diff --git a/.deadcode-out b/.deadcode-out
index e366abee94..24facdf12e 100644
--- a/.deadcode-out
+++ b/.deadcode-out
@@ -20,15 +20,13 @@ forgejo.org/models/db
 	TruncateBeans
 	InTransaction
 	DumpTables
+	GetTableNames
 
 forgejo.org/models/dbfs
 	file.renameTo
 	Create
 	Rename
 
-forgejo.org/models/forgefed
-	GetFederationHost
-
 forgejo.org/models/forgejo/semver
 	GetVersion
 	SetVersionString
@@ -57,6 +55,7 @@ forgejo.org/models/user
 	IsErrUserSettingIsNotExist
 	GetUserAllSettings
 	DeleteUserSetting
+	GetFederatedUser
 
 forgejo.org/modules/activitypub
 	NewContext
@@ -87,9 +86,11 @@ forgejo.org/modules/eventsource
 	Event.String
 
 forgejo.org/modules/forgefed
+	NewForgeFollow
 	NewForgeUndoLike
 	ForgeUndoLike.UnmarshalJSON
 	ForgeUndoLike.Validate
+	NewPersonIDFromModel
 	GetItemByType
 	JSONUnmarshalerFn
 	NotEmpty
@@ -188,10 +189,14 @@ forgejo.org/modules/translation
 	MockLocale.Tr
 	MockLocale.TrN
 	MockLocale.TrPluralString
+	MockLocale.TrPluralStringAllForms
 	MockLocale.TrSize
 	MockLocale.HasKey
 	MockLocale.PrettyNumber
 
+forgejo.org/modules/translation/localeiter
+	IterateMessagesContent
+
 forgejo.org/modules/util
 	OptionalArg
 
@@ -210,15 +215,15 @@ forgejo.org/modules/zstd
 	Writer.Write
 	Writer.Close
 
-forgejo.org/routers/web
-	NotFound
-
 forgejo.org/routers/web/org
 	MustEnableProjects
 
 forgejo.org/services/context
 	GetPrivateContext
 
+forgejo.org/services/federation
+	FollowRemoteActor
+
 forgejo.org/services/repository
 	IsErrForkAlreadyExist
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f3d30963c7..3f250e5682 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,13 +4,9 @@
   "features": {
     // installs nodejs into container
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "20"
-    },
-    "ghcr.io/devcontainers/features/git-lfs:1.2.3": {},
-    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
-    "ghcr.io/devcontainers/features/python:1": {
-      "version": "3.12"
+      "version": "22"
     },
+    "ghcr.io/devcontainers/features/git-lfs:1.2.5": {},
     "ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
   },
   "customizations": {
diff --git a/.dockerignore b/.dockerignore
index 5e7a893014..807c70b000 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -37,13 +37,9 @@ coverage.all
 coverage/
 cpu.out
 
-/modules/migration/bindata.go
 /modules/migration/bindata.go.hash
-/modules/options/bindata.go
 /modules/options/bindata.go.hash
-/modules/public/bindata.go
 /modules/public/bindata.go.hash
-/modules/templates/bindata.go
 /modules/templates/bindata.go.hash
 
 *.db
diff --git a/.editorconfig b/.editorconfig
index a547e8a585..5476eb02fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,9 @@ insert_final_newline = true
 [{*.{go,tmpl,html},Makefile,go.mod}]
 indent_style = tab
 
+[go.*]
+indent_style = tab
+
 [templates/custom/*.tmpl]
 insert_final_newline = false
 
diff --git a/.forgejo/issue_template/bug-report-ui.yaml b/.forgejo/issue_template/bug-report-ui.yaml
index 57d578b232..8bb7bf1d49 100644
--- a/.forgejo/issue_template/bug-report-ui.yaml
+++ b/.forgejo/issue_template/bug-report-ui.yaml
@@ -6,7 +6,7 @@ body:
 - type: markdown
   attributes:
     value: |
-      **NOTE: If your issue is a security concern, please email <security@forgejo.org> (GPG: `A4676E79`) instead of opening a public issue.**
+      **NOTE: If your issue is a security concern, please email <security@forgejo.org> ([security.txt](https://forgejo.org/.well-known/security.txt)) instead of opening a public issue.**
 - type: markdown
   attributes:
     value: |
diff --git a/.forgejo/issue_template/bug-report.yaml b/.forgejo/issue_template/bug-report.yaml
index 6e9b116e60..a2b50dbca2 100644
--- a/.forgejo/issue_template/bug-report.yaml
+++ b/.forgejo/issue_template/bug-report.yaml
@@ -6,7 +6,7 @@ body:
 - type: markdown
   attributes:
     value: |
-      **NOTE: If your issue is a security concern, please email <security@forgejo.org> (GPG: `A4676E79`) instead of opening a public issue.**
+      **NOTE: If your issue is a security concern, please email <security@forgejo.org> ([security.txt](https://forgejo.org/.well-known/security.txt)) instead of opening a public issue.**
 - type: markdown
   attributes:
     value: |
diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile
index d10564359e..09cce06c47 100644
--- a/.forgejo/testdata/build-release/Dockerfile
+++ b/.forgejo/testdata/build-release/Dockerfile
@@ -1,4 +1,4 @@
-FROM data.forgejo.org/oci/alpine:3.21
+FROM data.forgejo.org/oci/alpine:3.22
 ARG RELEASE_VERSION=unkown
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.version="${RELEASE_VERSION}"
diff --git a/.forgejo/workflows-composite/apt-install-from/action.yaml b/.forgejo/workflows-composite/apt-install-from/action.yaml
index 615e7cb184..c1c8c950e3 100644
--- a/.forgejo/workflows-composite/apt-install-from/action.yaml
+++ b/.forgejo/workflows-composite/apt-install-from/action.yaml
@@ -18,7 +18,7 @@ runs:
     - name: install packages
       run: |
         apt-get update -qq
-        apt-get -q install -qq -y ${PACKAGES}
+        apt-get -q install --allow-downgrades -qq -y ${PACKAGES}
       env:
         PACKAGES: ${{inputs.packages}}
     - name: remove temporary package list to prevent using it in other steps
diff --git a/.forgejo/workflows-composite/install-minimum-git-version/action.yaml b/.forgejo/workflows-composite/install-minimum-git-version/action.yaml
new file mode 100644
index 0000000000..d4e6e3f2a7
--- /dev/null
+++ b/.forgejo/workflows-composite/install-minimum-git-version/action.yaml
@@ -0,0 +1,22 @@
+#
+# Install the minimal version of Git supported by Forgejo
+#
+runs:
+  using: "composite"
+  steps:
+    - name: install git and git-lfs
+      run: |
+        set -x
+
+        export DEBIAN_FRONTEND=noninteractive
+
+        apt-get update -qq
+        apt-get -q install -y -qq curl ca-certificates
+
+        curl -sS -o /tmp/git-man.deb http://archive.ubuntu.com/ubuntu/pool/main/g/git/git-man_2.34.1-1ubuntu1_all.deb
+        curl -sS -o /tmp/git.deb https://archive.ubuntu.com/ubuntu/pool/main/g/git/git_2.34.1-1ubuntu1_amd64.deb
+        curl -sS -o /tmp/git-lfs.deb https://archive.ubuntu.com/ubuntu/pool/universe/g/git-lfs/git-lfs_3.0.2-1_amd64.deb
+
+        apt-get -q install --allow-downgrades -y -qq /tmp/git-man.deb
+        apt-get -q install --allow-downgrades -y -qq /tmp/git.deb
+        apt-get -q install --allow-downgrades -y -qq /tmp/git-lfs.deb
diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml
index 31c5c0cc3a..573c33f93b 100644
--- a/.forgejo/workflows/backport.yml
+++ b/.forgejo/workflows/backport.yml
@@ -47,7 +47,7 @@ jobs:
           cat <<'EOF'
           ${{ toJSON(github) }}
           EOF
-      - uses: https://data.forgejo.org/actions/git-backporting@v4.8.4
+      - uses: https://data.forgejo.org/actions/git-backporting@v4.8.5
         with:
           target-branch-pattern: "^backport/(?<target>(v.*))$"
           strategy: ort
diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml
index 1af6d567dd..a525a39eeb 100644
--- a/.forgejo/workflows/build-release-integration.yml
+++ b/.forgejo/workflows/build-release-integration.yml
@@ -28,7 +28,7 @@ jobs:
       - uses: https://data.forgejo.org/actions/checkout@v4
 
       - id: forgejo
-        uses: https://data.forgejo.org/actions/setup-forgejo@v2.0.4
+        uses: https://data.forgejo.org/actions/setup-forgejo@v3.0.2
         with:
           user: root
           password: admin1234
diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index a34f3533fd..c0948781c1 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -164,7 +164,7 @@ jobs:
 
       - name: build container & release
         if: ${{ secrets.TOKEN != '' }}
-        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.4
+        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.4.1
         with:
           forgejo: "${{ env.GITHUB_SERVER_URL }}"
           owner: "${{ env.GITHUB_REPOSITORY_OWNER }}"
@@ -183,7 +183,7 @@ jobs:
 
       - name: build rootless container
         if: ${{ secrets.TOKEN != '' }}
-        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.4
+        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.4.1
         with:
           forgejo: "${{ env.GITHUB_SERVER_URL }}"
           owner: "${{ env.GITHUB_REPOSITORY_OWNER }}"
@@ -201,7 +201,7 @@ jobs:
 
       - name: end-to-end tests
         if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' && vars.SKIP_END_TO_END != 'true' }}
-        uses: https://data.forgejo.org/actions/cascading-pr@v2.2.0
+        uses: https://data.forgejo.org/actions/cascading-pr@v2.2.1
         with:
           origin-url: ${{ env.GITHUB_SERVER_URL }}
           origin-repo: ${{ github.repository }}
diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml
index 7c8c56de13..9d613189a4 100644
--- a/.forgejo/workflows/cascade-setup-end-to-end.yml
+++ b/.forgejo/workflows/cascade-setup-end-to-end.yml
@@ -41,7 +41,7 @@ jobs:
         with:
           fetch-depth: '0'
           show-progress: 'false'
-      - uses: https://data.forgejo.org/actions/cascading-pr@v2.2.0
+      - uses: https://data.forgejo.org/actions/cascading-pr@v2.2.1
         with:
           origin-url: ${{ env.GITHUB_SERVER_URL }}
           origin-repo: ${{ github.repository }}
diff --git a/.forgejo/workflows/merge-requirements.yml b/.forgejo/workflows/merge-requirements.yml
index b052f18c06..9bed4b8797 100644
--- a/.forgejo/workflows/merge-requirements.yml
+++ b/.forgejo/workflows/merge-requirements.yml
@@ -1,4 +1,4 @@
-# Copyright 2024 The Forgejo Authors
+# Copyright 2025 The Forgejo Authors
 # SPDX-License-Identifier: MIT
 
 name: requirements
@@ -13,7 +13,8 @@ on:
 
 jobs:
   merge-conditions:
-    if: vars.ROLE == 'forgejo-coding'
+    if: >
+      vars.ROLE == 'forgejo-coding' && forge.event.pull_request.head.repo.full_name != 'forgejo-cascading-pr/forgejo'
     runs-on: docker
     container:
       image: 'data.forgejo.org/oci/node:22-bookworm'
@@ -26,18 +27,18 @@ jobs:
       - name: Missing test label
         if: >
           !(
-            contains(toJSON(github.event.pull_request.labels), 'test/present')
-            || contains(toJSON(github.event.pull_request.labels), 'test/not-needed')
-            || contains(toJSON(github.event.pull_request.labels), 'test/manual')
+            contains(toJSON(forge.event.pull_request.labels), 'test/present')
+            || contains(toJSON(forge.event.pull_request.labels), 'test/not-needed')
+            || contains(toJSON(forge.event.pull_request.labels), 'test/manual')
           )
         run: |
-          echo "Test label must be set to either 'present', 'not-needed' or 'manual'."
+          echo "A team member must set the label to either 'present', 'not-needed' or 'manual'."
           exit 1
       - name: Missing manual test instructions
         if: >
           (
-            contains(toJSON(github.event.pull_request.labels), 'test/manual')
-            && !contains(toJSON(github.event.pull_request.body), '# Test')
+            contains(toJSON(forge.event.pull_request.labels), 'test/manual')
+            && !contains(toJSON(forge.event.pull_request.body), '# Test')
           )
         run: |
           echo "Manual test label is set. The PR description needs to contain test steps introduced by a heading like:"
diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml
index 27d3b9383e..91fa03ab8e 100644
--- a/.forgejo/workflows/publish-release.yml
+++ b/.forgejo/workflows/publish-release.yml
@@ -44,7 +44,7 @@ jobs:
       - uses: https://data.forgejo.org/actions/checkout@v4
 
       - name: copy & sign
-        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.4
+        uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.4.1
         with:
           from-forgejo: ${{ vars.FORGEJO }}
           to-forgejo: ${{ vars.FORGEJO }}
diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml
index db33d30afb..ff2afe7303 100644
--- a/.forgejo/workflows/release-notes-assistant-milestones.yml
+++ b/.forgejo/workflows/release-notes-assistant-milestones.yml
@@ -4,30 +4,35 @@ on:
   schedule:
     - cron: '@daily'
 
+env:
+  RNA_WORKDIR: /srv/rna
+  RNA_VERSION: v1.3.6 # renovate: datasource=gitea-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org
+
 jobs:
   release-notes:
     if: vars.ROLE == 'forgejo-coding'
     runs-on: docker
     container:
-      image: 'data.forgejo.org/oci/node:22-bookworm'
+      image: 'data.forgejo.org/oci/ci:1'
     steps:
       - uses: https://data.forgejo.org/actions/checkout@v4
 
-      - uses: https://data.forgejo.org/actions/setup-go@v5
+      - uses: https://data.forgejo.org/actions/cache@v4
         with:
-          go-version-file: "go.mod"
-          cache: false
+          key: rna-${{ env.RNA_VERSION }}
+          path: ${{ env.RNA_WORKDIR }}
 
-      - name: apt install jq
+      - name: install release-notes-assistant
         run: |
-          export DEBIAN_FRONTEND=noninteractive
-          apt-get update -qq
-          apt-get -q install -y -qq jq
+          set -x
+          wget -O /usr/local/bin/rna https://code.forgejo.org/forgejo/release-notes-assistant/releases/download/${{ env.RNA_VERSION}}/release-notes-assistant
+          chmod +x /usr/local/bin/rna
 
       - name: update open milestones
         run: |
           set -x
-          curl -sS $GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/milestones?state=open | jq -r '.[] | .title' | while read forgejo version ; do
+          mkdir -p ${{ env.RNA_WORKDIR }}
+          curl -sS $FORGEJO_SERVER_URL/api/v1/repos/$FORGEJO_REPOSITORY/milestones?state=open | jq -r '.[] | .title' | while read forgejo version ; do
             milestone="$forgejo $version"
-            go run code.forgejo.org/forgejo/release-notes-assistant@v1.1.1 --config .release-notes-assistant.yaml --storage milestone --storage-location "$milestone"  --forgejo-url $GITHUB_SERVER_URL --repository $GITHUB_REPOSITORY --token ${{ secrets.RELEASE_NOTES_ASSISTANT_TOKEN }} release $version
+            rna --workdir ${{ env.RNA_WORKDIR }} --config .release-notes-assistant.yaml --storage milestone --storage-location "$milestone" --forgejo-url $FORGEJO_SERVER_URL --repository $FORGEJO_REPOSITORY --token ${{ secrets.RELEASE_NOTES_ASSISTANT_TOKEN }} release $version
           done
diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml
index 92edd912ec..f47fc59422 100644
--- a/.forgejo/workflows/release-notes-assistant.yml
+++ b/.forgejo/workflows/release-notes-assistant.yml
@@ -7,6 +7,9 @@ on:
       - synchronize
       - labeled
 
+env:
+  RNA_VERSION: v1.3.6 # renovate: datasource=gitea-releases depName=forgejo/release-notes-assistant registryUrl=https://code.forgejo.org
+
 jobs:
   release-notes:
     if: ( vars.ROLE == 'forgejo-coding' ) && contains(github.event.pull_request.labels.*.name, 'worth a release-note')
@@ -38,4 +41,4 @@ jobs:
 
       - name: release-notes-assistant preview
         run: |
-          go run code.forgejo.org/forgejo/release-notes-assistant@v1.1.1 --config .release-notes-assistant.yaml --storage pr --storage-location ${{ github.event.pull_request.number }}  --forgejo-url $GITHUB_SERVER_URL --repository $GITHUB_REPOSITORY --token ${{ secrets.RELEASE_NOTES_ASSISTANT_TOKEN }} preview ${{ github.event.pull_request.number }}
+          go run code.forgejo.org/forgejo/release-notes-assistant@$RNA_VERSION --config .release-notes-assistant.yaml --storage pr --storage-location ${{ github.event.pull_request.number }}  --forgejo-url $GITHUB_SERVER_URL --repository $GITHUB_REPOSITORY --token ${{ secrets.RELEASE_NOTES_ASSISTANT_TOKEN }} preview ${{ github.event.pull_request.number }}
diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml
index dbba9a82bb..7e6371ad87 100644
--- a/.forgejo/workflows/renovate.yml
+++ b/.forgejo/workflows/renovate.yml
@@ -20,7 +20,7 @@ env:
   RENOVATE_REPOSITORIES: ${{ github.repository }}
   # fix because 10.0.0-58-7e1df53+gitea-1.22.0 < 10.0.0 for semver
   # and codeberg api returns such versions from `git describe --tags`
-  RENOVATE_X_PLATFORM_VERSION: 10.0.0+gitea-1.22.0
+  # RENOVATE_X_PLATFORM_VERSION: 10.0.0+gitea-1.22.0 currently not needed
 
 jobs:
   renovate:
@@ -28,7 +28,7 @@ jobs:
 
     runs-on: docker
     container:
-      image: data.forgejo.org/renovate/renovate:39.212.0
+      image: data.forgejo.org/renovate/renovate:41.76.0
 
     steps:
       - name: Load renovate repo cache
@@ -49,7 +49,7 @@ jobs:
           LOG_LEVEL: debug
           RENOVATE_BASE_DIR: ${{ github.workspace }}/.tmp
           RENOVATE_ENDPOINT: ${{ github.server_url }}
-          RENOVATE_PLATFORM: gitea
+          RENOVATE_PLATFORM: forgejo
           RENOVATE_REPOSITORY_CACHE: 'enabled'
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           RENOVATE_GIT_AUTHOR: 'Renovate Bot <forgejo-renovate-action@forgejo.org>'
diff --git a/.forgejo/workflows/testing-integration.yml b/.forgejo/workflows/testing-integration.yml
new file mode 100644
index 0000000000..6822c45f39
--- /dev/null
+++ b/.forgejo/workflows/testing-integration.yml
@@ -0,0 +1,99 @@
+#
+# Additional integration tests designed to run once a day when
+# `mirror.yml` pushes to https://codeberg.org/forgejo-integration/forgejo
+# and send a notification via email to the contact email of the
+# organization should they fail.
+#
+# For debug purposes:
+#
+# - uncomment [on].pull_request
+# - swap 'forgejo-integration' and 'forgejo-coding'
+# - open a pull request at https://codeberg.org/forgejo/forgejo and fix things
+# - swap 'forgejo-integration' and 'forgejo-coding'
+# - comment [on].pull_request
+#
+
+name: testing-integration
+
+on:
+#  pull_request:
+  push:
+    tags: 'v[0-9]+.[0-9]+.*'
+    branches:
+      - 'forgejo'
+      - 'v*/forgejo'
+
+enable-email-notifications: true
+
+jobs:
+  test-unit:
+#    if: vars.ROLE == 'forgejo-coding'
+    if: vars.ROLE == 'forgejo-integration'
+    runs-on: docker
+    container:
+      image: 'data.forgejo.org/oci/node:22-bookworm'
+      options: --tmpfs /tmp:exec,noatime
+    steps:
+      - uses: https://data.forgejo.org/actions/checkout@v4
+      - uses: ./.forgejo/workflows-composite/setup-env
+      - name: install git 2.34.1 and git-lfs 3.0.2
+        uses: ./.forgejo/workflows-composite/install-minimum-git-version
+      - uses: ./.forgejo/workflows-composite/build-backend
+      - run: |
+          su forgejo -c 'make test-backend test-check'
+        timeout-minutes: 120
+        env:
+          RACE_ENABLED: 'true'
+          TAGS: bindata
+  test-sqlite:
+#    if: vars.ROLE == 'forgejo-coding'
+    if: vars.ROLE == 'forgejo-integration'
+    runs-on: docker
+    container:
+      image: 'data.forgejo.org/oci/node:22-bookworm'
+      options: --tmpfs /tmp:exec,noatime
+    steps:
+      - uses: https://data.forgejo.org/actions/checkout@v4
+      - uses: ./.forgejo/workflows-composite/setup-env
+      - name: install git 2.34.1 and git-lfs 3.0.2
+        uses: ./.forgejo/workflows-composite/install-minimum-git-version
+      - uses: ./.forgejo/workflows-composite/build-backend
+      - run: |
+          su forgejo -c 'make test-sqlite-migration test-sqlite'
+        timeout-minutes: 120
+        env:
+          TAGS: sqlite sqlite_unlock_notify
+          RACE_ENABLED: true
+          TEST_TAGS: sqlite sqlite_unlock_notify
+          USE_REPO_TEST_DIR: 1
+  test-mariadb:
+#    if: vars.ROLE == 'forgejo-coding'
+    if: vars.ROLE == 'forgejo-integration'
+    runs-on: docker
+    name: ${{ format('test-mariadb (v{0})', matrix.version) }}
+    strategy:
+      matrix:
+        version: ['10.6', '11.8']
+    container:
+      image: 'data.forgejo.org/oci/node:22-bookworm'
+      options: --tmpfs /tmp:exec,noatime
+    services:
+      mysql:
+        image: ${{ format('data.forgejo.org/oci/mariadb:{0}', matrix.version) }}
+        env:
+          MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
+          MARIADB_DATABASE: testgitea
+        options: --tmpfs /var/lib/mysql:noatime
+    steps:
+      - uses: https://data.forgejo.org/actions/checkout@v4
+      - uses: ./.forgejo/workflows-composite/setup-env
+      - name: install dependencies & git >= 2.42
+        uses: ./.forgejo/workflows-composite/apt-install-from
+        with:
+          packages: git git-lfs
+      - uses: ./.forgejo/workflows-composite/build-backend
+      - run: |
+          su forgejo -c 'make test-mysql-migration test-mysql'
+        timeout-minutes: 120
+        env:
+          USE_REPO_TEST_DIR: 1
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 62136b1b28..4c5e18a5e9 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -37,7 +37,11 @@ jobs:
       - run: make deps-frontend
       - run: make lint-frontend
       - run: make checks-frontend
-      - run: make test-frontend-coverage
+      - run: |
+          # Usage of `dayjs` can be impacted by local system timezone and can be sensitive to DST differences; since
+          # frontend tests are very short they're run twice with varying DST rules to reduce regression risk.
+          TZ=Europe/Berlin make test-frontend-coverage
+          TZ=America/Edmonton make test-frontend-coverage
       - run: make frontend
       - name: Install zstd for cache saving
         # works around https://github.com/actions/cache/issues/1169, because the
@@ -91,6 +95,7 @@ jobs:
           RACE_ENABLED: 'true'
           TAGS: bindata
           TEST_ELASTICSEARCH_URL: http://elasticsearch:9200
+          TEST_MINIO_ENDPOINT: minio:9000
   test-e2e:
     if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing'
     runs-on: docker
@@ -114,9 +119,14 @@ jobs:
         run: |
           su forgejo -c 'make deps-frontend frontend'
       - uses: ./.forgejo/workflows-composite/build-backend
+      - name: Decide to run all tests
+        id: run-all
+        if: contains(github.event.pull_request.labels.*.name, 'run-all-playwright-tests') || contains(github.event.pull_request.title, 'playwright')
+        run: |
+          echo "all=1" >> "$GITHUB_OUTPUT"
       - name: Get changed files
         id: changed-files
-        uses: https://data.forgejo.org/tj-actions/changed-files@v45
+        uses: https://data.forgejo.org/tj-actions/changed-files@v46
         with:
           separator: '\n'
       - run: |
@@ -126,6 +136,7 @@ jobs:
           USE_REPO_TEST_DIR: 1
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
           CHANGED_FILES: ${{steps.changed-files.outputs.all_changed_files}}
+          RUN_ALL: ${{steps.run-all.all}}
       - name: Upload test artifacts on failure
         if: failure()
         uses: https://data.forgejo.org/forgejo/upload-artifact@v4
diff --git a/.gitignore b/.gitignore
index 744e24a09a..e1200ce4e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ _testmain.go
 
 *coverage.out
 coverage.all
+coverage.html
+coverage.html.gz
 coverage/
 cpu.out
 
@@ -129,3 +131,4 @@ prime/
 
 # Manpage
 /man
+tests/integration/api_activitypub_person_inbox_useractivity_test.go
diff --git a/.golangci.yml b/.golangci.yml
index 136c0e624a..17d39c1456 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,9 @@
+version: "2"
+output:
+  sort-order:
+    - file
 linters:
-  enable-all: false
-  disable-all: true
-  fast: false
+  default: none
   enable:
     - bidichk
     - depguard
@@ -9,142 +11,161 @@ linters:
     - errcheck
     - forbidigo
     - gocritic
-    - gofmt
-    - gofumpt
-    - gosimple
     - govet
     - ineffassign
     - nakedret
     - nolintlint
     - revive
     - staticcheck
-    - stylecheck
     - testifylint
-    - typecheck
     - unconvert
-    - unused
     - unparam
+    - unused
     - usetesting
     - wastedassign
-
-run:
-  timeout: 10m
-
-output:
-  sort-results: true
-  sort-order: [file]
-  show-stats: true
-
-linters-settings:
-  stylecheck:
-    checks: ["all", "-ST1005", "-ST1003"]
-  nakedret:
-    max-func-lines: 0
-  gocritic:
-    disabled-checks:
-      - ifElseChain
-  revive:
-    severity: error
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: encoding/json
+              desc: use gitea's modules/json instead of encoding/json
+            - pkg: github.com/unknwon/com
+              desc: use gitea's util and replacements
+            - pkg: io/ioutil
+              desc: use os or io instead
+            - pkg: golang.org/x/exp
+              desc: it's experimental and unreliable
+            - pkg: forgejo.org/modules/git/internal
+              desc: do not use the internal package, use AddXxx function instead
+            - pkg: gopkg.in/ini.v1
+              desc: do not use the ini package, use gitea's config system instead
+            - pkg: github.com/minio/sha256-simd
+              desc: use crypto/sha256 instead, see https://codeberg.org/forgejo/forgejo/pulls/1528
+            - pkg: github.com/go-git/go-git
+              desc: use forgejo.org/modules/git instead, see https://codeberg.org/forgejo/forgejo/pulls/4941
+    gocritic:
+      disabled-checks:
+        - ifElseChain
+    revive:
+      severity: error
+      rules:
+        - name: atomic
+        - name: bare-return
+        - name: blank-imports
+        - name: constant-logical-expr
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: duplicated-imports
+        - name: empty-lines
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: errorf
+        - name: exported
+        - name: identical-branches
+        - name: if-return
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: modifies-value-receiver
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: string-of-int
+        - name: superfluous-else
+        - name: time-naming
+        - name: unconditional-recursion
+        - name: unexported-return
+        - name: unreachable-code
+        - name: var-declaration
+        - name: var-naming
+          arguments:
+            - []
+            - []
+            - - skip-package-name-checks: true
+        - name: redefines-builtin-id
+          disabled: true
+    staticcheck:
+      checks:
+        - all
+    testifylint:
+      disable:
+        - go-require
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: atomic
-      - name: bare-return
-      - name: blank-imports
-      - name: constant-logical-expr
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: duplicated-imports
-      - name: empty-lines
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: errorf
-      - name: exported
-      - name: identical-branches
-      - name: if-return
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: modifies-value-receiver
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: string-of-int
-      - name: superfluous-else
-      - name: time-naming
-      - name: unconditional-recursion
-      - name: unexported-return
-      - name: unreachable-code
-      - name: var-declaration
-      - name: var-naming
-      - name: redefines-builtin-id
-        disabled: true
-  gofumpt:
-    extra-rules: true
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: encoding/json
-            desc: use gitea's modules/json instead of encoding/json
-          - pkg: github.com/unknwon/com
-            desc: use gitea's util and replacements
-          - pkg: io/ioutil
-            desc: use os or io instead
-          - pkg: golang.org/x/exp
-            desc: it's experimental and unreliable
-          - pkg: forgejo.org/modules/git/internal
-            desc: do not use the internal package, use AddXxx function instead
-          - pkg: gopkg.in/ini.v1
-            desc: do not use the ini package, use gitea's config system instead
-          - pkg: github.com/minio/sha256-simd
-            desc: use crypto/sha256 instead, see https://codeberg.org/forgejo/forgejo/pulls/1528
-  testifylint:
-    disable:
-      - go-require
-
+      - linters:
+          - nolintlint
+        path: models/db/sql_postgres_with_schema.go
+      - linters:
+          - dupl
+          - errcheck
+          - gocyclo
+          - gosec
+          - staticcheck
+          - unparam
+        path: _test\.go
+      - linters:
+          - dupl
+          - errcheck
+          - gocyclo
+          - gosec
+        path: models/migrations/v
+      - linters:
+          - forbidigo
+        path: cmd
+      - linters:
+          - dupl
+        text: (?i)webhook
+      - linters:
+          - gocritic
+        text: (?i)`ID' should not be capitalized
+      - linters:
+          - deadcode
+          - unused
+        text: (?i)swagger
+      - linters:
+          - staticcheck
+        text: (?i)argument x is overwritten before first use
+      - linters:
+          - gocritic
+        text: '(?i)commentFormatting: put a space between `//` and comment text'
+      - linters:
+          - gocritic
+        text: '(?i)exitAfterDefer:'
+      - linters:
+          - staticcheck
+        text: "(ST1005|ST1003|QF1001):"
+    paths:
+      - node_modules
+      - public
+      - web_src
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-dirs: [node_modules, public, web_src]
-  exclude-case-sensitive: true
-  exclude-rules:
-    - path: models/db/sql_postgres_with_schema.go
-      linters:
-        - nolintlint
-    - path: _test\.go
-      linters:
-        - gocyclo
-        - errcheck
-        - dupl
-        - gosec
-        - unparam
-        - staticcheck
-    - path: models/migrations/v
-      linters:
-        - gocyclo
-        - errcheck
-        - dupl
-        - gosec
-    - path: cmd
-      linters:
-        - forbidigo
-    - text: "webhook"
-      linters:
-        - dupl
-    - text: "`ID' should not be capitalized"
-      linters:
-        - gocritic
-    - text: "swagger"
-      linters:
-        - unused
-        - deadcode
-    - text: "argument x is overwritten before first use"
-      linters:
-        - staticcheck
-    - text: "commentFormatting: put a space between `//` and comment text"
-      linters:
-        - gocritic
-    - text: "exitAfterDefer:"
-      linters:
-        - gocritic
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true
+  exclusions:
+    generated: lax
+    paths:
+      - node_modules
+      - public
+      - web_src
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/BSDmakefile b/BSDmakefile
index 79696eadcf..f4a819ff93 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -36,10 +36,6 @@ GARGS = "--no-print-directory"
     JARG = -j$(.MAKE.JOBS)
 .endif
 
-# bmake prefers out-of-source builds and tries to cd into ./obj (among others)
-# where possible. GNU Make doesn't, so override that value.
-.OBJDIR: ./
-
 # The GNU convention is to use the lowercased `prefix` variable/macro to
 # specify the installation directory. Humor them.
 GPREFIX =
@@ -48,11 +44,12 @@ GPREFIX =
 .endif
 
 .BEGIN: .SILENT
-	which $(GMAKE) || (printf "Error: GNU Make is required!\n\n" 1>&2 && false)
+	which $(GMAKE) >/dev/null || (printf "Error: GNU Make is required!\n\n" 1>&2 && false)
 
-.PHONY: FRC
-$(.TARGETS): FRC
-	$(GMAKE) $(GPREFIX) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
+.PHONY: EMPTY
+EMPTY: .SILENT
+	$(GMAKE) $(GPREFIX) $(GARGS) $(JARG)
 
-.DONE .DEFAULT: .SILENT
-	$(GMAKE) $(GPREFIX) $(GARGS) $(.TARGETS:S,.DONE,,) $(JARG)
+.PHONY: $(.TARGETS)
+$(.TARGETS): .SILENT
+	$(GMAKE) $(GPREFIX) $(GARGS) $(JARG) $@
diff --git a/CODEOWNERS b/CODEOWNERS
index ff2a4b9fdd..34cdceca09 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -9,10 +9,11 @@
 # Files related to frontend development.
 
 # Javascript and CSS code.
-web_src/.* @caesar @crystal @gusted
+web_src/.* @beowulf @gusted
+web_src/css/.* @0ko
 
 # HTML templates used by the backend.
-templates/.* @caesar @crystal @gusted
+templates/.* @beowulf @gusted
 ## the issue sidebar was touched by fnetx
 templates/repo/issue/view_content/sidebar.* @fnetx
 
diff --git a/Dockerfile b/Dockerfile
index 9a8877920a..322e2c61a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/xx AS xx
 
-FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.24-alpine3.21 AS build-env
+FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.24-alpine3.22 AS build-env
 
 ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-direct}
+ENV GOPROXY=${GOPROXY:-https://proxy.golang.org,direct}
 
 ARG RELEASE_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
@@ -33,10 +33,10 @@ RUN apk --no-cache add build-base git nodejs npm
 COPY . ${GOPATH}/src/forgejo.org
 WORKDIR ${GOPATH}/src/forgejo.org
 
-RUN make clean
+RUN make clean-no-bindata
 RUN make frontend
 RUN go build contrib/environment-to-ini/environment-to-ini.go && xx-verify environment-to-ini
-RUN LDFLAGS="-buildid=" make RELEASE_VERSION=$RELEASE_VERSION GOFLAGS="-trimpath" go-check generate-backend static-executable && xx-verify gitea
+RUN LDFLAGS="-buildid=" make FORGEJO_GENERATE_SKIP_HASH=true RELEASE_VERSION=$RELEASE_VERSION GOFLAGS="-trimpath" go-check generate-backend static-executable && xx-verify gitea
 
 # Copy local files
 COPY docker/root /tmp/local
@@ -51,7 +51,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \
               /go/src/forgejo.org/environment-to-ini
 RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete
 
-FROM data.forgejo.org/oci/alpine:3.21
+FROM data.forgejo.org/oci/alpine:3.22
 ARG RELEASE_VERSION
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.authors="Forgejo" \
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index 47aae2798d..6a3abaa4b9 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -1,9 +1,9 @@
 FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/xx AS xx
 
-FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.24-alpine3.21 AS build-env
+FROM --platform=$BUILDPLATFORM data.forgejo.org/oci/golang:1.24-alpine3.22 AS build-env
 
 ARG GOPROXY
-ENV GOPROXY=${GOPROXY:-direct}
+ENV GOPROXY=${GOPROXY:-https://proxy.golang.org,direct}
 
 ARG RELEASE_VERSION
 ARG TAGS="sqlite sqlite_unlock_notify"
@@ -33,10 +33,10 @@ RUN apk --no-cache add build-base git nodejs npm
 COPY . ${GOPATH}/src/forgejo.org
 WORKDIR ${GOPATH}/src/forgejo.org
 
-RUN make clean
+RUN make clean-no-bindata
 RUN make frontend
 RUN go build contrib/environment-to-ini/environment-to-ini.go && xx-verify environment-to-ini
-RUN make RELEASE_VERSION=$RELEASE_VERSION go-check generate-backend static-executable && xx-verify gitea
+RUN make FORGEJO_GENERATE_SKIP_HASH=true RELEASE_VERSION=$RELEASE_VERSION go-check generate-backend static-executable && xx-verify gitea
 
 # Copy local files
 COPY docker/rootless /tmp/local
@@ -49,7 +49,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \
               /go/src/forgejo.org/environment-to-ini
 RUN chmod 644 /go/src/forgejo.org/contrib/autocompletion/bash_autocomplete
 
-FROM data.forgejo.org/oci/alpine:3.21
+FROM data.forgejo.org/oci/alpine:3.22
 ARG RELEASE_VERSION
 LABEL maintainer="contact@forgejo.org" \
       org.opencontainers.image.authors="Forgejo" \
diff --git a/Makefile b/Makefile
index 4fb06db918..03d873c544 100644
--- a/Makefile
+++ b/Makefile
@@ -37,19 +37,17 @@ endif
 XGO_VERSION := go-1.21.x
 
 AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go
-EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.2.1 # renovate: datasource=go
-GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0 # renovate: datasource=go
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7 # renovate: datasource=go
+EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.3.0 # renovate: datasource=go
+GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.8.0 # renovate: datasource=go
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.1 # renovate: datasource=go
 GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go
-MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0 # renovate: datasource=go
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renovate: datasource=go
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go
 GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go
-DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.31.0 # renovate: datasource=go
-GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go
-GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.18.1 # renovate: datasource=go
-RENOVATE_NPM_PACKAGE ?= renovate@39.212.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate
+DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.36.0 # renovate: datasource=go
+GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.6.0 # renovate: datasource=go
+RENOVATE_NPM_PACKAGE ?= renovate@41.76.0 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate
 
 # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/
 DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ...
@@ -92,29 +90,22 @@ else
     FORGEJO_VERSION_API ?= $(GITEA_VERSION)+${GITEA_COMPATIBILITY}
   else
     # drop the "g" prefix prepended by git describe to the commit hash
-    FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always | sed 's/^v//' | sed 's/\-g/-/')+${GITEA_COMPATIBILITY}
+    FORGEJO_VERSION ?= $(shell git describe --exclude '*-test' --tags --always 2>/dev/null | sed 's/^v//' | sed 's/\-g/-/')
+    ifneq ($(FORGEJO_VERSION),)
+      ifeq ($(findstring $(GITEA_COMPATIBILITY),$(FORGEJO_VERSION)),)
+        FORGEJO_VERSION := $(FORGEJO_VERSION)+$(GITEA_COMPATIBILITY)
+      endif
+    endif
   endif
 endif
 FORGEJO_VERSION_MAJOR=$(shell echo $(FORGEJO_VERSION) | sed -e 's/\..*//')
 FORGEJO_VERSION_MINOR=$(shell echo $(FORGEJO_VERSION) | sed -E -e 's/^([0-9]+\.[0-9]+).*/\1/')
 
-show-version-full:
-	@echo ${FORGEJO_VERSION}
-
-show-version-major:
-	@echo ${FORGEJO_VERSION_MAJOR}
-
-show-version-minor:
-	@echo ${FORGEJO_VERSION_MINOR}
-
 RELEASE_VERSION ?= ${FORGEJO_VERSION}
 VERSION ?= ${RELEASE_VERSION}
 
 FORGEJO_VERSION_API ?= ${FORGEJO_VERSION}
 
-show-version-api:
-	@echo ${FORGEJO_VERSION_API}
-
 # Strip binaries by default to reduce size, allow overriding for debugging
 STRIP ?= 1
 ifeq ($(STRIP),1)
@@ -137,7 +128,7 @@ WEBPACK_CONFIGS := webpack.config.js tailwind.config.js
 WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
 WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts
 
-BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
+BINDATA_DEST := modules/migration/bindata.go modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
 BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
 
 GENERATED_GO_DEST := modules/charset/invisible_gen.go modules/charset/ambiguous_gen.go
@@ -208,7 +199,7 @@ all: build
 .PHONY: help
 help:
 	@echo "Make Routines:"
-	@echo " - \"\"                             equivalent to \"build\""
+	@echo " - \"\"                               equivalent to \"build\""
 	@echo " - build                            build everything"
 	@echo " - frontend                         build frontend files"
 	@echo " - backend                          build backend files"
@@ -221,31 +212,22 @@ help:
 	@echo " - deps-frontend                    install frontend dependencies"
 	@echo " - deps-backend                     install backend dependencies"
 	@echo " - deps-tools                       install tool dependencies"
-	@echo " - deps-py                          install python dependencies"
 	@echo " - lint                             lint everything"
 	@echo " - lint-fix                         lint everything and fix issues"
 	@echo " - lint-frontend                    lint frontend files"
 	@echo " - lint-frontend-fix                lint frontend files and fix issues"
 	@echo " - lint-backend                     lint backend files"
 	@echo " - lint-backend-fix                 lint backend files and fix issues"
-	@echo " - lint-codespell                   lint typos"
-	@echo " - lint-codespell-fix               lint typos and fix them automatically"
-	@echo " - lint-codespell-fix-i             lint typos and fix them interactively"
 	@echo " - lint-go                          lint go files"
 	@echo " - lint-go-fix                      lint go files and fix issues"
 	@echo " - lint-go-vet                      lint go files with vet"
-	@echo " - lint-go-gopls                    lint go files with gopls"
 	@echo " - lint-js                          lint js files"
 	@echo " - lint-js-fix                      lint js files and fix issues"
 	@echo " - lint-css                         lint css files"
 	@echo " - lint-css-fix                     lint css files and fix issues"
 	@echo " - lint-md                          lint markdown files"
 	@echo " - lint-swagger                     lint swagger files"
-	@echo " - lint-templates                   lint template files"
 	@echo " - lint-renovate                    lint renovate files"
-	@echo " - lint-yaml                        lint yaml files"
-	@echo " - lint-spell                       lint spelling"
-	@echo " - lint-spell-fix                   lint spelling and fix issues"
 	@echo " - checks                           run various consistency checks"
 	@echo " - checks-frontend                  check frontend files"
 	@echo " - checks-backend                   check backend files"
@@ -276,6 +258,30 @@ help:
 	@echo " - test-sqlite[\#TestSpecificName]  run integration test for sqlite"
 	@echo " - reproduce-build\#version         build a reproducible binary for the specified release version"
 
+.PHONY: verify-version
+verify-version:
+ifeq ($(FORGEJO_VERSION),)
+	@echo "Error: Could not determine FORGEJO_VERSION; version file $(STORED_VERSION_FILE) not present and no suitable git tag found"
+	@echo 'In most cases this likely means you forgot to fetch git tags, you can fix this by executing `git fetch --tags`. If this is not possible and this is part of a custom build process, then you can set a specific version by writing it to $(STORED_VERSION_FILE) (This must be a semver compatible version).'
+	@false
+endif
+
+.PHONY: show-version-full
+show-version-full: verify-version
+	@echo ${FORGEJO_VERSION}
+
+.PHONY: show-version-major
+show-version-major: verify-version
+	@echo ${FORGEJO_VERSION_MAJOR}
+
+.PHONY: show-version-minor
+show-version-minor: verify-version
+	@echo ${FORGEJO_VERSION_MINOR}
+
+.PHONY: show-version-api
+show-version-api: verify-version
+	@echo ${FORGEJO_VERSION_API}
+
 ###
 # Check system and environment requirements
 ###
@@ -317,8 +323,12 @@ clean-all: clean
 	rm -rf $(WEBPACK_DEST_ENTRIES) node_modules
 
 .PHONY: clean
-clean:
-	rm -rf $(EXECUTABLE) $(DIST) $(BINDATA_DEST) $(BINDATA_HASH) \
+clean: clean-no-bindata
+	rm -rf $(BINDATA_DEST) $(BINDATA_HASH)
+
+.PHONY: clean-no-bindata
+clean-no-bindata:
+	rm -rf $(EXECUTABLE) $(DIST) \
 		integrations*.test \
 		e2e*.test \
 		tests/integration/gitea-integration-* \
@@ -401,10 +411,10 @@ checks-frontend: lockfile-check svg-check
 checks-backend: tidy-check swagger-check fmt-check swagger-validate security-check
 
 .PHONY: lint
-lint: lint-frontend lint-backend lint-spell
+lint: lint-frontend lint-backend
 
 .PHONY: lint-fix
-lint-fix: lint-frontend-fix lint-backend-fix lint-spell-fix
+lint-fix: lint-frontend-fix lint-backend-fix
 
 .PHONY: lint-frontend
 lint-frontend: lint-js lint-css
@@ -418,18 +428,6 @@ lint-backend: lint-go lint-go-vet lint-editorconfig lint-renovate lint-locale li
 .PHONY: lint-backend-fix
 lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig lint-disposable-emails-fix
 
-.PHONY: lint-codespell
-lint-codespell: deps-py
-	@poetry run codespell
-
-.PHONY: lint-codespell-fix
-lint-codespell-fix: deps-py
-	@poetry run codespell -w
-
-.PHONY: lint-codespell-fix-i
-lint-codespell-fix-i: deps-py
-	@poetry run codespell -w -i 3 -C 2
-
 .PHONY: lint-js
 lint-js: node_modules
 	npx eslint --color --max-warnings=0
@@ -452,8 +450,8 @@ lint-swagger: node_modules
 
 .PHONY: lint-renovate
 lint-renovate: node_modules
-	npx --yes --package $(RENOVATE_NPM_PACKAGE) -- renovate-config-validator --strict > .lint-renovate 2>&1 || true
-	@if grep --quiet --extended-regexp -e '^( WARN:|ERROR:)' .lint-renovate ; then cat .lint-renovate ; rm .lint-renovate ; exit 1 ; fi
+	npx --yes --package $(RENOVATE_NPM_PACKAGE) -- renovate-config-validator > .lint-renovate 2>&1 || true
+	@if grep --quiet --extended-regexp -e '^( ERROR:)' .lint-renovate ; then cat .lint-renovate ; rm .lint-renovate ; exit 1 ; fi
 	@rm .lint-renovate
 
 .PHONY: lint-locale
@@ -462,20 +460,12 @@ lint-locale:
 
 .PHONY: lint-locale-usage
 lint-locale-usage:
-	$(GO) run build/lint-locale-usage/lint-locale-usage.go --allow-missing-msgids
+	$(GO) run build/lint-locale-usage/lint-locale-usage.go
 
 .PHONY: lint-md
 lint-md: node_modules
 	npx markdownlint docs *.md
 
-.PHONY: lint-spell
-lint-spell: lint-codespell
-	@go run $(MISSPELL_PACKAGE) -error $(SPELLCHECK_FILES)
-
-.PHONY: lint-spell-fix
-lint-spell-fix: lint-codespell-fix
-	@go run $(MISSPELL_PACKAGE) -w $(SPELLCHECK_FILES)
-
 RUN_DEADCODE = $(GO) run $(DEADCODE_PACKAGE) -generated=false -f='{{println .Path}}{{range .Funcs}}{{printf "\t%s\n" .Name}}{{end}}{{println}}' -test forgejo.org
 
 .PHONY: lint-go
@@ -495,11 +485,6 @@ lint-go-vet:
 	@echo "Running go vet..."
 	@$(GO) vet ./...
 
-.PHONY: lint-go-gopls
-lint-go-gopls:
-	@echo "Running gopls check..."
-	@GO=$(GO) GOPLS_PACKAGE=$(GOPLS_PACKAGE) tools/lint-go-gopls.sh $(GO_SOURCES_NO_BINDATA)
-
 .PHONY: lint-editorconfig
 lint-editorconfig:
 	$(GO) run $(EDITORCONFIG_CHECKER_PACKAGE) templates .forgejo/workflows
@@ -512,18 +497,9 @@ lint-disposable-emails:
 lint-disposable-emails-fix:
 	$(GO) run build/generate-disposable-email.go -r $(DISPOSABLE_EMAILS_SHA)
 
-.PHONY: lint-templates
-lint-templates: .venv node_modules
-	@node tools/lint-templates-svg.js
-	@poetry run djlint $(shell find templates -type f -iname '*.tmpl')
-
-.PHONY: lint-yaml
-lint-yaml: .venv
-	@poetry run yamllint -s .
-
 .PHONY: security-check
 security-check:
-	go run $(GOVULNCHECK_PACKAGE) ./...
+	go run $(GOVULNCHECK_PACKAGE) -show color ./...
 
 ###
 # Development and testing targets
@@ -577,7 +553,7 @@ test-check:
 
 .PHONY: test\#%
 test\#%:
-	@echo "Running go test with -tags '$(TEST_TAGS)'..."
+	@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
 	@$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
 
 .PHONY: coverage
@@ -662,6 +638,7 @@ generate-ini-pgsql:
 		-e 's|{{TEST_LOGGER}}|$(or $(TEST_LOGGER),test$(COMMA)file)|g' \
 		-e 's|{{TEST_TYPE}}|$(or $(TEST_TYPE),integration)|g' \
 		-e 's|{{TEST_STORAGE_TYPE}}|$(or $(TEST_STORAGE_TYPE),minio)|g' \
+		-e 's|{{TEST_S3_HOST}}|$(or $(TEST_S3_HOST),minio:9000)|g' \
 			tests/pgsql.ini.tmpl > tests/pgsql.ini
 
 .PHONY: test-pgsql
@@ -816,7 +793,7 @@ check: test
 ###
 
 .PHONY: install $(TAGS_PREREQ)
-install: $(wildcard *.go)
+install: $(wildcard *.go) | verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) install -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
 
 .PHONY: build
@@ -844,13 +821,13 @@ generate-go: $(TAGS_PREREQ)
 merge-locales:
 	@echo "NOT NEEDED: THIS IS A NOOP AS OF Forgejo 7.0 BUT KEPT FOR BACKWARD COMPATIBILITY"
 
-$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
+$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) | verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@
 
 forgejo: $(EXECUTABLE)
 	ln -f $(EXECUTABLE) forgejo
 
-static-executable: $(GO_SOURCES) $(TAGS_PREREQ)
+static-executable: $(GO_SOURCES) $(TAGS_PREREQ) | verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -o $(EXECUTABLE)
 
 .PHONY: release
@@ -863,18 +840,18 @@ $(DIST_DIRS):
 	mkdir -p $(DIST_DIRS)
 
 .PHONY: release-linux
-release-linux: | $(DIST_DIRS)
+release-linux: | $(DIST_DIRS) verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets '$(LINUX_ARCHS)' -out forgejo-$(VERSION) .
 ifeq ($(CI),true)
 	cp /build/* $(DIST)/binaries
 endif
 
 .PHONY: release-darwin
-release-darwin: | $(DIST_DIRS)
+release-darwin: | $(DIST_DIRS) verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin-10.12/amd64,darwin-10.12/arm64' -out gitea-$(VERSION) .
 
 .PHONY: release-freebsd
-release-freebsd: | $(DIST_DIRS)
+release-freebsd: | $(DIST_DIRS) verify-version
 	CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'freebsd/amd64' -out gitea-$(VERSION) .
 
 .PHONY: release-copy
@@ -928,10 +905,7 @@ reproduce-build\#%:
 ###
 
 .PHONY: deps
-deps: deps-frontend deps-backend deps-tools deps-py
-
-.PHONY: deps-py
-deps-py: .venv
+deps: deps-frontend deps-backend deps-tools
 
 .PHONY: deps-frontend
 deps-frontend: node_modules
@@ -947,13 +921,11 @@ deps-tools:
 	$(GO) install $(GOFUMPT_PACKAGE)
 	$(GO) install $(GOLANGCI_LINT_PACKAGE)
 	$(GO) install $(GXZ_PACKAGE)
-	$(GO) install $(MISSPELL_PACKAGE)
 	$(GO) install $(SWAGGER_PACKAGE)
 	$(GO) install $(XGO_PACKAGE)
 	$(GO) install $(GO_LICENSES_PACKAGE)
 	$(GO) install $(GOVULNCHECK_PACKAGE)
 	$(GO) install $(GOMOCK_PACKAGE)
-	$(GO) install $(GOPLS_PACKAGE)
 
 node_modules: package-lock.json
 	npm install --no-save
@@ -969,6 +941,7 @@ fomantic:
 	cd $(FOMANTIC_WORK_DIR) && npm install --no-save
 	cp -f $(FOMANTIC_WORK_DIR)/theme.config.less $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/theme.config
 	cp -rf $(FOMANTIC_WORK_DIR)/_site $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/
+	rm -rf $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/themes/default/modules/dropdown.overrides
 	$(SED_INPLACE) -e 's/  overrideBrowserslist\r/  overrideBrowserslist: ["defaults"]\r/g' $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/tasks/config/tasks.js
 	cd $(FOMANTIC_WORK_DIR) && npx gulp -f node_modules/fomantic-ui/gulpfile.js build
 	# fomantic uses "touchstart" as click event for some browsers, it's not ideal, so we force fomantic to always use "click" as click event
@@ -1017,8 +990,7 @@ generate-gomock:
 
 .PHONY: generate-images
 generate-images: | node_modules
-	npm install --no-save fabric@6 imagemin-zopfli@7
-	node tools/generate-images.js $(TAGS)
+	node tools/generate-images.js
 
 .PHONY: generate-manpage
 generate-manpage:
diff --git a/README.md b/README.md
index 0c4becacc4..f95aebadeb 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,6 @@ Our promise: **Independent Free/Libre Software forever!**
 
 ## What does Forgejo offer?
 
-<!-- If you want to know what Forgejo is like,
-you can check out public instances,
-e.g. [Codeberg.org](https://codeberg.org).
--->
-
 If you like any of the following, Forgejo is literally meant for you:
 
 - Lightweight: Forgejo can easily be hosted on nearly **every machine**.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 32f7b8c264..c688045d1c 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -4,7 +4,7 @@ A minor or major Forgejo release is published every [three months](https://forge
 
 A [patch or minor release](https://semver.org/spec/v2.0.0.html) (e.g. upgrading from v7.0.0 to v7.0.1 or v7.1.0) does not require manual intervention. But [major releases](https://semver.org/spec/v2.0.0.html#spec-item-8) where the first version number changes (e.g. upgrading from v1.21 to v7.0) contain breaking changes and the release notes explain how to deal with them.
 
-The release notes of each release [are available in the release-notes-published directory of this repository](release-notes-published), starting with [Forgejo 7.0.7](release-notes-published/7.0.7.md) and [Forgejo 8.0.1](release-notes-published/8.0.1.md).
+The release notes of each release [are available in the release-notes-published directory of this repository](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published), starting with [Forgejo 7.0.7](release-notes-published/7.0.7.md) and [Forgejo 8.0.1](release-notes-published/8.0.1.md).
 
 ## 9.0.2
 
diff --git a/assets/go-licenses.json b/assets/go-licenses.json
index af9c0ce8e0..11fd237360 100644
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
@@ -19,6 +19,11 @@
     "path": "code.forgejo.org/forgejo-contrib/go-libravatar/LICENSE",
     "licenseText": "Copyright (c) 2016 Sandro Santilli \u003cstrk@kbt.io\u003e\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
   },
+  {
+    "name": "code.forgejo.org/forgejo/go-rpmutils",
+    "path": "code.forgejo.org/forgejo/go-rpmutils/LICENSE",
+    "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
+  },
   {
     "name": "code.forgejo.org/forgejo/levelqueue",
     "path": "code.forgejo.org/forgejo/levelqueue/LICENSE",
@@ -29,6 +34,11 @@
     "path": "code.forgejo.org/forgejo/reply/LICENSE",
     "licenseText": "MIT License\n\nCopyright (c) The Forgejo Authors\nCopyright (c) Discourse\nCopyright (c) Claudemiro\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
+  {
+    "name": "code.forgejo.org/forgejo/runner/v9/act",
+    "path": "code.forgejo.org/forgejo/runner/v9/act/LICENSE",
+    "licenseText": "Copyright (c) 2023-2025 The Forgejo Authors\nCopyright (c) 2022 The Gitea Authors\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
+  },
   {
     "name": "code.forgejo.org/go-chi/binding",
     "path": "code.forgejo.org/go-chi/binding/LICENSE",
@@ -99,21 +109,21 @@
     "path": "github.com/Azure/go-ntlmssp/LICENSE",
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2016 Microsoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
-  {
-    "name": "github.com/DataDog/zstd",
-    "path": "github.com/DataDog/zstd/LICENSE",
-    "licenseText": "Simplified BSD License\n\nCopyright (c) 2016, Datadog \u003cinfo@datadoghq.com\u003e\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n    * Redistributions of source code must retain the above copyright notice,\n      this list of conditions and the following disclaimer.\n    * Redistributions in binary form must reproduce the above copyright notice,\n      this list of conditions and the following disclaimer in the documentation\n      and/or other materials provided with the distribution.\n    * Neither the name of the copyright holder nor the names of its contributors\n      may be used to endorse or promote products derived from this software\n      without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-  },
   {
     "name": "github.com/ProtonMail/go-crypto",
     "path": "github.com/ProtonMail/go-crypto/LICENSE",
     "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
   {
-    "name": "github.com/RoaringBitmap/roaring",
-    "path": "github.com/RoaringBitmap/roaring/LICENSE",
+    "name": "github.com/RoaringBitmap/roaring/v2",
+    "path": "github.com/RoaringBitmap/roaring/v2/LICENSE",
     "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright 2016 by the authors\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n\n================================================================================\n\nPortions of runcontainer.go are from the Go standard library, which is licensed\nunder:\n\nCopyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\n     notice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\n     copyright notice, this list of conditions and the following disclaimer\n     in the documentation and/or other materials provided with the\n     distribution.\n   * Neither the name of Google Inc. nor the names of its\n     contributors may be used to endorse or promote products derived from\n     this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
+  {
+    "name": "github.com/STARRY-S/zip",
+    "path": "github.com/STARRY-S/zip/LICENSE",
+    "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2023, Starry\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this\n   list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice,\n   this list of conditions and the following disclaimer in the documentation\n   and/or other materials provided with the distribution.\n\n3. Neither the name of the copyright holder nor the names of its\n   contributors may be used to endorse or promote products derived from\n   this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+  },
   {
     "name": "github.com/SaveTheRbtz/zstd-seekable-format-go/pkg",
     "path": "github.com/SaveTheRbtz/zstd-seekable-format-go/pkg/LICENSE",
@@ -244,6 +254,26 @@
     "path": "github.com/blevesearch/zapx/v16/LICENSE",
     "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License."
   },
+  {
+    "name": "github.com/bmatcuk/doublestar/v4",
+    "path": "github.com/bmatcuk/doublestar/v4/LICENSE",
+    "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Bob Matcuk\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n"
+  },
+  {
+    "name": "github.com/bodgit/plumbing",
+    "path": "github.com/bodgit/plumbing/LICENSE",
+    "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2019, Matt Dainty\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n  contributors may be used to endorse or promote products derived from\n  this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n"
+  },
+  {
+    "name": "github.com/bodgit/sevenzip",
+    "path": "github.com/bodgit/sevenzip/LICENSE",
+    "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2020, Matt Dainty\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n  contributors may be used to endorse or promote products derived from\n  this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+  },
+  {
+    "name": "github.com/bodgit/windows",
+    "path": "github.com/bodgit/windows/LICENSE",
+    "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2020, Matt Dainty\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n  contributors may be used to endorse or promote products derived from\n  this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n"
+  },
   {
     "name": "github.com/boombuler/barcode",
     "path": "github.com/boombuler/barcode/LICENSE",
@@ -289,11 +319,6 @@
     "path": "github.com/cloudflare/circl/LICENSE",
     "licenseText": "Copyright (c) 2019 Cloudflare. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n   * Neither the name of Cloudflare nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\n========================================================================\n\nCopyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n   * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n   * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n   * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
-  {
-    "name": "github.com/cpuguy83/go-md2man/v2/md2man",
-    "path": "github.com/cpuguy83/go-md2man/v2/md2man/LICENSE.md",
-    "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Brian Goff\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
-  },
   {
     "name": "github.com/cyphar/filepath-securejoin",
     "path": "github.com/cyphar/filepath-securejoin/LICENSE",
@@ -494,11 +519,6 @@
     "path": "github.com/golang-jwt/jwt/v5/LICENSE",
     "licenseText": "Copyright (c) 2012 Dave Grijalva\nCopyright (c) 2021 golang-jwt maintainers\n\nPermission 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:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE 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.\n\n"
   },
-  {
-    "name": "github.com/golang/geo",
-    "path": "github.com/golang/geo/LICENSE",
-    "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
-  },
   {
     "name": "github.com/golang/groupcache/lru",
     "path": "github.com/golang/groupcache/lru/LICENSE",
@@ -574,11 +594,21 @@
     "path": "github.com/gorilla/sessions/LICENSE",
     "licenseText": "Copyright (c) 2024 The Gorilla Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n\t * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n\t * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\t * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
+  {
+    "name": "github.com/hashicorp/errwrap",
+    "path": "github.com/hashicorp/errwrap/LICENSE",
+    "licenseText": "Mozilla Public License, version 2.0\n\n1. Definitions\n\n1.1. “Contributor”\n\n     means each individual or legal entity that creates, contributes to the\n     creation of, or owns Covered Software.\n\n1.2. “Contributor Version”\n\n     means the combination of the Contributions of others (if any) used by a\n     Contributor and that particular Contributor’s Contribution.\n\n1.3. “Contribution”\n\n     means Covered Software of a particular Contributor.\n\n1.4. “Covered Software”\n\n     means Source Code Form to which the initial Contributor has attached the\n     notice in Exhibit A, the Executable Form of such Source Code Form, and\n     Modifications of such Source Code Form, in each case including portions\n     thereof.\n\n1.5. “Incompatible With Secondary Licenses”\n     means\n\n     a. that the initial Contributor has attached the notice described in\n        Exhibit B to the Covered Software; or\n\n     b. that the Covered Software was made available under the terms of version\n        1.1 or earlier of the License, but not also under the terms of a\n        Secondary License.\n\n1.6. “Executable Form”\n\n     means any form of the work other than Source Code Form.\n\n1.7. “Larger Work”\n\n     means a work that combines Covered Software with other material, in a separate\n     file or files, that is not Covered Software.\n\n1.8. “License”\n\n     means this document.\n\n1.9. “Licensable”\n\n     means having the right to grant, to the maximum extent possible, whether at the\n     time of the initial grant or subsequently, any and all of the rights conveyed by\n     this License.\n\n1.10. “Modifications”\n\n     means any of the following:\n\n     a. any file in Source Code Form that results from an addition to, deletion\n        from, or modification of the contents of Covered Software; or\n\n     b. any new file in Source Code Form that contains any Covered Software.\n\n1.11. “Patent Claims” of a Contributor\n\n      means any patent claim(s), including without limitation, method, process,\n      and apparatus claims, in any patent Licensable by such Contributor that\n      would be infringed, but for the grant of the License, by the making,\n      using, selling, offering for sale, having made, import, or transfer of\n      either its Contributions or its Contributor Version.\n\n1.12. “Secondary License”\n\n      means either the GNU General Public License, Version 2.0, the GNU Lesser\n      General Public License, Version 2.1, the GNU Affero General Public\n      License, Version 3.0, or any later versions of those licenses.\n\n1.13. “Source Code Form”\n\n      means the form of the work preferred for making modifications.\n\n1.14. “You” (or “Your”)\n\n      means an individual or a legal entity exercising rights under this\n      License. For legal entities, “You” includes any entity that controls, is\n      controlled by, or is under common control with You. For purposes of this\n      definition, “control” means (a) the power, direct or indirect, to cause\n      the direction or management of such entity, whether by contract or\n      otherwise, or (b) ownership of more than fifty percent (50%) of the\n      outstanding shares or beneficial ownership of such entity.\n\n\n2. License Grants and Conditions\n\n2.1. Grants\n\n     Each Contributor hereby grants You a world-wide, royalty-free,\n     non-exclusive license:\n\n     a. under intellectual property rights (other than patent or trademark)\n        Licensable by such Contributor to use, reproduce, make available,\n        modify, display, perform, distribute, and otherwise exploit its\n        Contributions, either on an unmodified basis, with Modifications, or as\n        part of a Larger Work; and\n\n     b. under Patent Claims of such Contributor to make, use, sell, offer for\n        sale, have made, import, and otherwise transfer either its Contributions\n        or its Contributor Version.\n\n2.2. Effective Date\n\n     The licenses granted in Section 2.1 with respect to any Contribution become\n     effective for each Contribution on the date the Contributor first distributes\n     such Contribution.\n\n2.3. Limitations on Grant Scope\n\n     The licenses granted in this Section 2 are the only rights granted under this\n     License. No additional rights or licenses will be implied from the distribution\n     or licensing of Covered Software under this License. Notwithstanding Section\n     2.1(b) above, no patent license is granted by a Contributor:\n\n     a. for any code that a Contributor has removed from Covered Software; or\n\n     b. for infringements caused by: (i) Your and any other third party’s\n        modifications of Covered Software, or (ii) the combination of its\n        Contributions with other software (except as part of its Contributor\n        Version); or\n\n     c. under Patent Claims infringed by Covered Software in the absence of its\n        Contributions.\n\n     This License does not grant any rights in the trademarks, service marks, or\n     logos of any Contributor (except as may be necessary to comply with the\n     notice requirements in Section 3.4).\n\n2.4. Subsequent Licenses\n\n     No Contributor makes additional grants as a result of Your choice to\n     distribute the Covered Software under a subsequent version of this License\n     (see Section 10.2) or under the terms of a Secondary License (if permitted\n     under the terms of Section 3.3).\n\n2.5. Representation\n\n     Each Contributor represents that the Contributor believes its Contributions\n     are its original creation(s) or it has sufficient rights to grant the\n     rights to its Contributions conveyed by this License.\n\n2.6. Fair Use\n\n     This License is not intended to limit any rights You have under applicable\n     copyright doctrines of fair use, fair dealing, or other equivalents.\n\n2.7. Conditions\n\n     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in\n     Section 2.1.\n\n\n3. Responsibilities\n\n3.1. Distribution of Source Form\n\n     All distribution of Covered Software in Source Code Form, including any\n     Modifications that You create or to which You contribute, must be under the\n     terms of this License. You must inform recipients that the Source Code Form\n     of the Covered Software is governed by the terms of this License, and how\n     they can obtain a copy of this License. You may not attempt to alter or\n     restrict the recipients’ rights in the Source Code Form.\n\n3.2. Distribution of Executable Form\n\n     If You distribute Covered Software in Executable Form then:\n\n     a. such Covered Software must also be made available in Source Code Form,\n        as described in Section 3.1, and You must inform recipients of the\n        Executable Form how they can obtain a copy of such Source Code Form by\n        reasonable means in a timely manner, at a charge no more than the cost\n        of distribution to the recipient; and\n\n     b. You may distribute such Executable Form under the terms of this License,\n        or sublicense it under different terms, provided that the license for\n        the Executable Form does not attempt to limit or alter the recipients’\n        rights in the Source Code Form under this License.\n\n3.3. Distribution of a Larger Work\n\n     You may create and distribute a Larger Work under terms of Your choice,\n     provided that You also comply with the requirements of this License for the\n     Covered Software. If the Larger Work is a combination of Covered Software\n     with a work governed by one or more Secondary Licenses, and the Covered\n     Software is not Incompatible With Secondary Licenses, this License permits\n     You to additionally distribute such Covered Software under the terms of\n     such Secondary License(s), so that the recipient of the Larger Work may, at\n     their option, further distribute the Covered Software under the terms of\n     either this License or such Secondary License(s).\n\n3.4. Notices\n\n     You may not remove or alter the substance of any license notices (including\n     copyright notices, patent notices, disclaimers of warranty, or limitations\n     of liability) contained within the Source Code Form of the Covered\n     Software, except that You may alter any license notices to the extent\n     required to remedy known factual inaccuracies.\n\n3.5. Application of Additional Terms\n\n     You may choose to offer, and to charge a fee for, warranty, support,\n     indemnity or liability obligations to one or more recipients of Covered\n     Software. However, You may do so only on Your own behalf, and not on behalf\n     of any Contributor. You must make it absolutely clear that any such\n     warranty, support, indemnity, or liability obligation is offered by You\n     alone, and You hereby agree to indemnify every Contributor for any\n     liability incurred by such Contributor as a result of warranty, support,\n     indemnity or liability terms You offer. You may include additional\n     disclaimers of warranty and limitations of liability specific to any\n     jurisdiction.\n\n4. Inability to Comply Due to Statute or Regulation\n\n   If it is impossible for You to comply with any of the terms of this License\n   with respect to some or all of the Covered Software due to statute, judicial\n   order, or regulation then You must: (a) comply with the terms of this License\n   to the maximum extent possible; and (b) describe the limitations and the code\n   they affect. Such description must be placed in a text file included with all\n   distributions of the Covered Software under this License. Except to the\n   extent prohibited by statute or regulation, such description must be\n   sufficiently detailed for a recipient of ordinary skill to be able to\n   understand it.\n\n5. Termination\n\n5.1. The rights granted under this License will terminate automatically if You\n     fail to comply with any of its terms. However, if You become compliant,\n     then the rights granted under this License from a particular Contributor\n     are reinstated (a) provisionally, unless and until such Contributor\n     explicitly and finally terminates Your grants, and (b) on an ongoing basis,\n     if such Contributor fails to notify You of the non-compliance by some\n     reasonable means prior to 60 days after You have come back into compliance.\n     Moreover, Your grants from a particular Contributor are reinstated on an\n     ongoing basis if such Contributor notifies You of the non-compliance by\n     some reasonable means, this is the first time You have received notice of\n     non-compliance with this License from such Contributor, and You become\n     compliant prior to 30 days after Your receipt of the notice.\n\n5.2. If You initiate litigation against any entity by asserting a patent\n     infringement claim (excluding declaratory judgment actions, counter-claims,\n     and cross-claims) alleging that a Contributor Version directly or\n     indirectly infringes any patent, then the rights granted to You by any and\n     all Contributors for the Covered Software under Section 2.1 of this License\n     shall terminate.\n\n5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user\n     license agreements (excluding distributors and resellers) which have been\n     validly granted by You or Your distributors under this License prior to\n     termination shall survive termination.\n\n6. Disclaimer of Warranty\n\n   Covered Software is provided under this License on an “as is” basis, without\n   warranty of any kind, either expressed, implied, or statutory, including,\n   without limitation, warranties that the Covered Software is free of defects,\n   merchantable, fit for a particular purpose or non-infringing. The entire\n   risk as to the quality and performance of the Covered Software is with You.\n   Should any Covered Software prove defective in any respect, You (not any\n   Contributor) assume the cost of any necessary servicing, repair, or\n   correction. This disclaimer of warranty constitutes an essential part of this\n   License. No use of  any Covered Software is authorized under this License\n   except under this disclaimer.\n\n7. Limitation of Liability\n\n   Under no circumstances and under no legal theory, whether tort (including\n   negligence), contract, or otherwise, shall any Contributor, or anyone who\n   distributes Covered Software as permitted above, be liable to You for any\n   direct, indirect, special, incidental, or consequential damages of any\n   character including, without limitation, damages for lost profits, loss of\n   goodwill, work stoppage, computer failure or malfunction, or any and all\n   other commercial damages or losses, even if such party shall have been\n   informed of the possibility of such damages. This limitation of liability\n   shall not apply to liability for death or personal injury resulting from such\n   party’s negligence to the extent applicable law prohibits such limitation.\n   Some jurisdictions do not allow the exclusion or limitation of incidental or\n   consequential damages, so this exclusion and limitation may not apply to You.\n\n8. Litigation\n\n   Any litigation relating to this License may be brought only in the courts of\n   a jurisdiction where the defendant maintains its principal place of business\n   and such litigation shall be governed by laws of that jurisdiction, without\n   reference to its conflict-of-law provisions. Nothing in this Section shall\n   prevent a party’s ability to bring cross-claims or counter-claims.\n\n9. Miscellaneous\n\n   This License represents the complete agreement concerning the subject matter\n   hereof. If any provision of this License is held to be unenforceable, such\n   provision shall be reformed only to the extent necessary to make it\n   enforceable. Any law or regulation which provides that the language of a\n   contract shall be construed against the drafter shall not be used to construe\n   this License against a Contributor.\n\n\n10. Versions of the License\n\n10.1. New Versions\n\n      Mozilla Foundation is the license steward. Except as provided in Section\n      10.3, no one other than the license steward has the right to modify or\n      publish new versions of this License. Each version will be given a\n      distinguishing version number.\n\n10.2. Effect of New Versions\n\n      You may distribute the Covered Software under the terms of the version of\n      the License under which You originally received the Covered Software, or\n      under the terms of any subsequent version published by the license\n      steward.\n\n10.3. Modified Versions\n\n      If you create software not governed by this License, and you want to\n      create a new license for such software, you may create and use a modified\n      version of this License if you rename the license and remove any\n      references to the name of the license steward (except to note that such\n      modified license differs from this License).\n\n10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses\n      If You choose to distribute Source Code Form that is Incompatible With\n      Secondary Licenses under the terms of this version of the License, the\n      notice described in Exhibit B of this License must be attached.\n\nExhibit A - Source Code Form License Notice\n\n      This Source Code Form is subject to the\n      terms of the Mozilla Public License, v.\n      2.0. If a copy of the MPL was not\n      distributed with this file, You can\n      obtain one at\n      http://mozilla.org/MPL/2.0/.\n\nIf it is not possible or desirable to put the notice in a particular file, then\nYou may include the notice in a location (such as a LICENSE file in a relevant\ndirectory) where a recipient would be likely to look for such a notice.\n\nYou may add additional accurate notices of copyright ownership.\n\nExhibit B - “Incompatible With Secondary Licenses” Notice\n\n      This Source Code Form is “Incompatible\n      With Secondary Licenses”, as defined by\n      the Mozilla Public License, v. 2.0.\n\n"
+  },
   {
     "name": "github.com/hashicorp/go-cleanhttp",
     "path": "github.com/hashicorp/go-cleanhttp/LICENSE",
     "licenseText": "Mozilla Public License, version 2.0\n\n1. Definitions\n\n1.1. \"Contributor\"\n\n     means each individual or legal entity that creates, contributes to the\n     creation of, or owns Covered Software.\n\n1.2. \"Contributor Version\"\n\n     means the combination of the Contributions of others (if any) used by a\n     Contributor and that particular Contributor's Contribution.\n\n1.3. \"Contribution\"\n\n     means Covered Software of a particular Contributor.\n\n1.4. \"Covered Software\"\n\n     means Source Code Form to which the initial Contributor has attached the\n     notice in Exhibit A, the Executable Form of such Source Code Form, and\n     Modifications of such Source Code Form, in each case including portions\n     thereof.\n\n1.5. \"Incompatible With Secondary Licenses\"\n     means\n\n     a. that the initial Contributor has attached the notice described in\n        Exhibit B to the Covered Software; or\n\n     b. that the Covered Software was made available under the terms of\n        version 1.1 or earlier of the License, but not also under the terms of\n        a Secondary License.\n\n1.6. \"Executable Form\"\n\n     means any form of the work other than Source Code Form.\n\n1.7. \"Larger Work\"\n\n     means a work that combines Covered Software with other material, in a\n     separate file or files, that is not Covered Software.\n\n1.8. \"License\"\n\n     means this document.\n\n1.9. \"Licensable\"\n\n     means having the right to grant, to the maximum extent possible, whether\n     at the time of the initial grant or subsequently, any and all of the\n     rights conveyed by this License.\n\n1.10. \"Modifications\"\n\n     means any of the following:\n\n     a. any file in Source Code Form that results from an addition to,\n        deletion from, or modification of the contents of Covered Software; or\n\n     b. any new file in Source Code Form that contains any Covered Software.\n\n1.11. \"Patent Claims\" of a Contributor\n\n      means any patent claim(s), including without limitation, method,\n      process, and apparatus claims, in any patent Licensable by such\n      Contributor that would be infringed, but for the grant of the License,\n      by the making, using, selling, offering for sale, having made, import,\n      or transfer of either its Contributions or its Contributor Version.\n\n1.12. \"Secondary License\"\n\n      means either the GNU General Public License, Version 2.0, the GNU Lesser\n      General Public License, Version 2.1, the GNU Affero General Public\n      License, Version 3.0, or any later versions of those licenses.\n\n1.13. \"Source Code Form\"\n\n      means the form of the work preferred for making modifications.\n\n1.14. \"You\" (or \"Your\")\n\n      means an individual or a legal entity exercising rights under this\n      License. For legal entities, \"You\" includes any entity that controls, is\n      controlled by, or is under common control with You. For purposes of this\n      definition, \"control\" means (a) the power, direct or indirect, to cause\n      the direction or management of such entity, whether by contract or\n      otherwise, or (b) ownership of more than fifty percent (50%) of the\n      outstanding shares or beneficial ownership of such entity.\n\n\n2. License Grants and Conditions\n\n2.1. Grants\n\n     Each Contributor hereby grants You a world-wide, royalty-free,\n     non-exclusive license:\n\n     a. under intellectual property rights (other than patent or trademark)\n        Licensable by such Contributor to use, reproduce, make available,\n        modify, display, perform, distribute, and otherwise exploit its\n        Contributions, either on an unmodified basis, with Modifications, or\n        as part of a Larger Work; and\n\n     b. under Patent Claims of such Contributor to make, use, sell, offer for\n        sale, have made, import, and otherwise transfer either its\n        Contributions or its Contributor Version.\n\n2.2. Effective Date\n\n     The licenses granted in Section 2.1 with respect to any Contribution\n     become effective for each Contribution on the date the Contributor first\n     distributes such Contribution.\n\n2.3. Limitations on Grant Scope\n\n     The licenses granted in this Section 2 are the only rights granted under\n     this License. No additional rights or licenses will be implied from the\n     distribution or licensing of Covered Software under this License.\n     Notwithstanding Section 2.1(b) above, no patent license is granted by a\n     Contributor:\n\n     a. for any code that a Contributor has removed from Covered Software; or\n\n     b. for infringements caused by: (i) Your and any other third party's\n        modifications of Covered Software, or (ii) the combination of its\n        Contributions with other software (except as part of its Contributor\n        Version); or\n\n     c. under Patent Claims infringed by Covered Software in the absence of\n        its Contributions.\n\n     This License does not grant any rights in the trademarks, service marks,\n     or logos of any Contributor (except as may be necessary to comply with\n     the notice requirements in Section 3.4).\n\n2.4. Subsequent Licenses\n\n     No Contributor makes additional grants as a result of Your choice to\n     distribute the Covered Software under a subsequent version of this\n     License (see Section 10.2) or under the terms of a Secondary License (if\n     permitted under the terms of Section 3.3).\n\n2.5. Representation\n\n     Each Contributor represents that the Contributor believes its\n     Contributions are its original creation(s) or it has sufficient rights to\n     grant the rights to its Contributions conveyed by this License.\n\n2.6. Fair Use\n\n     This License is not intended to limit any rights You have under\n     applicable copyright doctrines of fair use, fair dealing, or other\n     equivalents.\n\n2.7. Conditions\n\n     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in\n     Section 2.1.\n\n\n3. Responsibilities\n\n3.1. Distribution of Source Form\n\n     All distribution of Covered Software in Source Code Form, including any\n     Modifications that You create or to which You contribute, must be under\n     the terms of this License. You must inform recipients that the Source\n     Code Form of the Covered Software is governed by the terms of this\n     License, and how they can obtain a copy of this License. You may not\n     attempt to alter or restrict the recipients' rights in the Source Code\n     Form.\n\n3.2. Distribution of Executable Form\n\n     If You distribute Covered Software in Executable Form then:\n\n     a. such Covered Software must also be made available in Source Code Form,\n        as described in Section 3.1, and You must inform recipients of the\n        Executable Form how they can obtain a copy of such Source Code Form by\n        reasonable means in a timely manner, at a charge no more than the cost\n        of distribution to the recipient; and\n\n     b. You may distribute such Executable Form under the terms of this\n        License, or sublicense it under different terms, provided that the\n        license for the Executable Form does not attempt to limit or alter the\n        recipients' rights in the Source Code Form under this License.\n\n3.3. Distribution of a Larger Work\n\n     You may create and distribute a Larger Work under terms of Your choice,\n     provided that You also comply with the requirements of this License for\n     the Covered Software. If the Larger Work is a combination of Covered\n     Software with a work governed by one or more Secondary Licenses, and the\n     Covered Software is not Incompatible With Secondary Licenses, this\n     License permits You to additionally distribute such Covered Software\n     under the terms of such Secondary License(s), so that the recipient of\n     the Larger Work may, at their option, further distribute the Covered\n     Software under the terms of either this License or such Secondary\n     License(s).\n\n3.4. Notices\n\n     You may not remove or alter the substance of any license notices\n     (including copyright notices, patent notices, disclaimers of warranty, or\n     limitations of liability) contained within the Source Code Form of the\n     Covered Software, except that You may alter any license notices to the\n     extent required to remedy known factual inaccuracies.\n\n3.5. Application of Additional Terms\n\n     You may choose to offer, and to charge a fee for, warranty, support,\n     indemnity or liability obligations to one or more recipients of Covered\n     Software. However, You may do so only on Your own behalf, and not on\n     behalf of any Contributor. You must make it absolutely clear that any\n     such warranty, support, indemnity, or liability obligation is offered by\n     You alone, and You hereby agree to indemnify every Contributor for any\n     liability incurred by such Contributor as a result of warranty, support,\n     indemnity or liability terms You offer. You may include additional\n     disclaimers of warranty and limitations of liability specific to any\n     jurisdiction.\n\n4. Inability to Comply Due to Statute or Regulation\n\n   If it is impossible for You to comply with any of the terms of this License\n   with respect to some or all of the Covered Software due to statute,\n   judicial order, or regulation then You must: (a) comply with the terms of\n   this License to the maximum extent possible; and (b) describe the\n   limitations and the code they affect. Such description must be placed in a\n   text file included with all distributions of the Covered Software under\n   this License. Except to the extent prohibited by statute or regulation,\n   such description must be sufficiently detailed for a recipient of ordinary\n   skill to be able to understand it.\n\n5. Termination\n\n5.1. The rights granted under this License will terminate automatically if You\n     fail to comply with any of its terms. However, if You become compliant,\n     then the rights granted under this License from a particular Contributor\n     are reinstated (a) provisionally, unless and until such Contributor\n     explicitly and finally terminates Your grants, and (b) on an ongoing\n     basis, if such Contributor fails to notify You of the non-compliance by\n     some reasonable means prior to 60 days after You have come back into\n     compliance. Moreover, Your grants from a particular Contributor are\n     reinstated on an ongoing basis if such Contributor notifies You of the\n     non-compliance by some reasonable means, this is the first time You have\n     received notice of non-compliance with this License from such\n     Contributor, and You become compliant prior to 30 days after Your receipt\n     of the notice.\n\n5.2. If You initiate litigation against any entity by asserting a patent\n     infringement claim (excluding declaratory judgment actions,\n     counter-claims, and cross-claims) alleging that a Contributor Version\n     directly or indirectly infringes any patent, then the rights granted to\n     You by any and all Contributors for the Covered Software under Section\n     2.1 of this License shall terminate.\n\n5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user\n     license agreements (excluding distributors and resellers) which have been\n     validly granted by You or Your distributors under this License prior to\n     termination shall survive termination.\n\n6. Disclaimer of Warranty\n\n   Covered Software is provided under this License on an \"as is\" basis,\n   without warranty of any kind, either expressed, implied, or statutory,\n   including, without limitation, warranties that the Covered Software is free\n   of defects, merchantable, fit for a particular purpose or non-infringing.\n   The entire risk as to the quality and performance of the Covered Software\n   is with You. Should any Covered Software prove defective in any respect,\n   You (not any Contributor) assume the cost of any necessary servicing,\n   repair, or correction. This disclaimer of warranty constitutes an essential\n   part of this License. No use of  any Covered Software is authorized under\n   this License except under this disclaimer.\n\n7. Limitation of Liability\n\n   Under no circumstances and under no legal theory, whether tort (including\n   negligence), contract, or otherwise, shall any Contributor, or anyone who\n   distributes Covered Software as permitted above, be liable to You for any\n   direct, indirect, special, incidental, or consequential damages of any\n   character including, without limitation, damages for lost profits, loss of\n   goodwill, work stoppage, computer failure or malfunction, or any and all\n   other commercial damages or losses, even if such party shall have been\n   informed of the possibility of such damages. This limitation of liability\n   shall not apply to liability for death or personal injury resulting from\n   such party's negligence to the extent applicable law prohibits such\n   limitation. Some jurisdictions do not allow the exclusion or limitation of\n   incidental or consequential damages, so this exclusion and limitation may\n   not apply to You.\n\n8. Litigation\n\n   Any litigation relating to this License may be brought only in the courts\n   of a jurisdiction where the defendant maintains its principal place of\n   business and such litigation shall be governed by laws of that\n   jurisdiction, without reference to its conflict-of-law provisions. Nothing\n   in this Section shall prevent a party's ability to bring cross-claims or\n   counter-claims.\n\n9. Miscellaneous\n\n   This License represents the complete agreement concerning the subject\n   matter hereof. If any provision of this License is held to be\n   unenforceable, such provision shall be reformed only to the extent\n   necessary to make it enforceable. Any law or regulation which provides that\n   the language of a contract shall be construed against the drafter shall not\n   be used to construe this License against a Contributor.\n\n\n10. Versions of the License\n\n10.1. New Versions\n\n      Mozilla Foundation is the license steward. Except as provided in Section\n      10.3, no one other than the license steward has the right to modify or\n      publish new versions of this License. Each version will be given a\n      distinguishing version number.\n\n10.2. Effect of New Versions\n\n      You may distribute the Covered Software under the terms of the version\n      of the License under which You originally received the Covered Software,\n      or under the terms of any subsequent version published by the license\n      steward.\n\n10.3. Modified Versions\n\n      If you create software not governed by this License, and you want to\n      create a new license for such software, you may create and use a\n      modified version of this License if you rename the license and remove\n      any references to the name of the license steward (except to note that\n      such modified license differs from this License).\n\n10.4. Distributing Source Code Form that is Incompatible With Secondary\n      Licenses If You choose to distribute Source Code Form that is\n      Incompatible With Secondary Licenses under the terms of this version of\n      the License, the notice described in Exhibit B of this License must be\n      attached.\n\nExhibit A - Source Code Form License Notice\n\n      This Source Code Form is subject to the\n      terms of the Mozilla Public License, v.\n      2.0. If a copy of the MPL was not\n      distributed with this file, You can\n      obtain one at\n      http://mozilla.org/MPL/2.0/.\n\nIf it is not possible or desirable to put the notice in a particular file,\nthen You may include the notice in a location (such as a LICENSE file in a\nrelevant directory) where a recipient would be likely to look for such a\nnotice.\n\nYou may add additional accurate notices of copyright ownership.\n\nExhibit B - \"Incompatible With Secondary Licenses\" Notice\n\n      This Source Code Form is \"Incompatible\n      With Secondary Licenses\", as defined by\n      the Mozilla Public License, v. 2.0.\n\n"
   },
+  {
+    "name": "github.com/hashicorp/go-multierror",
+    "path": "github.com/hashicorp/go-multierror/LICENSE",
+    "licenseText": "Mozilla Public License, version 2.0\n\n1. Definitions\n\n1.1. “Contributor”\n\n     means each individual or legal entity that creates, contributes to the\n     creation of, or owns Covered Software.\n\n1.2. “Contributor Version”\n\n     means the combination of the Contributions of others (if any) used by a\n     Contributor and that particular Contributor’s Contribution.\n\n1.3. “Contribution”\n\n     means Covered Software of a particular Contributor.\n\n1.4. “Covered Software”\n\n     means Source Code Form to which the initial Contributor has attached the\n     notice in Exhibit A, the Executable Form of such Source Code Form, and\n     Modifications of such Source Code Form, in each case including portions\n     thereof.\n\n1.5. “Incompatible With Secondary Licenses”\n     means\n\n     a. that the initial Contributor has attached the notice described in\n        Exhibit B to the Covered Software; or\n\n     b. that the Covered Software was made available under the terms of version\n        1.1 or earlier of the License, but not also under the terms of a\n        Secondary License.\n\n1.6. “Executable Form”\n\n     means any form of the work other than Source Code Form.\n\n1.7. “Larger Work”\n\n     means a work that combines Covered Software with other material, in a separate\n     file or files, that is not Covered Software.\n\n1.8. “License”\n\n     means this document.\n\n1.9. “Licensable”\n\n     means having the right to grant, to the maximum extent possible, whether at the\n     time of the initial grant or subsequently, any and all of the rights conveyed by\n     this License.\n\n1.10. “Modifications”\n\n     means any of the following:\n\n     a. any file in Source Code Form that results from an addition to, deletion\n        from, or modification of the contents of Covered Software; or\n\n     b. any new file in Source Code Form that contains any Covered Software.\n\n1.11. “Patent Claims” of a Contributor\n\n      means any patent claim(s), including without limitation, method, process,\n      and apparatus claims, in any patent Licensable by such Contributor that\n      would be infringed, but for the grant of the License, by the making,\n      using, selling, offering for sale, having made, import, or transfer of\n      either its Contributions or its Contributor Version.\n\n1.12. “Secondary License”\n\n      means either the GNU General Public License, Version 2.0, the GNU Lesser\n      General Public License, Version 2.1, the GNU Affero General Public\n      License, Version 3.0, or any later versions of those licenses.\n\n1.13. “Source Code Form”\n\n      means the form of the work preferred for making modifications.\n\n1.14. “You” (or “Your”)\n\n      means an individual or a legal entity exercising rights under this\n      License. For legal entities, “You” includes any entity that controls, is\n      controlled by, or is under common control with You. For purposes of this\n      definition, “control” means (a) the power, direct or indirect, to cause\n      the direction or management of such entity, whether by contract or\n      otherwise, or (b) ownership of more than fifty percent (50%) of the\n      outstanding shares or beneficial ownership of such entity.\n\n\n2. License Grants and Conditions\n\n2.1. Grants\n\n     Each Contributor hereby grants You a world-wide, royalty-free,\n     non-exclusive license:\n\n     a. under intellectual property rights (other than patent or trademark)\n        Licensable by such Contributor to use, reproduce, make available,\n        modify, display, perform, distribute, and otherwise exploit its\n        Contributions, either on an unmodified basis, with Modifications, or as\n        part of a Larger Work; and\n\n     b. under Patent Claims of such Contributor to make, use, sell, offer for\n        sale, have made, import, and otherwise transfer either its Contributions\n        or its Contributor Version.\n\n2.2. Effective Date\n\n     The licenses granted in Section 2.1 with respect to any Contribution become\n     effective for each Contribution on the date the Contributor first distributes\n     such Contribution.\n\n2.3. Limitations on Grant Scope\n\n     The licenses granted in this Section 2 are the only rights granted under this\n     License. No additional rights or licenses will be implied from the distribution\n     or licensing of Covered Software under this License. Notwithstanding Section\n     2.1(b) above, no patent license is granted by a Contributor:\n\n     a. for any code that a Contributor has removed from Covered Software; or\n\n     b. for infringements caused by: (i) Your and any other third party’s\n        modifications of Covered Software, or (ii) the combination of its\n        Contributions with other software (except as part of its Contributor\n        Version); or\n\n     c. under Patent Claims infringed by Covered Software in the absence of its\n        Contributions.\n\n     This License does not grant any rights in the trademarks, service marks, or\n     logos of any Contributor (except as may be necessary to comply with the\n     notice requirements in Section 3.4).\n\n2.4. Subsequent Licenses\n\n     No Contributor makes additional grants as a result of Your choice to\n     distribute the Covered Software under a subsequent version of this License\n     (see Section 10.2) or under the terms of a Secondary License (if permitted\n     under the terms of Section 3.3).\n\n2.5. Representation\n\n     Each Contributor represents that the Contributor believes its Contributions\n     are its original creation(s) or it has sufficient rights to grant the\n     rights to its Contributions conveyed by this License.\n\n2.6. Fair Use\n\n     This License is not intended to limit any rights You have under applicable\n     copyright doctrines of fair use, fair dealing, or other equivalents.\n\n2.7. Conditions\n\n     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in\n     Section 2.1.\n\n\n3. Responsibilities\n\n3.1. Distribution of Source Form\n\n     All distribution of Covered Software in Source Code Form, including any\n     Modifications that You create or to which You contribute, must be under the\n     terms of this License. You must inform recipients that the Source Code Form\n     of the Covered Software is governed by the terms of this License, and how\n     they can obtain a copy of this License. You may not attempt to alter or\n     restrict the recipients’ rights in the Source Code Form.\n\n3.2. Distribution of Executable Form\n\n     If You distribute Covered Software in Executable Form then:\n\n     a. such Covered Software must also be made available in Source Code Form,\n        as described in Section 3.1, and You must inform recipients of the\n        Executable Form how they can obtain a copy of such Source Code Form by\n        reasonable means in a timely manner, at a charge no more than the cost\n        of distribution to the recipient; and\n\n     b. You may distribute such Executable Form under the terms of this License,\n        or sublicense it under different terms, provided that the license for\n        the Executable Form does not attempt to limit or alter the recipients’\n        rights in the Source Code Form under this License.\n\n3.3. Distribution of a Larger Work\n\n     You may create and distribute a Larger Work under terms of Your choice,\n     provided that You also comply with the requirements of this License for the\n     Covered Software. If the Larger Work is a combination of Covered Software\n     with a work governed by one or more Secondary Licenses, and the Covered\n     Software is not Incompatible With Secondary Licenses, this License permits\n     You to additionally distribute such Covered Software under the terms of\n     such Secondary License(s), so that the recipient of the Larger Work may, at\n     their option, further distribute the Covered Software under the terms of\n     either this License or such Secondary License(s).\n\n3.4. Notices\n\n     You may not remove or alter the substance of any license notices (including\n     copyright notices, patent notices, disclaimers of warranty, or limitations\n     of liability) contained within the Source Code Form of the Covered\n     Software, except that You may alter any license notices to the extent\n     required to remedy known factual inaccuracies.\n\n3.5. Application of Additional Terms\n\n     You may choose to offer, and to charge a fee for, warranty, support,\n     indemnity or liability obligations to one or more recipients of Covered\n     Software. However, You may do so only on Your own behalf, and not on behalf\n     of any Contributor. You must make it absolutely clear that any such\n     warranty, support, indemnity, or liability obligation is offered by You\n     alone, and You hereby agree to indemnify every Contributor for any\n     liability incurred by such Contributor as a result of warranty, support,\n     indemnity or liability terms You offer. You may include additional\n     disclaimers of warranty and limitations of liability specific to any\n     jurisdiction.\n\n4. Inability to Comply Due to Statute or Regulation\n\n   If it is impossible for You to comply with any of the terms of this License\n   with respect to some or all of the Covered Software due to statute, judicial\n   order, or regulation then You must: (a) comply with the terms of this License\n   to the maximum extent possible; and (b) describe the limitations and the code\n   they affect. Such description must be placed in a text file included with all\n   distributions of the Covered Software under this License. Except to the\n   extent prohibited by statute or regulation, such description must be\n   sufficiently detailed for a recipient of ordinary skill to be able to\n   understand it.\n\n5. Termination\n\n5.1. The rights granted under this License will terminate automatically if You\n     fail to comply with any of its terms. However, if You become compliant,\n     then the rights granted under this License from a particular Contributor\n     are reinstated (a) provisionally, unless and until such Contributor\n     explicitly and finally terminates Your grants, and (b) on an ongoing basis,\n     if such Contributor fails to notify You of the non-compliance by some\n     reasonable means prior to 60 days after You have come back into compliance.\n     Moreover, Your grants from a particular Contributor are reinstated on an\n     ongoing basis if such Contributor notifies You of the non-compliance by\n     some reasonable means, this is the first time You have received notice of\n     non-compliance with this License from such Contributor, and You become\n     compliant prior to 30 days after Your receipt of the notice.\n\n5.2. If You initiate litigation against any entity by asserting a patent\n     infringement claim (excluding declaratory judgment actions, counter-claims,\n     and cross-claims) alleging that a Contributor Version directly or\n     indirectly infringes any patent, then the rights granted to You by any and\n     all Contributors for the Covered Software under Section 2.1 of this License\n     shall terminate.\n\n5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user\n     license agreements (excluding distributors and resellers) which have been\n     validly granted by You or Your distributors under this License prior to\n     termination shall survive termination.\n\n6. Disclaimer of Warranty\n\n   Covered Software is provided under this License on an “as is” basis, without\n   warranty of any kind, either expressed, implied, or statutory, including,\n   without limitation, warranties that the Covered Software is free of defects,\n   merchantable, fit for a particular purpose or non-infringing. The entire\n   risk as to the quality and performance of the Covered Software is with You.\n   Should any Covered Software prove defective in any respect, You (not any\n   Contributor) assume the cost of any necessary servicing, repair, or\n   correction. This disclaimer of warranty constitutes an essential part of this\n   License. No use of  any Covered Software is authorized under this License\n   except under this disclaimer.\n\n7. Limitation of Liability\n\n   Under no circumstances and under no legal theory, whether tort (including\n   negligence), contract, or otherwise, shall any Contributor, or anyone who\n   distributes Covered Software as permitted above, be liable to You for any\n   direct, indirect, special, incidental, or consequential damages of any\n   character including, without limitation, damages for lost profits, loss of\n   goodwill, work stoppage, computer failure or malfunction, or any and all\n   other commercial damages or losses, even if such party shall have been\n   informed of the possibility of such damages. This limitation of liability\n   shall not apply to liability for death or personal injury resulting from such\n   party’s negligence to the extent applicable law prohibits such limitation.\n   Some jurisdictions do not allow the exclusion or limitation of incidental or\n   consequential damages, so this exclusion and limitation may not apply to You.\n\n8. Litigation\n\n   Any litigation relating to this License may be brought only in the courts of\n   a jurisdiction where the defendant maintains its principal place of business\n   and such litigation shall be governed by laws of that jurisdiction, without\n   reference to its conflict-of-law provisions. Nothing in this Section shall\n   prevent a party’s ability to bring cross-claims or counter-claims.\n\n9. Miscellaneous\n\n   This License represents the complete agreement concerning the subject matter\n   hereof. If any provision of this License is held to be unenforceable, such\n   provision shall be reformed only to the extent necessary to make it\n   enforceable. Any law or regulation which provides that the language of a\n   contract shall be construed against the drafter shall not be used to construe\n   this License against a Contributor.\n\n\n10. Versions of the License\n\n10.1. New Versions\n\n      Mozilla Foundation is the license steward. Except as provided in Section\n      10.3, no one other than the license steward has the right to modify or\n      publish new versions of this License. Each version will be given a\n      distinguishing version number.\n\n10.2. Effect of New Versions\n\n      You may distribute the Covered Software under the terms of the version of\n      the License under which You originally received the Covered Software, or\n      under the terms of any subsequent version published by the license\n      steward.\n\n10.3. Modified Versions\n\n      If you create software not governed by this License, and you want to\n      create a new license for such software, you may create and use a modified\n      version of this License if you rename the license and remove any\n      references to the name of the license steward (except to note that such\n      modified license differs from this License).\n\n10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses\n      If You choose to distribute Source Code Form that is Incompatible With\n      Secondary Licenses under the terms of this version of the License, the\n      notice described in Exhibit B of this License must be attached.\n\nExhibit A - Source Code Form License Notice\n\n      This Source Code Form is subject to the\n      terms of the Mozilla Public License, v.\n      2.0. If a copy of the MPL was not\n      distributed with this file, You can\n      obtain one at\n      http://mozilla.org/MPL/2.0/.\n\nIf it is not possible or desirable to put the notice in a particular file, then\nYou may include the notice in a location (such as a LICENSE file in a relevant\ndirectory) where a recipient would be likely to look for such a notice.\n\nYou may add additional accurate notices of copyright ownership.\n\nExhibit B - “Incompatible With Secondary Licenses” Notice\n\n      This Source Code Form is “Incompatible\n      With Secondary Licenses”, as defined by\n      the Mozilla Public License, v. 2.0.\n"
+  },
   {
     "name": "github.com/hashicorp/go-retryablehttp",
     "path": "github.com/hashicorp/go-retryablehttp/LICENSE",
@@ -605,8 +635,8 @@
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Huan Du\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n"
   },
   {
-    "name": "github.com/jaytaylor/html2text",
-    "path": "github.com/jaytaylor/html2text/LICENSE",
+    "name": "github.com/inbucket/html2text",
+    "path": "github.com/inbucket/html2text/LICENSE",
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Jay Taylor\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n"
   },
   {
@@ -714,6 +744,11 @@
     "path": "github.com/mattn/go-runewidth/LICENSE",
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2016 Yasuhiro Matsumoto\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
+  {
+    "name": "github.com/mattn/go-shellwords",
+    "path": "github.com/mattn/go-shellwords/LICENSE",
+    "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2017 Yasuhiro Matsumoto\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+  },
   {
     "name": "github.com/meilisearch/meilisearch-go",
     "path": "github.com/meilisearch/meilisearch-go/LICENSE",
@@ -725,8 +760,8 @@
     "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
   {
-    "name": "github.com/mholt/archiver/v3",
-    "path": "github.com/mholt/archiver/v3/LICENSE",
+    "name": "github.com/mholt/archives",
+    "path": "github.com/mholt/archives/LICENSE",
     "licenseText": "MIT License\n\nCopyright (c) 2016 Matthew Holt\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE."
   },
   {
@@ -739,6 +774,11 @@
     "path": "github.com/miekg/dns/LICENSE",
     "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2009, The Go Authors. Extensions copyright (c) 2011, Miek Gieben. \nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n1. Redistributions of source code must retain the above copyright notice, this\n   list of conditions and the following disclaimer.\n\n2. Redistributions in binary form must reproduce the above copyright notice,\n   this list of conditions and the following disclaimer in the documentation\n   and/or other materials provided with the distribution.\n\n3. Neither the name of the copyright holder nor the names of its\n   contributors may be used to endorse or promote products derived from\n   this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
+  {
+    "name": "github.com/mikelolasagasti/xz",
+    "path": "github.com/mikelolasagasti/xz/LICENSE",
+    "licenseText": "Copyright (C) 2015-2017 Michael Cross \u003chttps://github.com/xi2\u003e\n\nPermission to use, copy, modify, and/or distribute this software for any\npurpose with or without fee is hereby granted.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\nREGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\nAND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\nINDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\nLOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\nOTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\nPERFORMANCE OF THIS SOFTWARE.\n"
+  },
   {
     "name": "github.com/minio/crc64nvme",
     "path": "github.com/minio/crc64nvme/LICENSE",
@@ -754,6 +794,11 @@
     "path": "github.com/minio/minio-go/v7/LICENSE",
     "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
+  {
+    "name": "github.com/minio/minlz",
+    "path": "github.com/minio/minlz/LICENSE",
+    "licenseText": "\r\n                                 Apache License\r\n                           Version 2.0, January 2004\r\n                        http://www.apache.org/licenses/\r\n\r\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r\n\r\n   1. Definitions.\r\n\r\n      \"License\" shall mean the terms and conditions for use, reproduction,\r\n      and distribution as defined by Sections 1 through 9 of this document.\r\n\r\n      \"Licensor\" shall mean the copyright owner or entity authorized by\r\n      the copyright owner that is granting the License.\r\n\r\n      \"Legal Entity\" shall mean the union of the acting entity and all\r\n      other entities that control, are controlled by, or are under common\r\n      control with that entity. For the purposes of this definition,\r\n      \"control\" means (i) the power, direct or indirect, to cause the\r\n      direction or management of such entity, whether by contract or\r\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r\n      outstanding shares, or (iii) beneficial ownership of such entity.\r\n\r\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\r\n      exercising permissions granted by this License.\r\n\r\n      \"Source\" form shall mean the preferred form for making modifications,\r\n      including but not limited to software source code, documentation\r\n      source, and configuration files.\r\n\r\n      \"Object\" form shall mean any form resulting from mechanical\r\n      transformation or translation of a Source form, including but\r\n      not limited to compiled object code, generated documentation,\r\n      and conversions to other media types.\r\n\r\n      \"Work\" shall mean the work of authorship, whether in Source or\r\n      Object form, made available under the License, as indicated by a\r\n      copyright notice that is included in or attached to the work\r\n      (an example is provided in the Appendix below).\r\n\r\n      \"Derivative Works\" shall mean any work, whether in Source or Object\r\n      form, that is based on (or derived from) the Work and for which the\r\n      editorial revisions, annotations, elaborations, or other modifications\r\n      represent, as a whole, an original work of authorship. For the purposes\r\n      of this License, Derivative Works shall not include works that remain\r\n      separable from, or merely link (or bind by name) to the interfaces of,\r\n      the Work and Derivative Works thereof.\r\n\r\n      \"Contribution\" shall mean any work of authorship, including\r\n      the original version of the Work and any modifications or additions\r\n      to that Work or Derivative Works thereof, that is intentionally\r\n      submitted to Licensor for inclusion in the Work by the copyright owner\r\n      or by an individual or Legal Entity authorized to submit on behalf of\r\n      the copyright owner. For the purposes of this definition, \"submitted\"\r\n      means any form of electronic, verbal, or written communication sent\r\n      to the Licensor or its representatives, including but not limited to\r\n      communication on electronic mailing lists, source code control systems,\r\n      and issue tracking systems that are managed by, or on behalf of, the\r\n      Licensor for the purpose of discussing and improving the Work, but\r\n      excluding communication that is conspicuously marked or otherwise\r\n      designated in writing by the copyright owner as \"Not a Contribution.\"\r\n\r\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\r\n      on behalf of whom a Contribution has been received by Licensor and\r\n      subsequently incorporated within the Work.\r\n\r\n   2. Grant of Copyright License. Subject to the terms and conditions of\r\n      this License, each Contributor hereby grants to You a perpetual,\r\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r\n      copyright license to reproduce, prepare Derivative Works of,\r\n      publicly display, publicly perform, sublicense, and distribute the\r\n      Work and such Derivative Works in Source or Object form.\r\n\r\n   3. Grant of Patent License. Subject to the terms and conditions of\r\n      this License, each Contributor hereby grants to You a perpetual,\r\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r\n      (except as stated in this section) patent license to make, have made,\r\n      use, offer to sell, sell, import, and otherwise transfer the Work,\r\n      where such license applies only to those patent claims licensable\r\n      by such Contributor that are necessarily infringed by their\r\n      Contribution(s) alone or by combination of their Contribution(s)\r\n      with the Work to which such Contribution(s) was submitted. If You\r\n      institute patent litigation against any entity (including a\r\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\r\n      or a Contribution incorporated within the Work constitutes direct\r\n      or contributory patent infringement, then any patent licenses\r\n      granted to You under this License for that Work shall terminate\r\n      as of the date such litigation is filed.\r\n\r\n   4. Redistribution. You may reproduce and distribute copies of the\r\n      Work or Derivative Works thereof in any medium, with or without\r\n      modifications, and in Source or Object form, provided that You\r\n      meet the following conditions:\r\n\r\n      (a) You must give any other recipients of the Work or\r\n          Derivative Works a copy of this License; and\r\n\r\n      (b) You must cause any modified files to carry prominent notices\r\n          stating that You changed the files; and\r\n\r\n      (c) You must retain, in the Source form of any Derivative Works\r\n          that You distribute, all copyright, patent, trademark, and\r\n          attribution notices from the Source form of the Work,\r\n          excluding those notices that do not pertain to any part of\r\n          the Derivative Works; and\r\n\r\n      (d) If the Work includes a \"NOTICE\" text file as part of its\r\n          distribution, then any Derivative Works that You distribute must\r\n          include a readable copy of the attribution notices contained\r\n          within such NOTICE file, excluding those notices that do not\r\n          pertain to any part of the Derivative Works, in at least one\r\n          of the following places: within a NOTICE text file distributed\r\n          as part of the Derivative Works; within the Source form or\r\n          documentation, if provided along with the Derivative Works; or,\r\n          within a display generated by the Derivative Works, if and\r\n          wherever such third-party notices normally appear. The contents\r\n          of the NOTICE file are for informational purposes only and\r\n          do not modify the License. You may add Your own attribution\r\n          notices within Derivative Works that You distribute, alongside\r\n          or as an addendum to the NOTICE text from the Work, provided\r\n          that such additional attribution notices cannot be construed\r\n          as modifying the License.\r\n\r\n      You may add Your own copyright statement to Your modifications and\r\n      may provide additional or different license terms and conditions\r\n      for use, reproduction, or distribution of Your modifications, or\r\n      for any such Derivative Works as a whole, provided Your use,\r\n      reproduction, and distribution of the Work otherwise complies with\r\n      the conditions stated in this License.\r\n\r\n   5. Submission of Contributions. Unless You explicitly state otherwise,\r\n      any Contribution intentionally submitted for inclusion in the Work\r\n      by You to the Licensor shall be under the terms and conditions of\r\n      this License, without any additional terms or conditions.\r\n      Notwithstanding the above, nothing herein shall supersede or modify\r\n      the terms of any separate license agreement you may have executed\r\n      with Licensor regarding such Contributions.\r\n\r\n   6. Trademarks. This License does not grant permission to use the trade\r\n      names, trademarks, service marks, or product names of the Licensor,\r\n      except as required for reasonable and customary use in describing the\r\n      origin of the Work and reproducing the content of the NOTICE file.\r\n\r\n   7. Disclaimer of Warranty. Unless required by applicable law or\r\n      agreed to in writing, Licensor provides the Work (and each\r\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\r\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r\n      implied, including, without limitation, any warranties or conditions\r\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r\n      PARTICULAR PURPOSE. You are solely responsible for determining the\r\n      appropriateness of using or redistributing the Work and assume any\r\n      risks associated with Your exercise of permissions under this License.\r\n\r\n   8. Limitation of Liability. In no event and under no legal theory,\r\n      whether in tort (including negligence), contract, or otherwise,\r\n      unless required by applicable law (such as deliberate and grossly\r\n      negligent acts) or agreed to in writing, shall any Contributor be\r\n      liable to You for damages, including any direct, indirect, special,\r\n      incidental, or consequential damages of any character arising as a\r\n      result of this License or out of the use or inability to use the\r\n      Work (including but not limited to damages for loss of goodwill,\r\n      work stoppage, computer failure or malfunction, or any and all\r\n      other commercial damages or losses), even if such Contributor\r\n      has been advised of the possibility of such damages.\r\n\r\n   9. Accepting Warranty or Additional Liability. While redistributing\r\n      the Work or Derivative Works thereof, You may choose to offer,\r\n      and charge a fee for, acceptance of support, warranty, indemnity,\r\n      or other liability obligations and/or rights consistent with this\r\n      License. However, in accepting such obligations, You may act only\r\n      on Your own behalf and on Your sole responsibility, not on behalf\r\n      of any other Contributor, and only if You agree to indemnify,\r\n      defend, and hold each Contributor harmless for any liability\r\n      incurred by, or claims asserted against, such Contributor by reason\r\n      of your accepting any such warranty or additional liability.\r\n\r\nEND OF TERMS AND CONDITIONS"
+  },
   {
     "name": "github.com/mitchellh/mapstructure",
     "path": "github.com/mitchellh/mapstructure/LICENSE",
@@ -774,21 +819,26 @@
     "path": "github.com/munnerz/goautoneg/LICENSE",
     "licenseText": "Copyright (c) 2011, Open Knowledge Foundation Ltd.\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n    Redistributions of source code must retain the above copyright\n    notice, this list of conditions and the following disclaimer.\n\n    Redistributions in binary form must reproduce the above copyright\n    notice, this list of conditions and the following disclaimer in\n    the documentation and/or other materials provided with the\n    distribution.\n\n    Neither the name of the Open Knowledge Foundation Ltd. nor the\n    names of its contributors may be used to endorse or promote\n    products derived from this software without specific prior written\n    permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nHOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
-  {
-    "name": "github.com/nektos/act/pkg",
-    "path": "github.com/nektos/act/pkg/LICENSE",
-    "licenseText": "MIT License\n\nCopyright (c) 2022 The Gitea Authors\nCopyright (c) 2019\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
-  },
   {
     "name": "github.com/niklasfasching/go-org/org",
     "path": "github.com/niklasfasching/go-org/org/LICENSE",
     "licenseText": "MIT License\n\nCopyright (c) 2018 Niklas Fasching\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
   {
-    "name": "github.com/nwaples/rardecode",
-    "path": "github.com/nwaples/rardecode/LICENSE",
+    "name": "github.com/nwaples/rardecode/v2",
+    "path": "github.com/nwaples/rardecode/v2/LICENSE",
     "licenseText": "Copyright (c) 2015, Nicholas Waples\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
+  {
+    "name": "github.com/olekukonko/errors",
+    "path": "github.com/olekukonko/errors/LICENSE",
+    "licenseText": "MIT License\n\nCopyright (c) 2025 Oleku Konko\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+  },
+  {
+    "name": "github.com/olekukonko/ll",
+    "path": "github.com/olekukonko/ll/LICENSE",
+    "licenseText": "MIT License\n\nCopyright (c) 2025 Oleku Konko\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+  },
   {
     "name": "github.com/olekukonko/tablewriter",
     "path": "github.com/olekukonko/tablewriter/LICENSE.md",
@@ -814,6 +864,11 @@
     "path": "github.com/opencontainers/image-spec/specs-go/LICENSE",
     "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   Copyright 2016 The Linux Foundation.\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
+  {
+    "name": "github.com/philhofer/fwd",
+    "path": "github.com/philhofer/fwd/LICENSE.md",
+    "licenseText": "Copyright (c) 2014-2015, Philip Hofer\n\nPermission 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:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE 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."
+  },
   {
     "name": "github.com/pierrec/lz4/v4",
     "path": "github.com/pierrec/lz4/v4/LICENSE",
@@ -889,21 +944,11 @@
     "path": "github.com/rs/xid/LICENSE",
     "licenseText": "Copyright (c) 2015 Olivier Poitrey \u003crs@dailymotion.com\u003e\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is furnished\nto do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
   },
-  {
-    "name": "github.com/russross/blackfriday/v2",
-    "path": "github.com/russross/blackfriday/v2/LICENSE.txt",
-    "licenseText": "Blackfriday is distributed under the Simplified BSD License:\n\n\u003e Copyright © 2011 Russ Ross\n\u003e All rights reserved.\n\u003e\n\u003e Redistribution and use in source and binary forms, with or without\n\u003e modification, are permitted provided that the following conditions\n\u003e are met:\n\u003e\n\u003e 1.  Redistributions of source code must retain the above copyright\n\u003e     notice, this list of conditions and the following disclaimer.\n\u003e\n\u003e 2.  Redistributions in binary form must reproduce the above\n\u003e     copyright notice, this list of conditions and the following\n\u003e     disclaimer in the documentation and/or other materials provided with\n\u003e     the distribution.\n\u003e\n\u003e THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\u003e \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\u003e LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS\n\u003e FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n\u003e COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n\u003e INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,\n\u003e BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n\u003e LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\n\u003e CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n\u003e LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN\n\u003e ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n\u003e POSSIBILITY OF SUCH DAMAGE.\n"
-  },
   {
     "name": "github.com/santhosh-tekuri/jsonschema/v6",
     "path": "github.com/santhosh-tekuri/jsonschema/v6/LICENSE",
     "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability."
   },
-  {
-    "name": "github.com/sassoftware/go-rpmutils",
-    "path": "github.com/sassoftware/go-rpmutils/LICENSE",
-    "licenseText": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
-  },
   {
     "name": "github.com/sergi/go-diff/diffmatchpatch",
     "path": "github.com/sergi/go-diff/diffmatchpatch/LICENSE",
@@ -919,6 +964,11 @@
     "path": "github.com/skeema/knownhosts/LICENSE",
     "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"{}\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright {yyyy} {name of copyright owner}\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
+  {
+    "name": "github.com/sorairolake/lzip-go",
+    "path": "github.com/sorairolake/lzip-go/LICENSE",
+    "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n\n---\n\nMIT License\n\nCopyright (c) 2024 Shun Sakai\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+  },
   {
     "name": "github.com/ssor/bom",
     "path": "github.com/ssor/bom/LICENSE",
@@ -934,15 +984,20 @@
     "path": "github.com/syndtr/goleveldb/leveldb/LICENSE",
     "licenseText": "Copyright 2012 Suryandaru Triandana \u003csyndtr@gmail.com\u003e\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n    * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n    * Redistributions in binary form must reproduce the above copyright\nnotice, this list of conditions and the following disclaimer in the\ndocumentation and/or other materials provided with the distribution.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nHOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
+  {
+    "name": "github.com/tinylib/msgp/msgp",
+    "path": "github.com/tinylib/msgp/msgp/LICENSE",
+    "licenseText": "Copyright (c) 2014 Philip Hofer\nPortions Copyright (c) 2009 The Go Authors (license at http://golang.org) where indicated\n\nPermission 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:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE 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."
+  },
   {
     "name": "github.com/ulikunitz/xz",
     "path": "github.com/ulikunitz/xz/LICENSE",
     "licenseText": "Copyright (c) 2014-2022  Ulrich Kunitz\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* My name, Ulrich Kunitz, may not be used to endorse or promote products\n  derived from this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   },
   {
-    "name": "github.com/urfave/cli/v2",
-    "path": "github.com/urfave/cli/v2/LICENSE",
-    "licenseText": "MIT License\n\nCopyright (c) 2022 urfave/cli maintainers\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+    "name": "github.com/urfave/cli/v3",
+    "path": "github.com/urfave/cli/v3/LICENSE",
+    "licenseText": "MIT License\n\nCopyright (c) 2023 urfave/cli maintainers\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
   {
     "name": "github.com/valyala/fastjson",
@@ -959,11 +1014,6 @@
     "path": "github.com/xanzy/ssh-agent/LICENSE",
     "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"{}\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright {yyyy} {name of copyright owner}\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n\n"
   },
-  {
-    "name": "github.com/xrash/smetrics",
-    "path": "github.com/xrash/smetrics/LICENSE",
-    "licenseText": "Copyright (C) 2016 Felipe da Cunha Gonçalves\nAll Rights Reserved.\n\nMIT LICENSE\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
-  },
   {
     "name": "github.com/yohcop/openid-go",
     "path": "github.com/yohcop/openid-go/LICENSE",
@@ -1014,6 +1064,11 @@
     "path": "go.uber.org/zap/exp/zapslog/LICENSE",
     "licenseText": "Copyright (c) 2016-2024 Uber Technologies, Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
   },
+  {
+    "name": "go4.org",
+    "path": "go4.org/LICENSE",
+    "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"{}\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright {yyyy} {name of copyright owner}\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n\n"
+  },
   {
     "name": "golang.org/x/crypto",
     "path": "golang.org/x/crypto/LICENSE",
diff --git a/build.go b/build.go
deleted file mode 100644
index d410e171c7..0000000000
--- a/build.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-//go:build vendor
-
-package main
-
-// Libraries that are included to vendor utilities used during build.
-// These libraries will not be included in a normal compilation.
-
-import (
-	// for embed
-	_ "github.com/shurcooL/vfsgen"
-)
diff --git a/build/generate-bindata.go b/build/generate-bindata.go
index 2fcb7c2f2a..67d3776847 100644
--- a/build/generate-bindata.go
+++ b/build/generate-bindata.go
@@ -1,5 +1,6 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 //go:build ignore
 
@@ -7,30 +8,40 @@ package main
 
 import (
 	"bytes"
-	"crypto/sha1"
+	"crypto/sha256"
 	"fmt"
+	"io"
+	"io/fs"
 	"log"
-	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strconv"
+	"text/template"
 
-	"github.com/shurcooL/vfsgen"
+	"github.com/klauspost/compress/zstd"
 )
 
-func needsUpdate(dir, filename string) (bool, []byte) {
-	needRegen := false
+func fileExists(filename string) bool {
 	_, err := os.Stat(filename)
-	if err != nil {
-		needRegen = true
+	if err == nil {
+		return true
 	}
+	if os.IsNotExist(err) {
+		return false
+	}
+	panic(err)
+}
+
+func needsUpdate(dir, filename string) (bool, []byte) {
+	needRegen := !fileExists(filename)
 
 	oldHash, err := os.ReadFile(filename + ".hash")
 	if err != nil {
 		oldHash = []byte{}
 	}
 
-	hasher := sha1.New()
+	hasher := sha256.New()
 
 	err = filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
 		if err != nil {
@@ -51,7 +62,7 @@ func needsUpdate(dir, filename string) (bool, []byte) {
 
 	newHash := hasher.Sum([]byte{})
 
-	if bytes.Compare(oldHash, newHash) != 0 {
+	if !bytes.Equal(oldHash, newHash) {
 		return true, newHash
 	}
 
@@ -69,24 +80,280 @@ func main() {
 		useGlobalModTime, _ = strconv.ParseBool(os.Args[4])
 	}
 
-	update, newHash := needsUpdate(dir, filename)
+	if os.Getenv("FORGEJO_GENERATE_SKIP_HASH") == "true" && fileExists(filename) {
+		fmt.Printf("bindata %s already exists and FORGEJO_GENERATE_SKIP_HASH=true\n", packageName)
+		return
+	}
 
+	update, newHash := needsUpdate(dir, filename)
 	if !update {
-		fmt.Printf("bindata for %s already up-to-date\n", packageName)
+		fmt.Printf("bindata %s already exists and the checksum is a match\n", packageName)
 		return
 	}
 
 	fmt.Printf("generating bindata for %s\n", packageName)
-	var fsTemplates http.FileSystem = http.Dir(dir)
-	err := vfsgen.Generate(fsTemplates, vfsgen.Options{
-		PackageName:      packageName,
-		BuildTags:        "bindata",
-		VariableName:     "Assets",
-		Filename:         filename,
-		UseGlobalModTime: useGlobalModTime,
-	})
+
+	root, err := os.OpenRoot(dir)
 	if err != nil {
-		log.Fatalf("%v\n", err)
+		log.Fatal(err)
+	}
+
+	out, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer out.Close()
+
+	if err := generate(root.FS(), packageName, useGlobalModTime, out); err != nil {
+		log.Fatal(err)
 	}
 	_ = os.WriteFile(filename+".hash", newHash, 0o666)
 }
+
+type file struct {
+	Path             string
+	Name             string
+	UncompressedSize int
+	CompressedData   []byte
+	UncompressedData []byte
+}
+
+type direntry struct {
+	Name  string
+	IsDir bool
+}
+
+func generate(fsRoot fs.FS, packageName string, globalTime bool, output io.Writer) error {
+	enc, err := zstd.NewWriter(nil, zstd.WithEncoderLevel(zstd.SpeedBestCompression))
+	if err != nil {
+		return err
+	}
+
+	files := []file{}
+
+	dirs := map[string][]direntry{}
+
+	if err := fs.WalkDir(fsRoot, ".", func(filePath string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if d.IsDir() {
+			entries, err := fs.ReadDir(fsRoot, filePath)
+			if err != nil {
+				return err
+			}
+			dirEntries := make([]direntry, 0, len(entries))
+			for _, entry := range entries {
+				dirEntries = append(dirEntries, direntry{Name: entry.Name(), IsDir: entry.IsDir()})
+			}
+			dirs[filePath] = dirEntries
+			return nil
+		}
+
+		src, err := fs.ReadFile(fsRoot, filePath)
+		if err != nil {
+			return err
+		}
+
+		dst := enc.EncodeAll(src, nil)
+		if len(dst) < len(src) {
+			files = append(files, file{
+				Path:             filePath,
+				Name:             path.Base(filePath),
+				UncompressedSize: len(src),
+				CompressedData:   dst,
+			})
+		} else {
+			files = append(files, file{
+				Path:             filePath,
+				Name:             path.Base(filePath),
+				UncompressedData: src,
+			})
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
+
+	return generatedTmpl.Execute(output, map[string]any{
+		"Packagename": packageName,
+		"GlobalTime":  globalTime,
+		"Files":       files,
+		"Dirs":        dirs,
+	})
+}
+
+var generatedTmpl = template.Must(template.New("").Parse(`// Code generated by efs-gen. DO NOT EDIT.
+
+//go:build bindata
+
+package {{.Packagename}}
+
+import (
+	"bytes"
+	"time"
+	"io"
+	"io/fs"
+
+	"github.com/klauspost/compress/zstd"
+)
+
+type normalFile struct {
+	name    string
+	content []byte
+}
+
+type compressedFile struct {
+	name             string
+	uncompressedSize int64
+	data             []byte
+}
+
+var files = map[string]any{
+{{- range .Files}}
+	"{{.Path}}": {{if .CompressedData}}compressedFile{"{{.Name}}", {{.UncompressedSize}}, []byte({{printf "%+q" .CompressedData}})}{{else}}normalFile{"{{.Name}}", []byte({{printf "%+q" .UncompressedData}})}{{end}},
+{{- end}}
+}
+
+var dirs = map[string][]fs.DirEntry{
+{{- range $key, $entry := .Dirs}}
+	"{{$key}}": {
+{{- range $entry}}
+		direntry{"{{.Name}}", {{.IsDir}}},
+{{- end}}
+	},
+{{- end}}
+}
+
+type assets struct{}
+
+var Assets = assets{}
+
+func (a assets) Open(name string) (fs.File, error) {
+	f, ok := files[name]
+	if !ok {
+		return nil, &fs.PathError{Op: "open", Path: name, Err: fs.ErrNotExist}
+	}
+
+	switch f := f.(type) {
+	case normalFile:
+		return file{name: f.name, size: int64(len(f.content)), data: bytes.NewReader(f.content)}, nil
+	case compressedFile:
+		r, _ := zstd.NewReader(bytes.NewReader(f.data))
+		return &compressFile{name: f.name, size: f.uncompressedSize, data: r, content: f.data}, nil
+	default:
+		panic("unknown file type")
+	}
+}
+
+func (a assets) ReadDir(name string) ([]fs.DirEntry, error) {
+	d, ok := dirs[name]
+	if !ok {
+		return nil, &fs.PathError{Op: "open", Path: name, Err: fs.ErrNotExist}
+	}
+	return d, nil
+}
+
+type file struct {
+	name string
+	size int64
+	data io.ReadSeeker
+}
+
+var _ io.ReadSeeker = (*file)(nil)
+
+func (f file) Stat() (fs.FileInfo, error) {
+	return fileinfo{name: f.name, size: f.size}, nil
+}
+
+func (f file) Read(p []byte) (int, error) {
+	return f.data.Read(p)
+}
+
+func (f file) Seek(offset int64, whence int) (int64, error) {
+	return f.data.Seek(offset, whence)
+}
+
+func (f file) Close() error { return nil }
+
+type compressFile struct {
+	name    string
+	size    int64
+	data    *zstd.Decoder
+	content []byte
+	zstdPos int64
+	seekPos int64
+}
+
+var _ io.ReadSeeker = (*compressFile)(nil)
+
+func (f *compressFile) Stat() (fs.FileInfo, error) {
+	return fileinfo{name: f.name, size: f.size}, nil
+}
+
+func (f *compressFile) Read(p []byte) (int, error) {
+	if f.zstdPos > f.seekPos {
+		if err := f.data.Reset(bytes.NewReader(f.content)); err != nil {
+			return 0, err
+		}
+		f.zstdPos = 0
+	}
+	if f.zstdPos < f.seekPos {
+		if _, err := io.CopyN(io.Discard, f.data, f.seekPos - f.zstdPos); err != nil {
+			return 0, err
+		}
+		f.zstdPos = f.seekPos
+	}
+	n, err := f.data.Read(p)
+	f.zstdPos += int64(n)
+	f.seekPos = f.zstdPos
+	return n, err
+}
+
+func (f *compressFile) Seek(offset int64, whence int) (int64, error) {
+	switch whence {
+	case io.SeekStart:
+		f.seekPos = 0 + offset
+	case io.SeekCurrent:
+		f.seekPos += offset
+	case io.SeekEnd:
+		f.seekPos = f.size + offset
+	}
+	return f.seekPos, nil
+}
+
+func (f *compressFile) Close() error {
+	f.data.Close()
+	return nil
+}
+
+func (f *compressFile) ZstdBytes() []byte { return f.content }
+
+type fileinfo struct {
+	name string
+	size int64
+}
+
+func (f fileinfo) Name() string       { return f.name }
+func (f fileinfo) Size() int64        { return f.size }
+func (f fileinfo) Mode() fs.FileMode  { return 0o444 }
+func (f fileinfo) ModTime() time.Time { return {{if .GlobalTime}}GlobalModTime(f.name){{else}}time.Unix(0, 0){{end}} }
+func (f fileinfo) IsDir() bool        { return false }
+func (f fileinfo) Sys() any           { return nil }
+
+type direntry struct {
+	name  string
+	isDir bool
+}
+
+func (d direntry) Name() string { return d.name }
+func (d direntry) IsDir() bool  { return d.isDir }
+func (d direntry) Type() fs.FileMode {
+	if d.isDir {
+		return 0o755 | fs.ModeDir
+	}
+	return 0o444
+}
+func (direntry) Info() (fs.FileInfo, error) { return nil, fs.ErrNotExist }
+`))
diff --git a/build/lint-locale-usage/lint-locale-usage.go b/build/lint-locale-usage/lint-locale-usage.go
index 31154ba7cb..88375c1c36 100644
--- a/build/lint-locale-usage/lint-locale-usage.go
+++ b/build/lint-locale-usage/lint-locale-usage.go
@@ -18,16 +18,14 @@ import (
 	tmplParser "text/template/parse"
 
 	"forgejo.org/modules/container"
-	"forgejo.org/modules/locale"
 	fjTemplates "forgejo.org/modules/templates"
+	"forgejo.org/modules/translation/localeiter"
 	"forgejo.org/modules/util"
 )
 
 // this works by first gathering all valid source string IDs from `en-US` reference files
 // and then checking if all used source strings are actually defined
 
-type OnMsgidHandler func(fset *token.FileSet, pos token.Pos, msgid string)
-
 type LocatedError struct {
 	Location string
 	Kind     string
@@ -49,8 +47,24 @@ func (e LocatedError) Error() string {
 	return sb.String()
 }
 
-func isLocaleTrFunction(funcname string) bool {
-	return funcname == "Tr" || funcname == "TrN"
+func InitLocaleTrFunctions() map[string][]uint {
+	ret := make(map[string][]uint)
+
+	f0 := []uint{0}
+	ret["Tr"] = f0
+	ret["TrString"] = f0
+	ret["TrHTML"] = f0
+
+	ret["TrPluralString"] = []uint{1}
+	ret["TrN"] = []uint{1, 2}
+
+	return ret
+}
+
+type Handler struct {
+	OnMsgid            func(fset *token.FileSet, pos token.Pos, msgid string)
+	OnUnexpectedInvoke func(fset *token.FileSet, pos token.Pos, funcname string, argc int)
+	LocaleTrFunctions  map[string][]uint
 }
 
 // the `Handle*File` functions follow the following calling convention:
@@ -58,7 +72,7 @@ func isLocaleTrFunction(funcname string) bool {
 // * `src` is either `nil` (then the function invokes `ReadFile` to read the file)
 //   or the contents of the file as {`[]byte`, or a `string`}
 
-func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error {
+func (handler Handler) HandleGoFile(fname string, src any) error {
 	fset := token.NewFileSet()
 	node, err := goParser.ParseFile(fset, fname, src, goParser.SkipObjectResolution)
 	if err != nil {
@@ -70,31 +84,47 @@ func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error {
 	}
 
 	ast.Inspect(node, func(n ast.Node) bool {
-		// search for function calls of the form `anything.Tr(any-string-lit)`
+		// search for function calls of the form `anything.Tr(any-string-lit, ...)`
 
 		call, ok := n.(*ast.CallExpr)
-		if !ok || len(call.Args) != 1 {
+		if !ok || len(call.Args) < 1 {
 			return true
 		}
 
 		funSel, ok := call.Fun.(*ast.SelectorExpr)
-		if (!ok) || !isLocaleTrFunction(funSel.Sel.Name) {
+		if !ok {
 			return true
 		}
 
-		argLit, ok := call.Args[0].(*ast.BasicLit)
-		if (!ok) || argLit.Kind != token.STRING {
+		ltf, ok := handler.LocaleTrFunctions[funSel.Sel.Name]
+		if !ok {
 			return true
 		}
 
-		// extract string content
-		arg, err := strconv.Unquote(argLit.Value)
-		if err != nil {
-			return true
+		var gotUnexpectedInvoke *int
+
+		for _, argNum := range ltf {
+			if len(call.Args) >= int(argNum+1) {
+				argLit, ok := call.Args[int(argNum)].(*ast.BasicLit)
+				if !ok || argLit.Kind != token.STRING {
+					continue
+				}
+
+				// extract string content
+				arg, err := strconv.Unquote(argLit.Value)
+				if err == nil {
+					// found interesting strings
+					handler.OnMsgid(fset, argLit.ValuePos, arg)
+				}
+			} else {
+				argc := len(call.Args)
+				gotUnexpectedInvoke = &argc
+			}
 		}
 
-		// found interesting string
-		omh(fset, argLit.ValuePos, arg)
+		if gotUnexpectedInvoke != nil {
+			handler.OnUnexpectedInvoke(fset, funSel.Sel.NamePos, funSel.Sel.Name, *gotUnexpectedInvoke)
+		}
 
 		return true
 	})
@@ -103,33 +133,33 @@ func (omh OnMsgidHandler) HandleGoFile(fname string, src any) error {
 }
 
 // derived from source: modules/templates/scopedtmpl/scopedtmpl.go, L169-L213
-func (omh OnMsgidHandler) handleTemplateNode(fset *token.FileSet, node tmplParser.Node) {
+func (handler Handler) handleTemplateNode(fset *token.FileSet, node tmplParser.Node) {
 	switch node.Type() {
 	case tmplParser.NodeAction:
-		omh.handleTemplatePipeNode(fset, node.(*tmplParser.ActionNode).Pipe)
+		handler.handleTemplatePipeNode(fset, node.(*tmplParser.ActionNode).Pipe)
 	case tmplParser.NodeList:
 		nodeList := node.(*tmplParser.ListNode)
-		omh.handleTemplateFileNodes(fset, nodeList.Nodes)
+		handler.handleTemplateFileNodes(fset, nodeList.Nodes)
 	case tmplParser.NodePipe:
-		omh.handleTemplatePipeNode(fset, node.(*tmplParser.PipeNode))
+		handler.handleTemplatePipeNode(fset, node.(*tmplParser.PipeNode))
 	case tmplParser.NodeTemplate:
-		omh.handleTemplatePipeNode(fset, node.(*tmplParser.TemplateNode).Pipe)
+		handler.handleTemplatePipeNode(fset, node.(*tmplParser.TemplateNode).Pipe)
 	case tmplParser.NodeIf:
 		nodeIf := node.(*tmplParser.IfNode)
-		omh.handleTemplateBranchNode(fset, nodeIf.BranchNode)
+		handler.handleTemplateBranchNode(fset, nodeIf.BranchNode)
 	case tmplParser.NodeRange:
 		nodeRange := node.(*tmplParser.RangeNode)
-		omh.handleTemplateBranchNode(fset, nodeRange.BranchNode)
+		handler.handleTemplateBranchNode(fset, nodeRange.BranchNode)
 	case tmplParser.NodeWith:
 		nodeWith := node.(*tmplParser.WithNode)
-		omh.handleTemplateBranchNode(fset, nodeWith.BranchNode)
+		handler.handleTemplateBranchNode(fset, nodeWith.BranchNode)
 
 	case tmplParser.NodeCommand:
 		nodeCommand := node.(*tmplParser.CommandNode)
 
-		omh.handleTemplateFileNodes(fset, nodeCommand.Args)
+		handler.handleTemplateFileNodes(fset, nodeCommand.Args)
 
-		if len(nodeCommand.Args) != 2 {
+		if len(nodeCommand.Args) < 2 {
 			return
 		}
 
@@ -138,54 +168,66 @@ func (omh OnMsgidHandler) handleTemplateNode(fset *token.FileSet, node tmplParse
 			return
 		}
 
-		nodeString, ok := nodeCommand.Args[1].(*tmplParser.StringNode)
+		nodeIdent, ok := nodeChain.Node.(*tmplParser.IdentifierNode)
+		if !ok || nodeIdent.Ident != "ctx" || len(nodeChain.Field) != 2 || nodeChain.Field[0] != "Locale" {
+			return
+		}
+
+		ltf, ok := handler.LocaleTrFunctions[nodeChain.Field[1]]
 		if !ok {
 			return
 		}
 
-		nodeIdent, ok := nodeChain.Node.(*tmplParser.IdentifierNode)
-		if !ok || nodeIdent.Ident != "ctx" {
-			return
+		var gotUnexpectedInvoke *int
+
+		for _, argNum := range ltf {
+			if len(nodeCommand.Args) >= int(argNum+2) {
+				nodeString, ok := nodeCommand.Args[int(argNum+1)].(*tmplParser.StringNode)
+				if ok {
+					// found interesting strings
+					// the column numbers are a bit "off", but much better than nothing
+					handler.OnMsgid(fset, token.Pos(nodeString.Pos), nodeString.Text)
+				}
+			} else {
+				argc := len(nodeCommand.Args) - 1
+				gotUnexpectedInvoke = &argc
+			}
 		}
 
-		if len(nodeChain.Field) != 2 || nodeChain.Field[0] != "Locale" || !isLocaleTrFunction(nodeChain.Field[1]) {
-			return
+		if gotUnexpectedInvoke != nil {
+			handler.OnUnexpectedInvoke(fset, token.Pos(nodeChain.Pos), nodeChain.Field[1], *gotUnexpectedInvoke)
 		}
 
-		// found interesting string
-		// the column numbers are a bit "off", but much better than nothing
-		omh(fset, token.Pos(nodeString.Pos), nodeString.Text)
-
 	default:
 	}
 }
 
-func (omh OnMsgidHandler) handleTemplatePipeNode(fset *token.FileSet, pipeNode *tmplParser.PipeNode) {
+func (handler Handler) handleTemplatePipeNode(fset *token.FileSet, pipeNode *tmplParser.PipeNode) {
 	if pipeNode == nil {
 		return
 	}
 
 	// NOTE: we can't pass `pipeNode.Cmds` to handleTemplateFileNodes due to incompatible argument types
 	for _, node := range pipeNode.Cmds {
-		omh.handleTemplateNode(fset, node)
+		handler.handleTemplateNode(fset, node)
 	}
 }
 
-func (omh OnMsgidHandler) handleTemplateBranchNode(fset *token.FileSet, branchNode tmplParser.BranchNode) {
-	omh.handleTemplatePipeNode(fset, branchNode.Pipe)
-	omh.handleTemplateFileNodes(fset, branchNode.List.Nodes)
+func (handler Handler) handleTemplateBranchNode(fset *token.FileSet, branchNode tmplParser.BranchNode) {
+	handler.handleTemplatePipeNode(fset, branchNode.Pipe)
+	handler.handleTemplateFileNodes(fset, branchNode.List.Nodes)
 	if branchNode.ElseList != nil {
-		omh.handleTemplateFileNodes(fset, branchNode.ElseList.Nodes)
+		handler.handleTemplateFileNodes(fset, branchNode.ElseList.Nodes)
 	}
 }
 
-func (omh OnMsgidHandler) handleTemplateFileNodes(fset *token.FileSet, nodes []tmplParser.Node) {
+func (handler Handler) handleTemplateFileNodes(fset *token.FileSet, nodes []tmplParser.Node) {
 	for _, node := range nodes {
-		omh.handleTemplateNode(fset, node)
+		handler.handleTemplateNode(fset, node)
 	}
 }
 
-func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error {
+func (handler Handler) HandleTemplateFile(fname string, src any) error {
 	var tmplContent []byte
 	switch src2 := src.(type) {
 	case nil:
@@ -222,7 +264,7 @@ func (omh OnMsgidHandler) HandleTemplateFile(fname string, src any) error {
 			Err:      err,
 		}
 	}
-	omh.handleTemplateFileNodes(fset, tmplParsed.Tree.Root.Nodes)
+	handler.handleTemplateFileNodes(fset, tmplParsed.Root.Nodes)
 	return nil
 }
 
@@ -258,10 +300,6 @@ func main() {
 	}
 
 	msgids := make(container.Set[string])
-	onMsgid := func(trKey, trValue string) error {
-		msgids[trKey] = struct{}{}
-		return nil
-	}
 
 	localeFile := filepath.Join(filepath.Join("options", "locale"), "locale_en-US.ini")
 	localeContent, err := os.ReadFile(localeFile)
@@ -270,7 +308,10 @@ func main() {
 		os.Exit(2)
 	}
 
-	if err = locale.IterateMessagesContent(localeContent, onMsgid); err != nil {
+	if err = localeiter.IterateMessagesContent(localeContent, func(trKey, trValue string) error {
+		msgids[trKey] = struct{}{}
+		return nil
+	}); err != nil {
 		fmt.Printf("%s:\tERROR: %s\n", localeFile, err.Error())
 		os.Exit(2)
 	}
@@ -282,19 +323,30 @@ func main() {
 		os.Exit(2)
 	}
 
-	if err := locale.IterateMessagesNextContent(localeContent, onMsgid); err != nil {
+	if err := localeiter.IterateMessagesNextContent(localeContent, func(trKey, pluralForm, trValue string) error {
+		// ignore plural form
+		msgids[trKey] = struct{}{}
+		return nil
+	}); err != nil {
 		fmt.Printf("%s:\tERROR: %s\n", localeFile, err.Error())
 		os.Exit(2)
 	}
 
 	gotAnyMsgidError := false
 
-	omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) {
-		if !msgids.Contains(msgid) {
+	handler := Handler{
+		OnMsgid: func(fset *token.FileSet, pos token.Pos, msgid string) {
+			if !msgids.Contains(msgid) {
+				gotAnyMsgidError = true
+				fmt.Printf("%s:\tmissing msgid: %s\n", fset.Position(pos).String(), msgid)
+			}
+		},
+		OnUnexpectedInvoke: func(fset *token.FileSet, pos token.Pos, funcname string, argc int) {
 			gotAnyMsgidError = true
-			fmt.Printf("%s:\tmissing msgid: %s\n", fset.Position(pos).String(), msgid)
-		}
-	})
+			fmt.Printf("%s:\tunexpected invocation of %s with %d arguments\n", fset.Position(pos).String(), funcname, argc)
+		},
+		LocaleTrFunctions: InitLocaleTrFunctions(),
+	}
 
 	if err := filepath.WalkDir(".", func(fpath string, d fs.DirEntry, err error) error {
 		if err != nil {
@@ -308,15 +360,15 @@ func main() {
 			if name == "docker" || name == ".git" || name == "node_modules" {
 				return fs.SkipDir
 			}
-		} else if name == "bindata.go" {
+		} else if name == "bindata.go" || fpath == "modules/translation/i18n/i18n_test.go" {
 			// skip false positives
 		} else if strings.HasSuffix(name, ".go") {
-			onError(omh.HandleGoFile(fpath, nil))
+			onError(handler.HandleGoFile(fpath, nil))
 		} else if strings.HasSuffix(name, ".tmpl") {
 			if strings.HasPrefix(fpath, "tests") && strings.HasSuffix(name, ".ini.tmpl") {
 				// skip false positives
 			} else {
-				onError(omh.HandleTemplateFile(fpath, nil))
+				onError(handler.HandleTemplateFile(fpath, nil))
 			}
 		}
 		return nil
diff --git a/build/lint-locale-usage/lint-locale-usage_test.go b/build/lint-locale-usage/lint-locale-usage_test.go
index 3b3b746053..81ca12c6db 100644
--- a/build/lint-locale-usage/lint-locale-usage_test.go
+++ b/build/lint-locale-usage/lint-locale-usage_test.go
@@ -11,33 +11,39 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func buildHandler(ret *[]string) Handler {
+	return Handler{
+		OnMsgid: func(fset *token.FileSet, pos token.Pos, msgid string) {
+			*ret = append(*ret, msgid)
+		},
+		OnUnexpectedInvoke: func(fset *token.FileSet, pos token.Pos, funcname string, argc int) {},
+		LocaleTrFunctions:  InitLocaleTrFunctions(),
+	}
+}
+
 func HandleGoFileWrapped(t *testing.T, fname, src string) []string {
 	var ret []string
-	omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) {
-		ret = append(ret, msgid)
-	})
-	require.NoError(t, omh.HandleGoFile(fname, src))
+	handler := buildHandler(&ret)
+	require.NoError(t, handler.HandleGoFile(fname, src))
 	return ret
 }
 
 func HandleTemplateFileWrapped(t *testing.T, fname, src string) []string {
 	var ret []string
-	omh := OnMsgidHandler(func(fset *token.FileSet, pos token.Pos, msgid string) {
-		ret = append(ret, msgid)
-	})
-	require.NoError(t, omh.HandleTemplateFile(fname, src))
+	handler := buildHandler(&ret)
+	require.NoError(t, handler.HandleTemplateFile(fname, src))
 	return ret
 }
 
 func TestUsagesParser(t *testing.T) {
 	t.Run("go, simple", func(t *testing.T) {
-		assert.EqualValues(t,
+		assert.Equal(t,
 			[]string{"what.an.example"},
 			HandleGoFileWrapped(t, "<g1>", "package main\nfunc Render(ctx *context.Context) string { return ctx.Tr(\"what.an.example\"); }\n"))
 	})
 
 	t.Run("template, simple", func(t *testing.T) {
-		assert.EqualValues(t,
+		assert.Equal(t,
 			[]string{"what.an.example"},
 			HandleTemplateFileWrapped(t, "<t1>", "{{ ctx.Locale.Tr \"what.an.example\" }}\n"))
 	})
diff --git a/build/lint-locale/lint-locale.go b/build/lint-locale/lint-locale.go
index 94ce941e62..dc4088c73c 100644
--- a/build/lint-locale/lint-locale.go
+++ b/build/lint-locale/lint-locale.go
@@ -14,7 +14,7 @@ import (
 	"slices"
 	"strings"
 
-	"forgejo.org/modules/locale"
+	"forgejo.org/modules/translation/localeiter"
 
 	"github.com/microcosm-cc/bluemonday"
 	"github.com/sergi/go-diff/diffmatchpatch"
@@ -52,7 +52,7 @@ func initBlueMondayPolicy() {
 	policy.AllowAttrs("id").Matching(positionalPlaceholderRe).OnElements("code")
 
 	// Allowed elements with no attributes. Must be a recognized tagname.
-	policy.AllowElements("strong", "br", "b", "strike", "code", "i")
+	policy.AllowElements("strong", "br", "b", "strike", "code", "i", "kbd")
 
 	// TODO: Remove <c> in `actions.workflow.dispatch.trigger_found`.
 	policy.AllowNoAttrs().OnElements("c")
@@ -100,7 +100,7 @@ func checkValue(trKey, value string) []string {
 func checkLocaleContent(localeContent []byte) []string {
 	errors := []string{}
 
-	if err := locale.IterateMessagesContent(localeContent, func(trKey, trValue string) error {
+	if err := localeiter.IterateMessagesContent(localeContent, func(trKey, trValue string) error {
 		errors = append(errors, checkValue(trKey, trValue)...)
 		return nil
 	}); err != nil {
@@ -113,8 +113,12 @@ func checkLocaleContent(localeContent []byte) []string {
 func checkLocaleNextContent(localeContent []byte) []string {
 	errors := []string{}
 
-	if err := locale.IterateMessagesNextContent(localeContent, func(trKey, trValue string) error {
-		errors = append(errors, checkValue(trKey, trValue)...)
+	if err := localeiter.IterateMessagesNextContent(localeContent, func(trKey, pluralForm, trValue string) error {
+		fullKey := trKey
+		if pluralForm != "" {
+			fullKey = trKey + "." + pluralForm
+		}
+		errors = append(errors, checkValue(fullKey, trValue)...)
 		return nil
 	}); err != nil {
 		panic(err)
diff --git a/build/lint-locale/lint-locale_test.go b/build/lint-locale/lint-locale_test.go
index 791f5278bc..dd146c0d70 100644
--- a/build/lint-locale/lint-locale_test.go
+++ b/build/lint-locale/lint-locale_test.go
@@ -15,9 +15,9 @@ func TestLocalizationPolicy(t *testing.T) {
 	t.Run("Remove tags", func(t *testing.T) {
 		assert.Empty(t, checkLocaleContent([]byte(`hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all "<user> added/removed <label>" comments.`)))
 
-		assert.EqualValues(t, []string{"key: \x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG"}, checkLocaleContent([]byte(`key = "<not-an-allowed-key> <label>"`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<user@example.com>\x1b[0m REPLACED-TAG"}, checkLocaleContent([]byte(`key = "<user@example.com> <email@example.com>"`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<tag>\x1b[0m REPLACED-TAG \x1b[31m</tag>\x1b[0m"}, checkLocaleContent([]byte(`key = "<tag> <email@example.com> </tag>"`)))
+		assert.Equal(t, []string{"key: \x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG"}, checkLocaleContent([]byte(`key = "<not-an-allowed-key> <label>"`)))
+		assert.Equal(t, []string{"key: \x1b[31m<user@example.com>\x1b[0m REPLACED-TAG"}, checkLocaleContent([]byte(`key = "<user@example.com> <email@example.com>"`)))
+		assert.Equal(t, []string{"key: \x1b[31m<tag>\x1b[0m REPLACED-TAG \x1b[31m</tag>\x1b[0m"}, checkLocaleContent([]byte(`key = "<tag> <email@example.com> </tag>"`)))
 	})
 
 	t.Run("Specific exception", func(t *testing.T) {
@@ -25,11 +25,11 @@ func TestLocalizationPolicy(t *testing.T) {
 		assert.Empty(t, checkLocaleContent([]byte(`pulls.title_desc_one = wants to merge %[1]d commit from <code>%[2]s</code> into <code id="%[4]s">%[3]s</code>`)))
 		assert.Empty(t, checkLocaleContent([]byte(`editor.commit_directly_to_this_branch = Commit directly to the <strong class="%[2]s">%[1]s</strong> branch.`)))
 
-		assert.EqualValues(t, []string{"workflow.dispatch.trigger_found: This workflow has a \x1b[31m<d>\x1b[0mworkflow_dispatch\x1b[31m</d>\x1b[0m event trigger."}, checkLocaleContent([]byte(`workflow.dispatch.trigger_found = This workflow has a <d>workflow_dispatch</d> event trigger.`)))
-		assert.EqualValues(t, []string{"key: <code\x1b[31m id=\"branch_targe\"\x1b[0m>%[3]s</code>"}, checkLocaleContent([]byte(`key = <code id="branch_targe">%[3]s</code>`)))
-		assert.EqualValues(t, []string{"key: <a\x1b[31m class=\"ui sh\"\x1b[0m href=\"https://TO-BE-REPLACED.COM\">"}, checkLocaleContent([]byte(`key = <a class="ui sh" href="%[3]s">`)))
-		assert.EqualValues(t, []string{"key: <a\x1b[31m class=\"js-click-me\"\x1b[0m href=\"https://TO-BE-REPLACED.COM\">"}, checkLocaleContent([]byte(`key = <a class="js-click-me" href="%[3]s">`)))
-		assert.EqualValues(t, []string{"key: <strong\x1b[31m class=\"branch-target\"\x1b[0m>%[1]s</strong>"}, checkLocaleContent([]byte(`key = <strong class="branch-target">%[1]s</strong>`)))
+		assert.Equal(t, []string{"workflow.dispatch.trigger_found: This workflow has a \x1b[31m<d>\x1b[0mworkflow_dispatch\x1b[31m</d>\x1b[0m event trigger."}, checkLocaleContent([]byte(`workflow.dispatch.trigger_found = This workflow has a <d>workflow_dispatch</d> event trigger.`)))
+		assert.Equal(t, []string{"key: <code\x1b[31m id=\"branch_targe\"\x1b[0m>%[3]s</code>"}, checkLocaleContent([]byte(`key = <code id="branch_targe">%[3]s</code>`)))
+		assert.Equal(t, []string{"key: <a\x1b[31m class=\"ui sh\"\x1b[0m href=\"https://TO-BE-REPLACED.COM\">"}, checkLocaleContent([]byte(`key = <a class="ui sh" href="%[3]s">`)))
+		assert.Equal(t, []string{"key: <a\x1b[31m class=\"js-click-me\"\x1b[0m href=\"https://TO-BE-REPLACED.COM\">"}, checkLocaleContent([]byte(`key = <a class="js-click-me" href="%[3]s">`)))
+		assert.Equal(t, []string{"key: <strong\x1b[31m class=\"branch-target\"\x1b[0m>%[1]s</strong>"}, checkLocaleContent([]byte(`key = <strong class="branch-target">%[1]s</strong>`)))
 	})
 
 	t.Run("General safe tags", func(t *testing.T) {
@@ -37,8 +37,9 @@ func TestLocalizationPolicy(t *testing.T) {
 		assert.Empty(t, checkLocaleContent([]byte("teams.specific_repositories_helper = Members will only have access to repositories explicitly added to the team. Selecting this <strong>will not</strong> automatically remove repositories already added with <i>All repositories</i>.")))
 		assert.Empty(t, checkLocaleContent([]byte("sqlite_helper = File path for the SQLite3 database.<br>Enter an absolute path if you run Forgejo as a service.")))
 		assert.Empty(t, checkLocaleContent([]byte("hi_user_x = Hi <b>%s</b>,")))
+		assert.Empty(t, checkLocaleContent([]byte("key = Press <kbd>Shift</kbd>")))
 
-		assert.EqualValues(t, []string{"error404: The page you are trying to reach either <strong\x1b[31m title='aaa'\x1b[0m>does not exist</strong> or <strong>you are not authorized</strong> to view it."}, checkLocaleContent([]byte("error404 = The page you are trying to reach either <strong title='aaa'>does not exist</strong> or <strong>you are not authorized</strong> to view it.")))
+		assert.Equal(t, []string{"error404: The page you are trying to reach either <strong\x1b[31m title='aaa'\x1b[0m>does not exist</strong> or <strong>you are not authorized</strong> to view it."}, checkLocaleContent([]byte("error404 = The page you are trying to reach either <strong title='aaa'>does not exist</strong> or <strong>you are not authorized</strong> to view it.")))
 	})
 
 	t.Run("<a>", func(t *testing.T) {
@@ -47,20 +48,20 @@ func TestLocalizationPolicy(t *testing.T) {
 		assert.Empty(t, checkLocaleContent([]byte(`webauthn_desc = Security keys are hardware devices containing cryptographic keys. They can be used for two-factor authentication. Security keys must support the <a rel="noreferrer" target="_blank" href="%s">WebAuthn Authenticator</a> standard.`)))
 		assert.Empty(t, checkLocaleContent([]byte("issues.closed_at = `closed this issue <a id=\"%[1]s\" href=\"#%[1]s\">%[2]s</a>`")))
 
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"https://example.com\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com">`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"javascript:alert('1')\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="javascript:alert('1')">`)))
-		assert.EqualValues(t, []string{"key: <a href=\"https://TO-BE-REPLACED.COM\"\x1b[31m download\x1b[0m>"}, checkLocaleContent([]byte(`key = <a href="%s" download>`)))
-		assert.EqualValues(t, []string{"key: <a href=\"https://TO-BE-REPLACED.COM\"\x1b[31m target=\"_self\"\x1b[0m>"}, checkLocaleContent([]byte(`key = <a href="%s" target="_self">`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"https://example.com/%s\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com/%s">`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"https://example.com/?q=%s\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com/?q=%s">`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"%s/open-redirect\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="%s/open-redirect">`)))
-		assert.EqualValues(t, []string{"key: \x1b[31m<a href=\"%s?q=open-redirect\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="%s?q=open-redirect">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"https://example.com\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"javascript:alert('1')\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="javascript:alert('1')">`)))
+		assert.Equal(t, []string{"key: <a href=\"https://TO-BE-REPLACED.COM\"\x1b[31m download\x1b[0m>"}, checkLocaleContent([]byte(`key = <a href="%s" download>`)))
+		assert.Equal(t, []string{"key: <a href=\"https://TO-BE-REPLACED.COM\"\x1b[31m target=\"_self\"\x1b[0m>"}, checkLocaleContent([]byte(`key = <a href="%s" target="_self">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"https://example.com/%s\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com/%s">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"https://example.com/?q=%s\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="https://example.com/?q=%s">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"%s/open-redirect\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="%s/open-redirect">`)))
+		assert.Equal(t, []string{"key: \x1b[31m<a href=\"%s?q=open-redirect\">\x1b[0m"}, checkLocaleContent([]byte(`key = <a href="%s?q=open-redirect">`)))
 	})
 
 	t.Run("Escaped HTML characters", func(t *testing.T) {
 		assert.Empty(t, checkLocaleContent([]byte("activity.git_stats_push_to_branch = `إلى %s و\"`")))
 
-		assert.EqualValues(t, []string{"key: و\x1b[31m&nbsp\x1b[0m\x1b[32m\u00a0\x1b[0m"}, checkLocaleContent([]byte(`key = و&nbsp;`)))
+		assert.Equal(t, []string{"key: و\x1b[31m&nbsp;\x1b[0m\x1b[32m\u00a0\x1b[0m"}, checkLocaleContent([]byte(`key = و&nbsp;`)))
 	})
 }
 
@@ -75,7 +76,7 @@ func TestNextLocalizationPolicy(t *testing.T) {
 			}
 		}`)))
 
-		assert.EqualValues(t, []string{"settings.hidden_comment_types_description: \"\x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG\""}, checkLocaleNextContent([]byte(`{
+		assert.Equal(t, []string{"settings.hidden_comment_types_description: \"\x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG\""}, checkLocaleNextContent([]byte(`{
 			"settings": {
 				"hidden_comment_types_description": "\"<not-an-allowed-key> <label>\""
 			}
@@ -87,8 +88,20 @@ func TestNextLocalizationPolicy(t *testing.T) {
 			"settings.hidden_comment_types_description": "Comment types checked here will not be shown inside issue pages. Checking \"Label\" for example removes all \"<user> added/removed <label>\" comments."
 		}`)))
 
-		assert.EqualValues(t, []string{"settings.hidden_comment_types_description: \"\x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG\""}, checkLocaleNextContent([]byte(`{
+		assert.Equal(t, []string{"settings.hidden_comment_types_description: \"\x1b[31m<not-an-allowed-key>\x1b[0m REPLACED-TAG\""}, checkLocaleNextContent([]byte(`{
 			"settings.hidden_comment_types_description": "\"<not-an-allowed-key> <label>\""
 		}`)))
 	})
+
+	t.Run("Plural form", func(t *testing.T) {
+		assert.Equal(t, []string{"repo.pulls.title_desc: key = \x1b[31m<a href=\"https://example.com\">\x1b[0m"}, checkLocaleNextContent([]byte(`{"repo.pulls.title_desc": {
+                       "few": "key = <a href=\"%s\">",
+                       "other": "key = <a href=\"https://example.com\">"
+    }}`)))
+
+		assert.Equal(t, []string{"repo.pulls.title_desc.few: key = \x1b[31m<a href=\"https://example.com\">\x1b[0m"}, checkLocaleNextContent([]byte(`{"repo.pulls.title_desc": {
+                       "few": "key = <a href=\"https://example.com\">",
+                       "other": "key = <a href=\"%s\">"
+    }}`)))
+	})
 }
diff --git a/build/update-locales.sh b/build/update-locales.sh
deleted file mode 100755
index 6f9ee334be..0000000000
--- a/build/update-locales.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# this script runs in alpine image which only has `sh` shell
-
-set +e
-if sed --version 2>/dev/null | grep -q GNU; then
-  SED_INPLACE="sed -i"
-else
-  SED_INPLACE="sed -i ''"
-fi
-set -e
-
-if [ ! -f ./options/locale/locale_en-US.ini ]; then
-  echo "please run this script in the root directory of the project"
-  exit 1
-fi
-
-mv ./options/locale/locale_en-US.ini ./options/
-
-# the "ini" library for locale has many quirks, its behavior is different from Crowdin.
-# see i18n_test.go for more details
-
-# this script helps to unquote the Crowdin outputs for the quirky ini library
-# * find all `key="...\"..."` lines
-# * remove the leading quote
-# * remove the trailing quote
-# * unescape the quotes
-# * eg: key="...\"..." => key=..."...
-$SED_INPLACE -r -e '/^[-.A-Za-z0-9_]+[ ]*=[ ]*".*"$/ {
-	s/^([-.A-Za-z0-9_]+)[ ]*=[ ]*"/\1=/
-	s/"$//
-	s/\\"/"/g
-	}' ./options/locale/*.ini
-
-# * if the escaped line is incomplete like `key="...` or `key=..."`, quote it with backticks
-# * eg: key="... => key=`"...`
-# * eg: key=..." => key=`..."`
-$SED_INPLACE -r -e 's/^([-.A-Za-z0-9_]+)[ ]*=[ ]*(".*[^"])$/\1=`\2`/' ./options/locale/*.ini
-$SED_INPLACE -r -e 's/^([-.A-Za-z0-9_]+)[ ]*=[ ]*([^"].*")$/\1=`\2`/' ./options/locale/*.ini
-
-# Remove translation under 25% of en_us
-baselines=$(wc -l "./options/locale_en-US.ini" | cut -d" " -f1)
-baselines=$((baselines / 4))
-for filename in ./options/locale/*.ini; do
-  lines=$(wc -l "$filename" | cut -d" " -f1)
-  if [ $lines -lt $baselines ]; then
-    echo "Removing $filename: $lines/$baselines"
-    rm "$filename"
-  fi
-done
-
-mv ./options/locale_en-US.ini ./options/locale/
diff --git a/cmd/actions.go b/cmd/actions.go
index 54b5154cfa..12af2c8e86 100644
--- a/cmd/actions.go
+++ b/cmd/actions.go
@@ -4,25 +4,28 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	// CmdActions represents the available actions sub-commands.
-	CmdActions = &cli.Command{
+// CmdActions represents the available actions sub-commands.
+func cmdActions() *cli.Command {
+	return &cli.Command{
 		Name:  "actions",
 		Usage: "Manage Forgejo Actions",
-		Subcommands: []*cli.Command{
-			subcmdActionsGenRunnerToken,
+		Commands: []*cli.Command{
+			subcmdActionsGenRunnerToken(),
 		},
 	}
+}
 
-	subcmdActionsGenRunnerToken = &cli.Command{
+func subcmdActionsGenRunnerToken() *cli.Command {
+	return &cli.Command{
 		Name:    "generate-runner-token",
 		Usage:   "Generate a new token for a runner to use to register with the server",
 		Action:  runGenerateActionsRunnerToken,
@@ -36,10 +39,10 @@ var (
 			},
 		},
 	}
-)
+}
 
-func runGenerateActionsRunnerToken(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runGenerateActionsRunnerToken(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	setting.MustInstalled()
diff --git a/cmd/admin.go b/cmd/admin.go
index e04a5bc530..7e06a99cda 100644
--- a/cmd/admin.go
+++ b/cmd/admin.go
@@ -15,56 +15,64 @@ import (
 	"forgejo.org/modules/log"
 	repo_module "forgejo.org/modules/repository"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	// CmdAdmin represents the available admin sub-command.
-	CmdAdmin = &cli.Command{
+// CmdAdmin represents the available admin sub-command.
+func cmdAdmin() *cli.Command {
+	return &cli.Command{
 		Name:  "admin",
 		Usage: "Perform common administrative operations",
-		Subcommands: []*cli.Command{
-			subcmdUser,
-			subcmdRepoSyncReleases,
-			subcmdRegenerate,
-			subcmdAuth,
-			subcmdSendMail,
+		Commands: []*cli.Command{
+			subcmdUser(),
+			subcmdRepoSyncReleases(),
+			subcmdRegenerate(),
+			subcmdAuth(),
+			subcmdSendMail(),
 		},
 	}
+}
 
-	subcmdRepoSyncReleases = &cli.Command{
+func subcmdRepoSyncReleases() *cli.Command {
+	return &cli.Command{
 		Name:   "repo-sync-releases",
 		Usage:  "Synchronize repository releases with tags",
 		Action: runRepoSyncReleases,
 	}
+}
 
-	subcmdRegenerate = &cli.Command{
+func subcmdRegenerate() *cli.Command {
+	return &cli.Command{
 		Name:  "regenerate",
 		Usage: "Regenerate specific files",
-		Subcommands: []*cli.Command{
+		Commands: []*cli.Command{
 			microcmdRegenHooks,
 			microcmdRegenKeys,
 		},
 	}
+}
 
-	subcmdAuth = &cli.Command{
+func subcmdAuth() *cli.Command {
+	return &cli.Command{
 		Name:  "auth",
 		Usage: "Modify external auth providers",
-		Subcommands: []*cli.Command{
-			microcmdAuthAddOauth,
-			microcmdAuthUpdateOauth,
-			microcmdAuthAddLdapBindDn,
-			microcmdAuthUpdateLdapBindDn,
-			microcmdAuthAddLdapSimpleAuth,
-			microcmdAuthUpdateLdapSimpleAuth,
-			microcmdAuthAddSMTP,
-			microcmdAuthUpdateSMTP,
-			microcmdAuthList,
-			microcmdAuthDelete,
+		Commands: []*cli.Command{
+			microcmdAuthAddOauth(),
+			microcmdAuthUpdateOauth(),
+			microcmdAuthAddLdapBindDn(),
+			microcmdAuthUpdateLdapBindDn(),
+			microcmdAuthAddLdapSimpleAuth(),
+			microcmdAuthUpdateLdapSimpleAuth(),
+			microcmdAuthAddSMTP(),
+			microcmdAuthUpdateSMTP(),
+			microcmdAuthList(),
+			microcmdAuthDelete(),
 		},
 	}
+}
 
-	subcmdSendMail = &cli.Command{
+func subcmdSendMail() *cli.Command {
+	return &cli.Command{
 		Name:   "sendmail",
 		Usage:  "Send a message to all users",
 		Action: runSendMail,
@@ -86,15 +94,17 @@ var (
 			},
 		},
 	}
+}
 
-	idFlag = &cli.Int64Flag{
+func idFlag() *cli.Int64Flag {
+	return &cli.Int64Flag{
 		Name:  "id",
 		Usage: "ID of authentication source",
 	}
-)
+}
 
-func runRepoSyncReleases(_ *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRepoSyncReleases(ctx context.Context, _ *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go
index b5e0212df7..91b344b1e9 100644
--- a/cmd/admin_auth.go
+++ b/cmd/admin_auth.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -13,17 +14,29 @@ import (
 	"forgejo.org/models/db"
 	auth_service "forgejo.org/services/auth"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	microcmdAuthDelete = &cli.Command{
+type (
+	authService struct {
+		initDB            func(ctx context.Context) error
+		createAuthSource  func(context.Context, *auth_model.Source) error
+		updateAuthSource  func(context.Context, *auth_model.Source) error
+		getAuthSourceByID func(ctx context.Context, id int64) (*auth_model.Source, error)
+	}
+)
+
+func microcmdAuthDelete() *cli.Command {
+	return &cli.Command{
 		Name:   "delete",
 		Usage:  "Delete specific auth source",
-		Flags:  []cli.Flag{idFlag},
+		Flags:  []cli.Flag{idFlag()},
 		Action: runDeleteAuth,
 	}
-	microcmdAuthList = &cli.Command{
+}
+
+func microcmdAuthList() *cli.Command {
+	return &cli.Command{
 		Name:   "list",
 		Usage:  "List auth sources",
 		Action: runListAuth,
@@ -54,10 +67,20 @@ var (
 			},
 		},
 	}
-)
+}
 
-func runListAuth(c *cli.Context) error {
-	ctx, cancel := installSignals()
+// newAuthService creates a service with default functions.
+func newAuthService() *authService {
+	return &authService{
+		initDB:            initDB,
+		createAuthSource:  auth_model.CreateSource,
+		updateAuthSource:  auth_model.UpdateSource,
+		getAuthSourceByID: auth_model.GetSourceByID,
+	}
+}
+
+func runListAuth(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -81,7 +104,7 @@ func runListAuth(c *cli.Context) error {
 
 	// loop through each source and print
 	w := tabwriter.NewWriter(os.Stdout, c.Int("min-width"), c.Int("tab-width"), c.Int("padding"), padChar, flags)
-	fmt.Fprintf(w, "ID\tName\tType\tEnabled\n")
+	fmt.Fprint(w, "ID\tName\tType\tEnabled\n")
 	for _, source := range authSources {
 		fmt.Fprintf(w, "%d\t%s\t%s\t%t\n", source.ID, source.Name, source.Type.String(), source.IsActive)
 	}
@@ -90,12 +113,12 @@ func runListAuth(c *cli.Context) error {
 	return nil
 }
 
-func runDeleteAuth(c *cli.Context) error {
+func runDeleteAuth(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("id") {
 		return errors.New("--id flag is missing")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go
index 637769b153..9af6c331d3 100644
--- a/cmd/admin_auth_ldap.go
+++ b/cmd/admin_auth_ldap.go
@@ -11,20 +11,11 @@ import (
 	"forgejo.org/models/auth"
 	"forgejo.org/services/auth/source/ldap"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-type (
-	authService struct {
-		initDB            func(ctx context.Context) error
-		createAuthSource  func(context.Context, *auth.Source) error
-		updateAuthSource  func(context.Context, *auth.Source) error
-		getAuthSourceByID func(ctx context.Context, id int64) (*auth.Source, error)
-	}
-)
-
-var (
-	commonLdapCLIFlags = []cli.Flag{
+func commonLdapCLIFlags() []cli.Flag {
+	return []cli.Flag{
 		&cli.StringFlag{
 			Name:  "name",
 			Usage: "Authentication name.",
@@ -102,8 +93,10 @@ var (
 			Usage: "The attribute of the user’s LDAP record containing the user’s avatar.",
 		},
 	}
+}
 
-	ldapBindDnCLIFlags = append(commonLdapCLIFlags,
+func ldapBindDnCLIFlags() []cli.Flag {
+	return append(commonLdapCLIFlags(),
 		&cli.StringFlag{
 			Name:  "bind-dn",
 			Usage: "The DN to bind to the LDAP server with when searching for the user.",
@@ -128,62 +121,62 @@ var (
 			Name:  "page-size",
 			Usage: "Search page size.",
 		})
+}
 
-	ldapSimpleAuthCLIFlags = append(commonLdapCLIFlags,
+func ldapSimpleAuthCLIFlags() []cli.Flag {
+	return append(commonLdapCLIFlags(),
 		&cli.StringFlag{
 			Name:  "user-dn",
 			Usage: "The user's DN.",
 		})
+}
 
-	microcmdAuthAddLdapBindDn = &cli.Command{
+func microcmdAuthAddLdapBindDn() *cli.Command {
+	return &cli.Command{
 		Name:  "add-ldap",
 		Usage: "Add new LDAP (via Bind DN) authentication source",
-		Action: func(c *cli.Context) error {
-			return newAuthService().addLdapBindDn(c)
+		Action: func(ctx context.Context, cli *cli.Command) error {
+			return newAuthService().addLdapBindDn(ctx, cli)
 		},
-		Flags: ldapBindDnCLIFlags,
+		Flags: ldapBindDnCLIFlags(),
 	}
+}
 
-	microcmdAuthUpdateLdapBindDn = &cli.Command{
+func microcmdAuthUpdateLdapBindDn() *cli.Command {
+	return &cli.Command{
 		Name:  "update-ldap",
 		Usage: "Update existing LDAP (via Bind DN) authentication source",
-		Action: func(c *cli.Context) error {
-			return newAuthService().updateLdapBindDn(c)
+		Action: func(ctx context.Context, cli *cli.Command) error {
+			return newAuthService().updateLdapBindDn(ctx, cli)
 		},
-		Flags: append([]cli.Flag{idFlag}, ldapBindDnCLIFlags...),
+		Flags: append([]cli.Flag{idFlag()}, ldapBindDnCLIFlags()...),
 	}
+}
 
-	microcmdAuthAddLdapSimpleAuth = &cli.Command{
+func microcmdAuthAddLdapSimpleAuth() *cli.Command {
+	return &cli.Command{
 		Name:  "add-ldap-simple",
 		Usage: "Add new LDAP (simple auth) authentication source",
-		Action: func(c *cli.Context) error {
-			return newAuthService().addLdapSimpleAuth(c)
+		Action: func(ctx context.Context, cli *cli.Command) error {
+			return newAuthService().addLdapSimpleAuth(ctx, cli)
 		},
-		Flags: ldapSimpleAuthCLIFlags,
+		Flags: ldapSimpleAuthCLIFlags(),
 	}
+}
 
-	microcmdAuthUpdateLdapSimpleAuth = &cli.Command{
+func microcmdAuthUpdateLdapSimpleAuth() *cli.Command {
+	return &cli.Command{
 		Name:  "update-ldap-simple",
 		Usage: "Update existing LDAP (simple auth) authentication source",
-		Action: func(c *cli.Context) error {
-			return newAuthService().updateLdapSimpleAuth(c)
+		Action: func(ctx context.Context, cli *cli.Command) error {
+			return newAuthService().updateLdapSimpleAuth(ctx, cli)
 		},
-		Flags: append([]cli.Flag{idFlag}, ldapSimpleAuthCLIFlags...),
-	}
-)
-
-// newAuthService creates a service with default functions.
-func newAuthService() *authService {
-	return &authService{
-		initDB:            initDB,
-		createAuthSource:  auth.CreateSource,
-		updateAuthSource:  auth.UpdateSource,
-		getAuthSourceByID: auth.GetSourceByID,
+		Flags: append([]cli.Flag{idFlag()}, ldapSimpleAuthCLIFlags()...),
 	}
 }
 
 // parseAuthSource assigns values on authSource according to command line flags.
-func parseAuthSource(c *cli.Context, authSource *auth.Source) {
+func parseAuthSource(c *cli.Command, authSource *auth.Source) {
 	if c.IsSet("name") {
 		authSource.Name = c.String("name")
 	}
@@ -202,7 +195,7 @@ func parseAuthSource(c *cli.Context, authSource *auth.Source) {
 }
 
 // parseLdapConfig assigns values on config according to command line flags.
-func parseLdapConfig(c *cli.Context, config *ldap.Source) error {
+func parseLdapConfig(c *cli.Command, config *ldap.Source) error {
 	if c.IsSet("name") {
 		config.Name = c.String("name")
 	}
@@ -289,7 +282,7 @@ func findLdapSecurityProtocolByName(name string) (ldap.SecurityProtocol, bool) {
 
 // getAuthSource gets the login source by its id defined in the command line flags.
 // It returns an error if the id is not set, does not match any source or if the source is not of expected type.
-func (a *authService) getAuthSource(ctx context.Context, c *cli.Context, authType auth.Type) (*auth.Source, error) {
+func (a *authService) getAuthSource(ctx context.Context, c *cli.Command, authType auth.Type) (*auth.Source, error) {
 	if err := argsSet(c, "id"); err != nil {
 		return nil, err
 	}
@@ -307,12 +300,12 @@ func (a *authService) getAuthSource(ctx context.Context, c *cli.Context, authTyp
 }
 
 // addLdapBindDn adds a new LDAP via Bind DN authentication source.
-func (a *authService) addLdapBindDn(c *cli.Context) error {
+func (a *authService) addLdapBindDn(ctx context.Context, c *cli.Command) error {
 	if err := argsSet(c, "name", "security-protocol", "host", "port", "user-search-base", "user-filter", "email-attribute"); err != nil {
 		return err
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := a.initDB(ctx); err != nil {
@@ -336,8 +329,8 @@ func (a *authService) addLdapBindDn(c *cli.Context) error {
 }
 
 // updateLdapBindDn updates a new LDAP via Bind DN authentication source.
-func (a *authService) updateLdapBindDn(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func (a *authService) updateLdapBindDn(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := a.initDB(ctx); err != nil {
@@ -358,12 +351,12 @@ func (a *authService) updateLdapBindDn(c *cli.Context) error {
 }
 
 // addLdapSimpleAuth adds a new LDAP (simple auth) authentication source.
-func (a *authService) addLdapSimpleAuth(c *cli.Context) error {
+func (a *authService) addLdapSimpleAuth(ctx context.Context, c *cli.Command) error {
 	if err := argsSet(c, "name", "security-protocol", "host", "port", "user-dn", "user-filter", "email-attribute"); err != nil {
 		return err
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := a.initDB(ctx); err != nil {
@@ -387,8 +380,8 @@ func (a *authService) addLdapSimpleAuth(c *cli.Context) error {
 }
 
 // updateLdapSimpleAuth updates a new LDAP (simple auth) authentication source.
-func (a *authService) updateLdapSimpleAuth(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func (a *authService) updateLdapSimpleAuth(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := a.initDB(ctx); err != nil {
diff --git a/cmd/admin_auth_ldap_test.go b/cmd/admin_auth_ldap_test.go
index 269af55d96..89ce5f4f08 100644
--- a/cmd/admin_auth_ldap_test.go
+++ b/cmd/admin_auth_ldap_test.go
@@ -8,18 +8,17 @@ import (
 	"testing"
 
 	"forgejo.org/models/auth"
+	"forgejo.org/modules/test"
 	"forgejo.org/services/auth/source/ldap"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func TestAddLdapBindDn(t *testing.T) {
 	// Mock cli functions to do not exit on error
-	osExiter := cli.OsExiter
-	defer func() { cli.OsExiter = osExiter }()
-	cli.OsExiter = func(code int) {}
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
 
 	// Test cases
 	cases := []struct {
@@ -216,22 +215,22 @@ func TestAddLdapBindDn(t *testing.T) {
 				return nil
 			},
 			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
-				assert.FailNow(t, "case %d: should not call updateAuthSource", n)
+				assert.FailNow(t, "should not call updateAuthSource", "case: %d", n)
 				return nil
 			},
 			getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) {
-				assert.FailNow(t, "case %d: should not call getAuthSourceByID", n)
+				assert.FailNow(t, "should not call getAuthSourceByID", "case: %d", n)
 				return nil, nil
 			},
 		}
 
 		// Create a copy of command to test
-		app := cli.NewApp()
-		app.Flags = microcmdAuthAddLdapBindDn.Flags
+		app := cli.Command{}
+		app.Flags = microcmdAuthAddLdapBindDn().Flags
 		app.Action = service.addLdapBindDn
 
 		// Run it
-		err := app.Run(c.args)
+		err := app.Run(t.Context(), c.args)
 		if c.errMsg != "" {
 			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
 		} else {
@@ -243,9 +242,7 @@ func TestAddLdapBindDn(t *testing.T) {
 
 func TestAddLdapSimpleAuth(t *testing.T) {
 	// Mock cli functions to do not exit on error
-	osExiter := cli.OsExiter
-	defer func() { cli.OsExiter = osExiter }()
-	cli.OsExiter = func(code int) {}
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
 
 	// Test cases
 	cases := []struct {
@@ -447,22 +444,22 @@ func TestAddLdapSimpleAuth(t *testing.T) {
 				return nil
 			},
 			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
-				assert.FailNow(t, "case %d: should not call updateAuthSource", n)
+				assert.FailNow(t, "should not call updateAuthSource", "case: %d", n)
 				return nil
 			},
 			getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) {
-				assert.FailNow(t, "case %d: should not call getAuthSourceByID", n)
+				assert.FailNow(t, "should not call getAuthSourceByID", "case: %d", n)
 				return nil, nil
 			},
 		}
 
 		// Create a copy of command to test
-		app := cli.NewApp()
-		app.Flags = microcmdAuthAddLdapSimpleAuth.Flags
+		app := cli.Command{}
+		app.Flags = microcmdAuthAddLdapSimpleAuth().Flags
 		app.Action = service.addLdapSimpleAuth
 
 		// Run it
-		err := app.Run(c.args)
+		err := app.Run(t.Context(), c.args)
 		if c.errMsg != "" {
 			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
 		} else {
@@ -474,9 +471,7 @@ func TestAddLdapSimpleAuth(t *testing.T) {
 
 func TestUpdateLdapBindDn(t *testing.T) {
 	// Mock cli functions to do not exit on error
-	osExiter := cli.OsExiter
-	defer func() { cli.OsExiter = osExiter }()
-	cli.OsExiter = func(code int) {}
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
 
 	// Test cases
 	cases := []struct {
@@ -898,7 +893,7 @@ func TestUpdateLdapBindDn(t *testing.T) {
 				return nil
 			},
 			createAuthSource: func(ctx context.Context, authSource *auth.Source) error {
-				assert.FailNow(t, "case %d: should not call createAuthSource", n)
+				assert.FailNow(t, "should not call createAuthSource", "case: %d", n)
 				return nil
 			},
 			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
@@ -920,12 +915,12 @@ func TestUpdateLdapBindDn(t *testing.T) {
 		}
 
 		// Create a copy of command to test
-		app := cli.NewApp()
-		app.Flags = microcmdAuthUpdateLdapBindDn.Flags
+		app := cli.Command{}
+		app.Flags = microcmdAuthUpdateLdapBindDn().Flags
 		app.Action = service.updateLdapBindDn
 
 		// Run it
-		err := app.Run(c.args)
+		err := app.Run(t.Context(), c.args)
 		if c.errMsg != "" {
 			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
 		} else {
@@ -937,9 +932,7 @@ func TestUpdateLdapBindDn(t *testing.T) {
 
 func TestUpdateLdapSimpleAuth(t *testing.T) {
 	// Mock cli functions to do not exit on error
-	osExiter := cli.OsExiter
-	defer func() { cli.OsExiter = osExiter }()
-	cli.OsExiter = func(code int) {}
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
 
 	// Test cases
 	cases := []struct {
@@ -1288,7 +1281,7 @@ func TestUpdateLdapSimpleAuth(t *testing.T) {
 				return nil
 			},
 			createAuthSource: func(ctx context.Context, authSource *auth.Source) error {
-				assert.FailNow(t, "case %d: should not call createAuthSource", n)
+				assert.FailNow(t, "should not call createAuthSource", "case: %d", n)
 				return nil
 			},
 			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
@@ -1310,12 +1303,12 @@ func TestUpdateLdapSimpleAuth(t *testing.T) {
 		}
 
 		// Create a copy of command to test
-		app := cli.NewApp()
-		app.Flags = microcmdAuthUpdateLdapSimpleAuth.Flags
+		app := cli.Command{}
+		app.Flags = microcmdAuthUpdateLdapSimpleAuth().Flags
 		app.Action = service.updateLdapSimpleAuth
 
 		// Run it
-		err := app.Run(c.args)
+		err := app.Run(t.Context(), c.args)
 		if c.errMsg != "" {
 			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
 		} else {
diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go
index 58238794b8..ef5d9116e3 100644
--- a/cmd/admin_auth_oauth.go
+++ b/cmd/admin_auth_oauth.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/url"
@@ -11,11 +12,11 @@ import (
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/services/auth/source/oauth2"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	oauthCLIFlags = []cli.Flag{
+func oauthCLIFlags() []cli.Flag {
+	return []cli.Flag{
 		&cli.StringFlag{
 			Name:  "name",
 			Value: "",
@@ -85,6 +86,11 @@ var (
 			Value: nil,
 			Usage: "Scopes to request when to authenticate against this OAuth2 source",
 		},
+		&cli.StringFlag{
+			Name:  "attribute-ssh-public-key",
+			Value: "",
+			Usage: "Claim name providing SSH public keys for this source",
+		},
 		&cli.StringFlag{
 			Name:  "required-claim-name",
 			Value: "",
@@ -119,24 +125,32 @@ var (
 			Name:  "group-team-map-removal",
 			Usage: "Activate automatic team membership removal depending on groups",
 		},
+		&cli.BoolFlag{
+			Name:  "allow-username-change",
+			Usage: "Allow users to change their username",
+		},
 	}
+}
 
-	microcmdAuthAddOauth = &cli.Command{
+func microcmdAuthAddOauth() *cli.Command {
+	return &cli.Command{
 		Name:   "add-oauth",
 		Usage:  "Add new Oauth authentication source",
-		Action: runAddOauth,
-		Flags:  oauthCLIFlags,
+		Action: newAuthService().addOauth,
+		Flags:  oauthCLIFlags(),
 	}
+}
 
-	microcmdAuthUpdateOauth = &cli.Command{
+func microcmdAuthUpdateOauth() *cli.Command {
+	return &cli.Command{
 		Name:   "update-oauth",
 		Usage:  "Update existing Oauth authentication source",
-		Action: runUpdateOauth,
-		Flags:  append(oauthCLIFlags[:1], append([]cli.Flag{idFlag}, oauthCLIFlags[1:]...)...),
+		Action: newAuthService().updateOauth,
+		Flags:  append(oauthCLIFlags()[:1], append([]cli.Flag{idFlag()}, oauthCLIFlags()[1:]...)...),
 	}
-)
+}
 
-func parseOAuth2Config(c *cli.Context) *oauth2.Source {
+func parseOAuth2Config(_ context.Context, c *cli.Command) *oauth2.Source {
 	var customURLMapping *oauth2.CustomURLMapping
 	if c.IsSet("use-custom-urls") {
 		customURLMapping = &oauth2.CustomURLMapping{
@@ -158,6 +172,7 @@ func parseOAuth2Config(c *cli.Context) *oauth2.Source {
 		IconURL:                       c.String("icon-url"),
 		SkipLocalTwoFA:                c.Bool("skip-local-2fa"),
 		Scopes:                        c.StringSlice("scopes"),
+		AttributeSSHPublicKey:         c.String("attribute-ssh-public-key"),
 		RequiredClaimName:             c.String("required-claim-name"),
 		RequiredClaimValue:            c.String("required-claim-value"),
 		GroupClaimName:                c.String("group-claim-name"),
@@ -165,18 +180,19 @@ func parseOAuth2Config(c *cli.Context) *oauth2.Source {
 		RestrictedGroup:               c.String("restricted-group"),
 		GroupTeamMap:                  c.String("group-team-map"),
 		GroupTeamMapRemoval:           c.Bool("group-team-map-removal"),
+		AllowUsernameChange:           c.Bool("allow-username-change"),
 	}
 }
 
-func runAddOauth(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func (a *authService) addOauth(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	if err := initDB(ctx); err != nil {
+	if err := a.initDB(ctx); err != nil {
 		return err
 	}
 
-	config := parseOAuth2Config(c)
+	config := parseOAuth2Config(ctx, c)
 	if config.Provider == "openidConnect" {
 		discoveryURL, err := url.Parse(config.OpenIDConnectAutoDiscoveryURL)
 		if err != nil || (discoveryURL.Scheme != "http" && discoveryURL.Scheme != "https") {
@@ -184,7 +200,7 @@ func runAddOauth(c *cli.Context) error {
 		}
 	}
 
-	return auth_model.CreateSource(ctx, &auth_model.Source{
+	return a.createAuthSource(ctx, &auth_model.Source{
 		Type:     auth_model.OAuth2,
 		Name:     c.String("name"),
 		IsActive: true,
@@ -192,19 +208,19 @@ func runAddOauth(c *cli.Context) error {
 	})
 }
 
-func runUpdateOauth(c *cli.Context) error {
+func (a *authService) updateOauth(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("id") {
 		return errors.New("--id flag is missing")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	if err := initDB(ctx); err != nil {
+	if err := a.initDB(ctx); err != nil {
 		return err
 	}
 
-	source, err := auth_model.GetSourceByID(ctx, c.Int64("id"))
+	source, err := a.getAuthSourceByID(ctx, c.Int64("id"))
 	if err != nil {
 		return err
 	}
@@ -239,6 +255,10 @@ func runUpdateOauth(c *cli.Context) error {
 		oAuth2Config.Scopes = c.StringSlice("scopes")
 	}
 
+	if c.IsSet("attribute-ssh-public-key") {
+		oAuth2Config.AttributeSSHPublicKey = c.String("attribute-ssh-public-key")
+	}
+
 	if c.IsSet("required-claim-name") {
 		oAuth2Config.RequiredClaimName = c.String("required-claim-name")
 	}
@@ -262,6 +282,10 @@ func runUpdateOauth(c *cli.Context) error {
 		oAuth2Config.GroupTeamMapRemoval = c.Bool("group-team-map-removal")
 	}
 
+	if c.IsSet("allow-username-change") {
+		oAuth2Config.AllowUsernameChange = c.Bool("allow-username-change")
+	}
+
 	// update custom URL mapping
 	customURLMapping := &oauth2.CustomURLMapping{}
 
@@ -295,5 +319,5 @@ func runUpdateOauth(c *cli.Context) error {
 	oAuth2Config.CustomURLMapping = customURLMapping
 	source.Cfg = oAuth2Config
 
-	return auth_model.UpdateSource(ctx, source)
+	return a.updateAuthSource(ctx, source)
 }
diff --git a/cmd/admin_auth_oauth_test.go b/cmd/admin_auth_oauth_test.go
new file mode 100644
index 0000000000..3430ad1f56
--- /dev/null
+++ b/cmd/admin_auth_oauth_test.go
@@ -0,0 +1,706 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package cmd
+
+import (
+	"context"
+	"testing"
+
+	"forgejo.org/models/auth"
+	"forgejo.org/modules/test"
+	"forgejo.org/services/auth/source/oauth2"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/urfave/cli/v3"
+)
+
+func TestAddOauth(t *testing.T) {
+	// Mock cli functions to do not exit on error
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
+
+	// Test cases
+	cases := []struct {
+		args   []string
+		source *auth.Source
+		errMsg string
+	}{
+		// case 0
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source full",
+				"--provider", "openidConnect",
+				"--key", "client id",
+				"--secret", "client secret",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+				"--use-custom-urls", "",
+				"--custom-tenant-id", "tenant id",
+				"--custom-auth-url", "https://example.com/auth",
+				"--custom-token-url", "https://example.com/token",
+				"--custom-profile-url", "https://example.com/profile",
+				"--custom-email-url", "https://example.com/email",
+				"--icon-url", "https://example.com/icon.svg",
+				"--skip-local-2fa",
+				"--scopes", "address",
+				"--scopes", "email",
+				"--scopes", "phone",
+				"--scopes", "profile",
+				"--attribute-ssh-public-key", "ssh_public_key",
+				"--required-claim-name", "can_access",
+				"--required-claim-value", "yes",
+				"--group-claim-name", "groups",
+				"--admin-group", "admin",
+				"--restricted-group", "restricted",
+				"--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+				"--group-team-map-removal",
+				"--allow-username-change",
+			},
+			source: &auth.Source{
+				Type:     auth.OAuth2,
+				Name:     "oauth2 (via openidConnect) source full",
+				IsActive: true,
+				Cfg: &oauth2.Source{
+					Provider:                      "openidConnect",
+					ClientID:                      "client id",
+					ClientSecret:                  "client secret",
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					CustomURLMapping: &oauth2.CustomURLMapping{
+						AuthURL:    "https://example.com/auth",
+						TokenURL:   "https://example.com/token",
+						ProfileURL: "https://example.com/profile",
+						EmailURL:   "https://example.com/email",
+						Tenant:     "tenant id",
+					},
+					IconURL:               "https://example.com/icon.svg",
+					Scopes:                []string{"address", "email", "phone", "profile"},
+					AttributeSSHPublicKey: "ssh_public_key",
+					RequiredClaimName:     "can_access",
+					RequiredClaimValue:    "yes",
+					GroupClaimName:        "groups",
+					AdminGroup:            "admin",
+					GroupTeamMap:          `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+					GroupTeamMapRemoval:   true,
+					RestrictedGroup:       "restricted",
+					SkipLocalTwoFA:        true,
+					AllowUsernameChange:   true,
+				},
+			},
+		},
+		// case 1
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source min",
+				"--provider", "openidConnect",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+			},
+			source: &auth.Source{
+				Type:     auth.OAuth2,
+				Name:     "oauth2 (via openidConnect) source min",
+				IsActive: true,
+				Cfg: &oauth2.Source{
+					Provider:                      "openidConnect",
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					Scopes:                        []string{},
+				},
+			},
+		},
+		// case 2
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags",
+				"--custom-tenant-id", "tenant id",
+				"--custom-auth-url", "https://example.com/auth",
+				"--custom-token-url", "https://example.com/token",
+				"--custom-profile-url", "https://example.com/profile",
+				"--custom-email-url", "https://example.com/email",
+			},
+			source: &auth.Source{
+				Type:     auth.OAuth2,
+				Name:     "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags",
+				IsActive: true,
+				Cfg: &oauth2.Source{
+					Scopes: []string{},
+				},
+			},
+		},
+		// case 3
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses",
+				"--provider", "openidConnect",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+				"--scopes", "address",
+				"--scopes", "email",
+				"--scopes", "phone",
+				"--scopes", "profile",
+			},
+			source: &auth.Source{
+				Type:     auth.OAuth2,
+				Name:     "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses",
+				IsActive: true,
+				Cfg: &oauth2.Source{
+					Provider:                      "openidConnect",
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					Scopes:                        []string{"address", "email", "phone", "profile"},
+				},
+			},
+		},
+		// case 4
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source `--scopes` supports commas as separators",
+				"--provider", "openidConnect",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+				"--scopes", "address,email,phone,profile",
+			},
+			source: &auth.Source{
+				Type:     auth.OAuth2,
+				Name:     "oauth2 (via openidConnect) source `--scopes` supports commas as separators",
+				IsActive: true,
+				Cfg: &oauth2.Source{
+					Provider:                      "openidConnect",
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					Scopes:                        []string{"address", "email", "phone", "profile"},
+				},
+			},
+		},
+		// case 5
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source",
+				"--provider", "openidConnect",
+			},
+			errMsg: "invalid Auto Discovery URL:  (this must be a valid URL starting with http:// or https://)",
+		},
+		// case 6
+		{
+			args: []string{
+				"oauth-test",
+				"--name", "oauth2 (via openidConnect) source",
+				"--provider", "openidConnect",
+				"--auto-discover-url", "example.com",
+			},
+			errMsg: "invalid Auto Discovery URL: example.com (this must be a valid URL starting with http:// or https://)",
+		},
+	}
+
+	for n, c := range cases {
+		// Mock functions.
+		var createdAuthSource *auth.Source
+		service := &authService{
+			initDB: func(context.Context) error {
+				return nil
+			},
+			createAuthSource: func(ctx context.Context, authSource *auth.Source) error {
+				createdAuthSource = authSource
+				return nil
+			},
+			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
+				assert.FailNow(t, "should not call updateAuthSource", "case: %d", n)
+				return nil
+			},
+			getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) {
+				assert.FailNow(t, "should not call getAuthSourceByID", "case: %d", n)
+				return nil, nil
+			},
+		}
+
+		// Create a copy of command to test
+		app := cli.Command{}
+		app.Flags = microcmdAuthAddOauth().Flags
+		app.Action = service.addOauth
+
+		// Run it
+		err := app.Run(t.Context(), c.args)
+		if c.errMsg != "" {
+			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
+		} else {
+			require.NoError(t, err, "case %d: should have no errors", n)
+			assert.Equal(t, c.source, createdAuthSource, "case %d: wrong authSource", n)
+		}
+	}
+}
+
+func TestUpdateOauth(t *testing.T) {
+	// Mock cli functions to do not exit on error
+	defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
+
+	// Test cases
+	cases := []struct {
+		args               []string
+		id                 int64
+		existingAuthSource *auth.Source
+		authSource         *auth.Source
+		errMsg             string
+	}{
+		// case 0
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "23",
+				"--name", "oauth2 (via openidConnect) source full",
+				"--provider", "openidConnect",
+				"--key", "client id",
+				"--secret", "client secret",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+				"--use-custom-urls", "",
+				"--custom-tenant-id", "tenant id",
+				"--custom-auth-url", "https://example.com/auth",
+				"--custom-token-url", "https://example.com/token",
+				"--custom-profile-url", "https://example.com/profile",
+				"--custom-email-url", "https://example.com/email",
+				"--icon-url", "https://example.com/icon.svg",
+				"--skip-local-2fa",
+				"--scopes", "address",
+				"--scopes", "email",
+				"--scopes", "phone",
+				"--scopes", "profile",
+				"--attribute-ssh-public-key", "ssh_public_key",
+				"--required-claim-name", "can_access",
+				"--required-claim-value", "yes",
+				"--group-claim-name", "groups",
+				"--admin-group", "admin",
+				"--restricted-group", "restricted",
+				"--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+				"--group-team-map-removal",
+			},
+			id: 23,
+			existingAuthSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg:  &oauth2.Source{},
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source full",
+				Cfg: &oauth2.Source{
+					Provider:                      "openidConnect",
+					ClientID:                      "client id",
+					ClientSecret:                  "client secret",
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					CustomURLMapping: &oauth2.CustomURLMapping{
+						AuthURL:    "https://example.com/auth",
+						TokenURL:   "https://example.com/token",
+						ProfileURL: "https://example.com/profile",
+						EmailURL:   "https://example.com/email",
+						Tenant:     "tenant id",
+					},
+					IconURL:               "https://example.com/icon.svg",
+					Scopes:                []string{"address", "email", "phone", "profile"},
+					AttributeSSHPublicKey: "ssh_public_key",
+					RequiredClaimName:     "can_access",
+					RequiredClaimValue:    "yes",
+					GroupClaimName:        "groups",
+					AdminGroup:            "admin",
+					GroupTeamMap:          `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+					GroupTeamMapRemoval:   true,
+					RestrictedGroup:       "restricted",
+					// `--skip-local-2fa` is currently ignored.
+					// SkipLocalTwoFA:        true,
+				},
+			},
+		},
+		// case 1
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 2
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--name", "oauth2 (via openidConnect) source full",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source full",
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 3
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--provider", "openidConnect",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					Provider:         "openidConnect",
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 4
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--key", "client id",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					ClientID:         "client id",
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 5
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--secret", "client secret",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					ClientSecret:     "client secret",
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 6
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--auto-discover-url", "https://example.com/.well-known/openid-configuration",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration",
+					CustomURLMapping:              &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 7
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--use-custom-urls", "",
+				"--custom-tenant-id", "tenant id",
+				"--custom-auth-url", "https://example.com/auth",
+				"--custom-token-url", "https://example.com/token",
+				"--custom-profile-url", "https://example.com/profile",
+				"--custom-email-url", "https://example.com/email",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{
+						AuthURL:    "https://example.com/auth",
+						TokenURL:   "https://example.com/token",
+						ProfileURL: "https://example.com/profile",
+						EmailURL:   "https://example.com/email",
+						Tenant:     "tenant id",
+					},
+				},
+			},
+		},
+		// case 8
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--name", "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags",
+				"--custom-tenant-id", "tenant id",
+				"--custom-auth-url", "https://example.com/auth",
+				"--custom-token-url", "https://example.com/token",
+				"--custom-profile-url", "https://example.com/profile",
+				"--custom-email-url", "https://example.com/email",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags",
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+				},
+			},
+		},
+		// case 9
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--icon-url", "https://example.com/icon.svg",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					IconURL:          "https://example.com/icon.svg",
+				},
+			},
+		},
+		// case 10
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--name", "oauth2 (via openidConnect) source `--skip-local-2fa` is currently ignored",
+				"--skip-local-2fa",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source `--skip-local-2fa` is currently ignored",
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					// `--skip-local-2fa` is currently ignored.
+					// SkipLocalTwoFA: true,
+				},
+			},
+		},
+		// case 11
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--name", "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses",
+				"--scopes", "address",
+				"--scopes", "email",
+				"--scopes", "phone",
+				"--scopes", "profile",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses",
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					Scopes:           []string{"address", "email", "phone", "profile"},
+				},
+			},
+		},
+		// case 12
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--name", "oauth2 (via openidConnect) source `--scopes` supports commas as separators",
+				"--scopes", "address,email,phone,profile",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Name: "oauth2 (via openidConnect) source `--scopes` supports commas as separators",
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					Scopes:           []string{"address", "email", "phone", "profile"},
+				},
+			},
+		},
+		// case 13
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--attribute-ssh-public-key", "ssh_public_key",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping:      &oauth2.CustomURLMapping{},
+					AttributeSSHPublicKey: "ssh_public_key",
+				},
+			},
+		},
+		// case 14
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--required-claim-name", "can_access",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping:  &oauth2.CustomURLMapping{},
+					RequiredClaimName: "can_access",
+				},
+			},
+		},
+		// case 15
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--required-claim-value", "yes",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping:   &oauth2.CustomURLMapping{},
+					RequiredClaimValue: "yes",
+				},
+			},
+		},
+		// case 16
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--group-claim-name", "groups",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					GroupClaimName:   "groups",
+				},
+			},
+		},
+		// case 17
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--admin-group", "admin",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					AdminGroup:       "admin",
+				},
+			},
+		},
+		// case 18
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--restricted-group", "restricted",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					RestrictedGroup:  "restricted",
+				},
+			},
+		},
+		// case 19
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping: &oauth2.CustomURLMapping{},
+					GroupTeamMap:     `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`,
+				},
+			},
+		},
+		// case 20
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "1",
+				"--group-team-map-removal",
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping:    &oauth2.CustomURLMapping{},
+					GroupTeamMapRemoval: true,
+				},
+			},
+		},
+		// case 21
+		{
+			args: []string{
+				"oauth-test",
+				"--id", "23",
+				"--group-team-map-removal=false",
+			},
+			id: 23,
+			existingAuthSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					GroupTeamMapRemoval: true,
+				},
+			},
+			authSource: &auth.Source{
+				Type: auth.OAuth2,
+				Cfg: &oauth2.Source{
+					CustomURLMapping:    &oauth2.CustomURLMapping{},
+					GroupTeamMapRemoval: false,
+				},
+			},
+		},
+		// case 22
+		{
+			args: []string{
+				"oauth-test",
+			},
+			errMsg: "--id flag is missing",
+		},
+	}
+
+	for n, c := range cases {
+		// Mock functions.
+		var updatedAuthSource *auth.Source
+		service := &authService{
+			initDB: func(context.Context) error {
+				return nil
+			},
+			createAuthSource: func(ctx context.Context, authSource *auth.Source) error {
+				assert.FailNow(t, "should not call createAuthSource", "case: %d", n)
+				return nil
+			},
+			updateAuthSource: func(ctx context.Context, authSource *auth.Source) error {
+				updatedAuthSource = authSource
+				return nil
+			},
+			getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) {
+				if c.id != 0 {
+					assert.Equal(t, c.id, id, "case %d: wrong id", n)
+				}
+				if c.existingAuthSource != nil {
+					return c.existingAuthSource, nil
+				}
+				return &auth.Source{
+					Type: auth.OAuth2,
+					Cfg:  &oauth2.Source{},
+				}, nil
+			},
+		}
+
+		// Create a copy of command to test
+		app := cli.Command{}
+		app.Flags = microcmdAuthUpdateOauth().Flags
+		app.Action = service.updateOauth
+
+		// Run it
+		err := app.Run(t.Context(), c.args)
+		if c.errMsg != "" {
+			assert.EqualError(t, err, c.errMsg, "case %d: error should match", n)
+		} else {
+			require.NoError(t, err, "case %d: should have no errors", n)
+			assert.Equal(t, c.authSource, updatedAuthSource, "case %d: wrong authSource", n)
+		}
+	}
+}
diff --git a/cmd/admin_auth_stmp.go b/cmd/admin_auth_stmp.go
index e166cc38cd..48b3adaac3 100644
--- a/cmd/admin_auth_stmp.go
+++ b/cmd/admin_auth_stmp.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"strings"
 
@@ -11,11 +12,11 @@ import (
 	"forgejo.org/modules/util"
 	"forgejo.org/services/auth/source/smtp"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	smtpCLIFlags = []cli.Flag{
+func smtpCLIFlags() []cli.Flag {
+	return []cli.Flag{
 		&cli.StringFlag{
 			Name:  "name",
 			Value: "",
@@ -71,23 +72,27 @@ var (
 			Value: true,
 		},
 	}
+}
 
-	microcmdAuthAddSMTP = &cli.Command{
+func microcmdAuthAddSMTP() *cli.Command {
+	return &cli.Command{
 		Name:   "add-smtp",
 		Usage:  "Add new SMTP authentication source",
 		Action: runAddSMTP,
-		Flags:  smtpCLIFlags,
+		Flags:  smtpCLIFlags(),
 	}
+}
 
-	microcmdAuthUpdateSMTP = &cli.Command{
+func microcmdAuthUpdateSMTP() *cli.Command {
+	return &cli.Command{
 		Name:   "update-smtp",
 		Usage:  "Update existing SMTP authentication source",
 		Action: runUpdateSMTP,
-		Flags:  append(smtpCLIFlags[:1], append([]cli.Flag{idFlag}, smtpCLIFlags[1:]...)...),
+		Flags:  append(smtpCLIFlags()[:1], append([]cli.Flag{idFlag()}, smtpCLIFlags()[1:]...)...),
 	}
-)
+}
 
-func parseSMTPConfig(c *cli.Context, conf *smtp.Source) error {
+func parseSMTPConfig(c *cli.Command, conf *smtp.Source) error {
 	if c.IsSet("auth-type") {
 		conf.Auth = c.String("auth-type")
 		validAuthTypes := []string{"PLAIN", "LOGIN", "CRAM-MD5"}
@@ -123,8 +128,8 @@ func parseSMTPConfig(c *cli.Context, conf *smtp.Source) error {
 	return nil
 }
 
-func runAddSMTP(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runAddSMTP(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -163,12 +168,12 @@ func runAddSMTP(c *cli.Context) error {
 	})
 }
 
-func runUpdateSMTP(c *cli.Context) error {
+func runUpdateSMTP(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("id") {
 		return errors.New("--id flag is missing")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_regenerate.go b/cmd/admin_regenerate.go
index 4e7f685843..7bfd12f8f4 100644
--- a/cmd/admin_regenerate.go
+++ b/cmd/admin_regenerate.go
@@ -4,11 +4,13 @@
 package cmd
 
 import (
+	"context"
+
 	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/modules/graceful"
 	repo_service "forgejo.org/services/repository"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 var (
@@ -25,8 +27,8 @@ var (
 	}
 )
 
-func runRegenerateHooks(_ *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRegenerateHooks(ctx context.Context, _ *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -35,8 +37,8 @@ func runRegenerateHooks(_ *cli.Context) error {
 	return repo_service.SyncRepositoryHooks(graceful.GetManager().ShutdownContext())
 }
 
-func runRegenerateKeys(_ *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRegenerateKeys(ctx context.Context, _ *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_user.go b/cmd/admin_user.go
index 967a6ed88a..f4f6fb49af 100644
--- a/cmd/admin_user.go
+++ b/cmd/admin_user.go
@@ -4,18 +4,21 @@
 package cmd
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var subcmdUser = &cli.Command{
-	Name:  "user",
-	Usage: "Modify users",
-	Subcommands: []*cli.Command{
-		microcmdUserCreate,
-		microcmdUserList,
-		microcmdUserChangePassword,
-		microcmdUserDelete,
-		microcmdUserGenerateAccessToken,
-		microcmdUserMustChangePassword,
-	},
+func subcmdUser() *cli.Command {
+	return &cli.Command{
+		Name:  "user",
+		Usage: "Modify users",
+		Commands: []*cli.Command{
+			microcmdUserCreate(),
+			microcmdUserList(),
+			microcmdUserChangePassword(),
+			microcmdUserDelete(),
+			microcmdUserGenerateAccessToken(),
+			microcmdUserMustChangePassword(),
+			microcmdUserResetMFA(),
+		},
+	}
 }
diff --git a/cmd/admin_user_change_password.go b/cmd/admin_user_change_password.go
index 563ad96afd..dd8c9d378a 100644
--- a/cmd/admin_user_change_password.go
+++ b/cmd/admin_user_change_password.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -13,40 +14,42 @@ import (
 	"forgejo.org/modules/setting"
 	user_service "forgejo.org/services/user"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserChangePassword = &cli.Command{
-	Name:   "change-password",
-	Usage:  "Change a user's password",
-	Action: runChangePassword,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "username",
-			Aliases: []string{"u"},
-			Value:   "",
-			Usage:   "The user to change password for",
+func microcmdUserChangePassword() *cli.Command {
+	return &cli.Command{
+		Name:   "change-password",
+		Usage:  "Change a user's password",
+		Action: runChangePassword,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "username",
+				Aliases: []string{"u"},
+				Value:   "",
+				Usage:   "The user to change password for",
+			},
+			&cli.StringFlag{
+				Name:    "password",
+				Aliases: []string{"p"},
+				Value:   "",
+				Usage:   "New password to set for user",
+			},
+			&cli.BoolFlag{
+				Name:  "must-change-password",
+				Usage: "User must change password",
+				Value: true,
+			},
 		},
-		&cli.StringFlag{
-			Name:    "password",
-			Aliases: []string{"p"},
-			Value:   "",
-			Usage:   "New password to set for user",
-		},
-		&cli.BoolFlag{
-			Name:  "must-change-password",
-			Usage: "User must change password",
-			Value: true,
-		},
-	},
+	}
 }
 
-func runChangePassword(c *cli.Context) error {
+func runChangePassword(ctx context.Context, c *cli.Command) error {
 	if err := argsSet(c, "username", "password"); err != nil {
 		return err
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_user_create.go b/cmd/admin_user_create.go
index 33e61c0753..96431412f6 100644
--- a/cmd/admin_user_create.go
+++ b/cmd/admin_user_create.go
@@ -4,8 +4,10 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
+	"strings"
 
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
@@ -14,61 +16,76 @@ import (
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserCreate = &cli.Command{
-	Name:   "create",
-	Usage:  "Create a new user in database",
-	Action: runCreateUser,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "name",
-			Usage: "Username. DEPRECATED: use username instead",
+func microcmdUserCreate() *cli.Command {
+	return &cli.Command{
+		Name:   "create",
+		Usage:  "Create a new user in database",
+		Action: runCreateUser,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "name",
+				Usage: "Username. DEPRECATED: use username instead",
+			},
+			&cli.StringFlag{
+				Name:  "username",
+				Usage: "Username",
+			},
+			&cli.StringFlag{
+				Name:  "password",
+				Usage: "User password",
+			},
+			&cli.StringFlag{
+				Name:  "email",
+				Usage: "User email address",
+			},
+			&cli.BoolFlag{
+				Name:  "admin",
+				Usage: "User is an admin",
+			},
+			&cli.BoolFlag{
+				Name:  "random-password",
+				Usage: "Generate a random password for the user",
+			},
+			&cli.BoolFlag{
+				Name:  "must-change-password",
+				Usage: "Set this option to false to prevent forcing the user to change their password after initial login",
+				Value: true,
+			},
+			&cli.IntFlag{
+				Name:  "random-password-length",
+				Usage: "Length of the random password to be generated",
+				Value: 12,
+			},
+			&cli.BoolFlag{
+				Name:  "access-token",
+				Usage: "Generate access token for the user",
+			},
+			&cli.StringFlag{
+				Name:  "access-token-name",
+				Usage: `Name of the generated access token`,
+				Value: "gitea-admin",
+			},
+			&cli.StringFlag{
+				Name:  "access-token-scopes",
+				Usage: `Scopes of the generated access token, comma separated. Examples: "all", "public-only,read:issue", "write:repository,write:user"`,
+				Value: "all",
+			},
+			&cli.BoolFlag{
+				Name:  "restricted",
+				Usage: "Make a restricted user account",
+			},
+			&cli.StringFlag{
+				Name:  "fullname",
+				Usage: `The full, human-readable name of the user`,
+			},
 		},
-		&cli.StringFlag{
-			Name:  "username",
-			Usage: "Username",
-		},
-		&cli.StringFlag{
-			Name:  "password",
-			Usage: "User password",
-		},
-		&cli.StringFlag{
-			Name:  "email",
-			Usage: "User email address",
-		},
-		&cli.BoolFlag{
-			Name:  "admin",
-			Usage: "User is an admin",
-		},
-		&cli.BoolFlag{
-			Name:  "random-password",
-			Usage: "Generate a random password for the user",
-		},
-		&cli.BoolFlag{
-			Name:               "must-change-password",
-			Usage:              "Set this option to false to prevent forcing the user to change their password after initial login",
-			Value:              true,
-			DisableDefaultText: true,
-		},
-		&cli.IntFlag{
-			Name:  "random-password-length",
-			Usage: "Length of the random password to be generated",
-			Value: 12,
-		},
-		&cli.BoolFlag{
-			Name:  "access-token",
-			Usage: "Generate access token for the user",
-		},
-		&cli.BoolFlag{
-			Name:  "restricted",
-			Usage: "Make a restricted user account",
-		},
-	},
+	}
 }
 
-func runCreateUser(c *cli.Context) error {
+func runCreateUser(ctx context.Context, c *cli.Command) error {
 	// this command highly depends on the many setting options (create org, visibility, etc.), so it must have a full setting load first
 	// duplicate setting loading should be safe at the moment, but it should be refactored & improved in the future.
 	setting.LoadSettings()
@@ -93,10 +110,10 @@ func runCreateUser(c *cli.Context) error {
 		username = c.String("username")
 	} else {
 		username = c.String("name")
-		_, _ = fmt.Fprintf(c.App.ErrWriter, "--name flag is deprecated. Use --username instead.\n")
+		_, _ = fmt.Fprint(c.Root().ErrWriter, "--name flag is deprecated. Use --username instead.\n")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -150,6 +167,7 @@ func runCreateUser(c *cli.Context) error {
 		IsAdmin:            isAdmin,
 		MustChangePassword: mustChangePassword,
 		Visibility:         visibility,
+		FullName:           c.String("fullname"),
 	}
 
 	overwriteDefault := &user_model.CreateUserOverwriteOptions{
@@ -157,23 +175,40 @@ func runCreateUser(c *cli.Context) error {
 		IsRestricted: restricted,
 	}
 
+	var accessTokenName string
+	var accessTokenScope auth_model.AccessTokenScope
+	if c.IsSet("access-token") {
+		accessTokenName = strings.TrimSpace(c.String("access-token-name"))
+		if accessTokenName == "" {
+			return errors.New("access-token-name cannot be empty")
+		}
+		var err error
+		accessTokenScope, err = auth_model.AccessTokenScope(c.String("access-token-scopes")).Normalize()
+		if err != nil {
+			return fmt.Errorf("invalid access token scope provided: %w", err)
+		}
+		if !accessTokenScope.HasPermissionScope() {
+			return errors.New("access token does not have any permission")
+		}
+	} else if c.IsSet("access-token-name") || c.IsSet("access-token-scopes") {
+		return errors.New("access-token-name and access-token-scopes flags are only valid when access-token flag is set")
+	}
+
+	// arguments should be prepared before creating the user & access token, in case there is anything wrong
+
+	// create the user
 	if err := user_model.CreateUser(ctx, u, overwriteDefault); err != nil {
 		return fmt.Errorf("CreateUser: %w", err)
 	}
+	fmt.Printf("New user '%s' has been successfully created!\n", username)
 
-	if c.Bool("access-token") {
-		t := &auth_model.AccessToken{
-			Name: "gitea-admin",
-			UID:  u.ID,
-		}
-
+	// create the access token
+	if accessTokenScope != "" {
+		t := &auth_model.AccessToken{Name: accessTokenName, UID: u.ID, Scope: accessTokenScope}
 		if err := auth_model.NewAccessToken(ctx, t); err != nil {
 			return err
 		}
-
 		fmt.Printf("Access token was successfully created... %s\n", t.Token)
 	}
-
-	fmt.Printf("New user '%s' has been successfully created!\n", username)
 	return nil
 }
diff --git a/cmd/admin_user_delete.go b/cmd/admin_user_delete.go
index 9a4cc22a77..3382c53e5f 100644
--- a/cmd/admin_user_delete.go
+++ b/cmd/admin_user_delete.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
@@ -12,41 +13,43 @@ import (
 	"forgejo.org/modules/storage"
 	user_service "forgejo.org/services/user"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserDelete = &cli.Command{
-	Name:  "delete",
-	Usage: "Delete specific user by id, name or email",
-	Flags: []cli.Flag{
-		&cli.Int64Flag{
-			Name:  "id",
-			Usage: "ID of user of the user to delete",
+func microcmdUserDelete() *cli.Command {
+	return &cli.Command{
+		Name:  "delete",
+		Usage: "Delete specific user by id, name or email",
+		Flags: []cli.Flag{
+			&cli.Int64Flag{
+				Name:  "id",
+				Usage: "ID of user of the user to delete",
+			},
+			&cli.StringFlag{
+				Name:    "username",
+				Aliases: []string{"u"},
+				Usage:   "Username of the user to delete",
+			},
+			&cli.StringFlag{
+				Name:    "email",
+				Aliases: []string{"e"},
+				Usage:   "Email of the user to delete",
+			},
+			&cli.BoolFlag{
+				Name:  "purge",
+				Usage: "Purge user, all their repositories, organizations and comments",
+			},
 		},
-		&cli.StringFlag{
-			Name:    "username",
-			Aliases: []string{"u"},
-			Usage:   "Username of the user to delete",
-		},
-		&cli.StringFlag{
-			Name:    "email",
-			Aliases: []string{"e"},
-			Usage:   "Email of the user to delete",
-		},
-		&cli.BoolFlag{
-			Name:  "purge",
-			Usage: "Purge user, all their repositories, organizations and comments",
-		},
-	},
-	Action: runDeleteUser,
+		Action: runDeleteUser,
+	}
 }
 
-func runDeleteUser(c *cli.Context) error {
+func runDeleteUser(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("id") && !c.IsSet("username") && !c.IsSet("email") {
 		return errors.New("You must provide the id, username or email of a user to delete")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
diff --git a/cmd/admin_user_generate_access_token.go b/cmd/admin_user_generate_access_token.go
index abb874bd5f..d0f2878297 100644
--- a/cmd/admin_user_generate_access_token.go
+++ b/cmd/admin_user_generate_access_token.go
@@ -4,49 +4,52 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
 	auth_model "forgejo.org/models/auth"
 	user_model "forgejo.org/models/user"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserGenerateAccessToken = &cli.Command{
-	Name:  "generate-access-token",
-	Usage: "Generate an access token for a specific user",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "username",
-			Aliases: []string{"u"},
-			Usage:   "Username",
+func microcmdUserGenerateAccessToken() *cli.Command {
+	return &cli.Command{
+		Name:  "generate-access-token",
+		Usage: "Generate an access token for a specific user",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "username",
+				Aliases: []string{"u"},
+				Usage:   "Username",
+			},
+			&cli.StringFlag{
+				Name:    "token-name",
+				Aliases: []string{"t"},
+				Usage:   "Token name",
+				Value:   "gitea-admin",
+			},
+			&cli.BoolFlag{
+				Name:  "raw",
+				Usage: "Display only the token value",
+			},
+			&cli.StringFlag{
+				Name:  "scopes",
+				Value: "all",
+				Usage: `Comma separated list of scopes to apply to access token, examples: "all", "public-only,read:issue", "write:repository,write:user"`,
+			},
 		},
-		&cli.StringFlag{
-			Name:    "token-name",
-			Aliases: []string{"t"},
-			Usage:   "Token name",
-			Value:   "gitea-admin",
-		},
-		&cli.BoolFlag{
-			Name:  "raw",
-			Usage: "Display only the token value",
-		},
-		&cli.StringFlag{
-			Name:  "scopes",
-			Value: "",
-			Usage: "Comma separated list of scopes to apply to access token",
-		},
-	},
-	Action: runGenerateAccessToken,
+		Action: runGenerateAccessToken,
+	}
 }
 
-func runGenerateAccessToken(c *cli.Context) error {
+func runGenerateAccessToken(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("username") {
-		return errors.New("You must provide a username to generate a token for")
+		return errors.New("you must provide a username to generate a token for")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -77,6 +80,9 @@ func runGenerateAccessToken(c *cli.Context) error {
 	if err != nil {
 		return fmt.Errorf("invalid access token scope provided: %w", err)
 	}
+	if !accessTokenScope.HasPermissionScope() {
+		return errors.New("access token does not have any permission")
+	}
 	t.Scope = accessTokenScope
 
 	// create the token
diff --git a/cmd/admin_user_list.go b/cmd/admin_user_list.go
index 6044ce7c3f..ccc4b8c917 100644
--- a/cmd/admin_user_list.go
+++ b/cmd/admin_user_list.go
@@ -4,29 +4,32 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"text/tabwriter"
 
 	user_model "forgejo.org/models/user"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserList = &cli.Command{
-	Name:   "list",
-	Usage:  "List users",
-	Action: runListUsers,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "admin",
-			Usage: "List only admin users",
+func microcmdUserList() *cli.Command {
+	return &cli.Command{
+		Name:   "list",
+		Usage:  "List users",
+		Action: runListUsers,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "admin",
+				Usage: "List only admin users",
+			},
 		},
-	},
+	}
 }
 
-func runListUsers(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runListUsers(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if err := initDB(ctx); err != nil {
@@ -41,7 +44,7 @@ func runListUsers(c *cli.Context) error {
 	w := tabwriter.NewWriter(os.Stdout, 5, 0, 1, ' ', 0)
 
 	if c.IsSet("admin") {
-		fmt.Fprintf(w, "ID\tUsername\tEmail\tIsActive\n")
+		fmt.Fprint(w, "ID\tUsername\tEmail\tIsActive\n")
 		for _, u := range users {
 			if u.IsAdmin {
 				fmt.Fprintf(w, "%d\t%s\t%s\t%t\n", u.ID, u.Name, u.Email, u.IsActive)
@@ -49,7 +52,7 @@ func runListUsers(c *cli.Context) error {
 		}
 	} else {
 		twofa := user_model.UserList(users).GetTwoFaStatus(ctx)
-		fmt.Fprintf(w, "ID\tUsername\tEmail\tIsActive\tIsAdmin\t2FA\n")
+		fmt.Fprint(w, "ID\tUsername\tEmail\tIsActive\tIsAdmin\t2FA\n")
 		for _, u := range users {
 			fmt.Fprintf(w, "%d\t%s\t%s\t%t\t%t\t%t\n", u.ID, u.Name, u.Email, u.IsActive, u.IsAdmin, twofa[u.ID])
 		}
diff --git a/cmd/admin_user_must_change_password.go b/cmd/admin_user_must_change_password.go
index 920f5c7b21..2ccad56eb9 100644
--- a/cmd/admin_user_must_change_password.go
+++ b/cmd/admin_user_must_change_password.go
@@ -4,38 +4,41 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
 	user_model "forgejo.org/models/user"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var microcmdUserMustChangePassword = &cli.Command{
-	Name:   "must-change-password",
-	Usage:  "Set the must change password flag for the provided users or all users",
-	Action: runMustChangePassword,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:    "all",
-			Aliases: []string{"A"},
-			Usage:   "All users must change password, except those explicitly excluded with --exclude",
+func microcmdUserMustChangePassword() *cli.Command {
+	return &cli.Command{
+		Name:   "must-change-password",
+		Usage:  "Set the must change password flag for the provided users or all users",
+		Action: runMustChangePassword,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:    "all",
+				Aliases: []string{"A"},
+				Usage:   "All users must change password, except those explicitly excluded with --exclude",
+			},
+			&cli.StringSliceFlag{
+				Name:    "exclude",
+				Aliases: []string{"e"},
+				Usage:   "Do not change the must-change-password flag for these users",
+			},
+			&cli.BoolFlag{
+				Name:  "unset",
+				Usage: "Instead of setting the must-change-password flag, unset it",
+			},
 		},
-		&cli.StringSliceFlag{
-			Name:    "exclude",
-			Aliases: []string{"e"},
-			Usage:   "Do not change the must-change-password flag for these users",
-		},
-		&cli.BoolFlag{
-			Name:  "unset",
-			Usage: "Instead of setting the must-change-password flag, unset it",
-		},
-	},
+	}
 }
 
-func runMustChangePassword(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runMustChangePassword(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if c.NArg() == 0 && !c.IsSet("all") {
diff --git a/cmd/admin_user_reset_mfa.go b/cmd/admin_user_reset_mfa.go
new file mode 100644
index 0000000000..8107fd97bf
--- /dev/null
+++ b/cmd/admin_user_reset_mfa.go
@@ -0,0 +1,73 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package cmd
+
+import (
+	"context"
+	"fmt"
+
+	auth_model "forgejo.org/models/auth"
+	user_model "forgejo.org/models/user"
+
+	"github.com/urfave/cli/v3"
+)
+
+func microcmdUserResetMFA() *cli.Command {
+	return &cli.Command{
+		Name:   "reset-mfa",
+		Usage:  "Remove all two-factor authentication configurations for a user",
+		Action: runResetMFA,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "username",
+				Aliases: []string{"u"},
+				Value:   "",
+				Usage:   "The user to update",
+			},
+		},
+	}
+}
+
+func runResetMFA(ctx context.Context, c *cli.Command) error {
+	if err := argsSet(c, "username"); err != nil {
+		return err
+	}
+
+	ctx, cancel := installSignals(ctx)
+	defer cancel()
+
+	if err := initDB(ctx); err != nil {
+		return err
+	}
+
+	user, err := user_model.GetUserByName(ctx, c.String("username"))
+	if err != nil {
+		return err
+	}
+
+	webAuthnList, err := auth_model.GetWebAuthnCredentialsByUID(ctx, user.ID)
+	if err != nil {
+		return err
+	}
+
+	for _, credential := range webAuthnList {
+		if _, err := auth_model.DeleteCredential(ctx, credential.ID, user.ID); err != nil {
+			return err
+		}
+	}
+
+	tfaModes, err := auth_model.GetTwoFactorByUID(ctx, user.ID)
+	if err == nil && tfaModes != nil {
+		if err := auth_model.DeleteTwoFactorByID(ctx, tfaModes.ID, user.ID); err != nil {
+			return err
+		}
+	} else {
+		if _, is := err.(auth_model.ErrTwoFactorNotEnrolled); !is {
+			return err
+		}
+	}
+
+	fmt.Printf("%s's two-factor authentication settings have been removed!\n", user.Name)
+	return nil
+}
diff --git a/cmd/cert.go b/cmd/cert.go
index bf83af389f..f9e3a16f3e 100644
--- a/cmd/cert.go
+++ b/cmd/cert.go
@@ -6,6 +6,7 @@
 package cmd
 
 import (
+	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
 	"crypto/rand"
@@ -20,47 +21,49 @@ import (
 	"strings"
 	"time"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdCert represents the available cert sub-command.
-var CmdCert = &cli.Command{
-	Name:  "cert",
-	Usage: "Generate self-signed certificate",
-	Description: `Generate a self-signed X.509 certificate for a TLS server.
+func cmdCert() *cli.Command {
+	return &cli.Command{
+		Name:  "cert",
+		Usage: "Generate self-signed certificate",
+		Description: `Generate a self-signed X.509 certificate for a TLS server.
 Outputs to 'cert.pem' and 'key.pem' and will overwrite existing files.`,
-	Action: runCert,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "host",
-			Value: "",
-			Usage: "Comma-separated hostnames and IPs to generate a certificate for",
+		Action: runCert,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "host",
+				Value: "",
+				Usage: "Comma-separated hostnames and IPs to generate a certificate for",
+			},
+			&cli.StringFlag{
+				Name:  "ecdsa-curve",
+				Value: "",
+				Usage: "ECDSA curve to use to generate a key. Valid values are P224, P256, P384, P521",
+			},
+			&cli.IntFlag{
+				Name:  "rsa-bits",
+				Value: 3072,
+				Usage: "Size of RSA key to generate. Ignored if --ecdsa-curve is set",
+			},
+			&cli.StringFlag{
+				Name:  "start-date",
+				Value: "",
+				Usage: "Creation date formatted as Jan 1 15:04:05 2011",
+			},
+			&cli.DurationFlag{
+				Name:  "duration",
+				Value: 365 * 24 * time.Hour,
+				Usage: "Duration that certificate is valid for",
+			},
+			&cli.BoolFlag{
+				Name:  "ca",
+				Usage: "whether this cert should be its own Certificate Authority",
+			},
 		},
-		&cli.StringFlag{
-			Name:  "ecdsa-curve",
-			Value: "",
-			Usage: "ECDSA curve to use to generate a key. Valid values are P224, P256, P384, P521",
-		},
-		&cli.IntFlag{
-			Name:  "rsa-bits",
-			Value: 3072,
-			Usage: "Size of RSA key to generate. Ignored if --ecdsa-curve is set",
-		},
-		&cli.StringFlag{
-			Name:  "start-date",
-			Value: "",
-			Usage: "Creation date formatted as Jan 1 15:04:05 2011",
-		},
-		&cli.DurationFlag{
-			Name:  "duration",
-			Value: 365 * 24 * time.Hour,
-			Usage: "Duration that certificate is valid for",
-		},
-		&cli.BoolFlag{
-			Name:  "ca",
-			Usage: "whether this cert should be its own Certificate Authority",
-		},
-	},
+	}
 }
 
 func publicKey(priv any) any {
@@ -89,7 +92,7 @@ func pemBlockForKey(priv any) *pem.Block {
 	}
 }
 
-func runCert(c *cli.Context) error {
+func runCert(ctx context.Context, c *cli.Command) error {
 	if err := argsSet(c, "host"); err != nil {
 		return err
 	}
diff --git a/cmd/cmd.go b/cmd/cmd.go
index c887d0ed52..85a482b78c 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -20,19 +20,21 @@ import (
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/util"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // argsSet checks that all the required arguments are set. args is a list of
 // arguments that must be set in the passed Context.
-func argsSet(c *cli.Context, args ...string) error {
+func argsSet(c *cli.Command, args ...string) error {
 	for _, a := range args {
 		if !c.IsSet(a) {
 			return errors.New(a + " is not set")
 		}
 
-		if util.IsEmptyString(c.String(a)) {
-			return errors.New(a + " is required")
+		if s, ok := c.Value(a).(string); ok {
+			if util.IsEmptyString(s) {
+				return errors.New(a + " is required")
+			}
 		}
 	}
 	return nil
@@ -73,8 +75,8 @@ If this is the intended configuration file complete the [database] section.`, se
 	return nil
 }
 
-func installSignals() (context.Context, context.CancelFunc) {
-	ctx, cancel := context.WithCancel(context.Background())
+func installSignals(ctx context.Context) (context.Context, context.CancelFunc) {
+	ctx, cancel := context.WithCancel(ctx)
 	go func() {
 		// install notify
 		signalChannel := make(chan os.Signal, 1)
@@ -109,7 +111,7 @@ func setupConsoleLogger(level log.Level, colorize bool, out io.Writer) {
 	log.GetManager().GetLogger(log.DEFAULT).ReplaceAllWriters(writer)
 }
 
-func globalBool(c *cli.Context, name string) bool {
+func globalBool(c *cli.Command, name string) bool {
 	for _, ctx := range c.Lineage() {
 		if ctx.Bool(name) {
 			return true
@@ -120,16 +122,16 @@ func globalBool(c *cli.Context, name string) bool {
 
 // PrepareConsoleLoggerLevel by default, use INFO level for console logger, but some sub-commands (for git/ssh protocol) shouldn't output any log to stdout.
 // Any log appears in git stdout pipe will break the git protocol, eg: client can't push and hangs forever.
-func PrepareConsoleLoggerLevel(defaultLevel log.Level) func(*cli.Context) error {
-	return func(c *cli.Context) error {
+func PrepareConsoleLoggerLevel(defaultLevel log.Level) func(ctx context.Context, cli *cli.Command) (context.Context, error) {
+	return func(ctx context.Context, cli *cli.Command) (context.Context, error) {
 		level := defaultLevel
-		if globalBool(c, "quiet") {
+		if globalBool(cli, "quiet") {
 			level = log.FATAL
 		}
-		if globalBool(c, "debug") || globalBool(c, "verbose") {
+		if globalBool(cli, "debug") || globalBool(cli, "verbose") {
 			level = log.TRACE
 		}
 		log.SetConsoleLogger(log.DEFAULT, "console-default", level)
-		return nil
+		return ctx, nil
 	}
 }
diff --git a/cmd/docs.go b/cmd/docs.go
deleted file mode 100644
index 1dc0980c00..0000000000
--- a/cmd/docs.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2020 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/urfave/cli/v2"
-)
-
-// CmdDocs represents the available docs sub-command.
-var CmdDocs = &cli.Command{
-	Name:        "docs",
-	Usage:       "Output CLI documentation",
-	Description: "A command to output Forgejo's CLI documentation, optionally to a file.",
-	Action:      runDocs,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "man",
-			Usage: "Output man pages instead",
-		},
-		&cli.StringFlag{
-			Name:    "output",
-			Aliases: []string{"o"},
-			Usage:   "Path to output to instead of stdout (will overwrite if exists)",
-		},
-	},
-}
-
-func runDocs(ctx *cli.Context) error {
-	docs, err := ctx.App.ToMarkdown()
-	if ctx.Bool("man") {
-		docs, err = ctx.App.ToMan()
-	}
-	if err != nil {
-		return err
-	}
-
-	if !ctx.Bool("man") {
-		// Clean up markdown. The following bug was fixed in v2, but is present in v1.
-		// It affects markdown output (even though the issue is referring to man pages)
-		// https://github.com/urfave/cli/issues/1040
-		firstHashtagIndex := strings.Index(docs, "#")
-
-		if firstHashtagIndex > 0 {
-			docs = docs[firstHashtagIndex:]
-		}
-	}
-
-	out := os.Stdout
-	if ctx.String("output") != "" {
-		fi, err := os.Create(ctx.String("output"))
-		if err != nil {
-			return err
-		}
-		defer fi.Close()
-		out = fi
-	}
-
-	_, err = fmt.Fprintln(out, docs)
-	return err
-}
diff --git a/cmd/doctor.go b/cmd/doctor.go
index b3420982f5..681794f094 100644
--- a/cmd/doctor.go
+++ b/cmd/doctor.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	golog "log"
 	"os"
@@ -19,81 +20,86 @@ import (
 	"forgejo.org/modules/setting"
 	"forgejo.org/services/doctor"
 
-	"github.com/urfave/cli/v2"
-	"xorm.io/xorm"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdDoctor represents the available doctor sub-command.
-var CmdDoctor = &cli.Command{
-	Name:        "doctor",
-	Usage:       "Diagnose and optionally fix problems, convert or re-create database tables",
-	Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
+func cmdDoctor() *cli.Command {
+	return &cli.Command{
+		Name:        "doctor",
+		Usage:       "Diagnose and optionally fix problems, convert or re-create database tables",
+		Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
 
-	Subcommands: []*cli.Command{
-		cmdDoctorCheck,
-		cmdRecreateTable,
-		cmdDoctorConvert,
-	},
+		Commands: []*cli.Command{
+			cmdDoctorCheck(),
+			cmdRecreateTable(),
+			cmdDoctorConvert(),
+		},
+	}
 }
 
-var cmdDoctorCheck = &cli.Command{
-	Name:        "check",
-	Usage:       "Diagnose and optionally fix problems",
-	Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
-	Action:      runDoctorCheck,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "list",
-			Usage: "List the available checks",
+func cmdDoctorCheck() *cli.Command {
+	return &cli.Command{
+		Name:        "check",
+		Usage:       "Diagnose and optionally fix problems",
+		Description: "A command to diagnose problems with the current Forgejo instance according to the given configuration. Some problems can optionally be fixed by modifying the database or data storage.",
+		Action:      runDoctorCheck,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "list",
+				Usage: "List the available checks",
+			},
+			&cli.BoolFlag{
+				Name:  "default",
+				Usage: "Run the default checks (if neither --run or --all is set, this is the default behaviour)",
+			},
+			&cli.StringSliceFlag{
+				Name:  "run",
+				Usage: "Run the provided checks - (if --default is set, the default checks will also run)",
+			},
+			&cli.BoolFlag{
+				Name:  "all",
+				Usage: "Run all the available checks",
+			},
+			&cli.BoolFlag{
+				Name:  "fix",
+				Usage: "Automatically fix what we can",
+			},
+			&cli.StringFlag{
+				Name:  "log-file",
+				Usage: `Name of the log file (no verbose log output by default). Set to "-" to output to stdout`,
+			},
+			&cli.BoolFlag{
+				Name:    "color",
+				Aliases: []string{"H"},
+				Usage:   "Use color for outputted information",
+			},
 		},
-		&cli.BoolFlag{
-			Name:  "default",
-			Usage: "Run the default checks (if neither --run or --all is set, this is the default behaviour)",
-		},
-		&cli.StringSliceFlag{
-			Name:  "run",
-			Usage: "Run the provided checks - (if --default is set, the default checks will also run)",
-		},
-		&cli.BoolFlag{
-			Name:  "all",
-			Usage: "Run all the available checks",
-		},
-		&cli.BoolFlag{
-			Name:  "fix",
-			Usage: "Automatically fix what we can",
-		},
-		&cli.StringFlag{
-			Name:  "log-file",
-			Usage: `Name of the log file (no verbose log output by default). Set to "-" to output to stdout`,
-		},
-		&cli.BoolFlag{
-			Name:    "color",
-			Aliases: []string{"H"},
-			Usage:   "Use color for outputted information",
-		},
-	},
+	}
 }
 
-var cmdRecreateTable = &cli.Command{
-	Name:      "recreate-table",
-	Usage:     "Recreate tables from XORM definitions and copy the data.",
-	ArgsUsage: "[TABLE]... : (TABLEs to recreate - leave blank for all)",
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name:  "debug",
-			Usage: "Print SQL commands sent",
+func cmdRecreateTable() *cli.Command {
+	return &cli.Command{
+		Name:      "recreate-table",
+		Usage:     "Recreate tables from XORM definitions and copy the data.",
+		ArgsUsage: "[TABLE]... : (TABLEs to recreate - leave blank for all)",
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "debug",
+				Usage: "Print SQL commands sent",
+			},
 		},
-	},
-	Description: `The database definitions Forgejo uses change across versions, sometimes changing default values and leaving old unused columns.
+		Description: `The database definitions Forgejo uses change across versions, sometimes changing default values and leaving old unused columns.
 
 This command will cause Xorm to recreate tables, copying over the data and deleting the old table.
 
 You should back-up your database before doing this and ensure that your database is up-to-date first.`,
-	Action: runRecreateTable,
+		Action: runRecreateTable,
+	}
 }
 
-func runRecreateTable(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runRecreateTable(stdCtx context.Context, ctx *cli.Command) error {
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	// Redirect the default golog to here
@@ -120,7 +126,7 @@ func runRecreateTable(ctx *cli.Context) error {
 
 	args := ctx.Args()
 	names := make([]string, 0, ctx.NArg())
-	for i := 0; i < ctx.NArg(); i++ {
+	for i := range ctx.NArg() {
 		names = append(names, args.Get(i))
 	}
 
@@ -130,24 +136,31 @@ func runRecreateTable(ctx *cli.Context) error {
 	}
 	recreateTables := migrate_base.RecreateTables(beans...)
 
-	return db.InitEngineWithMigration(stdCtx, func(x *xorm.Engine) error {
-		if err := migrations.EnsureUpToDate(x); err != nil {
+	return db.InitEngineWithMigration(stdCtx, func(x db.Engine) error {
+		engine, err := db.GetMasterEngine(x)
+		if err != nil {
 			return err
 		}
-		return recreateTables(x)
+
+		if err := migrations.EnsureUpToDate(engine); err != nil {
+			return err
+		}
+
+		return recreateTables(engine)
 	})
 }
 
-func setupDoctorDefaultLogger(ctx *cli.Context, colorize bool) {
+func setupDoctorDefaultLogger(ctx *cli.Command, colorize bool) {
 	// Silence the default loggers
 	setupConsoleLogger(log.FATAL, log.CanColorStderr, os.Stderr)
 
 	logFile := ctx.String("log-file")
-	if logFile == "" {
+	switch logFile {
+	case "":
 		return // if no doctor log-file is set, do not show any log from default logger
-	} else if logFile == "-" {
+	case "-":
 		setupConsoleLogger(log.TRACE, colorize, os.Stdout)
-	} else {
+	default:
 		logFile, _ = filepath.Abs(logFile)
 		writeMode := log.WriterMode{Level: log.TRACE, WriterOption: log.WriterFileOption{FileName: logFile}}
 		writer, err := log.NewEventWriter("console-to-file", "file", writeMode)
@@ -159,8 +172,8 @@ func setupDoctorDefaultLogger(ctx *cli.Context, colorize bool) {
 	}
 }
 
-func runDoctorCheck(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runDoctorCheck(stdCtx context.Context, ctx *cli.Command) error {
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	colorize := log.CanColorStdout
diff --git a/cmd/doctor_convert.go b/cmd/doctor_convert.go
index 06883264a3..44bebae154 100644
--- a/cmd/doctor_convert.go
+++ b/cmd/doctor_convert.go
@@ -4,25 +4,28 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // cmdDoctorConvert represents the available convert sub-command.
-var cmdDoctorConvert = &cli.Command{
-	Name:        "convert",
-	Usage:       "Convert the database",
-	Description: "A command to convert an existing MySQL database from utf8 to utf8mb4",
-	Action:      runDoctorConvert,
+func cmdDoctorConvert() *cli.Command {
+	return &cli.Command{
+		Name:        "convert",
+		Usage:       "Convert the database",
+		Description: "A command to convert an existing MySQL database from utf8 to utf8mb4",
+		Action:      runDoctorConvert,
+	}
 }
 
-func runDoctorConvert(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runDoctorConvert(stdCtx context.Context, ctx *cli.Command) error {
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	if err := initDB(stdCtx); err != nil {
diff --git a/cmd/doctor_test.go b/cmd/doctor_test.go
index bfb4b9d803..c3eda8315b 100644
--- a/cmd/doctor_test.go
+++ b/cmd/doctor_test.go
@@ -11,7 +11,7 @@ import (
 	"forgejo.org/services/doctor"
 
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func TestDoctorRun(t *testing.T) {
@@ -22,12 +22,12 @@ func TestDoctorRun(t *testing.T) {
 
 		SkipDatabaseInitialization: true,
 	})
-	app := cli.NewApp()
-	app.Commands = []*cli.Command{cmdDoctorCheck}
-	err := app.Run([]string{"./gitea", "check", "--run", "test-check"})
+	app := cli.Command{}
+	app.Commands = []*cli.Command{cmdDoctorCheck()}
+	err := app.Run(t.Context(), []string{"./gitea", "check", "--run", "test-check"})
 	require.NoError(t, err)
-	err = app.Run([]string{"./gitea", "check", "--run", "no-such"})
+	err = app.Run(t.Context(), []string{"./gitea", "check", "--run", "no-such"})
 	require.ErrorContains(t, err, `unknown checks: "no-such"`)
-	err = app.Run([]string{"./gitea", "check", "--run", "test-check,no-such"})
+	err = app.Run(t.Context(), []string{"./gitea", "check", "--run", "test-check,no-such"})
 	require.ErrorContains(t, err, `unknown checks: "no-such"`)
 }
diff --git a/cmd/dump.go b/cmd/dump.go
index ac72a2bb18..ea141291f5 100644
--- a/cmd/dump.go
+++ b/cmd/dump.go
@@ -5,12 +5,15 @@
 package cmd
 
 import (
+	"context"
+	"errors"
 	"fmt"
-	"io"
+	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"forgejo.org/models/db"
@@ -21,36 +24,43 @@ import (
 	"forgejo.org/modules/util"
 
 	"code.forgejo.org/go-chi/session"
-	"github.com/mholt/archiver/v3"
-	"github.com/urfave/cli/v2"
+	"github.com/mholt/archives"
+	"github.com/urfave/cli/v3"
 )
 
-func addReader(w archiver.Writer, r io.ReadCloser, info os.FileInfo, customName string, verbose bool) error {
+func addObject(archiveJobs chan archives.ArchiveAsyncJob, object fs.File, customName string, verbose bool) error {
 	if verbose {
 		log.Info("Adding file %s", customName)
 	}
 
-	return w.Write(archiver.File{
-		FileInfo: archiver.FileInfo{
-			FileInfo:   info,
-			CustomName: customName,
+	info, err := object.Stat()
+	if err != nil {
+		return err
+	}
+
+	ch := make(chan error)
+
+	archiveJobs <- archives.ArchiveAsyncJob{
+		File: archives.FileInfo{
+			FileInfo:      info,
+			NameInArchive: customName,
+			Open: func() (fs.File, error) {
+				return object, nil
+			},
 		},
-		ReadCloser: r,
-	})
+		Result: ch,
+	}
+
+	return <-ch
 }
 
-func addFile(w archiver.Writer, filePath, absPath string, verbose bool) error {
-	file, err := os.Open(absPath)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-	fileInfo, err := file.Stat()
+func addFile(archiveJobs chan archives.ArchiveAsyncJob, filePath, absPath string, verbose bool) error {
+	file, err := os.Open(absPath) // Closed by archiver
 	if err != nil {
 		return err
 	}
 
-	return addReader(w, file, fileInfo, filePath, verbose)
+	return addObject(archiveJobs, file, filePath, verbose)
 }
 
 func isSubdir(upper, lower string) (bool, error) {
@@ -83,6 +93,10 @@ func (o *outputType) Set(value string) error {
 	return fmt.Errorf("allowed values are %s", o.Join())
 }
 
+func (o *outputType) Get() any {
+	return o.String()
+}
+
 func (o outputType) String() string {
 	if o.selected == "" {
 		return o.Default
@@ -95,81 +109,130 @@ var outputTypeEnum = &outputType{
 	Default: "zip",
 }
 
+func getArchiverByType(outType string) (archives.ArchiverAsync, error) {
+	var archiver archives.ArchiverAsync
+	switch outType {
+	case "zip":
+		archiver = archives.Zip{}
+	case "tar":
+		archiver = archives.Tar{}
+	case "tar.sz":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Sz{},
+		}
+	case "tar.gz":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Gz{},
+		}
+	case "tar.xz":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Xz{},
+		}
+	case "tar.bz2":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Bz2{},
+		}
+	case "tar.br":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Brotli{},
+		}
+	case "tar.lz4":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Lz4{},
+		}
+	case "tar.zst":
+		archiver = archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Zstd{},
+		}
+	default:
+		return nil, fmt.Errorf("unsupported output type: %s", outType)
+	}
+	return archiver, nil
+}
+
 // CmdDump represents the available dump sub-command.
-var CmdDump = &cli.Command{
-	Name:  "dump",
-	Usage: "Dump Forgejo files and database",
-	Description: `Dump compresses all related files and database into zip file.
+func cmdDump() *cli.Command {
+	return &cli.Command{
+		Name:  "dump",
+		Usage: "Dump Forgejo files and database",
+		Description: `Dump compresses all related files and database into zip file.
 It can be used for backup and capture Forgejo server image to send to maintainer`,
-	Action: runDump,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "file",
-			Aliases: []string{"f"},
-			Value:   fmt.Sprintf("forgejo-dump-%d.zip", time.Now().Unix()),
-			Usage:   "Name of the dump file which will be created. Supply '-' for stdout. See type for available types.",
+		Action: runDump,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "file",
+				Aliases: []string{"f"},
+				Value:   fmt.Sprintf("forgejo-dump-%d.zip", time.Now().Unix()),
+				Usage:   "Name of the dump file which will be created. Supply '-' for stdout. See type for available types.",
+			},
+			&cli.BoolFlag{
+				Name:    "verbose",
+				Aliases: []string{"V"},
+				Usage:   "Show process details",
+			},
+			&cli.BoolFlag{
+				Name:    "quiet",
+				Aliases: []string{"q"},
+				Usage:   "Only display warnings and errors",
+			},
+			&cli.StringFlag{
+				Name:    "tempdir",
+				Aliases: []string{"t"},
+				Usage:   "Temporary dir path",
+			},
+			&cli.StringFlag{
+				Name:    "database",
+				Aliases: []string{"d"},
+				Usage:   "Specify the database SQL syntax: sqlite3, mysql, postgres",
+			},
+			&cli.BoolFlag{
+				Name:    "skip-repository",
+				Aliases: []string{"R"},
+				Usage:   "Skip repositories",
+			},
+			&cli.BoolFlag{
+				Name:    "skip-log",
+				Aliases: []string{"L"},
+				Usage:   "Skip logs",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-custom-dir",
+				Usage: "Skip custom directory",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-lfs-data",
+				Usage: "Skip LFS data",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-attachment-data",
+				Usage: "Skip attachment data",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-package-data",
+				Usage: "Skip package data",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-index",
+				Usage: "Skip bleve index data",
+			},
+			&cli.BoolFlag{
+				Name:  "skip-repo-archives",
+				Usage: "Skip repository archives",
+			},
+			&cli.GenericFlag{
+				Name:  "type",
+				Value: outputTypeEnum,
+				Usage: fmt.Sprintf("Dump output format: %s", outputTypeEnum.Join()),
+			},
 		},
-		&cli.BoolFlag{
-			Name:    "verbose",
-			Aliases: []string{"V"},
-			Usage:   "Show process details",
-		},
-		&cli.BoolFlag{
-			Name:    "quiet",
-			Aliases: []string{"q"},
-			Usage:   "Only display warnings and errors",
-		},
-		&cli.StringFlag{
-			Name:    "tempdir",
-			Aliases: []string{"t"},
-			Value:   os.TempDir(),
-			Usage:   "Temporary dir path",
-		},
-		&cli.StringFlag{
-			Name:    "database",
-			Aliases: []string{"d"},
-			Usage:   "Specify the database SQL syntax: sqlite3, mysql, postgres",
-		},
-		&cli.BoolFlag{
-			Name:    "skip-repository",
-			Aliases: []string{"R"},
-			Usage:   "Skip repositories",
-		},
-		&cli.BoolFlag{
-			Name:    "skip-log",
-			Aliases: []string{"L"},
-			Usage:   "Skip logs",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-custom-dir",
-			Usage: "Skip custom directory",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-lfs-data",
-			Usage: "Skip LFS data",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-attachment-data",
-			Usage: "Skip attachment data",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-package-data",
-			Usage: "Skip package data",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-index",
-			Usage: "Skip bleve index data",
-		},
-		&cli.BoolFlag{
-			Name:  "skip-repo-archives",
-			Usage: "Skip repository archives",
-		},
-		&cli.GenericFlag{
-			Name:  "type",
-			Value: outputTypeEnum,
-			Usage: fmt.Sprintf("Dump output format: %s", outputTypeEnum.Join()),
-		},
-	},
+	}
 }
 
 func fatal(format string, args ...any) {
@@ -177,7 +240,7 @@ func fatal(format string, args ...any) {
 	log.Fatal(format, args...)
 }
 
-func runDump(ctx *cli.Context) error {
+func runDump(stdCtx context.Context, ctx *cli.Command) error {
 	var file *os.File
 	fileName := ctx.String("file")
 	outType := ctx.String("type")
@@ -213,16 +276,16 @@ func runDump(ctx *cli.Context) error {
 
 	if !setting.InstallLock {
 		log.Error("Is '%s' really the right config path?\n", setting.CustomConf)
-		return fmt.Errorf("forgejo is not initialized")
+		return errors.New("forgejo is not initialized")
 	}
 	setting.LoadSettings() // cannot access session settings otherwise
 
 	verbose := ctx.Bool("verbose")
 	if verbose && ctx.Bool("quiet") {
-		return fmt.Errorf("--quiet and --verbose cannot both be set")
+		return errors.New("--quiet and --verbose cannot both be set")
 	}
 
-	stdCtx, cancel := installSignals()
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	err := db.InitEngine(stdCtx)
@@ -247,59 +310,211 @@ func runDump(ctx *cli.Context) error {
 		return err
 	}
 
-	var iface any
-	if fileName == "-" {
-		iface, err = archiver.ByExtension(fmt.Sprintf(".%s", outType))
-	} else {
-		iface, err = archiver.ByExtension(fileName)
-	}
+	archiveJobs := make(chan archives.ArchiveAsyncJob)
+	wg := sync.WaitGroup{}
+	archiver, err := getArchiverByType(outType)
 	if err != nil {
 		fatal("Failed to get archiver for extension: %v", err)
 	}
 
-	w, _ := iface.(archiver.Writer)
-	if err := w.Create(file); err != nil {
-		fatal("Creating archiver.Writer failed: %v", err)
-	}
-	defer w.Close()
-
 	if ctx.IsSet("skip-repository") && ctx.Bool("skip-repository") {
 		log.Info("Skipping local repositories")
 	} else {
 		log.Info("Dumping local repositories... %s", setting.RepoRootPath)
-		if err := addRecursiveExclude(w, "repos", setting.RepoRootPath, []string{absFileName}, verbose); err != nil {
-			fatal("Failed to include repositories: %v", err)
-		}
+		wg.Add(1)
+		go dumpRepos(ctx, archiveJobs, &wg, absFileName, verbose)
+	}
 
-		if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") {
-			log.Info("Skipping LFS data")
-		} else if !setting.LFS.StartServer {
-			log.Info("LFS not enabled - skipping")
-		} else if err := storage.LFS.IterateObjects("", func(objPath string, object storage.Object) error {
-			info, err := object.Stat()
-			if err != nil {
-				return err
+	wg.Add(1)
+	go dumpDatabase(ctx, archiveJobs, &wg, verbose)
+
+	if len(setting.CustomConf) > 0 {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			log.Info("Adding custom configuration file from %s", setting.CustomConf)
+			if err := addFile(archiveJobs, "app.ini", setting.CustomConf, verbose); err != nil {
+				fatal("Failed to include specified app.ini: %v", err)
 			}
+		}()
+	}
 
-			return addReader(w, object, info, path.Join("data", "lfs", objPath), verbose)
-		}); err != nil {
-			fatal("Failed to dump LFS objects: %v", err)
+	if ctx.IsSet("skip-custom-dir") && ctx.Bool("skip-custom-dir") {
+		log.Info("Skipping custom directory")
+	} else {
+		wg.Add(1)
+		go dumpCustom(archiveJobs, &wg, absFileName, verbose)
+	}
+
+	isExist, err := util.IsExist(setting.AppDataPath)
+	if err != nil {
+		log.Error("Failed to check if %s exists: %v", setting.AppDataPath, err)
+	}
+	if isExist {
+		log.Info("Packing data directory...%s", setting.AppDataPath)
+
+		wg.Add(1)
+		go dumpData(ctx, archiveJobs, &wg, absFileName, verbose)
+	}
+
+	if ctx.IsSet("skip-attachment-data") && ctx.Bool("skip-attachment-data") {
+		log.Info("Skipping attachment data")
+	} else {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := storage.Attachments.IterateObjects("", func(objPath string, object storage.Object) error {
+				return addObject(archiveJobs, object, path.Join("data", "attachments", objPath), verbose)
+			}); err != nil {
+				fatal("Failed to dump attachments: %v", err)
+			}
+		}()
+	}
+
+	if ctx.IsSet("skip-package-data") && ctx.Bool("skip-package-data") {
+		log.Info("Skipping package data")
+	} else if !setting.Packages.Enabled {
+		log.Info("Package registry not enabled - skipping")
+	} else {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			if err := storage.Packages.IterateObjects("", func(objPath string, object storage.Object) error {
+				return addObject(archiveJobs, object, path.Join("data", "packages", objPath), verbose)
+			}); err != nil {
+				fatal("Failed to dump packages: %v", err)
+			}
+		}()
+	}
+
+	// Doesn't check if LogRootPath exists before processing --skip-log intentionally,
+	// ensuring that it's clear the dump is skipped whether the directory's initialized
+	// yet or not.
+	if ctx.IsSet("skip-log") && ctx.Bool("skip-log") {
+		log.Info("Skipping log files")
+	} else {
+		isExist, err := util.IsExist(setting.Log.RootPath)
+		if err != nil {
+			log.Error("Failed to check if %s exists: %v", setting.Log.RootPath, err)
+		}
+		if isExist {
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				if err := addRecursiveExclude(archiveJobs, "log", setting.Log.RootPath, []string{absFileName}, verbose); err != nil {
+					fatal("Failed to include log: %v", err)
+				}
+			}()
 		}
 	}
 
+	// Wait for all jobs to finish before closing the channel
+	// ArchiveAsync will only return after the channel is closed
+	go func() {
+		wg.Wait()
+		close(archiveJobs)
+	}()
+
+	if err := archiver.ArchiveAsync(stdCtx, file, archiveJobs); err != nil {
+		_ = util.Remove(fileName)
+
+		fatal("Archiving failed: %v", err)
+	}
+
+	if fileName != "-" {
+		if err := os.Chmod(fileName, 0o600); err != nil {
+			log.Info("Can't change file access permissions mask to 0600: %v", err)
+		}
+
+		log.Info("Finished dumping in file %s", fileName)
+	} else {
+		log.Info("Finished dumping to stdout")
+	}
+
+	return nil
+}
+
+func dumpData(ctx *cli.Command, archiveJobs chan archives.ArchiveAsyncJob, wg *sync.WaitGroup, absFileName string, verbose bool) {
+	defer wg.Done()
+
+	var excludes []string
+	if setting.SessionConfig.OriginalProvider == "file" {
+		var opts session.Options
+		if err := json.Unmarshal([]byte(setting.SessionConfig.ProviderConfig), &opts); err != nil {
+			fatal("Failed to parse session config: %v", err)
+		}
+		excludes = append(excludes, opts.ProviderConfig)
+	}
+
+	if ctx.IsSet("skip-index") && ctx.Bool("skip-index") {
+		log.Info("Skipping bleve index data")
+		excludes = append(excludes, setting.Indexer.RepoPath)
+		excludes = append(excludes, setting.Indexer.IssuePath)
+	}
+
+	if ctx.IsSet("skip-repo-archives") && ctx.Bool("skip-repo-archives") {
+		log.Info("Skipping repository archives data")
+		excludes = append(excludes, setting.RepoArchive.Storage.Path)
+	}
+
+	excludes = append(excludes, setting.RepoRootPath)
+	excludes = append(excludes, setting.LFS.Storage.Path)
+	excludes = append(excludes, setting.Attachment.Storage.Path)
+	excludes = append(excludes, setting.Packages.Storage.Path)
+	excludes = append(excludes, setting.Log.RootPath)
+	excludes = append(excludes, absFileName)
+	if err := addRecursiveExclude(archiveJobs, "data", setting.AppDataPath, excludes, verbose); err != nil {
+		fatal("Failed to include data directory: %v", err)
+	}
+}
+
+func dumpCustom(archiveJobs chan archives.ArchiveAsyncJob, wg *sync.WaitGroup, absFileName string, verbose bool) {
+	defer wg.Done()
+
+	customDir, err := os.Stat(setting.CustomPath)
+	if err == nil && customDir.IsDir() {
+		if is, _ := isSubdir(setting.AppDataPath, setting.CustomPath); !is {
+			if err := addRecursiveExclude(archiveJobs, "custom", setting.CustomPath, []string{absFileName}, verbose); err != nil {
+				fatal("Failed to include custom: %v", err)
+			}
+		} else {
+			log.Info("Custom dir %s is inside data dir %s, skipping", setting.CustomPath, setting.AppDataPath)
+		}
+	} else {
+		log.Info("Custom dir %s does not exist, skipping", setting.CustomPath)
+	}
+}
+
+func dumpDatabase(ctx *cli.Command, archiveJobs chan archives.ArchiveAsyncJob, wg *sync.WaitGroup, verbose bool) {
+	defer wg.Done()
+
+	var err error
 	tmpDir := ctx.String("tempdir")
+	if tmpDir == "" {
+		tmpDir, err = os.MkdirTemp("", "forgejo-dump-*")
+		if err != nil {
+			fatal("Failed to create temporary directory: %v", err)
+		}
+
+		defer func() {
+			if err := util.Remove(tmpDir); err != nil {
+				log.Warn("Failed to remove temporary directory: %s: Error: %v", tmpDir, err)
+			}
+		}()
+	}
+
 	if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
 		fatal("Path does not exist: %s", tmpDir)
 	}
 
 	dbDump, err := os.CreateTemp(tmpDir, "forgejo-db.sql")
 	if err != nil {
-		fatal("Failed to create tmp file: %v", err)
+		fatal("Failed to create temporary file: %v", err)
 	}
 	defer func() {
 		_ = dbDump.Close()
 		if err := util.Remove(dbDump.Name()); err != nil {
-			log.Warn("Failed to remove temporary file: %s: Error: %v", dbDump.Name(), err)
+			log.Warn("Failed to remove temporary database file: %s: Error: %v", dbDump.Name(), err)
 		}
 	}()
 
@@ -314,139 +529,32 @@ func runDump(ctx *cli.Context) error {
 		fatal("Failed to dump database: %v", err)
 	}
 
-	if err := addFile(w, "forgejo-db.sql", dbDump.Name(), verbose); err != nil {
+	if err := addFile(archiveJobs, "forgejo-db.sql", dbDump.Name(), verbose); err != nil {
 		fatal("Failed to include forgejo-db.sql: %v", err)
 	}
+}
 
-	if len(setting.CustomConf) > 0 {
-		log.Info("Adding custom configuration file from %s", setting.CustomConf)
-		if err := addFile(w, "app.ini", setting.CustomConf, verbose); err != nil {
-			fatal("Failed to include specified app.ini: %v", err)
-		}
+func dumpRepos(ctx *cli.Command, archiveJobs chan archives.ArchiveAsyncJob, wg *sync.WaitGroup, absFileName string, verbose bool) {
+	defer wg.Done()
+
+	if err := addRecursiveExclude(archiveJobs, "repos", setting.RepoRootPath, []string{absFileName}, verbose); err != nil {
+		fatal("Failed to include repositories: %v", err)
 	}
 
-	if ctx.IsSet("skip-custom-dir") && ctx.Bool("skip-custom-dir") {
-		log.Info("Skipping custom directory")
-	} else {
-		customDir, err := os.Stat(setting.CustomPath)
-		if err == nil && customDir.IsDir() {
-			if is, _ := isSubdir(setting.AppDataPath, setting.CustomPath); !is {
-				if err := addRecursiveExclude(w, "custom", setting.CustomPath, []string{absFileName}, verbose); err != nil {
-					fatal("Failed to include custom: %v", err)
-				}
-			} else {
-				log.Info("Custom dir %s is inside data dir %s, skipping", setting.CustomPath, setting.AppDataPath)
-			}
-		} else {
-			log.Info("Custom dir %s does not exist, skipping", setting.CustomPath)
-		}
-	}
-
-	isExist, err := util.IsExist(setting.AppDataPath)
-	if err != nil {
-		log.Error("Failed to check if %s exists: %v", setting.AppDataPath, err)
-	}
-	if isExist {
-		log.Info("Packing data directory...%s", setting.AppDataPath)
-
-		var excludes []string
-		if setting.SessionConfig.OriginalProvider == "file" {
-			var opts session.Options
-			if err = json.Unmarshal([]byte(setting.SessionConfig.ProviderConfig), &opts); err != nil {
-				return err
-			}
-			excludes = append(excludes, opts.ProviderConfig)
-		}
-
-		if ctx.IsSet("skip-index") && ctx.Bool("skip-index") {
-			log.Info("Skipping bleve index data")
-			excludes = append(excludes, setting.Indexer.RepoPath)
-			excludes = append(excludes, setting.Indexer.IssuePath)
-		}
-
-		if ctx.IsSet("skip-repo-archives") && ctx.Bool("skip-repo-archives") {
-			log.Info("Skipping repository archives data")
-			excludes = append(excludes, setting.RepoArchive.Storage.Path)
-		}
-
-		excludes = append(excludes, setting.RepoRootPath)
-		excludes = append(excludes, setting.LFS.Storage.Path)
-		excludes = append(excludes, setting.Attachment.Storage.Path)
-		excludes = append(excludes, setting.Packages.Storage.Path)
-		excludes = append(excludes, setting.Log.RootPath)
-		excludes = append(excludes, absFileName)
-		if err := addRecursiveExclude(w, "data", setting.AppDataPath, excludes, verbose); err != nil {
-			fatal("Failed to include data directory: %v", err)
-		}
-	}
-
-	if ctx.IsSet("skip-attachment-data") && ctx.Bool("skip-attachment-data") {
-		log.Info("Skipping attachment data")
-	} else if err := storage.Attachments.IterateObjects("", func(objPath string, object storage.Object) error {
-		info, err := object.Stat()
-		if err != nil {
-			return err
-		}
-
-		return addReader(w, object, info, path.Join("data", "attachments", objPath), verbose)
+	if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") {
+		log.Info("Skipping LFS data")
+	} else if !setting.LFS.StartServer {
+		log.Info("LFS not enabled - skipping")
+	} else if err := storage.LFS.IterateObjects("", func(objPath string, object storage.Object) error {
+		return addObject(archiveJobs, object, path.Join("data", "lfs", objPath), verbose)
 	}); err != nil {
-		fatal("Failed to dump attachments: %v", err)
+		fatal("Failed to dump LFS objects: %v", err)
 	}
-
-	if ctx.IsSet("skip-package-data") && ctx.Bool("skip-package-data") {
-		log.Info("Skipping package data")
-	} else if !setting.Packages.Enabled {
-		log.Info("Package registry not enabled - skipping")
-	} else if err := storage.Packages.IterateObjects("", func(objPath string, object storage.Object) error {
-		info, err := object.Stat()
-		if err != nil {
-			return err
-		}
-
-		return addReader(w, object, info, path.Join("data", "packages", objPath), verbose)
-	}); err != nil {
-		fatal("Failed to dump packages: %v", err)
-	}
-
-	// Doesn't check if LogRootPath exists before processing --skip-log intentionally,
-	// ensuring that it's clear the dump is skipped whether the directory's initialized
-	// yet or not.
-	if ctx.IsSet("skip-log") && ctx.Bool("skip-log") {
-		log.Info("Skipping log files")
-	} else {
-		isExist, err := util.IsExist(setting.Log.RootPath)
-		if err != nil {
-			log.Error("Failed to check if %s exists: %v", setting.Log.RootPath, err)
-		}
-		if isExist {
-			if err := addRecursiveExclude(w, "log", setting.Log.RootPath, []string{absFileName}, verbose); err != nil {
-				fatal("Failed to include log: %v", err)
-			}
-		}
-	}
-
-	if fileName != "-" {
-		if err = w.Close(); err != nil {
-			_ = util.Remove(fileName)
-			fatal("Failed to save %s: %v", fileName, err)
-		}
-
-		if err := os.Chmod(fileName, 0o600); err != nil {
-			log.Info("Can't change file access permissions mask to 0600: %v", err)
-		}
-	}
-
-	if fileName != "-" {
-		log.Info("Finish dumping in file %s", fileName)
-	} else {
-		log.Info("Finish dumping to stdout")
-	}
-
-	return nil
 }
 
 // addRecursiveExclude zips absPath to specified insidePath inside writer excluding excludeAbsPath
-func addRecursiveExclude(w archiver.Writer, insidePath, absPath string, excludeAbsPath []string, verbose bool) error {
+// archives.FilesFromDisk doesn't support excluding files, so we have to do it manually
+func addRecursiveExclude(archiveJobs chan archives.ArchiveAsyncJob, insidePath, absPath string, excludeAbsPath []string, verbose bool) error {
 	absPath, err := filepath.Abs(absPath)
 	if err != nil {
 		return err
@@ -471,10 +579,11 @@ func addRecursiveExclude(w archiver.Writer, insidePath, absPath string, excludeA
 		}
 
 		if file.IsDir() {
-			if err := addFile(w, currentInsidePath, currentAbsPath, false); err != nil {
+			if err := addFile(archiveJobs, currentInsidePath, currentAbsPath, false); err != nil {
 				return err
 			}
-			if err = addRecursiveExclude(w, currentInsidePath, currentAbsPath, excludeAbsPath, verbose); err != nil {
+
+			if err := addRecursiveExclude(archiveJobs, currentInsidePath, currentAbsPath, excludeAbsPath, verbose); err != nil {
 				return err
 			}
 		} else {
@@ -492,7 +601,7 @@ func addRecursiveExclude(w archiver.Writer, insidePath, absPath string, excludeA
 				shouldAdd = targetStat.Mode().IsRegular()
 			}
 			if shouldAdd {
-				if err = addFile(w, currentInsidePath, currentAbsPath, verbose); err != nil {
+				if err := addFile(archiveJobs, currentInsidePath, currentAbsPath, verbose); err != nil {
 					return err
 				}
 			}
diff --git a/cmd/dump_repo.go b/cmd/dump_repo.go
index 197445f908..7159d55e99 100644
--- a/cmd/dump_repo.go
+++ b/cmd/dump_repo.go
@@ -19,68 +19,75 @@ import (
 	"forgejo.org/services/convert"
 	"forgejo.org/services/migrations"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdDumpRepository represents the available dump repository sub-command.
-var CmdDumpRepository = &cli.Command{
-	Name:        "dump-repo",
-	Usage:       "Dump the repository from git/github/gitea/gitlab",
-	Description: "This is a command for dumping the repository data.",
-	Action:      runDumpRepository,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:  "git_service",
-			Value: "",
-			Usage: "Git service, git, github, gitea, gitlab. If clone_addr could be recognized, this could be ignored.",
-		},
-		&cli.StringFlag{
-			Name:    "repo_dir",
-			Aliases: []string{"r"},
-			Value:   "./data",
-			Usage:   "Repository dir path to store the data",
-		},
-		&cli.StringFlag{
-			Name:  "clone_addr",
-			Value: "",
-			Usage: "The URL will be clone, currently could be a git/github/gitea/gitlab http/https URL",
-		},
-		&cli.StringFlag{
-			Name:  "auth_username",
-			Value: "",
-			Usage: "The username to visit the clone_addr",
-		},
-		&cli.StringFlag{
-			Name:  "auth_password",
-			Value: "",
-			Usage: "The password to visit the clone_addr",
-		},
-		&cli.StringFlag{
-			Name:  "auth_token",
-			Value: "",
-			Usage: "The personal token to visit the clone_addr",
-		},
-		&cli.StringFlag{
-			Name:  "owner_name",
-			Value: "",
-			Usage: "The data will be stored on a directory with owner name if not empty",
-		},
-		&cli.StringFlag{
-			Name:  "repo_name",
-			Value: "",
-			Usage: "The data will be stored on a directory with repository name if not empty",
-		},
-		&cli.StringFlag{
-			Name:  "units",
-			Value: "",
-			Usage: `Which items will be migrated, one or more units should be separated as comma.
+func cmdDumpRepository() *cli.Command {
+	return &cli.Command{
+		Name:        "dump-repo",
+		Usage:       "Dump the repository from git/github/gitea/gitlab",
+		Description: "This is a command for dumping the repository data.",
+		Action:      runDumpRepository,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "git_service",
+				Value: "",
+				Usage: "Git service, git, github, gitea, gitlab. If clone_addr could be recognized, this could be ignored.",
+			},
+			&cli.StringFlag{
+				Name:    "repo_dir",
+				Aliases: []string{"r"},
+				Value:   "./data",
+				Usage:   "Repository dir path to store the data",
+			},
+			&cli.StringFlag{
+				Name:  "clone_addr",
+				Value: "",
+				Usage: "The URL will be clone, currently could be a git/github/gitea/gitlab http/https URL",
+			},
+			&cli.StringFlag{
+				Name:  "auth_username",
+				Value: "",
+				Usage: "The username to visit the clone_addr",
+			},
+			&cli.StringFlag{
+				Name:  "auth_password",
+				Value: "",
+				Usage: "The password to visit the clone_addr",
+			},
+			&cli.StringFlag{
+				Name:  "auth_token",
+				Value: "",
+				Usage: "The personal token to visit the clone_addr",
+			},
+			&cli.StringFlag{
+				Name:  "owner_name",
+				Value: "",
+				Usage: "The data will be stored on a directory with owner name if not empty",
+			},
+			&cli.StringFlag{
+				Name:  "repo_name",
+				Value: "",
+				Usage: "The data will be stored on a directory with repository name if not empty",
+			},
+			&cli.StringFlag{
+				Name:  "units",
+				Value: "",
+				Usage: `Which items will be migrated, one or more units should be separated as comma.
 wiki, issues, labels, releases, release_assets, milestones, pull_requests, comments are allowed. Empty means all units.`,
+			},
 		},
-	},
+	}
 }
 
-func runDumpRepository(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runDumpRepository(stdCtx context.Context, ctx *cli.Command) error {
+	setupConsoleLogger(log.INFO, log.CanColorStderr, os.Stderr)
+
+	// setting.DisableLoggerInit()
+	setting.LoadSettings() // cannot access skip_tls_verify settings otherwise
+
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	if err := initDB(stdCtx); err != nil {
diff --git a/cmd/dump_test.go b/cmd/dump_test.go
index 459386318f..3bdd9d68f8 100644
--- a/cmd/dump_test.go
+++ b/cmd/dump_test.go
@@ -4,40 +4,32 @@
 package cmd
 
 import (
-	"io"
 	"os"
 	"testing"
 
-	"github.com/mholt/archiver/v3"
+	"github.com/mholt/archives"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-type mockArchiver struct {
-	addedFiles []string
-}
-
-func (mockArchiver) Create(out io.Writer) error {
-	return nil
-}
-
-func (m *mockArchiver) Write(f archiver.File) error {
-	m.addedFiles = append(m.addedFiles, f.Name())
-	return nil
-}
-
-func (mockArchiver) Close() error {
-	return nil
+func mockArchiverAsync(ch chan archives.ArchiveAsyncJob, files *[]string) {
+	for job := range ch {
+		*files = append(*files, job.File.NameInArchive)
+		job.Result <- nil
+	}
 }
 
 func TestAddRecursiveExclude(t *testing.T) {
 	t.Run("Empty", func(t *testing.T) {
-		dir := t.TempDir()
-		archiver := &mockArchiver{}
+		ch := make(chan archives.ArchiveAsyncJob)
+		var files []string
+		go mockArchiverAsync(ch, &files)
 
-		err := addRecursiveExclude(archiver, "", dir, []string{}, false)
+		dir := t.TempDir()
+
+		err := addRecursiveExclude(ch, "", dir, []string{}, false)
 		require.NoError(t, err)
-		assert.Empty(t, archiver.addedFiles)
+		assert.Empty(t, files)
 	})
 
 	t.Run("Single file", func(t *testing.T) {
@@ -46,20 +38,25 @@ func TestAddRecursiveExclude(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("No exclude", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, nil, false)
+			err := addRecursiveExclude(ch, "", dir, nil, false)
 			require.NoError(t, err)
-			assert.Len(t, archiver.addedFiles, 1)
-			assert.Contains(t, archiver.addedFiles, "example")
+
+			assert.Len(t, files, 1)
+			assert.Contains(t, files, "example")
 		})
 
 		t.Run("With exclude", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, []string{dir + "/example"}, false)
+			err := addRecursiveExclude(ch, "", dir, []string{dir + "/example"}, false)
 			require.NoError(t, err)
-			assert.Empty(t, archiver.addedFiles)
+			assert.Empty(t, files)
 		})
 	})
 
@@ -73,46 +70,57 @@ func TestAddRecursiveExclude(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Run("No exclude", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, nil, false)
+			err := addRecursiveExclude(ch, "", dir, nil, false)
 			require.NoError(t, err)
-			assert.Len(t, archiver.addedFiles, 5)
-			assert.Contains(t, archiver.addedFiles, "deep")
-			assert.Contains(t, archiver.addedFiles, "deep/nested")
-			assert.Contains(t, archiver.addedFiles, "deep/nested/folder")
-			assert.Contains(t, archiver.addedFiles, "deep/nested/folder/example")
-			assert.Contains(t, archiver.addedFiles, "deep/nested/folder/another-file")
+			assert.Len(t, files, 5)
+
+			assert.Contains(t, files, "deep")
+			assert.Contains(t, files, "deep/nested")
+			assert.Contains(t, files, "deep/nested/folder")
+			assert.Contains(t, files, "deep/nested/folder/example")
+			assert.Contains(t, files, "deep/nested/folder/another-file")
 		})
 
 		t.Run("Exclude first directory", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, []string{dir + "/deep"}, false)
+			err := addRecursiveExclude(ch, "", dir, []string{dir + "/deep"}, false)
 			require.NoError(t, err)
-			assert.Empty(t, archiver.addedFiles)
+			assert.Empty(t, files)
 		})
 
 		t.Run("Exclude nested directory", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, []string{dir + "/deep/nested/folder"}, false)
+			err := addRecursiveExclude(ch, "", dir, []string{dir + "/deep/nested/folder"}, false)
 			require.NoError(t, err)
-			assert.Len(t, archiver.addedFiles, 2)
-			assert.Contains(t, archiver.addedFiles, "deep")
-			assert.Contains(t, archiver.addedFiles, "deep/nested")
+			assert.Len(t, files, 2)
+
+			assert.Contains(t, files, "deep")
+			assert.Contains(t, files, "deep/nested")
 		})
 
 		t.Run("Exclude file", func(t *testing.T) {
-			archiver := &mockArchiver{}
+			ch := make(chan archives.ArchiveAsyncJob)
+			var files []string
+			go mockArchiverAsync(ch, &files)
 
-			err = addRecursiveExclude(archiver, "", dir, []string{dir + "/deep/nested/folder/example"}, false)
+			err := addRecursiveExclude(ch, "", dir, []string{dir + "/deep/nested/folder/example"}, false)
 			require.NoError(t, err)
-			assert.Len(t, archiver.addedFiles, 4)
-			assert.Contains(t, archiver.addedFiles, "deep")
-			assert.Contains(t, archiver.addedFiles, "deep/nested")
-			assert.Contains(t, archiver.addedFiles, "deep/nested/folder")
-			assert.Contains(t, archiver.addedFiles, "deep/nested/folder/another-file")
+			assert.Len(t, files, 4)
+
+			assert.Contains(t, files, "deep")
+			assert.Contains(t, files, "deep/nested")
+			assert.Contains(t, files, "deep/nested/folder")
+			assert.Contains(t, files, "deep/nested/folder/another-file")
 		})
 	})
 }
diff --git a/cmd/embedded.go b/cmd/embedded.go
index c8b9d13d25..8fa76ccef1 100644
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -19,23 +20,25 @@ import (
 	"forgejo.org/modules/util"
 
 	"github.com/gobwas/glob"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdEmbedded represents the available extract sub-command.
-var (
-	CmdEmbedded = &cli.Command{
+func cmdEmbedded() *cli.Command {
+	return &cli.Command{
 		Name:        "embedded",
 		Usage:       "Extract embedded resources",
 		Description: "A command for extracting embedded resources, like templates and images",
-		Subcommands: []*cli.Command{
-			subcmdList,
-			subcmdView,
-			subcmdExtract,
+		Commands: []*cli.Command{
+			subcmdList(),
+			subcmdView(),
+			subcmdExtract(),
 		},
 	}
+}
 
-	subcmdList = &cli.Command{
+func subcmdList() *cli.Command {
+	return &cli.Command{
 		Name:   "list",
 		Usage:  "List files matching the given pattern",
 		Action: runList,
@@ -47,8 +50,10 @@ var (
 			},
 		},
 	}
+}
 
-	subcmdView = &cli.Command{
+func subcmdView() *cli.Command {
+	return &cli.Command{
 		Name:   "view",
 		Usage:  "View a file matching the given pattern",
 		Action: runView,
@@ -60,8 +65,10 @@ var (
 			},
 		},
 	}
+}
 
-	subcmdExtract = &cli.Command{
+func subcmdExtract() *cli.Command {
+	return &cli.Command{
 		Name:   "extract",
 		Usage:  "Extract resources",
 		Action: runExtract,
@@ -90,9 +97,9 @@ var (
 			},
 		},
 	}
+}
 
-	matchedAssetFiles []assetFile
-)
+var matchedAssetFiles []assetFile
 
 type assetFile struct {
 	fs   *assetfs.LayeredFS
@@ -100,7 +107,7 @@ type assetFile struct {
 	path string
 }
 
-func initEmbeddedExtractor(c *cli.Context) error {
+func initEmbeddedExtractor(_ context.Context, c *cli.Command) error {
 	setupConsoleLogger(log.ERROR, log.CanColorStderr, os.Stderr)
 
 	patterns, err := compileCollectPatterns(c.Args().Slice())
@@ -115,32 +122,32 @@ func initEmbeddedExtractor(c *cli.Context) error {
 	return nil
 }
 
-func runList(c *cli.Context) error {
-	if err := runListDo(c); err != nil {
+func runList(ctx context.Context, c *cli.Command) error {
+	if err := runListDo(ctx, c); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
 }
 
-func runView(c *cli.Context) error {
-	if err := runViewDo(c); err != nil {
+func runView(ctx context.Context, c *cli.Command) error {
+	if err := runViewDo(ctx, c); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
 }
 
-func runExtract(c *cli.Context) error {
-	if err := runExtractDo(c); err != nil {
+func runExtract(ctx context.Context, c *cli.Command) error {
+	if err := runExtractDo(ctx, c); err != nil {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		return err
 	}
 	return nil
 }
 
-func runListDo(c *cli.Context) error {
-	if err := initEmbeddedExtractor(c); err != nil {
+func runListDo(ctx context.Context, c *cli.Command) error {
+	if err := initEmbeddedExtractor(ctx, c); err != nil {
 		return err
 	}
 
@@ -151,8 +158,8 @@ func runListDo(c *cli.Context) error {
 	return nil
 }
 
-func runViewDo(c *cli.Context) error {
-	if err := initEmbeddedExtractor(c); err != nil {
+func runViewDo(ctx context.Context, c *cli.Command) error {
+	if err := initEmbeddedExtractor(ctx, c); err != nil {
 		return err
 	}
 
@@ -174,8 +181,8 @@ func runViewDo(c *cli.Context) error {
 	return nil
 }
 
-func runExtractDo(c *cli.Context) error {
-	if err := initEmbeddedExtractor(c); err != nil {
+func runExtractDo(ctx context.Context, c *cli.Command) error {
+	if err := initEmbeddedExtractor(ctx, c); err != nil {
 		return err
 	}
 
@@ -271,7 +278,7 @@ func extractAsset(d string, a assetFile, overwrite, rename bool) error {
 	return nil
 }
 
-func collectAssetFilesByPattern(c *cli.Context, globs []glob.Glob, path string, layer *assetfs.Layer) {
+func collectAssetFilesByPattern(c *cli.Command, globs []glob.Glob, path string, layer *assetfs.Layer) {
 	fs := assetfs.Layered(layer)
 	files, err := fs.ListAllFiles(".", true)
 	if err != nil {
diff --git a/cmd/forgejo/actions.go b/cmd/forgejo/actions.go
index dbe7398bcf..c445d1aa38 100644
--- a/cmd/forgejo/actions.go
+++ b/cmd/forgejo/actions.go
@@ -6,6 +6,7 @@ package forgejo
 import (
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -16,14 +17,14 @@ import (
 	"forgejo.org/modules/setting"
 	private_routers "forgejo.org/routers/private"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func CmdActions(ctx context.Context) *cli.Command {
 	return &cli.Command{
 		Name:  "actions",
 		Usage: "Commands for managing Forgejo Actions",
-		Subcommands: []*cli.Command{
+		Commands: []*cli.Command{
 			SubcmdActionsGenerateRunnerToken(ctx),
 			SubcmdActionsGenerateRunnerSecret(ctx),
 			SubcmdActionsRegister(ctx),
@@ -36,7 +37,7 @@ func SubcmdActionsGenerateRunnerToken(ctx context.Context) *cli.Command {
 		Name:   "generate-runner-token",
 		Usage:  "Generate a new token for a runner to use to register with the server",
 		Before: prepareWorkPathAndCustomConf(ctx),
-		Action: func(cliCtx *cli.Context) error { return RunGenerateActionsRunnerToken(ctx, cliCtx) },
+		Action: RunGenerateActionsRunnerToken,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:    "scope",
@@ -52,7 +53,7 @@ func SubcmdActionsGenerateRunnerSecret(ctx context.Context) *cli.Command {
 	return &cli.Command{
 		Name:   "generate-secret",
 		Usage:  "Generate a secret suitable for input to the register subcommand",
-		Action: func(cliCtx *cli.Context) error { return RunGenerateSecret(ctx, cliCtx) },
+		Action: RunGenerateSecret,
 	}
 }
 
@@ -61,7 +62,7 @@ func SubcmdActionsRegister(ctx context.Context) *cli.Command {
 		Name:   "register",
 		Usage:  "Idempotent registration of a runner using a shared secret",
 		Before: prepareWorkPathAndCustomConf(ctx),
-		Action: func(cliCtx *cli.Context) error { return RunRegister(ctx, cliCtx) },
+		Action: RunRegister,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:  "secret",
@@ -105,26 +106,26 @@ func SubcmdActionsRegister(ctx context.Context) *cli.Command {
 	}
 }
 
-func readSecret(ctx context.Context, cliCtx *cli.Context) (string, error) {
-	if cliCtx.IsSet("secret") {
-		return cliCtx.String("secret"), nil
+func readSecret(ctx context.Context, cli *cli.Command) (string, error) {
+	if cli.IsSet("secret") {
+		return cli.String("secret"), nil
 	}
-	if cliCtx.IsSet("secret-stdin") {
+	if cli.IsSet("secret-stdin") {
 		buf, err := io.ReadAll(ContextGetStdin(ctx))
 		if err != nil {
 			return "", err
 		}
 		return string(buf), nil
 	}
-	if cliCtx.IsSet("secret-file") {
-		path := cliCtx.String("secret-file")
+	if cli.IsSet("secret-file") {
+		path := cli.String("secret-file")
 		buf, err := os.ReadFile(path)
 		if err != nil {
 			return "", err
 		}
 		return string(buf), nil
 	}
-	return "", fmt.Errorf("at least one of the --secret, --secret-stdin, --secret-file options is required")
+	return "", errors.New("at least one of the --secret, --secret-stdin, --secret-file options is required")
 }
 
 func validateSecret(secret string) error {
@@ -138,18 +139,18 @@ func validateSecret(secret string) error {
 	return nil
 }
 
-func getLabels(cliCtx *cli.Context) (*[]string, error) {
-	if !cliCtx.Bool("keep-labels") {
-		lblValue := strings.Split(cliCtx.String("labels"), ",")
+func getLabels(cli *cli.Command) (*[]string, error) {
+	if !cli.Bool("keep-labels") {
+		lblValue := strings.Split(cli.String("labels"), ",")
 		return &lblValue, nil
 	}
-	if cliCtx.String("labels") != "" {
-		return nil, fmt.Errorf("--labels and --keep-labels should not be used together")
+	if cli.String("labels") != "" {
+		return nil, errors.New("--labels and --keep-labels should not be used together")
 	}
 	return nil, nil
 }
 
-func RunRegister(ctx context.Context, cliCtx *cli.Context) error {
+func RunRegister(ctx context.Context, cli *cli.Command) error {
 	var cancel context.CancelFunc
 	if !ContextGetNoInit(ctx) {
 		ctx, cancel = installSignals(ctx)
@@ -161,17 +162,17 @@ func RunRegister(ctx context.Context, cliCtx *cli.Context) error {
 	}
 	setting.MustInstalled()
 
-	secret, err := readSecret(ctx, cliCtx)
+	secret, err := readSecret(ctx, cli)
 	if err != nil {
 		return err
 	}
 	if err := validateSecret(secret); err != nil {
 		return err
 	}
-	scope := cliCtx.String("scope")
-	name := cliCtx.String("name")
-	version := cliCtx.String("version")
-	labels, err := getLabels(cliCtx)
+	scope := cli.String("scope")
+	name := cli.String("name")
+	version := cli.String("version")
+	labels, err := getLabels(cli)
 	if err != nil {
 		return err
 	}
@@ -209,7 +210,7 @@ func RunRegister(ctx context.Context, cliCtx *cli.Context) error {
 	return nil
 }
 
-func RunGenerateSecret(ctx context.Context, cliCtx *cli.Context) error {
+func RunGenerateSecret(ctx context.Context, cli *cli.Command) error {
 	runner := actions_model.ActionRunner{}
 	if err := runner.GenerateToken(); err != nil {
 		return err
@@ -220,7 +221,7 @@ func RunGenerateSecret(ctx context.Context, cliCtx *cli.Context) error {
 	return nil
 }
 
-func RunGenerateActionsRunnerToken(ctx context.Context, cliCtx *cli.Context) error {
+func RunGenerateActionsRunnerToken(ctx context.Context, cli *cli.Command) error {
 	if !ContextGetNoInit(ctx) {
 		var cancel context.CancelFunc
 		ctx, cancel = installSignals(ctx)
@@ -229,7 +230,7 @@ func RunGenerateActionsRunnerToken(ctx context.Context, cliCtx *cli.Context) err
 
 	setting.MustInstalled()
 
-	scope := cliCtx.String("scope")
+	scope := cli.String("scope")
 
 	respText, extra := private.GenerateActionsRunnerToken(ctx, scope)
 	if extra.HasError() {
diff --git a/cmd/forgejo/actions_test.go b/cmd/forgejo/actions_test.go
index b58f52184c..11315239f7 100644
--- a/cmd/forgejo/actions_test.go
+++ b/cmd/forgejo/actions_test.go
@@ -4,14 +4,13 @@
 package forgejo
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
-	"forgejo.org/services/context"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func TestActions_getLabels(t *testing.T) {
@@ -54,21 +53,21 @@ func TestActions_getLabels(t *testing.T) {
 		},
 	}
 
-	flags := SubcmdActionsRegister(context.Context{}).Flags
+	flags := SubcmdActionsRegister(t.Context()).Flags
 	for _, c := range cases {
 		t.Run(fmt.Sprintf("args: %v", c.args), func(t *testing.T) {
 			// Create a copy of command to test
 			var result *resultType
-			app := cli.NewApp()
+			app := cli.Command{}
 			app.Flags = flags
-			app.Action = func(ctx *cli.Context) error {
+			app.Action = func(_ context.Context, ctx *cli.Command) error {
 				labels, err := getLabels(ctx)
 				result = &resultType{labels, err}
 				return nil
 			}
 
 			// Run it
-			_ = app.Run(c.args)
+			_ = app.Run(t.Context(), c.args)
 
 			// Test the results
 			require.NotNil(t, result)
diff --git a/cmd/forgejo/f3.go b/cmd/forgejo/f3.go
index bfd14cd1a4..c4aafeac58 100644
--- a/cmd/forgejo/f3.go
+++ b/cmd/forgejo/f3.go
@@ -20,7 +20,7 @@ import (
 	f3_cmd "code.forgejo.org/f3/gof3/v3/cmd"
 	f3_logger "code.forgejo.org/f3/gof3/v3/logger"
 	f3_util "code.forgejo.org/f3/gof3/v3/util"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func CmdF3(ctx context.Context) *cli.Command {
@@ -28,21 +28,21 @@ func CmdF3(ctx context.Context) *cli.Command {
 	return &cli.Command{
 		Name:  "f3",
 		Usage: "F3",
-		Subcommands: []*cli.Command{
+		Commands: []*cli.Command{
 			SubcmdF3Mirror(ctx),
 		},
 	}
 }
 
 func SubcmdF3Mirror(ctx context.Context) *cli.Command {
-	mirrorCmd := f3_cmd.CreateCmdMirror(ctx)
+	mirrorCmd := f3_cmd.CreateCmdMirror()
 	mirrorCmd.Before = prepareWorkPathAndCustomConf(ctx)
 	f3Action := mirrorCmd.Action
-	mirrorCmd.Action = func(c *cli.Context) error { return runMirror(ctx, c, f3Action) }
+	mirrorCmd.Action = func(ctx context.Context, cli *cli.Command) error { return runMirror(ctx, cli, f3Action) }
 	return mirrorCmd
 }
 
-func runMirror(ctx context.Context, c *cli.Context, action cli.ActionFunc) error {
+func runMirror(ctx context.Context, c *cli.Command, action cli.ActionFunc) error {
 	setting.LoadF3Setting()
 	if !setting.F3.Enabled {
 		return errors.New("F3 is disabled, it is not ready to be used and is only present for development purposes")
@@ -69,7 +69,7 @@ func runMirror(ctx context.Context, c *cli.Context, action cli.ActionFunc) error
 		}
 	}
 
-	err := action(c)
+	err := action(ctx, c)
 	if panicError, ok := err.(f3_util.PanicError); ok {
 		log.Debug("F3 Stack trace\n%s", panicError.Stack())
 	}
diff --git a/cmd/forgejo/forgejo.go b/cmd/forgejo/forgejo.go
index 3b95c80991..171ef1a71d 100644
--- a/cmd/forgejo/forgejo.go
+++ b/cmd/forgejo/forgejo.go
@@ -16,7 +16,7 @@ import (
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 type key int
@@ -34,7 +34,7 @@ func CmdForgejo(ctx context.Context) *cli.Command {
 		Name:  "forgejo-cli",
 		Usage: "Forgejo CLI",
 		Flags: []cli.Flag{},
-		Subcommands: []*cli.Command{
+		Commands: []*cli.Command{
 			CmdActions(ctx),
 			CmdF3(ctx),
 		},
@@ -147,12 +147,12 @@ func handleCliResponseExtra(ctx context.Context, extra private.ResponseExtra) er
 	return cli.Exit(extra.Error, 1)
 }
 
-func prepareWorkPathAndCustomConf(ctx context.Context) func(c *cli.Context) error {
-	return func(c *cli.Context) error {
+func prepareWorkPathAndCustomConf(ctx context.Context) func(ctx context.Context, cli *cli.Command) (context.Context, error) {
+	return func(ctx context.Context, cli *cli.Command) (context.Context, error) {
 		if !ContextGetNoInit(ctx) {
 			var args setting.ArgWorkPathAndCustomConf
 			// from children to parent, check the global flags
-			for _, curCtx := range c.Lineage() {
+			for _, curCtx := range cli.Lineage() {
 				if curCtx.IsSet("work-path") && args.WorkPath == "" {
 					args.WorkPath = curCtx.String("work-path")
 				}
@@ -165,6 +165,6 @@ func prepareWorkPathAndCustomConf(ctx context.Context) func(c *cli.Context) erro
 			}
 			setting.InitWorkPathAndCommonConfig(os.Getenv, args)
 		}
-		return nil
+		return ctx, nil
 	}
 }
diff --git a/cmd/generate.go b/cmd/generate.go
index 8d3c221ec5..7076ae541f 100644
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -5,56 +5,65 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 
 	"forgejo.org/modules/generate"
 
 	"github.com/mattn/go-isatty"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	// CmdGenerate represents the available generate sub-command.
-	CmdGenerate = &cli.Command{
+// CmdGenerate represents the available generate sub-command.
+func cmdGenerate() *cli.Command {
+	return &cli.Command{
 		Name:  "generate",
 		Usage: "Generate Gitea's secrets/keys/tokens",
-		Subcommands: []*cli.Command{
-			subcmdSecret,
+		Commands: []*cli.Command{
+			subcmdSecret(),
 		},
 	}
+}
 
-	subcmdSecret = &cli.Command{
+func subcmdSecret() *cli.Command {
+	return &cli.Command{
 		Name:  "secret",
 		Usage: "Generate a secret token",
-		Subcommands: []*cli.Command{
-			microcmdGenerateInternalToken,
-			microcmdGenerateLfsJwtSecret,
-			microcmdGenerateSecretKey,
+		Commands: []*cli.Command{
+			microcmdGenerateInternalToken(),
+			microcmdGenerateLfsJwtSecret(),
+			microcmdGenerateSecretKey(),
 		},
 	}
+}
 
-	microcmdGenerateInternalToken = &cli.Command{
+func microcmdGenerateInternalToken() *cli.Command {
+	return &cli.Command{
 		Name:   "INTERNAL_TOKEN",
 		Usage:  "Generate a new INTERNAL_TOKEN",
 		Action: runGenerateInternalToken,
 	}
+}
 
-	microcmdGenerateLfsJwtSecret = &cli.Command{
+func microcmdGenerateLfsJwtSecret() *cli.Command {
+	return &cli.Command{
 		Name:    "JWT_SECRET",
 		Aliases: []string{"LFS_JWT_SECRET"},
 		Usage:   "Generate a new JWT_SECRET",
 		Action:  runGenerateLfsJwtSecret,
 	}
+}
 
-	microcmdGenerateSecretKey = &cli.Command{
+func microcmdGenerateSecretKey() *cli.Command {
+	return &cli.Command{
 		Name:   "SECRET_KEY",
 		Usage:  "Generate a new SECRET_KEY",
 		Action: runGenerateSecretKey,
 	}
-)
+}
 
-func runGenerateInternalToken(c *cli.Context) error {
+func runGenerateInternalToken(ctx context.Context, c *cli.Command) error {
 	internalToken, err := generate.NewInternalToken()
 	if err != nil {
 		return err
@@ -63,28 +72,25 @@ func runGenerateInternalToken(c *cli.Context) error {
 	fmt.Printf("%s", internalToken)
 
 	if isatty.IsTerminal(os.Stdout.Fd()) {
-		fmt.Printf("\n")
+		fmt.Println()
 	}
 
 	return nil
 }
 
-func runGenerateLfsJwtSecret(c *cli.Context) error {
-	_, jwtSecretBase64, err := generate.NewJwtSecret()
-	if err != nil {
-		return err
-	}
+func runGenerateLfsJwtSecret(ctx context.Context, c *cli.Command) error {
+	_, jwtSecretBase64 := generate.NewJwtSecret()
 
 	fmt.Printf("%s", jwtSecretBase64)
 
 	if isatty.IsTerminal(os.Stdout.Fd()) {
-		fmt.Printf("\n")
+		fmt.Print("\n")
 	}
 
 	return nil
 }
 
-func runGenerateSecretKey(c *cli.Context) error {
+func runGenerateSecretKey(ctx context.Context, c *cli.Command) error {
 	secretKey, err := generate.NewSecretKey()
 	if err != nil {
 		return err
@@ -93,7 +99,7 @@ func runGenerateSecretKey(c *cli.Context) error {
 	fmt.Printf("%s", secretKey)
 
 	if isatty.IsTerminal(os.Stdout.Fd()) {
-		fmt.Printf("\n")
+		fmt.Print("\n")
 	}
 
 	return nil
diff --git a/cmd/hook.go b/cmd/hook.go
index 1630c41edd..7378dc21ad 100644
--- a/cmd/hook.go
+++ b/cmd/hook.go
@@ -21,29 +21,31 @@ import (
 	repo_module "forgejo.org/modules/repository"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 const (
 	hookBatchSize = 30
 )
 
-var (
-	// CmdHook represents the available hooks sub-command.
-	CmdHook = &cli.Command{
+// CmdHook represents the available hooks sub-command.
+func cmdHook() *cli.Command {
+	return &cli.Command{
 		Name:        "hook",
 		Usage:       "(internal) Should only be called by Git",
 		Description: "Delegate commands to corresponding Git hooks",
 		Before:      PrepareConsoleLoggerLevel(log.FATAL),
-		Subcommands: []*cli.Command{
-			subcmdHookPreReceive,
-			subcmdHookUpdate,
-			subcmdHookPostReceive,
-			subcmdHookProcReceive,
+		Commands: []*cli.Command{
+			subcmdHookPreReceive(),
+			subcmdHookUpdate(),
+			subcmdHookPostReceive(),
+			subcmdHookProcReceive(),
 		},
 	}
+}
 
-	subcmdHookPreReceive = &cli.Command{
+func subcmdHookPreReceive() *cli.Command {
+	return &cli.Command{
 		Name:        "pre-receive",
 		Usage:       "Delegate pre-receive Git hook",
 		Description: "This command should only be called by Git",
@@ -54,7 +56,10 @@ var (
 			},
 		},
 	}
-	subcmdHookUpdate = &cli.Command{
+}
+
+func subcmdHookUpdate() *cli.Command {
+	return &cli.Command{
 		Name:        "update",
 		Usage:       "Delegate update Git hook",
 		Description: "This command should only be called by Git",
@@ -65,7 +70,10 @@ var (
 			},
 		},
 	}
-	subcmdHookPostReceive = &cli.Command{
+}
+
+func subcmdHookPostReceive() *cli.Command {
+	return &cli.Command{
 		Name:        "post-receive",
 		Usage:       "Delegate post-receive Git hook",
 		Description: "This command should only be called by Git",
@@ -76,8 +84,11 @@ var (
 			},
 		},
 	}
-	// Note: new hook since git 2.29
-	subcmdHookProcReceive = &cli.Command{
+}
+
+// Note: new hook since git 2.29
+func subcmdHookProcReceive() *cli.Command {
+	return &cli.Command{
 		Name:        "proc-receive",
 		Usage:       "Delegate proc-receive Git hook",
 		Description: "This command should only be called by Git",
@@ -88,7 +99,7 @@ var (
 			},
 		},
 	}
-)
+}
 
 type delayWriter struct {
 	internal io.Writer
@@ -161,14 +172,14 @@ func (n *nilWriter) WriteString(s string) (int, error) {
 	return len(s), nil
 }
 
-func runHookPreReceive(c *cli.Context) error {
+func runHookPreReceive(ctx context.Context, c *cli.Command) error {
 	if isInternal, _ := strconv.ParseBool(os.Getenv(repo_module.EnvIsInternal)); isInternal {
 		return nil
 	}
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), true)
 
 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
@@ -220,11 +231,6 @@ Forgejo or set your environment appropriately.`, "")
 		}
 	}
 
-	supportProcReceive := false
-	if git.CheckGitVersionAtLeast("2.29") == nil {
-		supportProcReceive = true
-	}
-
 	for scanner.Scan() {
 		// TODO: support news feeds for wiki
 		if isWiki {
@@ -242,34 +248,28 @@ Forgejo or set your environment appropriately.`, "")
 		total++
 		lastline++
 
-		// If the ref is a branch or tag, check if it's protected
-		// if supportProcReceive all ref should be checked because
-		// permission check was delayed
-		if supportProcReceive || refFullName.IsBranch() || refFullName.IsTag() {
-			oldCommitIDs[count] = oldCommitID
-			newCommitIDs[count] = newCommitID
-			refFullNames[count] = refFullName
-			count++
-			fmt.Fprintf(out, "*")
+		// All references should be checked because permission check was delayed.
+		oldCommitIDs[count] = oldCommitID
+		newCommitIDs[count] = newCommitID
+		refFullNames[count] = refFullName
+		count++
+		fmt.Fprint(out, "*")
 
-			if count >= hookBatchSize {
-				fmt.Fprintf(out, " Checking %d references\n", count)
+		if count >= hookBatchSize {
+			fmt.Fprintf(out, " Checking %d references\n", count)
 
-				hookOptions.OldCommitIDs = oldCommitIDs
-				hookOptions.NewCommitIDs = newCommitIDs
-				hookOptions.RefFullNames = refFullNames
-				extra := private.HookPreReceive(ctx, username, reponame, hookOptions)
-				if extra.HasError() {
-					return fail(ctx, extra.UserMsg, "HookPreReceive(batch) failed: %v", extra.Error)
-				}
-				count = 0
-				lastline = 0
+			hookOptions.OldCommitIDs = oldCommitIDs
+			hookOptions.NewCommitIDs = newCommitIDs
+			hookOptions.RefFullNames = refFullNames
+			extra := private.HookPreReceive(ctx, username, reponame, hookOptions)
+			if extra.HasError() {
+				return fail(ctx, extra.UserMsg, "HookPreReceive(batch) failed: %v", extra.Error)
 			}
-		} else {
-			fmt.Fprintf(out, ".")
+			count = 0
+			lastline = 0
 		}
 		if lastline >= hookBatchSize {
-			fmt.Fprintf(out, "\n")
+			fmt.Fprint(out, "\n")
 			lastline = 0
 		}
 	}
@@ -286,7 +286,7 @@ Forgejo or set your environment appropriately.`, "")
 			return fail(ctx, extra.UserMsg, "HookPreReceive(last) failed: %v", extra.Error)
 		}
 	} else if lastline > 0 {
-		fmt.Fprintf(out, "\n")
+		fmt.Fprint(out, "\n")
 	}
 
 	fmt.Fprintf(out, "Checked %d references in total\n", total)
@@ -294,13 +294,13 @@ Forgejo or set your environment appropriately.`, "")
 }
 
 // runHookUpdate process the update hook: https://git-scm.com/docs/githooks#update
-func runHookUpdate(c *cli.Context) error {
+func runHookUpdate(ctx context.Context, c *cli.Command) error {
 	// Now if we're an internal don't do anything else
 	if isInternal, _ := strconv.ParseBool(os.Getenv(repo_module.EnvIsInternal)); isInternal {
 		return nil
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	if c.NArg() != 3 {
@@ -326,11 +326,11 @@ func runHookUpdate(c *cli.Context) error {
 	return fail(ctx, fmt.Sprintf("The modification of %s is skipped as it's an internal reference.", refFullName), "")
 }
 
-func runHookPostReceive(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runHookPostReceive(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), true)
 
 	// First of all run update-server-info no matter what
 	if _, _, err := git.NewCommand(ctx, "update-server-info").RunStdString(nil); err != nil {
@@ -402,7 +402,7 @@ Forgejo or set your environment appropriately.`, "")
 			continue
 		}
 
-		fmt.Fprintf(out, ".")
+		fmt.Fprint(out, ".")
 		oldCommitIDs[count] = string(fields[0])
 		newCommitIDs[count] = string(fields[1])
 		refFullNames[count] = git.RefName(fields[2])
@@ -490,11 +490,11 @@ func hookPrintResults(results []private.HookPostReceiveBranchResult) {
 	}
 }
 
-func runHookProcReceive(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runHookProcReceive(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), true)
 
 	if len(os.Getenv("SSH_ORIGINAL_COMMAND")) == 0 {
 		if setting.OnlyAllowPushIfGiteaEnvironmentSet {
@@ -505,10 +505,6 @@ Forgejo or set your environment appropriately.`, "")
 		return nil
 	}
 
-	if git.CheckGitVersionAtLeast("2.29") != nil {
-		return fail(ctx, "No proc-receive support", "current git version doesn't support proc-receive.")
-	}
-
 	reader := bufio.NewReader(os.Stdin)
 	repoUser := os.Getenv(repo_module.EnvRepoUsername)
 	repoName := os.Getenv(repo_module.EnvRepoName)
diff --git a/cmd/hook_test.go b/cmd/hook_test.go
index 89bd3cf737..82ed392fb8 100644
--- a/cmd/hook_test.go
+++ b/cmd/hook_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // Capture what's being written into a standard file descriptor.
@@ -134,14 +134,14 @@ func TestDelayWriter(t *testing.T) {
 	defer ts.Close()
 	defer test.MockVariableValue(&setting.LocalURL, ts.URL+"/")()
 
-	app := cli.NewApp()
-	app.Commands = []*cli.Command{subcmdHookPreReceive}
+	app := cli.Command{}
+	app.Commands = []*cli.Command{subcmdHookPreReceive()}
 
 	t.Run("Should delay", func(t *testing.T) {
 		defer test.MockVariableValue(&setting.Git.VerbosePushDelay, time.Millisecond*500)()
 		finish := captureOutput(t, os.Stdout)
 
-		err = app.Run([]string{"./forgejo", "pre-receive"})
+		err = app.Run(t.Context(), []string{"./forgejo", "pre-receive"})
 		require.NoError(t, err)
 		out := finish()
 
@@ -153,7 +153,7 @@ func TestDelayWriter(t *testing.T) {
 		defer test.MockVariableValue(&setting.Git.VerbosePushDelay, time.Second*5)()
 		finish := captureOutput(t, os.Stdout)
 
-		err = app.Run([]string{"./forgejo", "pre-receive"})
+		err = app.Run(t.Context(), []string{"./forgejo", "pre-receive"})
 		require.NoError(t, err)
 		out := finish()
 
@@ -163,15 +163,15 @@ func TestDelayWriter(t *testing.T) {
 }
 
 func TestRunHookUpdate(t *testing.T) {
-	app := cli.NewApp()
-	app.Commands = []*cli.Command{subcmdHookUpdate}
+	app := cli.Command{}
+	app.Commands = []*cli.Command{subcmdHookUpdate()}
 
 	t.Run("Removal of internal reference", func(t *testing.T) {
 		defer test.MockVariableValue(&cli.OsExiter, func(code int) {})()
 		defer test.MockVariableValue(&setting.IsProd, false)()
 		finish := captureOutput(t, os.Stderr)
 
-		err := app.Run([]string{"./forgejo", "update", "refs/pull/1/head", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000000"})
+		err := app.Run(t.Context(), []string{"./forgejo", "update", "refs/pull/1/head", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000000"})
 		out := finish()
 		require.Error(t, err)
 
@@ -183,7 +183,7 @@ func TestRunHookUpdate(t *testing.T) {
 		defer test.MockVariableValue(&setting.IsProd, false)()
 		finish := captureOutput(t, os.Stderr)
 
-		err := app.Run([]string{"./forgejo", "update", "refs/pull/1/head", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000001"})
+		err := app.Run(t.Context(), []string{"./forgejo", "update", "refs/pull/1/head", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000001"})
 		out := finish()
 		require.Error(t, err)
 
@@ -191,12 +191,12 @@ func TestRunHookUpdate(t *testing.T) {
 	})
 
 	t.Run("Removal of branch", func(t *testing.T) {
-		err := app.Run([]string{"./forgejo", "update", "refs/head/main", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000000"})
+		err := app.Run(t.Context(), []string{"./forgejo", "update", "refs/head/main", "0a51ae26bc73c47e2f754560c40904cf14ed51a9", "0000000000000000000000000000000000000000"})
 		require.NoError(t, err)
 	})
 
 	t.Run("Not enough arguments", func(t *testing.T) {
-		err := app.Run([]string{"./forgejo", "update"})
+		err := app.Run(t.Context(), []string{"./forgejo", "update"})
 		require.NoError(t, err)
 	})
 }
diff --git a/cmd/keys.go b/cmd/keys.go
index b12daee1bc..00901903f4 100644
--- a/cmd/keys.go
+++ b/cmd/keys.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
@@ -11,45 +12,47 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/private"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdKeys represents the available keys sub-command
-var CmdKeys = &cli.Command{
-	Name:        "keys",
-	Usage:       "(internal) Should only be called by SSH server",
-	Description: "Queries the Forgejo database to get the authorized command for a given ssh key fingerprint",
-	Before:      PrepareConsoleLoggerLevel(log.FATAL),
-	Action:      runKeys,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "expected",
-			Aliases: []string{"e"},
-			Value:   "git",
-			Usage:   "Expected user for whom provide key commands",
+func cmdKeys() *cli.Command {
+	return &cli.Command{
+		Name:        "keys",
+		Usage:       "(internal) Should only be called by SSH server",
+		Description: "Queries the Forgejo database to get the authorized command for a given ssh key fingerprint",
+		Before:      PrepareConsoleLoggerLevel(log.FATAL),
+		Action:      runKeys,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "expected",
+				Aliases: []string{"e"},
+				Value:   "git",
+				Usage:   "Expected user for whom provide key commands",
+			},
+			&cli.StringFlag{
+				Name:    "username",
+				Aliases: []string{"u"},
+				Value:   "",
+				Usage:   "Username trying to log in by SSH",
+			},
+			&cli.StringFlag{
+				Name:    "type",
+				Aliases: []string{"t"},
+				Value:   "",
+				Usage:   "Type of the SSH key provided to the SSH Server (requires content to be provided too)",
+			},
+			&cli.StringFlag{
+				Name:    "content",
+				Aliases: []string{"k"},
+				Value:   "",
+				Usage:   "Base64 encoded content of the SSH key provided to the SSH Server (requires type to be provided too)",
+			},
 		},
-		&cli.StringFlag{
-			Name:    "username",
-			Aliases: []string{"u"},
-			Value:   "",
-			Usage:   "Username trying to log in by SSH",
-		},
-		&cli.StringFlag{
-			Name:    "type",
-			Aliases: []string{"t"},
-			Value:   "",
-			Usage:   "Type of the SSH key provided to the SSH Server (requires content to be provided too)",
-		},
-		&cli.StringFlag{
-			Name:    "content",
-			Aliases: []string{"k"},
-			Value:   "",
-			Usage:   "Base64 encoded content of the SSH key provided to the SSH Server (requires type to be provided too)",
-		},
-	},
+	}
 }
 
-func runKeys(c *cli.Context) error {
+func runKeys(ctx context.Context, c *cli.Command) error {
 	if !c.IsSet("username") {
 		return errors.New("No username provided")
 	}
@@ -68,16 +71,16 @@ func runKeys(c *cli.Context) error {
 		return errors.New("No key type and content provided")
 	}
 
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), true)
 
 	authorizedString, extra := private.AuthorizedPublicKeyByContent(ctx, content)
 	// do not use handleCliResponseExtra or cli.NewExitError, if it exists immediately, it breaks some tests like Test_CmdKeys
 	if extra.Error != nil {
 		return extra.Error
 	}
-	_, _ = fmt.Fprintln(c.App.Writer, strings.TrimSpace(authorizedString.Text))
+	_, _ = fmt.Fprintln(c.Root().Writer, strings.TrimSpace(authorizedString.Text))
 	return nil
 }
diff --git a/cmd/mailer.go b/cmd/mailer.go
index cddebd6d36..d05d6c849b 100644
--- a/cmd/mailer.go
+++ b/cmd/mailer.go
@@ -4,16 +4,17 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-func runSendMail(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runSendMail(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	setting.MustInstalled()
diff --git a/cmd/main.go b/cmd/main.go
index 5f48814cd0..65cde47884 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -14,7 +14,7 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // cmdHelp is our own help subcommand with more information
@@ -25,18 +25,18 @@ func cmdHelp() *cli.Command {
 		Aliases:   []string{"h"},
 		Usage:     "Shows a list of commands or help for one command",
 		ArgsUsage: "[command]",
-		Action: func(c *cli.Context) (err error) {
-			lineage := c.Lineage() // The order is from child to parent: help, doctor, Gitea, {Command:nil}
+		Action: func(ctx context.Context, c *cli.Command) (err error) {
+			lineage := c.Lineage() // The order is from child to parent: help, doctor, Forgejo
 			targetCmdIdx := 0
-			if c.Command.Name == "help" {
+			if c.Name == "help" {
 				targetCmdIdx = 1
 			}
-			if lineage[targetCmdIdx+1].Command != nil {
-				err = cli.ShowCommandHelp(lineage[targetCmdIdx+1], lineage[targetCmdIdx].Command.Name)
+			if targetCmdIdx+1 < len(lineage) {
+				err = cli.ShowCommandHelp(ctx, lineage[targetCmdIdx+1], lineage[targetCmdIdx].Name)
 			} else {
 				err = cli.ShowAppHelp(c)
 			}
-			_, _ = fmt.Fprintf(c.App.Writer, `
+			_, _ = fmt.Fprintf(c.Root().Writer, `
 DEFAULT CONFIGURATION:
    AppPath:    %s
    WorkPath:   %s
@@ -77,25 +77,25 @@ func appGlobalFlags() []cli.Flag {
 	}
 }
 
-func prepareSubcommandWithConfig(command *cli.Command, globalFlags []cli.Flag) {
-	command.Flags = append(append([]cli.Flag{}, globalFlags...), command.Flags...)
+func prepareSubcommandWithConfig(command *cli.Command, globalFlags func() []cli.Flag) {
+	command.Flags = append(globalFlags(), command.Flags...)
 	command.Action = prepareWorkPathAndCustomConf(command.Action)
 	command.HideHelp = true
 	if command.Name != "help" {
-		command.Subcommands = append(command.Subcommands, cmdHelp())
+		command.Commands = append(command.Commands, cmdHelp())
 	}
-	for i := range command.Subcommands {
-		prepareSubcommandWithConfig(command.Subcommands[i], globalFlags)
+	for i := range command.Commands {
+		prepareSubcommandWithConfig(command.Commands[i], globalFlags)
 	}
 }
 
 // prepareWorkPathAndCustomConf wraps the Action to prepare the work path and custom config
 // It can't use "Before", because each level's sub-command's Before will be called one by one, so the "init" would be done multiple times
-func prepareWorkPathAndCustomConf(action cli.ActionFunc) func(ctx *cli.Context) error {
-	return func(ctx *cli.Context) error {
+func prepareWorkPathAndCustomConf(action cli.ActionFunc) func(_ context.Context, _ *cli.Command) error {
+	return func(ctx context.Context, cli *cli.Command) error {
 		var args setting.ArgWorkPathAndCustomConf
 		// from children to parent, check the global flags
-		for _, curCtx := range ctx.Lineage() {
+		for _, curCtx := range cli.Lineage() {
 			if curCtx.IsSet("work-path") && args.WorkPath == "" {
 				args.WorkPath = curCtx.String("work-path")
 			}
@@ -107,24 +107,24 @@ func prepareWorkPathAndCustomConf(action cli.ActionFunc) func(ctx *cli.Context)
 			}
 		}
 		setting.InitWorkPathAndCommonConfig(os.Getenv, args)
-		if ctx.Bool("help") || action == nil {
+		if cli.Bool("help") || action == nil {
 			// the default behavior of "urfave/cli": "nil action" means "show help"
-			return cmdHelp().Action(ctx)
+			return cmdHelp().Action(ctx, cli)
 		}
-		return action(ctx)
+		return action(ctx, cli)
 	}
 }
 
-func NewMainApp(version, versionExtra string) *cli.App {
+func NewMainApp(version, versionExtra string) *cli.Command {
 	path, err := os.Executable()
 	if err != nil {
 		panic(err)
 	}
 	executable := filepath.Base(path)
 
-	var subCmdsStandalone []*cli.Command = make([]*cli.Command, 0, 10)
-	var subCmdWithConfig []*cli.Command = make([]*cli.Command, 0, 10)
-	var globalFlags []cli.Flag = make([]cli.Flag, 0, 10)
+	subCmdsStandalone := make([]*cli.Command, 0, 10)
+	subCmdWithConfig := make([]*cli.Command, 0, 10)
+	globalFlags := func() []cli.Flag { return []cli.Flag{} }
 
 	//
 	// If the executable is forgejo-cli, provide a Forgejo specific CLI
@@ -133,14 +133,16 @@ func NewMainApp(version, versionExtra string) *cli.App {
 	if executable == "forgejo-cli" {
 		subCmdsStandalone = append(subCmdsStandalone, forgejo.CmdActions(context.Background()))
 		subCmdWithConfig = append(subCmdWithConfig, forgejo.CmdF3(context.Background()))
-		globalFlags = append(globalFlags, []cli.Flag{
-			&cli.BoolFlag{
-				Name: "quiet",
-			},
-			&cli.BoolFlag{
-				Name: "verbose",
-			},
-		}...)
+		globalFlags = func() []cli.Flag {
+			return []cli.Flag{
+				&cli.BoolFlag{
+					Name: "quiet",
+				},
+				&cli.BoolFlag{
+					Name: "verbose",
+				},
+			}
+		}
 	} else {
 		//
 		// Otherwise provide a Gitea compatible CLI which includes Forgejo
@@ -149,55 +151,54 @@ func NewMainApp(version, versionExtra string) *cli.App {
 		// binary and rename it to forgejo if they want.
 		//
 		subCmdsStandalone = append(subCmdsStandalone, forgejo.CmdForgejo(context.Background()))
-		subCmdWithConfig = append(subCmdWithConfig, CmdActions)
+		subCmdWithConfig = append(subCmdWithConfig, cmdActions())
 	}
 
 	return innerNewMainApp(version, versionExtra, subCmdsStandalone, subCmdWithConfig, globalFlags)
 }
 
-func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmdWithConfigArgs []*cli.Command, globalFlagsArgs []cli.Flag) *cli.App {
-	app := cli.NewApp()
-	app.HelpName = "forgejo"
-	app.Name = "Forgejo"
+func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmdWithConfigArgs []*cli.Command, globalFlagsArgs func() []cli.Flag) *cli.Command {
+	app := &cli.Command{}
+	app.Name = "forgejo"
 	app.Usage = "Beyond coding. We forge."
 	app.Description = `By default, forgejo will start serving using the web-server with no argument, which can alternatively be run by running the subcommand "web".`
 	app.Version = version + versionExtra
-	app.EnableBashCompletion = true
+	app.EnableShellCompletion = true
 
 	// these sub-commands need to use config file
 	subCmdWithConfig := []*cli.Command{
 		cmdHelp(), // the "help" sub-command was used to show the more information for "work path" and "custom config"
-		CmdWeb,
-		CmdServ,
-		CmdHook,
-		CmdKeys,
-		CmdDump,
-		CmdAdmin,
-		CmdMigrate,
-		CmdDoctor,
-		CmdManager,
-		CmdEmbedded,
-		CmdMigrateStorage,
-		CmdDumpRepository,
-		CmdRestoreRepository,
+		cmdWeb(),
+		cmdServ(),
+		cmdHook(),
+		cmdKeys(),
+		cmdDump(),
+		cmdAdmin(),
+		cmdMigrate(),
+		cmdDoctor(),
+		cmdManager(),
+		cmdEmbedded(),
+		cmdMigrateStorage(),
+		cmdDumpRepository(),
+		cmdRestoreRepository(),
 	}
 
 	subCmdWithConfig = append(subCmdWithConfig, subCmdWithConfigArgs...)
 
 	// these sub-commands do not need the config file, and they do not depend on any path or environment variable.
 	subCmdStandalone := []*cli.Command{
-		CmdCert,
-		CmdGenerate,
-		CmdDocs,
+		cmdCert(),
+		cmdGenerate(),
 	}
 	subCmdStandalone = append(subCmdStandalone, subCmdsStandaloneArgs...)
 
-	app.DefaultCommand = CmdWeb.Name
+	app.DefaultCommand = cmdWeb().Name
 
-	globalFlags := appGlobalFlags()
-	globalFlags = append(globalFlags, globalFlagsArgs...)
+	globalFlags := func() []cli.Flag {
+		return append(appGlobalFlags(), globalFlagsArgs()...)
+	}
 	app.Flags = append(app.Flags, cli.VersionFlag)
-	app.Flags = append(app.Flags, globalFlags...)
+	app.Flags = append(app.Flags, globalFlags()...)
 	app.HideHelp = true // use our own help action to show helps (with more information like default config)
 	app.Before = PrepareConsoleLoggerLevel(log.INFO)
 	for i := range subCmdWithConfig {
@@ -210,8 +211,8 @@ func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmd
 	return app
 }
 
-func RunMainApp(app *cli.App, args ...string) error {
-	err := app.Run(args)
+func RunMainApp(app *cli.Command, args ...string) error {
+	err := app.Run(context.Background(), args)
 	if err == nil {
 		return nil
 	}
@@ -220,7 +221,7 @@ func RunMainApp(app *cli.App, args ...string) error {
 		cli.OsExiter(1)
 		return err
 	}
-	_, _ = fmt.Fprintf(app.ErrWriter, "Command error: %v\n", err)
+	_, _ = fmt.Fprintf(app.Root().ErrWriter, "Command error: %v\n", err)
 	cli.OsExiter(1)
 	return err
 }
diff --git a/cmd/main_test.go b/cmd/main_test.go
index 5e0b36d028..737150c62f 100644
--- a/cmd/main_test.go
+++ b/cmd/main_test.go
@@ -4,6 +4,8 @@
 package cmd
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"io"
 	"path/filepath"
@@ -16,7 +18,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func TestMain(m *testing.M) {
@@ -27,10 +29,10 @@ func makePathOutput(workPath, customPath, customConf string) string {
 	return fmt.Sprintf("WorkPath=%s\nCustomPath=%s\nCustomConf=%s", workPath, customPath, customConf)
 }
 
-func newTestApp(testCmdAction func(ctx *cli.Context) error) *cli.App {
+func newTestApp(testCmdAction func(_ context.Context, ctx *cli.Command) error) *cli.Command {
 	app := NewMainApp("version", "version-extra")
 	testCmd := &cli.Command{Name: "test-cmd", Action: testCmdAction}
-	prepareSubcommandWithConfig(testCmd, appGlobalFlags())
+	prepareSubcommandWithConfig(testCmd, appGlobalFlags)
 	app.Commands = append(app.Commands, testCmd)
 	app.DefaultCommand = testCmd.Name
 	return app
@@ -42,7 +44,7 @@ type runResult struct {
 	ExitCode int
 }
 
-func runTestApp(app *cli.App, args ...string) (runResult, error) {
+func runTestApp(app *cli.Command, args ...string) (runResult, error) {
 	outBuf := new(strings.Builder)
 	errBuf := new(strings.Builder)
 	app.Writer = outBuf
@@ -65,7 +67,6 @@ func TestCliCmd(t *testing.T) {
 	defaultCustomConf := filepath.Join(defaultCustomPath, "conf/app.ini")
 
 	cli.CommandHelpTemplate = "(command help template)"
-	cli.AppHelpTemplate = "(app help template)"
 	cli.SubcommandHelpTemplate = "(subcommand help template)"
 
 	cases := []struct {
@@ -109,12 +110,17 @@ func TestCliCmd(t *testing.T) {
 		},
 	}
 
-	app := newTestApp(func(ctx *cli.Context) error {
-		_, _ = fmt.Fprint(ctx.App.Writer, makePathOutput(setting.AppWorkPath, setting.CustomPath, setting.CustomConf))
-		return nil
-	})
 	for _, c := range cases {
 		t.Run(c.cmd, func(t *testing.T) {
+			defer test.MockProtect(&setting.AppWorkPath)()
+			defer test.MockProtect(&setting.CustomPath)()
+			defer test.MockProtect(&setting.CustomConf)()
+
+			app := newTestApp(func(_ context.Context, ctx *cli.Command) error {
+				_, _ = fmt.Fprint(ctx.Root().Writer, makePathOutput(setting.AppWorkPath, setting.CustomPath, setting.CustomConf))
+				return nil
+			})
+
 			for k, v := range c.env {
 				t.Setenv(k, v)
 			}
@@ -122,37 +128,37 @@ func TestCliCmd(t *testing.T) {
 			r, err := runTestApp(app, args...)
 			require.NoError(t, err, c.cmd)
 			assert.NotEmpty(t, c.exp, c.cmd)
-			assert.Contains(t, r.Stdout, c.exp, c.cmd)
+			assert.Contains(t, r.Stdout, c.exp, c.cmd+"\n"+r.Stdout)
 		})
 	}
 }
 
 func TestCliCmdError(t *testing.T) {
-	app := newTestApp(func(ctx *cli.Context) error { return fmt.Errorf("normal error") })
+	app := newTestApp(func(_ context.Context, ctx *cli.Command) error { return errors.New("normal error") })
 	r, err := runTestApp(app, "./gitea", "test-cmd")
 	require.Error(t, err)
 	assert.Equal(t, 1, r.ExitCode)
-	assert.Equal(t, "", r.Stdout)
+	assert.Empty(t, r.Stdout)
 	assert.Equal(t, "Command error: normal error\n", r.Stderr)
 
-	app = newTestApp(func(ctx *cli.Context) error { return cli.Exit("exit error", 2) })
+	app = newTestApp(func(_ context.Context, ctx *cli.Command) error { return cli.Exit("exit error", 2) })
 	r, err = runTestApp(app, "./gitea", "test-cmd")
 	require.Error(t, err)
 	assert.Equal(t, 2, r.ExitCode)
-	assert.Equal(t, "", r.Stdout)
+	assert.Empty(t, r.Stdout)
 	assert.Equal(t, "exit error\n", r.Stderr)
 
-	app = newTestApp(func(ctx *cli.Context) error { return nil })
+	app = newTestApp(func(_ context.Context, ctx *cli.Command) error { return nil })
 	r, err = runTestApp(app, "./gitea", "test-cmd", "--no-such")
 	require.Error(t, err)
 	assert.Equal(t, 1, r.ExitCode)
-	assert.Equal(t, "Incorrect Usage: flag provided but not defined: -no-such\n\n", r.Stdout)
-	assert.Equal(t, "", r.Stderr) // the cli package's strange behavior, the error message is not in stderr ....
+	assert.Equal(t, "Incorrect Usage: flag provided but not defined: -no-such\n\n", r.Stderr)
+	assert.Empty(t, r.Stdout)
 
-	app = newTestApp(func(ctx *cli.Context) error { return nil })
+	app = newTestApp(func(_ context.Context, ctx *cli.Command) error { return nil })
 	r, err = runTestApp(app, "./gitea", "test-cmd")
 	require.NoError(t, err)
 	assert.Equal(t, -1, r.ExitCode) // the cli.OsExiter is not called
-	assert.Equal(t, "", r.Stdout)
-	assert.Equal(t, "", r.Stderr)
+	assert.Empty(t, r.Stdout)
+	assert.Empty(t, r.Stderr)
 }
diff --git a/cmd/manager.go b/cmd/manager.go
index 0cb1e60f73..029329b44e 100644
--- a/cmd/manager.go
+++ b/cmd/manager.go
@@ -4,30 +4,34 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"time"
 
 	"forgejo.org/modules/private"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	// CmdManager represents the manager command
-	CmdManager = &cli.Command{
+// CmdManager represents the manager command
+func cmdManager() *cli.Command {
+	return &cli.Command{
 		Name:        "manager",
 		Usage:       "Manage the running forgejo process",
 		Description: "This is a command for managing the running forgejo process",
-		Subcommands: []*cli.Command{
-			subcmdShutdown,
-			subcmdRestart,
-			subcmdReloadTemplates,
-			subcmdFlushQueues,
-			subcmdLogging,
-			subCmdProcesses,
+		Commands: []*cli.Command{
+			subcmdShutdown(),
+			subcmdRestart(),
+			subcmdReloadTemplates(),
+			subcmdFlushQueues(),
+			subcmdLogging(),
+			subCmdProcesses(),
 		},
 	}
-	subcmdShutdown = &cli.Command{
+}
+
+func subcmdShutdown() *cli.Command {
+	return &cli.Command{
 		Name:  "shutdown",
 		Usage: "Gracefully shutdown the running process",
 		Flags: []cli.Flag{
@@ -37,7 +41,10 @@ var (
 		},
 		Action: runShutdown,
 	}
-	subcmdRestart = &cli.Command{
+}
+
+func subcmdRestart() *cli.Command {
+	return &cli.Command{
 		Name:  "restart",
 		Usage: "Gracefully restart the running process - (not implemented for windows servers)",
 		Flags: []cli.Flag{
@@ -47,7 +54,10 @@ var (
 		},
 		Action: runRestart,
 	}
-	subcmdReloadTemplates = &cli.Command{
+}
+
+func subcmdReloadTemplates() *cli.Command {
+	return &cli.Command{
 		Name:  "reload-templates",
 		Usage: "Reload template files in the running process",
 		Flags: []cli.Flag{
@@ -57,7 +67,10 @@ var (
 		},
 		Action: runReloadTemplates,
 	}
-	subcmdFlushQueues = &cli.Command{
+}
+
+func subcmdFlushQueues() *cli.Command {
+	return &cli.Command{
 		Name:   "flush-queues",
 		Usage:  "Flush queues in the running process",
 		Action: runFlushQueues,
@@ -76,7 +89,10 @@ var (
 			},
 		},
 	}
-	subCmdProcesses = &cli.Command{
+}
+
+func subCmdProcesses() *cli.Command {
+	return &cli.Command{
 		Name:   "processes",
 		Usage:  "Display running processes within the current process",
 		Action: runProcesses,
@@ -106,49 +122,49 @@ var (
 			},
 		},
 	}
-)
+}
 
-func runShutdown(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runShutdown(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	extra := private.Shutdown(ctx)
 	return handleCliResponseExtra(extra)
 }
 
-func runRestart(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRestart(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	extra := private.Restart(ctx)
 	return handleCliResponseExtra(extra)
 }
 
-func runReloadTemplates(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runReloadTemplates(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	extra := private.ReloadTemplates(ctx)
 	return handleCliResponseExtra(extra)
 }
 
-func runFlushQueues(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runFlushQueues(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	extra := private.FlushQueues(ctx, c.Duration("timeout"), c.Bool("non-blocking"))
 	return handleCliResponseExtra(extra)
 }
 
-func runProcesses(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runProcesses(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	extra := private.Processes(ctx, os.Stdout, c.Bool("flat"), c.Bool("no-system"), c.Bool("stacktraces"), c.Bool("json"), c.String("cancel"))
 	return handleCliResponseExtra(extra)
 }
diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go
index ac2c1eb418..c18bfa919b 100644
--- a/cmd/manager_logging.go
+++ b/cmd/manager_logging.go
@@ -4,6 +4,7 @@
 package cmd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -11,11 +12,11 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/private"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
-var (
-	defaultLoggingFlags = []cli.Flag{
+func defaultLoggingFlags() []cli.Flag {
+	return []cli.Flag{
 		&cli.StringFlag{
 			Name:  "logger",
 			Usage: `Logger name - will default to "default"`,
@@ -43,6 +44,11 @@ var (
 			Aliases: []string{"e"},
 			Usage:   "Matching expression for the logger",
 		},
+		&cli.StringFlag{
+			Name:    "exclusion",
+			Aliases: []string{"x"},
+			Usage:   "Exclusion for the logger",
+		},
 		&cli.StringFlag{
 			Name:    "prefix",
 			Aliases: []string{"p"},
@@ -56,11 +62,13 @@ var (
 			Name: "debug",
 		},
 	}
+}
 
-	subcmdLogging = &cli.Command{
+func subcmdLogging() *cli.Command {
+	return &cli.Command{
 		Name:  "logging",
 		Usage: "Adjust logging commands",
-		Subcommands: []*cli.Command{
+		Commands: []*cli.Command{
 			{
 				Name:  "pause",
 				Usage: "Pause logging (Forgejo will buffer logs up to a certain point and will drop them after that point)",
@@ -104,11 +112,11 @@ var (
 			}, {
 				Name:  "add",
 				Usage: "Add a logger",
-				Subcommands: []*cli.Command{
+				Commands: []*cli.Command{
 					{
 						Name:  "file",
 						Usage: "Add a file logger",
-						Flags: append(defaultLoggingFlags, []cli.Flag{
+						Flags: append(defaultLoggingFlags(), []cli.Flag{
 							&cli.StringFlag{
 								Name:    "filename",
 								Aliases: []string{"f"},
@@ -152,7 +160,7 @@ var (
 					}, {
 						Name:  "conn",
 						Usage: "Add a net conn logger",
-						Flags: append(defaultLoggingFlags, []cli.Flag{
+						Flags: append(defaultLoggingFlags(), []cli.Flag{
 							&cli.BoolFlag{
 								Name:    "reconnect-on-message",
 								Aliases: []string{"R"},
@@ -193,13 +201,13 @@ var (
 			},
 		},
 	}
-)
+}
 
-func runRemoveLogger(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRemoveLogger(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	logger := c.String("logger")
 	if len(logger) == 0 {
 		logger = log.DEFAULT
@@ -210,11 +218,11 @@ func runRemoveLogger(c *cli.Context) error {
 	return handleCliResponseExtra(extra)
 }
 
-func runAddConnLogger(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runAddConnLogger(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	vals := map[string]any{}
 	mode := "conn"
 	vals["net"] = "tcp"
@@ -237,14 +245,14 @@ func runAddConnLogger(c *cli.Context) error {
 	if c.IsSet("reconnect-on-message") {
 		vals["reconnectOnMsg"] = c.Bool("reconnect-on-message")
 	}
-	return commonAddLogger(c, mode, vals)
+	return commonAddLogger(ctx, c, mode, vals)
 }
 
-func runAddFileLogger(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runAddFileLogger(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	vals := map[string]any{}
 	mode := "file"
 	if c.IsSet("filename") {
@@ -270,10 +278,10 @@ func runAddFileLogger(c *cli.Context) error {
 	if c.IsSet("compression-level") {
 		vals["compressionLevel"] = c.Int("compression-level")
 	}
-	return commonAddLogger(c, mode, vals)
+	return commonAddLogger(ctx, c, mode, vals)
 }
 
-func commonAddLogger(c *cli.Context, mode string, vals map[string]any) error {
+func commonAddLogger(ctx context.Context, c *cli.Command, mode string, vals map[string]any) error {
 	if len(c.String("level")) > 0 {
 		vals["level"] = log.LevelFromString(c.String("level")).String()
 	}
@@ -283,6 +291,9 @@ func commonAddLogger(c *cli.Context, mode string, vals map[string]any) error {
 	if len(c.String("expression")) > 0 {
 		vals["expression"] = c.String("expression")
 	}
+	if len(c.String("exclusion")) > 0 {
+		vals["exclusion"] = c.String("exclusion")
+	}
 	if len(c.String("prefix")) > 0 {
 		vals["prefix"] = c.String("prefix")
 	}
@@ -300,47 +311,47 @@ func commonAddLogger(c *cli.Context, mode string, vals map[string]any) error {
 	if c.IsSet("writer") {
 		writer = c.String("writer")
 	}
-	ctx, cancel := installSignals()
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	extra := private.AddLogger(ctx, logger, writer, mode, vals)
 	return handleCliResponseExtra(extra)
 }
 
-func runPauseLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runPauseLogging(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	userMsg := private.PauseLogging(ctx)
 	_, _ = fmt.Fprintln(os.Stdout, userMsg)
 	return nil
 }
 
-func runResumeLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runResumeLogging(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	userMsg := private.ResumeLogging(ctx)
 	_, _ = fmt.Fprintln(os.Stdout, userMsg)
 	return nil
 }
 
-func runReleaseReopenLogging(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runReleaseReopenLogging(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 	userMsg := private.ReleaseReopenLogging(ctx)
 	_, _ = fmt.Fprintln(os.Stdout, userMsg)
 	return nil
 }
 
-func runSetLogSQL(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runSetLogSQL(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), false)
 
 	extra := private.SetLogSQL(ctx, !c.Bool("off"))
 	return handleCliResponseExtra(extra)
diff --git a/cmd/migrate.go b/cmd/migrate.go
index ab291cfb66..5a485d17f9 100644
--- a/cmd/migrate.go
+++ b/cmd/migrate.go
@@ -11,19 +11,21 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdMigrate represents the available migrate sub-command.
-var CmdMigrate = &cli.Command{
-	Name:        "migrate",
-	Usage:       "Migrate the database",
-	Description: "This is a command for migrating the database, so that you can run 'forgejo admin user create' before starting the server.",
-	Action:      runMigrate,
+func cmdMigrate() *cli.Command {
+	return &cli.Command{
+		Name:        "migrate",
+		Usage:       "Migrate the database",
+		Description: "This is a command for migrating the database, so that you can run 'forgejo admin user create' before starting the server.",
+		Action:      runMigrate,
+	}
 }
 
-func runMigrate(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runMigrate(stdCtx context.Context, ctx *cli.Command) error {
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	if err := initDB(stdCtx); err != nil {
@@ -36,7 +38,13 @@ func runMigrate(ctx *cli.Context) error {
 	log.Info("Log path: %s", setting.Log.RootPath)
 	log.Info("Configuration file: %s", setting.CustomConf)
 
-	if err := db.InitEngineWithMigration(context.Background(), migrations.Migrate); err != nil {
+	if err := db.InitEngineWithMigration(context.Background(), func(dbEngine db.Engine) error {
+		masterEngine, err := db.GetMasterEngine(dbEngine)
+		if err != nil {
+			return err
+		}
+		return migrations.Migrate(masterEngine)
+	}); err != nil {
 		log.Fatal("Failed to initialize ORM engine: %v", err)
 		return err
 	}
diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go
index 1b839e7169..d741a883e3 100644
--- a/cmd/migrate_storage.go
+++ b/cmd/migrate_storage.go
@@ -22,78 +22,81 @@ import (
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/storage"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
+	"xorm.io/xorm"
 )
 
 // CmdMigrateStorage represents the available migrate storage sub-command.
-var CmdMigrateStorage = &cli.Command{
-	Name:        "migrate-storage",
-	Usage:       "Migrate the storage",
-	Description: "Copies stored files from storage configured in app.ini to parameter-configured storage",
-	Action:      runMigrateStorage,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "type",
-			Aliases: []string{"t"},
-			Value:   "",
-			Usage:   "Type of stored files to copy.  Allowed types: 'attachments', 'lfs', 'avatars', 'repo-avatars', 'repo-archivers', 'packages', 'actions-log', 'actions-artifacts'",
+func cmdMigrateStorage() *cli.Command {
+	return &cli.Command{
+		Name:        "migrate-storage",
+		Usage:       "Migrate the storage",
+		Description: "Copies stored files from storage configured in app.ini to parameter-configured storage",
+		Action:      runMigrateStorage,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "type",
+				Aliases: []string{"t"},
+				Value:   "",
+				Usage:   "Type of stored files to copy.  Allowed types: 'attachments', 'lfs', 'avatars', 'repo-avatars', 'repo-archivers', 'packages', 'actions-log', 'actions-artifacts'",
+			},
+			&cli.StringFlag{
+				Name:    "storage",
+				Aliases: []string{"s"},
+				Value:   "",
+				Usage:   "New storage type: local (default) or minio",
+			},
+			&cli.StringFlag{
+				Name:    "path",
+				Aliases: []string{"p"},
+				Value:   "",
+				Usage:   "New storage placement if store is local (leave blank for default)",
+			},
+			&cli.StringFlag{
+				Name:  "minio-endpoint",
+				Value: "",
+				Usage: "Minio storage endpoint",
+			},
+			&cli.StringFlag{
+				Name:  "minio-access-key-id",
+				Value: "",
+				Usage: "Minio storage accessKeyID",
+			},
+			&cli.StringFlag{
+				Name:  "minio-secret-access-key",
+				Value: "",
+				Usage: "Minio storage secretAccessKey",
+			},
+			&cli.StringFlag{
+				Name:  "minio-bucket",
+				Value: "",
+				Usage: "Minio storage bucket",
+			},
+			&cli.StringFlag{
+				Name:  "minio-location",
+				Value: "",
+				Usage: "Minio storage location to create bucket",
+			},
+			&cli.StringFlag{
+				Name:  "minio-base-path",
+				Value: "",
+				Usage: "Minio storage base path on the bucket",
+			},
+			&cli.BoolFlag{
+				Name:  "minio-use-ssl",
+				Usage: "Enable SSL for minio",
+			},
+			&cli.BoolFlag{
+				Name:  "minio-insecure-skip-verify",
+				Usage: "Skip SSL verification",
+			},
+			&cli.StringFlag{
+				Name:  "minio-checksum-algorithm",
+				Value: "",
+				Usage: "Minio checksum algorithm (default/md5)",
+			},
 		},
-		&cli.StringFlag{
-			Name:    "storage",
-			Aliases: []string{"s"},
-			Value:   "",
-			Usage:   "New storage type: local (default) or minio",
-		},
-		&cli.StringFlag{
-			Name:    "path",
-			Aliases: []string{"p"},
-			Value:   "",
-			Usage:   "New storage placement if store is local (leave blank for default)",
-		},
-		&cli.StringFlag{
-			Name:  "minio-endpoint",
-			Value: "",
-			Usage: "Minio storage endpoint",
-		},
-		&cli.StringFlag{
-			Name:  "minio-access-key-id",
-			Value: "",
-			Usage: "Minio storage accessKeyID",
-		},
-		&cli.StringFlag{
-			Name:  "minio-secret-access-key",
-			Value: "",
-			Usage: "Minio storage secretAccessKey",
-		},
-		&cli.StringFlag{
-			Name:  "minio-bucket",
-			Value: "",
-			Usage: "Minio storage bucket",
-		},
-		&cli.StringFlag{
-			Name:  "minio-location",
-			Value: "",
-			Usage: "Minio storage location to create bucket",
-		},
-		&cli.StringFlag{
-			Name:  "minio-base-path",
-			Value: "",
-			Usage: "Minio storage base path on the bucket",
-		},
-		&cli.BoolFlag{
-			Name:  "minio-use-ssl",
-			Usage: "Enable SSL for minio",
-		},
-		&cli.BoolFlag{
-			Name:  "minio-insecure-skip-verify",
-			Usage: "Skip SSL verification",
-		},
-		&cli.StringFlag{
-			Name:  "minio-checksum-algorithm",
-			Value: "",
-			Usage: "Minio checksum algorithm (default/md5)",
-		},
-	},
+	}
 }
 
 func migrateAttachments(ctx context.Context, dstStorage storage.ObjectStorage) error {
@@ -181,8 +184,8 @@ func migrateActionsArtifacts(ctx context.Context, dstStorage storage.ObjectStora
 	})
 }
 
-func runMigrateStorage(ctx *cli.Context) error {
-	stdCtx, cancel := installSignals()
+func runMigrateStorage(stdCtx context.Context, ctx *cli.Command) error {
+	stdCtx, cancel := installSignals(stdCtx)
 	defer cancel()
 
 	if err := initDB(stdCtx); err != nil {
@@ -195,7 +198,9 @@ func runMigrateStorage(ctx *cli.Context) error {
 	log.Info("Log path: %s", setting.Log.RootPath)
 	log.Info("Configuration file: %s", setting.CustomConf)
 
-	if err := db.InitEngineWithMigration(context.Background(), migrations.Migrate); err != nil {
+	if err := db.InitEngineWithMigration(context.Background(), func(e db.Engine) error {
+		return migrations.Migrate(e.(*xorm.Engine))
+	}); err != nil {
 		log.Fatal("Failed to initialize ORM engine: %v", err)
 		return err
 	}
diff --git a/cmd/migrate_storage_test.go b/cmd/migrate_storage_test.go
index 28af63f4c8..b75eb3cfa0 100644
--- a/cmd/migrate_storage_test.go
+++ b/cmd/migrate_storage_test.go
@@ -81,8 +81,8 @@ func TestMigratePackages(t *testing.T) {
 	entries, err := os.ReadDir(p)
 	require.NoError(t, err)
 	assert.Len(t, entries, 2)
-	assert.EqualValues(t, "01", entries[0].Name())
-	assert.EqualValues(t, "tmp", entries[1].Name())
+	assert.Equal(t, "01", entries[0].Name())
+	assert.Equal(t, "tmp", entries[1].Name())
 }
 
 func TestMigrateActionsArtifacts(t *testing.T) {
diff --git a/cmd/restore_repo.go b/cmd/restore_repo.go
index 1e53ce26ba..0e9f0bb50a 100644
--- a/cmd/restore_repo.go
+++ b/cmd/restore_repo.go
@@ -4,52 +4,55 @@
 package cmd
 
 import (
+	"context"
 	"strings"
 
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // CmdRestoreRepository represents the available restore a repository sub-command.
-var CmdRestoreRepository = &cli.Command{
-	Name:        "restore-repo",
-	Usage:       "Restore the repository from disk",
-	Description: "This is a command for restoring the repository data.",
-	Action:      runRestoreRepository,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo_dir",
-			Aliases: []string{"r"},
-			Value:   "./data",
-			Usage:   "Repository dir path to restore from",
-		},
-		&cli.StringFlag{
-			Name:  "owner_name",
-			Value: "",
-			Usage: "Restore destination owner name",
-		},
-		&cli.StringFlag{
-			Name:  "repo_name",
-			Value: "",
-			Usage: "Restore destination repository name",
-		},
-		&cli.StringFlag{
-			Name:  "units",
-			Value: "",
-			Usage: `Which items will be restored, one or more units should be separated as comma.
+func cmdRestoreRepository() *cli.Command {
+	return &cli.Command{
+		Name:        "restore-repo",
+		Usage:       "Restore the repository from disk",
+		Description: "This is a command for restoring the repository data.",
+		Action:      runRestoreRepository,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "repo_dir",
+				Aliases: []string{"r"},
+				Value:   "./data",
+				Usage:   "Repository dir path to restore from",
+			},
+			&cli.StringFlag{
+				Name:  "owner_name",
+				Value: "",
+				Usage: "Restore destination owner name",
+			},
+			&cli.StringFlag{
+				Name:  "repo_name",
+				Value: "",
+				Usage: "Restore destination repository name",
+			},
+			&cli.StringFlag{
+				Name:  "units",
+				Value: "",
+				Usage: `Which items will be restored, one or more units should be separated as comma.
 wiki, issues, labels, releases, release_assets, milestones, pull_requests, comments are allowed. Empty means all units.`,
+			},
+			&cli.BoolFlag{
+				Name:  "validation",
+				Usage: "Sanity check the content of the files before trying to load them",
+			},
 		},
-		&cli.BoolFlag{
-			Name:  "validation",
-			Usage: "Sanity check the content of the files before trying to load them",
-		},
-	},
+	}
 }
 
-func runRestoreRepository(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runRestoreRepository(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	setting.MustInstalled()
diff --git a/cmd/serv.go b/cmd/serv.go
index 0884d6c36b..b0571a276c 100644
--- a/cmd/serv.go
+++ b/cmd/serv.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/kballard/go-shellquote"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 const (
@@ -41,35 +41,40 @@ const (
 )
 
 // CmdServ represents the available serv sub-command.
-var CmdServ = &cli.Command{
-	Name:        "serv",
-	Usage:       "(internal) Should only be called by SSH shell",
-	Description: "Serv provides access auth for repositories",
-	Before:      PrepareConsoleLoggerLevel(log.FATAL),
-	Action:      runServ,
-	Flags: []cli.Flag{
-		&cli.BoolFlag{
-			Name: "enable-pprof",
+func cmdServ() *cli.Command {
+	return &cli.Command{
+		Name:        "serv",
+		Usage:       "(internal) Should only be called by SSH shell",
+		Description: "Serv provides access auth for repositories",
+		Before:      PrepareConsoleLoggerLevel(log.FATAL),
+		Action:      runServ,
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name: "enable-pprof",
+			},
+			&cli.BoolFlag{
+				Name: "debug",
+			},
 		},
-		&cli.BoolFlag{
-			Name: "debug",
-		},
-	},
+	}
 }
 
-func setup(ctx context.Context, debug bool) {
+func setup(ctx context.Context, debug, gitNeeded bool) {
 	if debug {
 		setupConsoleLogger(log.TRACE, false, os.Stderr)
 	} else {
 		setupConsoleLogger(log.FATAL, false, os.Stderr)
 	}
 	setting.MustInstalled()
+	// Sanity check to ensure path is not relative, see: https://github.com/go-gitea/gitea/pull/19317
 	if _, err := os.Stat(setting.RepoRootPath); err != nil {
 		_ = fail(ctx, "Unable to access repository path", "Unable to access repository path %q, err: %v", setting.RepoRootPath, err)
 		return
 	}
-	if err := git.InitSimple(context.Background()); err != nil {
-		_ = fail(ctx, "Failed to init git", "Failed to init git, err: %v", err)
+	if gitNeeded {
+		if err := git.InitSimple(context.Background()); err != nil {
+			_ = fail(ctx, "Failed to init git", "Failed to init git, err: %v", err)
+		}
 	}
 }
 
@@ -128,12 +133,12 @@ func handleCliResponseExtra(extra private.ResponseExtra) error {
 	return nil
 }
 
-func runServ(c *cli.Context) error {
-	ctx, cancel := installSignals()
+func runServ(ctx context.Context, c *cli.Command) error {
+	ctx, cancel := installSignals(ctx)
 	defer cancel()
 
 	// FIXME: This needs to internationalised
-	setup(ctx, c.Bool("debug"))
+	setup(ctx, c.Bool("debug"), true)
 
 	if setting.SSH.Disabled {
 		fmt.Println("Forgejo: SSH has been disabled")
@@ -188,12 +193,10 @@ func runServ(c *cli.Context) error {
 	}
 
 	if len(words) < 2 {
-		if git.CheckGitVersionAtLeast("2.29") == nil {
-			// for AGit Flow
-			if cmd == "ssh_info" {
-				fmt.Print(`{"type":"gitea","version":1}`)
-				return nil
-			}
+		// for AGit Flow
+		if cmd == "ssh_info" {
+			fmt.Print(`{"type":"agit","version":1}`)
+			return nil
 		}
 		return fail(ctx, "Too few arguments", "Too few arguments in cmd: %s", cmd)
 	}
@@ -253,11 +256,12 @@ func runServ(c *cli.Context) error {
 	}
 
 	if verb == lfsAuthenticateVerb {
-		if lfsVerb == "upload" {
+		switch lfsVerb {
+		case "upload":
 			requestedMode = perm.AccessModeWrite
-		} else if lfsVerb == "download" {
+		case "download":
 			requestedMode = perm.AccessModeRead
-		} else {
+		default:
 			return fail(ctx, "Unknown LFS verb", "Unknown lfs verb %s", lfsVerb)
 		}
 	}
diff --git a/cmd/web.go b/cmd/web.go
index 3e7fdee4bf..87965a7c1e 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -26,48 +26,50 @@ import (
 	"forgejo.org/routers/install"
 
 	"github.com/felixge/fgprof"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // PIDFile could be set from build tag
 var PIDFile = "/run/gitea.pid"
 
 // CmdWeb represents the available web sub-command.
-var CmdWeb = &cli.Command{
-	Name:  "web",
-	Usage: "Start the Forgejo web server",
-	Description: `The Forgejo web server is the only thing you need to run,
+func cmdWeb() *cli.Command {
+	return &cli.Command{
+		Name:  "web",
+		Usage: "Start the Forgejo web server",
+		Description: `The Forgejo web server is the only thing you need to run,
 and it takes care of all the other things for you`,
-	Before: PrepareConsoleLoggerLevel(log.INFO),
-	Action: runWeb,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "port",
-			Aliases: []string{"p"},
-			Value:   "3000",
-			Usage:   "Temporary port number to prevent conflict",
+		Before: PrepareConsoleLoggerLevel(log.INFO),
+		Action: runWeb,
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "port",
+				Aliases: []string{"p"},
+				Value:   "3000",
+				Usage:   "Temporary port number to prevent conflict",
+			},
+			&cli.StringFlag{
+				Name:  "install-port",
+				Value: "3000",
+				Usage: "Temporary port number to run the install page on to prevent conflict",
+			},
+			&cli.StringFlag{
+				Name:    "pid",
+				Aliases: []string{"P"},
+				Value:   PIDFile,
+				Usage:   "Custom pid file path",
+			},
+			&cli.BoolFlag{
+				Name:    "quiet",
+				Aliases: []string{"q"},
+				Usage:   "Only display Fatal logging errors until logging is set-up",
+			},
+			&cli.BoolFlag{
+				Name:  "verbose",
+				Usage: "Set initial logging to TRACE level until logging is properly set-up",
+			},
 		},
-		&cli.StringFlag{
-			Name:  "install-port",
-			Value: "3000",
-			Usage: "Temporary port number to run the install page on to prevent conflict",
-		},
-		&cli.StringFlag{
-			Name:    "pid",
-			Aliases: []string{"P"},
-			Value:   PIDFile,
-			Usage:   "Custom pid file path",
-		},
-		&cli.BoolFlag{
-			Name:    "quiet",
-			Aliases: []string{"q"},
-			Usage:   "Only display Fatal logging errors until logging is set-up",
-		},
-		&cli.BoolFlag{
-			Name:  "verbose",
-			Usage: "Set initial logging to TRACE level until logging is properly set-up",
-		},
-	},
+	}
 }
 
 func runHTTPRedirector() {
@@ -128,7 +130,7 @@ func showWebStartupMessage(msg string) {
 	}
 }
 
-func serveInstall(ctx *cli.Context) error {
+func serveInstall(_ context.Context, ctx *cli.Command) error {
 	showWebStartupMessage("Prepare to run install page")
 
 	routers.InitWebInstallPage(graceful.GetManager().HammerContext())
@@ -161,7 +163,7 @@ func serveInstall(ctx *cli.Context) error {
 	return nil
 }
 
-func serveInstalled(ctx *cli.Context) error {
+func serveInstalled(_ context.Context, ctx *cli.Command) error {
 	setting.InitCfgProvider(setting.CustomConf)
 	setting.LoadCommonSettings()
 	setting.MustInstalled()
@@ -198,9 +200,6 @@ func serveInstalled(ctx *cli.Context) error {
 	for fn := range publicFilesSet.Seq() {
 		log.Error("Found legacy public asset %q in CustomPath. Please move it to %s/public/assets/%s", fn, setting.CustomPath, fn)
 	}
-	if _, err := os.Stat(filepath.Join(setting.CustomPath, "robots.txt")); err == nil {
-		log.Error(`Found legacy public asset "robots.txt" in CustomPath. Please move it to %s/public/robots.txt`, setting.CustomPath)
-	}
 
 	routers.InitWebInstalled(graceful.GetManager().HammerContext())
 
@@ -236,7 +235,7 @@ func servePprof() {
 	finished()
 }
 
-func runWeb(ctx *cli.Context) error {
+func runWeb(ctx context.Context, cli *cli.Command) error {
 	defer func() {
 		if panicked := recover(); panicked != nil {
 			log.Fatal("PANIC: %v\n%s", panicked, log.Stack(2))
@@ -254,12 +253,12 @@ func runWeb(ctx *cli.Context) error {
 	}
 
 	// Set pid file setting
-	if ctx.IsSet("pid") {
-		createPIDFile(ctx.String("pid"))
+	if cli.IsSet("pid") {
+		createPIDFile(cli.String("pid"))
 	}
 
 	if !setting.InstallLock {
-		if err := serveInstall(ctx); err != nil {
+		if err := serveInstall(ctx, cli); err != nil {
 			return err
 		}
 	} else {
@@ -270,7 +269,7 @@ func runWeb(ctx *cli.Context) error {
 		go servePprof()
 	}
 
-	return serveInstalled(ctx)
+	return serveInstalled(ctx, cli)
 }
 
 func setPort(port string) error {
diff --git a/cmd/web_acme.go b/cmd/web_acme.go
index b2d7435be2..be6314addb 100644
--- a/cmd/web_acme.go
+++ b/cmd/web_acme.go
@@ -15,6 +15,7 @@ import (
 	"forgejo.org/modules/graceful"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/process"
+	"forgejo.org/modules/proxy"
 	"forgejo.org/modules/setting"
 
 	"github.com/caddyserver/certmagic"
@@ -54,8 +55,8 @@ func runACME(listenAddr string, m http.Handler) error {
 		altTLSALPNPort = p
 	}
 
-	magic := certmagic.NewDefault()
-	magic.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory}
+	certmagic.Default.Storage = &certmagic.FileStorage{Path: setting.AcmeLiveDirectory}
+
 	// Try to use private CA root if provided, otherwise defaults to system's trust
 	var certPool *x509.CertPool
 	if setting.AcmeCARoot != "" {
@@ -65,7 +66,8 @@ func runACME(listenAddr string, m http.Handler) error {
 			log.Warn("Failed to parse CA Root certificate, using default CA trust: %v", err)
 		}
 	}
-	myACME := certmagic.NewACMEIssuer(magic, certmagic.ACMEIssuer{
+
+	certmagic.DefaultACME = certmagic.ACMEIssuer{
 		CA:                      setting.AcmeURL,
 		TrustedRoots:            certPool,
 		Email:                   setting.AcmeEmail,
@@ -75,7 +77,17 @@ func runACME(listenAddr string, m http.Handler) error {
 		ListenHost:              setting.HTTPAddr,
 		AltTLSALPNPort:          altTLSALPNPort,
 		AltHTTPPort:             altHTTPPort,
-	})
+		HTTPProxy:               proxy.Proxy(),
+	}
+
+	// Preserve behavior to use Let's encrypt test CA when Let's encrypt is CA.
+	if certmagic.DefaultACME.CA == certmagic.LetsEncryptProductionCA {
+		certmagic.DefaultACME.TestCA = certmagic.LetsEncryptStagingCA
+	}
+
+	magic := certmagic.NewDefault()
+
+	myACME := certmagic.NewACMEIssuer(magic, certmagic.DefaultACME)
 
 	magic.Issuers = []certmagic.Issuer{myACME}
 
diff --git a/contrib/autocompletion/bash_autocomplete b/contrib/autocompletion/bash_autocomplete
index 5cb62f26a7..58844938a6 100755
--- a/contrib/autocompletion/bash_autocomplete
+++ b/contrib/autocompletion/bash_autocomplete
@@ -1,4 +1,3 @@
-#! /bin/bash
 # Heavily inspired by https://github.com/urfave/cli
 
 _cli_bash_autocomplete() {
@@ -7,9 +6,9 @@ _cli_bash_autocomplete() {
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     if [[ "$cur" == "-"* ]]; then
-      opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-bash-completion )
+      opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-shell-completion )
     else
-      opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
+      opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-shell-completion )
     fi
     COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
     return 0
diff --git a/contrib/autocompletion/zsh_autocomplete b/contrib/autocompletion/zsh_autocomplete
index b3b40df503..0fd1a0b175 100644
--- a/contrib/autocompletion/zsh_autocomplete
+++ b/contrib/autocompletion/zsh_autocomplete
@@ -9,9 +9,9 @@ _cli_zsh_autocomplete() {
   local cur
   cur=${words[-1]}
   if [[ "$cur" == "-"* ]]; then
-    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-shell-completion)}")
   else
-    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-shell-completion)}")
   fi
 
   if [[ "${opts[1]}" != "" ]]; then
diff --git a/contrib/backport/README b/contrib/backport/README
deleted file mode 100644
index 466b79c6d4..0000000000
--- a/contrib/backport/README
+++ /dev/null
@@ -1,41 +0,0 @@
-`backport`
-==========
-
-`backport` is a command to help create backports of PRs. It backports a
-provided PR from main on to a released version.
-
-It will create a backport branch, cherry-pick the PR's merge commit, adjust
-the commit message and then push this back up to your fork's remote.
-
-The default version will read from `docs/config.yml`. You can override this
-using the option `--version`.
-
-The upstream branches will be fetched, using the remote `origin`. This can
-be overridden using `--upstream`, and fetching can be avoided using
-`--no-fetch`.
-
-By default the branch created will be called `backport-$PR-$VERSION`. You
-can override this using the option `--backport-branch`. This branch will
-be created from `--release-branch` which is `release/$(VERSION)`
-by default and will be pulled from `$(UPSTREAM)`.
-
-The merge-commit as determined by the github API will be used as the SHA to
-cherry-pick. You can override this using `--cherry-pick`.
-
-The commit message will be amended to add the `Backport` header.
-`--no-amend-message` can be set to stop this from happening.
-
-If cherry-pick is successful the backported branch will be pushed up to your
-fork using your remote. These will be determined using `git remote -v`. You
-can set your fork name using `--fork-user` and your remote name using
-`--remote`. You can avoid pushing using `--no-push`.
-
-If the push is successful, `xdg-open` will be called to open a backport url.
-You can stop this using `--no-xdg-open`.
-
-Installation
-============
-
-```bash
-go install contrib/backport/backport.go
-```
diff --git a/contrib/backport/backport.go b/contrib/backport/backport.go
deleted file mode 100644
index dd6b4129df..0000000000
--- a/contrib/backport/backport.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-//nolint:forbidigo
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"github.com/google/go-github/v64/github"
-	"github.com/urfave/cli/v2"
-	"gopkg.in/yaml.v3"
-)
-
-const defaultVersion = "v1.18" // to backport to
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "backport"
-	app.Usage = "Backport provided PR-number on to the current or previous released version"
-	app.Description = `Backport will look-up the PR in Gitea's git log and attempt to cherry-pick it on the current version`
-	app.ArgsUsage = "<PR-to-backport>"
-
-	app.Flags = []cli.Flag{
-		&cli.StringFlag{
-			Name:  "version",
-			Usage: "Version branch to backport on to",
-		},
-		&cli.StringFlag{
-			Name:  "upstream",
-			Value: "origin",
-			Usage: "Upstream remote for the Gitea upstream",
-		},
-		&cli.StringFlag{
-			Name:  "release-branch",
-			Value: "",
-			Usage: "Release branch to backport on. Will default to release/<version>",
-		},
-		&cli.StringFlag{
-			Name:  "cherry-pick",
-			Usage: "SHA to cherry-pick as backport",
-		},
-		&cli.StringFlag{
-			Name:  "backport-branch",
-			Usage: "Backport branch to backport on to (default: backport-<pr>-<version>",
-		},
-		&cli.StringFlag{
-			Name:  "remote",
-			Value: "",
-			Usage: "Remote for your fork of the Gitea upstream",
-		},
-		&cli.StringFlag{
-			Name:  "fork-user",
-			Value: "",
-			Usage: "Forked user name on Github",
-		},
-		&cli.BoolFlag{
-			Name:  "no-fetch",
-			Usage: "Set this flag to prevent fetch of remote branches",
-		},
-		&cli.BoolFlag{
-			Name:  "no-amend-message",
-			Usage: "Set this flag to prevent automatic amendment of the commit message",
-		},
-		&cli.BoolFlag{
-			Name:  "no-push",
-			Usage: "Set this flag to prevent pushing the backport up to your fork",
-		},
-		&cli.BoolFlag{
-			Name:  "no-xdg-open",
-			Usage: "Set this flag to not use xdg-open to open the PR URL",
-		},
-		&cli.BoolFlag{
-			Name:  "continue",
-			Usage: "Set this flag to continue from a git cherry-pick that has broken",
-		},
-	}
-	cli.AppHelpTemplate = `NAME:
-	{{.Name}} - {{.Usage}}
-USAGE:
-	{{.HelpName}} {{if .VisibleFlags}}[options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-	{{if len .Authors}}
-AUTHOR:
-	{{range .Authors}}{{ . }}{{end}}
-	{{end}}{{if .Commands}}
-OPTIONS:
-	{{range .VisibleFlags}}{{.}}
-	{{end}}{{end}}
-`
-
-	app.Action = runBackport
-
-	if err := app.Run(os.Args); err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to backport: %v\n", err)
-	}
-}
-
-func runBackport(c *cli.Context) error {
-	ctx, cancel := installSignals()
-	defer cancel()
-
-	continuing := c.Bool("continue")
-
-	var pr string
-
-	version := c.String("version")
-	if version == "" && continuing {
-		// determine version from current branch name
-		var err error
-		pr, version, err = readCurrentBranch(ctx)
-		if err != nil {
-			return err
-		}
-	}
-	if version == "" {
-		version = readVersion()
-	}
-	if version == "" {
-		version = defaultVersion
-	}
-
-	upstream := c.String("upstream")
-	if upstream == "" {
-		upstream = "origin"
-	}
-
-	forkUser := c.String("fork-user")
-	remote := c.String("remote")
-	if remote == "" && !c.Bool("--no-push") {
-		var err error
-		remote, forkUser, err = determineRemote(ctx, forkUser)
-		if err != nil {
-			return err
-		}
-	}
-
-	upstreamReleaseBranch := c.String("release-branch")
-	if upstreamReleaseBranch == "" {
-		upstreamReleaseBranch = path.Join("release", version)
-	}
-
-	localReleaseBranch := path.Join(upstream, upstreamReleaseBranch)
-
-	args := c.Args().Slice()
-	if len(args) == 0 && pr == "" {
-		return fmt.Errorf("no PR number provided\nProvide a PR number to backport")
-	} else if len(args) != 1 && pr == "" {
-		return fmt.Errorf("multiple PRs provided %v\nOnly a single PR can be backported at a time", args)
-	}
-	if pr == "" {
-		pr = args[0]
-	}
-
-	backportBranch := c.String("backport-branch")
-	if backportBranch == "" {
-		backportBranch = "backport-" + pr + "-" + version
-	}
-
-	fmt.Printf("* Backporting %s to %s as %s\n", pr, localReleaseBranch, backportBranch)
-
-	sha := c.String("cherry-pick")
-	if sha == "" {
-		var err error
-		sha, err = determineSHAforPR(ctx, pr)
-		if err != nil {
-			return err
-		}
-	}
-	if sha == "" {
-		return fmt.Errorf("unable to determine sha for cherry-pick of %s", pr)
-	}
-
-	if !c.Bool("no-fetch") {
-		if err := fetchRemoteAndMain(ctx, upstream, upstreamReleaseBranch); err != nil {
-			return err
-		}
-	}
-
-	if !continuing {
-		if err := checkoutBackportBranch(ctx, backportBranch, localReleaseBranch); err != nil {
-			return err
-		}
-	}
-
-	if err := cherrypick(ctx, sha); err != nil {
-		return err
-	}
-
-	if !c.Bool("no-amend-message") {
-		if err := amendCommit(ctx, pr); err != nil {
-			return err
-		}
-	}
-
-	if !c.Bool("no-push") {
-		url := "https://github.com/go-gitea/gitea/compare/" + upstreamReleaseBranch + "..." + forkUser + ":" + backportBranch
-
-		if err := gitPushUp(ctx, remote, backportBranch); err != nil {
-			return err
-		}
-
-		if !c.Bool("no-xdg-open") {
-			if err := xdgOpen(ctx, url); err != nil {
-				return err
-			}
-		} else {
-			fmt.Printf("* Navigate to %s to open PR\n", url)
-		}
-	}
-	return nil
-}
-
-func xdgOpen(ctx context.Context, url string) error {
-	fmt.Printf("* `xdg-open %s`\n", url)
-	out, err := exec.CommandContext(ctx, "xdg-open", url).Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s", string(out))
-		return fmt.Errorf("unable to xdg-open to %s: %w", url, err)
-	}
-	return nil
-}
-
-func gitPushUp(ctx context.Context, remote, backportBranch string) error {
-	fmt.Printf("* `git push -u %s %s`\n", remote, backportBranch)
-	out, err := exec.CommandContext(ctx, "git", "push", "-u", remote, backportBranch).Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s", string(out))
-		return fmt.Errorf("unable to push up to %s: %w", remote, err)
-	}
-	return nil
-}
-
-func amendCommit(ctx context.Context, pr string) error {
-	fmt.Printf("* Amending commit to prepend `Backport #%s` to body\n", pr)
-	out, err := exec.CommandContext(ctx, "git", "log", "-1", "--pretty=format:%B").Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s", string(out))
-		return fmt.Errorf("unable to get last log message: %w", err)
-	}
-
-	parts := strings.SplitN(string(out), "\n", 2)
-
-	if len(parts) != 2 {
-		return fmt.Errorf("unable to interpret log message:\n%s", string(out))
-	}
-	subject, body := parts[0], parts[1]
-	if !strings.HasSuffix(subject, " (#"+pr+")") {
-		subject = subject + " (#" + pr + ")"
-	}
-
-	out, err = exec.CommandContext(ctx, "git", "commit", "--amend", "-m", subject+"\n\nBackport #"+pr+"\n"+body).Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s", string(out))
-		return fmt.Errorf("unable to amend last log message: %w", err)
-	}
-	return nil
-}
-
-func cherrypick(ctx context.Context, sha string) error {
-	// Check if a CHERRY_PICK_HEAD exists
-	if _, err := os.Stat(".git/CHERRY_PICK_HEAD"); err == nil {
-		// Assume that we are in the middle of cherry-pick - continue it
-		fmt.Println("* Attempting git cherry-pick --continue")
-		out, err := exec.CommandContext(ctx, "git", "cherry-pick", "--continue").Output()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "git cherry-pick --continue failed:\n%s\n", string(out))
-			return fmt.Errorf("unable to continue cherry-pick: %w", err)
-		}
-		return nil
-	}
-
-	fmt.Printf("* Attempting git cherry-pick %s\n", sha)
-	out, err := exec.CommandContext(ctx, "git", "cherry-pick", sha).Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "git cherry-pick %s failed:\n%s\n", sha, string(out))
-		return fmt.Errorf("git cherry-pick %s failed: %w", sha, err)
-	}
-	return nil
-}
-
-func checkoutBackportBranch(ctx context.Context, backportBranch, releaseBranch string) error {
-	out, err := exec.CommandContext(ctx, "git", "branch", "--show-current").Output()
-	if err != nil {
-		return fmt.Errorf("unable to check current branch %w", err)
-	}
-
-	currentBranch := strings.TrimSpace(string(out))
-	fmt.Printf("* Current branch is %s\n", currentBranch)
-	if currentBranch == backportBranch {
-		fmt.Printf("* Current branch is %s - not checking out\n", currentBranch)
-		return nil
-	}
-
-	if _, err := exec.CommandContext(ctx, "git", "rev-list", "-1", backportBranch).Output(); err == nil {
-		fmt.Printf("* Branch %s already exists. Checking it out...\n", backportBranch)
-		return exec.CommandContext(ctx, "git", "checkout", "-f", backportBranch).Run()
-	}
-
-	fmt.Printf("* `git checkout -b %s %s`\n", backportBranch, releaseBranch)
-	return exec.CommandContext(ctx, "git", "checkout", "-b", backportBranch, releaseBranch).Run()
-}
-
-func fetchRemoteAndMain(ctx context.Context, remote, releaseBranch string) error {
-	fmt.Printf("* `git fetch %s main`\n", remote)
-	out, err := exec.CommandContext(ctx, "git", "fetch", remote, "main").Output()
-	if err != nil {
-		fmt.Println(string(out))
-		return fmt.Errorf("unable to fetch %s from %s: %w", "main", remote, err)
-	}
-	fmt.Println(string(out))
-
-	fmt.Printf("* `git fetch %s %s`\n", remote, releaseBranch)
-	out, err = exec.CommandContext(ctx, "git", "fetch", remote, releaseBranch).Output()
-	if err != nil {
-		fmt.Println(string(out))
-		return fmt.Errorf("unable to fetch %s from %s: %w", releaseBranch, remote, err)
-	}
-	fmt.Println(string(out))
-
-	return nil
-}
-
-func determineRemote(ctx context.Context, forkUser string) (string, string, error) {
-	out, err := exec.CommandContext(ctx, "git", "remote", "-v").Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to list git remotes:\n%s\n", string(out))
-		return "", "", fmt.Errorf("unable to determine forked remote: %w", err)
-	}
-	lines := strings.Split(string(out), "\n")
-	for _, line := range lines {
-		fields := strings.Split(line, "\t")
-		name, remote := fields[0], fields[1]
-		// only look at pushers
-		if !strings.HasSuffix(remote, " (push)") {
-			continue
-		}
-		// only look at github.com pushes
-		if !strings.Contains(remote, "github.com") {
-			continue
-		}
-		// ignore go-gitea/gitea
-		if strings.Contains(remote, "go-gitea/gitea") {
-			continue
-		}
-		if !strings.Contains(remote, forkUser) {
-			continue
-		}
-		if strings.HasPrefix(remote, "git@github.com:") {
-			forkUser = strings.TrimPrefix(remote, "git@github.com:")
-		} else if strings.HasPrefix(remote, "https://github.com/") {
-			forkUser = strings.TrimPrefix(remote, "https://github.com/")
-		} else if strings.HasPrefix(remote, "https://www.github.com/") {
-			forkUser = strings.TrimPrefix(remote, "https://www.github.com/")
-		} else if forkUser == "" {
-			return "", "", fmt.Errorf("unable to extract forkUser from remote %s: %s", name, remote)
-		}
-		idx := strings.Index(forkUser, "/")
-		if idx >= 0 {
-			forkUser = forkUser[:idx]
-		}
-		return name, forkUser, nil
-	}
-	return "", "", fmt.Errorf("unable to find appropriate remote in:\n%s", string(out))
-}
-
-func readCurrentBranch(ctx context.Context) (pr, version string, err error) {
-	out, err := exec.CommandContext(ctx, "git", "branch", "--show-current").Output()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read current git branch:\n%s\n", string(out))
-		return "", "", fmt.Errorf("unable to read current git branch: %w", err)
-	}
-	parts := strings.Split(strings.TrimSpace(string(out)), "-")
-
-	if len(parts) != 3 || parts[0] != "backport" {
-		fmt.Fprintf(os.Stderr, "Unable to continue from git branch:\n%s\n", string(out))
-		return "", "", fmt.Errorf("unable to continue from git branch:\n%s", string(out))
-	}
-
-	return parts[1], parts[2], nil
-}
-
-func readVersion() string {
-	bs, err := os.ReadFile("docs/config.yaml")
-	if err != nil {
-		if err == os.ErrNotExist {
-			log.Println("`docs/config.yaml` not present")
-			return ""
-		}
-		fmt.Fprintf(os.Stderr, "Unable to read `docs/config.yaml`: %v\n", err)
-		return ""
-	}
-
-	type params struct {
-		Version string
-	}
-	type docConfig struct {
-		Params params
-	}
-	dc := &docConfig{}
-	if err := yaml.Unmarshal(bs, dc); err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read `docs/config.yaml`: %v\n", err)
-		return ""
-	}
-
-	if dc.Params.Version == "" {
-		fmt.Fprintf(os.Stderr, "No version in `docs/config.yaml`")
-		return ""
-	}
-
-	version := dc.Params.Version
-	if version[0] != 'v' {
-		version = "v" + version
-	}
-
-	split := strings.SplitN(version, ".", 3)
-
-	return strings.Join(split[:2], ".")
-}
-
-func determineSHAforPR(ctx context.Context, prStr string) (string, error) {
-	prNum, err := strconv.Atoi(prStr)
-	if err != nil {
-		return "", err
-	}
-
-	client := github.NewClient(http.DefaultClient)
-
-	pr, _, err := client.PullRequests.Get(ctx, "go-gitea", "gitea", prNum)
-	if err != nil {
-		return "", err
-	}
-
-	if pr.Merged == nil || !*pr.Merged {
-		return "", fmt.Errorf("PR #%d is not yet merged - cannot determine sha to backport", prNum)
-	}
-
-	if pr.MergeCommitSHA != nil {
-		return *pr.MergeCommitSHA, nil
-	}
-
-	return "", nil
-}
-
-func installSignals() (context.Context, context.CancelFunc) {
-	ctx, cancel := context.WithCancel(context.Background())
-	go func() {
-		// install notify
-		signalChannel := make(chan os.Signal, 1)
-
-		signal.Notify(
-			signalChannel,
-			syscall.SIGINT,
-			syscall.SIGTERM,
-		)
-		select {
-		case <-signalChannel:
-		case <-ctx.Done():
-		}
-		cancel()
-		signal.Reset()
-	}()
-
-	return ctx, cancel
-}
diff --git a/contrib/environment-to-ini/README b/contrib/environment-to-ini/README
index f1d3f2ae83..e4caf25666 100644
--- a/contrib/environment-to-ini/README
+++ b/contrib/environment-to-ini/README
@@ -1,45 +1,46 @@
 Environment To Ini
 ==================
 
-Multiple docker users have requested that the Gitea docker is changed
-to permit arbitrary configuration via environment variables.
+This tool allows defining Forgejo's entire configuration via environment
+variables, mostly geared towards usage in Docker.
 
-Gitea needs to use an ini file for configuration because the running
-environment that starts the docker may not be the same as that used
-by the hooks. An ini file also gives a good default and means that
-users do not have to completely provide a full environment.
+Forgejo needs to use an INI file for configuration because the running
+environment that starts the container may not be the same as the one used
+by the hooks. An INI file also gives a good default and means that
+users do not have to provide the entire set of environment variables.
 
 With those caveats above, this command provides a generic way of
 converting suitably structured environment variables into any ini
 value.
 
-To use the command is very simple just run it and the default gitea
-app.ini will be rewritten to take account of the variables provided,
-however there are various options to give slightly different
-behavior and these can be interrogated with the `-h` option.
+When run, `environment-to-ini` will write the config files based on the
+environment variables provided.
+Check with the `-h` flag for several options to alter this behaviour.
 
-The environment variables should be of the form:
+Environment variables of the form "FORGEJO__SECTION_NAME__KEY_NAME"
+will be mapped to the ini section "[section_name]" and the key
+"KEY_NAME" with the value as provided.
 
-	GITEA__SECTION_NAME__KEY_NAME
-
-Note, SECTION_NAME in the notation above is case-insensitive.
+Environment variables of the form "FORGEJO__SECTION_NAME__KEY_NAME__FILE"
+will be mapped to the ini section "[section_name]" and the key
+"KEY_NAME" with the value loaded from the specified file.
 
 Environment variables are usually restricted to a reduced character
 set "0-9A-Z_" - in order to allow the setting of sections with
 characters outside of that set, they should be escaped as following:
-"_0X2E_" for "." and "_0X2D_" for "-". The entire section and key names 
-can be escaped as a UTF8 byte string if necessary. E.g. to configure:
+"_0X2E_" for ".". The entire section and key names can be escaped as
+a UTF8 byte string if necessary. E.g. to configure:
 
-	"""
-	...
-	[log.console]
-	COLORIZE=false
-	STDERR=true
-	...
-	"""
+  """
+  ...
+  [log.console]
+  COLORIZE=false
+  STDERR=true
+  ...
+  """
 
-You would set the environment variables: "GITEA__LOG_0x2E_CONSOLE__COLORIZE=false"
-and "GITEA__LOG_0x2E_CONSOLE__STDERR=false". Other examples can be found
+You would set the environment variables: "FORGEJO__LOG_0x2E_CONSOLE__COLORIZE=false"
+and "FORGEJO__LOG_0x2E_CONSOLE__STDERR=false". Other examples can be found
 on the configuration cheat sheet.
 
 To build locally, run:
diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go
index 95f34527ac..e8e799b5f3 100644
--- a/contrib/environment-to-ini/environment-to-ini.go
+++ b/contrib/environment-to-ini/environment-to-ini.go
@@ -4,16 +4,17 @@
 package main
 
 import (
+	"context"
 	"os"
 
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func main() {
-	app := cli.NewApp()
+	app := cli.Command{}
 	app.Name = "environment-to-ini"
 	app.Usage = "Use provided environment to update configuration ini"
 	app.Description = `As a helper to allow docker users to update the forgejo configuration
@@ -72,13 +73,13 @@ func main() {
 		},
 	}
 	app.Action = runEnvironmentToIni
-	err := app.Run(os.Args)
+	err := app.Run(context.Background(), os.Args)
 	if err != nil {
 		log.Fatal("Failed to run app with %s: %v", os.Args, err)
 	}
 }
 
-func runEnvironmentToIni(c *cli.Context) error {
+func runEnvironmentToIni(ctx context.Context, c *cli.Command) error {
 	// the config system may change the environment variables, so get a copy first, to be used later
 	env := append([]string{}, os.Environ()...)
 	setting.InitWorkPathAndCfgProvider(os.Getenv, setting.ArgWorkPathAndCustomConf{
diff --git a/contrib/gitea-monitoring-mixin/dashboards/overview.libsonnet b/contrib/gitea-monitoring-mixin/dashboards/overview.libsonnet
index 31b7d4f9b2..108cab0eb1 100644
--- a/contrib/gitea-monitoring-mixin/dashboards/overview.libsonnet
+++ b/contrib/gitea-monitoring-mixin/dashboards/overview.libsonnet
@@ -408,7 +408,7 @@ local addIssueLabelsOverrides(labels) =
           regex: '',
           type: 'query',
           multi: true,
-          allValue: '.+'
+          allValue: '.+',
         },
       )
       .addTemplate(
@@ -423,7 +423,7 @@ local addIssueLabelsOverrides(labels) =
           regex: '',
           type: 'query',
           multi: true,
-          allValue: '.+'
+          allValue: '.+',
         },
       )
       .addTemplate(
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index f8fa95bbab..267696872d 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -183,7 +183,7 @@ RUN_USER = ; git
 ;;
 ;; For the built-in SSH server, choose the key exchange algorithms to support for SSH connections,
 ;; for system SSH this setting has no effect
-;SSH_SERVER_KEY_EXCHANGES = curve25519-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1
+;SSH_SERVER_KEY_EXCHANGES = mlkem768x25519-sha256, curve25519-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha256, diffie-hellman-group14-sha1
 ;;
 ;; For the built-in SSH server, choose the MACs to support for SSH connections,
 ;; for system SSH this setting has no effect
@@ -449,6 +449,9 @@ INTERNAL_TOKEN =
 ;; How long to remember that a user is logged in before requiring relogin (in days)
 ;LOGIN_REMEMBER_DAYS = 31
 ;;
+;; Require 2FA globally for none|all|admin.
+;GLOBAL_TWO_FACTOR_REQUIREMENT = none
+;;
 ;; Name of cookie used to store authentication information.
 ;COOKIE_REMEMBER_NAME = gitea_incredible
 ;;
@@ -592,9 +595,9 @@ LEVEL = Info
 ;BUFFER_LEN = 10000
 ;;
 ;; Sub logger modes, a single comma means use default MODE above, empty means disable it
-;logger.access.MODE=
-;logger.router.MODE=,
-;logger.xorm.MODE=,
+;LOGGER_ACCESS_MODE=
+;LOGGER_ROUTER_MODE=,
+;LOGGER_XORM_MODE=,
 ;;
 ;; Collect SSH logs (Creates log from ssh git request)
 ;;
@@ -631,6 +634,7 @@ LEVEL = Info
 ;LEVEL=
 ;FLAGS = stdflags or journald
 ;EXPRESSION =
+;EXCLUSION =
 ;PREFIX =
 ;COLORIZE = false
 ;;
@@ -1025,6 +1029,10 @@ LEVEL = Info
 ;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
 ;DEFAULT_FORK_REPO_UNITS = repo.code,repo.pulls
 ;;
+;; Comma separated list of default mirror repo units.
+;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
+;DEFAULT_MIRROR_REPO_UNITS = repo.code,repo.releases,repo.issues,repo.wiki,repo.projects,repo.packages
+;;
 ;; Prefix archive files by placing them in a directory named after the repository
 ;PREFIX_ARCHIVE_FILES = true
 ;;
@@ -1131,9 +1139,6 @@ LEVEL = Info
 ;; Add co-authored-by and co-committed-by trailers if committer does not match author
 ;ADD_CO_COMMITTER_TRAILERS = true
 ;;
-;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply
-;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false
-;;
 ;; Retarget child pull requests to the parent pull request branch target on merge of parent pull request. It only works on merged PRs where the head and base branch target the same repo.
 ;RETARGET_CHILDREN_ON_MERGE = true
 
@@ -1163,9 +1168,13 @@ LEVEL = Info
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
+;; Signing format that Forgejo should use, openpgp uses GPG and ssh uses OpenSSH.
+;FORMAT = openpgp
+;;
 ;; GPG key to use to sign commits, Defaults to the default - that is the value of git config --get user.signingkey
 ;; run in the context of the RUN_USER
-;; Switch to none to stop signing completely
+;; Switch to none to stop signing completely.
+;; If `FORMAT` is set to **ssh** this should be set to an absolute path to an public OpenSSH key.
 ;SIGNING_KEY = default
 ;;
 ;; If a SIGNING_KEY ID is provided and is not set to default, use the provided Name and Email address as the signer.
@@ -1571,6 +1580,20 @@ LEVEL = Info
 ;; - manage_gpg_keys: a user cannot configure gpg keys
 ;;EXTERNAL_USER_DISABLE_FEATURES =
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;[moderation]
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; When true enables moderation capabilities; default is false.
+;; If enabled it will be possible for users to report abusive content (new actions are added in the UI and /report_abuse route will be enabled) and a new Moderation section will be added to Admin settings where the reports can be reviewed.
+;ENABLED = false
+
+;; How long to keep resolved abuse reports for.
+;; Applies to reports that have been marked as ignored or handled
+;; Can be 1 hour, 7 days etc
+;KEEP_RESOLVED_REPORTS_FOR = 0
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;[openid]
@@ -1753,6 +1776,9 @@ LEVEL = Info
 ;; Use PASSWD = `your password` for quoting if you use special characters in the password.
 ;PASSWD =
 ;;
+;; Alternative location to specify mailer password. You cannot specify both this and PASSWD, and must pick one
+;PASSWD_URI = file:/etc/forgejo/mailer_passwd
+;;
 ;; Send mails only in plain text, without HTML alternative
 ;SEND_AS_PLAIN_TEXT = false
 ;;
@@ -1805,6 +1831,9 @@ LEVEL = Info
 ;; Password of the receiving account
 ;PASSWORD =
 ;;
+;; Alternative location to specify password of the receiving account. You cannot specify both this and PASSWORD, and must pick one
+;PASSWORD_URI = file:/etc/forgejo/email_incoming_password
+;;
 ;; Whether the IMAP server uses TLS.
 ;USE_TLS = false
 ;;
@@ -2440,7 +2469,7 @@ LEVEL = Info
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Set the maximum number of characters in a mermaid source. (Set to -1 to disable limits)
-;MERMAID_MAX_SOURCE_CHARACTERS = 5000
+;MERMAID_MAX_SOURCE_CHARACTERS = 50000
 ;; Set the maximum number of lines allowed for a filepreview. (Set to -1 to disable limits; set to 0 to disable the feature)
 ;FILEPREVIEW_MAX_LINES = 50
 
diff --git a/docker/root/etc/s6/openssh/setup b/docker/root/etc/s6/openssh/setup
index dbb3bafd35..48e7d4b211 100755
--- a/docker/root/etc/s6/openssh/setup
+++ b/docker/root/etc/s6/openssh/setup
@@ -31,6 +31,21 @@ if [ -e /data/ssh/ssh_host_ecdsa_cert ]; then
   SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_cert"}
 fi
 
+# In case someone wants to sign the `{keyname}.pub` key by `ssh-keygen -s ca -I identity ...` to
+# make use of the ssh-key certificate authority feature (see ssh-keygen CERTIFICATES section),
+# the generated key file name is `{keyname}-cert.pub`
+if [ -e /data/ssh/ssh_host_ed25519_key-cert.pub ]; then
+  SSH_ED25519_CERT=${SSH_ED25519_CERT:-"/data/ssh/ssh_host_ed25519_key-cert.pub"}
+fi
+
+if [ -e /data/ssh/ssh_host_rsa_key-cert.pub ]; then
+  SSH_RSA_CERT=${SSH_RSA_CERT:-"/data/ssh/ssh_host_rsa_key-cert.pub"}
+fi
+
+if [ -e /data/ssh/ssh_host_ecdsa_key-cert.pub ]; then
+  SSH_ECDSA_CERT=${SSH_ECDSA_CERT:-"/data/ssh/ssh_host_ecdsa_key-cert.pub"}
+fi
+
 if [ -d /etc/ssh ]; then
     SSH_PORT=${SSH_PORT:-"22"} \
     SSH_LISTEN_PORT=${SSH_LISTEN_PORT:-"${SSH_PORT}"} \
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 17f461a8f4..28cfa80089 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,5 +1,5 @@
 import eslintCommunityEslintPluginEslintComments from '@eslint-community/eslint-plugin-eslint-comments';
-import stylisticEslintPluginJs from '@stylistic/eslint-plugin-js';
+import stylisticEslintPlugin from '@stylistic/eslint-plugin';
 import vitest from '@vitest/eslint-plugin';
 import arrayFunc from 'eslint-plugin-array-func';
 import eslintPluginImportX from 'eslint-plugin-import-x';
@@ -26,7 +26,7 @@ export default tseslint.config(
   {
     plugins: {
       '@eslint-community/eslint-comments': eslintCommunityEslintPluginEslintComments,
-      '@stylistic/js': stylisticEslintPluginJs,
+      '@stylistic': stylisticEslintPlugin,
       '@vitest': vitest,
       'array-func': arrayFunc,
       'no-jquery': noJquery,
@@ -69,62 +69,62 @@ export default tseslint.config(
       '@eslint-community/eslint-comments/no-unused-enable': [2],
       '@eslint-community/eslint-comments/no-use': [0],
       '@eslint-community/eslint-comments/require-description': [0],
-      '@stylistic/js/array-bracket-newline': [0],
-      '@stylistic/js/array-bracket-spacing': [2, 'never'],
-      '@stylistic/js/array-element-newline': [0],
-      '@stylistic/js/arrow-parens': [2, 'always'],
+      '@stylistic/array-bracket-newline': [0],
+      '@stylistic/array-bracket-spacing': [2, 'never'],
+      '@stylistic/array-element-newline': [0],
+      '@stylistic/arrow-parens': [2, 'always'],
 
-      '@stylistic/js/arrow-spacing': [2, {
+      '@stylistic/arrow-spacing': [2, {
         before: true,
         after: true,
       }],
 
-      '@stylistic/js/block-spacing': [0],
+      '@stylistic/block-spacing': [0],
 
-      '@stylistic/js/brace-style': [2, '1tbs', {
+      '@stylistic/brace-style': [2, '1tbs', {
         allowSingleLine: true,
       }],
 
-      '@stylistic/js/comma-dangle': [2, 'always-multiline'],
+      '@stylistic/comma-dangle': [2, 'always-multiline'],
 
-      '@stylistic/js/comma-spacing': [2, {
+      '@stylistic/comma-spacing': [2, {
         before: false,
         after: true,
       }],
 
-      '@stylistic/js/comma-style': [2, 'last'],
-      '@stylistic/js/computed-property-spacing': [2, 'never'],
-      '@stylistic/js/dot-location': [2, 'property'],
-      '@stylistic/js/eol-last': [2],
-      '@stylistic/js/function-call-spacing': [2, 'never'],
-      '@stylistic/js/function-call-argument-newline': [0],
-      '@stylistic/js/function-paren-newline': [0],
-      '@stylistic/js/generator-star-spacing': [0],
-      '@stylistic/js/implicit-arrow-linebreak': [0],
+      '@stylistic/comma-style': [2, 'last'],
+      '@stylistic/computed-property-spacing': [2, 'never'],
+      '@stylistic/dot-location': [2, 'property'],
+      '@stylistic/eol-last': [2],
+      '@stylistic/function-call-spacing': [2, 'never'],
+      '@stylistic/function-call-argument-newline': [0],
+      '@stylistic/function-paren-newline': [0],
+      '@stylistic/generator-star-spacing': [0],
+      '@stylistic/implicit-arrow-linebreak': [0],
 
-      '@stylistic/js/indent': [2, 2, {
+      '@stylistic/indent': [2, 2, {
         ignoreComments: true,
         SwitchCase: 1,
       }],
 
-      '@stylistic/js/key-spacing': [2],
-      '@stylistic/js/keyword-spacing': [2],
-      '@stylistic/js/linebreak-style': [2, 'unix'],
-      '@stylistic/js/lines-around-comment': [0],
-      '@stylistic/js/lines-between-class-members': [0],
-      '@stylistic/js/max-len': [0],
-      '@stylistic/js/max-statements-per-line': [0],
-      '@stylistic/js/multiline-ternary': [0],
-      '@stylistic/js/new-parens': [2],
-      '@stylistic/js/newline-per-chained-call': [0],
-      '@stylistic/js/no-confusing-arrow': [0],
-      '@stylistic/js/no-extra-parens': [0],
-      '@stylistic/js/no-extra-semi': [2],
-      '@stylistic/js/no-floating-decimal': [0],
-      '@stylistic/js/no-mixed-operators': [0],
-      '@stylistic/js/no-mixed-spaces-and-tabs': [2],
+      '@stylistic/key-spacing': [2],
+      '@stylistic/keyword-spacing': [2],
+      '@stylistic/linebreak-style': [2, 'unix'],
+      '@stylistic/lines-around-comment': [0],
+      '@stylistic/lines-between-class-members': [0],
+      '@stylistic/max-len': [0],
+      '@stylistic/max-statements-per-line': [0],
+      '@stylistic/multiline-ternary': [0],
+      '@stylistic/new-parens': [2],
+      '@stylistic/newline-per-chained-call': [0],
+      '@stylistic/no-confusing-arrow': [0],
+      '@stylistic/no-extra-parens': [0],
+      '@stylistic/no-extra-semi': [2],
+      '@stylistic/no-floating-decimal': [0],
+      '@stylistic/no-mixed-operators': [0],
+      '@stylistic/no-mixed-spaces-and-tabs': [2],
 
-      '@stylistic/js/no-multi-spaces': [2, {
+      '@stylistic/no-multi-spaces': [2, {
         ignoreEOLComments: true,
 
         exceptions: {
@@ -132,60 +132,60 @@ export default tseslint.config(
         },
       }],
 
-      '@stylistic/js/no-multiple-empty-lines': [2, {
+      '@stylistic/no-multiple-empty-lines': [2, {
         max: 1,
         maxEOF: 0,
         maxBOF: 0,
       }],
 
-      '@stylistic/js/no-tabs': [2],
-      '@stylistic/js/no-trailing-spaces': [2],
-      '@stylistic/js/no-whitespace-before-property': [2],
-      '@stylistic/js/nonblock-statement-body-position': [2],
-      '@stylistic/js/object-curly-newline': [0],
-      '@stylistic/js/object-curly-spacing': [2, 'never'],
-      '@stylistic/js/object-property-newline': [0],
-      '@stylistic/js/one-var-declaration-per-line': [0],
-      '@stylistic/js/operator-linebreak': [2, 'after'],
-      '@stylistic/js/padded-blocks': [2, 'never'],
-      '@stylistic/js/padding-line-between-statements': [0],
-      '@stylistic/js/quote-props': [0],
+      '@stylistic/no-tabs': [2],
+      '@stylistic/no-trailing-spaces': [2],
+      '@stylistic/no-whitespace-before-property': [2],
+      '@stylistic/nonblock-statement-body-position': [2],
+      '@stylistic/object-curly-newline': [0],
+      '@stylistic/object-curly-spacing': [2, 'never'],
+      '@stylistic/object-property-newline': [0],
+      '@stylistic/one-var-declaration-per-line': [0],
+      '@stylistic/operator-linebreak': [2, 'after'],
+      '@stylistic/padded-blocks': [2, 'never'],
+      '@stylistic/padding-line-between-statements': [0],
+      '@stylistic/quote-props': [0],
 
-      '@stylistic/js/quotes': [2, 'single', {
+      '@stylistic/quotes': [2, 'single', {
         avoidEscape: true,
         allowTemplateLiterals: true,
       }],
 
-      '@stylistic/js/rest-spread-spacing': [2, 'never'],
+      '@stylistic/rest-spread-spacing': [2, 'never'],
 
-      '@stylistic/js/semi': [2, 'always', {
+      '@stylistic/semi': [2, 'always', {
         omitLastInOneLineBlock: true,
       }],
 
-      '@stylistic/js/semi-spacing': [2, {
+      '@stylistic/semi-spacing': [2, {
         before: false,
         after: true,
       }],
 
-      '@stylistic/js/semi-style': [2, 'last'],
-      '@stylistic/js/space-before-blocks': [2, 'always'],
+      '@stylistic/semi-style': [2, 'last'],
+      '@stylistic/space-before-blocks': [2, 'always'],
 
-      '@stylistic/js/space-before-function-paren': [2, {
+      '@stylistic/space-before-function-paren': [2, {
         anonymous: 'ignore',
         named: 'never',
         asyncArrow: 'always',
       }],
 
-      '@stylistic/js/space-in-parens': [2, 'never'],
-      '@stylistic/js/space-infix-ops': [2],
-      '@stylistic/js/space-unary-ops': [2],
-      '@stylistic/js/spaced-comment': [2, 'always'],
-      '@stylistic/js/switch-colon-spacing': [2],
-      '@stylistic/js/template-curly-spacing': [2, 'never'],
-      '@stylistic/js/template-tag-spacing': [2, 'never'],
-      '@stylistic/js/wrap-iife': [2, 'inside'],
-      '@stylistic/js/wrap-regex': [0],
-      '@stylistic/js/yield-star-spacing': [2, 'after'],
+      '@stylistic/space-in-parens': [2, 'never'],
+      '@stylistic/space-infix-ops': [2],
+      '@stylistic/space-unary-ops': [2],
+      '@stylistic/spaced-comment': [2, 'always'],
+      '@stylistic/switch-colon-spacing': [2],
+      '@stylistic/template-curly-spacing': [2, 'never'],
+      '@stylistic/template-tag-spacing': [2, 'never'],
+      '@stylistic/wrap-iife': [2, 'inside'],
+      '@stylistic/wrap-regex': [0],
+      '@stylistic/yield-star-spacing': [2, 'after'],
       'accessor-pairs': [2],
 
       'array-callback-return': [2, {
@@ -318,8 +318,9 @@ export default tseslint.config(
       'no-jquery/no-data': [0],
       'no-jquery/no-deferred': [2],
       'no-jquery/no-delegate': [2],
+      'no-jquery/no-done-fail': [2],
       'no-jquery/no-each-collection': [0],
-      'no-jquery/no-each-util': [0],
+      'no-jquery/no-each-util': [2],
       'no-jquery/no-each': [0],
       'no-jquery/no-error-shorthand': [2],
       'no-jquery/no-error': [2],
@@ -331,6 +332,7 @@ export default tseslint.config(
       'no-jquery/no-find-collection': [0],
       'no-jquery/no-find-util': [2],
       'no-jquery/no-find': [0],
+      'no-jquery/no-fx': [2],
       'no-jquery/no-fx-interval': [2],
       'no-jquery/no-global-eval': [2],
       'no-jquery/no-global-selector': [0],
@@ -350,7 +352,7 @@ export default tseslint.config(
       'no-jquery/no-live': [2],
       'no-jquery/no-load-shorthand': [2],
       'no-jquery/no-load': [2],
-      'no-jquery/no-map-collection': [0],
+      'no-jquery/no-map-collection': [2],
       'no-jquery/no-map-util': [2],
       'no-jquery/no-map': [2],
       'no-jquery/no-merge': [2],
@@ -374,12 +376,12 @@ export default tseslint.config(
       'no-jquery/no-selector-prop': [2],
       'no-jquery/no-serialize': [2],
       'no-jquery/no-size': [2],
-      'no-jquery/no-sizzle': [0],
+      'no-jquery/no-sizzle': [2],
       'no-jquery/no-slide': [2],
       'no-jquery/no-sub': [2],
       'no-jquery/no-support': [2],
       'no-jquery/no-text': [0],
-      'no-jquery/no-trigger': [0],
+      'no-jquery/no-trigger': [2],
       'no-jquery/no-trim': [2],
       'no-jquery/no-type': [2],
       'no-jquery/no-unique': [2],
@@ -744,7 +746,6 @@ export default tseslint.config(
       'unicorn/no-array-callback-reference': [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-await-expression-member': [0],
       'unicorn/no-await-in-promise-methods': [2],
@@ -757,7 +758,6 @@ export default tseslint.config(
       'unicorn/no-invalid-fetch-options': [2],
       'unicorn/no-invalid-remove-event-listener': [2],
       'unicorn/no-keyword-prefix': [0],
-      'unicorn/no-length-as-slice-end': [2],
       'unicorn/no-lonely-if': [2],
       'unicorn/no-magic-array-flat-depth': [0],
       'unicorn/no-named-default': [2],
@@ -774,8 +774,11 @@ export default tseslint.config(
       'unicorn/no-thenable': [2],
       'unicorn/no-this-assignment': [2],
       'unicorn/no-typeof-undefined': [2],
+      'unicorn/no-unnecessary-array-flat-depth': [2],
+      'unicorn/no-unnecessary-array-splice-count': [2],
       'unicorn/no-unnecessary-await': [2],
       'unicorn/no-unnecessary-polyfills': [2],
+      'unicorn/no-unnecessary-slice-end': [2],
       'unicorn/no-unreadable-array-destructuring': [0],
       'unicorn/no-unreadable-iife': [2],
       'unicorn/no-unused-properties': [2],
@@ -806,6 +809,7 @@ export default tseslint.config(
       'unicorn/prefer-event-target': [2],
       'unicorn/prefer-export-from': [0],
       'unicorn/prefer-global-this': [0],
+      'unicorn/prefer-import-meta-properties': [2],
       'unicorn/prefer-includes': [2],
       'unicorn/prefer-json-parse-buffer': [0],
       'unicorn/prefer-keyboard-event-key': [2],
@@ -828,6 +832,7 @@ export default tseslint.config(
       'unicorn/prefer-regexp-test': [2],
       'unicorn/prefer-set-has': [0],
       'unicorn/prefer-set-size': [2],
+      'unicorn/prefer-single-call': [2],
       'unicorn/prefer-spread': [0],
       'unicorn/prefer-string-raw': [0],
       'unicorn/prefer-string-replace-all': [0],
diff --git a/flake.lock b/flake.lock
index 90672733d5..dcf7755013 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 9f858541df..01b23258b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,39 +3,20 @@
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
-  outputs = {
-    nixpkgs,
-    flake-utils,
-    ...
-  }:
+  outputs =
+    {
+      nixpkgs,
+      flake-utils,
+      ...
+    }:
     flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         pkgs = nixpkgs.legacyPackages.${system};
-      in {
-        devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            # generic
-            git
-            git-lfs
-            gnumake
-            gnused
-            gnutar
-            gzip
-
-            # frontend
-            nodejs_20
-
-            # linting
-            python312
-            poetry
-
-            # backend
-            gofumpt
-            sqlite
-            go
-            gopls
-          ];
-        };
+      in
+      {
+        devShells.default = import ./shell.nix { inherit pkgs; };
+        formatter = pkgs.nixfmt-rfc-style;
       }
     );
 }
diff --git a/go.mod b/go.mod
index 8a4cfbbc9b..a3f4c13e4e 100644
--- a/go.mod
+++ b/go.mod
@@ -2,32 +2,34 @@ module forgejo.org
 
 go 1.24
 
-toolchain go1.24.1
+toolchain go1.24.6
 
 require (
-	code.forgejo.org/f3/gof3/v3 v3.10.6
+	code.forgejo.org/f3/gof3/v3 v3.11.0
 	code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251
+	code.forgejo.org/forgejo/go-rpmutils v1.0.0
 	code.forgejo.org/forgejo/levelqueue v1.0.0
 	code.forgejo.org/forgejo/reply v1.0.2
-	code.forgejo.org/go-chi/binding v1.0.0
-	code.forgejo.org/go-chi/cache v1.0.0
-	code.forgejo.org/go-chi/captcha v1.0.1
-	code.forgejo.org/go-chi/session v1.0.1
+	code.forgejo.org/forgejo/runner/v9 v9.0.3
+	code.forgejo.org/go-chi/binding v1.0.1
+	code.forgejo.org/go-chi/cache v1.0.1
+	code.forgejo.org/go-chi/captcha v1.0.2
+	code.forgejo.org/go-chi/session v1.0.2
 	code.gitea.io/actions-proto-go v0.4.0
-	code.gitea.io/sdk/gitea v0.20.0
+	code.gitea.io/sdk/gitea v0.21.0
 	codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
-	connectrpc.com/connect v1.17.0
-	github.com/42wim/httpsig v1.2.2
-	github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
+	connectrpc.com/connect v1.18.1
+	github.com/42wim/httpsig v1.2.3
+	github.com/42wim/sshsig v0.0.0-20250502153856-5100632e8920
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
-	github.com/ProtonMail/go-crypto v1.1.6
-	github.com/PuerkitoBio/goquery v1.10.2
+	github.com/ProtonMail/go-crypto v1.3.0
+	github.com/PuerkitoBio/goquery v1.10.3
 	github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2
-	github.com/alecthomas/chroma/v2 v2.15.0
+	github.com/alecthomas/chroma/v2 v2.20.0
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
-	github.com/blevesearch/bleve/v2 v2.4.4
+	github.com/blevesearch/bleve/v2 v2.5.2
 	github.com/buildkite/terminal-to-html/v3 v3.16.8
-	github.com/caddyserver/certmagic v0.22.2
+	github.com/caddyserver/certmagic v0.24.0
 	github.com/chi-middleware/proxy v1.1.1
 	github.com/djherbis/buffer v1.2.0
 	github.com/djherbis/nio/v3 v3.0.1
@@ -36,78 +38,74 @@ require (
 	github.com/editorconfig/editorconfig-core-go/v2 v2.6.3
 	github.com/emersion/go-imap v1.2.1
 	github.com/felixge/fgprof v0.9.5
-	github.com/fsnotify/fsnotify v1.8.0
+	github.com/fsnotify/fsnotify v1.9.0
 	github.com/gliderlabs/ssh v0.3.8
 	github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9
 	github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73
-	github.com/go-chi/chi/v5 v5.2.0
-	github.com/go-chi/cors v1.2.1
+	github.com/go-chi/chi/v5 v5.2.2
+	github.com/go-chi/cors v1.2.2
 	github.com/go-co-op/gocron v1.37.0
 	github.com/go-enry/go-enry/v2 v2.9.2
-	github.com/go-git/go-git/v5 v5.13.2
 	github.com/go-ldap/ldap/v3 v3.4.6
-	github.com/go-openapi/spec v0.20.14
-	github.com/go-sql-driver/mysql v1.9.1
-	github.com/go-webauthn/webauthn v0.12.2
+	github.com/go-openapi/spec v0.21.0
+	github.com/go-sql-driver/mysql v1.9.3
+	github.com/go-webauthn/webauthn v0.13.4
 	github.com/gobwas/glob v0.2.3
 	github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f
 	github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
-	github.com/golang-jwt/jwt/v5 v5.2.2
+	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/google/go-github/v64 v64.0.0
-	github.com/google/pprof v0.0.0-20241017200806-017d972448fc
+	github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/feeds v1.2.0
 	github.com/gorilla/sessions v1.4.0
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/huandu/xstrings v1.5.0
-	github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056
-	github.com/jhillyerd/enmime/v2 v2.1.0
+	github.com/inbucket/html2text v0.9.0
+	github.com/jhillyerd/enmime/v2 v2.2.0
 	github.com/json-iterator/go v1.1.12
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
-	github.com/klauspost/compress v1.17.11
-	github.com/klauspost/cpuid/v2 v2.2.10
+	github.com/klauspost/compress v1.18.0
+	github.com/klauspost/cpuid/v2 v2.2.11
 	github.com/lib/pq v1.10.9
 	github.com/markbates/goth v1.80.0
 	github.com/mattn/go-isatty v0.0.20
-	github.com/mattn/go-sqlite3 v1.14.28
-	github.com/meilisearch/meilisearch-go v0.31.0
-	github.com/mholt/archiver/v3 v3.5.1
+	github.com/mattn/go-sqlite3 v1.14.32
+	github.com/meilisearch/meilisearch-go v0.33.0
+	github.com/mholt/archives v0.1.3
 	github.com/microcosm-cc/bluemonday v1.0.27
-	github.com/minio/minio-go/v7 v7.0.88
-	github.com/msteinert/pam/v2 v2.0.0
-	github.com/nektos/act v0.2.52
-	github.com/niklasfasching/go-org v1.7.0
+	github.com/minio/minio-go/v7 v7.0.95
+	github.com/msteinert/pam/v2 v2.1.0
+	github.com/niklasfasching/go-org v1.9.1
 	github.com/olivere/elastic/v7 v7.0.32
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/pquerna/otp v1.4.0
 	github.com/prometheus/client_golang v1.21.1
-	github.com/redis/go-redis/v9 v9.7.3
+	github.com/redis/go-redis/v9 v9.8.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
-	github.com/sassoftware/go-rpmutils v0.4.0
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
-	github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
+	github.com/sergi/go-diff v1.4.0
 	github.com/stretchr/testify v1.10.0
 	github.com/syndtr/goleveldb v1.0.0
 	github.com/ulikunitz/xz v0.5.12
-	github.com/urfave/cli/v2 v2.27.6
+	github.com/urfave/cli/v3 v3.4.1
 	github.com/valyala/fastjson v1.6.4
 	github.com/yohcop/openid-go v1.0.1
-	github.com/yuin/goldmark v1.7.8
+	github.com/yuin/goldmark v1.7.13
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
-	gitlab.com/gitlab-org/api/client-go v0.126.0
-	go.uber.org/mock v0.5.0
-	golang.org/x/crypto v0.36.0
-	golang.org/x/image v0.25.0
-	golang.org/x/net v0.38.0
-	golang.org/x/oauth2 v0.28.0
-	golang.org/x/sync v0.12.0
-	golang.org/x/sys v0.31.0
-	golang.org/x/text v0.23.0
-	google.golang.org/protobuf v1.36.4
+	gitlab.com/gitlab-org/api/client-go v0.130.1
+	go.uber.org/mock v0.6.0
+	golang.org/x/crypto v0.41.0
+	golang.org/x/image v0.30.0
+	golang.org/x/net v0.43.0
+	golang.org/x/oauth2 v0.30.0
+	golang.org/x/sync v0.16.0
+	golang.org/x/sys v0.35.0
+	golang.org/x/text v0.28.0
+	google.golang.org/protobuf v1.36.7
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -121,96 +119,107 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 // indirect
-	github.com/DataDog/zstd v1.5.5 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/RoaringBitmap/roaring v1.9.3 // indirect
-	github.com/andybalholm/brotli v1.1.1 // indirect
+	github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
+	github.com/STARRY-S/zip v0.2.1 // indirect
+	github.com/andybalholm/brotli v1.1.2-0.20250424173009-453214e765f3 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.13.0 // indirect
-	github.com/blevesearch/bleve_index_api v1.1.12 // indirect
-	github.com/blevesearch/geo v0.1.20 // indirect
-	github.com/blevesearch/go-faiss v1.0.24 // indirect
+	github.com/bits-and-blooms/bitset v1.22.0 // indirect
+	github.com/blevesearch/bleve_index_api v1.2.8 // indirect
+	github.com/blevesearch/geo v0.2.3 // indirect
+	github.com/blevesearch/go-faiss v1.0.25 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
 	github.com/blevesearch/gtreap v0.1.1 // indirect
 	github.com/blevesearch/mmap-go v1.0.4 // indirect
-	github.com/blevesearch/scorch_segment_api/v2 v2.2.16 // indirect
+	github.com/blevesearch/scorch_segment_api/v2 v2.3.10 // indirect
 	github.com/blevesearch/segment v0.9.1 // indirect
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
 	github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect
-	github.com/blevesearch/vellum v1.0.10 // indirect
-	github.com/blevesearch/zapx/v11 v11.3.10 // indirect
-	github.com/blevesearch/zapx/v12 v12.3.10 // indirect
-	github.com/blevesearch/zapx/v13 v13.3.10 // indirect
-	github.com/blevesearch/zapx/v14 v14.3.10 // indirect
-	github.com/blevesearch/zapx/v15 v15.3.16 // indirect
-	github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b // indirect
+	github.com/blevesearch/vellum v1.1.0 // indirect
+	github.com/blevesearch/zapx/v11 v11.4.2 // indirect
+	github.com/blevesearch/zapx/v12 v12.4.2 // indirect
+	github.com/blevesearch/zapx/v13 v13.4.2 // indirect
+	github.com/blevesearch/zapx/v14 v14.4.2 // indirect
+	github.com/blevesearch/zapx/v15 v15.4.2 // indirect
+	github.com/blevesearch/zapx/v16 v16.2.4 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.8.0 // indirect
+	github.com/bodgit/plumbing v1.3.0 // indirect
+	github.com/bodgit/sevenzip v1.6.0 // indirect
+	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/boombuler/barcode v1.0.1 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
 	github.com/caddyserver/zerossl v0.1.3 // indirect
 	github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.3.8 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dlclark/regexp2 v1.11.4 // indirect
+	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fatih/color v1.16.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
 	github.com/go-enry/go-oniguruma v1.2.1 // indirect
 	github.com/go-fed/httpsig v1.1.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/go-git/go-git/v5 v5.16.2 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.20.4 // indirect
-	github.com/go-openapi/swag v0.22.7 // indirect
-	github.com/go-webauthn/x v0.1.20 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
+	github.com/go-webauthn/x v0.1.23 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
-	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	github.com/google/go-tpm v0.9.3 // indirect
+	github.com/google/go-tpm v0.9.5 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/libdns/libdns v0.2.3 // indirect
+	github.com/libdns/libdns v1.0.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/markbates/going v1.0.3 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mholt/acmez/v3 v3.1.1 // indirect
+	github.com/mattn/go-shellwords v1.0.12 // indirect
+	github.com/mholt/acmez/v3 v3.1.2 // indirect
 	github.com/miekg/dns v1.1.63 // indirect
-	github.com/minio/crc64nvme v1.0.1 // indirect
+	github.com/mikelolasagasti/xz v1.0.1 // indirect
+	github.com/minio/crc64nvme v1.0.2 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/minlz v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nwaples/rardecode v1.1.3 // indirect
-	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/nwaples/rardecode/v2 v2.1.0 // indirect
+	github.com/olekukonko/errors v1.1.0 // indirect
+	github.com/olekukonko/ll v0.0.9 // indirect
+	github.com/olekukonko/tablewriter v1.0.7 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
@@ -218,39 +227,33 @@ require (
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/rhysd/actionlint v1.6.27 // indirect
+	github.com/rhysd/actionlint v1.7.7 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/skeema/knownhosts v1.3.0 // indirect
+	github.com/skeema/knownhosts v1.3.1 // indirect
+	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
+	github.com/tinylib/msgp v1.3.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
-	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	github.com/zeebo/assert v1.3.0 // indirect
 	github.com/zeebo/blake3 v0.2.4 // indirect
-	go.etcd.io/bbolt v1.4.0 // indirect
+	go.etcd.io/bbolt v1.4.2 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	go.uber.org/zap/exp v0.3.0 // indirect
-	golang.org/x/mod v0.24.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
-	golang.org/x/tools v0.31.0 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
 
 replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 
-replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
-
-replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.25.1
-
 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1
 
 replace github.com/gliderlabs/ssh => code.forgejo.org/forgejo/ssh v0.0.0-20241211213324-5fc306ca0616
diff --git a/go.sum b/go.sum
index aa81c2cbb7..de016df77d 100644
--- a/go.sum
+++ b/go.sum
@@ -1,77 +1,95 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
 cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
-code.forgejo.org/f3/gof3/v3 v3.10.6 h1:Ru/Iz+pqM8IPi7atUHE7+q7v3O3DRbYgMFqrFTsO1m8=
-code.forgejo.org/f3/gof3/v3 v3.10.6/go.mod h1:K6lQCWQIyN/5rjP/OJL9fMA6fd++satndE20w/I6Kss=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+code.forgejo.org/f3/gof3/v3 v3.11.0 h1:f/xToKwqTgxG6PYxvewywjDQyCcyHEEJ6sZqUitFsAE=
+code.forgejo.org/f3/gof3/v3 v3.11.0/go.mod h1:4FaRUNSQGBiD1M0DuB0yNv+Z2wMtlOeckgygHSSq4KQ=
 code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251 h1:HTZl3CBk3ABNYtFI6TPLvJgGKFIhKT5CBk0sbOtkDKU=
 code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:PphB88CPbx601QrWPMZATeorACeVmQlyv3u+uUMbSaM=
-code.forgejo.org/forgejo/act v1.25.1 h1:T0CsN9iEWIyJzIbmMHMM9pl1KHzmI41q8mtepqVqdCc=
-code.forgejo.org/forgejo/act v1.25.1/go.mod h1:tSg5CAHnXp4WLNkMa2e9AEDSujMxKzNM4bF2pvvRCYQ=
-code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEjb3jaYYtmSE=
-code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
+code.forgejo.org/forgejo/go-rpmutils v1.0.0 h1:RZGGeKt70p/WaIEL97pyT6uiiEIoN8/aLmS5Z6WmX0M=
+code.forgejo.org/forgejo/go-rpmutils v1.0.0/go.mod h1:cg+VbgLXfrDPza9T+kBsMb3TVmmzPN4XseT6gDGLSUk=
 code.forgejo.org/forgejo/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:RArF5AsF9LH4nEoJxqRxcP5r8hhRfWcId84G82YbqzA=
 code.forgejo.org/forgejo/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
 code.forgejo.org/forgejo/levelqueue v1.0.0 h1:9krYpU6BM+j/1Ntj6m+VCAIu0UNnne1/UfU/XgPpLuE=
 code.forgejo.org/forgejo/levelqueue v1.0.0/go.mod h1:fmG6zhVuqim2rxSFOoasgXO8V2W/k9U31VVYqLIRLhQ=
 code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCdgFuQ=
 code.forgejo.org/forgejo/reply v1.0.2/go.mod h1:RyZUfzQLc+fuLIGjTSQWDAJWPiL4WtKXB/FifT5fM7U=
+code.forgejo.org/forgejo/runner/v9 v9.0.3 h1:BijUSIuPCDNKE3xfq7Ilj0JvK/IcFmP8oarg9dX/QPE=
+code.forgejo.org/forgejo/runner/v9 v9.0.3/go.mod h1:0/xEl3Fndpb7g28/4xmmInsugp2V6sXBePJuERPT+S8=
 code.forgejo.org/forgejo/ssh v0.0.0-20241211213324-5fc306ca0616 h1:kEZL84+02jY9RxXM4zHBWZ3Fml0B09cmP1LGkDsCfIA=
 code.forgejo.org/forgejo/ssh v0.0.0-20241211213324-5fc306ca0616/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8=
-code.forgejo.org/go-chi/binding v1.0.0 h1:EIDJtk9brK7WsT7rvS/D4cxX8XlnhY3LMy8ex1jeHu0=
-code.forgejo.org/go-chi/binding v1.0.0/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
-code.forgejo.org/go-chi/cache v1.0.0 h1:akLfGxNlHcacmtutovNtYFSTMsbdcp5MGjAEsP4pxnE=
-code.forgejo.org/go-chi/cache v1.0.0/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
-code.forgejo.org/go-chi/captcha v1.0.1 h1:/oe1fvGOpdyyeGijg3oMYNOYLvEovNvp79Y3gLe3qbk=
-code.forgejo.org/go-chi/captcha v1.0.1/go.mod h1:6EbjSVVa7WoZFENgwK/hLAJZq+HBXtgRsjnIngILC8Y=
-code.forgejo.org/go-chi/session v1.0.1 h1:RNkcJQZJBqlvJoIFXSth87b3kMFZLDBA18VcitD+Z0Y=
-code.forgejo.org/go-chi/session v1.0.1/go.mod h1:y69sjS984wc7k4xyu77yNE5HKeSlBoQW8VSGdsK7RAs=
+code.forgejo.org/go-chi/binding v1.0.1 h1:coKNI+X1NzRN7X85LlrpvBRqk0TXpJ+ja28vusQWEuY=
+code.forgejo.org/go-chi/binding v1.0.1/go.mod h1:oTFFDg/dkwFbmVuusiULB1OlrIJM95cOGK7Nc3GYcoo=
+code.forgejo.org/go-chi/cache v1.0.1 h1:w6IsDcPbeEnEYZn7M2HJe3/3/Ehtcw/72VjcVK7+lBw=
+code.forgejo.org/go-chi/cache v1.0.1/go.mod h1:K3aQSyRIN4xiuqV1kanfQ6O4ToDpzDpY3bNOyGjFe3U=
+code.forgejo.org/go-chi/captcha v1.0.2 h1:vyHDPXkpjDv8bLO9NqtWzZayzstD/WpJ5xwEkAaqZGQ=
+code.forgejo.org/go-chi/captcha v1.0.2/go.mod h1:lxiPLcJ76UCZHoH31/Wbum4GUi2NgjfFZLrJkKv1lLE=
+code.forgejo.org/go-chi/session v1.0.2 h1:pG+AXre9L9VXJmTaADXkmeEPuRalhmBXyv6tG2Rvjcc=
+code.forgejo.org/go-chi/session v1.0.2/go.mod h1:HnEGyBny7WPzCiVLP2vzL5ssma+3gCSl/vLpuVNYrqc=
 code.gitea.io/actions-proto-go v0.4.0 h1:OsPBPhodXuQnsspG1sQ4eRE1PeoZyofd7+i73zCwnsU=
 code.gitea.io/actions-proto-go v0.4.0/go.mod h1:mn7Wkqz6JbnTOHQpot3yDeHx+O5C9EGhMEE+htvHBas=
-code.gitea.io/sdk/gitea v0.20.0 h1:Zm/QDwwZK1awoM4AxdjeAQbxolzx2rIP8dDfmKu+KoU=
-code.gitea.io/sdk/gitea v0.20.0/go.mod h1:faouBHC/zyx5wLgjmRKR62ydyvMzwWf3QnU0bH7Cw6U=
+code.gitea.io/sdk/gitea v0.21.0 h1:69n6oz6kEVHRo1+APQQyizkhrZrLsTLXey9142pfkD4=
+code.gitea.io/sdk/gitea v0.21.0/go.mod h1:tnBjVhuKJCn8ibdyyhvUyxrR1Ca2KHEoTWoukNhXQPA=
 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 h1:TXbikPqa7YRtfU9vS6QJBg77pUvbEb6StRdZO8t1bEY=
 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsijsd8q1isWX8MACefDEgTQslQ4stk2AeeTt3kM=
-connectrpc.com/connect v1.17.0 h1:W0ZqMhtVzn9Zhn2yATuUokDLO5N+gIuBWMOnsQrfmZk=
-connectrpc.com/connect v1.17.0/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
+connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw=
+connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
-github.com/42wim/httpsig v1.2.2 h1:ofAYoHUNs/MJOLqQ8hIxeyz2QxOz8qdSVvp3PX/oPgA=
-github.com/42wim/httpsig v1.2.2/go.mod h1:P/UYo7ytNBFwc+dg35IubuAUIs8zj5zzFIgUCEl55WY=
-github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121 h1:r3qt8PCHnfjOv9PN3H+XXKmDA1dfFMIN1AislhlA/ps=
-github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121/go.mod h1:Ock8XgA7pvULhIaHGAk/cDnRfNrF9Jey81nPcc403iU=
+github.com/42wim/httpsig v1.2.3 h1:xb0YyWhkYj57SPtfSttIobJUPJZB9as1nsfo7KWVcEs=
+github.com/42wim/httpsig v1.2.3/go.mod h1:nZq9OlYKDrUBhptd77IHx4/sZZD+IxTBADvAPI9G/EM=
+github.com/42wim/sshsig v0.0.0-20250502153856-5100632e8920 h1:mWAVGlovzUfREJBhm0GwJnDNu21yRrL9QH9NIzAU3rg=
+github.com/42wim/sshsig v0.0.0-20250502153856-5100632e8920/go.mod h1:zWxcT7BIWOe05xVJL0VMvO/PJ6RpoCux10heb77H6Q8=
 github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U=
 github.com/6543/go-version v1.3.1/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ=
-github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
-github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
-github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8=
-github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU=
-github.com/RoaringBitmap/roaring v1.9.3 h1:t4EbC5qQwnisr5PrP9nt0IRhRTb9gMUgQF4t4S2OByM=
-github.com/RoaringBitmap/roaring v1.9.3/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
+github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
+github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
+github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
+github.com/RoaringBitmap/roaring/v2 v2.4.5 h1:uGrrMreGjvAtTBobc0g5IrW1D5ldxDQYe2JW2gggRdg=
+github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0=
+github.com/STARRY-S/zip v0.2.1 h1:pWBd4tuSGm3wtpoqRZZ2EAwOmcHK6XFf7bU9qcJXyFg=
+github.com/STARRY-S/zip v0.2.1/go.mod h1:xNvshLODWtC4EJ702g7cTYn13G53o1+X9BWnPFpcWV4=
 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 h1:cSXom2MoKJ9KPPw29RoZtHvUETY4F4n/kXl8m9btnQ0=
 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2/go.mod h1:JitQWJ8JuV4Y87l8VsHiiwhb3cgdyn68mX40s7NT6PA=
 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.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc=
-github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
+github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
+github.com/alecthomas/chroma/v2 v2.20.0/go.mod h1:e7tViK0xh/Nf4BYHl00ycY6rV7b8iXBksI9E359yNmA=
 github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
+github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 h1:Kk6a4nehpJ3UuJRqlA3JxYxBZEqCeOmATOvrbT4p9RA=
 github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
-github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
-github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
+github.com/andybalholm/brotli v1.1.2-0.20250424173009-453214e765f3 h1:8PmGpDEZl9yDpcdEr6Odf23feCxK3LNUNMxjXg41pZQ=
+github.com/andybalholm/brotli v1.1.2-0.20250424173009-453214e765f3/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
@@ -83,61 +101,70 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
-github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
-github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4=
+github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb h1:m935MPodAbYS46DG4pJSv7WO+VECIWUQ7OJYSoTrMh4=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
-github.com/blevesearch/bleve/v2 v2.4.4 h1:RwwLGjUm54SwyyykbrZs4vc1qjzYic4ZnAnY9TwNl60=
-github.com/blevesearch/bleve/v2 v2.4.4/go.mod h1:fa2Eo6DP7JR+dMFpQe+WiZXINKSunh7WBtlDGbolKXk=
-github.com/blevesearch/bleve_index_api v1.1.12 h1:P4bw9/G/5rulOF7SJ9l4FsDoo7UFJ+5kexNy1RXfegY=
-github.com/blevesearch/bleve_index_api v1.1.12/go.mod h1:PbcwjIcRmjhGbkS/lJCpfgVSMROV6TRubGGAODaK1W8=
-github.com/blevesearch/geo v0.1.20 h1:paaSpu2Ewh/tn5DKn/FB5SzvH0EWupxHEIwbCk/QPqM=
-github.com/blevesearch/geo v0.1.20/go.mod h1:DVG2QjwHNMFmjo+ZgzrIq2sfCh6rIHzy9d9d0B59I6w=
-github.com/blevesearch/go-faiss v1.0.24 h1:K79IvKjoKHdi7FdiXEsAhxpMuns0x4fM0BO93bW5jLI=
-github.com/blevesearch/go-faiss v1.0.24/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
+github.com/blevesearch/bleve/v2 v2.5.2 h1:Ab0r0MODV2C5A6BEL87GqLBySqp/s9xFgceCju6BQk8=
+github.com/blevesearch/bleve/v2 v2.5.2/go.mod h1:5Dj6dUQxZM6aqYT3eutTD/GpWKGFSsV8f7LDidFbwXo=
+github.com/blevesearch/bleve_index_api v1.2.8 h1:Y98Pu5/MdlkRyLM0qDHostYo7i+Vv1cDNhqTeR4Sy6Y=
+github.com/blevesearch/bleve_index_api v1.2.8/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0=
+github.com/blevesearch/geo v0.2.3 h1:K9/vbGI9ehlXdxjxDRJtoAMt7zGAsMIzc6n8zWcwnhg=
+github.com/blevesearch/geo v0.2.3/go.mod h1:K56Q33AzXt2YExVHGObtmRSFYZKYGv0JEN5mdacJJR8=
+github.com/blevesearch/go-faiss v1.0.25 h1:lel1rkOUGbT1CJ0YgzKwC7k+XH0XVBHnCVWahdCXk4U=
+github.com/blevesearch/go-faiss v1.0.25/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
 github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo=
 github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M=
 github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y=
 github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk=
 github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
 github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
-github.com/blevesearch/scorch_segment_api/v2 v2.2.16 h1:uGvKVvG7zvSxCwcm4/ehBa9cCEuZVE+/zvrSl57QUVY=
-github.com/blevesearch/scorch_segment_api/v2 v2.2.16/go.mod h1:VF5oHVbIFTu+znY1v30GjSpT5+9YFs9dV2hjvuh34F0=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.10 h1:Yqk0XD1mE0fDZAJXTjawJ8If/85JxnLd8v5vG/jWE/s=
+github.com/blevesearch/scorch_segment_api/v2 v2.3.10/go.mod h1:Z3e6ChN3qyN35yaQpl00MfI5s8AxUJbpTR/DL8QOQ+8=
 github.com/blevesearch/segment v0.9.1 h1:+dThDy+Lvgj5JMxhmOVlgFfkUtZV2kw49xax4+jTfSU=
 github.com/blevesearch/segment v0.9.1/go.mod h1:zN21iLm7+GnBHWTao9I+Au/7MBiL8pPFtJBJTsk6kQw=
 github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s=
 github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs=
 github.com/blevesearch/upsidedown_store_api v1.0.2 h1:U53Q6YoWEARVLd1OYNc9kvhBMGZzVrdmaozG2MfoB+A=
 github.com/blevesearch/upsidedown_store_api v1.0.2/go.mod h1:M01mh3Gpfy56Ps/UXHjEO/knbqyQ1Oamg8If49gRwrQ=
-github.com/blevesearch/vellum v1.0.10 h1:HGPJDT2bTva12hrHepVT3rOyIKFFF4t7Gf6yMxyMIPI=
-github.com/blevesearch/vellum v1.0.10/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k=
-github.com/blevesearch/zapx/v11 v11.3.10 h1:hvjgj9tZ9DeIqBCxKhi70TtSZYMdcFn7gDb71Xo/fvk=
-github.com/blevesearch/zapx/v11 v11.3.10/go.mod h1:0+gW+FaE48fNxoVtMY5ugtNHHof/PxCqh7CnhYdnMzQ=
-github.com/blevesearch/zapx/v12 v12.3.10 h1:yHfj3vXLSYmmsBleJFROXuO08mS3L1qDCdDK81jDl8s=
-github.com/blevesearch/zapx/v12 v12.3.10/go.mod h1:0yeZg6JhaGxITlsS5co73aqPtM04+ycnI6D1v0mhbCs=
-github.com/blevesearch/zapx/v13 v13.3.10 h1:0KY9tuxg06rXxOZHg3DwPJBjniSlqEgVpxIqMGahDE8=
-github.com/blevesearch/zapx/v13 v13.3.10/go.mod h1:w2wjSDQ/WBVeEIvP0fvMJZAzDwqwIEzVPnCPrz93yAk=
-github.com/blevesearch/zapx/v14 v14.3.10 h1:SG6xlsL+W6YjhX5N3aEiL/2tcWh3DO75Bnz77pSwwKU=
-github.com/blevesearch/zapx/v14 v14.3.10/go.mod h1:qqyuR0u230jN1yMmE4FIAuCxmahRQEOehF78m6oTgns=
-github.com/blevesearch/zapx/v15 v15.3.16 h1:Ct3rv7FUJPfPk99TI/OofdC+Kpb4IdyfdMH48sb+FmE=
-github.com/blevesearch/zapx/v15 v15.3.16/go.mod h1:Turk/TNRKj9es7ZpKK95PS7f6D44Y7fAFy8F4LXQtGg=
-github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b h1:ju9Az5YgrzCeK3M1QwvZIpxYhChkXp7/L0RhDYsxXoE=
-github.com/blevesearch/zapx/v16 v16.1.9-0.20241217210638-a0519e7caf3b/go.mod h1:BlrYNpOu4BvVRslmIG+rLtKhmjIaRhIbG8sb9scGTwI=
+github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
+github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
+github.com/blevesearch/zapx/v11 v11.4.2 h1:l46SV+b0gFN+Rw3wUI1YdMWdSAVhskYuvxlcgpQFljs=
+github.com/blevesearch/zapx/v11 v11.4.2/go.mod h1:4gdeyy9oGa/lLa6D34R9daXNUvfMPZqUYjPwiLmekwc=
+github.com/blevesearch/zapx/v12 v12.4.2 h1:fzRbhllQmEMUuAQ7zBuMvKRlcPA5ESTgWlDEoB9uQNE=
+github.com/blevesearch/zapx/v12 v12.4.2/go.mod h1:TdFmr7afSz1hFh/SIBCCZvcLfzYvievIH6aEISCte58=
+github.com/blevesearch/zapx/v13 v13.4.2 h1:46PIZCO/ZuKZYgxI8Y7lOJqX3Irkc3N8W82QTK3MVks=
+github.com/blevesearch/zapx/v13 v13.4.2/go.mod h1:knK8z2NdQHlb5ot/uj8wuvOq5PhDGjNYQQy0QDnopZk=
+github.com/blevesearch/zapx/v14 v14.4.2 h1:2SGHakVKd+TrtEqpfeq8X+So5PShQ5nW6GNxT7fWYz0=
+github.com/blevesearch/zapx/v14 v14.4.2/go.mod h1:rz0XNb/OZSMjNorufDGSpFpjoFKhXmppH9Hi7a877D8=
+github.com/blevesearch/zapx/v15 v15.4.2 h1:sWxpDE0QQOTjyxYbAVjt3+0ieu8NCE0fDRaFxEsp31k=
+github.com/blevesearch/zapx/v15 v15.4.2/go.mod h1:1pssev/59FsuWcgSnTa0OeEpOzmhtmr/0/11H0Z8+Nw=
+github.com/blevesearch/zapx/v16 v16.2.4 h1:tGgfvleXTAkwsD5mEzgM3zCS/7pgocTCnO1oyAUjlww=
+github.com/blevesearch/zapx/v16 v16.2.4/go.mod h1:Rti/REtuuMmzwsI8/C/qIzRaEoSK/wiFYw5e5ctUKKs=
+github.com/bmatcuk/doublestar/v4 v4.8.0 h1:DSXtrypQddoug1459viM9X9D3dp1Z7993fw36I2kNcQ=
+github.com/bmatcuk/doublestar/v4 v4.8.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bodgit/plumbing v1.3.0 h1:pf9Itz1JOQgn7vEOE7v7nlEfBykYqvUYioC61TwWCFU=
+github.com/bodgit/plumbing v1.3.0/go.mod h1:JOTb4XiRu5xfnmdnDJo6GmSbSbtSyufrsyZFByMtKEs=
+github.com/bodgit/sevenzip v1.6.0 h1:a4R0Wu6/P1o1pP/3VV++aEOcyeBxeO/xE2Y9NSTrr6A=
+github.com/bodgit/sevenzip v1.6.0/go.mod h1:zOBh9nJUof7tcrlqJFv1koWRrhz3LbDbUNngkuZxLMc=
+github.com/bodgit/windows v1.0.1 h1:tF7K6KOluPYygXa3Z2594zxlkbKPAOvqr97etrGNIz4=
+github.com/bodgit/windows v1.0.1/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
 github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 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.22.2 h1:qzZURXlrxwR5m25/jpvVeEyJHeJJMvAwe5zlMufOTQk=
-github.com/caddyserver/certmagic v0.22.2/go.mod h1:hbqE7BnkjhX5IJiFslPmrSeobSeZvI6ux8tyxhsd6qs=
+github.com/caddyserver/certmagic v0.24.0 h1:EfXTWpxHAUKgDfOj6MHImJN8Jm4AMFfMT6ITuKhrDF0=
+github.com/caddyserver/certmagic v0.24.0/go.mod h1:xPT7dC1DuHHnS2yuEQCEyks+b89sUkMENh8dJF+InLE=
 github.com/caddyserver/zerossl v0.1.3 h1:onS+pxp3M8HnHpN5MMbOMyNjmTheJyWRaZYwn+YTAyA=
 github.com/caddyserver/zerossl v0.1.3/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a h1:MISbI8sU/PSK/ztvmWKFcI7UGb5/HQT7B+i3a2myKgI=
 github.com/cention-sany/utf7 v0.0.0-20170124080048-26cad61bd60a/go.mod h1:2GxOXOlEPAMFPfp014mK1SWq8G8BN8o7/dfYqJrVGn8=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -147,16 +174,18 @@ github.com/chi-middleware/proxy v1.1.1/go.mod h1:jQwMEJct2tz9VmtCELxvnXoMfa+SOdi
 github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
 github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
 github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
-github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
-github.com/cloudflare/circl v1.3.8/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
-github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
-github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
-github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
+github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -173,9 +202,8 @@ github.com/djherbis/nio/v3 v3.0.1/go.mod h1:Ng4h80pbZFMla1yKzm61cF0tqqilXZYrogmW
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 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=
@@ -183,8 +211,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/editorconfig/editorconfig-core-go/v2 v2.6.3 h1:XVUp6qW3BIkmM3/1EkrHpa6bL56APOynfXcZEmIgOhs=
 github.com/editorconfig/editorconfig-core-go/v2 v2.6.3/go.mod h1:ThHVc+hqbUsmE1wmK/MASpQEhCleWu1JDJDNhUOMy0c=
-github.com/elazarl/goproxy v1.4.0 h1:4GyuSbFa+s26+3rmYNSuUVsx+HgPrV1bk1jXI0l9wjM=
-github.com/elazarl/goproxy v1.4.0/go.mod h1:X/5W/t+gzDyLfHW4DrMdpjqYjpXsURlBt9lpBDxZZZQ=
+github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
+github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
 github.com/emersion/go-imap v1.2.1 h1:+s9ZjMEjOB8NzZMVTM3cCenz2JrQIGGo5j1df19WjTA=
 github.com/emersion/go-imap v1.2.1/go.mod h1:Qlx1FSx2FTxjnjWpIlVNEuX+ylerZQNFE5NsmKFSejY=
 github.com/emersion/go-message v0.15.0/go.mod h1:wQUEfE+38+7EW8p8aZ96ptg6bAb1iwdgej19uXASlE4=
@@ -194,18 +222,20 @@ github.com/emersion/go-sasl v0.0.0-20231106173351-e73c9f7bad43/go.mod h1:iL2twTe
 github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
-github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
-github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/fgprof v0.9.5 h1:8+vR6yu2vvSKn08urWyEuxx75NWPEvybbkBirEpsbVY=
 github.com/felixge/fgprof v0.9.5/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
-github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
+github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9 h1:j2TrkUG/NATGi/EQS+MvEoF79CxiRUmT16ErFroNcKI=
 github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9/go.mod h1:cJ9Ye0ZNSMN7RzZDBRY3E+8M3Bpf/R1JX22Ir9yX6WI=
 github.com/go-ap/errors v0.0.0-20231003111023-183eef4b31b7 h1:I2nuhyVI/48VXoRCCZR2hYBgnSXa+EuDJf/VyX06TC0=
@@ -215,10 +245,10 @@ github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73/go.mod h1:jyveZeGw5La
 github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
 github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
-github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
+github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE=
+github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
 github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
 github.com/go-enry/go-enry/v2 v2.9.2 h1:giOQAtCgBX08kosrX818DCQJTCNtKwoPBGu0qb6nKTY=
@@ -233,29 +263,31 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
 github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.13.2 h1:7O7xvsK7K+rZPKW6AQR1YyNhfywkv7B8/FsP3ki6Zv0=
-github.com/go-git/go-git/v5 v5.13.2/go.mod h1:hWdW5P4YZRjmpGHwRH2v3zkWcNl6HeXaXQEMGb3NJ9A=
+github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM=
+github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
 github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
-github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
-github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
-github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
-github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
-github.com/go-openapi/spec v0.20.14 h1:7CBlRnw+mtjFGlPDRZmAMnq35cRzI91xj03HVyUi/Do=
-github.com/go-openapi/spec v0.20.14/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
-github.com/go-openapi/swag v0.22.7 h1:JWrc1uc/P9cSomxfnsFSVWoE1FW6bNbrVPmpQYpCcR8=
-github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
-github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI=
-github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/go-openapi/jsonpointer v0.21.1 h1:whnzv/pNXtK2FbX/W9yJfRmE2gsmkfahjMKB0fZvcic=
+github.com/go-openapi/jsonpointer v0.21.1/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
+github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
+github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
+github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/go-webauthn/webauthn v0.12.2 h1:yLaNPgBUEXDQtWnOjhsGhMMCEWbXwjg/aNkC8riJQI8=
-github.com/go-webauthn/webauthn v0.12.2/go.mod h1:Q8SZPPj4sZ469fNTcQXxRpzJOdb30jQrn/36FX8jilA=
-github.com/go-webauthn/x v0.1.20 h1:brEBDqfiPtNNCdS/peu8gARtq8fIPsHz0VzpPjGvgiw=
-github.com/go-webauthn/x v0.1.20/go.mod h1:n/gAc8ssZJGATM0qThE+W+vfgXiMedsWi3wf/C4lld0=
+github.com/go-webauthn/webauthn v0.13.4 h1:q68qusWPcqHbg9STSxBLBHnsKaLxNO0RnVKaAqMuAuQ=
+github.com/go-webauthn/webauthn v0.13.4/go.mod h1:MglN6OH9ECxvhDqoq1wMoF6P6JRYDiQpC9nc5OomQmI=
+github.com/go-webauthn/x v0.1.23 h1:9lEO0s+g8iTyz5Vszlg/rXTGrx3CjcD0RZQ1GPZCaxI=
+github.com/go-webauthn/x v0.1.23/go.mod h1:AJd3hI7NfEp/4fI6T4CHD753u91l510lglU7/NMN6+E=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
@@ -267,17 +299,26 @@ github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7w
 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
 github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0=
 github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85/go.mod h1:fR6z1Ie6rtF7kl/vBYMfgD5/G5B1blui7z426/sj2DU=
-github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
-github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -287,11 +328,13 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -304,18 +347,25 @@ github.com/google/go-github/v64 v64.0.0 h1:4G61sozmY3eiPAjjoOHponXDBONm+utovTKby
 github.com/google/go-github/v64 v64.0.0/go.mod h1:xB3vqMQNdHzilXBiO2I+M7iEFtHf+DP/omBOv6tQzVo=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
-github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc=
-github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
+github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU=
+github.com/google/go-tpm v0.9.5/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
-github.com/google/pprof v0.0.0-20241017200806-017d972448fc h1:NGyrhhFhwvRAZg02jnYVg3GBQy0qGBKmFQJwaPmpmxs=
-github.com/google/pprof v0.0.0-20241017200806-017d972448fc/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ=
+github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
@@ -330,12 +380,19 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
 github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
@@ -343,30 +400,32 @@ github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSo
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
-github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA=
-github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
+github.com/inbucket/html2text v0.9.0 h1:ULJmVcBEMAcmLE+/rN815KG1Fx6+a4HhbUxiDiN+qks=
+github.com/inbucket/html2text v0.9.0/go.mod h1:QDaumzl+/OzlSVbNohhmg+yAy5pKjUjzCKW2BMvztKE=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jhillyerd/enmime/v2 v2.1.0 h1:c8Qwi5Xq5EdtMN6byQWoZ/8I2RMTo6OJ7Xay+s1oPO0=
-github.com/jhillyerd/enmime/v2 v2.1.0/go.mod h1:EJ74dcRbBcqHSP2TBu08XRoy6y3Yx0cevwb1YkGMEmQ=
+github.com/jhillyerd/enmime/v2 v2.2.0 h1:Pe35MB96eZK5Q0XjlvPftOgWypQpd1gcbfJKAt7rsB8=
+github.com/jhillyerd/enmime/v2 v2.2.0/go.mod h1:SOBXlCemjhiV2DvHhAKnJiWrtJGS/Ffuw4Iy7NjBTaI=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
-github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU=
+github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
 github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -383,10 +442,8 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libdns/libdns v0.2.3 h1:ba30K4ObwMGB/QTmqUxf3H4/GmUrCAIkMWejeGl12v8=
-github.com/libdns/libdns v0.2.3/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
-github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0 h1:F/3FfGmKdiKFa8kL3YrpZ7pe9H4l4AzA1pbaOUnRvPI=
-github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0/go.mod h1:JEfTc3+2DF9Z4PXhLLvXL42zexJyh8rIq3OzUj/0rAk=
+github.com/libdns/libdns v1.0.0 h1:IvYaz07JNz6jUQ4h/fv2R4sVnRnm77J/aOuC9B+TQTA=
+github.com/libdns/libdns v1.0.0/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
@@ -394,30 +451,36 @@ github.com/markbates/going v1.0.3 h1:mY45T5TvW+Xz5A6jY7lf4+NLg9D8+iuStIHyR7M8qsE
 github.com/markbates/going v1.0.3/go.mod h1:fQiT6v6yQar9UD6bd/D4Z5Afbk9J6BBVBtLiyY4gp2o=
 github.com/markbates/goth v1.80.0 h1:NnvatczZDzOs1hn9Ug+dVYf2Viwwkp/ZDX5K+GLjan8=
 github.com/markbates/goth v1.80.0/go.mod h1:4/GYHo+W6NWisrMPZnq0Yr2Q70UntNLn7KXEFhrIdAY=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
-github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/meilisearch/meilisearch-go v0.31.0 h1:yZRhY1qJqdH8h6GFZALGtkDLyj8f9v5aJpsNMyrUmnY=
-github.com/meilisearch/meilisearch-go v0.31.0/go.mod h1:aNtyuwurDg/ggxQIcKqWH6G9g2ptc8GyY7PLY4zMn/g=
-github.com/mholt/acmez/v3 v3.1.1 h1:Jh+9uKHkPxUJdxM16q5mOr+G2V0aqkuFtNA28ihCxhQ=
-github.com/mholt/acmez/v3 v3.1.1/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
+github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
+github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
+github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/meilisearch/meilisearch-go v0.33.0 h1:vDJtB5Ba5X0XaDmrazDiX89QEpi3zuee5Lvt7FJu7Q0=
+github.com/meilisearch/meilisearch-go v0.33.0/go.mod h1:dY4nxhVc0Ext8Kn7u2YohJCsEjirg80DdcOmfNezUYg=
+github.com/mholt/acmez/v3 v3.1.2 h1:auob8J/0FhmdClQicvJvuDavgd5ezwLBfKuYmynhYzc=
+github.com/mholt/acmez/v3 v3.1.2/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
+github.com/mholt/archives v0.1.3 h1:aEAaOtNra78G+TvV5ohmXrJOAzf++dIlYeDW3N9q458=
+github.com/mholt/archives v0.1.3/go.mod h1:LUCGp++/IbV/I0Xq4SzcIR6uwgeh2yjnQWamjRQfLTU=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
 github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
-github.com/minio/crc64nvme v1.0.1 h1:DHQPrYPdqK7jQG/Ls5CTBZWeex/2FMS3G5XGkycuFrY=
-github.com/minio/crc64nvme v1.0.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/mikelolasagasti/xz v1.0.1 h1:Q2F2jX0RYJUG3+WsM+FJknv+6eVjsjXNDV0KJXZzkD0=
+github.com/mikelolasagasti/xz v1.0.1/go.mod h1:muAirjiOUxPRXwm9HdDtB3uoRPrGnL85XHtokL9Hcgc=
+github.com/minio/crc64nvme v1.0.2 h1:6uO1UxGAD+kwqWWp7mBFsi5gAse66C4NXO8cmcVculg=
+github.com/minio/crc64nvme v1.0.2/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.88 h1:v8MoIJjwYxOkehp+eiLIuvXk87P2raUtoU5klrAAshs=
-github.com/minio/minio-go/v7 v7.0.88/go.mod h1:33+O8h0tO7pCeCWwBVa07RhVVfB/3vS4kEX7rwYKmIg=
+github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU=
+github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo=
+github.com/minio/minlz v1.0.0 h1:Kj7aJZ1//LlTP1DM8Jm7lNKvvJS2m74gyyXXn3+uJWQ=
+github.com/minio/minlz v1.0.0/go.mod h1:qT0aEB35q79LLornSzeDH75LBf3aH1MV+jB5w9Wasec=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -429,20 +492,23 @@ github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUll
 github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM=
 github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
 github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
-github.com/msteinert/pam/v2 v2.0.0 h1:jnObb8MT6jvMbmrUQO5J/puTUjxy7Av+55zVJRJsCyE=
-github.com/msteinert/pam/v2 v2.0.0/go.mod h1:KT28NNIcDFf3PcBmNI2mIGO4zZJ+9RSs/At2PB3IDVc=
+github.com/msteinert/pam/v2 v2.1.0 h1:er5F9TKV5nGFuTt12ubtqPHEUdeBwReP7vd3wovidGY=
+github.com/msteinert/pam/v2 v2.1.0/go.mod h1:KT28NNIcDFf3PcBmNI2mIGO4zZJ+9RSs/At2PB3IDVc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/niklasfasching/go-org v1.7.0 h1:vyMdcMWWTe/XmANk19F4k8XGBYg0GQ/gJGMimOjGMek=
-github.com/niklasfasching/go-org v1.7.0/go.mod h1:WuVm4d45oePiE0eX25GqTDQIt/qPW1T9DGkRscqLW5o=
-github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
-github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
-github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
+github.com/niklasfasching/go-org v1.9.1 h1:/3s4uTPOF06pImGa2Yvlp24yKXZoTYM+nsIlMzfpg/0=
+github.com/niklasfasching/go-org v1.9.1/go.mod h1:ZAGFFkWvUQcpazmi/8nHqwvARpr1xpb+Es67oUGX/48=
+github.com/nwaples/rardecode/v2 v2.1.0 h1:JQl9ZoBPDy+nIZGb1mx8+anfHp/LV3NE2MjMiv0ct/U=
+github.com/nwaples/rardecode/v2 v2.1.0/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/olekukonko/errors v1.1.0 h1:RNuGIh15QdDenh+hNvKrJkmxxjV4hcS50Db478Ou5sM=
+github.com/olekukonko/errors v1.1.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.0.9 h1:Y+1YqDfVkqMWuEQMclsF9HUR5+a82+dxJuL1HHSRpxI=
+github.com/olekukonko/ll v0.0.9/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
+github.com/olekukonko/tablewriter v1.0.7 h1:HCC2e3MM+2g72M81ZcJU11uciw6z/p82aEnm4/ySDGw=
+github.com/olekukonko/tablewriter v1.0.7/go.mod h1:H428M+HzoUXC6JU2Abj9IT9ooRmdq9CxuDmKMtrOCMs=
 github.com/olivere/elastic/v7 v7.0.32 h1:R7CXvbu8Eq+WlsLgxmKVKPox0oOwAE/2T9Si5BnvK6E=
 github.com/olivere/elastic/v7 v7.0.32/go.mod h1:c7PVmLe3Fxq77PIfY/bZmxY/TAamBhCzZ8xDOE09a9k=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -460,7 +526,8 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
-github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
+github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
 github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
@@ -475,45 +542,44 @@ github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg=
 github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
 github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
 github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
-github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
+github.com/redis/go-redis/v9 v9.8.0 h1:q3nRvjrlge/6UD7eTu/DSg2uYiU2mCL0G/uzBWqhicI=
+github.com/redis/go-redis/v9 v9.8.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rhysd/actionlint v1.6.27 h1:xxwe8YmveBcC8lydW6GoHMGmB6H/MTqUU60F2p10wjw=
-github.com/rhysd/actionlint v1.6.27/go.mod h1:m2nFUjAnOrxCMXuOMz9evYBRCLUsMnKY2IJl/N5umbk=
+github.com/rhysd/actionlint v1.7.7 h1:0KgkoNTrYY7vmOCs9BW2AHxLvvpoY9nEUzgBHiPUr0k=
+github.com/rhysd/actionlint v1.7.7/go.mod h1:AE6I6vJEkNaIfWqC2GNE5spIJNhxf8NCtLEKU4NnUXg=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
+github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw=
-github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
-github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=
-github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
+github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
-github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs=
-github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1qZoYLZzLnBw+QkPP9WZnjlSWihhxAJC1+/M=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
-github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
+github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
+github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
+github.com/sorairolake/lzip-go v0.3.5 h1:ms5Xri9o1JBIWvOFAorYtUNik6HI3HgBTkISiqu0Cwg=
+github.com/sorairolake/lzip-go v0.3.5/go.mod h1:N0KYq5iWrMXI0ZEXKXaS9hCyOjZUQdBDEIbXfoUwbdk=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo=
 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod h1:RJID2RhlZKId02nZ62WenDCkgHFerpIOmW0iT7GKmXM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -532,22 +598,19 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
+github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
-github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
+github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM=
+github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
-github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
-github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yohcop/openid-go v1.0.1 h1:DPRd3iPO5F6O5zX2e62XpVAbPT6wV51cuucH0z9g3js=
@@ -555,8 +618,8 @@ github.com/yohcop/openid-go v1.0.1/go.mod h1:b/AvD03P0KHj4yuihb+VtLD6bYYgsy0zqBz
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
-github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA=
+github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
@@ -565,24 +628,32 @@ github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
 github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
-gitlab.com/gitlab-org/api/client-go v0.126.0 h1:VV5TdkF6pMbEdFGvbR2CwEgJwg6qdg1u3bj5eD2tiWk=
-gitlab.com/gitlab-org/api/client-go v0.126.0/go.mod h1:bYC6fPORKSmtuPRyD9Z2rtbAjE7UeNatu2VWHRf4/LE=
-go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
-go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
+gitlab.com/gitlab-org/api/client-go v0.130.1 h1:1xF5C5Zq3sFeNg3PzS2z63oqrxifne3n/OnbI7nptRc=
+gitlab.com/gitlab-org/api/client-go v0.130.1/go.mod h1:ZhSxLAWadqP6J9lMh40IAZOlOxBLPRh7yFOXR/bMJWM=
+go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
+go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
+go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
-go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
+go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
 go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
+go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
+go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
@@ -592,23 +663,59 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
-golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
-golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.30.0 h1:jD5RhkmVAnjqaCUXfbGBrn3lpxbknfN9w2UhHHU+5B4=
+golang.org/x/image v0.30.0/go.mod h1:SAEUTxCCMWSrJcCy/4HwavEsfZZJlYxeHLc6tTiAe/c=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -621,12 +728,21 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
-golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -634,15 +750,25 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -654,7 +780,6 @@ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -662,8 +787,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -673,9 +798,12 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -685,31 +813,88 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
-golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
-google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
+google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -734,8 +919,14 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
 lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
@@ -758,6 +949,9 @@ modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8=
 mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE=
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo=
 xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/xorm v1.3.9 h1:TUovzS0ko+IQ1XnNLfs5dqK1cJl1H5uHpWbWqAQ04nU=
diff --git a/main.go b/main.go
index 3f0283db7f..ade43881cf 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ import (
 	_ "forgejo.org/modules/markup/markdown"
 	_ "forgejo.org/modules/markup/orgmode"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // these flags will be set by the build flags
diff --git a/manifest.scm b/manifest.scm
new file mode 100644
index 0000000000..f9605bc2d9
--- /dev/null
+++ b/manifest.scm
@@ -0,0 +1,38 @@
+;;; Copyright 2025 The Forgejo Authors. All rights reserved.
+;;; SPDX-License-Identifier: MIT
+;;;
+;;; Commentary:
+;;;
+;;; This is a GNU Guix manifest that can be used to create a
+;;; development environment to build and test Forgejo.
+;;;
+;;; The following is a usage example to create a containerized
+;;; environment, with HOME shared for the Go cache and the network
+;;; made available to fetch required Go and Node dependencies.
+;;;
+#|
+guix shell -CNF --share=$HOME -m manifest.scm
+export GOTOOLCHAIN=local     # to use the Go binary from Guix
+export CC=gcc CGO_ENABLED=1
+export TAGS="timetzdata sqlite sqlite_unlock_notify"
+make clean
+make -j$(nproc)
+make test -j$(nproc)         # run unit tests
+make test-sqlite -j$(nproc)  # run integration tests
+make watch                   # run an instance/rebuild on changes
+|#
+(specifications->manifest
+ (list "bash-minimal"
+       "coreutils"
+       "findutils"
+       "gcc-toolchain"
+       "git"                            ;libpcre support is required
+       "git-lfs"
+       "gnupg"
+       "go"
+       "grep"
+       "make"
+       "node"
+       "nss-certs"
+       "openssh"
+       "sed"))
diff --git a/models/actions/artifact.go b/models/actions/artifact.go
index 10cd3868a1..95c4bead8f 100644
--- a/models/actions/artifact.go
+++ b/models/actions/artifact.go
@@ -132,6 +132,13 @@ func (opts FindArtifactsOptions) ToConds() builder.Cond {
 	return cond
 }
 
+var _ db.FindOptionsOrder = FindArtifactsOptions{}
+
+// ToOrders implements db.FindOptionsOrder, to have a stable order
+func (opts FindArtifactsOptions) ToOrders() string {
+	return "id"
+}
+
 // ActionArtifactMeta is the meta data of an artifact
 type ActionArtifactMeta struct {
 	ArtifactName string
diff --git a/models/actions/forgejo_test.go b/models/actions/forgejo_test.go
index fc4ccfa628..5702068c1b 100644
--- a/models/actions/forgejo_test.go
+++ b/models/actions/forgejo_test.go
@@ -24,9 +24,9 @@ func TestActions_RegisterRunner_Token(t *testing.T) {
 	version := "v1.2.3"
 	runner, err := RegisterRunner(db.DefaultContext, ownerID, repoID, token, &labels, name, version)
 	require.NoError(t, err)
-	assert.EqualValues(t, name, runner.Name)
+	assert.Equal(t, name, runner.Name)
 
-	assert.EqualValues(t, 1, subtle.ConstantTimeCompare([]byte(runner.TokenHash), []byte(auth_model.HashToken(token, runner.TokenSalt))), "the token cannot be verified with the same method as routers/api/actions/runner/interceptor.go as of 8228751c55d6a4263f0fec2932ca16181c09c97d")
+	assert.Equal(t, 1, subtle.ConstantTimeCompare([]byte(runner.TokenHash), []byte(auth_model.HashToken(token, runner.TokenSalt))), "the token cannot be verified with the same method as routers/api/actions/runner/interceptor.go as of 8228751c55d6a4263f0fec2932ca16181c09c97d")
 }
 
 // TestActions_RegisterRunner_TokenUpdate tests that a token's secret is updated
@@ -73,19 +73,19 @@ func TestActions_RegisterRunner_CreateWithLabels(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check that the returned record has been updated, except for the labels
-	assert.EqualValues(t, ownerID, runner.OwnerID)
-	assert.EqualValues(t, repoID, runner.RepoID)
-	assert.EqualValues(t, name, runner.Name)
-	assert.EqualValues(t, version, runner.Version)
-	assert.EqualValues(t, labelsCopy, runner.AgentLabels)
+	assert.Equal(t, ownerID, runner.OwnerID)
+	assert.Equal(t, repoID, runner.RepoID)
+	assert.Equal(t, name, runner.Name)
+	assert.Equal(t, version, runner.Version)
+	assert.Equal(t, labelsCopy, runner.AgentLabels)
 
 	// Check that whatever is in the DB has been updated, except for the labels
 	after := unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: runner.ID})
-	assert.EqualValues(t, ownerID, after.OwnerID)
-	assert.EqualValues(t, repoID, after.RepoID)
-	assert.EqualValues(t, name, after.Name)
-	assert.EqualValues(t, version, after.Version)
-	assert.EqualValues(t, labelsCopy, after.AgentLabels)
+	assert.Equal(t, ownerID, after.OwnerID)
+	assert.Equal(t, repoID, after.RepoID)
+	assert.Equal(t, name, after.Name)
+	assert.Equal(t, version, after.Version)
+	assert.Equal(t, labelsCopy, after.AgentLabels)
 }
 
 func TestActions_RegisterRunner_CreateWithoutLabels(t *testing.T) {
@@ -100,19 +100,19 @@ func TestActions_RegisterRunner_CreateWithoutLabels(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check that the returned record has been updated, except for the labels
-	assert.EqualValues(t, ownerID, runner.OwnerID)
-	assert.EqualValues(t, repoID, runner.RepoID)
-	assert.EqualValues(t, name, runner.Name)
-	assert.EqualValues(t, version, runner.Version)
-	assert.EqualValues(t, []string{}, runner.AgentLabels)
+	assert.Equal(t, ownerID, runner.OwnerID)
+	assert.Equal(t, repoID, runner.RepoID)
+	assert.Equal(t, name, runner.Name)
+	assert.Equal(t, version, runner.Version)
+	assert.Equal(t, []string{}, runner.AgentLabels)
 
 	// Check that whatever is in the DB has been updated, except for the labels
 	after := unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: runner.ID})
-	assert.EqualValues(t, ownerID, after.OwnerID)
-	assert.EqualValues(t, repoID, after.RepoID)
-	assert.EqualValues(t, name, after.Name)
-	assert.EqualValues(t, version, after.Version)
-	assert.EqualValues(t, []string{}, after.AgentLabels)
+	assert.Equal(t, ownerID, after.OwnerID)
+	assert.Equal(t, repoID, after.RepoID)
+	assert.Equal(t, name, after.Name)
+	assert.Equal(t, version, after.Version)
+	assert.Equal(t, []string{}, after.AgentLabels)
 }
 
 func TestActions_RegisterRunner_UpdateWithLabels(t *testing.T) {
@@ -132,19 +132,19 @@ func TestActions_RegisterRunner_UpdateWithLabels(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check that the returned record has been updated
-	assert.EqualValues(t, newOwnerID, runner.OwnerID)
-	assert.EqualValues(t, newRepoID, runner.RepoID)
-	assert.EqualValues(t, newName, runner.Name)
-	assert.EqualValues(t, newVersion, runner.Version)
-	assert.EqualValues(t, labelsCopy, runner.AgentLabels)
+	assert.Equal(t, newOwnerID, runner.OwnerID)
+	assert.Equal(t, newRepoID, runner.RepoID)
+	assert.Equal(t, newName, runner.Name)
+	assert.Equal(t, newVersion, runner.Version)
+	assert.Equal(t, labelsCopy, runner.AgentLabels)
 
 	// Check that whatever is in the DB has been updated
 	after := unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: recordID})
-	assert.EqualValues(t, newOwnerID, after.OwnerID)
-	assert.EqualValues(t, newRepoID, after.RepoID)
-	assert.EqualValues(t, newName, after.Name)
-	assert.EqualValues(t, newVersion, after.Version)
-	assert.EqualValues(t, labelsCopy, after.AgentLabels)
+	assert.Equal(t, newOwnerID, after.OwnerID)
+	assert.Equal(t, newRepoID, after.RepoID)
+	assert.Equal(t, newName, after.Name)
+	assert.Equal(t, newVersion, after.Version)
+	assert.Equal(t, labelsCopy, after.AgentLabels)
 }
 
 func TestActions_RegisterRunner_UpdateWithoutLabels(t *testing.T) {
@@ -162,17 +162,17 @@ func TestActions_RegisterRunner_UpdateWithoutLabels(t *testing.T) {
 	require.NoError(t, err)
 
 	// Check that the returned record has been updated, except for the labels
-	assert.EqualValues(t, newOwnerID, runner.OwnerID)
-	assert.EqualValues(t, newRepoID, runner.RepoID)
-	assert.EqualValues(t, newName, runner.Name)
-	assert.EqualValues(t, newVersion, runner.Version)
-	assert.EqualValues(t, before.AgentLabels, runner.AgentLabels)
+	assert.Equal(t, newOwnerID, runner.OwnerID)
+	assert.Equal(t, newRepoID, runner.RepoID)
+	assert.Equal(t, newName, runner.Name)
+	assert.Equal(t, newVersion, runner.Version)
+	assert.Equal(t, before.AgentLabels, runner.AgentLabels)
 
 	// Check that whatever is in the DB has been updated, except for the labels
 	after := unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: recordID})
-	assert.EqualValues(t, newOwnerID, after.OwnerID)
-	assert.EqualValues(t, newRepoID, after.RepoID)
-	assert.EqualValues(t, newName, after.Name)
-	assert.EqualValues(t, newVersion, after.Version)
-	assert.EqualValues(t, before.AgentLabels, after.AgentLabels)
+	assert.Equal(t, newOwnerID, after.OwnerID)
+	assert.Equal(t, newRepoID, after.RepoID)
+	assert.Equal(t, newName, after.Name)
+	assert.Equal(t, newVersion, after.Version)
+	assert.Equal(t, before.AgentLabels, after.AgentLabels)
 }
diff --git a/models/actions/main_test.go b/models/actions/main_test.go
index 27916f29ac..2eb923d9d0 100644
--- a/models/actions/main_test.go
+++ b/models/actions/main_test.go
@@ -13,6 +13,7 @@ func TestMain(m *testing.M) {
 	unittest.MainTest(m, &unittest.TestOptions{
 		FixtureFiles: []string{
 			"action_runner.yml",
+			"repository.yml",
 			"action_runner_token.yml",
 		},
 	})
diff --git a/models/actions/run.go b/models/actions/run.go
index 671177a892..6e0c70f8cf 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -5,6 +5,7 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"slices"
 	"strings"
@@ -20,7 +21,7 @@ import (
 	"forgejo.org/modules/util"
 	webhook_module "forgejo.org/modules/webhook"
 
-	"github.com/nektos/act/pkg/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
 	"xorm.io/builder"
 )
 
@@ -54,6 +55,7 @@ type ActionRun struct {
 	PreviousDuration time.Duration
 	Created          timeutil.TimeStamp `xorm:"created"`
 	Updated          timeutil.TimeStamp `xorm:"updated"`
+	NotifyEmail      bool
 }
 
 func init() {
@@ -185,77 +187,9 @@ func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) err
 	return err
 }
 
-// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event.
-// It's useful when a new run is triggered, and all previous runs needn't be continued anymore.
-func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) error {
-	// Find all runs in the specified repository, reference, and workflow with non-final status
-	runs, total, err := db.FindAndCount[ActionRun](ctx, FindRunOptions{
-		RepoID:       repoID,
-		Ref:          ref,
-		WorkflowID:   workflowID,
-		TriggerEvent: event,
-		Status:       []Status{StatusRunning, StatusWaiting, StatusBlocked},
-	})
-	if err != nil {
-		return err
-	}
-
-	// If there are no runs found, there's no need to proceed with cancellation, so return nil.
-	if total == 0 {
-		return nil
-	}
-
-	// Iterate over each found run and cancel its associated jobs.
-	for _, run := range runs {
-		// Find all jobs associated with the current run.
-		jobs, err := db.Find[ActionRunJob](ctx, FindRunJobOptions{
-			RunID: run.ID,
-		})
-		if err != nil {
-			return err
-		}
-
-		// Iterate over each job and attempt to cancel it.
-		for _, job := range jobs {
-			// Skip jobs that are already in a terminal state (completed, cancelled, etc.).
-			status := job.Status
-			if status.IsDone() {
-				continue
-			}
-
-			// If the job has no associated task (probably an error), set its status to 'Cancelled' and stop it.
-			if job.TaskID == 0 {
-				job.Status = StatusCancelled
-				job.Stopped = timeutil.TimeStampNow()
-
-				// Update the job's status and stopped time in the database.
-				n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped")
-				if err != nil {
-					return err
-				}
-
-				// If the update affected 0 rows, it means the job has changed in the meantime, so we need to try again.
-				if n == 0 {
-					return fmt.Errorf("job has changed, try again")
-				}
-
-				// Continue with the next job.
-				continue
-			}
-
-			// If the job has an associated task, try to stop the task, effectively cancelling the job.
-			if err := StopTask(ctx, job.TaskID, StatusCancelled); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Return nil to indicate successful cancellation of all running and waiting jobs.
-	return nil
-}
-
 // InsertRun inserts a run
 // The title will be cut off at 255 characters if it's longer than 255 characters.
+// We don't have to send the ActionRunNowDone notification here because there are no runs that start in a not done status.
 func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWorkflow) error {
 	ctx, commiter, err := db.TxContext(ctx)
 	if err != nil {
@@ -290,29 +224,38 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork
 	var hasWaiting bool
 	for _, v := range jobs {
 		id, job := v.Job()
-		needs := job.Needs()
-		if err := v.SetJob(id, job.EraseNeeds()); err != nil {
-			return err
+		status := StatusFailure
+		payload := []byte{}
+		needs := []string{}
+		name := run.Title
+		runsOn := []string{}
+		if job != nil {
+			needs = job.Needs()
+			if err := v.SetJob(id, job.EraseNeeds()); err != nil {
+				return err
+			}
+			payload, _ = v.Marshal()
+
+			if len(needs) > 0 || run.NeedApproval {
+				status = StatusBlocked
+			} else {
+				status = StatusWaiting
+				hasWaiting = true
+			}
+			name, _ = util.SplitStringAtByteN(job.Name, 255)
+			runsOn = job.RunsOn()
 		}
-		payload, _ := v.Marshal()
-		status := StatusWaiting
-		if len(needs) > 0 || run.NeedApproval {
-			status = StatusBlocked
-		} else {
-			hasWaiting = true
-		}
-		job.Name, _ = util.SplitStringAtByteN(job.Name, 255)
 		runJobs = append(runJobs, &ActionRunJob{
 			RunID:             run.ID,
 			RepoID:            run.RepoID,
 			OwnerID:           run.OwnerID,
 			CommitSHA:         run.CommitSHA,
 			IsForkPullRequest: run.IsForkPullRequest,
-			Name:              job.Name,
+			Name:              name,
 			WorkflowPayload:   payload,
 			JobID:             id,
 			Needs:             needs,
-			RunsOn:            job.RunsOn(),
+			RunsOn:            runsOn,
 			Status:            status,
 		})
 	}
@@ -341,6 +284,12 @@ func GetLatestRun(ctx context.Context, repoID int64) (*ActionRun, error) {
 	return &run, nil
 }
 
+func GetRunBefore(ctx context.Context, _ *ActionRun) (*ActionRun, error) {
+	// TODO return the most recent run related to the run given in argument
+	// see https://codeberg.org/forgejo/user-research/issues/63 for context
+	return nil, nil
+}
+
 func GetLatestRunForBranchAndWorkflow(ctx context.Context, repoID int64, branch, workflowFile, event string) (*ActionRun, error) {
 	var run ActionRun
 	q := db.GetEngine(ctx).Where("repo_id=?", repoID).And("workflow_id=?", workflowFile)
@@ -389,7 +338,9 @@ func GetRunByIndex(ctx context.Context, repoID, index int64) (*ActionRun, error)
 // UpdateRun updates a run.
 // It requires the inputted run has Version set.
 // It will return error if the version is not matched (it means the run has been changed after loaded).
-func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
+// All calls to UpdateRunWithoutNotification that change run.Status from a not done status to a done status must call the ActionRunNowDone notification channel.
+// Use the wrapper function UpdateRun instead.
+func UpdateRunWithoutNotification(ctx context.Context, run *ActionRun, cols ...string) error {
 	sess := db.GetEngine(ctx).ID(run.ID)
 	if len(cols) > 0 {
 		sess.Cols(cols...)
@@ -400,7 +351,7 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 		return err
 	}
 	if affected == 0 {
-		return fmt.Errorf("run has changed")
+		return errors.New("run has changed")
 		// It's impossible that the run is not found, since Gitea never deletes runs.
 	}
 
diff --git a/models/actions/run_job.go b/models/actions/run_job.go
index fffbb6670b..1fadb4b7c7 100644
--- a/models/actions/run_job.go
+++ b/models/actions/run_job.go
@@ -101,7 +101,9 @@ func GetRunJobsByRunID(ctx context.Context, runID int64) ([]*ActionRunJob, error
 	return jobs, nil
 }
 
-func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, cols ...string) (int64, error) {
+// All calls to UpdateRunJobWithoutNotification that change run.Status for any run from a not done status to a done status must call the ActionRunNowDone notification channel.
+// Use the wrapper function UpdateRunJob instead.
+func UpdateRunJobWithoutNotification(ctx context.Context, job *ActionRunJob, cond builder.Cond, cols ...string) (int64, error) {
 	e := db.GetEngine(ctx)
 
 	sess := e.ID(job.ID)
@@ -154,7 +156,8 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col
 		if run.Stopped.IsZero() && run.Status.IsDone() {
 			run.Stopped = timeutil.TimeStampNow()
 		}
-		if err := UpdateRun(ctx, run, "status", "started", "stopped"); err != nil {
+		// As the caller has to ensure the ActionRunNowDone notification is sent we can ignore doing so here.
+		if err := UpdateRunWithoutNotification(ctx, run, "status", "started", "stopped"); err != nil {
 			return 0, fmt.Errorf("update run %d: %w", run.ID, err)
 		}
 	}
diff --git a/models/actions/run_job_list.go b/models/actions/run_job_list.go
index cbcb4beb8e..afc754f26a 100644
--- a/models/actions/run_job_list.go
+++ b/models/actions/run_job_list.go
@@ -54,6 +54,8 @@ type FindRunJobOptions struct {
 	CommitSHA     string
 	Statuses      []Status
 	UpdatedBefore timeutil.TimeStamp
+	Events        []string // []webhook_module.HookEventType
+	RunNumber     int64
 }
 
 func (opts FindRunJobOptions) ToConds() builder.Cond {
@@ -76,5 +78,11 @@ func (opts FindRunJobOptions) ToConds() builder.Cond {
 	if opts.UpdatedBefore > 0 {
 		cond = cond.And(builder.Lt{"updated": opts.UpdatedBefore})
 	}
+	if len(opts.Events) > 0 {
+		cond = cond.And(builder.In("event", opts.Events))
+	}
+	if opts.RunNumber > 0 {
+		cond = cond.And(builder.Eq{"`index`": opts.RunNumber})
+	}
 	return cond
 }
diff --git a/models/actions/run_test.go b/models/actions/run_test.go
new file mode 100644
index 0000000000..c9a552a2b2
--- /dev/null
+++ b/models/actions/run_test.go
@@ -0,0 +1,11 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package actions
+
+import (
+	"testing"
+)
+
+func TestGetRunBefore(t *testing.T) {
+}
diff --git a/models/actions/runner.go b/models/actions/runner.go
index 99173000fb..bece1ae301 100644
--- a/models/actions/runner.go
+++ b/models/actions/runner.go
@@ -16,6 +16,7 @@ import (
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/shared/types"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/translation"
@@ -87,9 +88,10 @@ func (r *ActionRunner) BelongsToOwnerType() types.OwnerType {
 		return types.OwnerTypeRepository
 	}
 	if r.OwnerID != 0 {
-		if r.Owner.Type == user_model.UserTypeOrganization {
+		switch r.Owner.Type {
+		case user_model.UserTypeOrganization:
 			return types.OwnerTypeOrganization
-		} else if r.Owner.Type == user_model.UserTypeIndividual {
+		case user_model.UserTypeIndividual:
 			return types.OwnerTypeIndividual
 		}
 	}
@@ -167,12 +169,7 @@ func (r *ActionRunner) GenerateToken() (err error) {
 // UpdateSecret updates the hash based on the specified token. It does not
 // ensure that the runner's UUID matches the first 16 bytes of the token.
 func (r *ActionRunner) UpdateSecret(token string) error {
-	saltBytes, err := util.CryptoRandomBytes(16)
-	if err != nil {
-		return fmt.Errorf("CryptoRandomBytes %v", err)
-	}
-
-	salt := hex.EncodeToString(saltBytes)
+	salt := hex.EncodeToString(util.CryptoRandomBytes(16))
 
 	r.Token = token
 	r.TokenSalt = salt
@@ -357,3 +354,53 @@ func FixRunnersWithoutBelongingRepo(ctx context.Context) (int64, error) {
 	}
 	return res.RowsAffected()
 }
+
+func DeleteOfflineRunners(ctx context.Context, olderThan timeutil.TimeStamp, globalOnly bool) error {
+	log.Info("Doing: DeleteOfflineRunners")
+
+	if olderThan.AsTime().After(timeutil.TimeStampNow().AddDuration(-RunnerOfflineTime).AsTime()) {
+		return fmt.Errorf("invalid `cron.cleanup_offline_runners.older_than`value: must be at least %q", RunnerOfflineTime)
+	}
+
+	cond := builder.Or(
+		// never online
+		builder.And(builder.Eq{"last_online": 0}, builder.Lt{"created": olderThan}),
+		// was online but offline
+		builder.And(builder.Gt{"last_online": 0}, builder.Lt{"last_online": olderThan}),
+	)
+
+	if globalOnly {
+		cond = builder.And(cond, builder.Eq{"owner_id": 0}, builder.Eq{"repo_id": 0})
+	}
+
+	if err := db.Iterate(
+		ctx,
+		cond,
+		func(ctx context.Context, r *ActionRunner) error {
+			if err := DeleteRunner(ctx, r); err != nil {
+				return fmt.Errorf("DeleteOfflineRunners: %w", err)
+			}
+			lastOnline := r.LastOnline.AsTime()
+			olderThanTime := olderThan.AsTime()
+			if !lastOnline.IsZero() && lastOnline.Before(olderThanTime) {
+				log.Info(
+					"Deleted runner [ID: %d, Name: %s], last online %s ago",
+					r.ID, r.Name, olderThanTime.Sub(lastOnline).String(),
+				)
+			} else {
+				log.Info(
+					"Deleted runner [ID: %d, Name: %s], unused since %s ago",
+					r.ID, r.Name, olderThanTime.Sub(r.Created.AsTime()).String(),
+				)
+			}
+
+			return nil
+		},
+	); err != nil {
+		return err
+	}
+
+	log.Info("Finished: DeleteOfflineRunners")
+
+	return nil
+}
diff --git a/models/actions/runner_test.go b/models/actions/runner_test.go
index 0623e66046..1916c35a76 100644
--- a/models/actions/runner_test.go
+++ b/models/actions/runner_test.go
@@ -6,10 +6,12 @@ import (
 	"encoding/binary"
 	"fmt"
 	"testing"
+	"time"
 
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	"forgejo.org/models/unittest"
+	"forgejo.org/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -73,3 +75,68 @@ func TestDeleteRunner(t *testing.T) {
 		idAsBinary[6], idAsBinary[7])
 	assert.Equal(t, idAsHexadecimal, after.UUID[19:])
 }
+
+func TestDeleteOfflineRunnersRunnerGlobalOnly(t *testing.T) {
+	baseTime := time.Date(2024, 5, 19, 7, 40, 32, 0, time.UTC)
+	timeutil.MockSet(baseTime)
+	defer timeutil.MockUnset()
+
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	olderThan := timeutil.TimeStampNow().Add(-timeutil.Hour)
+
+	require.NoError(t, DeleteOfflineRunners(db.DefaultContext, olderThan, true))
+
+	// create at test base time
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 12345678})
+	// last_online test base time
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000001})
+	// created one month ago but a repo
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000002})
+	// last online one hour ago
+	unittest.AssertNotExistsBean(t, &ActionRunner{ID: 10000003})
+	// last online 10 seconds ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000004})
+	// created 1 month ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000005})
+	// created 1 hour ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000006})
+	// last online 1 hour ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000007})
+}
+
+func TestDeleteOfflineRunnersAll(t *testing.T) {
+	baseTime := time.Date(2024, 5, 19, 7, 40, 32, 0, time.UTC)
+	timeutil.MockSet(baseTime)
+	defer timeutil.MockUnset()
+
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	olderThan := timeutil.TimeStampNow().Add(-timeutil.Hour)
+
+	require.NoError(t, DeleteOfflineRunners(db.DefaultContext, olderThan, false))
+
+	// create at test base time
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 12345678})
+	// last_online test base time
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000001})
+	// created one month ago
+	unittest.AssertNotExistsBean(t, &ActionRunner{ID: 10000002})
+	// last online one hour ago
+	unittest.AssertNotExistsBean(t, &ActionRunner{ID: 10000003})
+	// last online 10 seconds ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000004})
+	// created 1 month ago
+	unittest.AssertNotExistsBean(t, &ActionRunner{ID: 10000005})
+	// created 1 hour ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000006})
+	// last online 1 hour ago
+	unittest.AssertExistsAndLoadBean(t, &ActionRunner{ID: 10000007})
+}
+
+func TestDeleteOfflineRunnersErrorOnInvalidOlderThanValue(t *testing.T) {
+	baseTime := time.Date(2024, 5, 19, 7, 40, 32, 0, time.UTC)
+	timeutil.MockSet(baseTime)
+	defer timeutil.MockUnset()
+	require.Error(t, DeleteOfflineRunners(db.DefaultContext, timeutil.TimeStampNow(), false))
+}
diff --git a/models/actions/runner_token_test.go b/models/actions/runner_token_test.go
index 65d83a8fd0..0de9ca5648 100644
--- a/models/actions/runner_token_test.go
+++ b/models/actions/runner_token_test.go
@@ -18,7 +18,7 @@ func TestGetLatestRunnerToken(t *testing.T) {
 	token := unittest.AssertExistsAndLoadBean(t, &ActionRunnerToken{ID: 3})
 	expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
 	require.NoError(t, err)
-	assert.EqualValues(t, expectedToken, token)
+	assert.Equal(t, expectedToken, token)
 }
 
 func TestNewRunnerToken(t *testing.T) {
@@ -27,7 +27,7 @@ func TestNewRunnerToken(t *testing.T) {
 	require.NoError(t, err)
 	expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
 	require.NoError(t, err)
-	assert.EqualValues(t, expectedToken, token)
+	assert.Equal(t, expectedToken, token)
 }
 
 func TestUpdateRunnerToken(t *testing.T) {
@@ -37,5 +37,5 @@ func TestUpdateRunnerToken(t *testing.T) {
 	require.NoError(t, UpdateRunnerToken(db.DefaultContext, token))
 	expectedToken, err := GetLatestRunnerToken(db.DefaultContext, 1, 0)
 	require.NoError(t, err)
-	assert.EqualValues(t, expectedToken, token)
+	assert.Equal(t, expectedToken, token)
 }
diff --git a/models/actions/schedule.go b/models/actions/schedule.go
index 633582e017..cc68e9eafc 100644
--- a/models/actions/schedule.go
+++ b/models/actions/schedule.go
@@ -5,7 +5,6 @@ package actions
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"forgejo.org/models/db"
@@ -119,27 +118,6 @@ func DeleteScheduleTaskByRepo(ctx context.Context, id int64) error {
 	return committer.Commit()
 }
 
-func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, cancelPreviousJobs bool) error {
-	// If actions disabled when there is schedule task, this will remove the outdated schedule tasks
-	// There is no other place we can do this because the app.ini will be changed manually
-	if err := DeleteScheduleTaskByRepo(ctx, repo.ID); err != nil {
-		return fmt.Errorf("DeleteCronTaskByRepo: %v", err)
-	}
-	if cancelPreviousJobs {
-		// cancel running cron jobs of this repository and delete old schedules
-		if err := CancelPreviousJobs(
-			ctx,
-			repo.ID,
-			repo.DefaultBranch,
-			"",
-			webhook_module.HookEventSchedule,
-		); err != nil {
-			return fmt.Errorf("CancelPreviousJobs: %v", err)
-		}
-	}
-	return nil
-}
-
 type FindScheduleOptions struct {
 	db.ListOptions
 	RepoID  int64
diff --git a/models/actions/status.go b/models/actions/status.go
index f4357af731..e42c221121 100644
--- a/models/actions/status.go
+++ b/models/actions/status.go
@@ -34,6 +34,15 @@ var statusNames = map[Status]string{
 	StatusBlocked:   "blocked",
 }
 
+var nameToStatus = make(map[string]Status, len(statusNames))
+
+func init() {
+	// Populate name to status lookup map
+	for status, name := range statusNames {
+		nameToStatus[name] = status
+	}
+}
+
 // String returns the string name of the Status
 func (s Status) String() string {
 	return statusNames[s]
@@ -102,3 +111,8 @@ func (s Status) AsResult() runnerv1.Result {
 	}
 	return runnerv1.Result_RESULT_UNSPECIFIED
 }
+
+func StatusFromString(name string) (Status, bool) {
+	status, exists := nameToStatus[name]
+	return status, exists
+}
diff --git a/models/actions/task.go b/models/actions/task.go
index 63cbc6e586..88b30196e3 100644
--- a/models/actions/task.go
+++ b/models/actions/task.go
@@ -17,10 +17,8 @@ import (
 	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/util"
 
-	runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
 	lru "github.com/hashicorp/golang-lru/v2"
-	"github.com/nektos/act/pkg/jobparser"
-	"google.golang.org/protobuf/types/known/timestamppb"
 	"xorm.io/builder"
 )
 
@@ -277,7 +275,7 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
 	}
 
 	var workflowJob *jobparser.Job
-	if gots, err := jobparser.Parse(job.WorkflowPayload); err != nil {
+	if gots, err := jobparser.Parse(job.WorkflowPayload, false); err != nil {
 		return nil, false, fmt.Errorf("parse workflow of job %d: %w", job.ID, err)
 	} else if len(gots) != 1 {
 		return nil, false, fmt.Errorf("workflow of job %d: not single workflow", job.ID)
@@ -313,7 +311,8 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask
 	}
 
 	job.TaskID = task.ID
-	if n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}); err != nil {
+	// We never have to send a notification here because the job is started with a not done status.
+	if n, err := UpdateRunJobWithoutNotification(ctx, job, builder.Eq{"task_id": 0}); err != nil {
 		return nil, false, err
 	} else if n != 1 {
 		return nil, false, nil
@@ -337,140 +336,6 @@ func UpdateTask(ctx context.Context, task *ActionTask, cols ...string) error {
 	return err
 }
 
-// UpdateTaskByState updates the task by the state.
-// It will always update the task if the state is not final, even there is no change.
-// So it will update ActionTask.Updated to avoid the task being judged as a zombie task.
-func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.TaskState) (*ActionTask, error) {
-	stepStates := map[int64]*runnerv1.StepState{}
-	for _, v := range state.Steps {
-		stepStates[v.Id] = v
-	}
-
-	ctx, commiter, err := db.TxContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer commiter.Close()
-
-	e := db.GetEngine(ctx)
-
-	task := &ActionTask{}
-	if has, err := e.ID(state.Id).Get(task); err != nil {
-		return nil, err
-	} else if !has {
-		return nil, util.ErrNotExist
-	} else if runnerID != task.RunnerID {
-		return nil, fmt.Errorf("invalid runner for task")
-	}
-
-	if task.Status.IsDone() {
-		// the state is final, do nothing
-		return task, nil
-	}
-
-	// state.Result is not unspecified means the task is finished
-	if state.Result != runnerv1.Result_RESULT_UNSPECIFIED {
-		task.Status = Status(state.Result)
-		task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix())
-		if err := UpdateTask(ctx, task, "status", "stopped"); err != nil {
-			return nil, err
-		}
-		if _, err := UpdateRunJob(ctx, &ActionRunJob{
-			ID:      task.JobID,
-			Status:  task.Status,
-			Stopped: task.Stopped,
-		}, nil); err != nil {
-			return nil, err
-		}
-	} else {
-		// Force update ActionTask.Updated to avoid the task being judged as a zombie task
-		task.Updated = timeutil.TimeStampNow()
-		if err := UpdateTask(ctx, task, "updated"); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := task.LoadAttributes(ctx); err != nil {
-		return nil, err
-	}
-
-	for _, step := range task.Steps {
-		var result runnerv1.Result
-		if v, ok := stepStates[step.Index]; ok {
-			result = v.Result
-			step.LogIndex = v.LogIndex
-			step.LogLength = v.LogLength
-			step.Started = convertTimestamp(v.StartedAt)
-			step.Stopped = convertTimestamp(v.StoppedAt)
-		}
-		if result != runnerv1.Result_RESULT_UNSPECIFIED {
-			step.Status = Status(result)
-		} else if step.Started != 0 {
-			step.Status = StatusRunning
-		}
-		if _, err := e.ID(step.ID).Update(step); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := commiter.Commit(); err != nil {
-		return nil, err
-	}
-
-	return task, nil
-}
-
-func StopTask(ctx context.Context, taskID int64, status Status) error {
-	if !status.IsDone() {
-		return fmt.Errorf("cannot stop task with status %v", status)
-	}
-	e := db.GetEngine(ctx)
-
-	task := &ActionTask{}
-	if has, err := e.ID(taskID).Get(task); err != nil {
-		return err
-	} else if !has {
-		return util.ErrNotExist
-	}
-	if task.Status.IsDone() {
-		return nil
-	}
-
-	now := timeutil.TimeStampNow()
-	task.Status = status
-	task.Stopped = now
-	if _, err := UpdateRunJob(ctx, &ActionRunJob{
-		ID:      task.JobID,
-		Status:  task.Status,
-		Stopped: task.Stopped,
-	}, nil); err != nil {
-		return err
-	}
-
-	if err := UpdateTask(ctx, task, "status", "stopped"); err != nil {
-		return err
-	}
-
-	if err := task.LoadAttributes(ctx); err != nil {
-		return err
-	}
-
-	for _, step := range task.Steps {
-		if !step.Status.IsDone() {
-			step.Status = status
-			if step.Started == 0 {
-				step.Started = now
-			}
-			step.Stopped = now
-		}
-		if _, err := e.ID(step.ID).Update(step); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, limit int) ([]*ActionTask, error) {
 	e := db.GetEngine(ctx)
 
@@ -481,13 +346,6 @@ func FindOldTasksToExpire(ctx context.Context, olderThan timeutil.TimeStamp, lim
 		Find(&tasks)
 }
 
-func convertTimestamp(timestamp *timestamppb.Timestamp) timeutil.TimeStamp {
-	if timestamp.GetSeconds() == 0 && timestamp.GetNanos() == 0 {
-		return timeutil.TimeStamp(0)
-	}
-	return timeutil.TimeStamp(timestamp.AsTime().Unix())
-}
-
 func logFileName(repoFullName string, taskID int64) string {
 	ret := fmt.Sprintf("%s/%02x/%d.log", repoFullName, taskID%256, taskID)
 
diff --git a/models/actions/utils.go b/models/actions/utils.go
index 7dd3f7ec12..d8e053b0ba 100644
--- a/models/actions/utils.go
+++ b/models/actions/utils.go
@@ -22,11 +22,7 @@ func generateSaltedToken() (string, string, string, string, error) {
 	if err != nil {
 		return "", "", "", "", err
 	}
-	buf, err := util.CryptoRandomBytes(20)
-	if err != nil {
-		return "", "", "", "", err
-	}
-	token := hex.EncodeToString(buf)
+	token := hex.EncodeToString(util.CryptoRandomBytes(20))
 	hash := auth_model.HashToken(token, salt)
 	return token, salt, hash, token[len(token)-8:], nil
 }
diff --git a/models/activities/action.go b/models/activities/action.go
index ef99132e6c..5067109545 100644
--- a/models/activities/action.go
+++ b/models/activities/action.go
@@ -1,11 +1,13 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package activities
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"path"
@@ -24,6 +26,7 @@ import (
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/container"
 	"forgejo.org/modules/git"
+	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/structs"
@@ -247,6 +250,12 @@ func (a *Action) GetActDisplayNameTitle(ctx context.Context) string {
 	return a.GetActFullName(ctx)
 }
 
+// GetRepo returns the repository of the action.
+func (a *Action) GetRepo(ctx context.Context) *repo_model.Repository {
+	a.loadRepo(ctx)
+	return a.Repo
+}
+
 // GetRepoUserName returns the name of the action repository owner.
 func (a *Action) GetRepoUserName(ctx context.Context) string {
 	a.loadRepo(ctx)
@@ -378,8 +387,21 @@ func (a *Action) IsIssueEvent() bool {
 
 // GetIssueInfos returns a list of associated information with the action.
 func (a *Action) GetIssueInfos() []string {
+	// Previously multiple pieces of data used to be encoded into a.Content by pipe-separating them, but this doesn't
+	// work well if some of the user-entered pieces of content (issue titles, comments, etc.) contain pipes.  The newer
+	// storage format is to json-encode a string array, which we check for and prefer... then fallback to assuming old.
+	var ret []string
+	if strings.HasPrefix(a.Content, "[") && strings.HasSuffix(a.Content, "]") {
+		ret = make([]string, 0, 3)
+		err := json.Unmarshal([]byte(a.Content), &ret)
+		if err != nil {
+			log.Error("GetIssueInfos json decoding error: %v", err)
+		}
+	} else {
+		ret = strings.SplitN(a.Content, "|", 3)
+	}
+
 	// make sure it always returns 3 elements, because there are some access to the a[1] and a[2] without checking the length
-	ret := strings.SplitN(a.Content, "|", 3)
 	for len(ret) < 3 {
 		ret = append(ret, "")
 	}
@@ -434,6 +456,12 @@ func (a *Action) GetIssueContent(ctx context.Context) string {
 	return a.Issue.Content
 }
 
+func GetActivityByID(ctx context.Context, id int64) (*Action, error) {
+	var act Action
+	_, err := db.GetEngine(ctx).ID(id).Get(&act)
+	return &act, err
+}
+
 // GetFeedsOptions options for retrieving feeds
 type GetFeedsOptions struct {
 	db.ListOptions
@@ -451,7 +479,7 @@ type GetFeedsOptions struct {
 // GetFeeds returns actions according to the provided options
 func GetFeeds(ctx context.Context, opts GetFeedsOptions) (ActionList, int64, error) {
 	if opts.RequestedUser == nil && opts.RequestedTeam == nil && opts.RequestedRepo == nil {
-		return nil, 0, fmt.Errorf("need at least one of these filters: RequestedUser, RequestedTeam, RequestedRepo")
+		return nil, 0, errors.New("need at least one of these filters: RequestedUser, RequestedTeam, RequestedRepo")
 	}
 
 	cond, err := activityQueryCondition(ctx, opts)
@@ -590,13 +618,14 @@ func DeleteOldActions(ctx context.Context, olderThan time.Duration) (err error)
 }
 
 // NotifyWatchers creates batch of actions for every watcher.
-func NotifyWatchers(ctx context.Context, actions ...*Action) error {
+func NotifyWatchers(ctx context.Context, actions ...*Action) ([]Action, error) {
 	var watchers []*repo_model.Watch
 	var repo *repo_model.Repository
 	var err error
 	var permCode []bool
 	var permIssue []bool
 	var permPR []bool
+	var out []Action
 
 	e := db.GetEngine(ctx)
 
@@ -607,14 +636,14 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
 			// Add feeds for user self and all watchers.
 			watchers, err = repo_model.GetWatchers(ctx, act.RepoID)
 			if err != nil {
-				return fmt.Errorf("get watchers: %w", err)
+				return nil, fmt.Errorf("get watchers: %w", err)
 			}
 
 			// Be aware that optimizing this correctly into the `GetWatchers` SQL
 			// query is for most cases less performant than doing this.
 			blockedDoerUserIDs, err := user_model.ListBlockedByUsersID(ctx, act.ActUserID)
 			if err != nil {
-				return fmt.Errorf("user_model.ListBlockedByUsersID: %w", err)
+				return nil, fmt.Errorf("user_model.ListBlockedByUsersID: %w", err)
 			}
 
 			if len(blockedDoerUserIDs) > 0 {
@@ -629,8 +658,9 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
 		// Add feed for actioner.
 		act.UserID = act.ActUserID
 		if _, err = e.Insert(act); err != nil {
-			return fmt.Errorf("insert new actioner: %w", err)
+			return nil, fmt.Errorf("insert new actioner: %w", err)
 		}
+		out = append(out, *act)
 
 		if repoChanged {
 			act.loadRepo(ctx)
@@ -638,7 +668,7 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
 
 			// check repo owner exist.
 			if err := act.Repo.LoadOwner(ctx); err != nil {
-				return fmt.Errorf("can't get repo owner: %w", err)
+				return nil, fmt.Errorf("can't get repo owner: %w", err)
 			}
 		} else if act.Repo == nil {
 			act.Repo = repo
@@ -649,7 +679,7 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
 			act.ID = 0
 			act.UserID = act.Repo.Owner.ID
 			if err = db.Insert(ctx, act); err != nil {
-				return fmt.Errorf("insert new actioner: %w", err)
+				return nil, fmt.Errorf("insert new actioner: %w", err)
 			}
 		}
 
@@ -702,26 +732,29 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
 			}
 
 			if err = db.Insert(ctx, act); err != nil {
-				return fmt.Errorf("insert new action: %w", err)
+				return nil, fmt.Errorf("insert new action: %w", err)
 			}
 		}
 	}
-	return nil
+	return out, nil
 }
 
 // NotifyWatchersActions creates batch of actions for every watcher.
-func NotifyWatchersActions(ctx context.Context, acts []*Action) error {
+func NotifyWatchersActions(ctx context.Context, acts []*Action) ([]Action, error) {
 	ctx, committer, err := db.TxContext(ctx)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	defer committer.Close()
+	var out []Action
 	for _, act := range acts {
-		if err := NotifyWatchers(ctx, act); err != nil {
-			return err
+		as, err := NotifyWatchers(ctx, act)
+		if err != nil {
+			return nil, err
 		}
+		out = append(out, as...)
 	}
-	return committer.Commit()
+	return out, committer.Commit()
 }
 
 // DeleteIssueActions delete all actions related with issueID
@@ -751,7 +784,9 @@ func DeleteIssueActions(ctx context.Context, repoID, issueID, issueIndex int64)
 
 	_, err := e.Where("repo_id = ?", repoID).
 		In("op_type", ActionCreateIssue, ActionCreatePullRequest).
-		Where("content LIKE ?", strconv.FormatInt(issueIndex, 10)+"|%"). // "IssueIndex|content..."
+		Where(builder.Or(
+			builder.Like{"content", strconv.FormatInt(issueIndex, 10) + "|%"},            // "IssueIndex|content..."
+			builder.Like{"content", "[\"" + strconv.FormatInt(issueIndex, 10) + "\"%"})). // JSON, ["IssueIndex"...
 		Delete(&Action{})
 	return err
 }
diff --git a/models/activities/action_test.go b/models/activities/action_test.go
index ebc40cffa5..6911733a09 100644
--- a/models/activities/action_test.go
+++ b/models/activities/action_test.go
@@ -56,7 +56,7 @@ func TestGetFeeds(t *testing.T) {
 	require.NoError(t, err)
 	if assert.Len(t, actions, 1) {
 		assert.EqualValues(t, 1, actions[0].ID)
-		assert.EqualValues(t, user.ID, actions[0].UserID)
+		assert.Equal(t, user.ID, actions[0].UserID)
 	}
 	assert.Equal(t, int64(1), count)
 
@@ -133,7 +133,7 @@ func TestGetFeeds2(t *testing.T) {
 	assert.Len(t, actions, 1)
 	if assert.Len(t, actions, 1) {
 		assert.EqualValues(t, 2, actions[0].ID)
-		assert.EqualValues(t, org.ID, actions[0].UserID)
+		assert.Equal(t, org.ID, actions[0].UserID)
 	}
 	assert.Equal(t, int64(1), count)
 
@@ -197,7 +197,8 @@ func TestNotifyWatchers(t *testing.T) {
 		RepoID:    1,
 		OpType:    activities_model.ActionStarRepo,
 	}
-	require.NoError(t, activities_model.NotifyWatchers(db.DefaultContext, action))
+	_, err := activities_model.NotifyWatchers(db.DefaultContext, action)
+	require.NoError(t, err)
 
 	// One watchers are inactive, thus action is only created for user 8, 1, 4, 11
 	unittest.AssertExistsAndLoadBean(t, &activities_model.Action{
@@ -291,7 +292,7 @@ func TestDeleteIssueActions(t *testing.T) {
 
 	// load an issue
 	issue := unittest.AssertExistsAndLoadBean(t, &issue_model.Issue{ID: 4})
-	assert.NotEqualValues(t, issue.ID, issue.Index) // it needs to use different ID/Index to test the DeleteIssueActions to delete some actions by IssueIndex
+	assert.NotEqual(t, issue.ID, issue.Index) // it needs to use different ID/Index to test the DeleteIssueActions to delete some actions by IssueIndex
 
 	// insert a comment
 	err := db.Insert(db.DefaultContext, &issue_model.Comment{Type: issue_model.CommentTypeComment, IssueID: issue.ID})
@@ -307,14 +308,69 @@ func TestDeleteIssueActions(t *testing.T) {
 	})
 	require.NoError(t, err)
 	err = db.Insert(db.DefaultContext, &activities_model.Action{
-		OpType:  activities_model.ActionCreateIssue,
-		RepoID:  issue.RepoID,
+		OpType: activities_model.ActionCreateIssue,
+		RepoID: issue.RepoID,
+		// Older Content format...
 		Content: fmt.Sprintf("%d|content...", issue.Index),
 	})
 	require.NoError(t, err)
+	err = db.Insert(db.DefaultContext, &activities_model.Action{
+		OpType: activities_model.ActionCreateIssue,
+		RepoID: issue.RepoID,
+		// JSON-encoded Content format...
+		Content: fmt.Sprintf("[\"%d\",\"content...\"]", issue.Index),
+	})
+	require.NoError(t, err)
 
 	// assert that the actions exist, then delete them
-	unittest.AssertCount(t, &activities_model.Action{}, 2)
+	unittest.AssertCount(t, &activities_model.Action{}, 3)
 	require.NoError(t, activities_model.DeleteIssueActions(db.DefaultContext, issue.RepoID, issue.ID, issue.Index))
 	unittest.AssertCount(t, &activities_model.Action{}, 0)
 }
+
+func TestGetIssueInfos(t *testing.T) {
+	tt := []struct {
+		content string
+		field1  string
+		field2  string
+		field3  string
+	}{
+		{
+			content: "4|",
+			field1:  "4",
+		},
+		{
+			content: "2|docs: Add README w/ template sections",
+			field1:  "2",
+			field2:  "docs: Add README w/ template sections",
+		},
+		{
+			content: "2|docs: Add README w/ template sections|Some comment...",
+			field1:  "2",
+			field2:  "docs: Add README w/ template sections",
+			field3:  "Some comment...",
+		},
+		{
+			content: "[\"4\"]",
+			field1:  "4",
+		},
+		{
+			content: "[\"2\", \"docs: Add README w/ | template sections\"]",
+			field1:  "2",
+			field2:  "docs: Add README w/ | template sections",
+		},
+		{
+			content: "[\"2\", \"docs: Add README w/ | template sections\", \"Some | comment...\"]",
+			field1:  "2",
+			field2:  "docs: Add README w/ | template sections",
+			field3:  "Some | comment...",
+		},
+	}
+	for _, test := range tt {
+		action := &activities_model.Action{Content: test.content}
+		issueInfos := action.GetIssueInfos()
+		assert.Equal(t, test.field1, issueInfos[0])
+		assert.Equal(t, test.field2, issueInfos[1])
+		assert.Equal(t, test.field3, issueInfos[2])
+	}
+}
diff --git a/models/activities/federated_user_activity.go b/models/activities/federated_user_activity.go
new file mode 100644
index 0000000000..1ff3a855d0
--- /dev/null
+++ b/models/activities/federated_user_activity.go
@@ -0,0 +1,106 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package activities
+
+import (
+	"context"
+	"fmt"
+
+	"forgejo.org/models/db"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/timeutil"
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+type FederatedUserActivity struct {
+	ID           int64 `xorm:"pk autoincr"`
+	UserID       int64 `xorm:"NOT NULL"`
+	ActorID      int64
+	ActorURI     string
+	Actor        *user_model.User   `xorm:"-"` // transient
+	NoteContent  string             `xorm:"TEXT"`
+	NoteURL      string             `xorm:"VARCHAR(255)"`
+	OriginalNote string             `xorm:"TEXT"`
+	Created      timeutil.TimeStamp `xorm:"created"`
+}
+
+func init() {
+	db.RegisterModel(new(FederatedUserActivity))
+}
+
+func NewFederatedUserActivity(userID, actorID int64, actorURI, noteContent, noteURL string, originalNote ap.Activity) (FederatedUserActivity, error) {
+	jsonString, err := json.Marshal(originalNote)
+	if err != nil {
+		return FederatedUserActivity{}, err
+	}
+	result := FederatedUserActivity{
+		UserID:       userID,
+		ActorID:      actorID,
+		ActorURI:     actorURI,
+		NoteContent:  noteContent,
+		NoteURL:      noteURL,
+		OriginalNote: string(jsonString),
+	}
+	if valid, err := validation.IsValid(result); !valid {
+		return FederatedUserActivity{}, err
+	}
+	return result, nil
+}
+
+func (federatedUserActivity FederatedUserActivity) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.UserID, "UserID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.ActorID, "ActorID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.ActorURI, "ActorURI")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.NoteContent, "NoteContent")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.NoteURL, "NoteURL")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUserActivity.OriginalNote, "OriginalNote")...)
+	return result
+}
+
+func CreateUserActivity(ctx context.Context, federatedUserActivity *FederatedUserActivity) error {
+	if valid, err := validation.IsValid(federatedUserActivity); !valid {
+		return err
+	}
+	_, err := db.GetEngine(ctx).Insert(federatedUserActivity)
+	return err
+}
+
+type GetFollowingFeedsOptions struct {
+	db.ListOptions
+}
+
+func GetFollowingFeeds(ctx context.Context, actorID int64, opts GetFollowingFeedsOptions) ([]*FederatedUserActivity, int64, error) {
+	log.Debug("user_id = %s", actorID)
+	sess := db.GetEngine(ctx).Where("user_id = ?", actorID)
+	opts.SetDefaultValues()
+	sess = db.SetSessionPagination(sess, &opts)
+
+	actions := make([]*FederatedUserActivity, 0, opts.PageSize)
+	count, err := sess.FindAndCount(&actions)
+	if err != nil {
+		return nil, 0, fmt.Errorf("FindAndCount: %w", err)
+	}
+	for _, act := range actions {
+		if err := act.loadActor(ctx); err != nil {
+			return nil, 0, err
+		}
+	}
+	return actions, count, err
+}
+
+func (federatedUserActivity *FederatedUserActivity) loadActor(ctx context.Context) error {
+	log.Debug("for activity %s", federatedUserActivity)
+	actorUser, _, err := user_model.GetFederatedUserByUserID(ctx, federatedUserActivity.ActorID)
+	if err != nil {
+		return err
+	}
+	federatedUserActivity.Actor = actorUser
+
+	return nil
+}
diff --git a/models/activities/federated_user_activity_test.go b/models/activities/federated_user_activity_test.go
new file mode 100644
index 0000000000..9bf4f77984
--- /dev/null
+++ b/models/activities/federated_user_activity_test.go
@@ -0,0 +1,24 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package activities
+
+import (
+	"testing"
+
+	"forgejo.org/modules/validation"
+)
+
+func Test_FederatedUserActivityValidation(t *testing.T) {
+	sut := FederatedUserActivity{}
+	sut.UserID = 13
+	sut.ActorID = 33
+	sut.ActorURI = "33"
+	sut.NoteContent = "Any content!"
+	sut.NoteURL = "https://example.org/note/17"
+	sut.OriginalNote = "federatedUserActivityNote-17"
+
+	if res, _ := validation.IsValid(sut); !res {
+		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
+	}
+}
diff --git a/models/activities/notification_list.go b/models/activities/notification_list.go
index 9b09dde7ab..9b266f5d96 100644
--- a/models/activities/notification_list.go
+++ b/models/activities/notification_list.go
@@ -107,7 +107,7 @@ func createOrUpdateIssueNotifications(ctx context.Context, issueID, commentID, n
 			return err
 		}
 		toNotify.AddMultiple(issueWatches...)
-		if !(issue.IsPull && issues_model.HasWorkInProgressPrefix(issue.Title)) {
+		if !issue.IsPull || !issues_model.HasWorkInProgressPrefix(issue.Title) {
 			repoWatches, err := repo_model.GetRepoWatchersIDs(ctx, issue.RepoID)
 			if err != nil {
 				return err
diff --git a/models/activities/notification_test.go b/models/activities/notification_test.go
index 305a2ae430..dfce92d491 100644
--- a/models/activities/notification_test.go
+++ b/models/activities/notification_test.go
@@ -45,11 +45,11 @@ func TestNotificationsForUser(t *testing.T) {
 	require.NoError(t, err)
 	if assert.Len(t, notfs, 3) {
 		assert.EqualValues(t, 5, notfs[0].ID)
-		assert.EqualValues(t, user.ID, notfs[0].UserID)
+		assert.Equal(t, user.ID, notfs[0].UserID)
 		assert.EqualValues(t, 4, notfs[1].ID)
-		assert.EqualValues(t, user.ID, notfs[1].UserID)
+		assert.Equal(t, user.ID, notfs[1].UserID)
 		assert.EqualValues(t, 2, notfs[2].ID)
-		assert.EqualValues(t, user.ID, notfs[2].UserID)
+		assert.Equal(t, user.ID, notfs[2].UserID)
 	}
 }
 
@@ -59,7 +59,7 @@ func TestNotification_GetRepo(t *testing.T) {
 	repo, err := notf.GetRepo(db.DefaultContext)
 	require.NoError(t, err)
 	assert.Equal(t, repo, notf.Repository)
-	assert.EqualValues(t, notf.RepoID, repo.ID)
+	assert.Equal(t, notf.RepoID, repo.ID)
 }
 
 func TestNotification_GetIssue(t *testing.T) {
@@ -68,7 +68,7 @@ func TestNotification_GetIssue(t *testing.T) {
 	issue, err := notf.GetIssue(db.DefaultContext)
 	require.NoError(t, err)
 	assert.Equal(t, issue, notf.Issue)
-	assert.EqualValues(t, notf.IssueID, issue.ID)
+	assert.Equal(t, notf.IssueID, issue.ID)
 }
 
 func TestGetNotificationCount(t *testing.T) {
@@ -137,5 +137,5 @@ func TestSetIssueReadBy(t *testing.T) {
 
 	nt, err := activities_model.GetIssueNotification(db.DefaultContext, user.ID, issue.ID)
 	require.NoError(t, err)
-	assert.EqualValues(t, activities_model.NotificationStatusRead, nt.Status)
+	assert.Equal(t, activities_model.NotificationStatusRead, nt.Status)
 }
diff --git a/models/activities/repo_activity_test.go b/models/activities/repo_activity_test.go
index c111c50208..ce930ada2d 100644
--- a/models/activities/repo_activity_test.go
+++ b/models/activities/repo_activity_test.go
@@ -23,8 +23,8 @@ func TestGetActivityStats(t *testing.T) {
 	stats, err := GetActivityStats(db.DefaultContext, repo, time.Unix(0, 0), true, true, true, true)
 	require.NoError(t, err)
 
-	assert.EqualValues(t, 2, stats.ActiveIssueCount())
-	assert.EqualValues(t, 2, stats.OpenedIssueCount())
-	assert.EqualValues(t, 0, stats.ClosedIssueCount())
-	assert.EqualValues(t, 3, stats.ActivePRCount())
+	assert.Equal(t, 2, stats.ActiveIssueCount())
+	assert.Equal(t, 2, stats.OpenedIssueCount())
+	assert.Equal(t, 0, stats.ClosedIssueCount())
+	assert.Equal(t, 3, stats.ActivePRCount())
 }
diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go
index 0cc3f759c6..11badb77e2 100644
--- a/models/activities/user_heatmap.go
+++ b/models/activities/user_heatmap.go
@@ -13,6 +13,12 @@ import (
 	"forgejo.org/modules/timeutil"
 )
 
+const (
+	// contributionsMaxAgeSeconds How old data to retrieve for the heatmap.
+	// 371 days to cover the entire heatmap (53 *full* weeks)
+	contributionsMaxAgeSeconds = 32054400
+)
+
 // UserHeatmapData represents the data needed to create a heatmap
 type UserHeatmapData struct {
 	Timestamp     timeutil.TimeStamp `json:"timestamp"`
@@ -62,7 +68,7 @@ func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organi
 		Select(groupBy+" AS timestamp, count(user_id) as contributions").
 		Table("action").
 		Where(cond).
-		And("created_unix > ?", timeutil.TimeStampNow()-31536000).
+		And("created_unix >= ?", timeutil.TimeStampNow()-contributionsMaxAgeSeconds).
 		GroupBy("timestamp").
 		OrderBy("timestamp").
 		Find(&hdata)
diff --git a/models/activities/user_heatmap_test.go b/models/activities/user_heatmap_test.go
index d922f9a78b..34308cb3d4 100644
--- a/models/activities/user_heatmap_test.go
+++ b/models/activities/user_heatmap_test.go
@@ -54,6 +54,10 @@ func TestGetUserHeatmapDataByUser(t *testing.T) {
 			"multiple actions performed with two grouped together",
 			10, 10, 3, `[{"timestamp":1603009800,"contributions":1},{"timestamp":1603010700,"contributions":2}]`,
 		},
+		{
+			"test cutoff within",
+			40, 40, 1, `[{"timestamp":1577404800,"contributions":1}]`,
+		},
 	}
 	// Prepare
 	require.NoError(t, unittest.PrepareTestDatabase())
diff --git a/models/asymkey/asymkey.go b/models/asymkey/asymkey.go
new file mode 100644
index 0000000000..1f04e8dada
--- /dev/null
+++ b/models/asymkey/asymkey.go
@@ -0,0 +1,29 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package asymkey
+
+import (
+	"context"
+
+	"forgejo.org/models/db"
+)
+
+// HasAsymKeyByUID returns true if the user has a GPG key or SSH key associated
+// with its account.
+func HasAsymKeyByUID(ctx context.Context, userID int64) (bool, error) {
+	hasGPGKey, err := db.Exist[GPGKey](ctx, FindGPGKeyOptions{
+		OwnerID:        userID,
+		IncludeSubKeys: true,
+	}.ToConds())
+	if err != nil {
+		return false, err
+	}
+	if hasGPGKey {
+		return true, nil
+	}
+
+	return db.Exist[PublicKey](ctx, FindPublicKeyOptions{
+		OwnerID:  userID,
+		KeyTypes: []KeyType{KeyTypeUser},
+	}.ToConds())
+}
diff --git a/models/asymkey/asymkey_test.go b/models/asymkey/asymkey_test.go
new file mode 100644
index 0000000000..1eeb593e40
--- /dev/null
+++ b/models/asymkey/asymkey_test.go
@@ -0,0 +1,34 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package asymkey
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUserHasAsymKey(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("No key", func(t *testing.T) {
+		ok, err := HasAsymKeyByUID(t.Context(), 1)
+		require.NoError(t, err)
+		assert.False(t, ok)
+	})
+
+	t.Run("SSH key", func(t *testing.T) {
+		ok, err := HasAsymKeyByUID(t.Context(), 2)
+		require.NoError(t, err)
+		assert.True(t, ok)
+	})
+
+	t.Run("GPG key", func(t *testing.T) {
+		ok, err := HasAsymKeyByUID(t.Context(), 36)
+		require.NoError(t, err)
+		assert.True(t, ok)
+	})
+}
diff --git a/models/asymkey/gpg_key.go b/models/asymkey/gpg_key.go
index b7e10ce85c..64866da076 100644
--- a/models/asymkey/gpg_key.go
+++ b/models/asymkey/gpg_key.go
@@ -5,6 +5,7 @@ package asymkey
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -209,7 +210,7 @@ func parseGPGKey(ctx context.Context, ownerID int64, e *openpgp.Entity, verified
 // deleteGPGKey does the actual key deletion
 func deleteGPGKey(ctx context.Context, keyID string) (int64, error) {
 	if keyID == "" {
-		return 0, fmt.Errorf("empty KeyId forbidden") // Should never happen but just to be sure
+		return 0, errors.New("empty KeyId forbidden") // Should never happen but just to be sure
 	}
 	// Delete imported key
 	n, err := db.GetEngine(ctx).Where("key_id=?", keyID).Delete(new(GPGKeyImport))
diff --git a/models/asymkey/gpg_key_common.go b/models/asymkey/gpg_key_common.go
index db1912c316..5b8a22fe63 100644
--- a/models/asymkey/gpg_key_common.go
+++ b/models/asymkey/gpg_key_common.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"crypto"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"hash"
 	"io"
@@ -75,7 +76,7 @@ func base64DecPubKey(content string) (*packet.PublicKey, error) {
 	// Check type
 	pkey, ok := p.(*packet.PublicKey)
 	if !ok {
-		return nil, fmt.Errorf("key is not a public key")
+		return nil, errors.New("key is not a public key")
 	}
 	return pkey, nil
 }
@@ -122,15 +123,15 @@ func readArmoredSign(r io.Reader) (body io.Reader, err error) {
 func extractSignature(s string) (*packet.Signature, error) {
 	r, err := readArmoredSign(strings.NewReader(s))
 	if err != nil {
-		return nil, fmt.Errorf("Failed to read signature armor")
+		return nil, errors.New("Failed to read signature armor")
 	}
 	p, err := packet.Read(r)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to read signature packet")
+		return nil, errors.New("Failed to read signature packet")
 	}
 	sig, ok := p.(*packet.Signature)
 	if !ok {
-		return nil, fmt.Errorf("Packet is not a signature")
+		return nil, errors.New("Packet is not a signature")
 	}
 	return sig, nil
 }
diff --git a/models/asymkey/gpg_key_object_verification.go b/models/asymkey/gpg_key_object_verification.go
index 407a29c221..745ed04869 100644
--- a/models/asymkey/gpg_key_object_verification.go
+++ b/models/asymkey/gpg_key_object_verification.go
@@ -6,6 +6,7 @@ package asymkey
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"hash"
 	"strings"
@@ -44,6 +45,8 @@ const (
 	BadDefaultSignature = "gpg.error.probable_bad_default_signature"
 	// NoKeyFound is used as the reason when no key can be found to verify the signature.
 	NoKeyFound = "gpg.error.no_gpg_keys_found"
+	// NotSigned is used as the reason when the commit is not signed.
+	NotSigned = "gpg.error.not_signed_commit"
 )
 
 type GitObject struct {
@@ -101,8 +104,8 @@ func ParseObjectWithSignature(ctx context.Context, c *GitObject) *ObjectVerifica
 	if c.Signature == nil {
 		return &ObjectVerification{
 			CommittingUser: committer,
-			Verified:       false,                         // Default value
-			Reason:         "gpg.error.not_signed_commit", // Default value
+			Verified:       false,     // Default value
+			Reason:         NotSigned, // Default value
 		}
 	}
 
@@ -201,7 +204,7 @@ func ParseObjectWithSignature(ctx context.Context, c *GitObject) *ObjectVerifica
 		}
 	}
 
-	if setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" {
+	if setting.Repository.Signing.Format == "openpgp" && setting.Repository.Signing.SigningKey != "" && setting.Repository.Signing.SigningKey != "default" && setting.Repository.Signing.SigningKey != "none" {
 		// OK we should try the default key
 		gpgSettings := git.GPGSettings{
 			Sign:  true,
@@ -314,7 +317,7 @@ func verifyWithGPGSettings(ctx context.Context, gpgSettings *git.GPGSettings, si
 func verifySign(s *packet.Signature, h hash.Hash, k *GPGKey) error {
 	// Check if key can sign
 	if !k.CanSign {
-		return fmt.Errorf("key can not sign")
+		return errors.New("key can not sign")
 	}
 	// Decode key
 	pkey, err := base64DecPubKey(k.Content)
diff --git a/models/asymkey/gpg_key_test.go b/models/asymkey/gpg_key_test.go
index 4db07b84c2..d265f438eb 100644
--- a/models/asymkey/gpg_key_test.go
+++ b/models/asymkey/gpg_key_test.go
@@ -293,7 +293,7 @@ heiQvzkApQup5c+BhH5zFDFdKJ2CBByxw9+7QjMFI/wgLixKuE0Ob2kAokXf7RlB
 	require.NoError(t, err)
 	assert.Len(t, keys, 1)
 	assert.Len(t, keys[0].Emails, 1)
-	assert.EqualValues(t, "no-reply@golang.com", keys[0].Emails[0].Email)
+	assert.Equal(t, "no-reply@golang.com", keys[0].Emails[0].Email)
 
 	primaryKeyID := "D68172F48E9C5283"
 	// Assert primary key
diff --git a/models/asymkey/main_test.go b/models/asymkey/main_test.go
index 316e8f1d54..aa13a93f0a 100644
--- a/models/asymkey/main_test.go
+++ b/models/asymkey/main_test.go
@@ -15,8 +15,6 @@ func TestMain(m *testing.M) {
 			"gpg_key.yml",
 			"public_key.yml",
 			"TestParseCommitWithSSHSignature/public_key.yml",
-			"deploy_key.yml",
-			"gpg_key_import.yml",
 			"user.yml",
 			"email_address.yml",
 		},
diff --git a/models/asymkey/ssh_key_object_verification.go b/models/asymkey/ssh_key_object_verification.go
index e0476fe5a8..5d933d35f9 100644
--- a/models/asymkey/ssh_key_object_verification.go
+++ b/models/asymkey/ssh_key_object_verification.go
@@ -12,8 +12,10 @@ import (
 	"forgejo.org/models/db"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/log"
+	"forgejo.org/modules/setting"
 
 	"github.com/42wim/sshsig"
+	"golang.org/x/crypto/ssh"
 )
 
 // ParseObjectWithSSHSignature check if signature is good against keystore.
@@ -62,6 +64,22 @@ func ParseObjectWithSSHSignature(ctx context.Context, c *GitObject, committer *u
 		}
 	}
 
+	// If the SSH instance key is set, try to verify it with that key.
+	if setting.SSHInstanceKey != nil {
+		instanceSSHKey := &PublicKey{
+			Content:     string(ssh.MarshalAuthorizedKey(setting.SSHInstanceKey)),
+			Fingerprint: ssh.FingerprintSHA256(setting.SSHInstanceKey),
+		}
+		instanceUser := &user_model.User{
+			Name:  setting.Repository.Signing.SigningName,
+			Email: setting.Repository.Signing.SigningEmail,
+		}
+		commitVerification := verifySSHObjectVerification(c.Signature.Signature, c.Signature.Payload, instanceSSHKey, committer, instanceUser, setting.Repository.Signing.SigningEmail)
+		if commitVerification != nil {
+			return commitVerification
+		}
+	}
+
 	return &ObjectVerification{
 		CommittingUser: committer,
 		Verified:       false,
diff --git a/models/asymkey/ssh_key_object_verification_test.go b/models/asymkey/ssh_key_object_verification_test.go
index 5d1b7edc27..4bfd79d56e 100644
--- a/models/asymkey/ssh_key_object_verification_test.go
+++ b/models/asymkey/ssh_key_object_verification_test.go
@@ -4,6 +4,7 @@
 package asymkey
 
 import (
+	"os"
 	"testing"
 
 	"forgejo.org/models/db"
@@ -15,6 +16,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
 )
 
 func TestParseCommitWithSSHSignature(t *testing.T) {
@@ -150,4 +152,43 @@ muPLbvEduU+Ze/1Ol1pgk=
 		assert.Equal(t, "user2 / SHA256:TKfwbZMR7e9OnlV2l1prfah1TXH8CmqR0PvFEXVCXA4", commitVerification.Reason)
 		assert.Equal(t, sshKey, commitVerification.SigningSSHKey)
 	})
+
+	t.Run("Instance key", func(t *testing.T) {
+		pubKeyContent, err := os.ReadFile("../../tests/integration/ssh-signing-key.pub")
+		require.NoError(t, err)
+		pubKey, _, _, _, err := ssh.ParseAuthorizedKey(pubKeyContent)
+		require.NoError(t, err)
+
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")()
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")()
+		defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)()
+
+		gitCommit := &git.Commit{
+			Committer: &git.Signature{
+				Email: "fox@example.com",
+			},
+			Signature: &git.ObjectSignature{
+				Payload: `tree f96f1a4f1a51dc42e2983592f503980b60b8849c
+parent 93f84db542dd8c6e952c8130bc2fcbe2e299b8b4
+author OwO <instance@example.com> 1738961379 +0100
+committer UwU <fox@example.com> 1738961379 +0100
+
+Fox
+`,
+				Signature: `-----BEGIN SSH SIGNATURE-----
+U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgV5ELwZ8XJe2LLR/UTuEu/vsFdb
+t7ry0W8hyzz/b1iocAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
+AAAAQCnyMRkWVVNoZxZkvi/ZoknUhs4LNBmEwZs9e9214WIt+mhKfc6BiHoE2qeluR2McD
+Y5RzHnA8Ke9wXddEePCQE=
+-----END SSH SIGNATURE-----
+`,
+			},
+		}
+
+		o := commitToGitObject(gitCommit)
+		commitVerification := ParseObjectWithSSHSignature(db.DefaultContext, &o, user2)
+		assert.True(t, commitVerification.Verified)
+		assert.Equal(t, "UwU / SHA256:QttK41r/zMUeAW71b5UgVSb8xGFF/DlZJ6TyADW+uoI", commitVerification.Reason)
+		assert.Equal(t, "SHA256:QttK41r/zMUeAW71b5UgVSb8xGFF/DlZJ6TyADW+uoI", commitVerification.SigningSSHKey.Fingerprint)
+	})
 }
diff --git a/models/asymkey/ssh_key_parse.go b/models/asymkey/ssh_key_parse.go
index 305e464b4b..8177db6439 100644
--- a/models/asymkey/ssh_key_parse.go
+++ b/models/asymkey/ssh_key_parse.go
@@ -10,6 +10,7 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"math/big"
 	"os"
@@ -93,7 +94,7 @@ func parseKeyString(content string) (string, error) {
 
 			block, _ := pem.Decode([]byte(content))
 			if block == nil {
-				return "", fmt.Errorf("failed to parse PEM block containing the public key")
+				return "", errors.New("failed to parse PEM block containing the public key")
 			}
 			if strings.Contains(block.Type, "PRIVATE") {
 				return "", ErrKeyIsPrivate
@@ -226,7 +227,7 @@ func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
 
 	// The ssh library can parse the key, so next we find out what key exactly we have.
 	switch pkeyType {
-	case ssh.KeyAlgoDSA:
+	case ssh.KeyAlgoDSA: //nolint:staticcheck
 		rawPub := struct {
 			Name       string
 			P, Q, G, Y *big.Int
diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go
index f3c3e41955..bc8cd7d36b 100644
--- a/models/asymkey/ssh_key_test.go
+++ b/models/asymkey/ssh_key_test.go
@@ -44,7 +44,7 @@ func Test_SSHParsePublicKey(t *testing.T) {
 				keyTypeN, lengthN, err := SSHNativeParsePublicKey(tc.content)
 				require.NoError(t, err)
 				assert.Equal(t, tc.keyType, keyTypeN)
-				assert.EqualValues(t, tc.length, lengthN)
+				assert.Equal(t, tc.length, lengthN)
 			})
 			if tc.skipSSHKeygen {
 				return
@@ -54,19 +54,19 @@ func Test_SSHParsePublicKey(t *testing.T) {
 				if err != nil {
 					// Some servers do not support ecdsa format.
 					if !strings.Contains(err.Error(), "line 1 too long:") {
-						assert.FailNow(t, "%v", err)
+						require.NoError(t, err)
 					}
 				}
 				assert.Equal(t, tc.keyType, keyTypeK)
-				assert.EqualValues(t, tc.length, lengthK)
+				assert.Equal(t, tc.length, lengthK)
 			})
 			t.Run("SSHParseKeyNative", func(t *testing.T) {
 				keyTypeK, lengthK, err := SSHNativeParsePublicKey(tc.content)
 				if err != nil {
-					assert.FailNow(t, "%v", err)
+					require.NoError(t, err)
 				}
 				assert.Equal(t, tc.keyType, keyTypeK)
-				assert.EqualValues(t, tc.length, lengthK)
+				assert.Equal(t, tc.length, lengthK)
 			})
 		})
 	}
diff --git a/models/auth/access_token.go b/models/auth/access_token.go
index 31d88c6b20..695702b7a0 100644
--- a/models/auth/access_token.go
+++ b/models/auth/access_token.go
@@ -111,12 +111,8 @@ func generateAccessToken(t *AccessToken) error {
 	if err != nil {
 		return err
 	}
-	token, err := util.CryptoRandomBytes(20)
-	if err != nil {
-		return err
-	}
 	t.TokenSalt = salt
-	t.Token = hex.EncodeToString(token)
+	t.Token = hex.EncodeToString(util.CryptoRandomBytes(20))
 	t.TokenHash = HashToken(t.Token, t.TokenSalt)
 	t.TokenLastEight = t.Token[len(t.Token)-8:]
 	return nil
diff --git a/models/auth/access_token_scope.go b/models/auth/access_token_scope.go
index 802ad5aa07..d14838cf02 100644
--- a/models/auth/access_token_scope.go
+++ b/models/auth/access_token_scope.go
@@ -283,6 +283,10 @@ func (s AccessTokenScope) Normalize() (AccessTokenScope, error) {
 	return bitmap.toScope(), nil
 }
 
+func (s AccessTokenScope) HasPermissionScope() bool {
+	return s != "" && s != AccessTokenScopePublicOnly
+}
+
 // PublicOnly checks if this token scope is limited to public resources
 func (s AccessTokenScope) PublicOnly() (bool, error) {
 	bitmap, err := s.parse()
diff --git a/models/auth/auth_token.go b/models/auth/auth_token.go
index a3ac9c4c1a..d09aebcf85 100644
--- a/models/auth/auth_token.go
+++ b/models/auth/auth_token.go
@@ -63,10 +63,7 @@ func (authToken *AuthorizationToken) IsExpired() bool {
 func GenerateAuthToken(ctx context.Context, userID int64, expiry timeutil.TimeStamp, purpose AuthorizationPurpose) (lookupKey, validator string, err error) {
 	// Request 64 random bytes. The first 32 bytes will be used for the lookupKey
 	// and the other 32 bytes will be used for the validator.
-	rBytes, err := util.CryptoRandomBytes(64)
-	if err != nil {
-		return "", "", err
-	}
+	rBytes := util.CryptoRandomBytes(64)
 	hexEncoded := hex.EncodeToString(rBytes)
 	validator, lookupKey = hexEncoded[64:], hexEncoded[:64]
 
diff --git a/models/auth/oauth2.go b/models/auth/oauth2.go
index fb0a451566..fa68197cf0 100644
--- a/models/auth/oauth2.go
+++ b/models/auth/oauth2.go
@@ -184,13 +184,9 @@ var base32Lower = base32.NewEncoding(lowerBase32Chars).WithPadding(base32.NoPadd
 
 // GenerateClientSecret will generate the client secret and returns the plaintext and saves the hash at the database
 func (app *OAuth2Application) GenerateClientSecret(ctx context.Context) (string, error) {
-	rBytes, err := util.CryptoRandomBytes(32)
-	if err != nil {
-		return "", err
-	}
 	// Add a prefix to the base32, this is in order to make it easier
 	// for code scanners to grab sensitive tokens.
-	clientSecret := "gto_" + base32Lower.EncodeToString(rBytes)
+	clientSecret := "gto_" + base32Lower.EncodeToString(util.CryptoRandomBytes(32))
 
 	hashedSecret, err := bcrypt.GenerateFromPassword([]byte(clientSecret), bcrypt.DefaultCost)
 	if err != nil {
@@ -475,13 +471,9 @@ func (grant *OAuth2Grant) TableName() string {
 
 // GenerateNewAuthorizationCode generates a new authorization code for a grant and saves it to the database
 func (grant *OAuth2Grant) GenerateNewAuthorizationCode(ctx context.Context, redirectURI, codeChallenge, codeChallengeMethod string) (code *OAuth2AuthorizationCode, err error) {
-	rBytes, err := util.CryptoRandomBytes(32)
-	if err != nil {
-		return &OAuth2AuthorizationCode{}, err
-	}
 	// Add a prefix to the base32, this is in order to make it easier
 	// for code scanners to grab sensitive tokens.
-	codeSecret := "gta_" + base32Lower.EncodeToString(rBytes)
+	codeSecret := "gta_" + base32Lower.EncodeToString(util.CryptoRandomBytes(32))
 
 	code = &OAuth2AuthorizationCode{
 		Grant:               grant,
diff --git a/models/auth/oauth2_test.go b/models/auth/oauth2_test.go
index 65865c6d31..9c6836ed0d 100644
--- a/models/auth/oauth2_test.go
+++ b/models/auth/oauth2_test.go
@@ -128,7 +128,7 @@ func TestOAuth2Application_CreateGrant(t *testing.T) {
 	assert.NotNil(t, grant)
 	assert.Equal(t, int64(2), grant.UserID)
 	assert.Equal(t, int64(1), grant.ApplicationID)
-	assert.Equal(t, "", grant.Scope)
+	assert.Empty(t, grant.Scope)
 }
 
 //////////////////// Grant
@@ -269,7 +269,7 @@ func TestOAuth2AuthorizationCode_TableName(t *testing.T) {
 func TestBuiltinApplicationsClientIDs(t *testing.T) {
 	clientIDs := auth_model.BuiltinApplicationsClientIDs()
 	slices.Sort(clientIDs)
-	assert.EqualValues(t, []string{"a4792ccc-144e-407e-86c9-5e7d8d9c3269", "d57cb8c4-630c-4168-8324-ec79935e18d4", "e90ee53c-94e2-48ac-9358-a874fb9e0662"}, clientIDs)
+	assert.Equal(t, []string{"a4792ccc-144e-407e-86c9-5e7d8d9c3269", "d57cb8c4-630c-4168-8324-ec79935e18d4", "e90ee53c-94e2-48ac-9358-a874fb9e0662"}, clientIDs)
 }
 
 func TestOrphanedOAuth2Applications(t *testing.T) {
diff --git a/models/auth/session_test.go b/models/auth/session_test.go
index ab6415f289..0f07038187 100644
--- a/models/auth/session_test.go
+++ b/models/auth/session_test.go
@@ -37,7 +37,7 @@ func TestAuthSession(t *testing.T) {
 		// New session is created.
 		sess, err := auth.ReadSession(db.DefaultContext, key)
 		require.NoError(t, err)
-		assert.EqualValues(t, key, sess.Key)
+		assert.Equal(t, key, sess.Key)
 		assert.Empty(t, sess.Data)
 		assert.EqualValues(t, now.Unix(), sess.Expiry)
 
@@ -67,8 +67,8 @@ func TestAuthSession(t *testing.T) {
 		// Ensure data is updated and expiry is set from the update session call.
 		sess, err := auth.ReadSession(db.DefaultContext, key)
 		require.NoError(t, err)
-		assert.EqualValues(t, key, sess.Key)
-		assert.EqualValues(t, data, sess.Data)
+		assert.Equal(t, key, sess.Key)
+		assert.Equal(t, data, sess.Data)
 		assert.EqualValues(t, now.Unix(), sess.Expiry)
 
 		timeutil.MockSet(now)
diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go
index edff471836..9a53ad30e0 100644
--- a/models/auth/twofactor.go
+++ b/models/auth/twofactor.go
@@ -61,17 +61,13 @@ func init() {
 }
 
 // GenerateScratchToken recreates the scratch token the user is using.
-func (t *TwoFactor) GenerateScratchToken() (string, error) {
-	tokenBytes, err := util.CryptoRandomBytes(6)
-	if err != nil {
-		return "", err
-	}
+func (t *TwoFactor) GenerateScratchToken() string {
 	// these chars are specially chosen, avoid ambiguous chars like `0`, `O`, `1`, `I`.
 	const base32Chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"
-	token := base32.NewEncoding(base32Chars).WithPadding(base32.NoPadding).EncodeToString(tokenBytes)
+	token := base32.NewEncoding(base32Chars).WithPadding(base32.NoPadding).EncodeToString(util.CryptoRandomBytes(6))
 	t.ScratchSalt, _ = util.CryptoRandomString(10)
 	t.ScratchHash = HashToken(token, t.ScratchSalt)
-	return token, nil
+	return token
 }
 
 // HashToken return the hashable salt
diff --git a/models/db/context.go b/models/db/context.go
index 35526936af..3e035cd733 100644
--- a/models/db/context.go
+++ b/models/db/context.go
@@ -141,7 +141,7 @@ func TxContext(parentCtx context.Context) (*Context, Committer, error) {
 		return nil, nil, err
 	}
 
-	return newContext(DefaultContext, sess, true), sess, nil
+	return newContext(parentCtx, sess, true), sess, nil
 }
 
 // WithTx represents executing database operations on a transaction, if the transaction exist,
diff --git a/models/db/context_test.go b/models/db/context_test.go
index 7ab327b7e9..d12d79ebe1 100644
--- a/models/db/context_test.go
+++ b/models/db/context_test.go
@@ -84,4 +84,16 @@ func TestTxContext(t *testing.T) {
 			return nil
 		}))
 	}
+
+	t.Run("Reuses parent context", func(t *testing.T) {
+		type unique struct{}
+
+		ctx := context.WithValue(db.DefaultContext, unique{}, "yes!")
+		assert.False(t, db.InTransaction(ctx))
+
+		require.NoError(t, db.WithTx(ctx, func(ctx context.Context) error {
+			assert.Equal(t, "yes!", ctx.Value(unique{}))
+			return nil
+		}))
+	})
 }
diff --git a/models/db/engine.go b/models/db/engine.go
index ca6576da8a..42b9150696 100755
--- a/models/db/engine.go
+++ b/models/db/engine.go
@@ -15,6 +15,7 @@ import (
 	"strings"
 	"time"
 
+	"forgejo.org/modules/container"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 
@@ -95,34 +96,70 @@ func init() {
 	}
 }
 
-// newXORMEngine returns a new XORM engine from the configuration
-func newXORMEngine() (*xorm.Engine, error) {
-	connStr, err := setting.DBConnStr()
+// newXORMEngineGroup creates an xorm.EngineGroup (with one master and one or more slaves).
+// It assumes you have separate master and slave DSNs defined via the settings package.
+func newXORMEngineGroup() (Engine, error) {
+	// Retrieve master DSN from settings.
+	masterConnStr, err := setting.DBMasterConnStr()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to determine master DSN: %w", err)
 	}
 
-	var engine *xorm.Engine
-
+	var masterEngine *xorm.Engine
+	// For PostgreSQL: if a schema is provided, we use the special "postgresschema" driver.
 	if setting.Database.Type.IsPostgreSQL() && len(setting.Database.Schema) > 0 {
-		// OK whilst we sort out our schema issues - create a schema aware postgres
 		registerPostgresSchemaDriver()
-		engine, err = xorm.NewEngine("postgresschema", connStr)
+		masterEngine, err = xorm.NewEngine("postgresschema", masterConnStr)
 	} else {
-		engine, err = xorm.NewEngine(setting.Database.Type.String(), connStr)
+		masterEngine, err = xorm.NewEngine(setting.Database.Type.String(), masterConnStr)
 	}
-
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to create master engine: %w", err)
 	}
 	if setting.Database.Type.IsMySQL() {
-		engine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"})
+		masterEngine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"})
 	}
-	engine.SetSchema(setting.Database.Schema)
-	return engine, nil
+	masterEngine.SetSchema(setting.Database.Schema)
+
+	slaveConnStrs, err := setting.DBSlaveConnStrs()
+	if err != nil {
+		return nil, fmt.Errorf("failed to load slave DSNs: %w", err)
+	}
+
+	var slaveEngines []*xorm.Engine
+	// Iterate over all slave DSNs and create engines
+	for _, dsn := range slaveConnStrs {
+		slaveEngine, err := xorm.NewEngine(setting.Database.Type.String(), dsn)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create slave engine for dsn %q: %w", dsn, err)
+		}
+		if setting.Database.Type.IsMySQL() {
+			slaveEngine.Dialect().SetParams(map[string]string{"rowFormat": "DYNAMIC"})
+		}
+		slaveEngine.SetSchema(setting.Database.Schema)
+		slaveEngines = append(slaveEngines, slaveEngine)
+	}
+
+	policy := setting.BuildLoadBalancePolicy(&setting.Database, slaveEngines)
+
+	// Create the EngineGroup using the selected policy
+	group, err := xorm.NewEngineGroup(masterEngine, slaveEngines, policy)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create engine group: %w", err)
+	}
+	return engineGroupWrapper{group}, nil
 }
 
-// SyncAllTables sync the schemas of all tables, is required by unit test code
+type engineGroupWrapper struct {
+	*xorm.EngineGroup
+}
+
+func (w engineGroupWrapper) AddHook(hook contexts.Hook) bool {
+	w.EngineGroup.AddHook(hook)
+	return true
+}
+
+// SyncAllTables sync the schemas of all tables
 func SyncAllTables() error {
 	_, err := x.StoreEngine("InnoDB").SyncWithOptions(xorm.SyncOptions{
 		WarnIfDatabaseColumnMissed: true,
@@ -130,52 +167,61 @@ func SyncAllTables() error {
 	return err
 }
 
-// InitEngine initializes the xorm.Engine and sets it as db.DefaultContext
+// InitEngine initializes the xorm EngineGroup and sets it as db.DefaultContext
 func InitEngine(ctx context.Context) error {
-	xormEngine, err := newXORMEngine()
+	xormEngine, err := newXORMEngineGroup()
 	if err != nil {
 		return fmt.Errorf("failed to connect to database: %w", err)
 	}
+	// Try to cast to the concrete type to access diagnostic methods
+	if eng, ok := xormEngine.(engineGroupWrapper); ok {
+		eng.SetMapper(names.GonicMapper{})
+		// WARNING: for serv command, MUST remove the output to os.Stdout,
+		// so use a log file instead of printing to stdout.
+		eng.SetLogger(NewXORMLogger(setting.Database.LogSQL))
+		eng.ShowSQL(setting.Database.LogSQL)
+		eng.SetMaxOpenConns(setting.Database.MaxOpenConns)
+		eng.SetMaxIdleConns(setting.Database.MaxIdleConns)
+		eng.SetConnMaxLifetime(setting.Database.ConnMaxLifetime)
+		eng.SetConnMaxIdleTime(setting.Database.ConnMaxIdleTime)
+		eng.SetDefaultContext(ctx)
 
-	xormEngine.SetMapper(names.GonicMapper{})
-	// WARNING: for serv command, MUST remove the output to os.stdout,
-	// so use log file to instead print to stdout.
-	xormEngine.SetLogger(NewXORMLogger(setting.Database.LogSQL))
-	xormEngine.ShowSQL(setting.Database.LogSQL)
-	xormEngine.SetMaxOpenConns(setting.Database.MaxOpenConns)
-	xormEngine.SetMaxIdleConns(setting.Database.MaxIdleConns)
-	xormEngine.SetConnMaxLifetime(setting.Database.ConnMaxLifetime)
-	xormEngine.SetConnMaxIdleTime(setting.Database.ConnMaxIdleTime)
-	xormEngine.SetDefaultContext(ctx)
+		if setting.Database.SlowQueryThreshold > 0 {
+			eng.AddHook(&SlowQueryHook{
+				Threshold: setting.Database.SlowQueryThreshold,
+				Logger:    log.GetLogger("xorm"),
+			})
+		}
 
-	if setting.Database.SlowQueryThreshold > 0 {
-		xormEngine.AddHook(&SlowQueryHook{
-			Treshold: setting.Database.SlowQueryThreshold,
-			Logger:   log.GetLogger("xorm"),
+		errorLogger := log.GetLogger("xorm")
+		if setting.IsInTesting {
+			errorLogger = log.GetLogger(log.DEFAULT)
+		}
+
+		eng.AddHook(&ErrorQueryHook{
+			Logger: errorLogger,
 		})
+
+		eng.AddHook(&TracingHook{})
+
+		SetDefaultEngine(ctx, eng)
+	} else {
+		// Fallback: if type assertion fails, set default engine without extended diagnostics
+		SetDefaultEngine(ctx, xormEngine)
 	}
-
-	errorLogger := log.GetLogger("xorm")
-	if setting.IsInTesting {
-		errorLogger = log.GetLogger(log.DEFAULT)
-	}
-
-	xormEngine.AddHook(&ErrorQueryHook{
-		Logger: errorLogger,
-	})
-
-	xormEngine.AddHook(&TracingHook{})
-
-	SetDefaultEngine(ctx, xormEngine)
 	return nil
 }
 
-// SetDefaultEngine sets the default engine for db
-func SetDefaultEngine(ctx context.Context, eng *xorm.Engine) {
-	x = eng
+// SetDefaultEngine sets the default engine for db.
+func SetDefaultEngine(ctx context.Context, eng Engine) {
+	masterEngine, err := GetMasterEngine(eng)
+	if err == nil {
+		x = masterEngine
+	}
+
 	DefaultContext = &Context{
 		Context: ctx,
-		e:       x,
+		e:       eng,
 	}
 }
 
@@ -191,12 +237,12 @@ func UnsetDefaultEngine() {
 	DefaultContext = nil
 }
 
-// InitEngineWithMigration initializes a new xorm.Engine and sets it as the db.DefaultContext
+// InitEngineWithMigration initializes a new xorm EngineGroup, runs migrations, and sets it as db.DefaultContext
 // This function must never call .Sync() if the provided migration function fails.
 // When called from the "doctor" command, the migration function is a version check
 // that prevents the doctor from fixing anything in the database if the migration level
 // is different from the expected value.
-func InitEngineWithMigration(ctx context.Context, migrateFunc func(*xorm.Engine) error) (err error) {
+func InitEngineWithMigration(ctx context.Context, migrateFunc func(Engine) error) (err error) {
 	if err = InitEngine(ctx); err != nil {
 		return err
 	}
@@ -230,14 +276,14 @@ func InitEngineWithMigration(ctx context.Context, migrateFunc func(*xorm.Engine)
 	return nil
 }
 
-// NamesToBean return a list of beans or an error
+// NamesToBean returns a list of beans given names
 func NamesToBean(names ...string) ([]any, error) {
 	beans := []any{}
 	if len(names) == 0 {
 		beans = append(beans, tables...)
 		return beans, nil
 	}
-	// Need to map provided names to beans...
+	// Map provided names to beans
 	beanMap := make(map[string]any)
 	for _, bean := range tables {
 		beanMap[strings.ToLower(reflect.Indirect(reflect.ValueOf(bean)).Type().Name())] = bean
@@ -259,7 +305,7 @@ func NamesToBean(names ...string) ([]any, error) {
 	return beans, nil
 }
 
-// DumpDatabase dumps all data from database according the special database SQL syntax to file system.
+// DumpDatabase dumps all data from database using special SQL syntax to the file system.
 func DumpDatabase(filePath, dbType string) error {
 	var tbs []*schemas.Table
 	for _, t := range tables {
@@ -295,29 +341,33 @@ func MaxBatchInsertSize(bean any) int {
 	return 999 / len(t.ColumnsSeq())
 }
 
-// IsTableNotEmpty returns true if table has at least one record
+// IsTableNotEmpty returns true if the table has at least one record
 func IsTableNotEmpty(beanOrTableName any) (bool, error) {
 	return x.Table(beanOrTableName).Exist()
 }
 
-// DeleteAllRecords will delete all the records of this table
+// DeleteAllRecords deletes all records in the given table.
 func DeleteAllRecords(tableName string) error {
 	_, err := x.Exec(fmt.Sprintf("DELETE FROM %s", tableName))
 	return err
 }
 
-// GetMaxID will return max id of the table
+// GetMaxID returns the maximum id in the table
 func GetMaxID(beanOrTableName any) (maxID int64, err error) {
 	_, err = x.Select("MAX(id)").Table(beanOrTableName).Get(&maxID)
 	return maxID, err
 }
 
 func SetLogSQL(ctx context.Context, on bool) {
-	e := GetEngine(ctx)
-	if x, ok := e.(*xorm.Engine); ok {
-		x.ShowSQL(on)
-	} else if sess, ok := e.(*xorm.Session); ok {
+	ctxEngine := GetEngine(ctx)
+
+	if sess, ok := ctxEngine.(*xorm.Session); ok {
 		sess.Engine().ShowSQL(on)
+	} else if wrapper, ok := ctxEngine.(engineGroupWrapper); ok {
+		// Handle engineGroupWrapper directly
+		wrapper.ShowSQL(on)
+	} else if masterEngine, err := GetMasterEngine(ctxEngine); err == nil {
+		masterEngine.ShowSQL(on)
 	}
 }
 
@@ -336,13 +386,22 @@ func (TracingHook) BeforeProcess(c *contexts.ContextHook) (context.Context, erro
 }
 
 func (TracingHook) AfterProcess(c *contexts.ContextHook) error {
+	if c.Result != nil {
+		if rowsAffected, err := c.Result.RowsAffected(); err == nil {
+			trace.Logf(c.Ctx, "rows affected", "%d", rowsAffected)
+		}
+		if lastID, err := c.Result.LastInsertId(); err == nil {
+			trace.Logf(c.Ctx, "last insert id", "%d", lastID)
+		}
+	}
+
 	c.Ctx.Value(sqlTask{}).(*trace.Task).End()
 	return nil
 }
 
 type SlowQueryHook struct {
-	Treshold time.Duration
-	Logger   log.Logger
+	Threshold time.Duration
+	Logger    log.Logger
 }
 
 var _ contexts.Hook = &SlowQueryHook{}
@@ -352,7 +411,7 @@ func (SlowQueryHook) BeforeProcess(c *contexts.ContextHook) (context.Context, er
 }
 
 func (h *SlowQueryHook) AfterProcess(c *contexts.ContextHook) error {
-	if c.ExecuteTime >= h.Treshold {
+	if c.ExecuteTime >= h.Threshold {
 		h.Logger.Log(8, log.WARN, "[Slow SQL Query] %s %v - %v", c.SQL, c.Args, c.ExecuteTime)
 	}
 	return nil
@@ -374,3 +433,27 @@ func (h *ErrorQueryHook) AfterProcess(c *contexts.ContextHook) error {
 	}
 	return nil
 }
+
+// GetMasterEngine extracts the master xorm.Engine from the provided xorm.Engine.
+// This handles both direct xorm.Engine cases and engines that implement a Master() method.
+func GetMasterEngine(x Engine) (*xorm.Engine, error) {
+	if getter, ok := x.(interface{ Master() *xorm.Engine }); ok {
+		return getter.Master(), nil
+	}
+
+	engine, ok := x.(*xorm.Engine)
+	if !ok {
+		return nil, fmt.Errorf("unsupported engine type: %T", x)
+	}
+
+	return engine, nil
+}
+
+// GetTableNames returns the table name of all registered models.
+func GetTableNames() container.Set[string] {
+	names := make(container.Set[string])
+	for _, table := range tables {
+		names.Add(x.TableName(table))
+	}
+	return names
+}
diff --git a/models/db/engine_test.go b/models/db/engine_test.go
index 5d20e3d602..98cc90c251 100644
--- a/models/db/engine_test.go
+++ b/models/db/engine_test.go
@@ -56,7 +56,7 @@ func TestDeleteOrphanedObjects(t *testing.T) {
 
 	countAfter, err := db.GetEngine(db.DefaultContext).Count(&issues_model.PullRequest{})
 	require.NoError(t, err)
-	assert.EqualValues(t, countBefore, countAfter)
+	assert.Equal(t, countBefore, countAfter)
 }
 
 func TestPrimaryKeys(t *testing.T) {
@@ -103,8 +103,8 @@ func TestSlowQuery(t *testing.T) {
 	// It's not possible to clean this up with XORM, but it's luckily not harmful
 	// to leave around.
 	engine.AddHook(&db.SlowQueryHook{
-		Treshold: time.Second * 10,
-		Logger:   log.GetLogger("slow-query"),
+		Threshold: time.Second * 10,
+		Logger:    log.GetLogger("slow-query"),
 	})
 
 	// NOOP query.
@@ -114,8 +114,8 @@ func TestSlowQuery(t *testing.T) {
 	assert.False(t, stopped)
 
 	engine.AddHook(&db.SlowQueryHook{
-		Treshold: 0, // Every query should be logged.
-		Logger:   log.GetLogger("slow-query"),
+		Threshold: 0, // Every query should be logged.
+		Logger:    log.GetLogger("slow-query"),
 	})
 
 	// NOOP query.
diff --git a/models/db/index.go b/models/db/index.go
index 4c15dbe8a1..c069f0febd 100644
--- a/models/db/index.go
+++ b/models/db/index.go
@@ -72,14 +72,19 @@ func postgresGetNextResourceIndex(ctx context.Context, tableName string, groupID
 }
 
 func mysqlGetNextResourceIndex(ctx context.Context, tableName string, groupID int64) (int64, error) {
-	if _, err := GetEngine(ctx).Exec(fmt.Sprintf("INSERT INTO %s (group_id, max_index) "+
-		"VALUES (?,1) ON DUPLICATE KEY UPDATE max_index = max_index+1",
-		tableName), groupID); err != nil {
+	res, err := GetEngine(ctx).Query(fmt.Sprintf("INSERT INTO %s (group_id, max_index) "+
+		"VALUES (?,1) ON DUPLICATE KEY UPDATE max_index = max_index+1 /*M!100500 RETURNING max_index */",
+		tableName), groupID)
+	if err != nil {
 		return 0, err
 	}
 
+	if len(res) > 0 {
+		return strconv.ParseInt(string(res[0]["max_index"]), 10, 64)
+	}
+
 	var idx int64
-	_, err := GetEngine(ctx).SQL(fmt.Sprintf("SELECT max_index FROM %s WHERE group_id = ?", tableName), groupID).Get(&idx)
+	_, err = GetEngine(ctx).SQL(fmt.Sprintf("SELECT max_index FROM %s WHERE group_id = ?", tableName), groupID).Get(&idx)
 	if err != nil {
 		return 0, err
 	}
diff --git a/models/db/index_test.go b/models/db/index_test.go
index 929e514329..b64a816bd2 100644
--- a/models/db/index_test.go
+++ b/models/db/index_test.go
@@ -33,10 +33,11 @@ func getCurrentResourceIndex(ctx context.Context, tableName string, groupID int6
 
 func TestSyncMaxResourceIndex(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
-	xe := unittest.GetXORMEngine()
+	xe, err := unittest.GetXORMEngine()
+	require.NoError(t, err)
 	require.NoError(t, xe.Sync(&TestIndex{}))
 
-	err := db.SyncMaxResourceIndex(db.DefaultContext, "test_index", 10, 51)
+	err = db.SyncMaxResourceIndex(db.DefaultContext, "test_index", 10, 51)
 	require.NoError(t, err)
 
 	// sync new max index
@@ -88,7 +89,8 @@ func TestSyncMaxResourceIndex(t *testing.T) {
 
 func TestGetNextResourceIndex(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
-	xe := unittest.GetXORMEngine()
+	xe, err := unittest.GetXORMEngine()
+	require.NoError(t, err)
 	require.NoError(t, xe.Sync(&TestIndex{}))
 
 	// create a new record
diff --git a/models/db/install/db.go b/models/db/install/db.go
index 104a7a8e39..e64e85cf01 100644
--- a/models/db/install/db.go
+++ b/models/db/install/db.go
@@ -6,12 +6,10 @@ package install
 import (
 	"forgejo.org/models/db"
 	"forgejo.org/modules/setting"
-
-	"xorm.io/xorm"
 )
 
-func getXORMEngine() *xorm.Engine {
-	return db.DefaultContext.(*db.Context).Engine().(*xorm.Engine)
+func getXORMEngine() db.Engine {
+	return db.DefaultContext.(*db.Context).Engine()
 }
 
 // CheckDatabaseConnection checks the database connection
diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go
index 47b6a956f4..bdeaa876d5 100644
--- a/models/db/iterate_test.go
+++ b/models/db/iterate_test.go
@@ -17,7 +17,8 @@ import (
 
 func TestIterate(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
-	xe := unittest.GetXORMEngine()
+	xe, err := unittest.GetXORMEngine()
+	require.NoError(t, err)
 	require.NoError(t, xe.Sync(&repo_model.RepoUnit{}))
 
 	cnt, err := db.GetEngine(db.DefaultContext).Count(&repo_model.RepoUnit{})
diff --git a/models/db/list_test.go b/models/db/list_test.go
index f13958496a..502372782d 100644
--- a/models/db/list_test.go
+++ b/models/db/list_test.go
@@ -29,11 +29,12 @@ func (opts mockListOptions) ToConds() builder.Cond {
 
 func TestFind(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
-	xe := unittest.GetXORMEngine()
+	xe, err := unittest.GetXORMEngine()
+	require.NoError(t, err)
 	require.NoError(t, xe.Sync(&repo_model.RepoUnit{}))
 
 	var repoUnitCount int
-	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT COUNT(*) FROM repo_unit").Get(&repoUnitCount)
+	_, err = db.GetEngine(db.DefaultContext).SQL("SELECT COUNT(*) FROM repo_unit").Get(&repoUnitCount)
 	require.NoError(t, err)
 	assert.NotEmpty(t, repoUnitCount)
 
@@ -48,6 +49,6 @@ func TestFind(t *testing.T) {
 
 	repoUnits, newCnt, err := db.FindAndCount[repo_model.RepoUnit](db.DefaultContext, opts)
 	require.NoError(t, err)
-	assert.EqualValues(t, cnt, newCnt)
+	assert.Equal(t, cnt, newCnt)
 	assert.Len(t, repoUnits, repoUnitCount)
 }
diff --git a/models/db/log.go b/models/db/log.go
index b94af8e39c..387709cc50 100644
--- a/models/db/log.go
+++ b/models/db/log.go
@@ -69,6 +69,9 @@ func (l *XORMLogBridge) Warn(v ...any) {
 
 // Warnf show warning log
 func (l *XORMLogBridge) Warnf(format string, v ...any) {
+	if format == "Table %s Column %s db default is %s, struct default is %s" || format == "Table %s Column %s db nullable is %v, struct nullable is %v" {
+		return
+	}
 	l.Log(stackLevel, log.WARN, format, v...)
 }
 
diff --git a/models/db/table_names_test.go b/models/db/table_names_test.go
new file mode 100644
index 0000000000..176ce9905d
--- /dev/null
+++ b/models/db/table_names_test.go
@@ -0,0 +1,40 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package db
+
+import (
+	"slices"
+	"testing"
+
+	"forgejo.org/modules/test"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetTableNames(t *testing.T) {
+	t.Run("Simple", func(t *testing.T) {
+		defer test.MockVariableValue(&tables, []any{new(GPGKey)})()
+
+		assert.Equal(t, []string{"gpg_key"}, GetTableNames().Values())
+	})
+
+	t.Run("Multiple tables", func(t *testing.T) {
+		defer test.MockVariableValue(&tables, []any{new(GPGKey), new(User), new(BlockedUser)})()
+
+		tableNames := GetTableNames().Values()
+		slices.Sort(tableNames)
+
+		assert.Equal(t, []string{"forgejo_blocked_user", "gpg_key", "user"}, tableNames)
+	})
+}
+
+type GPGKey struct{}
+
+type User struct{}
+
+type BlockedUser struct{}
+
+func (*BlockedUser) TableName() string {
+	return "forgejo_blocked_user"
+}
diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go
index 8e42c54f31..10da231e44 100644
--- a/models/dbfs/dbfs_test.go
+++ b/models/dbfs/dbfs_test.go
@@ -32,15 +32,15 @@ func TestDbfsBasic(t *testing.T) {
 
 	n, err := f.Write([]byte("0123456789")) // blocks: 0123 4567 89
 	require.NoError(t, err)
-	assert.EqualValues(t, 10, n)
+	assert.Equal(t, 10, n)
 
 	_, err = f.Seek(0, io.SeekStart)
 	require.NoError(t, err)
 
 	buf, err := io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, 10, n)
-	assert.EqualValues(t, "0123456789", string(buf))
+	assert.Equal(t, 10, n)
+	assert.Equal(t, "0123456789", string(buf))
 
 	// write some new data
 	_, err = f.Seek(1, io.SeekStart)
@@ -51,14 +51,14 @@ func TestDbfsBasic(t *testing.T) {
 	// read from offset
 	buf, err = io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "9", string(buf))
+	assert.Equal(t, "9", string(buf))
 
 	// read all
 	_, err = f.Seek(0, io.SeekStart)
 	require.NoError(t, err)
 	buf, err = io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "0bcdefghi9", string(buf))
+	assert.Equal(t, "0bcdefghi9", string(buf))
 
 	// write to new size
 	_, err = f.Seek(-1, io.SeekEnd)
@@ -69,7 +69,7 @@ func TestDbfsBasic(t *testing.T) {
 	require.NoError(t, err)
 	buf, err = io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "0bcdefghiJKLMNOP", string(buf))
+	assert.Equal(t, "0bcdefghiJKLMNOP", string(buf))
 
 	// write beyond EOF and fill with zero
 	_, err = f.Seek(5, io.SeekCurrent)
@@ -80,7 +80,7 @@ func TestDbfsBasic(t *testing.T) {
 	require.NoError(t, err)
 	buf, err = io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "0bcdefghiJKLMNOP\x00\x00\x00\x00\x00xyzu", string(buf))
+	assert.Equal(t, "0bcdefghiJKLMNOP\x00\x00\x00\x00\x00xyzu", string(buf))
 
 	// write to the block with zeros
 	_, err = f.Seek(-6, io.SeekCurrent)
@@ -91,7 +91,7 @@ func TestDbfsBasic(t *testing.T) {
 	require.NoError(t, err)
 	buf, err = io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "0bcdefghiJKLMNOP\x00\x00\x00ABCDzu", string(buf))
+	assert.Equal(t, "0bcdefghiJKLMNOP\x00\x00\x00ABCDzu", string(buf))
 
 	require.NoError(t, f.Close())
 
@@ -118,7 +118,7 @@ func TestDbfsBasic(t *testing.T) {
 	require.NoError(t, err)
 	stat, err := f.Stat()
 	require.NoError(t, err)
-	assert.EqualValues(t, "test.txt", stat.Name())
+	assert.Equal(t, "test.txt", stat.Name())
 	assert.EqualValues(t, 0, stat.Size())
 	_, err = f.Write([]byte("0123456789"))
 	require.NoError(t, err)
@@ -145,7 +145,7 @@ func TestDbfsReadWrite(t *testing.T) {
 
 	line, err := f2r.ReadString('\n')
 	require.NoError(t, err)
-	assert.EqualValues(t, "line 1\n", line)
+	assert.Equal(t, "line 1\n", line)
 	_, err = f2r.ReadString('\n')
 	require.ErrorIs(t, err, io.EOF)
 
@@ -154,7 +154,7 @@ func TestDbfsReadWrite(t *testing.T) {
 
 	line, err = f2r.ReadString('\n')
 	require.NoError(t, err)
-	assert.EqualValues(t, "line 2\n", line)
+	assert.Equal(t, "line 2\n", line)
 	_, err = f2r.ReadString('\n')
 	require.ErrorIs(t, err, io.EOF)
 }
@@ -187,5 +187,5 @@ func TestDbfsSeekWrite(t *testing.T) {
 
 	buf, err := io.ReadAll(fr)
 	require.NoError(t, err)
-	assert.EqualValues(t, "111333", string(buf))
+	assert.Equal(t, "111333", string(buf))
 }
diff --git a/models/error.go b/models/error.go
index e8962f386b..ebaa8a135d 100644
--- a/models/error.go
+++ b/models/error.go
@@ -414,7 +414,7 @@ func IsErrSHAOrCommitIDNotProvided(err error) bool {
 }
 
 func (err ErrSHAOrCommitIDNotProvided) Error() string {
-	return "a SHA or commit ID must be proved when updating a file"
+	return "a SHA or commit ID must be provided when updating a file"
 }
 
 // ErrInvalidMergeStyle represents an error if merging with disabled merge strategy
diff --git a/models/fixtures/ModerationFeatures/abuse_report.yml b/models/fixtures/ModerationFeatures/abuse_report.yml
new file mode 100644
index 0000000000..f2e371ee35
--- /dev/null
+++ b/models/fixtures/ModerationFeatures/abuse_report.yml
@@ -0,0 +1,21 @@
+-
+  id: 1
+  status: 1
+  reporter_id: 2  # @user2
+  content_type: 4 # Comment
+  content_id: 18  # user2/repo2/issues/2#issuecomment-18
+  category: 2     # Spam
+  remarks: The comment I'm reporting is pure SPAM.
+  shadow_copy_id: null
+  created_unix: 1752697980 # 2025-07-16 20:33:00
+
+-
+  id: 2
+  status: 1        # Open
+  reporter_id: 2   # @user2
+  content_type: 1  # User (users or organizations)
+  content_id: 1002 # @alexsmith
+  category: 2      # Spam
+  remarks: This user just posted a spammy comment on my issue.
+  shadow_copy_id: null
+  created_unix: 1752698010 # 2025-07-16 20:33:30
diff --git a/models/fixtures/ModerationFeatures/comment.yml b/models/fixtures/ModerationFeatures/comment.yml
new file mode 100644
index 0000000000..a4d41ad997
--- /dev/null
+++ b/models/fixtures/ModerationFeatures/comment.yml
@@ -0,0 +1,7 @@
+- # This is a spam comment (abusive content), created for testing moderation functionalities.
+  id: 18
+  type: 0 # Standard comment
+  poster_id: 1002 # @alexsmith
+  issue_id: 7 # user2/repo2#2
+  content: If anyone needs help for promoting their business online using SEO, just contact me (check my profile page).
+  created_unix: 1752697860 # 2025-07-16 20:31:00
diff --git a/models/fixtures/ModerationFeatures/user.yml b/models/fixtures/ModerationFeatures/user.yml
new file mode 100644
index 0000000000..662c61a3e9
--- /dev/null
+++ b/models/fixtures/ModerationFeatures/user.yml
@@ -0,0 +1,22 @@
+- # This user is a spammer and will create abusive content (for testing moderation functionalities).
+  id: 1002
+  lower_name: alexsmith
+  name: alexsmith
+  full_name: Alex Smith
+  email: alexsmith@example.org
+  keep_email_private: false
+  passwd: passwdSalt:password
+  passwd_hash_algo: dummy
+  type: 0
+  location: '@master@seo.net'
+  website: http://promote-your-business.biz
+  pronouns: SEO
+  salt: passwdSalt
+  description: I can help you promote your business online using SEO.
+  created_unix: 1752697800 # 2025-07-16 20:30:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  avatar: avatar-hash-1002
+  avatar_email: alexsmith@example.org
+  use_custom_avatar: false
diff --git a/models/fixtures/TestActivateUserEmail/email_address.yml b/models/fixtures/TestActivateUserEmail/email_address.yml
new file mode 100644
index 0000000000..cf41ff8241
--- /dev/null
+++ b/models/fixtures/TestActivateUserEmail/email_address.yml
@@ -0,0 +1,7 @@
+-
+  id: 1001
+  uid: 1001
+  email: AnotherTestUserWithUpperCaseEmail@otto.splvs.net
+  lower_email: anothertestuserwithuppercaseemail@otto.splvs.net
+  is_activated: false
+  is_primary: true
diff --git a/models/fixtures/TestActivateUserEmail/user.yml b/models/fixtures/TestActivateUserEmail/user.yml
new file mode 100644
index 0000000000..0a68e70a4a
--- /dev/null
+++ b/models/fixtures/TestActivateUserEmail/user.yml
@@ -0,0 +1,12 @@
+-
+  id: 1001
+  lower_name: user1001
+  name: user1001
+  full_name: User That loves Upper Cases
+  email: AnotherTestUserWithUpperCaseEmail@otto.splvs.net
+  passwd: ZogKvWdyEx:password
+  passwd_hash_algo: dummy
+  avatar: ''
+  avatar_email: anothertestuserwithuppercaseemail@otto.splvs.net
+  login_name: user1
+  created_unix: 1672578000
diff --git a/models/fixtures/TestAddTeamReviewRequest/issue.yml b/models/fixtures/TestAddTeamReviewRequest/issue.yml
new file mode 100644
index 0000000000..a1bcf2921f
--- /dev/null
+++ b/models/fixtures/TestAddTeamReviewRequest/issue.yml
@@ -0,0 +1,16 @@
+-
+  id: 23
+  repo_id: 2
+  index: 3
+  poster_id: 2
+  original_author_id: 0
+  name: protected branch pull
+  content: pull request to a protected branch
+  milestone_id: 0
+  priority: 0
+  is_pull: true
+  is_closed: false
+  num_comments: 0
+  created_unix: 1707270422
+  updated_unix: 1707270422
+  is_locked: false
\ No newline at end of file
diff --git a/models/fixtures/TestAddTeamReviewRequest/protected_branch.yml b/models/fixtures/TestAddTeamReviewRequest/protected_branch.yml
new file mode 100644
index 0000000000..93909bd991
--- /dev/null
+++ b/models/fixtures/TestAddTeamReviewRequest/protected_branch.yml
@@ -0,0 +1,28 @@
+- id: 1
+  repo_id: 2
+  branch_name: protected-main
+  can_push: false
+  enable_whitelist: true
+  whitelist_user_i_ds: [1]
+  whitelist_team_i_ds: []
+  enable_merge_whitelist: true
+  whitelist_deploy_keys: false
+  merge_whitelist_user_i_ds: [1]
+  merge_whitelist_team_i_ds: []
+  enable_status_check: false
+  status_check_contexts: []
+  enable_approvals_whitelist: true
+  approvals_whitelist_user_i_ds: []
+  approvals_whitelist_team_i_ds: [1]
+  required_approvals: 1
+  block_on_rejected_reviews: true
+  block_on_official_review_requests: true
+  block_on_outdated_branch: true
+  dismiss_stale_approvals: true
+  ignore_stale_approvals: false
+  require_signed_commits: false
+  protected_file_patterns: ""
+  unprotected_file_patterns: ""
+  apply_to_admins: true
+  created_unix: 1752513073
+  updated_unix: 1752513073
\ No newline at end of file
diff --git a/models/fixtures/TestAddTeamReviewRequest/pull_request.yml b/models/fixtures/TestAddTeamReviewRequest/pull_request.yml
new file mode 100644
index 0000000000..067bb01324
--- /dev/null
+++ b/models/fixtures/TestAddTeamReviewRequest/pull_request.yml
@@ -0,0 +1,12 @@
+-
+  id: 11
+  type: 0 # gitea pull request
+  status: 2 # mergeable
+  issue_id: 23
+  index: 3
+  head_repo_id: 2
+  base_repo_id: 2
+  head_branch: feature/protected-branch-pr
+  base_branch: protected-main
+  merge_base: 4a357436d925b5c974181ff12a994538ddc5a269
+  has_merged: false
\ No newline at end of file
diff --git a/models/fixtures/TestGetUsedForUser/action_artifact.yaml b/models/fixtures/TestGetUsedForUser/action_artifact.yaml
new file mode 100644
index 0000000000..db5392126d
--- /dev/null
+++ b/models/fixtures/TestGetUsedForUser/action_artifact.yaml
@@ -0,0 +1,17 @@
+-
+  id: 1001
+  run_id: 792
+  runner_id: 1
+  repo_id: 4
+  owner_id: 1
+  commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
+  storage_path: "27/5/1730330775594233150.chunk"
+  file_size: 693147180559
+  file_compressed_size: 693147180559
+  content_encoding: "application/zip"
+  artifact_path: "big-file.zip"
+  artifact_name: "big-file"
+  status: 4
+  created_unix: 1730330775
+  updated_unix: 1730330775
+  expired_unix: 1738106775
diff --git a/models/fixtures/action.yml b/models/fixtures/action.yml
index b2febb4ed8..f1592d4569 100644
--- a/models/fixtures/action.yml
+++ b/models/fixtures/action.yml
@@ -74,3 +74,11 @@
   is_private: false
   created_unix: 1680454039
   content: '4|' # issueId 5
+
+- id: 10
+  user_id: 40
+  op_type: 1 # create repo
+  act_user_id: 40
+  repo_id: 60 # public
+  is_private: false
+  created_unix: 1577404800 # end of heatmap
\ No newline at end of file
diff --git a/models/fixtures/action_run.yml b/models/fixtures/action_run.yml
index 7a7bf34197..5b6f89ae0e 100644
--- a/models/fixtures/action_run.yml
+++ b/models/fixtures/action_run.yml
@@ -471,3 +471,64 @@
   need_approval: 0
   approved_by: 0
   event_payload: '{"head_commit":{"id":"5f22f7d0d95d614d25a5b68592adb345a4b5c7fd"}}'
+
+
+# GET action run(s) test
+-
+  id: 892
+  title: "successful push run"
+  repo_id: 63
+  owner_id: 2
+  workflow_id: "success.yaml"
+  index: 1
+  trigger_user_id: 2
+  ref: "refs/heads/main"
+  commit_sha: "97f29ee599c373c729132a5c46a046978311e0ee"
+  event: "push"
+  is_fork_pull_request: 0
+  status: 1 # success
+  started: 1683636528
+  stopped: 1683636626
+  created: 1683636108
+  updated: 1683636626
+  need_approval: 0
+  approved_by: 0
+
+-
+  id: 893
+  title: "failed pull_request run"
+  repo_id: 63
+  owner_id: 2
+  workflow_id: "failed.yaml"
+  index: 2
+  trigger_user_id: 2
+  ref: "refs/heads/bugfix-1"
+  commit_sha: "35c5cddfc19397501ec8f4f7bb808a7c8f04445f"
+  event: "pull_request"
+  is_fork_pull_request: 0
+  status: 2 # failure
+  started: 1683636528
+  stopped: 1683636626
+  created: 1683636108
+  updated: 1683636626
+  need_approval: 0
+  approved_by: 0
+
+-
+  id: 894
+  title: "running workflow_dispatch run"
+  repo_id: 63
+  owner_id: 2
+  workflow_id: "running.yaml"
+  index: 3
+  trigger_user_id: 2
+  ref: "refs/heads/main"
+  commit_sha: "97f29ee599c373c729132a5c46a046978311e0ee"
+  event: "workflow_dispatch"
+  is_fork_pull_request: 0
+  status: 6 # running
+  started: 1683636528
+  created: 1683636108
+  updated: 1683636626
+  need_approval: 0
+  approved_by: 0
diff --git a/models/fixtures/action_runner.yml b/models/fixtures/action_runner.yml
index 94deac998e..fcf26d49b6 100644
--- a/models/fixtures/action_runner.yml
+++ b/models/fixtures/action_runner.yml
@@ -18,3 +18,122 @@
   created: 1716104432
   updated: 1716104432
   deleted: ~
+- id: 10000001
+  uuid: 10d3b248-6460-4bf5-b819-1f5b3109e10f
+  name: global-online
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 0
+  repo_id: 0
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: 7e9ed71f64e98ce1f70e94c63f3cb6c41a8cb0b90de3e1daf7ec5c35361d60ed44da67c5ac393b7aaf443dcfc766007dc828
+  token_salt: WUcgZWl7mW
+  last_online: 1716104422
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1716104431
+  updated: 1716104422
+  deleted: ~
+- id: 10000002
+  uuid: 1d188484-dd97-4a70-b707-5e87b578ab6b
+  name: repo-never-used
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 0
+  repo_id: 1
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: 51e88c17ac8b54dd101dc2e4f530a71643c703adba7170f4b1a28f1cb483b4cfb107798c521e0532ef3c6480b64518a5c6a5
+  token_salt: 4rh8ncXYIO
+  last_online: 0
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1713512432
+  updated: 1713512432
+  deleted: ~
+- id: 10000003
+  uuid: 7a039c6b-b0b2-4cf5-a93d-715d617f99e2
+  name: global-offline
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 0
+  repo_id: 0
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: c76960c56bc6069f0d1648991ec626500abe8c15286f5c355d565c3b5ba945d7d6f1272a6c77849e592528179511b94f5d69
+  token_salt: TFMe2jhOkB
+  last_online: 1715499632
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1715499632
+  updated: 1715499632
+  deleted: ~
+- id: 10000004
+  uuid: 93ca7fdd-faca-4df6-a474-8345263ef10b
+  name: user-online
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 1
+  repo_id: 0
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: 6ddf7f0f2301d2b3f66418145dc497a6d09fa6586e659afcb5ae2a0c5b639561d795aff8062537db9df73b396842ea826134
+  token_salt: QcdGuReAp4
+  last_online: 1716104422
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1716104431
+  updated: 1716104422
+  deleted: ~
+- id: 10000005
+  uuid: a8534df6-c4be-40f4-9714-903b69d973d9
+  name: user-never-used
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 1
+  repo_id: 0
+  description: desc
+  base: 0
+  repo_range: ""
+  token_hash: 4441de7defcfc3d21baa608dec66a562cf23307abddaabdbb836907ac5f48c8780c354891916c525b79ec7af8e95be7a09b4
+  token_salt: ONNqIOnj3t
+  last_online: 0
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1713512433
+  updated: 1713512433
+  deleted: ~
+- id: 10000006
+  uuid: e1c5bb6c-de68-4335-8955-5192f76708ac
+  name: orga-fresh-created
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 35
+  repo_id: 0
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: a61f9ee48c6847d243ace0a8936efe80af9277c7bc46d6da6e03d1d406608b8023ee66600ad24f0effaa8e3338f92ac97ac9
+  token_salt: fZJKjrFGWA
+  last_online: 0
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1716100832
+  updated: 1716100832
+  deleted: ~
+- id: 10000007
+  uuid: ff755f06-948e-479b-8031-5b3e9f123e32
+  name: orga-offline
+  version: v6.3.1+7-gc4c0ca0
+  owner_id: 35
+  repo_id: 0
+  description: ""
+  base: 0
+  repo_range: ""
+  token_hash: 9372efb38f9b64efe65065380abe2f24ef34a59d9619f4cdc08f1151e9849f0b6e722aa10538e8730288de6e2f09acdac695
+  token_salt: TnU7iiIdCb
+  last_online: 1716100832
+  last_active: 0
+  agent_labels: '["docker"]'
+  created: 1736085520
+  updated: 1716100832
+  deleted: ~
diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml
index f4121284a6..6908d85dda 100644
--- a/models/fixtures/comment.yml
+++ b/models/fixtures/comment.yml
@@ -113,3 +113,380 @@
   review_id: 22
   assignee_id: 5
   created_unix: 946684817
+
+-
+  id: 13
+  type: 29 # push
+  poster_id: 2
+  issue_id: 19 # in repo_id 58
+  content: '{"is_force_push":false,"commit_ids":["4ca8bcaf27e28504df7bf996819665986b01c847","96cef4a7b72b3c208340ae6f0cf55a93e9077c93","c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2"]}'
+  created_unix: 1688672373
+
+-
+  id: 14
+  type: 29 # push
+  poster_id: 2
+  issue_id: 19 # in repo_id 58
+  content: '{"is_force_push":false,"commit_ids":["23576dd018294e476c06e569b6b0f170d0558705"]}'
+  created_unix: 1688672374
+
+-
+  id: 15
+  type: 29 # push
+  poster_id: 2
+  issue_id: 19 # in repo_id 58
+  content: '{"is_force_push":false,"commit_ids":["3e64625bd6eb5bcba69ac97de6c8f507402df861", "c704db5794097441aa2d9dd834d5b7e2f8f08108"]}'
+  created_unix: 1688672375
+
+-
+  id: 16
+  type: 29 # push
+  poster_id: 2
+  issue_id: 19 # in repo_id 58
+  content: '{"is_force_push":false,"commit_ids":["811d46c7e518f4f180afb862c0db5cb8c80529ce", "747ddb3506a4fa04a7747808eb56ae16f9e933dc", "837d5c8125633d7d258f93b998e867eab0145520", "1978192d98bb1b65e11c2cf37da854fbf94bffd6"]}'
+  created_unix: 1688672376
+
+-
+  id: 17
+  type: 29 # push
+  poster_id: 2
+  issue_id: 19 # in repo_id 58
+  content: '{"is_force_push":true,"commit_ids":["1978192d98bb1b65e11c2cf37da854fbf94bffd6", "9b93963cf6de4dc33f915bb67f192d099c301f43"]}'
+  created_unix: 1749734240
+
+-
+  id: 2000
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 1
+  old_milestone_id: 0
+  created_unix: 946684820
+
+-
+  id: 2001
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 2
+  old_milestone_id: 1
+  created_unix: 946684920
+
+-
+  id: 2002
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 0
+  old_milestone_id: 2
+  created_unix: 946685020
+
+-
+  id: 2003
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 10 # not existing milestone
+  old_milestone_id: 0
+  created_unix: 946685080
+
+-
+  id: 2004
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 1
+  old_milestone_id: 10 # not existing (ghost) milestone
+  created_unix: 946685085
+
+-
+  id: 2005
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 10 # not existing (ghost) milestone
+  old_milestone_id: 1
+  created_unix: 946685090
+
+-
+  id: 2006
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 11 # not existing (ghost) milestone
+  old_milestone_id: 10 # not existing (ghost) milestone
+  created_unix: 946685095
+
+-
+  id: 2007
+  type: 8 # milestone
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  milestone_id: 0
+  old_milestone_id: 11 # not existing (ghost) milestone
+  created_unix: 946685100
+
+-
+  id: 2010
+  type: 30 # project
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  project_id: 1
+  old_project_id: 0
+  created_unix: 946685120
+
+-
+  id: 2011
+  type: 30 # project
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  project_id: 2
+  old_project_id: 1
+  created_unix: 946685220
+
+-
+  id: 2012
+  type: 30 # project
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  project_id: 0
+  old_project_id: 2
+  created_unix: 946685320
+
+-
+  id: 2013
+  type: 30 # project
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  project_id: 10 # not existing project
+  old_project_id: 0
+  created_unix: 946685420
+
+-
+  id: 2020
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  label_id: 1
+  content: 1 # add label
+  created_unix: 946685520
+
+-
+  id: 2021
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1
+  label_id: 2
+  content: 1 # add label
+  created_unix: 946685620
+
+-
+  id: 2022
+  type: 7 # label
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  label_id: 1
+  content: 0 # remove label
+  created_unix: 946685720
+
+-
+  id: 2023
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  label_id: 1
+  content: 1 # add label
+  created_unix: 946685720
+
+-
+  id: 2024
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  label_id: 2
+  content: 0 # remove label
+  created_unix: 946685720
+
+-
+  id: 2025
+  type: 7 # label
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  label_id: 2
+  content: 1 # add label
+  created_unix: 946685820
+
+-
+  id: 2026
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  label_id: 1
+  content: 0 # remove label
+  created_unix: 946685920
+
+-
+  id: 2027
+  type: 7 # label
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  label_id: 2
+  content: 0 # remove label
+  created_unix: 946685920
+
+- id: 2040
+  type: 9 # assignee
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  assignee_id: 1 # self
+  removed_assignee: false # add assignee
+  created_unix: 946688020
+
+- id: 2041
+  type: 9 # assignee
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  assignee_id: 1
+  removed_assignee: true # remove assignee
+  created_unix: 946688120
+
+- id: 2042
+  type: 9 # assignee
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  assignee_id: 2
+  removed_assignee: false # add assignee
+  created_unix: 946688220
+
+- id: 2043
+  type: 9 # assignee
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  assignee_id: 2 # self
+  removed_assignee: true # remove assignee
+  created_unix: 946688320
+
+- id: 2050
+  type: 23 # lock
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946688420
+
+- id: 2051
+  type: 24 # unlock
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946688520
+
+- id: 2052
+  type: 23 # lock
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  content: "Too heated"
+  created_unix: 946688620
+
+- id: 2053
+  type: 24 # unlock
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946688720
+
+- id: 2060
+  type: 36 # pin
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946688820
+
+- id: 2061
+  type: 37 # unpin
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946688920
+
+- id: 2070
+  type: 2 # close
+  poster_id: 1
+  issue_id: 1 # in repo_id 1
+  created_unix: 946689020
+
+- id: 2071
+  type: 1 # reopen
+  poster_id: 2
+  issue_id: 1 # in repo_id 1
+  created_unix: 946689220
+
+- id: 2072
+  type: 2 # close
+  poster_id: 1
+  issue_id: 2 # pull in repo_id 1
+  created_unix: 946689320
+
+- id: 2073
+  type: 1 # reopen
+  poster_id: 2
+  issue_id: 2 # pull in repo_id 1
+  created_unix: 946689420
+
+- id: 2080
+  type: 3 # issue reference
+  poster_id: 1
+  issue_id: 1 # issue in repo_id 1
+  ref_repo_id: 1
+  ref_issue_id: 5 # issue in repo_id 1
+  created_unix: 946689500
+
+- id: 2081
+  type: 3 # issue reference
+  poster_id: 1
+  issue_id: 1 # issue in repo_id 1
+  ref_repo_id: 1
+  ref_issue_id: 2 # pull in repo_id 1
+  created_unix: 946689600
+
+- id: 2082
+  type: 3 # issue reference
+  poster_id: 1
+  issue_id: 1 # issue in repo_id 1
+  ref_repo_id: 32
+  ref_issue_id: 16 # issue in repo_id 32
+  created_unix: 946689700
+
+- id: 2083
+  type: 3 # issue reference
+  poster_id: 1
+  issue_id: 1 # issue in repo_id 1
+  ref_repo_id: 10
+  ref_issue_id: 8 # pull in repo_id 10
+  created_unix: 946689800
+
+- id: 2090
+  type: 6 # pull reference
+  poster_id: 1
+  issue_id: 2 # pull in repo_id 1
+  ref_repo_id: 1
+  ref_issue_id: 1 # issue in repo_id 1
+  created_unix: 946689900
+
+- id: 2091
+  type: 6 # pull reference
+  poster_id: 1
+  issue_id: 2 # pull in repo_id 1
+  ref_repo_id: 1
+  ref_issue_id: 2 # pull in repo_id 1
+  created_unix: 946690000
+
+- id: 2092
+  type: 6 # pull reference
+  poster_id: 1
+  issue_id: 2 # pull in repo_id 1
+  ref_repo_id: 32
+  ref_issue_id: 16 # issue in repo_id 32
+  created_unix: 946690050
+
+- id: 2093
+  type: 6 # pull reference
+  poster_id: 1
+  issue_id: 2 # pull in repo_id 1
+  ref_repo_id: 10
+  ref_issue_id: 8 # pull in repo_id 10
+  created_unix: 946690100
diff --git a/models/fixtures/deploy_key.yml b/models/fixtures/deploy_key.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/deploy_key.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/external_login_user.yml b/models/fixtures/external_login_user.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/external_login_user.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/federated_user.yml b/models/fixtures/federated_user.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/federated_user.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/federation_host.yml b/models/fixtures/federation_host.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/federation_host.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/follow.yml b/models/fixtures/follow.yml
index b8d35828bf..da3d4a60c1 100644
--- a/models/fixtures/follow.yml
+++ b/models/fixtures/follow.yml
@@ -17,3 +17,13 @@
   id: 4
   user_id: 31
   follow_id: 33
+
+-
+  id: 5
+  user_id: 4
+  follow_id: 8
+
+-
+  id: 6
+  user_id: 5
+  follow_id: 8
diff --git a/models/fixtures/gpg_key_import.yml b/models/fixtures/gpg_key_import.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/gpg_key_import.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/hook_task.yml b/models/fixtures/hook_task.yml
index fc0e03bca1..c62d451868 100644
--- a/models/fixtures/hook_task.yml
+++ b/models/fixtures/hook_task.yml
@@ -18,7 +18,7 @@
   id: 2
   hook_id: 1
   uuid: uuid2
-  is_delivered: false
+  is_delivered: true
 
 -
   id: 3
@@ -40,4 +40,4 @@
   id: 4
   hook_id: 3
   uuid: uuid4
-  is_delivered: false
+  is_delivered: true
diff --git a/models/fixtures/label.yml b/models/fixtures/label.yml
index acfac74968..84c2a7f418 100644
--- a/models/fixtures/label.yml
+++ b/models/fixtures/label.yml
@@ -3,6 +3,7 @@
   repo_id: 1
   org_id: 0
   name: label1
+  description: 'First label'
   color: '#abcdef'
   exclusive: false
   num_issues: 2
@@ -107,3 +108,26 @@
   num_issues: 0
   num_closed_issues: 0
   archived_unix: 0
+
+-
+  id: 11
+  repo_id: 3
+  org_id: 0
+  name: "  <script>malicious</script> /'?&"
+  description: "Malicious label ' <script>malicious</script>"
+  color: '#000000'
+  exclusive: true
+  num_issues: 0
+  num_closed_issues: 0
+  archived_unix: 0
+
+-
+  id: 12
+  repo_id: 3
+  org_id: 0
+  name: 'archived label<>'
+  color: '#000000'
+  exclusive: false
+  num_issues: 0
+  num_closed_issues: 0
+  archived_unix: 2991092130
diff --git a/models/fixtures/login_source.yml b/models/fixtures/login_source.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/login_source.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/protected_branch.yml b/models/fixtures/protected_branch.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/protected_branch.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/pull_request.yml b/models/fixtures/pull_request.yml
index fbc0d504f8..79051ffb6c 100644
--- a/models/fixtures/pull_request.yml
+++ b/models/fixtures/pull_request.yml
@@ -65,6 +65,7 @@
   merge_base: 985f0301dba5e7b34be866819cd15ad3d8f508ee
   has_merged: false
   allow_maintainer_edit: true
+  commits_behind: 1
 
 -
   id: 6
diff --git a/models/fixtures/push_mirror.yml b/models/fixtures/push_mirror.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/push_mirror.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/repo_archiver.yml b/models/fixtures/repo_archiver.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/repo_archiver.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/repo_indexer_status.yml b/models/fixtures/repo_indexer_status.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/repo_indexer_status.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml
index cd49a51796..773f238645 100644
--- a/models/fixtures/repo_unit.yml
+++ b/models/fixtures/repo_unit.yml
@@ -795,3 +795,10 @@
   type: 10
   config: "{}"
   created_unix: 946684810
+
+-
+  id: 115
+  repo_id: 63
+  type: 10
+  config: "{}"
+  created_unix: 946684810
diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml
index f7aaad1f31..2f104eed65 100644
--- a/models/fixtures/repository.yml
+++ b/models/fixtures/repository.yml
@@ -31,6 +31,8 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1731254961
   updated_unix: 1731254961
+  topics: '[]'
+
 -
   id: 2
   owner_id: 2
@@ -61,7 +63,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: true
-
+  topics: '[]'
 -
   id: 3
   owner_id: 3
@@ -94,6 +96,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1700000001
   updated_unix: 1700000001
+  topics: '[]'
 
 -
   id: 4
@@ -125,6 +128,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 5
@@ -132,6 +136,7 @@
   owner_name: org3
   lower_name: repo5
   name: repo5
+  default_branch: master
   num_watches: 0
   num_stars: 0
   num_forks: 0
@@ -157,6 +162,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1700000002
   updated_unix: 1700000002
+  topics: '[]'
 
 -
   id: 6
@@ -189,6 +195,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1710000001
   updated_unix: 1710000001
+  topics: '[]'
 
 -
   id: 7
@@ -221,6 +228,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1710000003
   updated_unix: 1710000003
+  topics: '[]'
 
 -
   id: 8
@@ -253,6 +261,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1710000002
   updated_unix: 1710000002
+  topics: '[]'
 
 -
   id: 9
@@ -283,6 +292,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 10
@@ -314,6 +324,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 11
@@ -345,6 +356,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 12
@@ -375,6 +387,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 13
@@ -405,6 +418,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 14
@@ -436,6 +450,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 15
@@ -467,6 +482,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 16
@@ -498,6 +514,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 17
@@ -528,6 +545,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 18
@@ -558,6 +576,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 19
@@ -588,6 +607,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 20
@@ -618,6 +638,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 21
@@ -648,6 +669,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 22
@@ -678,6 +700,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 23
@@ -708,6 +731,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 24
@@ -738,6 +762,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 25
@@ -768,6 +793,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 26
@@ -798,6 +824,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 27
@@ -828,6 +855,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 28
@@ -858,6 +886,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 29
@@ -888,6 +917,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 30
@@ -918,6 +948,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 31
@@ -949,6 +980,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 32 # org public repo
@@ -981,6 +1013,7 @@
   close_issues_via_commit_in_any_branch: false
   created_unix: 1700000003
   updated_unix: 1700000003
+  topics: '[]'
 
 -
   id: 33
@@ -1012,6 +1045,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 34
@@ -1042,6 +1076,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 35
@@ -1072,6 +1107,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 36
@@ -1103,6 +1139,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 37
@@ -1134,6 +1171,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 38
@@ -1165,6 +1203,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 39
@@ -1196,6 +1235,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 40
@@ -1227,6 +1267,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 41
@@ -1258,6 +1299,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 42
@@ -1289,6 +1331,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 43
@@ -1319,6 +1362,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 44
@@ -1350,6 +1394,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 45
@@ -1380,6 +1425,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 46
@@ -1411,6 +1457,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 47
@@ -1442,6 +1489,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 48
@@ -1473,6 +1521,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 49
@@ -1505,6 +1554,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 50
@@ -1536,6 +1586,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 51
@@ -1567,6 +1618,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 52
@@ -1598,6 +1650,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 53
@@ -1626,6 +1679,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 54
@@ -1638,6 +1692,7 @@
   is_archived: false
   is_private: true
   status: 0
+  topics: '[]'
 
 -
   id: 55
@@ -1650,6 +1705,7 @@
   is_private: true
   num_issues: 1
   status: 0
+  topics: '[]'
 
 -
   id: 56
@@ -1663,6 +1719,7 @@
   is_private: true
   status: 0
   num_issues: 0
+  topics: '[]'
 
 -
   id: 57
@@ -1676,6 +1733,7 @@
   is_private: false
   status: 0
   num_issues: 0
+  topics: '[]'
 
 -
   id: 58 # org public repo
@@ -1707,6 +1765,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 1059
@@ -1720,6 +1779,7 @@
   is_private: false
   status: 0
   num_issues: 0
+  topics: '[]'
 
 -
   id: 59
@@ -1733,6 +1793,7 @@
   is_private: true
   status: 0
   num_issues: 0
+  topics: '[]'
 
 -
   id: 60
@@ -1764,6 +1825,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 -
   id: 61
@@ -1795,6 +1857,7 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
 
 - id: 62
   owner_id: 2
@@ -1825,3 +1888,36 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
+
+-
+  id: 63
+  owner_id: 2
+  owner_name: user2
+  lower_name: test_action_run_search
+  name: test_action_run_search
+  default_branch: main
+  num_watches: 0
+  num_stars: 0
+  num_forks: 0
+  num_issues: 0
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  num_milestones: 0
+  num_closed_milestones: 0
+  num_projects: 0
+  num_closed_projects: 0
+  is_private: true
+  is_empty: false
+  is_archived: false
+  is_mirror: false
+  status: 0
+  is_fork: false
+  fork_id: 0
+  is_template: false
+  template_id: 0
+  size: 0
+  is_fsck_enabled: true
+  close_issues_via_commit_in_any_branch: false
+  topics: '[]'
diff --git a/models/fixtures/secret.yml b/models/fixtures/secret.yml
deleted file mode 100644
index ca780a73aa..0000000000
--- a/models/fixtures/secret.yml
+++ /dev/null
@@ -1 +0,0 @@
-[] # empty
diff --git a/models/fixtures/team.yml b/models/fixtures/team.yml
index 149fe90888..a863f1203a 100644
--- a/models/fixtures/team.yml
+++ b/models/fixtures/team.yml
@@ -239,3 +239,15 @@
   num_members: 2
   includes_all_repositories: false
   can_create_org_repo: false
+
+-
+  id: 25
+  org_id: 17
+  lower_name: super-user
+  name: super-user
+  description: ""
+  authorize: 3
+  num_repos: 0
+  num_members: 0
+  includes_all_repositories: 0
+  can_create_org_repo: 0
diff --git a/models/fixtures/team_unit.yml b/models/fixtures/team_unit.yml
index e8f8d0e422..4d282a7eb5 100644
--- a/models/fixtures/team_unit.yml
+++ b/models/fixtures/team_unit.yml
@@ -329,3 +329,10 @@
   team_id: 22
   type: 3
   access_mode: 1
+
+-
+  id: 84
+  org_id: 17
+  team_id: 25
+  type: 3
+  access_mode: 3
diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml
index 630505b8b4..00aa182540 100644
--- a/models/fixtures/user.yml
+++ b/models/fixtures/user.yml
@@ -53,6 +53,7 @@
   login_source: 0
   login_name: user2
   type: 0
+  website: https://keyoxide.org/eb114f5e6c0dc2bcdd183550a4b61a2dc5923710
   salt: ZogKvWdyEx
   max_repo_creation: -1
   is_active: true
@@ -69,7 +70,7 @@
   num_followers: 2
   num_following: 1
   num_stars: 2
-  num_repos: 17
+  num_repos: 18
   num_teams: 0
   num_members: 0
   visibility: 0
@@ -93,7 +94,7 @@
   login_name: org3
   type: 1
   salt: ZogKvWdyEx
-  max_repo_creation: -1
+  max_repo_creation: 1000
   is_active: false
   is_admin: false
   is_restricted: false
@@ -143,7 +144,7 @@
   avatar_email: user4@example.com
   use_custom_avatar: true
   num_followers: 0
-  num_following: 1
+  num_following: 2
   num_stars: 0
   num_repos: 0
   num_teams: 0
@@ -181,7 +182,7 @@
   avatar_email: user5@example.com
   use_custom_avatar: true
   num_followers: 0
-  num_following: 0
+  num_following: 1
   num_stars: 0
   num_repos: 1
   num_teams: 0
@@ -294,7 +295,7 @@
   avatar: ""
   avatar_email: user8@example.com
   use_custom_avatar: true
-  num_followers: 1
+  num_followers: 3
   num_following: 1
   num_stars: 0
   num_repos: 0
@@ -641,7 +642,7 @@
   num_following: 0
   num_stars: 0
   num_repos: 2
-  num_teams: 3
+  num_teams: 4
   num_members: 4
   visibility: 0
   repo_admin_change_team_access: false
diff --git a/models/forgefed/federationhost.go b/models/forgefed/federationhost.go
index 00f13ea399..978847bd95 100644
--- a/models/forgefed/federationhost.go
+++ b/models/forgefed/federationhost.go
@@ -1,10 +1,12 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package forgefed
 
 import (
+	"database/sql"
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -15,19 +17,25 @@ import (
 // FederationHost data type
 // swagger:model
 type FederationHost struct {
-	ID             int64              `xorm:"pk autoincr"`
-	HostFqdn       string             `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
-	NodeInfo       NodeInfo           `xorm:"extends NOT NULL"`
-	LatestActivity time.Time          `xorm:"NOT NULL"`
-	Created        timeutil.TimeStamp `xorm:"created"`
-	Updated        timeutil.TimeStamp `xorm:"updated"`
+	ID             int64                  `xorm:"pk autoincr"`
+	HostFqdn       string                 `xorm:"host_fqdn UNIQUE(federation_host) INDEX VARCHAR(255) NOT NULL"`
+	HostPort       uint16                 `xorm:" UNIQUE(federation_host) INDEX NOT NULL DEFAULT 443"`
+	NodeInfo       NodeInfo               `xorm:"extends NOT NULL"`
+	HostSchema     string                 `xorm:"NOT NULL DEFAULT 'https'"`
+	LatestActivity time.Time              `xorm:"NOT NULL"`
+	KeyID          sql.NullString         `xorm:"key_id UNIQUE"`
+	PublicKey      sql.Null[sql.RawBytes] `xorm:"BLOB"`
+	Created        timeutil.TimeStamp     `xorm:"created"`
+	Updated        timeutil.TimeStamp     `xorm:"updated"`
 }
 
 // Factory function for FederationHost. Created struct is asserted to be valid.
-func NewFederationHost(nodeInfo NodeInfo, hostFqdn string) (FederationHost, error) {
+func NewFederationHost(hostFqdn string, nodeInfo NodeInfo, port uint16, schema string) (FederationHost, error) {
 	result := FederationHost{
-		HostFqdn: strings.ToLower(hostFqdn),
-		NodeInfo: nodeInfo,
+		HostFqdn:   strings.ToLower(hostFqdn),
+		NodeInfo:   nodeInfo,
+		HostPort:   port,
+		HostSchema: schema,
 	}
 	if valid, err := validation.IsValid(result); !valid {
 		return FederationHost{}, err
@@ -35,11 +43,20 @@ func NewFederationHost(nodeInfo NodeInfo, hostFqdn string) (FederationHost, erro
 	return result, nil
 }
 
+func (host FederationHost) AsURL() url.URL {
+	return url.URL{
+		Scheme: host.HostSchema,
+		Host:   fmt.Sprintf("%v:%v", host.HostFqdn, host.HostPort),
+	}
+}
+
 // Validate collects error strings in a slice and returns this
 func (host FederationHost) Validate() []string {
 	var result []string
 	result = append(result, validation.ValidateNotEmpty(host.HostFqdn, "HostFqdn")...)
 	result = append(result, validation.ValidateMaxLen(host.HostFqdn, 255, "HostFqdn")...)
+	result = append(result, validation.ValidateNotEmpty(host.HostPort, "HostPort")...)
+	result = append(result, validation.ValidateNotEmpty(host.HostSchema, "HostSchema")...)
 	result = append(result, host.NodeInfo.Validate()...)
 	if host.HostFqdn != strings.ToLower(host.HostFqdn) {
 		result = append(result, fmt.Sprintf("HostFqdn has to be lower case but was: %v", host.HostFqdn))
diff --git a/models/forgefed/federationhost_repository.go b/models/forgefed/federationhost_repository.go
index b04a5cd882..687966605f 100644
--- a/models/forgefed/federationhost_repository.go
+++ b/models/forgefed/federationhost_repository.go
@@ -6,7 +6,6 @@ package forgefed
 import (
 	"context"
 	"fmt"
-	"strings"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/validation"
@@ -30,9 +29,9 @@ func GetFederationHost(ctx context.Context, ID int64) (*FederationHost, error) {
 	return host, nil
 }
 
-func FindFederationHostByFqdn(ctx context.Context, fqdn string) (*FederationHost, error) {
+func findFederationHostFromDB(ctx context.Context, searchKey, searchValue string) (*FederationHost, error) {
 	host := new(FederationHost)
-	has, err := db.GetEngine(ctx).Where("host_fqdn=?", strings.ToLower(fqdn)).Get(host)
+	has, err := db.GetEngine(ctx).Where(searchKey, searchValue).Get(host)
 	if err != nil {
 		return nil, err
 	} else if !has {
@@ -44,6 +43,24 @@ func FindFederationHostByFqdn(ctx context.Context, fqdn string) (*FederationHost
 	return host, nil
 }
 
+func FindFederationHostByFqdnAndPort(ctx context.Context, fqdn string, port uint16) (*FederationHost, error) {
+	host := new(FederationHost)
+	has, err := db.GetEngine(ctx).Where("host_fqdn=? AND host_port=?", fqdn, port).Get(host)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, nil
+	}
+	if res, err := validation.IsValid(host); !res {
+		return nil, err
+	}
+	return host, nil
+}
+
+func FindFederationHostByKeyID(ctx context.Context, keyID string) (*FederationHost, error) {
+	return findFederationHostFromDB(ctx, "key_id=?", keyID)
+}
+
 func CreateFederationHost(ctx context.Context, host *FederationHost) error {
 	if res, err := validation.IsValid(host); !res {
 		return err
diff --git a/models/forgefed/federationhost_test.go b/models/forgefed/federationhost_test.go
index 7e48a41d3b..d11affbae0 100644
--- a/models/forgefed/federationhost_test.go
+++ b/models/forgefed/federationhost_test.go
@@ -18,6 +18,8 @@ func Test_FederationHostValidation(t *testing.T) {
 			SoftwareName: "forgejo",
 		},
 		LatestActivity: time.Now(),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, err := validation.IsValid(sut); !res {
 		t.Errorf("sut should be valid but was %q", err)
@@ -29,9 +31,11 @@ func Test_FederationHostValidation(t *testing.T) {
 			SoftwareName: "forgejo",
 		},
 		LatestActivity: time.Now(),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid: HostFqdn empty")
+		t.Error("sut should be invalid: HostFqdn empty")
 	}
 
 	sut = FederationHost{
@@ -40,18 +44,22 @@ func Test_FederationHostValidation(t *testing.T) {
 			SoftwareName: "forgejo",
 		},
 		LatestActivity: time.Now(),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid: HostFqdn too long (len=256)")
+		t.Error("sut should be invalid: HostFqdn too long (len=256)")
 	}
 
 	sut = FederationHost{
 		HostFqdn:       "host.do.main",
 		NodeInfo:       NodeInfo{},
 		LatestActivity: time.Now(),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid: NodeInfo invalid")
+		t.Error("sut should be invalid: NodeInfo invalid")
 	}
 
 	sut = FederationHost{
@@ -60,9 +68,11 @@ func Test_FederationHostValidation(t *testing.T) {
 			SoftwareName: "forgejo",
 		},
 		LatestActivity: time.Now().Add(1 * time.Hour),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid: Future timestamp")
+		t.Error("sut should be invalid: Future timestamp")
 	}
 
 	sut = FederationHost{
@@ -71,8 +81,10 @@ func Test_FederationHostValidation(t *testing.T) {
 			SoftwareName: "forgejo",
 		},
 		LatestActivity: time.Now(),
+		HostPort:       443,
+		HostSchema:     "https",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid: HostFqdn lower case")
+		t.Error("sut should be invalid: HostFqdn lower case")
 	}
 }
diff --git a/models/forgefed/nodeinfo.go b/models/forgefed/nodeinfo.go
index 2461b5e499..38f51304c5 100644
--- a/models/forgefed/nodeinfo.go
+++ b/models/forgefed/nodeinfo.go
@@ -17,12 +17,14 @@ type (
 )
 
 const (
-	ForgejoSourceType SoftwareNameType = "forgejo"
-	GiteaSourceType   SoftwareNameType = "gitea"
+	ForgejoSourceType    SoftwareNameType = "forgejo"
+	GiteaSourceType      SoftwareNameType = "gitea"
+	MastodonSourceType   SoftwareNameType = "mastodon"
+	GoToSocialSourceType SoftwareNameType = "gotosocial"
 )
 
 var KnownSourceTypes = []any{
-	ForgejoSourceType, GiteaSourceType,
+	ForgejoSourceType, GiteaSourceType, MastodonSourceType, GoToSocialSourceType,
 }
 
 // ------------------------------------------------ NodeInfoWellKnown ------------------------------------------------
diff --git a/models/forgefed/nodeinfo_test.go b/models/forgefed/nodeinfo_test.go
index 9e37e77100..a0c9781b90 100644
--- a/models/forgefed/nodeinfo_test.go
+++ b/models/forgefed/nodeinfo_test.go
@@ -4,7 +4,7 @@
 package forgefed
 
 import (
-	"fmt"
+	"errors"
 	"reflect"
 	"strings"
 	"testing"
@@ -28,7 +28,7 @@ func Test_NodeInfoWellKnownUnmarshalJSON(t *testing.T) {
 		},
 		"empty": {
 			item:    []byte(``),
-			wantErr: fmt.Errorf("cannot parse JSON: cannot parse empty string; unparsed tail: \"\""),
+			wantErr: errors.New("cannot parse JSON: cannot parse empty string; unparsed tail: \"\""),
 		},
 	}
 
@@ -74,7 +74,7 @@ func Test_NewNodeInfoWellKnown(t *testing.T) {
 
 	_, err := NewNodeInfoWellKnown([]byte(`invalid`))
 	if err == nil {
-		t.Errorf("error was expected here")
+		t.Error("error was expected here")
 	}
 }
 
@@ -87,6 +87,6 @@ func Test_NewNodeInfo(t *testing.T) {
 
 	_, err := NewNodeInfo([]byte(`invalid`))
 	if err == nil {
-		t.Errorf("error was expected here")
+		t.Error("error was expected here")
 	}
 }
diff --git a/models/forgejo/semver/semver_test.go b/models/forgejo/semver/semver_test.go
index 2d055e86bb..10989ecad3 100644
--- a/models/forgejo/semver/semver_test.go
+++ b/models/forgejo/semver/semver_test.go
@@ -22,7 +22,7 @@ func TestForgejoSemVerSetGet(t *testing.T) {
 	require.NoError(t, SetVersionString(ctx, newVersion.String()))
 	databaseVersion, err := GetVersion(ctx)
 	require.NoError(t, err)
-	assert.EqualValues(t, newVersion.String(), databaseVersion.String())
+	assert.Equal(t, newVersion.String(), databaseVersion.String())
 	assert.True(t, newVersion.Equal(databaseVersion))
 }
 
@@ -36,12 +36,12 @@ func TestForgejoSemVerMissing(t *testing.T) {
 
 	v, err := GetVersion(ctx)
 	require.NoError(t, err)
-	assert.EqualValues(t, "1.0.0", v.String())
+	assert.Equal(t, "1.0.0", v.String())
 
 	_, err = e.Exec("drop table forgejo_sem_ver")
 	require.NoError(t, err)
 
 	v, err = GetVersion(ctx)
 	require.NoError(t, err)
-	assert.EqualValues(t, "1.0.0", v.String())
+	assert.Equal(t, "1.0.0", v.String())
 }
diff --git a/models/forgejo_migrations/main_test.go b/models/forgejo_migrations/main_test.go
index 031fe8090d..2246e327f0 100644
--- a/models/forgejo_migrations/main_test.go
+++ b/models/forgejo_migrations/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"testing"
diff --git a/models/forgejo_migrations/migrate.go b/models/forgejo_migrations/migrate.go
index a4cbca70c1..71fcf16e7a 100644
--- a/models/forgejo_migrations/migrate.go
+++ b/models/forgejo_migrations/migrate.go
@@ -1,10 +1,11 @@
 // Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 
@@ -94,6 +95,30 @@ var migrations = []*Migration{
 	NewMigration("Add `created_unix` column to `user_redirect` table", AddCreatedUnixToRedirect),
 	// v27 -> v28
 	NewMigration("Add pronoun privacy settings to user", AddHidePronounsOptionToUser),
+	// v28 -> v29
+	NewMigration("Add public key information to `FederatedUser` and `FederationHost`", AddPublicKeyInformationForFederation),
+	// v29 -> v30
+	NewMigration("Migrate `User.NormalizedFederatedURI` column to extract port & schema into FederatedHost", MigrateNormalizedFederatedURI),
+	// v30 -> v31
+	NewMigration("Normalize repository.topics to empty slice instead of null", SetTopicsAsEmptySlice),
+	// v31 -> v32
+	NewMigration("Migrate maven package name concatenation", ChangeMavenArtifactConcatenation),
+	// v32 -> v33
+	NewMigration("Add federated user activity tables, update the `federated_user` table & add indexes", FederatedUserActivityMigration),
+	// v33 -> v34
+	NewMigration("Add `notify-email` column to `action_run` table", AddNotifyEmailToActionRun),
+	// v34 -> v35
+	NewMigration("Noop because of https://codeberg.org/forgejo/forgejo/issues/8373", NoopAddIndexToActionRunStopped),
+	// v35 -> v36
+	NewMigration("Fix wiki unit default permission", FixWikiUnitDefaultPermission),
+	// v36 -> v37
+	NewMigration("Add `branch_filter` to `push_mirror` table", AddPushMirrorBranchFilter),
+	// v37 -> v38
+	NewMigration("Add `resolved_unix` column to `abuse_report` table", AddResolvedUnixToAbuseReport),
+	// v38 -> v39
+	NewMigration("Migrate `data` column of `secret` table to store keying material", MigrateActionSecretsToKeying),
+	// v39 -> v40
+	NewMigration("Add index for release sha1", AddIndexForReleaseSha1),
 }
 
 // GetCurrentDBVersion returns the current Forgejo database version.
@@ -126,7 +151,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
 	}
 
 	if currentDB < 0 {
-		return fmt.Errorf("database has not been initialized")
+		return errors.New("database has not been initialized")
 	}
 
 	expected := ExpectedVersion()
diff --git a/models/forgejo_migrations/migrate_test.go b/models/forgejo_migrations/migrate_test.go
index 20653929a3..9d16c9fe1c 100644
--- a/models/forgejo_migrations/migrate_test.go
+++ b/models/forgejo_migrations/migrate_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"testing"
diff --git a/models/forgejo_migrations/v13.go b/models/forgejo_migrations/v13.go
index 614f68249d..ba4183885e 100644
--- a/models/forgejo_migrations/v13.go
+++ b/models/forgejo_migrations/v13.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v14.go b/models/forgejo_migrations/v14.go
index 53f1ef2223..65b857d343 100644
--- a/models/forgejo_migrations/v14.go
+++ b/models/forgejo_migrations/v14.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/forgejo_migrations/v15.go b/models/forgejo_migrations/v15.go
index 5e5588dd05..a63199ab19 100644
--- a/models/forgejo_migrations/v15.go
+++ b/models/forgejo_migrations/v15.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"time"
diff --git a/models/forgejo_migrations/v16.go b/models/forgejo_migrations/v16.go
index f80bfc5268..a7d4d5d590 100644
--- a/models/forgejo_migrations/v16.go
+++ b/models/forgejo_migrations/v16.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v17.go b/models/forgejo_migrations/v17.go
index d6e2983d00..8ef6f2c681 100644
--- a/models/forgejo_migrations/v17.go
+++ b/models/forgejo_migrations/v17.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v18.go b/models/forgejo_migrations/v18.go
index e6c1493f0e..e39b0cbf10 100644
--- a/models/forgejo_migrations/v18.go
+++ b/models/forgejo_migrations/v18.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v19.go b/models/forgejo_migrations/v19.go
index 69b7746eb1..43d279dcb0 100644
--- a/models/forgejo_migrations/v19.go
+++ b/models/forgejo_migrations/v19.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v1_20/v1.go b/models/forgejo_migrations/v1_20/v1.go
index 72beaf23de..f0cb125557 100644
--- a/models/forgejo_migrations/v1_20/v1.go
+++ b/models/forgejo_migrations/v1_20/v1.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_v1_20 //nolint:revive
+package forgejo_v1_20
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/forgejo_migrations/v1_20/v2.go b/models/forgejo_migrations/v1_20/v2.go
index 39f3b58924..3f79ac3801 100644
--- a/models/forgejo_migrations/v1_20/v2.go
+++ b/models/forgejo_migrations/v1_20/v2.go
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-package forgejo_v1_20 //nolint:revive
+package forgejo_v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_20/v3.go b/models/forgejo_migrations/v1_20/v3.go
index cce227e6eb..49530df556 100644
--- a/models/forgejo_migrations/v1_20/v3.go
+++ b/models/forgejo_migrations/v1_20/v3.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_v1_20 //nolint:revive
+package forgejo_v1_20
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/forgejo_migrations/v1_22/main_test.go b/models/forgejo_migrations/v1_22/main_test.go
index 03c4c5272c..d6a5bdacee 100644
--- a/models/forgejo_migrations/v1_22/main_test.go
+++ b/models/forgejo_migrations/v1_22/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
diff --git a/models/forgejo_migrations/v1_22/v10.go b/models/forgejo_migrations/v1_22/v10.go
index 819800ae71..cf45abdd24 100644
--- a/models/forgejo_migrations/v1_22/v10.go
+++ b/models/forgejo_migrations/v1_22/v10.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_22/v11.go b/models/forgejo_migrations/v1_22/v11.go
index 17bb592379..f0f92bd04c 100644
--- a/models/forgejo_migrations/v1_22/v11.go
+++ b/models/forgejo_migrations/v1_22/v11.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/forgejo_migrations/v1_22/v12.go b/models/forgejo_migrations/v1_22/v12.go
index 6822524705..51354bd3c2 100644
--- a/models/forgejo_migrations/v1_22/v12.go
+++ b/models/forgejo_migrations/v1_22/v12.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v1_22/v4.go b/models/forgejo_migrations/v1_22/v4.go
index f1195f5f66..499d377bb4 100644
--- a/models/forgejo_migrations/v1_22/v4.go
+++ b/models/forgejo_migrations/v1_22/v4.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_22/v5.go b/models/forgejo_migrations/v1_22/v5.go
index 55f9fe1338..1671d3eed2 100644
--- a/models/forgejo_migrations/v1_22/v5.go
+++ b/models/forgejo_migrations/v1_22/v5.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_22/v6.go b/models/forgejo_migrations/v1_22/v6.go
index 1a4874872c..072f8e6a15 100644
--- a/models/forgejo_migrations/v1_22/v6.go
+++ b/models/forgejo_migrations/v1_22/v6.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_22/v7.go b/models/forgejo_migrations/v1_22/v7.go
index b42dd1af67..e7f6eb412b 100644
--- a/models/forgejo_migrations/v1_22/v7.go
+++ b/models/forgejo_migrations/v1_22/v7.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/forgejo_migrations/v1_22/v8.go b/models/forgejo_migrations/v1_22/v8.go
index 2d3c0c594b..f23b00d2ad 100644
--- a/models/forgejo_migrations/v1_22/v8.go
+++ b/models/forgejo_migrations/v1_22/v8.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"strings"
diff --git a/models/forgejo_migrations/v1_22/v8_test.go b/models/forgejo_migrations/v1_22/v8_test.go
index 2af9e431b1..5117dd2dfb 100644
--- a/models/forgejo_migrations/v1_22/v8_test.go
+++ b/models/forgejo_migrations/v1_22/v8_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
@@ -29,7 +29,7 @@ func Test_RemoveSSHSignaturesFromReleaseNotes(t *testing.T) {
 	require.NoError(t, err)
 	assert.Len(t, releases, 3)
 
-	assert.Equal(t, "", releases[0].Note)
+	assert.Empty(t, releases[0].Note)
 	assert.Equal(t, "A message.\n", releases[1].Note)
 	assert.Equal(t, "no signature present here", releases[2].Note)
 }
diff --git a/models/forgejo_migrations/v1_22/v9.go b/models/forgejo_migrations/v1_22/v9.go
index 34c2844c39..e3cdea97f2 100644
--- a/models/forgejo_migrations/v1_22/v9.go
+++ b/models/forgejo_migrations/v1_22/v9.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v20.go b/models/forgejo_migrations/v20.go
index 8ca9e91f73..91c7b8e911 100644
--- a/models/forgejo_migrations/v20.go
+++ b/models/forgejo_migrations/v20.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v21.go b/models/forgejo_migrations/v21.go
index 53f141b2ab..61d7950c5a 100644
--- a/models/forgejo_migrations/v21.go
+++ b/models/forgejo_migrations/v21.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v22.go b/models/forgejo_migrations/v22.go
index eeb738799c..8078591da6 100644
--- a/models/forgejo_migrations/v22.go
+++ b/models/forgejo_migrations/v22.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v23.go b/models/forgejo_migrations/v23.go
index 20a916a716..a79a4f3d6e 100644
--- a/models/forgejo_migrations/v23.go
+++ b/models/forgejo_migrations/v23.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v24.go b/models/forgejo_migrations/v24.go
index ebfb5fc1c4..084a57e1ce 100644
--- a/models/forgejo_migrations/v24.go
+++ b/models/forgejo_migrations/v24.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v25.go b/models/forgejo_migrations/v25.go
index 8e3032a40c..56cde499a3 100644
--- a/models/forgejo_migrations/v25.go
+++ b/models/forgejo_migrations/v25.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"context"
diff --git a/models/forgejo_migrations/v25_test.go b/models/forgejo_migrations/v25_test.go
index e7402fd021..68e71da012 100644
--- a/models/forgejo_migrations/v25_test.go
+++ b/models/forgejo_migrations/v25_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"testing"
diff --git a/models/forgejo_migrations/v26.go b/models/forgejo_migrations/v26.go
index 3292d93ffd..a0c47799c2 100644
--- a/models/forgejo_migrations/v26.go
+++ b/models/forgejo_migrations/v26.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v27.go b/models/forgejo_migrations/v27.go
index 2efa3485a8..9cfbc64370 100644
--- a/models/forgejo_migrations/v27.go
+++ b/models/forgejo_migrations/v27.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/forgejo_migrations/v28.go b/models/forgejo_migrations/v28.go
index cba888d2ec..19f0dcd862 100644
--- a/models/forgejo_migrations/v28.go
+++ b/models/forgejo_migrations/v28.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package forgejo_migrations //nolint:revive
+package forgejo_migrations
 
 import "xorm.io/xorm"
 
diff --git a/models/forgejo_migrations/v29.go b/models/forgejo_migrations/v29.go
new file mode 100644
index 0000000000..92eb05e8b3
--- /dev/null
+++ b/models/forgejo_migrations/v29.go
@@ -0,0 +1,29 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgejo_migrations
+
+import (
+	"database/sql"
+
+	"xorm.io/xorm"
+)
+
+func AddPublicKeyInformationForFederation(x *xorm.Engine) error {
+	type FederationHost struct {
+		KeyID     sql.NullString         `xorm:"key_id UNIQUE"`
+		PublicKey sql.Null[sql.RawBytes] `xorm:"BLOB"`
+	}
+
+	err := x.Sync(&FederationHost{})
+	if err != nil {
+		return err
+	}
+
+	type FederatedUser struct {
+		KeyID     sql.NullString         `xorm:"key_id UNIQUE"`
+		PublicKey sql.Null[sql.RawBytes] `xorm:"BLOB"`
+	}
+
+	return x.Sync(&FederatedUser{})
+}
diff --git a/models/forgejo_migrations/v30.go b/models/forgejo_migrations/v30.go
new file mode 100644
index 0000000000..05a1dff898
--- /dev/null
+++ b/models/forgejo_migrations/v30.go
@@ -0,0 +1,106 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgejo_migrations
+
+import (
+	"time"
+
+	"forgejo.org/models/migrations/base"
+	"forgejo.org/modules/forgefed"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/xorm"
+)
+
+func MigrateNormalizedFederatedURI(x *xorm.Engine) error {
+	// Update schema
+	type FederatedUser struct {
+		ID                    int64  `xorm:"pk autoincr"`
+		UserID                int64  `xorm:"NOT NULL"`
+		ExternalID            string `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+		FederationHostID      int64  `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+		NormalizedOriginalURL string
+	}
+	type User struct {
+		ID                     int64 `xorm:"pk autoincr"`
+		NormalizedFederatedURI string
+	}
+	type FederationHost struct {
+		ID             int64              `xorm:"pk autoincr"`
+		HostFqdn       string             `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
+		NodeInfo       NodeInfo           `xorm:"extends NOT NULL"`
+		HostPort       uint16             `xorm:"NOT NULL DEFAULT 443"`
+		HostSchema     string             `xorm:"NOT NULL DEFAULT 'https'"`
+		LatestActivity time.Time          `xorm:"NOT NULL"`
+		Created        timeutil.TimeStamp `xorm:"created"`
+		Updated        timeutil.TimeStamp `xorm:"updated"`
+	}
+	if err := x.Sync(new(User), new(FederatedUser), new(FederationHost)); err != nil {
+		return err
+	}
+
+	// Migrate
+	sessMigration := x.NewSession()
+	defer sessMigration.Close()
+	if err := sessMigration.Begin(); err != nil {
+		return err
+	}
+	federatedUsers := make([]*FederatedUser, 0)
+	err := sessMigration.OrderBy("id").Find(&federatedUsers)
+	if err != nil {
+		return err
+	}
+
+	for _, federatedUser := range federatedUsers {
+		if federatedUser.NormalizedOriginalURL != "" {
+			log.Trace("migration[30]: FederatedUser was already migrated %v", federatedUser)
+		} else {
+			user := &User{}
+			has, err := sessMigration.Where("id=?", federatedUser.UserID).Get(user)
+			if err != nil {
+				return err
+			}
+
+			if !has {
+				log.Debug("migration[30]: User missing for federated user: %v", federatedUser)
+				_, err := sessMigration.Delete(federatedUser)
+				if err != nil {
+					return err
+				}
+			} else {
+				// Migrate User.NormalizedFederatedURI -> FederatedUser.NormalizedOriginalUrl
+				sql := "UPDATE `federated_user` SET `normalized_original_url` = ? WHERE `id` = ?"
+				if _, err := sessMigration.Exec(sql, user.NormalizedFederatedURI, federatedUser.FederationHostID); err != nil {
+					return err
+				}
+
+				// Migrate (Port, Schema) FederatedUser.NormalizedOriginalUrl -> FederationHost.(Port, Schema)
+				actorID, err := forgefed.NewActorID(user.NormalizedFederatedURI)
+				if err != nil {
+					return err
+				}
+				sql = "UPDATE `federation_host` SET `host_port` = ?, `host_schema` = ? WHERE `id` = ?"
+				if _, err := sessMigration.Exec(sql, actorID.HostPort, actorID.HostSchema, federatedUser.FederationHostID); err != nil {
+					return err
+				}
+			}
+		}
+	}
+
+	if err := sessMigration.Commit(); err != nil {
+		return err
+	}
+
+	// Drop User.NormalizedFederatedURI field in extra transaction
+	sessSchema := x.NewSession()
+	defer sessSchema.Close()
+	if err := sessSchema.Begin(); err != nil {
+		return err
+	}
+	if err := base.DropTableColumns(sessSchema, "user", "normalized_federated_uri"); err != nil {
+		return err
+	}
+	return sessSchema.Commit()
+}
diff --git a/models/forgejo_migrations/v30_test.go b/models/forgejo_migrations/v30_test.go
new file mode 100644
index 0000000000..152fddeb47
--- /dev/null
+++ b/models/forgejo_migrations/v30_test.go
@@ -0,0 +1,81 @@
+// Copyright 2025 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"testing"
+	"time"
+
+	migration_tests "forgejo.org/models/migrations/test"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/require"
+	"xorm.io/xorm/schemas"
+)
+
+func Test_MigrateNormalizedFederatedURI(t *testing.T) {
+	// Old structs
+	type User struct {
+		ID                     int64 `xorm:"pk autoincr"`
+		NormalizedFederatedURI string
+	}
+	type FederatedUser struct {
+		ID               int64  `xorm:"pk autoincr"`
+		UserID           int64  `xorm:"NOT NULL"`
+		ExternalID       string `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+		FederationHostID int64  `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+	}
+	type FederationHost struct {
+		ID             int64              `xorm:"pk autoincr"`
+		HostFqdn       string             `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
+		SoftwareName   string             `xorm:"NOT NULL"`
+		LatestActivity time.Time          `xorm:"NOT NULL"`
+		Created        timeutil.TimeStamp `xorm:"created"`
+		Updated        timeutil.TimeStamp `xorm:"updated"`
+	}
+
+	// Prepare TestEnv
+	x, deferable := migration_tests.PrepareTestEnv(t, 0,
+		new(User),
+		new(FederatedUser),
+		new(FederationHost),
+	)
+	defer deferable()
+	if x == nil || t.Failed() {
+		return
+	}
+
+	// test for expected results
+	getColumn := func(tn, co string) *schemas.Column {
+		tables, err := x.DBMetas()
+		require.NoError(t, err)
+		var table *schemas.Table
+		for _, elem := range tables {
+			if elem.Name == tn {
+				table = elem
+				break
+			}
+		}
+		return table.GetColumn(co)
+	}
+
+	require.NotNil(t, getColumn("user", "normalized_federated_uri"))
+	require.Nil(t, getColumn("federation_host", "host_port"))
+	require.Nil(t, getColumn("federation_host", "host_schema"))
+	cnt1, err := x.Table("federated_user").Count()
+	require.NoError(t, err)
+	require.Equal(t, int64(2), cnt1)
+
+	require.NoError(t, MigrateNormalizedFederatedURI(x))
+
+	require.Nil(t, getColumn("user", "normalized_federated_uri"))
+	require.NotNil(t, getColumn("federation_host", "host_port"))
+	require.NotNil(t, getColumn("federation_host", "host_schema"))
+	cnt2, err := x.Table("federated_user").Count()
+	require.NoError(t, err)
+	require.Equal(t, int64(1), cnt2)
+
+	// idempotent
+	require.NoError(t, MigrateNormalizedFederatedURI(x))
+}
diff --git a/models/forgejo_migrations/v31.go b/models/forgejo_migrations/v31.go
new file mode 100644
index 0000000000..23397c7c13
--- /dev/null
+++ b/models/forgejo_migrations/v31.go
@@ -0,0 +1,58 @@
+// Copyright 2025 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
+)
+
+func SetTopicsAsEmptySlice(x *xorm.Engine) error {
+	var err error
+	switch x.Dialect().URI().DBType {
+	case schemas.MYSQL:
+		_, err = x.Exec("UPDATE `repository` SET topics = '[]' WHERE topics IS NULL OR topics = 'null'")
+	case schemas.SQLITE:
+		_, err = x.Exec("UPDATE `repository` SET topics = '[]' WHERE topics IS NULL OR topics = 'null'")
+	case schemas.POSTGRES:
+		_, err = x.Exec("UPDATE `repository` SET topics = '[]' WHERE topics IS NULL OR topics::text = 'null'")
+	}
+
+	if err != nil {
+		return err
+	}
+
+	if x.Dialect().URI().DBType == schemas.SQLITE {
+		sessMigration := x.NewSession()
+		defer sessMigration.Close()
+		if err := sessMigration.Begin(); err != nil {
+			return err
+		}
+		_, err = sessMigration.Exec("ALTER TABLE `repository` RENAME COLUMN `topics` TO `topics_backup`")
+		if err != nil {
+			return err
+		}
+		_, err = sessMigration.Exec("ALTER TABLE `repository` ADD COLUMN `topics` TEXT NOT NULL DEFAULT '[]'")
+		if err != nil {
+			return err
+		}
+		_, err = sessMigration.Exec("UPDATE `repository` SET `topics` = `topics_backup`")
+		if err != nil {
+			return err
+		}
+		_, err = sessMigration.Exec("ALTER TABLE `repository` DROP COLUMN `topics_backup`")
+		if err != nil {
+			return err
+		}
+
+		return sessMigration.Commit()
+	}
+
+	type Repository struct {
+		ID     int64    `xorm:"pk autoincr"`
+		Topics []string `xorm:"TEXT JSON NOT NULL"`
+	}
+
+	return x.Sync(new(Repository))
+}
diff --git a/models/forgejo_migrations/v31_test.go b/models/forgejo_migrations/v31_test.go
new file mode 100644
index 0000000000..6d1690aae0
--- /dev/null
+++ b/models/forgejo_migrations/v31_test.go
@@ -0,0 +1,38 @@
+// Copyright 2025 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"testing"
+
+	migration_tests "forgejo.org/models/migrations/test"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_SetTopicsAsEmptySlice(t *testing.T) {
+	type Repository struct {
+		ID     int64    `xorm:"pk autoincr"`
+		Topics []string `xorm:"TEXT JSON"`
+	}
+
+	x, deferable := migration_tests.PrepareTestEnv(t, 0, new(Repository))
+	defer deferable()
+	if x == nil || t.Failed() {
+		return
+	}
+
+	require.NoError(t, SetTopicsAsEmptySlice(x))
+
+	var repos []Repository
+	require.NoError(t, x.Find(&repos))
+
+	for _, repo := range repos {
+		if repo.ID == 2 {
+			require.Equal(t, []string{"go", "dev"}, repo.Topics, "Valid topics should remain unchanged")
+		} else {
+			require.Equal(t, []string{}, repo.Topics, "NULL topics should be set to empty array")
+		}
+	}
+}
diff --git a/models/forgejo_migrations/v32.go b/models/forgejo_migrations/v32.go
new file mode 100644
index 0000000000..ce3f855694
--- /dev/null
+++ b/models/forgejo_migrations/v32.go
@@ -0,0 +1,407 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"encoding/xml"
+	"fmt"
+	"regexp"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
+
+	"forgejo.org/models/db"
+	"forgejo.org/models/packages"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/packages/maven"
+	packages_service "forgejo.org/services/packages"
+
+	"golang.org/x/net/context"
+	"xorm.io/xorm"
+)
+
+var getPackage = packages_service.GetPackageFileStream
+
+type Snapshot struct {
+	baseVersion string
+	date        string
+	time        string
+	build       int
+}
+
+type Metadata struct {
+	XMLName      xml.Name `xml:"metadata"`
+	ModelVersion string   `xml:"modelVersion,attr"`
+	GroupID      string   `xml:"groupId"`
+	ArtifactID   string   `xml:"artifactId"`
+	Version      string   `xml:"version"`
+}
+
+type mavenPackageResult struct {
+	PackageFile    *packages.PackageFile    `xorm:"extends"`
+	PackageVersion *packages.PackageVersion `xorm:"extends"`
+	Package        *packages.Package        `xorm:"extends"`
+	PackageName    string                   `xorm:"-"`
+	Snapshot       *Snapshot                `xorm:"-"`
+	GroupID        string                   `xorm:"-"`
+	ArtifactID     string                   `xorm:"-"`
+}
+
+// ChangeMavenArtifactConcatenation resolves old dash-concatenated Maven coordinates and regenerates metadata.
+// Note: runs per-owner in a single transaction; failures roll back all owners.
+func ChangeMavenArtifactConcatenation(x *xorm.Engine) error {
+	return db.WithTx(db.DefaultContext, func(ctx context.Context) error {
+		// get unique owner IDs of Maven packages
+		var ownerIDs []*int64
+		if err := db.GetEngine(ctx).
+			Table("package").
+			Select("package.owner_id").
+			Where("package.type = 'maven'").
+			GroupBy("package.owner_id").
+			OrderBy("package.owner_id DESC").
+			Find(&ownerIDs); err != nil {
+			return err
+		}
+
+		for _, id := range ownerIDs {
+			if err := fixMavenArtifactPerOwner(ctx, id); err != nil {
+				log.Error("owner %d migration failed: %v", id, err)
+				return err // rollback all
+			}
+		}
+
+		return nil
+	})
+}
+
+func fixMavenArtifactPerOwner(ctx context.Context, ownerID *int64) error {
+	results, err := getMavenPackageResultsToUpdate(ctx, ownerID)
+	if err != nil {
+		return err
+	}
+
+	if err = resolvePackageCollisions(ctx, results); err != nil {
+		return err
+	}
+
+	if err = processPackageVersions(ctx, results); err != nil {
+		return err
+	}
+
+	return processPackageFiles(ctx, results)
+}
+
+// processPackageFiles updates Maven package files and versions in the database
+// Returns an error if any database or processing operation fails.
+func processPackageFiles(ctx context.Context, results []*mavenPackageResult) error {
+	processedVersion := make(map[string][]*mavenPackageResult)
+
+	for _, r := range results {
+		if r.Snapshot != nil {
+			key := fmt.Sprintf("%s:%s", r.PackageName, r.PackageVersion.LowerVersion)
+			processedVersion[key] = append(processedVersion[key], r)
+		}
+
+		// Only update version_id when it differs
+		if r.PackageVersion.ID != r.PackageFile.VersionID {
+			pattern := strings.TrimSuffix(r.PackageFile.Name, ".pom") + "%"
+			// Per routers/api/packages/maven/maven.go:338, POM files already have the `IsLead`, so no update needed for this prop
+			if _, err := db.GetEngine(ctx).Exec("UPDATE package_file SET version_id = ? WHERE version_id = ? and name like ?", r.PackageVersion.ID, r.PackageFile.VersionID, pattern); err != nil {
+				return err
+			}
+		}
+	}
+
+	// If maven-metadata.xml is missing (snapshot path collision), skip regeneration
+	// Without this metadata, Maven cannot resolve snapshot details
+	for _, packageResults := range processedVersion {
+		sort.Slice(packageResults, func(i, j int) bool {
+			return packageResults[i].Snapshot.build > packageResults[j].Snapshot.build
+		})
+
+		rs := packageResults[0]
+
+		pf, md, err := parseMetadata(ctx, rs)
+		if err != nil {
+			return err
+		}
+
+		if pf != nil && md != nil && md.GroupID == rs.GroupID && md.ArtifactID == rs.ArtifactID {
+			if pf.VersionID != rs.PackageFile.VersionID {
+				if _, err := db.GetEngine(ctx).ID(pf.ID).Cols("version_id").Update(pf); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+
+		log.Warn("no maven-metadata.xml found for (id: %d) [%s:%s]", rs.PackageVersion.ID, rs.PackageName, rs.PackageVersion.Version)
+	}
+
+	return nil
+}
+
+// parseMetadata retrieves metadata for a Maven package file from the database and decodes it into a Metadata object.
+// Returns the associated PackageFile, Metadata, and any error encountered during processing.
+func parseMetadata(ctx context.Context, snapshot *mavenPackageResult) (*packages.PackageFile, *Metadata, error) {
+	var pf packages.PackageFile
+	found, err := db.GetEngine(ctx).Table(pf).
+		Where("version_id = ?", snapshot.PackageFile.VersionID). // still the old id
+		And("lower_name = ?", "maven-metadata.xml").
+		Get(&pf)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if !found {
+		return nil, nil, nil
+	}
+
+	s, _, _, err := getPackage(ctx, &pf)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	defer s.Close()
+	dec := xml.NewDecoder(s)
+	var m Metadata
+	if err := dec.Decode(&m); err != nil {
+		return nil, nil, err
+	}
+
+	return &pf, &m, nil
+}
+
+// processPackageVersions processes Maven package versions by updating metadata or inserting new records as necessary.
+// It avoids redundant updates by tracking already processed versions using a map. Returns an error on failure.
+func processPackageVersions(ctx context.Context, results []*mavenPackageResult) error {
+	processedVersion := make(map[string]int64)
+
+	for _, r := range results {
+		key := fmt.Sprintf("%s:%s", r.PackageName, r.PackageVersion.Version)
+
+		if id, ok := processedVersion[key]; ok {
+			r.PackageVersion.ID = id
+			continue
+		}
+
+		// for non collisions, just update the metadata
+		if r.PackageVersion.PackageID == r.Package.ID {
+			if _, err := db.GetEngine(ctx).ID(r.PackageVersion.ID).Cols("metadata_json").Update(r.PackageVersion); err != nil {
+				return err
+			}
+		} else {
+			log.Info("Create new maven package version for %s:%s", r.PackageName, r.PackageVersion.Version)
+			r.PackageVersion.ID = 0
+			r.PackageVersion.PackageID = r.Package.ID
+			if _, err := db.GetEngine(ctx).Insert(r.PackageVersion); err != nil {
+				return err
+			}
+		}
+
+		processedVersion[key] = r.PackageVersion.ID
+	}
+
+	return nil
+}
+
+// getMavenPackageResultsToUpdate retrieves Maven package results that need updates based on the owner ID.
+// It processes POM metadata, fixes package inconsistencies, and filters corrupted package versions.
+func getMavenPackageResultsToUpdate(ctx context.Context, ownerID *int64) ([]*mavenPackageResult, error) {
+	var candidates []*mavenPackageResult
+	if err := db.GetEngine(ctx).
+		Table("package_file").
+		Select("package_file.*, package_version.*, package.*").
+		Join("INNER", "package_version", "package_version.id = package_file.version_id").
+		Join("INNER", "package", "package.id = package_version.package_id").
+		Where("package_file.lower_name LIKE ?", "%.pom").
+		And("package.type = ?", "maven").
+		And("package.owner_id = ?", ownerID).
+		OrderBy("package_version.id DESC, package_file.id DESC").
+		Find(&candidates); err != nil {
+		return nil, err
+	}
+
+	var results []*mavenPackageResult
+	var corruptedVersionIDs []int64
+
+	// fetch actual metadata from blob as all packages needs to be fixed following the new string concatenation
+	for _, r := range candidates {
+		if err := processPomMetadata(ctx, r); err != nil {
+			// Skip corrupted versions; admin intervention may be needed to repair these files.
+			log.Warn("Failed to process package file [id: %d] ignoring package version[%d]: %v", r.PackageFile.ID, r.PackageVersion.ID, err)
+
+			corruptedVersionIDs = append(corruptedVersionIDs, r.PackageVersion.ID)
+
+			continue
+		}
+
+		results = append(results, r)
+		log.Debug("Resolved id [%d] from [%s:%s] to [%s:%s] [Snapshot: %v]", r.Package.ID, r.Package.Name, r.PackageVersion.Version, r.PackageName, r.PackageVersion.Version, r.Snapshot)
+	}
+
+	for _, corruptedVersionID := range corruptedVersionIDs {
+		for i := 0; i < len(results); {
+			if corruptedVersionID == results[i].PackageVersion.ID {
+				results = append(results[:i], results[i+1:]...)
+			} else {
+				i++
+			}
+		}
+	}
+
+	return results, nil
+}
+
+// resolvePackageCollisions handles name collisions by keeping the first existing record and inserting new Package records for subsequent collisions.
+// Returns a map from PackageName to its resolved Package.ID.
+func resolvePackageCollisions(ctx context.Context, results []*mavenPackageResult) error {
+	// Group new names by lowerName
+	collisions := make(map[string][]string)
+	for _, r := range results {
+		names := collisions[r.Package.LowerName]
+		if !slices.Contains(names, r.PackageName) {
+			collisions[r.Package.LowerName] = append(names, r.PackageName)
+		}
+	}
+
+	pkgIDByName := make(map[string]int64)
+	var err error
+
+	for _, r := range results {
+		list := collisions[r.Package.LowerName]
+
+		// update to the upcoming package name which is colon separated
+		r.Package.Name = r.PackageName
+		r.Package.LowerName = r.PackageName
+
+		// exiting entry
+		if id, ok := pkgIDByName[r.PackageName]; ok {
+			r.Package.ID = id
+			// first package kept the current id
+		} else if list[0] == r.PackageName {
+			pkgIDByName[r.PackageName] = r.Package.ID
+
+			if _, err = db.GetEngine(ctx).ID(r.Package.ID).Cols("name", "lower_name").Update(r.Package); err != nil {
+				return err
+			}
+			// create a new entry
+		} else {
+			log.Info("Create new maven package for %s", r.Package.Name)
+
+			r.Package.ID = 0
+			if _, err = db.GetEngine(ctx).Insert(r.Package); err != nil {
+				return err
+			}
+
+			pkgIDByName[r.PackageName] = r.Package.ID
+		}
+	}
+
+	return nil
+}
+
+// processPomMetadata processes a Maven package file, parses its POM metadata, and updates PackageVersion information.
+func processPomMetadata(ctx context.Context, mpr *mavenPackageResult) error {
+	s, _, _, err := getPackage(ctx, mpr.PackageFile)
+	if err != nil {
+		return fmt.Errorf("unable to get package stream: %v", err)
+	}
+	defer s.Close()
+
+	actualPom, err := maven.ParsePackageMetaData(s)
+	if err != nil {
+		return fmt.Errorf("failed to parse POM metadata: %v", err)
+	}
+
+	raw, err := json.Marshal(actualPom)
+	if err != nil {
+		return fmt.Errorf("failed to marshal metadata: %v", err)
+	}
+
+	var currentPom *maven.Metadata
+	if err = json.Unmarshal([]byte(mpr.PackageVersion.MetadataJSON), &currentPom); err != nil {
+		return fmt.Errorf("failed to unmarshal metadata: %v", err)
+	}
+
+	// since the rest api can also be (ab)used to upload artifacts wrong, just ignore them
+	if isInvalidMatch(currentPom, actualPom) {
+		return fmt.Errorf("artifact mismatch: actual [%s] expected [%s]", actualPom.ArtifactID, currentPom.ArtifactID)
+	}
+
+	// this will also fix packages that missed its groupID
+	// Ref: https://codeberg.org/forgejo/forgejo/pulls/6329
+	mpr.PackageVersion.MetadataJSON = string(raw)
+
+	// Since Maven packages are case-sensitive, avoid potential clashes and clean-ups
+	// by enforcing consistent case handling similar to RPM packages.
+	mpr.PackageName = fmt.Sprintf("%s:%s", actualPom.GroupID, actualPom.ArtifactID)
+
+	mpr.GroupID = actualPom.GroupID
+	mpr.ArtifactID = actualPom.ArtifactID
+
+	if strings.HasSuffix(mpr.PackageVersion.Version, "-SNAPSHOT") {
+		snap, err := extraSnapshotDetails(currentPom, actualPom, mpr)
+		if err != nil {
+			return err
+		}
+		mpr.Snapshot = snap
+	} else {
+		// only snapshots are affected but kept in case of not complete fixtures
+		expectedFileName := fmt.Sprintf("%s-%s.pom", actualPom.ArtifactID, mpr.PackageVersion.Version)
+		if mpr.PackageFile.Name != expectedFileName {
+			log.Warn("invalid package file name - this is a collision which needs to be resolved expected [%s], actual [%s]", expectedFileName, mpr.PackageFile.Name)
+		}
+	}
+
+	return nil
+}
+
+// extraSnapshotDetails extracts detailed snapshot information
+// Returns a Snapshot object encapsulating the extracted details or an error if the filename is invalid or parsing fails.
+func extraSnapshotDetails(currentPom, actualPom *maven.Metadata, mpr *mavenPackageResult) (*Snapshot, error) {
+	pattern := `^%s-` +
+		`(?P<baseVersion>[\d\.]+)-` +
+		`(?P<date>\d{8})\.` +
+		`(?P<time>\d{6})-` +
+		`(?P<build>\d+)\.pom$`
+	re := regexp.MustCompile(fmt.Sprintf(pattern, regexp.QuoteMeta(currentPom.ArtifactID)))
+
+	if re.FindStringSubmatch(mpr.PackageFile.Name) == nil {
+		log.Warn("invalid package file name - this is a collision which needs to be resolved %s", mpr.PackageFile.Name)
+	}
+
+	re = regexp.MustCompile(fmt.Sprintf(pattern, regexp.QuoteMeta(actualPom.ArtifactID)))
+	match := re.FindStringSubmatch(mpr.PackageFile.Name)
+
+	if match == nil {
+		return nil, fmt.Errorf("invalid snapshot filename: %s", mpr.PackageFile.Name)
+	}
+
+	baseIdx := re.SubexpIndex("baseVersion")
+	dateIdx := re.SubexpIndex("date")
+	timeIdx := re.SubexpIndex("time")
+	buildIdx := re.SubexpIndex("build")
+
+	buildNum, _ := strconv.Atoi(match[buildIdx])
+
+	return &Snapshot{
+		baseVersion: match[baseIdx],
+		date:        match[dateIdx],
+		time:        match[timeIdx],
+		build:       buildNum,
+	}, nil
+}
+
+// isInvalidMatch returns true if the stored metadata’s groupID:artifactID
+// differs from actual values—accounting for an earlier bug that sometimes omitted the groupID.
+func isInvalidMatch(current, actual *maven.Metadata) bool {
+	bare := fmt.Sprintf("-%s", actual.ArtifactID)
+	full := fmt.Sprintf("%s-%s", actual.GroupID, actual.ArtifactID)
+	currentID := fmt.Sprintf("%s-%s", current.GroupID, current.ArtifactID)
+
+	return currentID != full && currentID != bare
+}
diff --git a/models/forgejo_migrations/v32_test.go b/models/forgejo_migrations/v32_test.go
new file mode 100644
index 0000000000..24cda891bc
--- /dev/null
+++ b/models/forgejo_migrations/v32_test.go
@@ -0,0 +1,369 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"net/url"
+	"strings"
+	"testing"
+
+	migration_tests "forgejo.org/models/migrations/test"
+	"forgejo.org/models/packages"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type readSeekCloser struct {
+	*bytes.Reader
+}
+
+func (rsc readSeekCloser) Close() error {
+	// No resources to close, so we simply provide a no-op implementation.
+	return nil
+}
+
+func StringToReadSeekCloser(s string) io.ReadSeekCloser {
+	return readSeekCloser{Reader: bytes.NewReader([]byte(s))}
+}
+
+func Test_ChangeMavenArtifactConcatenation(t *testing.T) {
+	getPackage = func(ctx context.Context, pf *packages.PackageFile) (io.ReadSeekCloser, *url.URL, *packages.PackageFile, error) {
+		var data string
+
+		switch pf.BlobID {
+		case 1:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>1.0-SNAPSHOT</version></project>`
+		case 3:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>1.0-SNAPSHOT</version></project>`
+		case 6:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>7.0.0</version></project>`
+		case 7:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>7.0.0</version></project>`
+		case 9:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>7.0.0</version></project>`
+		case 11:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>1.0-SNAPSHOT</version></project>`
+		case 13:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>7.0.0</version></project>`
+		case 14:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>1.0-SNAPSHOT</version></project>`
+		case 16:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>7.0.0</version></project>`
+		case 20:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>8.0.0</version></project>`
+		case 21:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>8.0.0</version></project>`
+		case 23:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>8.0.0</version></project>`
+		case 26:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>8.0.0</version></project>`
+		case 28:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>8.0.0</version></project>`
+		case 32:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>9.0.0</version></project>`
+		case 33:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>9.0.0</version></project>`
+		case 35:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>9.0.0</version></project>`
+		case 38:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>9.0.0</version></project>`
+		case 40:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>9.0.0</version></project>`
+		case 44:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>10.0.0</version></project>`
+		case 45:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>10.0.0</version></project>`
+		case 47:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>10.0.0</version></project>`
+		case 50:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>10.0.0</version></project>`
+		case 52:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>10.0.0</version></project>`
+		case 56:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>11.0.0</version></project>`
+		case 57:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.example</groupId><artifactId>parent-project</artifactId></parent><groupId></groupId><artifactId>sub-module</artifactId><version>11.0.0</version></project>`
+		case 59:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>11.0.0</version></project>`
+		case 62:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo-</groupId><artifactId>bar</artifactId><version>11.0.0</version></project>`
+		case 64:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>foo</groupId><artifactId>-bar</artifactId><version>11.0.0</version></project>`
+		case 66:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.broken</groupId><artifactId>br-parent</artifactId></parent><groupId></groupId><artifactId>br-rest-webmvc</artifactId><version></version></project>`
+		case 68:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.broken</groupId><artifactId>br-parent</artifactId></parent><groupId></groupId><artifactId>br-openapi-base</artifactId><version></version></project>`
+		case 72:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><parent><groupId>de.loosetie</groupId><artifactId>lt-parent-kotlin</artifactId></parent><groupId>com.broken</groupId><artifactId>br-root</artifactId><version>1.2.4</version></project>`
+		case 74:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.broken</groupId><artifactId>br-parent</artifactId></parent><groupId></groupId><artifactId>br-repo-jooq</artifactId><version></version></project>`
+		case 76:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging></packaging><parent><groupId>com.broken</groupId><artifactId>br-parent</artifactId></parent><groupId></groupId><artifactId>br-repo-in-memory</artifactId><version></version></project>`
+		case 78:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><parent><groupId>com.broken</groupId><artifactId>br-root</artifactId></parent><groupId></groupId><artifactId>br-parent</artifactId><version></version></project>`
+		case 79:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>group</groupId><artifactId>bar-art</artifactId><version>11.0.0</version></project>`
+		case 80:
+			data = `<project><modelVersion>4.0.0</modelVersion><packaging>pom</packaging><groupId>group-bar</groupId><artifactId>art</artifactId><version>11.0.0</version></project>`
+		case 55:
+			data = `<?xml version="1.0" encoding="UTF-8"?><metadata modelVersion="1.1.0"><groupId>com.example</groupId><artifactId>sub-module</artifactId><version>1.0-SNAPSHOT</version></metadata>`
+		case 53:
+			data = `<?xml version="1.0" encoding="UTF-8"?><metadata modelVersion="1.1.0"><groupId>com.example</groupId><artifactId>parent-project</artifactId><version>1.0-SNAPSHOT</version></metadata>`
+		case 63:
+			data = `<?xml version="1.0" encoding="UTF-8"?><metadata modelVersion="1.1.0"><groupId>foo</groupId><artifactId>-bar</artifactId><version>1.0-SNAPSHOT</version></metadata>`
+		default:
+			t.Fatalf("Unknown package file type: %d", pf.BlobID)
+		}
+
+		return StringToReadSeekCloser(data), nil, nil, nil
+	}
+
+	x, deferable := migration_tests.PrepareTestEnv(t, 0, new(packages.Package), new(packages.PackageFile), new(packages.PackageVersion), new(packages.PackageBlob))
+	defer deferable()
+	if x == nil || t.Failed() {
+		return
+	}
+
+	cnt, err := x.Table("package").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 8, cnt)
+
+	cnt, err = x.Table("package_file").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 87, cnt)
+
+	cnt, err = x.Table("package_version").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 31, cnt)
+
+	cnt, err = x.Table("package_blob").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 80, cnt)
+
+	require.NoError(t, ChangeMavenArtifactConcatenation(x))
+
+	var pks []*packages.Package
+	require.NoError(t, x.OrderBy("id").Find(&pks))
+	validatePackages(t, pks)
+
+	var pvs []*packages.PackageVersion
+	require.NoError(t, x.OrderBy("id").Find(&pvs))
+	validatePackageVersions(t, pvs)
+
+	var pfs []*packages.PackageFile
+	require.NoError(t, x.OrderBy("id").Find(&pfs))
+	validatePackageFiles(t, pfs)
+}
+
+func validatePackages(t *testing.T, pbs []*packages.Package) {
+	assertPackage := func(id, ownerID, repoID int64, name string) {
+		pb := pbs[id-1]
+
+		require.Equal(t, id, pb.ID)
+		require.Equal(t, ownerID, pb.OwnerID)
+		require.Equal(t, repoID, pb.RepoID)
+		require.Equal(t, name, pb.Name)
+		require.Equal(t, name, pb.LowerName)
+		require.Equal(t, packages.TypeMaven, pb.Type)
+	}
+
+	require.Len(t, pbs, 10)
+
+	assertPackage(1, 2, 0, "com.example:parent-project")
+	assertPackage(2, 2, 0, "com.example:sub-module")
+	assertPackage(3, 1, 0, "com.example:parent-project")
+	assertPackage(4, 1, 0, "com.example:sub-module")
+	assertPackage(5, 1, 0, "foo:-bar")
+	assertPackage(6, 8, 54, "com.broken:br-rest-webmvc")
+	// broken poms completely ignored as it is impossible to look up the correct metadata
+	assertPackage(7, 8, 54, "com.broken-br-openapi-base")
+	assertPackage(8, 1, 0, "group-bar:art")
+
+	// new created entries
+	assertPackage(9, 1, 0, "group:bar-art")
+	assertPackage(10, 1, 0, "foo-:bar")
+}
+
+func validatePackageVersions(t *testing.T, pvs []*packages.PackageVersion) {
+	require.Len(t, pvs, 38)
+
+	assertPackageVersion := func(id, packageId, creatorId, createdUnix int64, version, metadata string) {
+		pv := pvs[id-1]
+
+		require.Equal(t, id, pv.ID)
+		require.Equal(t, packageId, pv.PackageID)
+
+		require.Equal(t, creatorId, pv.CreatorID)
+		require.Equal(t, version, pv.Version)
+		require.Equal(t, strings.ToLower(version), pv.LowerVersion)
+		require.JSONEq(t, metadata, pv.MetadataJSON)
+	}
+
+	assertPackageVersion(1, 1, 1, 1746256357, "1.0-SNAPSHOT", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	assertPackageVersion(2, 2, 1, 1746256358, "1.0-SNAPSHOT", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(3, 1, 1, 1746256360, "7.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(4, 2, 1, 1746256361, "7.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(5, 3, 1, 1746256364, "7.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(6, 4, 1, 1746256365, "7.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(7, 5, 1, 1746256367, "1.0-SNAPSHOT", `{"artifact_id":"-bar","group_id":"foo"}`)
+	assertPackageVersion(8, 5, 1, 1746256370, "7.0.0", `{"artifact_id":"-bar","group_id":"foo"}`)
+	assertPackageVersion(9, 1, 1, 1746256389, "8.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(10, 2, 1, 1746256390, "8.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(11, 3, 1, 1746256393, "8.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(12, 4, 1, 1746256394, "8.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(13, 5, 1, 1746256399, "8.0.0", `{"artifact_id":"-bar","group_id":"foo"}`)
+	assertPackageVersion(14, 1, 1, 1746256419, "9.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(15, 2, 1, 1746256420, "9.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(16, 3, 1, 1746256423, "9.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	// added groupId
+	assertPackageVersion(17, 4, 1, 1746256424, "9.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(18, 5, 1, 1746256429, "9.0.0", `{"artifact_id":"-bar","group_id":"foo"}`)
+	assertPackageVersion(19, 1, 1, 1746256449, "10.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	assertPackageVersion(20, 2, 1, 1746256450, "10.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(21, 3, 1, 1746256452, "10.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	assertPackageVersion(22, 4, 1, 1746256453, "10.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(23, 5, 1, 1746256459, "10.0.0", `{"artifact_id":"-bar","group_id":"foo"}`)
+	assertPackageVersion(24, 1, 1, 1746256478, "11.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	assertPackageVersion(25, 2, 1, 1746256479, "11.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(26, 3, 1, 1746256482, "11.0.0", `{"artifact_id":"parent-project","group_id":"com.example"}`)
+	assertPackageVersion(27, 4, 1, 1746256483, "11.0.0", `{"artifact_id":"sub-module","group_id":"com.example"}`)
+	assertPackageVersion(28, 5, 1, 1746256488, "11.0.0", `{"artifact_id":"-bar","group_id":"foo"}`)
+	// should be untouched at all. fixtures doesn't contain names
+	assertPackageVersion(29, 7, 6, 1746256488, "1.2.4", `{"group_id":"com.broken","artifact_id":"br-root","name":"Foo"}`)
+	// added group name
+	assertPackageVersion(30, 6, 6, 1746256488, "1.2.4", `{"artifact_id":"br-rest-webmvc", "group_id":"com.broken"}`)
+	assertPackageVersion(31, 8, 1, 1746256488, "11.0.0", `{"artifact_id":"art","group_id":"group-bar"}`)
+
+	// new entries
+	assertPackageVersion(32, 9, 1, 1746256488, "11.0.0", `{"artifact_id":"bar-art","group_id":"group"}`)
+	assertPackageVersion(33, 10, 1, 1746256488, "11.0.0", `{"artifact_id":"bar","group_id":"foo-"}`)
+	assertPackageVersion(34, 10, 1, 1746256488, "10.0.0", `{"artifact_id":"bar","group_id":"foo-"}`)
+	assertPackageVersion(35, 10, 1, 1746256488, "9.0.0", `{"artifact_id":"bar","group_id":"foo-"}`)
+	assertPackageVersion(36, 10, 1, 1746256488, "8.0.0", `{"artifact_id":"bar","group_id":"foo-"}`)
+	assertPackageVersion(37, 10, 1, 1746256488, "7.0.0", `{"artifact_id":"bar","group_id":"foo-"}`)
+	assertPackageVersion(38, 10, 1, 1746256488, "1.0-SNAPSHOT", `{"artifact_id":"bar","group_id":"foo-"}`)
+}
+
+func validatePackageFiles(t *testing.T, pfs []*packages.PackageFile) {
+	assertPackageVersion := func(pos, id, versionId, blobId, createdUnix int64, name string, isLead bool) {
+		pf := pfs[pos]
+
+		require.Equal(t, id, pf.ID)
+		require.Equal(t, versionId, pf.VersionID)
+		require.Equal(t, blobId, pf.BlobID)
+		require.Equal(t, name, pf.Name)
+		require.Equal(t, strings.ToLower(name), pf.LowerName)
+		require.Empty(t, pf.CompositeKey)
+		require.Equal(t, isLead, pf.IsLead)
+		require.EqualValues(t, createdUnix, pf.CreatedUnix)
+
+		require.Empty(t, pf.CompositeKey)
+	}
+	assertPackageVersion(0, 1, 1, 1, 1746256357, "parent-project-1.0-20250503.071237-1.pom", true)
+	assertPackageVersion(1, 3, 2, 3, 1746256358, "sub-module-1.0-20250503.071237-1.pom", true)
+	assertPackageVersion(2, 4, 2, 4, 1746256358, "sub-module-1.0-20250503.071237-1.jar", false)
+	assertPackageVersion(3, 6, 3, 6, 1746256360, "parent-project-7.0.0.pom", true)
+	assertPackageVersion(4, 7, 4, 7, 1746256361, "sub-module-7.0.0.pom", true)
+	assertPackageVersion(5, 8, 4, 8, 1746256361, "sub-module-7.0.0.jar", false)
+	assertPackageVersion(6, 9, 5, 9, 1746256364, "parent-project-7.0.0.pom", true)
+	assertPackageVersion(7, 10, 6, 7, 1746256365, "sub-module-7.0.0.pom", true)
+	assertPackageVersion(8, 11, 6, 10, 1746256365, "sub-module-7.0.0.jar", false)
+	// new versionId 7 -> 38
+	assertPackageVersion(9, 12, 38, 11, 1746256367, "bar-1.0-20250503.071248-1.pom", true)
+	// new versionId 37
+	assertPackageVersion(10, 14, 37, 13, 1746256370, "bar-7.0.0.pom", true)
+	assertPackageVersion(11, 15, 7, 14, 1746256373, "-bar-1.0-20250503.071253-2.pom", true)
+	assertPackageVersion(12, 17, 8, 16, 1746256375, "-bar-7.0.0.pom", true)
+	assertPackageVersion(13, 18, 1, 1, 1746256385, "parent-project-1.0-20250503.071306-2.pom", true)
+	assertPackageVersion(14, 20, 2, 3, 1746256386, "sub-module-1.0-20250503.071306-2.pom", true)
+	assertPackageVersion(15, 21, 2, 18, 1746256386, "sub-module-1.0-20250503.071306-2.jar", false)
+	assertPackageVersion(16, 23, 9, 20, 1746256389, "parent-project-8.0.0.pom", true)
+	assertPackageVersion(17, 24, 10, 21, 1746256390, "sub-module-8.0.0.pom", true)
+	assertPackageVersion(18, 25, 10, 22, 1746256390, "sub-module-8.0.0.jar", false)
+	assertPackageVersion(19, 26, 11, 23, 1746256393, "parent-project-8.0.0.pom", true)
+	assertPackageVersion(20, 27, 12, 21, 1746256394, "sub-module-8.0.0.pom", true)
+	assertPackageVersion(21, 28, 12, 24, 1746256394, "sub-module-8.0.0.jar", false)
+	// new versionId 7 -> 38
+	assertPackageVersion(22, 29, 38, 11, 1746256397, "bar-1.0-20250503.071317-3.pom", true)
+	assertPackageVersion(23, 31, 36, 26, 1746256399, "bar-8.0.0.pom", true)
+	assertPackageVersion(24, 32, 7, 14, 1746256402, "-bar-1.0-20250503.071323-4.pom", true)
+	assertPackageVersion(25, 34, 13, 28, 1746256405, "-bar-8.0.0.pom", true)
+	assertPackageVersion(26, 35, 1, 1, 1746256415, "parent-project-1.0-20250503.071335-3.pom", true)
+	assertPackageVersion(27, 37, 2, 3, 1746256416, "sub-module-1.0-20250503.071335-3.pom", true)
+	assertPackageVersion(28, 38, 2, 30, 1746256416, "sub-module-1.0-20250503.071335-3.jar", false)
+	assertPackageVersion(29, 40, 14, 32, 1746256419, "parent-project-9.0.0.pom", true)
+	assertPackageVersion(30, 41, 15, 33, 1746256420, "sub-module-9.0.0.pom", true)
+	assertPackageVersion(31, 42, 15, 34, 1746256420, "sub-module-9.0.0.jar", false)
+	assertPackageVersion(32, 43, 16, 35, 1746256423, "parent-project-9.0.0.pom", true)
+	assertPackageVersion(33, 44, 17, 33, 1746256424, "sub-module-9.0.0.pom", true)
+	assertPackageVersion(34, 45, 17, 36, 1746256424, "sub-module-9.0.0.jar", false)
+	// new versionId 7 -> 38
+	assertPackageVersion(35, 46, 38, 11, 1746256427, "bar-1.0-20250503.071347-5.pom", true)
+	// new versionId 18 -> 35
+	assertPackageVersion(36, 48, 35, 38, 1746256429, "bar-9.0.0.pom", true)
+	assertPackageVersion(37, 49, 7, 14, 1746256432, "-bar-1.0-20250503.071353-6.pom", true)
+	assertPackageVersion(38, 51, 18, 40, 1746256435, "-bar-9.0.0.pom", true)
+	assertPackageVersion(39, 52, 1, 1, 1746256445, "parent-project-1.0-20250503.071405-4.pom", true)
+	assertPackageVersion(40, 54, 2, 3, 1746256446, "sub-module-1.0-20250503.071405-4.pom", true)
+	assertPackageVersion(41, 55, 2, 42, 1746256446, "sub-module-1.0-20250503.071405-4.jar", false)
+	assertPackageVersion(42, 57, 19, 44, 1746256449, "parent-project-10.0.0.pom", true)
+	assertPackageVersion(43, 58, 20, 45, 1746256450, "sub-module-10.0.0.pom", true)
+	assertPackageVersion(44, 59, 20, 46, 1746256450, "sub-module-10.0.0.jar", false)
+	assertPackageVersion(45, 60, 21, 47, 1746256452, "parent-project-10.0.0.pom", true)
+	assertPackageVersion(46, 61, 22, 45, 1746256453, "sub-module-10.0.0.pom", true)
+	assertPackageVersion(47, 62, 22, 48, 1746256453, "sub-module-10.0.0.jar", false)
+	// new versionId 7 -> 38
+	assertPackageVersion(48, 63, 38, 11, 1746256456, "bar-1.0-20250503.071416-7.pom", true)
+	// new versionId 34
+	assertPackageVersion(49, 65, 34, 50, 1746256459, "bar-10.0.0.pom", true)
+	assertPackageVersion(50, 66, 7, 14, 1746256461, "-bar-1.0-20250503.071422-8.pom", true)
+	assertPackageVersion(51, 68, 23, 52, 1746256464, "-bar-10.0.0.pom", true)
+	assertPackageVersion(52, 69, 1, 1, 1746256474, "parent-project-1.0-20250503.071435-5.pom", true)
+	assertPackageVersion(53, 70, 1, 53, 1746256474, "maven-metadata.xml", false)
+	assertPackageVersion(54, 71, 2, 3, 1746256475, "sub-module-1.0-20250503.071435-5.pom", true)
+	assertPackageVersion(55, 72, 2, 54, 1746256475, "sub-module-1.0-20250503.071435-5.jar", false)
+	assertPackageVersion(56, 73, 2, 55, 1746256476, "maven-metadata.xml", false)
+	assertPackageVersion(57, 74, 24, 56, 1746256478, "parent-project-11.0.0.pom", true)
+	assertPackageVersion(58, 75, 25, 57, 1746256479, "sub-module-11.0.0.pom", true)
+	assertPackageVersion(59, 76, 25, 58, 1746256479, "sub-module-11.0.0.jar", false)
+	assertPackageVersion(60, 77, 26, 59, 1746256482, "parent-project-11.0.0.pom", true)
+	assertPackageVersion(61, 78, 27, 57, 1746256483, "sub-module-11.0.0.pom", true)
+	assertPackageVersion(62, 79, 27, 60, 1746256483, "sub-module-11.0.0.jar", false)
+	// new versionId 7 -> 38
+	assertPackageVersion(63, 80, 38, 11, 1746256486, "bar-1.0-20250503.071446-9.pom", true)
+	// new versionId 33
+	assertPackageVersion(64, 82, 33, 62, 1746256488, "bar-11.0.0.pom", true)
+	assertPackageVersion(65, 83, 7, 14, 1746256491, "-bar-1.0-20250503.071451-10.pom", true)
+	assertPackageVersion(66, 84, 7, 63, 1746256491, "maven-metadata.xml", false)
+	assertPackageVersion(67, 85, 28, 64, 1746256494, "-bar-11.0.0.pom", true)
+	assertPackageVersion(68, 86, 29, 75, 174625649444986, "br-repo-jooq-1.2.4-sources.jar", false)
+	assertPackageVersion(69, 87, 29, 65, 174625649446161, "br-rest-webmvc-1.2.4.jar", false)
+	assertPackageVersion(70, 88, 29, 68, 174625649444734, "br-openapi-base-1.2.4.pom", true)
+	assertPackageVersion(71, 89, 29, 69, 174625649444746, "br-openapi-base-1.2.4.jar", false)
+	assertPackageVersion(72, 90, 29, 70, 174625649444775, "br-openapi-base-1.2.4-sources.jar", false)
+	assertPackageVersion(73, 91, 29, 78, 174625649444852, "br-parent-1.2.4.pom", true)
+	assertPackageVersion(74, 92, 29, 76, 174625649444900, "br-repo-in-memory-1.2.4.pom", true)
+	assertPackageVersion(75, 93, 29, 73, 174625649444911, "br-repo-in-memory-1.2.4.jar", false)
+	assertPackageVersion(76, 94, 29, 77, 174625649444922, "br-repo-in-memory-1.2.4-sources.jar", false)
+	assertPackageVersion(77, 95, 29, 74, 174625649444953, "br-repo-jooq-1.2.4.pom", true)
+	assertPackageVersion(78, 96, 29, 67, 174625649444969, "br-repo-jooq-1.2.4.jar", false)
+	assertPackageVersion(79, 97, 29, 71, 174625649446161, "br-rest-webmvc-1.2.4-sources.jar", false)
+	assertPackageVersion(80, 98, 29, 66, 174625649446195, "br-rest-webmvc-1.2.4.pom", true)
+	assertPackageVersion(81, 99, 29, 72, 174625649446217, "br-root-1.2.4.pom", true)
+	assertPackageVersion(82, 100, 30, 66, 174625649446311, "br-rest-webmvc-1.2.4.pom", true)
+	assertPackageVersion(83, 101, 30, 65, 174625649446312, "br-rest-webmvc-1.2.4.jar", false)
+	assertPackageVersion(84, 102, 30, 71, 174625649446312, "br-rest-webmvc-1.2.4-sources.jar", false)
+	// new versionId 31 -> 32
+	assertPackageVersion(85, 103, 32, 79, 1746280832, "bar-art-11.0.0.pom", true)
+	assertPackageVersion(86, 104, 31, 80, 1746280843, "art-11.0.0.pom", true)
+}
diff --git a/models/forgejo_migrations/v33.go b/models/forgejo_migrations/v33.go
new file mode 100644
index 0000000000..b9ea8efe47
--- /dev/null
+++ b/models/forgejo_migrations/v33.go
@@ -0,0 +1,126 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgejo_migrations
+
+import (
+	"fmt"
+
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/xorm"
+)
+
+func dropOldFederationHostIndexes(x *xorm.Engine) {
+	// drop unique index on HostFqdn
+	type FederationHost struct {
+		ID       int64  `xorm:"pk autoincr"`
+		HostFqdn string `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
+	}
+
+	err := x.DropIndexes(FederationHost{})
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+}
+
+func addFederatedUserActivityTables(x *xorm.Engine) {
+	type FederatedUserActivity struct {
+		ID           int64 `xorm:"pk autoincr"`
+		UserID       int64 `xorm:"NOT NULL INDEX user_id"`
+		ActorID      int64
+		ActorURI     string
+		NoteContent  string             `xorm:"TEXT"`
+		NoteURL      string             `xorm:"VARCHAR(255)"`
+		OriginalNote string             `xorm:"TEXT"`
+		Created      timeutil.TimeStamp `xorm:"created"`
+	}
+
+	// add unique index on HostFqdn+HostPort
+	type FederationHost struct {
+		ID       int64  `xorm:"pk autoincr"`
+		HostFqdn string `xorm:"host_fqdn UNIQUE(federation_host) INDEX VARCHAR(255) NOT NULL"`
+		HostPort uint16 `xorm:"UNIQUE(federation_host) INDEX NOT NULL DEFAULT 443"`
+	}
+
+	type FederatedUserFollower struct {
+		ID int64 `xorm:"pk autoincr"`
+
+		FollowedUserID  int64 `xorm:"NOT NULL unique(fuf_rel)"`
+		FollowingUserID int64 `xorm:"NOT NULL unique(fuf_rel)"`
+	}
+
+	// Add InboxPath to FederatedUser & add index fo UserID
+	type FederatedUser struct {
+		ID        int64 `xorm:"pk autoincr"`
+		UserID    int64 `xorm:"NOT NULL INDEX user_id"`
+		InboxPath string
+	}
+
+	var err error
+
+	err = x.Sync(&FederationHost{})
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+
+	err = x.Sync(&FederatedUserActivity{})
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+
+	err = x.Sync(&FederatedUserFollower{})
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+
+	err = x.Sync(&FederatedUser{})
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+
+	// Migrate
+	sessMigration := x.NewSession()
+	defer sessMigration.Close()
+	if err := sessMigration.Begin(); err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+	federatedUsers := make([]*FederatedUser, 0)
+	err = sessMigration.OrderBy("id").Find(&federatedUsers)
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+
+	for _, federatedUser := range federatedUsers {
+		if federatedUser.InboxPath != "" {
+			log.Info("migration[33]: This user was already migrated: %v", federatedUser)
+		} else {
+			// Migrate User.InboxPath
+			sql := "UPDATE `federated_user` SET `inbox_path` = ? WHERE `id` = ?"
+			if _, err := sessMigration.Exec(sql, fmt.Sprintf("/api/v1/activitypub/user-id/%v/inbox", federatedUser.UserID), federatedUser.ID); err != nil {
+				log.Warn("migration[33]: There was an issue: %v", err)
+				return
+			}
+		}
+	}
+
+	err = sessMigration.Commit()
+	if err != nil {
+		log.Warn("migration[33]: There was an issue: %v", err)
+		return
+	}
+}
+
+func FederatedUserActivityMigration(x *xorm.Engine) error {
+	dropOldFederationHostIndexes(x)
+	addFederatedUserActivityTables(x)
+	return nil
+}
diff --git a/models/forgejo_migrations/v33_test.go b/models/forgejo_migrations/v33_test.go
new file mode 100644
index 0000000000..1d3298da15
--- /dev/null
+++ b/models/forgejo_migrations/v33_test.go
@@ -0,0 +1,46 @@
+// Copyright 2025 The Forgejo Authors.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"testing"
+	"time"
+
+	migration_tests "forgejo.org/models/migrations/test"
+	"forgejo.org/modules/log"
+	ft "forgejo.org/modules/test"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_FederatedUserActivityMigration(t *testing.T) {
+	lc, cl := ft.NewLogChecker(log.DEFAULT, log.WARN)
+	lc.Filter("migration[33]")
+	defer cl()
+
+	// intentionally conflicting definition
+	type FederatedUser struct {
+		ID     int64 `xorm:"pk autoincr"`
+		UserID string
+	}
+
+	// Prepare TestEnv
+	x, deferable := migration_tests.PrepareTestEnv(t, 0,
+		new(FederatedUser),
+	)
+	sessTest := x.NewSession()
+	sessTest.Insert(FederatedUser{UserID: "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" +
+		"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890" +
+		"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"})
+	sessTest.Commit()
+	defer deferable()
+	if x == nil || t.Failed() {
+		return
+	}
+
+	require.NoError(t, FederatedUserActivityMigration(x))
+	logFiltered, _ := lc.Check(5 * time.Second)
+	assert.NotEmpty(t, logFiltered)
+}
diff --git a/models/forgejo_migrations/v34.go b/models/forgejo_migrations/v34.go
new file mode 100644
index 0000000000..d193d799e7
--- /dev/null
+++ b/models/forgejo_migrations/v34.go
@@ -0,0 +1,14 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import "xorm.io/xorm"
+
+func AddNotifyEmailToActionRun(x *xorm.Engine) error {
+	type ActionRun struct {
+		ID          int64
+		NotifyEmail bool
+	}
+	return x.Sync(new(ActionRun))
+}
diff --git a/models/forgejo_migrations/v35.go b/models/forgejo_migrations/v35.go
new file mode 100644
index 0000000000..9b389fcc12
--- /dev/null
+++ b/models/forgejo_migrations/v35.go
@@ -0,0 +1,13 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+// see https://codeberg.org/forgejo/forgejo/issues/8373
+func NoopAddIndexToActionRunStopped(x *xorm.Engine) error {
+	return nil
+}
diff --git a/models/forgejo_migrations/v36.go b/models/forgejo_migrations/v36.go
new file mode 100644
index 0000000000..1a798147cf
--- /dev/null
+++ b/models/forgejo_migrations/v36.go
@@ -0,0 +1,55 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+func FixWikiUnitDefaultPermission(x *xorm.Engine) error {
+	// Type is Unit's Type
+	type Type int
+
+	// Enumerate all the unit types
+	const (
+		TypeInvalid         Type = iota // 0 invalid
+		TypeCode                        // 1 code
+		TypeIssues                      // 2 issues
+		TypePullRequests                // 3 PRs
+		TypeReleases                    // 4 Releases
+		TypeWiki                        // 5 Wiki
+		TypeExternalWiki                // 6 ExternalWiki
+		TypeExternalTracker             // 7 ExternalTracker
+		TypeProjects                    // 8 Projects
+		TypePackages                    // 9 Packages
+		TypeActions                     // 10 Actions
+	)
+
+	// RepoUnitAccessMode specifies the users access mode to a repo unit
+	type UnitAccessMode int
+
+	const (
+		// UnitAccessModeUnset - no unit mode set
+		UnitAccessModeUnset UnitAccessMode = iota // 0
+		// UnitAccessModeNone no access
+		UnitAccessModeNone // 1
+		// UnitAccessModeRead read access
+		UnitAccessModeRead // 2
+		// UnitAccessModeWrite write access
+		UnitAccessModeWrite // 3
+	)
+	_ = UnitAccessModeNone
+	_ = UnitAccessModeWrite
+
+	type RepoUnit struct {
+		DefaultPermissions UnitAccessMode `xorm:"NOT NULL DEFAULT 0"`
+	}
+	_, err := x.Where("type = ?", TypeWiki).
+		Where("default_permissions = ?", UnitAccessModeRead).
+		Cols("default_permissions").
+		Update(RepoUnit{
+			DefaultPermissions: UnitAccessModeUnset,
+		})
+	return err
+}
diff --git a/models/forgejo_migrations/v37.go b/models/forgejo_migrations/v37.go
new file mode 100644
index 0000000000..89358991af
--- /dev/null
+++ b/models/forgejo_migrations/v37.go
@@ -0,0 +1,16 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+func AddPushMirrorBranchFilter(x *xorm.Engine) error {
+	type PushMirror struct {
+		ID           int64  `xorm:"pk autoincr"`
+		BranchFilter string `xorm:"VARCHAR(255)"`
+	}
+	return x.Sync2(new(PushMirror))
+}
diff --git a/models/forgejo_migrations/v38.go b/models/forgejo_migrations/v38.go
new file mode 100644
index 0000000000..24240f15a0
--- /dev/null
+++ b/models/forgejo_migrations/v38.go
@@ -0,0 +1,19 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/xorm"
+)
+
+func AddResolvedUnixToAbuseReport(x *xorm.Engine) error {
+	type AbuseReport struct {
+		ID           int64              `xorm:"pk autoincr"`
+		ResolvedUnix timeutil.TimeStamp `xorm:"DEFAULT NULL"`
+	}
+
+	return x.Sync(&AbuseReport{})
+}
diff --git a/models/forgejo_migrations/v39.go b/models/forgejo_migrations/v39.go
new file mode 100644
index 0000000000..9af1c250b3
--- /dev/null
+++ b/models/forgejo_migrations/v39.go
@@ -0,0 +1,78 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"context"
+	"fmt"
+
+	"forgejo.org/models/db"
+	secret_model "forgejo.org/models/secret"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/secret"
+	"forgejo.org/modules/setting"
+
+	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
+)
+
+func MigrateActionSecretsToKeying(x *xorm.Engine) error {
+	return db.WithTx(db.DefaultContext, func(ctx context.Context) error {
+		sess := db.GetEngine(ctx)
+
+		switch x.Dialect().URI().DBType {
+		case schemas.MYSQL:
+			if _, err := sess.Exec("ALTER TABLE `secret` MODIFY `data` BLOB"); err != nil {
+				return err
+			}
+		case schemas.SQLITE:
+			if _, err := sess.Exec("ALTER TABLE `secret` RENAME COLUMN `data` TO `data_backup`"); err != nil {
+				return err
+			}
+			if _, err := sess.Exec("ALTER TABLE `secret` ADD COLUMN `data` BLOB"); err != nil {
+				return err
+			}
+			if _, err := sess.Exec("UPDATE `secret` SET `data` = `data_backup`"); err != nil {
+				return err
+			}
+			if _, err := sess.Exec("ALTER TABLE `secret` DROP COLUMN `data_backup`"); err != nil {
+				return err
+			}
+		case schemas.POSTGRES:
+			if _, err := sess.Exec("ALTER TABLE `secret` ALTER COLUMN `data` SET DATA TYPE bytea USING data::text::bytea"); err != nil {
+				return err
+			}
+		}
+
+		oldEncryptionKey := setting.SecretKey
+
+		messages := make([]string, 0, 100)
+		ids := make([]int64, 0, 100)
+
+		err := db.Iterate(ctx, nil, func(ctx context.Context, bean *secret_model.Secret) error {
+			secretBytes, err := secret.DecryptSecret(oldEncryptionKey, string(bean.Data))
+			if err != nil {
+				messages = append(messages, fmt.Sprintf("secret.id=%d, secret.name=%q, secret.repo_id=%d, secret.owner_id=%d: secret.DecryptSecret(): %v", bean.ID, bean.Name, bean.RepoID, bean.OwnerID, err))
+				ids = append(ids, bean.ID)
+				return nil
+			}
+
+			bean.SetSecret(secretBytes)
+			_, err = sess.Cols("data").ID(bean.ID).Update(bean)
+			return err
+		})
+
+		if err == nil {
+			if len(ids) > 0 {
+				log.Error("Forgejo migration[37]: The following action secrets were found to be corrupted and removed from the database.")
+				for _, message := range messages {
+					log.Error("Forgejo migration[37]: %s", message)
+				}
+
+				_, err = sess.In("id", ids).NoAutoCondition().NoAutoTime().Delete(&secret_model.Secret{})
+			}
+		}
+		return err
+	})
+}
diff --git a/models/forgejo_migrations/v39_test.go b/models/forgejo_migrations/v39_test.go
new file mode 100644
index 0000000000..42934d912f
--- /dev/null
+++ b/models/forgejo_migrations/v39_test.go
@@ -0,0 +1,52 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forgejo_migrations
+
+import (
+	"testing"
+
+	migration_tests "forgejo.org/models/migrations/test"
+	"forgejo.org/models/secret"
+	"forgejo.org/modules/keying"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_MigrateActionSecretToKeying(t *testing.T) {
+	type Secret struct {
+		ID          int64
+		OwnerID     int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL"`
+		RepoID      int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
+		Name        string             `xorm:"UNIQUE(owner_repo_name) NOT NULL"`
+		Data        string             `xorm:"LONGTEXT"` // encrypted data
+		CreatedUnix timeutil.TimeStamp `xorm:"created NOT NULL"`
+	}
+
+	// Prepare and load the testing database
+	x, deferable := migration_tests.PrepareTestEnv(t, 0, new(Secret))
+	defer deferable()
+	if x == nil || t.Failed() {
+		return
+	}
+
+	cnt, err := x.Table("secret").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 2, cnt)
+
+	require.NoError(t, MigrateActionSecretsToKeying(x))
+
+	cnt, err = x.Table("secret").Count()
+	require.NoError(t, err)
+	assert.EqualValues(t, 1, cnt)
+
+	var secret secret.Secret
+	_, err = x.Table("secret").ID(1).Get(&secret)
+	require.NoError(t, err)
+
+	secretBytes, err := keying.DeriveKey(keying.ContextActionSecret).Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID))
+	require.NoError(t, err)
+	assert.Equal(t, []byte("A deep dark secret"), secretBytes)
+}
diff --git a/models/forgejo_migrations/v40.go b/models/forgejo_migrations/v40.go
new file mode 100644
index 0000000000..11e8fbd85e
--- /dev/null
+++ b/models/forgejo_migrations/v40.go
@@ -0,0 +1,13 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgejo_migrations
+
+import "xorm.io/xorm"
+
+func AddIndexForReleaseSha1(x *xorm.Engine) error {
+	type Release struct {
+		Sha1 string `xorm:"INDEX VARCHAR(64)"`
+	}
+	return x.Sync(new(Release))
+}
diff --git a/models/git/branch_test.go b/models/git/branch_test.go
index 5c1762750e..4340e8f729 100644
--- a/models/git/branch_test.go
+++ b/models/git/branch_test.go
@@ -22,7 +22,7 @@ import (
 func TestAddDeletedBranch(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
-	assert.EqualValues(t, git.Sha1ObjectFormat.Name(), repo.ObjectFormatName)
+	assert.Equal(t, git.Sha1ObjectFormat.Name(), repo.ObjectFormatName)
 	firstBranch := unittest.AssertExistsAndLoadBean(t, &git_model.Branch{ID: 1})
 
 	assert.True(t, firstBranch.IsDeleted)
diff --git a/models/git/commit_status.go b/models/git/commit_status.go
index a679703ffd..60a0aa5a4f 100644
--- a/models/git/commit_status.go
+++ b/models/git/commit_status.go
@@ -179,25 +179,6 @@ func (status *CommitStatus) LocaleString(lang translation.Locale) string {
 	return lang.TrString("repo.commitstatus." + status.State.String())
 }
 
-// HideActionsURL set `TargetURL` to an empty string if the status comes from Gitea Actions
-func (status *CommitStatus) HideActionsURL(ctx context.Context) {
-	if status.RepoID == 0 {
-		return
-	}
-
-	if status.Repo == nil {
-		if err := status.loadRepository(ctx); err != nil {
-			log.Error("loadRepository: %v", err)
-			return
-		}
-	}
-
-	prefix := fmt.Sprintf("%s/actions", status.Repo.Link())
-	if strings.HasPrefix(status.TargetURL, prefix) {
-		status.TargetURL = ""
-	}
-}
-
 // CalcCommitStatus returns commit status state via some status, the commit statues should order by id desc
 func CalcCommitStatus(statuses []*CommitStatus) *CommitStatus {
 	if len(statuses) == 0 {
@@ -453,11 +434,19 @@ type SignCommitWithStatuses struct {
 	*asymkey_model.SignCommit
 }
 
-// ParseCommitsWithStatus checks commits latest statuses and calculates its worst status state
-func ParseCommitsWithStatus(ctx context.Context, oldCommits []*asymkey_model.SignCommit, repo *repo_model.Repository) []*SignCommitWithStatuses {
-	newCommits := make([]*SignCommitWithStatuses, 0, len(oldCommits))
+// ParseCommitsWithStatus converts git commits into SignCommitWithStatuses (checks signature and calculates its worst status state)
+func ParseCommitsWithStatus(ctx context.Context, commits []*git.Commit, repo *repo_model.Repository) []*SignCommitWithStatuses {
+	commitsWithSignature := asymkey_model.ParseCommitsWithSignature(
+		ctx,
+		user_model.ValidateCommitsWithEmails(ctx, commits),
+		repo.GetTrustModel(),
+		func(user *user_model.User) (bool, error) {
+			return repo_model.IsOwnerMemberCollaborator(ctx, repo, user.ID)
+		},
+	)
 
-	for _, c := range oldCommits {
+	commitsWithStatus := make([]*SignCommitWithStatuses, 0, len(commitsWithSignature))
+	for _, c := range commitsWithSignature {
 		commit := &SignCommitWithStatuses{
 			SignCommit: c,
 		}
@@ -469,43 +458,12 @@ func ParseCommitsWithStatus(ctx context.Context, oldCommits []*asymkey_model.Sig
 			commit.Status = CalcCommitStatus(statuses)
 		}
 
-		newCommits = append(newCommits, commit)
+		commitsWithStatus = append(commitsWithStatus, commit)
 	}
-	return newCommits
+	return commitsWithStatus
 }
 
 // hashCommitStatusContext hash context
 func hashCommitStatusContext(context string) string {
 	return fmt.Sprintf("%x", sha1.Sum([]byte(context)))
 }
-
-// ConvertFromGitCommit converts git commits into SignCommitWithStatuses
-func ConvertFromGitCommit(ctx context.Context, commits []*git.Commit, repo *repo_model.Repository) []*SignCommitWithStatuses {
-	return ParseCommitsWithStatus(ctx,
-		asymkey_model.ParseCommitsWithSignature(
-			ctx,
-			user_model.ValidateCommitsWithEmails(ctx, commits),
-			repo.GetTrustModel(),
-			func(user *user_model.User) (bool, error) {
-				return repo_model.IsOwnerMemberCollaborator(ctx, repo, user.ID)
-			},
-		),
-		repo,
-	)
-}
-
-// CommitStatusesHideActionsURL hide Gitea Actions urls
-func CommitStatusesHideActionsURL(ctx context.Context, statuses []*CommitStatus) {
-	idToRepos := make(map[int64]*repo_model.Repository)
-	for _, status := range statuses {
-		if status == nil {
-			continue
-		}
-
-		if status.Repo == nil {
-			status.Repo = idToRepos[status.RepoID]
-		}
-		status.HideActionsURL(ctx)
-		idToRepos[status.RepoID] = status.Repo
-	}
-}
diff --git a/models/git/commit_status_test.go b/models/git/commit_status_test.go
index c062bbbbb9..ce6c0d4673 100644
--- a/models/git/commit_status_test.go
+++ b/models/git/commit_status_test.go
@@ -4,11 +4,9 @@
 package git_test
 
 import (
-	"fmt"
 	"testing"
 	"time"
 
-	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
 	repo_model "forgejo.org/models/repo"
@@ -246,26 +244,3 @@ func TestFindRepoRecentCommitStatusContexts(t *testing.T) {
 		assert.Equal(t, "compliance/lint-backend", contexts[0])
 	}
 }
-
-func TestCommitStatusesHideActionsURL(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
-	run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: 791, RepoID: repo.ID})
-	require.NoError(t, run.LoadAttributes(db.DefaultContext))
-
-	statuses := []*git_model.CommitStatus{
-		{
-			RepoID:    repo.ID,
-			TargetURL: fmt.Sprintf("%s/jobs/%d", run.Link(), run.Index),
-		},
-		{
-			RepoID:    repo.ID,
-			TargetURL: "https://mycicd.org/1",
-		},
-	}
-
-	git_model.CommitStatusesHideActionsURL(db.DefaultContext, statuses)
-	assert.Empty(t, statuses[0].TargetURL)
-	assert.Equal(t, "https://mycicd.org/1", statuses[1].TargetURL)
-}
diff --git a/models/git/lfs_test.go b/models/git/lfs_test.go
index af5e1abd90..132b1628b3 100644
--- a/models/git/lfs_test.go
+++ b/models/git/lfs_test.go
@@ -35,7 +35,7 @@ func TestIterateRepositoryIDsWithLFSMetaObjects(t *testing.T) {
 			return nil
 		})
 		require.NoError(t, err)
-		assert.EqualValues(t, expected, cases)
+		assert.Equal(t, expected, cases)
 	})
 
 	t.Run("Low batch size", func(t *testing.T) {
@@ -47,7 +47,7 @@ func TestIterateRepositoryIDsWithLFSMetaObjects(t *testing.T) {
 			return nil
 		})
 		require.NoError(t, err)
-		assert.EqualValues(t, expected, cases)
+		assert.Equal(t, expected, cases)
 	})
 }
 
@@ -65,7 +65,7 @@ func TestIterateLFSMetaObjectsForRepo(t *testing.T) {
 			return nil
 		}, &IterateLFSMetaObjectsForRepoOptions{})
 		require.NoError(t, err)
-		assert.EqualValues(t, expectedIDs, actualIDs)
+		assert.Equal(t, expectedIDs, actualIDs)
 	})
 
 	t.Run("Low batch size", func(t *testing.T) {
@@ -77,7 +77,7 @@ func TestIterateLFSMetaObjectsForRepo(t *testing.T) {
 			return nil
 		}, &IterateLFSMetaObjectsForRepoOptions{})
 		require.NoError(t, err)
-		assert.EqualValues(t, expectedIDs, actualIDs)
+		assert.Equal(t, expectedIDs, actualIDs)
 
 		t.Run("Batch handles updates", func(t *testing.T) {
 			actualIDs := []int64{}
@@ -89,7 +89,7 @@ func TestIterateLFSMetaObjectsForRepo(t *testing.T) {
 				return nil
 			}, &IterateLFSMetaObjectsForRepoOptions{})
 			require.NoError(t, err)
-			assert.EqualValues(t, expectedIDs, actualIDs)
+			assert.Equal(t, expectedIDs, actualIDs)
 		})
 	})
 }
diff --git a/models/git/protected_branch_list_test.go b/models/git/protected_branch_list_test.go
index db7e54f685..0685e67999 100644
--- a/models/git/protected_branch_list_test.go
+++ b/models/git/protected_branch_list_test.go
@@ -71,7 +71,7 @@ func TestBranchRuleMatchPriority(t *testing.T) {
 				require.Error(t, fmt.Errorf("no matched rules but expected %s[%d]", kase.Rules[kase.ExpectedMatchIdx], kase.ExpectedMatchIdx))
 			}
 		} else {
-			assert.EqualValues(t, kase.Rules[kase.ExpectedMatchIdx], matchedPB.RuleName)
+			assert.Equal(t, kase.Rules[kase.ExpectedMatchIdx], matchedPB.RuleName)
 		}
 	}
 }
diff --git a/models/git/protected_branch_test.go b/models/git/protected_branch_test.go
index 278fa9fee4..f3aeb19b78 100644
--- a/models/git/protected_branch_test.go
+++ b/models/git/protected_branch_test.go
@@ -64,6 +64,6 @@ func TestBranchRuleMatch(t *testing.T) {
 
 	for _, kase := range kases {
 		pb := ProtectedBranch{RuleName: kase.Rule}
-		assert.EqualValues(t, kase.ExpectedMatch, pb.Match(kase.BranchName), "%s - %s", kase.BranchName, kase.Rule)
+		assert.Equal(t, kase.ExpectedMatch, pb.Match(kase.BranchName), "%s - %s", kase.BranchName, kase.Rule)
 	}
 }
diff --git a/models/issues/action_aggregator.go b/models/issues/action_aggregator.go
index cf5be753f1..c4632fd4dd 100644
--- a/models/issues/action_aggregator.go
+++ b/models/issues/action_aggregator.go
@@ -4,6 +4,7 @@
 package issues
 
 import (
+	"context"
 	"slices"
 
 	"forgejo.org/models/organization"
@@ -50,11 +51,12 @@ func (agg *ActionAggregator) aggregateAction(c *Comment, index int) {
 	}
 	agg.EndInd = index
 
-	if c.Type == CommentTypeClose {
+	switch c.Type {
+	case CommentTypeClose:
 		agg.IsClosed = true
-	} else if c.Type == CommentTypeReopen {
+	case CommentTypeReopen:
 		agg.IsClosed = false
-	} else if c.Type == CommentTypeReviewRequest {
+	case CommentTypeReviewRequest:
 		if c.AssigneeID > 0 {
 			req := RequestReviewTarget{User: c.Assignee}
 			if c.RemovedAssignee {
@@ -78,13 +80,13 @@ func (agg *ActionAggregator) aggregateAction(c *Comment, index int) {
 		for _, r := range c.AddedRequestReview {
 			agg.addReviewRequest(r)
 		}
-	} else if c.Type == CommentTypeLabel {
+	case CommentTypeLabel:
 		if c.Content == "1" {
 			agg.addLabel(c.Label)
 		} else {
 			agg.delLabel(c.Label)
 		}
-	} else if c.Type == CommentTypeAggregator {
+	case CommentTypeAggregator:
 		agg.Merge(c.Aggregator)
 	}
 }
@@ -373,3 +375,10 @@ func (t *RequestReviewTarget) Type() string {
 	}
 	return "team"
 }
+
+func (t *RequestReviewTarget) Link(ctx context.Context) string {
+	if t.User != nil {
+		return t.User.HomeLink()
+	}
+	return t.Team.Link(ctx)
+}
diff --git a/models/issues/action_aggregator_test.go b/models/issues/action_aggregator_test.go
new file mode 100644
index 0000000000..1962596d2d
--- /dev/null
+++ b/models/issues/action_aggregator_test.go
@@ -0,0 +1,37 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package issues
+
+import (
+	"testing"
+
+	"forgejo.org/models/db"
+	org_model "forgejo.org/models/organization"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRequestReviewTarget(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+
+	target := RequestReviewTarget{User: &user_model.User{ID: 1, Name: "user1"}}
+	assert.Equal(t, int64(1), target.ID())
+	assert.Equal(t, "user1", target.Name())
+	assert.Equal(t, "user", target.Type())
+	assert.Equal(t, "/user1", target.Link(db.DefaultContext))
+
+	target = RequestReviewTarget{Team: &org_model.Team{ID: 2, Name: "Collaborators", OrgID: 3}}
+	assert.Equal(t, int64(2), target.ID())
+	assert.Equal(t, "Collaborators", target.Name())
+	assert.Equal(t, "team", target.Type())
+	assert.Equal(t, "/org/org3/teams/Collaborators", target.Link(db.DefaultContext))
+
+	target = RequestReviewTarget{Team: org_model.NewGhostTeam()}
+	assert.Equal(t, int64(-1), target.ID())
+	assert.Equal(t, "Ghost team", target.Name())
+	assert.Equal(t, "team", target.Type())
+	assert.Empty(t, target.Link(db.DefaultContext))
+}
diff --git a/models/issues/comment.go b/models/issues/comment.go
index ce4cb6ea93..a84bbffd08 100644
--- a/models/issues/comment.go
+++ b/models/issues/comment.go
@@ -1,6 +1,6 @@
-// Copyright 2018 The Gitea Authors.
-// Copyright 2016 The Gogs Authors.
-// All rights reserved.
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package issues
@@ -324,6 +324,9 @@ type Comment struct {
 	NewCommit   string                              `xorm:"-"`
 	CommitsNum  int64                               `xorm:"-"`
 	IsForcePush bool                                `xorm:"-"`
+
+	// If you add new fields that might be used to store abusive content (mainly string fields),
+	// please also add them in the CommentData struct and the corresponding constructor.
 }
 
 func init() {
@@ -649,8 +652,11 @@ func (c *Comment) LoadAssigneeUserAndTeam(ctx context.Context) error {
 
 		if c.Issue.Repo.Owner.IsOrganization() {
 			c.AssigneeTeam, err = organization.GetTeamByID(ctx, c.AssigneeTeamID)
-			if err != nil && !organization.IsErrTeamNotExist(err) {
-				return err
+			if err != nil {
+				if !organization.IsErrTeamNotExist(err) {
+					return err
+				}
+				c.AssigneeTeam = organization.NewGhostTeam()
 			}
 		}
 	}
@@ -789,17 +795,16 @@ func (c *Comment) LoadPushCommits(ctx context.Context) (err error) {
 		}
 		c.OldCommit = data.CommitIDs[0]
 		c.NewCommit = data.CommitIDs[1]
-	} else {
-		gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, c.Issue.Repo)
-		if err != nil {
-			return err
-		}
-		defer closer.Close()
-
-		c.Commits = git_model.ConvertFromGitCommit(ctx, gitRepo.GetCommitsFromIDs(data.CommitIDs), c.Issue.Repo)
-		c.CommitsNum = int64(len(c.Commits))
 	}
 
+	gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, c.Issue.Repo)
+	if err != nil {
+		return err
+	}
+	defer closer.Close()
+	c.Commits = git_model.ParseCommitsWithStatus(ctx, gitRepo.GetCommitsFromIDs(data.CommitIDs), c.Issue.Repo)
+	c.CommitsNum = int64(len(c.Commits))
+
 	return err
 }
 
@@ -1149,6 +1154,11 @@ func UpdateComment(ctx context.Context, c *Comment, contentVersion int, doer *us
 	}
 	defer committer.Close()
 
+	// If the comment was reported as abusive, a shadow copy should be created before first update.
+	if err := IfNeededCreateShadowCopyForComment(ctx, c, true); err != nil {
+		return err
+	}
+
 	if err := c.LoadIssue(ctx); err != nil {
 		return err
 	}
@@ -1184,6 +1194,12 @@ func UpdateComment(ctx context.Context, c *Comment, contentVersion int, doer *us
 // DeleteComment deletes the comment
 func DeleteComment(ctx context.Context, comment *Comment) error {
 	e := db.GetEngine(ctx)
+
+	// If the comment was reported as abusive, a shadow copy should be created before deletion.
+	if err := IfNeededCreateShadowCopyForComment(ctx, comment, false); err != nil {
+		return err
+	}
+
 	if _, err := e.ID(comment.ID).NoAutoCondition().Delete(comment); err != nil {
 		return err
 	}
diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go
index 7285e347b4..9b502d1c91 100644
--- a/models/issues/comment_list.go
+++ b/models/issues/comment_list.go
@@ -101,7 +101,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		return nil
 	}
 
-	milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs))
+	milestones := make(map[int64]*Milestone, len(milestoneIDs))
 	left := len(milestoneIDs)
 	for left > 0 {
 		limit := db.DefaultMaxInSize
@@ -110,7 +110,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		}
 		err := db.GetEngine(ctx).
 			In("id", milestoneIDs[:limit]).
-			Find(&milestoneMaps)
+			Find(&milestones)
 		if err != nil {
 			return err
 		}
@@ -118,8 +118,8 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
 		milestoneIDs = milestoneIDs[limit:]
 	}
 
-	for _, issue := range comments {
-		issue.Milestone = milestoneMaps[issue.MilestoneID]
+	for _, comment := range comments {
+		comment.Milestone = milestones[comment.MilestoneID]
 	}
 	return nil
 }
@@ -140,7 +140,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		return nil
 	}
 
-	milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs))
+	milestones := make(map[int64]*Milestone, len(milestoneIDs))
 	left := len(milestoneIDs)
 	for left > 0 {
 		limit := db.DefaultMaxInSize
@@ -149,7 +149,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		}
 		err := db.GetEngine(ctx).
 			In("id", milestoneIDs[:limit]).
-			Find(&milestoneMaps)
+			Find(&milestones)
 		if err != nil {
 			return err
 		}
@@ -157,8 +157,8 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
 		milestoneIDs = milestoneIDs[limit:]
 	}
 
-	for _, issue := range comments {
-		issue.OldMilestone = milestoneMaps[issue.MilestoneID]
+	for _, comment := range comments {
+		comment.OldMilestone = milestones[comment.OldMilestoneID]
 	}
 	return nil
 }
diff --git a/models/issues/comment_test.go b/models/issues/comment_test.go
index 0e257f533c..c7adf6f62e 100644
--- a/models/issues/comment_test.go
+++ b/models/issues/comment_test.go
@@ -36,10 +36,10 @@ func TestCreateComment(t *testing.T) {
 	require.NoError(t, err)
 	then := time.Now().Unix()
 
-	assert.EqualValues(t, issues_model.CommentTypeComment, comment.Type)
-	assert.EqualValues(t, "Hello", comment.Content)
-	assert.EqualValues(t, issue.ID, comment.IssueID)
-	assert.EqualValues(t, doer.ID, comment.PosterID)
+	assert.Equal(t, issues_model.CommentTypeComment, comment.Type)
+	assert.Equal(t, "Hello", comment.Content)
+	assert.Equal(t, issue.ID, comment.IssueID)
+	assert.Equal(t, doer.ID, comment.PosterID)
 	unittest.AssertInt64InRange(t, now, then, int64(comment.CreatedUnix))
 	unittest.AssertExistsAndLoadBean(t, comment) // assert actually added to DB
 
@@ -95,7 +95,7 @@ func TestMigrate_InsertIssueComments(t *testing.T) {
 	require.NoError(t, err)
 
 	issueModified := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1})
-	assert.EqualValues(t, issue.NumComments+1, issueModified.NumComments)
+	assert.Equal(t, issue.NumComments+1, issueModified.NumComments)
 
 	unittest.CheckConsistencyFor(t, &issues_model.Issue{})
 }
@@ -132,5 +132,5 @@ func Test_UpdateIssueNumComments(t *testing.T) {
 
 	require.NoError(t, issues_model.UpdateIssueNumComments(db.DefaultContext, issue2.ID))
 	issue2 = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
-	assert.EqualValues(t, 1, issue2.NumComments)
+	assert.Equal(t, 1, issue2.NumComments)
 }
diff --git a/models/issues/issue.go b/models/issues/issue.go
index 142f2de182..5edebb4105 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -6,6 +6,7 @@ package issues
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"html/template"
 	"regexp"
@@ -646,7 +647,7 @@ func (issue *Issue) BlockedByDependencies(ctx context.Context, opts db.ListOptio
 	err = sess.Find(&issueDeps)
 
 	for _, depInfo := range issueDeps {
-		depInfo.Issue.Repo = &depInfo.Repository
+		depInfo.Repo = &depInfo.Repository
 	}
 
 	return issueDeps, err
@@ -664,7 +665,7 @@ func (issue *Issue) BlockingDependencies(ctx context.Context) (issueDeps []*Depe
 		Find(&issueDeps)
 
 	for _, depInfo := range issueDeps {
-		depInfo.Issue.Repo = &depInfo.Repository
+		depInfo.Repo = &depInfo.Repository
 	}
 
 	return issueDeps, err
@@ -804,7 +805,7 @@ func (issue *Issue) MovePin(ctx context.Context, newPosition int) error {
 	}
 
 	if newPosition < 1 {
-		return fmt.Errorf("The Position can't be lower than 1")
+		return errors.New("The Position can't be lower than 1")
 	}
 
 	dbctx, committer, err := db.TxContext(ctx)
diff --git a/models/issues/issue_list_test.go b/models/issues/issue_list_test.go
index 7aa5222958..8d43d34186 100644
--- a/models/issues/issue_list_test.go
+++ b/models/issues/issue_list_test.go
@@ -29,7 +29,7 @@ func TestIssueList_LoadRepositories(t *testing.T) {
 	require.NoError(t, err)
 	assert.Len(t, repos, 2)
 	for _, issue := range issueList {
-		assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
+		assert.Equal(t, issue.RepoID, issue.Repo.ID)
 	}
 }
 
@@ -43,28 +43,28 @@ func TestIssueList_LoadAttributes(t *testing.T) {
 
 	require.NoError(t, issueList.LoadAttributes(db.DefaultContext))
 	for _, issue := range issueList {
-		assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
+		assert.Equal(t, issue.RepoID, issue.Repo.ID)
 		for _, label := range issue.Labels {
-			assert.EqualValues(t, issue.RepoID, label.RepoID)
+			assert.Equal(t, issue.RepoID, label.RepoID)
 			unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
 		}
 		if issue.PosterID > 0 {
-			assert.EqualValues(t, issue.PosterID, issue.Poster.ID)
+			assert.Equal(t, issue.PosterID, issue.Poster.ID)
 		}
 		if issue.AssigneeID > 0 {
-			assert.EqualValues(t, issue.AssigneeID, issue.Assignee.ID)
+			assert.Equal(t, issue.AssigneeID, issue.Assignee.ID)
 		}
 		if issue.MilestoneID > 0 {
-			assert.EqualValues(t, issue.MilestoneID, issue.Milestone.ID)
+			assert.Equal(t, issue.MilestoneID, issue.Milestone.ID)
 		}
 		if issue.IsPull {
-			assert.EqualValues(t, issue.ID, issue.PullRequest.IssueID)
+			assert.Equal(t, issue.ID, issue.PullRequest.IssueID)
 		}
 		for _, attachment := range issue.Attachments {
-			assert.EqualValues(t, issue.ID, attachment.IssueID)
+			assert.Equal(t, issue.ID, attachment.IssueID)
 		}
 		for _, comment := range issue.Comments {
-			assert.EqualValues(t, issue.ID, comment.IssueID)
+			assert.Equal(t, issue.ID, comment.IssueID)
 		}
 		if issue.ID == int64(1) {
 			assert.Equal(t, int64(400), issue.TotalTrackedTime)
diff --git a/models/issues/issue_project_test.go b/models/issues/issue_project_test.go
index 099679a8c7..14d2e0a555 100644
--- a/models/issues/issue_project_test.go
+++ b/models/issues/issue_project_test.go
@@ -39,15 +39,15 @@ func TestPrivateIssueProjects(t *testing.T) {
 
 			issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.None[bool]())
 			require.NoError(t, err)
-			assert.EqualValues(t, 2, issuesNum)
+			assert.Equal(t, 2, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(true))
 			require.NoError(t, err)
-			assert.EqualValues(t, 0, issuesNum)
+			assert.Equal(t, 0, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(false))
 			require.NoError(t, err)
-			assert.EqualValues(t, 2, issuesNum)
+			assert.Equal(t, 2, issuesNum)
 		})
 
 		t.Run("Anonymous user", func(t *testing.T) {
@@ -59,15 +59,15 @@ func TestPrivateIssueProjects(t *testing.T) {
 
 			issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.None[bool]())
 			require.NoError(t, err)
-			assert.EqualValues(t, 1, issuesNum)
+			assert.Equal(t, 1, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.Some(true))
 			require.NoError(t, err)
-			assert.EqualValues(t, 0, issuesNum)
+			assert.Equal(t, 0, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, nil, org, optional.Some(false))
 			require.NoError(t, err)
-			assert.EqualValues(t, 1, issuesNum)
+			assert.Equal(t, 1, issuesNum)
 		})
 	})
 
@@ -85,15 +85,15 @@ func TestPrivateIssueProjects(t *testing.T) {
 
 			issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.None[bool]())
 			require.NoError(t, err)
-			assert.EqualValues(t, 2, issuesNum)
+			assert.Equal(t, 2, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.Some(true))
 			require.NoError(t, err)
-			assert.EqualValues(t, 0, issuesNum)
+			assert.Equal(t, 0, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, user2, nil, optional.Some(false))
 			require.NoError(t, err)
-			assert.EqualValues(t, 2, issuesNum)
+			assert.Equal(t, 2, issuesNum)
 		})
 
 		t.Run("Anonymous user", func(t *testing.T) {
@@ -105,15 +105,15 @@ func TestPrivateIssueProjects(t *testing.T) {
 
 			issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.None[bool]())
 			require.NoError(t, err)
-			assert.EqualValues(t, 1, issuesNum)
+			assert.Equal(t, 1, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.Some(true))
 			require.NoError(t, err)
-			assert.EqualValues(t, 0, issuesNum)
+			assert.Equal(t, 0, issuesNum)
 
 			issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, userProject, nil, nil, optional.Some(false))
 			require.NoError(t, err)
-			assert.EqualValues(t, 1, issuesNum)
+			assert.Equal(t, 1, issuesNum)
 		})
 	})
 }
@@ -137,15 +137,15 @@ func TestPrivateRepoProjects(t *testing.T) {
 
 		issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, user29, org, optional.None[bool]())
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, issuesNum)
+		assert.Equal(t, 1, issuesNum)
 
 		issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user29, org, optional.Some(true))
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, issuesNum)
+		assert.Equal(t, 0, issuesNum)
 
 		issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user29, org, optional.Some(false))
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, issuesNum)
+		assert.Equal(t, 1, issuesNum)
 	})
 
 	t.Run("Full access", func(t *testing.T) {
@@ -160,14 +160,14 @@ func TestPrivateRepoProjects(t *testing.T) {
 
 		issuesNum, err := issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.None[bool]())
 		require.NoError(t, err)
-		assert.EqualValues(t, 2, issuesNum)
+		assert.Equal(t, 2, issuesNum)
 
 		issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(true))
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, issuesNum)
+		assert.Equal(t, 0, issuesNum)
 
 		issuesNum, err = issues.NumIssuesInProject(db.DefaultContext, orgProject, user2, org, optional.Some(false))
 		require.NoError(t, err)
-		assert.EqualValues(t, 2, issuesNum)
+		assert.Equal(t, 2, issuesNum)
 	})
 }
diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
index bf4b89ee0b..529f0c15d4 100644
--- a/models/issues/issue_search.go
+++ b/models/issues/issue_search.go
@@ -48,7 +48,9 @@ type IssuesOptions struct { //nolint
 	UpdatedBeforeUnix  int64
 	// prioritize issues from this repo
 	PriorityRepoID int64
-	IsArchived     optional.Option[bool]
+	// if this issue index (not ID) exists and matches the filters, *and* priorityrepo sort is used, show it first
+	PriorityIssueIndex int64
+	IsArchived         optional.Option[bool]
 
 	// If combined with AllPublic, then private as well as public issues
 	// that matches the criteria will be returned, if AllPublic is false
@@ -60,12 +62,14 @@ type IssuesOptions struct { //nolint
 
 // applySorts sort an issues-related session based on the provided
 // sortType string
-func applySorts(sess *xorm.Session, sortType string, priorityRepoID int64) {
+func applySorts(sess *xorm.Session, sortType string, priorityRepoID, priorityIssueIndex int64) {
 	switch sortType {
 	case "oldest":
 		sess.Asc("issue.created_unix").Asc("issue.id")
 	case "recentupdate":
 		sess.Desc("issue.updated_unix").Desc("issue.created_unix").Desc("issue.id")
+	case "recentclose":
+		sess.Desc("issue.closed_unix").Desc("issue.created_unix").Desc("issue.id")
 	case "leastupdate":
 		sess.Asc("issue.updated_unix").Asc("issue.created_unix").Asc("issue.id")
 	case "mostcomment":
@@ -95,8 +99,11 @@ func applySorts(sess *xorm.Session, sortType string, priorityRepoID int64) {
 	case "priorityrepo":
 		sess.OrderBy("CASE "+
 			"WHEN issue.repo_id = ? THEN 1 "+
-			"ELSE 2 END ASC", priorityRepoID).
-			Desc("issue.created_unix").
+			"ELSE 2 END ASC", priorityRepoID)
+		if priorityIssueIndex != 0 {
+			sess.OrderBy("issue.index = ? DESC", priorityIssueIndex)
+		}
+		sess.Desc("issue.created_unix").
 			Desc("issue.id")
 	case "project-column-sorting":
 		sess.Asc("project_issue.sorting").Desc("issue.created_unix").Desc("issue.id")
@@ -468,7 +475,7 @@ func Issues(ctx context.Context, opts *IssuesOptions) (IssueList, error) {
 		Join("INNER", "repository", "`issue`.repo_id = `repository`.id")
 	applyLimit(sess, opts)
 	applyConditions(sess, opts)
-	applySorts(sess, opts.SortType, opts.PriorityRepoID)
+	applySorts(sess, opts.SortType, opts.PriorityRepoID, opts.PriorityIssueIndex)
 
 	issues := IssueList{}
 	if err := sess.Find(&issues); err != nil {
@@ -492,7 +499,7 @@ func IssueIDs(ctx context.Context, opts *IssuesOptions, otherConds ...builder.Co
 	}
 
 	applyLimit(sess, opts)
-	applySorts(sess, opts.SortType, opts.PriorityRepoID)
+	applySorts(sess, opts.SortType, opts.PriorityRepoID, opts.PriorityIssueIndex)
 
 	var res []int64
 	total, err := sess.Select("`issue`.id").Table(&Issue{}).FindAndCount(&res)
diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go
index afca27dfcf..8f40d3bdd9 100644
--- a/models/issues/issue_test.go
+++ b/models/issues/issue_test.go
@@ -143,8 +143,8 @@ func TestUpdateIssueCols(t *testing.T) {
 	then := time.Now().Unix()
 
 	updatedIssue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
-	assert.EqualValues(t, newTitle, updatedIssue.Title)
-	assert.EqualValues(t, prevContent, updatedIssue.Content)
+	assert.Equal(t, newTitle, updatedIssue.Title)
+	assert.Equal(t, prevContent, updatedIssue.Content)
 	unittest.AssertInt64InRange(t, now, then, int64(updatedIssue.UpdatedUnix))
 }
 
@@ -216,7 +216,7 @@ func TestIssues(t *testing.T) {
 		require.NoError(t, err)
 		if assert.Len(t, issues, len(test.ExpectedIssueIDs)) {
 			for i, issue := range issues {
-				assert.EqualValues(t, test.ExpectedIssueIDs[i], issue.ID)
+				assert.Equal(t, test.ExpectedIssueIDs[i], issue.ID)
 			}
 		}
 	}
@@ -249,10 +249,10 @@ func testInsertIssue(t *testing.T, title, content string, expectIndex int64) *is
 		has, err := db.GetEngine(db.DefaultContext).ID(issue.ID).Get(&newIssue)
 		require.NoError(t, err)
 		assert.True(t, has)
-		assert.EqualValues(t, issue.Title, newIssue.Title)
-		assert.EqualValues(t, issue.Content, newIssue.Content)
+		assert.Equal(t, issue.Title, newIssue.Title)
+		assert.Equal(t, issue.Content, newIssue.Content)
 		if expectIndex > 0 {
-			assert.EqualValues(t, expectIndex, newIssue.Index)
+			assert.Equal(t, expectIndex, newIssue.Index)
 		}
 	})
 	return &newIssue
@@ -286,7 +286,7 @@ func TestIssue_ResolveMentions(t *testing.T) {
 			ids[i] = user.ID
 		}
 		sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] })
-		assert.EqualValues(t, expected, ids)
+		assert.Equal(t, expected, ids)
 	}
 
 	// Public repo, existing user
@@ -421,28 +421,28 @@ func TestIssueLoadAttributes(t *testing.T) {
 
 	for _, issue := range issueList {
 		require.NoError(t, issue.LoadAttributes(db.DefaultContext))
-		assert.EqualValues(t, issue.RepoID, issue.Repo.ID)
+		assert.Equal(t, issue.RepoID, issue.Repo.ID)
 		for _, label := range issue.Labels {
-			assert.EqualValues(t, issue.RepoID, label.RepoID)
+			assert.Equal(t, issue.RepoID, label.RepoID)
 			unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label.ID})
 		}
 		if issue.PosterID > 0 {
-			assert.EqualValues(t, issue.PosterID, issue.Poster.ID)
+			assert.Equal(t, issue.PosterID, issue.Poster.ID)
 		}
 		if issue.AssigneeID > 0 {
-			assert.EqualValues(t, issue.AssigneeID, issue.Assignee.ID)
+			assert.Equal(t, issue.AssigneeID, issue.Assignee.ID)
 		}
 		if issue.MilestoneID > 0 {
-			assert.EqualValues(t, issue.MilestoneID, issue.Milestone.ID)
+			assert.Equal(t, issue.MilestoneID, issue.Milestone.ID)
 		}
 		if issue.IsPull {
-			assert.EqualValues(t, issue.ID, issue.PullRequest.IssueID)
+			assert.Equal(t, issue.ID, issue.PullRequest.IssueID)
 		}
 		for _, attachment := range issue.Attachments {
-			assert.EqualValues(t, issue.ID, attachment.IssueID)
+			assert.Equal(t, issue.ID, attachment.IssueID)
 		}
 		for _, comment := range issue.Comments {
-			assert.EqualValues(t, issue.ID, comment.IssueID)
+			assert.Equal(t, issue.ID, comment.IssueID)
 		}
 		if issue.ID == int64(1) {
 			assert.Equal(t, int64(400), issue.TotalTrackedTime)
diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go
index 9d0bc84454..aca9069205 100644
--- a/models/issues/issue_update.go
+++ b/models/issues/issue_update.go
@@ -1,10 +1,12 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package issues
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -275,6 +277,11 @@ func ChangeIssueContent(ctx context.Context, issue *Issue, doer *user_model.User
 		}
 	}
 
+	// If the issue was reported as abusive, a shadow copy should be created before first update.
+	if err := IfNeededCreateShadowCopyForIssue(ctx, issue); err != nil {
+		return err
+	}
+
 	issue.Content = content
 	issue.ContentVersion = contentVersion + 1
 
@@ -332,10 +339,10 @@ func NewIssueWithIndex(ctx context.Context, doer *user_model.User, opts NewIssue
 	}
 
 	if opts.Issue.Index <= 0 {
-		return fmt.Errorf("no issue index provided")
+		return errors.New("no issue index provided")
 	}
 	if opts.Issue.ID > 0 {
-		return fmt.Errorf("issue exist")
+		return errors.New("issue exist")
 	}
 
 	opts.Issue.Created = timeutil.TimeStampNanoNow()
diff --git a/models/issues/label_test.go b/models/issues/label_test.go
index f2ba28a6d2..f289ac0f86 100644
--- a/models/issues/label_test.go
+++ b/models/issues/label_test.go
@@ -21,7 +21,7 @@ func TestLabel_CalOpenIssues(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 	label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
 	label.CalOpenIssues()
-	assert.EqualValues(t, 2, label.NumOpenIssues)
+	assert.Equal(t, 2, label.NumOpenIssues)
 }
 
 func TestLabel_LoadSelectedLabelsAfterClick(t *testing.T) {
@@ -156,7 +156,7 @@ func TestGetLabelsByRepoID(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, labels, len(expectedIssueIDs))
 		for i, label := range labels {
-			assert.EqualValues(t, expectedIssueIDs[i], label.ID)
+			assert.Equal(t, expectedIssueIDs[i], label.ID)
 		}
 	}
 	testSuccess(1, "leastissues", []int64{2, 1})
@@ -223,7 +223,7 @@ func TestGetLabelsByOrgID(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, labels, len(expectedIssueIDs))
 		for i, label := range labels {
-			assert.EqualValues(t, expectedIssueIDs[i], label.ID)
+			assert.Equal(t, expectedIssueIDs[i], label.ID)
 		}
 	}
 	testSuccess(3, "leastissues", []int64{3, 4})
@@ -269,10 +269,10 @@ func TestUpdateLabel(t *testing.T) {
 	label.Name = update.Name
 	require.NoError(t, issues_model.UpdateLabel(db.DefaultContext, update))
 	newLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
-	assert.EqualValues(t, label.ID, newLabel.ID)
-	assert.EqualValues(t, label.Color, newLabel.Color)
-	assert.EqualValues(t, label.Name, newLabel.Name)
-	assert.EqualValues(t, label.Description, newLabel.Description)
+	assert.Equal(t, label.ID, newLabel.ID)
+	assert.Equal(t, label.Color, newLabel.Color)
+	assert.Equal(t, label.Name, newLabel.Name)
+	assert.Equal(t, label.Description, newLabel.Description)
 	assert.EqualValues(t, 0, newLabel.ArchivedUnix)
 	unittest.CheckConsistencyFor(t, &issues_model.Label{}, &repo_model.Repository{})
 }
@@ -315,7 +315,7 @@ func TestNewIssueLabel(t *testing.T) {
 		Content:  "1",
 	})
 	label = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 2})
-	assert.EqualValues(t, prevNumIssues+1, label.NumIssues)
+	assert.Equal(t, prevNumIssues+1, label.NumIssues)
 
 	// re-add existing IssueLabel
 	require.NoError(t, issues_model.NewIssueLabel(db.DefaultContext, issue, label, doer))
@@ -368,11 +368,11 @@ func TestNewIssueLabels(t *testing.T) {
 	})
 	unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label1.ID})
 	label1 = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
-	assert.EqualValues(t, 3, label1.NumIssues)
-	assert.EqualValues(t, 1, label1.NumClosedIssues)
+	assert.Equal(t, 3, label1.NumIssues)
+	assert.Equal(t, 1, label1.NumClosedIssues)
 	label2 = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 2})
-	assert.EqualValues(t, 1, label2.NumIssues)
-	assert.EqualValues(t, 1, label2.NumClosedIssues)
+	assert.Equal(t, 1, label2.NumIssues)
+	assert.Equal(t, 1, label2.NumClosedIssues)
 
 	// corner case: test empty slice
 	require.NoError(t, issues_model.NewIssueLabels(db.DefaultContext, issue, []*issues_model.Label{}, doer))
@@ -410,8 +410,8 @@ func TestDeleteIssueLabel(t *testing.T) {
 			LabelID:  labelID,
 		}, `content=""`)
 		label = unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: labelID})
-		assert.EqualValues(t, expectedNumIssues, label.NumIssues)
-		assert.EqualValues(t, expectedNumClosedIssues, label.NumClosedIssues)
+		assert.Equal(t, expectedNumIssues, label.NumIssues)
+		assert.Equal(t, expectedNumClosedIssues, label.NumClosedIssues)
 	}
 	testSuccess(1, 1, 2)
 	testSuccess(2, 5, 2)
diff --git a/models/issues/milestone.go b/models/issues/milestone.go
index 52433e735d..67a23246cf 100644
--- a/models/issues/milestone.go
+++ b/models/issues/milestone.go
@@ -67,6 +67,13 @@ type Milestone struct {
 	TotalTrackedTime int64 `xorm:"-"`
 }
 
+// Ghost milestone is a milestone which has been deleted
+const GhostMilestoneID = -1
+
+func (m *Milestone) IsGhost() bool {
+	return m.ID == GhostMilestoneID
+}
+
 func init() {
 	db.RegisterModel(new(Milestone))
 }
diff --git a/models/issues/milestone_test.go b/models/issues/milestone_test.go
index bfb4f38ad0..7391cc0894 100644
--- a/models/issues/milestone_test.go
+++ b/models/issues/milestone_test.go
@@ -70,7 +70,7 @@ func TestGetMilestonesByRepoID(t *testing.T) {
 
 		assert.Len(t, milestones, n)
 		for _, milestone := range milestones {
-			assert.EqualValues(t, repoID, milestone.RepoID)
+			assert.Equal(t, repoID, milestone.RepoID)
 		}
 	}
 	test(1, api.StateOpen)
@@ -327,7 +327,7 @@ func TestUpdateMilestone(t *testing.T) {
 	milestone.Content = "newMilestoneContent"
 	require.NoError(t, issues_model.UpdateMilestone(db.DefaultContext, milestone, milestone.IsClosed))
 	milestone = unittest.AssertExistsAndLoadBean(t, &issues_model.Milestone{ID: 1})
-	assert.EqualValues(t, "newMilestoneName", milestone.Name)
+	assert.Equal(t, "newMilestoneName", milestone.Name)
 	unittest.CheckConsistencyFor(t, &issues_model.Milestone{})
 }
 
@@ -364,7 +364,7 @@ func TestMigrate_InsertMilestones(t *testing.T) {
 	require.NoError(t, err)
 	unittest.AssertExistsAndLoadBean(t, ms)
 	repoModified := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repo.ID})
-	assert.EqualValues(t, repo.NumMilestones+1, repoModified.NumMilestones)
+	assert.Equal(t, repo.NumMilestones+1, repoModified.NumMilestones)
 
 	unittest.CheckConsistencyFor(t, &issues_model.Milestone{})
 }
diff --git a/models/issues/moderation.go b/models/issues/moderation.go
new file mode 100644
index 0000000000..9afb711d65
--- /dev/null
+++ b/models/issues/moderation.go
@@ -0,0 +1,141 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package issues
+
+import (
+	"context"
+	"strconv"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/timeutil"
+)
+
+// IssueData represents a trimmed down issue that is used for preserving
+// only the fields needed for abusive content reports (mainly string fields).
+type IssueData struct {
+	RepoID         int64
+	Index          int64
+	PosterID       int64
+	Title          string
+	Content        string
+	ContentVersion int
+	CreatedUnix    timeutil.TimeStamp
+	UpdatedUnix    timeutil.TimeStamp
+}
+
+// Implements GetFieldsMap() from ShadowCopyData interface, returning a list of <key, value> pairs
+// to be used when rendering the shadow copy for admins reviewing the corresponding abuse report(s).
+func (cd IssueData) GetFieldsMap() []moderation.ShadowCopyField {
+	return []moderation.ShadowCopyField{
+		{Key: "RepoID", Value: strconv.FormatInt(cd.RepoID, 10)},
+		{Key: "Index", Value: strconv.FormatInt(cd.Index, 10)},
+		{Key: "PosterID", Value: strconv.FormatInt(cd.PosterID, 10)},
+		{Key: "Title", Value: cd.Title},
+		{Key: "Content", Value: cd.Content},
+		{Key: "ContentVersion", Value: strconv.Itoa(cd.ContentVersion)},
+		{Key: "CreatedUnix", Value: cd.CreatedUnix.AsLocalTime().String()},
+		{Key: "UpdatedUnix", Value: cd.UpdatedUnix.AsLocalTime().String()},
+	}
+}
+
+// newIssueData creates a trimmed down issue to be used just to create a JSON structure
+// (keeping only the fields relevant for moderation purposes)
+func newIssueData(issue *Issue) IssueData {
+	return IssueData{
+		RepoID:         issue.RepoID,
+		Index:          issue.Index,
+		PosterID:       issue.PosterID,
+		Title:          issue.Title,
+		Content:        issue.Content,
+		ContentVersion: issue.ContentVersion,
+		CreatedUnix:    issue.CreatedUnix,
+		UpdatedUnix:    issue.UpdatedUnix,
+	}
+}
+
+// CommentData represents a trimmed down comment that is used for preserving
+// only the fields needed for abusive content reports (mainly string fields).
+type CommentData struct {
+	PosterID       int64
+	IssueID        int64
+	Content        string
+	ContentVersion int
+	CreatedUnix    timeutil.TimeStamp
+	UpdatedUnix    timeutil.TimeStamp
+}
+
+// Implements GetFieldsMap() from ShadowCopyData interface, returning a list of <key, value> pairs
+// to be used when rendering the shadow copy for admins reviewing the corresponding abuse report(s).
+func (cd CommentData) GetFieldsMap() []moderation.ShadowCopyField {
+	return []moderation.ShadowCopyField{
+		{Key: "PosterID", Value: strconv.FormatInt(cd.PosterID, 10)},
+		{Key: "IssueID", Value: strconv.FormatInt(cd.IssueID, 10)},
+		{Key: "Content", Value: cd.Content},
+		{Key: "ContentVersion", Value: strconv.Itoa(cd.ContentVersion)},
+		{Key: "CreatedUnix", Value: cd.CreatedUnix.AsLocalTime().String()},
+		{Key: "UpdatedUnix", Value: cd.UpdatedUnix.AsLocalTime().String()},
+	}
+}
+
+// newCommentData creates a trimmed down comment to be used just to create a JSON structure
+// (keeping only the fields relevant for moderation purposes)
+func newCommentData(comment *Comment) CommentData {
+	return CommentData{
+		PosterID:       comment.PosterID,
+		IssueID:        comment.IssueID,
+		Content:        comment.Content,
+		ContentVersion: comment.ContentVersion,
+		CreatedUnix:    comment.CreatedUnix,
+		UpdatedUnix:    comment.UpdatedUnix,
+	}
+}
+
+// IfNeededCreateShadowCopyForIssue checks if for the given issue there are any reports of abusive content submitted
+// and if found a shadow copy of relevant issue fields will be stored into DB and linked to the above report(s).
+// This function should be called before a issue is deleted or updated.
+func IfNeededCreateShadowCopyForIssue(ctx context.Context, issue *Issue) error {
+	shadowCopyNeeded, err := moderation.IsShadowCopyNeeded(ctx, moderation.ReportedContentTypeIssue, issue.ID)
+	if err != nil {
+		return err
+	}
+
+	if shadowCopyNeeded {
+		issueData := newIssueData(issue)
+		content, err := json.Marshal(issueData)
+		if err != nil {
+			return err
+		}
+		return moderation.CreateShadowCopyForIssue(ctx, issue.ID, string(content))
+	}
+
+	return nil
+}
+
+// IfNeededCreateShadowCopyForComment checks if for the given comment there are any reports of abusive content submitted
+// and if found a shadow copy of relevant comment fields will be stored into DB and linked to the above report(s).
+// This function should be called before a comment is deleted or updated.
+func IfNeededCreateShadowCopyForComment(ctx context.Context, comment *Comment, forUpdates bool) error {
+	shadowCopyNeeded, err := moderation.IsShadowCopyNeeded(ctx, moderation.ReportedContentTypeComment, comment.ID)
+	if err != nil {
+		return err
+	}
+
+	if shadowCopyNeeded {
+		if forUpdates {
+			// get the unaltered comment fields (for updates the provided variable is already altered but not yet saved)
+			if comment, err = GetCommentByID(ctx, comment.ID); err != nil {
+				return err
+			}
+		}
+		commentData := newCommentData(comment)
+		content, err := json.Marshal(commentData)
+		if err != nil {
+			return err
+		}
+		return moderation.CreateShadowCopyForComment(ctx, comment.ID, string(content))
+	}
+
+	return nil
+}
diff --git a/models/issues/moderation_test.go b/models/issues/moderation_test.go
new file mode 100644
index 0000000000..adb07bd63a
--- /dev/null
+++ b/models/issues/moderation_test.go
@@ -0,0 +1,70 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package issues_test
+
+import (
+	"testing"
+
+	"forgejo.org/models/issues"
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	tsCreated timeutil.TimeStamp = timeutil.TimeStamp(1753093500) // 2025-07-21 10:25:00 UTC
+	tsUpdated timeutil.TimeStamp = timeutil.TimeStamp(1753093525) // 2025-07-21 10:25:25 UTC
+)
+
+func testShadowCopyField(t *testing.T, scField moderation.ShadowCopyField, key, value string) {
+	assert.Equal(t, key, scField.Key)
+	assert.Equal(t, value, scField.Value)
+}
+
+func TestIssueDataGetFieldsMap(t *testing.T) {
+	id := issues.IssueData{
+		RepoID:         2001,
+		Index:          2,
+		PosterID:       1002,
+		Title:          "Professional marketing services",
+		Content:        "Visit my website at promote-your-business.biz for a list of available services.",
+		ContentVersion: 0,
+		CreatedUnix:    tsCreated,
+		UpdatedUnix:    tsUpdated,
+	}
+	scFields := id.GetFieldsMap()
+
+	if assert.Len(t, scFields, 8) {
+		testShadowCopyField(t, scFields[0], "RepoID", "2001")
+		testShadowCopyField(t, scFields[1], "Index", "2")
+		testShadowCopyField(t, scFields[2], "PosterID", "1002")
+		testShadowCopyField(t, scFields[3], "Title", "Professional marketing services")
+		testShadowCopyField(t, scFields[4], "Content", "Visit my website at promote-your-business.biz for a list of available services.")
+		testShadowCopyField(t, scFields[5], "ContentVersion", "0")
+		testShadowCopyField(t, scFields[6], "CreatedUnix", tsCreated.AsLocalTime().String())
+		testShadowCopyField(t, scFields[7], "UpdatedUnix", tsUpdated.AsLocalTime().String())
+	}
+}
+
+func TestCommentDataGetFieldsMap(t *testing.T) {
+	cd := issues.CommentData{
+		PosterID:       1002,
+		IssueID:        3001,
+		Content:        "Check out [alexsmith/website](/alexsmith/website)",
+		ContentVersion: 0,
+		CreatedUnix:    tsCreated,
+		UpdatedUnix:    tsUpdated,
+	}
+	scFields := cd.GetFieldsMap()
+
+	if assert.Len(t, scFields, 6) {
+		testShadowCopyField(t, scFields[0], "PosterID", "1002")
+		testShadowCopyField(t, scFields[1], "IssueID", "3001")
+		testShadowCopyField(t, scFields[2], "Content", "Check out [alexsmith/website](/alexsmith/website)")
+		testShadowCopyField(t, scFields[3], "ContentVersion", "0")
+		testShadowCopyField(t, scFields[4], "CreatedUnix", tsCreated.AsLocalTime().String())
+		testShadowCopyField(t, scFields[5], "UpdatedUnix", tsUpdated.AsLocalTime().String())
+	}
+}
diff --git a/models/issues/pull.go b/models/issues/pull.go
index c46961447c..188ef00814 100644
--- a/models/issues/pull.go
+++ b/models/issues/pull.go
@@ -5,7 +5,9 @@
 package issues
 
 import (
+	"bufio"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"regexp"
@@ -795,7 +797,7 @@ func (pr *PullRequest) GetWorkInProgressPrefix(ctx context.Context) string {
 // UpdateCommitDivergence update Divergence of a pull request
 func (pr *PullRequest) UpdateCommitDivergence(ctx context.Context, ahead, behind int) error {
 	if pr.ID == 0 {
-		return fmt.Errorf("pull ID is 0")
+		return errors.New("pull ID is 0")
 	}
 	pr.CommitsAhead = ahead
 	pr.CommitsBehind = behind
@@ -922,31 +924,30 @@ func MergeBlockedByOutdatedBranch(protectBranch *git_model.ProtectedBranch, pr *
 	return protectBranch.BlockOnOutdatedBranch && pr.CommitsBehind > 0
 }
 
-// GetCodeOwnersFromContent returns the code owners configuration
-// Return empty slice if files missing
+// GetCodeOwnersFromReader returns the code owners configuration
 // Return warning messages on parsing errors
 // We're trying to do the best we can when parsing a file.
 // Invalid lines are skipped. Non-existent users and teams too.
-func GetCodeOwnersFromContent(ctx context.Context, data string) ([]*CodeOwnerRule, []string) {
-	if len(data) == 0 {
-		return nil, nil
-	}
+func GetCodeOwnersFromReader(ctx context.Context, rc io.ReadCloser, truncated bool) ([]*CodeOwnerRule, []string) {
+	defer rc.Close()
+	scanner := bufio.NewScanner(rc)
 
-	rules := make([]*CodeOwnerRule, 0)
-	lines := strings.Split(data, "\n")
-	warnings := make([]string, 0)
+	var rules []*CodeOwnerRule
+	var warnings []string
+	line := 0
+	for scanner.Scan() {
+		line++
 
-	for i, line := range lines {
-		tokens := TokenizeCodeOwnersLine(line)
+		tokens := TokenizeCodeOwnersLine(scanner.Text())
 		if len(tokens) == 0 {
 			continue
 		} else if len(tokens) < 2 {
-			warnings = append(warnings, fmt.Sprintf("Line: %d: incorrect format", i+1))
+			warnings = append(warnings, fmt.Sprintf("Line: %d: incorrect format", line))
 			continue
 		}
 		rule, wr := ParseCodeOwnersLine(ctx, tokens)
 		for _, w := range wr {
-			warnings = append(warnings, fmt.Sprintf("Line: %d: %s", i+1, w))
+			warnings = append(warnings, fmt.Sprintf("Line: %d: %s", line, w))
 		}
 		if rule == nil {
 			continue
@@ -954,6 +955,12 @@ func GetCodeOwnersFromContent(ctx context.Context, data string) ([]*CodeOwnerRul
 
 		rules = append(rules, rule)
 	}
+	if err := scanner.Err(); err != nil {
+		warnings = append(warnings, err.Error())
+	}
+	if truncated {
+		warnings = append(warnings, fmt.Sprintf("File too big: truncated while on line %d", line))
+	}
 
 	return rules, warnings
 }
diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go
index a448673454..ddb813cf44 100644
--- a/models/issues/pull_list.go
+++ b/models/issues/pull_list.go
@@ -149,10 +149,11 @@ func PullRequests(ctx context.Context, baseRepoID int64, opts *PullRequestsOptio
 	}
 
 	findSession := listPullRequestStatement(ctx, baseRepoID, opts)
-	applySorts(findSession, opts.SortType, 0)
+	applySorts(findSession, opts.SortType, 0, 0)
 	findSession = db.SetSessionPagination(findSession, opts)
 	prs := make([]*PullRequest, 0, opts.PageSize)
-	return prs, maxResults, findSession.Find(&prs)
+	found := findSession.Find(&prs)
+	return prs, maxResults, found
 }
 
 // PullRequestList defines a list of pull requests
diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go
index e85b626c83..3682f6fd25 100644
--- a/models/issues/pull_test.go
+++ b/models/issues/pull_test.go
@@ -79,6 +79,47 @@ func TestPullRequestsNewest(t *testing.T) {
 	}
 }
 
+func TestPullRequests_Closed_RecentSortType(t *testing.T) {
+	// Issue ID | Closed At.  | Updated At
+	//    2     | 1707270001  | 1707270001
+	//    3     | 1707271000  | 1707279999
+	//    11    | 1707279999  | 1707275555
+	tests := []struct {
+		sortType             string
+		expectedIssueIDOrder []int64
+	}{
+		{"recentupdate", []int64{3, 11, 2}},
+		{"recentclose", []int64{11, 3, 2}},
+	}
+
+	require.NoError(t, unittest.PrepareTestDatabase())
+	_, err := db.Exec(db.DefaultContext, "UPDATE issue SET closed_unix = 1707270001, updated_unix = 1707270001, is_closed = true WHERE id = 2")
+	require.NoError(t, err)
+	_, err = db.Exec(db.DefaultContext, "UPDATE issue SET closed_unix = 1707271000, updated_unix = 1707279999, is_closed = true WHERE id = 3")
+	require.NoError(t, err)
+	_, err = db.Exec(db.DefaultContext, "UPDATE issue SET closed_unix = 1707279999, updated_unix = 1707275555, is_closed = true WHERE id = 11")
+	require.NoError(t, err)
+
+	for _, test := range tests {
+		t.Run(test.sortType, func(t *testing.T) {
+			prs, _, err := issues_model.PullRequests(db.DefaultContext, 1, &issues_model.PullRequestsOptions{
+				ListOptions: db.ListOptions{
+					Page: 1,
+				},
+				State:    "closed",
+				SortType: test.sortType,
+			})
+			require.NoError(t, err)
+
+			if assert.Len(t, prs, len(test.expectedIssueIDOrder)) {
+				for i := range test.expectedIssueIDOrder {
+					assert.Equal(t, test.expectedIssueIDOrder[i], prs[i].IssueID)
+				}
+			}
+		})
+	}
+}
+
 func TestLoadRequestedReviewers(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 
@@ -398,7 +439,7 @@ func TestDeleteOrphanedObjects(t *testing.T) {
 
 	countAfter, err := db.GetEngine(db.DefaultContext).Count(&issues_model.PullRequest{})
 	require.NoError(t, err)
-	assert.EqualValues(t, countBefore, countAfter)
+	assert.Equal(t, countBefore, countAfter)
 }
 
 func TestParseCodeOwnersLine(t *testing.T) {
@@ -431,7 +472,7 @@ func TestGetApprovers(t *testing.T) {
 	setting.Repository.PullRequest.DefaultMergeMessageOfficialApproversOnly = false
 	approvers := pr.GetApprovers(db.DefaultContext)
 	expected := "Reviewed-by: User Five <user5@example.com>\nReviewed-by: Org Six <org6@example.com>\n"
-	assert.EqualValues(t, expected, approvers)
+	assert.Equal(t, expected, approvers)
 }
 
 func TestGetPullRequestByMergedCommit(t *testing.T) {
diff --git a/models/issues/review.go b/models/issues/review.go
index db5cd65e2e..5370117a81 100644
--- a/models/issues/review.go
+++ b/models/issues/review.go
@@ -5,6 +5,7 @@ package issues
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"slices"
 	"strings"
@@ -349,7 +350,7 @@ func CreateReview(ctx context.Context, opts CreateReviewOptions) (*Review, error
 		review.Type = ReviewTypeRequest
 		review.ReviewerTeamID = opts.ReviewerTeam.ID
 	} else {
-		return nil, fmt.Errorf("provide either reviewer or reviewer team")
+		return nil, errors.New("provide either reviewer or reviewer team")
 	}
 
 	if _, err := sess.Insert(review); err != nil {
@@ -780,10 +781,6 @@ func AddTeamReviewRequest(ctx context.Context, issue *Issue, reviewer *organizat
 	official, err := IsOfficialReviewerTeam(ctx, issue, reviewer)
 	if err != nil {
 		return nil, fmt.Errorf("isOfficialReviewerTeam(): %w", err)
-	} else if !official {
-		if official, err = IsOfficialReviewer(ctx, issue, doer); err != nil {
-			return nil, fmt.Errorf("isOfficialReviewer(): %w", err)
-		}
 	}
 
 	if review, err = CreateReview(ctx, CreateReviewOptions{
@@ -796,12 +793,6 @@ func AddTeamReviewRequest(ctx context.Context, issue *Issue, reviewer *organizat
 		return nil, err
 	}
 
-	if official {
-		if _, err := db.Exec(ctx, "UPDATE `review` SET official=? WHERE issue_id=? AND reviewer_team_id=?", false, issue.ID, reviewer.ID); err != nil {
-			return nil, err
-		}
-	}
-
 	comment, err := CreateComment(ctx, &CreateCommentOptions{
 		Type:            CommentTypeReviewRequest,
 		Doer:            doer,
@@ -908,7 +899,7 @@ func MarkConversation(ctx context.Context, comment *Comment, doer *user_model.Us
 // the PR writer , offfcial reviewer and poster can do it
 func CanMarkConversation(ctx context.Context, issue *Issue, doer *user_model.User) (permResult bool, err error) {
 	if doer == nil || issue == nil {
-		return false, fmt.Errorf("issue or doer is nil")
+		return false, errors.New("issue or doer is nil")
 	}
 
 	if doer.ID != issue.PosterID {
@@ -945,11 +936,11 @@ func DeleteReview(ctx context.Context, r *Review) error {
 	defer committer.Close()
 
 	if r.ID == 0 {
-		return fmt.Errorf("review is not allowed to be 0")
+		return errors.New("review is not allowed to be 0")
 	}
 
 	if r.Type == ReviewTypeRequest {
-		return fmt.Errorf("review request can not be deleted using this method")
+		return errors.New("review request can not be deleted using this method")
 	}
 
 	opts := FindCommentsOptions{
diff --git a/models/issues/review_test.go b/models/issues/review_test.go
index 33d131c225..6e2f6ddfa8 100644
--- a/models/issues/review_test.go
+++ b/models/issues/review_test.go
@@ -8,6 +8,7 @@ import (
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
+	organization_model "forgejo.org/models/organization"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
@@ -319,3 +320,80 @@ func TestAddReviewRequest(t *testing.T) {
 	require.Error(t, err)
 	assert.True(t, issues_model.IsErrReviewRequestOnClosedPR(err))
 }
+
+func TestAddTeamReviewRequest(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/TestAddTeamReviewRequest")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	setupForProtectedBranch := func() (*issues_model.Issue, *user_model.User) {
+		// From override models/fixtures/TestAddTeamReviewRequest/issue.yml; issue #23 is a PR into a protected branch
+		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 23})
+		require.NoError(t, issue.LoadRepo(db.DefaultContext))
+		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+		return issue, doer
+	}
+
+	t.Run("Protected branch, not official team", func(t *testing.T) {
+		issue, doer := setupForProtectedBranch()
+		// Team 2 is not part of the whitelist for this protected branch
+		team := unittest.AssertExistsAndLoadBean(t, &organization_model.Team{ID: 2})
+
+		comment, err := issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team, doer)
+		require.NoError(t, err)
+		require.NotNil(t, comment)
+
+		review, err := issues_model.GetTeamReviewerByIssueIDAndTeamID(db.DefaultContext, issue.ID, team.ID)
+		require.NoError(t, err)
+		require.NotNil(t, review)
+		assert.Equal(t, issues_model.ReviewTypeRequest, review.Type)
+		assert.Equal(t, team.ID, review.ReviewerTeamID)
+		// This review request should not be marked official because it is not a request for a team in the branch
+		// protection rule's whitelist...
+		assert.False(t, review.Official)
+	})
+
+	t.Run("Protected branch, official team", func(t *testing.T) {
+		issue, doer := setupForProtectedBranch()
+		// Team 1 is part of the whitelist for this protected branch
+		team := unittest.AssertExistsAndLoadBean(t, &organization_model.Team{ID: 1})
+
+		comment, err := issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team, doer)
+		require.NoError(t, err)
+		require.NotNil(t, comment)
+
+		review, err := issues_model.GetTeamReviewerByIssueIDAndTeamID(db.DefaultContext, issue.ID, team.ID)
+		require.NoError(t, err)
+		require.NotNil(t, review)
+		assert.Equal(t, issues_model.ReviewTypeRequest, review.Type)
+		assert.Equal(t, team.ID, review.ReviewerTeamID)
+		// Expected to be considered official because team 1 is in the review whitelist for this protected branch
+		assert.True(t, review.Official)
+	})
+
+	t.Run("Unprotected branch, official team", func(t *testing.T) {
+		// Working on a PR into a branch that is not protected, issue #2
+		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+		require.NoError(t, issue.LoadRepo(db.DefaultContext))
+		doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+		// team is a team that has write perms against the repo
+		team := unittest.AssertExistsAndLoadBean(t, &organization_model.Team{ID: 1})
+
+		comment, err := issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team, doer)
+		require.NoError(t, err)
+		require.NotNil(t, comment)
+
+		review, err := issues_model.GetTeamReviewerByIssueIDAndTeamID(db.DefaultContext, issue.ID, team.ID)
+		require.NoError(t, err)
+		require.NotNil(t, review)
+		assert.Equal(t, issues_model.ReviewTypeRequest, review.Type)
+		assert.Equal(t, team.ID, review.ReviewerTeamID)
+		// Will not be marked as official because PR #2 there's no branch protection rule that enables whitelist
+		// approvals (verifying logic in `IsOfficialReviewerTeam` indirectly)
+		assert.False(t, review.Official)
+
+		// Adding the same team review request again should be a noop
+		comment, err = issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team, doer)
+		require.NoError(t, err)
+		require.Nil(t, comment)
+	})
+}
diff --git a/models/issues/stopwatch_test.go b/models/issues/stopwatch_test.go
index 3334ffea7d..d16e1d82df 100644
--- a/models/issues/stopwatch_test.go
+++ b/models/issues/stopwatch_test.go
@@ -84,7 +84,7 @@ func TestGetUIDsAndStopwatch(t *testing.T) {
 
 	uidStopwatches, err := issues_model.GetUIDsAndStopwatch(db.DefaultContext)
 	require.NoError(t, err)
-	assert.EqualValues(t, map[int64][]*issues_model.Stopwatch{
+	assert.Equal(t, map[int64][]*issues_model.Stopwatch{
 		1: {
 			{
 				ID:          1,
diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go
index 897ad016ab..7f7edda53b 100644
--- a/models/migrations/base/db.go
+++ b/models/migrations/base/db.go
@@ -74,7 +74,7 @@ func RecreateTable(sess *xorm.Session, bean any) error {
 	}
 	newTableColumns := table.Columns()
 	if len(newTableColumns) == 0 {
-		return fmt.Errorf("no columns in new table")
+		return errors.New("no columns in new table")
 	}
 	hasID := false
 	for _, column := range newTableColumns {
diff --git a/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package.yml b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package.yml
new file mode 100644
index 0000000000..df6fd6348f
--- /dev/null
+++ b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package.yml
@@ -0,0 +1,66 @@
+- id: 1
+  owner_id: 2
+  repo_id: 0
+  type: maven
+  name: com.example-parent-project
+  lower_name: com.example-parent-project
+  semver_compatible: 0
+  is_internal: 0
+- id: 2
+  owner_id: 2
+  repo_id: 0
+  type: maven
+  name: com.example-sub-module
+  lower_name: com.example-sub-module
+  semver_compatible: 0
+  is_internal: 0
+- id: 3
+  owner_id: 1
+  repo_id: 0
+  type: maven
+  name: com.example-parent-project
+  lower_name: com.example-parent-project
+  semver_compatible: 0
+  is_internal: 0
+- id: 4
+  owner_id: 1
+  repo_id: 0
+  type: maven
+  name: com.example-sub-module
+  lower_name: com.example-sub-module
+  semver_compatible: 0
+  is_internal: 0
+- id: 5
+  owner_id: 1
+  repo_id: 0
+  type: maven
+  name: foo--bar
+  lower_name: foo--bar
+  semver_compatible: 0
+  is_internal: 0
+# broken uploads
+- id: 6
+  owner_id: 8
+  repo_id: 54
+  type: maven
+  name: com.broken-br-rest-webmvc
+  lower_name: com.broken-br-rest-webmvc
+  semver_compatible: 0
+  is_internal: 0
+- id: 7
+  owner_id: 8
+  repo_id: 54
+  type: maven
+  name: com.broken-br-openapi-base
+  lower_name: com.broken-br-openapi-base
+  semver_compatible: 0
+  is_internal: 0
+# collision
+- id: 8
+  owner_id: 1
+  repo_id: 0
+  type: maven
+  name: group-bar-art
+  lower_name: group-bar-art
+  semver_compatible: 0
+  is_internal: 0
diff --git a/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_blob.yml b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_blob.yml
new file mode 100644
index 0000000000..69e38d4968
--- /dev/null
+++ b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_blob.yml
@@ -0,0 +1,641 @@
+- id: 1
+  size: 1038
+  hash_md5: 6096f13928b6de3103a2bd4857fcf1fa
+  hash_sha1: bbdfeca76d178834b5750cd8d14b8a698847c554
+  hash_sha256: 82d2245520562132935dc1d0caa181df125587917de9f14ed9dfeb2f2f88f0f0
+  hash_sha512: 898896789a69a87252b44e13c253ecadfbe04867c8319931eccddf4fef57b04b066061792b515c17d4480e3bbafc82590781a0c3fd43c6a64abe0e5cff05e057
+  created_unix: 1746256357
+  hash_blake2b: null
+- id: 2
+  size: 598
+  hash_md5: 390df8dad491a0aba1b5098801735d5b
+  hash_sha1: e96e2d1909a9dc88f6a34cdd2e34e2308d9a0283
+  hash_sha256: a292499ce09f7ec89fbcf97d7816dd7f9c90e3deb0163be5704a28e3eb0dc819
+  hash_sha512: 8ddb3201adbdb4bdf97d27f563db097a032f910fefcf64de1b09d533aaa44affb8622b037143ea620df1010bdba56e5206dff6bd9de4450e43ba214ac2bf67d9
+  created_unix: 1746256357
+  hash_blake2b: null
+- id: 3
+  size: 763
+  hash_md5: bb4f70724a5c4197d91f9bf1e36e49c3
+  hash_sha1: 6fd741578f83b0f1d10dbc0a53f339e790d93c16
+  hash_sha256: e6e07ed923d3c316d4174449be423171bc46a8c6dad0c864d3d2b916eda5bb5f
+  hash_sha512: 773336c44e8cd5aa92c3b3c921418392661ae5a4c51305341e2766d39ad978e3dfdf4f4992bbcc88bdce3fb824b6a75b1e86a161211940d55e6a4715dab924c6
+  created_unix: 1746256358
+  hash_blake2b: null
+- id: 4
+  size: 2099
+  hash_md5: 72dbbe63f0c475783e53cc8760183dbc
+  hash_sha1: c1f6bff52587f6cc11dd26549873e5dd4bfdf4df
+  hash_sha256: d79571250439111a13090e69b5dd5e3ba02f980fcf6aca46943f854a0762145f
+  hash_sha512: bda94c619b66d9c01e75385b2e77be630b38e70d8a4163894c059550d9c6bd8300656f9dbf6c81c06112061b18c4bdc32102019ed1dd151556bd02ba433175d4
+  created_unix: 1746256358
+  hash_blake2b: null
+- id: 5
+  size: 765
+  hash_md5: dba88ff4468713b2de10b2151115a3cd
+  hash_sha1: f2ba30eda8fd818a8e435a720c242acd77db4498
+  hash_sha256: 5fc713fca3c8daeef084fc9bebc08c0dc49dfccbbd6da774180f6b57dab2a0b1
+  hash_sha512: 5b494fffce128d83a5a5891c2615709efa8ed2ab7bf557ba33c4d6cc4cc2386af11e74e0db28c162bb402a6e9cdfd270f2dadb033832e9cf313c6ac5ee5493b9
+  created_unix: 1746256358
+  hash_blake2b: null
+- id: 6
+  size: 1031
+  hash_md5: 32aec2cc3a9369dbd7fd062267ddc0de
+  hash_sha1: 611b0d7b0e10574a87ca3fee6172f3b77b3fc824
+  hash_sha256: d53eaadc924150a5e5b7be4a0fdbbf20d2c996b01bb01f4388570815166fbabd
+  hash_sha512: f1b516945b8faf99e4943171c9b149114753b7cbe53707f901c7fa07f810662a8e2fe1a9dd4a7b1ee8989c4c26499c3e4ce5e233cadf5ee897dc5b4839353071
+  created_unix: 1746256360
+  hash_blake2b: null
+- id: 7
+  size: 749
+  hash_md5: dadab7af17fffd4ba67b2161f0573840
+  hash_sha1: 8438861bf54c263273cfb3d85bd4aa060d983cfe
+  hash_sha256: 28acf9ad32b66ee2e02fe58e6c61aafd12fc299fdb9add83a6043244a5e211a6
+  hash_sha512: bf009a26ab2f863fe4571840fd5ea3586ceb02270e1d52319ae65a96709aa0b81cbbf95cbd28add5b8803e20431579a1e61cd98dc089febf4f471d309efb124a
+  created_unix: 1746256361
+  hash_blake2b: null
+- id: 8
+  size: 2081
+  hash_md5: 65f26423829a7cda51535dfd8649927e
+  hash_sha1: c9436ace1e28aca3c546be746e8986f66a3beafd
+  hash_sha256: 9c2c053ac72e9fb571b6cd7a31019759126b5fae331753d8594cb8a0aa210e58
+  hash_sha512: 185728651b566828e8ee69cbd4d9fb331403c0f2e01bbf2e5be65d8e70a049390c78a08e5eff5ead7c070efaff7e3e7b4d13e8ca48d94f9b7a714be954259d94
+  created_unix: 1746256361
+  hash_blake2b: null
+- id: 9
+  size: 1016
+  hash_md5: 8c19574fa57e395ce6f35d8d5644048d
+  hash_sha1: 0dea7bcebea9d4f506da68a5c3a592ab6bbb8150
+  hash_sha256: c31fcee243ed68fa575c7ffbacfacfdcb24001bd86e261475220d91603d4995c
+  hash_sha512: eb92ec4f81e9beba3473f4504f8bb387aeac632a70a5016b27b6527ac70dcc4c940fb940a225452892701b8e6ecfdcd3858b6bd74b87f94a3b5f5bb1de369645
+  created_unix: 1746256364
+  hash_blake2b: null
+- id: 10
+  size: 2081
+  hash_md5: 42e97d6c79d8c7dfa4f80c90534a3a7e
+  hash_sha1: edeb74a2a1a05ad4851629b90b65463559976995
+  hash_sha256: 228213798b1af7033aed779446cb5a657b765f72dc47626ca2a0ad7aaca846e6
+  hash_sha512: 65d83d6a96e8b59ec0ae35a184a8bbe844e572eb7b2c66b022f92925dc31edcad02312e59d1312d944ee1ace163729e6d0ec95b1c97163c61a19b40b18156cca
+  created_unix: 1746256365
+  hash_blake2b: null
+- id: 11
+  size: 947
+  hash_md5: a1aa1f55f9579b5b81d2b2c797677d3a
+  hash_sha1: 27f82af8e6580ad7fecad111665666cb08f90274
+  hash_sha256: ec8b8d74a0074f391e5b9fb25f4924c5dc30e8767df07096f7ea9b4f038fe0a2
+  hash_sha512: eb59b7154f208bfbc5da207b7fbe8288917d637bd2ad09f60e525d1208ab41a5a312d349715b527012f46b32351494bff7f5c6510b4521fda0c9164afc87b50c
+  created_unix: 1746256367
+  hash_blake2b: null
+- id: 12
+  size: 580
+  hash_md5: a4e26488fa83b5945d1c0373fe07d6c0
+  hash_sha1: 891cde56160342b16e4e3eab187487b1e7d4c155
+  hash_sha256: 8d27bf11781cad6d864da15e7b04080a6b1c4f8908d2e5baba79b855f6049194
+  hash_sha512: ea05ff7b6e8566609063f3492c0b2551ae1275912b8c370c5345fadda9e3a408d0879c749a94160e180161eb7727a93d7a3a8aaa1dde892f75748fc4d62fece5
+  created_unix: 1746256368
+  hash_blake2b: null
+- id: 13
+  size: 940
+  hash_md5: 2b1ec34161144a7100b6988347f80e4c
+  hash_sha1: 29e71c96e109efccb8a7f756c1828e16b19d5303
+  hash_sha256: 97b8e8d2bf656e30a60328054fe47cb901ebe3aa7a4c30fa7f4cdbe1b2600663
+  hash_sha512: 8fb46a5898cb29eebac4a73b7c02dbcfe5c596c8f273b8e4483ea5778a3475718e792ec50b031879146e6072e396b022fdc6ee1cbf83369acdc0ee341cc9090c
+  created_unix: 1746256370
+  hash_blake2b: null
+- id: 14
+  size: 947
+  hash_md5: 086cba5b2139e72ea02ba0ba40bb1cef
+  hash_sha1: e62e69071a629c0c46465e132b530b33da90a49d
+  hash_sha256: 51c4395507768e97e7e6426f6acf0b054eb64fcdb5cff64b78680a013c8dbe14
+  hash_sha512: ced379957d362b70a60f188d6c8c24ef2b3bc9828b32314a629574dea760c17225f1ef91875e9906ba4063fcff522fcd1d8c47d0a9a1ee9c6fe6d28d35219aa3
+  created_unix: 1746256373
+  hash_blake2b: null
+- id: 15
+  size: 580
+  hash_md5: 4091fac7a4f1754f86ddcc52734d5628
+  hash_sha1: 5478354b11895f4495337e6c1ffd1480a05c4558
+  hash_sha256: 930a7c95b67d8f6bcef5587a522b945f16840d7466ca45408b43a320ae28ec11
+  hash_sha512: 93b69bc6c84fd03e66d42c49620d1efed6f3354598b82937528347b67088ed4042705b85989cbb9ce59c256cfc9fef8a706c3f149511643ceafbc88d660404fb
+  created_unix: 1746256373
+  hash_blake2b: null
+- id: 16
+  size: 940
+  hash_md5: 0714ceb54fbe397bd632a61e66498265
+  hash_sha1: d66dc74c7f5a092c266aaa18d236840e2ab1b7e7
+  hash_sha256: 6a8557a171e8808ed59b3e2c95f9499851e4a222654fa7320d3658c094bbc40d
+  hash_sha512: a6b34065742e12611f3df651d7b3c859d7f4d058bfb7aee3901e69755aa13342720530a8d4a8253f2696389db0d2df6ecb0d4068d7c747d7f480ec2fcb3846c1
+  created_unix: 1746256375
+  hash_blake2b: null
+- id: 17
+  size: 598
+  hash_md5: 65e94a8db881efaf0944e26c8c8262f0
+  hash_sha1: 60b143474f8dd311ccdd3eb08a1589a3f8b757df
+  hash_sha256: 9ffad7e3c4c868a02c08b5956e67a4ae86b3a516ef56ca3345d6e8416e7585fd
+  hash_sha512: 1441415dce05f8f2d44027bc5c78133e8a757454d3b26171e576d154c23b81d97ae8ed59861ee072e15ece88dfb187d53cd052972af46d35880cabc9fe31d670
+  created_unix: 1746256385
+  hash_blake2b: null
+- id: 18
+  size: 2099
+  hash_md5: 8e3ec93159d2190db2f80778756d33af
+  hash_sha1: 65a0719f6c8a19768852a7314fc3672c6f992347
+  hash_sha256: 2bdd4a5ebe1a6ac3043cb56485051a8b3332a16b6461899c3fd298156ebae4e6
+  hash_sha512: e33122f943f62ba64bdf16c9249495e643b836c756252de9d001069de6367792bfdfe22e00f689663b88e661309cd5d1af2a7dc6ab24a96e5542db065dfa5230
+  created_unix: 1746256386
+  hash_blake2b: null
+- id: 19
+  size: 765
+  hash_md5: 823b9b5f66afb761bfd3db0d5f7e7b35
+  hash_sha1: 822357b0ba18bb302272bd77227361beaac414d8
+  hash_sha256: 255da7936e3a5df32cd3ef0d8af7ecb9b273aee15d08932806ffa3feb0a15368
+  hash_sha512: ef0a455f0c7eb01403c51d85676a95d912622af4ea428fbf44818bcfd1b0a06d628decd27079f77d7913255ebfa0837411dbabf1b87d08caee3ca950a752f04a
+  created_unix: 1746256386
+  hash_blake2b: null
+- id: 20
+  size: 1031
+  hash_md5: a3952027a659d6199f4b5f6534465bd4
+  hash_sha1: e14f78cd8cf1561cce5dabbee03778be99f298f1
+  hash_sha256: 1bc987782dc3aa48b2fedca48c13bbc752d7e55c642d5b2194db88940652cef0
+  hash_sha512: 34298f6f1cccddd5489d6bee98a3bb16efdfe78edf38c71c2641aa49e316bc8efc1fda3423026343336d1e76211ac535678c7f0b144b6580cb3eae8c9dcd37f2
+  created_unix: 1746256389
+  hash_blake2b: null
+- id: 21
+  size: 749
+  hash_md5: 35decba84a82a8b52e9b81c29574ed82
+  hash_sha1: 1397366dbecb13de99f8caf9eb758afd23951824
+  hash_sha256: 060fb4fddb2d6b85cc5d49c531aedebdafd10638447ec7582122c2d6a05874bf
+  hash_sha512: 4dad39a4cf8d99f866492181bbda829a58123d1e5c70df06f83b2dc9690ccec149795f493ff814a7f2e32003033b47ea8d37ddbcce970f1a248a92b1ed791769
+  created_unix: 1746256390
+  hash_blake2b: null
+- id: 22
+  size: 2081
+  hash_md5: 8f02a5a705e82c7b4cd279714095f43e
+  hash_sha1: 0cd14ac45ee96a739e74921b11fd39145240be23
+  hash_sha256: bbc981db64f0cb352740e76df76452ccc1c0a5c0bc73929d63cbd12033976cf3
+  hash_sha512: 66bb3adec4666246c27844f89eaed600863a6e93143064d4edba1494efc474e095997e462480bd928680f090639205b8917486815181f3399115f21ce1233ad4
+  created_unix: 1746256390
+  hash_blake2b: null
+- id: 23
+  size: 1016
+  hash_md5: 9f446caee85b293c8b7aafadf38973d4
+  hash_sha1: 446a2c6fc2dda6ad2e00818afdff8771211ed08d
+  hash_sha256: 1379abf81c435e90cc4e9658bd7d6fad4437bf92bbc8610c2e0ed12e57e03150
+  hash_sha512: ed7a09670cd9cc74ce977c2a24f6ed98e2d72de7abc37ccf077c56f78320bcb37fdc702743837ded3d25d8b4dcab75e0559649486ba589a657a1b72954c2d8fb
+  created_unix: 1746256393
+  hash_blake2b: null
+- id: 24
+  size: 2081
+  hash_md5: 799454b1553262175f9f151a037e922e
+  hash_sha1: d56f9adcd116fd93d11d3692440bd6bd033c9e5a
+  hash_sha256: 4c6051a3051e44e747f38cc3fe96d20a2bc4272dc25cc0c374eca4d3bd45884b
+  hash_sha512: 7243936532054ee059bf8bc996a23e80ff5ec90ce5724235ec91e13ed501693dfe881f78e70dde01cb2f3ad1de428fdf0c86a740dc473f7401159bb1719ad59a
+  created_unix: 1746256394
+  hash_blake2b: null
+- id: 25
+  size: 580
+  hash_md5: 7ca05a7b4ef9c35504122ea71260a7ac
+  hash_sha1: dc9091893ec24b36d8e88ec1d64e58fed315744c
+  hash_sha256: f6cb7d1d54e02ddf93e1f1d9a9131f12770d19cc2432982f4af33a42f9d2f8ea
+  hash_sha512: d011cb7f41761ec032fa1c0ecd5733fe152d07a498f7d048e7ff0fe9e04cbc472594795ee427c86d71e104cc36bb4765fe652457bf02f6cfafb39bce1554e9e5
+  created_unix: 1746256397
+  hash_blake2b: null
+- id: 26
+  size: 940
+  hash_md5: 979ff1d9d17988d15d74a9125f2ec53f
+  hash_sha1: aa540f051f67d77d27edc2468addd77f50a9e134
+  hash_sha256: 1983f79e2cc3b39feada90a938d6b06772e87ec74a40540a347bad3f367824fb
+  hash_sha512: 2c8b53b796990c028cafe26d20183b4a3ddb0221274756d68a81c8cd3f00dc1de2e8346a9e9f83ccc119e94bc058576f96bc633be6a6499806877c42912d1208
+  created_unix: 1746256399
+  hash_blake2b: null
+- id: 27
+  size: 580
+  hash_md5: e8c6c698b114078242994350e2c59cfe
+  hash_sha1: 965f728ce742af25f364f840e05b9cd8c21e4505
+  hash_sha256: b83a283c38737abcbb23462117ef35e6ee4a4d86513a2440bb4d41fa0e117dc9
+  hash_sha512: 418aaf3bcd26cf63856e36ddba8c972ea99a764c25ed9fcfe6003236f6cc1e812885bf153d6f8a1b9fe712a3af04d4d99ea4d87a57ce06663f285cc1388a34b5
+  created_unix: 1746256402
+  hash_blake2b: null
+- id: 28
+  size: 940
+  hash_md5: 4831302596f19f696b56d59564d1991d
+  hash_sha1: 92e6531a2e7bc42727d4ff455efa8f1408c38c55
+  hash_sha256: b24b3aeb82d6dd3d532f6047e0b697b062fb10f2c4e1849b11eb1a7494450578
+  hash_sha512: ef61c607cec6ab378cbf2522c985fe699ab2843072068e0809f06ae02c7d9b8476663104ffded3af3c96335d0db817bb78dbbc062dc48ed84b104826cb4642a6
+  created_unix: 1746256405
+  hash_blake2b: null
+- id: 29
+  size: 598
+  hash_md5: 56a57f536a07cfd465c022e69bfc064d
+  hash_sha1: 4fd298455cddb9a0381410e5e05bcebb54d66639
+  hash_sha256: e8b37be762d1ab0fc8bbc297ba1b27c507d0098a287973c3b7003772839d81ce
+  hash_sha512: e1ed956616b3314eb247cf24586b36ce90435635ae40b57814c7a6cf0ef92c38bf13fbc2f07895ca6f67dfb9c3b9c0b4cf5556d69320b424dca989d1e4f74856
+  created_unix: 1746256415
+  hash_blake2b: null
+- id: 30
+  size: 2099
+  hash_md5: 4bc4c156c6a6a6d421e6b2a0f9bad601
+  hash_sha1: 7c8746c62bb8418d1570fd0884cf9f846e055ffa
+  hash_sha256: 3f56bd9d542d9b944c47fb946277d72445ef2d34dfee108ea3a8c2d06dbca50b
+  hash_sha512: 7b47cc1e588c8e358cc29aa2135bcccb0f919bfbd9bc26b8342a352f4fdde3f3d2b5ad935c1efd6fc2d9e7cec5b1dc5c3e6630c9b3b979e47ff4fbce7863ea3d
+  created_unix: 1746256416
+  hash_blake2b: null
+- id: 31
+  size: 765
+  hash_md5: 5c30fe5aa7e261d6c6575cc8265697a1
+  hash_sha1: cdc6f4ed95e723af264f3b6aae46bd0a98deacea
+  hash_sha256: fc9e302e423b982dad68720d5f940452a312cf3c287a96dc66582460265a1b01
+  hash_sha512: 079c9cdc9a919dac4225f42c26ffb34d4d115db8ab5e51cbcdd2b248f06935dfcb169f0a9e04f49b143615dafd5a6742ed231a1be13bc5c814af75ae173bd0e0
+  created_unix: 1746256416
+  hash_blake2b: null
+- id: 32
+  size: 1031
+  hash_md5: 0a379e399f7918290e303348c8cd6b07
+  hash_sha1: ab53de2814344cfd8998d209c6927a415df147ff
+  hash_sha256: 2267f735bd581417efae14f797ece94779fcea40ab28ac700734c0ee38b284e2
+  hash_sha512: 967ebc462c40ecda18ad36abba96534459d8c653c14628ea2d8a2f1e18b313b2cf07d36080cce0aed921780b7717913ab1a77063632845d0daebb4d93bee595e
+  created_unix: 1746256419
+  hash_blake2b: null
+- id: 33
+  size: 749
+  hash_md5: 861a7d2013e965382bb9404175aa4f44
+  hash_sha1: caf88fc255776f9460c5bd689973a66f528d447f
+  hash_sha256: 9c592110208bcd6624661c36180ce96f238dbe6c6f9ad9749a0d3df828172743
+  hash_sha512: f7a6a16bf8c972fc12871030e3b681c1341b2eccc047f64904b2e6139f8f41015387d517e1ae0e9a19fde8dd0c3d9188db3e433120618f096e7894d3646c765e
+  created_unix: 1746256420
+  hash_blake2b: null
+- id: 34
+  size: 2081
+  hash_md5: d05558896004f742e8bbe6bbb318deda
+  hash_sha1: 2537f2f2127f5bfeb43ab064aaabb8278ad4bc08
+  hash_sha256: 4e931208c50f458bd523ef5ef55c5367335c62d558be4e24615dd200a75c378d
+  hash_sha512: 8a4fece3a1dd51c870c160d526e58fc96c3282dd770a1e9ce38b39492cda676dd48ecf258ba3282ed081997142503967a7114646481cde6d5b7eb7be49fcff37
+  created_unix: 1746256420
+  hash_blake2b: null
+- id: 35
+  size: 1016
+  hash_md5: 835a5a3fe19145a134e4a0508fbb9411
+  hash_sha1: 707c30bed611042d57c52d0db2bcd0f609016a5a
+  hash_sha256: 650248c779adbb13c81316902d4b7b27ef294530b0bbd484a3f3a1d369ca995b
+  hash_sha512: 81810ccaf38ad57a9e384336f872d2f39da9474abd648024e8da6733c9d0fd214757563cc7c8a7dcff12cd3e64ba4b694afa6854a6f55bd4e5a53152eef6a7f2
+  created_unix: 1746256423
+  hash_blake2b: null
+- id: 36
+  size: 2081
+  hash_md5: 599464902943b0e7499180d1c2547754
+  hash_sha1: cab101f1bb3a73e91c3d75f7897067fb29c7747a
+  hash_sha256: 5e960e634845737a49b2bf758496e2a42cfb227ab24455a9d182bde7f597d4a6
+  hash_sha512: 759dde21a878216a6e629bdbd91e2fa4dcc04b7c56116683b5c7433eba277ca3f17daf918c4575130dd14a6d2dcf453bc7861f7e99b7abf150c3b058a299743e
+  created_unix: 1746256424
+  hash_blake2b: null
+- id: 37
+  size: 580
+  hash_md5: 6e23997166dfb6e2bf3cddb0d7a7f6ff
+  hash_sha1: a9972937cb840e3c961fa00ed8512c45fa9d75a3
+  hash_sha256: c95111d06b75e32cf4d507b818544dbb5245bc0b7dd8b3a1f5d8479772a06b1e
+  hash_sha512: ca549fae977e7fcda088e3211d362a3636c47bd914e2c5ce08ddff2703e60b06dbd66339bae819c881425364f679f1839b1e0685f3bced32747a969d00775a8c
+  created_unix: 1746256427
+  hash_blake2b: null
+- id: 38
+  size: 940
+  hash_md5: bda9707822e39ed52a6d0b9bb5e9af96
+  hash_sha1: f6ea322c0b9c6211747129636a59ff95e5dbb165
+  hash_sha256: 364f44514fb924cfcddc84c31bbf3dccf9060d9e3ef1e3e6dd28f5789a79e4c6
+  hash_sha512: 7636858249476a81c886c529997eb55ef8c36c52430f0e98050f628fcd440dc09e57f43f88e272f827f86c95451aa4b1927a8d860f970427d1df8348590e7869
+  created_unix: 1746256429
+  hash_blake2b: null
+- id: 39
+  size: 580
+  hash_md5: 5b373c943e67125442c5a573eece9404
+  hash_sha1: 84b40e3373b8c172d8c302dd304f792838a3f788
+  hash_sha256: d6355300d7e51c649efe19b3419d0dec57d42d4c75079e4ca06ea081f8260f5c
+  hash_sha512: bd926b535bd19f60d69d76a858db2c48f6057223bc23a3575a4fb49fc9ea455250f2bdedad09efdb098c4ac16c6e3d2451a6c182ef191f076276de790448506f
+  created_unix: 1746256432
+  hash_blake2b: null
+- id: 40
+  size: 940
+  hash_md5: e3817ea0b2f58dd5cc570c0d337a2ecd
+  hash_sha1: 2acc853133cb0ddb46a546fb31f7b4f23df1c676
+  hash_sha256: 775271730e0c4b923a81f539ce97d1b21a1db78ca201065dc886fd42d4e0251b
+  hash_sha512: cb28a65b2f5f7e1e9ec45f6151ed322ee751de5266f413940655de7d739ebf2f7ac9168ccd9676e5b1696d3dcfb57d0bbc404141dfb321a2d28c1a6dcf32b0a7
+  created_unix: 1746256435
+  hash_blake2b: null
+- id: 41
+  size: 598
+  hash_md5: fb3df5314eda77cfc0da782d86a1574e
+  hash_sha1: 874c3e4aeaad0dcb91f955357c008ed3de52883f
+  hash_sha256: a1f80fc25f3a4cacc21c4ab3e263cc722f7e44bc829a38e7fa927853737cbf9c
+  hash_sha512: b27519f9792ac72b715ff591895deba46d4c6455ea04a4b416e8c5a13eb234176ebd85a21cee5b473f3baa679c6c03cfb72d6d552dee7baa9e7d75535c776557
+  created_unix: 1746256445
+  hash_blake2b: null
+- id: 42
+  size: 2099
+  hash_md5: f12303e4cfd6cb446c8411f8c2c5c54d
+  hash_sha1: 74af4b51471a501f0fd65ff19498cda87c8252d3
+  hash_sha256: 9fde3ad1d6dc79a40d9ef1c41bb22d00db53df558c0f4d305aaddc0dc2cc0bba
+  hash_sha512: 0f19704ff822157723138bbbf027d418a601cbe0fd21db16478d6e870ad74b80084d5aa35d529a2c6555237cfea19a6c1f955df0c4b00b5ed94f0f1b42465bd6
+  created_unix: 1746256446
+  hash_blake2b: null
+- id: 43
+  size: 765
+  hash_md5: 0ee9f9dbd150f2fba1f2d151243a23ea
+  hash_sha1: 521db5e9e0e2d25e8b80c9a168ece7263e0b548c
+  hash_sha256: 034554ebaf63c4c20d9290e86b45375616b4e289a28e480f58e25a791c361639
+  hash_sha512: 23ba0f0847083365fbbd0c4de0d71a6560e50781f413e1546a11e9d9d4aad7daee1116b5b94844ee0a431f4d70796561a337a648ec052ac3c5e4bad5accf73ea
+  created_unix: 1746256446
+  hash_blake2b: null
+- id: 44
+  size: 1032
+  hash_md5: c4c544a801fb99281c6c473c22e0545b
+  hash_sha1: 1c686f728522cb8387a8415a259c62c1af8a0fd1
+  hash_sha256: ce8c82a53d379498784a981f3c69d847947420fb7e1077f5a2b3d9f41fb7c8ed
+  hash_sha512: d9d1bb2a1bcc7886f8c2fd5a413cd954fe2043d4a81dbb1f9ace06a1676684047a7ef2bdc27c9d3f9b800657dbf7226acc0f32b71fc6dc0c9e2662a5c64f7fea
+  created_unix: 1746256449
+  hash_blake2b: null
+- id: 45
+  size: 751
+  hash_md5: 89b82f20b8be3ea17a068b46e7497428
+  hash_sha1: 27f1389a68febf6786e0d79c698dd1d66c9abfd2
+  hash_sha256: db4ea60e526f85e9829a45e2d75c1f48509e7429a79f7a5d24bc536596c66ab5
+  hash_sha512: b441c6ba00bfcca18adaa976ac37bbf9cab17cac8e7d24e54bc40122dec33781faec7b07db97b3dcaefec7ff8a4251e96728772995d91d196691d8e3494b5768
+  created_unix: 1746256450
+  hash_blake2b: null
+- id: 46
+  size: 2081
+  hash_md5: 96d24b1f1bec73579c5dbf85ee52b332
+  hash_sha1: 4f407843baaa58116c1022b73f5e411f1c531840
+  hash_sha256: 6866d5d85796b5fc8576310f8ed1d9d9c85825727007809cfc9ff666f1dbdbf0
+  hash_sha512: 8c7c62afaeec008d7c6bc8e390f4adbb11c4ca11337aa1c6832ba83de19f0c75d52ea4fd72a822acdc4f567158120119ed121e0b68213db7a7a7a4f3a731f8fb
+  created_unix: 1746256450
+  hash_blake2b: null
+- id: 47
+  size: 1017
+  hash_md5: 71a491bc2a2bbb08ec5b3682d09c3f1f
+  hash_sha1: a126e70bed9837bf4609f32d74b20d2ca3e47b59
+  hash_sha256: 2bcacea4eefed11c6f6a23da44ddd575689460262af046a37872e32aa76b79c3
+  hash_sha512: d647d5f7122d76928ac349bdb147fad8b2cd68b7be75a4f580c768feaf86c5e1f7ec484786b6c81324b9df00329cc89217cb00d379138b40adfc81f74d06e6bb
+  created_unix: 1746256452
+  hash_blake2b: null
+- id: 48
+  size: 2081
+  hash_md5: 26e05a44a2e1989b418aac50feda163e
+  hash_sha1: 224cefa64086537d1d571644abc2180803128035
+  hash_sha256: ea09c61dff5dec488b378b2ce0d4dd64891394606aa318dd57d5f2158d7441fd
+  hash_sha512: 4ca6c77760a11e44f7826b3a23bd5b607ab1e323f47aa76acd9226f1771551fa4dd45c58002c8d3ba6fc4867ed17ad34edb1695a9ab94a31afb8255862633976
+  created_unix: 1746256453
+  hash_blake2b: null
+- id: 49
+  size: 580
+  hash_md5: a9e65f66ed8ba4769f366fc93142ae07
+  hash_sha1: c170e29851dc3fb44e115a907de7152efd5fb85e
+  hash_sha256: 8ae9c630848588ab6bafebbc6ebcb3b6fe329350e89894852db5c55cc52a4c2c
+  hash_sha512: e0bdaf7430a5176640c0fd57910e1b3e98b4dcc0d34a5a4e898be6c30ccd2d3b59c22dcf94619e3349003ba7b7882ab43216d6175471becffd874143d74ace17
+  created_unix: 1746256456
+  hash_blake2b: null
+- id: 50
+  size: 941
+  hash_md5: accc00b46ba0c6abc545ed79c2a2f88b
+  hash_sha1: 44a47e8601fe1785bbabc21dbc9efc61ff16d47f
+  hash_sha256: 6f514c55dca294288b5821f415cd24ba11649f001edcfe219e1052d252fd49d8
+  hash_sha512: 9ee7ebd7280fdb51f46610a7923212236b668e7a62a083bae7f2e2f1472d06cb0a9d0f38069e5537fa3b8689f13abeb3e38a1e8432d55f247a06c0522e74374e
+  created_unix: 1746256459
+  hash_blake2b: null
+- id: 51
+  size: 580
+  hash_md5: 700171de0c83b136769d88af94c1b9b3
+  hash_sha1: c3baca0fb897aeb9462f3718369a30515a68e415
+  hash_sha256: 96eec3e81eebd724a3ef0e6215e337543b3979f2a3355a193933dc7489aa4616
+  hash_sha512: bfb5bb19da1aa65d7cc78ad4f3c57769aefef90ffd5edab3ecd0db5272550bb0666de00acb2a053e03a9473e09d9a77b5026e46bbe18cf669ec4e953b49256c9
+  created_unix: 1746256462
+  hash_blake2b: null
+- id: 52
+  size: 941
+  hash_md5: 613b6c98a027fc929ecdb06482859626
+  hash_sha1: 39878c4f57ff81bcdc2ce191c44a9a9b31384646
+  hash_sha256: 78fe74176a46873c6fe0c519270641ea45b3e879b1d4caa595bf67dc69d760b0
+  hash_sha512: 16c23e52c02fa0d30dd60704299a375eb6ca75c3fb471fa3501720e53118254bc8888dbf44f75c3cdb2a98ac0ff9ae6fff72e9026fa9a241eaa25841f4fbdaaf
+  created_unix: 1746256464
+  hash_blake2b: null
+- id: 53
+  size: 598
+  hash_md5: f3015c6cc30b064cd13392a252b61038
+  hash_sha1: 5b6a6ba01238ec187d18ed02f080456d9b0d8416
+  hash_sha256: c331e46fb09c0bcc4aa8019b39d9ed7ddfacbcd139407557f6089f36e5861c57
+  hash_sha512: 64d91206800c8fcc22e449591952289fb83eff85dcc2bf898f2daab66d40ff4e8f9b665335b7a6bd2c0663d78a2ddf1debef923f3306f6813dae98caf02a0f95
+  created_unix: 1746256474
+  hash_blake2b: 1ae012597dbf2d40644c82e06dc6267d88638571b0c669c62e59d15463c289e170f602420e0147da1f9524cea5095f63868bc36ab5630383360e8101b3796d49
+- id: 54
+  size: 2099
+  hash_md5: 84d83643c58073eb48d88ae591920e50
+  hash_sha1: ef931c2b87b9e2c10b7bbb2bb592cb5dbe82aed7
+  hash_sha256: 8b554f322b8fce952f2221bf08be8447b8606e2ce54d8846b5edcc80ec1fbafd
+  hash_sha512: a2b1a5321f67ed8a324e17903497fac845169cbbb49cc3dfdad9800b164877a7d8f5fcc8f9d6a8e2b394cb13c9a512b27e39149f3b017dd28f26cfcb168fc4c6
+  created_unix: 1746256475
+  hash_blake2b: e4ca11cdd35926a89604589782e538c8140911fef2dad8a934685b33ad841e3cc96ea9d36c90ae413147ce2cabe6c5517045320049fbb3b0069f3620df753bfc
+- id: 55
+  size: 765
+  hash_md5: 1e9a236068db2f888b41ad1737e26764
+  hash_sha1: 03c5b9eb6e2fea31d3e774c51d3719227810414b
+  hash_sha256: b117af5eaca1f723b7fc3646853298bbffddbb02c63af5cf09d853f0585afb89
+  hash_sha512: c24ff96a33c8eb5f96a212923e1381d41e2813be978772f407aac30090c8657558427b40cbc129dc8b43b96c988ab888703ef5d5e139dff32bf727041a90fca5
+  created_unix: 1746256476
+  hash_blake2b: f4549d79377a1d01fd8c0a19d4a015dfcc50b58820d57ec7bd14fdc5fbaa8166fdd11432200d728d5f1052e54cab2069c8f80818616377c1baa1013fc7679356
+- id: 56
+  size: 1032
+  hash_md5: 6cda2dee8f57ccc1730f40917a6ec85c
+  hash_sha1: 9689d59af6cf615be6ac21106dcbcc79250b2909
+  hash_sha256: 012e2bbd675130a45b6b6255142254428a86b35c5cffd17546331e9f1bbadb55
+  hash_sha512: 06b79141428bb93d1ba14a82f132dd068ac4b68db3e55029a25ff4bd2be6274a33898f263dc225eed1186462f7eb3fa4e7a24925e996dda0dd1bdbd265eef6b4
+  created_unix: 1746256478
+  hash_blake2b: 0e148046a9984fe45d2109d227ed31b58329afc532eee4817d2113584ff034aa1c5ff09d44240c715d9a80a1a3ea89480bfb425e173df154aedde6398e2ec347
+- id: 57
+  size: 751
+  hash_md5: 00c8d9ca6462b0e95a30325307a1d855
+  hash_sha1: 525a79e7dfe6553e5e4b4057e80e090d48b43c84
+  hash_sha256: 5b74c950ced8330e3dae432f6c5b0330c6c8e3a72f706f2d8128db989640a02a
+  hash_sha512: 0777a9af5eb936fe5c1a28bb5df26c06db7e290f858cb1ac2e7717236c9be949e8bb214d4007b865ed9d22776b5abd4f8f1e16f862beb9d2db7388f16c9f0ac4
+  created_unix: 1746256479
+  hash_blake2b: 65ed24d1a672a0ec358359f0f9b1dcefce0b64fb8ebaf0342dcf5fd9826b3664a95ac54628a9c245ddfac0843ff36f70de3dff288d5782c54539e1a95c0466d4
+- id: 58
+  size: 2082
+  hash_md5: 610e6b411ad6a885613f3df4e022e8c2
+  hash_sha1: 5090aa11b88cc5c22895fdcd9e303eb5f89b414f
+  hash_sha256: b87955056b214c1404e58c6e60d2e8b203c249ed141ba80ef6e2d22e4d62d187
+  hash_sha512: c70e98ee7f6b22b427aed9232abdab8380385c841cb6d93af25328bc0a4ed0d1aa4342b363850fde06a1c4f68b0b63c2da99fa36e5934aed5314cdcf6e47e830
+  created_unix: 1746256479
+  hash_blake2b: e3d37152d65d1874f932f18ad0325b8bad850dd220e6f81f99ce58b3117a7f9ee40a3467992d8be78988af7434a5303f264cb5bdf4d4ab66752904a55fe4ac44
+- id: 59
+  size: 1017
+  hash_md5: 155aada9969270a2d3cc9e7cbd72398d
+  hash_sha1: 6f7140f45bbf17a98d8b51f87c6672c30cbfe114
+  hash_sha256: 3ff912d0c3e4a91d6f5394d8af0a361ca7f183ff6f8a606a32e68e80d4341300
+  hash_sha512: 04558b2154b25463060f6ac999426e816682c7b6e866bf3b9198b4b6cf41288f762439871858831bee627559906e920b478c21525e3ddf85b9896d55840775c5
+  created_unix: 1746256482
+  hash_blake2b: 485c3a16ff1036dfbc05cc55bbb175d5e782b16a97bc4b47fb29b3af824abab016f808fc6cdc96690c4f657b4acadd69bbcf0dec7dc478c91dd09137b7cb3e2f
+- id: 60
+  size: 2082
+  hash_md5: dc9d45bb32e8f3490634bd513cbf9ece
+  hash_sha1: ea91296f560ab8eb978b7ed0db8efe2fd0e8b413
+  hash_sha256: acf6b1fc9b5b93d9832b6c59e58feb352fd8b07e04356b4b60bbc35dd77c3aac
+  hash_sha512: ff31a45035f8092995bd6ff8e55e6fa35cdcaa4aeaf296da0382657d080541f49687a5adeccbde9ebac0fdbe814ac1e080e7f266bb38acfacd038ce0a6b6a632
+  created_unix: 1746256483
+  hash_blake2b: e24f6cd27d8702026d8d750734fd28d36b1621d8bc7bad18b403b61d0390829a31db679aeea559b7b3f7df27212cad968415d67a72c33abf5744cd61e96e8080
+- id: 61
+  size: 580
+  hash_md5: efddf19ae15f14a76ad89882c5687f1e
+  hash_sha1: 4241c3e18d179d31a02032e6fbb31014adf9f3f5
+  hash_sha256: eee31b528413c52085cc0b0aa0245ac472cfd364e80fde1c5386e78e75372890
+  hash_sha512: cb752b230dd53a380573dcbd2d406a497ad9279b4fff5fe7de493c34d354de35f343788673830f59912651c1eab81da04513f3ecef0ab6a30dc2f1b39fd9701c
+  created_unix: 1746256486
+  hash_blake2b: 02729bb20121140d8f8904adc712dd7432fb1117bba8a3d878b86aa59afdb3e6d26e3d597b072b0364666fea48c2c5721d5d3bdabb12241267d7fbed0668c927
+- id: 62
+  size: 941
+  hash_md5: 0aeb1040c1716c32a6ee5a3da7e4b7ca
+  hash_sha1: b7cca777ecd4e4d969f2e4c5e91d30fc7cb75070
+  hash_sha256: e2f0da45a23db0feddb37e44fbf6600e69187530e52234fe1bcc7ce3d1bd2a28
+  hash_sha512: c3394a2adb2bc062cd0015751b5a0d64c7e2600a9dd15b7153782bc9c45f57a734bd6ef7d12d35f48bf2b281e5949d8846fd61612f162c227d19a8a0de1f2ce9
+  created_unix: 1746256488
+  hash_blake2b: 3fe0bc2e796722fa3c26146ab7f5690eba647ce9463e94266998c68cefc2a834092f92ecddd70d98d1e8774808ebd87df429248c61e73144332b8cd8a571b4b0
+- id: 63
+  size: 582
+  hash_md5: 1262bc37cc2b04b123ae5c1e7a739c4c
+  hash_sha1: 2990625d65fed9184ea3da0553722c128dc962c4
+  hash_sha256: 49ef9afc4951add83afa570b9fef916c5bd22d236fd74752dbfb29944dac4db9
+  hash_sha512: 9012ae4e297da75320c057c78220f34c64889a1905c49467f4fce7400f87b2957ffa9b1f93b7048746d84320081ec7aa69338e2d57422e53cf3c06a5365f87ef
+  created_unix: 1746256491
+  hash_blake2b: a822759b7592218d9571f96ed3039dc934aab2b175476530926ff8bd874b94b05a9c6a275d8b3c2b50fc2efa67fd6045edb659bad9aa11e83044e53cc54564ec
+- id: 64
+  size: 941
+  hash_md5: 53561653378116758da59c1e5682d024
+  hash_sha1: ac27f3a6e7bd048aaa784273b6bfc92030708065
+  hash_sha256: 1da9c5d5281b8467a86fe7fb015f3ebf1807d3d975c8555959399b91628d7b8f
+  hash_sha512: a97b7265b7df742c903d68b2358f0d14cfc2511c20d2c61a8f2a24505a5fbeaff624b2dd47eca988a3466f55ce7910c0831e7c1617b41a5e560dd584f8b8c28d
+  created_unix: 1746256494
+  hash_blake2b: b6a911084595fdcddbab8c70e5482a2cf038bfde93b27258978a42465d894b92725f9abc81646d28a9c4b80a773c6347aaf43cf7d2067135a15edc2f1ad40b08
+# broken uploads
+- id: 65
+  size: 66356
+  hash_md5: 298a5b68e9783c9f193f3818b6362c0b
+  hash_sha1: 20eecad725f7c40a579fd06f438fa366e9dc5887
+  hash_sha256: 6b6802be078be4c07b38b9d0a156521459c81d2cc742be8cf115398890baf95c
+  hash_sha512: 983db2a7ccdf88c8765bacaf6da98eaea04aebd42e1e67943172e7e862c8f62a88cfc96adaf59bb3ad65d889c39e7281f55eb7d706b281782e4c9d0690091d2f
+  created_unix: 1734346161
+  hash_blake2b: null
+- id: 66
+  size: 2968
+  hash_md5: fa67973e250e94fb4a888ebdb4fa86d7
+  hash_sha1: dce5f1b461883dd50f9191d52aaab01a5a06e578
+  hash_sha256: aae8a7ee5a446ffbb59eb3e3a70ff8809b61cdc235105397e8550b30d12d145b
+  hash_sha512: 6b2f0e33da8204e72903a8f13f6ab4b77ef6b387453777e308088d8c44b925c1b1d226bd8836e32af89ce96a586de0ac0d7ebd351a9534fde7de73634b2fa802
+  created_unix: 1734346195
+  hash_blake2b: null
+- id: 67
+  size: 64135
+  hash_md5: d9c454fa89301aed28ffc712cd230c56
+  hash_sha1: 9c4b65d14fda070c3248e9ad6da78ef118cd7bec
+  hash_sha256: 9a41e5fec8381a75c41c0e4cc5df56546bbc0ac70019e9ec3716bdf3f7c0da0e
+  hash_sha512: 04e706e34c62602ab129dcb3e817fe4d3b6843b823686c375cebc3cb6adfb758227cf02aca015a808d340a3aeda7424e9ce35de14456d1a8d40874782239f250
+  created_unix: 1734344969
+  hash_blake2b: null
+- id: 68
+  size: 1053
+  hash_md5: d686ee5f6ce4b91cc317354f49cde759
+  hash_sha1: 8ff8b4d60a1062fe468ff5c310833151932ec628
+  hash_sha256: fd61ac88b2ad7760fd4798613bae50994a85e5346002409837f221a5120de03f
+  hash_sha512: d1705bb7dad6b70a6a9041276bfc41e1e265ac0b8ba65f0ee3bd680e3ad681d813f555b82e81ba162eaae37e5453846fb569c9d64498a69efcfbfa42bd75b82e
+  created_unix: 1734344734
+  hash_blake2b: null
+- id: 69
+  size: 24995
+  hash_md5: 555c619b35ccc37ef448e0627e1c91bc
+  hash_sha1: 2715bef2d294e8ef9bd8142b8cb92b4f20930792
+  hash_sha256: 90769f198e34910cf842b36e1ae790e801656fa9dc8c072c8ce06a031c195dcb
+  hash_sha512: 1d1f5f1badc779bb387259dcd6bf4deec7b8d711e67b62b2c6c85c1f2a6aab3ed463c82e7f5c7d2060bddbd6797ffd070b4120a7d66eea8a57ee345de2822c8e
+  created_unix: 1734344746
+  hash_blake2b: null
+- id: 70
+  size: 6307
+  hash_md5: 70833f96aba4e4aae6a66459e1f48640
+  hash_sha1: e049c72bc8f5990c1e63c0a9ed17c12b0096efe6
+  hash_sha256: 55f6f783455b4737078b1b7ec9361299ec336ad0982fdc70e8f861c69be847ca
+  hash_sha512: 8ac7ab63762560227892717c23a1ba2cd6b3f0a59cd8cfcaa86076c65e63dcbac8f0c47213dab21677f7583b672487ddbff28a4aa2446581e25f5d98edc70eca
+  created_unix: 1734344775
+  hash_blake2b: null
+- id: 71
+  size: 14826
+  hash_md5: 426d22a7b0b57a8a00681191c4f22ae6
+  hash_sha1: 69781f39415518ae823d8745ce4720e743172019
+  hash_sha256: 0fd63dcc4af83babbdff690441ea9182a640ed9d40b1312cdb1b457b2a03f38f
+  hash_sha512: 681fa091abad08a33950f6a308f46ead8c9af8529a42032835c03c960f4578a744b44bd4773aef73438b25b42cc51302498424aead7198eff623f96de6914176
+  created_unix: 1734346161
+  hash_blake2b: null
+- id: 72
+  size: 863
+  hash_md5: 9acc0ca46cfe4c2adfe0b6e5062a8a15
+  hash_sha1: 0d946b74eac616923103506ee350d82f6c9066bd
+  hash_sha256: f6641da8427411dcf13c15e7e10cabef802383d859301ffc2de0a49b0f213fc3
+  hash_sha512: 4ca12e3af7ca08d58307c610042c31775683011b47345064f213312211134cfe5919c71ba4211019565052364262ced0d9b7dffd058199a36c741f2fef39e2af
+  created_unix: 1734346217
+  hash_blake2b: null
+- id: 73
+  size: 10272
+  hash_md5: 6a4f701abfb602e3838ba300f9cb6ccc
+  hash_sha1: 0e30a16b8e1b74c51abd08e33dc5341404b71e3b
+  hash_sha256: 0c3e7c7143843491b221af0225ad4205b48ab871aa66ff00bce4d3954b9e0987
+  hash_sha512: b917580c12f09044e117adca76bd1551df5fb92af1860851700b232d07445b2e8293bb73a9c18bfecc6e6d5dbb6df86d954d6a5d93d0442847f6168125fc91be
+  created_unix: 1734344911
+  hash_blake2b: null
+- id: 74
+  size: 4229
+  hash_md5: 260b6982c5690d674ac546b3bcc743dc
+  hash_sha1: 8e3214aba795ae5849386dac742deb01caf04b8b
+  hash_sha256: ee2e1fe649bf8fc670b9ea5f34815d66c85ba7f8fcd861a557afb0aa9679f652
+  hash_sha512: 6c58c7d0eca2943f3a4a5a2785b961e00d18bf1a9d246879b487120e27f986a0364edb842748875f25244df1c9f939fb705086ad437fce4890f7c8e2b31a79ab
+  created_unix: 1734344953
+  hash_blake2b: null
+- id: 75
+  size: 12410
+  hash_md5: c511f1c9b10762bd9f907e834d7d01cb
+  hash_sha1: 4998c52d0d23dd3d218e2d9d336f24c0c073601e
+  hash_sha256: cdcf5d6a2c273647885dc4d1a3da4d64922042a4a0bb16beaf561f29b7c59209
+  hash_sha512: 6db8db82f436cec9066b4174a280e0e5bbd21cc829cb2beaf2071fe6ff1f8c77a5a7e5e8a168a41551a21c98bf03e6441375c87dc64a0ef2646720f348d3927d
+  created_unix: 1734344986
+  hash_blake2b: null
+- id: 76
+  size: 770
+  hash_md5: f123e1549bdb0cf99f89a8944f25d8f0
+  hash_sha1: 01507b6530a5b134a5c660765e0f552cdb5131d2
+  hash_sha256: 81bbd81ba91c24024c7d4790fa1cd5c25acfb7b9c7c4fa9814e0d9f399b6b622
+  hash_sha512: 0738901ad6678a9ab202d5a0356d8bc49c1ed1ec21922718ff706b0990446f78b87adf3bfd25273db8a8910dd7b19f8c232f469b1f65dacffafb6fde29182104
+  created_unix: 1734344900
+  hash_blake2b: null
+- id: 77
+  size: 4034
+  hash_md5: 4bf84ceb6e877a385f40ad51166bfc1a
+  hash_sha1: eaf6225714366c3a05d4c56c20b034efd8a5f037
+  hash_sha256: f375ec85318662e1789bd34750e578cb2fcf99c2bf005ecc06fabf64e23daafc
+  hash_sha512: 470c5ed2bf14a7ed426453ff026ad2269bbd503ba8c2cd767c89793530c77a7e7e503c68ee542d125bbceda3b49cdc5c846931981eac739a865ffb0cabbe4d89
+  created_unix: 1734344922
+  hash_blake2b: null
+- id: 78
+  size: 6088
+  hash_md5: 0a4d805af108af059f9af308168ddcfb
+  hash_sha1: bef8a000beaec4bbe5d68b008868d76c90f3f25d
+  hash_sha256: 5b055f5fa634434bdcde8b8174c783d768abb5a253ccef648bb522af603836ae
+  hash_sha512: 9254409431fa52da3144960c272e7aaa0bb646297601cbc6bf88f6c736903aa70943cb56fdbddfac096c10444de25bfd53084b2cf3139ef5b650aae38dd42c26
+  created_unix: 1734344852
+  hash_blake2b: null
+- id: 79
+  size: 946
+  hash_md5: 3f78acb32897fd77fe467b9776744c12
+  hash_sha1: 3d70df43777d56ad3388ad0036979fcb77443b4c
+  hash_sha256: f9b8b7d3050abecc367bc1523cf5ec17282b5d7181ee833ced319cf382f92616
+  hash_sha512: 2886114ebaef9a77b21d7240591d376a0ef898986882e25e86e0633d465bb9e8096355a4ca6273eb9cf532f02efadd5195b786249986d7c2fafe40f94a8c5ca9
+  created_unix: 1746280832
+  hash_blake2b: cef2628cf51cca9907bdcc69f4e6cbc65c121d37eccb9eccc29fb11179a09af67dccbe0eb04fcd2b87b23925f96082f33feae5c9c550307ab6c6f260aa532f8b
+- id: 80
+  size: 946
+  hash_md5: 222067385a69840b897fb1177a404876
+  hash_sha1: d56d3378e8492c6ceee3f967f41123fe59082770
+  hash_sha256: 3710e14622091c60701b5ee6357d80681ad3b236baf639d2f848887f0cf681a4
+  hash_sha512: 2de5f0f547b60272ce3da6933309f7c967b23a839c0b7321ae952c229241091033e0640c9e64a199b10936ea64bbc3520ff56a5b6cf339856ca3d089bd5d5487
+  created_unix: 1746280843
+  hash_blake2b: e7e3034bcbc26fba242f2d1c8ec4f653e175178e303b1d120adfed0eec2f6c674b29d5fec4ac2ecb862f491682af480c7d3234be633ad9b288cfdc29cd020beb
diff --git a/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_file.yml b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_file.yml
new file mode 100644
index 0000000000..2d7bd135b3
--- /dev/null
+++ b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_file.yml
@@ -0,0 +1,698 @@
+- id: 1
+  version_id: 1
+  blob_id: 1
+  name: parent-project-1.0-20250503.071237-1.pom
+  lower_name: parent-project-1.0-20250503.071237-1.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256357
+- id: 3
+  version_id: 2
+  blob_id: 3
+  name: sub-module-1.0-20250503.071237-1.pom
+  lower_name: sub-module-1.0-20250503.071237-1.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256358
+- id: 4
+  version_id: 2
+  blob_id: 4
+  name: sub-module-1.0-20250503.071237-1.jar
+  lower_name: sub-module-1.0-20250503.071237-1.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256358
+- id: 6
+  version_id: 3
+  blob_id: 6
+  name: parent-project-7.0.0.pom
+  lower_name: parent-project-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256360
+- id: 7
+  version_id: 4
+  blob_id: 7
+  name: sub-module-7.0.0.pom
+  lower_name: sub-module-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256361
+- id: 8
+  version_id: 4
+  blob_id: 8
+  name: sub-module-7.0.0.jar
+  lower_name: sub-module-7.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256361
+- id: 9
+  version_id: 5
+  blob_id: 9
+  name: parent-project-7.0.0.pom
+  lower_name: parent-project-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256364
+- id: 10
+  version_id: 6
+  blob_id: 7
+  name: sub-module-7.0.0.pom
+  lower_name: sub-module-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256365
+- id: 11
+  version_id: 6
+  blob_id: 10
+  name: sub-module-7.0.0.jar
+  lower_name: sub-module-7.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256365
+- id: 12
+  version_id: 7
+  blob_id: 11
+  name: bar-1.0-20250503.071248-1.pom
+  lower_name: bar-1.0-20250503.071248-1.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256367
+- id: 14
+  version_id: 8
+  blob_id: 13
+  name: bar-7.0.0.pom
+  lower_name: bar-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256370
+- id: 15
+  version_id: 7
+  blob_id: 14
+  name: -bar-1.0-20250503.071253-2.pom
+  lower_name: -bar-1.0-20250503.071253-2.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256373
+- id: 17
+  version_id: 8
+  blob_id: 16
+  name: -bar-7.0.0.pom
+  lower_name: -bar-7.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256375
+- id: 18
+  version_id: 1
+  blob_id: 1
+  name: parent-project-1.0-20250503.071306-2.pom
+  lower_name: parent-project-1.0-20250503.071306-2.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256385
+- id: 20
+  version_id: 2
+  blob_id: 3
+  name: sub-module-1.0-20250503.071306-2.pom
+  lower_name: sub-module-1.0-20250503.071306-2.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256386
+- id: 21
+  version_id: 2
+  blob_id: 18
+  name: sub-module-1.0-20250503.071306-2.jar
+  lower_name: sub-module-1.0-20250503.071306-2.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256386
+- id: 23
+  version_id: 9
+  blob_id: 20
+  name: parent-project-8.0.0.pom
+  lower_name: parent-project-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256389
+- id: 24
+  version_id: 10
+  blob_id: 21
+  name: sub-module-8.0.0.pom
+  lower_name: sub-module-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256390
+- id: 25
+  version_id: 10
+  blob_id: 22
+  name: sub-module-8.0.0.jar
+  lower_name: sub-module-8.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256390
+- id: 26
+  version_id: 11
+  blob_id: 23
+  name: parent-project-8.0.0.pom
+  lower_name: parent-project-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256393
+- id: 27
+  version_id: 12
+  blob_id: 21
+  name: sub-module-8.0.0.pom
+  lower_name: sub-module-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256394
+- id: 28
+  version_id: 12
+  blob_id: 24
+  name: sub-module-8.0.0.jar
+  lower_name: sub-module-8.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256394
+- id: 29
+  version_id: 7
+  blob_id: 11
+  name: bar-1.0-20250503.071317-3.pom
+  lower_name: bar-1.0-20250503.071317-3.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256397
+- id: 31
+  version_id: 13
+  blob_id: 26
+  name: bar-8.0.0.pom
+  lower_name: bar-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256399
+- id: 32
+  version_id: 7
+  blob_id: 14
+  name: -bar-1.0-20250503.071323-4.pom
+  lower_name: -bar-1.0-20250503.071323-4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256402
+- id: 34
+  version_id: 13
+  blob_id: 28
+  name: -bar-8.0.0.pom
+  lower_name: -bar-8.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256405
+- id: 35
+  version_id: 1
+  blob_id: 1
+  name: parent-project-1.0-20250503.071335-3.pom
+  lower_name: parent-project-1.0-20250503.071335-3.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256415
+- id: 37
+  version_id: 2
+  blob_id: 3
+  name: sub-module-1.0-20250503.071335-3.pom
+  lower_name: sub-module-1.0-20250503.071335-3.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256416
+- id: 38
+  version_id: 2
+  blob_id: 30
+  name: sub-module-1.0-20250503.071335-3.jar
+  lower_name: sub-module-1.0-20250503.071335-3.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256416
+- id: 40
+  version_id: 14
+  blob_id: 32
+  name: parent-project-9.0.0.pom
+  lower_name: parent-project-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256419
+- id: 41
+  version_id: 15
+  blob_id: 33
+  name: sub-module-9.0.0.pom
+  lower_name: sub-module-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256420
+- id: 42
+  version_id: 15
+  blob_id: 34
+  name: sub-module-9.0.0.jar
+  lower_name: sub-module-9.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256420
+- id: 43
+  version_id: 16
+  blob_id: 35
+  name: parent-project-9.0.0.pom
+  lower_name: parent-project-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256423
+- id: 44
+  version_id: 17
+  blob_id: 33
+  name: sub-module-9.0.0.pom
+  lower_name: sub-module-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256424
+- id: 45
+  version_id: 17
+  blob_id: 36
+  name: sub-module-9.0.0.jar
+  lower_name: sub-module-9.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256424
+- id: 46
+  version_id: 7
+  blob_id: 11
+  name: bar-1.0-20250503.071347-5.pom
+  lower_name: bar-1.0-20250503.071347-5.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256427
+- id: 48
+  version_id: 18
+  blob_id: 38
+  name: bar-9.0.0.pom
+  lower_name: bar-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256429
+- id: 49
+  version_id: 7
+  blob_id: 14
+  name: -bar-1.0-20250503.071353-6.pom
+  lower_name: -bar-1.0-20250503.071353-6.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256432
+- id: 51
+  version_id: 18
+  blob_id: 40
+  name: -bar-9.0.0.pom
+  lower_name: -bar-9.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256435
+- id: 52
+  version_id: 1
+  blob_id: 1
+  name: parent-project-1.0-20250503.071405-4.pom
+  lower_name: parent-project-1.0-20250503.071405-4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256445
+- id: 54
+  version_id: 2
+  blob_id: 3
+  name: sub-module-1.0-20250503.071405-4.pom
+  lower_name: sub-module-1.0-20250503.071405-4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256446
+- id: 55
+  version_id: 2
+  blob_id: 42
+  name: sub-module-1.0-20250503.071405-4.jar
+  lower_name: sub-module-1.0-20250503.071405-4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256446
+- id: 57
+  version_id: 19
+  blob_id: 44
+  name: parent-project-10.0.0.pom
+  lower_name: parent-project-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256449
+- id: 58
+  version_id: 20
+  blob_id: 45
+  name: sub-module-10.0.0.pom
+  lower_name: sub-module-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256450
+- id: 59
+  version_id: 20
+  blob_id: 46
+  name: sub-module-10.0.0.jar
+  lower_name: sub-module-10.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256450
+- id: 60
+  version_id: 21
+  blob_id: 47
+  name: parent-project-10.0.0.pom
+  lower_name: parent-project-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256452
+- id: 61
+  version_id: 22
+  blob_id: 45
+  name: sub-module-10.0.0.pom
+  lower_name: sub-module-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256453
+- id: 62
+  version_id: 22
+  blob_id: 48
+  name: sub-module-10.0.0.jar
+  lower_name: sub-module-10.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256453
+- id: 63
+  version_id: 7
+  blob_id: 11
+  name: bar-1.0-20250503.071416-7.pom
+  lower_name: bar-1.0-20250503.071416-7.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256456
+- id: 65
+  version_id: 23
+  blob_id: 50
+  name: bar-10.0.0.pom
+  lower_name: bar-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256459
+- id: 66
+  version_id: 7
+  blob_id: 14
+  name: -bar-1.0-20250503.071422-8.pom
+  lower_name: -bar-1.0-20250503.071422-8.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256461
+- id: 68
+  version_id: 23
+  blob_id: 52
+  name: -bar-10.0.0.pom
+  lower_name: -bar-10.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256464
+- id: 69
+  version_id: 1
+  blob_id: 1
+  name: parent-project-1.0-20250503.071435-5.pom
+  lower_name: parent-project-1.0-20250503.071435-5.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256474
+- id: 70
+  version_id: 1
+  blob_id: 53
+  name: maven-metadata.xml
+  lower_name: maven-metadata.xml
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256474
+- id: 71
+  version_id: 2
+  blob_id: 3
+  name: sub-module-1.0-20250503.071435-5.pom
+  lower_name: sub-module-1.0-20250503.071435-5.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256475
+- id: 72
+  version_id: 2
+  blob_id: 54
+  name: sub-module-1.0-20250503.071435-5.jar
+  lower_name: sub-module-1.0-20250503.071435-5.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256475
+- id: 73
+  version_id: 2
+  blob_id: 55
+  name: maven-metadata.xml
+  lower_name: maven-metadata.xml
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256476
+- id: 74
+  version_id: 24
+  blob_id: 56
+  name: parent-project-11.0.0.pom
+  lower_name: parent-project-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256478
+- id: 75
+  version_id: 25
+  blob_id: 57
+  name: sub-module-11.0.0.pom
+  lower_name: sub-module-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256479
+- id: 76
+  version_id: 25
+  blob_id: 58
+  name: sub-module-11.0.0.jar
+  lower_name: sub-module-11.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256479
+- id: 77
+  version_id: 26
+  blob_id: 59
+  name: parent-project-11.0.0.pom
+  lower_name: parent-project-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256482
+- id: 78
+  version_id: 27
+  blob_id: 57
+  name: sub-module-11.0.0.pom
+  lower_name: sub-module-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256483
+- id: 79
+  version_id: 27
+  blob_id: 60
+  name: sub-module-11.0.0.jar
+  lower_name: sub-module-11.0.0.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256483
+- id: 80
+  version_id: 7
+  blob_id: 11
+  name: bar-1.0-20250503.071446-9.pom
+  lower_name: bar-1.0-20250503.071446-9.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256486
+- id: 82
+  version_id: 28
+  blob_id: 62
+  name: bar-11.0.0.pom
+  lower_name: bar-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256488
+- id: 83
+  version_id: 7
+  blob_id: 14
+  name: -bar-1.0-20250503.071451-10.pom
+  lower_name: -bar-1.0-20250503.071451-10.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256491
+- id: 84
+  version_id: 7
+  blob_id: 63
+  name: maven-metadata.xml
+  lower_name: maven-metadata.xml
+  composite_key: ""
+  is_lead: 0
+  created_unix: 1746256491
+- id: 85
+  version_id: 28
+  blob_id: 64
+  name: -bar-11.0.0.pom
+  lower_name: -bar-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746256494
+# broken uploads
+- id: 86
+  version_id: 29
+  blob_id: 75
+  name: br-repo-jooq-1.2.4-sources.jar
+  lower_name: br-repo-jooq-1.2.4-sources.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444986
+- id: 87
+  version_id: 29
+  blob_id: 65
+  name: br-rest-webmvc-1.2.4.jar
+  lower_name: br-rest-webmvc-1.2.4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649446161
+- id: 88
+  version_id: 29
+  blob_id: 68
+  name: br-openapi-base-1.2.4.pom
+  lower_name: br-openapi-base-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649444734
+- id: 89
+  version_id: 29
+  blob_id: 69
+  name: br-openapi-base-1.2.4.jar
+  lower_name: br-openapi-base-1.2.4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444746
+- id: 90
+  version_id: 29
+  blob_id: 70
+  name: br-openapi-base-1.2.4-sources.jar
+  lower_name: br-openapi-base-1.2.4-sources.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444775
+- id: 91
+  version_id: 29
+  blob_id: 78
+  name: br-parent-1.2.4.pom
+  lower_name: br-parent-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649444852
+- id: 92
+  version_id: 29
+  blob_id: 76
+  name: br-repo-in-memory-1.2.4.pom
+  lower_name: br-repo-in-memory-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649444900
+- id: 93
+  version_id: 29
+  blob_id: 73
+  name: br-repo-in-memory-1.2.4.jar
+  lower_name: br-repo-in-memory-1.2.4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444911
+- id: 94
+  version_id: 29
+  blob_id: 77
+  name: br-repo-in-memory-1.2.4-sources.jar
+  lower_name: br-repo-in-memory-1.2.4-sources.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444922
+- id: 95
+  version_id: 29
+  blob_id: 74
+  name: br-repo-jooq-1.2.4.pom
+  lower_name: br-repo-jooq-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649444953
+- id: 96
+  version_id: 29
+  blob_id: 67
+  name: br-repo-jooq-1.2.4.jar
+  lower_name: br-repo-jooq-1.2.4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649444969
+- id: 97
+  version_id: 29
+  blob_id: 71
+  name: br-rest-webmvc-1.2.4-sources.jar
+  lower_name: br-rest-webmvc-1.2.4-sources.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649446161
+- id: 98
+  version_id: 29
+  blob_id: 66
+  name: br-rest-webmvc-1.2.4.pom
+  lower_name: br-rest-webmvc-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649446195
+- id: 99
+  version_id: 29
+  blob_id: 72
+  name: br-root-1.2.4.pom
+  lower_name: br-root-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649446217
+- id: 100
+  version_id: 30
+  blob_id: 66
+  name: br-rest-webmvc-1.2.4.pom
+  lower_name: br-rest-webmvc-1.2.4.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 174625649446311
+- id: 101
+  version_id: 30
+  blob_id: 65
+  name: br-rest-webmvc-1.2.4.jar
+  lower_name: br-rest-webmvc-1.2.4.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649446312
+- id: 102
+  version_id: 30
+  blob_id: 71
+  name: br-rest-webmvc-1.2.4-sources.jar
+  lower_name: br-rest-webmvc-1.2.4-sources.jar
+  composite_key: ""
+  is_lead: 0
+  created_unix: 174625649446312
+# collision
+- id: 103
+  version_id: 31
+  blob_id: 79
+  name: bar-art-11.0.0.pom
+  lower_name: bar-art-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746280832
+- id: 104
+  version_id: 31
+  blob_id: 80
+  name: art-11.0.0.pom
+  lower_name: art-11.0.0.pom
+  composite_key: ""
+  is_lead: 1
+  created_unix: 1746280843
diff --git a/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_version.yml b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_version.yml
new file mode 100644
index 0000000000..dbdb427adf
--- /dev/null
+++ b/models/migrations/fixtures/Test_ChangeMavenArtifactConcatenation/package_version.yml
@@ -0,0 +1,281 @@
+- id: 1
+  package_id: 1
+  creator_id: 1
+  version: 1.0-SNAPSHOT
+  lower_version: 1.0-snapshot
+  created_unix: 1746256357
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 2
+  package_id: 2
+  creator_id: 1
+  version: 1.0-SNAPSHOT
+  lower_version: 1.0-snapshot
+  created_unix: 1746256358
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 3
+  package_id: 1
+  creator_id: 1
+  version: 7.0.0
+  lower_version: 7.0.0
+  created_unix: 1746256360
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 4
+  package_id: 2
+  creator_id: 1
+  version: 7.0.0
+  lower_version: 7.0.0
+  created_unix: 1746256361
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 5
+  package_id: 3
+  creator_id: 1
+  version: 7.0.0
+  lower_version: 7.0.0
+  created_unix: 1746256364
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 6
+  package_id: 4
+  creator_id: 1
+  version: 7.0.0
+  lower_version: 7.0.0
+  created_unix: 1746256365
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 7
+  package_id: 5
+  creator_id: 1
+  version: 1.0-SNAPSHOT
+  lower_version: 1.0-snapshot
+  created_unix: 1746256367
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+- id: 8
+  package_id: 5
+  creator_id: 1
+  version: 7.0.0
+  lower_version: 7.0.0
+  created_unix: 1746256370
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+- id: 9
+  package_id: 1
+  creator_id: 1
+  version: 8.0.0
+  lower_version: 8.0.0
+  created_unix: 1746256389
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 10
+  package_id: 2
+  creator_id: 1
+  version: 8.0.0
+  lower_version: 8.0.0
+  created_unix: 1746256390
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 11
+  package_id: 3
+  creator_id: 1
+  version: 8.0.0
+  lower_version: 8.0.0
+  created_unix: 1746256393
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 12
+  package_id: 4
+  creator_id: 1
+  version: 8.0.0
+  lower_version: 8.0.0
+  created_unix: 1746256394
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 13
+  package_id: 5
+  creator_id: 1
+  version: 8.0.0
+  lower_version: 8.0.0
+  created_unix: 1746256399
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+- id: 14
+  package_id: 1
+  creator_id: 1
+  version: 9.0.0
+  lower_version: 9.0.0
+  created_unix: 1746256419
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 15
+  package_id: 2
+  creator_id: 1
+  version: 9.0.0
+  lower_version: 9.0.0
+  created_unix: 1746256420
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 16
+  package_id: 3
+  creator_id: 1
+  version: 9.0.0
+  lower_version: 9.0.0
+  created_unix: 1746256423
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 17
+  package_id: 4
+  creator_id: 1
+  version: 9.0.0
+  lower_version: 9.0.0
+  created_unix: 1746256424
+  is_internal: 0
+  metadata_json: '{"artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 18
+  package_id: 5
+  creator_id: 1
+  version: 9.0.0
+  lower_version: 9.0.0
+  created_unix: 1746256429
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+- id: 19
+  package_id: 1
+  creator_id: 1
+  version: 10.0.0
+  lower_version: 10.0.0
+  created_unix: 1746256449
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 20
+  package_id: 2
+  creator_id: 1
+  version: 10.0.0
+  lower_version: 10.0.0
+  created_unix: 1746256450
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 21
+  package_id: 3
+  creator_id: 1
+  version: 10.0.0
+  lower_version: 10.0.0
+  created_unix: 1746256452
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 22
+  package_id: 4
+  creator_id: 1
+  version: 10.0.0
+  lower_version: 10.0.0
+  created_unix: 1746256453
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 23
+  package_id: 5
+  creator_id: 1
+  version: 10.0.0
+  lower_version: 10.0.0
+  created_unix: 1746256459
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+- id: 24
+  package_id: 1
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256478
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 25
+  package_id: 2
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256479
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 26
+  package_id: 3
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256482
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"parent-project","name":"Example :: Parent "}'
+  download_count: 0
+- id: 27
+  package_id: 4
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256483
+  is_internal: 0
+  metadata_json: '{"group_id":"com.example","artifact_id":"sub-module","name":"Example :: SubModule ","dependencies":[{"group_id":"junit","artifact_id":"junit","version":"3.8.1"}]}'
+  download_count: 0
+- id: 28
+  package_id: 5
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256488
+  is_internal: 0
+  metadata_json: '{"group_id":"foo","artifact_id":"-bar","name":"Example :: Parent "}'
+  download_count: 0
+# broken uploads
+- id: 29
+  package_id: 7
+  creator_id: 6
+  version: 1.2.4
+  lower_version: 1.2.4
+  created_unix: 1746256488
+  is_internal: 0
+  metadata_json: '{"group_id":"com.broken","artifact_id":"br-root","name":"Foo"}'
+  download_count: 0
+- id: 30
+  package_id: 6
+  creator_id: 6
+  version: 1.2.4
+  lower_version: 1.2.4
+  created_unix: 1746256488
+  is_internal: 0
+  metadata_json: '{"artifact_id":"br-rest-webmvc","name":"Foo :: REST :: Web MVC","dependencies":[{"group_id":"com.broken","artifact_id":"br-base"},{"group_id":"jakarta.servlet","artifact_id":"jakarta.servlet-api"},{"group_id":"jakarta.validation","artifact_id":"jakarta.validation-api"},{"group_id":"org.springframework","artifact_id":"spring-webmvc"},{"group_id":"org.springframework.hateoas","artifact_id":"spring-hateoas"},{"group_id":"org.springframework.boot","artifact_id":"spring-boot-starter-test"},{"group_id":"com.broken","artifact_id":"br-test"},{"group_id":"com.broken","artifact_id":"br-repo-in-memory"},{"group_id":"org.hibernate.validator","artifact_id":"hibernate-validator"},{"group_id":"org.glassfish.expressly","artifact_id":"expressly"}]}'
+  download_count: 0
+# collision
+- id: 31
+  package_id: 8
+  creator_id: 1
+  version: 11.0.0
+  lower_version: 11.0.0
+  created_unix: 1746256488
+  is_internal: 0
+  metadata_json: '{"group_id":"group-bar","artifact_id":"art","name":"Example :: Parent "}'
+  download_count: 0
diff --git a/models/migrations/fixtures/Test_MigrateActionSecretToKeying/secret.yml b/models/migrations/fixtures/Test_MigrateActionSecretToKeying/secret.yml
new file mode 100644
index 0000000000..908b428321
--- /dev/null
+++ b/models/migrations/fixtures/Test_MigrateActionSecretToKeying/secret.yml
@@ -0,0 +1,14 @@
+-
+  id: 1
+  owner_id: 2
+  repo_id: 1
+  name: SECRET_1
+  data: 02458e5f341b2d5081a31283559843b6b7543ab98ed213d2b15b5cef94385fa348afa7e0875122e9
+  created_unix: 1753556968
+-
+  id: 2
+  owner_id: 2
+  repo_id: 1
+  name: BADBAD
+  data: badbad
+  created_unix: 1753556968
diff --git a/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federated_user.yaml b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federated_user.yaml
new file mode 100644
index 0000000000..dd2c347ae7
--- /dev/null
+++ b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federated_user.yaml
@@ -0,0 +1,10 @@
+- 
+  id: 1
+  user_id: 3
+  federation_host_id: 1
+  external_id: "18"
+-   
+  id: 2
+  user_id: 999
+  federation_host_id: 1
+  external_id: "19"
diff --git a/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federation_host.yaml b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federation_host.yaml
new file mode 100644
index 0000000000..46eeba9c69
--- /dev/null
+++ b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/federation_host.yaml
@@ -0,0 +1,5 @@
+-
+  id: 1
+  host_fqdn: "my.host.x"
+  software_name: forgejo
+  latest_activity: 2024-04-26 14:14:50
\ No newline at end of file
diff --git a/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/user.yaml b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/user.yaml
new file mode 100644
index 0000000000..f6d8a182b3
--- /dev/null
+++ b/models/migrations/fixtures/Test_MigrateNormalizedFederatedURI/user.yaml
@@ -0,0 +1,3 @@
+-
+  id: 3
+  normalized_federated_uri: "https://my.host.x/api/activitypub/user-id/18"
\ No newline at end of file
diff --git a/models/migrations/fixtures/Test_SetTopicsAsEmptySlice/repository.yml b/models/migrations/fixtures/Test_SetTopicsAsEmptySlice/repository.yml
new file mode 100644
index 0000000000..e37b0b25b5
--- /dev/null
+++ b/models/migrations/fixtures/Test_SetTopicsAsEmptySlice/repository.yml
@@ -0,0 +1,9 @@
+# type Repository struct {
+# 	ID     int64    `xorm:"pk autoincr"`
+# 	Topics []string `xorm:"TEXT JSON"`
+# }
+-
+  id: 1
+-
+  id: 2
+  topics: '["go", "dev"]'
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 11933014d7..2a5b97f519 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -6,8 +6,10 @@ package migrations
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"forgejo.org/models/db"
 	"forgejo.org/models/forgejo_migrations"
 	"forgejo.org/models/migrations/v1_10"
 	"forgejo.org/models/migrations/v1_11"
@@ -411,7 +413,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
 	}
 
 	if currentDB < 0 {
-		return fmt.Errorf("database has not been initialized")
+		return errors.New("database has not been initialized")
 	}
 
 	if minDBVersion > currentDB {
@@ -510,3 +512,12 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
 	// Execute Forgejo specific migrations.
 	return forgejo_migrations.Migrate(x)
 }
+
+// WrapperMigrate is a wrapper for Migrate to be called in diagnostics
+func WrapperMigrate(e db.Engine) error {
+	engine, err := db.GetMasterEngine(e)
+	if err != nil {
+		return err
+	}
+	return Migrate(engine)
+}
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go
index ea941b9a09..468c918c93 100644
--- a/models/migrations/migrations_test.go
+++ b/models/migrations/migrations_test.go
@@ -21,7 +21,7 @@ func TestMigrations(t *testing.T) {
 
 	assert.EqualValues(t, 71, migrationIDNumberToDBVersion(70))
 
-	assert.EqualValues(t, []*migration{{idNumber: 70}, {idNumber: 71}}, getPendingMigrations(70, preparedMigrations))
-	assert.EqualValues(t, []*migration{{idNumber: 71}}, getPendingMigrations(71, preparedMigrations))
-	assert.EqualValues(t, []*migration{}, getPendingMigrations(72, preparedMigrations))
+	assert.Equal(t, []*migration{{idNumber: 70}, {idNumber: 71}}, getPendingMigrations(70, preparedMigrations))
+	assert.Equal(t, []*migration{{idNumber: 71}}, getPendingMigrations(71, preparedMigrations))
+	assert.Equal(t, []*migration{}, getPendingMigrations(72, preparedMigrations))
 }
diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go
index 07487cf58a..6be3b3c2fc 100644
--- a/models/migrations/test/tests.go
+++ b/models/migrations/test/tests.go
@@ -95,7 +95,8 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu
 		t.Logf("initializing fixtures from: %s", fixturesDir)
 		if err := unittest.InitFixtures(
 			unittest.FixturesOptions{
-				Dir: fixturesDir,
+				Dir:                     fixturesDir,
+				SkipCleanRegistedModels: true,
 			}, x); err != nil {
 			t.Errorf("error whilst initializing fixtures from %s: %v", fixturesDir, err)
 			return x, deferFn
@@ -175,7 +176,10 @@ func newXORMEngine() (*xorm.Engine, error) {
 	if err := db.InitEngine(context.Background()); err != nil {
 		return nil, err
 	}
-	x := unittest.GetXORMEngine()
+	x, err := unittest.GetXORMEngine()
+	if err != nil {
+		return nil, err
+	}
 	return x, nil
 }
 
diff --git a/models/migrations/v1_10/v100.go b/models/migrations/v1_10/v100.go
index 5d2fd8e244..1742bea296 100644
--- a/models/migrations/v1_10/v100.go
+++ b/models/migrations/v1_10/v100.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"net/url"
diff --git a/models/migrations/v1_10/v101.go b/models/migrations/v1_10/v101.go
index f023a2a0e7..6c8dfe2486 100644
--- a/models/migrations/v1_10/v101.go
+++ b/models/migrations/v1_10/v101.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_10/v88.go b/models/migrations/v1_10/v88.go
index 7e86ac364f..eb8e81c19e 100644
--- a/models/migrations/v1_10/v88.go
+++ b/models/migrations/v1_10/v88.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"crypto/sha1"
diff --git a/models/migrations/v1_10/v89.go b/models/migrations/v1_10/v89.go
index d5f27ffdc6..0df2a6e17b 100644
--- a/models/migrations/v1_10/v89.go
+++ b/models/migrations/v1_10/v89.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v90.go b/models/migrations/v1_10/v90.go
index 295d4b1c1b..5521a97e32 100644
--- a/models/migrations/v1_10/v90.go
+++ b/models/migrations/v1_10/v90.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v91.go b/models/migrations/v1_10/v91.go
index 48cac2de70..08db6c2742 100644
--- a/models/migrations/v1_10/v91.go
+++ b/models/migrations/v1_10/v91.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v92.go b/models/migrations/v1_10/v92.go
index 9080108594..b6c04a9234 100644
--- a/models/migrations/v1_10/v92.go
+++ b/models/migrations/v1_10/v92.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"xorm.io/builder"
diff --git a/models/migrations/v1_10/v93.go b/models/migrations/v1_10/v93.go
index ee59a8db39..c131be9a8d 100644
--- a/models/migrations/v1_10/v93.go
+++ b/models/migrations/v1_10/v93.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v94.go b/models/migrations/v1_10/v94.go
index c131af162b..13b7d7b303 100644
--- a/models/migrations/v1_10/v94.go
+++ b/models/migrations/v1_10/v94.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v95.go b/models/migrations/v1_10/v95.go
index 3b1f67fd9c..86b52026bf 100644
--- a/models/migrations/v1_10/v95.go
+++ b/models/migrations/v1_10/v95.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go
index 3bfb770f24..bcbd618b49 100644
--- a/models/migrations/v1_10/v96.go
+++ b/models/migrations/v1_10/v96.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"path/filepath"
diff --git a/models/migrations/v1_10/v97.go b/models/migrations/v1_10/v97.go
index dee45b32e3..5872bb63e5 100644
--- a/models/migrations/v1_10/v97.go
+++ b/models/migrations/v1_10/v97.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v98.go b/models/migrations/v1_10/v98.go
index bdd9aed089..d21c326459 100644
--- a/models/migrations/v1_10/v98.go
+++ b/models/migrations/v1_10/v98.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go
index 7f287b77aa..addae66be9 100644
--- a/models/migrations/v1_10/v99.go
+++ b/models/migrations/v1_10/v99.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_10 //nolint
+package v1_10
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go
index a585d9c423..15f0c83c36 100644
--- a/models/migrations/v1_11/v102.go
+++ b/models/migrations/v1_11/v102.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_11/v103.go b/models/migrations/v1_11/v103.go
index 53527dac58..a515710160 100644
--- a/models/migrations/v1_11/v103.go
+++ b/models/migrations/v1_11/v103.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go
index af3578ca4a..7461f0cda3 100644
--- a/models/migrations/v1_11/v104.go
+++ b/models/migrations/v1_11/v104.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_11/v105.go b/models/migrations/v1_11/v105.go
index b91340c30a..d86973a0f6 100644
--- a/models/migrations/v1_11/v105.go
+++ b/models/migrations/v1_11/v105.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v106.go b/models/migrations/v1_11/v106.go
index ecb11cdd1e..edffe18683 100644
--- a/models/migrations/v1_11/v106.go
+++ b/models/migrations/v1_11/v106.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v107.go b/models/migrations/v1_11/v107.go
index f0bfe5862c..a158e3bb50 100644
--- a/models/migrations/v1_11/v107.go
+++ b/models/migrations/v1_11/v107.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v108.go b/models/migrations/v1_11/v108.go
index a85096234d..8f14504ceb 100644
--- a/models/migrations/v1_11/v108.go
+++ b/models/migrations/v1_11/v108.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v109.go b/models/migrations/v1_11/v109.go
index ea565ccda3..f7616aec7b 100644
--- a/models/migrations/v1_11/v109.go
+++ b/models/migrations/v1_11/v109.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v110.go b/models/migrations/v1_11/v110.go
index fce9be847e..e94a738f67 100644
--- a/models/migrations/v1_11/v110.go
+++ b/models/migrations/v1_11/v110.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_11/v111.go b/models/migrations/v1_11/v111.go
index cc3dc0d545..6f531e4858 100644
--- a/models/migrations/v1_11/v111.go
+++ b/models/migrations/v1_11/v111.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go
index 6112ab51a5..22054e6f68 100644
--- a/models/migrations/v1_11/v112.go
+++ b/models/migrations/v1_11/v112.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_11/v113.go b/models/migrations/v1_11/v113.go
index dea344a44f..a4d54f66fb 100644
--- a/models/migrations/v1_11/v113.go
+++ b/models/migrations/v1_11/v113.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_11/v114.go b/models/migrations/v1_11/v114.go
index 95adcee989..9467a8a90c 100644
--- a/models/migrations/v1_11/v114.go
+++ b/models/migrations/v1_11/v114.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"net/url"
diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go
index 3d4b41017b..65094df93d 100644
--- a/models/migrations/v1_11/v115.go
+++ b/models/migrations/v1_11/v115.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"crypto/md5"
diff --git a/models/migrations/v1_11/v116.go b/models/migrations/v1_11/v116.go
index 85aa76c1e0..729fbad18b 100644
--- a/models/migrations/v1_11/v116.go
+++ b/models/migrations/v1_11/v116.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_11 //nolint
+package v1_11
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v117.go b/models/migrations/v1_12/v117.go
index 8eadcdef2b..73b58ca34b 100644
--- a/models/migrations/v1_12/v117.go
+++ b/models/migrations/v1_12/v117.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v118.go b/models/migrations/v1_12/v118.go
index eb022dc5e4..e8b4249743 100644
--- a/models/migrations/v1_12/v118.go
+++ b/models/migrations/v1_12/v118.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v119.go b/models/migrations/v1_12/v119.go
index 60bfe6a57d..b4bf29a935 100644
--- a/models/migrations/v1_12/v119.go
+++ b/models/migrations/v1_12/v119.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v120.go b/models/migrations/v1_12/v120.go
index 3f7ed8d373..14d515f5a7 100644
--- a/models/migrations/v1_12/v120.go
+++ b/models/migrations/v1_12/v120.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v121.go b/models/migrations/v1_12/v121.go
index 175ec9164d..a28ae4e1c9 100644
--- a/models/migrations/v1_12/v121.go
+++ b/models/migrations/v1_12/v121.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_12/v122.go b/models/migrations/v1_12/v122.go
index 6e31d863a1..bc1b175f6a 100644
--- a/models/migrations/v1_12/v122.go
+++ b/models/migrations/v1_12/v122.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v123.go b/models/migrations/v1_12/v123.go
index b0c3af07a3..52b10bb850 100644
--- a/models/migrations/v1_12/v123.go
+++ b/models/migrations/v1_12/v123.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v124.go b/models/migrations/v1_12/v124.go
index d2ba03ffe0..9a93f436d4 100644
--- a/models/migrations/v1_12/v124.go
+++ b/models/migrations/v1_12/v124.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v125.go b/models/migrations/v1_12/v125.go
index ec4ffaab25..7f582ecff5 100644
--- a/models/migrations/v1_12/v125.go
+++ b/models/migrations/v1_12/v125.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v126.go b/models/migrations/v1_12/v126.go
index ca9ec3aa3f..64fd7f7478 100644
--- a/models/migrations/v1_12/v126.go
+++ b/models/migrations/v1_12/v126.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/builder"
diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go
index 11a4042973..f686fa617c 100644
--- a/models/migrations/v1_12/v127.go
+++ b/models/migrations/v1_12/v127.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go
index 6d7307f470..8fca974616 100644
--- a/models/migrations/v1_12/v128.go
+++ b/models/migrations/v1_12/v128.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v129.go b/models/migrations/v1_12/v129.go
index cf228242b9..3e4d3aca68 100644
--- a/models/migrations/v1_12/v129.go
+++ b/models/migrations/v1_12/v129.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go
index bfa856796a..383ef47492 100644
--- a/models/migrations/v1_12/v130.go
+++ b/models/migrations/v1_12/v130.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"forgejo.org/modules/json"
diff --git a/models/migrations/v1_12/v131.go b/models/migrations/v1_12/v131.go
index 5184bc3590..1266c2f185 100644
--- a/models/migrations/v1_12/v131.go
+++ b/models/migrations/v1_12/v131.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v132.go b/models/migrations/v1_12/v132.go
index 3b2b28f7ab..8b1ae6db93 100644
--- a/models/migrations/v1_12/v132.go
+++ b/models/migrations/v1_12/v132.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v133.go b/models/migrations/v1_12/v133.go
index c9087fc8c1..69e20597d8 100644
--- a/models/migrations/v1_12/v133.go
+++ b/models/migrations/v1_12/v133.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go
index bba996fd40..1fabdcae96 100644
--- a/models/migrations/v1_12/v134.go
+++ b/models/migrations/v1_12/v134.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v135.go b/models/migrations/v1_12/v135.go
index 8898011df5..5df0ad7fc4 100644
--- a/models/migrations/v1_12/v135.go
+++ b/models/migrations/v1_12/v135.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go
index db6fc6dea1..7d246a82be 100644
--- a/models/migrations/v1_12/v136.go
+++ b/models/migrations/v1_12/v136.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
@@ -90,7 +90,7 @@ func AddCommitDivergenceToPulls(x *xorm.Engine) error {
 
 			gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
 
-			divergence, err := git.GetDivergingCommits(graceful.GetManager().HammerContext(), repoPath, pr.BaseBranch, gitRefName)
+			divergence, err := git.GetDivergingCommits(graceful.GetManager().HammerContext(), repoPath, pr.BaseBranch, gitRefName, nil)
 			if err != nil {
 				log.Warn("Could not recalculate Divergence for pull: %d", pr.ID)
 				pr.CommitsAhead = 0
diff --git a/models/migrations/v1_12/v137.go b/models/migrations/v1_12/v137.go
index 0d86b72010..9d38483488 100644
--- a/models/migrations/v1_12/v137.go
+++ b/models/migrations/v1_12/v137.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_12/v138.go b/models/migrations/v1_12/v138.go
index 8c8d353f40..4485adeb2d 100644
--- a/models/migrations/v1_12/v138.go
+++ b/models/migrations/v1_12/v138.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go
index cd7963524e..51e57b984a 100644
--- a/models/migrations/v1_12/v139.go
+++ b/models/migrations/v1_12/v139.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_12 //nolint
+package v1_12
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go
index d74f808e9f..5bb612c098 100644
--- a/models/migrations/v1_13/v140.go
+++ b/models/migrations/v1_13/v140.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_13/v141.go b/models/migrations/v1_13/v141.go
index ae211e0e44..b54bc1727c 100644
--- a/models/migrations/v1_13/v141.go
+++ b/models/migrations/v1_13/v141.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go
index 7490e0f3b4..8939f6f2f8 100644
--- a/models/migrations/v1_13/v142.go
+++ b/models/migrations/v1_13/v142.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go
index 1f9120e2ba..6a8da8b06d 100644
--- a/models/migrations/v1_13/v143.go
+++ b/models/migrations/v1_13/v143.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go
index 7e801eab8a..f138338514 100644
--- a/models/migrations/v1_13/v144.go
+++ b/models/migrations/v1_13/v144.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go
index a01f577ed1..f7d3895c84 100644
--- a/models/migrations/v1_13/v145.go
+++ b/models/migrations/v1_13/v145.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go
index a1b54ee3aa..e6a476a288 100644
--- a/models/migrations/v1_13/v146.go
+++ b/models/migrations/v1_13/v146.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go
index cc57504c74..831ef5842a 100644
--- a/models/migrations/v1_13/v147.go
+++ b/models/migrations/v1_13/v147.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_13/v148.go b/models/migrations/v1_13/v148.go
index 7bb8ab700b..d276db3d61 100644
--- a/models/migrations/v1_13/v148.go
+++ b/models/migrations/v1_13/v148.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go
index 3a0c5909d5..c1bfe8b09e 100644
--- a/models/migrations/v1_13/v149.go
+++ b/models/migrations/v1_13/v149.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go
index be14fd130c..471a531024 100644
--- a/models/migrations/v1_13/v150.go
+++ b/models/migrations/v1_13/v150.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go
index 60339962cb..691b86062d 100644
--- a/models/migrations/v1_13/v151.go
+++ b/models/migrations/v1_13/v151.go
@@ -1,10 +1,11 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -83,7 +84,7 @@ func SetDefaultPasswordToArgon2(x *xorm.Engine) error {
 
 	newTableColumns := table.Columns()
 	if len(newTableColumns) == 0 {
-		return fmt.Errorf("no columns in new table")
+		return errors.New("no columns in new table")
 	}
 	hasID := false
 	for _, column := range newTableColumns {
diff --git a/models/migrations/v1_13/v152.go b/models/migrations/v1_13/v152.go
index 502c82a40d..648e26446f 100644
--- a/models/migrations/v1_13/v152.go
+++ b/models/migrations/v1_13/v152.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_13/v153.go b/models/migrations/v1_13/v153.go
index 0b2dd3eb62..e5462fc162 100644
--- a/models/migrations/v1_13/v153.go
+++ b/models/migrations/v1_13/v153.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go
index cf31190781..89dc7821b2 100644
--- a/models/migrations/v1_13/v154.go
+++ b/models/migrations/v1_13/v154.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_13 //nolint
+package v1_13
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go
index c01faedc35..57cf995be1 100644
--- a/models/migrations/v1_14/main_test.go
+++ b/models/migrations/v1_14/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"testing"
diff --git a/models/migrations/v1_14/v155.go b/models/migrations/v1_14/v155.go
index e814f59938..505a9ae033 100644
--- a/models/migrations/v1_14/v155.go
+++ b/models/migrations/v1_14/v155.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go
index b6dc91a054..7bbd9f4c85 100644
--- a/models/migrations/v1_14/v156.go
+++ b/models/migrations/v1_14/v156.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v157.go b/models/migrations/v1_14/v157.go
index 7187278d29..ba69f71130 100644
--- a/models/migrations/v1_14/v157.go
+++ b/models/migrations/v1_14/v157.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go
index 9849d5a9ea..2ab3c8a1f0 100644
--- a/models/migrations/v1_14/v158.go
+++ b/models/migrations/v1_14/v158.go
@@ -1,10 +1,10 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
-	"fmt"
+	"errors"
 	"strconv"
 
 	"forgejo.org/modules/log"
@@ -72,7 +72,7 @@ func UpdateCodeCommentReplies(x *xorm.Engine) error {
 		case setting.Database.Type.IsSQLite3():
 			sqlCmd = sqlSelect + sqlTail + " LIMIT " + strconv.Itoa(batchSize) + " OFFSET " + strconv.Itoa(start)
 		default:
-			return fmt.Errorf("Unsupported database type")
+			return errors.New("Unsupported database type")
 		}
 
 		if err := sess.SQL(sqlCmd).Find(&comments); err != nil {
diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go
index fdd7e12449..4e921ea1c6 100644
--- a/models/migrations/v1_14/v159.go
+++ b/models/migrations/v1_14/v159.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_14/v160.go b/models/migrations/v1_14/v160.go
index 4dea91b514..73f3798954 100644
--- a/models/migrations/v1_14/v160.go
+++ b/models/migrations/v1_14/v160.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go
index 6e904cfab6..9c850ad0c2 100644
--- a/models/migrations/v1_14/v161.go
+++ b/models/migrations/v1_14/v161.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"context"
diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go
index 5d6d7c2e3f..ead63f16f4 100644
--- a/models/migrations/v1_14/v162.go
+++ b/models/migrations/v1_14/v162.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go
index 60fc98c0a4..06ac36cbc7 100644
--- a/models/migrations/v1_14/v163.go
+++ b/models/migrations/v1_14/v163.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_14/v164.go b/models/migrations/v1_14/v164.go
index 54f6951427..d2fd9b8464 100644
--- a/models/migrations/v1_14/v164.go
+++ b/models/migrations/v1_14/v164.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go
index 9315e44197..90fd2b1e46 100644
--- a/models/migrations/v1_14/v165.go
+++ b/models/migrations/v1_14/v165.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_14/v166.go b/models/migrations/v1_14/v166.go
index e5731582fd..4c106bd7da 100644
--- a/models/migrations/v1_14/v166.go
+++ b/models/migrations/v1_14/v166.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"crypto/sha256"
diff --git a/models/migrations/v1_14/v167.go b/models/migrations/v1_14/v167.go
index 9d416f6a32..d77bbc401e 100644
--- a/models/migrations/v1_14/v167.go
+++ b/models/migrations/v1_14/v167.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v168.go b/models/migrations/v1_14/v168.go
index a30a8859f7..aa93eec19b 100644
--- a/models/migrations/v1_14/v168.go
+++ b/models/migrations/v1_14/v168.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_14/v169.go b/models/migrations/v1_14/v169.go
index 5b81bb58b1..4f9df0d96f 100644
--- a/models/migrations/v1_14/v169.go
+++ b/models/migrations/v1_14/v169.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_14/v170.go b/models/migrations/v1_14/v170.go
index 7b6498a3e9..a2ff4623e1 100644
--- a/models/migrations/v1_14/v170.go
+++ b/models/migrations/v1_14/v170.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v171.go b/models/migrations/v1_14/v171.go
index 51a35a02ad..7b200e960a 100644
--- a/models/migrations/v1_14/v171.go
+++ b/models/migrations/v1_14/v171.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go
index d49b70f5ad..c410d393f1 100644
--- a/models/migrations/v1_14/v172.go
+++ b/models/migrations/v1_14/v172.go
@@ -1,7 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_14/v173.go b/models/migrations/v1_14/v173.go
index 2d9eee9197..7752fbe966 100644
--- a/models/migrations/v1_14/v173.go
+++ b/models/migrations/v1_14/v173.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v174.go b/models/migrations/v1_14/v174.go
index c839e15db8..4049e43070 100644
--- a/models/migrations/v1_14/v174.go
+++ b/models/migrations/v1_14/v174.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go
index 3cda5772a0..49fa17d046 100644
--- a/models/migrations/v1_14/v175.go
+++ b/models/migrations/v1_14/v175.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v176.go b/models/migrations/v1_14/v176.go
index 1ed49f75fa..ef5dce9a02 100644
--- a/models/migrations/v1_14/v176.go
+++ b/models/migrations/v1_14/v176.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go
index d88ff207e7..d56b3e0470 100644
--- a/models/migrations/v1_14/v176_test.go
+++ b/models/migrations/v1_14/v176_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"testing"
diff --git a/models/migrations/v1_14/v177.go b/models/migrations/v1_14/v177.go
index 6e1838f369..96676bf8d9 100644
--- a/models/migrations/v1_14/v177.go
+++ b/models/migrations/v1_14/v177.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go
index 199a71186a..0e0a67fd33 100644
--- a/models/migrations/v1_14/v177_test.go
+++ b/models/migrations/v1_14/v177_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_14 //nolint
+package v1_14
 
 import (
 	"testing"
@@ -73,12 +73,12 @@ func Test_DeleteOrphanedIssueLabels(t *testing.T) {
 
 	// Now test what is left
 	if _, ok := postMigration[2]; ok {
-		t.Errorf("Orphaned Label[2] survived the migration")
+		t.Error("Orphaned Label[2] survived the migration")
 		return
 	}
 
 	if _, ok := postMigration[5]; ok {
-		t.Errorf("Orphaned Label[5] survived the migration")
+		t.Error("Orphaned Label[5] survived the migration")
 		return
 	}
 
diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go
index 6c04d3f5ee..4cf6d6f695 100644
--- a/models/migrations/v1_15/main_test.go
+++ b/models/migrations/v1_15/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"testing"
diff --git a/models/migrations/v1_15/v178.go b/models/migrations/v1_15/v178.go
index 6d236eb049..ca3a5c262e 100644
--- a/models/migrations/v1_15/v178.go
+++ b/models/migrations/v1_15/v178.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go
index b990583303..ce514cc4a9 100644
--- a/models/migrations/v1_15/v179.go
+++ b/models/migrations/v1_15/v179.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go
index 02fbd57cdb..0b68c3ceb7 100644
--- a/models/migrations/v1_15/v180.go
+++ b/models/migrations/v1_15/v180.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"forgejo.org/modules/json"
diff --git a/models/migrations/v1_15/v181.go b/models/migrations/v1_15/v181.go
index 2185ed0213..fb1d3d7a75 100644
--- a/models/migrations/v1_15/v181.go
+++ b/models/migrations/v1_15/v181.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"strings"
diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go
index 4544ca6520..8196f751e5 100644
--- a/models/migrations/v1_15/v181_test.go
+++ b/models/migrations/v1_15/v181_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"strings"
@@ -50,7 +50,7 @@ func Test_AddPrimaryEmail2EmailAddress(t *testing.T) {
 		require.NoError(t, err)
 		assert.True(t, has)
 		assert.True(t, emailAddress.IsPrimary)
-		assert.EqualValues(t, user.IsActive, emailAddress.IsActivated)
-		assert.EqualValues(t, user.ID, emailAddress.UID)
+		assert.Equal(t, user.IsActive, emailAddress.IsActivated)
+		assert.Equal(t, user.ID, emailAddress.UID)
 	}
 }
diff --git a/models/migrations/v1_15/v182.go b/models/migrations/v1_15/v182.go
index 9ca500c0f9..f53ff11df9 100644
--- a/models/migrations/v1_15/v182.go
+++ b/models/migrations/v1_15/v182.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go
index 6865cafac4..2baf90d06a 100644
--- a/models/migrations/v1_15/v182_test.go
+++ b/models/migrations/v1_15/v182_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"testing"
diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go
index aaad64c220..5684e35699 100644
--- a/models/migrations/v1_15/v183.go
+++ b/models/migrations/v1_15/v183.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go
index 41b64d4743..fbe0dcd780 100644
--- a/models/migrations/v1_15/v184.go
+++ b/models/migrations/v1_15/v184.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"context"
diff --git a/models/migrations/v1_15/v185.go b/models/migrations/v1_15/v185.go
index e5878ec193..60af59edca 100644
--- a/models/migrations/v1_15/v185.go
+++ b/models/migrations/v1_15/v185.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go
index ad75822de5..55d3199335 100644
--- a/models/migrations/v1_15/v186.go
+++ b/models/migrations/v1_15/v186.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go
index b573fc52ef..fabef14779 100644
--- a/models/migrations/v1_15/v187.go
+++ b/models/migrations/v1_15/v187.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_15/v188.go b/models/migrations/v1_15/v188.go
index 71e45cab0e..4494e6ff05 100644
--- a/models/migrations/v1_15/v188.go
+++ b/models/migrations/v1_15/v188.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_15 //nolint
+package v1_15
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go
index 6f891f3e94..8c0a043be6 100644
--- a/models/migrations/v1_16/main_test.go
+++ b/models/migrations/v1_16/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"testing"
diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go
index 1ee72d9c39..19bfcb2423 100644
--- a/models/migrations/v1_16/v189.go
+++ b/models/migrations/v1_16/v189.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"encoding/binary"
diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go
index e72c385168..9d74462a92 100644
--- a/models/migrations/v1_16/v189_test.go
+++ b/models/migrations/v1_16/v189_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"testing"
@@ -76,8 +76,8 @@ func Test_UnwrapLDAPSourceCfg(t *testing.T) {
 				return
 			}
 
-			assert.EqualValues(t, expected, converted, "UnwrapLDAPSourceCfg failed for %d", source.ID)
-			assert.EqualValues(t, source.ID%2 == 0, source.IsActive, "UnwrapLDAPSourceCfg failed for %d", source.ID)
+			assert.Equal(t, expected, converted, "UnwrapLDAPSourceCfg failed for %d", source.ID)
+			assert.Equal(t, source.ID%2 == 0, source.IsActive, "UnwrapLDAPSourceCfg failed for %d", source.ID)
 		}
 	}
 }
diff --git a/models/migrations/v1_16/v190.go b/models/migrations/v1_16/v190.go
index 5953802849..1eb6b6ddb4 100644
--- a/models/migrations/v1_16/v190.go
+++ b/models/migrations/v1_16/v190.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go
index 567f88d6d1..427476b70b 100644
--- a/models/migrations/v1_16/v191.go
+++ b/models/migrations/v1_16/v191.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go
index 731b9fb43a..31e8c36346 100644
--- a/models/migrations/v1_16/v192.go
+++ b/models/migrations/v1_16/v192.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_16/v193.go b/models/migrations/v1_16/v193.go
index 8d3ce7a558..a5af2de380 100644
--- a/models/migrations/v1_16/v193.go
+++ b/models/migrations/v1_16/v193.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go
index ab39bcd98c..bf8d8a7dc6 100644
--- a/models/migrations/v1_16/v193_test.go
+++ b/models/migrations/v1_16/v193_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"testing"
@@ -63,7 +63,7 @@ func Test_AddRepoIDForAttachment(t *testing.T) {
 		has, err := x.ID(attach.IssueID).Get(&issue)
 		require.NoError(t, err)
 		assert.True(t, has)
-		assert.EqualValues(t, attach.RepoID, issue.RepoID)
+		assert.Equal(t, attach.RepoID, issue.RepoID)
 	}
 
 	var releaseAttachments []*NewAttachment
@@ -76,6 +76,6 @@ func Test_AddRepoIDForAttachment(t *testing.T) {
 		has, err := x.ID(attach.ReleaseID).Get(&release)
 		require.NoError(t, err)
 		assert.True(t, has)
-		assert.EqualValues(t, attach.RepoID, release.RepoID)
+		assert.Equal(t, attach.RepoID, release.RepoID)
 	}
 }
diff --git a/models/migrations/v1_16/v194.go b/models/migrations/v1_16/v194.go
index 6aa13c50cf..2e4ed8340e 100644
--- a/models/migrations/v1_16/v194.go
+++ b/models/migrations/v1_16/v194.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v195.go b/models/migrations/v1_16/v195.go
index 6d7e94141e..4fd42b7bd2 100644
--- a/models/migrations/v1_16/v195.go
+++ b/models/migrations/v1_16/v195.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go
index 71234a6fb3..1fc7b51f3c 100644
--- a/models/migrations/v1_16/v195_test.go
+++ b/models/migrations/v1_16/v195_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"testing"
diff --git a/models/migrations/v1_16/v196.go b/models/migrations/v1_16/v196.go
index 7cbafc61e5..6c9caa100f 100644
--- a/models/migrations/v1_16/v196.go
+++ b/models/migrations/v1_16/v196.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v197.go b/models/migrations/v1_16/v197.go
index 97888b2847..862bdfdcbd 100644
--- a/models/migrations/v1_16/v197.go
+++ b/models/migrations/v1_16/v197.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go
index 8b3c73addc..5d3043eb46 100644
--- a/models/migrations/v1_16/v198.go
+++ b/models/migrations/v1_16/v198.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v199.go b/models/migrations/v1_16/v199.go
index 6adcf890af..4020352f2b 100644
--- a/models/migrations/v1_16/v199.go
+++ b/models/migrations/v1_16/v199.go
@@ -1,6 +1,6 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 // We used to use a table `remote_version` to store information for updater, now we use `AppState`, so this migration task is a no-op now.
diff --git a/models/migrations/v1_16/v200.go b/models/migrations/v1_16/v200.go
index c08c20e51d..de57fad8fe 100644
--- a/models/migrations/v1_16/v200.go
+++ b/models/migrations/v1_16/v200.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v201.go b/models/migrations/v1_16/v201.go
index 35e0c9f2fb..2c43698b0c 100644
--- a/models/migrations/v1_16/v201.go
+++ b/models/migrations/v1_16/v201.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v202.go b/models/migrations/v1_16/v202.go
index 6ba36152f1..d8c8fdcadc 100644
--- a/models/migrations/v1_16/v202.go
+++ b/models/migrations/v1_16/v202.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v203.go b/models/migrations/v1_16/v203.go
index e8e6b52453..c3241cba57 100644
--- a/models/migrations/v1_16/v203.go
+++ b/models/migrations/v1_16/v203.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v204.go b/models/migrations/v1_16/v204.go
index ece03e1305..4d375307e7 100644
--- a/models/migrations/v1_16/v204.go
+++ b/models/migrations/v1_16/v204.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go
index a064b9830d..cb452dfd7f 100644
--- a/models/migrations/v1_16/v205.go
+++ b/models/migrations/v1_16/v205.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_16/v206.go b/models/migrations/v1_16/v206.go
index 581a7d76e9..01a9c386eb 100644
--- a/models/migrations/v1_16/v206.go
+++ b/models/migrations/v1_16/v206.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_16/v207.go b/models/migrations/v1_16/v207.go
index 91208f066c..19126ead1f 100644
--- a/models/migrations/v1_16/v207.go
+++ b/models/migrations/v1_16/v207.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v208.go b/models/migrations/v1_16/v208.go
index 1a11ef096a..fb643324f4 100644
--- a/models/migrations/v1_16/v208.go
+++ b/models/migrations/v1_16/v208.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v209.go b/models/migrations/v1_16/v209.go
index be3100e02a..230838647b 100644
--- a/models/migrations/v1_16/v209.go
+++ b/models/migrations/v1_16/v209.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go
index 375a008e18..f48ab11db6 100644
--- a/models/migrations/v1_16/v210.go
+++ b/models/migrations/v1_16/v210.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"crypto/ecdh"
diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go
index 010cd8a770..8454920aa0 100644
--- a/models/migrations/v1_16/v210_test.go
+++ b/models/migrations/v1_16/v210_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_16 //nolint
+package v1_16
 
 import (
 	"encoding/hex"
@@ -84,5 +84,5 @@ func Test_RemigrateU2FCredentials(t *testing.T) {
 	err = x.Table("webauthn_credential").Select("id, credential_id").Asc("id").Find(&got)
 	require.NoError(t, err)
 
-	assert.EqualValues(t, expected, got)
+	assert.Equal(t, expected, got)
 }
diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go
index 0a8e05ab5f..166860b3b1 100644
--- a/models/migrations/v1_17/main_test.go
+++ b/models/migrations/v1_17/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"testing"
diff --git a/models/migrations/v1_17/v211.go b/models/migrations/v1_17/v211.go
index 9b72c8610b..517cf19388 100644
--- a/models/migrations/v1_17/v211.go
+++ b/models/migrations/v1_17/v211.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go
index 2337adcc80..23868c0bb2 100644
--- a/models/migrations/v1_17/v212.go
+++ b/models/migrations/v1_17/v212.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_17/v213.go b/models/migrations/v1_17/v213.go
index bb3f466e52..b2bbdf7279 100644
--- a/models/migrations/v1_17/v213.go
+++ b/models/migrations/v1_17/v213.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_17/v214.go b/models/migrations/v1_17/v214.go
index 2268164919..1925324f0f 100644
--- a/models/migrations/v1_17/v214.go
+++ b/models/migrations/v1_17/v214.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go
index 5aae798562..431103c98e 100644
--- a/models/migrations/v1_17/v215.go
+++ b/models/migrations/v1_17/v215.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"forgejo.org/models/pull"
diff --git a/models/migrations/v1_17/v216.go b/models/migrations/v1_17/v216.go
index 268f472a42..37aeacb6fc 100644
--- a/models/migrations/v1_17/v216.go
+++ b/models/migrations/v1_17/v216.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 // This migration added non-ideal indices to the action table which on larger datasets slowed things down
 // it has been superseded by v218.go
diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go
index 5f096d4824..fef48b7a5b 100644
--- a/models/migrations/v1_17/v217.go
+++ b/models/migrations/v1_17/v217.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go
index 5e3dcd0841..412d124286 100644
--- a/models/migrations/v1_17/v218.go
+++ b/models/migrations/v1_17/v218.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go
index e90656090f..7ca6a26be6 100644
--- a/models/migrations/v1_17/v219.go
+++ b/models/migrations/v1_17/v219.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"time"
diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go
index 61bbf19725..4e010e5b76 100644
--- a/models/migrations/v1_17/v220.go
+++ b/models/migrations/v1_17/v220.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	packages_model "forgejo.org/models/packages"
diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go
index 84e9a238af..3ef34e3f06 100644
--- a/models/migrations/v1_17/v221.go
+++ b/models/migrations/v1_17/v221.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"encoding/base32"
diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go
index 02607d6b32..a9c47136b2 100644
--- a/models/migrations/v1_17/v221_test.go
+++ b/models/migrations/v1_17/v221_test.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"encoding/base32"
diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go
index c9a33f007d..873769881e 100644
--- a/models/migrations/v1_17/v222.go
+++ b/models/migrations/v1_17/v222.go
@@ -1,10 +1,11 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"forgejo.org/models/migrations/base"
@@ -29,7 +30,7 @@ func DropOldCredentialIDColumn(x *xorm.Engine) error {
 	}
 	if !credentialIDBytesExists {
 		// looks like 221 hasn't properly run
-		return fmt.Errorf("webauthn_credential does not have a credential_id_bytes column... it is not safe to run this migration")
+		return errors.New("webauthn_credential does not have a credential_id_bytes column... it is not safe to run this migration")
 	}
 
 	// Create webauthnCredential table
diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go
index 7d92dcf5ae..4f5d34d841 100644
--- a/models/migrations/v1_17/v223.go
+++ b/models/migrations/v1_17/v223.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_17 //nolint
+package v1_17
 
 import (
 	"context"
diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go
index 33f5c51222..0c20934cea 100644
--- a/models/migrations/v1_18/main_test.go
+++ b/models/migrations/v1_18/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"testing"
diff --git a/models/migrations/v1_18/v224.go b/models/migrations/v1_18/v224.go
index f3d522b91a..6dc12020ea 100644
--- a/models/migrations/v1_18/v224.go
+++ b/models/migrations/v1_18/v224.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go
index 86bcb1323d..266eccfff8 100644
--- a/models/migrations/v1_18/v225.go
+++ b/models/migrations/v1_18/v225.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_18/v226.go b/models/migrations/v1_18/v226.go
index f87e24b11d..8ed9761476 100644
--- a/models/migrations/v1_18/v226.go
+++ b/models/migrations/v1_18/v226.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"xorm.io/builder"
diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go
index b6250fb76c..d39a010159 100644
--- a/models/migrations/v1_18/v227.go
+++ b/models/migrations/v1_18/v227.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go
index 1161c8a4c9..3f5b69734d 100644
--- a/models/migrations/v1_18/v228.go
+++ b/models/migrations/v1_18/v228.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go
index f96dde9840..00d794725f 100644
--- a/models/migrations/v1_18/v229.go
+++ b/models/migrations/v1_18/v229.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go
index ac5e726a79..903a60c851 100644
--- a/models/migrations/v1_18/v229_test.go
+++ b/models/migrations/v1_18/v229_test.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"testing"
diff --git a/models/migrations/v1_18/v230.go b/models/migrations/v1_18/v230.go
index ea5b4d02e1..078fce7643 100644
--- a/models/migrations/v1_18/v230.go
+++ b/models/migrations/v1_18/v230.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go
index 7dd6675673..da31b0dc9b 100644
--- a/models/migrations/v1_18/v230_test.go
+++ b/models/migrations/v1_18/v230_test.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_18 //nolint
+package v1_18
 
 import (
 	"testing"
diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go
index 7c56926f4c..9d1c3a57ea 100644
--- a/models/migrations/v1_19/main_test.go
+++ b/models/migrations/v1_19/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"testing"
diff --git a/models/migrations/v1_19/v231.go b/models/migrations/v1_19/v231.go
index 79e46132f0..8ef1e4e743 100644
--- a/models/migrations/v1_19/v231.go
+++ b/models/migrations/v1_19/v231.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go
index 7fb4a5ac8d..2aab2cf830 100644
--- a/models/migrations/v1_19/v232.go
+++ b/models/migrations/v1_19/v232.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go
index 191afd4868..e62e8a9356 100644
--- a/models/migrations/v1_19/v233.go
+++ b/models/migrations/v1_19/v233.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go
index de025ca2b7..3d5eac9887 100644
--- a/models/migrations/v1_19/v233_test.go
+++ b/models/migrations/v1_19/v233_test.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"testing"
@@ -63,7 +63,7 @@ func Test_AddHeaderAuthorizationEncryptedColWebhook(t *testing.T) {
 		assert.Equal(t, e.Meta, got[i].Meta)
 
 		if e.HeaderAuthorization == "" {
-			assert.Equal(t, "", got[i].HeaderAuthorizationEncrypted)
+			assert.Empty(t, got[i].HeaderAuthorizationEncrypted)
 		} else {
 			cipherhex := got[i].HeaderAuthorizationEncrypted
 			cleartext, err := secret.DecryptSecret(setting.SecretKey, cipherhex)
diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go
index c610a423dd..e00b1cc2b6 100644
--- a/models/migrations/v1_19/v234.go
+++ b/models/migrations/v1_19/v234.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_19/v235.go b/models/migrations/v1_19/v235.go
index 3715de3920..297d90f65a 100644
--- a/models/migrations/v1_19/v235.go
+++ b/models/migrations/v1_19/v235.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go
index fa01a6ab80..c453f95e04 100644
--- a/models/migrations/v1_19/v236.go
+++ b/models/migrations/v1_19/v236.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go
index b23c765aa5..cf30226ccd 100644
--- a/models/migrations/v1_19/v237.go
+++ b/models/migrations/v1_19/v237.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go
index 7c912a8341..b257315319 100644
--- a/models/migrations/v1_19/v238.go
+++ b/models/migrations/v1_19/v238.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_19/v239.go b/models/migrations/v1_19/v239.go
index 10076f2401..8f4a65be95 100644
--- a/models/migrations/v1_19/v239.go
+++ b/models/migrations/v1_19/v239.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go
index 4ca5becede..c49ce2f49a 100644
--- a/models/migrations/v1_19/v240.go
+++ b/models/migrations/v1_19/v240.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/models/db"
diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go
index a617d6fd2f..e35801a057 100644
--- a/models/migrations/v1_19/v241.go
+++ b/models/migrations/v1_19/v241.go
@@ -1,7 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go
index bbf227ef77..87ca9cf214 100644
--- a/models/migrations/v1_19/v242.go
+++ b/models/migrations/v1_19/v242.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_19/v243.go b/models/migrations/v1_19/v243.go
index 55bbfafb2f..9c3f372594 100644
--- a/models/migrations/v1_19/v243.go
+++ b/models/migrations/v1_19/v243.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_19 //nolint
+package v1_19
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go
index f870dca429..ee5eec5ef6 100644
--- a/models/migrations/v1_20/main_test.go
+++ b/models/migrations/v1_20/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"testing"
diff --git a/models/migrations/v1_20/v244.go b/models/migrations/v1_20/v244.go
index 977566ad7d..76cdccaca5 100644
--- a/models/migrations/v1_20/v244.go
+++ b/models/migrations/v1_20/v244.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go
index 7e6585388b..5e034568c4 100644
--- a/models/migrations/v1_20/v245.go
+++ b/models/migrations/v1_20/v245.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"context"
diff --git a/models/migrations/v1_20/v246.go b/models/migrations/v1_20/v246.go
index e6340ef079..22bf723404 100644
--- a/models/migrations/v1_20/v246.go
+++ b/models/migrations/v1_20/v246.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go
index 9ed810a623..056699d744 100644
--- a/models/migrations/v1_20/v247.go
+++ b/models/migrations/v1_20/v247.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_20/v248.go b/models/migrations/v1_20/v248.go
index 40555210e7..4f2091e4bc 100644
--- a/models/migrations/v1_20/v248.go
+++ b/models/migrations/v1_20/v248.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go
index d2b096bf58..0aebb2a343 100644
--- a/models/migrations/v1_20/v249.go
+++ b/models/migrations/v1_20/v249.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go
index cfcde2fc9b..e12223691f 100644
--- a/models/migrations/v1_20/v250.go
+++ b/models/migrations/v1_20/v250.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"strings"
diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go
index c8665ba7eb..7d2d259df6 100644
--- a/models/migrations/v1_20/v251.go
+++ b/models/migrations/v1_20/v251.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go
index bb85c78309..435cce7ebe 100644
--- a/models/migrations/v1_20/v252.go
+++ b/models/migrations/v1_20/v252.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go
index 5f4057e9d9..73354fd485 100644
--- a/models/migrations/v1_20/v253.go
+++ b/models/migrations/v1_20/v253.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/log"
diff --git a/models/migrations/v1_20/v254.go b/models/migrations/v1_20/v254.go
index 1e26979a5b..9cdbfb3916 100644
--- a/models/migrations/v1_20/v254.go
+++ b/models/migrations/v1_20/v254.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go
index 49b0ecf220..baa3c4b6d8 100644
--- a/models/migrations/v1_20/v255.go
+++ b/models/migrations/v1_20/v255.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_20/v256.go b/models/migrations/v1_20/v256.go
index 822153b93e..7b84c1e154 100644
--- a/models/migrations/v1_20/v256.go
+++ b/models/migrations/v1_20/v256.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go
index 70f229d73f..8045909dba 100644
--- a/models/migrations/v1_20/v257.go
+++ b/models/migrations/v1_20/v257.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_20/v258.go b/models/migrations/v1_20/v258.go
index 47174ce805..1d3faffdae 100644
--- a/models/migrations/v1_20/v258.go
+++ b/models/migrations/v1_20/v258.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go
index f10b94fa9c..9b2b68263e 100644
--- a/models/migrations/v1_20/v259.go
+++ b/models/migrations/v1_20/v259.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go
index d67cc9dd81..b41b6c7995 100644
--- a/models/migrations/v1_20/v259_test.go
+++ b/models/migrations/v1_20/v259_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_20 //nolint
+package v1_20
 
 import (
 	"sort"
@@ -97,7 +97,7 @@ func Test_ConvertScopedAccessTokens(t *testing.T) {
 	tokens := make([]AccessToken, 0)
 	err = x.Find(&tokens)
 	require.NoError(t, err)
-	assert.Equal(t, len(tests), len(tokens))
+	assert.Len(t, tokens, len(tests))
 
 	// sort the tokens (insertion order by auto-incrementing primary key)
 	sort.Slice(tokens, func(i, j int) bool {
diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go
index 7104887afb..3f10a39a94 100644
--- a/models/migrations/v1_21/main_test.go
+++ b/models/migrations/v1_21/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"testing"
diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go
index 245f3011ab..b73b53bd61 100644
--- a/models/migrations/v1_21/v260.go
+++ b/models/migrations/v1_21/v260.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go
index 743bef152d..83a4927704 100644
--- a/models/migrations/v1_21/v261.go
+++ b/models/migrations/v1_21/v261.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_21/v262.go b/models/migrations/v1_21/v262.go
index 23e900572a..6e88e29b9d 100644
--- a/models/migrations/v1_21/v262.go
+++ b/models/migrations/v1_21/v262.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go
index 2c7cbadf0d..55c418bde0 100644
--- a/models/migrations/v1_21/v263.go
+++ b/models/migrations/v1_21/v263.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go
index 88eaf0d918..acd2c9bb48 100644
--- a/models/migrations/v1_21/v264.go
+++ b/models/migrations/v1_21/v264.go
@@ -1,11 +1,11 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/timeutil"
@@ -57,7 +57,7 @@ func AddBranchTable(x *xorm.Engine) error {
 	if err != nil {
 		return err
 	} else if !has {
-		return fmt.Errorf("no admin user found")
+		return errors.New("no admin user found")
 	}
 
 	branches := make([]Branch, 0, 100)
diff --git a/models/migrations/v1_21/v265.go b/models/migrations/v1_21/v265.go
index 800eb95f72..b6892acc27 100644
--- a/models/migrations/v1_21/v265.go
+++ b/models/migrations/v1_21/v265.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v266.go b/models/migrations/v1_21/v266.go
index 79a5f5e14c..440549e868 100644
--- a/models/migrations/v1_21/v266.go
+++ b/models/migrations/v1_21/v266.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go
index f94696a22b..13992d8776 100644
--- a/models/migrations/v1_21/v267.go
+++ b/models/migrations/v1_21/v267.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_21/v268.go b/models/migrations/v1_21/v268.go
index 332793ff07..b677d2383e 100644
--- a/models/migrations/v1_21/v268.go
+++ b/models/migrations/v1_21/v268.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v269.go b/models/migrations/v1_21/v269.go
index 475ec02380..042040927d 100644
--- a/models/migrations/v1_21/v269.go
+++ b/models/migrations/v1_21/v269.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v270.go b/models/migrations/v1_21/v270.go
index b9cc84d3ac..ab7c5660ba 100644
--- a/models/migrations/v1_21/v270.go
+++ b/models/migrations/v1_21/v270.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go
index f45c113c1f..e3ce2d4b74 100644
--- a/models/migrations/v1_21/v271.go
+++ b/models/migrations/v1_21/v271.go
@@ -1,7 +1,8 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
+
 import (
 	"forgejo.org/modules/timeutil"
 
diff --git a/models/migrations/v1_21/v272.go b/models/migrations/v1_21/v272.go
index a729c49f1b..14c1e0c4b0 100644
--- a/models/migrations/v1_21/v272.go
+++ b/models/migrations/v1_21/v272.go
@@ -1,7 +1,8 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
+
 import (
 	"xorm.io/xorm"
 )
diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go
index 1ec6ade566..d6ec80d3d5 100644
--- a/models/migrations/v1_21/v273.go
+++ b/models/migrations/v1_21/v273.go
@@ -1,7 +1,8 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
+
 import (
 	"forgejo.org/modules/timeutil"
 
diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go
index b74e5fed51..a1211d1fdd 100644
--- a/models/migrations/v1_21/v274.go
+++ b/models/migrations/v1_21/v274.go
@@ -1,7 +1,8 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
+
 import (
 	"time"
 
diff --git a/models/migrations/v1_21/v275.go b/models/migrations/v1_21/v275.go
index 78804a59d6..2bfe5c72fa 100644
--- a/models/migrations/v1_21/v275.go
+++ b/models/migrations/v1_21/v275.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go
index 0830c3bd92..3b0bc23da7 100644
--- a/models/migrations/v1_21/v276.go
+++ b/models/migrations/v1_21/v276.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	repo_model "forgejo.org/models/repo"
diff --git a/models/migrations/v1_21/v277.go b/models/migrations/v1_21/v277.go
index 12529160b7..0c102eddde 100644
--- a/models/migrations/v1_21/v277.go
+++ b/models/migrations/v1_21/v277.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v278.go b/models/migrations/v1_21/v278.go
index d6a462d1e7..846f228678 100644
--- a/models/migrations/v1_21/v278.go
+++ b/models/migrations/v1_21/v278.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_21/v279.go b/models/migrations/v1_21/v279.go
index 2abd1bbe84..beb39effe1 100644
--- a/models/migrations/v1_21/v279.go
+++ b/models/migrations/v1_21/v279.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_21 //nolint
+package v1_21
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go
index dc991b78fe..7b05993e09 100644
--- a/models/migrations/v1_22/main_test.go
+++ b/models/migrations/v1_22/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
diff --git a/models/migrations/v1_22/v280.go b/models/migrations/v1_22/v280.go
index a8ee4a3bf7..2271cb6089 100644
--- a/models/migrations/v1_22/v280.go
+++ b/models/migrations/v1_22/v280.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go
index 5271c786be..2eeca9be82 100644
--- a/models/migrations/v1_22/v281.go
+++ b/models/migrations/v1_22/v281.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_22/v282.go b/models/migrations/v1_22/v282.go
index baad9e0916..eed64c30f7 100644
--- a/models/migrations/v1_22/v282.go
+++ b/models/migrations/v1_22/v282.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/v283.go b/models/migrations/v1_22/v283.go
index 86946d1c39..33a2513069 100644
--- a/models/migrations/v1_22/v283.go
+++ b/models/migrations/v1_22/v283.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go
index d8e147a131..652d96ac16 100644
--- a/models/migrations/v1_22/v283_test.go
+++ b/models/migrations/v1_22/v283_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
diff --git a/models/migrations/v1_22/v284.go b/models/migrations/v1_22/v284.go
index 2b95078980..31b38f6aed 100644
--- a/models/migrations/v1_22/v284.go
+++ b/models/migrations/v1_22/v284.go
@@ -1,7 +1,8 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
+
 import (
 	"xorm.io/xorm"
 )
diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go
index a55cc17c04..fed89f670e 100644
--- a/models/migrations/v1_22/v285.go
+++ b/models/migrations/v1_22/v285.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"time"
diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go
index d0489e7aeb..05247bb436 100644
--- a/models/migrations/v1_22/v286.go
+++ b/models/migrations/v1_22/v286.go
@@ -1,6 +1,6 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
-package v1_22 //nolint
+package v1_22
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go
index e6f8d4096e..5bb3334df2 100644
--- a/models/migrations/v1_22/v286_test.go
+++ b/models/migrations/v1_22/v286_test.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
@@ -109,11 +109,11 @@ func Test_RepositoryFormat(t *testing.T) {
 	ok, err := x.ID(2).Get(repo)
 	require.NoError(t, err)
 	assert.True(t, ok)
-	assert.EqualValues(t, "sha1", repo.ObjectFormatName)
+	assert.Equal(t, "sha1", repo.ObjectFormatName)
 
 	repo = new(Repository)
 	ok, err = x.ID(id).Get(repo)
 	require.NoError(t, err)
 	assert.True(t, ok)
-	assert.EqualValues(t, "sha256", repo.ObjectFormatName)
+	assert.Equal(t, "sha256", repo.ObjectFormatName)
 }
diff --git a/models/migrations/v1_22/v287.go b/models/migrations/v1_22/v287.go
index c8b1593286..5fd901f9de 100644
--- a/models/migrations/v1_22/v287.go
+++ b/models/migrations/v1_22/v287.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go
index 44e4991851..78be3b6ef2 100644
--- a/models/migrations/v1_22/v288.go
+++ b/models/migrations/v1_22/v288.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_22/v289.go b/models/migrations/v1_22/v289.go
index b9941aadd9..78689a4ffa 100644
--- a/models/migrations/v1_22/v289.go
+++ b/models/migrations/v1_22/v289.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go
index 594e417644..ebafab6567 100644
--- a/models/migrations/v1_22/v290.go
+++ b/models/migrations/v1_22/v290.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_22/v290_test.go b/models/migrations/v1_22/v290_test.go
index 569d77bc16..a1907cf4d6 100644
--- a/models/migrations/v1_22/v290_test.go
+++ b/models/migrations/v1_22/v290_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"strconv"
diff --git a/models/migrations/v1_22/v291.go b/models/migrations/v1_22/v291.go
index 74726fae96..823a644a95 100644
--- a/models/migrations/v1_22/v291.go
+++ b/models/migrations/v1_22/v291.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_22/v292.go b/models/migrations/v1_22/v292.go
index beca556aee..440f48ce80 100644
--- a/models/migrations/v1_22/v292.go
+++ b/models/migrations/v1_22/v292.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 // NOTE: noop the original migration has bug which some projects will be skip, so
 // these projects will have no default board.
diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go
index 9f38c3db56..e9c9746b26 100644
--- a/models/migrations/v1_22/v293.go
+++ b/models/migrations/v1_22/v293.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go
index 444146737d..6b1931b761 100644
--- a/models/migrations/v1_22/v293_test.go
+++ b/models/migrations/v1_22/v293_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"testing"
diff --git a/models/migrations/v1_22/v294.go b/models/migrations/v1_22/v294.go
index 314b4519f1..6c52372306 100644
--- a/models/migrations/v1_22/v294.go
+++ b/models/migrations/v1_22/v294.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go
index ef7b67ca5b..e87a4bc85f 100644
--- a/models/migrations/v1_22/v294_test.go
+++ b/models/migrations/v1_22/v294_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import (
 	"slices"
@@ -45,7 +45,8 @@ func Test_AddUniqueIndexForProjectIssue(t *testing.T) {
 	for _, index := range tables[0].Indexes {
 		if index.Type == schemas.UniqueType {
 			found = true
-			slices.Equal(index.Cols, []string{"project_id", "issue_id"})
+			slices.Sort(index.Cols)
+			assert.Equal(t, []string{"issue_id", "project_id"}, index.Cols)
 			break
 		}
 	}
diff --git a/models/migrations/v1_22/v295.go b/models/migrations/v1_22/v295.go
index 17bdadb4ad..319b1a399b 100644
--- a/models/migrations/v1_22/v295.go
+++ b/models/migrations/v1_22/v295.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_22/v296.go b/models/migrations/v1_22/v296.go
index 1ecacab95f..75350f9f65 100644
--- a/models/migrations/v1_22/v296.go
+++ b/models/migrations/v1_22/v296.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_22/v298.go b/models/migrations/v1_22/v298.go
index b9f3b95ade..7700173a00 100644
--- a/models/migrations/v1_22/v298.go
+++ b/models/migrations/v1_22/v298.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_22 //nolint
+package v1_22
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go
index 0fd90a4a67..5fb4fec999 100644
--- a/models/migrations/v1_23/main_test.go
+++ b/models/migrations/v1_23/main_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_23 //nolint
+package v1_23
 
 import (
 	"testing"
diff --git a/models/migrations/v1_23/v299.go b/models/migrations/v1_23/v299.go
index f6db960c3b..73ce19c875 100644
--- a/models/migrations/v1_23/v299.go
+++ b/models/migrations/v1_23/v299.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_23 //nolint
+package v1_23
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_23/v300.go b/models/migrations/v1_23/v300.go
index f1f1cccdbf..404d8dbea8 100644
--- a/models/migrations/v1_23/v300.go
+++ b/models/migrations/v1_23/v300.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_23 //nolint
+package v1_23
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_23/v301.go b/models/migrations/v1_23/v301.go
index b7797f6c6b..f2a4d8c559 100644
--- a/models/migrations/v1_23/v301.go
+++ b/models/migrations/v1_23/v301.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_23 //nolint
+package v1_23
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go
index c8ed786d63..1b056993bd 100644
--- a/models/migrations/v1_23/v302.go
+++ b/models/migrations/v1_23/v302.go
@@ -1,7 +1,7 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_23 //nolint
+package v1_23
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go
index fae0131bdd..03197d2857 100644
--- a/models/migrations/v1_23/v303.go
+++ b/models/migrations/v1_23/v303.go
@@ -1,7 +1,7 @@
 // Copyright 2025 The Forgejo Authors.
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package v1_23 //nolint
+package v1_23
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_23/v303_test.go b/models/migrations/v1_23/v303_test.go
index f105d11830..f2c764bae3 100644
--- a/models/migrations/v1_23/v303_test.go
+++ b/models/migrations/v1_23/v303_test.go
@@ -1,7 +1,7 @@
 // Copyright 2025 The Forgejo Authors.
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-package v1_23 //nolint
+package v1_23
 
 import (
 	"testing"
diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go
index ec6bd09bb5..eb669f57b6 100644
--- a/models/migrations/v1_6/v70.go
+++ b/models/migrations/v1_6/v70.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_6 //nolint
+package v1_6
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go
index 3706ad4406..42fe8cd1ba 100644
--- a/models/migrations/v1_6/v71.go
+++ b/models/migrations/v1_6/v71.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_6 //nolint
+package v1_6
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go
index 4df2a0f6e9..7cd2331376 100644
--- a/models/migrations/v1_6/v72.go
+++ b/models/migrations/v1_6/v72.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_6 //nolint
+package v1_6
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_7/v73.go b/models/migrations/v1_7/v73.go
index b5a748aae3..e0b7a28537 100644
--- a/models/migrations/v1_7/v73.go
+++ b/models/migrations/v1_7/v73.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_7 //nolint
+package v1_7
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_7/v74.go b/models/migrations/v1_7/v74.go
index f0567e3c9b..376be37a24 100644
--- a/models/migrations/v1_7/v74.go
+++ b/models/migrations/v1_7/v74.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_7 //nolint
+package v1_7
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_7/v75.go b/models/migrations/v1_7/v75.go
index fa7430970c..ef11575466 100644
--- a/models/migrations/v1_7/v75.go
+++ b/models/migrations/v1_7/v75.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_7 //nolint
+package v1_7
 
 import (
 	"xorm.io/builder"
diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go
index 61ad006a47..8d47280b41 100644
--- a/models/migrations/v1_8/v76.go
+++ b/models/migrations/v1_8/v76.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_8/v77.go b/models/migrations/v1_8/v77.go
index 8b19993924..4fe5ebe635 100644
--- a/models/migrations/v1_8/v77.go
+++ b/models/migrations/v1_8/v77.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go
index 8102b19335..840fc20d96 100644
--- a/models/migrations/v1_8/v78.go
+++ b/models/migrations/v1_8/v78.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import (
 	"forgejo.org/models/migrations/base"
diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go
index f7d2d68f96..c8e0db531f 100644
--- a/models/migrations/v1_8/v79.go
+++ b/models/migrations/v1_8/v79.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import (
 	"forgejo.org/modules/setting"
diff --git a/models/migrations/v1_8/v80.go b/models/migrations/v1_8/v80.go
index cebbbead28..6f9df47a93 100644
--- a/models/migrations/v1_8/v80.go
+++ b/models/migrations/v1_8/v80.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import "xorm.io/xorm"
 
diff --git a/models/migrations/v1_8/v81.go b/models/migrations/v1_8/v81.go
index 734fc24641..8152a47ad7 100644
--- a/models/migrations/v1_8/v81.go
+++ b/models/migrations/v1_8/v81.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_8 //nolint
+package v1_8
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go
index 78a90bdde9..235c73c504 100644
--- a/models/migrations/v1_9/v82.go
+++ b/models/migrations/v1_9/v82.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go
index fa24a92d28..9640564a44 100644
--- a/models/migrations/v1_9/v83.go
+++ b/models/migrations/v1_9/v83.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"forgejo.org/modules/timeutil"
diff --git a/models/migrations/v1_9/v84.go b/models/migrations/v1_9/v84.go
index c7155fe9cf..423915ae57 100644
--- a/models/migrations/v1_9/v84.go
+++ b/models/migrations/v1_9/v84.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go
index d8e9d91840..9d5adc82dd 100644
--- a/models/migrations/v1_9/v85.go
+++ b/models/migrations/v1_9/v85.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"fmt"
diff --git a/models/migrations/v1_9/v86.go b/models/migrations/v1_9/v86.go
index cf2725d158..9464ff0cf6 100644
--- a/models/migrations/v1_9/v86.go
+++ b/models/migrations/v1_9/v86.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"xorm.io/xorm"
diff --git a/models/migrations/v1_9/v87.go b/models/migrations/v1_9/v87.go
index fa01b6e5e3..81a4ebf80d 100644
--- a/models/migrations/v1_9/v87.go
+++ b/models/migrations/v1_9/v87.go
@@ -1,7 +1,7 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package v1_9 //nolint
+package v1_9
 
 import (
 	"xorm.io/xorm"
diff --git a/models/moderation/abuse_report.go b/models/moderation/abuse_report.go
new file mode 100644
index 0000000000..0bf8aab174
--- /dev/null
+++ b/models/moderation/abuse_report.go
@@ -0,0 +1,205 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"slices"
+	"time"
+
+	"forgejo.org/models/db"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/builder"
+)
+
+// ReportStatusType defines the statuses a report (of abusive content) can have.
+type ReportStatusType int
+
+const (
+	// ReportStatusTypeOpen represents the status of open reports that were not yet handled in any way.
+	ReportStatusTypeOpen ReportStatusType = iota + 1 // 1
+	// ReportStatusTypeHandled represents the status of valid reports, that have been acted upon.
+	ReportStatusTypeHandled // 2
+	// ReportStatusTypeIgnored represents the status of ignored reports, that were closed without any action.
+	ReportStatusTypeIgnored // 3
+)
+
+type (
+	// AbuseCategoryType defines the categories in which a user can include the reported content.
+	AbuseCategoryType int
+
+	// AbuseCategoryItem defines a pair of value and it's corresponding translation key
+	// (used to add options within the dropdown shown when new reports are submitted).
+	AbuseCategoryItem struct {
+		Value          AbuseCategoryType
+		TranslationKey string
+	}
+)
+
+const (
+	AbuseCategoryTypeOther          AbuseCategoryType = iota + 1 // 1 (Other violations of platform rules)
+	AbuseCategoryTypeSpam                                        // 2
+	AbuseCategoryTypeMalware                                     // 3
+	AbuseCategoryTypeIllegalContent                              // 4
+)
+
+var AbuseCategoriesTranslationKeys = map[AbuseCategoryType]string{
+	AbuseCategoryTypeSpam:           "moderation.abuse_category.spam",
+	AbuseCategoryTypeMalware:        "moderation.abuse_category.malware",
+	AbuseCategoryTypeIllegalContent: "moderation.abuse_category.illegal_content",
+	AbuseCategoryTypeOther:          "moderation.abuse_category.other_violations",
+}
+
+// GetAbuseCategoriesList returns a list of pairs with the available abuse category types
+// and their corresponding translation keys
+func GetAbuseCategoriesList() []AbuseCategoryItem {
+	return []AbuseCategoryItem{
+		{AbuseCategoryTypeSpam, AbuseCategoriesTranslationKeys[AbuseCategoryTypeSpam]},
+		{AbuseCategoryTypeMalware, AbuseCategoriesTranslationKeys[AbuseCategoryTypeMalware]},
+		{AbuseCategoryTypeIllegalContent, AbuseCategoriesTranslationKeys[AbuseCategoryTypeIllegalContent]},
+		{AbuseCategoryTypeOther, AbuseCategoriesTranslationKeys[AbuseCategoryTypeOther]},
+	}
+}
+
+// ReportedContentType defines the types of content that can be reported
+// (i.e. user/organization profile, repository, issue/pull, comment).
+type ReportedContentType int
+
+const (
+	// ReportedContentTypeUser should be used when reporting abusive users or organizations.
+	ReportedContentTypeUser ReportedContentType = iota + 1 // 1
+
+	// ReportedContentTypeRepository should be used when reporting a repository with abusive content.
+	ReportedContentTypeRepository // 2
+
+	// ReportedContentTypeIssue should be used when reporting an issue or pull request with abusive content.
+	ReportedContentTypeIssue // 3
+
+	// ReportedContentTypeComment should be used when reporting a comment with abusive content.
+	ReportedContentTypeComment // 4
+)
+
+var allReportedContentTypes = []ReportedContentType{
+	ReportedContentTypeUser,
+	ReportedContentTypeRepository,
+	ReportedContentTypeIssue,
+	ReportedContentTypeComment,
+}
+
+func (t ReportedContentType) IsValid() bool {
+	return slices.Contains(allReportedContentTypes, t)
+}
+
+// AbuseReport represents a report of abusive content.
+type AbuseReport struct {
+	ID     int64            `xorm:"pk autoincr"`
+	Status ReportStatusType `xorm:"INDEX NOT NULL DEFAULT 1"`
+	// The ID of the user who submitted the report.
+	ReporterID int64 `xorm:"NOT NULL"`
+	// Reported content type: user/organization profile, repository, issue/pull or comment.
+	ContentType ReportedContentType `xorm:"INDEX NOT NULL"`
+	// The ID of the reported item (based on ContentType: user, repository, issue or comment).
+	ContentID int64 `xorm:"NOT NULL"`
+	// The abuse category selected by the reporter.
+	Category AbuseCategoryType `xorm:"INDEX NOT NULL"`
+	// Remarks provided by the reporter.
+	Remarks string `xorm:"VARCHAR(500)"`
+	// The ID of the corresponding shadow-copied content when exists; otherwise null.
+	ShadowCopyID sql.NullInt64      `xorm:"DEFAULT NULL"`
+	CreatedUnix  timeutil.TimeStamp `xorm:"created NOT NULL"`
+	ResolvedUnix timeutil.TimeStamp `xorm:"DEFAULT NULL"`
+}
+
+var ErrSelfReporting = errors.New("reporting yourself is not allowed")
+
+func init() {
+	// RegisterModel will create the table if does not already exist
+	// or any missing columns if the table was previously created.
+	// It will not drop or rename existing columns (when struct has changed).
+	db.RegisterModel(new(AbuseReport))
+}
+
+// IsShadowCopyNeeded reports whether one or more reports were already submitted
+// for contentType and contentID and not yet linked to a shadow copy (regardless their status).
+func IsShadowCopyNeeded(ctx context.Context, contentType ReportedContentType, contentID int64) (bool, error) {
+	return db.GetEngine(ctx).Cols("id").Where(builder.IsNull{"shadow_copy_id"}).Exist(
+		&AbuseReport{ContentType: contentType, ContentID: contentID},
+	)
+}
+
+// AlreadyReportedByAndOpen returns if doerID has already submitted a report for contentType and contentID that is still Open.
+func AlreadyReportedByAndOpen(ctx context.Context, doerID int64, contentType ReportedContentType, contentID int64) bool {
+	reported, _ := db.GetEngine(ctx).Exist(&AbuseReport{
+		Status:      ReportStatusTypeOpen,
+		ReporterID:  doerID,
+		ContentType: contentType,
+		ContentID:   contentID,
+	})
+	return reported
+}
+
+// ReportAbuse creates a new abuse report in the DB with 'Open' status.
+// If the reported content is the user profile of the reporter ErrSelfReporting is returned.
+// If there is already an open report submitted by the same user for the same content,
+// the request will be ignored without returning an error (and a warning will be logged).
+func ReportAbuse(ctx context.Context, report *AbuseReport) error {
+	if report.ContentType == ReportedContentTypeUser && report.ReporterID == report.ContentID {
+		return ErrSelfReporting
+	}
+
+	if AlreadyReportedByAndOpen(ctx, report.ReporterID, report.ContentType, report.ContentID) {
+		log.Warn("Seems that user %d wanted to report again the content with type %d and ID %d; this request will be ignored.", report.ReporterID, report.ContentType, report.ContentID)
+		return nil
+	}
+
+	report.Status = ReportStatusTypeOpen
+	_, err := db.GetEngine(ctx).Insert(report)
+
+	return err
+}
+
+// GetResolvedReports gets all resolved reports
+func GetResolvedReports(ctx context.Context, keepReportsFor time.Duration) ([]*AbuseReport, error) {
+	cond := builder.And(
+		builder.Or(
+			builder.Eq{"`status`": ReportStatusTypeHandled},
+			builder.Eq{"`status`": ReportStatusTypeIgnored},
+		),
+	)
+
+	if keepReportsFor > 0 {
+		cond = cond.And(builder.Lt{"resolved_unix": time.Now().Add(-keepReportsFor).Unix()})
+	}
+
+	abuseReports := make([]*AbuseReport, 0, 30)
+	return abuseReports, db.GetEngine(ctx).
+		Where(cond).
+		Find(&abuseReports)
+}
+
+/*
+// MarkAsHandled will change the status to 'Handled' for all reports linked to the same item (user, repository, issue or comment).
+func MarkAsHandled(ctx context.Context, contentType ReportedContentType, contentID int64) error {
+	return updateStatus(ctx, contentType, contentID, ReportStatusTypeHandled)
+}
+
+// MarkAsIgnored will change the status to 'Ignored' for all reports linked to the same item (user, repository, issue or comment).
+func MarkAsIgnored(ctx context.Context, contentType ReportedContentType, contentID int64) error {
+	return updateStatus(ctx, contentType, contentID, ReportStatusTypeIgnored)
+}
+
+// updateStatus will set the provided status for any reports linked to the item with the given type and ID.
+func updateStatus(ctx context.Context, contentType ReportedContentType, contentID int64, status ReportStatusType) error {
+	_, err := db.GetEngine(ctx).Where(builder.Eq{
+		"content_type": contentType,
+		"content_id":   contentID,
+	}).Cols("status").Update(&AbuseReport{Status: status})
+
+	return err
+}
+*/
diff --git a/models/moderation/abuse_report_detailed.go b/models/moderation/abuse_report_detailed.go
new file mode 100644
index 0000000000..265d143709
--- /dev/null
+++ b/models/moderation/abuse_report_detailed.go
@@ -0,0 +1,135 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"forgejo.org/models/db"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/builder"
+)
+
+type AbuseReportDetailed struct {
+	AbuseReport        `xorm:"extends"`
+	ReportedTimes      int // only for overview
+	ReporterName       string
+	ContentReference   string
+	ShadowCopyDate     timeutil.TimeStamp // only for details
+	ShadowCopyRawValue string             // only for details
+}
+
+func (ard AbuseReportDetailed) ContentTypeIconName() string {
+	switch ard.ContentType {
+	case ReportedContentTypeUser:
+		return "octicon-person"
+	case ReportedContentTypeRepository:
+		return "octicon-repo"
+	case ReportedContentTypeIssue:
+		return "octicon-issue-opened"
+	case ReportedContentTypeComment:
+		return "octicon-comment"
+	default:
+		return "octicon-question"
+	}
+}
+
+func (ard AbuseReportDetailed) ContentURL() string {
+	switch ard.ContentType {
+	case ReportedContentTypeUser:
+		return strings.TrimLeft(ard.ContentReference, "@")
+	case ReportedContentTypeIssue:
+		return strings.ReplaceAll(ard.ContentReference, "#", "/issues/")
+	default:
+		return ard.ContentReference
+	}
+}
+
+func GetOpenReports(ctx context.Context) ([]*AbuseReportDetailed, error) {
+	var reports []*AbuseReportDetailed
+
+	// - For PostgreSQL user table name should be escaped.
+	//   - Escaping can be done with double quotes (") but this doesn't work for MariaDB.
+	// - For SQLite index column name should be escaped.
+	//   - Escaping can be done with double quotes (") or backticks (`).
+	// - For MariaDB/MySQL there is no need to escape the above.
+	// - Therefore we will use double quotes (") but only for PostgreSQL and SQLite.
+	identifierEscapeChar := ``
+	if setting.Database.Type.IsPostgreSQL() || setting.Database.Type.IsSQLite3() {
+		identifierEscapeChar = `"`
+	}
+
+	err := db.GetEngine(ctx).SQL(fmt.Sprintf(`SELECT AR.*, ARD.reported_times, U.name AS reporter_name, REFS.ref AS content_reference
+		FROM abuse_report AR
+		INNER JOIN (
+			SELECT min(id) AS id, count(id) AS reported_times
+			FROM abuse_report
+			WHERE status = %[2]d
+			GROUP BY content_type, content_id
+		) ARD ON ARD.id = AR.id
+		LEFT JOIN %[1]suser%[1]s U ON U.id = AR.reporter_id
+		LEFT JOIN (
+			SELECT %[3]d AS type, id, concat('@', name) AS "ref"
+			FROM %[1]suser%[1]s WHERE id IN (
+				SELECT content_id FROM abuse_report WHERE status = %[2]d AND content_type = %[3]d
+			)
+			UNION
+			SELECT %[4]d AS "type", id, concat(owner_name, '/', name) AS "ref"
+			FROM repository WHERE id IN (
+				SELECT content_id FROM abuse_report WHERE status = %[2]d AND content_type = %[4]d
+			)
+			UNION
+			SELECT %[5]d AS "type", I.id, concat(IR.owner_name, '/', IR.name, '#', I.%[1]sindex%[1]s) AS "ref"
+			FROM issue I
+			LEFT JOIN repository IR ON IR.id = I.repo_id
+			WHERE I.id IN (
+				SELECT content_id FROM abuse_report WHERE status = %[2]d AND content_type = %[5]d
+			)
+			UNION
+			SELECT %[6]d AS "type", C.id, concat(CIR.owner_name, '/', CIR.name, '/issues/', CI.%[1]sindex%[1]s, '#issuecomment-', C.id) AS "ref"
+			FROM comment C
+			LEFT JOIN issue CI ON CI.id = C.issue_id
+			LEFT JOIN repository CIR ON CIR.id = CI.repo_id
+			WHERE C.id IN (
+				SELECT content_id FROM abuse_report WHERE status = %[2]d AND content_type = %[6]d
+			)
+		) REFS ON REFS.type = AR.content_type AND REFS.id = AR.content_id
+		ORDER BY AR.created_unix ASC`, identifierEscapeChar, ReportStatusTypeOpen,
+		ReportedContentTypeUser, ReportedContentTypeRepository, ReportedContentTypeIssue, ReportedContentTypeComment)).
+		Find(&reports)
+	if err != nil {
+		return nil, err
+	}
+	return reports, nil
+}
+
+func GetOpenReportsByTypeAndContentID(ctx context.Context, contentType ReportedContentType, contentID int64) ([]*AbuseReportDetailed, error) {
+	var reports []*AbuseReportDetailed
+
+	// Some remarks concerning PostgreSQL:
+	// - user table should be escaped (e.g. `user`);
+	// - tried to use aliases for table names but errors like 'invalid reference to FROM-clause entry'
+	//   or 'missing FROM-clause entry' were returned;
+	err := db.GetEngine(ctx).
+		Select("abuse_report.*, `user`.name AS reporter_name, abuse_report_shadow_copy.created_unix AS shadow_copy_date, abuse_report_shadow_copy.raw_value AS shadow_copy_raw_value").
+		Table("abuse_report").
+		Join("LEFT", "user", "`user`.id = abuse_report.reporter_id").
+		Join("LEFT", "abuse_report_shadow_copy", "abuse_report_shadow_copy.id = abuse_report.shadow_copy_id").
+		Where(builder.Eq{
+			"content_type": contentType,
+			"content_id":   contentID,
+			"status":       ReportStatusTypeOpen,
+		}).
+		Asc("abuse_report.created_unix").
+		Find(&reports)
+	if err != nil {
+		return nil, err
+	}
+
+	return reports, nil
+}
diff --git a/models/moderation/shadow_copy.go b/models/moderation/shadow_copy.go
new file mode 100644
index 0000000000..8abb32e8ec
--- /dev/null
+++ b/models/moderation/shadow_copy.go
@@ -0,0 +1,92 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+
+	"forgejo.org/models/db"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/builder"
+)
+
+type AbuseReportShadowCopy struct {
+	ID          int64              `xorm:"pk autoincr"`
+	RawValue    string             `xorm:"LONGTEXT NOT NULL"` // A JSON with relevant fields from user, repository, issue or comment table.
+	CreatedUnix timeutil.TimeStamp `xorm:"created NOT NULL"`
+}
+
+// Returns the ID encapsulated in a sql.NullInt64 struct.
+func (sc AbuseReportShadowCopy) NullableID() sql.NullInt64 {
+	return sql.NullInt64{Int64: sc.ID, Valid: sc.ID > 0}
+}
+
+// ShadowCopyField defines a pair of a value stored within the shadow copy
+// (of some content reported as abusive) and a corresponding key (caption).
+// A list of such pairs is used when rendering shadow copies for admins reviewing abuse reports.
+type ShadowCopyField struct {
+	Key   string
+	Value string
+}
+
+// ShadowCopyData interface should be implemented by the type structs used for marshaling/unmarshaling the fields
+// preserved as shadow copies for abusive content reports (i.e. UserData, RepositoryData, IssueData, CommentData).
+type ShadowCopyData interface {
+	// GetFieldsMap returns a list of <key, value> pairs with the fields stored within shadow copies
+	// of content reported as abusive, to be used when rendering a shadow copy in the admin UI.
+	GetFieldsMap() []ShadowCopyField
+}
+
+func init() {
+	// RegisterModel will create the table if does not already exist
+	// or any missing columns if the table was previously created.
+	// It will not drop or rename existing columns (when struct has changed).
+	db.RegisterModel(new(AbuseReportShadowCopy))
+}
+
+func CreateShadowCopyForUser(ctx context.Context, userID int64, content string) error {
+	return createShadowCopy(ctx, ReportedContentTypeUser, userID, content)
+}
+
+func CreateShadowCopyForRepository(ctx context.Context, repoID int64, content string) error {
+	return createShadowCopy(ctx, ReportedContentTypeRepository, repoID, content)
+}
+
+func CreateShadowCopyForIssue(ctx context.Context, issueID int64, content string) error {
+	return createShadowCopy(ctx, ReportedContentTypeIssue, issueID, content)
+}
+
+func CreateShadowCopyForComment(ctx context.Context, commentID int64, content string) error {
+	return createShadowCopy(ctx, ReportedContentTypeComment, commentID, content)
+}
+
+func createShadowCopy(ctx context.Context, contentType ReportedContentType, contentID int64, content string) error {
+	err := db.WithTx(ctx, func(ctx context.Context) error {
+		sess := db.GetEngine(ctx)
+
+		shadowCopy := &AbuseReportShadowCopy{RawValue: content}
+		affected, err := sess.Insert(shadowCopy)
+		if err != nil {
+			return err
+		} else if affected == 0 {
+			log.Warn("Something went wrong while trying to create the shadow copy for reported content with type %d and ID %d.", contentType, contentID)
+		}
+
+		_, err = sess.Where(builder.Eq{
+			"content_type": contentType,
+			"content_id":   contentID,
+		}).And(builder.IsNull{"shadow_copy_id"}).Update(&AbuseReport{ShadowCopyID: shadowCopy.NullableID()})
+		if err != nil {
+			return fmt.Errorf("could not link the shadow copy (%d) to reported content with type %d and ID %d - %w", shadowCopy.ID, contentType, contentID, err)
+		}
+
+		return nil
+	})
+
+	return err
+}
diff --git a/models/org_team_test.go b/models/org_team_test.go
index dc1fdb4b3b..730bc65f7d 100644
--- a/models/org_team_test.go
+++ b/models/org_team_test.go
@@ -82,7 +82,7 @@ func TestUpdateTeam(t *testing.T) {
 	assert.True(t, strings.HasPrefix(team.Description, "A long description!"))
 
 	access := unittest.AssertExistsAndLoadBean(t, &access_model.Access{UserID: 4, RepoID: 3})
-	assert.EqualValues(t, perm.AccessModeAdmin, access.Mode)
+	assert.Equal(t, perm.AccessModeAdmin, access.Mode)
 
 	unittest.CheckConsistencyFor(t, &organization.Team{ID: team.ID})
 }
diff --git a/models/org_test.go b/models/org_test.go
index 45e21da0e0..4c87f1ee4a 100644
--- a/models/org_test.go
+++ b/models/org_test.go
@@ -49,7 +49,7 @@ func TestRemoveOrgUser(t *testing.T) {
 		require.NoError(t, RemoveOrgUser(db.DefaultContext, orgID, userID))
 		unittest.AssertNotExistsBean(t, &organization.OrgUser{OrgID: orgID, UID: userID})
 		org = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: orgID})
-		assert.EqualValues(t, expectedNumMembers, org.NumMembers)
+		assert.Equal(t, expectedNumMembers, org.NumMembers)
 	}
 	testSuccess(3, 4)
 	testSuccess(3, 4)
diff --git a/models/organization/TestFindOrgs/org_user.yml b/models/organization/TestFindOrgs/org_user.yml
new file mode 100644
index 0000000000..79b6fc613e
--- /dev/null
+++ b/models/organization/TestFindOrgs/org_user.yml
@@ -0,0 +1,5 @@
+-
+  id: 1000
+  uid: 4
+  org_id: 22
+  is_public: true
diff --git a/models/organization/org.go b/models/organization/org.go
index 1339f7415d..c4df5d4fe1 100644
--- a/models/organization/org.go
+++ b/models/organization/org.go
@@ -186,6 +186,11 @@ func (org *Organization) CanCreateRepo() bool {
 	return org.AsUser().CanCreateRepo()
 }
 
+// IsGhost returns if the organization is a ghost
+func (org *Organization) IsGhost() bool {
+	return org.AsUser().IsGhost()
+}
+
 // FindOrgMembersOpts represensts find org members conditions
 type FindOrgMembersOpts struct {
 	db.ListOptions
@@ -195,7 +200,7 @@ type FindOrgMembersOpts struct {
 }
 
 func (opts FindOrgMembersOpts) PublicOnly() bool {
-	return opts.Doer == nil || !(opts.IsDoerMember || opts.Doer.IsAdmin)
+	return opts.Doer == nil || (!opts.IsDoerMember && !opts.Doer.IsAdmin)
 }
 
 // CountOrgMembers counts the organization's members
@@ -289,12 +294,8 @@ func CreateOrganization(ctx context.Context, org *Organization, owner *user_mode
 	}
 
 	org.LowerName = strings.ToLower(org.Name)
-	if org.Rands, err = user_model.GetUserSalt(); err != nil {
-		return err
-	}
-	if org.Salt, err = user_model.GetUserSalt(); err != nil {
-		return err
-	}
+	org.Rands = user_model.GetUserSalt()
+	org.Salt = user_model.GetUserSalt()
 	org.UseCustomAvatar = true
 	org.MaxRepoCreation = -1
 	org.NumTeams = 1
@@ -478,7 +479,7 @@ func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUs
 		sess.And("is_public = ?", true)
 	}
 
-	if opts.ListOptions.PageSize > 0 {
+	if opts.PageSize > 0 {
 		sess = db.SetSessionPagination(sess, opts)
 
 		ous := make([]*OrgUser, 0, opts.PageSize)
diff --git a/models/organization/org_list.go b/models/organization/org_list.go
index 4bca3cdb99..371993cdee 100644
--- a/models/organization/org_list.go
+++ b/models/organization/org_list.go
@@ -26,6 +26,7 @@ type SearchOrganizationsOptions struct {
 type FindOrgOptions struct {
 	db.ListOptions
 	UserID         int64
+	IncludeLimited bool
 	IncludePrivate bool
 }
 
@@ -43,7 +44,11 @@ func (opts FindOrgOptions) ToConds() builder.Cond {
 		cond = cond.And(builder.In("`user`.`id`", queryUserOrgIDs(opts.UserID, opts.IncludePrivate)))
 	}
 	if !opts.IncludePrivate {
-		cond = cond.And(builder.Eq{"`user`.visibility": structs.VisibleTypePublic})
+		if !opts.IncludeLimited {
+			cond = cond.And(builder.Eq{"`user`.visibility": structs.VisibleTypePublic})
+		} else {
+			cond = cond.And(builder.In("`user`.visibility", structs.VisibleTypePublic, structs.VisibleTypeLimited))
+		}
 	}
 	return cond
 }
@@ -66,11 +71,8 @@ func GetOrgsCanCreateRepoByUserID(ctx context.Context, userID int64) ([]*Organiz
 		Find(&orgs)
 }
 
-// MinimalOrg represents a simple organization with only the needed columns
-type MinimalOrg = Organization
-
 // GetUserOrgsList returns all organizations the given user has access to
-func GetUserOrgsList(ctx context.Context, user *user_model.User) ([]*MinimalOrg, error) {
+func GetUserOrgsList(ctx context.Context, user *user_model.User) ([]*Organization, error) {
 	schema, err := db.TableInfo(new(user_model.User))
 	if err != nil {
 		return nil, err
@@ -95,7 +97,7 @@ func GetUserOrgsList(ctx context.Context, user *user_model.User) ([]*MinimalOrg,
 	}
 	columnsStr := selectColumns.String()
 
-	var orgs []*MinimalOrg
+	var orgs []*Organization
 	if err := db.GetEngine(ctx).Select(columnsStr).
 		Table("user").
 		Where(builder.In("`user`.`id`", queryUserOrgIDs(user.ID, true))).
@@ -133,6 +135,7 @@ func GetUserOrgsList(ctx context.Context, user *user_model.User) ([]*MinimalOrg,
 
 	for _, org := range orgs {
 		org.NumRepos = orgCountMap[org.ID]
+		org.Type = user_model.UserTypeOrganization
 	}
 
 	return orgs, nil
diff --git a/models/organization/org_list_test.go b/models/organization/org_list_test.go
index 0e27feee59..6e8c0bac26 100644
--- a/models/organization/org_list_test.go
+++ b/models/organization/org_list_test.go
@@ -27,6 +27,7 @@ func TestCountOrganizations(t *testing.T) {
 }
 
 func TestFindOrgs(t *testing.T) {
+	defer unittest.OverrideFixtures("models/organization/TestFindOrgs")()
 	require.NoError(t, unittest.PrepareTestDatabase())
 
 	orgs, err := db.Find[organization.Organization](db.DefaultContext, organization.FindOrgOptions{
@@ -34,8 +35,14 @@ func TestFindOrgs(t *testing.T) {
 		IncludePrivate: true,
 	})
 	require.NoError(t, err)
-	if assert.Len(t, orgs, 1) {
-		assert.EqualValues(t, 3, orgs[0].ID)
+	if assert.Len(t, orgs, 2) {
+		if orgs[0].ID == 22 {
+			assert.EqualValues(t, 22, orgs[0].ID)
+			assert.EqualValues(t, 3, orgs[1].ID)
+		} else {
+			assert.EqualValues(t, 3, orgs[0].ID)
+			assert.EqualValues(t, 22, orgs[1].ID)
+		}
 	}
 
 	orgs, err = db.Find[organization.Organization](db.DefaultContext, organization.FindOrgOptions{
@@ -50,6 +57,14 @@ func TestFindOrgs(t *testing.T) {
 		IncludePrivate: true,
 	})
 	require.NoError(t, err)
+	assert.EqualValues(t, 2, total)
+
+	total, err = db.Count[organization.Organization](db.DefaultContext, organization.FindOrgOptions{
+		UserID:         4,
+		IncludePrivate: false,
+		IncludeLimited: true,
+	})
+	require.NoError(t, err)
 	assert.EqualValues(t, 1, total)
 }
 
@@ -70,11 +85,11 @@ func TestGetUserOrgsList(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 	orgs, err := organization.GetUserOrgsList(db.DefaultContext, &user_model.User{ID: 4})
 	require.NoError(t, err)
-	if assert.Len(t, orgs, 1) {
-		assert.EqualValues(t, 3, orgs[0].ID)
-		// repo_id: 3 is in the team, 32 is public, 5 is private with no team
-		assert.EqualValues(t, 2, orgs[0].NumRepos)
-	}
+	assert.Len(t, orgs, 1)
+	assert.EqualValues(t, 3, orgs[0].ID)
+	// repo_id: 3 is in the team, 32 is public, 5 is private with no team
+	assert.Equal(t, 2, orgs[0].NumRepos)
+	assert.Equal(t, user_model.UserTypeOrganization, orgs[0].Type)
 }
 
 func TestGetUserOrgsListSorting(t *testing.T) {
@@ -82,7 +97,7 @@ func TestGetUserOrgsListSorting(t *testing.T) {
 	orgs, err := organization.GetUserOrgsList(db.DefaultContext, &user_model.User{ID: 1})
 	require.NoError(t, err)
 
-	isSorted := slices.IsSortedFunc(orgs, func(a, b *organization.MinimalOrg) int {
+	isSorted := slices.IsSortedFunc(orgs, func(a, b *organization.Organization) int {
 		return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
 	})
 
diff --git a/models/organization/org_test.go b/models/organization/org_test.go
index 212b893a42..0d564f7258 100644
--- a/models/organization/org_test.go
+++ b/models/organization/org_test.go
@@ -136,7 +136,7 @@ func TestIsOrganizationOwner(t *testing.T) {
 	test := func(orgID, userID int64, expected bool) {
 		isOwner, err := organization.IsOrganizationOwner(db.DefaultContext, orgID, userID)
 		require.NoError(t, err)
-		assert.EqualValues(t, expected, isOwner)
+		assert.Equal(t, expected, isOwner)
 	}
 	test(3, 2, true)
 	test(3, 3, false)
@@ -150,7 +150,7 @@ func TestIsOrganizationMember(t *testing.T) {
 	test := func(orgID, userID int64, expected bool) {
 		isMember, err := organization.IsOrganizationMember(db.DefaultContext, orgID, userID)
 		require.NoError(t, err)
-		assert.EqualValues(t, expected, isMember)
+		assert.Equal(t, expected, isMember)
 	}
 	test(3, 2, true)
 	test(3, 3, false)
@@ -165,7 +165,7 @@ func TestIsPublicMembership(t *testing.T) {
 	test := func(orgID, userID int64, expected bool) {
 		isMember, err := organization.IsPublicMembership(db.DefaultContext, orgID, userID)
 		require.NoError(t, err)
-		assert.EqualValues(t, expected, isMember)
+		assert.Equal(t, expected, isMember)
 	}
 	test(3, 2, true)
 	test(3, 3, false)
@@ -188,7 +188,7 @@ func TestGetOrgUsersByOrgID(t *testing.T) {
 	sort.Slice(orgUsers, func(i, j int) bool {
 		return orgUsers[i].ID < orgUsers[j].ID
 	})
-	assert.EqualValues(t, []*organization.OrgUser{{
+	assert.Equal(t, []*organization.OrgUser{{
 		ID:       1,
 		OrgID:    3,
 		UID:      2,
@@ -255,7 +255,7 @@ func TestAccessibleReposEnv_CountRepos(t *testing.T) {
 		require.NoError(t, err)
 		count, err := env.CountRepos()
 		require.NoError(t, err)
-		assert.EqualValues(t, expectedCount, count)
+		assert.Equal(t, expectedCount, count)
 	}
 	testSuccess(2, 3)
 	testSuccess(4, 2)
@@ -494,25 +494,25 @@ func TestUnitPermission(t *testing.T) {
 	user := &user_model.User{ID: 1001}
 	t.Run("Anonymous", func(t *testing.T) {
 		t.Run("Public", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeRead, publicOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeRead, publicOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
 		})
 		t.Run("Limited", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeNone, limitedOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeNone, limitedOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
 		})
 		t.Run("Private", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeNone, privateOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeNone, privateOrg.UnitPermission(db.DefaultContext, nil, unit.TypeCode))
 		})
 	})
 
 	t.Run("Logged in", func(t *testing.T) {
 		t.Run("Public", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeRead, publicOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeRead, publicOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
 		})
 		t.Run("Limited", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeRead, limitedOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeRead, limitedOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
 		})
 		t.Run("Private", func(t *testing.T) {
-			assert.EqualValues(t, perm.AccessModeNone, privateOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
+			assert.Equal(t, perm.AccessModeNone, privateOrg.UnitPermission(db.DefaultContext, user, unit.TypeCode))
 		})
 	})
 }
diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go
index 3f6799e8a1..a1472fde4b 100644
--- a/models/organization/org_user_test.go
+++ b/models/organization/org_user_test.go
@@ -140,7 +140,7 @@ func TestAddOrgUser(t *testing.T) {
 		unittest.AssertExistsAndLoadBean(t, ou)
 		assert.Equal(t, isPublic, ou.IsPublic)
 		org = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: orgID})
-		assert.EqualValues(t, expectedNumMembers, org.NumMembers)
+		assert.Equal(t, expectedNumMembers, org.NumMembers)
 	}
 
 	setting.Service.DefaultOrgMemberVisible = false
diff --git a/models/organization/team.go b/models/organization/team.go
index 450082077f..209471e013 100644
--- a/models/organization/team.go
+++ b/models/organization/team.go
@@ -1,5 +1,6 @@
-// Copyright 2018 The Gitea Authors. All rights reserved.
 // Copyright 2016 The Gogs Authors. All rights reserved.
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package organization
@@ -7,6 +8,7 @@ package organization
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"strings"
 
 	"forgejo.org/models/db"
@@ -20,13 +22,6 @@ import (
 	"xorm.io/builder"
 )
 
-// ___________
-// \__    ___/___ _____    _____
-//   |    |_/ __ \\__  \  /     \
-//   |    |\  ___/ / __ \|  Y Y  \
-//   |____| \___  >____  /__|_|  /
-//              \/     \/      \/
-
 // ErrTeamAlreadyExist represents a "TeamAlreadyExist" kind of error.
 type ErrTeamAlreadyExist struct {
 	OrgID int64
@@ -193,6 +188,27 @@ func (t *Team) UnitAccessMode(ctx context.Context, tp unit.Type) perm.AccessMode
 	return perm.AccessModeNone
 }
 
+// GetOrg returns the team's organization
+func (t *Team) GetOrg(ctx context.Context) *Organization {
+	org, err := GetOrgByID(ctx, t.OrgID)
+	if err != nil {
+		return OrgFromUser(user_model.NewGhostUser())
+	}
+	return org
+}
+
+// Link returns the team's page link
+func (t *Team) Link(ctx context.Context) string {
+	if t.IsGhost() {
+		return ""
+	}
+	org := t.GetOrg(ctx)
+	if org.IsGhost() {
+		return ""
+	}
+	return org.OrganisationLink() + "/teams/" + url.PathEscape(t.Name)
+}
+
 // IsUsableTeamName tests if a name could be as team name
 func IsUsableTeamName(name string) error {
 	switch name {
@@ -292,3 +308,23 @@ func FixInconsistentOwnerTeams(ctx context.Context) (int64, error) {
 
 	return int64(len(teamIDs)), nil
 }
+
+const (
+	GhostTeamID        = -1
+	GhostTeamName      = "Ghost team"
+	GhostTeamLowerName = "ghost team"
+)
+
+// NewGhostTeam creates ghost team (for deleted team)
+func NewGhostTeam() *Team {
+	return &Team{
+		ID:        GhostTeamID,
+		Name:      GhostTeamName,
+		LowerName: GhostTeamLowerName,
+	}
+}
+
+// IsGhost returns if a team is a ghost team
+func (t *Team) IsGhost() bool {
+	return t.ID == GhostTeamID
+}
diff --git a/models/organization/team_test.go b/models/organization/team_test.go
index 1be96b6a01..768ccdf5be 100644
--- a/models/organization/team_test.go
+++ b/models/organization/team_test.go
@@ -1,4 +1,5 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package organization_test
@@ -15,14 +16,33 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestTeam_IsOwnerTeam(t *testing.T) {
+func TestTeam(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 
-	team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 1})
-	assert.True(t, team.IsOwnerTeam())
+	owners := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 1})
+	assert.Equal(t, int64(3), owners.GetOrg(db.DefaultContext).ID)
+	assert.Equal(t, "/org/org3/teams/Owners", owners.Link(db.DefaultContext))
+	assert.False(t, owners.IsGhost())
+	assert.True(t, owners.IsOwnerTeam())
 
-	team = unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 2})
-	assert.False(t, team.IsOwnerTeam())
+	team1 := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: 2})
+	assert.Equal(t, int64(3), team1.GetOrg(db.DefaultContext).ID)
+	assert.Equal(t, "/org/org3/teams/team1", team1.Link(db.DefaultContext))
+	assert.False(t, team1.IsGhost())
+	assert.False(t, team1.IsOwnerTeam())
+
+	ghost := organization.NewGhostTeam()
+	assert.Equal(t, int64(-1), ghost.ID)
+	assert.Equal(t, int64(-1), ghost.GetOrg(db.DefaultContext).ID)
+	assert.Empty(t, ghost.Link(db.DefaultContext))
+	assert.True(t, ghost.IsGhost())
+	assert.False(t, ghost.IsOwnerTeam())
+
+	ghosted := organization.Team{ID: 10, Name: "Ghosted"}
+	assert.Equal(t, int64(-1), ghosted.GetOrg(db.DefaultContext).ID)
+	assert.Empty(t, ghosted.Link(db.DefaultContext))
+	assert.False(t, ghosted.IsGhost())
+	assert.False(t, ghosted.IsOwnerTeam())
 }
 
 func TestTeam_IsMember(t *testing.T) {
@@ -75,7 +95,7 @@ func TestGetTeam(t *testing.T) {
 	testSuccess := func(orgID int64, name string) {
 		team, err := organization.GetTeam(db.DefaultContext, orgID, name)
 		require.NoError(t, err)
-		assert.EqualValues(t, orgID, team.OrgID)
+		assert.Equal(t, orgID, team.OrgID)
 		assert.Equal(t, name, team.Name)
 	}
 	testSuccess(3, "Owners")
@@ -93,7 +113,7 @@ func TestGetTeamByID(t *testing.T) {
 	testSuccess := func(teamID int64) {
 		team, err := organization.GetTeamByID(db.DefaultContext, teamID)
 		require.NoError(t, err)
-		assert.EqualValues(t, teamID, team.ID)
+		assert.Equal(t, teamID, team.ID)
 	}
 	testSuccess(1)
 	testSuccess(2)
@@ -161,7 +181,7 @@ func TestGetUserOrgTeams(t *testing.T) {
 		teams, err := organization.GetUserOrgTeams(db.DefaultContext, orgID, userID)
 		require.NoError(t, err)
 		for _, team := range teams {
-			assert.EqualValues(t, orgID, team.OrgID)
+			assert.Equal(t, orgID, team.OrgID)
 			unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{TeamID: team.ID, UID: userID})
 		}
 	}
diff --git a/models/packages/package.go b/models/packages/package.go
index 3b01d0b1ea..c06dcf5eb3 100644
--- a/models/packages/package.go
+++ b/models/packages/package.go
@@ -125,7 +125,7 @@ func (pt Type) Name() string {
 	case TypeRpm:
 		return "RPM"
 	case TypeAlt:
-		return "Alt"
+		return "ALT"
 	case TypeRubyGems:
 		return "RubyGems"
 	case TypeSwift:
@@ -201,6 +201,15 @@ type Package struct {
 	IsInternal       bool   `xorm:"NOT NULL DEFAULT false"`
 }
 
+func ResolvePackageName(name string, t Type) string {
+	switch t {
+	case TypeMaven:
+		return name
+	default:
+		return strings.ToLower(name)
+	}
+}
+
 // TryInsertPackage inserts a package. If a package exists already, ErrDuplicatePackage is returned
 func TryInsertPackage(ctx context.Context, p *Package) (*Package, error) {
 	e := db.GetEngine(ctx)
@@ -272,7 +281,7 @@ func GetPackageByName(ctx context.Context, ownerID int64, packageType Type, name
 	var cond builder.Cond = builder.Eq{
 		"package.owner_id":    ownerID,
 		"package.type":        packageType,
-		"package.lower_name":  strings.ToLower(name),
+		"package.lower_name":  ResolvePackageName(name, packageType),
 		"package.is_internal": false,
 	}
 
diff --git a/models/packages/package_blob_test.go b/models/packages/package_blob_test.go
index 664dfa4d81..efcfeae39d 100644
--- a/models/packages/package_blob_test.go
+++ b/models/packages/package_blob_test.go
@@ -19,7 +19,8 @@ func TestPackagesGetOrInsertBlob(t *testing.T) {
 	blake2bIsSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 1})
 	blake2bNotSet := unittest.AssertExistsAndLoadBean(t, &PackageBlob{ID: 2})
 
-	blake2bSetToRandom := *blake2bNotSet
+	var blake2bSetToRandom PackageBlob
+	blake2bSetToRandom = *blake2bNotSet
 	blake2bSetToRandom.HashBlake2b = "SOMETHING RANDOM"
 
 	for _, testCase := range []struct {
diff --git a/models/packages/package_file.go b/models/packages/package_file.go
index d4bcc2859a..5034e1f29d 100644
--- a/models/packages/package_file.go
+++ b/models/packages/package_file.go
@@ -87,8 +87,8 @@ func GetFileForVersionByID(ctx context.Context, versionID, fileID int64) (*Packa
 	return pf, nil
 }
 
-// GetFileForVersionByName gets a file of a version by name
-func GetFileForVersionByName(ctx context.Context, versionID int64, name, key string) (*PackageFile, error) {
+// GetFileForVersionByNameMatchCase gets a file of a version by name
+func GetFileForVersionByNameMatchCase(ctx context.Context, versionID int64, name, key string) (*PackageFile, error) {
 	if name == "" {
 		return nil, ErrPackageFileNotExist
 	}
@@ -97,7 +97,7 @@ func GetFileForVersionByName(ctx context.Context, versionID int64, name, key str
 
 	has, err := db.GetEngine(ctx).Where(builder.Eq{
 		"version_id":    versionID,
-		"lower_name":    strings.ToLower(name),
+		"lower_name":    name,
 		"composite_key": key,
 	}).Get(pf)
 	if err != nil {
@@ -109,6 +109,11 @@ func GetFileForVersionByName(ctx context.Context, versionID int64, name, key str
 	return pf, nil
 }
 
+// GetFileForVersionByName gets a file of a version by name
+func GetFileForVersionByName(ctx context.Context, versionID int64, name, key string) (*PackageFile, error) {
+	return GetFileForVersionByNameMatchCase(ctx, versionID, strings.ToLower(name), key)
+}
+
 // DeleteFileByID deletes a file
 func DeleteFileByID(ctx context.Context, fileID int64) error {
 	_, err := db.GetEngine(ctx).ID(fileID).Delete(&PackageFile{})
diff --git a/models/packages/package_version.go b/models/packages/package_version.go
index 79086ff1ad..87a97143f3 100644
--- a/models/packages/package_version.go
+++ b/models/packages/package_version.go
@@ -211,10 +211,13 @@ func (opts *PackageSearchOptions) ToConds() builder.Cond {
 		cond = cond.And(builder.Eq{"package.id": opts.PackageID})
 	}
 	if opts.Name.Value != "" {
+		// potential drawback if Type is all / undefined
+		name := ResolvePackageName(opts.Name.Value, opts.Type)
+
 		if opts.Name.ExactMatch {
-			cond = cond.And(builder.Eq{"package.lower_name": strings.ToLower(opts.Name.Value)})
+			cond = cond.And(builder.Eq{"package.lower_name": name})
 		} else {
-			cond = cond.And(builder.Like{"package.lower_name", strings.ToLower(opts.Name.Value)})
+			cond = cond.And(builder.Like{"package.lower_name", name})
 		}
 	}
 	if opts.Version.Value != "" {
@@ -279,9 +282,7 @@ func (opts *PackageSearchOptions) configureOrderBy(e db.Engine) {
 	default:
 		e.Desc("package_version.created_unix")
 	}
-
-	// Sort by id for stable order with duplicates in the other field
-	e.Asc("package_version.id")
+	e.Desc("package_version.id") // Sort by id for stable order with duplicates in the other field
 }
 
 // SearchVersions gets all versions of packages matching the search options
diff --git a/models/perm/access/access.go b/models/perm/access/access.go
index 76b547f772..87ee600a15 100644
--- a/models/perm/access/access.go
+++ b/models/perm/access/access.go
@@ -133,7 +133,7 @@ func refreshCollaboratorAccesses(ctx context.Context, repoID int64, accessMap ma
 		return fmt.Errorf("getCollaborations: %w", err)
 	}
 	for _, c := range collaborators {
-		if c.User.IsGhost() {
+		if c.IsGhost() {
 			continue
 		}
 		updateUserAccess(accessMap, c.User, c.Collaboration.Mode)
diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go
index ce9963b83a..f7daf38e5c 100644
--- a/models/perm/access/repo_permission.go
+++ b/models/perm/access/repo_permission.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 
+	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	"forgejo.org/models/organization"
 	perm_model "forgejo.org/models/perm"
@@ -136,6 +137,33 @@ func (p *Permission) LogString() string {
 	return fmt.Sprintf(format, args...)
 }
 
+func GetActionRepoPermission(ctx context.Context, repo *repo_model.Repository, task *actions_model.ActionTask) (Permission, error) {
+	// straight forward case: an actions task is attempting to access its own repo
+	if task.RepoID == repo.ID {
+		var mode perm_model.AccessMode
+
+		// determine default access mode for repo:
+		if task.IsForkPullRequest {
+			mode = perm_model.AccessModeRead
+		} else {
+			mode = perm_model.AccessModeWrite
+		}
+
+		if err := repo.LoadUnits(ctx); err != nil {
+			return Permission{}, err
+		}
+
+		perm := Permission{
+			AccessMode: mode,
+			Units:      repo.Units,
+		}
+
+		return perm, nil
+	}
+
+	return GetUserRepoPermission(ctx, repo, user_model.NewActionsUser())
+}
+
 // GetUserRepoPermission returns the user permissions to the repository
 func GetUserRepoPermission(ctx context.Context, repo *repo_model.Repository, user *user_model.User) (Permission, error) {
 	var perm Permission
diff --git a/models/perm/access/repo_permission_test.go b/models/perm/access/repo_permission_test.go
new file mode 100644
index 0000000000..55bc975421
--- /dev/null
+++ b/models/perm/access/repo_permission_test.go
@@ -0,0 +1,78 @@
+package access_test
+
+import (
+	"testing"
+
+	actions_model "forgejo.org/models/actions"
+	"forgejo.org/models/db"
+	perm_model "forgejo.org/models/perm"
+	"forgejo.org/models/perm/access"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func assertAccess(t *testing.T, expectedMode perm_model.AccessMode, perm *access.Permission) {
+	assert.Equal(t, expectedMode, perm.AccessMode)
+
+	for _, unit := range perm.Units {
+		assert.Equal(t, expectedMode, perm.UnitAccessMode(unit.Type))
+	}
+}
+
+func TestActionTaskCanAccessOwnRepo(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: actionTask.RepoID})
+
+	perm, err := access.GetActionRepoPermission(db.DefaultContext, repo, actionTask)
+	require.NoError(t, err)
+	assertAccess(t, perm_model.AccessModeWrite, &perm)
+}
+
+func TestActionTaskCanAccessPublicRepo(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+
+	perm, err := access.GetActionRepoPermission(db.DefaultContext, repo, actionTask)
+	require.NoError(t, err)
+	assertAccess(t, perm_model.AccessModeRead, &perm)
+}
+
+func TestActionTaskCanAccessPublicRepoOfLimitedOrg(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 38})
+
+	perm, err := access.GetActionRepoPermission(db.DefaultContext, repo, actionTask)
+	require.NoError(t, err)
+	assertAccess(t, perm_model.AccessModeRead, &perm)
+}
+
+func TestActionTaskNoAccessPublicRepoOfPrivateOrg(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 40})
+
+	perm, err := access.GetActionRepoPermission(db.DefaultContext, repo, actionTask)
+	require.NoError(t, err)
+	assertAccess(t, perm_model.AccessModeNone, &perm)
+}
+
+func TestActionTaskNoAccessPrivateRepo(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+
+	perm, err := access.GetActionRepoPermission(db.DefaultContext, repo, actionTask)
+	require.NoError(t, err)
+	assertAccess(t, perm_model.AccessModeNone, &perm)
+}
diff --git a/models/project/column.go b/models/project/column.go
index 52917cb9fd..20de39357b 100644
--- a/models/project/column.go
+++ b/models/project/column.go
@@ -145,7 +145,7 @@ func NewColumn(ctx context.Context, column *Column) error {
 		return err
 	}
 	if res.ColumnCount >= maxProjectColumns {
-		return fmt.Errorf("NewBoard: maximum number of columns reached")
+		return errors.New("NewBoard: maximum number of columns reached")
 	}
 	column.Sorting = int8(util.Iif(res.ColumnCount > 0, res.MaxSorting+1, 0))
 	_, err := db.GetEngine(ctx).Insert(column)
@@ -170,7 +170,7 @@ func deleteColumnByID(ctx context.Context, columnID int64) error {
 	}
 
 	if column.Default {
-		return fmt.Errorf("deleteColumnByID: cannot delete default column")
+		return errors.New("deleteColumnByID: cannot delete default column")
 	}
 
 	// move all issues to the default column
diff --git a/models/project/column_test.go b/models/project/column_test.go
index 2ef27de3b5..4fc452df33 100644
--- a/models/project/column_test.go
+++ b/models/project/column_test.go
@@ -98,9 +98,9 @@ func Test_MoveColumnsOnProject(t *testing.T) {
 	columnsAfter, err := project1.GetColumns(db.DefaultContext)
 	require.NoError(t, err)
 	assert.Len(t, columnsAfter, 3)
-	assert.EqualValues(t, columns[1].ID, columnsAfter[0].ID)
-	assert.EqualValues(t, columns[2].ID, columnsAfter[1].ID)
-	assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
+	assert.Equal(t, columns[1].ID, columnsAfter[0].ID)
+	assert.Equal(t, columns[2].ID, columnsAfter[1].ID)
+	assert.Equal(t, columns[0].ID, columnsAfter[2].ID)
 }
 
 func Test_NewColumn(t *testing.T) {
diff --git a/models/project/issue.go b/models/project/issue.go
index 9e9db19004..d404033446 100644
--- a/models/project/issue.go
+++ b/models/project/issue.go
@@ -5,7 +5,7 @@ package project
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/log"
@@ -73,7 +73,7 @@ func MoveIssuesOnProjectColumn(ctx context.Context, column *Column, sortedIssueI
 			return err
 		}
 		if int(count) != len(sortedIssueIDs) {
-			return fmt.Errorf("all issues have to be added to a project first")
+			return errors.New("all issues have to be added to a project first")
 		}
 
 		for sorting, issueID := range sortedIssueIDs {
@@ -88,7 +88,7 @@ func MoveIssuesOnProjectColumn(ctx context.Context, column *Column, sortedIssueI
 
 func (c *Column) moveIssuesToAnotherColumn(ctx context.Context, newColumn *Column) error {
 	if c.ProjectID != newColumn.ProjectID {
-		return fmt.Errorf("columns have to be in the same project")
+		return errors.New("columns have to be in the same project")
 	}
 
 	if c.ID == newColumn.ID {
diff --git a/models/project/project_test.go b/models/project/project_test.go
index ee9fdaa2e2..ab23bab0bf 100644
--- a/models/project/project_test.go
+++ b/models/project/project_test.go
@@ -114,10 +114,10 @@ func TestProjectsSort(t *testing.T) {
 			OrderBy: GetSearchOrderByBySortType(tt.sortType),
 		})
 		require.NoError(t, err)
-		assert.EqualValues(t, int64(6), count)
+		assert.Equal(t, int64(6), count)
 		if assert.Len(t, projects, 6) {
 			for i := range projects {
-				assert.EqualValues(t, tt.wants[i], projects[i].ID)
+				assert.Equal(t, tt.wants[i], projects[i].ID)
 			}
 		}
 	}
diff --git a/models/pull/automerge.go b/models/pull/automerge.go
index 63f572309b..dcc1f39271 100644
--- a/models/pull/automerge.go
+++ b/models/pull/automerge.go
@@ -10,6 +10,7 @@ import (
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/log"
 	"forgejo.org/modules/timeutil"
 )
 
@@ -58,13 +59,15 @@ func ScheduleAutoMerge(ctx context.Context, doer *user_model.User, pullID int64,
 		return ErrAlreadyScheduledToAutoMerge{PullID: pullID}
 	}
 
-	_, err := db.GetEngine(ctx).Insert(&AutoMerge{
+	scheduledPRM, err := db.GetEngine(ctx).Insert(&AutoMerge{
 		DoerID:                 doer.ID,
 		PullID:                 pullID,
 		MergeStyle:             style,
 		Message:                message,
 		DeleteBranchAfterMerge: deleteBranch,
 	})
+	log.Trace("ScheduleAutoMerge %+v for PR %d", scheduledPRM, pullID)
+
 	return err
 }
 
@@ -81,6 +84,8 @@ func GetScheduledMergeByPullID(ctx context.Context, pullID int64) (bool, *AutoMe
 		return false, nil, err
 	}
 
+	log.Trace("GetScheduledMergeByPullID found %+v for PR %d", scheduledPRM, pullID)
+
 	scheduledPRM.Doer = doer
 	return true, scheduledPRM, nil
 }
@@ -94,6 +99,8 @@ func DeleteScheduledAutoMerge(ctx context.Context, pullID int64) error {
 		return db.ErrNotExist{Resource: "auto_merge", ID: pullID}
 	}
 
+	log.Trace("DeleteScheduledAutoMerge %+v for PR %d", scheduledPRM, pullID)
+
 	_, err = db.GetEngine(ctx).ID(scheduledPRM.ID).Delete(&AutoMerge{})
 	return err
 }
diff --git a/models/quota/main_test.go b/models/quota/main_test.go
new file mode 100644
index 0000000000..ec0a0e0013
--- /dev/null
+++ b/models/quota/main_test.go
@@ -0,0 +1,19 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package quota
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+
+	_ "forgejo.org/models"
+	_ "forgejo.org/models/actions"
+	_ "forgejo.org/models/activities"
+	_ "forgejo.org/models/forgefed"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m)
+}
diff --git a/models/quota/used.go b/models/quota/used.go
index 4a1bc84c0a..22815165f6 100644
--- a/models/quota/used.go
+++ b/models/quota/used.go
@@ -131,7 +131,8 @@ func createQueryFor(ctx context.Context, userID int64, q string) db.Engine {
 	case "artifacts":
 		session = session.
 			Table("action_artifact").
-			Join("INNER", "`repository`", "`action_artifact`.repo_id = `repository`.id")
+			Join("INNER", "`repository`", "`action_artifact`.repo_id = `repository`.id").
+			Where("`action_artifact`.status != ?", action_model.ArtifactStatusExpired)
 	case "packages":
 		session = session.
 			Table("package_version").
diff --git a/models/quota/used_test.go b/models/quota/used_test.go
new file mode 100644
index 0000000000..82cc5b9bcc
--- /dev/null
+++ b/models/quota/used_test.go
@@ -0,0 +1,23 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package quota
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetUsedForUser(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/TestGetUsedForUser/")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	used, err := GetUsedForUser(t.Context(), 5)
+	require.NoError(t, err)
+
+	assert.EqualValues(t, 4096, used.Size.Assets.Artifacts)
+}
diff --git a/models/repo/TestSearchRepositoryIDsByCondition/repository.yml b/models/repo/TestSearchRepositoryIDsByCondition/repository.yml
index 9ce830783d..b10fbc9226 100644
--- a/models/repo/TestSearchRepositoryIDsByCondition/repository.yml
+++ b/models/repo/TestSearchRepositoryIDsByCondition/repository.yml
@@ -28,3 +28,4 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
diff --git a/models/repo/attachment.go b/models/repo/attachment.go
index 3bf51e80ca..6d903be5f8 100644
--- a/models/repo/attachment.go
+++ b/models/repo/attachment.go
@@ -5,6 +5,7 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"path"
@@ -232,9 +233,9 @@ func DeleteAttachmentsByComment(ctx context.Context, commentID int64, remove boo
 // UpdateAttachmentByUUID Updates attachment via uuid
 func UpdateAttachmentByUUID(ctx context.Context, attach *Attachment, cols ...string) error {
 	if attach.UUID == "" {
-		return fmt.Errorf("attachment uuid should be not blank")
+		return errors.New("attachment uuid should be not blank")
 	}
-	if attach.ExternalURL != "" && !validation.IsValidExternalURL(attach.ExternalURL) {
+	if attach.ExternalURL != "" && !validation.IsValidReleaseAssetURL(attach.ExternalURL) {
 		return ErrInvalidExternalURL{ExternalURL: attach.ExternalURL}
 	}
 	_, err := db.GetEngine(ctx).Where("uuid=?", attach.UUID).Cols(cols...).Update(attach)
@@ -243,7 +244,7 @@ func UpdateAttachmentByUUID(ctx context.Context, attach *Attachment, cols ...str
 
 // UpdateAttachment updates the given attachment in database
 func UpdateAttachment(ctx context.Context, atta *Attachment) error {
-	if atta.ExternalURL != "" && !validation.IsValidExternalURL(atta.ExternalURL) {
+	if atta.ExternalURL != "" && !validation.IsValidReleaseAssetURL(atta.ExternalURL) {
 		return ErrInvalidExternalURL{ExternalURL: atta.ExternalURL}
 	}
 	sess := db.GetEngine(ctx).Cols("name", "issue_id", "release_id", "comment_id", "download_count")
diff --git a/models/repo/collaboration_test.go b/models/repo/collaboration_test.go
index 783091ba9e..36aefe4cd9 100644
--- a/models/repo/collaboration_test.go
+++ b/models/repo/collaboration_test.go
@@ -27,8 +27,8 @@ func TestRepository_GetCollaborators(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, collaborators, int(expectedLen))
 		for _, collaborator := range collaborators {
-			assert.EqualValues(t, collaborator.User.ID, collaborator.Collaboration.UserID)
-			assert.EqualValues(t, repoID, collaborator.Collaboration.RepoID)
+			assert.Equal(t, collaborator.User.ID, collaborator.Collaboration.UserID)
+			assert.Equal(t, repoID, collaborator.Collaboration.RepoID)
 		}
 	}
 	test(1)
@@ -47,7 +47,7 @@ func TestRepository_GetCollaborators(t *testing.T) {
 	require.NoError(t, err)
 	assert.Len(t, collaborators2, 1)
 
-	assert.NotEqualValues(t, collaborators1[0].ID, collaborators2[0].ID)
+	assert.NotEqual(t, collaborators1[0].ID, collaborators2[0].ID)
 }
 
 func TestRepository_IsCollaborator(t *testing.T) {
@@ -72,10 +72,10 @@ func TestRepository_ChangeCollaborationAccessMode(t *testing.T) {
 	require.NoError(t, repo_model.ChangeCollaborationAccessMode(db.DefaultContext, repo, 4, perm.AccessModeAdmin))
 
 	collaboration := unittest.AssertExistsAndLoadBean(t, &repo_model.Collaboration{RepoID: repo.ID, UserID: 4})
-	assert.EqualValues(t, perm.AccessModeAdmin, collaboration.Mode)
+	assert.Equal(t, perm.AccessModeAdmin, collaboration.Mode)
 
 	access := unittest.AssertExistsAndLoadBean(t, &access_model.Access{UserID: 4, RepoID: repo.ID})
-	assert.EqualValues(t, perm.AccessModeAdmin, access.Mode)
+	assert.Equal(t, perm.AccessModeAdmin, access.Mode)
 
 	require.NoError(t, repo_model.ChangeCollaborationAccessMode(db.DefaultContext, repo, 4, perm.AccessModeAdmin))
 
diff --git a/models/repo/following_repo_test.go b/models/repo/following_repo_test.go
index cff125dabe..4bac23e77a 100644
--- a/models/repo/following_repo_test.go
+++ b/models/repo/following_repo_test.go
@@ -26,6 +26,6 @@ func Test_FollowingRepoValidation(t *testing.T) {
 		URI:              "http://localhost:3000/api/v1/activitypub/repo-id/1",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid")
+		t.Error("sut should be invalid")
 	}
 }
diff --git a/models/repo/git.go b/models/repo/git.go
index 692176c8f6..11f6452be5 100644
--- a/models/repo/git.go
+++ b/models/repo/git.go
@@ -29,6 +29,8 @@ const (
 	MergeStyleRebaseUpdate MergeStyle = "rebase-update-only"
 )
 
+var MergeStyles = []MergeStyle{MergeStyleMerge, MergeStyleRebase, MergeStyleRebaseMerge, MergeStyleSquash, MergeStyleFastForwardOnly, MergeStyleManuallyMerged, MergeStyleRebaseUpdate}
+
 type UpdateStyle string
 
 const (
diff --git a/models/repo/moderation.go b/models/repo/moderation.go
new file mode 100644
index 0000000000..0d2672227b
--- /dev/null
+++ b/models/repo/moderation.go
@@ -0,0 +1,88 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package repo
+
+import (
+	"context"
+	"strconv"
+	"strings"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/timeutil"
+)
+
+// RepositoryData represents a trimmed down repository that is used for preserving
+// only the fields needed for abusive content reports (mainly string fields).
+type RepositoryData struct {
+	OwnerID     int64
+	OwnerName   string
+	Name        string
+	Description string
+	Website     string
+	Topics      []string
+	Avatar      string
+	CreatedUnix timeutil.TimeStamp
+	UpdatedUnix timeutil.TimeStamp
+}
+
+// Implements GetFieldsMap() from ShadowCopyData interface, returning a list of <key, value> pairs
+// to be used when rendering the shadow copy for admins reviewing the corresponding abuse report(s).
+func (rd RepositoryData) GetFieldsMap() []moderation.ShadowCopyField {
+	return []moderation.ShadowCopyField{
+		{Key: "OwnerID", Value: strconv.FormatInt(rd.OwnerID, 10)},
+		{Key: "OwnerName", Value: rd.OwnerName},
+		{Key: "Name", Value: rd.Name},
+		{Key: "Description", Value: rd.Description},
+		{Key: "Website", Value: rd.Website},
+		{Key: "Topics", Value: strings.Join(rd.Topics, ", ")},
+		{Key: "Avatar", Value: rd.Avatar},
+		{Key: "CreatedUnix", Value: rd.CreatedUnix.AsLocalTime().String()},
+		{Key: "UpdatedUnix", Value: rd.UpdatedUnix.AsLocalTime().String()},
+	}
+}
+
+// newRepositoryData creates a trimmed down repository to be used just to create a JSON structure
+// (keeping only the fields relevant for moderation purposes)
+func newRepositoryData(repo *Repository) RepositoryData {
+	return RepositoryData{
+		OwnerID:     repo.OwnerID,
+		OwnerName:   repo.OwnerName,
+		Name:        repo.Name,
+		Description: repo.Description,
+		Website:     repo.Website,
+		Topics:      repo.Topics,
+		Avatar:      repo.Avatar,
+		CreatedUnix: repo.CreatedUnix,
+		UpdatedUnix: repo.UpdatedUnix,
+	}
+}
+
+// IfNeededCreateShadowCopyForRepository checks if for the given repository there are any reports of abusive content submitted
+// and if found a shadow copy of relevant repository fields will be stored into DB and linked to the above report(s).
+// This function should be called when a repository is deleted or updated.
+func IfNeededCreateShadowCopyForRepository(ctx context.Context, repo *Repository, forUpdates bool) error {
+	shadowCopyNeeded, err := moderation.IsShadowCopyNeeded(ctx, moderation.ReportedContentTypeRepository, repo.ID)
+	if err != nil {
+		return err
+	}
+
+	if shadowCopyNeeded {
+		if forUpdates {
+			// get the unmodified repository fields
+			repo, err = GetRepositoryByID(ctx, repo.ID)
+			if err != nil {
+				return err
+			}
+		}
+		repoData := newRepositoryData(repo)
+		content, err := json.Marshal(repoData)
+		if err != nil {
+			return err
+		}
+		return moderation.CreateShadowCopyForRepository(ctx, repo.ID, string(content))
+	}
+
+	return nil
+}
diff --git a/models/repo/moderation_test.go b/models/repo/moderation_test.go
new file mode 100644
index 0000000000..9852db1b51
--- /dev/null
+++ b/models/repo/moderation_test.go
@@ -0,0 +1,51 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package repo_test
+
+import (
+	"testing"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/models/repo"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	tsCreated timeutil.TimeStamp = timeutil.TimeStamp(1753093500) // 2025-07-21 10:25:00 UTC
+	tsUpdated timeutil.TimeStamp = timeutil.TimeStamp(1753093525) // 2025-07-21 10:25:25 UTC
+)
+
+func testShadowCopyField(t *testing.T, scField moderation.ShadowCopyField, key, value string) {
+	assert.Equal(t, key, scField.Key)
+	assert.Equal(t, value, scField.Value)
+}
+
+func TestRepositoryDataGetFieldsMap(t *testing.T) {
+	rd := repo.RepositoryData{
+		OwnerID:     1002,
+		OwnerName:   "alexsmith",
+		Name:        "website",
+		Description: "My static website.",
+		Website:     "http://promote-your-business.biz",
+		Topics:      []string{"bulk-email", "email-services"},
+		Avatar:      "avatar-hash-repo-2002",
+		CreatedUnix: tsCreated,
+		UpdatedUnix: tsUpdated,
+	}
+	scFields := rd.GetFieldsMap()
+
+	if assert.Len(t, scFields, 9) {
+		testShadowCopyField(t, scFields[0], "OwnerID", "1002")
+		testShadowCopyField(t, scFields[1], "OwnerName", "alexsmith")
+		testShadowCopyField(t, scFields[2], "Name", "website")
+		testShadowCopyField(t, scFields[3], "Description", "My static website.")
+		testShadowCopyField(t, scFields[4], "Website", "http://promote-your-business.biz")
+		testShadowCopyField(t, scFields[5], "Topics", "bulk-email, email-services")
+		testShadowCopyField(t, scFields[6], "Avatar", "avatar-hash-repo-2002")
+		testShadowCopyField(t, scFields[7], "CreatedUnix", tsCreated.AsLocalTime().String())
+		testShadowCopyField(t, scFields[8], "UpdatedUnix", tsUpdated.AsLocalTime().String())
+	}
+}
diff --git a/models/repo/pushmirror.go b/models/repo/pushmirror.go
index d6d0d1135a..e57897fb7e 100644
--- a/models/repo/pushmirror.go
+++ b/models/repo/pushmirror.go
@@ -32,6 +32,7 @@ type PushMirror struct {
 	Repo          *Repository `xorm:"-"`
 	RemoteName    string
 	RemoteAddress string `xorm:"VARCHAR(2048)"`
+	BranchFilter  string `xorm:"VARCHAR(2048)"`
 
 	// A keypair formatted in OpenSSH format.
 	PublicKey  string `xorm:"VARCHAR(100)"`
@@ -122,6 +123,11 @@ func UpdatePushMirrorInterval(ctx context.Context, m *PushMirror) error {
 	return err
 }
 
+func UpdatePushMirrorBranchFilter(ctx context.Context, m *PushMirror) error {
+	_, err := db.GetEngine(ctx).ID(m.ID).Cols("branch_filter").Update(m)
+	return err
+}
+
 var DeletePushMirrors = deletePushMirrors
 
 func deletePushMirrors(ctx context.Context, opts PushMirrorOptions) error {
diff --git a/models/repo/pushmirror_test.go b/models/repo/pushmirror_test.go
index de6c9b0a41..a7e063ff71 100644
--- a/models/repo/pushmirror_test.go
+++ b/models/repo/pushmirror_test.go
@@ -40,8 +40,6 @@ func TestPushMirrorsIterate(t *testing.T) {
 		Interval:       0,
 	})
 
-	time.Sleep(1 * time.Millisecond)
-
 	repo_model.PushMirrorsIterate(db.DefaultContext, 1, func(idx int, bean any) error {
 		m, ok := bean.(*repo_model.PushMirror)
 		assert.True(t, ok)
@@ -67,7 +65,7 @@ func TestPushMirrorPrivatekey(t *testing.T) {
 	t.Run("Normal retrieval", func(t *testing.T) {
 		actualPrivateKey, err := m.Privatekey()
 		require.NoError(t, err)
-		assert.EqualValues(t, privateKey, actualPrivateKey)
+		assert.Equal(t, privateKey, actualPrivateKey)
 	})
 
 	t.Run("Incorrect retrieval", func(t *testing.T) {
@@ -77,3 +75,139 @@ func TestPushMirrorPrivatekey(t *testing.T) {
 		assert.Empty(t, actualPrivateKey)
 	})
 }
+
+func TestPushMirrorBranchFilter(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("Create push mirror with branch filter", func(t *testing.T) {
+		m := &repo_model.PushMirror{
+			RepoID:       1,
+			RemoteName:   "test-branch-filter",
+			BranchFilter: "main,develop",
+		}
+		unittest.AssertSuccessfulInsert(t, m)
+		assert.NotZero(t, m.ID)
+		assert.Equal(t, "main,develop", m.BranchFilter)
+	})
+
+	t.Run("Create push mirror with empty branch filter", func(t *testing.T) {
+		m := &repo_model.PushMirror{
+			RepoID:       1,
+			RemoteName:   "test-empty-filter",
+			BranchFilter: "",
+		}
+		unittest.AssertSuccessfulInsert(t, m)
+		assert.NotZero(t, m.ID)
+		assert.Empty(t, m.BranchFilter)
+	})
+
+	t.Run("Create push mirror without branch filter", func(t *testing.T) {
+		m := &repo_model.PushMirror{
+			RepoID:     1,
+			RemoteName: "test-no-filter",
+			// BranchFilter: "",
+		}
+		unittest.AssertSuccessfulInsert(t, m)
+		assert.NotZero(t, m.ID)
+		assert.Empty(t, m.BranchFilter)
+	})
+
+	t.Run("Update branch filter", func(t *testing.T) {
+		m := &repo_model.PushMirror{
+			RepoID:       1,
+			RemoteName:   "test-update",
+			BranchFilter: "main",
+		}
+		unittest.AssertSuccessfulInsert(t, m)
+
+		m.BranchFilter = "main,develop"
+		require.NoError(t, repo_model.UpdatePushMirrorBranchFilter(db.DefaultContext, m))
+
+		updated := unittest.AssertExistsAndLoadBean(t, &repo_model.PushMirror{ID: m.ID})
+		assert.Equal(t, "main,develop", updated.BranchFilter)
+	})
+
+	t.Run("Retrieve push mirror with branch filter", func(t *testing.T) {
+		original := &repo_model.PushMirror{
+			RepoID:       1,
+			RemoteName:   "test-retrieve",
+			BranchFilter: "main,develop",
+		}
+		unittest.AssertSuccessfulInsert(t, original)
+
+		retrieved := unittest.AssertExistsAndLoadBean(t, &repo_model.PushMirror{ID: original.ID})
+		assert.Equal(t, original.BranchFilter, retrieved.BranchFilter)
+		assert.Equal(t, "main,develop", retrieved.BranchFilter)
+	})
+
+	t.Run("GetPushMirrorsByRepoID includes branch filter", func(t *testing.T) {
+		mirrors := []*repo_model.PushMirror{
+			{
+				RepoID:       2,
+				RemoteName:   "mirror-1",
+				BranchFilter: "main",
+			},
+			{
+				RepoID:       2,
+				RemoteName:   "mirror-2",
+				BranchFilter: "develop,feature-*",
+			},
+			{
+				RepoID:       2,
+				RemoteName:   "mirror-3",
+				BranchFilter: "",
+			},
+		}
+
+		for _, mirror := range mirrors {
+			unittest.AssertSuccessfulInsert(t, mirror)
+		}
+
+		retrieved, count, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, 2, db.ListOptions{})
+		require.NoError(t, err)
+		assert.Equal(t, int64(3), count)
+		assert.Len(t, retrieved, 3)
+
+		filterMap := make(map[string]string)
+		for _, mirror := range retrieved {
+			filterMap[mirror.RemoteName] = mirror.BranchFilter
+		}
+
+		assert.Equal(t, "main", filterMap["mirror-1"])
+		assert.Equal(t, "develop,feature-*", filterMap["mirror-2"])
+		assert.Empty(t, filterMap["mirror-3"])
+	})
+
+	t.Run("GetPushMirrorsSyncedOnCommit includes branch filter", func(t *testing.T) {
+		mirrors := []*repo_model.PushMirror{
+			{
+				RepoID:       3,
+				RemoteName:   "sync-mirror-1",
+				BranchFilter: "main,develop",
+				SyncOnCommit: true,
+			},
+			{
+				RepoID:       3,
+				RemoteName:   "sync-mirror-2",
+				BranchFilter: "feature-*",
+				SyncOnCommit: true,
+			},
+		}
+
+		for _, mirror := range mirrors {
+			unittest.AssertSuccessfulInsert(t, mirror)
+		}
+
+		retrieved, err := repo_model.GetPushMirrorsSyncedOnCommit(db.DefaultContext, 3)
+		require.NoError(t, err)
+		assert.Len(t, retrieved, 2)
+
+		filterMap := make(map[string]string)
+		for _, mirror := range retrieved {
+			filterMap[mirror.RemoteName] = mirror.BranchFilter
+		}
+
+		assert.Equal(t, "main,develop", filterMap["sync-mirror-1"])
+		assert.Equal(t, "feature-*", filterMap["sync-mirror-2"])
+	})
+}
diff --git a/models/repo/release.go b/models/repo/release.go
index 10e9bb259f..b39a1de971 100644
--- a/models/repo/release.go
+++ b/models/repo/release.go
@@ -77,7 +77,7 @@ type Release struct {
 	Target               string
 	TargetBehind         string `xorm:"-"` // to handle non-existing or empty target
 	Title                string
-	Sha1                 string `xorm:"VARCHAR(64)"`
+	Sha1                 string `xorm:"INDEX VARCHAR(64)"`
 	HideArchiveLinks     bool   `xorm:"NOT NULL DEFAULT false"`
 	NumCommits           int64
 	NumCommitsBehind     int64                            `xorm:"-"`
@@ -618,3 +618,17 @@ func InsertReleases(ctx context.Context, rels ...*Release) error {
 
 	return committer.Commit()
 }
+
+func FindTagsByCommitIDs(ctx context.Context, repoID int64, commitIDs ...string) (map[string][]*Release, error) {
+	releases := make([]*Release, 0, len(commitIDs))
+	if err := db.GetEngine(ctx).Where("repo_id=?", repoID).
+		In("sha1", commitIDs).
+		Find(&releases); err != nil {
+		return nil, err
+	}
+	res := make(map[string][]*Release, len(releases))
+	for _, r := range releases {
+		res[r.Sha1] = append(res[r.Sha1], r)
+	}
+	return res, nil
+}
diff --git a/models/repo/release_test.go b/models/repo/release_test.go
index 94dbd6d9d5..69f9333589 100644
--- a/models/repo/release_test.go
+++ b/models/repo/release_test.go
@@ -49,3 +49,16 @@ func TestReleaseDisplayName(t *testing.T) {
 	release.Title = "Title"
 	assert.Equal(t, "Title", release.DisplayName())
 }
+
+func Test_FindTagsByCommitIDs(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	sha1Rels, err := FindTagsByCommitIDs(db.DefaultContext, 1, "65f1bf27bc3bf70f64657658635e66094edbcb4d")
+	require.NoError(t, err)
+	assert.Len(t, sha1Rels, 1)
+	rels := sha1Rels["65f1bf27bc3bf70f64657658635e66094edbcb4d"]
+	assert.Len(t, rels, 3)
+	assert.Equal(t, "v1.1", rels[0].TagName)
+	assert.Equal(t, "delete-tag", rels[1].TagName)
+	assert.Equal(t, "v1.0", rels[2].TagName)
+}
diff --git a/models/repo/repo.go b/models/repo/repo.go
index 8d204d5594..688c03b3d5 100644
--- a/models/repo/repo.go
+++ b/models/repo/repo.go
@@ -6,6 +6,7 @@ package repo
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"html/template"
 	"net"
@@ -182,7 +183,7 @@ type Repository struct {
 	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-"`
 	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true"`
 	CloseIssuesViaCommitInAnyBranch bool               `xorm:"NOT NULL DEFAULT false"`
-	Topics                          []string           `xorm:"TEXT JSON"`
+	Topics                          []string           `xorm:"TEXT JSON NOT NULL"`
 	ObjectFormatName                string             `xorm:"VARCHAR(6) NOT NULL DEFAULT 'sha1'"`
 
 	TrustModel TrustModelType
@@ -195,6 +196,13 @@ type Repository struct {
 	ArchivedUnix timeutil.TimeStamp `xorm:"DEFAULT 0"`
 }
 
+// BeforeInsert will be invoked by XORM before updating a record
+func (repo *Repository) BeforeInsert() {
+	if repo.Topics == nil {
+		repo.Topics = []string{}
+	}
+}
+
 func init() {
 	db.RegisterModel(new(Repository))
 }
@@ -402,27 +410,28 @@ func (repo *Repository) MustGetUnit(ctx context.Context, tp unit.Type) *RepoUnit
 		return ru
 	}
 
-	if tp == unit.TypeExternalWiki {
+	switch tp {
+	case unit.TypeExternalWiki:
 		return &RepoUnit{
 			Type:   tp,
 			Config: new(ExternalWikiConfig),
 		}
-	} else if tp == unit.TypeExternalTracker {
+	case unit.TypeExternalTracker:
 		return &RepoUnit{
 			Type:   tp,
 			Config: new(ExternalTrackerConfig),
 		}
-	} else if tp == unit.TypePullRequests {
+	case unit.TypePullRequests:
 		return &RepoUnit{
 			Type:   tp,
 			Config: new(PullRequestsConfig),
 		}
-	} else if tp == unit.TypeIssues {
+	case unit.TypeIssues:
 		return &RepoUnit{
 			Type:   tp,
 			Config: new(IssuesConfig),
 		}
-	} else if tp == unit.TypeActions {
+	case unit.TypeActions:
 		return &RepoUnit{
 			Type:   tp,
 			Config: new(ActionsConfig),
@@ -819,7 +828,7 @@ func GetRepositoryByURL(ctx context.Context, repoURL string) (*Repository, error
 	pathSegments := getRepositoryURLPathSegments(repoURL)
 
 	if len(pathSegments) != 2 {
-		return nil, fmt.Errorf("unknown or malformed repository URL")
+		return nil, errors.New("unknown or malformed repository URL")
 	}
 
 	ownerName := pathSegments[0]
diff --git a/models/repo/repo_list_test.go b/models/repo/repo_list_test.go
index c654d1b602..89873c299b 100644
--- a/models/repo/repo_list_test.go
+++ b/models/repo/repo_list_test.go
@@ -437,6 +437,6 @@ func TestSearchRepositoryIDsByCondition(t *testing.T) {
 		require.NoError(t, err)
 
 		slices.Sort(repoIDs)
-		assert.EqualValues(t, testCase.repoIDs, repoIDs)
+		assert.Equal(t, testCase.repoIDs, repoIDs)
 	}
 }
diff --git a/models/repo/repo_repository.go b/models/repo/repo_repository.go
index 0ba50e6614..9d586b8345 100644
--- a/models/repo/repo_repository.go
+++ b/models/repo/repo_repository.go
@@ -38,18 +38,18 @@ func StoreFollowingRepos(ctx context.Context, localRepoID int64, followingRepoLi
 	}
 
 	// Begin transaction
-	ctx, committer, err := db.TxContext((ctx))
+	dbCtx, committer, err := db.TxContext((ctx))
 	if err != nil {
 		return err
 	}
 	defer committer.Close()
 
-	_, err = db.GetEngine(ctx).Where("repo_id=?", localRepoID).Delete(FollowingRepo{})
+	_, err = db.GetEngine(dbCtx).Where("repo_id=?", localRepoID).Delete(FollowingRepo{})
 	if err != nil {
 		return err
 	}
 	for _, followingRepo := range followingRepoList {
-		_, err = db.GetEngine(ctx).Insert(followingRepo)
+		_, err = db.GetEngine(dbCtx).Insert(followingRepo)
 		if err != nil {
 			return err
 		}
diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go
index c11ad70627..aa6f2fa0ae 100644
--- a/models/repo/repo_unit.go
+++ b/models/repo/repo_unit.go
@@ -41,27 +41,30 @@ func (err ErrUnitTypeNotExist) Unwrap() error {
 }
 
 // RepoUnitAccessMode specifies the users access mode to a repo unit
+// Only UnitAccessModeWrite is used by the wiki, to mark it as instance-writable
 type UnitAccessMode int
 
 const (
 	// UnitAccessModeUnset - no unit mode set
 	UnitAccessModeUnset UnitAccessMode = iota // 0
+
 	// UnitAccessModeNone no access
-	UnitAccessModeNone // 1
+	// UnitAccessModeNone UnitAccessMode = 1
 	// UnitAccessModeRead read access
-	UnitAccessModeRead // 2
+	// UnitAccessModeRead UnitAccessMode = 2
+
 	// UnitAccessModeWrite write access
-	UnitAccessModeWrite // 3
+	UnitAccessModeWrite UnitAccessMode = 3
 )
 
 func (mode UnitAccessMode) ToAccessMode(modeIfUnset perm.AccessMode) perm.AccessMode {
 	switch mode {
 	case UnitAccessModeUnset:
 		return modeIfUnset
-	case UnitAccessModeNone:
-		return perm.AccessModeNone
-	case UnitAccessModeRead:
-		return perm.AccessModeRead
+	// case UnitAccessModeNone:
+	//	return perm.AccessModeNone
+	// case UnitAccessModeRead:
+	//	return perm.AccessModeRead
 	case UnitAccessModeWrite:
 		return perm.AccessModeWrite
 	default:
@@ -333,5 +336,8 @@ func getUnitsByRepoID(ctx context.Context, repoID int64) (units []*RepoUnit, err
 // UpdateRepoUnit updates the provided repo unit
 func UpdateRepoUnit(ctx context.Context, unit *RepoUnit) error {
 	_, err := db.GetEngine(ctx).ID(unit.ID).Update(unit)
-	return err
+	if err != nil {
+		return fmt.Errorf("UpdateRepoUnit: %v", err)
+	}
+	return nil
 }
diff --git a/models/repo/repo_unit_test.go b/models/repo/repo_unit_test.go
index 210b830d02..3d6d408fcb 100644
--- a/models/repo/repo_unit_test.go
+++ b/models/repo/repo_unit_test.go
@@ -16,26 +16,26 @@ import (
 func TestActionsConfig(t *testing.T) {
 	cfg := &ActionsConfig{}
 	cfg.DisableWorkflow("test1.yaml")
-	assert.EqualValues(t, []string{"test1.yaml"}, cfg.DisabledWorkflows)
+	assert.Equal(t, []string{"test1.yaml"}, cfg.DisabledWorkflows)
 
 	cfg.DisableWorkflow("test1.yaml")
-	assert.EqualValues(t, []string{"test1.yaml"}, cfg.DisabledWorkflows)
+	assert.Equal(t, []string{"test1.yaml"}, cfg.DisabledWorkflows)
 
 	cfg.EnableWorkflow("test1.yaml")
-	assert.EqualValues(t, []string{}, cfg.DisabledWorkflows)
+	assert.Equal(t, []string{}, cfg.DisabledWorkflows)
 
 	cfg.EnableWorkflow("test1.yaml")
-	assert.EqualValues(t, []string{}, cfg.DisabledWorkflows)
+	assert.Equal(t, []string{}, cfg.DisabledWorkflows)
 
 	cfg.DisableWorkflow("test1.yaml")
 	cfg.DisableWorkflow("test2.yaml")
 	cfg.DisableWorkflow("test3.yaml")
-	assert.EqualValues(t, "test1.yaml,test2.yaml,test3.yaml", cfg.ToString())
+	assert.Equal(t, "test1.yaml,test2.yaml,test3.yaml", cfg.ToString())
 }
 
 func TestRepoUnitAccessMode(t *testing.T) {
-	assert.Equal(t, perm.AccessModeNone, UnitAccessModeNone.ToAccessMode(perm.AccessModeAdmin))
-	assert.Equal(t, perm.AccessModeRead, UnitAccessModeRead.ToAccessMode(perm.AccessModeAdmin))
+	// assert.Equal(t, perm.AccessModeNone, UnitAccessModeNone.ToAccessMode(perm.AccessModeAdmin))
+	// assert.Equal(t, perm.AccessModeRead, UnitAccessModeRead.ToAccessMode(perm.AccessModeAdmin))
 	assert.Equal(t, perm.AccessModeWrite, UnitAccessModeWrite.ToAccessMode(perm.AccessModeAdmin))
 	assert.Equal(t, perm.AccessModeRead, UnitAccessModeUnset.ToAccessMode(perm.AccessModeRead))
 }
diff --git a/models/repo/topic.go b/models/repo/topic.go
index 4a3bdc7d8c..9086f17627 100644
--- a/models/repo/topic.go
+++ b/models/repo/topic.go
@@ -164,7 +164,7 @@ func FindTopics(ctx context.Context, opts *FindTopicOptions) ([]*Topic, int64, e
 	orderBy := "topic.repo_count DESC"
 	if opts.RepoID > 0 {
 		sess.Join("INNER", "repo_topic", "repo_topic.topic_id = topic.id")
-		orderBy = "topic.name" // when render topics for a repo, it's better to sort them by name, to get consistent result
+		orderBy = "topic.name" // When rendering topics for a repo, it's better to sort them by name to get consistent results
 	}
 	if opts.PageSize > 0 {
 		sess = db.SetSessionPagination(sess, opts)
diff --git a/models/repo/topic_test.go b/models/repo/topic_test.go
index 26ad27896e..541dcafbfe 100644
--- a/models/repo/topic_test.go
+++ b/models/repo/topic_test.go
@@ -53,7 +53,7 @@ func TestAddTopic(t *testing.T) {
 	repo2NrOfTopics = 2
 	totalNrOfTopics++
 	topic := unittest.AssertExistsAndLoadBean(t, &repo_model.Topic{Name: "gitea"})
-	assert.EqualValues(t, 1, topic.RepoCount)
+	assert.Equal(t, 1, topic.RepoCount)
 
 	topics, _, err = repo_model.FindTopics(db.DefaultContext, &repo_model.FindTopicOptions{})
 	require.NoError(t, err)
diff --git a/models/repo/watch_test.go b/models/repo/watch_test.go
index 059489afbf..698f6a5f49 100644
--- a/models/repo/watch_test.go
+++ b/models/repo/watch_test.go
@@ -36,7 +36,7 @@ func TestGetWatchers(t *testing.T) {
 	// One watchers are inactive, thus minus 1
 	assert.Len(t, watches, repo.NumWatches-1)
 	for _, watch := range watches {
-		assert.EqualValues(t, repo.ID, watch.RepoID)
+		assert.Equal(t, repo.ID, watch.RepoID)
 	}
 
 	watches, err = repo_model.GetWatchers(db.DefaultContext, unittest.NonexistentID)
diff --git a/models/repo_test.go b/models/repo_test.go
index 6fbef8edf6..6d732632d2 100644
--- a/models/repo_test.go
+++ b/models/repo_test.go
@@ -30,10 +30,10 @@ func Test_repoStatsCorrectIssueNumComments(t *testing.T) {
 
 	issue2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
 	assert.NotNil(t, issue2)
-	assert.EqualValues(t, 0, issue2.NumComments) // the fixture data is wrong, but we don't fix it here
+	assert.Equal(t, 0, issue2.NumComments) // the fixture data is wrong, but we don't fix it here
 
 	require.NoError(t, repoStatsCorrectIssueNumComments(db.DefaultContext, 2))
 	// reload the issue
 	issue2 = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
-	assert.EqualValues(t, 1, issue2.NumComments)
+	assert.Equal(t, 1, issue2.NumComments)
 }
diff --git a/models/repo_transfer_test.go b/models/repo_transfer_test.go
index 6449e40fce..7f01ac2b97 100644
--- a/models/repo_transfer_test.go
+++ b/models/repo_transfer_test.go
@@ -23,6 +23,6 @@ func TestGetPendingTransferIDs(t *testing.T) {
 	pendingTransferIDs, err := GetPendingTransferIDs(db.DefaultContext, reciepient.ID, doer.ID)
 	require.NoError(t, err)
 	if assert.Len(t, pendingTransferIDs, 1) {
-		assert.EqualValues(t, pendingTransfer.ID, pendingTransferIDs[0])
+		assert.Equal(t, pendingTransfer.ID, pendingTransferIDs[0])
 	}
 }
diff --git a/models/secret/main_test.go b/models/secret/main_test.go
new file mode 100644
index 0000000000..85bfec0c4f
--- /dev/null
+++ b/models/secret/main_test.go
@@ -0,0 +1,17 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package secret_test
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+
+	_ "forgejo.org/models"
+	_ "forgejo.org/models/activities"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m)
+}
diff --git a/models/secret/secret.go b/models/secret/secret.go
index 7be7f454a1..6f6867db52 100644
--- a/models/secret/secret.go
+++ b/models/secret/secret.go
@@ -11,9 +11,8 @@ import (
 	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	actions_module "forgejo.org/modules/actions"
+	"forgejo.org/modules/keying"
 	"forgejo.org/modules/log"
-	secret_module "forgejo.org/modules/secret"
-	"forgejo.org/modules/setting"
 	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/util"
 
@@ -39,7 +38,7 @@ type Secret struct {
 	OwnerID     int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL"`
 	RepoID      int64              `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL DEFAULT 0"`
 	Name        string             `xorm:"UNIQUE(owner_repo_name) NOT NULL"`
-	Data        string             `xorm:"LONGTEXT"` // encrypted data
+	Data        []byte             `xorm:"BLOB"` // encrypted data
 	CreatedUnix timeutil.TimeStamp `xorm:"created NOT NULL"`
 }
 
@@ -67,17 +66,21 @@ func InsertEncryptedSecret(ctx context.Context, ownerID, repoID int64, name, dat
 		return nil, fmt.Errorf("%w: ownerID and repoID cannot be both zero, global secrets are not supported", util.ErrInvalidArgument)
 	}
 
-	encrypted, err := secret_module.EncryptSecret(setting.SecretKey, data)
-	if err != nil {
-		return nil, err
-	}
 	secret := &Secret{
 		OwnerID: ownerID,
 		RepoID:  repoID,
 		Name:    strings.ToUpper(name),
-		Data:    encrypted,
 	}
-	return secret, db.Insert(ctx, secret)
+
+	return secret, db.WithTx(ctx, func(ctx context.Context) error {
+		if err := db.Insert(ctx, secret); err != nil {
+			return err
+		}
+
+		secret.SetSecret(data)
+		_, err := db.GetEngine(ctx).ID(secret.ID).Cols("data").Update(secret)
+		return err
+	})
 }
 
 func init() {
@@ -113,21 +116,9 @@ func (opts FindSecretsOptions) ToConds() builder.Cond {
 	return cond
 }
 
-// UpdateSecret changes org or user reop secret.
-func UpdateSecret(ctx context.Context, secretID int64, data string) error {
-	encrypted, err := secret_module.EncryptSecret(setting.SecretKey, data)
-	if err != nil {
-		return err
-	}
-
-	s := &Secret{
-		Data: encrypted,
-	}
-	affected, err := db.GetEngine(ctx).ID(secretID).Cols("data").Update(s)
-	if affected != 1 {
-		return ErrSecretNotFound{}
-	}
-	return err
+func (s *Secret) SetSecret(data string) {
+	key := keying.DeriveKey(keying.ContextActionSecret)
+	s.Data = key.Encrypt([]byte(data), keying.ColumnAndID("data", s.ID))
 }
 
 func GetSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) (map[string]string, error) {
@@ -155,13 +146,14 @@ func GetSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) (map[
 		return nil, err
 	}
 
+	key := keying.DeriveKey(keying.ContextActionSecret)
 	for _, secret := range append(ownerSecrets, repoSecrets...) {
-		v, err := secret_module.DecryptSecret(setting.SecretKey, secret.Data)
+		v, err := key.Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID))
 		if err != nil {
-			log.Error("decrypt secret %v %q: %v", secret.ID, secret.Name, err)
+			log.Error("unable to decrypt secret[id=%d,name=%q]: %v", secret.ID, secret.Name, err)
 			return nil, err
 		}
-		secrets[secret.Name] = v
+		secrets[secret.Name] = string(v)
 	}
 
 	return secrets, nil
diff --git a/models/secret/secret_test.go b/models/secret/secret_test.go
new file mode 100644
index 0000000000..15142d207b
--- /dev/null
+++ b/models/secret/secret_test.go
@@ -0,0 +1,103 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package secret
+
+import (
+	"testing"
+
+	"forgejo.org/models/actions"
+	"forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/keying"
+	"forgejo.org/modules/util"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestInsertEncryptedSecret(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("Global secret", func(t *testing.T) {
+		secret, err := InsertEncryptedSecret(t.Context(), 0, 0, "GLOBAL_SECRET", "some common secret")
+		require.ErrorIs(t, err, util.ErrInvalidArgument)
+		assert.Nil(t, secret)
+	})
+
+	key := keying.DeriveKey(keying.ContextActionSecret)
+
+	t.Run("Insert repository secret", func(t *testing.T) {
+		secret, err := InsertEncryptedSecret(t.Context(), 0, 1, "REPO_SECRET", "some repository secret")
+		require.NoError(t, err)
+		assert.NotNil(t, secret)
+		assert.Equal(t, "REPO_SECRET", secret.Name)
+		assert.EqualValues(t, 1, secret.RepoID)
+		assert.NotEmpty(t, secret.Data)
+
+		// Assert the secret is stored in the database.
+		unittest.AssertExistsAndLoadBean(t, &Secret{RepoID: 1, Name: "REPO_SECRET", Data: secret.Data})
+
+		t.Run("Keying", func(t *testing.T) {
+			// Cannot decrypt with different ID.
+			plainText, err := key.Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID+1))
+			require.Error(t, err)
+			assert.Nil(t, plainText)
+
+			// Cannot decrypt with different column.
+			plainText, err = key.Decrypt(secret.Data, keying.ColumnAndID("metadata", secret.ID))
+			require.Error(t, err)
+			assert.Nil(t, plainText)
+
+			// Can decrypt with correct column and ID.
+			plainText, err = key.Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID))
+			require.NoError(t, err)
+			assert.EqualValues(t, "some repository secret", plainText)
+		})
+	})
+
+	t.Run("Insert owner secret", func(t *testing.T) {
+		secret, err := InsertEncryptedSecret(t.Context(), 2, 0, "OWNER_SECRET", "some owner secret")
+		require.NoError(t, err)
+		assert.NotNil(t, secret)
+		assert.Equal(t, "OWNER_SECRET", secret.Name)
+		assert.EqualValues(t, 2, secret.OwnerID)
+		assert.NotEmpty(t, secret.Data)
+
+		// Assert the secret is stored in the database.
+		unittest.AssertExistsAndLoadBean(t, &Secret{OwnerID: 2, Name: "OWNER_SECRET", Data: secret.Data})
+
+		t.Run("Keying", func(t *testing.T) {
+			// Cannot decrypt with different ID.
+			plainText, err := key.Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID+1))
+			require.Error(t, err)
+			assert.Nil(t, plainText)
+
+			// Cannot decrypt with different column.
+			plainText, err = key.Decrypt(secret.Data, keying.ColumnAndID("metadata", secret.ID))
+			require.Error(t, err)
+			assert.Nil(t, plainText)
+
+			// Can decrypt with correct column and ID.
+			plainText, err = key.Decrypt(secret.Data, keying.ColumnAndID("data", secret.ID))
+			require.NoError(t, err)
+			assert.EqualValues(t, "some owner secret", plainText)
+		})
+	})
+
+	t.Run("Get secrets", func(t *testing.T) {
+		secrets, err := GetSecretsOfTask(t.Context(), &actions.ActionTask{
+			Job: &actions.ActionRunJob{
+				Run: &actions.ActionRun{
+					RepoID: 1,
+					Repo: &repo.Repository{
+						OwnerID: 2,
+					},
+				},
+			},
+		})
+		require.NoError(t, err)
+		assert.Equal(t, "some owner secret", secrets["OWNER_SECRET"])
+		assert.Equal(t, "some repository secret", secrets["REPO_SECRET"])
+	})
+}
diff --git a/models/system/setting_test.go b/models/system/setting_test.go
index 1abaf2f16b..c0376afa00 100644
--- a/models/system/setting_test.go
+++ b/models/system/setting_test.go
@@ -22,24 +22,24 @@ func TestSettings(t *testing.T) {
 
 	rev, settings, err := system.GetAllSettings(db.DefaultContext)
 	require.NoError(t, err)
-	assert.EqualValues(t, 1, rev)
+	assert.Equal(t, 1, rev)
 	assert.Len(t, settings, 1) // there is only one "revision" key
 
 	err = system.SetSettings(db.DefaultContext, map[string]string{keyName: "true"})
 	require.NoError(t, err)
 	rev, settings, err = system.GetAllSettings(db.DefaultContext)
 	require.NoError(t, err)
-	assert.EqualValues(t, 2, rev)
+	assert.Equal(t, 2, rev)
 	assert.Len(t, settings, 2)
-	assert.EqualValues(t, "true", settings[keyName])
+	assert.Equal(t, "true", settings[keyName])
 
 	err = system.SetSettings(db.DefaultContext, map[string]string{keyName: "false"})
 	require.NoError(t, err)
 	rev, settings, err = system.GetAllSettings(db.DefaultContext)
 	require.NoError(t, err)
-	assert.EqualValues(t, 3, rev)
+	assert.Equal(t, 3, rev)
 	assert.Len(t, settings, 2)
-	assert.EqualValues(t, "false", settings[keyName])
+	assert.Equal(t, "false", settings[keyName])
 
 	// setting the same value should not trigger DuplicateKey error, and the "version" should be increased
 	err = system.SetSettings(db.DefaultContext, map[string]string{keyName: "false"})
@@ -48,5 +48,5 @@ func TestSettings(t *testing.T) {
 	rev, settings, err = system.GetAllSettings(db.DefaultContext)
 	require.NoError(t, err)
 	assert.Len(t, settings, 2)
-	assert.EqualValues(t, 4, rev)
+	assert.Equal(t, 4, rev)
 }
diff --git a/models/unit/unit.go b/models/unit/unit.go
index 6251d44c9b..a14f3ff364 100644
--- a/models/unit/unit.go
+++ b/models/unit/unit.go
@@ -1,4 +1,5 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package unit
@@ -69,7 +70,7 @@ func (u Type) LogString() string {
 }
 
 var (
-	// AllRepoUnitTypes contains all the unit types
+	// AllRepoUnitTypes contains all units
 	AllRepoUnitTypes = []Type{
 		TypeCode,
 		TypeIssues,
@@ -83,7 +84,7 @@ var (
 		TypeActions,
 	}
 
-	// DefaultRepoUnits contains the default unit types
+	// DefaultRepoUnits contains default units for regular repos
 	DefaultRepoUnits = []Type{
 		TypeCode,
 		TypeIssues,
@@ -95,12 +96,22 @@ var (
 		TypeActions,
 	}
 
-	// ForkRepoUnits contains the default unit types for forks
+	// ForkRepoUnits contains default units for forks
 	DefaultForkRepoUnits = []Type{
 		TypeCode,
 		TypePullRequests,
 	}
 
+	// DefaultMirrorRepoUnits contains default units for mirrors
+	DefaultMirrorRepoUnits = []Type{
+		TypeCode,
+		TypeIssues,
+		TypeReleases,
+		TypeWiki,
+		TypeProjects,
+		TypePackages,
+	}
+
 	// NotAllowedDefaultRepoUnits contains units that can't be default
 	NotAllowedDefaultRepoUnits = []Type{
 		TypeExternalWiki,
@@ -172,6 +183,8 @@ func LoadUnitConfig() error {
 	if len(DefaultRepoUnits) == 0 {
 		return errors.New("no default repository units found")
 	}
+
+	// Default fork repo units
 	setDefaultForkRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultForkRepoUnits...)
 	if len(invalidKeys) > 0 {
 		log.Warn("Invalid keys in default fork repo units: %s", strings.Join(invalidKeys, ", "))
@@ -181,6 +194,16 @@ func LoadUnitConfig() error {
 		return errors.New("no default fork repository units found")
 	}
 
+	// Default mirror repo units
+	setDefaultMirrorRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultMirrorRepoUnits...)
+	if len(invalidKeys) > 0 {
+		log.Warn("Invalid keys in default mirror repo units: %s", strings.Join(invalidKeys, ", "))
+	}
+	DefaultMirrorRepoUnits = validateDefaultRepoUnits(DefaultMirrorRepoUnits, setDefaultMirrorRepoUnits)
+	if len(DefaultMirrorRepoUnits) == 0 {
+		return errors.New("no default mirror repository units found")
+	}
+
 	// Collect the allowed repo unit groups. Mutually exclusive units are
 	// grouped together.
 	AllowedRepoUnitGroups = [][]Type{}
diff --git a/models/unittest/consistency.go b/models/unittest/consistency.go
index fd2d4b7d75..de93b8f855 100644
--- a/models/unittest/consistency.go
+++ b/models/unittest/consistency.go
@@ -49,7 +49,7 @@ func checkForConsistency(t *testing.T, bean any) {
 	require.NoError(t, err)
 	f := consistencyCheckMap[tb.Name]
 	if f == nil {
-		assert.FailNow(t, "unknown bean type: %#v", bean)
+		assert.FailNow(t, "unknown bean type", "%#v", bean)
 	}
 	f(t, bean)
 }
@@ -73,8 +73,8 @@ func init() {
 		AssertCountByCond(t, "follow", builder.Eq{"user_id": user.int("ID")}, user.int("NumFollowing"))
 		AssertCountByCond(t, "follow", builder.Eq{"follow_id": user.int("ID")}, user.int("NumFollowers"))
 		if user.int("Type") != modelsUserTypeOrganization {
-			assert.EqualValues(t, 0, user.int("NumMembers"), "Unexpected number of members for user id: %d", user.int("ID"))
-			assert.EqualValues(t, 0, user.int("NumTeams"), "Unexpected number of teams for user id: %d", user.int("ID"))
+			assert.Equal(t, 0, user.int("NumMembers"), "Unexpected number of members for user id: %d", user.int("ID"))
+			assert.Equal(t, 0, user.int("NumTeams"), "Unexpected number of teams for user id: %d", user.int("ID"))
 		}
 	}
 
@@ -121,7 +121,7 @@ func init() {
 		assert.EqualValues(t, issue.int("NumComments"), actual, "Unexpected number of comments for issue id: %d", issue.int("ID"))
 		if issue.bool("IsPull") {
 			prRow := AssertExistsAndLoadMap(t, "pull_request", builder.Eq{"issue_id": issue.int("ID")})
-			assert.EqualValues(t, parseInt(prRow["index"]), issue.int("Index"), "Unexpected index for issue id: %d", issue.int("ID"))
+			assert.Equal(t, parseInt(prRow["index"]), issue.int("Index"), "Unexpected index for issue id: %d", issue.int("ID"))
 		}
 	}
 
@@ -129,7 +129,7 @@ func init() {
 		pr := reflectionWrap(bean)
 		issueRow := AssertExistsAndLoadMap(t, "issue", builder.Eq{"id": pr.int("IssueID")})
 		assert.True(t, parseBool(issueRow["is_pull"]))
-		assert.EqualValues(t, parseInt(issueRow["index"]), pr.int("Index"), "Unexpected index for pull request id: %d", pr.int("ID"))
+		assert.Equal(t, parseInt(issueRow["index"]), pr.int("Index"), "Unexpected index for pull request id: %d", pr.int("ID"))
 	}
 
 	checkForMilestoneConsistency := func(t *testing.T, bean any) {
diff --git a/models/unittest/fixture_loader.go b/models/unittest/fixture_loader.go
index 67ef1b28df..dda5c48d35 100644
--- a/models/unittest/fixture_loader.go
+++ b/models/unittest/fixture_loader.go
@@ -12,6 +12,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"forgejo.org/modules/container"
+
 	"gopkg.in/yaml.v3"
 )
 
@@ -32,13 +34,15 @@ type loader struct {
 	fixtureFiles []*fixtureFile
 }
 
-func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loader, error) {
+func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string, allTableNames container.Set[string]) (*loader, error) {
 	l := &loader{
 		db:           db,
 		dialect:      dialect,
 		fixtureFiles: []*fixtureFile{},
 	}
 
+	tablesWithoutFixture := allTableNames
+
 	// Load fixtures
 	for _, fixturePath := range fixturePaths {
 		stat, err := os.Stat(fixturePath)
@@ -60,6 +64,7 @@ func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loade
 						return nil, err
 					}
 					l.fixtureFiles = append(l.fixtureFiles, fixtureFile)
+					tablesWithoutFixture.Remove(fixtureFile.name)
 				}
 			}
 		} else {
@@ -71,6 +76,14 @@ func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loade
 		}
 	}
 
+	// Even though these tables have no fixtures, they can still be used and ensure
+	// they are cleaned.
+	for table := range tablesWithoutFixture.Seq() {
+		l.fixtureFiles = append(l.fixtureFiles, &fixtureFile{
+			name: table,
+		})
+	}
+
 	return l, nil
 }
 
@@ -178,13 +191,13 @@ func (l *loader) Load() error {
 	}()
 
 	// Clean the table and re-insert the fixtures.
-	tableDeleted := map[string]struct{}{}
+	tableDeleted := make(container.Set[string])
 	for _, fixture := range l.fixtureFiles {
-		if _, ok := tableDeleted[fixture.name]; !ok {
+		if !tableDeleted.Contains(fixture.name) {
 			if _, err := tx.Exec(fmt.Sprintf("DELETE FROM %s", l.quoteKeyword(fixture.name))); err != nil {
 				return fmt.Errorf("cannot delete table %s: %w", fixture.name, err)
 			}
-			tableDeleted[fixture.name] = struct{}{}
+			tableDeleted.Add(fixture.name)
 		}
 
 		for _, insertSQL := range fixture.insertSQLs {
diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go
index 495f9a2aac..829cc16466 100644
--- a/models/unittest/fixtures.go
+++ b/models/unittest/fixtures.go
@@ -7,10 +7,12 @@ package unittest
 import (
 	"fmt"
 	"path/filepath"
+	"sync"
 	"time"
 
 	"forgejo.org/models/db"
 	"forgejo.org/modules/auth/password/hash"
+	"forgejo.org/modules/container"
 	"forgejo.org/modules/setting"
 
 	"xorm.io/xorm"
@@ -20,11 +22,11 @@ import (
 var fixturesLoader *loader
 
 // GetXORMEngine gets the XORM engine
-func GetXORMEngine(engine ...*xorm.Engine) (x *xorm.Engine) {
+func GetXORMEngine(engine ...*xorm.Engine) (x *xorm.Engine, err error) {
 	if len(engine) == 1 {
-		return engine[0]
+		return engine[0], nil
 	}
-	return db.DefaultContext.(*db.Context).Engine().(*xorm.Engine)
+	return db.GetMasterEngine(db.DefaultContext.(*db.Context).Engine())
 }
 
 func OverrideFixtures(dir string) func() {
@@ -44,9 +46,15 @@ func OverrideFixtures(dir string) func() {
 	}
 }
 
+var allTableNames = sync.OnceValue(db.GetTableNames)
+
 // InitFixtures initialize test fixtures for a test database
 func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) {
-	e := GetXORMEngine(engine...)
+	e, err := GetXORMEngine(engine...)
+	if err != nil {
+		return err
+	}
+
 	fixturePaths := []string{}
 	if opts.Dir != "" {
 		fixturePaths = append(fixturePaths, opts.Dir)
@@ -71,7 +79,12 @@ func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) {
 		panic("Unsupported RDBMS for test")
 	}
 
-	fixturesLoader, err = newFixtureLoader(e.DB().DB, dialect, fixturePaths)
+	var allTables container.Set[string]
+	if !opts.SkipCleanRegistedModels {
+		allTables = allTableNames().Clone()
+	}
+
+	fixturesLoader, err = newFixtureLoader(e.DB().DB, dialect, fixturePaths, allTables)
 	if err != nil {
 		return err
 	}
@@ -86,10 +99,12 @@ func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) {
 
 // LoadFixtures load fixtures for a test database
 func LoadFixtures(engine ...*xorm.Engine) error {
-	e := GetXORMEngine(engine...)
-	var err error
+	e, err := GetXORMEngine(engine...)
+	if err != nil {
+		return err
+	}
 	// (doubt) database transaction conflicts could occur and result in ROLLBACK? just try for a few times.
-	for i := 0; i < 5; i++ {
+	for range 5 {
 		if err = fixturesLoader.Load(); err == nil {
 			break
 		}
diff --git a/models/unittest/mock_http.go b/models/unittest/mock_http.go
index e749275282..6064e07e9b 100644
--- a/models/unittest/mock_http.go
+++ b/models/unittest/mock_http.go
@@ -67,7 +67,7 @@ func NewMockWebServer(t *testing.T, liveServerBaseURL, testDataDir string, liveM
 			for headerName, headerValues := range response.Header {
 				for _, headerValue := range headerValues {
 					if !slices.Contains(ignoredHeaders, strings.ToLower(headerName)) {
-						_, err := fixtureWriter.WriteString(fmt.Sprintf("%s: %s\n", headerName, headerValue))
+						_, err := fmt.Fprintf(fixtureWriter, "%s: %s\n", headerName, headerValue)
 						require.NoError(t, err, "writing the header of the HTTP response to the fixture file failed")
 					}
 				}
diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go
index d34c9e9a0a..29ec82c55f 100644
--- a/models/unittest/testdb.go
+++ b/models/unittest/testdb.go
@@ -217,6 +217,10 @@ type FixturesOptions struct {
 	Files []string
 	Dirs  []string
 	Base  string
+	// By default all registered models are cleaned, even if they do not have
+	// fixture. Enabling this will skip that and only models with fixtures are
+	// considered.
+	SkipCleanRegistedModels bool
 }
 
 // CreateTestEngine creates a memory database and loads the fixture data from fixturesDir
diff --git a/models/user/activitypub.go b/models/user/activitypub.go
new file mode 100644
index 0000000000..aabf2336fc
--- /dev/null
+++ b/models/user/activitypub.go
@@ -0,0 +1,25 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package user
+
+import (
+	"fmt"
+	"net/url"
+
+	"forgejo.org/modules/setting"
+)
+
+// APActorID returns the IRI to the api endpoint of the user
+func (u *User) APActorID() string {
+	if u.IsAPServerActor() {
+		return fmt.Sprintf("%sapi/v1/activitypub/actor", setting.AppURL)
+	}
+
+	return fmt.Sprintf("%sapi/v1/activitypub/user-id/%s", setting.AppURL, url.PathEscape(fmt.Sprintf("%d", u.ID)))
+}
+
+// KeyID returns the ID of the user's public key
+func (u *User) KeyID() string {
+	return u.APActorID() + "#main-key"
+}
diff --git a/models/user/avatar.go b/models/user/avatar.go
index 27af7f774d..d534bd7bea 100644
--- a/models/user/avatar.go
+++ b/models/user/avatar.go
@@ -62,7 +62,7 @@ func GenerateRandomAvatar(ctx context.Context, u *User) error {
 
 // AvatarLinkWithSize returns a link to the user's avatar with size. size <= 0 means default size
 func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string {
-	if u.IsGhost() {
+	if u.IsGhost() || u.ID <= 0 {
 		return avatars.DefaultAvatarLink()
 	}
 
diff --git a/models/user/email_address.go b/models/user/email_address.go
index f9eaec56c9..a3c33ffc00 100644
--- a/models/user/email_address.go
+++ b/models/user/email_address.go
@@ -266,9 +266,7 @@ func updateActivation(ctx context.Context, email *EmailAddress, activate bool) e
 	if err != nil {
 		return err
 	}
-	if user.Rands, err = GetUserSalt(); err != nil {
-		return err
-	}
+	user.Rands = GetUserSalt()
 	email.IsActivated = activate
 	if _, err := db.GetEngine(ctx).ID(email.ID).Cols("is_activated").Update(email); err != nil {
 		return err
@@ -403,9 +401,7 @@ func ActivateUserEmail(ctx context.Context, userID int64, email string, activate
 		// The user's activation state should be synchronized with the primary email
 		if user.IsActive != activate {
 			user.IsActive = activate
-			if user.Rands, err = GetUserSalt(); err != nil {
-				return fmt.Errorf("unable to generate salt: %w", err)
-			}
+			user.Rands = GetUserSalt()
 			if err = UpdateUserCols(ctx, user, "is_active", "rands"); err != nil {
 				return fmt.Errorf("unable to updateUserCols() for user ID: %d: %w", userID, err)
 			}
diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go
index 1801f57a23..85f5b16c65 100644
--- a/models/user/email_address_test.go
+++ b/models/user/email_address_test.go
@@ -181,3 +181,20 @@ func TestDeletePrimaryEmailAddressOfUser(t *testing.T) {
 	assert.True(t, user_model.IsErrEmailAddressNotExist(err))
 	assert.Nil(t, email)
 }
+
+func TestActivateUserEmail(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/TestActivateUserEmail")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("Activate email", func(t *testing.T) {
+		require.NoError(t, user_model.ActivateUserEmail(t.Context(), 1001, "AnotherTestUserWithUpperCaseEmail@otto.splvs.net", true))
+
+		unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{UID: 1001}, "is_activated = true")
+	})
+
+	t.Run("Deactivate email", func(t *testing.T) {
+		require.NoError(t, user_model.ActivateUserEmail(t.Context(), 1001, "AnotherTestUserWithUpperCaseEmail@otto.splvs.net", false))
+
+		unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{UID: 1001}, "is_activated = false")
+	})
+}
diff --git a/models/user/federated_user.go b/models/user/federated_user.go
index fc07836408..d2a9c34c9e 100644
--- a/models/user/federated_user.go
+++ b/models/user/federated_user.go
@@ -1,24 +1,32 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
 
 import (
+	"database/sql"
+
 	"forgejo.org/modules/validation"
 )
 
 type FederatedUser struct {
-	ID               int64  `xorm:"pk autoincr"`
-	UserID           int64  `xorm:"NOT NULL"`
-	ExternalID       string `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
-	FederationHostID int64  `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+	ID                    int64                  `xorm:"pk autoincr"`
+	UserID                int64                  `xorm:"NOT NULL INDEX user_id"`
+	ExternalID            string                 `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+	FederationHostID      int64                  `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
+	KeyID                 sql.NullString         `xorm:"key_id UNIQUE"`
+	PublicKey             sql.Null[sql.RawBytes] `xorm:"BLOB"`
+	InboxPath             string
+	NormalizedOriginalURL string // This field is just to keep original information. Pls. do not use for search or as ID!
 }
 
-func NewFederatedUser(userID int64, externalID string, federationHostID int64) (FederatedUser, error) {
+func NewFederatedUser(userID int64, externalID string, federationHostID int64, inboxPath, normalizedOriginalURL string) (FederatedUser, error) {
 	result := FederatedUser{
-		UserID:           userID,
-		ExternalID:       externalID,
-		FederationHostID: federationHostID,
+		UserID:                userID,
+		ExternalID:            externalID,
+		FederationHostID:      federationHostID,
+		InboxPath:             inboxPath,
+		NormalizedOriginalURL: normalizedOriginalURL,
 	}
 	if valid, err := validation.IsValid(result); !valid {
 		return FederatedUser{}, err
@@ -26,10 +34,11 @@ func NewFederatedUser(userID int64, externalID string, federationHostID int64) (
 	return result, nil
 }
 
-func (user FederatedUser) Validate() []string {
+func (federatedUser FederatedUser) Validate() []string {
 	var result []string
-	result = append(result, validation.ValidateNotEmpty(user.UserID, "UserID")...)
-	result = append(result, validation.ValidateNotEmpty(user.ExternalID, "ExternalID")...)
-	result = append(result, validation.ValidateNotEmpty(user.FederationHostID, "FederationHostID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUser.UserID, "UserID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUser.ExternalID, "ExternalID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUser.FederationHostID, "FederationHostID")...)
+	result = append(result, validation.ValidateNotEmpty(federatedUser.InboxPath, "InboxPath")...)
 	return result
 }
diff --git a/models/user/federated_user_follower.go b/models/user/federated_user_follower.go
new file mode 100644
index 0000000000..db72c9b5ce
--- /dev/null
+++ b/models/user/federated_user_follower.go
@@ -0,0 +1,30 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package user
+
+import "forgejo.org/modules/validation"
+
+type FederatedUserFollower struct {
+	ID              int64 `xorm:"pk autoincr"`
+	FollowedUserID  int64 `xorm:"NOT NULL unique(fuf_rel)"`
+	FollowingUserID int64 `xorm:"NOT NULL unique(fuf_rel)"`
+}
+
+func NewFederatedUserFollower(followedUserID, federatedUserID int64) (FederatedUserFollower, error) {
+	result := FederatedUserFollower{
+		FollowedUserID:  followedUserID,
+		FollowingUserID: federatedUserID,
+	}
+	if valid, err := validation.IsValid(result); !valid {
+		return FederatedUserFollower{}, err
+	}
+	return result, nil
+}
+
+func (user FederatedUserFollower) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(user.FollowedUserID, "FollowedUserID")...)
+	result = append(result, validation.ValidateNotEmpty(user.FollowingUserID, "FollowingUserID")...)
+	return result
+}
diff --git a/models/user/federated_user_follower_test.go b/models/user/federated_user_follower_test.go
new file mode 100644
index 0000000000..e57ba01308
--- /dev/null
+++ b/models/user/federated_user_follower_test.go
@@ -0,0 +1,27 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package user
+
+import (
+	"testing"
+
+	"forgejo.org/modules/validation"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_FederatedUserFollowerValidation(t *testing.T) {
+	sut := FederatedUserFollower{
+		FollowedUserID:  12,
+		FollowingUserID: 1,
+	}
+	res, err := validation.IsValid(sut)
+	assert.Truef(t, res, "sut should be valid but was %q", err)
+
+	sut = FederatedUserFollower{
+		FollowedUserID: 1,
+	}
+	res, _ = validation.IsValid(sut)
+	assert.False(t, res, "sut should be invalid")
+}
diff --git a/models/user/federated_user_test.go b/models/user/federated_user_test.go
index 374236f6d3..be18339670 100644
--- a/models/user/federated_user_test.go
+++ b/models/user/federated_user_test.go
@@ -14,6 +14,7 @@ func Test_FederatedUserValidation(t *testing.T) {
 		UserID:           12,
 		ExternalID:       "12",
 		FederationHostID: 1,
+		InboxPath:        "/api/v1/activitypub/user-id/12/inbox",
 	}
 	if res, err := validation.IsValid(sut); !res {
 		t.Errorf("sut should be valid but was %q", err)
@@ -22,8 +23,9 @@ func Test_FederatedUserValidation(t *testing.T) {
 	sut = FederatedUser{
 		ExternalID:       "12",
 		FederationHostID: 1,
+		InboxPath:        "/api/v1/activitypub/user-id/12/inbox",
 	}
 	if res, _ := validation.IsValid(sut); res {
-		t.Errorf("sut should be invalid")
+		t.Error("sut should be invalid")
 	}
 }
diff --git a/models/user/fixtures/login_source.yml b/models/user/fixtures/login_source.yml
new file mode 100644
index 0000000000..3950f85964
--- /dev/null
+++ b/models/user/fixtures/login_source.yml
@@ -0,0 +1,8 @@
+-
+  id: 1001
+  type: 6 # OAuth2
+  name: OAuth2 authentication source
+  is_active: 1
+  cfg: '{"Provider":"invalid","ClientID":"invalid","ClientSecret":"invalid","AllowUsernameChange":true}'
+  created_unix: 1753740851
+  updated_unix: 1753740851
diff --git a/models/user/fixtures/user.yml b/models/user/fixtures/user.yml
index b1892f331b..137064a368 100644
--- a/models/user/fixtures/user.yml
+++ b/models/user/fixtures/user.yml
@@ -11,6 +11,7 @@
   must_change_password: false
   login_source: 1001
   login_name: 123
+  login_type: 6
   type: 5
   salt: ZogKvWdyEx
   max_repo_creation: -1
diff --git a/models/user/follow.go b/models/user/follow.go
index 5be0f73c35..8663b2a943 100644
--- a/models/user/follow.go
+++ b/models/user/follow.go
@@ -11,6 +11,7 @@ import (
 )
 
 // Follow represents relations of user and their followers.
+// TODO: We should unify Activity-pub-following and classical following (see models/user/user_repository.go#IsFollowingAp)
 type Follow struct {
 	ID          int64              `xorm:"pk autoincr"`
 	UserID      int64              `xorm:"UNIQUE(follow)"`
@@ -38,21 +39,21 @@ func FollowUser(ctx context.Context, userID, followID int64) (err error) {
 		return ErrBlockedByUser
 	}
 
-	ctx, committer, err := db.TxContext(ctx)
+	dbCtx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return err
 	}
 	defer committer.Close()
 
-	if err = db.Insert(ctx, &Follow{UserID: userID, FollowID: followID}); err != nil {
+	if err = db.Insert(dbCtx, &Follow{UserID: userID, FollowID: followID}); err != nil {
 		return err
 	}
 
-	if _, err = db.Exec(ctx, "UPDATE `user` SET num_followers = num_followers + 1 WHERE id = ?", followID); err != nil {
+	if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_followers = num_followers + 1 WHERE id = ?", followID); err != nil {
 		return err
 	}
 
-	if _, err = db.Exec(ctx, "UPDATE `user` SET num_following = num_following + 1 WHERE id = ?", userID); err != nil {
+	if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_following = num_following + 1 WHERE id = ?", userID); err != nil {
 		return err
 	}
 	return committer.Commit()
@@ -64,21 +65,21 @@ func UnfollowUser(ctx context.Context, userID, followID int64) (err error) {
 		return nil
 	}
 
-	ctx, committer, err := db.TxContext(ctx)
+	dbCtx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return err
 	}
 	defer committer.Close()
 
-	if _, err = db.DeleteByBean(ctx, &Follow{UserID: userID, FollowID: followID}); err != nil {
+	if _, err = db.DeleteByBean(dbCtx, &Follow{UserID: userID, FollowID: followID}); err != nil {
 		return err
 	}
 
-	if _, err = db.Exec(ctx, "UPDATE `user` SET num_followers = num_followers - 1 WHERE id = ?", followID); err != nil {
+	if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_followers = num_followers - 1 WHERE id = ?", followID); err != nil {
 		return err
 	}
 
-	if _, err = db.Exec(ctx, "UPDATE `user` SET num_following = num_following - 1 WHERE id = ?", userID); err != nil {
+	if _, err = db.Exec(dbCtx, "UPDATE `user` SET num_following = num_following - 1 WHERE id = ?", userID); err != nil {
 		return err
 	}
 	return committer.Commit()
diff --git a/models/user/moderation.go b/models/user/moderation.go
new file mode 100644
index 0000000000..17901f84ec
--- /dev/null
+++ b/models/user/moderation.go
@@ -0,0 +1,141 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package user
+
+import (
+	"context"
+	"reflect"
+	"slices"
+	"sync"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/timeutil"
+
+	"xorm.io/xorm/names"
+)
+
+// UserData represents a trimmed down user that is used for preserving
+// only the fields needed for abusive content reports (mainly string fields).
+type UserData struct { //revive:disable-line:exported
+	Name        string
+	FullName    string
+	Email       string
+	LoginName   string
+	Location    string
+	Website     string
+	Pronouns    string
+	Description string
+	CreatedUnix timeutil.TimeStamp
+	UpdatedUnix timeutil.TimeStamp
+	// This field was intentionally renamed so that is not the same with the one from User struct.
+	// If we keep it the same as in User, during login it might trigger the creation of a shadow copy.
+	// TODO: Should we decide that this field is not that relevant for abuse reporting purposes, better remove it.
+	LastLogin   timeutil.TimeStamp `json:"LastLoginUnix"`
+	Avatar      string
+	AvatarEmail string
+}
+
+// Implements GetFieldsMap() from ShadowCopyData interface, returning a list of <key, value> pairs
+// to be used when rendering the shadow copy for admins reviewing the corresponding abuse report(s).
+func (ud UserData) GetFieldsMap() []moderation.ShadowCopyField {
+	return []moderation.ShadowCopyField{
+		{Key: "Name", Value: ud.Name},
+		{Key: "FullName", Value: ud.FullName},
+		{Key: "Email", Value: ud.Email},
+		{Key: "LoginName", Value: ud.LoginName},
+		{Key: "Location", Value: ud.Location},
+		{Key: "Website", Value: ud.Website},
+		{Key: "Pronouns", Value: ud.Pronouns},
+		{Key: "Description", Value: ud.Description},
+		{Key: "CreatedUnix", Value: ud.CreatedUnix.AsLocalTime().String()},
+		{Key: "UpdatedUnix", Value: ud.UpdatedUnix.AsLocalTime().String()},
+		{Key: "LastLogin", Value: ud.LastLogin.AsLocalTime().String()},
+		{Key: "Avatar", Value: ud.Avatar},
+		{Key: "AvatarEmail", Value: ud.AvatarEmail},
+	}
+}
+
+// newUserData creates a trimmed down user to be used just to create a JSON structure
+// (keeping only the fields relevant for moderation purposes)
+func newUserData(user *User) UserData {
+	return UserData{
+		Name:        user.Name,
+		FullName:    user.FullName,
+		Email:       user.Email,
+		LoginName:   user.LoginName,
+		Location:    user.Location,
+		Website:     user.Website,
+		Pronouns:    user.Pronouns,
+		Description: user.Description,
+		CreatedUnix: user.CreatedUnix,
+		UpdatedUnix: user.UpdatedUnix,
+		LastLogin:   user.LastLoginUnix,
+		Avatar:      user.Avatar,
+		AvatarEmail: user.AvatarEmail,
+	}
+}
+
+// userDataColumnNames builds (only once) and returns a slice with the column names
+// (e.g. FieldName -> field_name) corresponding to UserData struct fields.
+var userDataColumnNames = sync.OnceValue(func() []string {
+	mapper := new(names.GonicMapper)
+	udType := reflect.TypeOf(UserData{})
+	columnNames := make([]string, 0, udType.NumField())
+	for i := 0; i < udType.NumField(); i++ {
+		columnNames = append(columnNames, mapper.Obj2Table(udType.Field(i).Name))
+	}
+	return columnNames
+})
+
+// IfNeededCreateShadowCopyForUser checks if for the given user there are any reports of abusive content submitted
+// and if found a shadow copy of relevant user fields will be stored into DB and linked to the above report(s).
+// This function should be called before a user is deleted or updated.
+//
+// In case the User object was already altered before calling this method, just provide the userID and
+// nil for unalteredUser; when it is decided that a shadow copy should be created and unalteredUser is nil,
+// the user will be retrieved from DB based on the provided userID.
+//
+// For deletions alteredCols argument must be omitted.
+//
+// In case of updates it will first checks whether any of the columns being updated (alteredCols argument)
+// is relevant for moderation purposes (i.e. included in the UserData struct).
+func IfNeededCreateShadowCopyForUser(ctx context.Context, userID int64, unalteredUser *User, alteredCols ...string) error {
+	// TODO: this can be triggered quite often (e.g. by routers/web/repo/middlewares.go SetDiffViewStyle())
+
+	shouldCheckIfNeeded := len(alteredCols) == 0 // no columns being updated, therefore a deletion
+	if !shouldCheckIfNeeded {
+		// for updates we need to go further only if certain columns are being changed
+		for _, colName := range userDataColumnNames() {
+			if shouldCheckIfNeeded = slices.Contains(alteredCols, colName); shouldCheckIfNeeded {
+				break
+			}
+		}
+	}
+
+	if !shouldCheckIfNeeded {
+		return nil
+	}
+
+	shadowCopyNeeded, err := moderation.IsShadowCopyNeeded(ctx, moderation.ReportedContentTypeUser, userID)
+	if err != nil {
+		return err
+	}
+
+	if shadowCopyNeeded {
+		if unalteredUser == nil {
+			if unalteredUser, err = GetUserByID(ctx, userID); err != nil {
+				return err
+			}
+		}
+		userData := newUserData(unalteredUser)
+		content, err := json.Marshal(userData)
+		if err != nil {
+			return err
+		}
+		return moderation.CreateShadowCopyForUser(ctx, userID, string(content))
+	}
+
+	return nil
+}
diff --git a/models/user/moderation_test.go b/models/user/moderation_test.go
new file mode 100644
index 0000000000..f951e41e11
--- /dev/null
+++ b/models/user/moderation_test.go
@@ -0,0 +1,60 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package user_test
+
+import (
+	"testing"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	tsCreated   timeutil.TimeStamp = timeutil.TimeStamp(1753093200) // 2025-07-21 10:20:00 UTC
+	tsUpdated   timeutil.TimeStamp = timeutil.TimeStamp(1753093320) // 2025-07-21 10:22:00 UTC
+	tsLastLogin timeutil.TimeStamp = timeutil.TimeStamp(1753093800) // 2025-07-21 10:30:00 UTC
+)
+
+func testShadowCopyField(t *testing.T, scField moderation.ShadowCopyField, key, value string) {
+	assert.Equal(t, key, scField.Key)
+	assert.Equal(t, value, scField.Value)
+}
+
+func TestUserDataGetFieldsMap(t *testing.T) {
+	ud := user.UserData{
+		Name:        "alexsmith",
+		FullName:    "Alex Smith",
+		Email:       "alexsmith@example.org",
+		LoginName:   "",
+		Location:    "@master@seo.net",
+		Website:     "http://promote-your-business.biz",
+		Pronouns:    "SEO",
+		Description: "I can help you promote your business online using SEO.",
+		CreatedUnix: tsCreated,
+		UpdatedUnix: tsUpdated,
+		LastLogin:   tsLastLogin,
+		Avatar:      "avatar-hash-user-1002",
+		AvatarEmail: "alexsmith@example.org",
+	}
+	scFields := ud.GetFieldsMap()
+
+	if assert.Len(t, scFields, 13) {
+		testShadowCopyField(t, scFields[0], "Name", "alexsmith")
+		testShadowCopyField(t, scFields[1], "FullName", "Alex Smith")
+		testShadowCopyField(t, scFields[2], "Email", "alexsmith@example.org")
+		testShadowCopyField(t, scFields[3], "LoginName", "")
+		testShadowCopyField(t, scFields[4], "Location", "@master@seo.net")
+		testShadowCopyField(t, scFields[5], "Website", "http://promote-your-business.biz")
+		testShadowCopyField(t, scFields[6], "Pronouns", "SEO")
+		testShadowCopyField(t, scFields[7], "Description", "I can help you promote your business online using SEO.")
+		testShadowCopyField(t, scFields[8], "CreatedUnix", tsCreated.AsLocalTime().String())
+		testShadowCopyField(t, scFields[9], "UpdatedUnix", tsUpdated.AsLocalTime().String())
+		testShadowCopyField(t, scFields[10], "LastLogin", tsLastLogin.AsLocalTime().String())
+		testShadowCopyField(t, scFields[11], "Avatar", "avatar-hash-user-1002")
+		testShadowCopyField(t, scFields[12], "AvatarEmail", "alexsmith@example.org")
+	}
+}
diff --git a/models/user/search.go b/models/user/search.go
index d2b9901823..b30422e269 100644
--- a/models/user/search.go
+++ b/models/user/search.go
@@ -52,13 +52,14 @@ func (opts *SearchUserOptions) toSearchQueryBase(ctx context.Context) *xorm.Sess
 		cond = builder.Eq{"type": opts.Type}
 	}
 	if opts.IncludeReserved {
-		if opts.Type == UserTypeIndividual {
+		switch opts.Type {
+		case UserTypeIndividual:
 			cond = cond.Or(builder.Eq{"type": UserTypeUserReserved}).Or(
 				builder.Eq{"type": UserTypeBot},
 			).Or(
 				builder.Eq{"type": UserTypeRemoteUser},
 			)
-		} else if opts.Type == UserTypeOrganization {
+		case UserTypeOrganization:
 			cond = cond.Or(builder.Eq{"type": UserTypeOrganizationReserved})
 		}
 	}
diff --git a/models/user/setting.go b/models/user/setting.go
index a915119ad2..e547d24e9f 100644
--- a/models/user/setting.go
+++ b/models/user/setting.go
@@ -5,6 +5,7 @@ package user
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -114,10 +115,10 @@ func GetUserAllSettings(ctx context.Context, uid int64) (map[string]*Setting, er
 
 func validateUserSettingKey(key string) error {
 	if len(key) == 0 {
-		return fmt.Errorf("setting key must be set")
+		return errors.New("setting key must be set")
 	}
 	if strings.ToLower(key) != key {
-		return fmt.Errorf("setting key should be lowercase")
+		return errors.New("setting key should be lowercase")
 	}
 	return nil
 }
diff --git a/models/user/setting_test.go b/models/user/setting_test.go
index 7b6658041f..9c71821875 100644
--- a/models/user/setting_test.go
+++ b/models/user/setting_test.go
@@ -31,15 +31,15 @@ func TestSettings(t *testing.T) {
 	settings, err := user_model.GetSettings(db.DefaultContext, 99, []string{keyName})
 	require.NoError(t, err)
 	assert.Len(t, settings, 1)
-	assert.EqualValues(t, newSetting.SettingValue, settings[keyName].SettingValue)
+	assert.Equal(t, newSetting.SettingValue, settings[keyName].SettingValue)
 
 	settingValue, err := user_model.GetUserSetting(db.DefaultContext, 99, keyName)
 	require.NoError(t, err)
-	assert.EqualValues(t, newSetting.SettingValue, settingValue)
+	assert.Equal(t, newSetting.SettingValue, settingValue)
 
 	settingValue, err = user_model.GetUserSetting(db.DefaultContext, 99, "no_such")
 	require.NoError(t, err)
-	assert.EqualValues(t, "", settingValue)
+	assert.Empty(t, settingValue)
 
 	// updated setting
 	updatedSetting := &user_model.Setting{UserID: 99, SettingKey: keyName, SettingValue: "Updated"}
@@ -50,7 +50,7 @@ func TestSettings(t *testing.T) {
 	settings, err = user_model.GetUserAllSettings(db.DefaultContext, 99)
 	require.NoError(t, err)
 	assert.Len(t, settings, 1)
-	assert.EqualValues(t, updatedSetting.SettingValue, settings[updatedSetting.SettingKey].SettingValue)
+	assert.Equal(t, updatedSetting.SettingValue, settings[updatedSetting.SettingKey].SettingValue)
 
 	// delete setting
 	err = user_model.DeleteUserSetting(db.DefaultContext, 99, keyName)
diff --git a/models/user/user.go b/models/user/user.go
index fb43f01696..5f413ba136 100644
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -1,6 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
@@ -15,6 +15,7 @@ import (
 	"net/url"
 	"path/filepath"
 	"regexp"
+	"runtime/trace"
 	"strings"
 	"time"
 	"unicode"
@@ -135,9 +136,6 @@ type User struct {
 	AvatarEmail     string `xorm:"NOT NULL"`
 	UseCustomAvatar bool
 
-	// For federation
-	NormalizedFederatedURI string
-
 	// Counters
 	NumFollowers int
 	NumFollowing int `xorm:"NOT NULL DEFAULT 0"`
@@ -156,6 +154,9 @@ type User struct {
 	KeepActivityPrivate bool   `xorm:"NOT NULL DEFAULT false"`
 	KeepPronounsPrivate bool   `xorm:"NOT NULL DEFAULT false"`
 	EnableRepoUnitHints bool   `xorm:"NOT NULL DEFAULT true"`
+
+	// If you add new fields that might be used to store abusive content (mainly string fields),
+	// please also add them in the UserData struct and the corresponding constructor.
 }
 
 func init() {
@@ -181,11 +182,11 @@ func (u *User) BeforeUpdate() {
 		u.MaxRepoCreation = -1
 	}
 
-	// Organization does not need email
-	u.Email = strings.ToLower(u.Email)
+	// Ensure AvatarEmail is set for non-organization users, because organization
+	// are not required to have a email set.
 	if !u.IsOrganization() {
 		if len(u.AvatarEmail) == 0 {
-			u.AvatarEmail = u.Email
+			u.AvatarEmail = strings.ToLower(u.Email)
 		}
 	}
 
@@ -233,6 +234,33 @@ func GetAllAdmins(ctx context.Context) ([]*User, error) {
 	return users, db.GetEngine(ctx).OrderBy("id").Where("type = ?", UserTypeIndividual).And("is_admin = ?", true).Find(&users)
 }
 
+// MustHaveTwoFactor returns true if the user is a individual and requires 2fa
+func (u *User) MustHaveTwoFactor() bool {
+	if !u.IsIndividual() || setting.GlobalTwoFactorRequirement.IsNone() {
+		return false
+	}
+
+	return setting.GlobalTwoFactorRequirement.IsAll() || (u.IsAdmin && setting.GlobalTwoFactorRequirement.IsAdmin())
+}
+
+// IsAccessAllowed determines whether the user is permitted to log in based on
+// their activation status, login prohibition, 2FA requirement and 2FA enrollment status.
+func (u *User) IsAccessAllowed(ctx context.Context) bool {
+	if !u.IsActive || u.ProhibitLogin {
+		return false
+	}
+	if !u.MustHaveTwoFactor() {
+		return true
+	}
+
+	hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
+	if err != nil {
+		log.Error("Error getting 2fa: %s", err)
+		return false
+	}
+	return hasTwoFactor
+}
+
 // IsLocal returns true if user login type is LoginPlain.
 func (u *User) IsLocal() bool {
 	return u.LoginType <= auth.Plain
@@ -295,6 +323,9 @@ func (u *User) CanImportLocal() bool {
 
 // DashboardLink returns the user dashboard page link.
 func (u *User) DashboardLink() string {
+	if u.IsGhost() {
+		return ""
+	}
 	if u.IsOrganization() {
 		return u.OrganisationLink() + "/dashboard"
 	}
@@ -303,21 +334,25 @@ func (u *User) DashboardLink() string {
 
 // HomeLink returns the user or organization home page link.
 func (u *User) HomeLink() string {
+	if u.IsGhost() {
+		return ""
+	}
 	return setting.AppSubURL + "/" + url.PathEscape(u.Name)
 }
 
 // HTMLURL returns the user or organization's full link.
 func (u *User) HTMLURL() string {
+	if u.IsGhost() {
+		return ""
+	}
 	return setting.AppURL + url.PathEscape(u.Name)
 }
 
-// APActorID returns the IRI to the api endpoint of the user
-func (u *User) APActorID() string {
-	return fmt.Sprintf("%vapi/v1/activitypub/user-id/%v", setting.AppURL, url.PathEscape(fmt.Sprintf("%v", u.ID)))
-}
-
 // OrganisationLink returns the organization sub page link.
 func (u *User) OrganisationLink() string {
+	if u.IsGhost() || !u.IsOrganization() {
+		return ""
+	}
 	return setting.AppSubURL + "/org/" + url.PathEscape(u.Name)
 }
 
@@ -392,9 +427,7 @@ func (u *User) SetPassword(passwd string) (err error) {
 		return err
 	}
 
-	if u.Salt, err = GetUserSalt(); err != nil {
-		return err
-	}
+	u.Salt = GetUserSalt()
 	if u.Passwd, err = hash.Parse(setting.PasswordHashAlgo).Hash(passwd, u.Salt); err != nil {
 		return err
 	}
@@ -404,7 +437,8 @@ func (u *User) SetPassword(passwd string) (err error) {
 }
 
 // ValidatePassword checks if the given password matches the one belonging to the user.
-func (u *User) ValidatePassword(passwd string) bool {
+func (u *User) ValidatePassword(ctx context.Context, passwd string) bool {
+	defer trace.StartRegion(ctx, "Validate user password").End()
 	return hash.Parse(u.PasswdHashAlgo).VerifyPassword(passwd, u.Passwd, u.Salt)
 }
 
@@ -564,19 +598,15 @@ func IsUserExist(ctx context.Context, uid int64, name string) (bool, error) {
 const SaltByteLength = 16
 
 // GetUserSalt returns a random user salt token.
-func GetUserSalt() (string, error) {
-	rBytes, err := util.CryptoRandomBytes(SaltByteLength)
-	if err != nil {
-		return "", err
-	}
+func GetUserSalt() string {
 	// Returns a 32 bytes long string.
-	return hex.EncodeToString(rBytes), nil
+	return hex.EncodeToString(util.CryptoRandomBytes(SaltByteLength))
 }
 
 // Note: The set of characters here can safely expand without a breaking change,
 // but characters removed from this set can cause user account linking to break
 var (
-	customCharsReplacement    = strings.NewReplacer("Æ", "AE")
+	customCharsReplacement    = strings.NewReplacer("Æ", "AE", "ß", "ss")
 	removeCharsRE             = regexp.MustCompile(`['´\x60]`)
 	removeDiacriticsTransform = transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
 	replaceCharsHyphenRE      = regexp.MustCompile(`[\s~+]`)
@@ -624,6 +654,7 @@ var (
 		"pulls",
 		"milestones",
 		"notifications",
+		"report_abuse",
 
 		"favicon.ico",
 		"manifest.json", // web app manifests
@@ -700,7 +731,7 @@ func createUser(ctx context.Context, u *User, createdByAdmin bool, overwriteDefa
 	u.MaxRepoCreation = -1
 	u.Theme = setting.UI.DefaultTheme
 	u.IsRestricted = setting.Service.DefaultUserIsRestricted
-	u.IsActive = !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm)
+	u.IsActive = !setting.Service.RegisterEmailConfirm && !setting.Service.RegisterManualConfirm
 
 	// Ensure consistency of the dates.
 	if u.UpdatedUnix < u.CreatedUnix {
@@ -777,9 +808,7 @@ func createUser(ctx context.Context, u *User, createdByAdmin bool, overwriteDefa
 
 	u.LowerName = strings.ToLower(u.Name)
 	u.AvatarEmail = u.Email
-	if u.Rands, err = GetUserSalt(); err != nil {
-		return err
-	}
+	u.Rands = GetUserSalt()
 	if u.Passwd != "" {
 		if err = u.SetPassword(u.Passwd); err != nil {
 			return err
@@ -935,6 +964,14 @@ func UpdateUserCols(ctx context.Context, u *User, cols ...string) error {
 		return err
 	}
 
+	// If the user was reported as abusive and any of the columns being updated is relevant
+	// for moderation purposes a shadow copy should be created before first update.
+	// Since u is already altered at this point we are sending nil instead as an argument
+	// so that the unaltered version will be retrieved from DB.
+	if err := IfNeededCreateShadowCopyForUser(ctx, u.ID, nil, cols...); err != nil {
+		return err
+	}
+
 	_, err := db.GetEngine(ctx).ID(u.ID).Cols(cols...).Update(u)
 	return err
 }
diff --git a/models/user/user_repository.go b/models/user/user_repository.go
index 172bf7c8b4..df864746e8 100644
--- a/models/user/user_repository.go
+++ b/models/user/user_repository.go
@@ -1,4 +1,4 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
@@ -8,12 +8,14 @@ import (
 	"fmt"
 
 	"forgejo.org/models/db"
+	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/validation"
 )
 
 func init() {
 	db.RegisterModel(new(FederatedUser))
+	db.RegisterModel(new(FederatedUserFollower))
 }
 
 func CreateFederatedUser(ctx context.Context, user *User, federatedUser *FederatedUser) error {
@@ -26,13 +28,18 @@ func CreateFederatedUser(ctx context.Context, user *User, federatedUser *Federat
 	}
 
 	// Begin transaction
-	ctx, committer, err := db.TxContext((ctx))
+	txCtx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return err
 	}
-	defer committer.Close()
+	defer func() {
+		err := committer.Close()
+		if err != nil {
+			log.Error("Error closing committer: %v", err)
+		}
+	}()
 
-	if err := CreateUser(ctx, user, &overwrite); err != nil {
+	if err := CreateUser(txCtx, user, &overwrite); err != nil {
 		return err
 	}
 
@@ -41,7 +48,7 @@ func CreateFederatedUser(ctx context.Context, user *User, federatedUser *Federat
 		return err
 	}
 
-	_, err = db.GetEngine(ctx).Insert(federatedUser)
+	_, err = db.GetEngine(txCtx).Insert(federatedUser)
 	if err != nil {
 		return err
 	}
@@ -50,9 +57,7 @@ func CreateFederatedUser(ctx context.Context, user *User, federatedUser *Federat
 	return committer.Commit()
 }
 
-func FindFederatedUser(ctx context.Context, externalID string,
-	federationHostID int64,
-) (*User, *FederatedUser, error) {
+func FindFederatedUser(ctx context.Context, externalID string, federationHostID int64) (*User, *FederatedUser, error) {
 	federatedUser := new(FederatedUser)
 	user := new(User)
 	has, err := db.GetEngine(ctx).Where("external_id=? and federation_host_id=?", externalID, federationHostID).Get(federatedUser)
@@ -65,7 +70,7 @@ func FindFederatedUser(ctx context.Context, externalID string,
 	if err != nil {
 		return nil, nil, err
 	} else if !has {
-		return nil, nil, fmt.Errorf("User %v for federated user is missing", federatedUser.UserID)
+		return nil, nil, fmt.Errorf("FederatedUser table contains entry for user ID %v, but no user with this ID exists", federatedUser.UserID)
 	}
 
 	if res, err := validation.IsValid(*user); !res {
@@ -77,7 +82,145 @@ func FindFederatedUser(ctx context.Context, externalID string,
 	return user, federatedUser, nil
 }
 
+func GetFederatedUser(ctx context.Context, externalID string, federationHostID int64) (*User, *FederatedUser, error) {
+	user, federatedUser, err := FindFederatedUser(ctx, externalID, federationHostID)
+	if err != nil {
+		return nil, nil, err
+	} else if federatedUser == nil {
+		return nil, nil, fmt.Errorf("FederatedUser not found (given externalId: %v, federationHostId: %v)", externalID, federationHostID)
+	}
+	return user, federatedUser, nil
+}
+
+func GetFederatedUserByUserID(ctx context.Context, userID int64) (*User, *FederatedUser, error) {
+	federatedUser := new(FederatedUser)
+	user := new(User)
+	has, err := db.GetEngine(ctx).Where("user_id=?", userID).Get(federatedUser)
+	if err != nil {
+		return nil, nil, err
+	} else if !has {
+		return nil, nil, fmt.Errorf("FederatedUser table does not contain entry for user ID: %v", federatedUser.UserID)
+	}
+	has, err = db.GetEngine(ctx).ID(federatedUser.UserID).Get(user)
+	if err != nil {
+		return nil, nil, err
+	} else if !has {
+		return nil, nil, fmt.Errorf("FederatedUser table contains entry for user ID %v, but no user with this ID exists", federatedUser.UserID)
+	}
+
+	if res, err := validation.IsValid(*user); !res {
+		return nil, nil, err
+	}
+	if res, err := validation.IsValid(*federatedUser); !res {
+		return nil, nil, err
+	}
+	return user, federatedUser, nil
+}
+
+func FindFederatedUserByKeyID(ctx context.Context, keyID string) (*User, *FederatedUser, error) {
+	federatedUser := new(FederatedUser)
+	user := new(User)
+	has, err := db.GetEngine(ctx).Where("key_id=?", keyID).Get(federatedUser)
+	if err != nil {
+		return nil, nil, err
+	} else if !has {
+		return nil, nil, nil
+	}
+	has, err = db.GetEngine(ctx).ID(federatedUser.UserID).Get(user)
+	if err != nil {
+		return nil, nil, err
+	} else if !has {
+		return nil, nil, fmt.Errorf("FederatedUser table contains entry for user ID %v, but no user with this ID exists", federatedUser.UserID)
+	}
+
+	if res, err := validation.IsValid(*user); !res {
+		return nil, nil, err
+	}
+	if res, err := validation.IsValid(*federatedUser); !res {
+		return nil, nil, err
+	}
+
+	return user, federatedUser, nil
+}
+
+func UpdateFederatedUser(ctx context.Context, federatedUser *FederatedUser) error {
+	if res, err := validation.IsValid(federatedUser); !res {
+		return err
+	}
+	_, err := db.GetEngine(ctx).ID(federatedUser.ID).Update(federatedUser)
+	return err
+}
+
 func DeleteFederatedUser(ctx context.Context, userID int64) error {
 	_, err := db.GetEngine(ctx).Delete(&FederatedUser{UserID: userID})
 	return err
 }
+
+func GetFollowersForUser(ctx context.Context, user *User) ([]*FederatedUserFollower, error) {
+	if res, err := validation.IsValid(user); !res {
+		return nil, err
+	}
+	followers := make([]*FederatedUserFollower, 0, 8)
+
+	err := db.GetEngine(ctx).
+		Where("followed_user_id = ?", user.ID).
+		Find(&followers)
+	if err != nil {
+		return nil, err
+	}
+	for _, element := range followers {
+		if res, err := validation.IsValid(*element); !res {
+			return nil, err
+		}
+	}
+	return followers, nil
+}
+
+func AddFollower(ctx context.Context, followedUser *User, followingUser *FederatedUser) (*FederatedUserFollower, error) {
+	if res, err := validation.IsValid(followedUser); !res {
+		return nil, err
+	}
+	if res, err := validation.IsValid(followingUser); !res {
+		return nil, err
+	}
+
+	federatedUserFollower, err := NewFederatedUserFollower(followedUser.ID, followingUser.UserID)
+	if err != nil {
+		return nil, err
+	}
+	_, err = db.GetEngine(ctx).Insert(&federatedUserFollower)
+	if err != nil {
+		return nil, err
+	}
+
+	return &federatedUserFollower, err
+}
+
+func RemoveFollower(ctx context.Context, followedUser *User, followingUser *FederatedUser) error {
+	if res, err := validation.IsValid(followedUser); !res {
+		return err
+	}
+	if res, err := validation.IsValid(followingUser); !res {
+		return err
+	}
+
+	_, err := db.GetEngine(ctx).Delete(&FederatedUserFollower{
+		FollowedUserID:  followedUser.ID,
+		FollowingUserID: followingUser.UserID,
+	})
+	return err
+}
+
+func IsFollowingAp(ctx context.Context, followedUser *User, followingUser *FederatedUser) (bool, error) {
+	if res, err := validation.IsValid(followedUser); !res {
+		return false, err
+	}
+	if res, err := validation.IsValid(followingUser); !res {
+		return false, err
+	}
+
+	return db.GetEngine(ctx).Get(&FederatedUserFollower{
+		FollowedUserID:  followedUser.ID,
+		FollowingUserID: followingUser.UserID,
+	})
+}
diff --git a/models/user/user_system.go b/models/user/user_system.go
index f1585b512a..11f54591b7 100644
--- a/models/user/user_system.go
+++ b/models/user/user_system.go
@@ -12,6 +12,13 @@ import (
 	"forgejo.org/modules/structs"
 )
 
+// IsSystem returns true if the user has a fixed
+// negative ID, is never stored in the database and
+// is generated on the fly when needed.
+func (u *User) IsSystem() bool {
+	return u.IsGhost() || u.IsActions()
+}
+
 const (
 	GhostUserID        = -1
 	GhostUserName      = "Ghost"
@@ -73,30 +80,30 @@ func (u *User) IsActions() bool {
 }
 
 const (
-	APActorUserID   = -3
-	APActorUserName = "actor"
-	APActorEmail    = "noreply@forgejo.org"
+	APServerActorUserID   = -3
+	APServerActorUserName = "actor"
+	APServerActorEmail    = "noreply@forgejo.org"
 )
 
-func NewAPActorUser() *User {
+func NewAPServerActor() *User {
 	return &User{
-		ID:               APActorUserID,
-		Name:             APActorUserName,
-		LowerName:        APActorUserName,
+		ID:               APServerActorUserID,
+		Name:             APServerActorUserName,
+		LowerName:        APServerActorUserName,
 		IsActive:         true,
-		Email:            APActorEmail,
+		Email:            APServerActorEmail,
 		KeepEmailPrivate: true,
-		LoginName:        APActorUserName,
+		LoginName:        APServerActorUserName,
 		Type:             UserTypeIndividual,
 		Visibility:       structs.VisibleTypePublic,
 	}
 }
 
-func APActorUserAPActorID() string {
+func APServerActorID() string {
 	path, _ := url.JoinPath(setting.AppURL, "/api/v1/activitypub/actor")
 	return path
 }
 
-func (u *User) IsAPActor() bool {
-	return u != nil && u.ID == APActorUserID
+func (u *User) IsAPServerActor() bool {
+	return u != nil && u.ID == APServerActorUserID
 }
diff --git a/models/user/user_test.go b/models/user/user_test.go
index 63a12b788f..5b0c9676de 100644
--- a/models/user/user_test.go
+++ b/models/user/user_test.go
@@ -46,6 +46,28 @@ func TestIsValidUserID(t *testing.T) {
 	assert.True(t, user_model.IsValidUserID(200))
 }
 
+func TestUserLinks(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	assert.Equal(t, "/", user1.DashboardLink())
+	assert.Equal(t, "/user1", user1.HomeLink())
+	assert.Equal(t, "https://try.gitea.io/user1", user1.HTMLURL())
+	assert.Empty(t, user1.OrganisationLink())
+
+	org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	assert.Equal(t, "/org/org3/dashboard", org3.DashboardLink())
+	assert.Equal(t, "/org3", org3.HomeLink())
+	assert.Equal(t, "https://try.gitea.io/org3", org3.HTMLURL())
+	assert.Equal(t, "/org/org3", org3.OrganisationLink())
+
+	ghost := user_model.NewGhostUser()
+	assert.Empty(t, ghost.DashboardLink())
+	assert.Empty(t, ghost.HomeLink())
+	assert.Empty(t, ghost.HTMLURL())
+	assert.Empty(t, ghost.OrganisationLink())
+}
+
 func TestGetUserFromMap(t *testing.T) {
 	id := int64(200)
 	idMap := map[int64]*user_model.User{
@@ -138,9 +160,21 @@ func TestAPActorID(t *testing.T) {
 	user := user_model.User{ID: 1}
 	url := user.APActorID()
 	expected := "https://try.gitea.io/api/v1/activitypub/user-id/1"
-	if url != expected {
-		t.Errorf("unexpected APActorID, expected: %q, actual: %q", expected, url)
-	}
+	assert.Equal(t, expected, url)
+}
+
+func TestAPActorID_APActorID(t *testing.T) {
+	user := user_model.User{ID: user_model.APServerActorUserID}
+	url := user.APActorID()
+	expected := "https://try.gitea.io/api/v1/activitypub/actor"
+	assert.Equal(t, expected, url)
+}
+
+func TestKeyID(t *testing.T) {
+	user := user_model.User{ID: 1}
+	url := user.KeyID()
+	expected := "https://try.gitea.io/api/v1/activitypub/user-id/1#main-key"
+	assert.Equal(t, expected, url)
 }
 
 func TestSearchUsers(t *testing.T) {
@@ -152,7 +186,7 @@ func TestSearchUsers(t *testing.T) {
 		cassText := fmt.Sprintf("ids: %v, opts: %v", expectedUserOrOrgIDs, opts)
 		if assert.Len(t, users, len(expectedUserOrOrgIDs), "case: %s", cassText) {
 			for i, expectedID := range expectedUserOrOrgIDs {
-				assert.EqualValues(t, expectedID, users[i].ID, "case: %s", cassText)
+				assert.Equal(t, expectedID, users[i].ID, "case: %s", cassText)
 			}
 		}
 	}
@@ -255,7 +289,7 @@ func TestHashPasswordDeterministic(t *testing.T) {
 			r2 := u.Passwd
 
 			assert.NotEqual(t, r1, r2)
-			assert.True(t, u.ValidatePassword(pass))
+			assert.True(t, u.ValidatePassword(t.Context(), pass))
 		}
 	}
 }
@@ -312,7 +346,7 @@ func TestCreateUserInvalidEmail(t *testing.T) {
 
 	err := user_model.CreateUser(db.DefaultContext, user)
 	require.Error(t, err)
-	assert.True(t, validation.IsErrEmailCharIsNotSupported(err))
+	assert.True(t, validation.IsErrEmailInvalid(err))
 }
 
 func TestCreateUserEmailAlreadyUsed(t *testing.T) {
@@ -603,28 +637,161 @@ func TestGetAllAdmins(t *testing.T) {
 	assert.Equal(t, int64(1), admins[0].ID)
 }
 
+func TestMustHaveTwoFactor(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+	ghostUser := user_model.NewGhostUser()
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		// this should be the default, so don't have to set the variable
+		assert.False(t, adminUser.MustHaveTwoFactor())
+		assert.False(t, normalUser.MustHaveTwoFactor())
+		assert.False(t, restrictedUser.MustHaveTwoFactor())
+		assert.False(t, org.MustHaveTwoFactor())
+		assert.False(t, ghostUser.MustHaveTwoFactor())
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		assert.True(t, adminUser.MustHaveTwoFactor())
+		assert.True(t, normalUser.MustHaveTwoFactor())
+		assert.True(t, restrictedUser.MustHaveTwoFactor())
+		assert.False(t, org.MustHaveTwoFactor())
+		assert.True(t, ghostUser.MustHaveTwoFactor())
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		assert.True(t, adminUser.MustHaveTwoFactor())
+		assert.False(t, normalUser.MustHaveTwoFactor())
+		assert.False(t, restrictedUser.MustHaveTwoFactor())
+		assert.False(t, org.MustHaveTwoFactor())
+		assert.False(t, ghostUser.MustHaveTwoFactor())
+	})
+}
+
+func TestIsAccessAllowed(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	runTest := func(t *testing.T, user *user_model.User, useTOTP, accessAllowed bool) {
+		t.Helper()
+		if useTOTP {
+			unittest.AssertSuccessfulInsert(t, &auth.TwoFactor{UID: user.ID})
+			defer unittest.AssertSuccessfulDelete(t, &auth.TwoFactor{UID: user.ID})
+		}
+
+		assert.Equal(t, accessAllowed, user.IsAccessAllowed(t.Context()))
+	}
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	inactiveUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 9})
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 17})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+	prohibitLoginUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 37})
+	ghostUser := user_model.NewGhostUser()
+
+	// users with enabled WebAuthn
+	normalWebAuthnUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 32})
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		// this should be the default, so don't have to set the variable
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, true)
+			runTest(t, normalUser, false, true)
+			runTest(t, inactiveUser, false, false)
+			runTest(t, org, false, true)
+			runTest(t, restrictedUser, false, true)
+			runTest(t, prohibitLoginUser, false, false)
+			runTest(t, ghostUser, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, normalWebAuthnUser, false, true)
+
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, inactiveUser, true, false)
+			runTest(t, org, true, true)
+			runTest(t, restrictedUser, true, true)
+			runTest(t, prohibitLoginUser, true, false)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false)
+			runTest(t, normalUser, false, false)
+			runTest(t, inactiveUser, false, false)
+			runTest(t, org, false, true)
+			runTest(t, restrictedUser, false, false)
+			runTest(t, prohibitLoginUser, false, false)
+			runTest(t, ghostUser, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, normalWebAuthnUser, false, true)
+
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, inactiveUser, true, false)
+			runTest(t, org, true, true)
+			runTest(t, restrictedUser, true, true)
+			runTest(t, prohibitLoginUser, true, false)
+		})
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false)
+			runTest(t, normalUser, false, true)
+			runTest(t, inactiveUser, false, false)
+			runTest(t, org, false, true)
+			runTest(t, restrictedUser, false, true)
+			runTest(t, prohibitLoginUser, false, false)
+			runTest(t, ghostUser, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, normalWebAuthnUser, false, true)
+
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, inactiveUser, true, false)
+			runTest(t, org, true, true)
+			runTest(t, restrictedUser, true, true)
+			runTest(t, prohibitLoginUser, true, false)
+		})
+	})
+}
+
 func Test_ValidateUser(t *testing.T) {
-	oldSetting := setting.Service.AllowedUserVisibilityModesSlice
-	defer func() {
-		setting.Service.AllowedUserVisibilityModesSlice = oldSetting
-	}()
-	setting.Service.AllowedUserVisibilityModesSlice = []bool{true, false, true}
+	defer test.MockVariableValue(&setting.Service.AllowedUserVisibilityModesSlice, []bool{true, false, true})()
+
 	kases := map[*user_model.User]bool{
 		{ID: 1, Visibility: structs.VisibleTypePublic}:  true,
 		{ID: 2, Visibility: structs.VisibleTypeLimited}: false,
 		{ID: 2, Visibility: structs.VisibleTypePrivate}: true,
 	}
 	for kase, expected := range kases {
-		assert.EqualValues(t, expected, nil == user_model.ValidateUser(kase))
+		assert.Equal(t, expected, nil == user_model.ValidateUser(kase))
 	}
 }
 
 func Test_NormalizeUserFromEmail(t *testing.T) {
-	oldSetting := setting.Service.AllowDotsInUsernames
-	defer func() {
-		setting.Service.AllowDotsInUsernames = oldSetting
-	}()
-	setting.Service.AllowDotsInUsernames = true
+	defer test.MockVariableValue(&setting.Service.AllowDotsInUsernames, true)()
+
 	testCases := []struct {
 		Input             string
 		Expected          string
@@ -633,6 +800,7 @@ func Test_NormalizeUserFromEmail(t *testing.T) {
 		{"test", "test", true},
 		{"Sinéad.O'Connor", "Sinead.OConnor", true},
 		{"Æsir", "AEsir", true},
+		{"Flußpferd", "Flusspferd", true},
 		// \u00e9\u0065\u0301
 		{"éé", "ee", true},
 		{"Awareness Hub", "Awareness-Hub", true},
@@ -643,7 +811,7 @@ func Test_NormalizeUserFromEmail(t *testing.T) {
 	for _, testCase := range testCases {
 		normalizedName, err := user_model.NormalizeUserName(testCase.Input)
 		require.NoError(t, err)
-		assert.EqualValues(t, testCase.Expected, normalizedName)
+		assert.Equal(t, testCase.Expected, normalizedName)
 		if testCase.IsNormalizedValid {
 			require.NoError(t, user_model.IsUsableUsername(normalizedName))
 		} else {
@@ -673,13 +841,13 @@ func TestEmailTo(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.result, func(t *testing.T) {
 			testUser := &user_model.User{FullName: testCase.fullName, Email: testCase.mail}
-			assert.EqualValues(t, testCase.result, testUser.EmailTo())
+			assert.Equal(t, testCase.result, testUser.EmailTo())
 		})
 	}
 
 	t.Run("Override user's email", func(t *testing.T) {
 		testUser := &user_model.User{FullName: "Christine Jorgensen", Email: "christine@test.com"}
-		assert.EqualValues(t, `"Christine Jorgensen" <christine@example.org>`, testUser.EmailTo("christine@example.org"))
+		assert.Equal(t, `"Christine Jorgensen" <christine@example.org>`, testUser.EmailTo("christine@example.org"))
 	})
 }
 
@@ -689,12 +857,7 @@ func TestDisabledUserFeatures(t *testing.T) {
 	testValues := container.SetOf(setting.UserFeatureDeletion,
 		setting.UserFeatureManageSSHKeys,
 		setting.UserFeatureManageGPGKeys)
-
-	oldSetting := setting.Admin.ExternalUserDisableFeatures
-	defer func() {
-		setting.Admin.ExternalUserDisableFeatures = oldSetting
-	}()
-	setting.Admin.ExternalUserDisableFeatures = testValues
+	defer test.MockVariableValue(&setting.Admin.ExternalUserDisableFeatures, testValues)()
 
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 
@@ -735,7 +898,7 @@ func TestGenerateEmailAuthorizationCode(t *testing.T) {
 	authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation)
 	require.NoError(t, err)
 	assert.False(t, authToken.IsExpired())
-	assert.EqualValues(t, authToken.HashedValidator, auth.HashValidator(rawValidator))
+	assert.Equal(t, authToken.HashedValidator, auth.HashValidator(rawValidator))
 
 	authToken.Expiry = authToken.Expiry.Add(-int64(setting.Service.ActiveCodeLives) * 60)
 	assert.True(t, authToken.IsExpired())
@@ -762,7 +925,7 @@ func TestVerifyUserAuthorizationToken(t *testing.T) {
 	t.Run("No delete", func(t *testing.T) {
 		u, _, err := user_model.VerifyUserAuthorizationToken(db.DefaultContext, code, auth.UserActivation)
 		require.NoError(t, err)
-		assert.EqualValues(t, user.ID, u.ID)
+		assert.Equal(t, user.ID, u.ID)
 
 		authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation)
 		require.NoError(t, err)
@@ -772,7 +935,7 @@ func TestVerifyUserAuthorizationToken(t *testing.T) {
 	t.Run("Delete", func(t *testing.T) {
 		u, deleteToken, err := user_model.VerifyUserAuthorizationToken(db.DefaultContext, code, auth.UserActivation)
 		require.NoError(t, err)
-		assert.EqualValues(t, user.ID, u.ID)
+		assert.Equal(t, user.ID, u.ID)
 		require.NoError(t, deleteToken())
 
 		authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation)
@@ -802,14 +965,14 @@ func TestPronounsPrivacy(t *testing.T) {
 		user.Pronouns = ""
 		user.KeepPronounsPrivate = false
 
-		assert.Equal(t, "", user.GetPronouns(false))
+		assert.Empty(t, user.GetPronouns(false))
 	})
 	t.Run("EmptyPronounsIfSetButPrivateAndNotLoggedIn", func(t *testing.T) {
 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 		user.Pronouns = "any"
 		user.KeepPronounsPrivate = true
 
-		assert.Equal(t, "", user.GetPronouns(false))
+		assert.Empty(t, user.GetPronouns(false))
 	})
 	t.Run("ReturnPronounsIfSetAndNotPrivateAndNotLoggedIn", func(t *testing.T) {
 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
diff --git a/models/webhook/hooktask.go b/models/webhook/hooktask.go
index 58600cb8bf..f5f73842ae 100644
--- a/models/webhook/hooktask.go
+++ b/models/webhook/hooktask.go
@@ -198,7 +198,8 @@ func MarkTaskDelivered(ctx context.Context, task *HookTask) (bool, error) {
 func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType, olderThan time.Duration, numberToKeep int) error {
 	log.Trace("Doing: CleanupHookTaskTable")
 
-	if cleanupType == OlderThan {
+	switch cleanupType {
+	case OlderThan:
 		deleteOlderThan := time.Now().Add(-olderThan).UnixNano()
 		deletes, err := db.GetEngine(ctx).
 			Where("is_delivered = ? and delivered < ?", true, deleteOlderThan).
@@ -207,7 +208,7 @@ func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType,
 			return err
 		}
 		log.Trace("Deleted %d rows from hook_task", deletes)
-	} else if cleanupType == PerWebhook {
+	case PerWebhook:
 		hookIDs := make([]int64, 0, 10)
 		err := db.GetEngine(ctx).
 			Table("webhook").
diff --git a/models/webhook/webhook.go b/models/webhook/webhook.go
index 0691f231b2..1f81caf424 100644
--- a/models/webhook/webhook.go
+++ b/models/webhook/webhook.go
@@ -170,139 +170,157 @@ func (w *Webhook) UpdateEvent() error {
 // HasCreateEvent returns true if hook enabled create event.
 func (w *Webhook) HasCreateEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Create)
+		(w.ChooseEvents && w.Create)
 }
 
 // HasDeleteEvent returns true if hook enabled delete event.
 func (w *Webhook) HasDeleteEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Delete)
+		(w.ChooseEvents && w.Delete)
 }
 
 // HasForkEvent returns true if hook enabled fork event.
 func (w *Webhook) HasForkEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Fork)
+		(w.ChooseEvents && w.Fork)
 }
 
 // HasIssuesEvent returns true if hook enabled issues event.
 func (w *Webhook) HasIssuesEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Issues)
+		(w.ChooseEvents && w.Issues)
 }
 
 // HasIssuesAssignEvent returns true if hook enabled issues assign event.
 func (w *Webhook) HasIssuesAssignEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.IssueAssign)
+		(w.ChooseEvents && w.IssueAssign)
 }
 
 // HasIssuesLabelEvent returns true if hook enabled issues label event.
 func (w *Webhook) HasIssuesLabelEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.IssueLabel)
+		(w.ChooseEvents && w.IssueLabel)
 }
 
 // HasIssuesMilestoneEvent returns true if hook enabled issues milestone event.
 func (w *Webhook) HasIssuesMilestoneEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.IssueMilestone)
+		(w.ChooseEvents && w.IssueMilestone)
 }
 
 // HasIssueCommentEvent returns true if hook enabled issue_comment event.
 func (w *Webhook) HasIssueCommentEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.IssueComment)
+		(w.ChooseEvents && w.IssueComment)
 }
 
 // HasPushEvent returns true if hook enabled push event.
 func (w *Webhook) HasPushEvent() bool {
 	return w.PushOnly || w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Push)
+		(w.ChooseEvents && w.Push)
 }
 
 // HasPullRequestEvent returns true if hook enabled pull request event.
 func (w *Webhook) HasPullRequestEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequest)
+		(w.ChooseEvents && w.PullRequest)
 }
 
 // HasPullRequestAssignEvent returns true if hook enabled pull request assign event.
 func (w *Webhook) HasPullRequestAssignEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestAssign)
+		(w.ChooseEvents && w.PullRequestAssign)
 }
 
 // HasPullRequestLabelEvent returns true if hook enabled pull request label event.
 func (w *Webhook) HasPullRequestLabelEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestLabel)
+		(w.ChooseEvents && w.PullRequestLabel)
 }
 
 // HasPullRequestMilestoneEvent returns true if hook enabled pull request milestone event.
 func (w *Webhook) HasPullRequestMilestoneEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestMilestone)
+		(w.ChooseEvents && w.PullRequestMilestone)
 }
 
 // HasPullRequestCommentEvent returns true if hook enabled pull_request_comment event.
 func (w *Webhook) HasPullRequestCommentEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestComment)
+		(w.ChooseEvents && w.PullRequestComment)
 }
 
 // HasPullRequestApprovedEvent returns true if hook enabled pull request review event.
 func (w *Webhook) HasPullRequestApprovedEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestReview)
+		(w.ChooseEvents && w.PullRequestReview)
 }
 
 // HasPullRequestRejectedEvent returns true if hook enabled pull request review event.
 func (w *Webhook) HasPullRequestRejectedEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestReview)
+		(w.ChooseEvents && w.PullRequestReview)
 }
 
 // HasPullRequestReviewCommentEvent returns true if hook enabled pull request review event.
 func (w *Webhook) HasPullRequestReviewCommentEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestReview)
+		(w.ChooseEvents && w.PullRequestReview)
 }
 
 // HasPullRequestSyncEvent returns true if hook enabled pull request sync event.
 func (w *Webhook) HasPullRequestSyncEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestSync)
+		(w.ChooseEvents && w.PullRequestSync)
 }
 
 // HasWikiEvent returns true if hook enabled wiki event.
 func (w *Webhook) HasWikiEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvent.Wiki)
+		(w.ChooseEvents && w.Wiki)
 }
 
 // HasReleaseEvent returns if hook enabled release event.
 func (w *Webhook) HasReleaseEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Release)
+		(w.ChooseEvents && w.Release)
 }
 
 // HasRepositoryEvent returns if hook enabled repository event.
 func (w *Webhook) HasRepositoryEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Repository)
+		(w.ChooseEvents && w.Repository)
 }
 
 // HasPackageEvent returns if hook enabled package event.
 func (w *Webhook) HasPackageEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.Package)
+		(w.ChooseEvents && w.Package)
+}
+
+// HasActionRunFailureEvent returns if hook enabled action failure event.
+func (w *Webhook) HasActionRunFailureEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.ActionRunFailure)
+}
+
+// HasActionRunRecoverEvent returns if hook enabled action recover event.
+func (w *Webhook) HasActionRunRecoverEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.ActionRunRecover)
+}
+
+// HasActionRunSuccessEvent returns if hook enabled action success event.
+func (w *Webhook) HasActionRunSuccessEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.ActionRunSuccess)
 }
 
 // HasPullRequestReviewRequestEvent returns true if hook enabled pull request review request event.
 func (w *Webhook) HasPullRequestReviewRequestEvent() bool {
 	return w.SendEverything ||
-		(w.ChooseEvents && w.HookEvents.PullRequestReviewRequest)
+		(w.ChooseEvents && w.PullRequestReviewRequest)
 }
 
 // EventCheckers returns event checkers
@@ -337,6 +355,9 @@ func (w *Webhook) EventCheckers() []struct {
 		{w.HasReleaseEvent, webhook_module.HookEventRelease},
 		{w.HasPackageEvent, webhook_module.HookEventPackage},
 		{w.HasPullRequestReviewRequestEvent, webhook_module.HookEventPullRequestReviewRequest},
+		{w.HasActionRunFailureEvent, webhook_module.HookEventActionRunFailure},
+		{w.HasActionRunRecoverEvent, webhook_module.HookEventActionRunRecover},
+		{w.HasActionRunSuccessEvent, webhook_module.HookEventActionRunSuccess},
 	}
 }
 
diff --git a/models/webhook/webhook_test.go b/models/webhook/webhook_test.go
index 7f0abbd8bb..60cd2b333b 100644
--- a/models/webhook/webhook_test.go
+++ b/models/webhook/webhook_test.go
@@ -74,7 +74,8 @@ func TestWebhook_EventsArray(t *testing.T) {
 		"pull_request", "pull_request_assign", "pull_request_label", "pull_request_milestone",
 		"pull_request_comment", "pull_request_review_approved", "pull_request_review_rejected",
 		"pull_request_review_comment", "pull_request_sync", "wiki", "repository", "release",
-		"package", "pull_request_review_request",
+		"package", "pull_request_review_request", "action_run_failure",
+		"action_run_recover", "action_run_success",
 	},
 		(&Webhook{
 			HookEvent: &webhook_module.HookEvent{SendEverything: true},
@@ -89,15 +90,78 @@ func TestWebhook_EventsArray(t *testing.T) {
 }
 
 func TestCreateWebhook(t *testing.T) {
-	hook := &Webhook{
-		RepoID:      3,
-		URL:         "www.example.com/unit_test",
-		ContentType: ContentTypeJSON,
-		Events:      `{"push_only":false,"send_everything":false,"choose_events":false,"events":{"create":false,"push":true,"pull_request":true}}`,
-	}
-	unittest.AssertNotExistsBean(t, hook)
-	require.NoError(t, CreateWebhook(db.DefaultContext, hook))
-	unittest.AssertExistsAndLoadBean(t, hook)
+	t.Run("Some chosen events 1", func(t *testing.T) {
+		hook := &Webhook{
+			RepoID:      3,
+			URL:         "https://www.example.com/unit_test",
+			ContentType: ContentTypeJSON,
+			Events:      `{"push_only":false,"send_everything":false,"choose_events":true,"events":{"create":false,"push":true,"pull_request":true}}`,
+		}
+		unittest.AssertNotExistsBean(t, hook)
+		require.NoError(t, CreateWebhook(db.DefaultContext, hook))
+		hookFromDb := unittest.AssertExistsAndLoadBean(t, hook)
+		assert.Equal(t, []string{
+			string(webhook_module.HookEventPush),
+			string(webhook_module.HookEventPullRequest),
+		}, hookFromDb.EventsArray())
+	})
+
+	t.Run("Some chosen events 2", func(t *testing.T) {
+		hook := &Webhook{
+			RepoID:      3,
+			URL:         "https://www.example.com/unit_test",
+			ContentType: ContentTypeJSON,
+			Events:      `{"push_only":false,"send_everything":false,"choose_events":true,"events":{"action_run_recover":false,"action_run_success":true}}`,
+		}
+		unittest.AssertNotExistsBean(t, hook)
+		require.NoError(t, CreateWebhook(db.DefaultContext, hook))
+		hookFromDb := unittest.AssertExistsAndLoadBean(t, hook)
+		assert.Equal(t, []string{string(webhook_module.HookEventActionRunSuccess)}, hookFromDb.EventsArray())
+	})
+
+	t.Run("All events", func(t *testing.T) {
+		hook := &Webhook{
+			RepoID:      3,
+			URL:         "https://www.example.com/unit_test",
+			ContentType: ContentTypeJSON,
+			Events:      `{"push_only":false,"send_everything":false,"choose_events":true,"events":{"create":true,"delete":true,"fork":true,"issues":true,"issue_assign":true,"issue_label":true,"issue_milestone":true,"issue_comment":true,"push":true,"pull_request":true,"pull_request_assign":true,"pull_request_label":true,"pull_request_milestone":true,"pull_request_comment":true,"pull_request_review":true,"pull_request_sync":true,"pull_request_review_request":true,"wiki":true,"repository":true,"release":true,"package":true,"action_run_failure":true,"action_run_recover":true,"action_run_success":true}}`,
+		}
+		unittest.AssertNotExistsBean(t, hook)
+		require.NoError(t, CreateWebhook(db.DefaultContext, hook))
+		hookFromDb := unittest.AssertExistsAndLoadBean(t, hook)
+		assert.Equal(t, []string{
+			string(webhook_module.HookEventCreate),
+			string(webhook_module.HookEventDelete),
+			string(webhook_module.HookEventFork),
+			string(webhook_module.HookEventPush),
+			string(webhook_module.HookEventIssues),
+			string(webhook_module.HookEventIssueAssign),
+			string(webhook_module.HookEventIssueLabel),
+			string(webhook_module.HookEventIssueMilestone),
+			string(webhook_module.HookEventIssueComment),
+			string(webhook_module.HookEventPullRequest),
+			string(webhook_module.HookEventPullRequestAssign),
+			string(webhook_module.HookEventPullRequestLabel),
+			string(webhook_module.HookEventPullRequestMilestone),
+			string(webhook_module.HookEventPullRequestComment),
+			string(webhook_module.HookEventPullRequestReviewApproved),
+			string(webhook_module.HookEventPullRequestReviewRejected),
+			string(webhook_module.HookEventPullRequestReviewComment),
+			string(webhook_module.HookEventPullRequestSync),
+			string(webhook_module.HookEventWiki),
+			string(webhook_module.HookEventRepository),
+			string(webhook_module.HookEventRelease),
+			string(webhook_module.HookEventPackage),
+			string(webhook_module.HookEventPullRequestReviewRequest),
+			// these aren't webhook event types
+			// string(webhook_module.HookEventSchedule),
+			// string(webhook_module.HookEventWorkflowDispatch),
+			string(webhook_module.HookEventActionRunFailure),
+			string(webhook_module.HookEventActionRunRecover),
+			string(webhook_module.HookEventActionRunSuccess),
+		},
+			hookFromDb.EventsArray())
+	})
 }
 
 func TestGetWebhookByRepoID(t *testing.T) {
diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go
index 43948cce5c..26d862ac4a 100644
--- a/modules/actions/workflows.go
+++ b/modules/actions/workflows.go
@@ -13,10 +13,10 @@ import (
 	api "forgejo.org/modules/structs"
 	webhook_module "forgejo.org/modules/webhook"
 
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/model"
+	"code.forgejo.org/forgejo/runner/v9/act/workflowpattern"
 	"github.com/gobwas/glob"
-	"github.com/nektos/act/pkg/jobparser"
-	"github.com/nektos/act/pkg/model"
-	"github.com/nektos/act/pkg/workflowpattern"
 	"gopkg.in/yaml.v3"
 )
 
@@ -86,7 +86,7 @@ func GetContentFromEntry(entry *git.TreeEntry) ([]byte, error) {
 }
 
 func GetEventsFromContent(content []byte) ([]*jobparser.Event, error) {
-	workflow, err := model.ReadWorkflow(bytes.NewReader(content))
+	workflow, err := model.ReadWorkflow(bytes.NewReader(content), false)
 	if err != nil {
 		return nil, err
 	}
@@ -122,6 +122,14 @@ func DetectWorkflows(
 		events, err := GetEventsFromContent(content)
 		if err != nil {
 			log.Warn("ignore invalid workflow %q: %v", entry.Name(), err)
+			dwf := &DetectedWorkflow{
+				EntryName: entry.Name(),
+				TriggerEvent: &jobparser.Event{
+					Name: triggedEvent.Event(),
+				},
+				Content: content,
+			}
+			workflows = append(workflows, dwf)
 			continue
 		}
 		for _, evt := range events {
@@ -315,6 +323,10 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
 				matchTimes++
 			}
 		case "paths":
+			if refName.IsTag() {
+				matchTimes++
+				break
+			}
 			filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
 			if err != nil {
 				log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err)
@@ -328,6 +340,10 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
 				}
 			}
 		case "paths-ignore":
+			if refName.IsTag() {
+				matchTimes++
+				break
+			}
 			filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
 			if err != nil {
 				log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err)
diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go
index b85ed7fd56..9068ce31c3 100644
--- a/modules/actions/workflows_test.go
+++ b/modules/actions/workflows_test.go
@@ -150,6 +150,24 @@ func TestDetectMatched(t *testing.T) {
 			yamlOn:         "on: workflow_dispatch",
 			expected:       true,
 		},
+		{
+			desc:           "push to tag matches workflow with paths condition (should skip paths check)",
+			triggeredEvent: webhook_module.HookEventPush,
+			payload: &api.PushPayload{
+				Ref:    "refs/tags/v1.0.0",
+				Before: "0000000",
+				Commits: []*api.PayloadCommit{
+					{
+						ID:      "abcdef123456",
+						Added:   []string{"src/main.go"},
+						Message: "Release v1.0.0",
+					},
+				},
+			},
+			commit:   nil,
+			yamlOn:   "on:\n  push:\n    paths:\n      - src/**",
+			expected: true,
+		},
 	}
 
 	for _, tc := range testCases {
diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go
index d43e9c2bb0..11a2fd94c3 100644
--- a/modules/activitypub/client.go
+++ b/modules/activitypub/client.go
@@ -66,6 +66,11 @@ type ClientFactory struct {
 
 // NewClient function
 func NewClientFactory() (c *ClientFactory, err error) {
+	return NewClientFactoryWithTimeout(5 * time.Second)
+}
+
+// NewClient function
+func NewClientFactoryWithTimeout(timeout time.Duration) (c *ClientFactory, err error) {
 	if err = containsRequiredHTTPHeaders(http.MethodGet, setting.Federation.GetHeaders); err != nil {
 		return nil, err
 	} else if err = containsRequiredHTTPHeaders(http.MethodPost, setting.Federation.PostHeaders); err != nil {
@@ -77,7 +82,7 @@ func NewClientFactory() (c *ClientFactory, err error) {
 			Transport: &http.Transport{
 				Proxy: proxy.Proxy(),
 			},
-			Timeout: 5 * time.Second,
+			Timeout: timeout,
 		},
 		algs:        setting.HttpsigAlgs,
 		digestAlg:   httpsig.DigestAlgorithm(setting.Federation.DigestAlgorithm),
@@ -89,6 +94,7 @@ func NewClientFactory() (c *ClientFactory, err error) {
 
 type APClientFactory interface {
 	WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error)
+	WithKeysDirect(ctx context.Context, privateKey, pubID string) (APClient, error)
 }
 
 // Client struct
@@ -103,12 +109,8 @@ type Client struct {
 }
 
 // NewRequest function
-func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error) {
-	priv, err := GetPrivateKey(ctx, user)
-	if err != nil {
-		return nil, err
-	}
-	privPem, _ := pem.Decode([]byte(priv))
+func (cf *ClientFactory) WithKeysDirect(ctx context.Context, privateKey, pubID string) (APClient, error) {
+	privPem, _ := pem.Decode([]byte(privateKey))
 	privParsed, err := x509.ParsePKCS1PrivateKey(privPem.Bytes)
 	if err != nil {
 		return nil, err
@@ -126,6 +128,14 @@ func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pu
 	return &c, nil
 }
 
+func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error) {
+	priv, err := GetPrivateKey(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	return cf.WithKeysDirect(ctx, priv, pubID)
+}
+
 // NewRequest function
 func (c *Client) newRequest(method string, b []byte, to string) (req *http.Request, err error) {
 	buf := bytes.NewBuffer(b)
@@ -149,12 +159,14 @@ func (c *Client) Post(b []byte, to string) (resp *http.Response, err error) {
 		return nil, err
 	}
 
-	signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, httpsigExpirationTime)
-	if err != nil {
-		return nil, err
-	}
-	if err := signer.SignRequest(c.priv, c.pubID, req, b); err != nil {
-		return nil, err
+	if c.pubID != "" {
+		signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, httpsigExpirationTime)
+		if err != nil {
+			return nil, err
+		}
+		if err := signer.SignRequest(c.priv, c.pubID, req, b); err != nil {
+			return nil, err
+		}
 	}
 
 	resp, err = c.client.Do(req)
@@ -167,12 +179,15 @@ func (c *Client) Get(to string) (resp *http.Response, err error) {
 	if req, err = c.newRequest(http.MethodGet, nil, to); err != nil {
 		return nil, err
 	}
-	signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.getHeaders, httpsig.Signature, httpsigExpirationTime)
-	if err != nil {
-		return nil, err
-	}
-	if err := signer.SignRequest(c.priv, c.pubID, req, nil); err != nil {
-		return nil, err
+
+	if c.pubID != "" {
+		signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.getHeaders, httpsig.Signature, httpsigExpirationTime)
+		if err != nil {
+			return nil, err
+		}
+		if err := signer.SignRequest(c.priv, c.pubID, req, nil); err != nil {
+			return nil, err
+		}
 	}
 
 	resp, err = c.client.Do(req)
@@ -191,10 +206,17 @@ func (c *Client) GetBody(uri string) ([]byte, error) {
 		return nil, err
 	}
 	defer response.Body.Close()
-	body, err := io.ReadAll(response.Body)
+	if response.ContentLength > setting.Federation.MaxSize {
+		return nil, fmt.Errorf("Request returned %d bytes (max allowed incoming size: %d bytes)", response.ContentLength, setting.Federation.MaxSize)
+	} else if response.ContentLength == -1 {
+		log.Warn("Request to %v returned an unknown content length, response may be truncated to %d bytes", uri, setting.Federation.MaxSize)
+	}
+
+	body, err := io.ReadAll(io.LimitReader(response.Body, setting.Federation.MaxSize))
 	if err != nil {
 		return nil, err
 	}
+
 	log.Debug("Client: got body: %v", charLimiter(string(body), 120))
 	return body, nil
 }
diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go
index 8d54ae5e4a..2041f28bb1 100644
--- a/modules/assetfs/layered.go
+++ b/modules/assetfs/layered.go
@@ -5,10 +5,10 @@ package assetfs
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"io/fs"
-	"net/http"
 	"os"
 	"path/filepath"
 	"slices"
@@ -25,7 +25,7 @@ import (
 // Layer represents a layer in a layered asset file-system. It has a name and works like http.FileSystem
 type Layer struct {
 	name      string
-	fs        http.FileSystem
+	fs        fs.FS
 	localPath string
 }
 
@@ -34,10 +34,18 @@ func (l *Layer) Name() string {
 }
 
 // Open opens the named file. The caller is responsible for closing the file.
-func (l *Layer) Open(name string) (http.File, error) {
+func (l *Layer) Open(name string) (fs.File, error) {
 	return l.fs.Open(name)
 }
 
+func (l *Layer) ReadDir(name string) ([]fs.DirEntry, error) {
+	dirEntries, err := fs.ReadDir(l.fs, name)
+	if err != nil && errors.Is(err, fs.ErrNotExist) {
+		err = nil
+	}
+	return dirEntries, err
+}
+
 // Local returns a new Layer with the given name, it serves files from the given local path.
 func Local(name, base string, sub ...string) *Layer {
 	// TODO: the old behavior (StaticRootPath might not be absolute), not ideal, just keep the same as before
@@ -48,11 +56,11 @@ func Local(name, base string, sub ...string) *Layer {
 		panic(fmt.Sprintf("Unable to get absolute path for %q: %v", base, err))
 	}
 	root := util.FilePathJoinAbs(base, sub...)
-	return &Layer{name: name, fs: http.Dir(root), localPath: root}
+	return &Layer{name: name, fs: os.DirFS(root), localPath: root}
 }
 
 // Bindata returns a new Layer with the given name, it serves files from the given bindata asset.
-func Bindata(name string, fs http.FileSystem) *Layer {
+func Bindata(name string, fs fs.FS) *Layer {
 	return &Layer{name: name, fs: fs}
 }
 
@@ -69,7 +77,7 @@ func Layered(layers ...*Layer) *LayeredFS {
 }
 
 // Open opens the named file. The caller is responsible for closing the file.
-func (l *LayeredFS) Open(name string) (http.File, error) {
+func (l *LayeredFS) Open(name string) (fs.File, error) {
 	for _, layer := range l.layers {
 		f, err := layer.Open(name)
 		if err == nil || !os.IsNotExist(err) {
@@ -102,29 +110,18 @@ func (l *LayeredFS) ReadLayeredFile(elems ...string) ([]byte, string, error) {
 	return nil, "", fs.ErrNotExist
 }
 
-func shouldInclude(info fs.FileInfo, fileMode ...bool) bool {
+func shouldInclude(info fs.DirEntry, fileMode ...bool) bool {
 	if util.CommonSkip(info.Name()) {
 		return false
 	}
 	if len(fileMode) == 0 {
 		return true
 	} else if len(fileMode) == 1 {
-		return fileMode[0] == !info.Mode().IsDir()
+		return fileMode[0] == !info.IsDir()
 	}
 	panic("too many arguments for fileMode in shouldInclude")
 }
 
-func readDir(layer *Layer, name string) ([]fs.FileInfo, error) {
-	f, err := layer.Open(name)
-	if os.IsNotExist(err) {
-		return nil, nil
-	} else if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	return f.Readdir(-1)
-}
-
 // ListFiles lists files/directories in the given directory. The fileMode controls the returned files.
 // * omitted: all files and directories will be returned.
 // * true: only files will be returned.
@@ -133,7 +130,7 @@ func readDir(layer *Layer, name string) ([]fs.FileInfo, error) {
 func (l *LayeredFS) ListFiles(name string, fileMode ...bool) ([]string, error) {
 	fileSet := make(container.Set[string])
 	for _, layer := range l.layers {
-		infos, err := readDir(layer, name)
+		infos, err := layer.ReadDir(name)
 		if err != nil {
 			return nil, err
 		}
@@ -162,7 +159,7 @@ func listAllFiles(layers []*Layer, name string, fileMode ...bool) ([]string, err
 	var list func(dir string) error
 	list = func(dir string) error {
 		for _, layer := range layers {
-			infos, err := readDir(layer, dir)
+			infos, err := layer.ReadDir(dir)
 			if err != nil {
 				return err
 			}
diff --git a/modules/assetfs/layered_test.go b/modules/assetfs/layered_test.go
index 58876d9be2..76eeb61d83 100644
--- a/modules/assetfs/layered_test.go
+++ b/modules/assetfs/layered_test.go
@@ -1,4 +1,5 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package assetfs
@@ -53,7 +54,7 @@ func TestLayered(t *testing.T) {
 	require.NoError(t, err)
 	bs, err := io.ReadAll(f)
 	require.NoError(t, err)
-	assert.EqualValues(t, "f1", string(bs))
+	assert.Equal(t, "f1", string(bs))
 	_ = f.Close()
 
 	assertRead := func(expected string, expectedErr error, elems ...string) {
@@ -77,27 +78,27 @@ func TestLayered(t *testing.T) {
 
 	files, err := assets.ListFiles(".", true)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"f1", "f2", "fa"}, files)
+	assert.Equal(t, []string{"f1", "f2", "fa"}, files)
 
 	files, err = assets.ListFiles(".", false)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"d1", "d2", "da"}, files)
+	assert.Equal(t, []string{"d1", "d2", "da"}, files)
 
 	files, err = assets.ListFiles(".")
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"d1", "d2", "da", "f1", "f2", "fa"}, files)
+	assert.Equal(t, []string{"d1", "d2", "da", "f1", "f2", "fa"}, files)
 
 	files, err = assets.ListAllFiles(".", true)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"d1/f", "d2/f", "da/f", "f1", "f2", "fa"}, files)
+	assert.Equal(t, []string{"d1/f", "d2/f", "da/f", "f1", "f2", "fa"}, files)
 
 	files, err = assets.ListAllFiles(".", false)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"d1", "d2", "da", "da/sub1", "da/sub2"}, files)
+	assert.Equal(t, []string{"d1", "d2", "da", "da/sub1", "da/sub2"}, files)
 
 	files, err = assets.ListAllFiles(".")
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"d1", "d1/f",
 		"d2", "d2/f",
 		"da", "da/f", "da/sub1", "da/sub2",
@@ -105,6 +106,33 @@ func TestLayered(t *testing.T) {
 	}, files)
 
 	assert.Empty(t, assets.GetFileLayerName("no-such"))
-	assert.EqualValues(t, "l1", assets.GetFileLayerName("f1"))
-	assert.EqualValues(t, "l2", assets.GetFileLayerName("f2"))
+	assert.Equal(t, "l1", assets.GetFileLayerName("f1"))
+	assert.Equal(t, "l2", assets.GetFileLayerName("f2"))
+}
+
+// Allow layers to read symlink outside the layer root.
+func TestLayeredSymlink(t *testing.T) {
+	dir := t.TempDir()
+	dirl1 := filepath.Join(dir, "l1")
+	require.NoError(t, os.MkdirAll(dirl1, 0o755))
+
+	// Open layer in dir/l1
+	layer := Local("l1", dirl1)
+
+	// Create a file in dir/outside
+	fileContents := []byte("I am outside the layer")
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "outside"), fileContents, 0o600))
+	// Symlink dir/l1/outside to dir/outside
+	require.NoError(t, os.Symlink(filepath.Join(dir, "outside"), filepath.Join(dirl1, "outside")))
+
+	// Open dir/l1/outside.
+	f, err := layer.Open("outside")
+	require.NoError(t, err)
+	defer f.Close()
+
+	// Confirm it contains the output of dir/outside
+	contents, err := io.ReadAll(f)
+	require.NoError(t, err)
+
+	assert.Equal(t, fileContents, contents)
 }
diff --git a/modules/auth/openid/discovery_cache_test.go b/modules/auth/openid/discovery_cache_test.go
index 5a7f450937..77ce46c4d5 100644
--- a/modules/auth/openid/discovery_cache_test.go
+++ b/modules/auth/openid/discovery_cache_test.go
@@ -23,14 +23,14 @@ func (s *testDiscoveredInfo) OpLocalID() string {
 }
 
 func TestTimedDiscoveryCache(t *testing.T) {
-	dc := newTimedDiscoveryCache(1 * time.Second)
+	dc := newTimedDiscoveryCache(100 * time.Millisecond)
 
 	// Put some initial values
 	dc.Put("foo", &testDiscoveredInfo{}) // openid.opEndpoint: "a", openid.opLocalID: "b", openid.claimedID: "c"})
 
 	// Make sure we can retrieve them
 	if di := dc.Get("foo"); di == nil {
-		t.Errorf("Expected a result, got nil")
+		t.Error("Expected a result, got nil")
 	} else if di.OpEndpoint() != "opEndpoint" || di.OpLocalID() != "opLocalID" || di.ClaimedID() != "claimedID" {
 		t.Errorf("Expected opEndpoint opLocalID claimedID, got %v %v %v", di.OpEndpoint(), di.OpLocalID(), di.ClaimedID())
 	}
@@ -41,9 +41,9 @@ func TestTimedDiscoveryCache(t *testing.T) {
 	}
 
 	// Sleep one second and try retrieve again
-	time.Sleep(1 * time.Second)
+	time.Sleep(100 * time.Millisecond)
 
 	if di := dc.Get("foo"); di != nil {
-		t.Errorf("Expected a nil, got a result")
+		t.Error("Expected a nil, got a result")
 	}
 }
diff --git a/modules/auth/webauthn/webauthn_test.go b/modules/auth/webauthn/webauthn_test.go
index 552b698984..5ad01de602 100644
--- a/modules/auth/webauthn/webauthn_test.go
+++ b/modules/auth/webauthn/webauthn_test.go
@@ -7,19 +7,19 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestInit(t *testing.T) {
-	setting.Domain = "domain"
-	setting.AppName = "AppName"
-	setting.AppURL = "https://domain/"
-	rpOrigin := []string{"https://domain"}
+	defer test.MockVariableValue(&setting.Domain, "domain")()
+	defer test.MockVariableValue(&setting.AppName, "AppName")()
+	defer test.MockVariableValue(&setting.AppURL, "https://domain/")()
 
 	Init()
 
 	assert.Equal(t, setting.Domain, WebAuthn.Config.RPID)
 	assert.Equal(t, setting.AppName, WebAuthn.Config.RPDisplayName)
-	assert.Equal(t, rpOrigin, WebAuthn.Config.RPOrigins)
+	assert.Equal(t, []string{"https://domain"}, WebAuthn.Config.RPOrigins)
 }
diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go
index 2166ca51b0..5c21ad5824 100644
--- a/modules/avatar/avatar_test.go
+++ b/modules/avatar/avatar_test.go
@@ -95,8 +95,8 @@ func Test_ProcessAvatarImage(t *testing.T) {
 	assert.NotEqual(t, origin, result)
 	decoded, err := png.Decode(bytes.NewReader(result))
 	require.NoError(t, err)
-	assert.EqualValues(t, scaledSize, decoded.Bounds().Max.X)
-	assert.EqualValues(t, scaledSize, decoded.Bounds().Max.Y)
+	assert.Equal(t, scaledSize, decoded.Bounds().Max.X)
+	assert.Equal(t, scaledSize, decoded.Bounds().Max.Y)
 
 	// if origin image is smaller than the default size, use the origin image
 	origin = newImgData(1)
diff --git a/modules/avatar/hash_test.go b/modules/avatar/hash_test.go
index 0a2db53ad4..8ee27131a8 100644
--- a/modules/avatar/hash_test.go
+++ b/modules/avatar/hash_test.go
@@ -19,8 +19,8 @@ func Test_HashAvatar(t *testing.T) {
 	var buff bytes.Buffer
 	png.Encode(&buff, myImage)
 
-	assert.EqualValues(t, "9ddb5bac41d57e72aa876321d0c09d71090c05f94bc625303801be2f3240d2cb", avatar.HashAvatar(1, buff.Bytes()))
-	assert.EqualValues(t, "9a5d44e5d637b9582a976676e8f3de1dccd877c2fe3e66ca3fab1629f2f47609", avatar.HashAvatar(8, buff.Bytes()))
-	assert.EqualValues(t, "ed7399158672088770de6f5211ce15528ebd675e92fc4fc060c025f4b2794ccb", avatar.HashAvatar(1024, buff.Bytes()))
-	assert.EqualValues(t, "161178642c7d59eb25a61dddced5e6b66eae1c70880d5f148b1b497b767e72d9", avatar.HashAvatar(1024, []byte{}))
+	assert.Equal(t, "9ddb5bac41d57e72aa876321d0c09d71090c05f94bc625303801be2f3240d2cb", avatar.HashAvatar(1, buff.Bytes()))
+	assert.Equal(t, "9a5d44e5d637b9582a976676e8f3de1dccd877c2fe3e66ca3fab1629f2f47609", avatar.HashAvatar(8, buff.Bytes()))
+	assert.Equal(t, "ed7399158672088770de6f5211ce15528ebd675e92fc4fc060c025f4b2794ccb", avatar.HashAvatar(1024, buff.Bytes()))
+	assert.Equal(t, "161178642c7d59eb25a61dddced5e6b66eae1c70880d5f148b1b497b767e72d9", avatar.HashAvatar(1024, []byte{}))
 }
diff --git a/modules/avatar/identicon/identicon.go b/modules/avatar/identicon/identicon.go
index 40471565d6..13e8ec88e6 100644
--- a/modules/avatar/identicon/identicon.go
+++ b/modules/avatar/identicon/identicon.go
@@ -8,6 +8,7 @@ package identicon
 
 import (
 	"crypto/sha256"
+	"errors"
 	"fmt"
 	"image"
 	"image/color"
@@ -29,7 +30,7 @@ type Identicon struct {
 // fore all possible foreground colors. only one foreground color will be picked randomly for one image
 func New(size int, back color.Color, fore ...color.Color) (*Identicon, error) {
 	if len(fore) == 0 {
-		return nil, fmt.Errorf("foreground is not set")
+		return nil, errors.New("foreground is not set")
 	}
 
 	if size < minImageSize {
diff --git a/modules/base/tool.go b/modules/base/tool.go
index fd6a7c2b77..e3a3ff4a23 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -114,7 +114,7 @@ func EntryIcon(entry *git.TreeEntry) string {
 		return "file-symlink-file"
 	case entry.IsDir():
 		return "file-directory-fill"
-	case entry.IsSubModule():
+	case entry.IsSubmodule():
 		return "file-submodule"
 	}
 
diff --git a/modules/base/tool_test.go b/modules/base/tool_test.go
index ed1b469161..aa57f0d77b 100644
--- a/modules/base/tool_test.go
+++ b/modules/base/tool_test.go
@@ -73,7 +73,7 @@ func TestEllipsisString(t *testing.T) {
 }
 
 func TestTruncateString(t *testing.T) {
-	assert.Equal(t, "", TruncateString("foobar", 0))
+	assert.Empty(t, TruncateString("foobar", 0))
 	assert.Equal(t, "f", TruncateString("foobar", 1))
 	assert.Equal(t, "fo", TruncateString("foobar", 2))
 	assert.Equal(t, "foo", TruncateString("foobar", 3))
@@ -125,5 +125,5 @@ func TestFormatNumberSI(t *testing.T) {
 	assert.Equal(t, "1.3k", FormatNumberSI(int64(1317)))
 	assert.Equal(t, "21.3M", FormatNumberSI(21317675))
 	assert.Equal(t, "45.7G", FormatNumberSI(45721317675))
-	assert.Equal(t, "", FormatNumberSI("test"))
+	assert.Empty(t, FormatNumberSI("test"))
 }
diff --git a/modules/cache/cache.go b/modules/cache/cache.go
index 9ad4b5cd90..aa69a0d3a7 100644
--- a/modules/cache/cache.go
+++ b/modules/cache/cache.go
@@ -4,6 +4,7 @@
 package cache
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"time"
@@ -48,7 +49,7 @@ const (
 
 func Test() (time.Duration, error) {
 	if conn == nil {
-		return 0, fmt.Errorf("default cache not initialized")
+		return 0, errors.New("default cache not initialized")
 	}
 
 	testData := fmt.Sprintf("%x", make([]byte, 500))
@@ -63,10 +64,10 @@ func Test() (time.Duration, error) {
 	}
 	testVal := conn.Get(testCacheKey)
 	if testVal == nil {
-		return 0, fmt.Errorf("expect cache hit but got none")
+		return 0, errors.New("expect cache hit but got none")
 	}
 	if testVal != testData {
-		return 0, fmt.Errorf("expect cache to return same value as stored but got other")
+		return 0, errors.New("expect cache to return same value as stored but got other")
 	}
 
 	return time.Since(start), nil
diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go
index 8e931d5b2c..aa28c98452 100644
--- a/modules/cache/cache_test.go
+++ b/modules/cache/cache_test.go
@@ -4,7 +4,7 @@
 package cache
 
 import (
-	"fmt"
+	"errors"
 	"testing"
 	"time"
 
@@ -45,22 +45,22 @@ func TestGetString(t *testing.T) {
 	createTestCache()
 
 	data, err := GetString("key", func() (string, error) {
-		return "", fmt.Errorf("some error")
+		return "", errors.New("some error")
 	})
 	require.Error(t, err)
-	assert.Equal(t, "", data)
+	assert.Empty(t, data)
 
 	data, err = GetString("key", func() (string, error) {
 		return "", nil
 	})
 	require.NoError(t, err)
-	assert.Equal(t, "", data)
+	assert.Empty(t, data)
 
 	data, err = GetString("key", func() (string, error) {
 		return "some data", nil
 	})
 	require.NoError(t, err)
-	assert.Equal(t, "", data)
+	assert.Empty(t, data)
 	Remove("key")
 
 	data, err = GetString("key", func() (string, error) {
@@ -70,7 +70,7 @@ func TestGetString(t *testing.T) {
 	assert.Equal(t, "some data", data)
 
 	data, err = GetString("key", func() (string, error) {
-		return "", fmt.Errorf("some error")
+		return "", errors.New("some error")
 	})
 	require.NoError(t, err)
 	assert.Equal(t, "some data", data)
@@ -81,7 +81,7 @@ func TestGetInt(t *testing.T) {
 	createTestCache()
 
 	data, err := GetInt("key", func() (int, error) {
-		return 0, fmt.Errorf("some error")
+		return 0, errors.New("some error")
 	})
 	require.Error(t, err)
 	assert.Equal(t, 0, data)
@@ -106,7 +106,7 @@ func TestGetInt(t *testing.T) {
 	assert.Equal(t, 100, data)
 
 	data, err = GetInt("key", func() (int, error) {
-		return 0, fmt.Errorf("some error")
+		return 0, errors.New("some error")
 	})
 	require.NoError(t, err)
 	assert.Equal(t, 100, data)
@@ -117,7 +117,7 @@ func TestGetInt64(t *testing.T) {
 	createTestCache()
 
 	data, err := GetInt64("key", func() (int64, error) {
-		return 0, fmt.Errorf("some error")
+		return 0, errors.New("some error")
 	})
 	require.Error(t, err)
 	assert.EqualValues(t, 0, data)
@@ -142,7 +142,7 @@ func TestGetInt64(t *testing.T) {
 	assert.EqualValues(t, 100, data)
 
 	data, err = GetInt64("key", func() (int64, error) {
-		return 0, fmt.Errorf("some error")
+		return 0, errors.New("some error")
 	})
 	require.NoError(t, err)
 	assert.EqualValues(t, 100, data)
diff --git a/modules/cache/context_test.go b/modules/cache/context_test.go
index 4f0f06f535..dd89986d0c 100644
--- a/modules/cache/context_test.go
+++ b/modules/cache/context_test.go
@@ -23,7 +23,7 @@ func TestWithCacheContext(t *testing.T) {
 	SetContextData(ctx, field, "my_config1", 1)
 	v = GetContextData(ctx, field, "my_config1")
 	assert.NotNil(t, v)
-	assert.EqualValues(t, 1, v.(int))
+	assert.Equal(t, 1, v.(int))
 
 	RemoveContextData(ctx, field, "my_config1")
 	RemoveContextData(ctx, field, "my_config2") // remove a non-exist key
@@ -35,7 +35,7 @@ func TestWithCacheContext(t *testing.T) {
 		return 1, nil
 	})
 	require.NoError(t, err)
-	assert.EqualValues(t, 1, vInt)
+	assert.Equal(t, 1, vInt)
 
 	v = GetContextData(ctx, field, "my_config1")
 	assert.EqualValues(t, 1, v)
diff --git a/modules/charset/ambiguous/ambiguous.json b/modules/charset/ambiguous/ambiguous.json
index d0f69f6ae2..82bbc7da1c 100644
--- a/modules/charset/ambiguous/ambiguous.json
+++ b/modules/charset/ambiguous/ambiguous.json
@@ -1 +1 @@
-"{\"_common\":[8232,32,8233,32,5760,32,8192,32,8193,32,8194,32,8195,32,8196,32,8197,32,8198,32,8200,32,8201,32,8202,32,8287,32,8199,32,8239,32,2042,95,65101,95,65102,95,65103,95,8208,45,8209,45,8210,45,65112,45,1748,45,8259,45,727,45,8722,45,10134,45,11450,45,1549,44,1643,44,8218,44,184,44,42233,44,894,59,2307,58,2691,58,1417,58,1795,58,1796,58,5868,58,65072,58,6147,58,6153,58,8282,58,1475,58,760,58,42889,58,8758,58,720,58,42237,58,451,33,11601,33,660,63,577,63,2429,63,5038,63,42731,63,119149,46,8228,46,1793,46,1794,46,42510,46,68176,46,1632,46,1776,46,42232,46,1373,96,65287,96,8219,96,8242,96,1370,96,1523,96,8175,96,65344,96,900,96,8189,96,8125,96,8127,96,8190,96,697,96,884,96,712,96,714,96,715,96,756,96,699,96,701,96,700,96,702,96,42892,96,1497,96,2036,96,2037,96,5194,96,5836,96,94033,96,94034,96,65339,91,10088,40,10098,40,12308,40,64830,40,65341,93,10089,41,10099,41,12309,41,64831,41,10100,123,119060,123,10101,125,65342,94,8270,42,1645,42,8727,42,66335,42,5941,47,8257,47,8725,47,8260,47,9585,47,10187,47,10744,47,119354,47,12755,47,12339,47,11462,47,20031,47,12035,47,65340,92,65128,92,8726,92,10189,92,10741,92,10745,92,119311,92,119355,92,12756,92,20022,92,12034,92,42872,38,708,94,710,94,5869,43,10133,43,66203,43,8249,60,10094,60,706,60,119350,60,5176,60,5810,60,5120,61,11840,61,12448,61,42239,61,8250,62,10095,62,707,62,119351,62,5171,62,94015,62,8275,126,732,126,8128,126,8764,126,65372,124,65293,45,120784,50,120794,50,120804,50,120814,50,120824,50,130034,50,42842,50,423,50,1000,50,42564,50,5311,50,42735,50,119302,51,120785,51,120795,51,120805,51,120815,51,120825,51,130035,51,42923,51,540,51,439,51,42858,51,11468,51,1248,51,94011,51,71882,51,120786,52,120796,52,120806,52,120816,52,120826,52,130036,52,5070,52,71855,52,120787,53,120797,53,120807,53,120817,53,120827,53,130037,53,444,53,71867,53,120788,54,120798,54,120808,54,120818,54,120828,54,130038,54,11474,54,5102,54,71893,54,119314,55,120789,55,120799,55,120809,55,120819,55,120829,55,130039,55,66770,55,71878,55,2819,56,2538,56,2666,56,125131,56,120790,56,120800,56,120810,56,120820,56,120830,56,130040,56,547,56,546,56,66330,56,2663,57,2920,57,2541,57,3437,57,120791,57,120801,57,120811,57,120821,57,120831,57,130041,57,42862,57,11466,57,71884,57,71852,57,71894,57,9082,97,65345,97,119834,97,119886,97,119938,97,119990,97,120042,97,120094,97,120146,97,120198,97,120250,97,120302,97,120354,97,120406,97,120458,97,593,97,945,97,120514,97,120572,97,120630,97,120688,97,120746,97,65313,65,119808,65,119860,65,119912,65,119964,65,120016,65,120068,65,120120,65,120172,65,120224,65,120276,65,120328,65,120380,65,120432,65,913,65,120488,65,120546,65,120604,65,120662,65,120720,65,5034,65,5573,65,42222,65,94016,65,66208,65,119835,98,119887,98,119939,98,119991,98,120043,98,120095,98,120147,98,120199,98,120251,98,120303,98,120355,98,120407,98,120459,98,388,98,5071,98,5234,98,5551,98,65314,66,8492,66,119809,66,119861,66,119913,66,120017,66,120069,66,120121,66,120173,66,120225,66,120277,66,120329,66,120381,66,120433,66,42932,66,914,66,120489,66,120547,66,120605,66,120663,66,120721,66,5108,66,5623,66,42192,66,66178,66,66209,66,66305,66,65347,99,8573,99,119836,99,119888,99,119940,99,119992,99,120044,99,120096,99,120148,99,120200,99,120252,99,120304,99,120356,99,120408,99,120460,99,7428,99,1010,99,11429,99,43951,99,66621,99,128844,67,71922,67,71913,67,65315,67,8557,67,8450,67,8493,67,119810,67,119862,67,119914,67,119966,67,120018,67,120174,67,120226,67,120278,67,120330,67,120382,67,120434,67,1017,67,11428,67,5087,67,42202,67,66210,67,66306,67,66581,67,66844,67,8574,100,8518,100,119837,100,119889,100,119941,100,119993,100,120045,100,120097,100,120149,100,120201,100,120253,100,120305,100,120357,100,120409,100,120461,100,1281,100,5095,100,5231,100,42194,100,8558,68,8517,68,119811,68,119863,68,119915,68,119967,68,120019,68,120071,68,120123,68,120175,68,120227,68,120279,68,120331,68,120383,68,120435,68,5024,68,5598,68,5610,68,42195,68,8494,101,65349,101,8495,101,8519,101,119838,101,119890,101,119942,101,120046,101,120098,101,120150,101,120202,101,120254,101,120306,101,120358,101,120410,101,120462,101,43826,101,1213,101,8959,69,65317,69,8496,69,119812,69,119864,69,119916,69,120020,69,120072,69,120124,69,120176,69,120228,69,120280,69,120332,69,120384,69,120436,69,917,69,120492,69,120550,69,120608,69,120666,69,120724,69,11577,69,5036,69,42224,69,71846,69,71854,69,66182,69,119839,102,119891,102,119943,102,119995,102,120047,102,120099,102,120151,102,120203,102,120255,102,120307,102,120359,102,120411,102,120463,102,43829,102,42905,102,383,102,7837,102,1412,102,119315,70,8497,70,119813,70,119865,70,119917,70,120021,70,120073,70,120125,70,120177,70,120229,70,120281,70,120333,70,120385,70,120437,70,42904,70,988,70,120778,70,5556,70,42205,70,71874,70,71842,70,66183,70,66213,70,66853,70,65351,103,8458,103,119840,103,119892,103,119944,103,120048,103,120100,103,120152,103,120204,103,120256,103,120308,103,120360,103,120412,103,120464,103,609,103,7555,103,397,103,1409,103,119814,71,119866,71,119918,71,119970,71,120022,71,120074,71,120126,71,120178,71,120230,71,120282,71,120334,71,120386,71,120438,71,1292,71,5056,71,5107,71,42198,71,65352,104,8462,104,119841,104,119945,104,119997,104,120049,104,120101,104,120153,104,120205,104,120257,104,120309,104,120361,104,120413,104,120465,104,1211,104,1392,104,5058,104,65320,72,8459,72,8460,72,8461,72,119815,72,119867,72,119919,72,120023,72,120179,72,120231,72,120283,72,120335,72,120387,72,120439,72,919,72,120494,72,120552,72,120610,72,120668,72,120726,72,11406,72,5051,72,5500,72,42215,72,66255,72,731,105,9075,105,65353,105,8560,105,8505,105,8520,105,119842,105,119894,105,119946,105,119998,105,120050,105,120102,105,120154,105,120206,105,120258,105,120310,105,120362,105,120414,105,120466,105,120484,105,618,105,617,105,953,105,8126,105,890,105,120522,105,120580,105,120638,105,120696,105,120754,105,1110,105,42567,105,1231,105,43893,105,5029,105,71875,105,65354,106,8521,106,119843,106,119895,106,119947,106,119999,106,120051,106,120103,106,120155,106,120207,106,120259,106,120311,106,120363,106,120415,106,120467,106,1011,106,1112,106,65322,74,119817,74,119869,74,119921,74,119973,74,120025,74,120077,74,120129,74,120181,74,120233,74,120285,74,120337,74,120389,74,120441,74,42930,74,895,74,1032,74,5035,74,5261,74,42201,74,119844,107,119896,107,119948,107,120000,107,120052,107,120104,107,120156,107,120208,107,120260,107,120312,107,120364,107,120416,107,120468,107,8490,75,65323,75,119818,75,119870,75,119922,75,119974,75,120026,75,120078,75,120130,75,120182,75,120234,75,120286,75,120338,75,120390,75,120442,75,922,75,120497,75,120555,75,120613,75,120671,75,120729,75,11412,75,5094,75,5845,75,42199,75,66840,75,1472,108,8739,73,9213,73,65512,73,1633,108,1777,73,66336,108,125127,108,120783,73,120793,73,120803,73,120813,73,120823,73,130033,73,65321,73,8544,73,8464,73,8465,73,119816,73,119868,73,119920,73,120024,73,120128,73,120180,73,120232,73,120284,73,120336,73,120388,73,120440,73,65356,108,8572,73,8467,108,119845,108,119897,108,119949,108,120001,108,120053,108,120105,73,120157,73,120209,73,120261,73,120313,73,120365,73,120417,73,120469,73,448,73,120496,73,120554,73,120612,73,120670,73,120728,73,11410,73,1030,73,1216,73,1493,108,1503,108,1575,108,126464,108,126592,108,65166,108,65165,108,1994,108,11599,73,5825,73,42226,73,93992,73,66186,124,66313,124,119338,76,8556,76,8466,76,119819,76,119871,76,119923,76,120027,76,120079,76,120131,76,120183,76,120235,76,120287,76,120339,76,120391,76,120443,76,11472,76,5086,76,5290,76,42209,76,93974,76,71843,76,71858,76,66587,76,66854,76,65325,77,8559,77,8499,77,119820,77,119872,77,119924,77,120028,77,120080,77,120132,77,120184,77,120236,77,120288,77,120340,77,120392,77,120444,77,924,77,120499,77,120557,77,120615,77,120673,77,120731,77,1018,77,11416,77,5047,77,5616,77,5846,77,42207,77,66224,77,66321,77,119847,110,119899,110,119951,110,120003,110,120055,110,120107,110,120159,110,120211,110,120263,110,120315,110,120367,110,120419,110,120471,110,1400,110,1404,110,65326,78,8469,78,119821,78,119873,78,119925,78,119977,78,120029,78,120081,78,120185,78,120237,78,120289,78,120341,78,120393,78,120445,78,925,78,120500,78,120558,78,120616,78,120674,78,120732,78,11418,78,42208,78,66835,78,3074,111,3202,111,3330,111,3458,111,2406,111,2662,111,2790,111,3046,111,3174,111,3302,111,3430,111,3664,111,3792,111,4160,111,1637,111,1781,111,65359,111,8500,111,119848,111,119900,111,119952,111,120056,111,120108,111,120160,111,120212,111,120264,111,120316,111,120368,111,120420,111,120472,111,7439,111,7441,111,43837,111,959,111,120528,111,120586,111,120644,111,120702,111,120760,111,963,111,120532,111,120590,111,120648,111,120706,111,120764,111,11423,111,4351,111,1413,111,1505,111,1607,111,126500,111,126564,111,126596,111,65259,111,65260,111,65258,111,65257,111,1726,111,64428,111,64429,111,64427,111,64426,111,1729,111,64424,111,64425,111,64423,111,64422,111,1749,111,3360,111,4125,111,66794,111,71880,111,71895,111,66604,111,1984,79,2534,79,2918,79,12295,79,70864,79,71904,79,120782,79,120792,79,120802,79,120812,79,120822,79,130032,79,65327,79,119822,79,119874,79,119926,79,119978,79,120030,79,120082,79,120134,79,120186,79,120238,79,120290,79,120342,79,120394,79,120446,79,927,79,120502,79,120560,79,120618,79,120676,79,120734,79,11422,79,1365,79,11604,79,4816,79,2848,79,66754,79,42227,79,71861,79,66194,79,66219,79,66564,79,66838,79,9076,112,65360,112,119849,112,119901,112,119953,112,120005,112,120057,112,120109,112,120161,112,120213,112,120265,112,120317,112,120369,112,120421,112,120473,112,961,112,120530,112,120544,112,120588,112,120602,112,120646,112,120660,112,120704,112,120718,112,120762,112,120776,112,11427,112,65328,80,8473,80,119823,80,119875,80,119927,80,119979,80,120031,80,120083,80,120187,80,120239,80,120291,80,120343,80,120395,80,120447,80,929,80,120504,80,120562,80,120620,80,120678,80,120736,80,11426,80,5090,80,5229,80,42193,80,66197,80,119850,113,119902,113,119954,113,120006,113,120058,113,120110,113,120162,113,120214,113,120266,113,120318,113,120370,113,120422,113,120474,113,1307,113,1379,113,1382,113,8474,81,119824,81,119876,81,119928,81,119980,81,120032,81,120084,81,120188,81,120240,81,120292,81,120344,81,120396,81,120448,81,11605,81,119851,114,119903,114,119955,114,120007,114,120059,114,120111,114,120163,114,120215,114,120267,114,120319,114,120371,114,120423,114,120475,114,43847,114,43848,114,7462,114,11397,114,43905,114,119318,82,8475,82,8476,82,8477,82,119825,82,119877,82,119929,82,120033,82,120189,82,120241,82,120293,82,120345,82,120397,82,120449,82,422,82,5025,82,5074,82,66740,82,5511,82,42211,82,94005,82,65363,115,119852,115,119904,115,119956,115,120008,115,120060,115,120112,115,120164,115,120216,115,120268,115,120320,115,120372,115,120424,115,120476,115,42801,115,445,115,1109,115,43946,115,71873,115,66632,115,65331,83,119826,83,119878,83,119930,83,119982,83,120034,83,120086,83,120138,83,120190,83,120242,83,120294,83,120346,83,120398,83,120450,83,1029,83,1359,83,5077,83,5082,83,42210,83,94010,83,66198,83,66592,83,119853,116,119905,116,119957,116,120009,116,120061,116,120113,116,120165,116,120217,116,120269,116,120321,116,120373,116,120425,116,120477,116,8868,84,10201,84,128872,84,65332,84,119827,84,119879,84,119931,84,119983,84,120035,84,120087,84,120139,84,120191,84,120243,84,120295,84,120347,84,120399,84,120451,84,932,84,120507,84,120565,84,120623,84,120681,84,120739,84,11430,84,5026,84,42196,84,93962,84,71868,84,66199,84,66225,84,66325,84,119854,117,119906,117,119958,117,120010,117,120062,117,120114,117,120166,117,120218,117,120270,117,120322,117,120374,117,120426,117,120478,117,42911,117,7452,117,43854,117,43858,117,651,117,965,117,120534,117,120592,117,120650,117,120708,117,120766,117,1405,117,66806,117,71896,117,8746,85,8899,85,119828,85,119880,85,119932,85,119984,85,120036,85,120088,85,120140,85,120192,85,120244,85,120296,85,120348,85,120400,85,120452,85,1357,85,4608,85,66766,85,5196,85,42228,85,94018,85,71864,85,8744,118,8897,118,65366,118,8564,118,119855,118,119907,118,119959,118,120011,118,120063,118,120115,118,120167,118,120219,118,120271,118,120323,118,120375,118,120427,118,120479,118,7456,118,957,118,120526,118,120584,118,120642,118,120700,118,120758,118,1141,118,1496,118,71430,118,43945,118,71872,118,119309,86,1639,86,1783,86,8548,86,119829,86,119881,86,119933,86,119985,86,120037,86,120089,86,120141,86,120193,86,120245,86,120297,86,120349,86,120401,86,120453,86,1140,86,11576,86,5081,86,5167,86,42719,86,42214,86,93960,86,71840,86,66845,86,623,119,119856,119,119908,119,119960,119,120012,119,120064,119,120116,119,120168,119,120220,119,120272,119,120324,119,120376,119,120428,119,120480,119,7457,119,1121,119,1309,119,1377,119,71434,119,71438,119,71439,119,43907,119,71919,87,71910,87,119830,87,119882,87,119934,87,119986,87,120038,87,120090,87,120142,87,120194,87,120246,87,120298,87,120350,87,120402,87,120454,87,1308,87,5043,87,5076,87,42218,87,5742,120,10539,120,10540,120,10799,120,65368,120,8569,120,119857,120,119909,120,119961,120,120013,120,120065,120,120117,120,120169,120,120221,120,120273,120,120325,120,120377,120,120429,120,120481,120,5441,120,5501,120,5741,88,9587,88,66338,88,71916,88,65336,88,8553,88,119831,88,119883,88,119935,88,119987,88,120039,88,120091,88,120143,88,120195,88,120247,88,120299,88,120351,88,120403,88,120455,88,42931,88,935,88,120510,88,120568,88,120626,88,120684,88,120742,88,11436,88,11613,88,5815,88,42219,88,66192,88,66228,88,66327,88,66855,88,611,121,7564,121,65369,121,119858,121,119910,121,119962,121,120014,121,120066,121,120118,121,120170,121,120222,121,120274,121,120326,121,120378,121,120430,121,120482,121,655,121,7935,121,43866,121,947,121,8509,121,120516,121,120574,121,120632,121,120690,121,120748,121,1199,121,4327,121,71900,121,65337,89,119832,89,119884,89,119936,89,119988,89,120040,89,120092,89,120144,89,120196,89,120248,89,120300,89,120352,89,120404,89,120456,89,933,89,978,89,120508,89,120566,89,120624,89,120682,89,120740,89,11432,89,1198,89,5033,89,5053,89,42220,89,94019,89,71844,89,66226,89,119859,122,119911,122,119963,122,120015,122,120067,122,120119,122,120171,122,120223,122,120275,122,120327,122,120379,122,120431,122,120483,122,7458,122,43923,122,71876,122,66293,90,71909,90,65338,90,8484,90,8488,90,119833,90,119885,90,119937,90,119989,90,120041,90,120197,90,120249,90,120301,90,120353,90,120405,90,120457,90,918,90,120493,90,120551,90,120609,90,120667,90,120725,90,5059,90,42204,90,71849,90,65282,34,65284,36,65285,37,65286,38,65290,42,65291,43,65294,46,65295,47,65296,48,65297,49,65298,50,65299,51,65300,52,65301,53,65302,54,65303,55,65304,56,65305,57,65308,60,65309,61,65310,62,65312,64,65316,68,65318,70,65319,71,65324,76,65329,81,65330,82,65333,85,65334,86,65335,87,65343,95,65346,98,65348,100,65350,102,65355,107,65357,109,65358,110,65361,113,65362,114,65364,116,65365,117,65367,119,65370,122,65371,123,65373,125],\"_default\":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"cs\":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"de\":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"es\":[8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"fr\":[65374,126,65306,58,65281,33,8216,96,8245,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"it\":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"ja\":[8211,45,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65292,44,65307,59],\"ko\":[8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"pl\":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"pt-BR\":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"qps-ploc\":[160,32,8211,45,65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"ru\":[65374,126,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,305,105,921,73,1009,112,215,120,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"tr\":[160,32,8211,45,65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65288,40,65289,41,65292,44,65307,59,65311,63],\"zh-hans\":[65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41],\"zh-hant\":[8211,45,65374,126,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65283,35,65307,59]}"
\ No newline at end of file
+"{\"_common\":[8232,32,8233,32,5760,32,8192,32,8193,32,8194,32,8195,32,8196,32,8197,32,8198,32,8200,32,8201,32,8202,32,8287,32,8199,32,8239,32,2042,95,65101,95,65102,95,65103,95,8208,45,8209,45,8210,45,65112,45,1748,45,8259,45,727,45,8722,45,10134,45,11450,45,1549,44,1643,44,184,44,42233,44,894,59,2307,58,2691,58,1417,58,1795,58,1796,58,5868,58,65072,58,6147,58,6153,58,8282,58,1475,58,760,58,42889,58,8758,58,720,58,42237,58,451,33,11601,33,660,63,577,63,2429,63,5038,63,42731,63,119149,46,8228,46,1793,46,1794,46,42510,46,68176,46,1632,46,1776,46,42232,46,1373,96,65287,96,8219,96,1523,96,8242,96,1370,96,8175,96,65344,96,900,96,8189,96,8125,96,8127,96,8190,96,697,96,884,96,712,96,714,96,715,96,756,96,699,96,701,96,700,96,702,96,42892,96,1497,96,2036,96,2037,96,5194,96,5836,96,94033,96,94034,96,65339,91,10088,40,10098,40,12308,40,64830,40,65341,93,10089,41,10099,41,12309,41,64831,41,10100,123,119060,123,10101,125,65342,94,8270,42,1645,42,8727,42,66335,42,5941,47,8257,47,8725,47,8260,47,9585,47,10187,47,10744,47,119354,47,12755,47,12339,47,11462,47,20031,47,12035,47,65340,92,65128,92,8726,92,10189,92,10741,92,10745,92,119311,92,119355,92,12756,92,20022,92,12034,92,42872,38,708,94,710,94,5869,43,10133,43,66203,43,8249,60,10094,60,706,60,119350,60,5176,60,5810,60,5120,61,11840,61,12448,61,42239,61,8250,62,10095,62,707,62,119351,62,5171,62,94015,62,8275,126,732,126,8128,126,8764,126,65372,124,65293,45,118002,50,120784,50,120794,50,120804,50,120814,50,120824,50,130034,50,42842,50,423,50,1000,50,42564,50,5311,50,42735,50,119302,51,118003,51,120785,51,120795,51,120805,51,120815,51,120825,51,130035,51,42923,51,540,51,439,51,42858,51,11468,51,1248,51,94011,51,71882,51,118004,52,120786,52,120796,52,120806,52,120816,52,120826,52,130036,52,5070,52,71855,52,118005,53,120787,53,120797,53,120807,53,120817,53,120827,53,130037,53,444,53,71867,53,118006,54,120788,54,120798,54,120808,54,120818,54,120828,54,130038,54,11474,54,5102,54,71893,54,119314,55,118007,55,120789,55,120799,55,120809,55,120819,55,120829,55,130039,55,66770,55,71878,55,2819,56,2538,56,2666,56,125131,56,118008,56,120790,56,120800,56,120810,56,120820,56,120830,56,130040,56,547,56,546,56,66330,56,2663,57,2920,57,2541,57,3437,57,118009,57,120791,57,120801,57,120811,57,120821,57,120831,57,130041,57,42862,57,11466,57,71884,57,71852,57,71894,57,9082,97,65345,97,119834,97,119886,97,119938,97,119990,97,120042,97,120094,97,120146,97,120198,97,120250,97,120302,97,120354,97,120406,97,120458,97,593,97,945,97,120514,97,120572,97,120630,97,120688,97,120746,97,65313,65,117974,65,119808,65,119860,65,119912,65,119964,65,120016,65,120068,65,120120,65,120172,65,120224,65,120276,65,120328,65,120380,65,120432,65,913,65,120488,65,120546,65,120604,65,120662,65,120720,65,5034,65,5573,65,42222,65,94016,65,66208,65,119835,98,119887,98,119939,98,119991,98,120043,98,120095,98,120147,98,120199,98,120251,98,120303,98,120355,98,120407,98,120459,98,388,98,5071,98,5234,98,5551,98,65314,66,8492,66,117975,66,119809,66,119861,66,119913,66,120017,66,120069,66,120121,66,120173,66,120225,66,120277,66,120329,66,120381,66,120433,66,42932,66,914,66,120489,66,120547,66,120605,66,120663,66,120721,66,5108,66,5623,66,42192,66,66178,66,66209,66,66305,66,65347,99,8573,99,119836,99,119888,99,119940,99,119992,99,120044,99,120096,99,120148,99,120200,99,120252,99,120304,99,120356,99,120408,99,120460,99,7428,99,1010,99,11429,99,43951,99,66621,99,128844,67,71913,67,71922,67,65315,67,8557,67,8450,67,8493,67,117976,67,119810,67,119862,67,119914,67,119966,67,120018,67,120174,67,120226,67,120278,67,120330,67,120382,67,120434,67,1017,67,11428,67,5087,67,42202,67,66210,67,66306,67,66581,67,66844,67,8574,100,8518,100,119837,100,119889,100,119941,100,119993,100,120045,100,120097,100,120149,100,120201,100,120253,100,120305,100,120357,100,120409,100,120461,100,1281,100,5095,100,5231,100,42194,100,8558,68,8517,68,117977,68,119811,68,119863,68,119915,68,119967,68,120019,68,120071,68,120123,68,120175,68,120227,68,120279,68,120331,68,120383,68,120435,68,5024,68,5598,68,5610,68,42195,68,8494,101,65349,101,8495,101,8519,101,119838,101,119890,101,119942,101,120046,101,120098,101,120150,101,120202,101,120254,101,120306,101,120358,101,120410,101,120462,101,43826,101,1213,101,8959,69,65317,69,8496,69,117978,69,119812,69,119864,69,119916,69,120020,69,120072,69,120124,69,120176,69,120228,69,120280,69,120332,69,120384,69,120436,69,917,69,120492,69,120550,69,120608,69,120666,69,120724,69,11577,69,5036,69,42224,69,71846,69,71854,69,66182,69,119839,102,119891,102,119943,102,119995,102,120047,102,120099,102,120151,102,120203,102,120255,102,120307,102,120359,102,120411,102,120463,102,43829,102,42905,102,383,102,7837,102,1412,102,119315,70,8497,70,117979,70,119813,70,119865,70,119917,70,120021,70,120073,70,120125,70,120177,70,120229,70,120281,70,120333,70,120385,70,120437,70,42904,70,988,70,120778,70,5556,70,42205,70,71874,70,71842,70,66183,70,66213,70,66853,70,65351,103,8458,103,119840,103,119892,103,119944,103,120048,103,120100,103,120152,103,120204,103,120256,103,120308,103,120360,103,120412,103,120464,103,609,103,7555,103,397,103,1409,103,117980,71,119814,71,119866,71,119918,71,119970,71,120022,71,120074,71,120126,71,120178,71,120230,71,120282,71,120334,71,120386,71,120438,71,1292,71,5056,71,5107,71,42198,71,65352,104,8462,104,119841,104,119945,104,119997,104,120049,104,120101,104,120153,104,120205,104,120257,104,120309,104,120361,104,120413,104,120465,104,1211,104,1392,104,5058,104,65320,72,8459,72,8460,72,8461,72,117981,72,119815,72,119867,72,119919,72,120023,72,120179,72,120231,72,120283,72,120335,72,120387,72,120439,72,919,72,120494,72,120552,72,120610,72,120668,72,120726,72,11406,72,5051,72,5500,72,42215,72,66255,72,731,105,9075,105,65353,105,8560,105,8505,105,8520,105,119842,105,119894,105,119946,105,119998,105,120050,105,120102,105,120154,105,120206,105,120258,105,120310,105,120362,105,120414,105,120466,105,120484,105,618,105,617,105,953,105,8126,105,890,105,120522,105,120580,105,120638,105,120696,105,120754,105,1110,105,42567,105,1231,105,43893,105,5029,105,71875,105,65354,106,8521,106,119843,106,119895,106,119947,106,119999,106,120051,106,120103,106,120155,106,120207,106,120259,106,120311,106,120363,106,120415,106,120467,106,1011,106,1112,106,65322,74,117983,74,119817,74,119869,74,119921,74,119973,74,120025,74,120077,74,120129,74,120181,74,120233,74,120285,74,120337,74,120389,74,120441,74,42930,74,895,74,1032,74,5035,74,5261,74,42201,74,119844,107,119896,107,119948,107,120000,107,120052,107,120104,107,120156,107,120208,107,120260,107,120312,107,120364,107,120416,107,120468,107,8490,75,65323,75,117984,75,119818,75,119870,75,119922,75,119974,75,120026,75,120078,75,120130,75,120182,75,120234,75,120286,75,120338,75,120390,75,120442,75,922,75,120497,75,120555,75,120613,75,120671,75,120729,75,11412,75,5094,75,5845,75,42199,75,66840,75,1472,108,8739,73,9213,73,65512,73,1633,108,1777,73,66336,108,125127,108,118001,108,120783,73,120793,73,120803,73,120813,73,120823,73,130033,73,65321,73,8544,73,8464,73,8465,73,117982,108,119816,73,119868,73,119920,73,120024,73,120128,73,120180,73,120232,73,120284,73,120336,73,120388,73,120440,73,65356,108,8572,73,8467,108,119845,108,119897,108,119949,108,120001,108,120053,108,120105,73,120157,73,120209,73,120261,73,120313,73,120365,73,120417,73,120469,73,448,73,120496,73,120554,73,120612,73,120670,73,120728,73,11410,73,1030,73,1216,73,1493,108,1503,108,1575,108,126464,108,126592,108,65166,108,65165,108,1994,108,11599,73,5825,73,42226,73,93992,73,66186,124,66313,124,119338,76,8556,76,8466,76,117985,76,119819,76,119871,76,119923,76,120027,76,120079,76,120131,76,120183,76,120235,76,120287,76,120339,76,120391,76,120443,76,11472,76,5086,76,5290,76,42209,76,93974,76,71843,76,71858,76,66587,76,66854,76,65325,77,8559,77,8499,77,117986,77,119820,77,119872,77,119924,77,120028,77,120080,77,120132,77,120184,77,120236,77,120288,77,120340,77,120392,77,120444,77,924,77,120499,77,120557,77,120615,77,120673,77,120731,77,1018,77,11416,77,5047,77,5616,77,5846,77,42207,77,66224,77,66321,77,119847,110,119899,110,119951,110,120003,110,120055,110,120107,110,120159,110,120211,110,120263,110,120315,110,120367,110,120419,110,120471,110,1400,110,1404,110,65326,78,8469,78,117987,78,119821,78,119873,78,119925,78,119977,78,120029,78,120081,78,120185,78,120237,78,120289,78,120341,78,120393,78,120445,78,925,78,120500,78,120558,78,120616,78,120674,78,120732,78,11418,78,42208,78,66835,78,3074,111,3202,111,3330,111,3458,111,2406,111,2662,111,2790,111,3046,111,3174,111,3302,111,3430,111,3664,111,3792,111,4160,111,1637,111,1781,111,65359,111,8500,111,119848,111,119900,111,119952,111,120056,111,120108,111,120160,111,120212,111,120264,111,120316,111,120368,111,120420,111,120472,111,7439,111,7441,111,43837,111,959,111,120528,111,120586,111,120644,111,120702,111,120760,111,963,111,120532,111,120590,111,120648,111,120706,111,120764,111,11423,111,4351,111,1413,111,1505,111,1607,111,126500,111,126564,111,126596,111,65259,111,65260,111,65258,111,65257,111,1726,111,64428,111,64429,111,64427,111,64426,111,1729,111,64424,111,64425,111,64423,111,64422,111,1749,111,3360,111,4125,111,66794,111,71880,111,71895,111,66604,111,1984,79,2534,79,2918,79,12295,79,70864,79,71904,79,118000,79,120782,79,120792,79,120802,79,120812,79,120822,79,130032,79,65327,79,117988,79,119822,79,119874,79,119926,79,119978,79,120030,79,120082,79,120134,79,120186,79,120238,79,120290,79,120342,79,120394,79,120446,79,927,79,120502,79,120560,79,120618,79,120676,79,120734,79,11422,79,1365,79,11604,79,4816,79,2848,79,66754,79,42227,79,71861,79,66194,79,66219,79,66564,79,66838,79,9076,112,65360,112,119849,112,119901,112,119953,112,120005,112,120057,112,120109,112,120161,112,120213,112,120265,112,120317,112,120369,112,120421,112,120473,112,961,112,120530,112,120544,112,120588,112,120602,112,120646,112,120660,112,120704,112,120718,112,120762,112,120776,112,11427,112,65328,80,8473,80,117989,80,119823,80,119875,80,119927,80,119979,80,120031,80,120083,80,120187,80,120239,80,120291,80,120343,80,120395,80,120447,80,929,80,120504,80,120562,80,120620,80,120678,80,120736,80,11426,80,5090,80,5229,80,42193,80,66197,80,119850,113,119902,113,119954,113,120006,113,120058,113,120110,113,120162,113,120214,113,120266,113,120318,113,120370,113,120422,113,120474,113,1307,113,1379,113,1382,113,8474,81,117990,81,119824,81,119876,81,119928,81,119980,81,120032,81,120084,81,120188,81,120240,81,120292,81,120344,81,120396,81,120448,81,11605,81,119851,114,119903,114,119955,114,120007,114,120059,114,120111,114,120163,114,120215,114,120267,114,120319,114,120371,114,120423,114,120475,114,43847,114,43848,114,7462,114,11397,114,43905,114,119318,82,8475,82,8476,82,8477,82,117991,82,119825,82,119877,82,119929,82,120033,82,120189,82,120241,82,120293,82,120345,82,120397,82,120449,82,422,82,5025,82,5074,82,66740,82,5511,82,42211,82,94005,82,65363,115,119852,115,119904,115,119956,115,120008,115,120060,115,120112,115,120164,115,120216,115,120268,115,120320,115,120372,115,120424,115,120476,115,42801,115,445,115,1109,115,43946,115,71873,115,66632,115,65331,83,117992,83,119826,83,119878,83,119930,83,119982,83,120034,83,120086,83,120138,83,120190,83,120242,83,120294,83,120346,83,120398,83,120450,83,1029,83,1359,83,5077,83,5082,83,42210,83,94010,83,66198,83,66592,83,119853,116,119905,116,119957,116,120009,116,120061,116,120113,116,120165,116,120217,116,120269,116,120321,116,120373,116,120425,116,120477,116,8868,84,10201,84,128872,84,65332,84,117993,84,119827,84,119879,84,119931,84,119983,84,120035,84,120087,84,120139,84,120191,84,120243,84,120295,84,120347,84,120399,84,120451,84,932,84,120507,84,120565,84,120623,84,120681,84,120739,84,11430,84,5026,84,42196,84,93962,84,71868,84,66199,84,66225,84,66325,84,119854,117,119906,117,119958,117,120010,117,120062,117,120114,117,120166,117,120218,117,120270,117,120322,117,120374,117,120426,117,120478,117,42911,117,7452,117,43854,117,43858,117,651,117,965,117,120534,117,120592,117,120650,117,120708,117,120766,117,1405,117,66806,117,71896,117,8746,85,8899,85,117994,85,119828,85,119880,85,119932,85,119984,85,120036,85,120088,85,120140,85,120192,85,120244,85,120296,85,120348,85,120400,85,120452,85,1357,85,4608,85,66766,85,5196,85,42228,85,94018,85,71864,85,8744,118,8897,118,65366,118,8564,118,119855,118,119907,118,119959,118,120011,118,120063,118,120115,118,120167,118,120219,118,120271,118,120323,118,120375,118,120427,118,120479,118,7456,118,957,118,120526,118,120584,118,120642,118,120700,118,120758,118,1141,118,1496,118,71430,118,43945,118,71872,118,119309,86,1639,86,1783,86,8548,86,117995,86,119829,86,119881,86,119933,86,119985,86,120037,86,120089,86,120141,86,120193,86,120245,86,120297,86,120349,86,120401,86,120453,86,1140,86,11576,86,5081,86,5167,86,42719,86,42214,86,93960,86,71840,86,66845,86,623,119,119856,119,119908,119,119960,119,120012,119,120064,119,120116,119,120168,119,120220,119,120272,119,120324,119,120376,119,120428,119,120480,119,7457,119,1121,119,1309,119,1377,119,71434,119,71438,119,71439,119,43907,119,71910,87,71919,87,117996,87,119830,87,119882,87,119934,87,119986,87,120038,87,120090,87,120142,87,120194,87,120246,87,120298,87,120350,87,120402,87,120454,87,1308,87,5043,87,5076,87,42218,87,5742,120,10539,120,10540,120,10799,120,65368,120,8569,120,119857,120,119909,120,119961,120,120013,120,120065,120,120117,120,120169,120,120221,120,120273,120,120325,120,120377,120,120429,120,120481,120,5441,120,5501,120,5741,88,9587,88,66338,88,71916,88,65336,88,8553,88,117997,88,119831,88,119883,88,119935,88,119987,88,120039,88,120091,88,120143,88,120195,88,120247,88,120299,88,120351,88,120403,88,120455,88,42931,88,935,88,120510,88,120568,88,120626,88,120684,88,120742,88,11436,88,11613,88,5815,88,42219,88,66192,88,66228,88,66327,88,66855,88,611,121,7564,121,65369,121,119858,121,119910,121,119962,121,120014,121,120066,121,120118,121,120170,121,120222,121,120274,121,120326,121,120378,121,120430,121,120482,121,655,121,7935,121,43866,121,947,121,8509,121,120516,121,120574,121,120632,121,120690,121,120748,121,1199,121,4327,121,71900,121,65337,89,117998,89,119832,89,119884,89,119936,89,119988,89,120040,89,120092,89,120144,89,120196,89,120248,89,120300,89,120352,89,120404,89,120456,89,933,89,978,89,120508,89,120566,89,120624,89,120682,89,120740,89,11432,89,1198,89,5033,89,5053,89,42220,89,94019,89,71844,89,66226,89,119859,122,119911,122,119963,122,120015,122,120067,122,120119,122,120171,122,120223,122,120275,122,120327,122,120379,122,120431,122,120483,122,7458,122,43923,122,71876,122,71909,90,66293,90,65338,90,8484,90,8488,90,117999,90,119833,90,119885,90,119937,90,119989,90,120041,90,120197,90,120249,90,120301,90,120353,90,120405,90,120457,90,918,90,120493,90,120551,90,120609,90,120667,90,120725,90,5059,90,42204,90,71849,90,65282,34,65283,35,65284,36,65285,37,65286,38,65290,42,65291,43,65294,46,65295,47,65296,48,65298,50,65299,51,65300,52,65301,53,65302,54,65303,55,65304,56,65305,57,65308,60,65309,61,65310,62,65312,64,65316,68,65318,70,65319,71,65324,76,65329,81,65330,82,65333,85,65334,86,65335,87,65343,95,65346,98,65348,100,65350,102,65355,107,65357,109,65358,110,65361,113,65362,114,65364,116,65365,117,65367,119,65370,122,65371,123,65373,125,119846,109],\"_default\":[160,32,8211,45,65374,126,8218,44,65306,58,65281,33,8216,96,8217,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"cs\":[65374,126,8218,44,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"de\":[65374,126,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"es\":[8211,45,65374,126,8218,44,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"fr\":[65374,126,8218,44,65306,58,65281,33,8216,96,8245,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"it\":[160,32,8211,45,65374,126,8218,44,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"ja\":[8211,45,8218,44,65281,33,8216,96,8245,96,180,96,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65292,44,65297,49,65307,59],\"ko\":[8211,45,65374,126,8218,44,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"pl\":[65374,126,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"pt-BR\":[65374,126,8218,44,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"qps-ploc\":[160,32,8211,45,65374,126,8218,44,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"ru\":[65374,126,8218,44,65306,58,65281,33,8216,96,8245,96,180,96,12494,47,305,105,921,73,1009,112,215,120,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"tr\":[160,32,8211,45,65374,126,8218,44,65306,58,65281,33,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65288,40,65289,41,65292,44,65297,49,65307,59,65311,63],\"zh-hans\":[160,32,65374,126,8218,44,8245,96,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89,65297,49],\"zh-hant\":[8211,45,65374,126,8218,44,180,96,12494,47,1047,51,1073,54,1072,97,1040,65,1068,98,1042,66,1089,99,1057,67,1077,101,1045,69,1053,72,305,105,1050,75,921,73,1052,77,1086,111,1054,79,1009,112,1088,112,1056,80,1075,114,1058,84,215,120,1093,120,1061,88,1091,121,1059,89]}"
\ No newline at end of file
diff --git a/modules/charset/ambiguous_gen.go b/modules/charset/ambiguous_gen.go
index c88ffd5aa5..b0fa6099a7 100644
--- a/modules/charset/ambiguous_gen.go
+++ b/modules/charset/ambiguous_gen.go
@@ -19,8 +19,8 @@ type AmbiguousTable struct {
 // AmbiguousCharacters provides a map by locale name to the confusable characters in that locale
 var AmbiguousCharacters = map[string]*AmbiguousTable{
 	"_common": {
-		Confusable: []rune{184, 383, 388, 397, 422, 423, 439, 444, 445, 448, 451, 540, 546, 547, 577, 593, 609, 611, 617, 618, 623, 651, 655, 660, 697, 699, 700, 701, 702, 706, 707, 708, 710, 712, 714, 715, 720, 727, 731, 732, 756, 760, 884, 890, 894, 895, 900, 913, 914, 917, 918, 919, 922, 924, 925, 927, 929, 932, 933, 935, 945, 947, 953, 957, 959, 961, 963, 965, 978, 988, 1000, 1010, 1011, 1017, 1018, 1029, 1030, 1032, 1109, 1110, 1112, 1121, 1140, 1141, 1198, 1199, 1211, 1213, 1216, 1231, 1248, 1281, 1292, 1307, 1308, 1309, 1357, 1359, 1365, 1370, 1373, 1377, 1379, 1382, 1392, 1400, 1404, 1405, 1409, 1412, 1413, 1417, 1472, 1475, 1493, 1496, 1497, 1503, 1505, 1523, 1549, 1575, 1607, 1632, 1633, 1637, 1639, 1643, 1645, 1726, 1729, 1748, 1749, 1776, 1777, 1781, 1783, 1793, 1794, 1795, 1796, 1984, 1994, 2036, 2037, 2042, 2307, 2406, 2429, 2534, 2538, 2541, 2662, 2663, 2666, 2691, 2790, 2819, 2848, 2918, 2920, 3046, 3074, 3174, 3202, 3302, 3330, 3360, 3430, 3437, 3458, 3664, 3792, 4125, 4160, 4327, 4351, 4608, 4816, 5024, 5025, 5026, 5029, 5033, 5034, 5035, 5036, 5038, 5043, 5047, 5051, 5053, 5056, 5058, 5059, 5070, 5071, 5074, 5076, 5077, 5081, 5082, 5086, 5087, 5090, 5094, 5095, 5102, 5107, 5108, 5120, 5167, 5171, 5176, 5194, 5196, 5229, 5231, 5234, 5261, 5290, 5311, 5441, 5500, 5501, 5511, 5551, 5556, 5573, 5598, 5610, 5616, 5623, 5741, 5742, 5760, 5810, 5815, 5825, 5836, 5845, 5846, 5868, 5869, 5941, 6147, 6153, 7428, 7439, 7441, 7452, 7456, 7457, 7458, 7462, 7555, 7564, 7837, 7935, 8125, 8126, 8127, 8128, 8175, 8189, 8190, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200, 8201, 8202, 8208, 8209, 8210, 8218, 8219, 8228, 8232, 8233, 8239, 8242, 8249, 8250, 8257, 8259, 8260, 8270, 8275, 8282, 8287, 8450, 8458, 8459, 8460, 8461, 8462, 8464, 8465, 8466, 8467, 8469, 8473, 8474, 8475, 8476, 8477, 8484, 8488, 8490, 8492, 8493, 8494, 8495, 8496, 8497, 8499, 8500, 8505, 8509, 8517, 8518, 8519, 8520, 8521, 8544, 8548, 8553, 8556, 8557, 8558, 8559, 8560, 8564, 8569, 8572, 8573, 8574, 8722, 8725, 8726, 8727, 8739, 8744, 8746, 8758, 8764, 8868, 8897, 8899, 8959, 9075, 9076, 9082, 9213, 9585, 9587, 10088, 10089, 10094, 10095, 10098, 10099, 10100, 10101, 10133, 10134, 10187, 10189, 10201, 10539, 10540, 10741, 10744, 10745, 10799, 11397, 11406, 11410, 11412, 11416, 11418, 11422, 11423, 11426, 11427, 11428, 11429, 11430, 11432, 11436, 11450, 11462, 11466, 11468, 11472, 11474, 11576, 11577, 11599, 11601, 11604, 11605, 11613, 11840, 12034, 12035, 12295, 12308, 12309, 12339, 12448, 12755, 12756, 20022, 20031, 42192, 42193, 42194, 42195, 42196, 42198, 42199, 42201, 42202, 42204, 42205, 42207, 42208, 42209, 42210, 42211, 42214, 42215, 42218, 42219, 42220, 42222, 42224, 42226, 42227, 42228, 42232, 42233, 42237, 42239, 42510, 42564, 42567, 42719, 42731, 42735, 42801, 42842, 42858, 42862, 42872, 42889, 42892, 42904, 42905, 42911, 42923, 42930, 42931, 42932, 43826, 43829, 43837, 43847, 43848, 43854, 43858, 43866, 43893, 43905, 43907, 43923, 43945, 43946, 43951, 64422, 64423, 64424, 64425, 64426, 64427, 64428, 64429, 64830, 64831, 65072, 65101, 65102, 65103, 65112, 65128, 65165, 65166, 65257, 65258, 65259, 65260, 65282, 65284, 65285, 65286, 65287, 65290, 65291, 65293, 65294, 65295, 65296, 65297, 65298, 65299, 65300, 65301, 65302, 65303, 65304, 65305, 65308, 65309, 65310, 65312, 65313, 65314, 65315, 65316, 65317, 65318, 65319, 65320, 65321, 65322, 65323, 65324, 65325, 65326, 65327, 65328, 65329, 65330, 65331, 65332, 65333, 65334, 65335, 65336, 65337, 65338, 65339, 65340, 65341, 65342, 65343, 65344, 65345, 65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 65354, 65355, 65356, 65357, 65358, 65359, 65360, 65361, 65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 65370, 65371, 65372, 65373, 65512, 66178, 66182, 66183, 66186, 66192, 66194, 66197, 66198, 66199, 66203, 66208, 66209, 66210, 66213, 66219, 66224, 66225, 66226, 66228, 66255, 66293, 66305, 66306, 66313, 66321, 66325, 66327, 66330, 66335, 66336, 66338, 66564, 66581, 66587, 66592, 66604, 66621, 66632, 66740, 66754, 66766, 66770, 66794, 66806, 66835, 66838, 66840, 66844, 66845, 66853, 66854, 66855, 68176, 70864, 71430, 71434, 71438, 71439, 71840, 71842, 71843, 71844, 71846, 71849, 71852, 71854, 71855, 71858, 71861, 71864, 71867, 71868, 71872, 71873, 71874, 71875, 71876, 71878, 71880, 71882, 71884, 71893, 71894, 71895, 71896, 71900, 71904, 71909, 71910, 71913, 71916, 71919, 71922, 93960, 93962, 93974, 93992, 94005, 94010, 94011, 94015, 94016, 94018, 94019, 94033, 94034, 119060, 119149, 119302, 119309, 119311, 119314, 119315, 119318, 119338, 119350, 119351, 119354, 119355, 119808, 119809, 119810, 119811, 119812, 119813, 119814, 119815, 119816, 119817, 119818, 119819, 119820, 119821, 119822, 119823, 119824, 119825, 119826, 119827, 119828, 119829, 119830, 119831, 119832, 119833, 119834, 119835, 119836, 119837, 119838, 119839, 119840, 119841, 119842, 119843, 119844, 119845, 119847, 119848, 119849, 119850, 119851, 119852, 119853, 119854, 119855, 119856, 119857, 119858, 119859, 119860, 119861, 119862, 119863, 119864, 119865, 119866, 119867, 119868, 119869, 119870, 119871, 119872, 119873, 119874, 119875, 119876, 119877, 119878, 119879, 119880, 119881, 119882, 119883, 119884, 119885, 119886, 119887, 119888, 119889, 119890, 119891, 119892, 119894, 119895, 119896, 119897, 119899, 119900, 119901, 119902, 119903, 119904, 119905, 119906, 119907, 119908, 119909, 119910, 119911, 119912, 119913, 119914, 119915, 119916, 119917, 119918, 119919, 119920, 119921, 119922, 119923, 119924, 119925, 119926, 119927, 119928, 119929, 119930, 119931, 119932, 119933, 119934, 119935, 119936, 119937, 119938, 119939, 119940, 119941, 119942, 119943, 119944, 119945, 119946, 119947, 119948, 119949, 119951, 119952, 119953, 119954, 119955, 119956, 119957, 119958, 119959, 119960, 119961, 119962, 119963, 119964, 119966, 119967, 119970, 119973, 119974, 119977, 119978, 119979, 119980, 119982, 119983, 119984, 119985, 119986, 119987, 119988, 119989, 119990, 119991, 119992, 119993, 119995, 119997, 119998, 119999, 120000, 120001, 120003, 120005, 120006, 120007, 120008, 120009, 120010, 120011, 120012, 120013, 120014, 120015, 120016, 120017, 120018, 120019, 120020, 120021, 120022, 120023, 120024, 120025, 120026, 120027, 120028, 120029, 120030, 120031, 120032, 120033, 120034, 120035, 120036, 120037, 120038, 120039, 120040, 120041, 120042, 120043, 120044, 120045, 120046, 120047, 120048, 120049, 120050, 120051, 120052, 120053, 120055, 120056, 120057, 120058, 120059, 120060, 120061, 120062, 120063, 120064, 120065, 120066, 120067, 120068, 120069, 120071, 120072, 120073, 120074, 120077, 120078, 120079, 120080, 120081, 120082, 120083, 120084, 120086, 120087, 120088, 120089, 120090, 120091, 120092, 120094, 120095, 120096, 120097, 120098, 120099, 120100, 120101, 120102, 120103, 120104, 120105, 120107, 120108, 120109, 120110, 120111, 120112, 120113, 120114, 120115, 120116, 120117, 120118, 120119, 120120, 120121, 120123, 120124, 120125, 120126, 120128, 120129, 120130, 120131, 120132, 120134, 120138, 120139, 120140, 120141, 120142, 120143, 120144, 120146, 120147, 120148, 120149, 120150, 120151, 120152, 120153, 120154, 120155, 120156, 120157, 120159, 120160, 120161, 120162, 120163, 120164, 120165, 120166, 120167, 120168, 120169, 120170, 120171, 120172, 120173, 120174, 120175, 120176, 120177, 120178, 120179, 120180, 120181, 120182, 120183, 120184, 120185, 120186, 120187, 120188, 120189, 120190, 120191, 120192, 120193, 120194, 120195, 120196, 120197, 120198, 120199, 120200, 120201, 120202, 120203, 120204, 120205, 120206, 120207, 120208, 120209, 120211, 120212, 120213, 120214, 120215, 120216, 120217, 120218, 120219, 120220, 120221, 120222, 120223, 120224, 120225, 120226, 120227, 120228, 120229, 120230, 120231, 120232, 120233, 120234, 120235, 120236, 120237, 120238, 120239, 120240, 120241, 120242, 120243, 120244, 120245, 120246, 120247, 120248, 120249, 120250, 120251, 120252, 120253, 120254, 120255, 120256, 120257, 120258, 120259, 120260, 120261, 120263, 120264, 120265, 120266, 120267, 120268, 120269, 120270, 120271, 120272, 120273, 120274, 120275, 120276, 120277, 120278, 120279, 120280, 120281, 120282, 120283, 120284, 120285, 120286, 120287, 120288, 120289, 120290, 120291, 120292, 120293, 120294, 120295, 120296, 120297, 120298, 120299, 120300, 120301, 120302, 120303, 120304, 120305, 120306, 120307, 120308, 120309, 120310, 120311, 120312, 120313, 120315, 120316, 120317, 120318, 120319, 120320, 120321, 120322, 120323, 120324, 120325, 120326, 120327, 120328, 120329, 120330, 120331, 120332, 120333, 120334, 120335, 120336, 120337, 120338, 120339, 120340, 120341, 120342, 120343, 120344, 120345, 120346, 120347, 120348, 120349, 120350, 120351, 120352, 120353, 120354, 120355, 120356, 120357, 120358, 120359, 120360, 120361, 120362, 120363, 120364, 120365, 120367, 120368, 120369, 120370, 120371, 120372, 120373, 120374, 120375, 120376, 120377, 120378, 120379, 120380, 120381, 120382, 120383, 120384, 120385, 120386, 120387, 120388, 120389, 120390, 120391, 120392, 120393, 120394, 120395, 120396, 120397, 120398, 120399, 120400, 120401, 120402, 120403, 120404, 120405, 120406, 120407, 120408, 120409, 120410, 120411, 120412, 120413, 120414, 120415, 120416, 120417, 120419, 120420, 120421, 120422, 120423, 120424, 120425, 120426, 120427, 120428, 120429, 120430, 120431, 120432, 120433, 120434, 120435, 120436, 120437, 120438, 120439, 120440, 120441, 120442, 120443, 120444, 120445, 120446, 120447, 120448, 120449, 120450, 120451, 120452, 120453, 120454, 120455, 120456, 120457, 120458, 120459, 120460, 120461, 120462, 120463, 120464, 120465, 120466, 120467, 120468, 120469, 120471, 120472, 120473, 120474, 120475, 120476, 120477, 120478, 120479, 120480, 120481, 120482, 120483, 120484, 120488, 120489, 120492, 120493, 120494, 120496, 120497, 120499, 120500, 120502, 120504, 120507, 120508, 120510, 120514, 120516, 120522, 120526, 120528, 120530, 120532, 120534, 120544, 120546, 120547, 120550, 120551, 120552, 120554, 120555, 120557, 120558, 120560, 120562, 120565, 120566, 120568, 120572, 120574, 120580, 120584, 120586, 120588, 120590, 120592, 120602, 120604, 120605, 120608, 120609, 120610, 120612, 120613, 120615, 120616, 120618, 120620, 120623, 120624, 120626, 120630, 120632, 120638, 120642, 120644, 120646, 120648, 120650, 120660, 120662, 120663, 120666, 120667, 120668, 120670, 120671, 120673, 120674, 120676, 120678, 120681, 120682, 120684, 120688, 120690, 120696, 120700, 120702, 120704, 120706, 120708, 120718, 120720, 120721, 120724, 120725, 120726, 120728, 120729, 120731, 120732, 120734, 120736, 120739, 120740, 120742, 120746, 120748, 120754, 120758, 120760, 120762, 120764, 120766, 120776, 120778, 120782, 120783, 120784, 120785, 120786, 120787, 120788, 120789, 120790, 120791, 120792, 120793, 120794, 120795, 120796, 120797, 120798, 120799, 120800, 120801, 120802, 120803, 120804, 120805, 120806, 120807, 120808, 120809, 120810, 120811, 120812, 120813, 120814, 120815, 120816, 120817, 120818, 120819, 120820, 120821, 120822, 120823, 120824, 120825, 120826, 120827, 120828, 120829, 120830, 120831, 125127, 125131, 126464, 126500, 126564, 126592, 126596, 128844, 128872, 130032, 130033, 130034, 130035, 130036, 130037, 130038, 130039, 130040, 130041},
-		With:       []rune{44, 102, 98, 103, 82, 50, 51, 53, 115, 73, 33, 51, 56, 56, 63, 97, 103, 121, 105, 105, 119, 117, 121, 63, 96, 96, 96, 96, 96, 60, 62, 94, 94, 96, 96, 96, 58, 45, 105, 126, 96, 58, 96, 105, 59, 74, 96, 65, 66, 69, 90, 72, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 89, 70, 50, 99, 106, 67, 77, 83, 73, 74, 115, 105, 106, 119, 86, 118, 89, 121, 104, 101, 73, 105, 51, 100, 71, 113, 87, 119, 85, 83, 79, 96, 96, 119, 113, 113, 104, 110, 110, 117, 103, 102, 111, 58, 108, 58, 108, 118, 96, 108, 111, 96, 44, 108, 111, 46, 108, 111, 86, 44, 42, 111, 111, 45, 111, 46, 73, 111, 86, 46, 46, 58, 58, 79, 108, 96, 96, 95, 58, 111, 63, 79, 56, 57, 111, 57, 56, 58, 111, 56, 79, 79, 57, 111, 111, 111, 111, 111, 111, 111, 111, 57, 111, 111, 111, 111, 111, 121, 111, 85, 79, 68, 82, 84, 105, 89, 65, 74, 69, 63, 87, 77, 72, 89, 71, 104, 90, 52, 98, 82, 87, 83, 86, 83, 76, 67, 80, 75, 100, 54, 71, 66, 61, 86, 62, 60, 96, 85, 80, 100, 98, 74, 76, 50, 120, 72, 120, 82, 98, 70, 65, 68, 68, 77, 66, 88, 120, 32, 60, 88, 73, 96, 75, 77, 58, 43, 47, 58, 58, 99, 111, 111, 117, 118, 119, 122, 114, 103, 121, 102, 121, 96, 105, 96, 126, 96, 96, 96, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 45, 44, 96, 46, 32, 32, 32, 96, 60, 62, 47, 45, 47, 42, 126, 58, 32, 67, 103, 72, 72, 72, 104, 73, 73, 76, 108, 78, 80, 81, 82, 82, 82, 90, 90, 75, 66, 67, 101, 101, 69, 70, 77, 111, 105, 121, 68, 100, 101, 105, 106, 73, 86, 88, 76, 67, 68, 77, 105, 118, 120, 73, 99, 100, 45, 47, 92, 42, 73, 118, 85, 58, 126, 84, 118, 85, 69, 105, 112, 97, 73, 47, 88, 40, 41, 60, 62, 40, 41, 123, 125, 43, 45, 47, 92, 84, 120, 120, 92, 47, 92, 120, 114, 72, 73, 75, 77, 78, 79, 111, 80, 112, 67, 99, 84, 89, 88, 45, 47, 57, 51, 76, 54, 86, 69, 73, 33, 79, 81, 88, 61, 92, 47, 79, 40, 41, 47, 61, 47, 92, 92, 47, 66, 80, 100, 68, 84, 71, 75, 74, 67, 90, 70, 77, 78, 76, 83, 82, 86, 72, 87, 88, 89, 65, 69, 73, 79, 85, 46, 44, 58, 61, 46, 50, 105, 86, 63, 50, 115, 50, 51, 57, 38, 58, 96, 70, 102, 117, 51, 74, 88, 66, 101, 102, 111, 114, 114, 117, 117, 121, 105, 114, 119, 122, 118, 115, 99, 111, 111, 111, 111, 111, 111, 111, 111, 40, 41, 58, 95, 95, 95, 45, 92, 108, 108, 111, 111, 111, 111, 34, 36, 37, 38, 96, 42, 43, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 60, 61, 62, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 73, 66, 69, 70, 124, 88, 79, 80, 83, 84, 43, 65, 66, 67, 70, 79, 77, 84, 89, 88, 72, 90, 66, 67, 124, 77, 84, 88, 56, 42, 108, 88, 79, 67, 76, 83, 111, 99, 115, 82, 79, 85, 55, 111, 117, 78, 79, 75, 67, 86, 70, 76, 88, 46, 79, 118, 119, 119, 119, 86, 70, 76, 89, 69, 90, 57, 69, 52, 76, 79, 85, 53, 84, 118, 115, 70, 105, 122, 55, 111, 51, 57, 54, 57, 111, 117, 121, 79, 90, 87, 67, 88, 87, 67, 86, 84, 76, 73, 82, 83, 51, 62, 65, 85, 89, 96, 96, 123, 46, 51, 86, 92, 55, 70, 82, 76, 60, 62, 47, 92, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 67, 68, 71, 74, 75, 78, 79, 80, 81, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 102, 104, 105, 106, 107, 108, 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 68, 69, 70, 71, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 87, 88, 89, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 77, 79, 83, 84, 85, 86, 87, 88, 89, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 105, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 70, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 108, 56, 108, 111, 111, 108, 111, 67, 84, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57},
+		Confusable: []rune{184, 383, 388, 397, 422, 423, 439, 444, 445, 448, 451, 540, 546, 547, 577, 593, 609, 611, 617, 618, 623, 651, 655, 660, 697, 699, 700, 701, 702, 706, 707, 708, 710, 712, 714, 715, 720, 727, 731, 732, 756, 760, 884, 890, 894, 895, 900, 913, 914, 917, 918, 919, 922, 924, 925, 927, 929, 932, 933, 935, 945, 947, 953, 957, 959, 961, 963, 965, 978, 988, 1000, 1010, 1011, 1017, 1018, 1029, 1030, 1032, 1109, 1110, 1112, 1121, 1140, 1141, 1198, 1199, 1211, 1213, 1216, 1231, 1248, 1281, 1292, 1307, 1308, 1309, 1357, 1359, 1365, 1370, 1373, 1377, 1379, 1382, 1392, 1400, 1404, 1405, 1409, 1412, 1413, 1417, 1472, 1475, 1493, 1496, 1497, 1503, 1505, 1523, 1549, 1575, 1607, 1632, 1633, 1637, 1639, 1643, 1645, 1726, 1729, 1748, 1749, 1776, 1777, 1781, 1783, 1793, 1794, 1795, 1796, 1984, 1994, 2036, 2037, 2042, 2307, 2406, 2429, 2534, 2538, 2541, 2662, 2663, 2666, 2691, 2790, 2819, 2848, 2918, 2920, 3046, 3074, 3174, 3202, 3302, 3330, 3360, 3430, 3437, 3458, 3664, 3792, 4125, 4160, 4327, 4351, 4608, 4816, 5024, 5025, 5026, 5029, 5033, 5034, 5035, 5036, 5038, 5043, 5047, 5051, 5053, 5056, 5058, 5059, 5070, 5071, 5074, 5076, 5077, 5081, 5082, 5086, 5087, 5090, 5094, 5095, 5102, 5107, 5108, 5120, 5167, 5171, 5176, 5194, 5196, 5229, 5231, 5234, 5261, 5290, 5311, 5441, 5500, 5501, 5511, 5551, 5556, 5573, 5598, 5610, 5616, 5623, 5741, 5742, 5760, 5810, 5815, 5825, 5836, 5845, 5846, 5868, 5869, 5941, 6147, 6153, 7428, 7439, 7441, 7452, 7456, 7457, 7458, 7462, 7555, 7564, 7837, 7935, 8125, 8126, 8127, 8128, 8175, 8189, 8190, 8192, 8193, 8194, 8195, 8196, 8197, 8198, 8199, 8200, 8201, 8202, 8208, 8209, 8210, 8219, 8228, 8232, 8233, 8239, 8242, 8249, 8250, 8257, 8259, 8260, 8270, 8275, 8282, 8287, 8450, 8458, 8459, 8460, 8461, 8462, 8464, 8465, 8466, 8467, 8469, 8473, 8474, 8475, 8476, 8477, 8484, 8488, 8490, 8492, 8493, 8494, 8495, 8496, 8497, 8499, 8500, 8505, 8509, 8517, 8518, 8519, 8520, 8521, 8544, 8548, 8553, 8556, 8557, 8558, 8559, 8560, 8564, 8569, 8572, 8573, 8574, 8722, 8725, 8726, 8727, 8739, 8744, 8746, 8758, 8764, 8868, 8897, 8899, 8959, 9075, 9076, 9082, 9213, 9585, 9587, 10088, 10089, 10094, 10095, 10098, 10099, 10100, 10101, 10133, 10134, 10187, 10189, 10201, 10539, 10540, 10741, 10744, 10745, 10799, 11397, 11406, 11410, 11412, 11416, 11418, 11422, 11423, 11426, 11427, 11428, 11429, 11430, 11432, 11436, 11450, 11462, 11466, 11468, 11472, 11474, 11576, 11577, 11599, 11601, 11604, 11605, 11613, 11840, 12034, 12035, 12295, 12308, 12309, 12339, 12448, 12755, 12756, 20022, 20031, 42192, 42193, 42194, 42195, 42196, 42198, 42199, 42201, 42202, 42204, 42205, 42207, 42208, 42209, 42210, 42211, 42214, 42215, 42218, 42219, 42220, 42222, 42224, 42226, 42227, 42228, 42232, 42233, 42237, 42239, 42510, 42564, 42567, 42719, 42731, 42735, 42801, 42842, 42858, 42862, 42872, 42889, 42892, 42904, 42905, 42911, 42923, 42930, 42931, 42932, 43826, 43829, 43837, 43847, 43848, 43854, 43858, 43866, 43893, 43905, 43907, 43923, 43945, 43946, 43951, 64422, 64423, 64424, 64425, 64426, 64427, 64428, 64429, 64830, 64831, 65072, 65101, 65102, 65103, 65112, 65128, 65165, 65166, 65257, 65258, 65259, 65260, 65282, 65283, 65284, 65285, 65286, 65287, 65290, 65291, 65293, 65294, 65295, 65296, 65298, 65299, 65300, 65301, 65302, 65303, 65304, 65305, 65308, 65309, 65310, 65312, 65313, 65314, 65315, 65316, 65317, 65318, 65319, 65320, 65321, 65322, 65323, 65324, 65325, 65326, 65327, 65328, 65329, 65330, 65331, 65332, 65333, 65334, 65335, 65336, 65337, 65338, 65339, 65340, 65341, 65342, 65343, 65344, 65345, 65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 65354, 65355, 65356, 65357, 65358, 65359, 65360, 65361, 65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 65370, 65371, 65372, 65373, 65512, 66178, 66182, 66183, 66186, 66192, 66194, 66197, 66198, 66199, 66203, 66208, 66209, 66210, 66213, 66219, 66224, 66225, 66226, 66228, 66255, 66293, 66305, 66306, 66313, 66321, 66325, 66327, 66330, 66335, 66336, 66338, 66564, 66581, 66587, 66592, 66604, 66621, 66632, 66740, 66754, 66766, 66770, 66794, 66806, 66835, 66838, 66840, 66844, 66845, 66853, 66854, 66855, 68176, 70864, 71430, 71434, 71438, 71439, 71840, 71842, 71843, 71844, 71846, 71849, 71852, 71854, 71855, 71858, 71861, 71864, 71867, 71868, 71872, 71873, 71874, 71875, 71876, 71878, 71880, 71882, 71884, 71893, 71894, 71895, 71896, 71900, 71904, 71909, 71910, 71913, 71916, 71919, 71922, 93960, 93962, 93974, 93992, 94005, 94010, 94011, 94015, 94016, 94018, 94019, 94033, 94034, 117974, 117975, 117976, 117977, 117978, 117979, 117980, 117981, 117982, 117983, 117984, 117985, 117986, 117987, 117988, 117989, 117990, 117991, 117992, 117993, 117994, 117995, 117996, 117997, 117998, 117999, 118000, 118001, 118002, 118003, 118004, 118005, 118006, 118007, 118008, 118009, 119060, 119149, 119302, 119309, 119311, 119314, 119315, 119318, 119338, 119350, 119351, 119354, 119355, 119808, 119809, 119810, 119811, 119812, 119813, 119814, 119815, 119816, 119817, 119818, 119819, 119820, 119821, 119822, 119823, 119824, 119825, 119826, 119827, 119828, 119829, 119830, 119831, 119832, 119833, 119834, 119835, 119836, 119837, 119838, 119839, 119840, 119841, 119842, 119843, 119844, 119845, 119846, 119847, 119848, 119849, 119850, 119851, 119852, 119853, 119854, 119855, 119856, 119857, 119858, 119859, 119860, 119861, 119862, 119863, 119864, 119865, 119866, 119867, 119868, 119869, 119870, 119871, 119872, 119873, 119874, 119875, 119876, 119877, 119878, 119879, 119880, 119881, 119882, 119883, 119884, 119885, 119886, 119887, 119888, 119889, 119890, 119891, 119892, 119894, 119895, 119896, 119897, 119899, 119900, 119901, 119902, 119903, 119904, 119905, 119906, 119907, 119908, 119909, 119910, 119911, 119912, 119913, 119914, 119915, 119916, 119917, 119918, 119919, 119920, 119921, 119922, 119923, 119924, 119925, 119926, 119927, 119928, 119929, 119930, 119931, 119932, 119933, 119934, 119935, 119936, 119937, 119938, 119939, 119940, 119941, 119942, 119943, 119944, 119945, 119946, 119947, 119948, 119949, 119951, 119952, 119953, 119954, 119955, 119956, 119957, 119958, 119959, 119960, 119961, 119962, 119963, 119964, 119966, 119967, 119970, 119973, 119974, 119977, 119978, 119979, 119980, 119982, 119983, 119984, 119985, 119986, 119987, 119988, 119989, 119990, 119991, 119992, 119993, 119995, 119997, 119998, 119999, 120000, 120001, 120003, 120005, 120006, 120007, 120008, 120009, 120010, 120011, 120012, 120013, 120014, 120015, 120016, 120017, 120018, 120019, 120020, 120021, 120022, 120023, 120024, 120025, 120026, 120027, 120028, 120029, 120030, 120031, 120032, 120033, 120034, 120035, 120036, 120037, 120038, 120039, 120040, 120041, 120042, 120043, 120044, 120045, 120046, 120047, 120048, 120049, 120050, 120051, 120052, 120053, 120055, 120056, 120057, 120058, 120059, 120060, 120061, 120062, 120063, 120064, 120065, 120066, 120067, 120068, 120069, 120071, 120072, 120073, 120074, 120077, 120078, 120079, 120080, 120081, 120082, 120083, 120084, 120086, 120087, 120088, 120089, 120090, 120091, 120092, 120094, 120095, 120096, 120097, 120098, 120099, 120100, 120101, 120102, 120103, 120104, 120105, 120107, 120108, 120109, 120110, 120111, 120112, 120113, 120114, 120115, 120116, 120117, 120118, 120119, 120120, 120121, 120123, 120124, 120125, 120126, 120128, 120129, 120130, 120131, 120132, 120134, 120138, 120139, 120140, 120141, 120142, 120143, 120144, 120146, 120147, 120148, 120149, 120150, 120151, 120152, 120153, 120154, 120155, 120156, 120157, 120159, 120160, 120161, 120162, 120163, 120164, 120165, 120166, 120167, 120168, 120169, 120170, 120171, 120172, 120173, 120174, 120175, 120176, 120177, 120178, 120179, 120180, 120181, 120182, 120183, 120184, 120185, 120186, 120187, 120188, 120189, 120190, 120191, 120192, 120193, 120194, 120195, 120196, 120197, 120198, 120199, 120200, 120201, 120202, 120203, 120204, 120205, 120206, 120207, 120208, 120209, 120211, 120212, 120213, 120214, 120215, 120216, 120217, 120218, 120219, 120220, 120221, 120222, 120223, 120224, 120225, 120226, 120227, 120228, 120229, 120230, 120231, 120232, 120233, 120234, 120235, 120236, 120237, 120238, 120239, 120240, 120241, 120242, 120243, 120244, 120245, 120246, 120247, 120248, 120249, 120250, 120251, 120252, 120253, 120254, 120255, 120256, 120257, 120258, 120259, 120260, 120261, 120263, 120264, 120265, 120266, 120267, 120268, 120269, 120270, 120271, 120272, 120273, 120274, 120275, 120276, 120277, 120278, 120279, 120280, 120281, 120282, 120283, 120284, 120285, 120286, 120287, 120288, 120289, 120290, 120291, 120292, 120293, 120294, 120295, 120296, 120297, 120298, 120299, 120300, 120301, 120302, 120303, 120304, 120305, 120306, 120307, 120308, 120309, 120310, 120311, 120312, 120313, 120315, 120316, 120317, 120318, 120319, 120320, 120321, 120322, 120323, 120324, 120325, 120326, 120327, 120328, 120329, 120330, 120331, 120332, 120333, 120334, 120335, 120336, 120337, 120338, 120339, 120340, 120341, 120342, 120343, 120344, 120345, 120346, 120347, 120348, 120349, 120350, 120351, 120352, 120353, 120354, 120355, 120356, 120357, 120358, 120359, 120360, 120361, 120362, 120363, 120364, 120365, 120367, 120368, 120369, 120370, 120371, 120372, 120373, 120374, 120375, 120376, 120377, 120378, 120379, 120380, 120381, 120382, 120383, 120384, 120385, 120386, 120387, 120388, 120389, 120390, 120391, 120392, 120393, 120394, 120395, 120396, 120397, 120398, 120399, 120400, 120401, 120402, 120403, 120404, 120405, 120406, 120407, 120408, 120409, 120410, 120411, 120412, 120413, 120414, 120415, 120416, 120417, 120419, 120420, 120421, 120422, 120423, 120424, 120425, 120426, 120427, 120428, 120429, 120430, 120431, 120432, 120433, 120434, 120435, 120436, 120437, 120438, 120439, 120440, 120441, 120442, 120443, 120444, 120445, 120446, 120447, 120448, 120449, 120450, 120451, 120452, 120453, 120454, 120455, 120456, 120457, 120458, 120459, 120460, 120461, 120462, 120463, 120464, 120465, 120466, 120467, 120468, 120469, 120471, 120472, 120473, 120474, 120475, 120476, 120477, 120478, 120479, 120480, 120481, 120482, 120483, 120484, 120488, 120489, 120492, 120493, 120494, 120496, 120497, 120499, 120500, 120502, 120504, 120507, 120508, 120510, 120514, 120516, 120522, 120526, 120528, 120530, 120532, 120534, 120544, 120546, 120547, 120550, 120551, 120552, 120554, 120555, 120557, 120558, 120560, 120562, 120565, 120566, 120568, 120572, 120574, 120580, 120584, 120586, 120588, 120590, 120592, 120602, 120604, 120605, 120608, 120609, 120610, 120612, 120613, 120615, 120616, 120618, 120620, 120623, 120624, 120626, 120630, 120632, 120638, 120642, 120644, 120646, 120648, 120650, 120660, 120662, 120663, 120666, 120667, 120668, 120670, 120671, 120673, 120674, 120676, 120678, 120681, 120682, 120684, 120688, 120690, 120696, 120700, 120702, 120704, 120706, 120708, 120718, 120720, 120721, 120724, 120725, 120726, 120728, 120729, 120731, 120732, 120734, 120736, 120739, 120740, 120742, 120746, 120748, 120754, 120758, 120760, 120762, 120764, 120766, 120776, 120778, 120782, 120783, 120784, 120785, 120786, 120787, 120788, 120789, 120790, 120791, 120792, 120793, 120794, 120795, 120796, 120797, 120798, 120799, 120800, 120801, 120802, 120803, 120804, 120805, 120806, 120807, 120808, 120809, 120810, 120811, 120812, 120813, 120814, 120815, 120816, 120817, 120818, 120819, 120820, 120821, 120822, 120823, 120824, 120825, 120826, 120827, 120828, 120829, 120830, 120831, 125127, 125131, 126464, 126500, 126564, 126592, 126596, 128844, 128872, 130032, 130033, 130034, 130035, 130036, 130037, 130038, 130039, 130040, 130041},
+		With:       []rune{44, 102, 98, 103, 82, 50, 51, 53, 115, 73, 33, 51, 56, 56, 63, 97, 103, 121, 105, 105, 119, 117, 121, 63, 96, 96, 96, 96, 96, 60, 62, 94, 94, 96, 96, 96, 58, 45, 105, 126, 96, 58, 96, 105, 59, 74, 96, 65, 66, 69, 90, 72, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 89, 70, 50, 99, 106, 67, 77, 83, 73, 74, 115, 105, 106, 119, 86, 118, 89, 121, 104, 101, 73, 105, 51, 100, 71, 113, 87, 119, 85, 83, 79, 96, 96, 119, 113, 113, 104, 110, 110, 117, 103, 102, 111, 58, 108, 58, 108, 118, 96, 108, 111, 96, 44, 108, 111, 46, 108, 111, 86, 44, 42, 111, 111, 45, 111, 46, 73, 111, 86, 46, 46, 58, 58, 79, 108, 96, 96, 95, 58, 111, 63, 79, 56, 57, 111, 57, 56, 58, 111, 56, 79, 79, 57, 111, 111, 111, 111, 111, 111, 111, 111, 57, 111, 111, 111, 111, 111, 121, 111, 85, 79, 68, 82, 84, 105, 89, 65, 74, 69, 63, 87, 77, 72, 89, 71, 104, 90, 52, 98, 82, 87, 83, 86, 83, 76, 67, 80, 75, 100, 54, 71, 66, 61, 86, 62, 60, 96, 85, 80, 100, 98, 74, 76, 50, 120, 72, 120, 82, 98, 70, 65, 68, 68, 77, 66, 88, 120, 32, 60, 88, 73, 96, 75, 77, 58, 43, 47, 58, 58, 99, 111, 111, 117, 118, 119, 122, 114, 103, 121, 102, 121, 96, 105, 96, 126, 96, 96, 96, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 45, 96, 46, 32, 32, 32, 96, 60, 62, 47, 45, 47, 42, 126, 58, 32, 67, 103, 72, 72, 72, 104, 73, 73, 76, 108, 78, 80, 81, 82, 82, 82, 90, 90, 75, 66, 67, 101, 101, 69, 70, 77, 111, 105, 121, 68, 100, 101, 105, 106, 73, 86, 88, 76, 67, 68, 77, 105, 118, 120, 73, 99, 100, 45, 47, 92, 42, 73, 118, 85, 58, 126, 84, 118, 85, 69, 105, 112, 97, 73, 47, 88, 40, 41, 60, 62, 40, 41, 123, 125, 43, 45, 47, 92, 84, 120, 120, 92, 47, 92, 120, 114, 72, 73, 75, 77, 78, 79, 111, 80, 112, 67, 99, 84, 89, 88, 45, 47, 57, 51, 76, 54, 86, 69, 73, 33, 79, 81, 88, 61, 92, 47, 79, 40, 41, 47, 61, 47, 92, 92, 47, 66, 80, 100, 68, 84, 71, 75, 74, 67, 90, 70, 77, 78, 76, 83, 82, 86, 72, 87, 88, 89, 65, 69, 73, 79, 85, 46, 44, 58, 61, 46, 50, 105, 86, 63, 50, 115, 50, 51, 57, 38, 58, 96, 70, 102, 117, 51, 74, 88, 66, 101, 102, 111, 114, 114, 117, 117, 121, 105, 114, 119, 122, 118, 115, 99, 111, 111, 111, 111, 111, 111, 111, 111, 40, 41, 58, 95, 95, 95, 45, 92, 108, 108, 111, 111, 111, 111, 34, 35, 36, 37, 38, 96, 42, 43, 45, 46, 47, 48, 50, 51, 52, 53, 54, 55, 56, 57, 60, 61, 62, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 73, 66, 69, 70, 124, 88, 79, 80, 83, 84, 43, 65, 66, 67, 70, 79, 77, 84, 89, 88, 72, 90, 66, 67, 124, 77, 84, 88, 56, 42, 108, 88, 79, 67, 76, 83, 111, 99, 115, 82, 79, 85, 55, 111, 117, 78, 79, 75, 67, 86, 70, 76, 88, 46, 79, 118, 119, 119, 119, 86, 70, 76, 89, 69, 90, 57, 69, 52, 76, 79, 85, 53, 84, 118, 115, 70, 105, 122, 55, 111, 51, 57, 54, 57, 111, 117, 121, 79, 90, 87, 67, 88, 87, 67, 86, 84, 76, 73, 82, 83, 51, 62, 65, 85, 89, 96, 96, 65, 66, 67, 68, 69, 70, 71, 72, 108, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 79, 108, 50, 51, 52, 53, 54, 55, 56, 57, 123, 46, 51, 86, 92, 55, 70, 82, 76, 60, 62, 47, 92, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 67, 68, 71, 74, 75, 78, 79, 80, 81, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 102, 104, 105, 106, 107, 108, 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 68, 69, 70, 71, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 87, 88, 89, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 77, 79, 83, 84, 85, 86, 87, 88, 89, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 73, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 105, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 65, 66, 69, 90, 72, 73, 75, 77, 78, 79, 80, 84, 89, 88, 97, 121, 105, 118, 111, 112, 111, 117, 112, 70, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57, 108, 56, 108, 111, 111, 108, 111, 67, 84, 79, 73, 50, 51, 52, 53, 54, 55, 56, 57},
 		Locale:     "_common",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -152,16 +152,15 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 8190, Hi: 8192, Stride: 2},
 				{Lo: 8193, Hi: 8202, Stride: 1},
 				{Lo: 8208, Hi: 8210, Stride: 1},
-				{Lo: 8218, Hi: 8219, Stride: 1},
-				{Lo: 8228, Hi: 8232, Stride: 4},
-				{Lo: 8233, Hi: 8239, Stride: 6},
-				{Lo: 8242, Hi: 8249, Stride: 7},
-				{Lo: 8250, Hi: 8257, Stride: 7},
-				{Lo: 8259, Hi: 8260, Stride: 1},
-				{Lo: 8270, Hi: 8275, Stride: 5},
-				{Lo: 8282, Hi: 8287, Stride: 5},
-				{Lo: 8450, Hi: 8458, Stride: 8},
-				{Lo: 8459, Hi: 8462, Stride: 1},
+				{Lo: 8219, Hi: 8228, Stride: 9},
+				{Lo: 8232, Hi: 8233, Stride: 1},
+				{Lo: 8239, Hi: 8242, Stride: 3},
+				{Lo: 8249, Hi: 8250, Stride: 1},
+				{Lo: 8257, Hi: 8259, Stride: 2},
+				{Lo: 8260, Hi: 8270, Stride: 10},
+				{Lo: 8275, Hi: 8282, Stride: 7},
+				{Lo: 8287, Hi: 8450, Stride: 163},
+				{Lo: 8458, Hi: 8462, Stride: 1},
 				{Lo: 8464, Hi: 8467, Stride: 1},
 				{Lo: 8469, Hi: 8473, Stride: 4},
 				{Lo: 8474, Hi: 8477, Stride: 1},
@@ -250,10 +249,10 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 65112, Hi: 65128, Stride: 16},
 				{Lo: 65165, Hi: 65166, Stride: 1},
 				{Lo: 65257, Hi: 65260, Stride: 1},
-				{Lo: 65282, Hi: 65284, Stride: 2},
-				{Lo: 65285, Hi: 65287, Stride: 1},
+				{Lo: 65282, Hi: 65287, Stride: 1},
 				{Lo: 65290, Hi: 65291, Stride: 1},
-				{Lo: 65293, Hi: 65305, Stride: 1},
+				{Lo: 65293, Hi: 65296, Stride: 1},
+				{Lo: 65298, Hi: 65305, Stride: 1},
 				{Lo: 65308, Hi: 65310, Stride: 1},
 				{Lo: 65312, Hi: 65373, Stride: 1},
 				{Lo: 65512, Hi: 65512, Stride: 1},
@@ -304,15 +303,16 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 94011, Hi: 94015, Stride: 4},
 				{Lo: 94016, Hi: 94018, Stride: 2},
 				{Lo: 94019, Hi: 94033, Stride: 14},
-				{Lo: 94034, Hi: 119060, Stride: 25026},
-				{Lo: 119149, Hi: 119302, Stride: 153},
-				{Lo: 119309, Hi: 119311, Stride: 2},
-				{Lo: 119314, Hi: 119315, Stride: 1},
-				{Lo: 119318, Hi: 119338, Stride: 20},
-				{Lo: 119350, Hi: 119351, Stride: 1},
-				{Lo: 119354, Hi: 119355, Stride: 1},
-				{Lo: 119808, Hi: 119845, Stride: 1},
-				{Lo: 119847, Hi: 119892, Stride: 1},
+				{Lo: 94034, Hi: 117974, Stride: 23940},
+				{Lo: 117975, Hi: 118009, Stride: 1},
+				{Lo: 119060, Hi: 119149, Stride: 89},
+				{Lo: 119302, Hi: 119309, Stride: 7},
+				{Lo: 119311, Hi: 119314, Stride: 3},
+				{Lo: 119315, Hi: 119318, Stride: 3},
+				{Lo: 119338, Hi: 119350, Stride: 12},
+				{Lo: 119351, Hi: 119354, Stride: 3},
+				{Lo: 119355, Hi: 119808, Stride: 453},
+				{Lo: 119809, Hi: 119892, Stride: 1},
 				{Lo: 119894, Hi: 119897, Stride: 1},
 				{Lo: 119899, Hi: 119949, Stride: 1},
 				{Lo: 119951, Hi: 119964, Stride: 1},
@@ -405,8 +405,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"_default": {
-		Confusable: []rune{160, 180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{32, 96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{160, 180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8217, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{32, 96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "_default",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -424,20 +424,21 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
 				{Lo: 8211, Hi: 8216, Stride: 5},
-				{Lo: 8217, Hi: 8245, Stride: 28},
-				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
+				{Lo: 8217, Hi: 8218, Stride: 1},
+				{Lo: 8245, Hi: 12494, Stride: 4249},
+				{Lo: 65281, Hi: 65288, Stride: 7},
 				{Lo: 65289, Hi: 65292, Stride: 3},
-				{Lo: 65306, Hi: 65307, Stride: 1},
-				{Lo: 65311, Hi: 65374, Stride: 63},
+				{Lo: 65297, Hi: 65306, Stride: 9},
+				{Lo: 65307, Hi: 65311, Stride: 4},
+				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"cs": {
-		Confusable: []rune{180, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "cs",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -453,11 +454,11 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8216, Hi: 8217, Stride: 1},
+				{Lo: 8216, Hi: 8218, Stride: 2},
 				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65283, Stride: 2},
-				{Lo: 65288, Hi: 65289, Stride: 1},
-				{Lo: 65292, Hi: 65306, Stride: 14},
+				{Lo: 65281, Hi: 65288, Stride: 7},
+				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65297, Hi: 65306, Stride: 9},
 				{Lo: 65307, Hi: 65311, Stride: 4},
 				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
@@ -466,8 +467,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"de": {
-		Confusable: []rune{180, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "de",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -483,11 +484,10 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8216, Hi: 8217, Stride: 1},
 				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65283, Stride: 2},
-				{Lo: 65288, Hi: 65289, Stride: 1},
-				{Lo: 65292, Hi: 65306, Stride: 14},
+				{Lo: 65281, Hi: 65288, Stride: 7},
+				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65297, Hi: 65306, Stride: 9},
 				{Lo: 65307, Hi: 65311, Stride: 4},
 				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
@@ -496,8 +496,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"es": {
-		Confusable: []rune{180, 215, 305, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 120, 105, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 215, 305, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 120, 105, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "es",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -513,20 +513,21 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8211, Hi: 8245, Stride: 34},
-				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
+				{Lo: 8211, Hi: 8218, Stride: 7},
+				{Lo: 8245, Hi: 12494, Stride: 4249},
+				{Lo: 65281, Hi: 65288, Stride: 7},
 				{Lo: 65289, Hi: 65292, Stride: 3},
-				{Lo: 65306, Hi: 65307, Stride: 1},
-				{Lo: 65311, Hi: 65374, Stride: 63},
+				{Lo: 65297, Hi: 65306, Stride: 9},
+				{Lo: 65307, Hi: 65311, Stride: 4},
+				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"fr": {
-		Confusable: []rune{215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "fr",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -542,20 +543,21 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8216, Hi: 8245, Stride: 29},
-				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
+				{Lo: 8216, Hi: 8218, Stride: 2},
+				{Lo: 8245, Hi: 12494, Stride: 4249},
+				{Lo: 65281, Hi: 65288, Stride: 7},
 				{Lo: 65289, Hi: 65292, Stride: 3},
-				{Lo: 65306, Hi: 65307, Stride: 1},
-				{Lo: 65311, Hi: 65374, Stride: 63},
+				{Lo: 65297, Hi: 65306, Stride: 9},
+				{Lo: 65307, Hi: 65311, Stride: 4},
+				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 0,
 		},
 	},
 	"it": {
-		Confusable: []rune{160, 180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{32, 96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{160, 180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{32, 96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "it",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -572,11 +574,11 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8211, Hi: 8216, Stride: 5},
+				{Lo: 8211, Hi: 8218, Stride: 7},
 				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65283, Stride: 2},
-				{Lo: 65288, Hi: 65289, Stride: 1},
-				{Lo: 65292, Hi: 65306, Stride: 14},
+				{Lo: 65281, Hi: 65288, Stride: 7},
+				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65297, Hi: 65306, Stride: 9},
 				{Lo: 65307, Hi: 65311, Stride: 4},
 				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
@@ -585,8 +587,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"ja": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8217, 8245, 65281, 65283, 65292, 65306, 65307},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 96, 96, 33, 35, 44, 58, 59},
+		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8218, 8245, 65281, 65292, 65297, 65307},
+		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 44, 96, 33, 44, 49, 59},
 		Locale:     "ja",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -603,18 +605,17 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
 				{Lo: 8211, Hi: 8216, Stride: 5},
-				{Lo: 8217, Hi: 8245, Stride: 28},
-				{Lo: 65281, Hi: 65283, Stride: 2},
-				{Lo: 65292, Hi: 65306, Stride: 14},
-				{Lo: 65307, Hi: 65307, Stride: 1},
+				{Lo: 8218, Hi: 8245, Stride: 27},
+				{Lo: 65281, Hi: 65292, Stride: 11},
+				{Lo: 65297, Hi: 65307, Stride: 10},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"ko": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "ko",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -630,20 +631,21 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8211, Hi: 8245, Stride: 34},
-				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
+				{Lo: 8211, Hi: 8218, Stride: 7},
+				{Lo: 8245, Hi: 12494, Stride: 4249},
+				{Lo: 65281, Hi: 65288, Stride: 7},
 				{Lo: 65289, Hi: 65292, Stride: 3},
-				{Lo: 65306, Hi: 65307, Stride: 1},
-				{Lo: 65311, Hi: 65374, Stride: 63},
+				{Lo: 65297, Hi: 65306, Stride: 9},
+				{Lo: 65307, Hi: 65311, Stride: 4},
+				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"pl": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "pl",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -659,21 +661,20 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8216, Hi: 8217, Stride: 1},
-				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65283, Stride: 2},
+				{Lo: 8216, Hi: 8245, Stride: 29},
+				{Lo: 12494, Hi: 65281, Stride: 52787},
 				{Lo: 65288, Hi: 65289, Stride: 1},
-				{Lo: 65292, Hi: 65306, Stride: 14},
-				{Lo: 65307, Hi: 65311, Stride: 4},
-				{Lo: 65374, Hi: 65374, Stride: 1},
+				{Lo: 65292, Hi: 65297, Stride: 5},
+				{Lo: 65306, Hi: 65307, Stride: 1},
+				{Lo: 65311, Hi: 65374, Stride: 63},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"pt-BR": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8216, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "pt-BR",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -689,11 +690,11 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8216, Hi: 8217, Stride: 1},
+				{Lo: 8216, Hi: 8218, Stride: 2},
 				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65283, Stride: 2},
-				{Lo: 65288, Hi: 65289, Stride: 1},
-				{Lo: 65292, Hi: 65306, Stride: 14},
+				{Lo: 65281, Hi: 65288, Stride: 7},
+				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65297, Hi: 65306, Stride: 9},
 				{Lo: 65307, Hi: 65311, Stride: 4},
 				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
@@ -702,8 +703,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"qps-ploc": {
-		Confusable: []rune{160, 180, 215, 305, 921, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{32, 96, 120, 105, 73, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{160, 180, 215, 305, 921, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8216, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{32, 96, 120, 105, 73, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "qps-ploc",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -720,10 +721,10 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
 				{Lo: 8211, Hi: 8216, Stride: 5},
-				{Lo: 8217, Hi: 8245, Stride: 28},
+				{Lo: 8218, Hi: 8245, Stride: 27},
 				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
-				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65288, Hi: 65289, Stride: 1},
+				{Lo: 65292, Hi: 65297, Stride: 5},
 				{Lo: 65306, Hi: 65307, Stride: 1},
 				{Lo: 65311, Hi: 65374, Stride: 63},
 			},
@@ -732,18 +733,18 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"ru": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 8216, 8217, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 96, 96, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{180, 215, 305, 921, 1009, 8216, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{96, 120, 105, 73, 112, 96, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "ru",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
 				{Lo: 180, Hi: 215, Stride: 35},
 				{Lo: 305, Hi: 921, Stride: 616},
 				{Lo: 1009, Hi: 8216, Stride: 7207},
-				{Lo: 8217, Hi: 8245, Stride: 28},
+				{Lo: 8218, Hi: 8245, Stride: 27},
 				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
-				{Lo: 65289, Hi: 65292, Stride: 3},
+				{Lo: 65288, Hi: 65289, Stride: 1},
+				{Lo: 65292, Hi: 65297, Stride: 5},
 				{Lo: 65306, Hi: 65307, Stride: 1},
 				{Lo: 65311, Hi: 65374, Stride: 63},
 			},
@@ -752,8 +753,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"tr": {
-		Confusable: []rune{160, 180, 215, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8245, 12494, 65281, 65283, 65288, 65289, 65292, 65306, 65307, 65311, 65374},
-		With:       []rune{32, 96, 120, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 96, 47, 33, 35, 40, 41, 44, 58, 59, 63, 126},
+		Confusable: []rune{160, 180, 215, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8218, 8245, 12494, 65281, 65288, 65289, 65292, 65297, 65306, 65307, 65311, 65374},
+		With:       []rune{32, 96, 120, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 44, 96, 47, 33, 40, 41, 44, 49, 58, 59, 63, 126},
 		Locale:     "tr",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -769,38 +770,39 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8211, Hi: 8245, Stride: 34},
-				{Lo: 12494, Hi: 65281, Stride: 52787},
-				{Lo: 65283, Hi: 65288, Stride: 5},
+				{Lo: 8211, Hi: 8218, Stride: 7},
+				{Lo: 8245, Hi: 12494, Stride: 4249},
+				{Lo: 65281, Hi: 65288, Stride: 7},
 				{Lo: 65289, Hi: 65292, Stride: 3},
-				{Lo: 65306, Hi: 65307, Stride: 1},
-				{Lo: 65311, Hi: 65374, Stride: 63},
+				{Lo: 65297, Hi: 65306, Stride: 9},
+				{Lo: 65307, Hi: 65311, Stride: 4},
+				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
 		},
 	},
 	"zh-hans": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8245, 12494, 65281, 65288, 65289, 65306, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 96, 47, 33, 40, 41, 58, 126},
+		Confusable: []rune{160, 180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8218, 8245, 12494, 65297, 65374},
+		With:       []rune{32, 96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 44, 96, 47, 49, 126},
 		Locale:     "zh-hans",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
-				{Lo: 180, Hi: 215, Stride: 35},
-				{Lo: 305, Hi: 921, Stride: 616},
-				{Lo: 1009, Hi: 1040, Stride: 31},
-				{Lo: 1042, Hi: 1045, Stride: 3},
-				{Lo: 1047, Hi: 1050, Stride: 3},
-				{Lo: 1052, Hi: 1054, Stride: 1},
+				{Lo: 160, Hi: 180, Stride: 20},
+				{Lo: 215, Hi: 305, Stride: 90},
+				{Lo: 921, Hi: 1009, Stride: 88},
+				{Lo: 1040, Hi: 1042, Stride: 2},
+				{Lo: 1045, Hi: 1047, Stride: 2},
+				{Lo: 1050, Hi: 1052, Stride: 2},
+				{Lo: 1053, Hi: 1054, Stride: 1},
 				{Lo: 1056, Hi: 1059, Stride: 1},
 				{Lo: 1061, Hi: 1068, Stride: 7},
 				{Lo: 1072, Hi: 1073, Stride: 1},
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8245, Hi: 12494, Stride: 4249},
-				{Lo: 65281, Hi: 65288, Stride: 7},
-				{Lo: 65289, Hi: 65306, Stride: 17},
+				{Lo: 8218, Hi: 8245, Stride: 27},
+				{Lo: 12494, Hi: 65297, Stride: 52803},
 				{Lo: 65374, Hi: 65374, Stride: 1},
 			},
 			R32:         []unicode.Range32{},
@@ -808,8 +810,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 		},
 	},
 	"zh-hant": {
-		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 12494, 65283, 65307, 65374},
-		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 47, 35, 59, 126},
+		Confusable: []rune{180, 215, 305, 921, 1009, 1040, 1042, 1045, 1047, 1050, 1052, 1053, 1054, 1056, 1057, 1058, 1059, 1061, 1068, 1072, 1073, 1075, 1077, 1086, 1088, 1089, 1091, 1093, 8211, 8218, 12494, 65374},
+		With:       []rune{96, 120, 105, 73, 112, 65, 66, 69, 51, 75, 77, 72, 79, 80, 67, 84, 89, 88, 98, 97, 54, 114, 101, 111, 112, 99, 121, 120, 45, 44, 47, 126},
 		Locale:     "zh-hant",
 		RangeTable: &unicode.RangeTable{
 			R16: []unicode.Range16{
@@ -825,9 +827,8 @@ var AmbiguousCharacters = map[string]*AmbiguousTable{
 				{Lo: 1075, Hi: 1077, Stride: 2},
 				{Lo: 1086, Hi: 1088, Stride: 2},
 				{Lo: 1089, Hi: 1093, Stride: 2},
-				{Lo: 8211, Hi: 12494, Stride: 4283},
-				{Lo: 65283, Hi: 65307, Stride: 24},
-				{Lo: 65374, Hi: 65374, Stride: 1},
+				{Lo: 8211, Hi: 8218, Stride: 7},
+				{Lo: 12494, Hi: 65374, Stride: 52880},
 			},
 			R32:         []unicode.Range32{},
 			LatinOffset: 1,
diff --git a/modules/charset/ambiguous_gen_test.go b/modules/charset/ambiguous_gen_test.go
index 221c27d0e1..d3be0b1a13 100644
--- a/modules/charset/ambiguous_gen_test.go
+++ b/modules/charset/ambiguous_gen_test.go
@@ -14,7 +14,7 @@ import (
 func TestAmbiguousCharacters(t *testing.T) {
 	for locale, ambiguous := range AmbiguousCharacters {
 		assert.Equal(t, locale, ambiguous.Locale)
-		assert.Equal(t, len(ambiguous.Confusable), len(ambiguous.With))
+		assert.Len(t, ambiguous.With, len(ambiguous.Confusable))
 		assert.True(t, sort.SliceIsSorted(ambiguous.Confusable, func(i, j int) bool {
 			return ambiguous.Confusable[i] < ambiguous.Confusable[j]
 		}))
diff --git a/modules/charset/charset_test.go b/modules/charset/charset_test.go
index ef0d1565d6..358220494b 100644
--- a/modules/charset/charset_test.go
+++ b/modules/charset/charset_test.go
@@ -253,7 +253,7 @@ func TestToUTF8WithFallbackReader(t *testing.T) {
 		input += "// Выключаем"
 		rd := ToUTF8WithFallbackReader(bytes.NewReader([]byte(input)), ConvertOpts{})
 		r, _ := io.ReadAll(rd)
-		assert.EqualValuesf(t, input, string(r), "testing string len=%d", testLen)
+		assert.Equalf(t, input, string(r), "testing string len=%d", testLen)
 	}
 
 	truncatedOneByteExtension := failFastBytes
diff --git a/modules/charset/escape_stream.go b/modules/charset/escape_stream.go
index 01ebf52a15..2bc5df9539 100644
--- a/modules/charset/escape_stream.go
+++ b/modules/charset/escape_stream.go
@@ -151,7 +151,7 @@ func (e *escapeStreamer) brokenRune(bs []byte) error {
 	e.escaped.Escaped = true
 	e.escaped.HasBadRunes = true
 
-	if err := e.PassthroughHTMLStreamer.StartTag("span", html.Attribute{
+	if err := e.StartTag("span", html.Attribute{
 		Key: "class",
 		Val: "broken-code-point",
 	}); err != nil {
@@ -161,14 +161,14 @@ func (e *escapeStreamer) brokenRune(bs []byte) error {
 		return err
 	}
 
-	return e.PassthroughHTMLStreamer.EndTag("span")
+	return e.EndTag("span")
 }
 
 func (e *escapeStreamer) ambiguousRune(r, c rune) error {
 	e.escaped.Escaped = true
 	e.escaped.HasAmbiguous = true
 
-	if err := e.PassthroughHTMLStreamer.StartTag("span", html.Attribute{
+	if err := e.StartTag("span", html.Attribute{
 		Key: "class",
 		Val: "ambiguous-code-point",
 	}, html.Attribute{
@@ -177,7 +177,7 @@ func (e *escapeStreamer) ambiguousRune(r, c rune) error {
 	}); err != nil {
 		return err
 	}
-	if err := e.PassthroughHTMLStreamer.StartTag("span", html.Attribute{
+	if err := e.StartTag("span", html.Attribute{
 		Key: "class",
 		Val: "char",
 	}); err != nil {
@@ -186,18 +186,18 @@ func (e *escapeStreamer) ambiguousRune(r, c rune) error {
 	if err := e.PassthroughHTMLStreamer.Text(string(r)); err != nil {
 		return err
 	}
-	if err := e.PassthroughHTMLStreamer.EndTag("span"); err != nil {
+	if err := e.EndTag("span"); err != nil {
 		return err
 	}
 
-	return e.PassthroughHTMLStreamer.EndTag("span")
+	return e.EndTag("span")
 }
 
 func (e *escapeStreamer) invisibleRune(r rune) error {
 	e.escaped.Escaped = true
 	e.escaped.HasInvisible = true
 
-	if err := e.PassthroughHTMLStreamer.StartTag("span", html.Attribute{
+	if err := e.StartTag("span", html.Attribute{
 		Key: "class",
 		Val: "escaped-code-point",
 	}, html.Attribute{
@@ -206,7 +206,7 @@ func (e *escapeStreamer) invisibleRune(r rune) error {
 	}); err != nil {
 		return err
 	}
-	if err := e.PassthroughHTMLStreamer.StartTag("span", html.Attribute{
+	if err := e.StartTag("span", html.Attribute{
 		Key: "class",
 		Val: "char",
 	}); err != nil {
@@ -215,11 +215,11 @@ func (e *escapeStreamer) invisibleRune(r rune) error {
 	if err := e.PassthroughHTMLStreamer.Text(string(r)); err != nil {
 		return err
 	}
-	if err := e.PassthroughHTMLStreamer.EndTag("span"); err != nil {
+	if err := e.EndTag("span"); err != nil {
 		return err
 	}
 
-	return e.PassthroughHTMLStreamer.EndTag("span")
+	return e.EndTag("span")
 }
 
 type runeCountType struct {
diff --git a/modules/charset/escape_test.go b/modules/charset/escape_test.go
index eec6f102cb..0518045b29 100644
--- a/modules/charset/escape_test.go
+++ b/modules/charset/escape_test.go
@@ -190,5 +190,5 @@ func TestAmbiguousUnicodeDetectionContext(t *testing.T) {
 	assert.EqualValues(t, `a<span class="escaped-code-point" data-escaped="[U+00A0]"><span class="char"> </span></span>test`, out)
 
 	_, out = EscapeControlHTML(input, &translation.MockLocale{}, testContext)
-	assert.EqualValues(t, input, out)
+	assert.Equal(t, input, out)
 }
diff --git a/modules/container/set.go b/modules/container/set.go
index 70f837bc66..d3719dc552 100644
--- a/modules/container/set.go
+++ b/modules/container/set.go
@@ -74,3 +74,8 @@ func (s Set[T]) Values() []T {
 func (s Set[T]) Seq() iter.Seq[T] {
 	return maps.Keys(s)
 }
+
+// Clone returns a identical shallow copy of this set.
+func (s Set[T]) Clone() Set[T] {
+	return maps.Clone(s)
+}
diff --git a/modules/container/set_test.go b/modules/container/set_test.go
index e54e31a052..44e4847f6b 100644
--- a/modules/container/set_test.go
+++ b/modules/container/set_test.go
@@ -36,7 +36,7 @@ func TestSet(t *testing.T) {
 		called++
 		assert.True(t, slices.Contains(values, value))
 	}
-	assert.EqualValues(t, len(values), called)
+	assert.Equal(t, len(values), called)
 
 	s = SetOf("key6", "key7")
 	assert.False(t, s.Contains("key1"))
@@ -47,4 +47,11 @@ func TestSet(t *testing.T) {
 	assert.False(t, s.IsSubset([]string{"key1"}))
 
 	assert.True(t, s.IsSubset([]string{}))
+
+	t.Run("Clone", func(t *testing.T) {
+		clonedSet := s.Clone()
+		clonedSet.Remove("key6")
+		assert.False(t, clonedSet.Contains("key6"))
+		assert.True(t, s.Contains("key6"))
+	})
 }
diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go
index 6eb3b3056f..27cea46ca2 100644
--- a/modules/csv/csv_test.go
+++ b/modules/csv/csv_test.go
@@ -101,10 +101,10 @@ j, ,\x20
 	for n, c := range cases {
 		rd, err := CreateReaderAndDetermineDelimiter(nil, strings.NewReader(decodeSlashes(t, c.csv)))
 		require.NoError(t, err, "case %d: should not throw error: %v\n", n, err)
-		assert.EqualValues(t, c.expectedDelimiter, rd.Comma, "case %d: delimiter should be '%c', got '%c'", n, c.expectedDelimiter, rd.Comma)
+		assert.Equal(t, c.expectedDelimiter, rd.Comma, "case %d: delimiter should be '%c', got '%c'", n, c.expectedDelimiter, rd.Comma)
 		rows, err := rd.ReadAll()
 		require.NoError(t, err, "case %d: should not throw error: %v\n", n, err)
-		assert.EqualValues(t, c.expectedRows, rows, "case %d: rows should be equal", n)
+		assert.Equal(t, c.expectedRows, rows, "case %d: rows should be equal", n)
 	}
 }
 
@@ -236,7 +236,7 @@ John Doe	john@doe.com	This,note,had,a,lot,of,commas,to,test,delimiters`,
 			Ctx:          git.DefaultContext,
 			RelativePath: c.filename,
 		}, []byte(decodeSlashes(t, c.csv)))
-		assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
+		assert.Equal(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
 	}
 }
 
@@ -301,7 +301,7 @@ abc   | |123
 
 	for n, c := range cases {
 		modifiedText := removeQuotedString(decodeSlashes(t, c.text))
-		assert.EqualValues(t, c.expectedText, modifiedText, "case %d: modified text should be equal", n)
+		assert.Equal(t, c.expectedText, modifiedText, "case %d: modified text should be equal", n)
 	}
 }
 
@@ -456,7 +456,7 @@ jkl`,
 
 	for n, c := range cases {
 		delimiter := guessDelimiter([]byte(decodeSlashes(t, c.csv)))
-		assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
+		assert.Equal(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
 	}
 }
 
@@ -548,7 +548,7 @@ a|"he said, ""here I am"""`,
 
 	for n, c := range cases {
 		delimiter := guessFromBeforeAfterQuotes([]byte(decodeSlashes(t, c.csv)))
-		assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
+		assert.Equal(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter)
 	}
 }
 
@@ -584,7 +584,7 @@ func TestFormatError(t *testing.T) {
 			require.Error(t, err, "case %d: expected an error to be returned", n)
 		} else {
 			require.NoError(t, err, "case %d: no error was expected, got error: %v", n, err)
-			assert.EqualValues(t, c.expectedMessage, message, "case %d: messages should be equal, expected '%s' got '%s'", n, c.expectedMessage, message)
+			assert.Equal(t, c.expectedMessage, message, "case %d: messages should be equal, expected '%s' got '%s'", n, c.expectedMessage, message)
 		}
 	}
 }
diff --git a/modules/emoji/emoji_test.go b/modules/emoji/emoji_test.go
index 2526cd121e..ad3db10fb4 100644
--- a/modules/emoji/emoji_test.go
+++ b/modules/emoji/emoji_test.go
@@ -23,16 +23,16 @@ func TestLookup(t *testing.T) {
 	d := FromAlias("beer")
 
 	if !reflect.DeepEqual(a, b) {
-		t.Errorf("a and b should equal")
+		t.Error("a and b should equal")
 	}
 	if !reflect.DeepEqual(b, c) {
-		t.Errorf("b and c should equal")
+		t.Error("b and c should equal")
 	}
 	if !reflect.DeepEqual(c, d) {
-		t.Errorf("c and d should equal")
+		t.Error("c and d should equal")
 	}
 	if !reflect.DeepEqual(a, d) {
-		t.Errorf("a and d should equal")
+		t.Error("a and d should equal")
 	}
 
 	m := FromCode("\U0001f44d")
@@ -40,13 +40,13 @@ func TestLookup(t *testing.T) {
 	o := FromAlias("+1")
 
 	if !reflect.DeepEqual(m, n) {
-		t.Errorf("m and n should equal")
+		t.Error("m and n should equal")
 	}
 	if !reflect.DeepEqual(n, o) {
-		t.Errorf("n and o should equal")
+		t.Error("n and o should equal")
 	}
 	if !reflect.DeepEqual(m, o) {
-		t.Errorf("m and o should equal")
+		t.Error("m and o should equal")
 	}
 }
 
diff --git a/modules/forgefed/activity_follow.go b/modules/forgefed/activity_follow.go
new file mode 100644
index 0000000000..5cb45ca885
--- /dev/null
+++ b/modules/forgefed/activity_follow.go
@@ -0,0 +1,57 @@
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/google/uuid"
+)
+
+// ForgeFollow activity data type
+// swagger:model
+type ForgeFollow struct {
+	// swagger:ignore
+	ap.Activity
+}
+
+func NewForgeFollowFromAp(activity ap.Activity) (ForgeFollow, error) {
+	result := ForgeFollow{}
+	result.Activity = activity
+	if valid, err := validation.IsValid(result); !valid {
+		return ForgeFollow{}, err
+	}
+	return result, nil
+}
+
+func NewForgeFollow(actor, object string) (ForgeFollow, error) {
+	result := ForgeFollow{}
+	result.Type = ap.FollowType
+	result.ID = ap.IRI(actor + "/follows/" + uuid.New().String())
+	result.Actor = ap.IRI(actor)
+	result.Object = ap.IRI(object)
+	if valid, err := validation.IsValid(result); !valid {
+		return ForgeFollow{}, err
+	}
+	return result, nil
+}
+
+func (follow ForgeFollow) MarshalJSON() ([]byte, error) {
+	return follow.Activity.MarshalJSON()
+}
+
+func (follow *ForgeFollow) UnmarshalJSON(data []byte) error {
+	return follow.Activity.UnmarshalJSON(data)
+}
+
+func (follow ForgeFollow) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(string(follow.Type), "type")...)
+	result = append(result, validation.ValidateOneOf(string(follow.Type), []any{"Follow"}, "type")...)
+	result = append(result, validation.ValidateIDExists(follow.Actor, "actor")...)
+	result = append(result, validation.ValidateIDExists(follow.Object, "object")...)
+
+	return result
+}
diff --git a/modules/forgefed/activity_follow_test.go b/modules/forgefed/activity_follow_test.go
new file mode 100644
index 0000000000..8ba31d5f6f
--- /dev/null
+++ b/modules/forgefed/activity_follow_test.go
@@ -0,0 +1,30 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"testing"
+
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_NewForgeFollowValidation(t *testing.T) {
+	sut := ForgeFollow{}
+	sut.Type = "Follow"
+	sut.Actor = ap.IRI("example.org/alice")
+	sut.Object = ap.IRI("example.org/bob")
+
+	valid, err := validation.IsValid(sut)
+	assert.True(t, valid, "sut is invalid: %v\n", err)
+
+	sut = ForgeFollow{}
+	sut.Actor = ap.IRI("example.org/alice")
+	sut.Object = ap.IRI("example.org/bob")
+
+	valid, err = validation.IsValid(sut)
+	assert.False(t, valid, "sut is valid: %v\n", err)
+}
diff --git a/modules/forgefed/activity_like_test.go b/modules/forgefed/activity_like_test.go
index 815b0e02f3..eef5563d8b 100644
--- a/modules/forgefed/activity_like_test.go
+++ b/modules/forgefed/activity_like_test.go
@@ -4,7 +4,7 @@
 package forgefed
 
 import (
-	"fmt"
+	"errors"
 	"reflect"
 	"strings"
 	"testing"
@@ -13,6 +13,8 @@ import (
 	"forgejo.org/modules/validation"
 
 	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_NewForgeLike(t *testing.T) {
@@ -22,21 +24,14 @@ func Test_NewForgeLike(t *testing.T) {
 	objectIRI := "https://codeberg.org/api/v1/activitypub/repository-id/1"
 	startTime, _ := time.Parse("2006-Jan-02", "2024-Mar-07")
 	sut, err := NewForgeLike(actorIRI, objectIRI, startTime)
-	if err != nil {
-		t.Errorf("unexpected error: %v\n", err)
-	}
-	if valid, _ := validation.IsValid(sut); !valid {
-		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
-	}
+	require.NoError(t, err, "unexpected error: %v\n", err)
+
+	valid, _ := validation.IsValid(sut)
+	assert.True(t, valid, "sut expected to be valid: %v\n", sut.Validate())
 
 	got, err := sut.MarshalJSON()
-	if err != nil {
-		t.Errorf("MarshalJSON() error = \"%v\"", err)
-		return
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("MarshalJSON() got = %q, want %q", got, want)
-	}
+	require.NoError(t, err, "MarshalJSON() error = %q", err)
+	assert.True(t, reflect.DeepEqual(got, want), "MarshalJSON()\n got: %q,\n want: %q", got, want)
 }
 
 func Test_LikeMarshalJSON(t *testing.T) {
@@ -66,13 +61,8 @@ func Test_LikeMarshalJSON(t *testing.T) {
 	for name, tt := range tests {
 		t.Run(name, func(t *testing.T) {
 			got, err := tt.item.MarshalJSON()
-			if (err != nil || tt.wantErr != nil) && tt.wantErr.Error() != err.Error() {
-				t.Errorf("MarshalJSON() error = \"%v\", wantErr \"%v\"", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("MarshalJSON() got = %q, want %q", got, tt.want)
-			}
+			assert.False(t, (err != nil || tt.wantErr != nil) && tt.wantErr.Error() != err.Error(), "MarshalJSON()\n got: %v,\n want: %v", err, tt.wantErr)
+			assert.True(t, reflect.DeepEqual(got, tt.want), "MarshalJSON()\n got: %q\n want: %q", got, tt.want)
 		})
 	}
 }
@@ -89,8 +79,8 @@ func Test_LikeUnmarshalJSON(t *testing.T) {
 			item: []byte(`{"type":"Like","actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1","object":"https://codeberg.org/api/activitypub/repository-id/1"}`),
 			want: &ForgeLike{
 				Activity: ap.Activity{
-					Actor:  ap.IRI("https://repo.prod.meissa.de/api/activitypub/user-id/1"),
 					Type:   "Like",
+					Actor:  ap.IRI("https://repo.prod.meissa.de/api/activitypub/user-id/1"),
 					Object: ap.IRI("https://codeberg.org/api/activitypub/repository-id/1"),
 				},
 			},
@@ -99,7 +89,7 @@ func Test_LikeUnmarshalJSON(t *testing.T) {
 		"invalid": {
 			item:    []byte(`{"type":"Invalid","actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1","object":"https://codeberg.org/api/activitypub/repository-id/1"`),
 			want:    &ForgeLike{},
-			wantErr: fmt.Errorf("cannot parse JSON"),
+			wantErr: errors.New("cannot parse JSON"),
 		},
 	}
 
@@ -107,12 +97,10 @@ func Test_LikeUnmarshalJSON(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			got := new(ForgeLike)
 			err := got.UnmarshalJSON(test.item)
-			if (err != nil || test.wantErr != nil) && !strings.Contains(err.Error(), test.wantErr.Error()) {
-				t.Errorf("UnmarshalJSON() error = \"%v\", wantErr \"%v\"", err, test.wantErr)
-				return
-			}
+			assert.False(t, (err != nil || test.wantErr != nil) && !strings.Contains(err.Error(), test.wantErr.Error()), "UnmarshalJSON()\n error: %v\n wantErr: %v", err, test.wantErr)
+
 			if !reflect.DeepEqual(got, test.want) {
-				t.Errorf("UnmarshalJSON() got = %q, want %q, err %q", got, test.want, err.Error())
+				assert.Errorf(t, err, "UnmarshalJSON() got = %q, want %q, err %q", got, test.want, err.Error())
 			}
 		})
 	}
@@ -120,54 +108,47 @@ func Test_LikeUnmarshalJSON(t *testing.T) {
 
 func Test_ForgeLikeValidation(t *testing.T) {
 	// Successful
-
 	sut := new(ForgeLike)
 	sut.UnmarshalJSON([]byte(`{"type":"Like",
 	"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 	"startTime": "2014-12-31T23:00:00-08:00"}`))
-	if res, _ := validation.IsValid(sut); !res {
-		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
-	}
+	valid, _ := validation.IsValid(sut)
+	assert.True(t, valid, "sut expected to be valid: %v\n", sut.Validate())
 
 	// Errors
-
 	sut.UnmarshalJSON([]byte(`{"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 	"startTime": "2014-12-31T23:00:00-08:00"}`))
-	if err := validateAndCheckError(sut, "type should not be empty"); err != nil {
-		t.Error(err)
-	}
+	validate := sut.Validate()
+	assert.Len(t, validate, 2)
+	assert.Equal(t,
+		"Field type contains the value , which is not in allowed subset [Like]",
+		validate[1])
 
 	sut.UnmarshalJSON([]byte(`{"type":"bad-type",
 		"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 	"startTime": "2014-12-31T23:00:00-08:00"}`))
-	if err := validateAndCheckError(sut, "Value bad-type is not contained in allowed values [Like]"); err != nil {
-		t.Error(err)
-	}
+	validate = sut.Validate()
+	assert.Len(t, validate, 1)
+	assert.Equal(t,
+		"Field type contains the value bad-type, which is not in allowed subset [Like]",
+		validate[0])
 
 	sut.UnmarshalJSON([]byte(`{"type":"Like",
 		"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 	  "object":"https://codeberg.org/api/activitypub/repository-id/1",
 	  "startTime": "not a date"}`))
-	if err := validateAndCheckError(sut, "StartTime was invalid."); err != nil {
-		t.Error(err)
-	}
-
-	sut.UnmarshalJSON([]byte(`{"type":"Wrong",
-		"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
-	  "object":"https://codeberg.org/api/activitypub/repository-id/1",
-	  "startTime": "2014-12-31T23:00:00-08:00"}`))
-	if err := validateAndCheckError(sut, "Value Wrong is not contained in allowed values [Like]"); err != nil {
-		t.Error(err)
-	}
+	validate = sut.Validate()
+	assert.Len(t, validate, 1)
+	assert.Equal(t,
+		"StartTime was invalid.",
+		validate[0])
 }
 
 func TestActivityValidation_Attack(t *testing.T) {
 	sut := new(ForgeLike)
 	sut.UnmarshalJSON([]byte(`{rubbish}`))
-	if len(sut.Validate()) != 5 {
-		t.Errorf("5 validation errors expected but was: %v\n", len(sut.Validate()))
-	}
+	assert.Len(t, sut.Validate(), 5)
 }
diff --git a/modules/forgefed/activity_undo_like_test.go b/modules/forgefed/activity_undo_like_test.go
index 1b77369b67..76358b1669 100644
--- a/modules/forgefed/activity_undo_like_test.go
+++ b/modules/forgefed/activity_undo_like_test.go
@@ -4,7 +4,7 @@
 package forgefed
 
 import (
-	"fmt"
+	"errors"
 	"reflect"
 	"strings"
 	"testing"
@@ -125,7 +125,7 @@ func Test_UndoLikeUnmarshalJSON(t *testing.T) {
 		"invalid": {
 			item:    []byte(`invalid JSON`),
 			want:    nil,
-			wantErr: fmt.Errorf("cannot parse JSON"),
+			wantErr: errors.New("cannot parse JSON"),
 		},
 	}
 
@@ -173,7 +173,7 @@ func TestActivityValidationUndo(t *testing.T) {
 		  "startTime":"2024-03-27T00:00:00Z",
 		  "actor":"https://repo.prod.meissa.de/api/v1/activitypub/user-id/1",
 		  "object":"https://codeberg.org/api/v1/activitypub/repository-id/1"}}`))
-	if err := validateAndCheckError(sut, "type should not be empty"); err != nil {
+	if err := validateAndCheckError(sut, "Value type should not be empty"); err != nil {
 		t.Error(*err)
 	}
 
diff --git a/modules/forgefed/activity_user_activity.go b/modules/forgefed/activity_user_activity.go
new file mode 100644
index 0000000000..0eb05cd6ec
--- /dev/null
+++ b/modules/forgefed/activity_user_activity.go
@@ -0,0 +1,77 @@
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"fmt"
+	"time"
+
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+// ForgeFollow activity data type
+// swagger:model
+type ForgeUserActivity struct {
+	ap.Activity
+	Note ForgeUserActivityNote
+}
+
+func NewForgeUserActivityFromAp(activity ap.Activity) (ForgeUserActivity, error) {
+	result := ForgeUserActivity{}
+	result.Activity = activity
+	note, err := NewForgeUserActivityNoteFromAp(activity.Object)
+	if err != nil {
+		return ForgeUserActivity{}, err
+	}
+	result.Note = note
+	if valid, err := validation.IsValid(result); !valid {
+		return ForgeUserActivity{}, err
+	}
+	return result, nil
+}
+
+func NewForgeUserActivity(doer *user_model.User, actionID int64, content string) (ForgeUserActivity, error) {
+	id := fmt.Sprintf("%s/activities/%d", doer.APActorID(), actionID)
+	published := time.Now()
+
+	result := ForgeUserActivity{}
+	result.ID = ap.IRI(id + "/activity")
+	result.Type = ap.CreateType
+	result.Actor = ap.IRI(doer.APActorID())
+	result.Published = published
+	result.To = ap.ItemCollection{
+		ap.IRI("https://www.w3.org/ns/activitystreams#Public"),
+	}
+	result.CC = ap.ItemCollection{
+		ap.IRI(doer.APActorID() + "/followers"),
+	}
+	note, err := newNote(doer, content, id, published)
+	if err != nil {
+		return ForgeUserActivity{}, err
+	}
+	result.Object = note
+
+	return result, nil
+}
+
+func (userActivity ForgeUserActivity) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(string(userActivity.Type), "type")...)
+	result = append(result, validation.ValidateOneOf(string(userActivity.Type), []any{"Create"}, "type")...)
+	result = append(result, validation.ValidateIDExists(userActivity.Actor, "actor")...)
+
+	if len(userActivity.To) == 0 {
+		result = append(result, "Missing to")
+	}
+	if len(userActivity.CC) == 0 {
+		result = append(result, "Missing cc")
+	}
+
+	result = append(result, userActivity.Note.Validate()...)
+
+	return result
+}
diff --git a/modules/forgefed/activity_user_activity_test.go b/modules/forgefed/activity_user_activity_test.go
new file mode 100644
index 0000000000..107ae51204
--- /dev/null
+++ b/modules/forgefed/activity_user_activity_test.go
@@ -0,0 +1,40 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"testing"
+
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_ForgeUserActivityValidation(t *testing.T) {
+	note := ForgeUserActivityNote{}
+	note.Type = "Note"
+	note.Content = ap.NaturalLanguageValues{
+		{
+			Ref:   ap.NilLangRef,
+			Value: ap.Content("Any Content!"),
+		},
+	}
+	note.URL = ap.IRI("example.org/user-id/57")
+
+	sut := ForgeUserActivity{}
+	sut.Type = "Create"
+	sut.Actor = ap.IRI("example.org/user-id/23")
+	sut.CC = ap.ItemCollection{
+		ap.IRI("example.org/registration/public#2nd"),
+	}
+	sut.To = ap.ItemCollection{
+		ap.IRI("example.org/registration/public"),
+	}
+
+	sut.Note = note
+
+	valid, _ := validation.IsValid(sut)
+	assert.True(t, valid, "sut expected to be valid: %v\n", sut.Validate())
+}
diff --git a/modules/forgefed/actor.go b/modules/forgefed/actor.go
index c01175f0f6..5383d5adaf 100644
--- a/modules/forgefed/actor.go
+++ b/modules/forgefed/actor.go
@@ -1,4 +1,4 @@
-// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package forgefed
@@ -6,22 +6,22 @@ package forgefed
 import (
 	"fmt"
 	"net/url"
+	"strconv"
 	"strings"
 
 	"forgejo.org/modules/validation"
-
-	ap "github.com/go-ap/activitypub"
 )
 
 // ----------------------------- ActorID --------------------------------------------
 type ActorID struct {
-	ID               string
-	Source           string
-	Schema           string
-	Path             string
-	Host             string
-	Port             string
-	UnvalidatedInput string
+	ID                 string
+	Source             string
+	HostSchema         string
+	Path               string
+	Host               string
+	HostPort           uint16
+	UnvalidatedInput   string
+	IsPortSupplemented bool
 }
 
 // Factory function for ActorID. Created struct is asserted to be valid
@@ -39,21 +39,29 @@ func NewActorID(uri string) (ActorID, error) {
 }
 
 func (id ActorID) AsURI() string {
-	var result string
-	if id.Port == "" {
-		result = fmt.Sprintf("%s://%s/%s/%s", id.Schema, id.Host, id.Path, id.ID)
+	var result, path string
+
+	if id.Path == "" {
+		path = id.ID
 	} else {
-		result = fmt.Sprintf("%s://%s:%s/%s/%s", id.Schema, id.Host, id.Port, id.Path, id.ID)
+		path = fmt.Sprintf("%s/%s", id.Path, id.ID)
 	}
+
+	if id.IsPortSupplemented {
+		result = fmt.Sprintf("%s://%s/%s", id.HostSchema, id.Host, path)
+	} else {
+		result = fmt.Sprintf("%s://%s:%d/%s", id.HostSchema, id.Host, id.HostPort, path)
+	}
+
 	return result
 }
 
 func (id ActorID) Validate() []string {
 	var result []string
-	result = append(result, validation.ValidateNotEmpty(id.ID, "userId")...)
-	result = append(result, validation.ValidateNotEmpty(id.Schema, "schema")...)
-	result = append(result, validation.ValidateNotEmpty(id.Path, "path")...)
+	result = append(result, validation.ValidateNotEmpty(id.ID, "ID")...)
 	result = append(result, validation.ValidateNotEmpty(id.Host, "host")...)
+	result = append(result, validation.ValidateNotEmpty(id.HostPort, "hostPort")...)
+	result = append(result, validation.ValidateNotEmpty(id.HostSchema, "hostSchema")...)
 	result = append(result, validation.ValidateNotEmpty(id.UnvalidatedInput, "unvalidatedInput")...)
 
 	if id.UnvalidatedInput != id.AsURI() {
@@ -63,90 +71,39 @@ func (id ActorID) Validate() []string {
 	return result
 }
 
-// ----------------------------- PersonID --------------------------------------------
-type PersonID struct {
-	ActorID
-}
-
-// Factory function for PersonID. Created struct is asserted to be valid
-func NewPersonID(uri, source string) (PersonID, error) {
-	result, err := newActorID(uri)
+func newActorID(uri string) (ActorID, error) {
+	validatedURI, err := url.ParseRequestURI(uri)
 	if err != nil {
-		return PersonID{}, err
+		return ActorID{}, err
 	}
-	result.Source = source
+	pathWithActorID := strings.Split(validatedURI.Path, "/")
+	if containsEmptyString(pathWithActorID) {
+		pathWithActorID = removeEmptyStrings(pathWithActorID)
+	}
+	length := len(pathWithActorID)
+	pathWithoutActorID := strings.Join(pathWithActorID[0:length-1], "/")
+	id := strings.ToLower(pathWithActorID[length-1])
 
-	// validate Person specific path
-	personID := PersonID{result}
-	if valid, err := validation.IsValid(personID); !valid {
-		return PersonID{}, err
+	result := ActorID{}
+	result.ID = id
+	result.HostSchema = strings.ToLower(validatedURI.Scheme)
+	result.Host = strings.ToLower(validatedURI.Hostname())
+	result.Path = strings.ToLower(pathWithoutActorID)
+
+	if validatedURI.Port() == "" && result.HostSchema == "https" {
+		result.IsPortSupplemented = true
+		result.HostPort = 443
+	} else if validatedURI.Port() == "" && result.HostSchema == "http" {
+		result.IsPortSupplemented = true
+		result.HostPort = 80
+	} else {
+		numPort, _ := strconv.ParseUint(validatedURI.Port(), 10, 16)
+		result.HostPort = uint16(numPort)
 	}
 
-	return personID, nil
-}
+	result.UnvalidatedInput = strings.ToLower(uri)
 
-func (id PersonID) AsWebfinger() string {
-	result := fmt.Sprintf("@%s@%s", strings.ToLower(id.ID), strings.ToLower(id.Host))
-	return result
-}
-
-func (id PersonID) AsLoginName() string {
-	result := fmt.Sprintf("%s%s", strings.ToLower(id.ID), id.HostSuffix())
-	return result
-}
-
-func (id PersonID) HostSuffix() string {
-	result := fmt.Sprintf("-%s", strings.ToLower(id.Host))
-	return result
-}
-
-func (id PersonID) Validate() []string {
-	result := id.ActorID.Validate()
-	result = append(result, validation.ValidateNotEmpty(id.Source, "source")...)
-	result = append(result, validation.ValidateOneOf(id.Source, []any{"forgejo", "gitea"}, "Source")...)
-	switch id.Source {
-	case "forgejo", "gitea":
-		if strings.ToLower(id.Path) != "api/v1/activitypub/user-id" && strings.ToLower(id.Path) != "api/activitypub/user-id" {
-			result = append(result, fmt.Sprintf("path: %q has to be a person specific api path", id.Path))
-		}
-	}
-	return result
-}
-
-// ----------------------------- RepositoryID --------------------------------------------
-
-type RepositoryID struct {
-	ActorID
-}
-
-// Factory function for RepositoryID. Created struct is asserted to be valid.
-func NewRepositoryID(uri, source string) (RepositoryID, error) {
-	result, err := newActorID(uri)
-	if err != nil {
-		return RepositoryID{}, err
-	}
-	result.Source = source
-
-	// validate Person specific
-	repoID := RepositoryID{result}
-	if valid, err := validation.IsValid(repoID); !valid {
-		return RepositoryID{}, err
-	}
-
-	return repoID, nil
-}
-
-func (id RepositoryID) Validate() []string {
-	result := id.ActorID.Validate()
-	result = append(result, validation.ValidateNotEmpty(id.Source, "source")...)
-	result = append(result, validation.ValidateOneOf(id.Source, []any{"forgejo", "gitea"}, "Source")...)
-	switch id.Source {
-	case "forgejo", "gitea":
-		if strings.ToLower(id.Path) != "api/v1/activitypub/repository-id" && strings.ToLower(id.Path) != "api/activitypub/repository-id" {
-			result = append(result, fmt.Sprintf("path: %q has to be a repo specific api path", id.Path))
-		}
-	}
-	return result
+	return result, nil
 }
 
 func containsEmptyString(ar []string) bool {
@@ -167,52 +124,3 @@ func removeEmptyStrings(ls []string) []string {
 	}
 	return rs
 }
-
-func newActorID(uri string) (ActorID, error) {
-	validatedURI, err := url.ParseRequestURI(uri)
-	if err != nil {
-		return ActorID{}, err
-	}
-	pathWithActorID := strings.Split(validatedURI.Path, "/")
-	if containsEmptyString(pathWithActorID) {
-		pathWithActorID = removeEmptyStrings(pathWithActorID)
-	}
-	length := len(pathWithActorID)
-	pathWithoutActorID := strings.Join(pathWithActorID[0:length-1], "/")
-	id := pathWithActorID[length-1]
-
-	result := ActorID{}
-	result.ID = id
-	result.Schema = validatedURI.Scheme
-	result.Host = validatedURI.Hostname()
-	result.Path = pathWithoutActorID
-	result.Port = validatedURI.Port()
-	result.UnvalidatedInput = uri
-	return result, nil
-}
-
-// ----------------------------- ForgePerson -------------------------------------
-
-// ForgePerson activity data type
-// swagger:model
-type ForgePerson struct {
-	// swagger:ignore
-	ap.Actor
-}
-
-func (s ForgePerson) MarshalJSON() ([]byte, error) {
-	return s.Actor.MarshalJSON()
-}
-
-func (s *ForgePerson) UnmarshalJSON(data []byte) error {
-	return s.Actor.UnmarshalJSON(data)
-}
-
-func (s ForgePerson) Validate() []string {
-	var result []string
-	result = append(result, validation.ValidateNotEmpty(string(s.Type), "Type")...)
-	result = append(result, validation.ValidateOneOf(string(s.Type), []any{string(ap.PersonType)}, "Type")...)
-	result = append(result, validation.ValidateNotEmpty(s.PreferredUsername.String(), "PreferredUsername")...)
-
-	return result
-}
diff --git a/modules/forgefed/actor_person.go b/modules/forgefed/actor_person.go
new file mode 100644
index 0000000000..7c43b0d7ce
--- /dev/null
+++ b/modules/forgefed/actor_person.go
@@ -0,0 +1,122 @@
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"fmt"
+	"strings"
+
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+// ----------------------------- PersonID --------------------------------------------
+type PersonID struct {
+	ActorID
+}
+
+const (
+	personIDapiPathV1       = "api/v1/activitypub/user-id"
+	personIDapiPathV1Latest = "api/activitypub/user-id"
+)
+
+// Factory function for PersonID. Created struct is asserted to be valid
+func NewPersonID(uri, source string) (PersonID, error) {
+	result, err := newActorID(uri)
+	if err != nil {
+		return PersonID{}, err
+	}
+	result.Source = source
+
+	// validate Person specific path
+	personID := PersonID{result}
+	if valid, err := validation.IsValid(personID); !valid {
+		return PersonID{}, err
+	}
+
+	return personID, nil
+}
+
+func NewPersonIDFromModel(host, schema string, port uint16, softwareName, id string) (PersonID, error) {
+	result := PersonID{}
+	result.ID = id
+	result.Source = softwareName
+	result.Host = host
+	result.HostSchema = schema
+	result.HostPort = port
+	result.IsPortSupplemented = false
+
+	if softwareName == "forgejo" {
+		result.Path = personIDapiPathV1
+	}
+	result.UnvalidatedInput = result.AsURI()
+
+	// validate Person specific path
+	if valid, err := validation.IsValid(result); !valid {
+		return PersonID{}, err
+	}
+
+	return result, nil
+}
+
+func (id PersonID) AsWebfinger() string {
+	result := fmt.Sprintf("@%s@%s", strings.ToLower(id.ID), strings.ToLower(id.Host))
+	return result
+}
+
+func (id PersonID) AsLoginName() string {
+	result := fmt.Sprintf("%s%s", strings.ToLower(id.ID), id.HostSuffix())
+	return result
+}
+
+func (id PersonID) HostSuffix() string {
+	var result string
+	if !id.IsPortSupplemented {
+		result = fmt.Sprintf("-%s-%d", strings.ToLower(id.Host), id.HostPort)
+	} else {
+		result = fmt.Sprintf("-%s", strings.ToLower(id.Host))
+	}
+	return result
+}
+
+func (id PersonID) Validate() []string {
+	result := id.ActorID.Validate()
+	result = append(result, validation.ValidateNotEmpty(id.Source, "source")...)
+	result = append(result, validation.ValidateOneOf(id.Source, []any{"forgejo", "gitea", "mastodon", "gotosocial"}, "Source")...)
+	if id.Source == "forgejo" {
+		result = append(result, validation.ValidateNotEmpty(id.Path, "path")...)
+		if strings.ToLower(id.Path) != personIDapiPathV1 && strings.ToLower(id.Path) != personIDapiPathV1Latest {
+			result = append(result, fmt.Sprintf("path: %q has to be a person specific api path", id.Path))
+		}
+	}
+
+	return result
+}
+
+// ----------------------------- ForgePerson -------------------------------------
+
+// ForgePerson activity data type
+// swagger:model
+type ForgePerson struct {
+	// swagger:ignore
+	ap.Actor
+}
+
+func (s ForgePerson) MarshalJSON() ([]byte, error) {
+	return s.Actor.MarshalJSON()
+}
+
+func (s *ForgePerson) UnmarshalJSON(data []byte) error {
+	return s.Actor.UnmarshalJSON(data)
+}
+
+func (s ForgePerson) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(string(s.Type), "Type")...)
+	result = append(result, validation.ValidateOneOf(string(s.Type), []any{string(ap.PersonType)}, "Type")...)
+	result = append(result, validation.ValidateNotEmpty(s.PreferredUsername.String(), "PreferredUsername")...)
+
+	return result
+}
diff --git a/modules/forgefed/actor_person_test.go b/modules/forgefed/actor_person_test.go
new file mode 100644
index 0000000000..e4f1734a9d
--- /dev/null
+++ b/modules/forgefed/actor_person_test.go
@@ -0,0 +1,252 @@
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewPersonIdFromModel(t *testing.T) {
+	expected := PersonID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "https"
+	expected.Path = "api/v1/activitypub/user-id"
+	expected.Host = "an.other.host"
+	expected.HostPort = 443
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "https://an.other.host:443/api/v1/activitypub/user-id/1"
+
+	sut, _ := NewPersonIDFromModel("an.other.host", "https", 443, "forgejo", "1")
+	assert.Equal(t, expected, sut)
+}
+
+func TestNewPersonId(t *testing.T) {
+	var sut, expected PersonID
+	var err error
+
+	expected = PersonID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "https"
+	expected.Path = "api/v1/activitypub/user-id"
+	expected.Host = "an.other.host"
+	expected.HostPort = 443
+	expected.IsPortSupplemented = true
+	expected.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1"
+
+	sut, err = NewPersonID("https://an.other.host/api/v1/activitypub/user-id/1", "forgejo")
+	require.NoError(t, err)
+	assert.Equal(t, expected, sut)
+
+	expected = PersonID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "https"
+	expected.Path = "api/v1/activitypub/user-id"
+	expected.Host = "an.other.host"
+	expected.HostPort = 443
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "https://an.other.host:443/api/v1/activitypub/user-id/1"
+
+	sut, _ = NewPersonID("https://an.other.host:443/api/v1/activitypub/user-id/1", "forgejo")
+	assert.Equal(t, expected, sut)
+
+	expected = PersonID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "http"
+	expected.Path = "api/v1/activitypub/user-id"
+	expected.Host = "an.other.host"
+	expected.HostPort = 80
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "http://an.other.host:80/api/v1/activitypub/user-id/1"
+
+	sut, _ = NewPersonID("http://an.other.host:80/api/v1/activitypub/user-id/1", "forgejo")
+	assert.Equal(t, expected, sut)
+
+	expected = PersonID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "https"
+	expected.Path = "api/v1/activitypub/user-id"
+	expected.Host = "an.other.host"
+	expected.HostPort = 443
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "https://an.other.host:443/api/v1/activitypub/user-id/1"
+
+	sut, _ = NewPersonID("HTTPS://an.other.host:443/api/v1/activitypub/user-id/1", "forgejo")
+	assert.Equal(t, expected, sut)
+
+	expected = PersonID{}
+	expected.ID = "@me"
+	expected.Source = "gotosocial"
+	expected.HostSchema = "https"
+	expected.Path = ""
+	expected.Host = "an.other.host"
+	expected.HostPort = 443
+	expected.IsPortSupplemented = true
+	expected.UnvalidatedInput = "https://an.other.host/@me"
+
+	sut, err = NewPersonID("https://an.other.host/@me", "gotosocial")
+	require.NoError(t, err)
+	assert.Equal(t, expected, sut)
+}
+
+func TestPersonIdValidation(t *testing.T) {
+	sut := PersonID{}
+	sut.ID = "1"
+	sut.Source = "forgejo"
+	sut.HostSchema = "https"
+	sut.Path = ""
+	sut.Host = "an.other.host"
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
+	sut.UnvalidatedInput = "https://an.other.host/1"
+
+	result, err := validation.IsValid(sut)
+	assert.False(t, result)
+	require.EqualError(t, err, "Validation Error: forgefed.PersonID: Value path should not be empty\npath: \"\" has to be a person specific api path")
+
+	sut = PersonID{}
+	sut.ID = "1"
+	sut.Source = "mastodon"
+	sut.HostSchema = "https"
+	sut.Path = ""
+	sut.Host = "an.other.host"
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
+	sut.UnvalidatedInput = "https://an.other.host/1"
+
+	result, err = validation.IsValid(sut)
+	assert.True(t, result)
+	require.NoError(t, err)
+
+	sut = PersonID{}
+	sut.ID = "1"
+	sut.Source = "forgejo"
+	sut.HostSchema = "https"
+	sut.Path = "path"
+	sut.Host = "an.other.host"
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
+	sut.UnvalidatedInput = "https://an.other.host/path/1"
+
+	result, err = validation.IsValid(sut)
+	assert.False(t, result)
+	require.EqualError(t, err, "Validation Error: forgefed.PersonID: path: \"path\" has to be a person specific api path")
+
+	sut = PersonID{}
+	sut.ID = "1"
+	sut.Source = "forgejox"
+	sut.HostSchema = "https"
+	sut.Path = "api/v1/activitypub/user-id"
+	sut.Host = "an.other.host"
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
+	sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1"
+
+	result, err = validation.IsValid(sut)
+	assert.False(t, result)
+	require.EqualError(t, err, "Validation Error: forgefed.PersonID: Field Source contains the value forgejox, which is not in allowed subset [forgejo gitea mastodon gotosocial]")
+}
+
+func TestWebfingerId(t *testing.T) {
+	sut, _ := NewPersonID("https://codeberg.org/api/v1/activitypub/user-id/12345", "forgejo")
+	assert.Equal(t, "@12345@codeberg.org", sut.AsWebfinger())
+}
+
+func TestShouldThrowErrorOnInvalidInput(t *testing.T) {
+	tests := []struct {
+		input     string
+		username  string
+		expectErr bool
+	}{
+		{"", "forgejo", true},
+		{"http://localhost:3000/api/v1/something", "forgejo", true},
+		{"./api/v1/something", "forgejo", true},
+		{"http://1.2.3.4/api/v1/something", "forgejo", true},
+		{"http:///[fe80::1ff:fe23:4567:890a%25eth0]/api/v1/something", "forgejo", true},
+		{"https://codeberg.org/api/v1/activitypub/../activitypub/user-id/12345", "forgejo", true},
+		{"https://myuser@an.other.host/api/v1/activitypub/user-id/1", "forgejo", true},
+		{"https://an.other.host/api/v1/activitypub/user-id/1", "forgejo", false},
+	}
+
+	for _, tt := range tests {
+		_, err := NewPersonID(tt.input, tt.username)
+		if tt.expectErr {
+			assert.Error(t, err, "Expected an error for input: %s", tt.input)
+		} else {
+			assert.NoError(t, err, "Expected no error for input: %s, but got: %v", tt.input, err)
+		}
+	}
+}
+
+func Test_PersonMarshalJSON(t *testing.T) {
+	sut := ForgePerson{}
+	sut.Type = "Person"
+	sut.PreferredUsername = ap.NaturalLanguageValuesNew()
+	sut.PreferredUsername.Set("en", ap.Content("MaxMuster"))
+	result, _ := sut.MarshalJSON()
+	assert.JSONEq(t, `{"type":"Person","preferredUsername":"MaxMuster"}`, string(result), "Expected string is not equal")
+}
+
+func Test_PersonUnmarshalJSON(t *testing.T) {
+	expected := &ForgePerson{
+		Actor: ap.Actor{
+			Type: "Person",
+			PreferredUsername: ap.NaturalLanguageValues{
+				ap.LangRefValue{Ref: "en", Value: []byte("MaxMuster")},
+			},
+		},
+	}
+	sut := new(ForgePerson)
+	err := sut.UnmarshalJSON([]byte(`{"type":"Person","preferredUsername":"MaxMuster"}`))
+	require.NoError(t, err, "UnmarshalJSON() unexpected error: %q", err)
+
+	x, _ := expected.MarshalJSON()
+	y, _ := sut.MarshalJSON()
+	assert.True(t, reflect.DeepEqual(x, y), "UnmarshalJSON()\n got: %q,\n want: %q", x, y)
+
+	expectedStr := strings.ReplaceAll(strings.ReplaceAll(`{
+		"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10",
+		"type":"Person",
+		"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatar/fa7f9c4af2a64f41b1bef292bf872614"},
+		"url":"https://federated-repo.prod.meissa.de/stargoose9",
+		"inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10/inbox",
+		"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10/outbox",
+		"preferredUsername":"stargoose9",
+		"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10#main-key",
+			"owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10",
+			"publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBoj...XAgMBAAE=\n-----END PUBLIC KEY-----\n"}}`,
+		"\n", ""),
+		"\t", "")
+	err = sut.UnmarshalJSON([]byte(expectedStr))
+	require.NoError(t, err, "UnmarshalJSON() unexpected error: %q", err)
+	result, _ := sut.MarshalJSON()
+	assert.JSONEq(t, expectedStr, string(result), "Expected string is not equal")
+}
+
+func TestForgePersonValidation(t *testing.T) {
+	sut := new(ForgePerson)
+	sut.UnmarshalJSON([]byte(`{"type":"Person","preferredUsername":"MaxMuster"}`))
+	valid, _ := validation.IsValid(sut)
+	assert.True(t, valid, "sut expected to be valid: %v\n", sut.Validate())
+}
+
+func TestAsloginName(t *testing.T) {
+	sut, _ := NewPersonID("https://codeberg.org/api/v1/activitypub/user-id/12345", "forgejo")
+	assert.Equal(t, "12345-codeberg.org", sut.AsLoginName())
+
+	sut, _ = NewPersonID("https://codeberg.org:443/api/v1/activitypub/user-id/12345", "forgejo")
+	assert.Equal(t, "12345-codeberg.org-443", sut.AsLoginName())
+}
diff --git a/modules/forgefed/actor_repository.go b/modules/forgefed/actor_repository.go
new file mode 100644
index 0000000000..e73107caef
--- /dev/null
+++ b/modules/forgefed/actor_repository.go
@@ -0,0 +1,52 @@
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"fmt"
+	"strings"
+
+	"forgejo.org/modules/validation"
+)
+
+// ----------------------------- RepositoryID --------------------------------------------
+
+type RepositoryID struct {
+	ActorID
+}
+
+const (
+	repositoryIDapiPathV1       = "api/v1/activitypub/repository-id"
+	repositoryIDapiPathV1Latest = "api/activitypub/repository-id"
+)
+
+// Factory function for RepositoryID. Created struct is asserted to be valid.
+func NewRepositoryID(uri, source string) (RepositoryID, error) {
+	result, err := newActorID(uri)
+	if err != nil {
+		return RepositoryID{}, err
+	}
+	result.Source = source
+
+	// validate Person specific
+	repoID := RepositoryID{result}
+	if valid, err := validation.IsValid(repoID); !valid {
+		return RepositoryID{}, err
+	}
+
+	return repoID, nil
+}
+
+func (id RepositoryID) Validate() []string {
+	result := id.ActorID.Validate()
+	result = append(result, validation.ValidateNotEmpty(id.Source, "source")...)
+	result = append(result, validation.ValidateOneOf(id.Source, []any{"forgejo", "gitea"}, "Source")...)
+	if id.Source == "forgejo" {
+		result = append(result, validation.ValidateNotEmpty(id.Path, "path")...)
+		if strings.ToLower(id.Path) != repositoryIDapiPathV1 && strings.ToLower(id.Path) != repositoryIDapiPathV1Latest {
+			result = append(result, fmt.Sprintf("path: %q has to be a repo specific api path", id.Path))
+		}
+	}
+	return result
+}
diff --git a/modules/forgefed/actor_repository_test.go b/modules/forgefed/actor_repository_test.go
new file mode 100644
index 0000000000..382706f387
--- /dev/null
+++ b/modules/forgefed/actor_repository_test.go
@@ -0,0 +1,45 @@
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"testing"
+
+	"forgejo.org/modules/setting"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewRepositoryId(t *testing.T) {
+	var sut, expected RepositoryID
+	var err error
+	setting.AppURL = "http://localhost:3000/"
+
+	expected = RepositoryID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "http"
+	expected.Path = ""
+	expected.Host = "localhost"
+	expected.HostPort = 3000
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "http://localhost:3000/1"
+
+	_, err = NewRepositoryID("https://an.other.host/api/v1/activitypub/user-id/1", "forgejo")
+	require.EqualError(t, err, "Validation Error: forgefed.RepositoryID: path: \"api/v1/activitypub/user-id\" has to be a repo specific api path")
+
+	expected = RepositoryID{}
+	expected.ID = "1"
+	expected.Source = "forgejo"
+	expected.HostSchema = "http"
+	expected.Path = "api/activitypub/repository-id"
+	expected.Host = "localhost"
+	expected.HostPort = 3000
+	expected.IsPortSupplemented = false
+	expected.UnvalidatedInput = "http://localhost:3000/api/activitypub/repository-id/1"
+	sut, err = NewRepositoryID("http://localhost:3000/api/activitypub/repository-id/1", "forgejo")
+	require.NoError(t, err)
+	assert.Equal(t, expected, sut)
+}
diff --git a/modules/forgefed/actor_test.go b/modules/forgefed/actor_test.go
index e2157a96e4..a32114616c 100644
--- a/modules/forgefed/actor_test.go
+++ b/modules/forgefed/actor_test.go
@@ -1,225 +1,74 @@
-// Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package forgefed
 
 import (
-	"reflect"
-	"strings"
 	"testing"
 
-	"forgejo.org/modules/setting"
-	"forgejo.org/modules/validation"
-
-	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
-func TestNewPersonId(t *testing.T) {
-	expected := PersonID{}
-	expected.ID = "1"
-	expected.Source = "forgejo"
-	expected.Schema = "https"
-	expected.Path = "api/v1/activitypub/user-id"
-	expected.Host = "an.other.host"
-	expected.Port = ""
-	expected.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1"
-	sut, _ := NewPersonID("https://an.other.host/api/v1/activitypub/user-id/1", "forgejo")
-	if sut != expected {
-		t.Errorf("expected: %v\n but was: %v\n", expected, sut)
-	}
+func TestActorNew(t *testing.T) {
+	sut, err := NewActorID("https://an.other.forgejo.host/api/v1/activitypub/user-id/5")
+	require.NoError(t, err)
+	assert.Equal(t, ActorID{
+		ID:                 "5",
+		HostSchema:         "https",
+		Path:               "api/v1/activitypub/user-id",
+		Host:               "an.other.forgejo.host",
+		HostPort:           443,
+		UnvalidatedInput:   "https://an.other.forgejo.host/api/v1/activitypub/user-id/5",
+		IsPortSupplemented: true,
+	}, sut)
 
-	expected = PersonID{}
-	expected.ID = "1"
-	expected.Source = "forgejo"
-	expected.Schema = "https"
-	expected.Path = "api/v1/activitypub/user-id"
-	expected.Host = "an.other.host"
-	expected.Port = "443"
-	expected.UnvalidatedInput = "https://an.other.host:443/api/v1/activitypub/user-id/1"
-	sut, _ = NewPersonID("https://an.other.host:443/api/v1/activitypub/user-id/1", "forgejo")
-	if sut != expected {
-		t.Errorf("expected: %v\n but was: %v\n", expected, sut)
-	}
-}
+	sut, err = NewActorID("https://an.other.forgejo.host/api/v1/activitypub/actor")
+	require.NoError(t, err)
+	assert.Equal(t, ActorID{
+		ID:                 "actor",
+		HostSchema:         "https",
+		Path:               "api/v1/activitypub",
+		Host:               "an.other.forgejo.host",
+		HostPort:           443,
+		UnvalidatedInput:   "https://an.other.forgejo.host/api/v1/activitypub/actor",
+		IsPortSupplemented: true,
+	}, sut)
 
-func TestNewRepositoryId(t *testing.T) {
-	setting.AppURL = "http://localhost:3000/"
-	expected := RepositoryID{}
-	expected.ID = "1"
-	expected.Source = "forgejo"
-	expected.Schema = "http"
-	expected.Path = "api/activitypub/repository-id"
-	expected.Host = "localhost"
-	expected.Port = "3000"
-	expected.UnvalidatedInput = "http://localhost:3000/api/activitypub/repository-id/1"
-	sut, _ := NewRepositoryID("http://localhost:3000/api/activitypub/repository-id/1", "forgejo")
-	if sut != expected {
-		t.Errorf("expected: %v\n but was: %v\n", expected, sut)
-	}
+	sut, err = NewActorID("https://an.other.gts.host/users/me")
+	require.NoError(t, err)
+	assert.Equal(t, ActorID{
+		ID:                 "me",
+		HostSchema:         "https",
+		Path:               "users",
+		Host:               "an.other.gts.host",
+		HostPort:           443,
+		UnvalidatedInput:   "https://an.other.gts.host/users/me",
+		IsPortSupplemented: true,
+	}, sut)
 }
 
 func TestActorIdValidation(t *testing.T) {
 	sut := ActorID{}
-	sut.Source = "forgejo"
-	sut.Schema = "https"
+	sut.HostSchema = "https"
 	sut.Path = "api/v1/activitypub/user-id"
 	sut.Host = "an.other.host"
-	sut.Port = ""
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
 	sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/"
-	if sut.Validate()[0] != "userId should not be empty" {
-		t.Errorf("validation error expected but was: %v\n", sut.Validate())
-	}
+	result := sut.Validate()
+	assert.Len(t, result, 1)
+	assert.Equal(t, "Value ID should not be empty", result[0])
 
 	sut = ActorID{}
 	sut.ID = "1"
-	sut.Source = "forgejo"
-	sut.Schema = "https"
+	sut.HostSchema = "https"
 	sut.Path = "api/v1/activitypub/user-id"
 	sut.Host = "an.other.host"
-	sut.Port = ""
+	sut.HostPort = 443
+	sut.IsPortSupplemented = true
 	sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1?illegal=action"
-	if sut.Validate()[0] != "not all input was parsed, \nUnvalidated Input:\"https://an.other.host/api/v1/activitypub/user-id/1?illegal=action\" \nParsed URI: \"https://an.other.host/api/v1/activitypub/user-id/1\"" {
-		t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
-	}
-}
-
-func TestPersonIdValidation(t *testing.T) {
-	sut := PersonID{}
-	sut.ID = "1"
-	sut.Source = "forgejo"
-	sut.Schema = "https"
-	sut.Path = "path"
-	sut.Host = "an.other.host"
-	sut.Port = ""
-	sut.UnvalidatedInput = "https://an.other.host/path/1"
-
-	_, err := validation.IsValid(sut)
-	if validation.IsErrNotValid(err) && strings.Contains(err.Error(), "path: \"path\" has to be a person specific api path\n") {
-		t.Errorf("validation error expected but was: %v\n", err)
-	}
-
-	sut = PersonID{}
-	sut.ID = "1"
-	sut.Source = "forgejox"
-	sut.Schema = "https"
-	sut.Path = "api/v1/activitypub/user-id"
-	sut.Host = "an.other.host"
-	sut.Port = ""
-	sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1"
-	if sut.Validate()[0] != "Value forgejox is not contained in allowed values [forgejo gitea]" {
-		t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
-	}
-}
-
-func TestWebfingerId(t *testing.T) {
-	sut, _ := NewPersonID("https://codeberg.org/api/v1/activitypub/user-id/12345", "forgejo")
-	if sut.AsWebfinger() != "@12345@codeberg.org" {
-		t.Errorf("wrong webfinger: %v", sut.AsWebfinger())
-	}
-
-	sut, _ = NewPersonID("https://Codeberg.org/api/v1/activitypub/user-id/12345", "forgejo")
-	if sut.AsWebfinger() != "@12345@codeberg.org" {
-		t.Errorf("wrong webfinger: %v", sut.AsWebfinger())
-	}
-}
-
-func TestShouldThrowErrorOnInvalidInput(t *testing.T) {
-	var err any
-	// TODO: remove after test
-	//_, err = NewPersonId("", "forgejo")
-	//if err == nil {
-	//	t.Errorf("empty input should be invalid.")
-	//}
-
-	_, err = NewPersonID("http://localhost:3000/api/v1/something", "forgejo")
-	if err == nil {
-		t.Errorf("localhost uris are not external")
-	}
-	_, err = NewPersonID("./api/v1/something", "forgejo")
-	if err == nil {
-		t.Errorf("relative uris are not allowed")
-	}
-	_, err = NewPersonID("http://1.2.3.4/api/v1/something", "forgejo")
-	if err == nil {
-		t.Errorf("uri may not be ip-4 based")
-	}
-	_, err = NewPersonID("http:///[fe80::1ff:fe23:4567:890a%25eth0]/api/v1/something", "forgejo")
-	if err == nil {
-		t.Errorf("uri may not be ip-6 based")
-	}
-	_, err = NewPersonID("https://codeberg.org/api/v1/activitypub/../activitypub/user-id/12345", "forgejo")
-	if err == nil {
-		t.Errorf("uri may not contain relative path elements")
-	}
-	_, err = NewPersonID("https://myuser@an.other.host/api/v1/activitypub/user-id/1", "forgejo")
-	if err == nil {
-		t.Errorf("uri may not contain unparsed elements")
-	}
-
-	_, err = NewPersonID("https://an.other.host/api/v1/activitypub/user-id/1", "forgejo")
-	if err != nil {
-		t.Errorf("this uri should be valid but was: %v", err)
-	}
-}
-
-func Test_PersonMarshalJSON(t *testing.T) {
-	sut := ForgePerson{}
-	sut.Type = "Person"
-	sut.PreferredUsername = ap.NaturalLanguageValuesNew()
-	sut.PreferredUsername.Set("en", ap.Content("MaxMuster"))
-	result, _ := sut.MarshalJSON()
-	if string(result) != "{\"type\":\"Person\",\"preferredUsername\":\"MaxMuster\"}" {
-		t.Errorf("MarshalJSON() was = %q", result)
-	}
-}
-
-func Test_PersonUnmarshalJSON(t *testing.T) {
-	expected := &ForgePerson{
-		Actor: ap.Actor{
-			Type: "Person",
-			PreferredUsername: ap.NaturalLanguageValues{
-				ap.LangRefValue{Ref: "en", Value: []byte("MaxMuster")},
-			},
-		},
-	}
-	sut := new(ForgePerson)
-	err := sut.UnmarshalJSON([]byte(`{"type":"Person","preferredUsername":"MaxMuster"}`))
-	if err != nil {
-		t.Errorf("UnmarshalJSON() unexpected error: %v", err)
-	}
-	x, _ := expected.MarshalJSON()
-	y, _ := sut.MarshalJSON()
-	if !reflect.DeepEqual(x, y) {
-		t.Errorf("UnmarshalJSON() expected: %q got: %q", x, y)
-	}
-
-	expectedStr := strings.ReplaceAll(strings.ReplaceAll(`{
-		"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10",
-		"type":"Person",
-		"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatar/fa7f9c4af2a64f41b1bef292bf872614"},
-		"url":"https://federated-repo.prod.meissa.de/stargoose9",
-		"inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10/inbox",
-		"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10/outbox",
-		"preferredUsername":"stargoose9",
-		"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10#main-key",
-			"owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/10",
-			"publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBoj...XAgMBAAE=\n-----END PUBLIC KEY-----\n"}}`,
-		"\n", ""),
-		"\t", "")
-	err = sut.UnmarshalJSON([]byte(expectedStr))
-	if err != nil {
-		t.Errorf("UnmarshalJSON() unexpected error: %v", err)
-	}
-	result, _ := sut.MarshalJSON()
-	if expectedStr != string(result) {
-		t.Errorf("UnmarshalJSON() expected: %q got: %q", expectedStr, result)
-	}
-}
-
-func TestForgePersonValidation(t *testing.T) {
-	sut := new(ForgePerson)
-	sut.UnmarshalJSON([]byte(`{"type":"Person","preferredUsername":"MaxMuster"}`))
-	if res, _ := validation.IsValid(sut); !res {
-		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
-	}
+	result = sut.Validate()
+	assert.Len(t, result, 1)
+	assert.Equal(t, "not all input was parsed, \nUnvalidated Input:\"https://an.other.host/api/v1/activitypub/user-id/1?illegal=action\" \nParsed URI: \"https://an.other.host/api/v1/activitypub/user-id/1\"", result[0])
 }
diff --git a/modules/forgefed/forgefed.go b/modules/forgefed/forgefed.go
index 2344dc7a8b..8fca66cb53 100644
--- a/modules/forgefed/forgefed.go
+++ b/modules/forgefed/forgefed.go
@@ -1,4 +1,4 @@
-// Copyright 2023 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package forgefed
diff --git a/modules/forgefed/nodeinfo.go b/modules/forgefed/nodeinfo.go
index b22d2959d4..f9ddaa512f 100644
--- a/modules/forgefed/nodeinfo.go
+++ b/modules/forgefed/nodeinfo.go
@@ -1,4 +1,4 @@
-// Copyright 2023 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package forgefed
@@ -10,10 +10,10 @@ import (
 func (id ActorID) AsWellKnownNodeInfoURI() string {
 	wellKnownPath := ".well-known/nodeinfo"
 	var result string
-	if id.Port == "" {
-		result = fmt.Sprintf("%s://%s/%s", id.Schema, id.Host, wellKnownPath)
+	if id.HostPort == 0 {
+		result = fmt.Sprintf("%s://%s/%s", id.HostSchema, id.Host, wellKnownPath)
 	} else {
-		result = fmt.Sprintf("%s://%s:%s/%s", id.Schema, id.Host, id.Port, wellKnownPath)
+		result = fmt.Sprintf("%s://%s:%d/%s", id.HostSchema, id.Host, id.HostPort, wellKnownPath)
 	}
 	return result
 }
diff --git a/modules/forgefed/object_user_activity_note.go b/modules/forgefed/object_user_activity_note.go
new file mode 100644
index 0000000000..758c25aef8
--- /dev/null
+++ b/modules/forgefed/object_user_activity_note.go
@@ -0,0 +1,68 @@
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"time"
+
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+// ForgeFollow activity data type
+// swagger:model
+type ForgeUserActivityNote struct {
+	// swagger.ignore
+	ap.Object
+}
+
+func NewForgeUserActivityNoteFromAp(item ap.Item) (ForgeUserActivityNote, error) {
+	result := ForgeUserActivityNote{}
+	object := item.(*ap.Object)
+	result.Object = *object
+	if valid, err := validation.IsValid(result); !valid {
+		return ForgeUserActivityNote{}, err
+	}
+	return result, nil
+}
+
+// TODO: Unused - might be removed
+func newNote(doer *user_model.User, content, id string, published time.Time) (ForgeUserActivityNote, error) {
+	note := ForgeUserActivityNote{}
+	note.Type = ap.NoteType
+	note.AttributedTo = ap.IRI(doer.APActorID())
+	note.Content = ap.NaturalLanguageValues{
+		{
+			Ref:   ap.NilLangRef,
+			Value: ap.Content(content),
+		},
+	}
+	note.ID = ap.IRI(id)
+	note.Published = published
+	note.URL = ap.IRI(id)
+	note.To = ap.ItemCollection{
+		ap.IRI("https://www.w3.org/ns/activitystreams#Public"),
+	}
+	note.CC = ap.ItemCollection{
+		ap.IRI(doer.APActorID() + "/followers"),
+	}
+
+	if valid, err := validation.IsValid(note); !valid {
+		return ForgeUserActivityNote{}, err
+	}
+
+	return note, nil
+}
+
+func (note ForgeUserActivityNote) Validate() []string {
+	var result []string
+	result = append(result, validation.ValidateNotEmpty(string(note.Type), "type")...)
+	result = append(result, validation.ValidateOneOf(string(note.Type), []any{"Note"}, "type")...)
+	result = append(result, validation.ValidateNotEmpty(note.Content.String(), "content")...)
+	result = append(result, validation.ValidateIDExists(note.URL, "url")...)
+
+	return result
+}
diff --git a/modules/forgefed/object_user_activity_note_test.go b/modules/forgefed/object_user_activity_note_test.go
new file mode 100644
index 0000000000..02aebd58d3
--- /dev/null
+++ b/modules/forgefed/object_user_activity_note_test.go
@@ -0,0 +1,28 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package forgefed
+
+import (
+	"testing"
+
+	"forgejo.org/modules/validation"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_UserActivityNoteValidation(t *testing.T) {
+	sut := ForgeUserActivityNote{}
+	sut.Type = "Note"
+	sut.Content = ap.NaturalLanguageValues{
+		{
+			Ref:   ap.NilLangRef,
+			Value: ap.Content("Any Content!"),
+		},
+	}
+	sut.URL = ap.IRI("example.org/user-id/57")
+
+	valid, _ := validation.IsValid(sut)
+	assert.True(t, valid, "sut expected to be valid: %v\n", sut.Validate())
+}
diff --git a/modules/generate/generate.go b/modules/generate/generate.go
index 9738195da9..16a797ef5a 100644
--- a/modules/generate/generate.go
+++ b/modules/generate/generate.go
@@ -5,10 +5,8 @@
 package generate
 
 import (
-	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"io"
 	"time"
 
 	"forgejo.org/modules/util"
@@ -18,18 +16,11 @@ import (
 
 // NewInternalToken generate a new value intended to be used by INTERNAL_TOKEN.
 func NewInternalToken() (string, error) {
-	secretBytes := make([]byte, 32)
-	_, err := io.ReadFull(rand.Reader, secretBytes)
-	if err != nil {
-		return "", err
-	}
-
-	secretKey := base64.RawURLEncoding.EncodeToString(secretBytes)
+	secretKey := base64.RawURLEncoding.EncodeToString(util.CryptoRandomBytes(32))
 
 	now := time.Now()
 
-	var internalToken string
-	internalToken, err = jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
+	internalToken, err := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"nbf": now.Unix(),
 	}).SignedString([]byte(secretKey))
 	if err != nil {
@@ -54,14 +45,9 @@ func DecodeJwtSecret(src string) ([]byte, error) {
 }
 
 // NewJwtSecret generates a new base64 encoded value intended to be used for JWT secrets.
-func NewJwtSecret() ([]byte, string, error) {
-	bytes := make([]byte, 32)
-	_, err := rand.Read(bytes)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return bytes, base64.RawURLEncoding.EncodeToString(bytes), nil
+func NewJwtSecret() ([]byte, string) {
+	bytes := util.CryptoRandomBytes(32)
+	return bytes, base64.RawURLEncoding.EncodeToString(bytes)
 }
 
 // NewSecretKey generate a new value intended to be used by SECRET_KEY.
diff --git a/modules/generate/generate_test.go b/modules/generate/generate_test.go
index eb7178af33..b51d17deb2 100644
--- a/modules/generate/generate_test.go
+++ b/modules/generate/generate_test.go
@@ -26,8 +26,7 @@ func TestDecodeJwtSecret(t *testing.T) {
 }
 
 func TestNewJwtSecret(t *testing.T) {
-	secret, encoded, err := NewJwtSecret()
-	require.NoError(t, err)
+	secret, encoded := NewJwtSecret()
 	assert.Len(t, secret, 32)
 	decoded, err := DecodeJwtSecret(encoded)
 	require.NoError(t, err)
diff --git a/modules/git/blame.go b/modules/git/blame.go
index 4ff347e31b..868edab2b8 100644
--- a/modules/git/blame.go
+++ b/modules/git/blame.go
@@ -132,7 +132,7 @@ func (r *BlameReader) Close() error {
 // CreateBlameReader creates reader for given repository, commit and file
 func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath string, commit *Commit, file string, bypassBlameIgnore bool) (*BlameReader, error) {
 	var ignoreRevsFile *string
-	if CheckGitVersionAtLeast("2.23") == nil && !bypassBlameIgnore {
+	if !bypassBlameIgnore {
 		ignoreRevsFile = tryCreateBlameIgnoreRevsFile(commit)
 	}
 
diff --git a/modules/git/blob.go b/modules/git/blob.go
index 3fda358938..4eef5f0e2a 100644
--- a/modules/git/blob.go
+++ b/modules/git/blob.go
@@ -8,11 +8,11 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/base64"
+	"fmt"
 	"io"
 
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/typesniffer"
-	"forgejo.org/modules/util"
 )
 
 // Blob represents a Git object.
@@ -25,42 +25,25 @@ type Blob struct {
 	repo    *Repository
 }
 
-// DataAsync gets a ReadCloser for the contents of a blob without reading it all.
-// Calling the Close function on the result will discard all unread output.
-func (b *Blob) DataAsync() (io.ReadCloser, error) {
+func (b *Blob) newReader() (*bufio.Reader, int64, func(), error) {
 	wr, rd, cancel, err := b.repo.CatFileBatch(b.repo.Ctx)
 	if err != nil {
-		return nil, err
+		return nil, 0, nil, err
 	}
 
 	_, err = wr.Write([]byte(b.ID.String() + "\n"))
 	if err != nil {
 		cancel()
-		return nil, err
+		return nil, 0, nil, err
 	}
 	_, _, size, err := ReadBatchLine(rd)
 	if err != nil {
 		cancel()
-		return nil, err
+		return nil, 0, nil, err
 	}
 	b.gotSize = true
 	b.size = size
-
-	if size < 4096 {
-		bs, err := io.ReadAll(io.LimitReader(rd, size))
-		defer cancel()
-		if err != nil {
-			return nil, err
-		}
-		_, err = rd.Discard(1)
-		return io.NopCloser(bytes.NewReader(bs)), err
-	}
-
-	return &blobReader{
-		rd:     rd,
-		n:      size,
-		cancel: cancel,
-	}, nil
+	return rd, size, cancel, err
 }
 
 // Size returns the uncompressed size of the blob
@@ -91,10 +74,36 @@ func (b *Blob) Size() int64 {
 	return b.size
 }
 
+// DataAsync gets a ReadCloser for the contents of a blob without reading it all.
+// Calling the Close function on the result will discard all unread output.
+func (b *Blob) DataAsync() (io.ReadCloser, error) {
+	rd, size, cancel, err := b.newReader()
+	if err != nil {
+		return nil, err
+	}
+
+	if size < 4096 {
+		bs, err := io.ReadAll(io.LimitReader(rd, size))
+		defer cancel()
+		if err != nil {
+			return nil, err
+		}
+		_, err = rd.Discard(1)
+		return io.NopCloser(bytes.NewReader(bs)), err
+	}
+
+	return &blobReader{
+		rd:     rd,
+		n:      size,
+		cancel: cancel,
+	}, nil
+}
+
 type blobReader struct {
-	rd     *bufio.Reader
-	n      int64
-	cancel func()
+	rd                *bufio.Reader
+	n                 int64 // number of bytes to read
+	additionalDiscard int64 // additional number of bytes to discard
+	cancel            func()
 }
 
 func (b *blobReader) Read(p []byte) (n int, err error) {
@@ -117,7 +126,8 @@ func (b *blobReader) Close() error {
 
 	defer b.cancel()
 
-	if err := DiscardFull(b.rd, b.n+1); err != nil {
+	// discard the unread bytes, the truncated bytes and the trailing newline
+	if err := DiscardFull(b.rd, b.n+b.additionalDiscard+1); err != nil {
 		return err
 	}
 
@@ -131,74 +141,75 @@ func (b *Blob) Name() string {
 	return b.name
 }
 
-// GetBlobContent Gets the limited content of the blob as raw text
+// NewTruncatedReader return a blob-reader which silently truncates when the limit is reached (io.EOF will be returned)
+func (b *Blob) NewTruncatedReader(limit int64) (rc io.ReadCloser, fullSize int64, err error) {
+	r, fullSize, cancel, err := b.newReader()
+	if err != nil {
+		return nil, fullSize, err
+	}
+
+	limit = min(limit, fullSize)
+	return &blobReader{
+		rd:                r,
+		n:                 limit,
+		additionalDiscard: fullSize - limit,
+		cancel:            cancel,
+	}, fullSize, nil
+}
+
+// GetBlobContent Gets the truncated content of the blob as raw text
 func (b *Blob) GetBlobContent(limit int64) (string, error) {
 	if limit <= 0 {
 		return "", nil
 	}
-	dataRc, err := b.DataAsync()
+	rc, fullSize, err := b.NewTruncatedReader(limit)
 	if err != nil {
 		return "", err
 	}
-	defer dataRc.Close()
-	buf, err := util.ReadWithLimit(dataRc, int(limit))
+	defer rc.Close()
+
+	buf := make([]byte, min(fullSize, limit))
+	_, err = io.ReadFull(rc, buf)
 	return string(buf), err
 }
 
-// GetBlobLineCount gets line count of the blob
-func (b *Blob) GetBlobLineCount() (int, error) {
-	reader, err := b.DataAsync()
-	if err != nil {
-		return 0, err
-	}
-	defer reader.Close()
-	buf := make([]byte, 32*1024)
-	count := 1
-	lineSep := []byte{'\n'}
-
-	c, err := reader.Read(buf)
-	if c == 0 && err == io.EOF {
-		return 0, nil
-	}
-	for {
-		count += bytes.Count(buf[:c], lineSep)
-		switch {
-		case err == io.EOF:
-			return count, nil
-		case err != nil:
-			return count, err
-		}
-		c, err = reader.Read(buf)
-	}
+type BlobTooLargeError struct {
+	Size, Limit int64
 }
 
-// GetBlobContentBase64 Reads the content of the blob with a base64 encode and returns the encoded string
-func (b *Blob) GetBlobContentBase64() (string, error) {
-	dataRc, err := b.DataAsync()
-	if err != nil {
-		return "", err
-	}
-	defer dataRc.Close()
+func (b BlobTooLargeError) Error() string {
+	return fmt.Sprintf("blob: content larger than limit (%d > %d)", b.Size, b.Limit)
+}
 
-	pr, pw := io.Pipe()
-	encoder := base64.NewEncoder(base64.StdEncoding, pw)
-
-	go func() {
-		_, err := io.Copy(encoder, dataRc)
-		_ = encoder.Close()
-
-		if err != nil {
-			_ = pw.CloseWithError(err)
-		} else {
-			_ = pw.Close()
+// GetContentBase64 Reads the content of the blob and returns it as base64 encoded string.
+// Returns [BlobTooLargeError] if the (unencoded) content is larger than the limit.
+func (b *Blob) GetContentBase64(limit int64) (string, error) {
+	if b.Size() > limit {
+		return "", BlobTooLargeError{
+			Size:  b.Size(),
+			Limit: limit,
 		}
-	}()
+	}
 
-	out, err := io.ReadAll(pr)
+	rc, size, err := b.NewTruncatedReader(limit)
 	if err != nil {
 		return "", err
 	}
-	return string(out), nil
+	defer rc.Close()
+
+	encoding := base64.StdEncoding
+	buf := bytes.NewBuffer(make([]byte, 0, encoding.EncodedLen(int(size))))
+
+	encoder := base64.NewEncoder(encoding, buf)
+
+	if _, err := io.Copy(encoder, rc); err != nil {
+		return "", err
+	}
+	if err := encoder.Close(); err != nil {
+		return "", err
+	}
+
+	return buf.String(), nil
 }
 
 // GuessContentType guesses the content type of the blob.
@@ -209,7 +220,7 @@ func (b *Blob) GuessContentType() (typesniffer.SniffedType, error) {
 	}
 	defer r.Close()
 
-	return typesniffer.DetectContentTypeFromReader(r)
+	return typesniffer.DetectContentTypeFromReader(r, b.Name())
 }
 
 // GetBlob finds the blob object in the repository.
diff --git a/modules/git/blob_test.go b/modules/git/blob_test.go
index 810964b33d..a4b8033941 100644
--- a/modules/git/blob_test.go
+++ b/modules/git/blob_test.go
@@ -35,6 +35,124 @@ func TestBlob_Data(t *testing.T) {
 	assert.Equal(t, output, string(data))
 }
 
+func TestBlob(t *testing.T) {
+	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+	repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
+	require.NoError(t, err)
+
+	defer repo.Close()
+
+	testBlob, err := repo.GetBlob("6c493ff740f9380390d5c9ddef4af18697ac9375")
+	require.NoError(t, err)
+
+	t.Run("GetBlobContent", func(t *testing.T) {
+		r, err := testBlob.GetBlobContent(100)
+		require.NoError(t, err)
+		require.Equal(t, "file2\n", r)
+
+		r, err = testBlob.GetBlobContent(-1)
+		require.NoError(t, err)
+		require.Empty(t, r)
+
+		r, err = testBlob.GetBlobContent(4)
+		require.NoError(t, err)
+		require.Equal(t, "file", r)
+
+		r, err = testBlob.GetBlobContent(6)
+		require.NoError(t, err)
+		require.Equal(t, "file2\n", r)
+	})
+
+	t.Run("GetContentBase64", func(t *testing.T) {
+		r, err := testBlob.GetContentBase64(100)
+		require.NoError(t, err)
+		require.Equal(t, "ZmlsZTIK", r)
+
+		r, err = testBlob.GetContentBase64(-1)
+		require.ErrorAs(t, err, &BlobTooLargeError{})
+		require.Empty(t, r)
+
+		r, err = testBlob.GetContentBase64(4)
+		require.ErrorAs(t, err, &BlobTooLargeError{})
+		require.Empty(t, r)
+
+		r, err = testBlob.GetContentBase64(6)
+		require.NoError(t, err)
+		require.Equal(t, "ZmlsZTIK", r)
+	})
+
+	t.Run("NewTruncatedReader", func(t *testing.T) {
+		// read fewer than available
+		rc, size, err := testBlob.NewTruncatedReader(100)
+		require.NoError(t, err)
+		require.Equal(t, int64(6), size)
+
+		buf := make([]byte, 1)
+		n, err := rc.Read(buf)
+		require.NoError(t, err)
+		require.Equal(t, 1, n)
+		require.Equal(t, "f", string(buf))
+		n, err = rc.Read(buf)
+		require.NoError(t, err)
+		require.Equal(t, 1, n)
+		require.Equal(t, "i", string(buf))
+
+		require.NoError(t, rc.Close())
+
+		// read more than available
+		rc, size, err = testBlob.NewTruncatedReader(100)
+		require.NoError(t, err)
+		require.Equal(t, int64(6), size)
+
+		buf = make([]byte, 100)
+		n, err = rc.Read(buf)
+		require.NoError(t, err)
+		require.Equal(t, 6, n)
+		require.Equal(t, "file2\n", string(buf[:n]))
+
+		n, err = rc.Read(buf)
+		require.Error(t, err)
+		require.Equal(t, io.EOF, err)
+		require.Equal(t, 0, n)
+
+		require.NoError(t, rc.Close())
+
+		// read more than truncated
+		rc, size, err = testBlob.NewTruncatedReader(4)
+		require.NoError(t, err)
+		require.Equal(t, int64(6), size)
+
+		buf = make([]byte, 10)
+		n, err = rc.Read(buf)
+		require.NoError(t, err)
+		require.Equal(t, 4, n)
+		require.Equal(t, "file", string(buf[:n]))
+
+		n, err = rc.Read(buf)
+		require.Error(t, err)
+		require.Equal(t, io.EOF, err)
+		require.Equal(t, 0, n)
+
+		require.NoError(t, rc.Close())
+	})
+
+	t.Run("NonExisting", func(t *testing.T) {
+		nonExistingBlob, err := repo.GetBlob("00003ff740f9380390d5c9ddef4af18690000000")
+		require.NoError(t, err)
+
+		r, err := nonExistingBlob.GetBlobContent(100)
+		require.Error(t, err)
+		require.IsType(t, ErrNotExist{}, err)
+		require.Empty(t, r)
+
+		rc, size, err := nonExistingBlob.NewTruncatedReader(100)
+		require.Error(t, err)
+		require.IsType(t, ErrNotExist{}, err)
+		require.Empty(t, rc)
+		require.Empty(t, size)
+	})
+}
+
 func Benchmark_Blob_Data(b *testing.B) {
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
 	repo, err := openRepositoryWithDefaultContext(bareRepo1Path)
diff --git a/modules/git/command_test.go b/modules/git/command_test.go
index ace43598fc..aaede9a071 100644
--- a/modules/git/command_test.go
+++ b/modules/git/command_test.go
@@ -55,10 +55,10 @@ func TestGitArgument(t *testing.T) {
 
 func TestCommandString(t *testing.T) {
 	cmd := NewCommandContextNoGlobals(t.Context(), "a", "-m msg", "it's a test", `say "hello"`)
-	assert.EqualValues(t, cmd.prog+` a "-m msg" "it's a test" "say \"hello\""`, cmd.String())
+	assert.Equal(t, cmd.prog+` a "-m msg" "it's a test" "say \"hello\""`, cmd.String())
 
 	cmd = NewCommandContextNoGlobals(t.Context(), "url: https://a:b@c/")
-	assert.EqualValues(t, cmd.prog+` "url: https://sanitized-credential@c/"`, cmd.toString(true))
+	assert.Equal(t, cmd.prog+` "url: https://sanitized-credential@c/"`, cmd.toString(true))
 }
 
 func TestGrepOnlyFunction(t *testing.T) {
diff --git a/modules/git/commit.go b/modules/git/commit.go
index baefe3820d..4fb13ecd4f 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -9,7 +9,6 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"fmt"
 	"io"
 	"os/exec"
 	"strconv"
@@ -17,8 +16,6 @@ import (
 
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/util"
-
-	"github.com/go-git/go-git/v5/config"
 )
 
 // Commit represents a git commit.
@@ -30,8 +27,8 @@ type Commit struct {
 	CommitMessage string
 	Signature     *ObjectSignature
 
-	Parents        []ObjectID // ID strings
-	submoduleCache *ObjectCache
+	Parents    []ObjectID           // ID strings
+	submodules map[string]Submodule // submodule indexed by path
 }
 
 // Message returns the commit message. Same as retrieving CommitMessage directly.
@@ -220,7 +217,7 @@ func (c *Commit) HasPreviousCommit(objectID ObjectID) (bool, error) {
 	}
 	var exitError *exec.ExitError
 	if errors.As(err, &exitError) {
-		if exitError.ProcessState.ExitCode() == 1 && len(exitError.Stderr) == 0 {
+		if exitError.ExitCode() == 1 && len(exitError.Stderr) == 0 {
 			return false, nil
 		}
 	}
@@ -353,71 +350,9 @@ func (c *Commit) GetFileContent(filename string, limit int) (string, error) {
 	return string(bytes), nil
 }
 
-// GetSubModules get all the sub modules of current revision git tree
-func (c *Commit) GetSubModules() (*ObjectCache, error) {
-	if c.submoduleCache != nil {
-		return c.submoduleCache, nil
-	}
-
-	entry, err := c.GetTreeEntryByPath(".gitmodules")
-	if err != nil {
-		if _, ok := err.(ErrNotExist); ok {
-			return nil, nil
-		}
-		return nil, err
-	}
-
-	content, err := entry.Blob().GetBlobContent(10 * 1024)
-	if err != nil {
-		return nil, err
-	}
-
-	c.submoduleCache, err = parseSubmoduleContent([]byte(content))
-	if err != nil {
-		return nil, err
-	}
-	return c.submoduleCache, nil
-}
-
-func parseSubmoduleContent(bs []byte) (*ObjectCache, error) {
-	cfg := config.NewModules()
-	if err := cfg.Unmarshal(bs); err != nil {
-		return nil, err
-	}
-	submoduleCache := newObjectCache()
-	if len(cfg.Submodules) == 0 {
-		return nil, fmt.Errorf("no submodules found")
-	}
-	for _, subModule := range cfg.Submodules {
-		submoduleCache.Set(subModule.Path, subModule.URL)
-	}
-
-	return submoduleCache, nil
-}
-
-// GetSubModule returns the URL to the submodule according entryname
-func (c *Commit) GetSubModule(entryname string) (string, error) {
-	modules, err := c.GetSubModules()
-	if err != nil {
-		return "", err
-	}
-
-	if modules != nil {
-		module, has := modules.Get(entryname)
-		if has {
-			return module.(string), nil
-		}
-	}
-	return "", nil
-}
-
 // GetBranchName gets the closest branch name (as returned by 'git name-rev --name-only')
 func (c *Commit) GetBranchName() (string, error) {
-	cmd := NewCommand(c.repo.Ctx, "name-rev")
-	if CheckGitVersionAtLeast("2.13.0") == nil {
-		cmd.AddArguments("--exclude", "refs/tags/*")
-	}
-	cmd.AddArguments("--name-only", "--no-undefined").AddDynamicArguments(c.ID.String())
+	cmd := NewCommand(c.repo.Ctx, "name-rev", "--exclude", "refs/tags/*", "--name-only", "--no-undefined").AddDynamicArguments(c.ID.String())
 	data, _, err := cmd.RunStdString(&RunOpts{Dir: c.repo.Path})
 	if err != nil {
 		// handle special case where git can not describe commit
@@ -432,6 +367,11 @@ func (c *Commit) GetBranchName() (string, error) {
 	return strings.SplitN(strings.TrimSpace(data), "~", 2)[0], nil
 }
 
+// GetAllBranches returns a slice with all branches that contains this commit
+func (c *Commit) GetAllBranches() ([]string, error) {
+	return c.repo.getBranches(c, -1)
+}
+
 // CommitFileStatus represents status of files in a commit.
 type CommitFileStatus struct {
 	Added    []string
diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go
index 8d9142d362..6511a1689a 100644
--- a/modules/git/commit_info.go
+++ b/modules/git/commit_info.go
@@ -15,9 +15,9 @@ import (
 
 // CommitInfo describes the first commit with the provided entry
 type CommitInfo struct {
-	Entry         *TreeEntry
-	Commit        *Commit
-	SubModuleFile *SubModuleFile
+	Entry     *TreeEntry
+	Commit    *Commit
+	Submodule Submodule
 }
 
 // GetCommitsInfo gets information of all commits that are corresponding to these entries
@@ -71,19 +71,18 @@ func (tes Entries) GetCommitsInfo(ctx context.Context, commit *Commit, treePath
 		}
 
 		// If the entry if a submodule add a submodule file for this
-		if entry.IsSubModule() {
+		if entry.IsSubmodule() {
 			var fullPath string
 			if len(treePath) > 0 {
 				fullPath = treePath + "/" + entry.Name()
 			} else {
 				fullPath = entry.Name()
 			}
-			subModuleURL, err := commit.GetSubModule(fullPath)
+			submodule, err := commit.GetSubmodule(fullPath, entry)
 			if err != nil {
 				return nil, nil, err
 			}
-			subModuleFile := NewSubModuleFile(commitsInfo[i].Commit, subModuleURL, entry.ID.String())
-			commitsInfo[i].SubModuleFile = subModuleFile
+			commitsInfo[i].Submodule = submodule
 		}
 	}
 
diff --git a/modules/git/commit_reader.go b/modules/git/commit_reader.go
index 8e2523d7fb..ec8989f5a7 100644
--- a/modules/git/commit_reader.go
+++ b/modules/git/commit_reader.go
@@ -85,6 +85,8 @@ readLoop:
 				_, _ = payloadSB.Write(line)
 			case "encoding":
 				_, _ = payloadSB.Write(line)
+			case "change-id": // jj-vcs specific header.
+				_, _ = payloadSB.Write(line)
 			case "gpgsig":
 				fallthrough
 			case "gpgsig-sha256": // FIXME: no intertop, so only 1 exists at present.
diff --git a/modules/git/commit_sha256_test.go b/modules/git/commit_sha256_test.go
index 9e56829f45..b2606105fa 100644
--- a/modules/git/commit_sha256_test.go
+++ b/modules/git/commit_sha256_test.go
@@ -107,7 +107,7 @@ signed commit`
 		return
 	}
 	assert.EqualValues(t, sha, commitFromReader.ID)
-	assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
+	assert.Equal(t, `-----BEGIN PGP SIGNATURE-----
 
 iQIrBAABCgAtFiEES+fB08xlgTrzSdQvhkUIsBsmec8FAmU/wKoPHGFtYWplckBz
 dXNlLmRlAAoJEIZFCLAbJnnP4s4PQIJATa++WPzR6/H4etT7bsOGoMyguEJYyWOd
@@ -124,19 +124,19 @@ HKRr3NlRM/DygzTyj0gN74uoa0goCIbyAQhiT42nm0cuhM7uN/W0ayrlZjGF1cbR
 =xybZ
 -----END PGP SIGNATURE-----
 `, commitFromReader.Signature.Signature)
-	assert.EqualValues(t, `tree e7f9e96dd79c09b078cac8b303a7d3b9d65ff9b734e86060a4d20409fd379f9e
+	assert.Equal(t, `tree e7f9e96dd79c09b078cac8b303a7d3b9d65ff9b734e86060a4d20409fd379f9e
 parent 26e9ccc29fad747e9c5d9f4c9ddeb7eff61cc45ef6a8dc258cbeb181afc055e8
 author Adam Majer <amajer@suse.de> 1698676906 +0100
 committer Adam Majer <amajer@suse.de> 1698676906 +0100
 
 signed commit`, commitFromReader.Signature.Payload)
-	assert.EqualValues(t, "Adam Majer <amajer@suse.de>", commitFromReader.Author.String())
+	assert.Equal(t, "Adam Majer <amajer@suse.de>", commitFromReader.Author.String())
 
 	commitFromReader2, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString+"\n\n"))
 	require.NoError(t, err)
 	commitFromReader.CommitMessage += "\n\n"
 	commitFromReader.Signature.Payload += "\n\n"
-	assert.EqualValues(t, commitFromReader, commitFromReader2)
+	assert.Equal(t, commitFromReader, commitFromReader2)
 }
 
 func TestHasPreviousCommitSha256(t *testing.T) {
diff --git a/modules/git/commit_test.go b/modules/git/commit_test.go
index 6bb7d776f5..ee57a735e6 100644
--- a/modules/git/commit_test.go
+++ b/modules/git/commit_test.go
@@ -5,6 +5,7 @@ package git
 
 import (
 	"path/filepath"
+	"slices"
 	"strings"
 	"testing"
 
@@ -92,7 +93,7 @@ empty commit`
 	require.NoError(t, err)
 	require.NotNil(t, commitFromReader)
 	assert.EqualValues(t, sha, commitFromReader.ID)
-	assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
+	assert.Equal(t, `-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEWPb2jX6FS2mqyJRQLmK0HJOGlEMFAl00zmEACgkQLmK0HJOG
 lEMDFBAAhQKKqLD1VICygJMEB8t1gBmNLgvziOLfpX4KPWdPtBk3v/QJ7OrfMrVK
@@ -109,19 +110,19 @@ mfeFhT57UbE4qukTDIQ0Y0WM40UYRTakRaDY7ubhXgLgx09Cnp9XTVMsHgT6j9/i
 =FRsO
 -----END PGP SIGNATURE-----
 `, commitFromReader.Signature.Signature)
-	assert.EqualValues(t, `tree f1a6cb52b2d16773290cefe49ad0684b50a4f930
+	assert.Equal(t, `tree f1a6cb52b2d16773290cefe49ad0684b50a4f930
 parent 37991dec2c8e592043f47155ce4808d4580f9123
 author silverwind <me@silverwind.io> 1563741793 +0200
 committer silverwind <me@silverwind.io> 1563741793 +0200
 
 empty commit`, commitFromReader.Signature.Payload)
-	assert.EqualValues(t, "silverwind <me@silverwind.io>", commitFromReader.Author.String())
+	assert.Equal(t, "silverwind <me@silverwind.io>", commitFromReader.Author.String())
 
 	commitFromReader2, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString+"\n\n"))
 	require.NoError(t, err)
 	commitFromReader.CommitMessage += "\n\n"
 	commitFromReader.Signature.Payload += "\n\n"
-	assert.EqualValues(t, commitFromReader, commitFromReader2)
+	assert.Equal(t, commitFromReader, commitFromReader2)
 }
 
 func TestCommitWithEncodingFromReader(t *testing.T) {
@@ -158,7 +159,7 @@ ISO-8859-1`
 	require.NoError(t, err)
 	require.NotNil(t, commitFromReader)
 	assert.EqualValues(t, sha, commitFromReader.ID)
-	assert.EqualValues(t, `-----BEGIN PGP SIGNATURE-----
+	assert.Equal(t, `-----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEE9HRrbqvYxPT8PXbefPSEkrowAa8FAmYGg7IACgkQfPSEkrow
 Aa9olwv+P0HhtCM6CRvlUmPaqswRsDPNR4i66xyXGiSxdI9V5oJL7HLiQIM7KrFR
@@ -173,20 +174,69 @@ jw4YcO5u
 =r3UU
 -----END PGP SIGNATURE-----
 `, commitFromReader.Signature.Signature)
-	assert.EqualValues(t, `tree ca3fad42080dd1a6d291b75acdfc46e5b9b307e5
+	assert.Equal(t, `tree ca3fad42080dd1a6d291b75acdfc46e5b9b307e5
 parent 47b24e7ab977ed31c5a39989d570847d6d0052af
 author KN4CK3R <admin@oldschoolhack.me> 1711702962 +0100
 committer KN4CK3R <admin@oldschoolhack.me> 1711702962 +0100
 encoding ISO-8859-1
 
 ISO-8859-1`, commitFromReader.Signature.Payload)
-	assert.EqualValues(t, "KN4CK3R <admin@oldschoolhack.me>", commitFromReader.Author.String())
+	assert.Equal(t, "KN4CK3R <admin@oldschoolhack.me>", commitFromReader.Author.String())
 
 	commitFromReader2, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString+"\n\n"))
 	require.NoError(t, err)
 	commitFromReader.CommitMessage += "\n\n"
 	commitFromReader.Signature.Payload += "\n\n"
-	assert.EqualValues(t, commitFromReader, commitFromReader2)
+	assert.Equal(t, commitFromReader, commitFromReader2)
+}
+
+func TestCommitWithChangeIDFromReader(t *testing.T) {
+	commitString := `e66911914414b0daa85d4a428c8d607b9b249a2c commit 611
+tree efd3cbedfc360ce9f60e5f92d51221be5afb4bf0
+author Nicole Patricia Mazzuca <nicole@strega-nil.co> 1746965490 +0200
+committer Nicole Patricia Mazzuca <nicole@strega-nil.co> 1746965630 +0200
+change-id psyxzzozmuvvwrwnpqpvmtwntqsnwzpu
+gpgsig -----BEGIN PGP SIGNATURE-----
+` + " " + `
+ iHUEABYKAB0WIQT/T2ISZ7rMF2EbKVdDm0tNAL/2MgUCaCCUfgAKCRBDm0tNAL/2
+ Mmu/AQC0OWWHsSlfDKIArdALjDLgd00OQVbP+6iYVE9e+rorFwEA5qYVAXD60EHB
+ +7UVcfwZ2jKajkk3q01VyT/CDo3LLQE=
+ =yq2Y
+ -----END PGP SIGNATURE-----
+
+views: first commit!
+
+includes a basic month view, and prints a nice view of an imaginary
+January where the year starts on a Monday :)`
+
+	sha := &Sha1Hash{0xe6, 0x69, 0x11, 0x91, 0x44, 0x14, 0xb0, 0xda, 0xa8, 0x5d, 0x4a, 0x42, 0x8c, 0x8d, 0x60, 0x7b, 0x9b, 0x24, 0x9a, 0x2c}
+	gitRepo, err := openRepositoryWithDefaultContext(filepath.Join(testReposDir, "repo1_bare"))
+	require.NoError(t, err)
+	assert.NotNil(t, gitRepo)
+	defer gitRepo.Close()
+
+	commitFromReader, err := CommitFromReader(gitRepo, sha, strings.NewReader(commitString))
+	require.NoError(t, err)
+	require.NotNil(t, commitFromReader)
+	assert.EqualValues(t, sha, commitFromReader.ID)
+	assert.Equal(t, `-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQT/T2ISZ7rMF2EbKVdDm0tNAL/2MgUCaCCUfgAKCRBDm0tNAL/2
+Mmu/AQC0OWWHsSlfDKIArdALjDLgd00OQVbP+6iYVE9e+rorFwEA5qYVAXD60EHB
++7UVcfwZ2jKajkk3q01VyT/CDo3LLQE=
+=yq2Y
+-----END PGP SIGNATURE-----
+`, commitFromReader.Signature.Signature)
+	assert.Equal(t, `tree efd3cbedfc360ce9f60e5f92d51221be5afb4bf0
+author Nicole Patricia Mazzuca <nicole@strega-nil.co> 1746965490 +0200
+committer Nicole Patricia Mazzuca <nicole@strega-nil.co> 1746965630 +0200
+change-id psyxzzozmuvvwrwnpqpvmtwntqsnwzpu
+
+views: first commit!
+
+includes a basic month view, and prints a nice view of an imaginary
+January where the year starts on a Monday :)`, commitFromReader.Signature.Payload)
+	assert.Equal(t, "Nicole Patricia Mazzuca <nicole@strega-nil.co>", commitFromReader.Author.String())
 }
 
 func TestHasPreviousCommit(t *testing.T) {
@@ -370,32 +420,19 @@ func TestParseCommitRenames(t *testing.T) {
 	}
 }
 
-func Test_parseSubmoduleContent(t *testing.T) {
-	submoduleFiles := []struct {
-		fileContent  string
-		expectedPath string
-		expectedURL  string
-	}{
-		{
-			fileContent: `[submodule "jakarta-servlet"]
-url = ../../ALP-pool/jakarta-servlet
-path = jakarta-servlet`,
-			expectedPath: "jakarta-servlet",
-			expectedURL:  "../../ALP-pool/jakarta-servlet",
-		},
-		{
-			fileContent: `[submodule "jakarta-servlet"]
-path = jakarta-servlet
-url = ../../ALP-pool/jakarta-servlet`,
-			expectedPath: "jakarta-servlet",
-			expectedURL:  "../../ALP-pool/jakarta-servlet",
-		},
-	}
-	for _, kase := range submoduleFiles {
-		submodule, err := parseSubmoduleContent([]byte(kase.fileContent))
-		require.NoError(t, err)
-		v, ok := submodule.Get(kase.expectedPath)
-		assert.True(t, ok)
-		assert.Equal(t, kase.expectedURL, v)
-	}
+func TestGetAllBranches(t *testing.T) {
+	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
+
+	bareRepo1, err := openRepositoryWithDefaultContext(bareRepo1Path)
+	require.NoError(t, err)
+
+	commit, err := bareRepo1.GetCommit("95bb4d39648ee7e325106df01a621c530863a653")
+	require.NoError(t, err)
+
+	branches, err := commit.GetAllBranches()
+	require.NoError(t, err)
+
+	slices.Sort(branches)
+
+	assert.Equal(t, []string{"branch1", "branch2", "master"}, branches)
 }
diff --git a/modules/git/diff_compare.go b/modules/git/diff_compare.go
new file mode 100644
index 0000000000..0eba8cb541
--- /dev/null
+++ b/modules/git/diff_compare.go
@@ -0,0 +1,56 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package git
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"os"
+
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/util"
+)
+
+// CheckIfDiffDiffers returns if the diff of the newCommitID and
+// oldCommitID with the merge base of the base branch has changed.
+//
+// Informally it checks if the following two diffs are exactly the same in their
+// contents, thus ignoring different commit IDs, headers and messages:
+// 1. git diff --merge-base baseReference newCommitID
+// 2. git diff --merge-base baseReference oldCommitID
+func (repo *Repository) CheckIfDiffDiffers(base, oldCommitID, newCommitID string, env []string) (hasChanged bool, err error) {
+	cmd := NewCommand(repo.Ctx, "diff", "--name-only", "-z").AddDynamicArguments(newCommitID, oldCommitID, base)
+	stdoutReader, stdoutWriter, err := os.Pipe()
+	if err != nil {
+		return false, fmt.Errorf("unable to open pipe for to run diff: %w", err)
+	}
+
+	stderr := new(bytes.Buffer)
+	if err := cmd.Run(&RunOpts{
+		Dir:    repo.Path,
+		Stdout: stdoutWriter,
+		Stderr: stderr,
+		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
+			_ = stdoutWriter.Close()
+			defer func() {
+				_ = stdoutReader.Close()
+			}()
+			return util.IsEmptyReader(stdoutReader)
+		},
+	}); err != nil {
+		if err == util.ErrNotEmpty {
+			return true, nil
+		}
+		err = ConcatenateError(err, stderr.String())
+
+		log.Error("Unable to run git diff on %s %s %s in %q: Error: %v",
+			newCommitID, oldCommitID, base,
+			repo.Path,
+			err)
+
+		return false, fmt.Errorf("Unable to run git diff --name-only -z %s %s %s: %w", newCommitID, oldCommitID, base, err)
+	}
+
+	return false, nil
+}
diff --git a/modules/git/diff_compare_test.go b/modules/git/diff_compare_test.go
new file mode 100644
index 0000000000..433497b5c4
--- /dev/null
+++ b/modules/git/diff_compare_test.go
@@ -0,0 +1,421 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package git
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCheckIfDiffDiffers(t *testing.T) {
+	tmpDir := t.TempDir()
+
+	err := InitRepository(t.Context(), tmpDir, false, Sha1ObjectFormat.Name())
+	require.NoError(t, err)
+
+	gitRepo, err := openRepositoryWithDefaultContext(tmpDir)
+	require.NoError(t, err)
+	defer gitRepo.Close()
+
+	require.NoError(t, NewCommand(t.Context(), "switch", "-c", "main").Run(&RunOpts{Dir: tmpDir}))
+
+	require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("aaa"), 0o600))
+	require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+	require.NoError(t, NewCommand(t.Context(), "commit", "-m", "initial commit").Run(&RunOpts{Dir: tmpDir}))
+
+	t.Run("Simple fast-forward", func(t *testing.T) {
+		// Check that A--B--C, where A is the base branch.
+
+		t.Run("Different diff", func(t *testing.T) {
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "a-1", "main").Run(&RunOpts{Dir: tmpDir}))
+
+			// B commit
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "a-2").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("ccc"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "a-1", "a-2", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+
+		t.Run("Same diff", func(t *testing.T) {
+			// Because C is a empty commit, the diff does not differ relative to the
+			// base branch.
+
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "a-3", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "a-4").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "--allow-empty", "-m", "No changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "a-3", "a-4", nil)
+			require.NoError(t, err)
+			assert.False(t, changed)
+		})
+	})
+
+	t.Run("Merge-base is base reference", func(t *testing.T) {
+		//   B
+		//  /
+		// A
+		//  \
+		//   C
+		t.Run("Different diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "b-1", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "b-2", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("ccc"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "b-1", "b-2", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+
+		t.Run("Same diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "b-3", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "b-4", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "b-3", "b-4", nil)
+			require.NoError(t, err)
+			assert.False(t, changed)
+		})
+	})
+
+	t.Run("Merge-base is different", func(t *testing.T) {
+		//   B
+		//  /
+		// A--D
+		//     \
+		//      C
+		// Where D is the base reference.
+
+		// D commit, where A is `main`.
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "main-D", "main").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "FUNFACT"), []byte("Smithy was the runner up to be Forgejo's name"), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "FUNFACT").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Forgejo history").Run(&RunOpts{Dir: tmpDir}))
+
+		t.Run("Different diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "c-1", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "c-2", "main-D").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "FUNFACT"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "FUNFACT").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the funfact").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main-D", "c-1", "c-2", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+
+		t.Run("Same diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "c-3", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "c-4", "main-D").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main-D", "c-3", "c-4", nil)
+			require.NoError(t, err)
+			assert.False(t, changed)
+		})
+	})
+
+	t.Run("Merge commit", func(t *testing.T) {
+		//   B
+		//  /
+		// A - D
+		//      \
+		//       C
+		//
+		// From B, it merges D where E is the merge commit :
+		//   B---E
+		//  /   /
+		// A---D
+		//      \
+		//       C
+
+		t.Run("Different diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "d-1", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+			// E commit
+			require.NoError(t, NewCommand(t.Context(), "merge", "--no-ff", "main-D").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "d-2", "main-D").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "FUNFACT"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "FUNFACT").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the funfact").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main-D", "d-1", "d-2", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+
+		t.Run("Same diff", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "d-3", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+			// Merges D.
+			require.NoError(t, NewCommand(t.Context(), "merge", "--no-ff", "main-D").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "d-4", "main-D").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main-D", "d-3", "d-4", nil)
+			require.NoError(t, err)
+			assert.False(t, changed)
+		})
+	})
+
+	t.Run("Non-typical rebase", func(t *testing.T) {
+		//   B
+		//  /
+		// A--D
+		//     \
+		//      C
+		// Where D is the base reference.
+		// B was rebased onto D, which produced C.
+		// B and D made the same change to same file.
+
+		// D commit.
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "main-D-2", "main").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "FUNFACT"), []byte("Smithy was the runner up to be Forgejo's name"), 0o600))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("ccc"), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "FUNFACT", "README").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Forgejo history").Run(&RunOpts{Dir: tmpDir}))
+
+		// B commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "e-1", "main").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "CONTACT"), []byte("@example.com"), 0o600))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("ccc"), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "README", "CONTACT").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the contact and README").Run(&RunOpts{Dir: tmpDir}))
+
+		// C commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "e-2").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "rebase", "main-D-2").Run(&RunOpts{Dir: tmpDir}))
+
+		// The diff changed, because it no longers shows the change made to `README`.
+		changed, err := gitRepo.CheckIfDiffDiffers("main-D-2", "e-1", "e-2", nil)
+		require.NoError(t, err)
+		assert.False(t, changed) // This should be true.
+	})
+
+	t.Run("Directory", func(t *testing.T) {
+		//   B
+		//  /
+		// A
+		//  \
+		//   C
+		t.Run("Same directory", func(t *testing.T) {
+			t.Run("Different diff", func(t *testing.T) {
+				// B commit
+				require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-1", "main").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+				require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("bbb"), 0o600))
+				require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+				// C commit
+				require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-2", "main").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+				require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("ccc"), 0o600))
+				require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+				changed, err := gitRepo.CheckIfDiffDiffers("main", "f-1", "f-2", nil)
+				require.NoError(t, err)
+				assert.True(t, changed)
+			})
+
+			t.Run("Same diff", func(t *testing.T) {
+				// B commit
+				require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-3", "main").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+				require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("bbb"), 0o600))
+				require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changed to the README").Run(&RunOpts{Dir: tmpDir}))
+
+				// C commit
+				require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-4", "main").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+				require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("bbb"), 0o600))
+				require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+				require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+				changed, err := gitRepo.CheckIfDiffDiffers("main", "f-3", "f-4", nil)
+				require.NoError(t, err)
+				assert.False(t, changed)
+			})
+		})
+
+		t.Run("Different directory", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-5", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-6", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "documentation"), 0o755))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "documentation", "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "documentation/README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "f-5", "f-6", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+
+		t.Run("Directory and file", func(t *testing.T) {
+			// B commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-7", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "docs"), 0o755))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "docs", "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "docs/README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			// C commit
+			require.NoError(t, NewCommand(t.Context(), "switch", "-c", "f-8", "main").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "README"), []byte("bbb"), 0o600))
+			require.NoError(t, NewCommand(t.Context(), "add", "README").Run(&RunOpts{Dir: tmpDir}))
+			require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Changes to the README").Run(&RunOpts{Dir: tmpDir}))
+
+			changed, err := gitRepo.CheckIfDiffDiffers("main", "f-7", "f-8", nil)
+			require.NoError(t, err)
+			assert.True(t, changed)
+		})
+	})
+
+	t.Run("Rebase", func(t *testing.T) {
+		//   B
+		//  /
+		// A--D
+		//     \
+		//      C
+		// Where D is the base reference.
+		// B was rebased onto D, which produced C.
+		// B and D made different (non conflicting) changes to same file.
+
+		// A commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "main-3", "main").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "REBASE"), bytes.Repeat([]byte{'b', 'b', 'b', '\n'}, 100), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "REBASE").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Rebasing is fun").Run(&RunOpts{Dir: tmpDir}))
+
+		// B commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "g-1", "main-3").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "REBASE"), append(bytes.Repeat([]byte{'b', 'b', 'b', '\n'}, 100), 'a', 'a', 'a'), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "REBASE").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Rebasing is fun").Run(&RunOpts{Dir: tmpDir}))
+
+		// D commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "g-2", "main-3").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "REBASE"), append([]byte{'a', 'a', 'a'}, bytes.Repeat([]byte{'b', 'b', 'b', '\n'}, 99)...), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "REBASE").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Rebasing is fun").Run(&RunOpts{Dir: tmpDir}))
+
+		// C commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "g-3", "g-1").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "rebase", "g-2").Run(&RunOpts{Dir: tmpDir}))
+
+		changed, err := gitRepo.CheckIfDiffDiffers("g-2", "g-1", "g-3", nil)
+		require.NoError(t, err)
+		assert.True(t, changed)
+	})
+
+	t.Run("Rebasing change not shown", func(t *testing.T) {
+		//   B
+		//  /
+		// A--D
+		//     \
+		//      C
+		// Where D is the base reference.
+		// B was rebased onto D, which produced C.
+		// B and D made different (non conflicting) changes to same file.
+
+		// A commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "--orphan", "main-4").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.MkdirAll(filepath.Join(tmpDir, "A"), 0o700))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "A", "a"), bytes.Repeat([]byte{'A', 'A', 'A', '\n'}, 100), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "A/a").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Just wondering").Run(&RunOpts{Dir: tmpDir}))
+
+		// B commit
+		// Changes last line.
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "h-1").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "A", "a"), append(bytes.Repeat([]byte{'A', 'A', 'A', '\n'}, 99), 'B', 'B', 'B', '\n'), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "A/a").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Just wondering").Run(&RunOpts{Dir: tmpDir}))
+
+		// D commit
+		// Changes first line.
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "h-2", "main-4").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "A", "a"), append([]byte{'B', 'B', 'B', '\n'}, bytes.Repeat([]byte{'A', 'A', 'A', '\n'}, 99)...), 0o600))
+		require.NoError(t, NewCommand(t.Context(), "add", "A/a").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "commit", "-m", "Just wondering").Run(&RunOpts{Dir: tmpDir}))
+
+		// C commit
+		require.NoError(t, NewCommand(t.Context(), "switch", "-c", "h-3").Run(&RunOpts{Dir: tmpDir}))
+		require.NoError(t, NewCommand(t.Context(), "rebase", "h-2").Run(&RunOpts{Dir: tmpDir}))
+
+		changed, err := gitRepo.CheckIfDiffDiffers("h-2", "h-1", "h-3", nil)
+		require.NoError(t, err)
+
+		assert.False(t, changed)
+	})
+}
diff --git a/modules/git/diff_test.go b/modules/git/diff_test.go
index 0855a7de1c..9130767c66 100644
--- a/modules/git/diff_test.go
+++ b/modules/git/diff_test.go
@@ -162,8 +162,8 @@ func BenchmarkCutDiffAroundLine(b *testing.B) {
 
 func TestParseDiffHunkString(t *testing.T) {
 	leftLine, leftHunk, rightLine, rightHunk := ParseDiffHunkString("@@ -19,3 +19,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER")
-	assert.EqualValues(t, 19, leftLine)
-	assert.EqualValues(t, 3, leftHunk)
-	assert.EqualValues(t, 19, rightLine)
-	assert.EqualValues(t, 5, rightHunk)
+	assert.Equal(t, 19, leftLine)
+	assert.Equal(t, 3, leftHunk)
+	assert.Equal(t, 19, rightLine)
+	assert.Equal(t, 5, rightHunk)
 }
diff --git a/modules/git/error.go b/modules/git/error.go
index 427eb4a5b9..06c6994706 100644
--- a/modules/git/error.go
+++ b/modules/git/error.go
@@ -120,10 +120,7 @@ func (err *ErrPushRejected) GenerateMessage() {
 		err.Message = ""
 		return
 	}
-	for {
-		if len(err.StdErr) <= i+8 {
-			break
-		}
+	for len(err.StdErr) > i+8 {
 		if err.StdErr[i:i+8] != "remote: " {
 			break
 		}
diff --git a/modules/git/git.go b/modules/git/git.go
index c7d5a31b31..851b090b53 100644
--- a/modules/git/git.go
+++ b/modules/git/git.go
@@ -23,7 +23,7 @@ import (
 )
 
 // RequiredVersion is the minimum Git version required
-const RequiredVersion = "2.0.0"
+const RequiredVersion = "2.34.1"
 
 var (
 	// GitExecutable is the command name of git
@@ -33,20 +33,21 @@ var (
 	// DefaultContext is the default context to run git commands in, must be initialized by git.InitXxx
 	DefaultContext context.Context
 
-	SupportProcReceive     bool // >= 2.29
 	SupportHashSha256      bool // >= 2.42, SHA-256 repositories no longer an ‘experimental curiosity’
 	InvertedGitFlushEnv    bool // 2.43.1
 	SupportCheckAttrOnBare bool // >= 2.40
+	SupportGitMergeTree    bool // >= 2.38
+	SupportGrepMaxCount    bool // >= 2.38
 
 	HasSSHExecutable bool
 
-	gitVersion *version.Version
+	GitVersion *version.Version
 )
 
 // loadGitVersion returns current Git version from shell. Internal usage only.
 func loadGitVersion() error {
 	// doesn't need RWMutex because it's executed by Init()
-	if gitVersion != nil {
+	if GitVersion != nil {
 		return nil
 	}
 	stdout, _, runErr := NewCommand(DefaultContext, "version").RunStdString(nil)
@@ -62,7 +63,7 @@ func loadGitVersion() error {
 	versionString := fields[2]
 
 	var err error
-	gitVersion, err = version.NewVersion(versionString)
+	GitVersion, err = version.NewVersion(versionString)
 	return err
 }
 
@@ -88,7 +89,7 @@ func SetExecutablePath(path string) error {
 		return err
 	}
 
-	if gitVersion.LessThan(versionRequired) {
+	if GitVersion.LessThan(versionRequired) {
 		moreHint := "get git: https://git-scm.com/downloads"
 		if runtime.GOOS == "linux" {
 			// there are a lot of CentOS/RHEL users using old git, so we add a special hint for them
@@ -97,7 +98,7 @@ func SetExecutablePath(path string) error {
 				moreHint = "get git: https://git-scm.com/downloads/linux and https://ius.io"
 			}
 		}
-		return fmt.Errorf("installed git version %q is not supported, Gitea requires git version >= %q, %s", gitVersion.Original(), RequiredVersion, moreHint)
+		return fmt.Errorf("installed git version %q is not supported, Gitea requires git version >= %q, %s", GitVersion.Original(), RequiredVersion, moreHint)
 	}
 
 	return nil
@@ -105,13 +106,13 @@ func SetExecutablePath(path string) error {
 
 // VersionInfo returns git version information
 func VersionInfo() string {
-	if gitVersion == nil {
+	if GitVersion == nil {
 		return "(git not found)"
 	}
 	format := "%s"
-	args := []any{gitVersion.Original()}
+	args := []any{GitVersion.Original()}
 	// Since git wire protocol has been released from git v2.18
-	if setting.Git.EnableAutoGitWireProtocol && CheckGitVersionAtLeast("2.18") == nil {
+	if setting.Git.EnableAutoGitWireProtocol {
 		format += ", Wire Protocol %s Enabled"
 		args = append(args, "Version 2") // for focus color
 	}
@@ -170,16 +171,13 @@ func InitFull(ctx context.Context) (err error) {
 		_ = os.Setenv("GNUPGHOME", filepath.Join(HomeDir(), ".gnupg"))
 	}
 
-	// Since git wire protocol has been released from git v2.18
-	if setting.Git.EnableAutoGitWireProtocol && CheckGitVersionAtLeast("2.18") == nil {
+	if setting.Git.EnableAutoGitWireProtocol {
 		globalCommandArgs = append(globalCommandArgs, "-c", "protocol.version=2")
 	}
 
 	// Explicitly disable credential helper, otherwise Git credentials might leak
-	if CheckGitVersionAtLeast("2.9") == nil {
-		globalCommandArgs = append(globalCommandArgs, "-c", "credential.helper=")
-	}
-	SupportProcReceive = CheckGitVersionAtLeast("2.29") == nil
+	globalCommandArgs = append(globalCommandArgs, "-c", "credential.helper=")
+
 	SupportHashSha256 = CheckGitVersionAtLeast("2.42") == nil
 	SupportCheckAttrOnBare = CheckGitVersionAtLeast("2.40") == nil
 	if SupportHashSha256 {
@@ -189,11 +187,10 @@ func InitFull(ctx context.Context) (err error) {
 	}
 
 	InvertedGitFlushEnv = CheckGitVersionEqual("2.43.1") == nil
+	SupportGitMergeTree = CheckGitVersionAtLeast("2.38") == nil
+	SupportGrepMaxCount = CheckGitVersionAtLeast("2.38") == nil
 
 	if setting.LFS.StartServer {
-		if CheckGitVersionAtLeast("2.1.2") != nil {
-			return errors.New("LFS server support requires Git >= 2.1.2")
-		}
 		globalCommandArgs = append(globalCommandArgs, "-c", "filter.lfs.required=", "-c", "filter.lfs.smudge=", "-c", "filter.lfs.clean=")
 	}
 
@@ -230,38 +227,28 @@ func syncGitConfig() (err error) {
 		}
 	}
 
-	// Set git some configurations - these must be set to these values for gitea to work correctly
+	// Set git some configurations - these must be set to these values for forgejo to work correctly
 	if err := configSet("core.quotePath", "false"); err != nil {
 		return err
 	}
 
-	if CheckGitVersionAtLeast("2.10") == nil {
-		if err := configSet("receive.advertisePushOptions", "true"); err != nil {
-			return err
-		}
+	if err := configSet("receive.advertisePushOptions", "true"); err != nil {
+		return err
 	}
 
-	if CheckGitVersionAtLeast("2.18") == nil {
-		if err := configSet("core.commitGraph", "true"); err != nil {
-			return err
-		}
-		if err := configSet("gc.writeCommitGraph", "true"); err != nil {
-			return err
-		}
-		if err := configSet("fetch.writeCommitGraph", "true"); err != nil {
-			return err
-		}
+	if err := configSet("core.commitGraph", "true"); err != nil {
+		return err
+	}
+	if err := configSet("gc.writeCommitGraph", "true"); err != nil {
+		return err
+	}
+	if err := configSet("fetch.writeCommitGraph", "true"); err != nil {
+		return err
 	}
 
-	if SupportProcReceive {
-		// set support for AGit flow
-		if err := configAddNonExist("receive.procReceiveRefs", "refs/for"); err != nil {
-			return err
-		}
-	} else {
-		if err := configUnsetAll("receive.procReceiveRefs", "refs/for"); err != nil {
-			return err
-		}
+	// set support for AGit flow
+	if err := configAddNonExist("receive.procReceiveRefs", "refs/for"); err != nil {
+		return err
 	}
 
 	// Due to CVE-2022-24765, git now denies access to git directories which are not owned by current user
@@ -278,8 +265,45 @@ func syncGitConfig() (err error) {
 		return err
 	}
 
-	// By default partial clones are disabled, enable them from git v2.22
-	if !setting.Git.DisablePartialClone && CheckGitVersionAtLeast("2.22") == nil {
+	switch setting.Repository.Signing.Format {
+	case "ssh":
+		// Get the ssh-keygen binary that Git will use.
+		// This can be overridden in app.ini in [git.config] section, so we must
+		// query this information.
+		sshKeygenPath, err := configGet("gpg.ssh.program")
+		if err != nil {
+			return err
+		}
+		// git is very stubborn and does not give a default value, so we must do
+		// this ourselves.
+		if len(sshKeygenPath) == 0 {
+			// Default value of git, very unlikely to change.
+			// https://github.com/git/git/blob/5b97a56fa0e7d580dc8865b73107407c9b3f0eff/gpg-interface.c#L116
+			sshKeygenPath = "ssh-keygen"
+		}
+
+		// Although there's a version requirement of 8.2p1, there's no cross-version
+		// method to get the version of ssh-keygen. Therefore we do a simple binary
+		// presence check and hope for the best.
+		if _, err := exec.LookPath(sshKeygenPath); err != nil {
+			if errors.Is(err, exec.ErrNotFound) {
+				return errors.New("git signing requires a ssh-keygen binary")
+			}
+			return err
+		}
+
+		if err := configSet("gpg.format", "ssh"); err != nil {
+			return err
+		}
+		// openpgp is already the default value, so in the case of a non SSH format
+		// set the value to openpgp.
+	default:
+		if err := configSet("gpg.format", "openpgp"); err != nil {
+			return err
+		}
+	}
+
+	if !setting.Git.DisablePartialClone {
 		if err = configSet("uploadpack.allowfilter", "true"); err != nil {
 			return err
 		}
@@ -303,8 +327,8 @@ func CheckGitVersionAtLeast(atLeast string) error {
 	if err != nil {
 		return err
 	}
-	if gitVersion.Compare(atLeastVersion) < 0 {
-		return fmt.Errorf("installed git binary version %s is not at least %s", gitVersion.Original(), atLeast)
+	if GitVersion.Compare(atLeastVersion) < 0 {
+		return fmt.Errorf("installed git binary version %s is not at least %s", GitVersion.Original(), atLeast)
 	}
 	return nil
 }
@@ -318,12 +342,21 @@ func CheckGitVersionEqual(equal string) error {
 	if err != nil {
 		return err
 	}
-	if !gitVersion.Equal(atLeastVersion) {
-		return fmt.Errorf("installed git binary version %s is not equal to %s", gitVersion.Original(), equal)
+	if !GitVersion.Equal(atLeastVersion) {
+		return fmt.Errorf("installed git binary version %s is not equal to %s", GitVersion.Original(), equal)
 	}
 	return nil
 }
 
+func configGet(key string) (string, error) {
+	stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil)
+	if err != nil && !IsErrorExitCode(err, 1) {
+		return "", fmt.Errorf("failed to get git config %s, err: %w", key, err)
+	}
+
+	return strings.TrimSpace(stdout), nil
+}
+
 func configSet(key, value string) error {
 	stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil)
 	if err != nil && !IsErrorExitCode(err, 1) {
diff --git a/modules/git/git_test.go b/modules/git/git_test.go
index bb07367e3b..38d4db169c 100644
--- a/modules/git/git_test.go
+++ b/modules/git/git_test.go
@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/modules/util"
 
 	"github.com/stretchr/testify/assert"
@@ -84,13 +85,57 @@ func TestGitConfig(t *testing.T) {
 }
 
 func TestSyncConfig(t *testing.T) {
-	oldGitConfig := setting.GitConfig
-	defer func() {
-		setting.GitConfig = oldGitConfig
-	}()
+	defer test.MockProtect(&setting.GitConfig)()
 
 	setting.GitConfig.Options["sync-test.cfg-key-a"] = "CfgValA"
 	require.NoError(t, syncGitConfig())
 	assert.True(t, gitConfigContains("[sync-test]"))
 	assert.True(t, gitConfigContains("cfg-key-a = CfgValA"))
 }
+
+func TestSyncConfigGPGFormat(t *testing.T) {
+	defer test.MockProtect(&setting.GitConfig)()
+
+	t.Run("No format", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Repository.Signing.Format, "")()
+		require.NoError(t, syncGitConfig())
+		assert.True(t, gitConfigContains("[gpg]"))
+		assert.True(t, gitConfigContains("format = openpgp"))
+	})
+
+	t.Run("SSH format", func(t *testing.T) {
+		r, err := os.OpenRoot(t.TempDir())
+		require.NoError(t, err)
+		f, err := r.OpenFile("ssh-keygen", os.O_CREATE|os.O_TRUNC, 0o700)
+		require.NoError(t, f.Close())
+		require.NoError(t, err)
+		t.Setenv("PATH", r.Name())
+		defer test.MockVariableValue(&setting.Repository.Signing.Format, "ssh")()
+
+		require.NoError(t, syncGitConfig())
+		assert.True(t, gitConfigContains("[gpg]"))
+		assert.True(t, gitConfigContains("format = ssh"))
+
+		t.Run("No ssh-keygen binary", func(t *testing.T) {
+			require.NoError(t, r.Remove("ssh-keygen"))
+			require.ErrorContains(t, syncGitConfig(), "git signing requires a ssh-keygen binary")
+		})
+
+		t.Run("Dynamic ssh-keygen binary location", func(t *testing.T) {
+			f, err := r.OpenFile("ssh-keygen-2", os.O_CREATE|os.O_TRUNC, 0o700)
+			require.NoError(t, f.Close())
+			require.NoError(t, err)
+			defer test.MockVariableValue(&setting.GitConfig.Options, map[string]string{
+				"gpg.ssh.program": "ssh-keygen-2",
+			})()
+			require.NoError(t, syncGitConfig())
+		})
+	})
+
+	t.Run("OpenPGP format", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")()
+		require.NoError(t, syncGitConfig())
+		assert.True(t, gitConfigContains("[gpg]"))
+		assert.True(t, gitConfigContains("format = openpgp"))
+	})
+}
diff --git a/modules/git/grep.go b/modules/git/grep.go
index 117b09fc83..3703b13660 100644
--- a/modules/git/grep.go
+++ b/modules/git/grep.go
@@ -98,8 +98,7 @@ func GrepSearch(ctx context.Context, repo *Repository, search string, opts GrepO
 
 	cmd.AddOptionValues("--context", fmt.Sprint(opts.ContextLineNumber))
 
-	// --max-count requires at least git 2.38
-	if CheckGitVersionAtLeast("2.38.0") == nil {
+	if SupportGrepMaxCount {
 		cmd.AddOptionValues("--max-count", fmt.Sprint(opts.MatchesPerFile))
 	} else {
 		log.Warn("git-grep: --max-count requires at least git 2.38")
diff --git a/modules/git/grep_test.go b/modules/git/grep_test.go
index 534468e268..83ddb766af 100644
--- a/modules/git/grep_test.go
+++ b/modules/git/grep_test.go
@@ -59,48 +59,55 @@ func TestGrepSearch(t *testing.T) {
 		},
 	}, res)
 
-	res, err = GrepSearch(t.Context(), repo, "world", GrepOptions{MatchesPerFile: 1})
-	require.NoError(t, err)
-	assert.Equal(t, []*GrepResult{
-		{
-			Filename:          "i-am-a-python.p",
-			LineNumbers:       []int{1},
-			LineCodes:         []string{"## This is a simple file to do a hello world"},
-			HighlightedRanges: [][3]int{{0, 39, 44}},
-		},
-		{
-			Filename:          "java-hello/main.java",
-			LineNumbers:       []int{1},
-			LineCodes:         []string{"public class HelloWorld"},
-			HighlightedRanges: [][3]int{{0, 18, 23}},
-		},
-		{
-			Filename:          "main.vendor.java",
-			LineNumbers:       []int{1},
-			LineCodes:         []string{"public class HelloWorld"},
-			HighlightedRanges: [][3]int{{0, 18, 23}},
-		},
-		{
-			Filename:          "python-hello/hello.py",
-			LineNumbers:       []int{1},
-			LineCodes:         []string{"## This is a simple file to do a hello world"},
-			HighlightedRanges: [][3]int{{0, 39, 44}},
-		},
-	}, res)
+	t.Run("Max count", func(t *testing.T) {
+		if !SupportGrepMaxCount {
+			t.Skip("Skipping, git grep --max-count is not supported")
+			return
+		}
 
-	res, err = GrepSearch(t.Context(), repo, "world", GrepOptions{
-		MatchesPerFile: 1,
-		Filename:       "java-hello/",
+		res, err = GrepSearch(t.Context(), repo, "world", GrepOptions{MatchesPerFile: 1})
+		require.NoError(t, err)
+		assert.Equal(t, []*GrepResult{
+			{
+				Filename:          "i-am-a-python.p",
+				LineNumbers:       []int{1},
+				LineCodes:         []string{"## This is a simple file to do a hello world"},
+				HighlightedRanges: [][3]int{{0, 39, 44}},
+			},
+			{
+				Filename:          "java-hello/main.java",
+				LineNumbers:       []int{1},
+				LineCodes:         []string{"public class HelloWorld"},
+				HighlightedRanges: [][3]int{{0, 18, 23}},
+			},
+			{
+				Filename:          "main.vendor.java",
+				LineNumbers:       []int{1},
+				LineCodes:         []string{"public class HelloWorld"},
+				HighlightedRanges: [][3]int{{0, 18, 23}},
+			},
+			{
+				Filename:          "python-hello/hello.py",
+				LineNumbers:       []int{1},
+				LineCodes:         []string{"## This is a simple file to do a hello world"},
+				HighlightedRanges: [][3]int{{0, 39, 44}},
+			},
+		}, res)
+
+		res, err = GrepSearch(t.Context(), repo, "world", GrepOptions{
+			MatchesPerFile: 1,
+			Filename:       "java-hello/",
+		})
+		require.NoError(t, err)
+		assert.Equal(t, []*GrepResult{
+			{
+				Filename:          "java-hello/main.java",
+				LineNumbers:       []int{1},
+				LineCodes:         []string{"public class HelloWorld"},
+				HighlightedRanges: [][3]int{{0, 18, 23}},
+			},
+		}, res)
 	})
-	require.NoError(t, err)
-	assert.Equal(t, []*GrepResult{
-		{
-			Filename:          "java-hello/main.java",
-			LineNumbers:       []int{1},
-			LineCodes:         []string{"public class HelloWorld"},
-			HighlightedRanges: [][3]int{{0, 18, 23}},
-		},
-	}, res)
 
 	res, err = GrepSearch(t.Context(), repo, "no-such-content", GrepOptions{})
 	require.NoError(t, err)
diff --git a/modules/git/log_name_status.go b/modules/git/log_name_status.go
index e98e8c19a3..50786e7a42 100644
--- a/modules/git/log_name_status.go
+++ b/modules/git/log_name_status.go
@@ -118,11 +118,12 @@ func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int
 		g.buffull = false
 		g.next, err = g.rd.ReadSlice('\x00')
 		if err != nil {
-			if err == bufio.ErrBufferFull {
+			switch err {
+			case bufio.ErrBufferFull:
 				g.buffull = true
-			} else if err == io.EOF {
+			case io.EOF:
 				return nil, nil
-			} else {
+			default:
 				return nil, err
 			}
 		}
@@ -132,11 +133,12 @@ func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int
 	if bytes.Equal(g.next, []byte("commit\000")) {
 		g.next, err = g.rd.ReadSlice('\x00')
 		if err != nil {
-			if err == bufio.ErrBufferFull {
+			switch err {
+			case bufio.ErrBufferFull:
 				g.buffull = true
-			} else if err == io.EOF {
+			case io.EOF:
 				return nil, nil
-			} else {
+			default:
 				return nil, err
 			}
 		}
@@ -169,7 +171,7 @@ func (g *LogNameStatusRepoParser) Next(treepath string, paths2ids map[string]int
 		}
 	}
 
-	if err == io.EOF || !(g.next[0] == '\n' || g.next[0] == '\000') {
+	if err == io.EOF || (g.next[0] != '\n' && g.next[0] != '\000') {
 		return &ret, nil
 	}
 
@@ -214,11 +216,12 @@ diffloop:
 		}
 		g.next, err = g.rd.ReadSlice('\x00')
 		if err != nil {
-			if err == bufio.ErrBufferFull {
+			switch err {
+			case bufio.ErrBufferFull:
 				g.buffull = true
-			} else if err == io.EOF {
+			case io.EOF:
 				return &ret, nil
-			} else {
+			default:
 				return nil, err
 			}
 		}
diff --git a/modules/git/parse_test.go b/modules/git/parse_test.go
index 89c6e0399b..03f359f6c1 100644
--- a/modules/git/parse_test.go
+++ b/modules/git/parse_test.go
@@ -57,7 +57,7 @@ func TestParseTreeEntriesLong(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, entries, len(testCase.Expected))
 		for i, entry := range entries {
-			assert.EqualValues(t, testCase.Expected[i], entry)
+			assert.Equal(t, testCase.Expected[i], entry)
 		}
 	}
 }
@@ -90,7 +90,7 @@ func TestParseTreeEntriesShort(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, entries, len(testCase.Expected))
 		for i, entry := range entries {
-			assert.EqualValues(t, testCase.Expected[i], entry)
+			assert.Equal(t, testCase.Expected[i], entry)
 		}
 	}
 }
diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go
index f39b7113bb..1ee8921854 100644
--- a/modules/git/pipeline/revlist.go
+++ b/modules/git/pipeline/revlist.go
@@ -16,26 +16,6 @@ import (
 	"forgejo.org/modules/log"
 )
 
-// RevListAllObjects runs rev-list --objects --all and writes to a pipewriter
-func RevListAllObjects(ctx context.Context, revListWriter *io.PipeWriter, wg *sync.WaitGroup, basePath string, errChan chan<- error) {
-	defer wg.Done()
-	defer revListWriter.Close()
-
-	stderr := new(bytes.Buffer)
-	var errbuf strings.Builder
-	cmd := git.NewCommand(ctx, "rev-list", "--objects", "--all")
-	if err := cmd.Run(&git.RunOpts{
-		Dir:    basePath,
-		Stdout: revListWriter,
-		Stderr: stderr,
-	}); err != nil {
-		log.Error("git rev-list --objects --all [%s]: %v - %s", basePath, err, errbuf.String())
-		err = fmt.Errorf("git rev-list --objects --all [%s]: %w - %s", basePath, err, errbuf.String())
-		_ = revListWriter.CloseWithError(err)
-		errChan <- err
-	}
-}
-
 // RevListObjects run rev-list --objects from headSHA to baseSHA
 func RevListObjects(ctx context.Context, revListWriter *io.PipeWriter, wg *sync.WaitGroup, tmpBasePath, headSHA, baseSHA string, errChan chan<- error) {
 	defer wg.Done()
diff --git a/modules/git/pushoptions/pushoptions.go b/modules/git/pushoptions/pushoptions.go
index 9709a8be79..e96ba0a339 100644
--- a/modules/git/pushoptions/pushoptions.go
+++ b/modules/git/pushoptions/pushoptions.go
@@ -4,6 +4,7 @@
 package pushoptions
 
 import (
+	"encoding/base64"
 	"fmt"
 	"os"
 	"strconv"
@@ -109,5 +110,22 @@ func (o gitPushOptions) GetBool(key Key, def bool) bool {
 
 func (o gitPushOptions) GetString(key Key) (string, bool) {
 	val, ok := o[string(key)]
-	return val, ok
+	if !ok {
+		return "", false
+	}
+
+	// If the value is prefixed with `{base64}` then everything after that is very
+	// likely to be encoded via base64.
+	base64Value, found := strings.CutPrefix(val, "{base64}")
+	if !found {
+		return val, true
+	}
+
+	value, err := base64.StdEncoding.DecodeString(base64Value)
+	if err != nil {
+		// Not valid base64? Return the original value.
+		return val, true
+	}
+
+	return string(value), true
 }
diff --git a/modules/git/pushoptions/pushoptions_test.go b/modules/git/pushoptions/pushoptions_test.go
index 49bf2d275b..d7c50649d0 100644
--- a/modules/git/pushoptions/pushoptions_test.go
+++ b/modules/git/pushoptions/pushoptions_test.go
@@ -4,6 +4,7 @@
 package pushoptions
 
 import (
+	"encoding/base64"
 	"fmt"
 	"testing"
 
@@ -22,8 +23,8 @@ func TestToAndFromMap(t *testing.T) {
 	options.Parse(fmt.Sprintf("%v", RepoPrivate))
 	actual := options.Map()
 	expected := map[string]string{string(RepoPrivate): "true"}
-	assert.EqualValues(t, expected, actual)
-	assert.EqualValues(t, expected, NewFromMap(&actual).Map())
+	assert.Equal(t, expected, actual)
+	assert.Equal(t, expected, NewFromMap(&actual).Map())
 }
 
 func TestChangeRepositorySettings(t *testing.T) {
@@ -46,7 +47,7 @@ func TestParse(t *testing.T) {
 
 		val, ok := options.GetString(RepoPrivate)
 		assert.False(t, ok)
-		assert.Equal(t, "", val)
+		assert.Empty(t, val)
 
 		assert.True(t, options.GetBool(RepoPrivate, true))
 		assert.False(t, options.GetBool(RepoPrivate, false))
@@ -92,6 +93,23 @@ func TestParse(t *testing.T) {
 		assert.False(t, options.Parse("unknown=value"))
 		assert.True(t, options.Empty())
 	})
+
+	t.Run("Base64 values", func(t *testing.T) {
+		options := New()
+
+		description := `I contain
+a
+line`
+		assert.True(t, options.Parse(fmt.Sprintf("%s={base64}%s", AgitDescription, base64.StdEncoding.EncodeToString([]byte(description)))))
+		val, ok := options.GetString(AgitDescription)
+		assert.True(t, ok)
+		assert.Equal(t, description, val)
+
+		assert.True(t, options.Parse(fmt.Sprintf("%s={base64}fooled you", AgitTitle)))
+		val, ok = options.GetString(AgitTitle)
+		assert.True(t, ok)
+		assert.Equal(t, "{base64}fooled you", val)
+	})
 }
 
 func TestReadEnv(t *testing.T) {
diff --git a/modules/git/remote.go b/modules/git/remote.go
index fb66d76ff0..83a02fe2be 100644
--- a/modules/git/remote.go
+++ b/modules/git/remote.go
@@ -12,14 +12,7 @@ import (
 
 // GetRemoteAddress returns remote url of git repository in the repoPath with special remote name
 func GetRemoteAddress(ctx context.Context, repoPath, remoteName string) (string, error) {
-	var cmd *Command
-	if CheckGitVersionAtLeast("2.7") == nil {
-		cmd = NewCommand(ctx, "remote", "get-url").AddDynamicArguments(remoteName)
-	} else {
-		cmd = NewCommand(ctx, "config", "--get").AddDynamicArguments("remote." + remoteName + ".url")
-	}
-
-	result, _, err := cmd.RunStdString(&RunOpts{Dir: repoPath})
+	result, _, err := NewCommand(ctx, "remote", "get-url").AddDynamicArguments(remoteName).RunStdString(&RunOpts{Dir: repoPath})
 	if err != nil {
 		return "", err
 	}
diff --git a/modules/git/repo.go b/modules/git/repo.go
index 0f4d1f5afa..23e9337615 100644
--- a/modules/git/repo.go
+++ b/modules/git/repo.go
@@ -278,10 +278,10 @@ type DivergeObject struct {
 }
 
 // GetDivergingCommits returns the number of commits a targetBranch is ahead or behind a baseBranch
-func GetDivergingCommits(ctx context.Context, repoPath, baseBranch, targetBranch string) (do DivergeObject, err error) {
+func GetDivergingCommits(ctx context.Context, repoPath, baseBranch, targetBranch string, env []string) (do DivergeObject, err error) {
 	cmd := NewCommand(ctx, "rev-list", "--count", "--left-right").
 		AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
-	stdout, _, err := cmd.RunStdString(&RunOpts{Dir: repoPath})
+	stdout, _, err := cmd.RunStdString(&RunOpts{Dir: repoPath, Env: env})
 	if err != nil {
 		return do, err
 	}
diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go
index 2154467332..2b07513162 100644
--- a/modules/git/repo_attribute.go
+++ b/modules/git/repo_attribute.go
@@ -7,6 +7,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -116,7 +117,7 @@ func (ca GitAttribute) Bool() optional.Option[bool] {
 // instantiation.
 func (repo *Repository) gitCheckAttrCommand(treeish string, attributes ...string) (*Command, *RunOpts, context.CancelFunc, error) {
 	if len(attributes) == 0 {
-		return nil, nil, nil, fmt.Errorf("no provided attributes to check-attr")
+		return nil, nil, nil, errors.New("no provided attributes to check-attr")
 	}
 
 	env := os.Environ()
diff --git a/modules/git/repo_attribute_test.go b/modules/git/repo_attribute_test.go
index ee89373b90..3d2c845fa0 100644
--- a/modules/git/repo_attribute_test.go
+++ b/modules/git/repo_attribute_test.go
@@ -5,7 +5,6 @@ package git
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"io/fs"
 	"os"
@@ -101,7 +100,7 @@ func TestGitAttributeBareNonBare(t *testing.T) {
 		cloneStats, err := gitRepo.GitAttributes(commitID, "i-am-a-python.p", LinguistAttributes...)
 		require.NoError(t, err)
 
-		assert.EqualValues(t, cloneStats, bareStats)
+		assert.Equal(t, cloneStats, bareStats)
 		refStats := cloneStats
 
 		t.Run("GitAttributeChecker/"+commitID+"/SupportBare", func(t *testing.T) {
@@ -111,7 +110,7 @@ func TestGitAttributeBareNonBare(t *testing.T) {
 
 			bareStats, err := bareChecker.CheckPath("i-am-a-python.p")
 			require.NoError(t, err)
-			assert.EqualValues(t, refStats, bareStats)
+			assert.Equal(t, refStats, bareStats)
 		})
 		t.Run("GitAttributeChecker/"+commitID+"/NoBareSupport", func(t *testing.T) {
 			defer test.MockVariableValue(&SupportCheckAttrOnBare, false)()
@@ -122,7 +121,7 @@ func TestGitAttributeBareNonBare(t *testing.T) {
 			cloneStats, err := cloneChecker.CheckPath("i-am-a-python.p")
 			require.NoError(t, err)
 
-			assert.EqualValues(t, refStats, cloneStats)
+			assert.Equal(t, refStats, cloneStats)
 		})
 	}
 }
@@ -135,7 +134,7 @@ func TestGitAttributes(t *testing.T) {
 
 	attr, err := gitRepo.GitAttributes("8fee858da5796dfb37704761701bb8e800ad9ef3", "i-am-a-python.p", LinguistAttributes...)
 	require.NoError(t, err)
-	assert.EqualValues(t, map[string]GitAttribute{
+	assert.Equal(t, map[string]GitAttribute{
 		"gitlab-language":        "unspecified",
 		"linguist-detectable":    "unspecified",
 		"linguist-documentation": "unspecified",
@@ -146,7 +145,7 @@ func TestGitAttributes(t *testing.T) {
 
 	attr, err = gitRepo.GitAttributes("341fca5b5ea3de596dc483e54c2db28633cd2f97", "i-am-a-python.p", LinguistAttributes...)
 	require.NoError(t, err)
-	assert.EqualValues(t, map[string]GitAttribute{
+	assert.Equal(t, map[string]GitAttribute{
 		"gitlab-language":        "unspecified",
 		"linguist-detectable":    "unspecified",
 		"linguist-documentation": "unspecified",
@@ -177,13 +176,13 @@ func TestGitAttributeFirst(t *testing.T) {
 	t.Run("none is specified", func(t *testing.T) {
 		language, err := gitRepo.GitAttributeFirst("8fee858da5796dfb37704761701bb8e800ad9ef3", "i-am-a-python.p", "linguist-detectable", "gitlab-language", "non-existing")
 		require.NoError(t, err)
-		assert.Equal(t, "", language.String())
+		assert.Empty(t, language.String())
 	})
 }
 
 func TestGitAttributeStruct(t *testing.T) {
-	assert.Equal(t, "", GitAttribute("").String())
-	assert.Equal(t, "", GitAttribute("unspecified").String())
+	assert.Empty(t, GitAttribute("").String())
+	assert.Empty(t, GitAttribute("unspecified").String())
 
 	assert.Equal(t, "python", GitAttribute("python").String())
 
@@ -197,7 +196,7 @@ func TestGitAttributeCheckerError(t *testing.T) {
 		path := t.TempDir()
 
 		// we can't use unittest.CopyDir because of an import cycle (git.Init in unittest)
-		require.NoError(t, CopyFS(path, os.DirFS(filepath.Join(testReposDir, "language_stats_repo"))))
+		require.NoError(t, os.CopyFS(path, os.DirFS(filepath.Join(testReposDir, "language_stats_repo"))))
 
 		gitRepo, err := openRepositoryWithDefaultContext(path)
 		require.NoError(t, err)
@@ -251,10 +250,14 @@ func TestGitAttributeCheckerError(t *testing.T) {
 		cancel()
 
 		ac, err := gitRepo.GitAttributeChecker("8fee858da5796dfb37704761701bb8e800ad9ef3", "linguist-language")
-		require.NoError(t, err)
+		if SupportCheckAttrOnBare {
+			require.NoError(t, err)
 
-		_, err = ac.CheckPath("i-am-a-python.p")
-		require.Error(t, err)
+			_, err = ac.CheckPath("i-am-a-python.p")
+			require.Error(t, err)
+		} else {
+			require.Error(t, err)
+		}
 	})
 
 	t.Run("Cancelled/DuringRun", func(t *testing.T) {
@@ -320,32 +323,3 @@ func TestGitAttributeCheckerError(t *testing.T) {
 		require.ErrorIs(t, err, fs.ErrClosed)
 	})
 }
-
-// CopyFS is adapted from https://github.com/golang/go/issues/62484
-// which should be available with go1.23
-func CopyFS(dir string, fsys fs.FS) error {
-	return fs.WalkDir(fsys, ".", func(path string, d fs.DirEntry, _ error) error {
-		targ := filepath.Join(dir, filepath.FromSlash(path))
-		if d.IsDir() {
-			return os.MkdirAll(targ, 0o777)
-		}
-		r, err := fsys.Open(path)
-		if err != nil {
-			return err
-		}
-		defer r.Close()
-		info, err := r.Stat()
-		if err != nil {
-			return err
-		}
-		w, err := os.OpenFile(targ, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o666|info.Mode()&0o777)
-		if err != nil {
-			return err
-		}
-		if _, err := io.Copy(w, r); err != nil {
-			w.Close()
-			return fmt.Errorf("copying %s: %v", path, err)
-		}
-		return w.Close()
-	})
-}
diff --git a/modules/git/repo_base_test.go b/modules/git/repo_base_test.go
index c9ac6a8559..5b0cfd1b37 100644
--- a/modules/git/repo_base_test.go
+++ b/modules/git/repo_base_test.go
@@ -45,7 +45,7 @@ func TestCatFileBatch(t *testing.T) {
 			sha, typ, size, err := ReadBatchLine(r)
 			require.NoError(t, err)
 			assert.Equal(t, "commit", typ)
-			assert.EqualValues(t, []byte("95bb4d39648ee7e325106df01a621c530863a653"), sha)
+			assert.Equal(t, []byte("95bb4d39648ee7e325106df01a621c530863a653"), sha)
 			assert.EqualValues(t, 144, size)
 		})
 
@@ -60,7 +60,7 @@ func TestCatFileBatch(t *testing.T) {
 		sha, typ, size, err := ReadBatchLine(r)
 		require.NoError(t, err)
 		assert.Equal(t, "commit", typ)
-		assert.EqualValues(t, []byte("95bb4d39648ee7e325106df01a621c530863a653"), sha)
+		assert.Equal(t, []byte("95bb4d39648ee7e325106df01a621c530863a653"), sha)
 		assert.EqualValues(t, 144, size)
 	})
 
@@ -120,7 +120,7 @@ func TestCatFileBatchCheck(t *testing.T) {
 			sha, typ, size, err := ReadBatchLine(r)
 			require.NoError(t, err)
 			assert.Equal(t, "tag", typ)
-			assert.EqualValues(t, []byte("3ad28a9149a2864384548f3d17ed7f38014c9e8a"), sha)
+			assert.Equal(t, []byte("3ad28a9149a2864384548f3d17ed7f38014c9e8a"), sha)
 			assert.EqualValues(t, 807, size)
 		})
 
@@ -135,7 +135,7 @@ func TestCatFileBatchCheck(t *testing.T) {
 		sha, typ, size, err := ReadBatchLine(r)
 		require.NoError(t, err)
 		assert.Equal(t, "tag", typ)
-		assert.EqualValues(t, []byte("3ad28a9149a2864384548f3d17ed7f38014c9e8a"), sha)
+		assert.Equal(t, []byte("3ad28a9149a2864384548f3d17ed7f38014c9e8a"), sha)
 		assert.EqualValues(t, 807, size)
 	})
 
diff --git a/modules/git/repo_blame.go b/modules/git/repo_blame.go
index 139cdd7be9..d812354af5 100644
--- a/modules/git/repo_blame.go
+++ b/modules/git/repo_blame.go
@@ -4,20 +4,46 @@
 package git
 
 import (
+	"errors"
 	"fmt"
+	"regexp"
+)
+
+var (
+	ErrBlameFileDoesNotExist   = errors.New("the blamed file does not exist")
+	ErrBlameFileNotEnoughLines = errors.New("the blamed file has not enough lines")
+
+	notEnoughLinesRe = regexp.MustCompile(`^fatal: file .+ has only \d+ lines?\n$`)
 )
 
 // LineBlame returns the latest commit at the given line
-func (repo *Repository) LineBlame(revision, path, file string, line uint) (*Commit, error) {
-	res, _, err := NewCommand(repo.Ctx, "blame").
+func (repo *Repository) LineBlame(revision, file string, line uint64) (*Commit, error) {
+	res, _, gitErr := NewCommand(repo.Ctx, "blame").
 		AddOptionFormat("-L %d,%d", line, line).
 		AddOptionValues("-p", revision).
-		AddDashesAndList(file).RunStdString(&RunOpts{Dir: path})
+		AddDashesAndList(file).RunStdString(&RunOpts{Dir: repo.Path})
+	if gitErr != nil {
+		stdErr := gitErr.Stderr()
+
+		if stdErr == fmt.Sprintf("fatal: no such path %s in %s\n", file, revision) {
+			return nil, ErrBlameFileDoesNotExist
+		}
+		if notEnoughLinesRe.MatchString(stdErr) {
+			return nil, ErrBlameFileNotEnoughLines
+		}
+
+		return nil, gitErr
+	}
+
+	objectFormat, err := repo.GetObjectFormat()
 	if err != nil {
 		return nil, err
 	}
-	if len(res) < 40 {
-		return nil, fmt.Errorf("invalid result of blame: %s", res)
+
+	objectIDLen := objectFormat.FullLength()
+	if len(res) < objectIDLen {
+		return nil, fmt.Errorf("output of blame is invalid, cannot contain commit ID: %s", res)
 	}
-	return repo.GetCommit(res[:40])
+
+	return repo.GetCommit(res[:objectIDLen])
 }
diff --git a/modules/git/repo_blame_test.go b/modules/git/repo_blame_test.go
new file mode 100644
index 0000000000..126b95386d
--- /dev/null
+++ b/modules/git/repo_blame_test.go
@@ -0,0 +1,52 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package git
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestLineBlame(t *testing.T) {
+	t.Run("SHA1", func(t *testing.T) {
+		repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare"))
+		require.NoError(t, err)
+		defer repo.Close()
+
+		commit, err := repo.LineBlame("HEAD", "foo/link_short", 1)
+		require.NoError(t, err)
+		assert.Equal(t, "37991dec2c8e592043f47155ce4808d4580f9123", commit.ID.String())
+
+		commit, err = repo.LineBlame("HEAD", "foo/link_short", 512)
+		require.ErrorIs(t, err, ErrBlameFileNotEnoughLines)
+		assert.Nil(t, commit)
+
+		commit, err = repo.LineBlame("HEAD", "non-existent/path", 512)
+		require.ErrorIs(t, err, ErrBlameFileDoesNotExist)
+		assert.Nil(t, commit)
+	})
+
+	t.Run("SHA256", func(t *testing.T) {
+		skipIfSHA256NotSupported(t)
+
+		repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare_sha256"))
+		require.NoError(t, err)
+		defer repo.Close()
+
+		commit, err := repo.LineBlame("HEAD", "foo/link_short", 1)
+		require.NoError(t, err)
+		assert.Equal(t, "6aae864a3d1d0d6a5be0cc64028c1e7021e2632b031fd8eb82afc5a283d1c3d1", commit.ID.String())
+
+		commit, err = repo.LineBlame("HEAD", "foo/link_short", 512)
+		require.ErrorIs(t, err, ErrBlameFileNotEnoughLines)
+		assert.Nil(t, commit)
+
+		commit, err = repo.LineBlame("HEAD", "non-existent/path", 512)
+		require.ErrorIs(t, err, ErrBlameFileDoesNotExist)
+		assert.Nil(t, commit)
+	})
+}
diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go
index 1992060351..1e38bf2946 100644
--- a/modules/git/repo_branch.go
+++ b/modules/git/repo_branch.go
@@ -19,15 +19,9 @@ import (
 // BranchPrefix base dir of the branch information file store on git
 const BranchPrefix = "refs/heads/"
 
-// IsReferenceExist returns true if given reference exists in the repository.
-func IsReferenceExist(ctx context.Context, repoPath, name string) bool {
-	_, _, err := NewCommand(ctx, "show-ref", "--verify").AddDashesAndList(name).RunStdString(&RunOpts{Dir: repoPath})
-	return err == nil
-}
-
 // IsBranchExist returns true if given branch exists in the repository.
 func IsBranchExist(ctx context.Context, repoPath, name string) bool {
-	return IsReferenceExist(ctx, repoPath, BranchPrefix+name)
+	return NewCommand(ctx, "show-ref", "--verify", "--quiet").AddDashesAndList(BranchPrefix+name).Run(&RunOpts{Dir: repoPath}) == nil
 }
 
 // Branch represents a Git branch.
@@ -41,7 +35,7 @@ type Branch struct {
 // GetHEADBranch returns corresponding branch of HEAD.
 func (repo *Repository) GetHEADBranch() (*Branch, error) {
 	if repo == nil {
-		return nil, fmt.Errorf("nil repo")
+		return nil, errors.New("nil repo")
 	}
 	stdout, _, err := NewCommand(repo.Ctx, "symbolic-ref", "HEAD").RunStdString(&RunOpts{Dir: repo.Path})
 	if err != nil {
diff --git a/modules/git/repo_branch_test.go b/modules/git/repo_branch_test.go
index 610c8457d9..e61ea6f5d7 100644
--- a/modules/git/repo_branch_test.go
+++ b/modules/git/repo_branch_test.go
@@ -1,4 +1,5 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package git
@@ -21,21 +22,21 @@ func TestRepository_GetBranches(t *testing.T) {
 
 	require.NoError(t, err)
 	assert.Len(t, branches, 2)
-	assert.EqualValues(t, 3, countAll)
+	assert.Equal(t, 3, countAll)
 	assert.ElementsMatch(t, []string{"master", "branch2"}, branches)
 
 	branches, countAll, err = bareRepo1.GetBranchNames(0, 0)
 
 	require.NoError(t, err)
 	assert.Len(t, branches, 3)
-	assert.EqualValues(t, 3, countAll)
+	assert.Equal(t, 3, countAll)
 	assert.ElementsMatch(t, []string{"master", "branch2", "branch1"}, branches)
 
 	branches, countAll, err = bareRepo1.GetBranchNames(5, 1)
 
 	require.NoError(t, err)
 	assert.Empty(t, branches)
-	assert.EqualValues(t, 3, countAll)
+	assert.Equal(t, 3, countAll)
 	assert.ElementsMatch(t, []string{}, branches)
 }
 
@@ -71,15 +72,15 @@ func TestGetRefsBySha(t *testing.T) {
 	// refs/pull/1/head
 	branches, err = bareRepo5.GetRefsBySha("c83380d7056593c51a699d12b9c00627bd5743e9", PullPrefix)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"refs/pull/1/head"}, branches)
+	assert.Equal(t, []string{"refs/pull/1/head"}, branches)
 
 	branches, err = bareRepo5.GetRefsBySha("d8e0bbb45f200e67d9a784ce55bd90821af45ebd", BranchPrefix)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"refs/heads/master", "refs/heads/master-clone"}, branches)
+	assert.Equal(t, []string{"refs/heads/master", "refs/heads/master-clone"}, branches)
 
 	branches, err = bareRepo5.GetRefsBySha("58a4bcc53ac13e7ff76127e0fb518b5262bf09af", BranchPrefix)
 	require.NoError(t, err)
-	assert.EqualValues(t, []string{"refs/heads/test-patch-1"}, branches)
+	assert.Equal(t, []string{"refs/heads/test-patch-1"}, branches)
 }
 
 func BenchmarkGetRefsBySha(b *testing.B) {
@@ -195,3 +196,17 @@ func TestRepository_IsReferenceExist(t *testing.T) {
 		})
 	}
 }
+
+func TestIsBranchExist(t *testing.T) {
+	repo1Path := filepath.Join(testReposDir, "repo1_bare")
+
+	assert.True(t, IsBranchExist(t.Context(), repo1Path, "branch1"))
+	assert.True(t, IsBranchExist(t.Context(), repo1Path, "branch2"))
+	assert.True(t, IsBranchExist(t.Context(), repo1Path, "master"))
+
+	assert.False(t, IsBranchExist(t.Context(), repo1Path, "HEAD"))
+	assert.False(t, IsBranchExist(t.Context(), repo1Path, "153f451b9ee7fa1da317ab17a127e9fd9d384310"))
+	assert.False(t, IsBranchExist(t.Context(), repo1Path, "153f451b9ee7fa1da317ab17a127e9fd9d384310"))
+	assert.False(t, IsBranchExist(t.Context(), repo1Path, "signed-tag"))
+	assert.False(t, IsBranchExist(t.Context(), repo1Path, "test"))
+}
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 65ab6fd3fd..41ca0e39b1 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -443,39 +443,18 @@ func (repo *Repository) getCommitsBeforeLimit(id ObjectID, num int) ([]*Commit,
 }
 
 func (repo *Repository) getBranches(commit *Commit, limit int) ([]string, error) {
-	if CheckGitVersionAtLeast("2.7.0") == nil {
-		stdout, _, err := NewCommand(repo.Ctx, "for-each-ref", "--format=%(refname:strip=2)").
-			AddOptionFormat("--count=%d", limit).
-			AddOptionValues("--contains", commit.ID.String(), BranchPrefix).
-			RunStdString(&RunOpts{Dir: repo.Path})
-		if err != nil {
-			return nil, err
-		}
+	command := NewCommand(repo.Ctx, "for-each-ref", "--format=%(refname:strip=2)").AddOptionValues("--contains", commit.ID.String(), BranchPrefix)
 
-		branches := strings.Fields(stdout)
-		return branches, nil
+	if limit != -1 {
+		command = command.AddOptionFormat("--count=%d", limit)
 	}
 
-	stdout, _, err := NewCommand(repo.Ctx, "branch").AddOptionValues("--contains", commit.ID.String()).RunStdString(&RunOpts{Dir: repo.Path})
+	stdout, _, err := command.RunStdString(&RunOpts{Dir: repo.Path})
 	if err != nil {
 		return nil, err
 	}
 
-	refs := strings.Split(stdout, "\n")
-
-	var max int
-	if len(refs) > limit {
-		max = limit
-	} else {
-		max = len(refs) - 1
-	}
-
-	branches := make([]string, max)
-	for i, ref := range refs[:max] {
-		parts := strings.Fields(ref)
-
-		branches[i] = parts[len(parts)-1]
-	}
+	branches := strings.Fields(stdout)
 	return branches, nil
 }
 
diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go
index 9cbc40eee7..53760b208e 100644
--- a/modules/git/repo_commit_test.go
+++ b/modules/git/repo_commit_test.go
@@ -127,19 +127,19 @@ func TestGetTagCommit(t *testing.T) {
 
 	aTagID, err := bareRepo1.GetTagCommitID(aTagName)
 	require.NoError(t, err)
-	assert.NotEqualValues(t, aTagCommitID, aTagID)
+	assert.NotEqual(t, aTagCommitID, aTagID)
 
 	lTagID, err := bareRepo1.GetTagCommitID(lTagName)
 	require.NoError(t, err)
-	assert.EqualValues(t, lTagCommitID, lTagID)
+	assert.Equal(t, lTagCommitID, lTagID)
 
 	aTag, err := bareRepo1.GetTagCommit(aTagName)
 	require.NoError(t, err)
-	assert.EqualValues(t, aTagCommitID, aTag.ID.String())
+	assert.Equal(t, aTagCommitID, aTag.ID.String())
 
 	lTag, err := bareRepo1.GetTagCommit(lTagName)
 	require.NoError(t, err)
-	assert.EqualValues(t, lTagCommitID, lTag.ID.String())
+	assert.Equal(t, lTagCommitID, lTag.ID.String())
 }
 
 func TestCommitsByRange(t *testing.T) {
diff --git a/modules/git/repo_commitgraph.go b/modules/git/repo_commitgraph.go
index 492438be37..c3647bd894 100644
--- a/modules/git/repo_commitgraph.go
+++ b/modules/git/repo_commitgraph.go
@@ -11,10 +11,8 @@ import (
 // WriteCommitGraph write commit graph to speed up repo access
 // this requires git v2.18 to be installed
 func WriteCommitGraph(ctx context.Context, repoPath string) error {
-	if CheckGitVersionAtLeast("2.18") == nil {
-		if _, _, err := NewCommand(ctx, "commit-graph", "write").RunStdString(&RunOpts{Dir: repoPath}); err != nil {
-			return fmt.Errorf("unable to write commit-graph for '%s' : %w", repoPath, err)
-		}
+	if _, _, err := NewCommand(ctx, "commit-graph", "write").RunStdString(&RunOpts{Dir: repoPath}); err != nil {
+		return fmt.Errorf("unable to write commit-graph for '%s' : %w", repoPath, err)
 	}
 	return nil
 }
diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go
index 373b5befb5..94f1911c4a 100644
--- a/modules/git/repo_compare.go
+++ b/modules/git/repo_compare.go
@@ -183,6 +183,17 @@ func (repo *Repository) GetDiffShortStat(base, head string) (numFiles, totalAddi
 	return numFiles, totalAdditions, totalDeletions, err
 }
 
+// GetCommitStat returns the number of files, total additions and total deletions the commit has.
+func (repo *Repository) GetCommitShortStat(commitID string) (numFiles, totalAdditions, totalDeletions int, err error) {
+	cmd := NewCommand(repo.Ctx, "diff-tree", "--shortstat", "--no-commit-id", "--root").AddDynamicArguments(commitID)
+	stdout, _, err := cmd.RunStdString(&RunOpts{Dir: repo.Path})
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return parseDiffStat(stdout)
+}
+
 // GetDiffShortStat counts number of changed files, number of additions and deletions
 func GetDiffShortStat(ctx context.Context, repoPath string, trustedArgs TrustedCmdArgs, dynamicArgs ...string) (numFiles, totalAdditions, totalDeletions int, err error) {
 	// Now if we call:
diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go
index 86bd6855a7..b1ebdf6177 100644
--- a/modules/git/repo_compare_test.go
+++ b/modules/git/repo_compare_test.go
@@ -1,4 +1,5 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package git
@@ -162,3 +163,83 @@ func TestGetCommitFilesChanged(t *testing.T) {
 		assert.ElementsMatch(t, tc.files, changedFiles)
 	}
 }
+
+func TestGetCommitShortStat(t *testing.T) {
+	t.Run("repo1_bare", func(t *testing.T) {
+		repo, err := openRepositoryWithDefaultContext(filepath.Join(testReposDir, "repo1_bare"))
+		if err != nil {
+			require.NoError(t, err)
+			return
+		}
+		defer repo.Close()
+
+		numFiles, totalAddition, totalDeletions, err := repo.GetCommitShortStat("ce064814f4a0d337b333e646ece456cd39fab612")
+		require.NoError(t, err)
+		assert.Equal(t, 0, numFiles)
+		assert.Equal(t, 0, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("feaf4ba6bc635fec442f46ddd4512416ec43c2c2")
+		require.NoError(t, err)
+		assert.Equal(t, 0, numFiles)
+		assert.Equal(t, 0, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("37991dec2c8e592043f47155ce4808d4580f9123")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 1, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("6fbd69e9823458e6c4a2fc5c0f6bc022b2f2acd1")
+		require.NoError(t, err)
+		assert.Equal(t, 2, numFiles)
+		assert.Equal(t, 2, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("8006ff9adbf0cb94da7dad9e537e53817f9fa5c0")
+		require.NoError(t, err)
+		assert.Equal(t, 2, numFiles)
+		assert.Equal(t, 2, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("8d92fc957a4d7cfd98bc375f0b7bb189a0d6c9f2")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 1, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("95bb4d39648ee7e325106df01a621c530863a653")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 1, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+	})
+
+	t.Run("repo6_blame_sha256", func(t *testing.T) {
+		repo, err := openRepositoryWithDefaultContext(filepath.Join(testReposDir, "repo6_blame_sha256"))
+		if err != nil {
+			require.NoError(t, err)
+			return
+		}
+		defer repo.Close()
+
+		numFiles, totalAddition, totalDeletions, err := repo.GetCommitShortStat("e2f5660e15159082902960af0ed74fc144921d2b0c80e069361853b3ece29ba3")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 1, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("9347b0198cd1f25017579b79d0938fa89dba34ad2514f0dd92f6bc975ed1a2fe")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 1, totalAddition)
+		assert.Equal(t, 1, totalDeletions)
+
+		numFiles, totalAddition, totalDeletions, err = repo.GetCommitShortStat("ab2b57a4fa476fb2edb74dafa577caf918561abbaa8fba0c8dc63c412e17a7cc")
+		require.NoError(t, err)
+		assert.Equal(t, 1, numFiles)
+		assert.Equal(t, 6, totalAddition)
+		assert.Equal(t, 0, totalDeletions)
+	})
+}
diff --git a/modules/git/repo_language_stats.go b/modules/git/repo_language_stats.go
index 7b76c7bcc7..ee4beb2f87 100644
--- a/modules/git/repo_language_stats.go
+++ b/modules/git/repo_language_stats.go
@@ -240,7 +240,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
 			sizes[language] += f.Size()
 		} else if len(sizes) == 0 && (firstExcludedLanguage == "" || firstExcludedLanguage == language) {
 			// Only consider Programming or Markup languages as fallback
-			if !(langType == enry.Programming || langType == enry.Markup) {
+			if langType != enry.Programming && langType != enry.Markup {
 				continue
 			}
 			firstExcludedLanguage = language
diff --git a/modules/git/repo_language_stats_test.go b/modules/git/repo_language_stats_test.go
index ccd7301f81..e3d8ba1f69 100644
--- a/modules/git/repo_language_stats_test.go
+++ b/modules/git/repo_language_stats_test.go
@@ -21,7 +21,7 @@ func TestRepository_GetLanguageStats(t *testing.T) {
 	stats, err := gitRepo.GetLanguageStats("8fee858da5796dfb37704761701bb8e800ad9ef3")
 	require.NoError(t, err)
 
-	assert.EqualValues(t, map[string]int64{
+	assert.Equal(t, map[string]int64{
 		"Python": 134,
 		"Java":   112,
 	}, stats)
@@ -37,7 +37,7 @@ func TestRepository_GetLanguageStats(t *testing.T) {
 }
 
 func TestMergeLanguageStats(t *testing.T) {
-	assert.EqualValues(t, map[string]int64{
+	assert.Equal(t, map[string]int64{
 		"PHP":    1,
 		"python": 10,
 		"JAVA":   700,
diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go
index 3c8b863f75..1c7ff7b709 100644
--- a/modules/git/repo_ref.go
+++ b/modules/git/repo_ref.go
@@ -22,11 +22,12 @@ func (repo *Repository) GetRefs() ([]*Reference, error) {
 // refType should only be a literal "branch" or "tag" and nothing else
 func (repo *Repository) ListOccurrences(ctx context.Context, refType, commitSHA string) ([]string, error) {
 	cmd := NewCommand(ctx)
-	if refType == "branch" {
+	switch refType {
+	case "branch":
 		cmd.AddArguments("branch")
-	} else if refType == "tag" {
+	case "tag":
 		cmd.AddArguments("tag")
-	} else {
+	default:
 		return nil, util.NewInvalidArgumentErrorf(`can only use "branch" or "tag" for refType, but got %q`, refType)
 	}
 	stdout, _, err := cmd.AddArguments("--no-color", "--sort=-creatordate", "--contains").AddDynamicArguments(commitSHA).RunStdString(&RunOpts{Dir: repo.Path})
diff --git a/modules/git/repo_stats_test.go b/modules/git/repo_stats_test.go
index 2a15b6f1b7..9284ab5d5d 100644
--- a/modules/git/repo_stats_test.go
+++ b/modules/git/repo_stats_test.go
@@ -31,7 +31,7 @@ func TestRepository_GetCodeActivityStats(t *testing.T) {
 	assert.EqualValues(t, 10, code.Additions)
 	assert.EqualValues(t, 1, code.Deletions)
 	assert.Len(t, code.Authors, 3)
-	assert.EqualValues(t, "tris.git@shoddynet.org", code.Authors[1].Email)
+	assert.Equal(t, "tris.git@shoddynet.org", code.Authors[1].Email)
 	assert.EqualValues(t, 3, code.Authors[1].Commits)
 	assert.EqualValues(t, 5, code.Authors[0].Commits)
 }
diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go
index a4b13bf03d..d88851551f 100644
--- a/modules/git/repo_tag_test.go
+++ b/modules/git/repo_tag_test.go
@@ -28,30 +28,24 @@ func TestRepository_GetTags(t *testing.T) {
 	}
 	assert.Len(t, tags, 2)
 	assert.Len(t, tags, total)
-	assert.EqualValues(t, "signed-tag", tags[0].Name)
-	assert.EqualValues(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String())
-	assert.EqualValues(t, "tag", tags[0].Type)
-	assert.EqualValues(t, time.Date(2022, time.November, 13, 16, 40, 20, 0, time.FixedZone("", 3600)), tags[0].Tagger.When)
-	assert.EqualValues(t, "test", tags[1].Name)
-	assert.EqualValues(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[1].ID.String())
-	assert.EqualValues(t, "tag", tags[1].Type)
-	assert.EqualValues(t, time.Date(2018, time.June, 16, 20, 13, 18, 0, time.FixedZone("", -25200)), tags[1].Tagger.When)
+	assert.Equal(t, "signed-tag", tags[0].Name)
+	assert.Equal(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String())
+	assert.Equal(t, "tag", tags[0].Type)
+	assert.Equal(t, time.Date(2022, time.November, 13, 16, 40, 20, 0, time.FixedZone("", 3600)), tags[0].Tagger.When)
+	assert.Equal(t, "test", tags[1].Name)
+	assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[1].ID.String())
+	assert.Equal(t, "tag", tags[1].Type)
+	assert.Equal(t, time.Date(2018, time.June, 16, 20, 13, 18, 0, time.FixedZone("", -25200)), tags[1].Tagger.When)
 }
 
 func TestRepository_GetTag(t *testing.T) {
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
 
 	clonedPath, err := cloneRepo(t, bareRepo1Path)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
+	require.NoError(t, err)
 
 	bareRepo1, err := openRepositoryWithDefaultContext(clonedPath)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
+	require.NoError(t, err)
 	defer bareRepo1.Close()
 
 	// LIGHTWEIGHT TAGS
@@ -60,25 +54,16 @@ func TestRepository_GetTag(t *testing.T) {
 
 	// Create the lightweight tag
 	err = bareRepo1.CreateTag(lTagName, lTagCommitID)
-	if err != nil {
-		require.NoError(t, err, "Unable to create the lightweight tag: %s for ID: %s. Error: %v", lTagName, lTagCommitID, err)
-		return
-	}
+	require.NoError(t, err, "Unable to create the lightweight tag: %s for ID: %s. Error: %v", lTagName, lTagCommitID, err)
 
 	// and try to get the Tag for lightweight tag
 	lTag, err := bareRepo1.GetTag(lTagName)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
-	if lTag == nil {
-		assert.NotNil(t, lTag)
-		assert.FailNow(t, "nil lTag: %s", lTagName)
-	}
-	assert.EqualValues(t, lTagName, lTag.Name)
-	assert.EqualValues(t, lTagCommitID, lTag.ID.String())
-	assert.EqualValues(t, lTagCommitID, lTag.Object.String())
-	assert.EqualValues(t, "commit", lTag.Type)
+	require.NoError(t, err)
+	require.NotNil(t, lTag)
+	assert.Equal(t, lTagName, lTag.Name)
+	assert.Equal(t, lTagCommitID, lTag.ID.String())
+	assert.Equal(t, lTagCommitID, lTag.Object.String())
+	assert.Equal(t, "commit", lTag.Type)
 
 	// ANNOTATED TAGS
 	aTagCommitID := "8006ff9adbf0cb94da7dad9e537e53817f9fa5c0"
@@ -87,32 +72,20 @@ func TestRepository_GetTag(t *testing.T) {
 
 	// Create the annotated tag
 	err = bareRepo1.CreateAnnotatedTag(aTagName, aTagMessage, aTagCommitID)
-	if err != nil {
-		require.NoError(t, err, "Unable to create the annotated tag: %s for ID: %s. Error: %v", aTagName, aTagCommitID, err)
-		return
-	}
+	require.NoError(t, err, "Unable to create the annotated tag: %s for ID: %s. Error: %v", aTagName, aTagCommitID, err)
 
 	// Now try to get the tag for the annotated Tag
 	aTagID, err := bareRepo1.GetTagID(aTagName)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
+	require.NoError(t, err)
 
 	aTag, err := bareRepo1.GetTag(aTagName)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
-	if aTag == nil {
-		assert.NotNil(t, aTag)
-		assert.FailNow(t, "nil aTag: %s", aTagName)
-	}
-	assert.EqualValues(t, aTagName, aTag.Name)
-	assert.EqualValues(t, aTagID, aTag.ID.String())
+	require.NoError(t, err)
+	require.NotNil(t, aTag)
+	assert.Equal(t, aTagName, aTag.Name)
+	assert.Equal(t, aTagID, aTag.ID.String())
 	assert.NotEqual(t, aTagID, aTag.Object.String())
-	assert.EqualValues(t, aTagCommitID, aTag.Object.String())
-	assert.EqualValues(t, "tag", aTag.Type)
+	assert.Equal(t, aTagCommitID, aTag.Object.String())
+	assert.Equal(t, "tag", aTag.Type)
 
 	// RELEASE TAGS
 
@@ -120,24 +93,15 @@ func TestRepository_GetTag(t *testing.T) {
 	rTagName := "release/" + lTagName
 
 	err = bareRepo1.CreateTag(rTagName, rTagCommitID)
-	if err != nil {
-		require.NoError(t, err, "Unable to create the  tag: %s for ID: %s. Error: %v", rTagName, rTagCommitID, err)
-		return
-	}
+	require.NoError(t, err, "Unable to create the  tag: %s for ID: %s. Error: %v", rTagName, rTagCommitID, err)
 
 	rTagID, err := bareRepo1.GetTagID(rTagName)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
-	assert.EqualValues(t, rTagCommitID, rTagID)
+	require.NoError(t, err)
+	assert.Equal(t, rTagCommitID, rTagID)
 
 	oTagID, err := bareRepo1.GetTagID(lTagName)
-	if err != nil {
-		require.NoError(t, err)
-		return
-	}
-	assert.EqualValues(t, lTagCommitID, oTagID)
+	require.NoError(t, err)
+	assert.Equal(t, lTagCommitID, oTagID)
 }
 
 func TestRepository_GetAnnotatedTag(t *testing.T) {
@@ -173,9 +137,9 @@ func TestRepository_GetAnnotatedTag(t *testing.T) {
 		return
 	}
 	assert.NotNil(t, tag)
-	assert.EqualValues(t, aTagName, tag.Name)
-	assert.EqualValues(t, aTagID, tag.ID.String())
-	assert.EqualValues(t, "tag", tag.Type)
+	assert.Equal(t, aTagName, tag.Name)
+	assert.Equal(t, aTagID, tag.ID.String())
+	assert.Equal(t, "tag", tag.Type)
 
 	// Annotated tag's Commit ID should fail
 	tag2, err := bareRepo1.GetAnnotatedTag(aTagCommitID)
diff --git a/modules/git/repo_test.go b/modules/git/repo_test.go
index c4ef9dbe96..c3971b2a5f 100644
--- a/modules/git/repo_test.go
+++ b/modules/git/repo_test.go
@@ -33,21 +33,21 @@ func TestRepoIsEmpty(t *testing.T) {
 
 func TestRepoGetDivergingCommits(t *testing.T) {
 	bareRepo1Path := filepath.Join(testReposDir, "repo1_bare")
-	do, err := GetDivergingCommits(t.Context(), bareRepo1Path, "master", "branch2")
+	do, err := GetDivergingCommits(t.Context(), bareRepo1Path, "master", "branch2", nil)
 	require.NoError(t, err)
 	assert.Equal(t, DivergeObject{
 		Ahead:  1,
 		Behind: 5,
 	}, do)
 
-	do, err = GetDivergingCommits(t.Context(), bareRepo1Path, "master", "master")
+	do, err = GetDivergingCommits(t.Context(), bareRepo1Path, "master", "master", nil)
 	require.NoError(t, err)
 	assert.Equal(t, DivergeObject{
 		Ahead:  0,
 		Behind: 0,
 	}, do)
 
-	do, err = GetDivergingCommits(t.Context(), bareRepo1Path, "master", "test")
+	do, err = GetDivergingCommits(t.Context(), bareRepo1Path, "master", "test", nil)
 	require.NoError(t, err)
 	assert.Equal(t, DivergeObject{
 		Ahead:  0,
diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go
index 53d94d9d7d..e552496607 100644
--- a/modules/git/repo_tree.go
+++ b/modules/git/repo_tree.go
@@ -97,7 +97,7 @@ func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
 		if err != nil {
 			return nil, err
 		}
-		commit.Tree.ResolvedID = resolvedID
+		commit.ResolvedID = resolvedID
 		return &commit.Tree, nil
 	case "commit":
 		commit, err := CommitFromReader(repo, id, io.LimitReader(rd, size))
@@ -107,7 +107,7 @@ func (repo *Repository) getTree(id ObjectID) (*Tree, error) {
 		if _, err := rd.Discard(1); err != nil {
 			return nil, err
 		}
-		commit.Tree.ResolvedID = commit.ID
+		commit.ResolvedID = commit.ID
 		return &commit.Tree, nil
 	case "tree":
 		tree := NewTree(repo, id)
diff --git a/modules/git/signature_test.go b/modules/git/signature_test.go
index 92681feea9..b9b5aff61b 100644
--- a/modules/git/signature_test.go
+++ b/modules/git/signature_test.go
@@ -42,6 +42,6 @@ func TestParseSignatureFromCommitLine(t *testing.T) {
 	}
 	for _, test := range tests {
 		got := parseSignatureFromCommitLine(test.line)
-		assert.EqualValues(t, test.want, got)
+		assert.Equal(t, test.want, got)
 	}
 }
diff --git a/modules/git/submodule.go b/modules/git/submodule.go
index b99c81582b..4ea97d66eb 100644
--- a/modules/git/submodule.go
+++ b/modules/git/submodule.go
@@ -6,38 +6,124 @@ package git
 
 import (
 	"fmt"
+	"io"
 	"net"
 	"net/url"
 	"path"
 	"regexp"
 	"strings"
+
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/util"
+
+	"gopkg.in/ini.v1" //nolint:depguard // used to read .gitmodules
 )
 
-var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+@)?([a-zA-Z0-9._-]+):(.*)$`)
-
-// SubModule submodule is a reference on git repository
-type SubModule struct {
-	Name string
-	URL  string
-}
-
-// SubModuleFile represents a file with submodule type.
-type SubModuleFile struct {
-	*Commit
-
-	refURL string
-	refID  string
-}
-
-// NewSubModuleFile create a new submodule file
-func NewSubModuleFile(c *Commit, refURL, refID string) *SubModuleFile {
-	return &SubModuleFile{
-		Commit: c,
-		refURL: refURL,
-		refID:  refID,
+// GetSubmodule returns the Submodule of a given path
+func (c *Commit) GetSubmodule(path string, entry *TreeEntry) (Submodule, error) {
+	err := c.readSubmodules()
+	if err != nil {
+		// the .gitmodules file exists but could not be read or parsed
+		return Submodule{}, err
 	}
+
+	sm, ok := c.submodules[path]
+	if !ok {
+		// no info found in .gitmodules: fallback to what we can provide
+		return Submodule{
+			Path:   path,
+			Commit: entry.ID,
+		}, nil
+	}
+
+	sm.Commit = entry.ID
+	return sm, nil
 }
 
+// readSubmodules populates the submodules field by reading the .gitmodules file
+func (c *Commit) readSubmodules() error {
+	if c.submodules != nil {
+		return nil
+	}
+
+	entry, err := c.GetTreeEntryByPath(".gitmodules")
+	if err != nil {
+		if IsErrNotExist(err) {
+			c.submodules = make(map[string]Submodule)
+			return nil
+		}
+		return err
+	}
+
+	rc, _, err := entry.Blob().NewTruncatedReader(10 * 1024)
+	if err != nil {
+		return err
+	}
+	defer rc.Close()
+
+	c.submodules, err = parseSubmoduleContent(rc)
+	return err
+}
+
+func parseSubmoduleContent(r io.Reader) (map[string]Submodule, error) {
+	// https://git-scm.com/docs/gitmodules#_description
+	// The .gitmodules file, located in the top-level directory of a Git working tree
+	// is a text file with a syntax matching the requirements of git-config[1].
+	// https://git-scm.com/docs/git-config#_configuration_file
+
+	cfg := ini.Empty(ini.LoadOptions{
+		InsensitiveKeys: true, // "The variable names are case-insensitive", but "Subsection names are case sensitive"
+	})
+	err := cfg.Append(r)
+	if err != nil {
+		return nil, err
+	}
+
+	sections := cfg.Sections()
+	submodule := make(map[string]Submodule, len(sections))
+
+	for _, s := range sections {
+		sm := parseSubmoduleSection(s)
+		if sm.Path == "" || sm.URL == "" {
+			continue
+		}
+		submodule[sm.Path] = sm
+	}
+	return submodule, nil
+}
+
+func parseSubmoduleSection(s *ini.Section) Submodule {
+	section, name, _ := strings.Cut(s.Name(), " ")
+	if !util.ASCIIEqualFold("submodule", section) { // See https://codeberg.org/forgejo/forgejo/pulls/8438#issuecomment-5805251
+		return Submodule{}
+	}
+	_ = name
+
+	sm := Submodule{}
+	if key, _ := s.GetKey("path"); key != nil {
+		sm.Path = key.Value()
+	}
+	if key, _ := s.GetKey("url"); key != nil {
+		sm.URL = key.Value()
+	}
+	return sm
+}
+
+// Submodule represents a parsed git submodule reference.
+type Submodule struct {
+	Path   string   // path property
+	URL    string   // upstream URL
+	Commit ObjectID // upstream Commit-ID
+}
+
+// ResolveUpstreamURL resolves the upstream URL relative to the repo URL.
+func (sm Submodule) ResolveUpstreamURL(repoURL string) string {
+	repoFullName := strings.TrimPrefix(repoURL, setting.AppURL) // currently hacky, but can be dropped when refactoring getRefURL
+	return getRefURL(sm.URL, setting.AppURL, repoFullName, setting.SSH.Domain)
+}
+
+var scpSyntax = regexp.MustCompile(`^([a-zA-Z0-9_]+@)?([a-zA-Z0-9._-]+):(.*)$`)
+
 func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
 	if refURL == "" {
 		return ""
@@ -53,7 +139,7 @@ func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
 
 	urlPrefix = strings.TrimSuffix(urlPrefix, "/")
 
-	// FIXME: Need to consider branch - which will require changes in modules/git/commit.go:GetSubModules
+	// FIXME: Need to consider branch - which will require changes in parseSubmoduleSection
 	// Relative url prefix check (according to git submodule documentation)
 	if strings.HasPrefix(refURI, "./") || strings.HasPrefix(refURI, "../") {
 		return urlPrefix + path.Clean(path.Join("/", repoFullName, refURI))
@@ -107,13 +193,3 @@ func getRefURL(refURL, urlPrefix, repoFullName, sshDomain string) string {
 
 	return ""
 }
-
-// RefURL guesses and returns reference URL.
-func (sf *SubModuleFile) RefURL(urlPrefix, repoFullName, sshDomain string) string {
-	return getRefURL(sf.refURL, urlPrefix, repoFullName, sshDomain)
-}
-
-// RefID returns reference ID.
-func (sf *SubModuleFile) RefID() string {
-	return sf.refID
-}
diff --git a/modules/git/submodule_test.go b/modules/git/submodule_test.go
index e05f2510c4..2d27f47456 100644
--- a/modules/git/submodule_test.go
+++ b/modules/git/submodule_test.go
@@ -4,9 +4,11 @@
 package git
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetRefURL(t *testing.T) {
@@ -37,6 +39,77 @@ func TestGetRefURL(t *testing.T) {
 	}
 
 	for _, kase := range kases {
-		assert.EqualValues(t, kase.expect, getRefURL(kase.refURL, kase.prefixURL, kase.parentPath, kase.SSHDomain))
+		assert.Equal(t, kase.expect, getRefURL(kase.refURL, kase.prefixURL, kase.parentPath, kase.SSHDomain))
+	}
+}
+
+func Test_parseSubmoduleContent(t *testing.T) {
+	submoduleFiles := []struct {
+		fileContent  string
+		expectedPath string
+		expected     Submodule
+	}{
+		{
+			fileContent: `[submodule "jakarta-servlet"]
+url = ../../ALP-pool/jakarta-servlet
+path = jakarta-servlet`,
+			expectedPath: "jakarta-servlet",
+			expected: Submodule{
+				Path: "jakarta-servlet",
+				URL:  "../../ALP-pool/jakarta-servlet",
+			},
+		},
+		{
+			fileContent: `[submodule "jakarta-servlet"]
+path = jakarta-servlet
+url = ../../ALP-pool/jakarta-servlet`,
+			expectedPath: "jakarta-servlet",
+			expected: Submodule{
+				Path: "jakarta-servlet",
+				URL:  "../../ALP-pool/jakarta-servlet",
+			},
+		},
+		{
+			fileContent: `[submodule "about/documents"]
+  path = about/documents
+  url = git@github.com:example/documents.git
+  branch = gh-pages
+[submodule "custom-name"]
+  path = manifesto
+  url = https://github.com/example/manifesto.git
+[submodule]
+  path = relative/url
+  url = ../such-relative.git
+`,
+			expectedPath: "relative/url",
+			expected: Submodule{
+				Path: "relative/url",
+				URL:  "../such-relative.git",
+			},
+		},
+		{
+			fileContent: `# .gitmodules
+# Subsection names are case sensitive
+[submodule "Seanpm2001/Degoogle-your-life"]
+	path = Its-time-to-cut-WideVine-DRM/DeGoogle-Your-Life/submodule.gitmodules
+	url = https://github.com/seanpm2001/Degoogle-your-life/
+
+[submodule "seanpm2001/degoogle-your-life"]
+	url = https://github.com/seanpm2001/degoogle-your-life/
+# This second section should not be merged with the first, because of casing
+`,
+			expectedPath: "Its-time-to-cut-WideVine-DRM/DeGoogle-Your-Life/submodule.gitmodules",
+			expected: Submodule{
+				Path: "Its-time-to-cut-WideVine-DRM/DeGoogle-Your-Life/submodule.gitmodules",
+				URL:  "https://github.com/seanpm2001/Degoogle-your-life/",
+			},
+		},
+	}
+	for _, kase := range submoduleFiles {
+		submodule, err := parseSubmoduleContent(strings.NewReader(kase.fileContent))
+		require.NoError(t, err)
+		v, ok := submodule[kase.expectedPath]
+		assert.True(t, ok)
+		assert.Equal(t, kase.expected, v)
 	}
 }
diff --git a/modules/git/tag_test.go b/modules/git/tag_test.go
index 8279066b2f..72409f959b 100644
--- a/modules/git/tag_test.go
+++ b/modules/git/tag_test.go
@@ -87,21 +87,21 @@ v0
 	for _, test := range testData {
 		tag, err := parseTagData(Sha1ObjectFormat, test.data)
 		require.NoError(t, err)
-		assert.EqualValues(t, test.tag.ID, tag.ID)
-		assert.EqualValues(t, test.tag.Object, tag.Object)
-		assert.EqualValues(t, test.tag.Name, tag.Name)
-		assert.EqualValues(t, test.tag.Message, tag.Message)
-		assert.EqualValues(t, test.tag.Type, tag.Type)
+		assert.Equal(t, test.tag.ID, tag.ID)
+		assert.Equal(t, test.tag.Object, tag.Object)
+		assert.Equal(t, test.tag.Name, tag.Name)
+		assert.Equal(t, test.tag.Message, tag.Message)
+		assert.Equal(t, test.tag.Type, tag.Type)
 		if test.tag.Signature != nil && assert.NotNil(t, tag.Signature) {
-			assert.EqualValues(t, test.tag.Signature.Signature, tag.Signature.Signature)
-			assert.EqualValues(t, test.tag.Signature.Payload, tag.Signature.Payload)
+			assert.Equal(t, test.tag.Signature.Signature, tag.Signature.Signature)
+			assert.Equal(t, test.tag.Signature.Payload, tag.Signature.Payload)
 		} else {
 			assert.Nil(t, tag.Signature)
 		}
 		if test.tag.Tagger != nil && assert.NotNil(t, tag.Tagger) {
-			assert.EqualValues(t, test.tag.Tagger.Name, tag.Tagger.Name)
-			assert.EqualValues(t, test.tag.Tagger.Email, tag.Tagger.Email)
-			assert.EqualValues(t, test.tag.Tagger.When.Unix(), tag.Tagger.When.Unix())
+			assert.Equal(t, test.tag.Tagger.Name, tag.Tagger.Name)
+			assert.Equal(t, test.tag.Tagger.Email, tag.Tagger.Email)
+			assert.Equal(t, test.tag.Tagger.When.Unix(), tag.Tagger.When.Unix())
 		} else {
 			assert.Nil(t, tag.Tagger)
 		}
diff --git a/modules/git/tests/repos/templates_repo/COMMIT_EDITMSG b/modules/git/tests/repos/templates_repo/COMMIT_EDITMSG
new file mode 100644
index 0000000000..a77fa514de
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Initial
diff --git a/modules/git/tests/repos/templates_repo/HEAD b/modules/git/tests/repos/templates_repo/HEAD
new file mode 100644
index 0000000000..cb089cd89a
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/modules/git/tests/repos/templates_repo/config b/modules/git/tests/repos/templates_repo/config
new file mode 100644
index 0000000000..a4ef456cbc
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/config
@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	logallrefupdates = true
diff --git a/modules/git/tests/repos/templates_repo/description b/modules/git/tests/repos/templates_repo/description
new file mode 100644
index 0000000000..498b267a8c
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/modules/git/tests/repos/templates_repo/index b/modules/git/tests/repos/templates_repo/index
new file mode 100644
index 0000000000..2b3f95a155
Binary files /dev/null and b/modules/git/tests/repos/templates_repo/index differ
diff --git a/modules/git/tests/repos/templates_repo/info/exclude b/modules/git/tests/repos/templates_repo/info/exclude
new file mode 100644
index 0000000000..a5196d1be8
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/modules/git/tests/repos/templates_repo/info/refs b/modules/git/tests/repos/templates_repo/info/refs
new file mode 100644
index 0000000000..8ee4ab3ff8
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/info/refs
@@ -0,0 +1 @@
+45697427ce0595075c5c8efa42567f050208510d	refs/heads/master
diff --git a/modules/git/tests/repos/templates_repo/objects/info/commit-graph b/modules/git/tests/repos/templates_repo/objects/info/commit-graph
new file mode 100644
index 0000000000..8904092586
Binary files /dev/null and b/modules/git/tests/repos/templates_repo/objects/info/commit-graph differ
diff --git a/modules/git/tests/repos/templates_repo/objects/info/packs b/modules/git/tests/repos/templates_repo/objects/info/packs
new file mode 100644
index 0000000000..5833126b59
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/objects/info/packs
@@ -0,0 +1,2 @@
+P pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack
+
diff --git a/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.bitmap b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.bitmap
new file mode 100644
index 0000000000..6bd87bf13c
Binary files /dev/null and b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.bitmap differ
diff --git a/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.idx b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.idx
new file mode 100644
index 0000000000..b530533e1b
Binary files /dev/null and b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.idx differ
diff --git a/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack
new file mode 100644
index 0000000000..6bbcbb6546
Binary files /dev/null and b/modules/git/tests/repos/templates_repo/objects/pack/pack-abb44544ae19d590e95822e963f78d069d27ba9e.pack differ
diff --git a/modules/git/tests/repos/templates_repo/packed-refs b/modules/git/tests/repos/templates_repo/packed-refs
new file mode 100644
index 0000000000..eb6e7a8add
--- /dev/null
+++ b/modules/git/tests/repos/templates_repo/packed-refs
@@ -0,0 +1,2 @@
+# pack-refs with: peeled fully-peeled sorted 
+45697427ce0595075c5c8efa42567f050208510d refs/heads/master
diff --git a/modules/git/tests/repos/templates_repo/refs/heads/.gitkeep b/modules/git/tests/repos/templates_repo/refs/heads/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/git/tests/repos/templates_repo/refs/tags/.gitkeep b/modules/git/tests/repos/templates_repo/refs/tags/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/git/tree_blob.go b/modules/git/tree_blob.go
index df339f64b1..5c1aa7753d 100644
--- a/modules/git/tree_blob.go
+++ b/modules/git/tree_blob.go
@@ -17,7 +17,6 @@ func (t *Tree) GetTreeEntryByPath(relpath string) (*TreeEntry, error) {
 			ptree:     t,
 			ID:        t.ID,
 			name:      "",
-			fullName:  "",
 			entryMode: EntryModeTree,
 		}, nil
 	}
@@ -55,7 +54,7 @@ func (t *Tree) GetBlobByPath(relpath string) (*Blob, error) {
 		return nil, err
 	}
 
-	if !entry.IsDir() && !entry.IsSubModule() {
+	if !entry.IsDir() && !entry.IsSubmodule() {
 		return entry.Blob(), nil
 	}
 
diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go
index d51b7992fe..8b6c4c467c 100644
--- a/modules/git/tree_entry.go
+++ b/modules/git/tree_entry.go
@@ -21,16 +21,12 @@ type TreeEntry struct {
 	entryMode EntryMode
 	name      string
 
-	size     int64
-	sized    bool
-	fullName string
+	size  int64
+	sized bool
 }
 
 // Name returns the name of the entry
 func (te *TreeEntry) Name() string {
-	if te.fullName != "" {
-		return te.fullName
-	}
 	return te.name
 }
 
@@ -68,8 +64,8 @@ func (te *TreeEntry) Size() int64 {
 	return te.size
 }
 
-// IsSubModule if the entry is a sub module
-func (te *TreeEntry) IsSubModule() bool {
+// IsSubmodule if the entry is a submodule
+func (te *TreeEntry) IsSubmodule() bool {
 	return te.entryMode == EntryModeCommit
 }
 
@@ -116,32 +112,37 @@ func (te *TreeEntry) Type() string {
 	}
 }
 
+// LinkTarget returns the target of the symlink as string.
+func (te *TreeEntry) LinkTarget() (string, error) {
+	if !te.IsLink() {
+		return "", ErrBadLink{te.Name(), "not a symlink"}
+	}
+
+	const symlinkLimit = 4096 // according to git config core.longpaths https://stackoverflow.com/a/22575737
+	blob := te.Blob()
+	if blob.Size() > symlinkLimit {
+		return "", ErrBadLink{te.Name(), "symlink too large"}
+	}
+
+	rc, size, err := blob.NewTruncatedReader(symlinkLimit)
+	if err != nil {
+		return "", err
+	}
+	defer rc.Close()
+
+	buf := make([]byte, int(size))
+	_, err = io.ReadFull(rc, buf)
+	return string(buf), err
+}
+
 // FollowLink returns the entry pointed to by a symlink
 func (te *TreeEntry) FollowLink() (*TreeEntry, string, error) {
-	if !te.IsLink() {
-		return nil, "", ErrBadLink{te.Name(), "not a symlink"}
-	}
-
 	// read the link
-	r, err := te.Blob().DataAsync()
+	lnk, err := te.LinkTarget()
 	if err != nil {
 		return nil, "", err
 	}
-	closed := false
-	defer func() {
-		if !closed {
-			_ = r.Close()
-		}
-	}()
-	buf := make([]byte, te.Size())
-	_, err = io.ReadFull(r, buf)
-	if err != nil {
-		return nil, "", err
-	}
-	_ = r.Close()
-	closed = true
 
-	lnk := string(buf)
 	t := te.ptree
 
 	// traverse up directories
@@ -209,7 +210,7 @@ func (te *TreeEntry) Tree() *Tree {
 
 // GetSubJumpablePathName return the full path of subdirectory jumpable ( contains only one directory )
 func (te *TreeEntry) GetSubJumpablePathName() string {
-	if te.IsSubModule() || !te.IsDir() {
+	if te.IsSubmodule() || !te.IsDir() {
 		return ""
 	}
 	tree, err := te.ptree.SubTree(te.Name())
@@ -236,7 +237,7 @@ type customSortableEntries struct {
 
 var sorter = []func(t1, t2 *TreeEntry, cmp func(s1, s2 string) bool) bool{
 	func(t1, t2 *TreeEntry, cmp func(s1, s2 string) bool) bool {
-		return (t1.IsDir() || t1.IsSubModule()) && !t2.IsDir() && !t2.IsSubModule()
+		return (t1.IsDir() || t1.IsSubmodule()) && !t2.IsDir() && !t2.IsSubmodule()
 	},
 	func(t1, t2 *TreeEntry, cmp func(s1, s2 string) bool) bool {
 		return cmp(t1.Name(), t2.Name())
diff --git a/modules/git/tree_test.go b/modules/git/tree_test.go
index 7e439628f2..aa092cc56b 100644
--- a/modules/git/tree_test.go
+++ b/modules/git/tree_test.go
@@ -34,10 +34,10 @@ func Test_GetTreePathLatestCommit(t *testing.T) {
 
 	commitID, err := repo.GetBranchCommitID("master")
 	require.NoError(t, err)
-	assert.EqualValues(t, "544d8f7a3b15927cddf2299b4b562d6ebd71b6a7", commitID)
+	assert.Equal(t, "544d8f7a3b15927cddf2299b4b562d6ebd71b6a7", commitID)
 
 	commit, err := repo.GetTreePathLatestCommit("master", "blame.txt")
 	require.NoError(t, err)
 	assert.NotNil(t, commit)
-	assert.EqualValues(t, "45fb6cbc12f970b04eacd5cd4165edd11c8d7376", commit.ID.String())
+	assert.Equal(t, "45fb6cbc12f970b04eacd5cd4165edd11c8d7376", commit.ID.String())
 }
diff --git a/modules/git/url/url_test.go b/modules/git/url/url_test.go
index e1e52c0ed5..54655633bf 100644
--- a/modules/git/url/url_test.go
+++ b/modules/git/url/url_test.go
@@ -160,8 +160,8 @@ func TestParseGitURLs(t *testing.T) {
 		t.Run(kase.kase, func(t *testing.T) {
 			u, err := Parse(kase.kase)
 			require.NoError(t, err)
-			assert.EqualValues(t, kase.expected.extraMark, u.extraMark)
-			assert.EqualValues(t, *kase.expected, *u)
+			assert.Equal(t, kase.expected.extraMark, u.extraMark)
+			assert.Equal(t, *kase.expected, *u)
 		})
 	}
 }
diff --git a/modules/graceful/releasereopen/releasereopen_test.go b/modules/graceful/releasereopen/releasereopen_test.go
index 6ab9f955f6..869bd2fdcf 100644
--- a/modules/graceful/releasereopen/releasereopen_test.go
+++ b/modules/graceful/releasereopen/releasereopen_test.go
@@ -31,14 +31,14 @@ func TestManager(t *testing.T) {
 	_ = m.Register(t3)
 
 	require.NoError(t, m.ReleaseReopen())
-	assert.EqualValues(t, 1, t1.count)
-	assert.EqualValues(t, 1, t2.count)
-	assert.EqualValues(t, 1, t3.count)
+	assert.Equal(t, 1, t1.count)
+	assert.Equal(t, 1, t2.count)
+	assert.Equal(t, 1, t3.count)
 
 	c2()
 
 	require.NoError(t, m.ReleaseReopen())
-	assert.EqualValues(t, 2, t1.count)
-	assert.EqualValues(t, 1, t2.count)
-	assert.EqualValues(t, 2, t3.count)
+	assert.Equal(t, 2, t1.count)
+	assert.Equal(t, 1, t2.count)
+	assert.Equal(t, 2, t3.count)
 }
diff --git a/modules/graceful/server.go b/modules/graceful/server.go
index 121bbed364..e812117dbd 100644
--- a/modules/graceful/server.go
+++ b/modules/graceful/server.go
@@ -260,7 +260,7 @@ func (w *wrappedConn) Write(p []byte) (n int, err error) {
 		if minDeadline.After(w.deadline) {
 			w.deadline = minDeadline
 		}
-		_ = w.Conn.SetWriteDeadline(w.deadline)
+		_ = w.SetWriteDeadline(w.deadline)
 	}
 	return w.Conn.Write(p)
 }
diff --git a/modules/graceful/server_hooks.go b/modules/graceful/server_hooks.go
index 06be783361..334f749003 100644
--- a/modules/graceful/server_hooks.go
+++ b/modules/graceful/server_hooks.go
@@ -61,10 +61,7 @@ func (srv *Server) doHammer() {
 		return
 	}
 	log.Warn("Forcefully shutting down parent")
-	for {
-		if srv.getState() == stateTerminate {
-			break
-		}
+	for srv.getState() != stateTerminate {
 		srv.wg.Done()
 
 		// Give other goroutines a chance to finish before we forcibly stop them.
diff --git a/modules/graceful/server_http.go b/modules/graceful/server_http.go
index 7c855ac64e..0b2984a953 100644
--- a/modules/graceful/server_http.go
+++ b/modules/graceful/server_http.go
@@ -16,6 +16,11 @@ func newHTTPServer(network, address, name string, handler http.Handler) (*Server
 		Handler:     handler,
 		BaseContext: func(net.Listener) context.Context { return GetManager().HammerContext() },
 	}
+	// Enable H2C for HTTP server
+	httpServer.Protocols = new(http.Protocols)
+	httpServer.Protocols.SetHTTP1(true)
+	httpServer.Protocols.SetHTTP2(true)
+	httpServer.Protocols.SetUnencryptedHTTP2(true)
 	server.OnShutdown = func() {
 		httpServer.SetKeepAlivesEnabled(false)
 	}
diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go
index 6464999033..ed5d190764 100644
--- a/modules/highlight/highlight_test.go
+++ b/modules/highlight/highlight_test.go
@@ -133,7 +133,7 @@ c=2
 		t.Run(tt.name, func(t *testing.T) {
 			out, lexerName, err := File(tt.name, "", []byte(tt.code))
 			require.NoError(t, err)
-			assert.EqualValues(t, tt.want, out)
+			assert.Equal(t, tt.want, out)
 			assert.Equal(t, tt.lexerName, lexerName)
 		})
 	}
@@ -196,7 +196,7 @@ c=2`),
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			out := PlainText([]byte(tt.code))
-			assert.EqualValues(t, tt.want, out)
+			assert.Equal(t, tt.want, out)
 		})
 	}
 }
diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go
index cd35367bc9..d385ac21c9 100644
--- a/modules/httplib/serve.go
+++ b/modules/httplib/serve.go
@@ -35,6 +35,8 @@ type ServeHeaderOptions struct {
 	Filename           string
 	CacheDuration      time.Duration // defaults to 5 minutes
 	LastModified       time.Time
+	AdditionalHeaders  http.Header
+	RedirectStatusCode int
 }
 
 // ServeSetHeaders sets necessary content serve headers
@@ -82,6 +84,12 @@ func ServeSetHeaders(w http.ResponseWriter, opts *ServeHeaderOptions) {
 		// http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat
 		header.Set("Last-Modified", opts.LastModified.UTC().Format(http.TimeFormat))
 	}
+
+	if opts.AdditionalHeaders != nil {
+		for k, v := range opts.AdditionalHeaders {
+			header[k] = v
+		}
+	}
 }
 
 // ServeData download file from io.Reader
@@ -91,7 +99,7 @@ func setServeHeadersByFile(r *http.Request, w http.ResponseWriter, filePath stri
 		Filename: path.Base(filePath),
 	}
 
-	sniffedType := typesniffer.DetectContentType(mineBuf)
+	sniffedType := typesniffer.DetectContentType(mineBuf, opts.Filename)
 
 	// the "render" parameter came from year 2016: 638dd24c, it doesn't have clear meaning, so I think it could be removed later
 	isPlain := sniffedType.IsText() || r.FormValue("render") != ""
diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go
index f793b5db3f..4c8b5f2a86 100644
--- a/modules/indexer/code/bleve/bleve.go
+++ b/modules/indexer/code/bleve/bleve.go
@@ -177,9 +177,10 @@ func (b *Indexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserErro
 	fileContents, err := io.ReadAll(io.LimitReader(batchReader, size))
 	if err != nil {
 		return err
-	} else if !typesniffer.DetectContentType(fileContents).IsText() {
+	} else if !typesniffer.DetectContentType(fileContents, update.Filename).IsText() {
 		// FIXME: UTF-16 files will probably fail here
-		return nil
+		// Even if the file is not recognized as a "text file", we could still put its name into the indexers to make the filename become searchable, while leave the content to empty.
+		fileContents = nil
 	}
 
 	if _, err = batchReader.Discard(1); err != nil {
@@ -259,11 +260,11 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 	if opts.Mode == internal.CodeSearchModeUnion {
 		query := bleve.NewDisjunctionQuery()
 		for _, field := range strings.Fields(opts.Keyword) {
-			query.AddQuery(inner_bleve.MatchPhraseQuery(field, "Content", repoIndexerAnalyzer, 0))
+			query.AddQuery(inner_bleve.MatchPhraseQuery(field, "Content", repoIndexerAnalyzer, false, 1.0))
 		}
 		keywordQuery = query
 	} else {
-		keywordQuery = inner_bleve.MatchPhraseQuery(opts.Keyword, "Content", repoIndexerAnalyzer, 0)
+		keywordQuery = inner_bleve.MatchPhraseQuery(opts.Keyword, "Content", repoIndexerAnalyzer, false, 1.0)
 	}
 
 	if len(opts.RepoIDs) > 0 {
diff --git a/modules/indexer/code/bleve/tokenizer/hierarchy/hierarchy.go b/modules/indexer/code/bleve/tokenizer/hierarchy/hierarchy.go
index 83d53b58b1..c44aa78c46 100644
--- a/modules/indexer/code/bleve/tokenizer/hierarchy/hierarchy.go
+++ b/modules/indexer/code/bleve/tokenizer/hierarchy/hierarchy.go
@@ -65,5 +65,7 @@ func TokenizerConstructor(config map[string]any, cache *registry.Cache) (analysi
 }
 
 func init() {
-	registry.RegisterTokenizer(Name, TokenizerConstructor)
+	if err := registry.RegisterTokenizer(Name, TokenizerConstructor); err != nil {
+		panic(err)
+	}
 }
diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go
index 3903d77fe0..9b11f56fb7 100644
--- a/modules/indexer/code/elasticsearch/elasticsearch.go
+++ b/modules/indexer/code/elasticsearch/elasticsearch.go
@@ -144,7 +144,7 @@ func (b *Indexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserErro
 	fileContents, err := io.ReadAll(io.LimitReader(batchReader, size))
 	if err != nil {
 		return nil, err
-	} else if !typesniffer.DetectContentType(fileContents).IsText() {
+	} else if !typesniffer.DetectContentType(fileContents, update.Filename).IsText() {
 		// FIXME: UTF-16 files will probably fail here
 		return nil, nil
 	}
diff --git a/modules/indexer/code/elasticsearch/elasticsearch_test.go b/modules/indexer/code/elasticsearch/elasticsearch_test.go
index c6ba93e76d..58683bf4b2 100644
--- a/modules/indexer/code/elasticsearch/elasticsearch_test.go
+++ b/modules/indexer/code/elasticsearch/elasticsearch_test.go
@@ -11,6 +11,6 @@ import (
 
 func TestIndexPos(t *testing.T) {
 	startIdx, endIdx := indexPos("test index start and end", "start", "end")
-	assert.EqualValues(t, 11, startIdx)
-	assert.EqualValues(t, 24, endIdx)
+	assert.Equal(t, 11, startIdx)
+	assert.Equal(t, 24, endIdx)
 }
diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go
index 29b2936fa1..740d2e1b5c 100644
--- a/modules/indexer/code/indexer_test.go
+++ b/modules/indexer/code/indexer_test.go
@@ -110,9 +110,9 @@ func testIndexer(name string, t *testing.T, indexer internal.Indexer) {
 				ids := make([]int64, 0, len(res))
 				for _, hit := range res {
 					ids = append(ids, hit.RepoID)
-					assert.EqualValues(t, "# repo1\n\nDescription for repo1", hit.Content)
+					assert.Equal(t, "# repo1\n\nDescription for repo1", hit.Content)
 				}
-				assert.EqualValues(t, kw.IDs, ids)
+				assert.Equal(t, kw.IDs, ids)
 			})
 		}
 
@@ -131,7 +131,7 @@ func TestBleveIndexAndSearch(t *testing.T) {
 		if idx != nil {
 			idx.Close()
 		}
-		assert.FailNow(t, "Unable to create bleve indexer Error: %v", err)
+		require.NoError(t, err)
 	}
 	defer idx.Close()
 
@@ -152,7 +152,7 @@ func TestESIndexAndSearch(t *testing.T) {
 		if indexer != nil {
 			indexer.Close()
 		}
-		assert.FailNow(t, "Unable to init ES indexer Error: %v", err)
+		assert.FailNow(t, "Unable to init ES indexer", "error: %v", err)
 	}
 
 	defer indexer.Close()
diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go
index cc2c2aaf06..73662b1dda 100644
--- a/modules/indexer/code/internal/indexer.go
+++ b/modules/indexer/code/internal/indexer.go
@@ -5,7 +5,7 @@ package internal
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
@@ -57,13 +57,13 @@ type dummyIndexer struct {
 }
 
 func (d *dummyIndexer) Index(ctx context.Context, repo *repo_model.Repository, sha string, changes *RepoChanges) error {
-	return fmt.Errorf("indexer is not ready")
+	return errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Delete(ctx context.Context, repoID int64) error {
-	return fmt.Errorf("indexer is not ready")
+	return errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Search(ctx context.Context, opts *SearchOptions) (int64, []*SearchResult, []*SearchResultLanguages, error) {
-	return 0, nil, nil, fmt.Errorf("indexer is not ready")
+	return 0, nil, nil, errors.New("indexer is not ready")
 }
diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go
index adf51a76d7..499b9117c4 100644
--- a/modules/indexer/code/search.go
+++ b/modules/indexer/code/search.go
@@ -97,7 +97,7 @@ func HighlightSearchResultCode(filename string, lineNums []int, highlightRanges
 	conv := hcd.ConvertToPlaceholders(string(hl))
 	convLines := strings.Split(conv, "\n")
 
-	// each highlightRange is of the form [line number, start pos, end pos]
+	// each highlightRange is of the form [line number, start byte offset, end byte offset]
 	for _, highlightRange := range highlightRanges {
 		ln, start, end := highlightRange[0], highlightRange[1], highlightRange[2]
 		line := convLines[ln]
@@ -105,15 +105,18 @@ func HighlightSearchResultCode(filename string, lineNums []int, highlightRanges
 			continue
 		}
 
+		sr := strings.NewReader(line)
 		sb := strings.Builder{}
 		count := -1
 		isOpen := false
-		for _, r := range line {
+		for r, size, err := sr.ReadRune(); err == nil; r, size, err = sr.ReadRune() {
 			if token, ok := hcd.PlaceholderTokenMap[r];
 			// token was not found
-			!ok ||
-				// token was marked as used
-				token == "" ||
+			!ok {
+				count += size
+			} else if
+			// token was marked as used
+			token == "" ||
 				// the token is not an valid html tag emitted by chroma
 				!(len(token) > 6 && (token[0:5] == "<span" || token[0:6] == "</span")) {
 				count++
@@ -132,15 +135,15 @@ func HighlightSearchResultCode(filename string, lineNums []int, highlightRanges
 				continue
 			}
 
-			switch count {
-			case end:
+			switch {
+			case count >= end:
 				// if tag is not open, no need to close
 				if !isOpen {
 					break
 				}
 				sb.WriteRune(endTag)
 				isOpen = false
-			case start:
+			case count >= start:
 				// if tag is open, do not open again
 				if isOpen {
 					break
@@ -161,7 +164,7 @@ func HighlightSearchResultCode(filename string, lineNums []int, highlightRanges
 	highlightedLines := strings.Split(hcd.Recover(conv), "\n")
 	// The lineNums outputted by highlight.Code might not match the original lineNums, because "highlight" removes the last `\n`
 	lines := make([]ResultLine, min(len(highlightedLines), len(lineNums)))
-	for i := 0; i < len(lines); i++ {
+	for i := range len(lines) {
 		lines[i].Num = lineNums[i]
 		lines[i].FormattedContent = template.HTML(highlightedLines[i])
 	}
diff --git a/modules/indexer/code/search_test.go b/modules/indexer/code/search_test.go
new file mode 100644
index 0000000000..2413ddec0b
--- /dev/null
+++ b/modules/indexer/code/search_test.go
@@ -0,0 +1,122 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package code
+
+import (
+	"html/template"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHighlightSearchResultCode(t *testing.T) {
+	opts := []struct {
+		Title  string
+		File   string
+		Lines  []int
+		Range  [][3]int
+		Code   string
+		Result []template.HTML
+	}{
+		{
+			Title: "One Match Text",
+			File:  "test.txt",
+			Range: [][3]int{{1, 5, 9}},
+			Code:  "First Line\nMark this only\nThe End",
+			Result: []template.HTML{
+				"First Line",
+				"Mark <span class=\"search-highlight\">this</span> only",
+				"The End",
+			},
+		},
+		{
+			Title: "Two Match Text",
+			File:  "test.txt",
+			Range: [][3]int{
+				{1, 5, 9},
+				{2, 5, 9},
+			},
+			Code: "First Line\nMark this only\nMark this too\nThe End",
+			Result: []template.HTML{
+				"First Line",
+				"Mark <span class=\"search-highlight\">this</span> only",
+				"Mark <span class=\"search-highlight\">this</span> too",
+				"The End",
+			},
+		},
+		{
+			Title: "Unicode Before",
+			File:  "test.txt",
+			Range: [][3]int{{1, 10, 14}},
+			Code:  "First Line\nMark 👉 this only\nThe End",
+			Result: []template.HTML{
+				"First Line",
+				"Mark 👉 <span class=\"search-highlight\">this</span> only",
+				"The End",
+			},
+		},
+		{
+			Title: "Unicode Between",
+			File:  "test.txt",
+			Range: [][3]int{{1, 5, 14}},
+			Code:  "First Line\nMark this 😊 only\nThe End",
+			Result: []template.HTML{
+				"First Line",
+				"Mark <span class=\"search-highlight\">this 😊</span> only",
+				"The End",
+			},
+		},
+		{
+			Title: "Unicode Before And Between",
+			File:  "test.txt",
+			Range: [][3]int{{1, 10, 19}},
+			Code:  "First Line\nMark 👉 this 😊 only\nThe End",
+			Result: []template.HTML{
+				"First Line",
+				"Mark 👉 <span class=\"search-highlight\">this 😊</span> only",
+				"The End",
+			},
+		},
+		{
+			Title: "Golang",
+			File:  "test.go",
+			Range: [][3]int{{1, 14, 23}},
+			Code:  "func main() {\n\tfmt.Println(\"mark this\")\n}",
+			Result: []template.HTML{
+				"<span class=\"kd\">func</span><span class=\"w\"> </span><span class=\"nf\">main</span><span class=\"p\">(</span><span class=\"p\">)</span><span class=\"w\"> </span><span class=\"p\">{</span><span class=\"w\">",
+				"</span><span class=\"w\"></span><span class=\"w\">\t</span><span class=\"nx\">fmt</span><span class=\"p\">.</span><span class=\"nf\">Println</span><span class=\"p\">(</span><span class=\"s\">&#34;<span class=\"search-highlight\">mark this</span>&#34;</span><span class=\"p\">)</span><span class=\"w\">",
+				"</span><span class=\"w\"></span><span class=\"p\">}</span>",
+			},
+		},
+		{
+			Title: "Golang Unicode",
+			File:  "test.go",
+			Range: [][3]int{{1, 14, 28}},
+			Code:  "func main() {\n\tfmt.Println(\"mark this 😊\")\n}",
+			Result: []template.HTML{
+				"<span class=\"kd\">func</span><span class=\"w\"> </span><span class=\"nf\">main</span><span class=\"p\">(</span><span class=\"p\">)</span><span class=\"w\"> </span><span class=\"p\">{</span><span class=\"w\">",
+				"</span><span class=\"w\"></span><span class=\"w\">\t</span><span class=\"nx\">fmt</span><span class=\"p\">.</span><span class=\"nf\">Println</span><span class=\"p\">(</span><span class=\"s\">&#34;<span class=\"search-highlight\">mark this 😊</span>&#34;</span><span class=\"p\">)</span><span class=\"w\">",
+				"</span><span class=\"w\"></span><span class=\"p\">}</span>",
+			},
+		},
+	}
+	for _, o := range opts {
+		t.Run(o.Title, func(t *testing.T) {
+			lines := []int{}
+			for i := range strings.Count(strings.TrimSuffix(o.Code, "\n"), "\n") + 1 {
+				lines = append(lines, i+1)
+			}
+			res := HighlightSearchResultCode(o.File, lines, o.Range, o.Code)
+			assert.Len(t, res, len(o.Result))
+			assert.Len(t, res, len(lines))
+
+			for i, r := range res {
+				require.Equal(t, lines[i], r.Num)
+				require.Equal(t, o.Result[i], r.FormattedContent)
+			}
+		})
+	}
+}
diff --git a/modules/indexer/internal/bleve/indexer.go b/modules/indexer/internal/bleve/indexer.go
index 4a61a80765..669417bb4b 100644
--- a/modules/indexer/internal/bleve/indexer.go
+++ b/modules/indexer/internal/bleve/indexer.go
@@ -5,7 +5,7 @@ package bleve
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/modules/indexer/internal"
 	"forgejo.org/modules/log"
@@ -38,11 +38,11 @@ func NewIndexer(indexDir string, version int, mappingGetter func() (mapping.Inde
 // Init initializes the indexer
 func (i *Indexer) Init(_ context.Context) (bool, error) {
 	if i == nil {
-		return false, fmt.Errorf("cannot init nil indexer")
+		return false, errors.New("cannot init nil indexer")
 	}
 
 	if i.Indexer != nil {
-		return false, fmt.Errorf("indexer is already initialized")
+		return false, errors.New("indexer is already initialized")
 	}
 
 	indexer, version, err := openIndexer(i.indexDir, i.version)
@@ -82,10 +82,10 @@ func (i *Indexer) Init(_ context.Context) (bool, error) {
 // Ping checks if the indexer is available
 func (i *Indexer) Ping(_ context.Context) error {
 	if i == nil {
-		return fmt.Errorf("cannot ping nil indexer")
+		return errors.New("cannot ping nil indexer")
 	}
 	if i.Indexer == nil {
-		return fmt.Errorf("indexer is not initialized")
+		return errors.New("indexer is not initialized")
 	}
 	return nil
 }
diff --git a/modules/indexer/internal/bleve/metadata_test.go b/modules/indexer/internal/bleve/metadata_test.go
index 31603a92a3..3b0d3aca3d 100644
--- a/modules/indexer/internal/bleve/metadata_test.go
+++ b/modules/indexer/internal/bleve/metadata_test.go
@@ -24,5 +24,5 @@ func TestMetadata(t *testing.T) {
 
 	meta, err = readIndexMetadata(dir)
 	require.NoError(t, err)
-	assert.EqualValues(t, 24, meta.Version)
+	assert.Equal(t, 24, meta.Version)
 }
diff --git a/modules/indexer/internal/bleve/query.go b/modules/indexer/internal/bleve/query.go
index 9f08290172..e043023671 100644
--- a/modules/indexer/internal/bleve/query.go
+++ b/modules/indexer/internal/bleve/query.go
@@ -29,11 +29,12 @@ func MatchQuery(matchTerm, field, analyzer string, fuzziness int) *query.MatchQu
 }
 
 // MatchPhraseQuery generates a match phrase query for the given phrase, field and analyzer
-func MatchPhraseQuery(matchPhrase, field, analyzer string, fuzziness int) *query.MatchPhraseQuery {
+func MatchPhraseQuery(matchPhrase, field, analyzer string, autoFuzzy bool, boost float64) *query.MatchPhraseQuery {
 	q := bleve.NewMatchPhraseQuery(matchPhrase)
 	q.FieldVal = field
 	q.Analyzer = analyzer
-	q.Fuzziness = fuzziness
+	q.SetAutoFuzziness(autoFuzzy)
+	q.SetBoost(boost)
 	return q
 }
 
diff --git a/modules/indexer/internal/elasticsearch/indexer.go b/modules/indexer/internal/elasticsearch/indexer.go
index 9cd29f3e49..a7a710588c 100644
--- a/modules/indexer/internal/elasticsearch/indexer.go
+++ b/modules/indexer/internal/elasticsearch/indexer.go
@@ -5,6 +5,7 @@ package elasticsearch
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"forgejo.org/modules/indexer/internal"
@@ -36,10 +37,10 @@ func NewIndexer(url, indexName string, version int, mapping string) *Indexer {
 // Init initializes the indexer
 func (i *Indexer) Init(ctx context.Context) (bool, error) {
 	if i == nil {
-		return false, fmt.Errorf("cannot init nil indexer")
+		return false, errors.New("cannot init nil indexer")
 	}
 	if i.Client != nil {
-		return false, fmt.Errorf("indexer is already initialized")
+		return false, errors.New("indexer is already initialized")
 	}
 
 	client, err := i.initClient()
@@ -66,10 +67,10 @@ func (i *Indexer) Init(ctx context.Context) (bool, error) {
 // Ping checks if the indexer is available
 func (i *Indexer) Ping(ctx context.Context) error {
 	if i == nil {
-		return fmt.Errorf("cannot ping nil indexer")
+		return errors.New("cannot ping nil indexer")
 	}
 	if i.Client == nil {
-		return fmt.Errorf("indexer is not initialized")
+		return errors.New("indexer is not initialized")
 	}
 
 	resp, err := i.Client.ClusterHealth().Do(ctx)
diff --git a/modules/indexer/internal/indexer.go b/modules/indexer/internal/indexer.go
index c7f356da1e..3442bbaff2 100644
--- a/modules/indexer/internal/indexer.go
+++ b/modules/indexer/internal/indexer.go
@@ -5,7 +5,7 @@ package internal
 
 import (
 	"context"
-	"fmt"
+	"errors"
 )
 
 // Indexer defines an basic indexer interface
@@ -27,11 +27,11 @@ func NewDummyIndexer() Indexer {
 type dummyIndexer struct{}
 
 func (d *dummyIndexer) Init(ctx context.Context) (bool, error) {
-	return false, fmt.Errorf("indexer is not ready")
+	return false, errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Ping(ctx context.Context) error {
-	return fmt.Errorf("indexer is not ready")
+	return errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Close() {}
diff --git a/modules/indexer/internal/meilisearch/indexer.go b/modules/indexer/internal/meilisearch/indexer.go
index feac1d052c..b21605772c 100644
--- a/modules/indexer/internal/meilisearch/indexer.go
+++ b/modules/indexer/internal/meilisearch/indexer.go
@@ -5,6 +5,7 @@ package meilisearch
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/meilisearch/meilisearch-go"
@@ -33,11 +34,11 @@ func NewIndexer(url, apiKey, indexName string, version int, settings *meilisearc
 // Init initializes the indexer
 func (i *Indexer) Init(_ context.Context) (bool, error) {
 	if i == nil {
-		return false, fmt.Errorf("cannot init nil indexer")
+		return false, errors.New("cannot init nil indexer")
 	}
 
 	if i.Client != nil {
-		return false, fmt.Errorf("indexer is already initialized")
+		return false, errors.New("indexer is already initialized")
 	}
 
 	i.Client = meilisearch.New(i.url, meilisearch.WithAPIKey(i.apiKey))
@@ -63,10 +64,10 @@ func (i *Indexer) Init(_ context.Context) (bool, error) {
 // Ping checks if the indexer is available
 func (i *Indexer) Ping(ctx context.Context) error {
 	if i == nil {
-		return fmt.Errorf("cannot ping nil indexer")
+		return errors.New("cannot ping nil indexer")
 	}
 	if i.Client == nil {
-		return fmt.Errorf("indexer is not initialized")
+		return errors.New("indexer is not initialized")
 	}
 	resp, err := i.Client.Health()
 	if err != nil {
diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go
index 5d6099bd2a..cb98f722c5 100644
--- a/modules/indexer/issues/bleve/bleve.go
+++ b/modules/indexer/issues/bleve/bleve.go
@@ -23,7 +23,7 @@ import (
 const (
 	issueIndexerAnalyzer      = "issueIndexer"
 	issueIndexerDocType       = "issueIndexerDocType"
-	issueIndexerLatestVersion = 4
+	issueIndexerLatestVersion = 5
 )
 
 const unicodeNormalizeName = "unicodeNormalize"
@@ -69,6 +69,7 @@ func generateIssueIndexMapping() (mapping.IndexMapping, error) {
 
 	docMapping.AddFieldMappingsAt("is_public", boolFieldMapping)
 
+	docMapping.AddFieldMappingsAt("index", numberFieldMapping)
 	docMapping.AddFieldMappingsAt("title", textFieldMapping)
 	docMapping.AddFieldMappingsAt("content", textFieldMapping)
 	docMapping.AddFieldMappingsAt("comments", textFieldMapping)
@@ -155,22 +156,24 @@ func (b *Indexer) Delete(_ context.Context, ids ...int64) error {
 func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (*internal.SearchResult, error) {
 	var queries []query.Query
 
-	if options.Keyword != "" {
-		tokens, err := options.Tokens()
-		if err != nil {
-			return nil, err
-		}
+	tokens, err := options.Tokens()
+	if err != nil {
+		return nil, err
+	}
+
+	if len(tokens) > 0 {
 		q := bleve.NewBooleanQuery()
 		for _, token := range tokens {
-			fuzziness := 0
-			if token.Fuzzy {
-				// TODO: replace with "auto" after bleve update
-				fuzziness = min(len(token.Term)/4, 2)
-			}
 			innerQ := bleve.NewDisjunctionQuery(
-				inner_bleve.MatchPhraseQuery(token.Term, "title", issueIndexerAnalyzer, fuzziness),
-				inner_bleve.MatchPhraseQuery(token.Term, "content", issueIndexerAnalyzer, fuzziness),
-				inner_bleve.MatchPhraseQuery(token.Term, "comments", issueIndexerAnalyzer, fuzziness))
+				inner_bleve.MatchPhraseQuery(token.Term, "title", issueIndexerAnalyzer, token.Fuzzy, 2.0),
+				inner_bleve.MatchPhraseQuery(token.Term, "content", issueIndexerAnalyzer, token.Fuzzy, 1.0),
+				inner_bleve.MatchPhraseQuery(token.Term, "comments", issueIndexerAnalyzer, token.Fuzzy, 1.0))
+
+			if issueID, err := token.ParseIssueReference(); err == nil {
+				idQuery := inner_bleve.NumericEqualityQuery(issueID, "index")
+				idQuery.SetBoost(20.0)
+				innerQ.AddQuery(idQuery)
+			}
 
 			switch token.Kind {
 			case internal.BoolOptMust:
@@ -195,6 +198,15 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		queries = append(queries, bleve.NewDisjunctionQuery(repoQueries...))
 	}
 
+	if options.PriorityRepoID.Has() {
+		eq := inner_bleve.NumericEqualityQuery(options.PriorityRepoID.Value(), "repo_id")
+		eq.SetBoost(10.0)
+		meh := bleve.NewMatchAllQuery()
+		meh.SetBoost(0)
+		should := bleve.NewDisjunctionQuery(eq, meh)
+		queries = append(queries, should)
+	}
+
 	if options.IsPull.Has() {
 		queries = append(queries, inner_bleve.BoolFieldQuery(options.IsPull.Value(), "is_pull"))
 	}
diff --git a/modules/indexer/issues/db/db.go b/modules/indexer/issues/db/db.go
index 9dd026e74f..5f42bce9a1 100644
--- a/modules/indexer/issues/db/db.go
+++ b/modules/indexer/issues/db/db.go
@@ -5,6 +5,7 @@ package db
 
 import (
 	"context"
+	"strconv"
 
 	"forgejo.org/models/db"
 	issue_model "forgejo.org/models/issues"
@@ -52,6 +53,7 @@ func (i *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 
 	cond := builder.NewCond()
 
+	var priorityIssueIndex int64
 	if options.Keyword != "" {
 		repoCond := builder.In("repo_id", options.RepoIDs)
 		if len(options.RepoIDs) == 1 {
@@ -71,12 +73,25 @@ func (i *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 				)),
 			),
 		)
+
+		term := options.Keyword
+		if term[0] == '#' || term[0] == '!' {
+			term = term[1:]
+		}
+		if issueID, err := strconv.ParseInt(term, 10, 64); err == nil {
+			cond = builder.Or(
+				builder.Eq{"`index`": issueID},
+				cond,
+			)
+			priorityIssueIndex = issueID
+		}
 	}
 
 	opt, err := ToDBOptions(ctx, options)
 	if err != nil {
 		return nil, err
 	}
+	opt.PriorityIssueIndex = priorityIssueIndex
 
 	// If pagesize == 0, return total count only. It's a special case for search count.
 	if options.Paginator != nil && options.Paginator.PageSize == 0 {
diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go
index 4411cc1c37..55a471fc8e 100644
--- a/modules/indexer/issues/db/options.go
+++ b/modules/indexer/issues/db/options.go
@@ -78,6 +78,11 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
 		User:               nil,
 	}
 
+	if options.PriorityRepoID.Has() {
+		opts.SortType = "priorityrepo"
+		opts.PriorityRepoID = options.PriorityRepoID.Value()
+	}
+
 	if len(options.MilestoneIDs) == 1 && options.MilestoneIDs[0] == 0 {
 		opts.MilestoneIDs = []int64{db.NoConditionID}
 	} else {
diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go
index 1bf0145796..311e92730e 100644
--- a/modules/indexer/issues/elasticsearch/elasticsearch.go
+++ b/modules/indexer/issues/elasticsearch/elasticsearch.go
@@ -18,7 +18,7 @@ import (
 )
 
 const (
-	issueIndexerLatestVersion = 1
+	issueIndexerLatestVersion = 2
 	// multi-match-types, currently only 2 types are used
 	// Reference: https://www.elastic.co/guide/en/elasticsearch/reference/7.0/query-dsl-multi-match-query.html#multi-match-types
 	esMultiMatchTypeBestFields   = "best_fields"
@@ -56,7 +56,8 @@ const (
 			"repo_id": { "type": "long", "index": true },
 			"is_public": { "type": "boolean", "index": true },
 
-			"title": {  "type": "text", "index": true },
+			"index": { "type": "long", "index": true },
+			"title": { "type": "text", "index": true },
 			"content": { "type": "text", "index": true },
 			"comments": { "type" : "text", "index": true },
 
@@ -148,28 +149,33 @@ func (b *Indexer) Delete(ctx context.Context, ids ...int64) error {
 func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (*internal.SearchResult, error) {
 	query := elastic.NewBoolQuery()
 
-	if options.Keyword != "" {
+	tokens, err := options.Tokens()
+	if err != nil {
+		return nil, err
+	}
+
+	if len(tokens) > 0 {
 		q := elastic.NewBoolQuery()
-		tokens, err := options.Tokens()
-		if err != nil {
-			return nil, err
-		}
 		for _, token := range tokens {
-			innerQ := elastic.NewMultiMatchQuery(token.Term, "title", "content", "comments")
+			innerQ := elastic.NewMultiMatchQuery(token.Term, "content", "comments").FieldWithBoost("title", 2.0).TieBreaker(0.5)
 			if token.Fuzzy {
 				// If the term is not a phrase use fuzziness set to AUTO
 				innerQ = innerQ.Type(esMultiMatchTypeBestFields).Fuzziness(esFuzzyAuto)
 			} else {
 				innerQ = innerQ.Type(esMultiMatchTypePhrasePrefix)
 			}
-
+			var eitherQ elastic.Query = innerQ
+			if issueID, err := token.ParseIssueReference(); err == nil {
+				indexQ := elastic.NewTermQuery("index", issueID).Boost(20)
+				eitherQ = elastic.NewDisMaxQuery().Query(indexQ).Query(innerQ).TieBreaker(0.5)
+			}
 			switch token.Kind {
 			case internal.BoolOptMust:
-				q.Must(innerQ)
+				q.Must(eitherQ)
 			case internal.BoolOptShould:
-				q.Should(innerQ)
+				q.Should(eitherQ)
 			case internal.BoolOptNot:
-				q.MustNot(innerQ)
+				q.MustNot(eitherQ)
 			}
 		}
 		query.Must(q)
@@ -183,6 +189,10 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		}
 		query.Must(q)
 	}
+	if options.PriorityRepoID.Has() {
+		q := elastic.NewTermQuery("repo_id", options.PriorityRepoID.Value()).Boost(10)
+		query.Should(q)
+	}
 
 	if options.IsPull.Has() {
 		query.Must(elastic.NewTermQuery("is_pull", options.IsPull.Value()))
diff --git a/modules/indexer/issues/elasticsearch/elasticsearch_test.go b/modules/indexer/issues/elasticsearch/elasticsearch_test.go
index f8cd4e02f6..1ad01352d3 100644
--- a/modules/indexer/issues/elasticsearch/elasticsearch_test.go
+++ b/modules/indexer/issues/elasticsearch/elasticsearch_test.go
@@ -11,36 +11,22 @@ import (
 	"time"
 
 	"forgejo.org/modules/indexer/issues/internal/tests"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestElasticsearchIndexer(t *testing.T) {
-	// The elasticsearch instance started by testing.yml > test-unit > services > elasticsearch
-	url := "http://elastic:changeme@elasticsearch:9200"
-
-	if os.Getenv("CI") == "" {
-		// Make it possible to run tests against a local elasticsearch instance
-		url = os.Getenv("TEST_ELASTICSEARCH_URL")
-		if url == "" {
-			t.Skip("TEST_ELASTICSEARCH_URL not set and not running in CI")
-			return
-		}
-	}
-
-	ok := false
-	for i := 0; i < 60; i++ {
-		resp, err := http.Get(url)
-		if err == nil && resp.StatusCode == http.StatusOK {
-			ok = true
-			break
-		}
-		t.Logf("Waiting for elasticsearch to be up: %v", err)
-		time.Sleep(time.Second)
-	}
-	if !ok {
-		t.Fatalf("Failed to wait for elasticsearch to be up")
+	url := os.Getenv("TEST_ELASTICSEARCH_URL")
+	if url == "" {
+		t.Skip("TEST_ELASTICSEARCH_URL not set")
 		return
 	}
 
+	require.Eventually(t, func() bool {
+		resp, err := http.Get(url)
+		return err == nil && resp.StatusCode == http.StatusOK
+	}, time.Minute, time.Microsecond*100, "Failed to wait for elasticsearch to be up")
+
 	indexer := NewIndexer(url, fmt.Sprintf("test_elasticsearch_indexer_%d", time.Now().Unix()))
 	defer indexer.Close()
 
diff --git a/modules/indexer/issues/internal/indexer.go b/modules/indexer/issues/internal/indexer.go
index 2f3b4029dc..1b9428b889 100644
--- a/modules/indexer/issues/internal/indexer.go
+++ b/modules/indexer/issues/internal/indexer.go
@@ -5,7 +5,7 @@ package internal
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/modules/indexer/internal"
 )
@@ -30,13 +30,13 @@ type dummyIndexer struct {
 }
 
 func (d *dummyIndexer) Index(_ context.Context, _ ...*IndexerData) error {
-	return fmt.Errorf("indexer is not ready")
+	return errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Delete(_ context.Context, _ ...int64) error {
-	return fmt.Errorf("indexer is not ready")
+	return errors.New("indexer is not ready")
 }
 
 func (d *dummyIndexer) Search(_ context.Context, _ *SearchOptions) (*SearchResult, error) {
-	return nil, fmt.Errorf("indexer is not ready")
+	return nil, errors.New("indexer is not ready")
 }
diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go
index 03f5595a5b..cdd113212d 100644
--- a/modules/indexer/issues/internal/model.go
+++ b/modules/indexer/issues/internal/model.go
@@ -14,6 +14,7 @@ type IndexerData struct {
 	ID       int64 `json:"id"`
 	RepoID   int64 `json:"repo_id"`
 	IsPublic bool  `json:"is_public"` // If the repo is public
+	Index    int64 `json:"index"`
 
 	// Fields used for keyword searching
 	Title    string   `json:"title"`
@@ -74,8 +75,9 @@ type SearchResult struct {
 type SearchOptions struct {
 	Keyword string // keyword to search
 
-	RepoIDs   []int64 // repository IDs which the issues belong to
-	AllPublic bool    // if include all public repositories
+	RepoIDs        []int64                // repository IDs which the issues belong to
+	AllPublic      bool                   // if include all public repositories
+	PriorityRepoID optional.Option[int64] // issues from this repository will be prioritized when SortByScore
 
 	IsPull   optional.Option[bool] // if the issues is a pull request
 	IsClosed optional.Option[bool] // if the issues is closed
diff --git a/modules/indexer/issues/internal/qstring.go b/modules/indexer/issues/internal/qstring.go
index fdb89b09e9..348f7a564b 100644
--- a/modules/indexer/issues/internal/qstring.go
+++ b/modules/indexer/issues/internal/qstring.go
@@ -5,6 +5,7 @@ package internal
 
 import (
 	"io"
+	"strconv"
 	"strings"
 )
 
@@ -22,6 +23,14 @@ type Token struct {
 	Fuzzy bool
 }
 
+func (tk *Token) ParseIssueReference() (int64, error) {
+	term := tk.Term
+	if len(term) > 1 && (term[0] == '#' || term[0] == '!') {
+		term = term[1:]
+	}
+	return strconv.ParseInt(term, 10, 64)
+}
+
 type Tokenizer struct {
 	in *strings.Reader
 }
@@ -36,12 +45,9 @@ func (t *Tokenizer) next() (tk Token, err error) {
 
 	// skip all leading white space
 	for {
-		if r, _, err = t.in.ReadRune(); err == nil && r == ' ' {
-			//nolint:staticcheck,wastedassign // SA4006 the variable is used after the loop
-			r, _, err = t.in.ReadRune()
-			continue
+		if r, _, err = t.in.ReadRune(); err != nil || r != ' ' {
+			break
 		}
-		break
 	}
 	if err != nil {
 		return tk, err
@@ -98,11 +104,17 @@ nextEnd:
 
 // Tokenize the keyword
 func (o *SearchOptions) Tokens() (tokens []Token, err error) {
+	if o.Keyword == "" {
+		return nil, nil
+	}
+
 	in := strings.NewReader(o.Keyword)
 	it := Tokenizer{in: in}
 
 	for token, err := it.next(); err == nil; token, err = it.next() {
-		tokens = append(tokens, token)
+		if token.Term != "" {
+			tokens = append(tokens, token)
+		}
 	}
 	if err != nil && err != io.EOF {
 		return nil, err
diff --git a/modules/indexer/issues/internal/qstring_test.go b/modules/indexer/issues/internal/qstring_test.go
index a911b86e2f..eb4bdb306f 100644
--- a/modules/indexer/issues/internal/qstring_test.go
+++ b/modules/indexer/issues/internal/qstring_test.go
@@ -41,6 +41,36 @@ var testOpts = []testIssueQueryStringOpt{
 			},
 		},
 	},
+	{
+		Keyword: "Hello  World",
+		Results: []Token{
+			{
+				Term:  "Hello",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+			{
+				Term:  "World",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
+	{
+		Keyword: " Hello World ",
+		Results: []Token{
+			{
+				Term:  "Hello",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+			{
+				Term:  "World",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
 	{
 		Keyword: "+Hello +World",
 		Results: []Token{
@@ -156,6 +186,68 @@ var testOpts = []testIssueQueryStringOpt{
 			},
 		},
 	},
+	{
+		Keyword: "\\",
+		Results: nil,
+	},
+	{
+		Keyword: "\"",
+		Results: nil,
+	},
+	{
+		Keyword: "Hello \\",
+		Results: []Token{
+			{
+				Term:  "Hello",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
+	{
+		Keyword: "\"\"",
+		Results: nil,
+	},
+	{
+		Keyword: "\" World \"",
+		Results: []Token{
+			{
+				Term:  " World ",
+				Fuzzy: false,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
+	{
+		Keyword: "\"\" World \"\"",
+		Results: []Token{
+			{
+				Term:  "World",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
+	{
+		Keyword: "Best \"Hello World\" Ever",
+		Results: []Token{
+			{
+				Term:  "Best",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+			{
+				Term:  "Hello World",
+				Fuzzy: false,
+				Kind:  BoolOptShould,
+			},
+			{
+				Term:  "Ever",
+				Fuzzy: true,
+				Kind:  BoolOptShould,
+			},
+		},
+	},
 }
 
 func TestIssueQueryString(t *testing.T) {
@@ -169,3 +261,35 @@ func TestIssueQueryString(t *testing.T) {
 		})
 	}
 }
+
+func TestToken_ParseIssueReference(t *testing.T) {
+	var tk Token
+	{
+		tk.Term = "123"
+		id, err := tk.ParseIssueReference()
+		require.NoError(t, err)
+		assert.Equal(t, int64(123), id)
+	}
+	{
+		tk.Term = "#123"
+		id, err := tk.ParseIssueReference()
+		require.NoError(t, err)
+		assert.Equal(t, int64(123), id)
+	}
+	{
+		tk.Term = "!123"
+		id, err := tk.ParseIssueReference()
+		require.NoError(t, err)
+		assert.Equal(t, int64(123), id)
+	}
+	{
+		tk.Term = "text"
+		_, err := tk.ParseIssueReference()
+		require.Error(t, err)
+	}
+	{
+		tk.Term = ""
+		_, err := tk.ParseIssueReference()
+		require.Error(t, err)
+	}
+}
diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go
index 8308cb7f60..46014994a0 100644
--- a/modules/indexer/issues/internal/tests/tests.go
+++ b/modules/indexer/issues/internal/tests/tests.go
@@ -8,7 +8,6 @@
 package tests
 
 import (
-	"context"
 	"fmt"
 	"slices"
 	"testing"
@@ -40,7 +39,7 @@ func TestIndexer(t *testing.T, indexer internal.Indexer) {
 			data[v.ID] = v
 		}
 		require.NoError(t, indexer.Index(t.Context(), d...))
-		require.NoError(t, waitData(indexer, int64(len(data))))
+		waitData(t, indexer, int64(len(data)))
 	}
 
 	defer func() {
@@ -54,13 +53,13 @@ func TestIndexer(t *testing.T, indexer internal.Indexer) {
 				for _, v := range c.ExtraData {
 					data[v.ID] = v
 				}
-				require.NoError(t, waitData(indexer, int64(len(data))))
+				waitData(t, indexer, int64(len(data)))
 				defer func() {
 					for _, v := range c.ExtraData {
 						require.NoError(t, indexer.Delete(t.Context(), v.ID))
 						delete(data, v.ID)
 					}
-					require.NoError(t, waitData(indexer, int64(len(data))))
+					waitData(t, indexer, int64(len(data)))
 				}()
 			}
 
@@ -88,14 +87,44 @@ func TestIndexer(t *testing.T, indexer internal.Indexer) {
 	}
 }
 
+func allResults(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
+	assert.Len(t, result.Hits, len(data))
+	assert.Equal(t, len(data), int(result.Total))
+}
+
 var cases = []*testIndexerCase{
 	{
 		Name:          "default",
 		SearchOptions: &internal.SearchOptions{},
-		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
-			assert.Equal(t, len(data), int(result.Total))
+		Expected:      allResults,
+	},
+	{
+		Name: "empty keyword",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "",
 		},
+		Expected: allResults,
+	},
+	{
+		Name: "whitespace keyword",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "    ",
+		},
+		Expected: allResults,
+	},
+	{
+		Name: "dangling slash in keyword",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "\\",
+		},
+		Expected: allResults,
+	},
+	{
+		Name: "dangling quote in keyword",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "\"",
+		},
+		Expected: allResults,
 	},
 	{
 		Name: "empty",
@@ -550,6 +579,55 @@ var cases = []*testIndexerCase{
 			}), result.Total)
 		},
 	},
+	{
+		Name: "Index",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "13",
+			SortBy:  internal.SortByScore,
+			RepoIDs: []int64{5},
+		},
+		ExpectedIDs:   []int64{93}, // 93 = #13 in repo 5
+		ExpectedTotal: 1,
+	},
+	{
+		Name: "Index with prefix",
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "#13",
+			SortBy:  internal.SortByScore,
+			RepoIDs: []int64{5},
+		},
+		ExpectedIDs:   []int64{93},
+		ExpectedTotal: 1,
+	},
+	{
+		Name: "Index and title boost",
+		ExtraData: []*internal.IndexerData{
+			{ID: 1001, Title: "re #13", RepoID: 5},
+			{ID: 1002, Title: "re #1001", Content: "leave 13 alone. - 13", RepoID: 5},
+		},
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "!13",
+			SortBy:  internal.SortByScore,
+			RepoIDs: []int64{5},
+		},
+		ExpectedIDs:   []int64{93, 1001, 1002},
+		ExpectedTotal: 3,
+	},
+	{
+		Name: "Index exclude",
+		ExtraData: []*internal.IndexerData{
+			{ID: 1001, Index: 101, Title: "Brrr", RepoID: 5},
+			{ID: 1002, Index: 102, Title: "Brrr", Content: "Brrr", RepoID: 5},
+			{ID: 1003, Index: 103, Title: "Brrr", RepoID: 5},
+			{ID: 1004, Index: 104, Title: "Brrr", RepoID: 5},
+		},
+		SearchOptions: &internal.SearchOptions{
+			Keyword: "Brrr -101 -103",
+			SortBy:  internal.SortByScore,
+		},
+		ExpectedIDs:   []int64{1002, 1004},
+		ExpectedTotal: 2,
+	},
 	{
 		Name: "SortByCreatedDesc",
 		SearchOptions: &internal.SearchOptions{
@@ -557,7 +635,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByCreatedDesc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -573,7 +651,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByUpdatedDesc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -589,7 +667,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByCommentsDesc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -605,7 +683,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByDeadlineDesc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -621,7 +699,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByScore,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -637,7 +715,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByCreatedAsc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -653,7 +731,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByUpdatedAsc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -669,7 +747,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByCommentsAsc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -685,7 +763,7 @@ var cases = []*testIndexerCase{
 			SortBy:    internal.SortByDeadlineAsc,
 		},
 		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
-			assert.Equal(t, len(data), len(result.Hits))
+			assert.Len(t, result.Hits, len(data))
 			assert.Equal(t, len(data), int(result.Total))
 			for i, v := range result.Hits {
 				if i < len(result.Hits)-1 {
@@ -694,6 +772,25 @@ var cases = []*testIndexerCase{
 			}
 		},
 	},
+	{
+		Name: "PriorityRepoID",
+		SearchOptions: &internal.SearchOptions{
+			IsPull:         optional.Some(false),
+			IsClosed:       optional.Some(false),
+			PriorityRepoID: optional.Some(int64(3)),
+			Paginator:      &db.ListOptionsAll,
+			SortBy:         internal.SortByScore,
+		},
+		Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) {
+			for i, v := range result.Hits {
+				if i < 7 {
+					assert.Equal(t, int64(3), data[v.ID].RepoID)
+				} else {
+					assert.NotEqual(t, int64(3), data[v.ID].RepoID)
+				}
+			}
+		},
+	},
 }
 
 type testIndexerCase struct {
@@ -742,6 +839,7 @@ func generateDefaultIndexerData() []*internal.IndexerData {
 
 			data = append(data, &internal.IndexerData{
 				ID:                 id,
+				Index:              issueIndex,
 				RepoID:             repoID,
 				IsPublic:           repoID%2 == 0,
 				Title:              fmt.Sprintf("issue%d of repo%d", issueIndex, repoID),
@@ -783,22 +881,17 @@ func countIndexerData(data map[int64]*internal.IndexerData, f func(v *internal.I
 
 // waitData waits for the indexer to index all data.
 // Some engines like Elasticsearch index data asynchronously, so we need to wait for a while.
-func waitData(indexer internal.Indexer, total int64) error {
+func waitData(t testing.TB, indexer internal.Indexer, total int64) {
 	var actual int64
-	for i := 0; i < 100; i++ {
-		result, err := indexer.Search(context.Background(), &internal.SearchOptions{
+	assert.Eventually(t, func() bool {
+		result, err := indexer.Search(t.Context(), &internal.SearchOptions{
 			Paginator: &db.ListOptions{
 				PageSize: 0,
 			},
 		})
-		if err != nil {
-			return err
-		}
+		require.NoError(t, err)
+
 		actual = result.Total
-		if actual == total {
-			return nil
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	return fmt.Errorf("waitData: expected %d, actual %d", total, actual)
+		return actual == total
+	}, time.Second*10, time.Millisecond*100, "expected %d but got %d", total, actual)
 }
diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go
index 17a8ba2452..8c83a7f417 100644
--- a/modules/indexer/issues/meilisearch/meilisearch.go
+++ b/modules/indexer/issues/meilisearch/meilisearch.go
@@ -13,6 +13,7 @@ import (
 	indexer_internal "forgejo.org/modules/indexer/internal"
 	inner_meilisearch "forgejo.org/modules/indexer/internal/meilisearch"
 	"forgejo.org/modules/indexer/issues/internal"
+	"forgejo.org/modules/json"
 
 	"github.com/meilisearch/meilisearch-go"
 )
@@ -100,7 +101,7 @@ func (b *Indexer) Index(_ context.Context, issues ...*internal.IndexerData) erro
 		return nil
 	}
 	for _, issue := range issues {
-		_, err := b.inner.Client.Index(b.inner.VersionedIndexName()).AddDocuments(issue)
+		_, err := b.inner.Client.Index(b.inner.VersionedIndexName()).AddDocuments(issue, nil)
 		if err != nil {
 			return err
 		}
@@ -305,18 +306,13 @@ func doubleQuoteKeyword(k string) string {
 func convertHits(searchRes *meilisearch.SearchResponse) ([]internal.Match, error) {
 	hits := make([]internal.Match, 0, len(searchRes.Hits))
 	for _, hit := range searchRes.Hits {
-		hit, ok := hit.(map[string]any)
-		if !ok {
-			return nil, ErrMalformedResponse
-		}
-
-		issueID, ok := hit["id"].(float64)
-		if !ok {
+		var issueID int64
+		if err := json.Unmarshal(hit["id"], &issueID); err != nil {
 			return nil, ErrMalformedResponse
 		}
 
 		hits = append(hits, internal.Match{
-			ID: int64(issueID),
+			ID: issueID,
 		})
 	}
 	return hits, nil
diff --git a/modules/indexer/issues/meilisearch/meilisearch_test.go b/modules/indexer/issues/meilisearch/meilisearch_test.go
index 01160a5240..810de77046 100644
--- a/modules/indexer/issues/meilisearch/meilisearch_test.go
+++ b/modules/indexer/issues/meilisearch/meilisearch_test.go
@@ -34,20 +34,10 @@ func TestMeilisearchIndexer(t *testing.T) {
 		key = os.Getenv("TEST_MEILISEARCH_KEY")
 	}
 
-	ok := false
-	for i := 0; i < 60; i++ {
+	require.Eventually(t, func() bool {
 		resp, err := http.Get(url)
-		if err == nil && resp.StatusCode == http.StatusOK {
-			ok = true
-			break
-		}
-		t.Logf("Waiting for meilisearch to be up: %v", err)
-		time.Sleep(time.Second)
-	}
-	if !ok {
-		t.Fatalf("Failed to wait for meilisearch to be up")
-		return
-	}
+		return err == nil && resp.StatusCode == http.StatusOK
+	}, time.Minute, time.Microsecond*100, "Failed to wait for meilisearch to be up")
 
 	indexer := NewIndexer(url, key, fmt.Sprintf("test_meilisearch_indexer_%d", time.Now().Unix()))
 	defer indexer.Close()
@@ -56,42 +46,46 @@ func TestMeilisearchIndexer(t *testing.T) {
 }
 
 func TestConvertHits(t *testing.T) {
-	_, err := convertHits(&meilisearch.SearchResponse{
-		Hits: []any{"aa", "bb", "cc", "dd"},
-	})
-	require.ErrorIs(t, err, ErrMalformedResponse)
+	for _, invalidID := range []string{"\"aa\"", "{\"aa\":\"123\"}", "[\"aa\"]"} {
+		_, err := convertHits(&meilisearch.SearchResponse{
+			Hits: meilisearch.Hits{
+				meilisearch.Hit{"id": []byte(invalidID)},
+			},
+		})
+		require.ErrorIs(t, err, ErrMalformedResponse)
+	}
 
 	validResponse := &meilisearch.SearchResponse{
-		Hits: []any{
-			map[string]any{
-				"id":       float64(11),
-				"title":    "a title",
-				"content":  "issue body with no match",
-				"comments": []any{"hey what's up?", "I'm currently bowling", "nice"},
+		Hits: meilisearch.Hits{
+			meilisearch.Hit{
+				"id":       []byte("11"),
+				"title":    []byte("\"a title\""),
+				"content":  []byte("\"issue body with no match\""),
+				"comments": []byte("[\"hey what's up?\", \"I'm currently bowling\", \"nice\"]"),
 			},
-			map[string]any{
-				"id":       float64(22),
-				"title":    "Bowling as title",
-				"content":  "",
-				"comments": []any{},
+			meilisearch.Hit{
+				"id":       []byte("22"),
+				"title":    []byte("\"Bowling as title\""),
+				"content":  []byte("\"\""),
+				"comments": []byte("[]"),
 			},
-			map[string]any{
-				"id":       float64(33),
-				"title":    "Bowl-ing as fuzzy match",
-				"content":  "",
-				"comments": []any{},
+			meilisearch.Hit{
+				"id":       []byte("33"),
+				"title":    []byte("\"Bowl-ing as fuzzy match\""),
+				"content":  []byte("\"\""),
+				"comments": []byte("[]"),
 			},
 		},
 	}
 	hits, err := convertHits(validResponse)
 	require.NoError(t, err)
-	assert.EqualValues(t, []internal.Match{{ID: 11}, {ID: 22}, {ID: 33}}, hits)
+	assert.Equal(t, []internal.Match{{ID: 11}, {ID: 22}, {ID: 33}}, hits)
 }
 
 func TestDoubleQuoteKeyword(t *testing.T) {
-	assert.EqualValues(t, "", doubleQuoteKeyword(""))
-	assert.EqualValues(t, `"a" "b" "c"`, doubleQuoteKeyword("a b c"))
-	assert.EqualValues(t, `"a" "d" "g"`, doubleQuoteKeyword("a  d g"))
-	assert.EqualValues(t, `"a" "d" "g"`, doubleQuoteKeyword("a  d g"))
-	assert.EqualValues(t, `"a" "d" "g"`, doubleQuoteKeyword(`a  "" "d" """g`))
+	assert.Empty(t, doubleQuoteKeyword(""))
+	assert.Equal(t, `"a" "b" "c"`, doubleQuoteKeyword("a b c"))
+	assert.Equal(t, `"a" "d" "g"`, doubleQuoteKeyword("a  d g"))
+	assert.Equal(t, `"a" "d" "g"`, doubleQuoteKeyword("a  d g"))
+	assert.Equal(t, `"a" "d" "g"`, doubleQuoteKeyword(`a  "" "d" """g`))
 }
diff --git a/modules/indexer/issues/util.go b/modules/indexer/issues/util.go
index 3e6c8babe4..909e840ae5 100644
--- a/modules/indexer/issues/util.go
+++ b/modules/indexer/issues/util.go
@@ -95,6 +95,7 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
 	return &internal.IndexerData{
 		ID:                 issue.ID,
 		RepoID:             issue.RepoID,
+		Index:              issue.Index,
 		IsPublic:           !issue.Repo.IsPrivate,
 		Title:              issue.Title,
 		Content:            issue.Content,
diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go
index 2403eb8dca..e4eac70d95 100644
--- a/modules/indexer/stats/queue.go
+++ b/modules/indexer/stats/queue.go
@@ -4,7 +4,7 @@
 package stats
 
 import (
-	"fmt"
+	"errors"
 
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/modules/graceful"
@@ -31,7 +31,7 @@ func handler(items ...int64) []int64 {
 func initStatsQueue() error {
 	statsQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "repo_stats_update", handler)
 	if statsQueue == nil {
-		return fmt.Errorf("unable to create repo_stats_update queue")
+		return errors.New("unable to create repo_stats_update queue")
 	}
 	go graceful.GetManager().RunWithCancel(statsQueue)
 	return nil
diff --git a/modules/issue/template/template.go b/modules/issue/template/template.go
index 8e07cbecd8..08c1b21c26 100644
--- a/modules/issue/template/template.go
+++ b/modules/issue/template/template.go
@@ -4,6 +4,7 @@
 package template
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"regexp"
@@ -31,17 +32,17 @@ func Validate(template *api.IssueTemplate) error {
 
 func validateMetadata(template *api.IssueTemplate) error {
 	if strings.TrimSpace(template.Name) == "" {
-		return fmt.Errorf("'name' is required")
+		return errors.New("'name' is required")
 	}
 	if strings.TrimSpace(template.About) == "" {
-		return fmt.Errorf("'about' is required")
+		return errors.New("'about' is required")
 	}
 	return nil
 }
 
 func validateYaml(template *api.IssueTemplate) error {
 	if len(template.Fields) == 0 {
-		return fmt.Errorf("'body' is required")
+		return errors.New("'body' is required")
 	}
 	ids := make(container.Set[string])
 	for idx, field := range template.Fields {
@@ -191,7 +192,7 @@ func validateOptions(field *api.IssueFormField, idx int) error {
 				}
 				for _, visibleType := range visibilityList {
 					visibleType, ok := visibleType.(string)
-					if !ok || !(visibleType == "form" || visibleType == "content") {
+					if !ok || (visibleType != "form" && visibleType != "content") {
 						return position.Errorf("'visible' list can only contain strings of 'form' and 'content'")
 					}
 				}
diff --git a/modules/issue/template/template_test.go b/modules/issue/template/template_test.go
index 89e8924e95..10ede4be81 100644
--- a/modules/issue/template/template_test.go
+++ b/modules/issue/template/template_test.go
@@ -902,7 +902,7 @@ Option 1 of dropdown, Option 2 of dropdown
 				t.Fatal(err)
 			}
 			if got := RenderToMarkdown(template, tt.args.values); got != tt.want {
-				assert.EqualValues(t, tt.want, got)
+				assert.Equal(t, tt.want, got)
 			}
 		})
 	}
diff --git a/modules/keying/keying.go b/modules/keying/keying.go
index 30c664180c..f39e16aeed 100644
--- a/modules/keying/keying.go
+++ b/modules/keying/keying.go
@@ -17,10 +17,11 @@ package keying
 
 import (
 	"crypto/hkdf"
-	"crypto/rand"
 	"crypto/sha256"
 	"encoding/binary"
 
+	"forgejo.org/modules/util"
+
 	"golang.org/x/crypto/chacha20poly1305"
 )
 
@@ -57,6 +58,8 @@ var (
 	ContextPushMirror Context = "pushmirror"
 	// Used for the `two_factor` table.
 	ContextTOTP Context = "totp"
+	// Used for the `secret` table.
+	ContextActionSecret Context = "action_secret"
 )
 
 // Derive *the* key for a given context, this is a deterministic function.
@@ -95,10 +98,7 @@ func (k *Key) Encrypt(plaintext, additionalData []byte) []byte {
 	}
 
 	// Generate a random nonce.
-	nonce := make([]byte, aeadNonceSize)
-	if n, err := rand.Read(nonce); err != nil || n != aeadNonceSize {
-		panic(err)
-	}
+	nonce := util.CryptoRandomBytes(aeadNonceSize)
 
 	// Returns the ciphertext of this plaintext.
 	return e.Seal(nonce, nonce, plaintext, additionalData)
diff --git a/modules/keying/keying_test.go b/modules/keying/keying_test.go
index 87dce0a566..f73440b357 100644
--- a/modules/keying/keying_test.go
+++ b/modules/keying/keying_test.go
@@ -50,7 +50,7 @@ func TestKeying(t *testing.T) {
 		cipherText2 := key.Encrypt(plainText, []byte{0x05, 0x06})
 
 		// Ensure ciphertexts don't have an deterministic output.
-		assert.NotEqualValues(t, cipherText, cipherText2)
+		assert.NotEqual(t, cipherText, cipherText2)
 	})
 
 	t.Run("Decrypt", func(t *testing.T) {
@@ -59,7 +59,7 @@ func TestKeying(t *testing.T) {
 		t.Run("Successful", func(t *testing.T) {
 			convertedPlainText, err := key.Decrypt(cipherText, []byte{0x05, 0x06})
 			require.NoError(t, err)
-			assert.EqualValues(t, plainText, convertedPlainText)
+			assert.Equal(t, plainText, convertedPlainText)
 		})
 
 		t.Run("Not enough additional data", func(t *testing.T) {
@@ -97,15 +97,15 @@ func TestKeying(t *testing.T) {
 }
 
 func TestKeyingColumnAndID(t *testing.T) {
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table", math.MinInt64))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table", -1))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table", 0))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, keying.ColumnAndID("table", 1))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table", math.MaxInt64))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table", math.MinInt64))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table", -1))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table", 0))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, keying.ColumnAndID("table", 1))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x3a, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table", math.MaxInt64))
 
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table2", math.MinInt64))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table2", -1))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table2", 0))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, keying.ColumnAndID("table2", 1))
-	assert.EqualValues(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table2", math.MaxInt64))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table2", math.MinInt64))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table2", -1))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, keying.ColumnAndID("table2", 0))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}, keying.ColumnAndID("table2", 1))
+	assert.Equal(t, []byte{0x74, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x3a, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, keying.ColumnAndID("table2", math.MaxInt64))
 }
diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go
index ba23cec2be..c76b2c142c 100644
--- a/modules/lfs/content_store.go
+++ b/modules/lfs/content_store.go
@@ -79,7 +79,7 @@ func (s *ContentStore) Put(pointer Pointer, r io.Reader) error {
 
 // Exists returns true if the object exists in the content store.
 func (s *ContentStore) Exists(pointer Pointer) (bool, error) {
-	_, err := s.ObjectStorage.Stat(pointer.RelativePath())
+	_, err := s.Stat(pointer.RelativePath())
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil
@@ -92,7 +92,7 @@ func (s *ContentStore) Exists(pointer Pointer) (bool, error) {
 // Verify returns true if the object exists in the content store and size is correct.
 func (s *ContentStore) Verify(pointer Pointer) (bool, error) {
 	p := pointer.RelativePath()
-	fi, err := s.ObjectStorage.Stat(p)
+	fi, err := s.Stat(p)
 	if os.IsNotExist(err) || (err == nil && fi.Size() != pointer.Size) {
 		return false, nil
 	} else if err != nil {
diff --git a/modules/lfs/pointer_scanner.go b/modules/lfs/pointer_scanner.go
index 632ecd19ae..80da8e5222 100644
--- a/modules/lfs/pointer_scanner.go
+++ b/modules/lfs/pointer_scanner.go
@@ -39,16 +39,7 @@ func SearchPointerBlobs(ctx context.Context, repo *git.Repository, pointerChan c
 	go pipeline.BlobsLessThan1024FromCatFileBatchCheck(catFileCheckReader, shasToBatchWriter, &wg)
 
 	// 1. Run batch-check on all objects in the repository
-	if git.CheckGitVersionAtLeast("2.6.0") != nil {
-		revListReader, revListWriter := io.Pipe()
-		shasToCheckReader, shasToCheckWriter := io.Pipe()
-		wg.Add(2)
-		go pipeline.CatFileBatchCheck(ctx, shasToCheckReader, catFileCheckWriter, &wg, basePath)
-		go pipeline.BlobsFromRevListObjects(revListReader, shasToCheckWriter, &wg)
-		go pipeline.RevListAllObjects(ctx, revListWriter, &wg, basePath, errChan)
-	} else {
-		go pipeline.CatFileBatchCheckAllObjects(ctx, catFileCheckWriter, &wg, basePath, errChan)
-	}
+	go pipeline.CatFileBatchCheckAllObjects(ctx, catFileCheckWriter, &wg, basePath, errChan)
 	wg.Wait()
 
 	close(pointerChan)
diff --git a/modules/locale/utils.go b/modules/locale/utils.go
deleted file mode 100644
index 726dc92adc..0000000000
--- a/modules/locale/utils.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// Copyright 2025 The Forgejo Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-// extracted from `/build/lint-locale.go`, `/build/lint-locale-usage.go`
-
-package locale
-
-import (
-	"encoding/json" //nolint:depguard
-	"fmt"
-
-	"gopkg.in/ini.v1" //nolint:depguard
-)
-
-func IterateMessagesContent(localeContent []byte, onMsgid func(string, string) error) error {
-	// Same configuration as Forgejo uses.
-	cfg := ini.Empty(ini.LoadOptions{
-		IgnoreContinuation: true,
-	})
-	cfg.NameMapper = ini.SnackCase
-
-	if err := cfg.Append(localeContent); err != nil {
-		return err
-	}
-
-	for _, section := range cfg.Sections() {
-		for _, key := range section.Keys() {
-			var trKey string
-			if section.Name() == "" || section.Name() == "DEFAULT" || section.Name() == "common" {
-				trKey = key.Name()
-			} else {
-				trKey = section.Name() + "." + key.Name()
-			}
-			if err := onMsgid(trKey, key.Value()); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func iterateMessagesNextInner(onMsgid func(string, string) error, data map[string]any, trKey ...string) error {
-	for key, value := range data {
-		currentKey := key
-		if len(trKey) == 1 {
-			currentKey = trKey[0] + "." + key
-		}
-
-		switch value := value.(type) {
-		case string:
-			if err := onMsgid(currentKey, value); err != nil {
-				return err
-			}
-		case map[string]any:
-			if err := iterateMessagesNextInner(onMsgid, value, currentKey); err != nil {
-				return err
-			}
-		default:
-			return fmt.Errorf("unexpected type: %s - %T", currentKey, value)
-		}
-	}
-
-	return nil
-}
-
-func IterateMessagesNextContent(localeContent []byte, onMsgid func(string, string) error) error {
-	var localeData map[string]any
-	if err := json.Unmarshal(localeContent, &localeData); err != nil {
-		return err
-	}
-	return iterateMessagesNextInner(onMsgid, localeData)
-}
diff --git a/modules/log/event_format.go b/modules/log/event_format.go
index df6b083a92..6835a4ca5b 100644
--- a/modules/log/event_format.go
+++ b/modules/log/event_format.go
@@ -13,10 +13,9 @@ import (
 type Event struct {
 	Time time.Time
 
-	GoroutinePid string
-	Caller       string
-	Filename     string
-	Line         int
+	Caller   string
+	Filename string
+	Line     int
 
 	Level Level
 
@@ -225,19 +224,6 @@ func EventFormatTextMessage(mode *WriterMode, event *Event, msgFormat string, ms
 		msg = msg[:len(msg)-1]
 	}
 
-	if flags&Lgopid == Lgopid {
-		if event.GoroutinePid != "" {
-			buf = append(buf, '[')
-			if mode.Colorize {
-				buf = append(buf, ColorBytes(FgHiYellow)...)
-			}
-			buf = append(buf, event.GoroutinePid...)
-			if mode.Colorize {
-				buf = append(buf, resetBytes...)
-			}
-			buf = append(buf, ']', ' ')
-		}
-	}
 	buf = append(buf, msg...)
 
 	if event.Stacktrace != "" && mode.StacktraceLevel <= event.Level {
diff --git a/modules/log/event_format_test.go b/modules/log/event_format_test.go
index 0c6061eaea..f6f9754300 100644
--- a/modules/log/event_format_test.go
+++ b/modules/log/event_format_test.go
@@ -24,48 +24,45 @@ func TestItoa(t *testing.T) {
 func TestEventFormatTextMessage(t *testing.T) {
 	res := EventFormatTextMessage(&WriterMode{Prefix: "[PREFIX] ", Colorize: false, Flags: Flags{defined: true, flags: 0xffffffff}},
 		&Event{
-			Time:         time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
-			Caller:       "caller",
-			Filename:     "filename",
-			Line:         123,
-			GoroutinePid: "pid",
-			Level:        ERROR,
-			Stacktrace:   "stacktrace",
+			Time:       time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
+			Caller:     "caller",
+			Filename:   "filename",
+			Line:       123,
+			Level:      ERROR,
+			Stacktrace: "stacktrace",
 		},
 		"msg format: %v %v", "arg0", NewColoredValue("arg1", FgBlue),
 	)
 
-	assert.Equal(t, `<3>[PREFIX] 2020/01/02 03:04:05.000000 filename:123:caller [E] [pid] msg format: arg0 arg1
+	assert.Equal(t, `<3>[PREFIX] 2020/01/02 03:04:05.000000 filename:123:caller [E] msg format: arg0 arg1
 	stacktrace
 
 `, string(res))
 
 	res = EventFormatTextMessage(&WriterMode{Prefix: "[PREFIX] ", Colorize: true, Flags: Flags{defined: true, flags: 0xffffffff}},
 		&Event{
-			Time:         time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
-			Caller:       "caller",
-			Filename:     "filename",
-			Line:         123,
-			GoroutinePid: "pid",
-			Level:        ERROR,
-			Stacktrace:   "stacktrace",
+			Time:       time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
+			Caller:     "caller",
+			Filename:   "filename",
+			Line:       123,
+			Level:      ERROR,
+			Stacktrace: "stacktrace",
 		},
 		"msg format: %v %v", "arg0", NewColoredValue("arg1", FgBlue),
 	)
 
-	assert.Equal(t, "<3>[PREFIX] \x1b[36m2020/01/02 03:04:05.000000 \x1b[0m\x1b[32mfilename:123:\x1b[32mcaller\x1b[0m \x1b[1;31m[E]\x1b[0m [\x1b[93mpid\x1b[0m] msg format: arg0 \x1b[34marg1\x1b[0m\n\tstacktrace\n\n", string(res))
+	assert.Equal(t, "<3>[PREFIX] \x1b[36m2020/01/02 03:04:05.000000 \x1b[0m\x1b[32mfilename:123:\x1b[32mcaller\x1b[0m \x1b[1;31m[E]\x1b[0m msg format: arg0 \x1b[34marg1\x1b[0m\n\tstacktrace\n\n", string(res))
 }
 
 func TestEventFormatTextMessageStd(t *testing.T) {
 	res := EventFormatTextMessage(&WriterMode{Prefix: "[PREFIX] ", Colorize: false, Flags: Flags{defined: true, flags: LstdFlags}},
 		&Event{
-			Time:         time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
-			Caller:       "caller",
-			Filename:     "filename",
-			Line:         123,
-			GoroutinePid: "pid",
-			Level:        ERROR,
-			Stacktrace:   "stacktrace",
+			Time:       time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
+			Caller:     "caller",
+			Filename:   "filename",
+			Line:       123,
+			Level:      ERROR,
+			Stacktrace: "stacktrace",
 		},
 		"msg format: %v %v", "arg0", NewColoredValue("arg1", FgBlue),
 	)
@@ -77,13 +74,12 @@ func TestEventFormatTextMessageStd(t *testing.T) {
 
 	res = EventFormatTextMessage(&WriterMode{Prefix: "[PREFIX] ", Colorize: true, Flags: Flags{defined: true, flags: LstdFlags}},
 		&Event{
-			Time:         time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
-			Caller:       "caller",
-			Filename:     "filename",
-			Line:         123,
-			GoroutinePid: "pid",
-			Level:        ERROR,
-			Stacktrace:   "stacktrace",
+			Time:       time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
+			Caller:     "caller",
+			Filename:   "filename",
+			Line:       123,
+			Level:      ERROR,
+			Stacktrace: "stacktrace",
 		},
 		"msg format: %v %v", "arg0", NewColoredValue("arg1", FgBlue),
 	)
@@ -96,13 +92,12 @@ func TestEventFormatTextMessageJournal(t *testing.T) {
 	//       the proper way here is to attach the backtrace as structured metadata, but we can't do that via stderr
 	res := EventFormatTextMessage(&WriterMode{Prefix: "[PREFIX] ", Colorize: false, Flags: Flags{defined: true, flags: LjournaldFlags}},
 		&Event{
-			Time:         time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
-			Caller:       "caller",
-			Filename:     "filename",
-			Line:         123,
-			GoroutinePid: "pid",
-			Level:        ERROR,
-			Stacktrace:   "stacktrace",
+			Time:       time.Date(2020, 1, 2, 3, 4, 5, 6, time.UTC),
+			Caller:     "caller",
+			Filename:   "filename",
+			Line:       123,
+			Level:      ERROR,
+			Stacktrace: "stacktrace",
 		},
 		"msg format: %v %v", "arg0", NewColoredValue("arg1", FgBlue),
 	)
diff --git a/modules/log/event_writer.go b/modules/log/event_writer.go
index 4b77e488de..32b5b582c5 100644
--- a/modules/log/event_writer.go
+++ b/modules/log/event_writer.go
@@ -26,6 +26,7 @@ type WriterMode struct {
 	Flags    Flags
 
 	Expression string
+	Exclusion  string
 
 	StacktraceLevel Level
 
diff --git a/modules/log/event_writer_base.go b/modules/log/event_writer_base.go
index c327c48ca2..4de2b953c7 100644
--- a/modules/log/event_writer_base.go
+++ b/modules/log/event_writer_base.go
@@ -68,6 +68,14 @@ func (b *EventWriterBaseImpl) Run(ctx context.Context) {
 		}
 	}
 
+	var exclusionRegexp *regexp.Regexp
+	if b.Mode.Exclusion != "" {
+		var err error
+		if exclusionRegexp, err = regexp.Compile(b.Mode.Exclusion); err != nil {
+			FallbackErrorf("unable to compile exclusion %q for writer %q: %v", b.Mode.Exclusion, b.Name, err)
+		}
+	}
+
 	handlePaused := func() {
 		if pause := b.GetPauseChan(); pause != nil {
 			select {
@@ -95,6 +103,13 @@ func (b *EventWriterBaseImpl) Run(ctx context.Context) {
 					continue
 				}
 			}
+			if exclusionRegexp != nil {
+				fileLineCaller := fmt.Sprintf("%s:%d:%s", event.Origin.Filename, event.Origin.Line, event.Origin.Caller)
+				matched := exclusionRegexp.MatchString(fileLineCaller) || exclusionRegexp.MatchString(event.Origin.MsgSimpleText)
+				if matched {
+					continue
+				}
+			}
 
 			var err error
 			switch msg := event.Msg.(type) {
@@ -105,7 +120,7 @@ func (b *EventWriterBaseImpl) Run(ctx context.Context) {
 			case io.WriterTo:
 				_, err = msg.WriteTo(b.OutputWriteCloser)
 			default:
-				_, err = b.OutputWriteCloser.Write([]byte(fmt.Sprint(msg)))
+				_, err = fmt.Fprint(b.OutputWriteCloser, msg)
 			}
 			if err != nil {
 				FallbackErrorf("unable to write log message of %q (%v): %v", b.Name, err, event.Msg)
diff --git a/modules/log/event_writer_buffer_test.go b/modules/log/event_writer_buffer_test.go
index ba9455ba69..d1e37c3673 100644
--- a/modules/log/event_writer_buffer_test.go
+++ b/modules/log/event_writer_buffer_test.go
@@ -31,3 +31,49 @@ func TestBufferLogger(t *testing.T) {
 	logger.Close()
 	assert.Contains(t, bufferWriter.Buffer.String(), expected)
 }
+
+func TestBufferLoggerWithExclusion(t *testing.T) {
+	prefix := "ExclusionPrefix "
+	level := log.INFO
+	message := "something"
+
+	bufferWriter := log.NewEventWriterBuffer("test-buffer", log.WriterMode{
+		Level:     level,
+		Prefix:    prefix,
+		Exclusion: message,
+	})
+
+	logger := log.NewLoggerWithWriters(t.Context(), "test", bufferWriter)
+
+	logger.SendLogEvent(&log.Event{
+		Level:         log.INFO,
+		MsgSimpleText: message,
+	})
+	logger.Close()
+	assert.NotContains(t, bufferWriter.Buffer.String(), message)
+}
+
+func TestBufferLoggerWithExpressionAndExclusion(t *testing.T) {
+	prefix := "BothPrefix "
+	level := log.INFO
+	expression := ".*foo.*"
+	exclusion := ".*bar.*"
+
+	bufferWriter := log.NewEventWriterBuffer("test-buffer", log.WriterMode{
+		Level:      level,
+		Prefix:     prefix,
+		Expression: expression,
+		Exclusion:  exclusion,
+	})
+
+	logger := log.NewLoggerWithWriters(t.Context(), "test", bufferWriter)
+
+	logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "foo expression"})
+	logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "bar exclusion"})
+	logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "foo bar both"})
+	logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "none"})
+	logger.Close()
+
+	assert.Contains(t, bufferWriter.Buffer.String(), "foo expression")
+	assert.NotContains(t, bufferWriter.Buffer.String(), "bar")
+}
diff --git a/modules/log/flags.go b/modules/log/flags.go
index afce30680d..1e4fe830c1 100644
--- a/modules/log/flags.go
+++ b/modules/log/flags.go
@@ -30,7 +30,6 @@ const (
 	LUTC                              // if Ldate or Ltime is set, use UTC rather than the local time zone
 	Llevelinitial                     // Initial character of the provided level in brackets, eg. [I] for info
 	Llevel                            // Provided level in brackets [INFO]
-	Lgopid                            // the Goroutine-PID of the context
 	Llevelprefix                      // printk-style logging prefixes as documented in sd-daemon(3), used by journald
 
 	Lmedfile       = Lshortfile | Llongfile                                    // last 20 characters of the filename
@@ -57,7 +56,6 @@ var flagFromString = map[string]uint32{
 	"levelinitial":  Llevelinitial,
 	"level":         Llevel,
 	"levelprefix":   Llevelprefix,
-	"gopid":         Lgopid,
 
 	"medfile":       Lmedfile,
 	"stdflags":      LstdFlags,
@@ -82,7 +80,6 @@ var flagComboToString = []struct {
 	{LUTC, "utc"},
 	{Llevelinitial, "levelinitial"},
 	{Llevel, "level"},
-	{Lgopid, "gopid"},
 }
 
 func (f Flags) Bits() uint32 {
diff --git a/modules/log/flags_test.go b/modules/log/flags_test.go
index 1ee322c630..f39fe440e2 100644
--- a/modules/log/flags_test.go
+++ b/modules/log/flags_test.go
@@ -13,19 +13,17 @@ import (
 )
 
 func TestFlags(t *testing.T) {
-	assert.EqualValues(t, Ldefault, Flags{}.Bits())
+	assert.Equal(t, Ldefault, Flags{}.Bits())
 	assert.EqualValues(t, 0, FlagsFromString("").Bits())
-	assert.EqualValues(t, Lgopid, FlagsFromString("", Lgopid).Bits())
-	assert.EqualValues(t, 0, FlagsFromString("none", Lgopid).Bits())
-	assert.EqualValues(t, Ldate|Ltime, FlagsFromString("date,time", Lgopid).Bits())
+	assert.Equal(t, Ldate|Ltime, FlagsFromString("date,time").Bits())
 
-	assert.EqualValues(t, "stdflags", FlagsFromString("stdflags").String())
-	assert.EqualValues(t, "medfile", FlagsFromString("medfile").String())
+	assert.Equal(t, "stdflags", FlagsFromString("stdflags").String())
+	assert.Equal(t, "medfile", FlagsFromString("medfile").String())
 
 	bs, err := json.Marshal(FlagsFromString("utc,level"))
 	require.NoError(t, err)
-	assert.EqualValues(t, `"level,utc"`, string(bs))
+	assert.Equal(t, `"level,utc"`, string(bs))
 	var flags Flags
 	require.NoError(t, json.Unmarshal(bs, &flags))
-	assert.EqualValues(t, LUTC|Llevel, flags.Bits())
+	assert.Equal(t, LUTC|Llevel, flags.Bits())
 }
diff --git a/modules/log/groutinelabel.go b/modules/log/groutinelabel.go
deleted file mode 100644
index cd5fb96d52..0000000000
--- a/modules/log/groutinelabel.go
+++ /dev/null
@@ -1,21 +0,0 @@
-//go:build !go1.24
-
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package log
-
-import "unsafe"
-
-//go:linkname runtime_getProfLabel runtime/pprof.runtime_getProfLabel
-func runtime_getProfLabel() unsafe.Pointer //nolint
-
-type labelMap map[string]string
-
-func getGoroutineLabels() map[string]string {
-	l := (*labelMap)(runtime_getProfLabel())
-	if l == nil {
-		return nil
-	}
-	return *l
-}
diff --git a/modules/log/groutinelabel_go1.24.go b/modules/log/groutinelabel_go1.24.go
deleted file mode 100644
index e849811bc2..0000000000
--- a/modules/log/groutinelabel_go1.24.go
+++ /dev/null
@@ -1,38 +0,0 @@
-//go:build go1.24
-
-// Copyright 2024 The Forgejo Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package log
-
-import "unsafe"
-
-//go:linkname runtime_getProfLabel runtime/pprof.runtime_getProfLabel
-func runtime_getProfLabel() unsafe.Pointer //nolint
-
-// Struct definitions copied from: https://github.com/golang/go/blob/ca63101df47a4467bc80faa654fc19d68e583952/src/runtime/pprof/label.go
-type label struct {
-	key   string
-	value string
-}
-
-type LabelSet struct {
-	list []label
-}
-
-type labelMap struct {
-	LabelSet
-}
-
-func getGoroutineLabels() map[string]string {
-	l := (*labelMap)(runtime_getProfLabel())
-	if l == nil {
-		return nil
-	}
-
-	m := make(map[string]string, len(l.list))
-	for _, label := range l.list {
-		m[label.key] = label.value
-	}
-	return m
-}
diff --git a/modules/log/groutinelabel_test.go b/modules/log/groutinelabel_test.go
deleted file mode 100644
index df8c1e9259..0000000000
--- a/modules/log/groutinelabel_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package log
-
-import (
-	"context"
-	"runtime/pprof"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_getGoroutineLabels(t *testing.T) {
-	pprof.Do(t.Context(), pprof.Labels(), func(ctx context.Context) {
-		currentLabels := getGoroutineLabels()
-		pprof.ForLabels(ctx, func(key, value string) bool {
-			assert.EqualValues(t, value, currentLabels[key])
-			return true
-		})
-
-		pprof.Do(ctx, pprof.Labels("Test_getGoroutineLabels", "Test_getGoroutineLabels_child1"), func(ctx context.Context) {
-			currentLabels := getGoroutineLabels()
-			pprof.ForLabels(ctx, func(key, value string) bool {
-				assert.EqualValues(t, value, currentLabels[key])
-				return true
-			})
-			if assert.NotNil(t, currentLabels) {
-				assert.EqualValues(t, "Test_getGoroutineLabels_child1", currentLabels["Test_getGoroutineLabels"])
-			}
-		})
-	})
-}
diff --git a/modules/log/logger_impl.go b/modules/log/logger_impl.go
index b21e800f52..76d7e6a821 100644
--- a/modules/log/logger_impl.go
+++ b/modules/log/logger_impl.go
@@ -200,11 +200,6 @@ func (l *LoggerImpl) Log(skip int, level Level, format string, logArgs ...any) {
 		event.Stacktrace = Stack(skip + 1)
 	}
 
-	labels := getGoroutineLabels()
-	if labels != nil {
-		event.GoroutinePid = labels["pid"]
-	}
-
 	// get a simple text message without color
 	msgArgs := make([]any, len(logArgs))
 	copy(msgArgs, logArgs)
diff --git a/modules/log/logger_test.go b/modules/log/logger_test.go
index e04c9da8b0..99045b0f4f 100644
--- a/modules/log/logger_test.go
+++ b/modules/log/logger_test.go
@@ -56,16 +56,16 @@ func TestLogger(t *testing.T) {
 
 	dump := logger.DumpWriters()
 	assert.Empty(t, dump)
-	assert.EqualValues(t, NONE, logger.GetLevel())
+	assert.Equal(t, NONE, logger.GetLevel())
 	assert.False(t, logger.IsEnabled())
 
 	w1 := newDummyWriter("dummy-1", DEBUG, 0)
 	logger.AddWriters(w1)
-	assert.EqualValues(t, DEBUG, logger.GetLevel())
+	assert.Equal(t, DEBUG, logger.GetLevel())
 
 	w2 := newDummyWriter("dummy-2", WARN, 200*time.Millisecond)
 	logger.AddWriters(w2)
-	assert.EqualValues(t, DEBUG, logger.GetLevel())
+	assert.Equal(t, DEBUG, logger.GetLevel())
 
 	dump = logger.DumpWriters()
 	assert.Len(t, dump, 2)
@@ -143,3 +143,19 @@ func TestLoggerExpressionFilter(t *testing.T) {
 
 	assert.Equal(t, []string{"foo\n", "foo bar\n", "by filename\n"}, w1.GetLogs())
 }
+
+func TestLoggerExclusionFilter(t *testing.T) {
+	logger := NewLoggerWithWriters(t.Context(), "test")
+
+	w1 := newDummyWriter("dummy-1", DEBUG, 0)
+	w1.Mode.Exclusion = "foo.*"
+	logger.AddWriters(w1)
+
+	logger.Info("foo")
+	logger.Info("bar")
+	logger.Info("foo bar")
+	logger.SendLogEvent(&Event{Level: INFO, Filename: "foo.go", MsgSimpleText: "by filename"})
+	logger.Close()
+
+	assert.Equal(t, []string{"bar\n"}, w1.GetLogs())
+}
diff --git a/modules/markup/common/footnote.go b/modules/markup/common/footnote.go
index 0e75e2adfd..05125dbcc1 100644
--- a/modules/markup/common/footnote.go
+++ b/modules/markup/common/footnote.go
@@ -459,7 +459,7 @@ func (r *FootnoteHTMLRenderer) renderFootnoteList(w util.BufWriter, source []byt
 			html.RenderAttributes(w, node, html.GlobalAttributeFilter)
 		}
 		_ = w.WriteByte('>')
-		if r.Config.XHTML {
+		if r.XHTML {
 			_, _ = w.WriteString("\n<hr />\n")
 		} else {
 			_, _ = w.WriteString("\n<hr>\n")
diff --git a/modules/markup/common/linkify.go b/modules/markup/common/linkify.go
index f84680205e..e3c069b01d 100644
--- a/modules/markup/common/linkify.go
+++ b/modules/markup/common/linkify.go
@@ -17,7 +17,7 @@ import (
 	"github.com/yuin/goldmark/util"
 )
 
-var wwwURLRegxp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`)
+var wwwURLRegexp = regexp.MustCompile(`^www\.[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}((?:/|[#?])[-a-zA-Z0-9@:%_\+.~#!?&//=\(\);,'">\^{}\[\]` + "`" + `]*)?`)
 
 type linkifyParser struct{}
 
@@ -63,7 +63,7 @@ func (s *linkifyParser) Parse(parent ast.Node, block text.Reader, pc parser.Cont
 		m = LinkRegex.FindSubmatchIndex(line)
 	}
 	if m == nil && bytes.HasPrefix(line, domainWWW) {
-		m = wwwURLRegxp.FindSubmatchIndex(line)
+		m = wwwURLRegexp.FindSubmatchIndex(line)
 		protocol = []byte("http")
 	}
 	if m != nil {
@@ -73,9 +73,10 @@ func (s *linkifyParser) Parse(parent ast.Node, block text.Reader, pc parser.Cont
 		} else if lastChar == ')' {
 			closing := 0
 			for i := m[1] - 1; i >= m[0]; i-- {
-				if line[i] == ')' {
+				switch line[i] {
+				case ')':
 					closing++
-				} else if line[i] == '(' {
+				case '(':
 					closing--
 				}
 			}
diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go
index 11e0a54e5d..0e8a0738c2 100644
--- a/modules/markup/console/console_test.go
+++ b/modules/markup/console/console_test.go
@@ -28,6 +28,6 @@ func TestRenderConsole(t *testing.T) {
 		err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext},
 			strings.NewReader(k), &buf)
 		require.NoError(t, err)
-		assert.EqualValues(t, v, buf.String())
+		assert.Equal(t, v, buf.String())
 	}
 }
diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go
index 008a899c05..b536530196 100644
--- a/modules/markup/csv/csv_test.go
+++ b/modules/markup/csv/csv_test.go
@@ -28,6 +28,6 @@ func TestRenderCSV(t *testing.T) {
 		err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext},
 			strings.NewReader(k), &buf)
 		require.NoError(t, err)
-		assert.EqualValues(t, v, buf.String())
+		assert.Equal(t, v, buf.String())
 	}
 }
diff --git a/modules/markup/file_preview.go b/modules/markup/file_preview.go
index 5499eff18c..8b1442ed08 100644
--- a/modules/markup/file_preview.go
+++ b/modules/markup/file_preview.go
@@ -341,7 +341,7 @@ func (p *FilePreview) CreateHTML(locale translation.Locale) *html.Node {
 	psubtitle := &html.Node{
 		Type: html.ElementNode,
 		Data: atom.Span.String(),
-		Attr: []html.Attribute{{Key: "class", Val: "text small grey"}},
+		Attr: []html.Attribute{{Key: "class", Val: "text grey"}},
 	}
 	psubtitle.AppendChild(&html.Node{
 		Type: html.RawNode,
diff --git a/modules/markup/html.go b/modules/markup/html.go
index 323adf931d..7961c5c930 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -55,7 +55,7 @@ var (
 	shortLinkPattern = regexp.MustCompile(`\[\[(.*?)\]\](\w*)`)
 
 	// anyHashPattern splits url containing SHA into parts
-	anyHashPattern = regexp.MustCompile(`https?://(?:\S+/){4,5}([0-9a-f]{7,64})(/[-+~_%.a-zA-Z0-9/]+)?(\?[-+~_%\.a-zA-Z0-9=&]+)?(#[-+~_%.a-zA-Z0-9]+)?`)
+	anyHashPattern = regexp.MustCompile(`https?://(?:(?:\S+/){3,4}(?:commit|tree|blob)/)([0-9a-f]{7,64})(/[-+~_%.a-zA-Z0-9/]+)?(\?[-+~_%\.a-zA-Z0-9=&]+)?(#[-+~_%.a-zA-Z0-9]+)?`)
 
 	// comparePattern matches "http://domain/org/repo/compare/COMMIT1...COMMIT2#hash"
 	comparePattern = regexp.MustCompile(`https?://(?:\S+/){4,5}([0-9a-f]{7,64})(\.\.\.?)([0-9a-f]{7,64})?(#[-+~_%.a-zA-Z0-9]+)?`)
@@ -69,6 +69,10 @@ var (
 	//   https://html.spec.whatwg.org/multipage/input.html#e-mail-state-(type%3Demail)
 	emailRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+)(?:\\s|$|\\)|\\]|;|,|\\?|!|\\.(\\s|$))")
 
+	// Fediverse handle regex (same as emailRegex but with additonal @ or !
+	// at start)
+	fediRegex = regexp.MustCompile("(?:\\s|^|\\(|\\[)([@!]([a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+)@([a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9]{2,}(?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+))(?:\\s|$|\\)|\\]|;|,|\\?|!|\\.(\\s|$))")
+
 	// blackfriday extensions create IDs like fn:user-content-footnote
 	blackfridayExtRegex = regexp.MustCompile(`[^:]*:user-content-`)
 
@@ -153,6 +157,7 @@ var defaultProcessors = []processor{
 	issueIndexPatternProcessor,
 	commitCrossReferencePatternProcessor,
 	hashCurrentPatternProcessor,
+	fediAddressProcessor,
 	emailAddressProcessor,
 	emojiProcessor,
 	emojiShortCodeProcessor,
@@ -363,7 +368,7 @@ func visitNode(ctx *RenderContext, procs []processor, node *html.Node) {
 	// Add user-content- to IDs and "#" links if they don't already have them
 	for idx, attr := range node.Attr {
 		val := strings.TrimPrefix(attr.Val, "#")
-		notHasPrefix := !(strings.HasPrefix(val, "user-content-") || blackfridayExtRegex.MatchString(val))
+		notHasPrefix := !strings.HasPrefix(val, "user-content-") && !blackfridayExtRegex.MatchString(val)
 
 		if attr.Key == "id" && notHasPrefix {
 			node.Attr[idx].Val = "user-content-" + attr.Val
@@ -1237,6 +1242,21 @@ func hashCurrentPatternProcessor(ctx *RenderContext, node *html.Node) {
 	}
 }
 
+// fediAddressProcessor replaces raw fediverse handles with toolforge links
+func fediAddressProcessor(ctx *RenderContext, node *html.Node) {
+	next := node.NextSibling
+	for node != nil && node != next {
+		m := fediRegex.FindStringSubmatchIndex(node.Data)
+		if m == nil {
+			return
+		}
+
+		fedihandle := node.Data[m[2]:m[3]]
+		replaceContent(node, m[2], m[3], createLink("https://fedirect.toolforge.org/?id="+url.QueryEscape(fedihandle), fedihandle, "fedihandle"))
+		node = node.NextSibling.NextSibling
+	}
+}
+
 // emailAddressProcessor replaces raw email addresses with a mailto: link.
 func emailAddressProcessor(ctx *RenderContext, node *html.Node) {
 	next := node.NextSibling
diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go
index 6a5d3bfa35..08b1fed505 100644
--- a/modules/markup/html_internal_test.go
+++ b/modules/markup/html_internal_test.go
@@ -469,6 +469,10 @@ func TestRegExp_anySHA1Pattern(t *testing.T) {
 	for k, v := range testCases {
 		assert.Equal(t, anyHashPattern.FindStringSubmatch(k)[1:], v)
 	}
+
+	for _, v := range []string{"https://codeberg.org/forgejo/forgejo/attachments/774421a1-b0ae-4501-8fba-983874b76811"} {
+		assert.False(t, anyHashPattern.MatchString(v))
+	}
 }
 
 func TestRegExp_shortLinkPattern(t *testing.T) {
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index d503796eb6..6bc0f7e56c 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -307,6 +307,19 @@ func TestRender_email(t *testing.T) {
 	test(
 		"email@domain..com",
 		`<p>email@domain..com</p>`)
+
+	// Test fediverse handle
+	test(
+		"@forgejo@floss.social",
+		`<p><a href="https://fedirect.toolforge.org/?id=%40forgejo%40floss.social" rel="nofollow">@forgejo@floss.social</a></p>`)
+
+	test(
+		"!forgejo@programming.dev",
+		`<p><a href="https://fedirect.toolforge.org/?id=%21forgejo%40programming.dev" rel="nofollow">!forgejo@programming.dev</a></p>`)
+
+	test(
+		"@#&@forgejo.org",
+		`<p><a href="https://fedirect.toolforge.org/?id=%40%23%26%40forgejo.org" rel="nofollow">@#&amp;@forgejo.org</a></p>`)
 }
 
 func TestRender_emoji(t *testing.T) {
@@ -721,7 +734,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -730,11 +743,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -755,7 +768,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<a href="http://localhost:3000/gogits/gogs/" rel="nofollow">gogits/gogs</a> – `+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">gogits/gogs@190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -764,11 +777,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -791,7 +804,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<a href="http://localhost:3000/gogits/gogs/" rel="nofollow">gogits/gogs</a> – `+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/4c1aaf56bcb9f39dcf65f3f250726850aed13cd6/single-line.txt#L1" class="muted" rel="nofollow">single-line.txt</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Line 1 in <a href="http://localhost:3000/gogits/gogs/src/commit/4c1aaf56bcb9f39dcf65f3f250726850aed13cd6" class="text black" rel="nofollow">gogits/gogs@4c1aaf5</a>`+
 				`</span>`+
 				`</div>`+
@@ -834,7 +847,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/sub/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/sub/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -843,11 +856,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -865,7 +878,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/sub/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/sub/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -874,11 +887,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -898,7 +911,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -907,11 +920,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -923,7 +936,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -932,11 +945,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -954,7 +967,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -963,11 +976,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -979,7 +992,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -988,11 +1001,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -1004,7 +1017,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -1013,11 +1026,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -1039,7 +1052,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be/path/to/file.md?display=source#L1-L2" class="muted" rel="nofollow">path/to/file.md</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 1 to 2 in <a href="http://localhost:3000/gogits/gogs/src/commit/c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be" class="text black" rel="nofollow">c991312</a>`+
 				`</span>`+
 				`</div>`+
@@ -1072,7 +1085,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be/path/to/file.md?display=source#L1-L2" class="muted" rel="nofollow">path/to/file.md</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 1 to 2 in <a href="http://localhost:3000/gogits/gogs/src/commit/c9913120ed2c1e27c1d7752ecdb7a504dc7cf6be" class="text black" rel="nofollow">c991312</a>`+
 				`</span>`+
 				`</div>`+
@@ -1107,7 +1120,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20/path/to/file.go?display=source#L2-L3" class="muted" rel="nofollow">path/to/file.go</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Lines 2 to 3 in <a href="http://localhost:3000/gogits/gogs/src/commit/190d9492934af498c3f669d6a2431dc5459e5b20" class="text black" rel="nofollow">190d949</a>`+
 				`</span>`+
 				`</div>`+
@@ -1116,11 +1129,11 @@ func TestRender_FilePreview(t *testing.T) {
 				`<tbody>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="2"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">B</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`<tr>`+
 				`<td class="lines-num"><span data-line-number="3"></span></td>`+
-				`<td class="lines-code chroma"><code class="code-inner"><span class="nx">C</span>`+"\n"+`</code></td>`+
+				`<td class="lines-code chroma"><code class="code-inner"><span class="w"></span><span class="nx">C</span>`+"<span class=\"w\">\n</span>"+`</code></td>`+
 				`</tr>`+
 				`</tbody>`+
 				`</table>`+
@@ -1142,7 +1155,7 @@ func TestRender_FilePreview(t *testing.T) {
 				`<div>`+
 				`<a href="http://localhost:3000/gogits/gogs/src/commit/eeb243c3395e1921c5d90e73bd739827251fc99d/path/to/file%20%23.txt#L1" class="muted" rel="nofollow">path/to/file #.txt</a>`+
 				`</div>`+
-				`<span class="text small grey">`+
+				`<span class="text grey">`+
 				`Line 1 in <a href="http://localhost:3000/gogits/gogs/src/commit/eeb243c3395e1921c5d90e73bd739827251fc99d" class="text black" rel="nofollow">eeb243c</a>`+
 				`</span>`+
 				`</div>`+
diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go
index 9a901a2287..67d81488fd 100644
--- a/modules/markup/markdown/goldmark.go
+++ b/modules/markup/markdown/goldmark.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"forgejo.org/modules/markup"
+	markdownutil "forgejo.org/modules/markup/markdown/util"
 	"forgejo.org/modules/setting"
 
 	"github.com/yuin/goldmark/ast"
@@ -35,8 +36,8 @@ func (g *ASTTransformer) applyElementDir(n ast.Node) {
 func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
 	firstChild := node.FirstChild()
 	tocMode := ""
-	ctx := pc.Get(renderContextKey).(*markup.RenderContext)
-	rc := pc.Get(renderConfigKey).(*RenderConfig)
+	ctx := pc.Get(markdownutil.RenderContextKey).(*markup.RenderContext)
+	rc := pc.Get(markdownutil.RenderConfigKey).(*RenderConfig)
 
 	tocList := make([]markup.Header, 0, 20)
 	if rc.yamlNode != nil {
@@ -131,7 +132,7 @@ func (r *HTMLRenderer) renderDocument(w util.BufWriter, source []byte, node ast.
 		if entering {
 			_, err = w.WriteString("<div")
 			if err == nil {
-				_, err = w.WriteString(fmt.Sprintf(` lang=%q`, val))
+				_, err = fmt.Fprintf(w, ` lang=%q`, val)
 			}
 			if err == nil {
 				_, err = w.WriteRune('>')
@@ -203,7 +204,7 @@ func (r *HTMLRenderer) renderIcon(w util.BufWriter, source []byte, node ast.Node
 		return ast.WalkContinue, nil
 	}
 
-	_, err := w.WriteString(fmt.Sprintf(`<i class="icon %s"></i>`, name))
+	_, err := fmt.Fprintf(w, `<i class="icon %s"></i>`, name)
 	if err != nil {
 		return ast.WalkStop, err
 	}
diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go
index db92631acc..2b19e0f1c9 100644
--- a/modules/markup/markdown/markdown.go
+++ b/modules/markup/markdown/markdown.go
@@ -5,7 +5,7 @@
 package markdown
 
 import (
-	"fmt"
+	"errors"
 	"html/template"
 	"io"
 	"strings"
@@ -16,6 +16,7 @@ import (
 	"forgejo.org/modules/markup/common"
 	"forgejo.org/modules/markup/markdown/callout"
 	"forgejo.org/modules/markup/markdown/math"
+	markdownutil "forgejo.org/modules/markup/markdown/util"
 	"forgejo.org/modules/setting"
 	giteautil "forgejo.org/modules/util"
 
@@ -34,11 +35,6 @@ var (
 	specMarkdownOnce sync.Once
 )
 
-var (
-	renderContextKey = parser.NewContextKey()
-	renderConfigKey  = parser.NewContextKey()
-)
-
 type limitWriter struct {
 	w     io.Writer
 	sum   int64
@@ -54,7 +50,7 @@ func (l *limitWriter) Write(data []byte) (int, error) {
 		if err != nil {
 			return n, err
 		}
-		return n, fmt.Errorf("rendered content too large - truncating render")
+		return n, errors.New("rendered content too large - truncating render")
 	}
 	n, err := l.w.Write(data)
 	l.sum += int64(n)
@@ -64,7 +60,7 @@ func (l *limitWriter) Write(data []byte) (int, error) {
 // newParserContext creates a parser.Context with the render context set
 func newParserContext(ctx *markup.RenderContext) parser.Context {
 	pc := parser.NewContext(parser.WithIDs(newPrefixedIDs()))
-	pc.Set(renderContextKey, ctx)
+	pc.Set(markdownutil.RenderContextKey, ctx)
 	return pc
 }
 
@@ -192,7 +188,7 @@ func actualRender(ctx *markup.RenderContext, input io.Reader, output io.Writer)
 	}
 	rc.metaLength = metaLength
 
-	pc.Set(renderConfigKey, rc)
+	pc.Set(markdownutil.RenderConfigKey, rc)
 
 	if err := converter.Convert(buf, lw, parser.WithContext(pc)); err != nil {
 		log.Error("Unable to render: %v", err)
@@ -267,8 +263,13 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
 
 // RenderString renders Markdown string to HTML with all specific handling stuff and return string
 func RenderString(ctx *markup.RenderContext, content string) (template.HTML, error) {
+	return RenderReader(ctx, strings.NewReader(content))
+}
+
+// RenderReader renders Markdown io.Reader to HTML with all specific handling stuff and return string
+func RenderReader(ctx *markup.RenderContext, input io.Reader) (template.HTML, error) {
 	var buf strings.Builder
-	if err := Render(ctx, strings.NewReader(content), &buf); err != nil {
+	if err := Render(ctx, input, &buf); err != nil {
 		return "", err
 	}
 	return template.HTML(buf.String()), nil
diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go
index e229ee4c65..c854861031 100644
--- a/modules/markup/markdown/markdown_test.go
+++ b/modules/markup/markdown/markdown_test.go
@@ -104,7 +104,7 @@ func TestRender_Images(t *testing.T) {
 
 	test(
 		"!["+title+"]("+url+")",
-		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`" loading="lazy"/></a></p>`)
 
 	test(
 		"[["+title+"|"+url+"]]",
@@ -115,7 +115,7 @@ func TestRender_Images(t *testing.T) {
 
 	test(
 		"!["+title+"]("+url+")",
-		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`"/></a></p>`)
+		`<p><a href="`+result+`" target="_blank" rel="nofollow noopener"><img src="`+result+`" alt="`+title+`" loading="lazy"/></a></p>`)
 
 	test(
 		"[["+title+"|"+url+"]]",
@@ -412,8 +412,8 @@ func TestRenderSiblingImages_Issue12925(t *testing.T) {
 	testcase := `![image1](/image1)
 ![image2](/image2)
 `
-	expected := `<p><a href="/image1" target="_blank" rel="nofollow noopener"><img src="/image1" alt="image1"></a><br>
-<a href="/image2" target="_blank" rel="nofollow noopener"><img src="/image2" alt="image2"></a></p>
+	expected := `<p><a href="/image1" target="_blank" rel="nofollow noopener"><img src="/image1" alt="image1" loading="lazy"></a><br>
+<a href="/image2" target="_blank" rel="nofollow noopener"><img src="/image2" alt="image2" loading="lazy"></a></p>
 `
 	res, err := markdown.RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, testcase)
 	require.NoError(t, err)
@@ -561,6 +561,14 @@ func TestMathBlock(t *testing.T) {
 			"test $$a$$",
 			`<p>test <code class="language-math display is-loading">a</code></p>` + nl,
 		},
+		{
+			`\[
+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}
+\]`,
+			`<p>[<br/>
+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}<br/>
+]</p>` + nl,
+		},
 	}
 
 	for _, test := range testcases {
@@ -568,6 +576,32 @@ func TestMathBlock(t *testing.T) {
 		require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
 		assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase)
 	}
+
+	t.Run("Wiki context", func(t *testing.T) {
+		testcases := []struct {
+			testcase string
+			expected string
+		}{
+			{
+				"$a$",
+				`<p><code class="language-math is-loading">a</code></p>` + nl,
+			},
+			{
+				`\[
+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}
+\]`,
+				`<pre class="code-block is-loading"><code class="chroma language-math display">
+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}
+</code></pre>` + nl,
+			},
+		}
+
+		for _, test := range testcases {
+			res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext, IsWiki: true}, test.testcase)
+			require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase)
+			assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase)
+		}
+	})
 }
 
 func TestFootnote(t *testing.T) {
@@ -845,10 +879,10 @@ mail@domain.com
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/src/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/image.jpg" target="_blank" rel="nofollow noopener"><img src="/image.jpg" alt="local image"/></a><br/>
-<a href="/path/file" target="_blank" rel="nofollow noopener"><img src="/path/file" alt="local image"/></a><br/>
-<a href="/path/file" target="_blank" rel="nofollow noopener"><img src="/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/image.jpg" target="_blank" rel="nofollow noopener"><img src="/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/path/file" target="_blank" rel="nofollow noopener"><img src="/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/path/file" target="_blank" rel="nofollow noopener"><img src="/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/image.jpg" rel="nofollow"><img src="/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -872,10 +906,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/wiki/raw/image.jpg" rel="nofollow"><img src="/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -901,10 +935,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="https://gitea.io/src/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="https://gitea.io/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/image.jpg" alt="local image"/></a><br/>
-<a href="https://gitea.io/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/path/file" alt="local image"/></a><br/>
-<a href="https://gitea.io/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="https://gitea.io/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="https://gitea.io/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://gitea.io/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="https://gitea.io/image.jpg" rel="nofollow"><img src="https://gitea.io/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -930,10 +964,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="https://gitea.io/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="https://gitea.io/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="https://gitea.io/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://gitea.io/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="https://gitea.io/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="https://gitea.io/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://gitea.io/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="https://gitea.io/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="https://gitea.io/wiki/raw/image.jpg" rel="nofollow"><img src="https://gitea.io/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -959,10 +993,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/relative/path/src/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/relative/path/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/image.jpg" alt="local image"/></a><br/>
-<a href="/relative/path/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/path/file" alt="local image"/></a><br/>
-<a href="/relative/path/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/relative/path/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/relative/path/image.jpg" rel="nofollow"><img src="/relative/path/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -988,10 +1022,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/relative/path/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/relative/path/wiki/raw/image.jpg" rel="nofollow"><img src="/relative/path/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1018,10 +1052,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/user/repo/src/branch/main/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/user/repo/media/branch/main/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/image.jpg" alt="local image"/></a><br/>
-<a href="/user/repo/media/branch/main/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/path/file" alt="local image"/></a><br/>
-<a href="/user/repo/media/branch/main/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/user/repo/media/branch/main/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/media/branch/main/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/media/branch/main/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/user/repo/media/branch/main/image.jpg" rel="nofollow"><img src="/user/repo/media/branch/main/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1048,10 +1082,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/relative/path/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/relative/path/wiki/raw/image.jpg" rel="nofollow"><img src="/relative/path/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1078,10 +1112,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/user/repo/src/sub/folder/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/user/repo/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/image.jpg" alt="local image"/></a><br/>
-<a href="/user/repo/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/path/file" alt="local image"/></a><br/>
-<a href="/user/repo/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/user/repo/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/user/repo/image.jpg" rel="nofollow"><img src="/user/repo/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1108,10 +1142,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/relative/path/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/relative/path/wiki/raw/image.jpg" rel="nofollow"><img src="/relative/path/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1139,10 +1173,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/user/repo/src/branch/main/sub/folder/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/user/repo/media/branch/main/sub/folder/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/image.jpg" alt="local image"/></a><br/>
-<a href="/user/repo/media/branch/main/sub/folder/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/path/file" alt="local image"/></a><br/>
-<a href="/user/repo/media/branch/main/sub/folder/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/user/repo/media/branch/main/sub/folder/image.jpg" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/media/branch/main/sub/folder/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/user/repo/media/branch/main/sub/folder/path/file" target="_blank" rel="nofollow noopener"><img src="/user/repo/media/branch/main/sub/folder/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/user/repo/media/branch/main/sub/folder/image.jpg" rel="nofollow"><img src="/user/repo/media/branch/main/sub/folder/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
@@ -1170,10 +1204,10 @@ space</p>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
 <a href="/relative/path/wiki/file.bin" rel="nofollow">local link</a><br/>
 <a href="https://example.com" rel="nofollow">remote link</a><br/>
-<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image"/></a><br/>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a><br/>
+<a href="/relative/path/wiki/raw/image.jpg" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/image.jpg" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="/relative/path/wiki/raw/path/file" target="_blank" rel="nofollow noopener"><img src="/relative/path/wiki/raw/path/file" alt="local image" loading="lazy"/></a><br/>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a><br/>
 <a href="/relative/path/wiki/raw/image.jpg" rel="nofollow"><img src="/relative/path/wiki/raw/image.jpg" title="local image" alt=""/></a><br/>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a><br/>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow">https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash</a><br/>
diff --git a/modules/markup/markdown/math/block_parser.go b/modules/markup/markdown/math/block_parser.go
index 527df84975..b0fe1d588a 100644
--- a/modules/markup/markdown/math/block_parser.go
+++ b/modules/markup/markdown/math/block_parser.go
@@ -6,6 +6,9 @@ package math
 import (
 	"bytes"
 
+	"forgejo.org/modules/markup"
+	markdownutil "forgejo.org/modules/markup/markdown/util"
+
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/parser"
 	"github.com/yuin/goldmark/text"
@@ -61,6 +64,13 @@ func (b *blockParser) Open(parent ast.Node, reader text.Reader, pc parser.Contex
 		return node, parser.Close | parser.NoChildren
 	}
 
+	ctx := pc.Get(markdownutil.RenderContextKey).(*markup.RenderContext)
+	if ctx.IsWiki {
+		reader.Advance(segment.Len() - 1)
+		segment.Start += 2
+		node.Lines().Append(segment)
+		return node, parser.NoChildren
+	}
 	return nil, parser.NoChildren
 }
 
diff --git a/modules/markup/markdown/math/inline_parser.go b/modules/markup/markdown/math/inline_parser.go
index b11195d551..da28d4fd9c 100644
--- a/modules/markup/markdown/math/inline_parser.go
+++ b/modules/markup/markdown/math/inline_parser.go
@@ -96,12 +96,12 @@ func (parser *inlineParser) Parse(parent ast.Node, block text.Reader, pc parser.
 		if len(line) <= pos {
 			break
 		}
-		suceedingCharacter := line[pos]
+		succeedingCharacter := line[pos]
 		// check valid ending character
-		if !isPunctuation(suceedingCharacter) &&
-			!(suceedingCharacter == ' ') &&
-			!(suceedingCharacter == '\n') &&
-			!isBracket(suceedingCharacter) {
+		if !isPunctuation(succeedingCharacter) &&
+			(succeedingCharacter != ' ') &&
+			(succeedingCharacter != '\n') &&
+			!isBracket(succeedingCharacter) {
 			return nil
 		}
 		if line[ender-1] != '\\' {
@@ -139,12 +139,12 @@ func trimBlock(node *Inline, block text.Reader) {
 
 	// trim first space and last space
 	first := node.FirstChild().(*ast.Text)
-	if !(!first.Segment.IsEmpty() && block.Source()[first.Segment.Start] == ' ') {
+	if first.Segment.IsEmpty() || block.Source()[first.Segment.Start] != ' ' {
 		return
 	}
 
 	last := node.LastChild().(*ast.Text)
-	if !(!last.Segment.IsEmpty() && block.Source()[last.Segment.Stop-1] == ' ') {
+	if last.Segment.IsEmpty() || block.Source()[last.Segment.Stop-1] != ' ' {
 		return
 	}
 
diff --git a/modules/markup/markdown/meta_test.go b/modules/markup/markdown/meta_test.go
index d341ae43e4..aaf116ff20 100644
--- a/modules/markup/markdown/meta_test.go
+++ b/modules/markup/markdown/meta_test.go
@@ -54,7 +54,7 @@ func TestExtractMetadata(t *testing.T) {
 		var meta IssueTemplate
 		body, err := ExtractMetadata(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest), &meta)
 		require.NoError(t, err)
-		assert.Equal(t, "", body)
+		assert.Empty(t, body)
 		assert.Equal(t, metaTest, meta)
 		assert.True(t, meta.Valid())
 	})
@@ -86,7 +86,7 @@ func TestExtractMetadataBytes(t *testing.T) {
 		var meta IssueTemplate
 		body, err := ExtractMetadataBytes([]byte(fmt.Sprintf("%s\n%s\n%s", sepTest, frontTest, sepTest)), &meta)
 		require.NoError(t, err)
-		assert.Equal(t, "", string(body))
+		assert.Empty(t, string(body))
 		assert.Equal(t, metaTest, meta)
 		assert.True(t, meta.Valid())
 	})
diff --git a/modules/markup/markdown/transform_codespan.go b/modules/markup/markdown/transform_codespan.go
index 15c3a44f0a..fc88db026b 100644
--- a/modules/markup/markdown/transform_codespan.go
+++ b/modules/markup/markdown/transform_codespan.go
@@ -40,7 +40,7 @@ func (r *HTMLRenderer) renderCodeSpan(w util.BufWriter, source []byte, n ast.Nod
 					r.Writer.RawWrite(w, value)
 				}
 			case *ColorPreview:
-				_, _ = w.WriteString(fmt.Sprintf(`<span class="color-preview" style="background-color: %v"></span>`, string(v.Color)))
+				_, _ = fmt.Fprintf(w, `<span class="color-preview" style="background-color: %v"></span>`, string(v.Color))
 			}
 		}
 		return ast.WalkSkipChildren, nil
diff --git a/modules/markup/markdown/transform_image.go b/modules/markup/markdown/transform_image.go
index 0f9c69cae6..b86c9e3d41 100644
--- a/modules/markup/markdown/transform_image.go
+++ b/modules/markup/markdown/transform_image.go
@@ -44,6 +44,7 @@ func (g *ASTTransformer) transformImage(ctx *markup.RenderContext, v *ast.Image)
 		for _, attr := range v.Attributes() {
 			image.SetAttribute(attr.Name, attr.Value)
 		}
+		image.SetAttributeString("loading", []byte("lazy"))
 		for child := v.FirstChild(); child != nil; {
 			next := child.NextSibling()
 			image.AppendChild(image, child)
diff --git a/modules/markup/markdown/util/text.go b/modules/markup/markdown/util/text.go
index 8a42e5835b..db6e432e79 100644
--- a/modules/markup/markdown/util/text.go
+++ b/modules/markup/markdown/util/text.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 
 	"github.com/yuin/goldmark/ast"
+	"github.com/yuin/goldmark/parser"
 )
 
 func textOfChildren(n ast.Node, src []byte, b *bytes.Buffer) {
@@ -24,3 +25,8 @@ func Text(n ast.Node, src []byte) []byte {
 	textOfChildren(n, src, &b)
 	return b.Bytes()
 }
+
+var (
+	RenderContextKey = parser.NewContextKey()
+	RenderConfigKey  = parser.NewContextKey()
+)
diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go
index 6a34ac81c4..7e5abc2ebe 100644
--- a/modules/markup/mdstripper/mdstripper.go
+++ b/modules/markup/mdstripper/mdstripper.go
@@ -107,11 +107,12 @@ func (r *stripRenderer) processAutoLink(w io.Writer, link []byte) {
 	}
 
 	var sep string
-	if parts[3] == "issues" {
+	switch parts[3] {
+	case "issues":
 		sep = "#"
-	} else if parts[3] == "pulls" {
+	case "pulls":
 		sep = "!"
-	} else {
+	default:
 		// Process out of band
 		r.links = append(r.links, linkStr)
 		return
diff --git a/modules/markup/mdstripper/mdstripper_test.go b/modules/markup/mdstripper/mdstripper_test.go
index ea34df0a3b..7fb49c1e01 100644
--- a/modules/markup/mdstripper/mdstripper_test.go
+++ b/modules/markup/mdstripper/mdstripper_test.go
@@ -79,7 +79,7 @@ A HIDDEN ` + "`" + `GHOST` + "`" + ` IN THIS LINE.
 				lines = append(lines, line)
 			}
 		}
-		assert.EqualValues(t, test.expectedText, lines)
-		assert.EqualValues(t, test.expectedLinks, links)
+		assert.Equal(t, test.expectedText, lines)
+		assert.Equal(t, test.expectedLinks, links)
 	}
 }
diff --git a/modules/markup/orgmode/orgmode_test.go b/modules/markup/orgmode/orgmode_test.go
index cdaa9f18ce..71157dc7c7 100644
--- a/modules/markup/orgmode/orgmode_test.go
+++ b/modules/markup/orgmode/orgmode_test.go
@@ -152,9 +152,9 @@ func HelloWorld() {
 }
 #+end_src
 `, `<div class="src src-go">
-<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;</span>
-<span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
-	<span class="nx">fmt</span><span class="p">.</span><span class="nf">Println</span><span class="p">(</span><span class="s">&#34;Hello World&#34;</span><span class="p">)</span>
-<span class="p">}</span></code></pre>
+<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;</span><span class="w">
+</span><span class="w"></span><span class="kd">func</span><span class="w"> </span><span class="nf">HelloWorld</span><span class="p">()</span><span class="w"> </span><span class="p">{</span><span class="w">
+</span><span class="w">	</span><span class="nx">fmt</span><span class="p">.</span><span class="nf">Println</span><span class="p">(</span><span class="s">&#34;Hello World&#34;</span><span class="p">)</span><span class="w">
+</span><span class="w"></span><span class="p">}</span></code></pre>
 </div>`)
 }
diff --git a/modules/markup/sanitizer.go b/modules/markup/sanitizer.go
index 7ff11f0844..aacc2536bf 100644
--- a/modules/markup/sanitizer.go
+++ b/modules/markup/sanitizer.go
@@ -108,6 +108,9 @@ func createDefaultPolicy() *bluemonday.Policy {
 	// Allow classes for emojis
 	policy.AllowAttrs("class").Matching(regexp.MustCompile(`^emoji$`)).OnElements("img")
 
+	// Allow attributes for images
+	policy.AllowAttrs("loading").Matching(regexp.MustCompile(`^lazy$`)).OnElements("img")
+
 	// Allow icons, emojis, chroma syntax and keyword markup on span
 	policy.AllowAttrs("class").Matching(regexp.MustCompile(`^((icon(\s+[\p{L}\p{N}_-]+)+)|(emoji)|(language-math display)|(language-math inline))$|^([a-z][a-z0-9]{0,2})$|^` + keywordClass + `$`)).OnElements("span")
 	policy.AllowAttrs("data-alias").Matching(regexp.MustCompile(`^[a-zA-Z0-9-_+]+$`)).OnElements("span")
@@ -122,7 +125,7 @@ func createDefaultPolicy() *bluemonday.Policy {
 	policy.AllowAttrs("class").Matching(regexp.MustCompile("^ui table$")).OnElements("div")
 	policy.AllowAttrs("class").Matching(regexp.MustCompile("^header$")).OnElements("div")
 	policy.AllowAttrs("data-line-number").Matching(regexp.MustCompile("^[0-9]+$")).OnElements("span")
-	policy.AllowAttrs("class").Matching(regexp.MustCompile("^text small grey$")).OnElements("span")
+	policy.AllowAttrs("class").Matching(regexp.MustCompile("^text grey$")).OnElements("span")
 	policy.AllowAttrs("class").Matching(regexp.MustCompile("^file-preview$")).OnElements("table")
 	policy.AllowAttrs("class").Matching(regexp.MustCompile("^lines-escape$")).OnElements("td")
 	policy.AllowAttrs("class").Matching(regexp.MustCompile("^toggle-escape-button btn interact-bg$")).OnElements("button")
diff --git a/modules/markup/sanitizer_test.go b/modules/markup/sanitizer_test.go
index 9805a34910..a0faff0494 100644
--- a/modules/markup/sanitizer_test.go
+++ b/modules/markup/sanitizer_test.go
@@ -75,6 +75,10 @@ func Test_Sanitizer(t *testing.T) {
 		// Emoji
 		`<span class="emoji" aria-label="thumbs up" data-alias="+1">THUMBS UP</span>`, `<span class="emoji" aria-label="thumbs up" data-alias="+1">THUMBS UP</span>`,
 		`<span class="emoji" aria-label="thumbs up" data-alias="(+!)">THUMBS UP</span>`, `<span class="emoji" aria-label="thumbs up">THUMBS UP</span>`,
+
+		// Images lazy loading
+		`<img src="/image1" alt="image1" loading="lazy">`, `<img src="/image1" alt="image1" loading="lazy">`,
+		`<img src="/image1" alt="image1" loading="eager">`, `<img src="/image1" alt="image1">`,
 	}
 
 	for i := 0; i < len(testCases); i += 2 {
diff --git a/modules/optional/option.go b/modules/optional/option.go
index af9e5ac852..ccbad259c2 100644
--- a/modules/optional/option.go
+++ b/modules/optional/option.go
@@ -3,6 +3,8 @@
 
 package optional
 
+import "strconv"
+
 type Option[T any] []T
 
 func None[T any]() Option[T] {
@@ -43,3 +45,12 @@ func (o Option[T]) ValueOrDefault(v T) T {
 	}
 	return v
 }
+
+// ParseBool get the corresponding optional.Option[bool] of a string using strconv.ParseBool
+func ParseBool(s string) Option[bool] {
+	v, e := strconv.ParseBool(s)
+	if e != nil {
+		return None[bool]()
+	}
+	return Some(v)
+}
diff --git a/modules/optional/option_test.go b/modules/optional/option_test.go
index f6d22d2431..a674caf633 100644
--- a/modules/optional/option_test.go
+++ b/modules/optional/option_test.go
@@ -57,3 +57,16 @@ func TestOption(t *testing.T) {
 	assert.True(t, opt3.Has())
 	assert.Equal(t, int(1), opt3.Value())
 }
+
+func Test_ParseBool(t *testing.T) {
+	assert.Equal(t, optional.None[bool](), optional.ParseBool(""))
+	assert.Equal(t, optional.None[bool](), optional.ParseBool("x"))
+
+	assert.Equal(t, optional.Some(false), optional.ParseBool("0"))
+	assert.Equal(t, optional.Some(false), optional.ParseBool("f"))
+	assert.Equal(t, optional.Some(false), optional.ParseBool("False"))
+
+	assert.Equal(t, optional.Some(true), optional.ParseBool("1"))
+	assert.Equal(t, optional.Some(true), optional.ParseBool("t"))
+	assert.Equal(t, optional.Some(true), optional.ParseBool("True"))
+}
diff --git a/modules/optional/serialization_test.go b/modules/optional/serialization_test.go
index 80fe1c9805..14bf3b7814 100644
--- a/modules/optional/serialization_test.go
+++ b/modules/optional/serialization_test.go
@@ -52,11 +52,11 @@ func TestOptionalToJson(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			b, err := json.Marshal(tc.obj)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, string(b), "gitea json module returned unexpected")
+			assert.Equal(t, tc.want, string(b), "gitea json module returned unexpected")
 
 			b, err = std_json.Marshal(tc.obj)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, string(b), "std json module returned unexpected")
+			assert.Equal(t, tc.want, string(b), "std json module returned unexpected")
 		})
 	}
 }
@@ -90,12 +90,12 @@ func TestOptionalFromJson(t *testing.T) {
 			var obj1 testSerializationStruct
 			err := json.Unmarshal([]byte(tc.data), &obj1)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, obj1, "gitea json module returned unexpected")
+			assert.Equal(t, tc.want, obj1, "gitea json module returned unexpected")
 
 			var obj2 testSerializationStruct
 			err = std_json.Unmarshal([]byte(tc.data), &obj2)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, obj2, "std json module returned unexpected")
+			assert.Equal(t, tc.want, obj2, "std json module returned unexpected")
 		})
 	}
 }
@@ -136,7 +136,7 @@ optional_two_string: null
 		t.Run(tc.name, func(t *testing.T) {
 			b, err := yaml.Marshal(tc.obj)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, string(b), "yaml module returned unexpected")
+			assert.Equal(t, tc.want, string(b), "yaml module returned unexpected")
 		})
 	}
 }
@@ -185,7 +185,7 @@ optional_twostring: null
 			var obj testSerializationStruct
 			err := yaml.Unmarshal([]byte(tc.data), &obj)
 			require.NoError(t, err)
-			assert.EqualValues(t, tc.want, obj, "yaml module returned unexpected")
+			assert.Equal(t, tc.want, obj, "yaml module returned unexpected")
 		})
 	}
 }
diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go
index f967bd25a0..ca352c828c 100644
--- a/modules/packages/arch/metadata.go
+++ b/modules/packages/arch/metadata.go
@@ -7,6 +7,7 @@ import (
 	"archive/tar"
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/hex"
 	"errors"
 	"fmt"
@@ -19,7 +20,7 @@ import (
 	"forgejo.org/modules/util"
 	"forgejo.org/modules/validation"
 
-	"github.com/mholt/archiver/v3"
+	"github.com/mholt/archives"
 )
 
 // Arch Linux Packages
@@ -109,55 +110,61 @@ func ParsePackage(r *packages.HashedBuffer) (*Package, error) {
 		return nil, err
 	}
 
-	var tarball archiver.Reader
+	var tarball archives.Extractor
 	var tarballType string
 	if bytes.Equal(header[:len(magicZSTD)], magicZSTD) {
 		tarballType = "zst"
-		tarball = archiver.NewTarZstd()
+		tarball = archives.CompressedArchive{
+			Compression: archives.Zstd{},
+			Extraction:  archives.Tar{},
+		}
 	} else if bytes.Equal(header[:len(magicXZ)], magicXZ) {
 		tarballType = "xz"
-		tarball = archiver.NewTarXz()
+		tarball = archives.CompressedArchive{
+			Compression: archives.Xz{},
+			Extraction:  archives.Tar{},
+		}
 	} else if bytes.Equal(header[:len(magicGZ)], magicGZ) {
 		tarballType = "gz"
-		tarball = archiver.NewTarGz()
+		tarball = archives.CompressedArchive{
+			Compression: archives.Gz{},
+			Extraction:  archives.Tar{},
+		}
 	} else {
 		return nil, errors.New("not supported compression")
 	}
-	err = tarball.Open(r, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer tarball.Close()
 
 	var pkg *Package
 	var mTree bool
 
 	files := make([]string, 0)
 
-	for {
-		f, err := tarball.Read()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, err
-		}
+	err = tarball.Extract(context.TODO(), r, func(ctx context.Context, file archives.FileInfo) error {
 		// ref:https://gitlab.archlinux.org/pacman/pacman/-/blob/91546004903eea5d5267d59898a6029ba1d64031/lib/libalpm/add.c#L529-L533
-		if !strings.HasPrefix(f.Name(), ".") {
-			files = append(files, (f.Header.(*tar.Header)).Name)
+		if !strings.HasPrefix(file.Name(), ".") {
+			files = append(files, (file.Header.(*tar.Header)).Name)
 		}
 
-		switch f.Name() {
+		switch file.Name() {
 		case ".PKGINFO":
+			f, err := file.Open()
+			if err != nil {
+				return err
+			}
+			defer f.Close()
+
 			pkg, err = ParsePackageInfo(tarballType, f)
 			if err != nil {
-				_ = f.Close()
-				return nil, err
+				return err
 			}
 		case ".MTREE":
 			mTree = true
 		}
-		_ = f.Close()
+
+		return nil
+	})
+	if err != nil {
+		return nil, err
 	}
 
 	if pkg == nil {
diff --git a/modules/packages/arch/metadata_test.go b/modules/packages/arch/metadata_test.go
index 16c1c1637d..fbdc9e5ddc 100644
--- a/modules/packages/arch/metadata_test.go
+++ b/modules/packages/arch/metadata_test.go
@@ -5,7 +5,7 @@ package arch
 
 import (
 	"bytes"
-	"errors"
+	"io/fs"
 	"os"
 	"strings"
 	"testing"
@@ -14,7 +14,7 @@ import (
 
 	"forgejo.org/modules/packages"
 
-	"github.com/mholt/archiver/v3"
+	"github.com/mholt/archives"
 	"github.com/stretchr/testify/require"
 )
 
@@ -25,7 +25,7 @@ pkgbase = b
 pkgver = 1-2
 arch = x86_64
 `
-	fs := fstest.MapFS{
+	mapfs := fstest.MapFS{
 		"pkginfo": &fstest.MapFile{
 			Data:    []byte(PKGINFO),
 			Mode:    os.ModePerm,
@@ -39,65 +39,111 @@ arch = x86_64
 	}
 
 	// Test .PKGINFO file
-	pinf, err := fs.Stat("pkginfo")
-	require.NoError(t, err)
-
-	pfile, err := fs.Open("pkginfo")
-	require.NoError(t, err)
-
-	parcname, err := archiver.NameInArchive(pinf, ".PKGINFO", ".PKGINFO")
+	pinf, err := mapfs.Stat("pkginfo")
 	require.NoError(t, err)
 
 	// Test .MTREE file
-	minf, err := fs.Stat("mtree")
+	minf, err := mapfs.Stat("mtree")
 	require.NoError(t, err)
 
-	mfile, err := fs.Open("mtree")
-	require.NoError(t, err)
+	files := []archives.FileInfo{
+		{
+			FileInfo:      pinf,
+			NameInArchive: ".PKGINFO",
+			Open: func() (fs.File, error) {
+				return mapfs.Open("pkginfo")
+			},
+		},
+		{
+			FileInfo:      minf,
+			NameInArchive: ".MTREE",
+			Open: func() (fs.File, error) {
+				return mapfs.Open("mtree")
+			},
+		},
+	}
 
-	marcname, err := archiver.NameInArchive(minf, ".MTREE", ".MTREE")
-	require.NoError(t, err)
-
-	t.Run("normal archive", func(t *testing.T) {
+	t.Run("normal zst archive", func(t *testing.T) {
 		var buf bytes.Buffer
-
-		archive := archiver.NewTarZstd()
-		archive.Create(&buf)
-
-		err = archive.Write(archiver.File{
-			FileInfo: archiver.FileInfo{
-				FileInfo:   pinf,
-				CustomName: parcname,
-			},
-			ReadCloser: pfile,
-		})
-		require.NoError(t, errors.Join(pfile.Close(), err))
-
-		err = archive.Write(archiver.File{
-			FileInfo: archiver.FileInfo{
-				FileInfo:   minf,
-				CustomName: marcname,
-			},
-			ReadCloser: mfile,
-		})
-		require.NoError(t, errors.Join(mfile.Close(), archive.Close(), err))
+		archive := archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Zstd{},
+		}
+		archive.Archive(t.Context(), &buf, files)
 
 		reader, err := packages.CreateHashedBufferFromReader(&buf)
-		if err != nil {
-			t.Fatal(err)
-		}
+		require.NoError(t, err)
 		defer reader.Close()
-		_, err = ParsePackage(reader)
+		pkg, err := ParsePackage(reader)
+
+		require.Equal(t, "zst", pkg.CompressType)
+		require.Equal(t, "a", pkg.Name)
+		require.Equal(t, "b", pkg.VersionMetadata.Base)
+		require.Equal(t, "x86_64", pkg.FileMetadata.Arch)
+		require.Equal(t, "1-2", pkg.Version)
+
+		require.NoError(t, err)
+	})
+
+	t.Run("normal xz archive", func(t *testing.T) {
+		var buf bytes.Buffer
+		archive := archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Xz{},
+		}
+		archive.Archive(t.Context(), &buf, files)
+
+		reader, err := packages.CreateHashedBufferFromReader(&buf)
+		require.NoError(t, err)
+		defer reader.Close()
+		pkg, err := ParsePackage(reader)
+
+		require.Equal(t, "xz", pkg.CompressType)
+		require.Equal(t, "a", pkg.Name)
+		require.Equal(t, "b", pkg.VersionMetadata.Base)
+		require.Equal(t, "x86_64", pkg.FileMetadata.Arch)
+		require.Equal(t, "1-2", pkg.Version)
+
+		require.NoError(t, err)
+	})
+
+	t.Run("normal gz archive", func(t *testing.T) {
+		var buf bytes.Buffer
+		archive := archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Gz{},
+		}
+		archive.Archive(t.Context(), &buf, files)
+
+		reader, err := packages.CreateHashedBufferFromReader(&buf)
+		require.NoError(t, err)
+		defer reader.Close()
+		pkg, err := ParsePackage(reader)
+
+		require.Equal(t, "gz", pkg.CompressType)
+		require.Equal(t, "a", pkg.Name)
+		require.Equal(t, "b", pkg.VersionMetadata.Base)
+		require.Equal(t, "x86_64", pkg.FileMetadata.Arch)
+		require.Equal(t, "1-2", pkg.Version)
 
 		require.NoError(t, err)
 	})
 
 	t.Run("missing .PKGINFO", func(t *testing.T) {
 		var buf bytes.Buffer
-
-		archive := archiver.NewTarZstd()
-		archive.Create(&buf)
-		require.NoError(t, archive.Close())
+		archive := archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Zstd{},
+		}
+		archive.Archive(t.Context(), &buf, []archives.FileInfo{
+			{
+				FileInfo:      minf,
+				NameInArchive: ".MTREE",
+				Open: func() (fs.File, error) {
+					return mapfs.Open("mtree")
+				},
+			},
+		})
 
 		reader, err := packages.CreateHashedBufferFromReader(&buf)
 		require.NoError(t, err)
@@ -111,21 +157,20 @@ arch = x86_64
 
 	t.Run("missing .MTREE", func(t *testing.T) {
 		var buf bytes.Buffer
-
-		pfile, err := fs.Open("pkginfo")
-		require.NoError(t, err)
-
-		archive := archiver.NewTarZstd()
-		archive.Create(&buf)
-
-		err = archive.Write(archiver.File{
-			FileInfo: archiver.FileInfo{
-				FileInfo:   pinf,
-				CustomName: parcname,
+		archive := archives.CompressedArchive{
+			Archival:    archives.Tar{},
+			Compression: archives.Zstd{},
+		}
+		archive.Archive(t.Context(), &buf, []archives.FileInfo{
+			{
+				FileInfo:      pinf,
+				NameInArchive: ".PKGINFO",
+				Open: func() (fs.File, error) {
+					return mapfs.Open("pkginfo")
+				},
 			},
-			ReadCloser: pfile,
 		})
-		require.NoError(t, errors.Join(pfile.Close(), archive.Close(), err))
+
 		reader, err := packages.CreateHashedBufferFromReader(&buf)
 		require.NoError(t, err)
 
diff --git a/modules/packages/cargo/parser_test.go b/modules/packages/cargo/parser_test.go
index 8792a7a977..d2470fab42 100644
--- a/modules/packages/cargo/parser_test.go
+++ b/modules/packages/cargo/parser_test.go
@@ -98,8 +98,8 @@ func TestParsePackage(t *testing.T) {
 		assert.Equal(t, []string{author}, cp.Metadata.Authors)
 		assert.Len(t, cp.Metadata.Dependencies, 2)
 		assert.Equal(t, "dep", cp.Metadata.Dependencies[0].Name)
-		assert.EqualValues(t, "v4l2-sys-mit", cp.Metadata.Dependencies[1].Name)
-		assert.EqualValues(t, "v4l2-sys", *cp.Metadata.Dependencies[1].Package)
+		assert.Equal(t, "v4l2-sys-mit", cp.Metadata.Dependencies[1].Name)
+		assert.Equal(t, "v4l2-sys", *cp.Metadata.Dependencies[1].Package)
 		assert.Equal(t, homepage, cp.Metadata.ProjectURL)
 		assert.Equal(t, license, cp.Metadata.License)
 		content, _ := io.ReadAll(cp.Content)
diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go
index ec9d834357..6cac77b7ff 100644
--- a/modules/packages/container/metadata.go
+++ b/modules/packages/container/metadata.go
@@ -84,6 +84,13 @@ func ParseImageConfig(mt string, r io.Reader) (*Metadata, error) {
 func parseOCIImageConfig(r io.Reader) (*Metadata, error) {
 	var image oci.Image
 	if err := json.NewDecoder(r).Decode(&image); err != nil {
+		// Handle empty config blobs (common in OCI artifacts)
+		if err == io.EOF {
+			return &Metadata{
+				Type:     TypeOCI,
+				Platform: DefaultPlatform,
+			}, nil
+		}
 		return nil, err
 	}
 
diff --git a/modules/packages/container/metadata_test.go b/modules/packages/container/metadata_test.go
index 6c8c6ea5b9..5596c95751 100644
--- a/modules/packages/container/metadata_test.go
+++ b/modules/packages/container/metadata_test.go
@@ -4,6 +4,7 @@
 package container
 
 import (
+	"io"
 	"strings"
 	"testing"
 
@@ -60,3 +61,49 @@ func TestParseImageConfig(t *testing.T) {
 	assert.Equal(t, projectURL, metadata.ProjectURL)
 	assert.Equal(t, repositoryURL, metadata.RepositoryURL)
 }
+
+func TestParseImageConfigEmptyBlob(t *testing.T) {
+	t.Run("Empty config blob (EOF)", func(t *testing.T) {
+		// Test empty reader (simulates empty config blob common in OCI artifacts)
+		metadata, err := ParseImageConfig(oci.MediaTypeImageManifest, strings.NewReader(""))
+		require.NoError(t, err)
+
+		assert.Equal(t, TypeOCI, metadata.Type)
+		assert.Equal(t, DefaultPlatform, metadata.Platform)
+		assert.Empty(t, metadata.Description)
+		assert.Empty(t, metadata.Authors)
+		assert.Empty(t, metadata.Labels)
+		assert.Empty(t, metadata.Manifests)
+	})
+
+	t.Run("Empty JSON object", func(t *testing.T) {
+		// Test minimal valid JSON config
+		metadata, err := ParseImageConfig(oci.MediaTypeImageManifest, strings.NewReader("{}"))
+		require.NoError(t, err)
+
+		assert.Equal(t, TypeOCI, metadata.Type)
+		assert.Equal(t, DefaultPlatform, metadata.Platform)
+		assert.Empty(t, metadata.Description)
+		assert.Empty(t, metadata.Authors)
+	})
+
+	t.Run("Invalid JSON still returns error", func(t *testing.T) {
+		// Test that actual JSON errors (not EOF) are still returned
+		_, err := ParseImageConfig(oci.MediaTypeImageManifest, strings.NewReader("{invalid json"))
+		require.Error(t, err)
+		assert.NotEqual(t, io.EOF, err)
+	})
+
+	t.Run("OCI artifact with empty config", func(t *testing.T) {
+		// Test OCI artifact scenario with minimal config
+		configOCI := `{"config": {}}`
+		metadata, err := ParseImageConfig(oci.MediaTypeImageManifest, strings.NewReader(configOCI))
+		require.NoError(t, err)
+
+		assert.Equal(t, TypeOCI, metadata.Type)
+		assert.Equal(t, DefaultPlatform, metadata.Platform)
+		assert.Empty(t, metadata.Description)
+		assert.Empty(t, metadata.Authors)
+		assert.Empty(t, metadata.ImageLayers)
+	})
+}
diff --git a/modules/packages/debian/metadata.go b/modules/packages/debian/metadata.go
index e44801654b..1729a2206e 100644
--- a/modules/packages/debian/metadata.go
+++ b/modules/packages/debian/metadata.go
@@ -46,7 +46,7 @@ var (
 	// https://www.debian.org/doc/debian-policy/ch-controlfields.html#source
 	namePattern = regexp.MustCompile(`\A[a-z0-9][a-z0-9+-.]+\z`)
 	// https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
-	versionPattern = regexp.MustCompile(`\A(?:[0-9]:)?[a-zA-Z0-9.+~]+(?:-[a-zA-Z0-9.+-~]+)?\z`)
+	versionPattern = regexp.MustCompile(`\A(?:[1-9]?[0-9]:)?[a-zA-Z0-9.+~]+(?:-[a-zA-Z0-9.+-~]+)?\z`)
 )
 
 type Package struct {
diff --git a/modules/packages/debian/metadata_test.go b/modules/packages/debian/metadata_test.go
index cfcbc57ee0..079b9c19c8 100644
--- a/modules/packages/debian/metadata_test.go
+++ b/modules/packages/debian/metadata_test.go
@@ -167,6 +167,14 @@ func TestParseControlFile(t *testing.T) {
 		require.ErrorIs(t, err, ErrInvalidArchitecture)
 	})
 
+	t.Run("ValidVersionEpoch", func(t *testing.T) {
+		for _, version := range []string{"0:1.2.3-test", "1:1.2.3-test", "9:1.2.3-test", "10:1.2.3-test", "37:1.2.3-test", "99:1.2.3-test"} {
+			p, err := ParseControlFile(buildContent(packageName, version, packageArchitecture))
+			require.NoError(t, err)
+			assert.NotNil(t, p)
+		}
+	})
+
 	t.Run("Valid", func(t *testing.T) {
 		content := buildContent(packageName, packageVersion, packageArchitecture)
 		full := content.String()
diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go
index 30c91115e7..503b7b1a24 100644
--- a/modules/packages/rpm/metadata.go
+++ b/modules/packages/rpm/metadata.go
@@ -11,7 +11,7 @@ import (
 	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/validation"
 
-	"github.com/sassoftware/go-rpmutils"
+	"code.forgejo.org/forgejo/go-rpmutils"
 )
 
 const (
@@ -232,9 +232,10 @@ func getEntries(h *rpmutils.RpmHeader, namesTag, versionsTag, flagsTag int, repo
 	case "alt":
 		for i := range names {
 			e := &Entry{
+				Name:     names[i],
 				AltFlags: uint32(flags[i]),
+				Version:  versions[i],
 			}
-			e.Version = versions[i]
 			entries = append(entries, e)
 		}
 	}
diff --git a/modules/process/manager_stacktraces_test.go b/modules/process/manager_stacktraces_test.go
index 509b424d8b..936fab40d8 100644
--- a/modules/process/manager_stacktraces_test.go
+++ b/modules/process/manager_stacktraces_test.go
@@ -23,19 +23,19 @@ func TestProcessStacktraces(t *testing.T) {
 	t.Run("No flat with no system process", func(t *testing.T) {
 		processes, processCount, _, err := GetManager().ProcessStacktraces(false, true)
 		require.NoError(t, err)
-		assert.EqualValues(t, 4, processCount)
+		assert.Equal(t, 4, processCount)
 		assert.Len(t, processes, 2)
 
-		assert.EqualValues(t, "Children normal process", processes[0].Description)
-		assert.EqualValues(t, NormalProcessType, processes[0].Type)
+		assert.Equal(t, "Children normal process", processes[0].Description)
+		assert.Equal(t, NormalProcessType, processes[0].Type)
 		assert.Empty(t, processes[0].ParentPID)
 		assert.Len(t, processes[0].Children, 1)
 
-		assert.EqualValues(t, "Children process", processes[0].Children[0].Description)
-		assert.EqualValues(t, processes[0].PID, processes[0].Children[0].ParentPID)
+		assert.Equal(t, "Children process", processes[0].Children[0].Description)
+		assert.Equal(t, processes[0].PID, processes[0].Children[0].ParentPID)
 
-		assert.EqualValues(t, "Normal process", processes[1].Description)
-		assert.EqualValues(t, NormalProcessType, processes[1].Type)
+		assert.Equal(t, "Normal process", processes[1].Description)
+		assert.Equal(t, NormalProcessType, processes[1].Type)
 		assert.Empty(t, processes[1].ParentPID)
 		assert.Empty(t, processes[1].Children)
 	})
@@ -43,21 +43,21 @@ func TestProcessStacktraces(t *testing.T) {
 	t.Run("Flat with no system process", func(t *testing.T) {
 		processes, processCount, _, err := GetManager().ProcessStacktraces(true, true)
 		require.NoError(t, err)
-		assert.EqualValues(t, 4, processCount)
+		assert.Equal(t, 4, processCount)
 		assert.Len(t, processes, 3)
 
-		assert.EqualValues(t, "Children process", processes[0].Description)
-		assert.EqualValues(t, NormalProcessType, processes[0].Type)
-		assert.EqualValues(t, processes[1].PID, processes[0].ParentPID)
+		assert.Equal(t, "Children process", processes[0].Description)
+		assert.Equal(t, NormalProcessType, processes[0].Type)
+		assert.Equal(t, processes[1].PID, processes[0].ParentPID)
 		assert.Empty(t, processes[0].Children)
 
-		assert.EqualValues(t, "Children normal process", processes[1].Description)
-		assert.EqualValues(t, NormalProcessType, processes[1].Type)
+		assert.Equal(t, "Children normal process", processes[1].Description)
+		assert.Equal(t, NormalProcessType, processes[1].Type)
 		assert.Empty(t, processes[1].ParentPID)
 		assert.Empty(t, processes[1].Children)
 
-		assert.EqualValues(t, "Normal process", processes[2].Description)
-		assert.EqualValues(t, NormalProcessType, processes[2].Type)
+		assert.Equal(t, "Normal process", processes[2].Description)
+		assert.Equal(t, NormalProcessType, processes[2].Type)
 		assert.Empty(t, processes[2].ParentPID)
 		assert.Empty(t, processes[2].Children)
 	})
@@ -65,27 +65,27 @@ func TestProcessStacktraces(t *testing.T) {
 	t.Run("System process", func(t *testing.T) {
 		processes, processCount, _, err := GetManager().ProcessStacktraces(false, false)
 		require.NoError(t, err)
-		assert.EqualValues(t, 4, processCount)
+		assert.Equal(t, 4, processCount)
 		assert.Len(t, processes, 4)
 
-		assert.EqualValues(t, "System process", processes[0].Description)
-		assert.EqualValues(t, SystemProcessType, processes[0].Type)
+		assert.Equal(t, "System process", processes[0].Description)
+		assert.Equal(t, SystemProcessType, processes[0].Type)
 		assert.Empty(t, processes[0].ParentPID)
 		assert.Empty(t, processes[0].Children)
 
-		assert.EqualValues(t, "Children normal process", processes[1].Description)
-		assert.EqualValues(t, NormalProcessType, processes[1].Type)
+		assert.Equal(t, "Children normal process", processes[1].Description)
+		assert.Equal(t, NormalProcessType, processes[1].Type)
 		assert.Empty(t, processes[1].ParentPID)
 		assert.Len(t, processes[1].Children, 1)
 
-		assert.EqualValues(t, "Normal process", processes[2].Description)
-		assert.EqualValues(t, NormalProcessType, processes[2].Type)
+		assert.Equal(t, "Normal process", processes[2].Description)
+		assert.Equal(t, NormalProcessType, processes[2].Type)
 		assert.Empty(t, processes[2].ParentPID)
 		assert.Empty(t, processes[2].Children)
 
 		// This is the "main" pid, testing code always runs in a goroutine.
-		assert.EqualValues(t, "(unassociated)", processes[3].Description)
-		assert.EqualValues(t, NoneProcessType, processes[3].Type)
+		assert.Equal(t, "(unassociated)", processes[3].Description)
+		assert.Equal(t, NoneProcessType, processes[3].Type)
 		assert.Empty(t, processes[3].ParentPID)
 		assert.Empty(t, processes[3].Children)
 	})
diff --git a/modules/public/mime_types.go b/modules/public/mime_types.go
index 32bdf3bfa2..87ee2854ae 100644
--- a/modules/public/mime_types.go
+++ b/modules/public/mime_types.go
@@ -23,6 +23,11 @@ var wellKnownMimeTypesLower = map[string]string{
 	".wasm": "application/wasm",
 	".webp": "image/webp",
 	".xml":  "text/xml; charset=utf-8",
+	".glb":  "model/gltf-binary",
+	".gltf": "model/gltf+json",
+	".obj":  "model/obj",
+	".stl":  "model/stl",
+	".3mf":  "model/3mf",
 
 	// well, there are some types missing from the builtin list
 	".txt": "text/plain; charset=utf-8",
diff --git a/modules/public/public.go b/modules/public/public.go
index 174936fd4a..a7db5b62e9 100644
--- a/modules/public/public.go
+++ b/modules/public/public.go
@@ -6,6 +6,7 @@ package public
 import (
 	"bytes"
 	"io"
+	"io/fs"
 	"net/http"
 	"os"
 	"path"
@@ -59,7 +60,7 @@ func setWellKnownContentType(w http.ResponseWriter, file string) {
 	}
 }
 
-func handleRequest(w http.ResponseWriter, req *http.Request, fs http.FileSystem, file string) {
+func handleRequest(w http.ResponseWriter, req *http.Request, fs fs.FS, file string) {
 	// actually, fs (http.FileSystem) is designed to be a safe interface, relative paths won't bypass its parent directory, it's also fine to do a clean here
 	f, err := fs.Open(util.PathJoinRelX(file))
 	if err != nil {
@@ -86,33 +87,31 @@ func handleRequest(w http.ResponseWriter, req *http.Request, fs http.FileSystem,
 		return
 	}
 
-	serveContent(w, req, fi, fi.ModTime(), f)
+	serveContent(w, req, fi.Name(), fi.ModTime(), f.(io.ReadSeeker))
 }
 
-type GzipBytesProvider interface {
-	GzipBytes() []byte
+type ZstdBytesProvider interface {
+	ZstdBytes() []byte
 }
 
 // serveContent serve http content
-func serveContent(w http.ResponseWriter, req *http.Request, fi os.FileInfo, modtime time.Time, content io.ReadSeeker) {
-	setWellKnownContentType(w, fi.Name())
+func serveContent(w http.ResponseWriter, req *http.Request, name string, modtime time.Time, content io.ReadSeeker) {
+	setWellKnownContentType(w, name)
 
 	encodings := parseAcceptEncoding(req.Header.Get("Accept-Encoding"))
-	if encodings.Contains("gzip") {
-		// try to provide gzip content directly from bindata (provided by vfsgen۰CompressedFileInfo)
-		if compressed, ok := fi.(GzipBytesProvider); ok {
-			rdGzip := bytes.NewReader(compressed.GzipBytes())
-			// all gzipped static files (from bindata) are managed by Gitea, so we can make sure every file has the correct ext name
-			// then we can get the correct Content-Type, we do not need to do http.DetectContentType on the decompressed data
+	if encodings.Contains("zstd") {
+		// If the file was compressed, use the bytes directly.
+		if compressed, ok := content.(ZstdBytesProvider); ok {
+			rdZstd := bytes.NewReader(compressed.ZstdBytes())
 			if w.Header().Get("Content-Type") == "" {
 				w.Header().Set("Content-Type", "application/octet-stream")
 			}
-			w.Header().Set("Content-Encoding", "gzip")
-			httpcache.ServeContentWithCacheControl(w, req, fi.Name(), modtime, rdGzip)
+			w.Header().Set("Content-Encoding", "zstd")
+			httpcache.ServeContentWithCacheControl(w, req, name, modtime, rdZstd)
 			return
 		}
 	}
 
-	httpcache.ServeContentWithCacheControl(w, req, fi.Name(), modtime, content)
+	httpcache.ServeContentWithCacheControl(w, req, name, modtime, content)
 	return
 }
diff --git a/modules/public/serve_static.go b/modules/public/serve_static.go
index e19bd976eb..148d789bba 100644
--- a/modules/public/serve_static.go
+++ b/modules/public/serve_static.go
@@ -12,8 +12,6 @@ import (
 	"forgejo.org/modules/timeutil"
 )
 
-var _ GzipBytesProvider = (*vfsgen۰CompressedFileInfo)(nil)
-
 // GlobalModTime provide a global mod time for embedded asset files
 func GlobalModTime(filename string) time.Time {
 	return timeutil.GetExecutableModTime()
diff --git a/modules/queue/base_test.go b/modules/queue/base_test.go
index d852a80b16..caa930158c 100644
--- a/modules/queue/base_test.go
+++ b/modules/queue/base_test.go
@@ -22,7 +22,7 @@ func testQueueBasic(t *testing.T, newFn func(cfg *BaseConfig) (baseQueue, error)
 		_ = q.RemoveAll(ctx)
 		cnt, err := q.Len(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, cnt)
+		assert.Equal(t, 0, cnt)
 
 		// push the first item
 		err = q.PushItem(ctx, []byte("foo"))
@@ -30,7 +30,7 @@ func testQueueBasic(t *testing.T, newFn func(cfg *BaseConfig) (baseQueue, error)
 
 		cnt, err = q.Len(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, cnt)
+		assert.Equal(t, 1, cnt)
 
 		// push a duplicate item
 		err = q.PushItem(ctx, []byte("foo"))
@@ -46,10 +46,10 @@ func testQueueBasic(t *testing.T, newFn func(cfg *BaseConfig) (baseQueue, error)
 		has, err := q.HasItem(ctx, []byte("foo"))
 		require.NoError(t, err)
 		if !isUnique {
-			assert.EqualValues(t, 2, cnt)
+			assert.Equal(t, 2, cnt)
 			assert.False(t, has) // non-unique queues don't check for duplicates
 		} else {
-			assert.EqualValues(t, 1, cnt)
+			assert.Equal(t, 1, cnt)
 			assert.True(t, has)
 		}
 
@@ -60,18 +60,18 @@ func testQueueBasic(t *testing.T, newFn func(cfg *BaseConfig) (baseQueue, error)
 		// pop the first item (and the duplicate if non-unique)
 		it, err := q.PopItem(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, "foo", string(it))
+		assert.Equal(t, "foo", string(it))
 
 		if !isUnique {
 			it, err = q.PopItem(ctx)
 			require.NoError(t, err)
-			assert.EqualValues(t, "foo", string(it))
+			assert.Equal(t, "foo", string(it))
 		}
 
 		// pop another item
 		it, err = q.PopItem(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, "bar", string(it))
+		assert.Equal(t, "bar", string(it))
 
 		// pop an empty queue (timeout, cancel)
 		ctxTimed, cancel := context.WithTimeout(ctx, 10*time.Millisecond)
@@ -108,13 +108,13 @@ func testQueueBasic(t *testing.T, newFn func(cfg *BaseConfig) (baseQueue, error)
 		// remove all
 		cnt, err = q.Len(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, cfg.Length, cnt)
+		assert.Equal(t, cfg.Length, cnt)
 
 		_ = q.RemoveAll(ctx)
 
 		cnt, err = q.Len(ctx)
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, cnt)
+		assert.Equal(t, 0, cnt)
 	})
 }
 
@@ -127,7 +127,7 @@ func TestBaseDummy(t *testing.T) {
 
 	cnt, err := q.Len(ctx)
 	require.NoError(t, err)
-	assert.EqualValues(t, 0, cnt)
+	assert.Equal(t, 0, cnt)
 
 	has, err := q.HasItem(ctx, []byte("foo"))
 	require.NoError(t, err)
diff --git a/modules/queue/manager_test.go b/modules/queue/manager_test.go
index bd6e314493..fd5d21570c 100644
--- a/modules/queue/manager_test.go
+++ b/modules/queue/manager_test.go
@@ -8,17 +8,14 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestManager(t *testing.T) {
-	oldAppDataPath := setting.AppDataPath
-	setting.AppDataPath = t.TempDir()
-	defer func() {
-		setting.AppDataPath = oldAppDataPath
-	}()
+	defer test.MockVariableValue(&setting.AppDataPath, t.TempDir())()
 
 	newQueueFromConfig := func(name, cfg string) (*WorkerPoolQueue[int], error) {
 		cfgProvider, err := setting.NewConfigProviderFromData(cfg)
@@ -48,7 +45,7 @@ CONN_STR = redis://
 	assert.Equal(t, filepath.Join(setting.AppDataPath, "queues/common"), q.baseConfig.DataFullDir)
 	assert.Equal(t, 100000, q.baseConfig.Length)
 	assert.Equal(t, 20, q.batchLength)
-	assert.Equal(t, "", q.baseConfig.ConnStr)
+	assert.Empty(t, q.baseConfig.ConnStr)
 	assert.Equal(t, "default_queue", q.baseConfig.QueueFullName)
 	assert.Equal(t, "default_queue_unique", q.baseConfig.SetFullName)
 	assert.NotZero(t, q.GetWorkerMaxNumber())
@@ -102,7 +99,7 @@ MAX_WORKERS = 123
 	assert.Equal(t, filepath.Join(setting.AppDataPath, "queues/dir2"), q2.baseConfig.DataFullDir)
 	assert.Equal(t, 102, q2.baseConfig.Length)
 	assert.Equal(t, 22, q2.batchLength)
-	assert.Equal(t, "", q2.baseConfig.ConnStr)
+	assert.Empty(t, q2.baseConfig.ConnStr)
 	assert.Equal(t, "sub_q2", q2.baseConfig.QueueFullName)
 	assert.Equal(t, "sub_q2_u2", q2.baseConfig.SetFullName)
 	assert.Equal(t, 123, q2.GetWorkerMaxNumber())
diff --git a/modules/queue/mock/redisuniversalclient.go b/modules/queue/mock/redisuniversalclient.go
index 65bac755d1..a19e639ac1 100644
--- a/modules/queue/mock/redisuniversalclient.go
+++ b/modules/queue/mock/redisuniversalclient.go
@@ -22,6 +22,7 @@ import (
 type MockRedisClient struct {
 	ctrl     *gomock.Controller
 	recorder *MockRedisClientMockRecorder
+	isgomock struct{}
 }
 
 // MockRedisClientMockRecorder is the mock recorder for MockRedisClient.
@@ -56,38 +57,38 @@ func (mr *MockRedisClientMockRecorder) Close() *gomock.Call {
 }
 
 // DBSize mocks base method.
-func (m *MockRedisClient) DBSize(arg0 context.Context) *redis.IntCmd {
+func (m *MockRedisClient) DBSize(ctx context.Context) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DBSize", arg0)
+	ret := m.ctrl.Call(m, "DBSize", ctx)
 	ret0, _ := ret[0].(*redis.IntCmd)
 	return ret0
 }
 
 // DBSize indicates an expected call of DBSize.
-func (mr *MockRedisClientMockRecorder) DBSize(arg0 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) DBSize(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DBSize", reflect.TypeOf((*MockRedisClient)(nil).DBSize), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DBSize", reflect.TypeOf((*MockRedisClient)(nil).DBSize), ctx)
 }
 
 // Decr mocks base method.
-func (m *MockRedisClient) Decr(arg0 context.Context, arg1 string) *redis.IntCmd {
+func (m *MockRedisClient) Decr(ctx context.Context, key string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Decr", arg0, arg1)
+	ret := m.ctrl.Call(m, "Decr", ctx, key)
 	ret0, _ := ret[0].(*redis.IntCmd)
 	return ret0
 }
 
 // Decr indicates an expected call of Decr.
-func (mr *MockRedisClientMockRecorder) Decr(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Decr(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockRedisClient)(nil).Decr), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decr", reflect.TypeOf((*MockRedisClient)(nil).Decr), ctx, key)
 }
 
 // Del mocks base method.
-func (m *MockRedisClient) Del(arg0 context.Context, arg1 ...string) *redis.IntCmd {
+func (m *MockRedisClient) Del(ctx context.Context, keys ...string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0}
-	for _, a := range arg1 {
+	varargs := []any{ctx}
+	for _, a := range keys {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "Del", varargs...)
@@ -96,17 +97,17 @@ func (m *MockRedisClient) Del(arg0 context.Context, arg1 ...string) *redis.IntCm
 }
 
 // Del indicates an expected call of Del.
-func (mr *MockRedisClientMockRecorder) Del(arg0 any, arg1 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Del(ctx any, keys ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0}, arg1...)
+	varargs := append([]any{ctx}, keys...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Del", reflect.TypeOf((*MockRedisClient)(nil).Del), varargs...)
 }
 
 // Exists mocks base method.
-func (m *MockRedisClient) Exists(arg0 context.Context, arg1 ...string) *redis.IntCmd {
+func (m *MockRedisClient) Exists(ctx context.Context, keys ...string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0}
-	for _, a := range arg1 {
+	varargs := []any{ctx}
+	for _, a := range keys {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "Exists", varargs...)
@@ -115,45 +116,45 @@ func (m *MockRedisClient) Exists(arg0 context.Context, arg1 ...string) *redis.In
 }
 
 // Exists indicates an expected call of Exists.
-func (mr *MockRedisClientMockRecorder) Exists(arg0 any, arg1 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Exists(ctx any, keys ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0}, arg1...)
+	varargs := append([]any{ctx}, keys...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockRedisClient)(nil).Exists), varargs...)
 }
 
 // FlushDB mocks base method.
-func (m *MockRedisClient) FlushDB(arg0 context.Context) *redis.StatusCmd {
+func (m *MockRedisClient) FlushDB(ctx context.Context) *redis.StatusCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "FlushDB", arg0)
+	ret := m.ctrl.Call(m, "FlushDB", ctx)
 	ret0, _ := ret[0].(*redis.StatusCmd)
 	return ret0
 }
 
 // FlushDB indicates an expected call of FlushDB.
-func (mr *MockRedisClientMockRecorder) FlushDB(arg0 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) FlushDB(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FlushDB", reflect.TypeOf((*MockRedisClient)(nil).FlushDB), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FlushDB", reflect.TypeOf((*MockRedisClient)(nil).FlushDB), ctx)
 }
 
 // Get mocks base method.
-func (m *MockRedisClient) Get(arg0 context.Context, arg1 string) *redis.StringCmd {
+func (m *MockRedisClient) Get(ctx context.Context, key string) *redis.StringCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Get", arg0, arg1)
+	ret := m.ctrl.Call(m, "Get", ctx, key)
 	ret0, _ := ret[0].(*redis.StringCmd)
 	return ret0
 }
 
 // Get indicates an expected call of Get.
-func (mr *MockRedisClientMockRecorder) Get(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Get(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRedisClient)(nil).Get), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockRedisClient)(nil).Get), ctx, key)
 }
 
 // HDel mocks base method.
-func (m *MockRedisClient) HDel(arg0 context.Context, arg1 string, arg2 ...string) *redis.IntCmd {
+func (m *MockRedisClient) HDel(ctx context.Context, key string, fields ...string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0, arg1}
-	for _, a := range arg2 {
+	varargs := []any{ctx, key}
+	for _, a := range fields {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "HDel", varargs...)
@@ -162,31 +163,31 @@ func (m *MockRedisClient) HDel(arg0 context.Context, arg1 string, arg2 ...string
 }
 
 // HDel indicates an expected call of HDel.
-func (mr *MockRedisClientMockRecorder) HDel(arg0, arg1 any, arg2 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) HDel(ctx, key any, fields ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0, arg1}, arg2...)
+	varargs := append([]any{ctx, key}, fields...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HDel", reflect.TypeOf((*MockRedisClient)(nil).HDel), varargs...)
 }
 
 // HKeys mocks base method.
-func (m *MockRedisClient) HKeys(arg0 context.Context, arg1 string) *redis.StringSliceCmd {
+func (m *MockRedisClient) HKeys(ctx context.Context, key string) *redis.StringSliceCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "HKeys", arg0, arg1)
+	ret := m.ctrl.Call(m, "HKeys", ctx, key)
 	ret0, _ := ret[0].(*redis.StringSliceCmd)
 	return ret0
 }
 
 // HKeys indicates an expected call of HKeys.
-func (mr *MockRedisClientMockRecorder) HKeys(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) HKeys(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HKeys", reflect.TypeOf((*MockRedisClient)(nil).HKeys), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HKeys", reflect.TypeOf((*MockRedisClient)(nil).HKeys), ctx, key)
 }
 
 // HSet mocks base method.
-func (m *MockRedisClient) HSet(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd {
+func (m *MockRedisClient) HSet(ctx context.Context, key string, values ...any) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0, arg1}
-	for _, a := range arg2 {
+	varargs := []any{ctx, key}
+	for _, a := range values {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "HSet", varargs...)
@@ -195,73 +196,73 @@ func (m *MockRedisClient) HSet(arg0 context.Context, arg1 string, arg2 ...any) *
 }
 
 // HSet indicates an expected call of HSet.
-func (mr *MockRedisClientMockRecorder) HSet(arg0, arg1 any, arg2 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) HSet(ctx, key any, values ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0, arg1}, arg2...)
+	varargs := append([]any{ctx, key}, values...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HSet", reflect.TypeOf((*MockRedisClient)(nil).HSet), varargs...)
 }
 
 // Incr mocks base method.
-func (m *MockRedisClient) Incr(arg0 context.Context, arg1 string) *redis.IntCmd {
+func (m *MockRedisClient) Incr(ctx context.Context, key string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Incr", arg0, arg1)
+	ret := m.ctrl.Call(m, "Incr", ctx, key)
 	ret0, _ := ret[0].(*redis.IntCmd)
 	return ret0
 }
 
 // Incr indicates an expected call of Incr.
-func (mr *MockRedisClientMockRecorder) Incr(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Incr(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockRedisClient)(nil).Incr), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Incr", reflect.TypeOf((*MockRedisClient)(nil).Incr), ctx, key)
 }
 
 // LLen mocks base method.
-func (m *MockRedisClient) LLen(arg0 context.Context, arg1 string) *redis.IntCmd {
+func (m *MockRedisClient) LLen(ctx context.Context, key string) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LLen", arg0, arg1)
+	ret := m.ctrl.Call(m, "LLen", ctx, key)
 	ret0, _ := ret[0].(*redis.IntCmd)
 	return ret0
 }
 
 // LLen indicates an expected call of LLen.
-func (mr *MockRedisClientMockRecorder) LLen(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) LLen(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LLen", reflect.TypeOf((*MockRedisClient)(nil).LLen), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LLen", reflect.TypeOf((*MockRedisClient)(nil).LLen), ctx, key)
 }
 
 // LPop mocks base method.
-func (m *MockRedisClient) LPop(arg0 context.Context, arg1 string) *redis.StringCmd {
+func (m *MockRedisClient) LPop(ctx context.Context, key string) *redis.StringCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "LPop", arg0, arg1)
+	ret := m.ctrl.Call(m, "LPop", ctx, key)
 	ret0, _ := ret[0].(*redis.StringCmd)
 	return ret0
 }
 
 // LPop indicates an expected call of LPop.
-func (mr *MockRedisClientMockRecorder) LPop(arg0, arg1 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) LPop(ctx, key any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LPop", reflect.TypeOf((*MockRedisClient)(nil).LPop), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LPop", reflect.TypeOf((*MockRedisClient)(nil).LPop), ctx, key)
 }
 
 // Ping mocks base method.
-func (m *MockRedisClient) Ping(arg0 context.Context) *redis.StatusCmd {
+func (m *MockRedisClient) Ping(ctx context.Context) *redis.StatusCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Ping", arg0)
+	ret := m.ctrl.Call(m, "Ping", ctx)
 	ret0, _ := ret[0].(*redis.StatusCmd)
 	return ret0
 }
 
 // Ping indicates an expected call of Ping.
-func (mr *MockRedisClientMockRecorder) Ping(arg0 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Ping(ctx any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ping", reflect.TypeOf((*MockRedisClient)(nil).Ping), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ping", reflect.TypeOf((*MockRedisClient)(nil).Ping), ctx)
 }
 
 // RPush mocks base method.
-func (m *MockRedisClient) RPush(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd {
+func (m *MockRedisClient) RPush(ctx context.Context, key string, values ...any) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0, arg1}
-	for _, a := range arg2 {
+	varargs := []any{ctx, key}
+	for _, a := range values {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "RPush", varargs...)
@@ -270,17 +271,17 @@ func (m *MockRedisClient) RPush(arg0 context.Context, arg1 string, arg2 ...any)
 }
 
 // RPush indicates an expected call of RPush.
-func (mr *MockRedisClientMockRecorder) RPush(arg0, arg1 any, arg2 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) RPush(ctx, key any, values ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0, arg1}, arg2...)
+	varargs := append([]any{ctx, key}, values...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RPush", reflect.TypeOf((*MockRedisClient)(nil).RPush), varargs...)
 }
 
 // SAdd mocks base method.
-func (m *MockRedisClient) SAdd(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd {
+func (m *MockRedisClient) SAdd(ctx context.Context, key string, members ...any) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0, arg1}
-	for _, a := range arg2 {
+	varargs := []any{ctx, key}
+	for _, a := range members {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "SAdd", varargs...)
@@ -289,31 +290,31 @@ func (m *MockRedisClient) SAdd(arg0 context.Context, arg1 string, arg2 ...any) *
 }
 
 // SAdd indicates an expected call of SAdd.
-func (mr *MockRedisClientMockRecorder) SAdd(arg0, arg1 any, arg2 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) SAdd(ctx, key any, members ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0, arg1}, arg2...)
+	varargs := append([]any{ctx, key}, members...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SAdd", reflect.TypeOf((*MockRedisClient)(nil).SAdd), varargs...)
 }
 
 // SIsMember mocks base method.
-func (m *MockRedisClient) SIsMember(arg0 context.Context, arg1 string, arg2 any) *redis.BoolCmd {
+func (m *MockRedisClient) SIsMember(ctx context.Context, key string, member any) *redis.BoolCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SIsMember", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "SIsMember", ctx, key, member)
 	ret0, _ := ret[0].(*redis.BoolCmd)
 	return ret0
 }
 
 // SIsMember indicates an expected call of SIsMember.
-func (mr *MockRedisClientMockRecorder) SIsMember(arg0, arg1, arg2 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) SIsMember(ctx, key, member any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SIsMember", reflect.TypeOf((*MockRedisClient)(nil).SIsMember), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SIsMember", reflect.TypeOf((*MockRedisClient)(nil).SIsMember), ctx, key, member)
 }
 
 // SRem mocks base method.
-func (m *MockRedisClient) SRem(arg0 context.Context, arg1 string, arg2 ...any) *redis.IntCmd {
+func (m *MockRedisClient) SRem(ctx context.Context, key string, members ...any) *redis.IntCmd {
 	m.ctrl.T.Helper()
-	varargs := []any{arg0, arg1}
-	for _, a := range arg2 {
+	varargs := []any{ctx, key}
+	for _, a := range members {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "SRem", varargs...)
@@ -322,22 +323,22 @@ func (m *MockRedisClient) SRem(arg0 context.Context, arg1 string, arg2 ...any) *
 }
 
 // SRem indicates an expected call of SRem.
-func (mr *MockRedisClientMockRecorder) SRem(arg0, arg1 any, arg2 ...any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) SRem(ctx, key any, members ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	varargs := append([]any{arg0, arg1}, arg2...)
+	varargs := append([]any{ctx, key}, members...)
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SRem", reflect.TypeOf((*MockRedisClient)(nil).SRem), varargs...)
 }
 
 // Set mocks base method.
-func (m *MockRedisClient) Set(arg0 context.Context, arg1 string, arg2 any, arg3 time.Duration) *redis.StatusCmd {
+func (m *MockRedisClient) Set(ctx context.Context, key string, value any, expiration time.Duration) *redis.StatusCmd {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Set", arg0, arg1, arg2, arg3)
+	ret := m.ctrl.Call(m, "Set", ctx, key, value, expiration)
 	ret0, _ := ret[0].(*redis.StatusCmd)
 	return ret0
 }
 
 // Set indicates an expected call of Set.
-func (mr *MockRedisClientMockRecorder) Set(arg0, arg1, arg2, arg3 any) *gomock.Call {
+func (mr *MockRedisClientMockRecorder) Set(ctx, key, value, expiration any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockRedisClient)(nil).Set), arg0, arg1, arg2, arg3)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockRedisClient)(nil).Set), ctx, key, value, expiration)
 }
diff --git a/modules/queue/workerqueue_test.go b/modules/queue/workerqueue_test.go
index 5ae1a701b2..8d907ed8cd 100644
--- a/modules/queue/workerqueue_test.go
+++ b/modules/queue/workerqueue_test.go
@@ -64,9 +64,9 @@ func TestWorkerPoolQueueUnhandled(t *testing.T) {
 		ok := true
 		for i := 0; i < queueSetting.Length; i++ {
 			if i%2 == 0 {
-				ok = ok && assert.EqualValues(t, 2, m[i], "test %s: item %d", t.Name(), i)
+				ok = ok && assert.Equal(t, 2, m[i], "test %s: item %d", t.Name(), i)
 			} else {
-				ok = ok && assert.EqualValues(t, 1, m[i], "test %s: item %d", t.Name(), i)
+				ok = ok && assert.Equal(t, 1, m[i], "test %s: item %d", t.Name(), i)
 			}
 		}
 		if !ok {
@@ -174,7 +174,7 @@ func testWorkerPoolQueuePersistence(t *testing.T, queueSetting setting.QueueSett
 
 	assert.NotEmpty(t, tasksQ1)
 	assert.NotEmpty(t, tasksQ2)
-	assert.EqualValues(t, testCount, len(tasksQ1)+len(tasksQ2))
+	assert.Equal(t, testCount, len(tasksQ1)+len(tasksQ2))
 }
 
 func TestWorkerPoolQueueActiveWorkers(t *testing.T) {
@@ -192,13 +192,13 @@ func TestWorkerPoolQueueActiveWorkers(t *testing.T) {
 	}
 
 	time.Sleep(50 * time.Millisecond)
-	assert.EqualValues(t, 1, q.GetWorkerNumber())
-	assert.EqualValues(t, 1, q.GetWorkerActiveNumber())
+	assert.Equal(t, 1, q.GetWorkerNumber())
+	assert.Equal(t, 1, q.GetWorkerActiveNumber())
 	time.Sleep(500 * time.Millisecond)
-	assert.EqualValues(t, 1, q.GetWorkerNumber())
-	assert.EqualValues(t, 0, q.GetWorkerActiveNumber())
+	assert.Equal(t, 1, q.GetWorkerNumber())
+	assert.Equal(t, 0, q.GetWorkerActiveNumber())
 	time.Sleep(workerIdleDuration)
-	assert.EqualValues(t, 1, q.GetWorkerNumber()) // there is at least one worker after the queue begins working
+	assert.Equal(t, 1, q.GetWorkerNumber()) // there is at least one worker after the queue begins working
 	stop()
 
 	q, _ = newWorkerPoolQueueForTest("test-workpoolqueue", setting.QueueSettings{Type: "channel", BatchLength: 1, MaxWorkers: 3, Length: 100}, handler, false)
@@ -208,13 +208,13 @@ func TestWorkerPoolQueueActiveWorkers(t *testing.T) {
 	}
 
 	time.Sleep(50 * time.Millisecond)
-	assert.EqualValues(t, 3, q.GetWorkerNumber())
-	assert.EqualValues(t, 3, q.GetWorkerActiveNumber())
+	assert.Equal(t, 3, q.GetWorkerNumber())
+	assert.Equal(t, 3, q.GetWorkerActiveNumber())
 	time.Sleep(500 * time.Millisecond)
-	assert.EqualValues(t, 3, q.GetWorkerNumber())
-	assert.EqualValues(t, 0, q.GetWorkerActiveNumber())
+	assert.Equal(t, 3, q.GetWorkerNumber())
+	assert.Equal(t, 0, q.GetWorkerActiveNumber())
 	time.Sleep(workerIdleDuration)
-	assert.EqualValues(t, 1, q.GetWorkerNumber()) // there is at least one worker after the queue begins working
+	assert.Equal(t, 1, q.GetWorkerNumber()) // there is at least one worker after the queue begins working
 	stop()
 }
 
@@ -241,13 +241,13 @@ func TestWorkerPoolQueueShutdown(t *testing.T) {
 	}
 	<-handlerCalled
 	time.Sleep(200 * time.Millisecond) // wait for a while to make sure all workers are active
-	assert.EqualValues(t, 4, q.GetWorkerActiveNumber())
+	assert.Equal(t, 4, q.GetWorkerActiveNumber())
 	stop() // stop triggers shutdown
-	assert.EqualValues(t, 0, q.GetWorkerActiveNumber())
+	assert.Equal(t, 0, q.GetWorkerActiveNumber())
 
 	// no item was ever handled, so we still get all of them again
 	q, _ = newWorkerPoolQueueForTest("test-workpoolqueue", qs, handler, false)
-	assert.EqualValues(t, 20, q.GetQueueItemNumber())
+	assert.Equal(t, 20, q.GetQueueItemNumber())
 }
 
 func TestWorkerPoolQueueWorkerIdleReset(t *testing.T) {
diff --git a/modules/references/references.go b/modules/references/references.go
index e1d4b47de0..7df5119393 100644
--- a/modules/references/references.go
+++ b/modules/references/references.go
@@ -460,15 +460,17 @@ func findAllIssueReferencesBytes(content []byte, links []string) []*rawReference
 			}
 			parts := strings.Split(u.EscapedPath(), "/")
 			// /user/repo/issues/3
-			if len(parts) != 5 || parts[0] != "" {
+			// /user/repo/pulls/7/files/...
+			if len(parts) < 5 || parts[0] != "" {
 				continue
 			}
 			var sep string
-			if parts[3] == "issues" {
+			switch parts[3] {
+			case "issues":
 				sep = "#"
-			} else if parts[3] == "pulls" {
+			case "pulls":
 				sep = "!"
-			} else {
+			default:
 				continue
 			}
 			// Note: closing/reopening keywords not supported with URLs
diff --git a/modules/references/references_test.go b/modules/references/references_test.go
index 996066c820..bb22c0bd59 100644
--- a/modules/references/references_test.go
+++ b/modules/references/references_test.go
@@ -46,7 +46,7 @@ owner/repo!123456789
 	contentBytes := []byte(test)
 	convertFullHTMLReferencesToShortRefs(re, &contentBytes)
 	result := string(contentBytes)
-	assert.EqualValues(t, expect, result)
+	assert.Equal(t, expect, result)
 }
 
 func TestFindAllIssueReferences(t *testing.T) {
@@ -132,6 +132,30 @@ func TestFindAllIssueReferences(t *testing.T) {
 				{203, "user4", "repo5", "203", true, XRefActionNone, nil, nil, ""},
 			},
 		},
+		{
+			"This http://gitea.com:3000/user4/repo5/pulls/202#x yes.",
+			[]testResult{
+				{202, "user4", "repo5", "202", true, XRefActionNone, nil, nil, ""},
+			},
+		},
+		{
+			"This http://gitea.com:3000/user4/repo5/pulls/202/commits yes.",
+			[]testResult{
+				{202, "user4", "repo5", "202", true, XRefActionNone, nil, nil, ""},
+			},
+		},
+		{
+			"This http://gitea.com:3000/user4/repo5/pulls/202/files yes.",
+			[]testResult{
+				{202, "user4", "repo5", "202", true, XRefActionNone, nil, nil, ""},
+			},
+		},
+		{
+			"This http://gitea.com:3000/user4/repo5/pulls/202/files#diff- yes.",
+			[]testResult{
+				{202, "user4", "repo5", "202", true, XRefActionNone, nil, nil, ""},
+			},
+		},
 		{
 			"This http://GiTeA.COM:3000/user4/repo6/pulls/205 yes.",
 			[]testResult{
@@ -284,9 +308,9 @@ func testFixtures(t *testing.T, fixtures []testFixture, context string) {
 		}
 		expref := rawToIssueReferenceList(expraw)
 		refs := FindAllIssueReferencesMarkdown(fixture.input)
-		assert.EqualValues(t, expref, refs, "[%s] Failed to parse: {%s}", context, fixture.input)
+		assert.Equal(t, expref, refs, "[%s] Failed to parse: {%s}", context, fixture.input)
 		rawrefs := findAllIssueReferencesMarkdown(fixture.input)
-		assert.EqualValues(t, expraw, rawrefs, "[%s] Failed to parse: {%s}", context, fixture.input)
+		assert.Equal(t, expraw, rawrefs, "[%s] Failed to parse: {%s}", context, fixture.input)
 	}
 
 	// Restore for other tests that may rely on the original value
@@ -295,7 +319,7 @@ func testFixtures(t *testing.T, fixtures []testFixture, context string) {
 
 func TestFindAllMentions(t *testing.T) {
 	res := FindAllMentionsBytes([]byte("@tasha, @mike; @lucy: @john"))
-	assert.EqualValues(t, []RefSpan{
+	assert.Equal(t, []RefSpan{
 		{Start: 0, End: 6},
 		{Start: 8, End: 13},
 		{Start: 15, End: 20},
@@ -558,7 +582,7 @@ func TestParseCloseKeywords(t *testing.T) {
 			res := pat.FindAllStringSubmatch(test.match, -1)
 			assert.Len(t, res, 1)
 			assert.Len(t, res[0], 2)
-			assert.EqualValues(t, test.expected, res[0][1])
+			assert.Equal(t, test.expected, res[0][1])
 		}
 	}
 }
diff --git a/modules/regexplru/regexplru_test.go b/modules/regexplru/regexplru_test.go
index 8c0c722336..6e15e88e14 100644
--- a/modules/regexplru/regexplru_test.go
+++ b/modules/regexplru/regexplru_test.go
@@ -19,9 +19,9 @@ func TestRegexpLru(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, r.MatchString("a"))
 
-	assert.EqualValues(t, 1, lruCache.Len())
+	assert.Equal(t, 1, lruCache.Len())
 
 	_, err = GetCompiled("(")
 	require.Error(t, err)
-	assert.EqualValues(t, 2, lruCache.Len())
+	assert.Equal(t, 2, lruCache.Len())
 }
diff --git a/modules/repository/branch_test.go b/modules/repository/branch_test.go
index deb6cd5d19..31e27f222f 100644
--- a/modules/repository/branch_test.go
+++ b/modules/repository/branch_test.go
@@ -28,5 +28,5 @@ func TestSyncRepoBranches(t *testing.T) {
 	assert.Equal(t, "sha1", repo.ObjectFormatName)
 	branch, err := git_model.GetBranch(db.DefaultContext, 1, "master")
 	require.NoError(t, err)
-	assert.EqualValues(t, "master", branch.Name)
+	assert.Equal(t, "master", branch.Name)
 }
diff --git a/modules/repository/commits.go b/modules/repository/commits.go
index 8f63f03db5..261b6f7a22 100644
--- a/modules/repository/commits.go
+++ b/modules/repository/commits.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repository
@@ -9,6 +10,7 @@ import (
 	"net/url"
 	"time"
 
+	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/models/avatars"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/cache"
@@ -26,6 +28,8 @@ type PushCommit struct {
 	AuthorName     string
 	CommitterEmail string
 	CommitterName  string
+	Signature      *git.ObjectSignature
+	Verification   *asymkey_model.ObjectVerification
 	Timestamp      time.Time
 }
 
@@ -145,6 +149,32 @@ func (pc *PushCommits) AvatarLink(ctx context.Context, email string) string {
 	return v
 }
 
+// PushCommitToCommit transforms a PushCommit to a git.Commit type on a best effort basis.
+//
+// Attention: Converting a Commit to a PushCommit and converting back to a Commit will not result in an identical object!
+func PushCommitToCommit(commit *PushCommit) (*git.Commit, error) {
+	id, err := git.NewIDFromString(commit.Sha1)
+	if err != nil {
+		return nil, err
+	}
+	return &git.Commit{
+		ID: id,
+		Author: &git.Signature{
+			Name:  commit.AuthorName,
+			Email: commit.AuthorEmail,
+			When:  commit.Timestamp,
+		},
+		Committer: &git.Signature{
+			Name:  commit.CommitterName,
+			Email: commit.CommitterEmail,
+			When:  commit.Timestamp,
+		},
+		CommitMessage: commit.Message,
+		Signature:     commit.Signature,
+		Parents:       []git.ObjectID{},
+	}, nil
+}
+
 // CommitToPushCommit transforms a git.Commit to PushCommit type.
 func CommitToPushCommit(commit *git.Commit) *PushCommit {
 	return &PushCommit{
@@ -154,6 +184,7 @@ func CommitToPushCommit(commit *git.Commit) *PushCommit {
 		AuthorName:     commit.Author.Name,
 		CommitterEmail: commit.Committer.Email,
 		CommitterName:  commit.Committer.Name,
+		Signature:      commit.Signature,
 		Timestamp:      commit.Author.When,
 	}
 }
diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go
index f49b0d37c5..4b6d4bfe51 100644
--- a/modules/repository/commits_test.go
+++ b/modules/repository/commits_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repository
@@ -63,9 +64,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
 	assert.Equal(t, "user2", payloadCommits[0].Committer.UserName)
 	assert.Equal(t, "User2", payloadCommits[0].Author.Name)
 	assert.Equal(t, "user2", payloadCommits[0].Author.UserName)
-	assert.EqualValues(t, []string{}, payloadCommits[0].Added)
-	assert.EqualValues(t, []string{}, payloadCommits[0].Removed)
-	assert.EqualValues(t, []string{"readme.md"}, payloadCommits[0].Modified)
+	assert.Equal(t, []string{}, payloadCommits[0].Added)
+	assert.Equal(t, []string{}, payloadCommits[0].Removed)
+	assert.Equal(t, []string{"readme.md"}, payloadCommits[0].Modified)
 
 	assert.Equal(t, "27566bd", payloadCommits[1].ID)
 	assert.Equal(t, "good signed commit (with not yet validated email)", payloadCommits[1].Message)
@@ -74,9 +75,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
 	assert.Equal(t, "user2", payloadCommits[1].Committer.UserName)
 	assert.Equal(t, "User2", payloadCommits[1].Author.Name)
 	assert.Equal(t, "user2", payloadCommits[1].Author.UserName)
-	assert.EqualValues(t, []string{}, payloadCommits[1].Added)
-	assert.EqualValues(t, []string{}, payloadCommits[1].Removed)
-	assert.EqualValues(t, []string{"readme.md"}, payloadCommits[1].Modified)
+	assert.Equal(t, []string{}, payloadCommits[1].Added)
+	assert.Equal(t, []string{}, payloadCommits[1].Removed)
+	assert.Equal(t, []string{"readme.md"}, payloadCommits[1].Modified)
 
 	assert.Equal(t, "5099b81", payloadCommits[2].ID)
 	assert.Equal(t, "good signed commit", payloadCommits[2].Message)
@@ -85,9 +86,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
 	assert.Equal(t, "user2", payloadCommits[2].Committer.UserName)
 	assert.Equal(t, "User2", payloadCommits[2].Author.Name)
 	assert.Equal(t, "user2", payloadCommits[2].Author.UserName)
-	assert.EqualValues(t, []string{"readme.md"}, payloadCommits[2].Added)
-	assert.EqualValues(t, []string{}, payloadCommits[2].Removed)
-	assert.EqualValues(t, []string{}, payloadCommits[2].Modified)
+	assert.Equal(t, []string{"readme.md"}, payloadCommits[2].Added)
+	assert.Equal(t, []string{}, payloadCommits[2].Removed)
+	assert.Equal(t, []string{}, payloadCommits[2].Modified)
 
 	assert.Equal(t, "69554a6", headCommit.ID)
 	assert.Equal(t, "not signed commit", headCommit.Message)
@@ -96,9 +97,9 @@ func TestPushCommits_ToAPIPayloadCommits(t *testing.T) {
 	assert.Equal(t, "user2", headCommit.Committer.UserName)
 	assert.Equal(t, "User2", headCommit.Author.Name)
 	assert.Equal(t, "user2", headCommit.Author.UserName)
-	assert.EqualValues(t, []string{}, headCommit.Added)
-	assert.EqualValues(t, []string{}, headCommit.Removed)
-	assert.EqualValues(t, []string{"readme.md"}, headCommit.Modified)
+	assert.Equal(t, []string{}, headCommit.Added)
+	assert.Equal(t, []string{}, headCommit.Removed)
+	assert.Equal(t, []string{"readme.md"}, headCommit.Modified)
 }
 
 func TestPushCommits_AvatarLink(t *testing.T) {
@@ -133,6 +134,50 @@ func TestPushCommits_AvatarLink(t *testing.T) {
 		pushCommits.AvatarLink(db.DefaultContext, "nonexistent@example.com"))
 }
 
+func TestPushCommitToCommit(t *testing.T) {
+	now := time.Now()
+	sig := &git.Signature{
+		Email: "example@example.com",
+		Name:  "John Doe",
+		When:  now,
+	}
+	const hexString = "0123456789abcdef0123456789abcdef01234567"
+	sha1, err := git.NewIDFromString(hexString)
+	require.NoError(t, err)
+	commit, err := PushCommitToCommit(&PushCommit{
+		Sha1:           sha1.String(),
+		Message:        "Commit Message",
+		AuthorEmail:    "example@example.com",
+		AuthorName:     "John Doe",
+		CommitterEmail: "example@example.com",
+		CommitterName:  "John Doe",
+		Signature:      nil,
+		Timestamp:      now,
+	})
+	require.NoError(t, err)
+	assert.Equal(t, sha1, commit.ID)
+	assert.Equal(t, "Commit Message", commit.CommitMessage)
+	assert.Equal(t, sig, commit.Author)
+	assert.Equal(t, sig, commit.Committer)
+	assert.Nil(t, commit.Signature)
+}
+
+func TestPushCommitToCommitInvalidSha(t *testing.T) {
+	now := time.Now()
+	const hexString = "012"
+	_, err := PushCommitToCommit(&PushCommit{
+		Sha1:           hexString,
+		Message:        "Commit Message",
+		AuthorEmail:    "example@example.com",
+		AuthorName:     "John Doe",
+		CommitterEmail: "example@example.com",
+		CommitterName:  "John Doe",
+		Signature:      nil,
+		Timestamp:      now,
+	})
+	require.Error(t, err)
+}
+
 func TestCommitToPushCommit(t *testing.T) {
 	now := time.Now()
 	sig := &git.Signature{
diff --git a/modules/repository/create.go b/modules/repository/create.go
index d76a5571c7..becfed0370 100644
--- a/modules/repository/create.go
+++ b/modules/repository/create.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repository
@@ -68,12 +69,16 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
 
 	// insert units for repo
 	defaultUnits := unit.DefaultRepoUnits
-	if isFork {
+	switch {
+	case isFork:
 		defaultUnits = unit.DefaultForkRepoUnits
+	case repo.IsMirror:
+		defaultUnits = unit.DefaultMirrorRepoUnits
 	}
 	units := make([]repo_model.RepoUnit, 0, len(defaultUnits))
 	for _, tp := range defaultUnits {
-		if tp == unit.TypeIssues {
+		switch tp {
+		case unit.TypeIssues:
 			units = append(units, repo_model.RepoUnit{
 				RepoID: repo.ID,
 				Type:   tp,
@@ -83,7 +88,7 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
 					EnableDependencies:               setting.Service.DefaultEnableDependencies,
 				},
 			})
-		} else if tp == unit.TypePullRequests {
+		case unit.TypePullRequests:
 			units = append(units, repo_model.RepoUnit{
 				RepoID: repo.ID,
 				Type:   tp,
@@ -94,7 +99,7 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
 					AllowRebaseUpdate:  true,
 				},
 			})
-		} else {
+		default:
 			units = append(units, repo_model.RepoUnit{
 				RepoID: repo.ID,
 				Type:   tp,
@@ -240,6 +245,11 @@ func UpdateRepository(ctx context.Context, repo *repo_model.Repository, visibili
 
 	e := db.GetEngine(ctx)
 
+	// If the repository was reported as abusive, a shadow copy should be created before first update.
+	if err := repo_model.IfNeededCreateShadowCopyForRepository(ctx, repo, true); err != nil {
+		return err
+	}
+
 	if _, err = e.ID(repo.ID).AllCols().Update(repo); err != nil {
 		return fmt.Errorf("update: %w", err)
 	}
diff --git a/modules/repository/create_test.go b/modules/repository/create_test.go
index cb34143cef..45f7f8e853 100644
--- a/modules/repository/create_test.go
+++ b/modules/repository/create_test.go
@@ -42,5 +42,5 @@ func TestGetDirectorySize(t *testing.T) {
 
 	size, err := getDirectorySize(repo.RepoPath())
 	require.NoError(t, err)
-	assert.EqualValues(t, size, repo.Size)
+	assert.Equal(t, size, repo.Size)
 }
diff --git a/modules/repository/init_test.go b/modules/repository/init_test.go
index 227efdc1db..1fa928105c 100644
--- a/modules/repository/init_test.go
+++ b/modules/repository/init_test.go
@@ -14,17 +14,17 @@ func TestMergeCustomLabels(t *testing.T) {
 		all:    []string{"a", "a.yaml", "a.yml"},
 		custom: nil,
 	})
-	assert.EqualValues(t, []string{"a.yaml"}, files, "yaml file should win")
+	assert.Equal(t, []string{"a.yaml"}, files, "yaml file should win")
 
 	files = mergeCustomLabelFiles(optionFileList{
 		all:    []string{"a", "a.yaml"},
 		custom: []string{"a"},
 	})
-	assert.EqualValues(t, []string{"a"}, files, "custom file should win")
+	assert.Equal(t, []string{"a"}, files, "custom file should win")
 
 	files = mergeCustomLabelFiles(optionFileList{
 		all:    []string{"a", "a.yml", "a.yaml"},
 		custom: []string{"a", "a.yml"},
 	})
-	assert.EqualValues(t, []string{"a.yml"}, files, "custom yml file should win if no yaml")
+	assert.Equal(t, []string{"a.yml"}, files, "custom yml file should win if no yaml")
 }
diff --git a/modules/repository/license.go b/modules/repository/license.go
index af75d463d2..9776f047af 100644
--- a/modules/repository/license.go
+++ b/modules/repository/license.go
@@ -99,7 +99,8 @@ func getLicensePlaceholder(name string) *licensePlaceholder {
 
 	// Some special placeholders for specific licenses.
 	// It's unsafe to apply them to all licenses.
-	if name == "0BSD" {
+	switch name {
+	case "0BSD":
 		return &licensePlaceholder{
 			Owner:     []string{"AUTHOR"},
 			Email:     []string{"EMAIL"},
@@ -108,7 +109,7 @@ func getLicensePlaceholder(name string) *licensePlaceholder {
 		}
 
 		// Other special placeholders can be added here.
-	} else if name == "BSD-4-Clause" {
+	case "BSD-4-Clause":
 		ret.Owner = append(ret.Owner, "COPYRIGHT HOLDER")
 		ret.Owner = append(ret.Owner, "the organization")
 	}
diff --git a/modules/repository/repo_test.go b/modules/repository/repo_test.go
index 278bdc2420..45a650ba42 100644
--- a/modules/repository/repo_test.go
+++ b/modules/repository/repo_test.go
@@ -63,7 +63,7 @@ func Test_calcSync(t *testing.T) {
 
 	inserts, deletes, updates := calcSync(gitTags, dbReleases)
 	if assert.Len(t, inserts, 1, "inserts") {
-		assert.EqualValues(t, *gitTags[2], *inserts[0], "inserts equal")
+		assert.Equal(t, *gitTags[2], *inserts[0], "inserts equal")
 	}
 
 	if assert.Len(t, deletes, 1, "deletes") {
@@ -71,6 +71,6 @@ func Test_calcSync(t *testing.T) {
 	}
 
 	if assert.Len(t, updates, 1, "updates") {
-		assert.EqualValues(t, *gitTags[1], *updates[0], "updates equal")
+		assert.Equal(t, *gitTags[1], *updates[0], "updates equal")
 	}
 }
diff --git a/modules/setting/actions_test.go b/modules/setting/actions_test.go
index 4bff6e02ad..a3cd5ced44 100644
--- a/modules/setting/actions_test.go
+++ b/modules/setting/actions_test.go
@@ -21,9 +21,9 @@ func Test_getStorageInheritNameSectionTypeForActions(t *testing.T) {
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "minio", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
 	assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
 
 	iniStr = `
 [storage.actions_log]
@@ -34,9 +34,9 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "minio", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
 	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
+	assert.Equal(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
 
 	iniStr = `
 [storage.actions_log]
@@ -50,9 +50,9 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "minio", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
 	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
+	assert.Equal(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
 
 	iniStr = `
 [storage.actions_artifacts]
@@ -66,9 +66,9 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "local", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
+	assert.Equal(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
 	assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
 
 	iniStr = `
 [storage.actions_artifacts]
@@ -82,9 +82,9 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "local", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
+	assert.Equal(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
 	assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
+	assert.Equal(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
 
 	iniStr = ``
 	cfg, err = NewConfigProviderFromData(iniStr)
@@ -92,9 +92,9 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadActionsFrom(cfg))
 
 	assert.EqualValues(t, "local", Actions.LogStorage.Type)
-	assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
+	assert.Equal(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
 	assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
+	assert.Equal(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
 }
 
 func Test_getDefaultActionsURLForActions(t *testing.T) {
@@ -151,7 +151,7 @@ DEFAULT_ACTIONS_URL = https://example.com
 			require.NoError(t, err)
 			require.NoError(t, loadActionsFrom(cfg))
 
-			assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())
+			assert.Equal(t, tt.wantURL, Actions.DefaultActionsURL.URL())
 		})
 	}
 }
diff --git a/modules/setting/admin_test.go b/modules/setting/admin_test.go
index 5473534521..744f069d82 100644
--- a/modules/setting/admin_test.go
+++ b/modules/setting/admin_test.go
@@ -26,8 +26,8 @@ func Test_loadAdminFrom(t *testing.T) {
 	loadAdminFrom(cfg)
 
 	assert.True(t, Admin.DisableRegularOrgCreation)
-	assert.EqualValues(t, "z", Admin.DefaultEmailNotification)
+	assert.Equal(t, "z", Admin.DefaultEmailNotification)
 	assert.True(t, Admin.SendNotificationEmailOnNewUser)
-	assert.EqualValues(t, container.SetOf("a", "b"), Admin.UserDisabledFeatures)
-	assert.EqualValues(t, container.SetOf("x", "y"), Admin.ExternalUserDisableFeatures)
+	assert.Equal(t, container.SetOf("a", "b"), Admin.UserDisabledFeatures)
+	assert.Equal(t, container.SetOf("x", "y"), Admin.ExternalUserDisableFeatures)
 }
diff --git a/modules/setting/attachment_test.go b/modules/setting/attachment_test.go
index f8085c1657..a56fcf1c55 100644
--- a/modules/setting/attachment_test.go
+++ b/modules/setting/attachment_test.go
@@ -26,9 +26,9 @@ MINIO_ENDPOINT = my_minio:9000
 	require.NoError(t, loadAttachmentFrom(cfg))
 
 	assert.EqualValues(t, "minio", Attachment.Storage.Type)
-	assert.EqualValues(t, "my_minio:9000", Attachment.Storage.MinioConfig.Endpoint)
-	assert.EqualValues(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "my_minio:9000", Attachment.Storage.MinioConfig.Endpoint)
+	assert.Equal(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageTypeSectionOverridesStorageSection(t *testing.T) {
@@ -48,8 +48,8 @@ MINIO_BUCKET = gitea
 	require.NoError(t, loadAttachmentFrom(cfg))
 
 	assert.EqualValues(t, "minio", Attachment.Storage.Type)
-	assert.EqualValues(t, "gitea-minio", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-minio", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageSpecificOverridesStorage(t *testing.T) {
@@ -70,8 +70,8 @@ STORAGE_TYPE = local
 	require.NoError(t, loadAttachmentFrom(cfg))
 
 	assert.EqualValues(t, "minio", Attachment.Storage.Type)
-	assert.EqualValues(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageGetDefaults(t *testing.T) {
@@ -81,7 +81,7 @@ func Test_getStorageGetDefaults(t *testing.T) {
 	require.NoError(t, loadAttachmentFrom(cfg))
 
 	// default storage is local, so bucket is empty
-	assert.EqualValues(t, "", Attachment.Storage.MinioConfig.Bucket)
+	assert.Empty(t, Attachment.Storage.MinioConfig.Bucket)
 }
 
 func Test_getStorageInheritNameSectionType(t *testing.T) {
@@ -116,7 +116,7 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := Attachment.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
 }
 
 func Test_AttachmentStorage1(t *testing.T) {
@@ -129,6 +129,6 @@ STORAGE_TYPE = minio
 
 	require.NoError(t, loadAttachmentFrom(cfg))
 	assert.EqualValues(t, "minio", Attachment.Storage.Type)
-	assert.EqualValues(t, "gitea", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 }
diff --git a/modules/setting/config_env_test.go b/modules/setting/config_env_test.go
index bec3e584ef..fed0f668aa 100644
--- a/modules/setting/config_env_test.go
+++ b/modules/setting/config_env_test.go
@@ -30,8 +30,8 @@ func TestDecodeEnvSectionKey(t *testing.T) {
 
 	ok, section, key = decodeEnvSectionKey("SEC")
 	assert.False(t, ok)
-	assert.Equal(t, "", section)
-	assert.Equal(t, "", key)
+	assert.Empty(t, section)
+	assert.Empty(t, key)
 }
 
 func TestDecodeEnvironmentKey(t *testing.T) {
@@ -40,19 +40,19 @@ func TestDecodeEnvironmentKey(t *testing.T) {
 
 	ok, section, key, file := decodeEnvironmentKey(prefix, suffix, "SEC__KEY")
 	assert.False(t, ok)
-	assert.Equal(t, "", section)
-	assert.Equal(t, "", key)
+	assert.Empty(t, section)
+	assert.Empty(t, key)
 	assert.False(t, file)
 
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA__SEC")
 	assert.False(t, ok)
-	assert.Equal(t, "", section)
-	assert.Equal(t, "", key)
+	assert.Empty(t, section)
+	assert.Empty(t, key)
 	assert.False(t, file)
 
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA____KEY")
 	assert.True(t, ok)
-	assert.Equal(t, "", section)
+	assert.Empty(t, section)
 	assert.Equal(t, "KEY", key)
 	assert.False(t, file)
 
@@ -72,8 +72,8 @@ func TestDecodeEnvironmentKey(t *testing.T) {
 	// but it could be fixed in the future by adding a new suffix like "__VALUE" (no such key VALUE is used in Gitea either)
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA__SEC__FILE")
 	assert.False(t, ok)
-	assert.Equal(t, "", section)
-	assert.Equal(t, "", key)
+	assert.Empty(t, section)
+	assert.Empty(t, key)
 	assert.True(t, file)
 
 	ok, section, key, file = decodeEnvironmentKey(prefix, suffix, "GITEA__SEC__KEY__FILE")
diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go
index e93b21abda..a34859de56 100644
--- a/modules/setting/config_provider.go
+++ b/modules/setting/config_provider.go
@@ -262,7 +262,7 @@ func (p *iniConfigProvider) Save() error {
 	}
 	filename := p.file
 	if filename == "" {
-		return fmt.Errorf("config file path must not be empty")
+		return errors.New("config file path must not be empty")
 	}
 	if p.loadedFromEmpty {
 		if err := os.MkdirAll(filepath.Dir(filename), os.ModePerm); err != nil {
@@ -331,6 +331,14 @@ func deprecatedSetting(rootCfg ConfigProvider, oldSection, oldKey, newSection, n
 	}
 }
 
+func deprecatedSettingWarning(rootCfg ConfigProvider, oldSection, oldKey, newSection, newKey string) { //nolint:unparam
+	if rootCfg.Section(oldSection).HasKey(oldKey) {
+		msg := fmt.Sprintf("Deprecated config option `[%s]` `%s` present. Use `[%s]` `%s` instead.", oldSection, oldKey, newSection, newKey)
+		log.Error("%v", msg)
+		DeprecatedWarnings = append(DeprecatedWarnings, msg)
+	}
+}
+
 // deprecatedSettingDB add a hint that the configuration has been moved to database but still kept in app.ini
 func deprecatedSettingDB(rootCfg ConfigProvider, oldSection, oldKey string) {
 	if rootCfg.Section(oldSection).HasKey(oldKey) {
diff --git a/modules/setting/config_provider_test.go b/modules/setting/config_provider_test.go
index 702be80861..3b99911f38 100644
--- a/modules/setting/config_provider_test.go
+++ b/modules/setting/config_provider_test.go
@@ -63,17 +63,17 @@ key = 123
 
 	// test default behavior
 	assert.Equal(t, "123", ConfigSectionKeyString(sec, "key"))
-	assert.Equal(t, "", ConfigSectionKeyString(secSub, "key"))
+	assert.Empty(t, ConfigSectionKeyString(secSub, "key"))
 	assert.Equal(t, "def", ConfigSectionKeyString(secSub, "key", "def"))
 
 	assert.Equal(t, "123", ConfigInheritedKeyString(secSub, "key"))
 
 	// Workaround for ini package's BuggyKeyOverwritten behavior
-	assert.Equal(t, "", ConfigSectionKeyString(sec, "empty"))
-	assert.Equal(t, "", ConfigSectionKeyString(secSub, "empty"))
+	assert.Empty(t, ConfigSectionKeyString(sec, "empty"))
+	assert.Empty(t, ConfigSectionKeyString(secSub, "empty"))
 	assert.Equal(t, "def", ConfigInheritedKey(secSub, "empty").MustString("def"))
 	assert.Equal(t, "def", ConfigInheritedKey(secSub, "empty").MustString("xyz"))
-	assert.Equal(t, "", ConfigSectionKeyString(sec, "empty"))
+	assert.Empty(t, ConfigSectionKeyString(sec, "empty"))
 	assert.Equal(t, "def", ConfigSectionKeyString(secSub, "empty"))
 }
 
diff --git a/modules/setting/cron_test.go b/modules/setting/cron_test.go
index 32f8ecffd2..cabfb3a325 100644
--- a/modules/setting/cron_test.go
+++ b/modules/setting/cron_test.go
@@ -39,6 +39,6 @@ EXTEND = true
 	_, err = getCronSettings(cfg, "test", extended)
 	require.NoError(t, err)
 	assert.True(t, extended.Base)
-	assert.EqualValues(t, "white rabbit", extended.Second)
+	assert.Equal(t, "white rabbit", extended.Second)
 	assert.True(t, extended.Extend)
 }
diff --git a/modules/setting/database.go b/modules/setting/database.go
index 76fae27164..96859e4cf4 100644
--- a/modules/setting/database.go
+++ b/modules/setting/database.go
@@ -10,8 +10,13 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
+
+	"forgejo.org/modules/log"
+
+	"xorm.io/xorm"
 )
 
 var (
@@ -24,35 +29,41 @@ var (
 	EnableSQLite3 bool
 
 	// Database holds the database settings
-	Database = struct {
-		Type               DatabaseType
-		Host               string
-		Name               string
-		User               string
-		Passwd             string
-		Schema             string
-		SSLMode            string
-		Path               string
-		LogSQL             bool
-		MysqlCharset       string
-		CharsetCollation   string
-		Timeout            int // seconds
-		SQLiteJournalMode  string
-		DBConnectRetries   int
-		DBConnectBackoff   time.Duration
-		MaxIdleConns       int
-		MaxOpenConns       int
-		ConnMaxIdleTime    time.Duration
-		ConnMaxLifetime    time.Duration
-		IterateBufferSize  int
-		AutoMigration      bool
-		SlowQueryThreshold time.Duration
-	}{
+	Database = DatabaseSettings{
 		Timeout:           500,
 		IterateBufferSize: 50,
 	}
 )
 
+type DatabaseSettings struct {
+	Type               DatabaseType
+	Host               string
+	HostPrimary        string
+	HostReplica        string
+	LoadBalancePolicy  string
+	LoadBalanceWeights string
+	Name               string
+	User               string
+	Passwd             string
+	Schema             string
+	SSLMode            string
+	Path               string
+	LogSQL             bool
+	MysqlCharset       string
+	CharsetCollation   string
+	Timeout            int // seconds
+	SQLiteJournalMode  string
+	DBConnectRetries   int
+	DBConnectBackoff   time.Duration
+	MaxIdleConns       int
+	MaxOpenConns       int
+	ConnMaxIdleTime    time.Duration
+	ConnMaxLifetime    time.Duration
+	IterateBufferSize  int
+	AutoMigration      bool
+	SlowQueryThreshold time.Duration
+}
+
 // LoadDBSetting loads the database settings
 func LoadDBSetting() {
 	loadDBSetting(CfgProvider)
@@ -63,6 +74,10 @@ func loadDBSetting(rootCfg ConfigProvider) {
 	Database.Type = DatabaseType(sec.Key("DB_TYPE").String())
 
 	Database.Host = sec.Key("HOST").String()
+	Database.HostPrimary = sec.Key("HOST_PRIMARY").String()
+	Database.HostReplica = sec.Key("HOST_REPLICA").String()
+	Database.LoadBalancePolicy = sec.Key("LOAD_BALANCE_POLICY").String()
+	Database.LoadBalanceWeights = sec.Key("LOAD_BALANCE_WEIGHTS").String()
 	Database.Name = sec.Key("NAME").String()
 	Database.User = sec.Key("USER").String()
 	if len(Database.Passwd) == 0 {
@@ -99,8 +114,114 @@ func loadDBSetting(rootCfg ConfigProvider) {
 	}
 }
 
-// DBConnStr returns database connection string
-func DBConnStr() (string, error) {
+// DBMasterConnStr returns the connection string for the master (primary) database.
+// If a primary host is defined in the configuration, it is used;
+// otherwise, it falls back to Database.Host.
+// Returns an error if no master host is provided but a slave is defined.
+func DBMasterConnStr() (string, error) {
+	var host string
+	if Database.HostPrimary != "" {
+		host = Database.HostPrimary
+	} else {
+		host = Database.Host
+	}
+	if host == "" && Database.HostReplica != "" {
+		return "", errors.New("master host is not defined while slave is defined; cannot proceed")
+	}
+
+	// For SQLite, no host is needed
+	if host == "" && !Database.Type.IsSQLite3() {
+		return "", errors.New("no database host defined")
+	}
+
+	return dbConnStrWithHost(host)
+}
+
+// DBSlaveConnStrs returns one or more connection strings for the replica databases.
+// If a replica host is defined (possibly as a comma-separated list) then those DSNs are returned.
+// Otherwise, this function falls back to the master DSN (with a warning log).
+func DBSlaveConnStrs() ([]string, error) {
+	var dsns []string
+	if Database.HostReplica != "" {
+		// support multiple replica hosts separated by commas
+		replicas := strings.SplitSeq(Database.HostReplica, ",")
+		for r := range replicas {
+			trimmed := strings.TrimSpace(r)
+			if trimmed == "" {
+				continue
+			}
+			dsn, err := dbConnStrWithHost(trimmed)
+			if err != nil {
+				return nil, err
+			}
+			dsns = append(dsns, dsn)
+		}
+	}
+	// Fall back to master if no slave DSN was provided.
+	if len(dsns) == 0 {
+		master, err := DBMasterConnStr()
+		if err != nil {
+			return nil, err
+		}
+		log.Debug("Database: No dedicated replica host defined; falling back to primary DSN for replica connections")
+		dsns = append(dsns, master)
+	}
+	return dsns, nil
+}
+
+func BuildLoadBalancePolicy(settings *DatabaseSettings, slaveEngines []*xorm.Engine) xorm.GroupPolicy {
+	var policy xorm.GroupPolicy
+	switch settings.LoadBalancePolicy { // Use the settings parameter directly
+	case "WeightRandom":
+		var weights []int
+		if settings.LoadBalanceWeights != "" { // Use the settings parameter directly
+			for part := range strings.SplitSeq(settings.LoadBalanceWeights, ",") {
+				w, err := strconv.Atoi(strings.TrimSpace(part))
+				if err != nil {
+					w = 1 // use a default weight if conversion fails
+				}
+				weights = append(weights, w)
+			}
+		}
+		// If no valid weights were provided, default each slave to weight 1
+		if len(weights) == 0 {
+			weights = make([]int, len(slaveEngines))
+			for i := range weights {
+				weights[i] = 1
+			}
+		}
+		policy = xorm.WeightRandomPolicy(weights)
+	case "WeightRoundRobin":
+		var weights []int
+		if settings.LoadBalanceWeights != "" {
+			for part := range strings.SplitSeq(settings.LoadBalanceWeights, ",") {
+				w, err := strconv.Atoi(strings.TrimSpace(part))
+				if err != nil {
+					w = 1 // use a default weight if conversion fails
+				}
+				weights = append(weights, w)
+			}
+		}
+		// If no valid weights were provided, default each slave to weight 1
+		if len(weights) == 0 {
+			weights = make([]int, len(slaveEngines))
+			for i := range weights {
+				weights[i] = 1
+			}
+		}
+		policy = xorm.WeightRoundRobinPolicy(weights)
+	case "RoundRobin":
+		policy = xorm.RoundRobinPolicy()
+	case "LeastConn":
+		policy = xorm.LeastConnPolicy()
+	default:
+		policy = xorm.RandomPolicy()
+	}
+	return policy
+}
+
+// dbConnStrWithHost constructs the connection string, given a host value.
+func dbConnStrWithHost(host string) (string, error) {
 	var connStr string
 	paramSep := "?"
 	if strings.Contains(Database.Name, paramSep) {
@@ -109,23 +230,25 @@ func DBConnStr() (string, error) {
 	switch Database.Type {
 	case "mysql":
 		connType := "tcp"
-		if len(Database.Host) > 0 && Database.Host[0] == '/' { // looks like a unix socket
+		// if the host starts with '/' it is assumed to be a unix socket path
+		if len(host) > 0 && host[0] == '/' {
 			connType = "unix"
 		}
 		tls := Database.SSLMode
-		if tls == "disable" { // allow (Postgres-inspired) default value to work in MySQL
+		// allow the "disable" value (borrowed from Postgres defaults) to behave as false
+		if tls == "disable" {
 			tls = "false"
 		}
 		connStr = fmt.Sprintf("%s:%s@%s(%s)/%s%sparseTime=true&tls=%s",
-			Database.User, Database.Passwd, connType, Database.Host, Database.Name, paramSep, tls)
+			Database.User, Database.Passwd, connType, host, Database.Name, paramSep, tls)
 	case "postgres":
-		connStr = getPostgreSQLConnectionString(Database.Host, Database.User, Database.Passwd, Database.Name, Database.SSLMode)
+		connStr = getPostgreSQLConnectionString(host, Database.User, Database.Passwd, Database.Name, Database.SSLMode)
 	case "sqlite3":
 		if !EnableSQLite3 {
 			return "", errors.New("this Gitea binary was not built with SQLite3 support")
 		}
 		if err := os.MkdirAll(filepath.Dir(Database.Path), os.ModePerm); err != nil {
-			return "", fmt.Errorf("Failed to create directories: %w", err)
+			return "", fmt.Errorf("failed to create directories: %w", err)
 		}
 		journalMode := ""
 		if Database.SQLiteJournalMode != "" {
@@ -136,7 +259,6 @@ func DBConnStr() (string, error) {
 	default:
 		return "", fmt.Errorf("unknown database type: %s", Database.Type)
 	}
-
 	return connStr, nil
 }
 
diff --git a/modules/setting/database_test.go b/modules/setting/database_test.go
index a742d54f8c..ce816d53e8 100644
--- a/modules/setting/database_test.go
+++ b/modules/setting/database_test.go
@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -107,3 +108,104 @@ func Test_getPostgreSQLConnectionString(t *testing.T) {
 		assert.Equal(t, test.Output, connStr)
 	}
 }
+
+func getPostgreSQLEngineGroupConnectionStrings(primaryHost, replicaHosts, user, passwd, name, sslmode string) (string, []string) {
+	// Determine the primary connection string.
+	primary := primaryHost
+	if strings.TrimSpace(primary) == "" {
+		primary = "127.0.0.1:5432"
+	}
+	primaryConn := getPostgreSQLConnectionString(primary, user, passwd, name, sslmode)
+
+	// Build the replica connection strings.
+	replicaConns := []string{}
+	if strings.TrimSpace(replicaHosts) != "" {
+		// Split comma-separated replica host values.
+		hosts := strings.Split(replicaHosts, ",")
+		for _, h := range hosts {
+			trimmed := strings.TrimSpace(h)
+			if trimmed != "" {
+				replicaConns = append(replicaConns,
+					getPostgreSQLConnectionString(trimmed, user, passwd, name, sslmode))
+			}
+		}
+	}
+
+	return primaryConn, replicaConns
+}
+
+func Test_getPostgreSQLEngineGroupConnectionStrings(t *testing.T) {
+	tests := []struct {
+		primaryHost    string // primary host setting (e.g. "localhost" or "[::1]:1234")
+		replicaHosts   string // comma-separated replica hosts (e.g. "replica1,replica2:2345")
+		user           string
+		passwd         string
+		name           string
+		sslmode        string
+		outputPrimary  string
+		outputReplicas []string
+	}{
+		{
+			// No primary override (empty => default) and no replicas.
+			primaryHost:    "",
+			replicaHosts:   "",
+			user:           "",
+			passwd:         "",
+			name:           "",
+			sslmode:        "",
+			outputPrimary:  "postgres://:@127.0.0.1:5432?sslmode=",
+			outputReplicas: []string{},
+		},
+		{
+			// Primary set and one replica.
+			primaryHost:    "localhost",
+			replicaHosts:   "replicahost",
+			user:           "user",
+			passwd:         "pass",
+			name:           "gitea",
+			sslmode:        "disable",
+			outputPrimary:  "postgres://user:pass@localhost:5432/gitea?sslmode=disable",
+			outputReplicas: []string{"postgres://user:pass@replicahost:5432/gitea?sslmode=disable"},
+		},
+		{
+			// Primary with explicit port; multiple replicas (one without and one with an explicit port).
+			primaryHost:   "localhost:5433",
+			replicaHosts:  "replica1,replica2:5434",
+			user:          "test",
+			passwd:        "secret",
+			name:          "db",
+			sslmode:       "require",
+			outputPrimary: "postgres://test:secret@localhost:5433/db?sslmode=require",
+			outputReplicas: []string{
+				"postgres://test:secret@replica1:5432/db?sslmode=require",
+				"postgres://test:secret@replica2:5434/db?sslmode=require",
+			},
+		},
+		{
+			// IPv6 addresses for primary and replica.
+			primaryHost:   "[::1]:1234",
+			replicaHosts:  "[::2]:2345",
+			user:          "ipv6",
+			passwd:        "ipv6pass",
+			name:          "ipv6db",
+			sslmode:       "disable",
+			outputPrimary: "postgres://ipv6:ipv6pass@[::1]:1234/ipv6db?sslmode=disable",
+			outputReplicas: []string{
+				"postgres://ipv6:ipv6pass@[::2]:2345/ipv6db?sslmode=disable",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		primary, replicas := getPostgreSQLEngineGroupConnectionStrings(
+			test.primaryHost,
+			test.replicaHosts,
+			test.user,
+			test.passwd,
+			test.name,
+			test.sslmode,
+		)
+		assert.Equal(t, test.outputPrimary, primary)
+		assert.Equal(t, test.outputReplicas, replicas)
+	}
+}
diff --git a/modules/setting/federation.go b/modules/setting/federation.go
index a0fdec228e..510ac128ee 100644
--- a/modules/setting/federation.go
+++ b/modules/setting/federation.go
@@ -15,18 +15,20 @@ var (
 		Enabled             bool
 		ShareUserStatistics bool
 		MaxSize             int64
-		Algorithms          []string
+		SignatureAlgorithms []string
 		DigestAlgorithm     string
 		GetHeaders          []string
 		PostHeaders         []string
+		SignatureEnforced   bool
 	}{
 		Enabled:             false,
 		ShareUserStatistics: true,
 		MaxSize:             4,
-		Algorithms:          []string{"rsa-sha256", "rsa-sha512", "ed25519"},
+		SignatureAlgorithms: []string{"rsa-sha256", "rsa-sha512", "ed25519"},
 		DigestAlgorithm:     "SHA-256",
 		GetHeaders:          []string{"(request-target)", "Date", "Host"},
 		PostHeaders:         []string{"(request-target)", "Date", "Host", "Digest"},
+		SignatureEnforced:   true,
 	}
 )
 
@@ -44,8 +46,8 @@ func loadFederationFrom(rootCfg ConfigProvider) {
 	// Get MaxSize in bytes instead of MiB
 	Federation.MaxSize = 1 << 20 * Federation.MaxSize
 
-	HttpsigAlgs = make([]httpsig.Algorithm, len(Federation.Algorithms))
-	for i, alg := range Federation.Algorithms {
+	HttpsigAlgs = make([]httpsig.Algorithm, len(Federation.SignatureAlgorithms))
+	for i, alg := range Federation.SignatureAlgorithms {
 		HttpsigAlgs[i] = httpsig.Algorithm(alg)
 	}
 }
diff --git a/modules/setting/forgejo_storage_test.go b/modules/setting/forgejo_storage_test.go
index d91bff59e9..42c46beb77 100644
--- a/modules/setting/forgejo_storage_test.go
+++ b/modules/setting/forgejo_storage_test.go
@@ -259,6 +259,6 @@ func testStoragePathMatch(t *testing.T, iniStr string, storageType StorageType,
 	cfg, err := NewConfigProviderFromData(iniStr)
 	require.NoError(t, err, iniStr)
 	require.NoError(t, loadCommonSettingsFrom(cfg), iniStr)
-	assert.EqualValues(t, testSectionToPath(storageType, section), testStorageGetPath(*storage), iniStr)
-	assert.EqualValues(t, storageType, (*storage).Type, iniStr)
+	assert.Equal(t, testSectionToPath(storageType, section), testStorageGetPath(*storage), iniStr)
+	assert.Equal(t, storageType, (*storage).Type, iniStr)
 }
diff --git a/modules/setting/git_test.go b/modules/setting/git_test.go
index 34427f908f..5604151907 100644
--- a/modules/setting/git_test.go
+++ b/modules/setting/git_test.go
@@ -6,17 +6,15 @@ package setting
 import (
 	"testing"
 
+	"forgejo.org/modules/test"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestGitConfig(t *testing.T) {
-	oldGit := Git
-	oldGitConfig := GitConfig
-	defer func() {
-		Git = oldGit
-		GitConfig = oldGitConfig
-	}()
+	defer test.MockProtect(&Git)()
+	defer test.MockProtect(&GitConfig)()
 
 	cfg, err := NewConfigProviderFromData(`
 [git.config]
@@ -24,8 +22,8 @@ a.b = 1
 `)
 	require.NoError(t, err)
 	loadGitFrom(cfg)
-	assert.EqualValues(t, "1", GitConfig.Options["a.b"])
-	assert.EqualValues(t, "histogram", GitConfig.Options["diff.algorithm"])
+	assert.Equal(t, "1", GitConfig.Options["a.b"])
+	assert.Equal(t, "histogram", GitConfig.Options["diff.algorithm"])
 
 	cfg, err = NewConfigProviderFromData(`
 [git.config]
@@ -33,24 +31,20 @@ diff.algorithm = other
 `)
 	require.NoError(t, err)
 	loadGitFrom(cfg)
-	assert.EqualValues(t, "other", GitConfig.Options["diff.algorithm"])
+	assert.Equal(t, "other", GitConfig.Options["diff.algorithm"])
 }
 
 func TestGitReflog(t *testing.T) {
-	oldGit := Git
-	oldGitConfig := GitConfig
-	defer func() {
-		Git = oldGit
-		GitConfig = oldGitConfig
-	}()
+	defer test.MockProtect(&Git)()
+	defer test.MockProtect(&GitConfig)()
 
 	// default reflog config without legacy options
 	cfg, err := NewConfigProviderFromData(``)
 	require.NoError(t, err)
 	loadGitFrom(cfg)
 
-	assert.EqualValues(t, "true", GitConfig.GetOption("core.logAllRefUpdates"))
-	assert.EqualValues(t, "90", GitConfig.GetOption("gc.reflogExpire"))
+	assert.Equal(t, "true", GitConfig.GetOption("core.logAllRefUpdates"))
+	assert.Equal(t, "90", GitConfig.GetOption("gc.reflogExpire"))
 
 	// custom reflog config by legacy options
 	cfg, err = NewConfigProviderFromData(`
@@ -61,6 +55,6 @@ EXPIRATION = 123
 	require.NoError(t, err)
 	loadGitFrom(cfg)
 
-	assert.EqualValues(t, "false", GitConfig.GetOption("core.logAllRefUpdates"))
-	assert.EqualValues(t, "123", GitConfig.GetOption("gc.reflogExpire"))
+	assert.Equal(t, "false", GitConfig.GetOption("core.logAllRefUpdates"))
+	assert.Equal(t, "123", GitConfig.GetOption("gc.reflogExpire"))
 }
diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go
index 502be159a1..a890a4a328 100644
--- a/modules/setting/incoming_email.go
+++ b/modules/setting/incoming_email.go
@@ -4,6 +4,7 @@
 package setting
 
 import (
+	"errors"
 	"fmt"
 	"net/mail"
 	"strings"
@@ -43,9 +44,14 @@ func loadIncomingEmailFrom(rootCfg ConfigProvider) {
 	if sec.HasKey("USER") && !sec.HasKey("USERNAME") {
 		IncomingEmail.Username = sec.Key("USER").String()
 	}
+
 	if sec.HasKey("PASSWD") && !sec.HasKey("PASSWORD") {
-		IncomingEmail.Password = sec.Key("PASSWD").String()
+		sec.Key("PASSWORD").SetValue(sec.Key("PASSWD").String())
 	}
+	if sec.HasKey("PASSWD_URI") && !sec.HasKey("PASSWORD_URI") {
+		sec.Key("PASSWORD_URI").SetValue(sec.Key("PASSWD_URI").String())
+	}
+	IncomingEmail.Password = loadSecret(sec, "PASSWORD_URI", "PASSWORD")
 
 	// Infer Port if not set
 	if IncomingEmail.Port == 0 {
@@ -68,7 +74,7 @@ func checkReplyToAddress() error {
 	}
 
 	if parsed.Name != "" {
-		return fmt.Errorf("name must not be set")
+		return errors.New("name must not be set")
 	}
 
 	c := strings.Count(IncomingEmail.ReplyToAddress, IncomingEmail.TokenPlaceholder)
diff --git a/modules/setting/incoming_email_test.go b/modules/setting/incoming_email_test.go
index 0fdd44d333..4ea740bafd 100644
--- a/modules/setting/incoming_email_test.go
+++ b/modules/setting/incoming_email_test.go
@@ -4,6 +4,8 @@
 package setting
 
 import (
+	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -31,8 +33,24 @@ func Test_loadIncomingEmailFrom(t *testing.T) {
 
 		loadIncomingEmailFrom(cfg)
 
-		assert.EqualValues(t, "jane.doe@example.com", IncomingEmail.Username)
-		assert.EqualValues(t, "y0u'll n3v3r gUess th1S!!1", IncomingEmail.Password)
+		assert.Equal(t, "jane.doe@example.com", IncomingEmail.Username)
+		assert.Equal(t, "y0u'll n3v3r gUess th1S!!1", IncomingEmail.Password)
+	})
+
+	t.Run("Secrets", func(t *testing.T) {
+		uri := filepath.Join(t.TempDir(), "email_incoming_password")
+
+		if err := os.WriteFile(uri, []byte("th1S gUess n3v3r y0u'll!!1"), 0o644); err != nil {
+			t.Fatal(err)
+		}
+
+		cfg, sec := makeBaseConfig()
+		sec.NewKey("PASSWORD_URI", "file:"+uri)
+
+		IncomingEmail.Password = ""
+		loadIncomingEmailFrom(cfg)
+
+		assert.Equal(t, "th1S gUess n3v3r y0u'll!!1", IncomingEmail.Password)
 	})
 
 	t.Run("Port settings", func(t *testing.T) {
@@ -45,7 +63,7 @@ func Test_loadIncomingEmailFrom(t *testing.T) {
 
 			loadIncomingEmailFrom(cfg)
 
-			assert.EqualValues(t, 143, IncomingEmail.Port)
+			assert.Equal(t, 143, IncomingEmail.Port)
 		})
 
 		t.Run("no port, with tls", func(t *testing.T) {
@@ -56,7 +74,7 @@ func Test_loadIncomingEmailFrom(t *testing.T) {
 
 			loadIncomingEmailFrom(cfg)
 
-			assert.EqualValues(t, 993, IncomingEmail.Port)
+			assert.Equal(t, 993, IncomingEmail.Port)
 		})
 
 		t.Run("port overrides tls", func(t *testing.T) {
@@ -68,7 +86,7 @@ func Test_loadIncomingEmailFrom(t *testing.T) {
 
 			loadIncomingEmailFrom(cfg)
 
-			assert.EqualValues(t, 1993, IncomingEmail.Port)
+			assert.Equal(t, 1993, IncomingEmail.Port)
 		})
 	})
 }
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
index 3cd48c538b..452bfae737 100644
--- a/modules/setting/lfs.go
+++ b/modules/setting/lfs.go
@@ -80,10 +80,7 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
 	jwtSecretBase64 := loadSecret(rootCfg.Section("server"), "LFS_JWT_SECRET_URI", "LFS_JWT_SECRET")
 	LFS.JWTSecretBytes, err = generate.DecodeJwtSecret(jwtSecretBase64)
 	if err != nil {
-		LFS.JWTSecretBytes, jwtSecretBase64, err = generate.NewJwtSecret()
-		if err != nil {
-			return fmt.Errorf("error generating JWT Secret for custom config: %v", err)
-		}
+		LFS.JWTSecretBytes, jwtSecretBase64 = generate.NewJwtSecret()
 
 		// Save secret
 		saveCfg, err := rootCfg.PrepareSaving()
diff --git a/modules/setting/lfs_test.go b/modules/setting/lfs_test.go
index 2b204282a8..0abf401fa0 100644
--- a/modules/setting/lfs_test.go
+++ b/modules/setting/lfs_test.go
@@ -20,7 +20,7 @@ func Test_getStorageInheritNameSectionTypeForLFS(t *testing.T) {
 	require.NoError(t, loadLFSFrom(cfg))
 
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 
 	iniStr = `
 [server]
@@ -55,7 +55,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadLFSFrom(cfg))
 
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 
 	iniStr = `
 [lfs]
@@ -69,7 +69,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadLFSFrom(cfg))
 
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 
 	iniStr = `
 [lfs]
@@ -84,7 +84,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadLFSFrom(cfg))
 
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
-	assert.EqualValues(t, "my_lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "my_lfs/", LFS.Storage.MinioConfig.BasePath)
 }
 
 func Test_LFSStorage1(t *testing.T) {
@@ -97,8 +97,8 @@ STORAGE_TYPE = minio
 
 	require.NoError(t, loadLFSFrom(cfg))
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
-	assert.EqualValues(t, "gitea", LFS.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", LFS.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 }
 
 func Test_LFSClientServerConfigs(t *testing.T) {
@@ -113,9 +113,9 @@ BATCH_SIZE = 0
 	assert.NoError(t, err)
 
 	assert.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, 100, LFS.MaxBatchSize)
-	assert.EqualValues(t, 20, LFSClient.BatchSize)
-	assert.EqualValues(t, 8, LFSClient.BatchOperationConcurrency)
+	assert.Equal(t, 100, LFS.MaxBatchSize)
+	assert.Equal(t, 20, LFSClient.BatchSize)
+	assert.Equal(t, 8, LFSClient.BatchOperationConcurrency)
 
 	iniStr = `
 [lfs_client]
@@ -126,6 +126,6 @@ BATCH_OPERATION_CONCURRENCY = 10
 	assert.NoError(t, err)
 
 	assert.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, 50, LFSClient.BatchSize)
-	assert.EqualValues(t, 10, LFSClient.BatchOperationConcurrency)
+	assert.Equal(t, 50, LFSClient.BatchSize)
+	assert.Equal(t, 10, LFSClient.BatchOperationConcurrency)
 }
diff --git a/modules/setting/log.go b/modules/setting/log.go
index 0747ac4dac..a23662239e 100644
--- a/modules/setting/log.go
+++ b/modules/setting/log.go
@@ -56,41 +56,73 @@ func loadLogGlobalFrom(rootCfg ConfigProvider) {
 func prepareLoggerConfig(rootCfg ConfigProvider) {
 	sec := rootCfg.Section("log")
 
-	if !sec.HasKey("logger.default.MODE") {
-		sec.Key("logger.default.MODE").MustString(",")
+	// Priority: `LOGGER_DEFAULT_MODE` -> `logger.default.MODE`
+	deprecatedSettingWarning(rootCfg, "log", "logger.default.MODE", "log", "LOGGER_DEFAULT_MODE")
+	hasNoValue := !sec.HasKey("LOGGER_DEFAULT_MODE")
+	if hasNoValue && sec.HasKey("logger.default.MODE") {
+		sec.Key("LOGGER_DEFAULT_MODE").SetValue(sec.Key("logger.default.MODE").String())
+		hasNoValue = false
+	}
+	if hasNoValue {
+		sec.Key("LOGGER_DEFAULT_MODE").SetValue(",") // use default logger
 	}
 
-	deprecatedSetting(rootCfg, "log", "ACCESS", "log", "logger.access.MODE", "1.21")
-	deprecatedSetting(rootCfg, "log", "ENABLE_ACCESS_LOG", "log", "logger.access.MODE", "1.21")
-	if val := sec.Key("ACCESS").String(); val != "" {
-		sec.Key("logger.access.MODE").MustString(val)
+	// Priority: `ENABLE_ACCESS_LOG` -> `LOGGER_ACCESS_MODE` -> `logger.access.MODE` -> `ACCESS`
+	deprecatedSettingWarning(rootCfg, "log", "ACCESS", "log", "LOGGER_ACCESS_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "ENABLE_ACCESS_LOG", "log", "LOGGER_ACCESS_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "logger.access.MODE", "log", "LOGGER_ACCESS_MODE")
+	hasNoValue = !sec.HasKey("LOGGER_ACCESS_MODE")
+	if hasNoValue && sec.HasKey("logger.access.MODE") {
+		sec.Key("LOGGER_ACCESS_MODE").SetValue(sec.Key("logger.access.MODE").String())
+		hasNoValue = false
+	}
+	if val := sec.Key("ACCESS").String(); hasNoValue && val != "" {
+		sec.Key("LOGGER_ACCESS_MODE").SetValue(val)
 	}
 	if sec.HasKey("ENABLE_ACCESS_LOG") && !sec.Key("ENABLE_ACCESS_LOG").MustBool() {
-		sec.Key("logger.access.MODE").SetValue("")
+		sec.Key("LOGGER_ACCESS_MODE").SetValue("")
 	}
 
-	deprecatedSetting(rootCfg, "log", "ROUTER", "log", "logger.router.MODE", "1.21")
-	deprecatedSetting(rootCfg, "log", "DISABLE_ROUTER_LOG", "log", "logger.router.MODE", "1.21")
-	if val := sec.Key("ROUTER").String(); val != "" {
-		sec.Key("logger.router.MODE").MustString(val)
+	// Priority: `DISABLE_ROUTER_LOG` -> `LOGGER_ROUTER_MODE` -> `logger.router.MODE` -> `ROUTER`
+	deprecatedSettingWarning(rootCfg, "log", "ROUTER", "log", "LOGGER_ROUTER_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "DISABLE_ROUTER_LOG", "log", "LOGGER_ROUTER_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "logger.router.MODE", "log", "LOGGER_ROUTER_MODE")
+	hasNoValue = !sec.HasKey("LOGGER_ROUTER_MODE")
+	if hasNoValue && sec.HasKey("logger.router.MODE") {
+		sec.Key("LOGGER_ROUTER_MODE").SetValue(sec.Key("logger.router.MODE").String())
+		hasNoValue = false
 	}
-	if !sec.HasKey("logger.router.MODE") {
-		sec.Key("logger.router.MODE").MustString(",") // use default logger
+	if val := sec.Key("ROUTER").String(); hasNoValue && val != "" {
+		sec.Key("LOGGER_ROUTER_MODE").SetValue(val)
+		hasNoValue = false
 	}
 	if sec.HasKey("DISABLE_ROUTER_LOG") && sec.Key("DISABLE_ROUTER_LOG").MustBool() {
-		sec.Key("logger.router.MODE").SetValue("")
+		sec.Key("LOGGER_ROUTER_MODE").SetValue("")
+		hasNoValue = false
+	}
+	if hasNoValue {
+		sec.Key("LOGGER_ROUTER_MODE").SetValue(",") // use default logger
 	}
 
-	deprecatedSetting(rootCfg, "log", "XORM", "log", "logger.xorm.MODE", "1.21")
-	deprecatedSetting(rootCfg, "log", "ENABLE_XORM_LOG", "log", "logger.xorm.MODE", "1.21")
-	if val := sec.Key("XORM").String(); val != "" {
-		sec.Key("logger.xorm.MODE").MustString(val)
+	// Priority: `ENABLE_XORM_LOG` -> `LOGGER_XORM_MODE` -> `logger.xorm.MODE` -> `XORM`
+	deprecatedSettingWarning(rootCfg, "log", "XORM", "log", "LOGGER_XORM_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "ENABLE_XORM_LOG", "log", "LOGGER_XORM_MODE")
+	deprecatedSettingWarning(rootCfg, "log", "logger.xorm.MODE", "log", "LOGGER_XORM_MODE")
+	hasNoValue = !sec.HasKey("LOGGER_XORM_MODE")
+	if hasNoValue && sec.HasKey("logger.xorm.MODE") {
+		sec.Key("LOGGER_XORM_MODE").SetValue(sec.Key("logger.xorm.MODE").String())
+		hasNoValue = false
 	}
-	if !sec.HasKey("logger.xorm.MODE") {
-		sec.Key("logger.xorm.MODE").MustString(",") // use default logger
+	if val := sec.Key("XORM").String(); hasNoValue && val != "" {
+		sec.Key("LOGGER_XORM_MODE").SetValue(val)
+		hasNoValue = false
 	}
 	if sec.HasKey("ENABLE_XORM_LOG") && !sec.Key("ENABLE_XORM_LOG").MustBool() {
-		sec.Key("logger.xorm.MODE").SetValue("")
+		sec.Key("LOGGER_XORM_MODE").SetValue("")
+		hasNoValue = false
+	}
+	if hasNoValue {
+		sec.Key("LOGGER_XORM_MODE").SetValue(",") // use default logger
 	}
 }
 
@@ -133,6 +165,7 @@ func loadLogModeByName(rootCfg ConfigProvider, loggerName, modeName string) (wri
 	writerMode.StacktraceLevel = log.LevelFromString(ConfigInheritedKeyString(sec, "STACKTRACE_LEVEL", Log.StacktraceLogLevel.String()))
 	writerMode.Prefix = ConfigInheritedKeyString(sec, "PREFIX")
 	writerMode.Expression = ConfigInheritedKeyString(sec, "EXPRESSION")
+	writerMode.Exclusion = ConfigInheritedKeyString(sec, "EXCLUSION")
 	// flags are updated and set below
 
 	switch writerType {
@@ -216,14 +249,14 @@ func initManagedLoggers(manager *log.LoggerManager, cfg ConfigProvider) {
 
 func initLoggerByName(manager *log.LoggerManager, rootCfg ConfigProvider, loggerName string) {
 	sec := rootCfg.Section("log")
-	keyPrefix := "logger." + loggerName
+	key := "LOGGER_" + strings.ToUpper(loggerName) + "_MODE"
 
-	disabled := sec.HasKey(keyPrefix+".MODE") && sec.Key(keyPrefix+".MODE").String() == ""
+	disabled := sec.HasKey(key) && sec.Key(key).String() == ""
 	if disabled {
 		return
 	}
 
-	modeVal := sec.Key(keyPrefix + ".MODE").String()
+	modeVal := sec.Key(key).String()
 	if modeVal == "," {
 		modeVal = Log.Mode
 	}
diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go
index eda6dc36af..a37c8f07a9 100644
--- a/modules/setting/log_test.go
+++ b/modules/setting/log_test.go
@@ -10,16 +10,13 @@ import (
 
 	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/require"
 )
 
 func initLoggersByConfig(t *testing.T, config string) (*log.LoggerManager, func()) {
-	oldLogConfig := Log
-	Log = LogGlobalConfig{}
-	defer func() {
-		Log = oldLogConfig
-	}()
+	defer test.MockVariableValue(&Log, LogGlobalConfig{})()
 
 	cfg, err := NewConfigProviderFromData(config)
 	require.NoError(t, err)
@@ -29,6 +26,17 @@ func initLoggersByConfig(t *testing.T, config string) (*log.LoggerManager, func(
 	return manager, manager.Close
 }
 
+func initLoggerConfig(t *testing.T, config string) ConfigProvider {
+	defer test.MockVariableValue(&Log, LogGlobalConfig{})()
+
+	cfg, err := NewConfigProviderFromData(config)
+	require.NoError(t, err)
+
+	prepareLoggerConfig(cfg)
+
+	return cfg
+}
+
 func toJSON(v any) string {
 	b, _ := json.MarshalIndent(v, "", "\t")
 	return string(b)
@@ -44,6 +52,7 @@ func TestLogConfigDefault(t *testing.T) {
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "info",
 		"Prefix": "",
@@ -83,6 +92,7 @@ logger.xorm.MODE =
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "info",
 		"Prefix": "",
@@ -121,6 +131,7 @@ MODE = console
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "info",
 		"Prefix": "",
@@ -168,6 +179,7 @@ ACCESS = file
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "info",
 		"Prefix": "",
@@ -191,6 +203,7 @@ ACCESS = file
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "none",
 		"Level": "info",
 		"Prefix": "",
@@ -238,8 +251,8 @@ ENABLE_ACCESS_LOG = false
 func TestLogConfigNewConfig(t *testing.T) {
 	manager, managerClose := initLoggersByConfig(t, `
 [log]
-logger.access.MODE = console
-logger.xorm.MODE = console, console-1
+LOGGER_ACCESS_MODE = console
+LOGGER_XORM_MODE = console, console-1
 
 [log.console]
 LEVEL = warn
@@ -257,6 +270,7 @@ STDERR = true
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "warn",
 		"Prefix": "",
@@ -270,6 +284,7 @@ STDERR = true
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "error",
 		"Prefix": "",
@@ -287,6 +302,7 @@ STDERR = true
 		"BufferLen": 10000,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "none",
 		"Level": "warn",
 		"Prefix": "",
@@ -323,6 +339,7 @@ MODE = file
 LEVEL = error
 STACKTRACE_LEVEL = fatal
 EXPRESSION = filter
+EXCLUSION = not
 FLAGS = medfile
 PREFIX = "[Prefix] "
 FILE_NAME = file-xxx.log
@@ -341,6 +358,7 @@ COMPRESSION_LEVEL = 4
 		"BufferLen": 10,
 		"Colorize": false,
 		"Expression": "",
+		"Exclusion": "",
 		"Flags": "stdflags",
 		"Level": "info",
 		"Prefix": "",
@@ -360,6 +378,7 @@ COMPRESSION_LEVEL = 4
 		"BufferLen": 10,
 		"Colorize": false,
 		"Expression": "filter",
+		"Exclusion": "not",
 		"Flags": "medfile",
 		"Level": "error",
 		"Prefix": "[Prefix] ",
@@ -384,3 +403,191 @@ COMPRESSION_LEVEL = 4
 	expected = strings.ReplaceAll(expected, "$FILENAME-1", tempPath("file-xxx.log"))
 	require.JSONEq(t, expected, toJSON(dump))
 }
+
+func TestLegacyLoggerMigrations(t *testing.T) {
+	type Cases = []struct {
+		name string
+		cfg  string
+		exp  string
+	}
+
+	runCases := func(t *testing.T, key string, cases Cases) {
+		for _, c := range cases {
+			t.Run(c.name, func(t *testing.T) {
+				cfg := initLoggerConfig(t, c.cfg)
+				require.Equal(t, c.exp, cfg.Section("log").Key(key).String())
+			})
+		}
+	}
+
+	t.Run("default", func(t *testing.T) {
+		runCases(t, "LOGGER_DEFAULT_MODE", Cases{
+			{
+				"uses default value for default logger",
+				"",
+				",",
+			},
+			{
+				"uses logger.default.MODE for default logger",
+				`[log]
+logger.default.MODE = file
+`,
+				"file",
+			},
+		})
+	})
+
+	t.Run("access", func(t *testing.T) {
+		runCases(t, "LOGGER_ACCESS_MODE", Cases{
+			{
+				"uses default value for access logger",
+				"",
+				"",
+			},
+			{
+				"uses ACCESS for access logger",
+				`[log]
+ACCESS = file
+`,
+				"file",
+			},
+			{
+				"ENABLE_ACCESS_LOG=true doesn't change access logger",
+				`[log]
+ENABLE_ACCESS_LOG = true
+logger.access.MODE = console
+`,
+				"console",
+			},
+			{
+				"ENABLE_ACCESS_LOG=false disables access logger",
+				`[log]
+ENABLE_ACCESS_LOG = false
+logger.access.MODE = console
+`,
+				"",
+			},
+			{
+				"logger.access.MODE has precedence over ACCESS for access logger",
+				`[log]
+ACCESS = file
+logger.access.MODE = console
+`,
+				"console",
+			},
+			{
+				"LOGGER_ACCESS_MODE has precedence over logger.access.MODE for access logger",
+				`[log]
+LOGGER_ACCESS_MODE = file
+logger.access.MODE = console
+`,
+				"file",
+			},
+			{
+				"ENABLE_ACCESS_LOG doesn't enable access logger",
+				`[log]
+ENABLE_ACCESS_LOG = true
+`,
+				"", // should be `,`
+			},
+		})
+	})
+
+	t.Run("router", func(t *testing.T) {
+		runCases(t, "LOGGER_ROUTER_MODE", Cases{
+			{
+				"uses default value for router logger",
+				"",
+				",",
+			},
+			{
+				"uses ROUTER for router logger",
+				`[log]
+ROUTER = file
+`,
+				"file",
+			},
+			{
+				"DISABLE_ROUTER_LOG=false doesn't change router logger",
+				`[log]
+ROUTER = file
+DISABLE_ROUTER_LOG = false
+`,
+				"file",
+			},
+			{
+				"DISABLE_ROUTER_LOG=true disables router logger",
+				`[log]
+DISABLE_ROUTER_LOG = true
+logger.router.MODE = console
+`,
+				"",
+			},
+			{
+				"logger.router.MODE as precedence over ROUTER for router logger",
+				`[log]
+ROUTER = file
+logger.router.MODE = console
+`,
+				"console",
+			},
+			{
+				"LOGGER_ROUTER_MODE has precedence over logger.router.MODE for router logger",
+				`[log]
+LOGGER_ROUTER_MODE = file
+logger.router.MODE = console
+`,
+				"file",
+			},
+		})
+	})
+
+	t.Run("xorm", func(t *testing.T) {
+		runCases(t, "LOGGER_XORM_MODE", Cases{
+			{
+				"uses default value for xorm logger",
+				"",
+				",",
+			},
+			{
+				"uses XORM for xorm logger",
+				`[log]
+XORM = file
+`,
+				"file",
+			},
+			{
+				"ENABLE_XORM_LOG=true doesn't change xorm logger",
+				`[log]
+ENABLE_XORM_LOG = true
+logger.xorm.MODE = console
+`,
+				"console",
+			},
+			{
+				"ENABLE_XORM_LOG=false disables xorm logger",
+				`[log]
+ENABLE_XORM_LOG = false
+logger.xorm.MODE = console
+`,
+				"",
+			},
+			{
+				"logger.xorm.MODE has precedence over XORM for xorm logger",
+				`[log]
+XORM = file
+logger.xorm.MODE = console
+`,
+				"console",
+			},
+			{
+				"LOGGER_XORM_MODE has precedence over logger.xorm.MODE for xorm logger",
+				`[log]
+LOGGER_XORM_MODE = file
+logger.xorm.MODE = console
+`,
+				"file",
+			},
+		})
+	})
+}
diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go
index b7f69c3492..b43484a90f 100644
--- a/modules/setting/mailer.go
+++ b/modules/setting/mailer.go
@@ -147,6 +147,10 @@ func loadMailerFrom(rootCfg ConfigProvider) {
 	if sec.HasKey("PASSWORD") && !sec.HasKey("PASSWD") {
 		sec.Key("PASSWD").SetValue(sec.Key("PASSWORD").String())
 	}
+	if sec.HasKey("PASSWORD_URI") && !sec.HasKey("PASSWD_URI") {
+		sec.Key("PASSWD_URI").SetValue(sec.Key("PASSWORD_URI").String())
+	}
+	sec.Key("PASSWD").SetValue(loadSecret(sec, "PASSWD_URI", "PASSWD"))
 
 	// Set default values & validate
 	sec.Key("NAME").MustString(AppName)
@@ -215,6 +219,11 @@ func loadMailerFrom(rootCfg ConfigProvider) {
 		if err != nil {
 			log.Error("Failed to parse Sendmail args: '%s' with error %v", sec.Key("SENDMAIL_ARGS").String(), err)
 		}
+
+		if len(MailService.SendmailArgs) == 0 || MailService.SendmailArgs[len(MailService.SendmailArgs)-1] != "--" {
+			log.Warn("SENDMAIL_ARGS setting does not end in \"--\", appending it to prevent argument injection")
+			MailService.SendmailArgs = append(MailService.SendmailArgs, "--")
+		}
 	case "smtp", "smtps", "smtp+starttls", "smtp+unix":
 		ips := tryResolveAddr(MailService.SMTPAddr)
 		if MailService.Protocol == "smtp" {
diff --git a/modules/setting/mailer_test.go b/modules/setting/mailer_test.go
index f8af4a78c1..47eaf3ffbb 100644
--- a/modules/setting/mailer_test.go
+++ b/modules/setting/mailer_test.go
@@ -4,6 +4,8 @@
 package setting
 
 import (
+	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -34,8 +36,8 @@ func Test_loadMailerFrom(t *testing.T) {
 			// Check mailer setting
 			loadMailerFrom(cfg)
 
-			assert.EqualValues(t, kase.SMTPAddr, MailService.SMTPAddr)
-			assert.EqualValues(t, kase.SMTPPort, MailService.SMTPPort)
+			assert.Equal(t, kase.SMTPAddr, MailService.SMTPAddr)
+			assert.Equal(t, kase.SMTPPort, MailService.SMTPPort)
 		})
 	}
 
@@ -48,7 +50,49 @@ func Test_loadMailerFrom(t *testing.T) {
 
 		loadMailerFrom(cfg)
 
-		assert.EqualValues(t, "jane.doe@example.com", MailService.User)
-		assert.EqualValues(t, "y0u'll n3v3r gUess th1S!!1", MailService.Passwd)
+		assert.Equal(t, "jane.doe@example.com", MailService.User)
+		assert.Equal(t, "y0u'll n3v3r gUess th1S!!1", MailService.Passwd)
+	})
+
+	t.Run("Secrets", func(t *testing.T) {
+		uri := filepath.Join(t.TempDir(), "mailer_passwd")
+
+		if err := os.WriteFile(uri, []byte("th1S gUess n3v3r y0u'll!!1"), 0o644); err != nil {
+			t.Fatal(err)
+		}
+
+		cfg, _ := NewConfigProviderFromData("")
+		sec := cfg.Section("mailer")
+		sec.NewKey("ENABLED", "true")
+		sec.NewKey("PASSWD_URI", "file:"+uri)
+
+		MailService.Passwd = ""
+		loadMailerFrom(cfg)
+
+		assert.Equal(t, "th1S gUess n3v3r y0u'll!!1", MailService.Passwd)
+	})
+
+	t.Run("sendmail argument sanitization", func(t *testing.T) {
+		cfg, _ := NewConfigProviderFromData("")
+		sec := cfg.Section("mailer")
+		sec.NewKey("ENABLED", "true")
+		sec.NewKey("PROTOCOL", "sendmail")
+		sec.NewKey("SENDMAIL_ARGS", "-B 8BITMIME")
+
+		loadMailerFrom(cfg)
+
+		assert.Equal(t, []string{"-B", "8BITMIME", "--"}, MailService.SendmailArgs)
+	})
+
+	t.Run("empty sendmail args", func(t *testing.T) {
+		cfg, _ := NewConfigProviderFromData("")
+		sec := cfg.Section("mailer")
+		sec.NewKey("ENABLED", "true")
+		sec.NewKey("PROTOCOL", "sendmail")
+		sec.NewKey("SENDMAIL_ARGS", "")
+
+		loadMailerFrom(cfg)
+
+		assert.Equal(t, []string{"--"}, MailService.SendmailArgs)
 	})
 }
diff --git a/modules/setting/markup.go b/modules/setting/markup.go
index 90fc86b131..4ab9e7b2d1 100644
--- a/modules/setting/markup.go
+++ b/modules/setting/markup.go
@@ -62,7 +62,7 @@ type MarkupSanitizerRule struct {
 func loadMarkupFrom(rootCfg ConfigProvider) {
 	mustMapSetting(rootCfg, "markdown", &Markdown)
 
-	MermaidMaxSourceCharacters = rootCfg.Section("markup").Key("MERMAID_MAX_SOURCE_CHARACTERS").MustInt(5000)
+	MermaidMaxSourceCharacters = rootCfg.Section("markup").Key("MERMAID_MAX_SOURCE_CHARACTERS").MustInt(50000)
 	FilePreviewMaxLines = rootCfg.Section("markup").Key("FILEPREVIEW_MAX_LINES").MustInt(50)
 	ExternalMarkupRenderers = make([]*MarkupRenderer, 0, 10)
 	ExternalSanitizerRules = make([]MarkupSanitizerRule, 0, 10)
diff --git a/modules/setting/moderation.go b/modules/setting/moderation.go
new file mode 100644
index 0000000000..799efed761
--- /dev/null
+++ b/modules/setting/moderation.go
@@ -0,0 +1,30 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package setting
+
+import (
+	"fmt"
+	"time"
+)
+
+// Moderation settings
+var Moderation = struct {
+	Enabled                bool          `ini:"ENABLED"`
+	KeepResolvedReportsFor time.Duration `ini:"KEEP_RESOLVED_REPORTS_FOR"`
+}{
+	Enabled: false,
+}
+
+func loadModerationFrom(rootCfg ConfigProvider) error {
+	sec := rootCfg.Section("moderation")
+	err := sec.MapTo(&Moderation)
+	if err != nil {
+		return fmt.Errorf("failed to map Moderation settings: %v", err)
+	}
+
+	// keep reports for one week by default. Since time.Duration stops at the unit of an hour
+	// we are using the value of 24 (hours) * 7 (days) which gives us the value of 168
+	Moderation.KeepResolvedReportsFor = sec.Key("KEEP_RESOLVED_REPORTS_FOR").MustDuration(168 * time.Hour)
+	return nil
+}
diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go
index 72500cfc89..9e95e1c6a9 100644
--- a/modules/setting/oauth2.go
+++ b/modules/setting/oauth2.go
@@ -138,10 +138,7 @@ func loadOAuth2From(rootCfg ConfigProvider) {
 	if InstallLock {
 		jwtSecretBytes, err := generate.DecodeJwtSecret(jwtSecretBase64)
 		if err != nil {
-			jwtSecretBytes, jwtSecretBase64, err = generate.NewJwtSecret()
-			if err != nil {
-				log.Fatal("error generating JWT secret: %v", err)
-			}
+			jwtSecretBytes, jwtSecretBase64 = generate.NewJwtSecret()
 			saveCfg, err := rootCfg.PrepareSaving()
 			if err != nil {
 				log.Fatal("save oauth2.JWT_SECRET failed: %v", err)
@@ -161,10 +158,7 @@ var generalSigningSecret atomic.Pointer[[]byte]
 func GetGeneralTokenSigningSecret() []byte {
 	old := generalSigningSecret.Load()
 	if old == nil || len(*old) == 0 {
-		jwtSecret, _, err := generate.NewJwtSecret()
-		if err != nil {
-			log.Fatal("Unable to generate general JWT secret: %v", err)
-		}
+		jwtSecret, _ := generate.NewJwtSecret()
 		if generalSigningSecret.CompareAndSwap(old, &jwtSecret) {
 			return jwtSecret
 		}
diff --git a/modules/setting/oauth2_test.go b/modules/setting/oauth2_test.go
index 2fc5da6996..7a1f4842a4 100644
--- a/modules/setting/oauth2_test.go
+++ b/modules/setting/oauth2_test.go
@@ -32,7 +32,7 @@ JWT_SECRET = BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 	actual := GetGeneralTokenSigningSecret()
 	expected, _ := generate.DecodeJwtSecret("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")
 	assert.Len(t, actual, 32)
-	assert.EqualValues(t, expected, actual)
+	assert.Equal(t, expected, actual)
 }
 
 func TestGetGeneralSigningSecretSave(t *testing.T) {
diff --git a/modules/setting/packages_test.go b/modules/setting/packages_test.go
index 78eb4b4bbc..85a4656da0 100644
--- a/modules/setting/packages_test.go
+++ b/modules/setting/packages_test.go
@@ -42,7 +42,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadPackagesFrom(cfg))
 
 	assert.EqualValues(t, "minio", Packages.Storage.Type)
-	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "packages/", Packages.Storage.MinioConfig.BasePath)
 
 	// we can also configure packages storage directly
 	iniStr = `
@@ -54,7 +54,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadPackagesFrom(cfg))
 
 	assert.EqualValues(t, "minio", Packages.Storage.Type)
-	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "packages/", Packages.Storage.MinioConfig.BasePath)
 
 	// or we can indicate the storage type in the packages section
 	iniStr = `
@@ -69,7 +69,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadPackagesFrom(cfg))
 
 	assert.EqualValues(t, "minio", Packages.Storage.Type)
-	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "packages/", Packages.Storage.MinioConfig.BasePath)
 
 	// or we can indicate the storage type  and minio base path in the packages section
 	iniStr = `
@@ -85,7 +85,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadPackagesFrom(cfg))
 
 	assert.EqualValues(t, "minio", Packages.Storage.Type)
-	assert.EqualValues(t, "my_packages/", Packages.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "my_packages/", Packages.Storage.MinioConfig.BasePath)
 }
 
 func Test_PackageStorage1(t *testing.T) {
@@ -110,8 +110,8 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := Packages.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "packages/", storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "packages/", storage.MinioConfig.BasePath)
 	assert.True(t, storage.MinioConfig.ServeDirect)
 }
 
@@ -137,8 +137,8 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := Packages.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "packages/", storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "packages/", storage.MinioConfig.BasePath)
 	assert.True(t, storage.MinioConfig.ServeDirect)
 }
 
@@ -165,8 +165,8 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := Packages.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "my_packages/", storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "my_packages/", storage.MinioConfig.BasePath)
 	assert.True(t, storage.MinioConfig.ServeDirect)
 }
 
@@ -193,7 +193,7 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := Packages.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "my_packages/", storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "my_packages/", storage.MinioConfig.BasePath)
 	assert.True(t, storage.MinioConfig.ServeDirect)
 }
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 9efd674f8b..7e774f0139 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -1,15 +1,19 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package setting
 
 import (
+	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
 
 	"forgejo.org/modules/log"
+
+	"golang.org/x/crypto/ssh"
 )
 
 // enumerates all the policy repository creating
@@ -26,6 +30,8 @@ var MaxUserCardsPerPage = 36
 // MaxForksPerPage sets maximum amount of forks shown per page
 var MaxForksPerPage = 40
 
+var SSHInstanceKey ssh.PublicKey
+
 // Repository settings
 var (
 	Repository = struct {
@@ -47,6 +53,7 @@ var (
 		DisabledRepoUnits                       []string
 		DefaultRepoUnits                        []string
 		DefaultForkRepoUnits                    []string
+		DefaultMirrorRepoUnits                  []string
 		PrefixArchiveFiles                      bool
 		DisableMigrations                       bool
 		DisableStars                            bool
@@ -90,7 +97,6 @@ var (
 			DefaultUpdateStyle                       string
 			PopulateSquashCommentWithCommitMessages  bool
 			AddCoCommitterTrailers                   bool
-			TestConflictingPatchesWithGitApply       bool
 			RetargetChildrenOnMerge                  bool
 		} `ini:"repository.pull-request"`
 
@@ -109,6 +115,7 @@ var (
 			SigningKey        string
 			SigningName       string
 			SigningEmail      string
+			Format            string
 			InitialCommit     []string
 			CRUDActions       []string `ini:"CRUD_ACTIONS"`
 			Merges            []string
@@ -170,6 +177,7 @@ var (
 		DisabledRepoUnits:                       []string{},
 		DefaultRepoUnits:                        []string{},
 		DefaultForkRepoUnits:                    []string{},
+		DefaultMirrorRepoUnits:                  []string{},
 		PrefixArchiveFiles:                      true,
 		DisableMigrations:                       false,
 		DisableStars:                            false,
@@ -220,7 +228,6 @@ var (
 			DefaultUpdateStyle                       string
 			PopulateSquashCommentWithCommitMessages  bool
 			AddCoCommitterTrailers                   bool
-			TestConflictingPatchesWithGitApply       bool
 			RetargetChildrenOnMerge                  bool
 		}{
 			WorkInProgressPrefixes: []string{"WIP:", "[WIP]"},
@@ -262,6 +269,7 @@ var (
 			SigningKey        string
 			SigningName       string
 			SigningEmail      string
+			Format            string
 			InitialCommit     []string
 			CRUDActions       []string `ini:"CRUD_ACTIONS"`
 			Merges            []string
@@ -271,6 +279,7 @@ var (
 			SigningKey:        "default",
 			SigningName:       "",
 			SigningEmail:      "",
+			Format:            "openpgp",
 			InitialCommit:     []string{"always"},
 			CRUDActions:       []string{"pubkey", "twofa", "parentsigned"},
 			Merges:            []string{"pubkey", "twofa", "basesigned", "commitssigned"},
@@ -376,4 +385,15 @@ func loadRepositoryFrom(rootCfg ConfigProvider) {
 		log.Fatal("loadRepoArchiveFrom: %v", err)
 	}
 	Repository.EnableFlags = sec.Key("ENABLE_FLAGS").MustBool()
+
+	if Repository.Signing.Format == "ssh" && Repository.Signing.SigningKey != "none" && Repository.Signing.SigningKey != "" {
+		sshPublicKey, err := os.ReadFile(Repository.Signing.SigningKey)
+		if err != nil {
+			log.Fatal("Could not read repository signing key in %q: %v", Repository.Signing.SigningKey, err)
+		}
+		SSHInstanceKey, _, _, _, err = ssh.ParseAuthorizedKey(sshPublicKey)
+		if err != nil {
+			log.Fatal("Could not parse the SSH signing key %q: %v", sshPublicKey, err)
+		}
+	}
 }
diff --git a/modules/setting/repository_archive_test.go b/modules/setting/repository_archive_test.go
index d3901b6e47..cff59f3663 100644
--- a/modules/setting/repository_archive_test.go
+++ b/modules/setting/repository_archive_test.go
@@ -21,7 +21,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 
 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type)
-	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 
 	// we can also configure packages storage directly
 	iniStr = `
@@ -33,7 +33,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 
 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type)
-	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 
 	// or we can indicate the storage type in the packages section
 	iniStr = `
@@ -48,7 +48,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 
 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type)
-	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 
 	// or we can indicate the storage type  and minio base path in the packages section
 	iniStr = `
@@ -64,7 +64,7 @@ STORAGE_TYPE = minio
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 
 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type)
-	assert.EqualValues(t, "my_archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "my_archive/", RepoArchive.Storage.MinioConfig.BasePath)
 }
 
 func Test_RepoArchiveStorage(t *testing.T) {
@@ -86,7 +86,7 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage := RepoArchive.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
 
 	iniStr = `
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -108,5 +108,5 @@ MINIO_SECRET_ACCESS_KEY = correct_key
 	storage = RepoArchive.Storage
 
 	assert.EqualValues(t, "minio", storage.Type)
-	assert.EqualValues(t, "gitea", storage.MinioConfig.Bucket)
+	assert.Equal(t, "gitea", storage.MinioConfig.Bucket)
 }
diff --git a/modules/setting/repository_test.go b/modules/setting/repository_test.go
new file mode 100644
index 0000000000..d36e739f6b
--- /dev/null
+++ b/modules/setting/repository_test.go
@@ -0,0 +1,59 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package setting
+
+import (
+	"fmt"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
+)
+
+func TestSSHInstanceKey(t *testing.T) {
+	sshSigningKeyPath, err := filepath.Abs("../../tests/integration/ssh-signing-key.pub")
+	require.NoError(t, err)
+
+	t.Run("None value", func(t *testing.T) {
+		cfg, err := NewConfigProviderFromData(`
+[repository.signing]
+FORMAT = ssh
+SIGNING_KEY = none
+`)
+		require.NoError(t, err)
+
+		loadRepositoryFrom(cfg)
+
+		assert.Nil(t, SSHInstanceKey)
+	})
+
+	t.Run("No value", func(t *testing.T) {
+		cfg, err := NewConfigProviderFromData(`
+[repository.signing]
+FORMAT = ssh
+`)
+		require.NoError(t, err)
+
+		loadRepositoryFrom(cfg)
+
+		assert.Nil(t, SSHInstanceKey)
+	})
+	t.Run("Normal", func(t *testing.T) {
+		iniStr := fmt.Sprintf(`
+[repository.signing]
+FORMAT = ssh
+SIGNING_KEY = %s
+`, sshSigningKeyPath)
+		cfg, err := NewConfigProviderFromData(iniStr)
+		require.NoError(t, err)
+
+		loadRepositoryFrom(cfg)
+
+		assert.NotNil(t, SSHInstanceKey)
+		assert.Equal(t, "ssh-ed25519", SSHInstanceKey.Type())
+		assert.EqualValues(t, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH\n", ssh.MarshalAuthorizedKey(SSHInstanceKey))
+	})
+}
diff --git a/modules/setting/security.go b/modules/setting/security.go
index f3480d1056..c591a7c90a 100644
--- a/modules/setting/security.go
+++ b/modules/setting/security.go
@@ -20,6 +20,7 @@ var (
 	SecretKey                          string
 	InternalToken                      string // internal access token
 	LogInRememberDays                  int
+	GlobalTwoFactorRequirement         TwoFactorRequirementType
 	CookieRememberName                 string
 	ReverseProxyAuthUser               string
 	ReverseProxyAuthEmail              string
@@ -113,6 +114,8 @@ func loadSecurityFrom(rootCfg ConfigProvider) {
 	}
 	keying.Init([]byte(SecretKey))
 
+	GlobalTwoFactorRequirement = NewTwoFactorRequirementType(sec.Key("GLOBAL_TWO_FACTOR_REQUIREMENT").String())
+
 	CookieRememberName = sec.Key("COOKIE_REMEMBER_NAME").MustString("gitea_incredible")
 
 	ReverseProxyAuthUser = sec.Key("REVERSE_PROXY_AUTHENTICATION_USER").MustString("X-WEBAUTH-USER")
@@ -168,6 +171,42 @@ func loadSecurityFrom(rootCfg ConfigProvider) {
 
 	// warn if the setting is set to false explicitly
 	if sectionHasDisableQueryAuthToken && !DisableQueryAuthToken {
-		log.Warn("Enabling Query API Auth tokens is not recommended. DISABLE_QUERY_AUTH_TOKEN will default to true in gitea 1.23 and will be removed in gitea 1.24.")
+		log.Warn("Enabling Query API Auth tokens is not recommended. DISABLE_QUERY_AUTH_TOKEN will be removed in Forgejo v13.0.0.")
 	}
 }
+
+type TwoFactorRequirementType string
+
+// llu:TrKeysSuffix admin.config.global_2fa_requirement.
+const (
+	NoneTwoFactorRequirement  TwoFactorRequirementType = "none"
+	AllTwoFactorRequirement   TwoFactorRequirementType = "all"
+	AdminTwoFactorRequirement TwoFactorRequirementType = "admin"
+)
+
+func NewTwoFactorRequirementType(twoFactorRequirement string) TwoFactorRequirementType {
+	switch twoFactorRequirement {
+	case AllTwoFactorRequirement.String():
+		return AllTwoFactorRequirement
+	case AdminTwoFactorRequirement.String():
+		return AdminTwoFactorRequirement
+	default:
+		return NoneTwoFactorRequirement
+	}
+}
+
+func (r TwoFactorRequirementType) String() string {
+	return string(r)
+}
+
+func (r TwoFactorRequirementType) IsNone() bool {
+	return r == NoneTwoFactorRequirement
+}
+
+func (r TwoFactorRequirementType) IsAll() bool {
+	return r == AllTwoFactorRequirement
+}
+
+func (r TwoFactorRequirementType) IsAdmin() bool {
+	return r == AdminTwoFactorRequirement
+}
diff --git a/modules/setting/server.go b/modules/setting/server.go
index bff51f787d..3ff91d2cde 100644
--- a/modules/setting/server.go
+++ b/modules/setting/server.go
@@ -16,6 +16,8 @@ import (
 	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/util"
+
+	"github.com/caddyserver/certmagic"
 )
 
 // Scheme describes protocol types
@@ -206,7 +208,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
 			EnableAcme = sec.Key("ENABLE_LETSENCRYPT").MustBool(false)
 		}
 		if EnableAcme {
-			AcmeURL = sec.Key("ACME_URL").MustString("")
+			AcmeURL = sec.Key("ACME_URL").MustString(certmagic.LetsEncryptProductionCA)
 			AcmeCARoot = sec.Key("ACME_CA_ROOT").MustString("")
 
 			if sec.HasKey("ACME_ACCEPTTOS") {
diff --git a/modules/setting/server_test.go b/modules/setting/server_test.go
index 4450f99546..3c6faa2311 100644
--- a/modules/setting/server_test.go
+++ b/modules/setting/server_test.go
@@ -84,5 +84,5 @@ func TestUnixSocketAbstractNamespace(t *testing.T) {
 	require.NoError(t, err)
 	loadServerFrom(cfg)
 
-	assert.EqualValues(t, "@forgejo", HTTPAddr)
+	assert.Equal(t, "@forgejo", HTTPAddr)
 }
diff --git a/modules/setting/service.go b/modules/setting/service.go
index 729b10839e..5717225578 100644
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -206,7 +206,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
 		}
 		Service.EmailDomainBlockList = append(Service.EmailDomainBlockList, toAdd...)
 	}
-	Service.ShowRegistrationButton = sec.Key("SHOW_REGISTRATION_BUTTON").MustBool(!(Service.DisableRegistration || Service.AllowOnlyExternalRegistration))
+	Service.ShowRegistrationButton = sec.Key("SHOW_REGISTRATION_BUTTON").MustBool(!Service.DisableRegistration && !Service.AllowOnlyExternalRegistration)
 	Service.EnableInternalSignIn = sec.Key("ENABLE_INTERNAL_SIGNIN").MustBool(true)
 	Service.ShowMilestonesDashboardPage = sec.Key("SHOW_MILESTONES_DASHBOARD_PAGE").MustBool(true)
 	Service.RequireSignInView = sec.Key("REQUIRE_SIGNIN_VIEW").MustBool()
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index eb7b9e9373..9644d9b83b 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"forgejo.org/modules/log"
+	"forgejo.org/modules/optional"
 	"forgejo.org/modules/user"
-	"forgejo.org/modules/util"
 )
 
 var ForgejoVersion = "1.0.0"
@@ -140,6 +140,10 @@ func loadCommonSettingsFrom(cfg ConfigProvider) error {
 	if err := loadActionsFrom(cfg); err != nil {
 		return err
 	}
+	if err := loadModerationFrom(cfg); err != nil {
+		return err
+	}
+
 	loadUIFrom(cfg)
 	loadAdminFrom(cfg)
 	loadAPIFrom(cfg)
@@ -162,7 +166,7 @@ func loadRunModeFrom(rootCfg ConfigProvider) {
 	// The following is a purposefully undocumented option. Please do not run Forgejo as root. It will only cause future headaches.
 	// Please don't use root as a bandaid to "fix" something that is broken, instead the broken thing should instead be fixed properly.
 	unsafeAllowRunAsRoot := ConfigSectionKeyBool(rootSec, "I_AM_BEING_UNSAFE_RUNNING_AS_ROOT")
-	unsafeAllowRunAsRoot = unsafeAllowRunAsRoot || util.OptionalBoolParse(os.Getenv("GITEA_I_AM_BEING_UNSAFE_RUNNING_AS_ROOT")).Value()
+	unsafeAllowRunAsRoot = unsafeAllowRunAsRoot || optional.ParseBool(os.Getenv("GITEA_I_AM_BEING_UNSAFE_RUNNING_AS_ROOT")).Value()
 	RunMode = os.Getenv("GITEA_RUN_MODE")
 	if RunMode == "" {
 		RunMode = rootSec.Key("RUN_MODE").MustString("prod")
diff --git a/modules/setting/ssh.go b/modules/setting/ssh.go
index 86193bddb9..1ad826a17a 100644
--- a/modules/setting/ssh.go
+++ b/modules/setting/ssh.go
@@ -56,7 +56,7 @@ var SSH = struct {
 	Domain:                        "",
 	Port:                          22,
 	ServerCiphers:                 []string{"chacha20-poly1305@openssh.com", "aes128-ctr", "aes192-ctr", "aes256-ctr", "aes128-gcm@openssh.com", "aes256-gcm@openssh.com"},
-	ServerKeyExchanges:            []string{"curve25519-sha256", "ecdh-sha2-nistp256", "ecdh-sha2-nistp384", "ecdh-sha2-nistp521", "diffie-hellman-group14-sha256", "diffie-hellman-group14-sha1"},
+	ServerKeyExchanges:            []string{"mlkem768x25519-sha256", "curve25519-sha256", "ecdh-sha2-nistp256", "ecdh-sha2-nistp384", "ecdh-sha2-nistp521", "diffie-hellman-group14-sha256", "diffie-hellman-group14-sha1"},
 	ServerMACs:                    []string{"hmac-sha2-256-etm@openssh.com", "hmac-sha2-256", "hmac-sha1"},
 	KeygenPath:                    "",
 	MinimumKeySizeCheck:           true,
diff --git a/modules/setting/storage.go b/modules/setting/storage.go
index 8ee5c0f0ab..532842064c 100644
--- a/modules/setting/storage.go
+++ b/modules/setting/storage.go
@@ -170,8 +170,8 @@ func getStorageTargetSection(rootCfg ConfigProvider, name, typ string, sec Confi
 	targetSec, _ := rootCfg.GetSection(storageSectionName + "." + name)
 	if targetSec != nil {
 		targetType := targetSec.Key("STORAGE_TYPE").String()
-		switch {
-		case targetType == "":
+		switch targetType {
+		case "":
 			if targetSec.Key("PATH").String() == "" { // both storage type and path are empty, use default
 				return getDefaultStorageSection(rootCfg), targetSecIsDefault, nil
 			}
diff --git a/modules/setting/storage_test.go b/modules/setting/storage_test.go
index 59135b5911..a1b687ba5b 100644
--- a/modules/setting/storage_test.go
+++ b/modules/setting/storage_test.go
@@ -27,16 +27,16 @@ MINIO_BUCKET = gitea-storage
 	require.NoError(t, err)
 
 	require.NoError(t, loadAttachmentFrom(cfg))
-	assert.EqualValues(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-attachment", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, "gitea-lfs", LFS.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-lfs", LFS.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadAvatarsFrom(cfg))
-	assert.EqualValues(t, "gitea-storage", Avatar.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "avatars/", Avatar.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-storage", Avatar.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "avatars/", Avatar.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageUseOtherNameAsType(t *testing.T) {
@@ -52,12 +52,12 @@ MINIO_BUCKET = gitea-storage
 	require.NoError(t, err)
 
 	require.NoError(t, loadAttachmentFrom(cfg))
-	assert.EqualValues(t, "gitea-storage", Attachment.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-storage", Attachment.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "attachments/", Attachment.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, "gitea-storage", LFS.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea-storage", LFS.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageInheritStorageType(t *testing.T) {
@@ -70,32 +70,32 @@ STORAGE_TYPE = minio
 
 	require.NoError(t, loadPackagesFrom(cfg))
 	assert.EqualValues(t, "minio", Packages.Storage.Type)
-	assert.EqualValues(t, "gitea", Packages.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "packages/", Packages.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", Packages.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "packages/", Packages.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 	assert.EqualValues(t, "minio", RepoArchive.Storage.Type)
-	assert.EqualValues(t, "gitea", RepoArchive.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", RepoArchive.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadActionsFrom(cfg))
 	assert.EqualValues(t, "minio", Actions.LogStorage.Type)
-	assert.EqualValues(t, "gitea", Actions.LogStorage.MinioConfig.Bucket)
-	assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", Actions.LogStorage.MinioConfig.Bucket)
+	assert.Equal(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
 
 	assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
-	assert.EqualValues(t, "gitea", Actions.ArtifactStorage.MinioConfig.Bucket)
-	assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", Actions.ArtifactStorage.MinioConfig.Bucket)
+	assert.Equal(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
 
 	require.NoError(t, loadAvatarsFrom(cfg))
 	assert.EqualValues(t, "minio", Avatar.Storage.Type)
-	assert.EqualValues(t, "gitea", Avatar.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "avatars/", Avatar.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", Avatar.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "avatars/", Avatar.Storage.MinioConfig.BasePath)
 
 	require.NoError(t, loadRepoAvatarFrom(cfg))
 	assert.EqualValues(t, "minio", RepoAvatar.Storage.Type)
-	assert.EqualValues(t, "gitea", RepoAvatar.Storage.MinioConfig.Bucket)
-	assert.EqualValues(t, "repo-avatars/", RepoAvatar.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "gitea", RepoAvatar.Storage.MinioConfig.Bucket)
+	assert.Equal(t, "repo-avatars/", RepoAvatar.Storage.MinioConfig.BasePath)
 }
 
 type testLocalStoragePathCase struct {
@@ -114,7 +114,7 @@ func testLocalStoragePath(t *testing.T, appDataPath, iniStr string, cases []test
 
 		assert.EqualValues(t, "local", storage.Type)
 		assert.True(t, filepath.IsAbs(storage.Path))
-		assert.EqualValues(t, filepath.Clean(c.expectedPath), filepath.Clean(storage.Path))
+		assert.Equal(t, filepath.Clean(c.expectedPath), filepath.Clean(storage.Path))
 	}
 }
 
@@ -352,8 +352,8 @@ MINIO_SECRET_ACCESS_KEY = my_secret_key
 
 	require.NoError(t, loadRepoArchiveFrom(cfg))
 	cp := RepoArchive.Storage.ToShadowCopy()
-	assert.EqualValues(t, "******", cp.MinioConfig.AccessKeyID)
-	assert.EqualValues(t, "******", cp.MinioConfig.SecretAccessKey)
+	assert.Equal(t, "******", cp.MinioConfig.AccessKeyID)
+	assert.Equal(t, "******", cp.MinioConfig.SecretAccessKey)
 }
 
 func Test_getStorageConfiguration24(t *testing.T) {
@@ -408,10 +408,10 @@ MINIO_USE_SSL = true
 `)
 	require.NoError(t, err)
 	require.NoError(t, loadRepoArchiveFrom(cfg))
-	assert.EqualValues(t, "my_access_key", RepoArchive.Storage.MinioConfig.AccessKeyID)
-	assert.EqualValues(t, "my_secret_key", RepoArchive.Storage.MinioConfig.SecretAccessKey)
+	assert.Equal(t, "my_access_key", RepoArchive.Storage.MinioConfig.AccessKeyID)
+	assert.Equal(t, "my_secret_key", RepoArchive.Storage.MinioConfig.SecretAccessKey)
 	assert.True(t, RepoArchive.Storage.MinioConfig.UseSSL)
-	assert.EqualValues(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 }
 
 func Test_getStorageConfiguration28(t *testing.T) {
@@ -425,10 +425,10 @@ MINIO_BASE_PATH = /prefix
 `)
 	require.NoError(t, err)
 	require.NoError(t, loadRepoArchiveFrom(cfg))
-	assert.EqualValues(t, "my_access_key", RepoArchive.Storage.MinioConfig.AccessKeyID)
-	assert.EqualValues(t, "my_secret_key", RepoArchive.Storage.MinioConfig.SecretAccessKey)
+	assert.Equal(t, "my_access_key", RepoArchive.Storage.MinioConfig.AccessKeyID)
+	assert.Equal(t, "my_secret_key", RepoArchive.Storage.MinioConfig.SecretAccessKey)
 	assert.True(t, RepoArchive.Storage.MinioConfig.UseSSL)
-	assert.EqualValues(t, "/prefix/repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "/prefix/repo-archive/", RepoArchive.Storage.MinioConfig.BasePath)
 
 	cfg, err = NewConfigProviderFromData(`
 [storage]
@@ -443,10 +443,10 @@ MINIO_BASE_PATH = /lfs
 `)
 	require.NoError(t, err)
 	require.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, "my_access_key", LFS.Storage.MinioConfig.AccessKeyID)
-	assert.EqualValues(t, "my_secret_key", LFS.Storage.MinioConfig.SecretAccessKey)
+	assert.Equal(t, "my_access_key", LFS.Storage.MinioConfig.AccessKeyID)
+	assert.Equal(t, "my_secret_key", LFS.Storage.MinioConfig.SecretAccessKey)
 	assert.True(t, LFS.Storage.MinioConfig.UseSSL)
-	assert.EqualValues(t, "/lfs", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "/lfs", LFS.Storage.MinioConfig.BasePath)
 
 	cfg, err = NewConfigProviderFromData(`
 [storage]
@@ -461,8 +461,8 @@ MINIO_BASE_PATH = /lfs
 `)
 	require.NoError(t, err)
 	require.NoError(t, loadLFSFrom(cfg))
-	assert.EqualValues(t, "my_access_key", LFS.Storage.MinioConfig.AccessKeyID)
-	assert.EqualValues(t, "my_secret_key", LFS.Storage.MinioConfig.SecretAccessKey)
+	assert.Equal(t, "my_access_key", LFS.Storage.MinioConfig.AccessKeyID)
+	assert.Equal(t, "my_secret_key", LFS.Storage.MinioConfig.SecretAccessKey)
 	assert.True(t, LFS.Storage.MinioConfig.UseSSL)
-	assert.EqualValues(t, "/lfs", LFS.Storage.MinioConfig.BasePath)
+	assert.Equal(t, "/lfs", LFS.Storage.MinioConfig.BasePath)
 }
diff --git a/modules/storage/local_test.go b/modules/storage/local_test.go
index d0dd3a6462..d74c6bbc41 100644
--- a/modules/storage/local_test.go
+++ b/modules/storage/local_test.go
@@ -50,7 +50,7 @@ func TestBuildLocalPath(t *testing.T) {
 		t.Run(k.path, func(t *testing.T) {
 			l := LocalStorage{dir: k.localDir}
 
-			assert.EqualValues(t, k.expected, l.buildLocalPath(k.path))
+			assert.Equal(t, k.expected, l.buildLocalPath(k.path))
 		})
 	}
 }
diff --git a/modules/storage/minio.go b/modules/storage/minio.go
index ee545edc10..8d4f9d6627 100644
--- a/modules/storage/minio.go
+++ b/modules/storage/minio.go
@@ -76,8 +76,13 @@ var getBucketVersioning = func(ctx context.Context, minioClient *minio.Client, b
 	return err
 }
 
+var initializationTimeout = 30 * time.Second
+
 // NewMinioStorage returns a minio storage
 func NewMinioStorage(ctx context.Context, cfg *setting.Storage) (ObjectStorage, error) {
+	initCtx, cancel := context.WithTimeout(ctx, initializationTimeout)
+	defer cancel()
+
 	config := cfg.MinioConfig
 	if config.ChecksumAlgorithm != "" && config.ChecksumAlgorithm != "default" && config.ChecksumAlgorithm != "md5" {
 		return nil, fmt.Errorf("invalid minio checksum algorithm: %s", config.ChecksumAlgorithm)
@@ -112,7 +117,7 @@ func NewMinioStorage(ctx context.Context, cfg *setting.Storage) (ObjectStorage,
 	// Otherwise even if the request itself fails (403, 404, etc), the code should still continue because the parameters seem "good" enough.
 	// Keep in mind that GetBucketVersioning requires "owner" to really succeed, so it can't be used to check the existence.
 	// Not using "BucketExists (HeadBucket)" because it doesn't include detailed failure reasons.
-	err = getBucketVersioning(ctx, minioClient, config.Bucket)
+	err = getBucketVersioning(initCtx, minioClient, config.Bucket)
 	if err != nil {
 		errResp, ok := err.(minio.ErrorResponse)
 		if !ok {
@@ -125,13 +130,13 @@ func NewMinioStorage(ctx context.Context, cfg *setting.Storage) (ObjectStorage,
 	}
 
 	// Check to see if we already own this bucket
-	exists, err := minioClient.BucketExists(ctx, config.Bucket)
+	exists, err := minioClient.BucketExists(initCtx, config.Bucket)
 	if err != nil {
 		return nil, convertMinioErr(err)
 	}
 
 	if !exists {
-		if err := minioClient.MakeBucket(ctx, config.Bucket, minio.MakeBucketOptions{
+		if err := minioClient.MakeBucket(initCtx, config.Bucket, minio.MakeBucketOptions{
 			Region: config.Location,
 		}); err != nil {
 			return nil, convertMinioErr(err)
@@ -231,7 +236,7 @@ type minioFileInfo struct {
 }
 
 func (m minioFileInfo) Name() string {
-	return path.Base(m.ObjectInfo.Key)
+	return path.Base(m.Key)
 }
 
 func (m minioFileInfo) Size() int64 {
@@ -243,7 +248,7 @@ func (m minioFileInfo) ModTime() time.Time {
 }
 
 func (m minioFileInfo) IsDir() bool {
-	return strings.HasSuffix(m.ObjectInfo.Key, "/")
+	return strings.HasSuffix(m.Key, "/")
 }
 
 func (m minioFileInfo) Mode() os.FileMode {
diff --git a/modules/storage/minio_test.go b/modules/storage/minio_test.go
index 99f70c4565..18fe91edfb 100644
--- a/modules/storage/minio_test.go
+++ b/modules/storage/minio_test.go
@@ -9,8 +9,10 @@ import (
 	"net/http/httptest"
 	"os"
 	"testing"
+	"time"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/stretchr/testify/assert"
@@ -18,13 +20,14 @@ import (
 )
 
 func TestMinioStorageIterator(t *testing.T) {
-	if os.Getenv("CI") == "" {
-		t.Skip("minioStorage not present outside of CI")
+	endpoint := os.Getenv("TEST_MINIO_ENDPOINT")
+	if endpoint == "" {
+		t.Skip("TEST_MINIO_ENDPOINT not set")
 		return
 	}
 	testStorageIterator(t, setting.MinioStorageType, &setting.Storage{
 		MinioConfig: setting.MinioStorageConfig{
-			Endpoint:        "minio:9000",
+			Endpoint:        endpoint,
 			AccessKeyID:     "123456",
 			SecretAccessKey: "12345678",
 			Bucket:          "gitea",
@@ -34,13 +37,14 @@ func TestMinioStorageIterator(t *testing.T) {
 }
 
 func TestVirtualHostMinioStorage(t *testing.T) {
-	if os.Getenv("CI") == "" {
-		t.Skip("minioStorage not present outside of CI")
+	endpoint := os.Getenv("TEST_MINIO_ENDPOINT")
+	if endpoint == "" {
+		t.Skip("TEST_MINIO_ENDPOINT not set")
 		return
 	}
 	testStorageIterator(t, setting.MinioStorageType, &setting.Storage{
 		MinioConfig: setting.MinioStorageConfig{
-			Endpoint:        "minio:9000",
+			Endpoint:        endpoint,
 			AccessKeyID:     "123456",
 			SecretAccessKey: "12345678",
 			Bucket:          "gitea",
@@ -52,19 +56,19 @@ func TestVirtualHostMinioStorage(t *testing.T) {
 
 func TestMinioStoragePath(t *testing.T) {
 	m := &MinioStorage{basePath: ""}
-	assert.Equal(t, "", m.buildMinioPath("/"))
-	assert.Equal(t, "", m.buildMinioPath("."))
+	assert.Empty(t, m.buildMinioPath("/"))
+	assert.Empty(t, m.buildMinioPath("."))
 	assert.Equal(t, "a", m.buildMinioPath("/a"))
 	assert.Equal(t, "a/b", m.buildMinioPath("/a/b/"))
-	assert.Equal(t, "", m.buildMinioDirPrefix(""))
+	assert.Empty(t, m.buildMinioDirPrefix(""))
 	assert.Equal(t, "a/", m.buildMinioDirPrefix("/a/"))
 
 	m = &MinioStorage{basePath: "/"}
-	assert.Equal(t, "", m.buildMinioPath("/"))
-	assert.Equal(t, "", m.buildMinioPath("."))
+	assert.Empty(t, m.buildMinioPath("/"))
+	assert.Empty(t, m.buildMinioPath("."))
 	assert.Equal(t, "a", m.buildMinioPath("/a"))
 	assert.Equal(t, "a/b", m.buildMinioPath("/a/b/"))
-	assert.Equal(t, "", m.buildMinioDirPrefix(""))
+	assert.Empty(t, m.buildMinioDirPrefix(""))
 	assert.Equal(t, "a/", m.buildMinioDirPrefix("/a/"))
 
 	m = &MinioStorage{basePath: "/base"}
@@ -85,13 +89,14 @@ func TestMinioStoragePath(t *testing.T) {
 }
 
 func TestS3StorageBadRequest(t *testing.T) {
-	if os.Getenv("CI") == "" {
-		t.Skip("S3Storage not present outside of CI")
+	endpoint := os.Getenv("TEST_MINIO_ENDPOINT")
+	if endpoint == "" {
+		t.Skip("TEST_MINIO_ENDPOINT not set")
 		return
 	}
 	cfg := &setting.Storage{
 		MinioConfig: setting.MinioStorageConfig{
-			Endpoint:        "minio:9000",
+			Endpoint:        endpoint,
 			AccessKeyID:     "123456",
 			SecretAccessKey: "12345678",
 			Bucket:          "bucket",
@@ -214,3 +219,41 @@ func TestMinioCredentials(t *testing.T) {
 		})
 	})
 }
+
+func TestNewMinioStorageInitializationTimeout(t *testing.T) {
+	defer test.MockVariableValue(&getBucketVersioning, func(ctx context.Context, minioClient *minio.Client, bucket string) error {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case <-time.After(1 * time.Millisecond):
+			return minio.ErrorResponse{
+				StatusCode: http.StatusBadRequest,
+				Code:       "TestError",
+				Message:    "Mocked error for testing",
+			}
+		}
+	})()
+
+	settings := &setting.Storage{
+		MinioConfig: setting.MinioStorageConfig{
+			Endpoint:        "localhost",
+			AccessKeyID:     "123456",
+			SecretAccessKey: "12345678",
+			Bucket:          "bucket",
+			Location:        "us-east-1",
+		},
+	}
+
+	// Verify that we reach `getBucketVersioning` and return the error from our mock.
+	storage, err := NewMinioStorage(t.Context(), settings)
+	require.ErrorContains(t, err, "Mocked error for testing")
+	assert.Nil(t, storage)
+
+	defer test.MockVariableValue(&initializationTimeout, 1*time.Nanosecond)()
+
+	// Now that the timeout is super low, verify that we get a context deadline exceeded error from our mock.
+	storage, err = NewMinioStorage(t.Context(), settings)
+	require.Error(t, err)
+	require.ErrorIs(t, err, context.DeadlineExceeded, "err must be a context deadline exceeded error, but was %v", err)
+	assert.Nil(t, storage)
+}
diff --git a/modules/storage/storage_test.go b/modules/storage/storage_test.go
index af3dd9520e..76589d941a 100644
--- a/modules/storage/storage_test.go
+++ b/modules/storage/storage_test.go
@@ -5,6 +5,7 @@ package storage
 
 import (
 	"bytes"
+	"io"
 	"testing"
 
 	"forgejo.org/modules/setting"
@@ -13,22 +14,39 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+type spyCloser struct {
+	io.Reader
+	closed int
+}
+
+func (s *spyCloser) Close() error {
+	s.closed++
+	return nil
+}
+
+var _ io.ReadCloser = &spyCloser{}
+
 func testStorageIterator(t *testing.T, typStr Type, cfg *setting.Storage) {
 	l, err := NewStorage(typStr, cfg)
 	require.NoError(t, err)
 
-	testFiles := [][]string{
-		{"a/1.txt", "a1"},
-		{"/a/1.txt", "aa1"}, // same as above, but with leading slash that will be trim
-		{"ab/1.txt", "ab1"},
-		{"b/1.txt", "b1"},
-		{"b/2.txt", "b2"},
-		{"b/3.txt", "b3"},
-		{"b/x 4.txt", "bx4"},
+	testFiles := []struct {
+		path, content string
+		size          int64
+	}{
+		{"a/1.txt", "a1", -1},
+		{"/a/1.txt", "aa1", -1}, // same as above, but with leading slash that will be trim
+		{"ab/1.txt", "ab1", 3},
+		{"b/1.txt", "b1", 2}, // minio closes when the size is set
+		{"b/2.txt", "b2", -1},
+		{"b/3.txt", "b3", -1},
+		{"b/x 4.txt", "bx4", -1},
 	}
 	for _, f := range testFiles {
-		_, err = l.Save(f[0], bytes.NewBufferString(f[1]), -1)
+		sc := &spyCloser{bytes.NewBufferString(f.content), 0}
+		_, err = l.Save(f.path, sc, f.size)
 		require.NoError(t, err)
+		assert.Equal(t, 0, sc.closed)
 	}
 
 	expectedList := map[string][]string{
diff --git a/modules/structs/action.go b/modules/structs/action.go
index df9f845adc..f47b228d75 100644
--- a/modules/structs/action.go
+++ b/modules/structs/action.go
@@ -3,6 +3,10 @@
 
 package structs
 
+import (
+	"time"
+)
+
 // ActionRunJob represents a job of a run
 // swagger:model
 type ActionRunJob struct {
@@ -23,3 +27,60 @@ type ActionRunJob struct {
 	// the action run job status
 	Status string `json:"status"`
 }
+
+// ActionRun represents an action run
+// swagger:model
+type ActionRun struct {
+	// the action run id
+	ID int64 `json:"id"`
+	// the action run's title
+	Title string `json:"title"`
+	// the repo this action is part of
+	Repo *Repository `json:"repository"`
+	// the name of workflow file
+	WorkflowID string `json:"workflow_id"`
+	// a unique number for each run of a repository
+	Index int64 `json:"index_in_repo"`
+	// the user that triggered this action run
+	TriggerUser *User `json:"trigger_user"`
+	// the cron id for the schedule trigger
+	ScheduleID int64
+	// the commit/tag/… the action run ran on
+	PrettyRef string `json:"prettyref"`
+	// has the commit/tag/… the action run ran on been deleted
+	IsRefDeleted bool `json:"is_ref_deleted"`
+	// the commit sha the action run ran on
+	CommitSHA string `json:"commit_sha"`
+	// If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow.
+	IsForkPullRequest bool `json:"is_fork_pull_request"`
+	// may need approval if it's a fork pull request
+	NeedApproval bool `json:"need_approval"`
+	// who approved this action run
+	ApprovedBy int64 `json:"approved_by"`
+	// the webhook event that causes the workflow to run
+	Event string `json:"event"`
+	// the payload of the webhook event that causes the workflow to run
+	EventPayload string `json:"event_payload"`
+	// the trigger event defined in the `on` configuration of the triggered workflow
+	TriggerEvent string `json:"trigger_event"`
+	// the current status of this run
+	Status string `json:"status"`
+	// when the action run was started
+	Started time.Time `json:"started,omitempty"`
+	// when the action run was stopped
+	Stopped time.Time `json:"stopped,omitempty"`
+	// when the action run was created
+	Created time.Time `json:"created,omitempty"`
+	// when the action run was last updated
+	Updated time.Time `json:"updated,omitempty"`
+	// how long the action run ran for
+	Duration time.Duration `json:"duration,omitempty"`
+	// the url of this action run
+	HTMLURL string `json:"html_url"`
+}
+
+// ListActionRunResponse return a list of ActionRun
+type ListActionRunResponse struct {
+	Entries    []*ActionRun `json:"workflow_runs"`
+	TotalCount int64        `json:"total_count"`
+}
diff --git a/modules/structs/activitypub.go b/modules/structs/activitypub.go
index 117eb0bed2..0cc257ff95 100644
--- a/modules/structs/activitypub.go
+++ b/modules/structs/activitypub.go
@@ -1,4 +1,5 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package structs
@@ -7,3 +8,15 @@ package structs
 type ActivityPub struct {
 	Context string `json:"@context"`
 }
+
+type APRemoteFollowOption struct {
+	Target string `json:"target"`
+}
+
+type APPersonFollowItem struct {
+	ActorID string `json:"actor_id"`
+	Note    string `json:"note"`
+
+	OriginalURL  string `json:"original_url"`
+	OriginalItem string `json:"original_item"`
+}
diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go
index 0a3d4140c2..746f618cf0 100644
--- a/modules/structs/attachment.go
+++ b/modules/structs/attachment.go
@@ -22,6 +22,12 @@ type Attachment struct {
 	Type string `json:"type"`
 }
 
+// WebAttachment the generic attachment with mime type
+type WebAttachment struct {
+	*Attachment
+	MimeType string `json:"mime_type"`
+}
+
 // EditAttachmentOptions options for editing attachments
 // swagger:model
 type EditAttachmentOptions struct {
diff --git a/modules/structs/fork.go b/modules/structs/fork.go
index eb7774afbc..8fc73647bd 100644
--- a/modules/structs/fork.go
+++ b/modules/structs/fork.go
@@ -10,3 +10,11 @@ type CreateForkOption struct {
 	// name of the forked repository
 	Name *string `json:"name"`
 }
+
+// SyncForkInfo information about syncing a fork
+type SyncForkInfo struct {
+	Allowed       bool   `json:"allowed"`
+	ForkCommit    string `json:"fork_commit"`
+	BaseCommit    string `json:"base_commit"`
+	CommitsBehind int    `json:"commits_behind"`
+}
diff --git a/modules/structs/git_blob.go b/modules/structs/git_blob.go
index 96c7a271a9..ef06693905 100644
--- a/modules/structs/git_blob.go
+++ b/modules/structs/git_blob.go
@@ -3,8 +3,8 @@
 
 package structs
 
-// GitBlobResponse represents a git blob
-type GitBlobResponse struct {
+// GitBlob represents a git blob
+type GitBlob struct {
 	Content  string `json:"content"`
 	Encoding string `json:"encoding"`
 	URL      string `json:"url"`
diff --git a/modules/structs/hook.go b/modules/structs/hook.go
index 1665dc4da6..11372ca6e1 100644
--- a/modules/structs/hook.go
+++ b/modules/structs/hook.go
@@ -118,6 +118,7 @@ var (
 	_ Payloader = &RepositoryPayload{}
 	_ Payloader = &ReleasePayload{}
 	_ Payloader = &PackagePayload{}
+	_ Payloader = &ActionPayload{}
 )
 
 // _________                        __
@@ -483,3 +484,36 @@ type PackagePayload struct {
 func (p *PackagePayload) JSONPayload() ([]byte, error) {
 	return json.MarshalIndent(p, "", "  ")
 }
+
+//     _        _   _
+//    / \   ___| |_(_) ___  _ __
+//   / _ \ / __| __| |/ _ \| '_ \
+//  / ___ \ (__| |_| | (_) | | | |
+// /_/   \_\___|\__|_|\___/|_| |_|
+
+// this name is ridiculous, yes
+// it's the sub-type of hook that has something to do with Forgejo Actions
+type HookActionAction string
+
+const (
+	HookActionFailure HookActionAction = "failure"
+	HookActionRecover HookActionAction = "recover"
+	HookActionSuccess HookActionAction = "success"
+)
+
+// ActionPayload payload for action webhooks
+type ActionPayload struct {
+	Action HookActionAction `json:"action"`
+	Run    *ActionRun       `json:"run"`
+	// the status of this run before it completed
+	// this must be a not done status
+	PriorStatus string `json:"prior_status"`
+	// the last run for the same workflow
+	// could be nil when Run is the first for it's workflow
+	LastRun *ActionRun `json:"last_run,omitempty"`
+}
+
+// JSONPayload return payload information
+func (p *ActionPayload) JSONPayload() ([]byte, error) {
+	return json.MarshalIndent(p, "", "  ")
+}
diff --git a/modules/structs/mirror.go b/modules/structs/mirror.go
index 1b6566803a..4909ae20ca 100644
--- a/modules/structs/mirror.go
+++ b/modules/structs/mirror.go
@@ -13,6 +13,7 @@ type CreatePushMirrorOption struct {
 	Interval       string `json:"interval"`
 	SyncOnCommit   bool   `json:"sync_on_commit"`
 	UseSSH         bool   `json:"use_ssh"`
+	BranchFilter   string `json:"branch_filter"`
 }
 
 // PushMirror represents information of a push mirror
@@ -29,4 +30,6 @@ type PushMirror struct {
 	Interval       string     `json:"interval"`
 	SyncOnCommit   bool       `json:"sync_on_commit"`
 	PublicKey      string     `json:"public_key"`
+
+	BranchFilter string `json:"branch_filter"`
 }
diff --git a/modules/structs/repo.go b/modules/structs/repo.go
index c9cd729cf3..01cbf26f61 100644
--- a/modules/structs/repo.go
+++ b/modules/structs/repo.go
@@ -327,6 +327,7 @@ const (
 	GitBucketService                       // 7 gitbucket service
 	CodebaseService                        // 8 codebase service
 	ForgejoService                         // 9 forgejo service
+	PagureService                          // 10 pagure service
 )
 
 // Name represents the service type's name
@@ -354,6 +355,8 @@ func (gt GitServiceType) Title() string {
 		return "Codebase"
 	case ForgejoService:
 		return "Forgejo"
+	case PagureService:
+		return "Pagure"
 	case PlainGitService:
 		return "Git"
 	}
@@ -412,6 +415,7 @@ var SupportedFullGitService = []GitServiceType{
 	OneDevService,
 	GitBucketService,
 	CodebaseService,
+	PagureService,
 }
 
 // RepoTransfer represents a pending repo transfer
diff --git a/modules/structs/repo_file.go b/modules/structs/repo_file.go
index 00c804146a..242343493b 100644
--- a/modules/structs/repo_file.go
+++ b/modules/structs/repo_file.go
@@ -4,6 +4,8 @@
 
 package structs
 
+import "time"
+
 // FileOptions options for all file APIs
 type FileOptions struct {
 	// message (optional) for the commit of this file. if not supplied, a default message will be used
@@ -31,7 +33,7 @@ type CreateFileOptions struct {
 
 // Branch returns branch name
 func (o *CreateFileOptions) Branch() string {
-	return o.FileOptions.BranchName
+	return o.BranchName
 }
 
 // DeleteFileOptions options for deleting files (used for other File structs below)
@@ -45,7 +47,7 @@ type DeleteFileOptions struct {
 
 // Branch returns branch name
 func (o *DeleteFileOptions) Branch() string {
-	return o.FileOptions.BranchName
+	return o.BranchName
 }
 
 // UpdateFileOptions options for updating files
@@ -61,7 +63,7 @@ type UpdateFileOptions struct {
 
 // Branch returns branch name
 func (o *UpdateFileOptions) Branch() string {
-	return o.FileOptions.BranchName
+	return o.BranchName
 }
 
 // ChangeFileOperation for creating, updating or deleting a file
@@ -92,7 +94,7 @@ type ChangeFilesOptions struct {
 
 // Branch returns branch name
 func (o *ChangeFilesOptions) Branch() string {
-	return o.FileOptions.BranchName
+	return o.BranchName
 }
 
 // FileOptionInterface provides a unified interface for the different file options
@@ -121,6 +123,8 @@ type ContentsResponse struct {
 	Path          string `json:"path"`
 	SHA           string `json:"sha"`
 	LastCommitSHA string `json:"last_commit_sha"`
+	// swagger:strfmt date-time
+	LastCommitWhen time.Time `json:"last_commit_when"`
 	// `type` will be `file`, `dir`, `symlink`, or `submodule`
 	Type string `json:"type"`
 	Size int64  `json:"size"`
diff --git a/modules/structs/user_app.go b/modules/structs/user_app.go
index 7f78fbd495..6592c1cd48 100644
--- a/modules/structs/user_app.go
+++ b/modules/structs/user_app.go
@@ -23,9 +23,11 @@ type AccessToken struct {
 type AccessTokenList []*AccessToken
 
 // CreateAccessTokenOption options when create access token
+// swagger:model CreateAccessTokenOption
 type CreateAccessTokenOption struct {
 	// required: true
-	Name   string   `json:"name" binding:"Required"`
+	Name string `json:"name" binding:"Required"`
+	// example: ["all", "read:activitypub","read:issue", "write:misc", "read:notification", "read:organization", "read:package", "read:repository", "read:user"]
 	Scopes []string `json:"scopes"`
 }
 
diff --git a/modules/system/appstate_test.go b/modules/system/appstate_test.go
index 8a444aff0f..d19900c03d 100644
--- a/modules/system/appstate_test.go
+++ b/modules/system/appstate_test.go
@@ -43,8 +43,8 @@ func TestAppStateDB(t *testing.T) {
 
 	item1 := new(testItem1)
 	require.NoError(t, as.Get(db.DefaultContext, item1))
-	assert.Equal(t, "", item1.Val1)
-	assert.EqualValues(t, 0, item1.Val2)
+	assert.Empty(t, item1.Val1)
+	assert.Equal(t, 0, item1.Val2)
 
 	item1 = new(testItem1)
 	item1.Val1 = "a"
@@ -58,7 +58,7 @@ func TestAppStateDB(t *testing.T) {
 	item1 = new(testItem1)
 	require.NoError(t, as.Get(db.DefaultContext, item1))
 	assert.Equal(t, "a", item1.Val1)
-	assert.EqualValues(t, 2, item1.Val2)
+	assert.Equal(t, 2, item1.Val2)
 
 	item2 = new(testItem2)
 	require.NoError(t, as.Get(db.DefaultContext, item2))
diff --git a/modules/templates/context.go b/modules/templates/context.go
new file mode 100644
index 0000000000..d2b896391b
--- /dev/null
+++ b/modules/templates/context.go
@@ -0,0 +1,23 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package templates
+
+import (
+	"context"
+
+	"forgejo.org/modules/translation"
+)
+
+type Context struct {
+	context.Context
+	Locale      translation.Locale
+	AvatarUtils *AvatarUtils
+	Data        map[string]any
+}
+
+var _ context.Context = Context{}
+
+func NewContext(ctx context.Context) *Context {
+	return &Context{Context: ctx}
+}
diff --git a/modules/templates/context_test.go b/modules/templates/context_test.go
new file mode 100644
index 0000000000..d854fbf0ff
--- /dev/null
+++ b/modules/templates/context_test.go
@@ -0,0 +1,18 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package templates
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestContext(t *testing.T) {
+	type ctxKey struct{}
+
+	// Test that the original context is used for its context functions.
+	ctx := NewContext(context.WithValue(t.Context(), ctxKey{}, "there"))
+	assert.Equal(t, "there", ctx.Value(ctxKey{}))
+}
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 02b175e6f6..2e33e51e60 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -6,6 +6,8 @@
 package templates
 
 import (
+	"bytes"
+	"context"
 	"fmt"
 	"html"
 	"html/template"
@@ -29,6 +31,23 @@ func NewFuncMap() template.FuncMap {
 	return map[string]any{
 		"ctx": func() any { return nil }, // template context function
 
+		"ExecuteTemplate": func(ctx context.Context, tmplName string, args any) template.HTML {
+			h := HTMLRenderer()
+			tmpl, err := h.TemplateLookup(tmplName, ctx)
+			if err != nil {
+				panic("Template not found: " + tmplName)
+			}
+
+			buf := bytes.Buffer{}
+			if err := tmpl.Execute(&buf, args); err != nil {
+				panic("Error while executing template")
+			}
+
+			// We can safely return this as `template.HTML` as html/template will
+			// already make sure it's sanitized.
+			return template.HTML(buf.String())
+		},
+
 		"DumpVar": dumpVar,
 
 		// -----------------------------------------------------------------
@@ -188,6 +207,7 @@ func NewFuncMap() template.FuncMap {
 		"RenderMarkdownToHtml": RenderMarkdownToHtml,
 		"RenderLabel":          RenderLabel,
 		"RenderLabels":         RenderLabels,
+		"RenderUser":           RenderUser,
 		"RenderReviewRequest":  RenderReviewRequest,
 
 		// -----------------------------------------------------------------
diff --git a/modules/templates/htmlrenderer_test.go b/modules/templates/htmlrenderer_test.go
index 7373605744..d7a4cd7161 100644
--- a/modules/templates/htmlrenderer_test.go
+++ b/modules/templates/htmlrenderer_test.go
@@ -66,7 +66,7 @@ func TestHandleError(t *testing.T) {
 		_, err = tmpl.Parse(s)
 		require.Error(t, err)
 		msg := h(err)
-		assert.EqualValues(t, strings.TrimSpace(expect), strings.TrimSpace(msg))
+		assert.Equal(t, strings.TrimSpace(expect), strings.TrimSpace(msg))
 	}
 
 	test("{{", p.handleGenericTemplateError, `
@@ -103,5 +103,5 @@ god knows XXX
 ----------------------------------------------------------------------
 `
 	actualMsg := p.handleExpectedEndError(errors.New("template: test:1: expected end; found XXX"))
-	assert.EqualValues(t, strings.TrimSpace(expectedMsg), strings.TrimSpace(actualMsg))
+	assert.Equal(t, strings.TrimSpace(expectedMsg), strings.TrimSpace(actualMsg))
 }
diff --git a/modules/templates/scopedtmpl/scopedtmpl.go b/modules/templates/scopedtmpl/scopedtmpl.go
index 2722ba97a2..41a8ca86e9 100644
--- a/modules/templates/scopedtmpl/scopedtmpl.go
+++ b/modules/templates/scopedtmpl/scopedtmpl.go
@@ -192,21 +192,21 @@ func newScopedTemplateSet(all *template.Template, name string) (*scopedTemplateS
 				collectTemplates(nodeList.Nodes)
 			} else if node.Type() == parse.NodeIf {
 				nodeIf := node.(*parse.IfNode)
-				collectTemplates(nodeIf.BranchNode.List.Nodes)
-				if nodeIf.BranchNode.ElseList != nil {
-					collectTemplates(nodeIf.BranchNode.ElseList.Nodes)
+				collectTemplates(nodeIf.List.Nodes)
+				if nodeIf.ElseList != nil {
+					collectTemplates(nodeIf.ElseList.Nodes)
 				}
 			} else if node.Type() == parse.NodeRange {
 				nodeRange := node.(*parse.RangeNode)
-				collectTemplates(nodeRange.BranchNode.List.Nodes)
-				if nodeRange.BranchNode.ElseList != nil {
-					collectTemplates(nodeRange.BranchNode.ElseList.Nodes)
+				collectTemplates(nodeRange.List.Nodes)
+				if nodeRange.ElseList != nil {
+					collectTemplates(nodeRange.ElseList.Nodes)
 				}
 			} else if node.Type() == parse.NodeWith {
 				nodeWith := node.(*parse.WithNode)
-				collectTemplates(nodeWith.BranchNode.List.Nodes)
-				if nodeWith.BranchNode.ElseList != nil {
-					collectTemplates(nodeWith.BranchNode.ElseList.Nodes)
+				collectTemplates(nodeWith.List.Nodes)
+				if nodeWith.ElseList != nil {
+					collectTemplates(nodeWith.ElseList.Nodes)
 				}
 			}
 		}
diff --git a/modules/templates/util_dict.go b/modules/templates/util_dict.go
index 9d9af77fad..16f722e61b 100644
--- a/modules/templates/util_dict.go
+++ b/modules/templates/util_dict.go
@@ -4,6 +4,7 @@
 package templates
 
 import (
+	"errors"
 	"fmt"
 	"html"
 	"html/template"
@@ -33,7 +34,7 @@ func dictMerge(base map[string]any, arg any) bool {
 // The dot syntax is highly discouraged because it might cause unclear key conflicts. It's always good to use explicit keys.
 func dict(args ...any) (map[string]any, error) {
 	if len(args)%2 != 0 {
-		return nil, fmt.Errorf("invalid dict constructor syntax: must have key-value pairs")
+		return nil, errors.New("invalid dict constructor syntax: must have key-value pairs")
 	}
 	m := make(map[string]any, len(args)/2)
 	for i := 0; i < len(args); i += 2 {
diff --git a/modules/templates/util_misc.go b/modules/templates/util_misc.go
index 12a65c87da..60f918be47 100644
--- a/modules/templates/util_misc.go
+++ b/modules/templates/util_misc.go
@@ -1,4 +1,5 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package templates
@@ -13,7 +14,9 @@ import (
 	"time"
 
 	activities_model "forgejo.org/models/activities"
+	asymkey_model "forgejo.org/models/asymkey"
 	repo_model "forgejo.org/models/repo"
+	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
 	giturl "forgejo.org/modules/git/url"
 	"forgejo.org/modules/json"
@@ -38,10 +41,11 @@ func SortArrow(normSort, revSort, urlSort string, isDefault bool) template.HTML
 	} else {
 		// if sort arg is in url test if it correlates with column header sort arguments
 		// the direction of the arrow should indicate the "current sort order", up means ASC(normal), down means DESC(rev)
-		if urlSort == normSort {
+		switch urlSort {
+		case normSort:
 			// the table is sorted with this header normal
 			return svg.RenderHTML("octicon-triangle-up", 16)
-		} else if urlSort == revSort {
+		case revSort:
 			// the table is sorted with this header reverse
 			return svg.RenderHTML("octicon-triangle-down", 16)
 		}
@@ -59,6 +63,7 @@ func IsMultilineCommitMessage(msg string) bool {
 type Actioner interface {
 	GetOpType() activities_model.ActionType
 	GetActUserName(ctx context.Context) string
+	GetRepo(ctx context.Context) *repo_model.Repository
 	GetRepoUserName(ctx context.Context) string
 	GetRepoName(ctx context.Context) string
 	GetRepoPath(ctx context.Context) string
@@ -108,7 +113,7 @@ func ActionIcon(opType activities_model.ActionType) string {
 }
 
 // ActionContent2Commits converts action content to push commits
-func ActionContent2Commits(act Actioner) *repository.PushCommits {
+func ActionContent2Commits(ctx context.Context, act Actioner) *repository.PushCommits {
 	push := repository.NewPushCommits()
 
 	if act == nil || act.GetContent() == "" {
@@ -122,6 +127,23 @@ func ActionContent2Commits(act Actioner) *repository.PushCommits {
 	if push.Len == 0 {
 		push.Len = len(push.Commits)
 	}
+	repo := act.GetRepo(ctx)
+	for _, commit := range push.Commits {
+		gitCommit, err := repository.PushCommitToCommit(commit)
+		if err != nil {
+			// Only happens if the commit has an invalid sha
+			commit.Verification = &asymkey_model.ObjectVerification{
+				Verified: false,
+				Reason:   "git.error.invalid_commit_id",
+			}
+			continue
+		}
+		verification := asymkey_model.ParseCommitWithSignature(ctx, gitCommit)
+		_ = asymkey_model.CalculateTrustStatus(verification, repo.GetTrustModel(), func(user *user_model.User) (bool, error) {
+			return repo_model.IsOwnerMemberCollaborator(ctx, repo, user.ID)
+		}, nil)
+		commit.Verification = verification
+	}
 
 	return push
 }
diff --git a/modules/templates/util_misc_test.go b/modules/templates/util_misc_test.go
new file mode 100644
index 0000000000..3d59f29bd1
--- /dev/null
+++ b/modules/templates/util_misc_test.go
@@ -0,0 +1,124 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package templates
+
+import (
+	"testing"
+
+	activities_model "forgejo.org/models/activities"
+	asymkey_model "forgejo.org/models/asymkey"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/repository"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func pushCommits() *repository.PushCommits {
+	pushCommits := repository.NewPushCommits()
+	pushCommits.Commits = []*repository.PushCommit{
+		{
+			Sha1:           "x",
+			CommitterEmail: "user2@example.com",
+			CommitterName:  "User2",
+			AuthorEmail:    "user2@example.com",
+			AuthorName:     "User2",
+			Message:        "invalid sha1",
+		},
+		{
+			Sha1:           "2c54faec6c45d31c1abfaecdab471eac6633738a",
+			CommitterEmail: "user2@example.com",
+			CommitterName:  "User2",
+			AuthorEmail:    "user2@example.com",
+			AuthorName:     "User2",
+			Message:        "not signed commit",
+		},
+		{
+			Sha1:           "2d491b2985a7ff848d5c02748e7ea9f9f7619f9f",
+			CommitterEmail: "non-existent",
+			CommitterName:  "user2",
+			AuthorEmail:    "non-existent",
+			AuthorName:     "user2",
+			Message:        "Using email that isn't known to Forgejo",
+			Signature: &git.ObjectSignature{
+				Payload: `tree 2d491b2985a7ff848d5c02748e7ea9f9f7619f9f
+parent 45b03601635a1f463b81963a4022c7f87ce96ef9
+author user2 <non-existent> 1699710556 +0100
+committer user2 <non-existent> 1699710556 +0100
+
+Using email that isn't known to Forgejo
+`,
+				Signature: `-----BEGIN SSH SIGNATURE-----
+U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgoGSe9Zy7Ez9bSJcaTNjh/Y7p95
+f5DujjqkpzFRtw6CEAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
+AAAAQIMufOuSjZeDUujrkVK4sl7ICa0WwEftas8UAYxx0Thdkiw2qWjR1U1PKfTLm16/w8
+/bS1LX1lZNuzm2LR2qEgw=
+-----END SSH SIGNATURE-----
+`,
+			},
+		},
+		{
+			Sha1:           "853694aae8816094a0d875fee7ea26278dbf5d0f",
+			CommitterEmail: "user2@example.com",
+			CommitterName:  "user2",
+			AuthorEmail:    "user2@example.com",
+			AuthorName:     "user2",
+			Message:        "Add content",
+			Signature: &git.ObjectSignature{
+				Payload: `tree 853694aae8816094a0d875fee7ea26278dbf5d0f
+parent c2780d5c313da2a947eae22efd7dacf4213f4e7f
+author user2 <user2@example.com> 1699707877 +0100
+committer user2 <user2@example.com> 1699707877 +0100
+
+Add content
+`,
+				Signature: `-----BEGIN SSH SIGNATURE-----
+U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgoGSe9Zy7Ez9bSJcaTNjh/Y7p95
+f5DujjqkpzFRtw6CEAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
+AAAAQBe2Fwk/FKY3SBCnG6jSYcO6ucyahp2SpQ/0P+otslzIHpWNW8cQ0fGLdhhaFynJXQ
+fs9cMpZVM9BfIKNUSO8QY=
+-----END SSH SIGNATURE-----
+`,
+			},
+		},
+	}
+	return pushCommits
+}
+
+func TestActionContent2Commits_VerificationState(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/TestParseCommitWithSSHSignature/")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2, OwnerID: user2.ID})
+	commits, err := json.Marshal(pushCommits())
+	require.NoError(t, err)
+
+	act := &activities_model.Action{
+		OpType:  activities_model.ActionCommitRepo,
+		Repo:    repo,
+		Content: string(commits),
+	}
+	push := ActionContent2Commits(t.Context(), act)
+
+	assert.Equal(t, 4, push.Len)
+	assert.False(t, push.Commits[0].Verification.Verified)
+	assert.Empty(t, push.Commits[0].Verification.TrustStatus)
+	assert.Equal(t, "git.error.invalid_commit_id", push.Commits[0].Verification.Reason)
+
+	assert.False(t, push.Commits[1].Verification.Verified)
+	assert.Empty(t, push.Commits[1].Verification.TrustStatus)
+	assert.Equal(t, asymkey_model.NotSigned, push.Commits[1].Verification.Reason)
+
+	assert.False(t, push.Commits[2].Verification.Verified)
+	assert.Empty(t, push.Commits[2].Verification.TrustStatus)
+	assert.Equal(t, asymkey_model.NoKeyFound, push.Commits[2].Verification.Reason)
+
+	assert.True(t, push.Commits[3].Verification.Verified)
+	assert.Equal(t, "user2 / SHA256:TKfwbZMR7e9OnlV2l1prfah1TXH8CmqR0PvFEXVCXA4", push.Commits[3].Verification.Reason)
+	assert.Equal(t, "trusted", push.Commits[3].Verification.TrustStatus)
+}
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
index a4d7a82eea..bec8d5f5e3 100644
--- a/modules/templates/util_render.go
+++ b/modules/templates/util_render.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	"html"
 	"html/template"
 	"math"
 	"net/url"
@@ -15,18 +16,18 @@ import (
 	"unicode"
 
 	issues_model "forgejo.org/models/issues"
+	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/emoji"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/markup"
 	"forgejo.org/modules/markup/markdown"
 	"forgejo.org/modules/setting"
-	"forgejo.org/modules/translation"
 	"forgejo.org/modules/util"
 )
 
 // RenderCommitMessage renders commit message with XSS-safe and special links.
 func RenderCommitMessage(ctx context.Context, msg string, metas map[string]string) template.HTML {
-	cleanMsg := template.HTMLEscapeString(msg)
+	cleanMsg := html.EscapeString(msg)
 	// we can safely assume that it will not return any error, since there
 	// shouldn't be any special HTML.
 	fullMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
@@ -63,7 +64,7 @@ func RenderCommitMessageLinkSubject(ctx context.Context, msg, urlDefault string,
 		Ctx:         ctx,
 		DefaultLink: urlDefault,
 		Metas:       metas,
-	}, template.HTMLEscapeString(msgLine))
+	}, html.EscapeString(msgLine))
 	if err != nil {
 		log.Error("RenderCommitMessageSubject: %v", err)
 		return template.HTML("")
@@ -88,7 +89,7 @@ func RenderCommitBody(ctx context.Context, msg string, metas map[string]string)
 	renderedMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
 		Ctx:   ctx,
 		Metas: metas,
-	}, template.HTMLEscapeString(msgLine))
+	}, html.EscapeString(msgLine))
 	if err != nil {
 		log.Error("RenderCommitMessage: %v", err)
 		return ""
@@ -122,7 +123,7 @@ func RenderIssueTitle(ctx context.Context, text string, metas map[string]string)
 	renderedText, err := markup.RenderIssueTitle(&markup.RenderContext{
 		Ctx:   ctx,
 		Metas: metas,
-	}, template.HTMLEscapeString(text))
+	}, html.EscapeString(text))
 	if err != nil {
 		log.Error("RenderIssueTitle: %v", err)
 		return template.HTML("")
@@ -132,7 +133,7 @@ func RenderIssueTitle(ctx context.Context, text string, metas map[string]string)
 
 // RenderRefIssueTitle renders referenced issue/pull title with defined post processors
 func RenderRefIssueTitle(ctx context.Context, text string) template.HTML {
-	renderedText, err := markup.RenderRefIssueTitle(&markup.RenderContext{Ctx: ctx}, template.HTMLEscapeString(text))
+	renderedText, err := markup.RenderRefIssueTitle(&markup.RenderContext{Ctx: ctx}, html.EscapeString(text))
 	if err != nil {
 		log.Error("RenderRefIssueTitle: %v", err)
 		return ""
@@ -143,18 +144,18 @@ func RenderRefIssueTitle(ctx context.Context, text string) template.HTML {
 
 // RenderLabel renders a label
 // locale is needed due to an import cycle with our context providing the `Tr` function
-func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_model.Label) template.HTML {
+func RenderLabel(ctx *Context, label *issues_model.Label) template.HTML {
 	var (
 		archivedCSSClass string
 		textColor        = util.ContrastColor(label.Color)
 		labelScope       = label.ExclusiveScope()
 	)
 
-	description := emoji.ReplaceAliases(template.HTMLEscapeString(label.Description))
+	description := emoji.ReplaceAliases(html.EscapeString(label.Description))
 
 	if label.IsArchived() {
 		archivedCSSClass = "archived-label"
-		description = locale.TrString("repo.issues.archived_label_description", description)
+		description = ctx.Locale.TrString("repo.issues.archived_label_description", description)
 	}
 
 	if labelScope == "" {
@@ -212,7 +213,7 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m
 // RenderEmoji renders html text with emoji post processors
 func RenderEmoji(ctx context.Context, text string) template.HTML {
 	renderedText, err := markup.RenderEmoji(&markup.RenderContext{Ctx: ctx},
-		template.HTMLEscapeString(text))
+		html.EscapeString(text))
 	if err != nil {
 		log.Error("RenderEmoji: %v", err)
 		return template.HTML("")
@@ -244,7 +245,7 @@ func RenderMarkdownToHtml(ctx context.Context, input string) template.HTML { //n
 	return output
 }
 
-func RenderLabels(ctx context.Context, locale translation.Locale, labels []*issues_model.Label, repoLink string, isPull bool) template.HTML {
+func RenderLabels(ctx *Context, labels []*issues_model.Label, repoLink string, isPull bool) template.HTML {
 	htmlCode := `<span class="labels-list">`
 	for _, label := range labels {
 		// Protect against nil value in labels - shouldn't happen but would cause a panic if so
@@ -257,16 +258,34 @@ func RenderLabels(ctx context.Context, locale translation.Locale, labels []*issu
 			issuesOrPull = "pulls"
 		}
 		htmlCode += fmt.Sprintf("<a href='%s/%s?labels=%d' rel='nofollow'>%s</a> ",
-			repoLink, issuesOrPull, label.ID, RenderLabel(ctx, locale, label))
+			repoLink, issuesOrPull, label.ID, RenderLabel(ctx, label))
 	}
 	htmlCode += "</span>"
 	return template.HTML(htmlCode)
 }
 
-func RenderReviewRequest(users []issues_model.RequestReviewTarget) template.HTML {
+func RenderUser(ctx context.Context, user user_model.User) template.HTML {
+	if user.ID > 0 {
+		return template.HTML(fmt.Sprintf(
+			"<a href='%s' rel='nofollow'><strong>%s</strong></a>",
+			user.HomeLink(), html.EscapeString(user.GetDisplayName())))
+	}
+	return template.HTML(fmt.Sprintf("<strong>%s</strong>",
+		html.EscapeString(user.GetDisplayName())))
+}
+
+func RenderReviewRequest(ctx context.Context, users []issues_model.RequestReviewTarget) template.HTML {
 	usernames := make([]string, 0, len(users))
 	for _, user := range users {
-		usernames = append(usernames, template.HTMLEscapeString(user.Name()))
+		if user.ID() > 0 {
+			usernames = append(usernames, fmt.Sprintf(
+				"<a href='%s' rel='nofollow'><strong>%s</strong></a>",
+				user.Link(ctx), html.EscapeString(user.Name())))
+		} else {
+			usernames = append(usernames, fmt.Sprintf(
+				"<strong>%s</strong>",
+				html.EscapeString(user.Name())))
+		}
 	}
 
 	htmlCode := `<span class="review-request-list">`
diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go
index 20c39eb417..3cfd572491 100644
--- a/modules/templates/util_render_test.go
+++ b/modules/templates/util_render_test.go
@@ -10,7 +10,11 @@ import (
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
+	org_model "forgejo.org/models/organization"
 	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/modules/translation"
 
 	"github.com/stretchr/testify/assert"
@@ -47,12 +51,12 @@ var testMetas = map[string]string{
 
 func TestApostrophesInMentions(t *testing.T) {
 	rendered := RenderMarkdownToHtml(t.Context(), "@mention-user's comment")
-	assert.EqualValues(t, template.HTML("<p><a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a>&#39;s comment</p>\n"), rendered)
+	assert.Equal(t, template.HTML("<p><a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a>&#39;s comment</p>\n"), rendered)
 }
 
 func TestNonExistantUserMention(t *testing.T) {
 	rendered := RenderMarkdownToHtml(t.Context(), "@ThisUserDoesNotExist @mention-user")
-	assert.EqualValues(t, template.HTML("<p>@ThisUserDoesNotExist <a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a></p>\n"), rendered)
+	assert.Equal(t, template.HTML("<p>@ThisUserDoesNotExist <a href=\"/mention-user\" class=\"mention\" rel=\"nofollow\">@mention-user</a></p>\n"), rendered)
 }
 
 func TestRenderCommitBody(t *testing.T) {
@@ -192,8 +196,8 @@ func TestRenderMarkdownToHtml(t *testing.T) {
 <a href="https://example.com" rel="nofollow">remote link</a>
 <a href="/src/file.bin" rel="nofollow">local link</a>
 <a href="https://example.com" rel="nofollow">remote link</a>
-<a href="/image.jpg" target="_blank" rel="nofollow noopener"><img src="/image.jpg" alt="local image"/></a>
-<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image"/></a>
+<a href="/image.jpg" target="_blank" rel="nofollow noopener"><img src="/image.jpg" alt="local image" loading="lazy"/></a>
+<a href="https://example.com/image.jpg" target="_blank" rel="nofollow noopener"><img src="https://example.com/image.jpg" alt="remote image" loading="lazy"/></a>
 <a href="/image.jpg" rel="nofollow"><img src="/image.jpg" title="local image" alt=""/></a>
 <a href="https://example.com/image.jpg" rel="nofollow"><img src="https://example.com/image.jpg" title="remote link" alt=""/></a>
 <a href="https://example.com/user/repo/compare/88fc37a3c0a4dda553bdcfc80c178a58247f42fb...12fc37a3c0a4dda553bdcfc80c178a58247f42fb#hash" rel="nofollow"><code>88fc37a3c0...12fc37a3c0 (hash)</code></a>
@@ -215,9 +219,70 @@ func TestRenderLabels(t *testing.T) {
 
 	tr := &translation.MockLocale{}
 	label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
+	labelScoped := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 7})
+	labelMalicious := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 11})
+	labelArchived := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 12})
 
-	assert.Contains(t, RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", false),
-		"user2/repo1/issues?labels=1")
-	assert.Contains(t, RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", true),
-		"user2/repo1/pulls?labels=1")
+	ctx := NewContext(t.Context())
+	ctx.Locale = tr
+
+	rendered := RenderLabels(ctx, []*issues_model.Label{label}, "user2/repo1", false)
+	assert.Contains(t, rendered, "user2/repo1/issues?labels=1")
+	assert.Contains(t, rendered, ">label1<")
+	assert.Contains(t, rendered, "title='First label'")
+	rendered = RenderLabels(ctx, []*issues_model.Label{label}, "user2/repo1", true)
+	assert.Contains(t, rendered, "user2/repo1/pulls?labels=1")
+	assert.Contains(t, rendered, ">label1<")
+	rendered = RenderLabels(ctx, []*issues_model.Label{labelScoped}, "user2/repo1", false)
+	assert.Contains(t, rendered, "user2/repo1/issues?labels=7")
+	assert.Contains(t, rendered, ">scope<")
+	assert.Contains(t, rendered, ">label1<")
+	rendered = RenderLabels(ctx, []*issues_model.Label{labelMalicious}, "user2/repo1", false)
+	assert.Contains(t, rendered, "user2/repo1/issues?labels=11")
+	assert.Contains(t, rendered, ">  &lt;script&gt;malicious&lt;/script&gt; <")
+	assert.Contains(t, rendered, ">&#39;?&amp;<")
+	assert.Contains(t, rendered, "title='Malicious label &#39; &lt;script&gt;malicious&lt;/script&gt;'")
+	rendered = RenderLabels(ctx, []*issues_model.Label{labelArchived}, "user2/repo1", false)
+	assert.Contains(t, rendered, "user2/repo1/issues?labels=12")
+	assert.Contains(t, rendered, ">archived label&lt;&gt;<")
+	assert.Contains(t, rendered, "title='repo.issues.archived_label_description'")
+}
+
+func TestRenderUser(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+	ghost := user_model.NewGhostUser()
+
+	assert.Contains(t, RenderUser(db.DefaultContext, *user),
+		"<a href='/user2' rel='nofollow'><strong>user2</strong></a>")
+	assert.Contains(t, RenderUser(db.DefaultContext, *org),
+		"<a href='/org3' rel='nofollow'><strong>org3</strong></a>")
+	assert.Contains(t, RenderUser(db.DefaultContext, *ghost),
+		"<strong>Ghost</strong>")
+
+	defer test.MockVariableValue(&setting.UI.DefaultShowFullName, true)()
+	assert.Contains(t, RenderUser(db.DefaultContext, *user),
+		"<a href='/user2' rel='nofollow'><strong>&lt; U&lt;se&gt;r Tw&lt;o &gt; &gt;&lt;</strong></a>")
+	assert.Contains(t, RenderUser(db.DefaultContext, *org),
+		"<a href='/org3' rel='nofollow'><strong>&lt;&lt;&lt;&lt; &gt;&gt; &gt;&gt; &gt; &gt;&gt; &gt; &gt;&gt;&gt; &gt;&gt;</strong></a>")
+	assert.Contains(t, RenderUser(db.DefaultContext, *ghost),
+		"<strong>Ghost</strong>")
+}
+
+func TestRenderReviewRequest(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+
+	target1 := issues_model.RequestReviewTarget{User: &user_model.User{ID: 1, Name: "user1", FullName: "User <One>"}}
+	target2 := issues_model.RequestReviewTarget{Team: &org_model.Team{ID: 2, Name: "Team2", OrgID: 3}}
+	target3 := issues_model.RequestReviewTarget{Team: org_model.NewGhostTeam()}
+	assert.Contains(t, RenderReviewRequest(db.DefaultContext, []issues_model.RequestReviewTarget{target1, target2, target3}),
+		"<a href='/user1' rel='nofollow'><strong>user1</strong></a>, "+
+			"<a href='/org/org3/teams/Team2' rel='nofollow'><strong>Team2</strong></a>, "+
+			"<strong>Ghost team</strong>")
+
+	defer test.MockVariableValue(&setting.UI.DefaultShowFullName, true)()
+	assert.Contains(t, RenderReviewRequest(db.DefaultContext, []issues_model.RequestReviewTarget{target1}),
+		"<a href='/user1' rel='nofollow'><strong>User &lt;One&gt;</strong></a>")
 }
diff --git a/modules/templates/util_test.go b/modules/templates/util_test.go
index 79aaba4a0e..e28da8090b 100644
--- a/modules/templates/util_test.go
+++ b/modules/templates/util_test.go
@@ -29,7 +29,7 @@ func TestDict(t *testing.T) {
 	for _, c := range cases {
 		got, err := dict(c.args...)
 		require.NoError(t, err)
-		assert.EqualValues(t, c.want, got)
+		assert.Equal(t, c.want, got)
 	}
 
 	bads := []struct {
diff --git a/modules/templates/vars/vars_test.go b/modules/templates/vars/vars_test.go
index c54342204d..a0c3490c3a 100644
--- a/modules/templates/vars/vars_test.go
+++ b/modules/templates/vars/vars_test.go
@@ -61,7 +61,7 @@ func TestExpandVars(t *testing.T) {
 	for _, kase := range kases {
 		t.Run(kase.tmpl, func(t *testing.T) {
 			res, err := Expand(kase.tmpl, kase.data)
-			assert.EqualValues(t, kase.out, res)
+			assert.Equal(t, kase.out, res)
 			if kase.error {
 				require.Error(t, err)
 			} else {
diff --git a/modules/test/distant_federation_server_mock.go b/modules/test/distant_federation_server_mock.go
index fd68c88a40..ea8a69e9b4 100644
--- a/modules/test/distant_federation_server_mock.go
+++ b/modules/test/distant_federation_server_mock.go
@@ -10,56 +10,79 @@ import (
 	"net/http/httptest"
 	"strings"
 	"testing"
+
+	"forgejo.org/modules/util"
 )
 
 type FederationServerMockPerson struct {
-	ID     int64
-	Name   string
-	PubKey string
+	ID      int64
+	Name    string
+	PubKey  string
+	PrivKey string
 }
 type FederationServerMockRepository struct {
 	ID int64
 }
+type ApActorMock struct {
+	PrivKey string
+	PubKey  string
+}
 type FederationServerMock struct {
+	ApActor      ApActorMock
 	Persons      []FederationServerMockPerson
 	Repositories []FederationServerMockRepository
 	LastPost     string
 }
 
 func NewFederationServerMockPerson(id int64, name string) FederationServerMockPerson {
+	priv, pub, _ := util.GenerateKeyPair(3072)
 	return FederationServerMockPerson{
-		ID:   id,
-		Name: name,
-		PubKey: `"-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA18H5s7N6ItZUAh9tneII\nIuZdTTa3cZlLa/9ejWAHTkcp3WLW+/zbsumlMrWYfBy2/yTm56qasWt38iY4D6ul\n` +
-			`CPiwhAqX3REvVq8tM79a2CEqZn9ka6vuXoDgBg/sBf/BUWqf7orkjUXwk/U0Egjf\nk5jcurF4vqf1u+rlAHH37dvSBaDjNj6Qnj4OP12bjfaY/yvs7+jue/eNXFHjzN4E\n` +
-			`T2H4B/yeKTJ4UuAwTlLaNbZJul2baLlHelJPAsxiYaziVuV5P+IGWckY6RSerRaZ\nAkc4mmGGtjAyfN9aewe+lNVfwS7ElFx546PlLgdQgjmeSwLX8FWxbPE5A/PmaXCs\n` +
-			`nx+nou+3dD7NluULLtdd7K+2x02trObKXCAzmi5/Dc+yKTzpFqEz+hLNCz7TImP/\ncK//NV9Q+X67J9O27baH9R9ZF4zMw8rv2Pg0WLSw1z7lLXwlgIsDapeMCsrxkVO4\n` +
-			`LXX5AQ1xQNtlssnVoUBqBrvZsX2jUUKUocvZqMGuE4hfAgMBAAE=\n-----END PUBLIC KEY-----\n"`,
+		ID:      id,
+		Name:    name,
+		PubKey:  pub,
+		PrivKey: priv,
 	}
 }
 
+func (p *FederationServerMockPerson) KeyID(host string) string {
+	return fmt.Sprintf("%[1]v/api/v1/activitypub/user-id/%[2]v#main-key", host, p.ID)
+}
+
 func NewFederationServerMockRepository(id int64) FederationServerMockRepository {
 	return FederationServerMockRepository{
 		ID: id,
 	}
 }
 
+func NewApActorMock() ApActorMock {
+	priv, pub, _ := util.GenerateKeyPair(1024)
+	return ApActorMock{
+		PrivKey: priv,
+		PubKey:  pub,
+	}
+}
+
+func (u *ApActorMock) KeyID(host string) string {
+	return fmt.Sprintf("%[1]v/api/v1/activitypub/actor#main-key", host)
+}
+
 func (p FederationServerMockPerson) marshal(host string) string {
 	return fmt.Sprintf(`{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],`+
-		`"id":"http://%[1]v/api/activitypub/user-id/%[2]v",`+
+		`"id":"http://%[1]v/api/v1/activitypub/user-id/%[2]v",`+
 		`"type":"Person",`+
 		`"icon":{"type":"Image","mediaType":"image/png","url":"http://%[1]v/avatars/1bb05d9a5f6675ed0272af9ea193063c"},`+
 		`"url":"http://%[1]v/%[2]v",`+
-		`"inbox":"http://%[1]v/api/activitypub/user-id/%[2]v/inbox",`+
-		`"outbox":"http://%[1]v/api/activitypub/user-id/%[2]v/outbox",`+
+		`"inbox":"http://%[1]v/api/v1/activitypub/user-id/%[2]v/inbox",`+
+		`"outbox":"http://%[1]v/api/v1/activitypub/user-id/%[2]v/outbox",`+
 		`"preferredUsername":"%[3]v",`+
-		`"publicKey":{"id":"http://%[1]v/api/activitypub/user-id/%[2]v#main-key",`+
-		`"owner":"http://%[1]v/api/activitypub/user-id/%[2]v",`+
-		`"publicKeyPem":%[4]v}}`, host, p.ID, p.Name, p.PubKey)
+		`"publicKey":{"id":"http://%[1]v/api/v1/activitypub/user-id/%[2]v#main-key",`+
+		`"owner":"http://%[1]v/api/v1/activitypub/user-id/%[2]v",`+
+		`"publicKeyPem":%[4]q}}`, host, p.ID, p.Name, p.PubKey)
 }
 
 func NewFederationServerMock() *FederationServerMock {
 	return &FederationServerMock{
+		ApActor: NewApActorMock(),
 		Persons: []FederationServerMockPerson{
 			NewFederationServerMockPerson(15, "stargoose1"),
 			NewFederationServerMockPerson(30, "stargoose2"),
@@ -71,8 +94,18 @@ func NewFederationServerMock() *FederationServerMock {
 	}
 }
 
+func (mock *FederationServerMock) recordLastPost(t *testing.T, req *http.Request) {
+	buf := new(strings.Builder)
+	_, err := io.Copy(buf, req.Body)
+	if err != nil {
+		t.Errorf("Error reading body: %q", err)
+	}
+	mock.LastPost = strings.ReplaceAll(buf.String(), req.Host, "DISTANT_FEDERATION_HOST")
+}
+
 func (mock *FederationServerMock) DistantServer(t *testing.T) *httptest.Server {
 	federatedRoutes := http.NewServeMux()
+
 	federatedRoutes.HandleFunc("/.well-known/nodeinfo",
 		func(res http.ResponseWriter, req *http.Request) {
 			// curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/.well-known/nodeinfo
@@ -87,30 +120,28 @@ func (mock *FederationServerMock) DistantServer(t *testing.T) *httptest.Server {
 				`"protocols":["activitypub"],"services":{"inbound":[],"outbound":["rss2.0"]},`+
 				`"openRegistrations":true,"usage":{"users":{"total":14,"activeHalfyear":2}},"metadata":{}}`)
 		})
+
 	for _, person := range mock.Persons {
 		federatedRoutes.HandleFunc(fmt.Sprintf("/api/v1/activitypub/user-id/%v", person.ID),
 			func(res http.ResponseWriter, req *http.Request) {
 				// curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/2
 				fmt.Fprint(res, person.marshal(req.Host))
 			})
-	}
-	for _, repository := range mock.Repositories {
-		federatedRoutes.HandleFunc(fmt.Sprintf("/api/v1/activitypub/repository-id/%v/inbox/", repository.ID),
+		federatedRoutes.HandleFunc(fmt.Sprintf("POST /api/v1/activitypub/user-id/%v/inbox", person.ID),
 			func(res http.ResponseWriter, req *http.Request) {
-				if req.Method != "POST" {
-					t.Errorf("POST expected at: %q", req.URL.EscapedPath())
-				}
-				buf := new(strings.Builder)
-				_, err := io.Copy(buf, req.Body)
-				if err != nil {
-					t.Errorf("Error reading body: %q", err)
-				}
-				mock.LastPost = buf.String()
+				mock.recordLastPost(t, req)
+			})
+	}
+
+	for _, repository := range mock.Repositories {
+		federatedRoutes.HandleFunc(fmt.Sprintf("POST /api/v1/activitypub/repository-id/%v/inbox", repository.ID),
+			func(res http.ResponseWriter, req *http.Request) {
+				mock.recordLastPost(t, req)
 			})
 	}
 	federatedRoutes.HandleFunc("/",
 		func(res http.ResponseWriter, req *http.Request) {
-			t.Errorf("Unhandled request: %q", req.URL.EscapedPath())
+			t.Errorf("Unhandled %v request: %q", req.Method, req.URL.EscapedPath())
 		})
 	federatedSrv := httptest.NewServer(federatedRoutes)
 	return federatedSrv
diff --git a/modules/test/utils.go b/modules/test/utils.go
index f60bad022e..db131f19d0 100644
--- a/modules/test/utils.go
+++ b/modules/test/utils.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"strings"
+	"time"
 
 	"forgejo.org/modules/json"
 )
@@ -46,3 +47,8 @@ func MockProtect[T any](p *T) (reset func()) {
 	old := *p
 	return func() { *p = old }
 }
+
+// When this is called, sleep until the unix time was increased by one.
+func SleepTillNextSecond() {
+	time.Sleep(time.Second - time.Since(time.Now().Truncate(time.Second)))
+}
diff --git a/modules/testlogger/testlogger.go b/modules/testlogger/testlogger.go
index b5f196ad4b..772ae47e71 100644
--- a/modules/testlogger/testlogger.go
+++ b/modules/testlogger/testlogger.go
@@ -363,6 +363,12 @@ var ignoredErrorMessage = []string{
 
 	// TestDatabaseCollation
 	`[E] [Error SQL Query] INSERT INTO test_collation_tbl (txt) VALUES ('main') []`,
+
+	// Test_CmdForgejo_Actions
+	`DB: No dedicated replica host defined; falling back to primary DSN for replica connections`,
+
+	// TestDevtestErrorpages
+	`ErrorPage() [E] Example error: Example error`,
 }
 
 func (w *testLoggerWriterCloser) recordError(msg string) {
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index b0bbe25f98..f296a2dc86 100644
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -96,11 +96,7 @@ func timeSincePro(then, now time.Time, lang translation.Locale) string {
 	}
 
 	var timeStr, diffStr string
-	for {
-		if diff == 0 {
-			break
-		}
-
+	for diff != 0 {
 		diff, diffStr = computeTimeDiffFloor(diff, lang)
 		timeStr += ", " + diffStr
 	}
diff --git a/modules/translation/i18n/dummy.go b/modules/translation/i18n/dummy.go
index 861672c619..9f1e682f11 100644
--- a/modules/translation/i18n/dummy.go
+++ b/modules/translation/i18n/dummy.go
@@ -15,6 +15,10 @@ type KeyLocale struct{}
 
 var _ Locale = (*KeyLocale)(nil)
 
+func (k *KeyLocale) Language() string {
+	return "dummy"
+}
+
 // HasKey implements Locale.
 func (k *KeyLocale) HasKey(trKey string) bool {
 	return true
@@ -35,6 +39,11 @@ func (k *KeyLocale) TrPluralString(count any, trKey string, trArgs ...any) templ
 	return template.HTML(FormatDummy(trKey, PrepareArgsForHTML(trArgs...)...))
 }
 
+// TrPluralStringAllForms implements Locale.
+func (k *KeyLocale) TrPluralStringAllForms(trKey string) ([]string, []string) {
+	return []string{trKey}, nil
+}
+
 func FormatDummy(trKey string, args ...any) string {
 	if len(args) == 0 {
 		return fmt.Sprintf("(%s)", trKey)
diff --git a/modules/translation/i18n/i18n.go b/modules/translation/i18n/i18n.go
index e447502a3b..10ed8ac199 100644
--- a/modules/translation/i18n/i18n.go
+++ b/modules/translation/i18n/i18n.go
@@ -25,6 +25,7 @@ const (
 var DefaultLocales = NewLocaleStore()
 
 type Locale interface {
+	Language() string
 	// TrString translates a given key and arguments for a language
 	TrString(trKey string, trArgs ...any) string
 	// TrPluralString translates a given pluralized key and arguments for a language.
@@ -34,6 +35,9 @@ type Locale interface {
 	TrHTML(trKey string, trArgs ...any) template.HTML
 	// HasKey reports if a locale has a translation for a given key
 	HasKey(trKey string) bool
+	// TrPluralStringAllForms returns all plural form variants for a given string, and also
+	// the fallbacks for the default language if the translation is incomplete.
+	TrPluralStringAllForms(trKey string) ([]string, []string)
 }
 
 // LocaleStore provides the functions common to all locale stores
@@ -42,6 +46,8 @@ type LocaleStore interface {
 
 	// SetDefaultLang sets the default language to fall back to
 	SetDefaultLang(lang string)
+	// GetDefaultLang returns the name of the default language to fall back to
+	GetDefaultLang() string
 	// ListLangNameDesc provides paired slices of language names to descriptors
 	ListLangNameDesc() (names, desc []string)
 	// Locale return the locale for the provided language or the default language if not found
@@ -49,7 +55,7 @@ type LocaleStore interface {
 	// HasLang returns whether a given language is present in the store
 	HasLang(langName string) bool
 	// AddLocaleByIni adds a new old-style language to the store
-	AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, source, moreSource []byte) error
+	AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, usedPluralForms []PluralFormIndex, source, moreSource []byte) error
 	// AddLocaleByJSON adds new-style content to an existing language to the store
 	AddToLocaleFromJSON(langName string, source []byte) error
 }
diff --git a/modules/translation/i18n/i18n_test.go b/modules/translation/i18n/i18n_test.go
index a0458f0b8e..ac086d75d9 100644
--- a/modules/translation/i18n/i18n_test.go
+++ b/modules/translation/i18n/i18n_test.go
@@ -32,6 +32,11 @@ var MockPluralRuleEnglish PluralFormRule = func(n int64) PluralFormIndex {
 	return PluralFormOther
 }
 
+var (
+	UsedPluralFormsEnglish = []PluralFormIndex{PluralFormOne, PluralFormOther}
+	UsedPluralFormsMock    = []PluralFormIndex{PluralFormZero, PluralFormOne, PluralFormFew, PluralFormOther}
+)
+
 func TestLocaleStore(t *testing.T) {
 	testData1 := []byte(`
 .dot.name = Dot Name
@@ -85,8 +90,8 @@ commits = fallback value for commits
 `)
 
 	ls := NewLocaleStore()
-	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRuleEnglish, testData1, nil))
-	require.NoError(t, ls.AddLocaleByIni("lang2", "Lang2", MockPluralRule, testData2, nil))
+	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRuleEnglish, UsedPluralFormsEnglish, testData1, nil))
+	require.NoError(t, ls.AddLocaleByIni("lang2", "Lang2", MockPluralRule, UsedPluralFormsMock, testData2, nil))
 	require.NoError(t, ls.AddToLocaleFromJSON("lang1", testDataJSON1))
 	require.NoError(t, ls.AddToLocaleFromJSON("lang2", testDataJSON2))
 	ls.SetDefaultLang("lang1")
@@ -166,7 +171,7 @@ commits = fallback value for commits
 
 	found = lang1.HasKey("no-such")
 	assert.False(t, found)
-	assert.EqualValues(t, "no-such", lang1.TrString("no-such"))
+	assert.Equal(t, "no-such", lang1.TrString("no-such"))
 	require.NoError(t, ls.Close())
 }
 
@@ -182,7 +187,7 @@ c=22
 `)
 
 	ls := NewLocaleStore()
-	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, testData1, testData2))
+	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, UsedPluralFormsMock, testData1, testData2))
 	lang1, _ := ls.Locale("lang1")
 	assert.Equal(t, "11", lang1.TrString("a"))
 	assert.Equal(t, "21", lang1.TrString("b"))
@@ -223,7 +228,7 @@ func (e *errorPointerReceiver) Error() string {
 
 func TestLocaleWithTemplate(t *testing.T) {
 	ls := NewLocaleStore()
-	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, []byte(`key=<a>%s</a>`), nil))
+	require.NoError(t, ls.AddLocaleByIni("lang1", "Lang1", MockPluralRule, UsedPluralFormsMock, []byte(`key=<a>%s</a>`), nil))
 	lang1, _ := ls.Locale("lang1")
 
 	tmpl := template.New("test").Funcs(template.FuncMap{"tr": lang1.TrHTML})
@@ -286,7 +291,7 @@ func TestLocaleStoreQuirks(t *testing.T) {
 
 	for _, testData := range testDataList {
 		ls := NewLocaleStore()
-		err := ls.AddLocaleByIni("lang1", "Lang1", nil, []byte("a="+testData.in), nil)
+		err := ls.AddLocaleByIni("lang1", "Lang1", nil, nil, []byte("a="+testData.in), nil)
 		lang1, _ := ls.Locale("lang1")
 		require.NoError(t, err, testData.hint)
 		assert.Equal(t, testData.out, lang1.TrString("a"), testData.hint)
diff --git a/modules/translation/i18n/localestore.go b/modules/translation/i18n/localestore.go
index 1b64139690..fc27c75d13 100644
--- a/modules/translation/i18n/localestore.go
+++ b/modules/translation/i18n/localestore.go
@@ -9,9 +9,9 @@ import (
 	"html/template"
 	"slices"
 
-	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/translation/localeiter"
 	"forgejo.org/modules/util"
 )
 
@@ -24,6 +24,7 @@ type locale struct {
 
 	newStyleMessages map[string]string
 	pluralRule       PluralFormRule
+	usedPluralForms  []PluralFormIndex
 }
 
 var _ Locale = (*locale)(nil)
@@ -56,7 +57,7 @@ const (
 // the correct plural form for a given count and language.
 
 // AddLocaleByIni adds locale by ini into the store
-func (store *localeStore) AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, source, moreSource []byte) error {
+func (store *localeStore) AddLocaleByIni(langName, langDesc string, pluralRule PluralFormRule, usedPluralForms []PluralFormIndex, source, moreSource []byte) error {
 	if _, ok := store.localeMap[langName]; ok {
 		return ErrLocaleAlreadyExist
 	}
@@ -64,7 +65,7 @@ func (store *localeStore) AddLocaleByIni(langName, langDesc string, pluralRule P
 	store.langNames = append(store.langNames, langName)
 	store.langDescs = append(store.langDescs, langDesc)
 
-	l := &locale{store: store, langName: langName, idxToMsgMap: make(map[int]string), pluralRule: pluralRule, newStyleMessages: make(map[string]string)}
+	l := &locale{store: store, langName: langName, idxToMsgMap: make(map[int]string), pluralRule: pluralRule, usedPluralForms: usedPluralForms, newStyleMessages: make(map[string]string)}
 	store.localeMap[l.langName] = l
 
 	iniFile, err := setting.NewConfigProviderForLocale(source, moreSource)
@@ -95,54 +96,20 @@ func (store *localeStore) AddLocaleByIni(langName, langDesc string, pluralRule P
 	return nil
 }
 
-func RecursivelyAddTranslationsFromJSON(locale *locale, object map[string]any, prefix string) error {
-	for key, value := range object {
-		var fullkey string
-		if prefix != "" {
-			fullkey = prefix + "." + key
-		} else {
-			fullkey = key
-		}
-
-		switch v := value.(type) {
-		case string:
-			// Check whether we are adding a plural form to the parent object, or a new nested JSON object.
-
-			if key == "zero" || key == "one" || key == "two" || key == "few" || key == "many" {
-				locale.newStyleMessages[prefix+PluralFormSeparator+key] = v
-			} else if key == "other" {
-				locale.newStyleMessages[prefix] = v
-			} else {
-				locale.newStyleMessages[fullkey] = v
-			}
-
-		case map[string]any:
-			err := RecursivelyAddTranslationsFromJSON(locale, v, fullkey)
-			if err != nil {
-				return err
-			}
-
-		case nil:
-		default:
-			return fmt.Errorf("Unrecognized JSON value '%s'", value)
-		}
-	}
-
-	return nil
-}
-
 func (store *localeStore) AddToLocaleFromJSON(langName string, source []byte) error {
 	locale, ok := store.localeMap[langName]
 	if !ok {
 		return ErrLocaleDoesNotExist
 	}
 
-	var result map[string]any
-	if err := json.Unmarshal(source, &result); err != nil {
-		return err
-	}
-
-	return RecursivelyAddTranslationsFromJSON(locale, result, "")
+	return localeiter.IterateMessagesNextContent(source, func(key, pluralForm, value string) error {
+		msgKey := key
+		if pluralForm != "" {
+			msgKey = key + PluralFormSeparator + pluralForm
+		}
+		locale.newStyleMessages[msgKey] = value
+		return nil
+	})
 }
 
 func (l *locale) LookupNewStyleMessage(trKey string) string {
@@ -152,7 +119,7 @@ func (l *locale) LookupNewStyleMessage(trKey string) string {
 	return ""
 }
 
-func (l *locale) LookupPlural(trKey string, count any) string {
+func (l *locale) LookupPluralByCount(trKey string, count any) string {
 	n, err := util.ToInt64(count)
 	if err != nil {
 		log.Error("Invalid plural count '%s'", count)
@@ -160,6 +127,10 @@ func (l *locale) LookupPlural(trKey string, count any) string {
 	}
 
 	pluralForm := l.pluralRule(n)
+	return l.LookupPluralByForm(trKey, pluralForm)
+}
+
+func (l *locale) LookupPluralByForm(trKey string, pluralForm PluralFormIndex) string {
 	suffix := ""
 	switch pluralForm {
 	case PluralFormZero:
@@ -175,7 +146,7 @@ func (l *locale) LookupPlural(trKey string, count any) string {
 	case PluralFormOther:
 		// No suffix for the "other" string.
 	default:
-		log.Error("Invalid plural form index %d for count %d", pluralForm, count)
+		log.Error("Invalid plural form index %d", pluralForm)
 		return ""
 	}
 
@@ -183,7 +154,7 @@ func (l *locale) LookupPlural(trKey string, count any) string {
 		return result
 	}
 
-	log.Error("Missing translation for plural form index %d for count %d", pluralForm, count)
+	log.Error("Missing translation for plural form %s", suffix)
 	return ""
 }
 
@@ -201,6 +172,10 @@ func (store *localeStore) SetDefaultLang(lang string) {
 	store.defaultLang = lang
 }
 
+func (store *localeStore) GetDefaultLang() string {
+	return store.defaultLang
+}
+
 // Locale returns the locale for the lang or the default language
 func (store *localeStore) Locale(lang string) (Locale, bool) {
 	l, found := store.localeMap[lang]
@@ -219,6 +194,10 @@ func (store *localeStore) Close() error {
 	return nil
 }
 
+func (l *locale) Language() string {
+	return l.langName
+}
+
 func (l *locale) TrString(trKey string, trArgs ...any) string {
 	format := trKey
 
@@ -285,11 +264,11 @@ func (l *locale) TrHTML(trKey string, trArgs ...any) template.HTML {
 }
 
 func (l *locale) TrPluralString(count any, trKey string, trArgs ...any) template.HTML {
-	message := l.LookupPlural(trKey, count)
+	message := l.LookupPluralByCount(trKey, count)
 
 	if message == "" {
 		if defaultLang, ok := l.store.localeMap[l.store.defaultLang]; ok {
-			message = defaultLang.LookupPlural(trKey, count)
+			message = defaultLang.LookupPluralByCount(trKey, count)
 		}
 		if message == "" {
 			message = trKey
@@ -303,6 +282,36 @@ func (l *locale) TrPluralString(count any, trKey string, trArgs ...any) template
 	return template.HTML(message)
 }
 
+func (l *locale) TrPluralStringAllForms(trKey string) ([]string, []string) {
+	defaultLang, hasDefaultLang := l.store.localeMap[l.store.defaultLang]
+
+	var fallback []string
+	fallback = nil
+
+	result := make([]string, len(l.usedPluralForms))
+	allPresent := true
+
+	for i, form := range l.usedPluralForms {
+		result[i] = l.LookupPluralByForm(trKey, form)
+		if result[i] == "" {
+			allPresent = false
+		}
+	}
+
+	if !allPresent {
+		if hasDefaultLang {
+			fallback = make([]string, len(defaultLang.usedPluralForms))
+			for i, form := range defaultLang.usedPluralForms {
+				fallback[i] = defaultLang.LookupPluralByForm(trKey, form)
+			}
+		} else {
+			log.Error("Plural set for '%s' is incomplete and no fallback language is set.", trKey)
+		}
+	}
+
+	return result, fallback
+}
+
 // HasKey returns whether a key is present in this locale or not
 func (l *locale) HasKey(trKey string) bool {
 	_, ok := l.newStyleMessages[trKey]
diff --git a/modules/translation/localeiter/utils.go b/modules/translation/localeiter/utils.go
new file mode 100644
index 0000000000..de398258e2
--- /dev/null
+++ b/modules/translation/localeiter/utils.go
@@ -0,0 +1,89 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+// extracted from `/build/lint-locale.go`, `/build/lint-locale-usage.go`
+
+package localeiter
+
+import (
+	"encoding/json" //nolint:depguard
+	"fmt"
+
+	"forgejo.org/modules/setting"
+)
+
+func IterateMessagesContent(localeContent []byte, onMsgid func(string, string) error) error {
+	cfg, err := setting.NewConfigProviderForLocale(localeContent)
+	if err != nil {
+		return err
+	}
+
+	for _, section := range cfg.Sections() {
+		for _, key := range section.Keys() {
+			var trKey string
+			// see https://codeberg.org/forgejo/discussions/issues/104
+			//     https://github.com/WeblateOrg/weblate/issues/10831
+			// for an explanation of why "common" is an alternative
+			if section.Name() == "" || section.Name() == "DEFAULT" || section.Name() == "common" {
+				trKey = key.Name()
+			} else {
+				trKey = section.Name() + "." + key.Name()
+			}
+			if err := onMsgid(trKey, key.Value()); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func iterateMessagesNextInner(onMsgid func(string, string, string) error, data map[string]any, trKey string) error {
+	for key, value := range data {
+		fullKey := key
+		if trKey != "" {
+			fullKey = trKey + "." + key
+		}
+		switch value := value.(type) {
+		case string:
+			// Check whether we are adding a plural form to the parent object, or a new nested JSON object.
+			realKey := trKey
+			pluralSuffix := ""
+
+			switch key {
+			case "zero", "one", "two", "few", "many":
+				pluralSuffix = key
+			case "other":
+				// do nothing
+			default:
+				realKey = fullKey
+			}
+
+			if err := onMsgid(realKey, pluralSuffix, value); err != nil {
+				return err
+			}
+
+		case map[string]any:
+			if err := iterateMessagesNextInner(onMsgid, value, fullKey); err != nil {
+				return err
+			}
+
+		case nil:
+			// do nothing
+
+		default:
+			return fmt.Errorf("Unexpected JSON type: %s - %T", fullKey, value)
+		}
+	}
+
+	return nil
+}
+
+func IterateMessagesNextContent(localeContent []byte, onMsgid func(string, string, string) error) error {
+	var localeData map[string]any
+	if err := json.Unmarshal(localeContent, &localeData); err != nil {
+		return err
+	}
+	return iterateMessagesNextInner(onMsgid, localeData, "")
+}
diff --git a/modules/translation/mock.go b/modules/translation/mock.go
index 72a15b7438..fc1c6a83fd 100644
--- a/modules/translation/mock.go
+++ b/modules/translation/mock.go
@@ -6,11 +6,15 @@ package translation
 import (
 	"fmt"
 	"html/template"
+
+	"forgejo.org/modules/translation/i18n"
 )
 
-// MockLocale provides a mocked locale without any translations
+// MockLocale provides a mocked locale without any translations, other than those inserted into MockTranslations by a testcase
 type MockLocale struct {
 	Lang, LangName string // these fields are used directly in templates: ctx.Locale.Lang
+
+	MockTranslations map[string]string
 }
 
 var _ Locale = (*MockLocale)(nil)
@@ -20,11 +24,14 @@ func (l MockLocale) Language() string {
 }
 
 func (l MockLocale) TrString(s string, _ ...any) string {
+	if val, ok := l.MockTranslations[s]; ok {
+		return val
+	}
 	return s
 }
 
 func (l MockLocale) Tr(s string, a ...any) template.HTML {
-	return template.HTML(s)
+	return template.HTML(l.TrString(s))
 }
 
 func (l MockLocale) TrN(cnt any, key1, keyN string, args ...any) template.HTML {
@@ -35,6 +42,11 @@ func (l MockLocale) TrPluralString(count any, trKey string, trArgs ...any) templ
 	return template.HTML(trKey)
 }
 
+// TrPluralStringAllForms implements Locale.
+func (l MockLocale) TrPluralStringAllForms(trKey string) ([]string, []string) {
+	return []string{l.TrString(trKey + i18n.PluralFormSeparator + "one"), l.TrString(trKey + i18n.PluralFormSeparator + "other")}, nil
+}
+
 func (l MockLocale) TrSize(s int64) ReadableSize {
 	return ReadableSize{fmt.Sprint(s), ""}
 }
diff --git a/modules/translation/plural_rules.go b/modules/translation/plural_rules.go
index 7e9ae39111..587ee48850 100644
--- a/modules/translation/plural_rules.go
+++ b/modules/translation/plural_rules.go
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 // Some useful links:
+// https://codeberg.org/forgejo/forgejo/src/branch/forgejo/web_src/js/webcomponents/relative-time.js
 // https://www.unicode.org/cldr/charts/46/supplemental/language_plural_rules.html
 // https://translate.codeberg.org/languages/$LANGUAGE_CODE/#information
 // https://github.com/WeblateOrg/language-data/blob/main/languages.csv
@@ -16,7 +17,7 @@ import (
 	"forgejo.org/modules/translation/i18n"
 )
 
-// The constants refer to indices below in `PluralRules` and also in i18n.js, keep them in sync!
+// The constants refer to indices below in `PluralRules` and also in web_src/js/webcomponents/relative-time.js, keep them in sync!
 const (
 	PluralRuleDefault    = 0
 	PluralRuleBengali    = 1
@@ -251,3 +252,34 @@ var PluralRules = []i18n.PluralFormRule{
 		return i18n.PluralFormOther
 	},
 }
+
+var UsedPluralForms = [][]i18n.PluralFormIndex{
+	// [ 0] Common 2-form, e.g. English, German
+	{i18n.PluralFormOne, i18n.PluralFormOther},
+	// [ 1] Bengali
+	{i18n.PluralFormOne, i18n.PluralFormOther},
+	// [ 2] Icelandic
+	{i18n.PluralFormOne, i18n.PluralFormOther},
+	// [ 3] Filipino
+	{i18n.PluralFormOne, i18n.PluralFormOther},
+	// [ 4] OneForm
+	{i18n.PluralFormOther},
+	// [ 5] Czech
+	{i18n.PluralFormOne, i18n.PluralFormFew, i18n.PluralFormOther},
+	// [ 6] Russian
+	{i18n.PluralFormOne, i18n.PluralFormFew, i18n.PluralFormMany},
+	// [ 7] Polish
+	{i18n.PluralFormOne, i18n.PluralFormFew, i18n.PluralFormOther},
+	// [ 8] Latvian
+	{i18n.PluralFormZero, i18n.PluralFormOne, i18n.PluralFormOther},
+	// [ 9] Lithuanian
+	{i18n.PluralFormOne, i18n.PluralFormFew, i18n.PluralFormMany},
+	// [10] French
+	{i18n.PluralFormOne, i18n.PluralFormMany, i18n.PluralFormOther},
+	// [11] Catalan
+	{i18n.PluralFormOne, i18n.PluralFormMany, i18n.PluralFormOther},
+	// [12] Slovenian
+	{i18n.PluralFormOne, i18n.PluralFormTwo, i18n.PluralFormFew, i18n.PluralFormOther},
+	// [13] Arabic
+	{i18n.PluralFormZero, i18n.PluralFormOne, i18n.PluralFormTwo, i18n.PluralFormFew, i18n.PluralFormMany, i18n.PluralFormOther},
+}
diff --git a/modules/translation/translation.go b/modules/translation/translation.go
index 1b763764f1..17c7cc068b 100644
--- a/modules/translation/translation.go
+++ b/modules/translation/translation.go
@@ -27,6 +27,10 @@ type contextKey struct{}
 var ContextKey any = &contextKey{}
 
 // Locale represents an interface to translation
+//
+// If this gets modified, remember to also adjust
+// build/lint-locale-usage/lint-locale-usage.go's InitLocaleTrFunctions(),
+// which requires to know in what argument positions `trKey`'s are given.
 type Locale interface {
 	Language() string
 	TrString(string, ...any) string
@@ -42,6 +46,8 @@ type Locale interface {
 	HasKey(trKey string) bool
 
 	PrettyNumber(v any) string
+
+	TrPluralStringAllForms(trKey string) ([]string, []string)
 }
 
 // LangType represents a lang type
@@ -104,8 +110,9 @@ func InitLocales(ctx context.Context) {
 				}
 			}
 
+			pluralRuleIndex := GetPluralRuleImpl(setting.Langs[i])
 			key := "locale_" + setting.Langs[i] + ".ini"
-			if err = i18n.DefaultLocales.AddLocaleByIni(setting.Langs[i], setting.Names[i], PluralRules[GetPluralRuleImpl(setting.Langs[i])], localeDataBase, localeData[key]); err != nil {
+			if err = i18n.DefaultLocales.AddLocaleByIni(setting.Langs[i], setting.Names[i], PluralRules[pluralRuleIndex], UsedPluralForms[pluralRuleIndex], localeDataBase, localeData[key]); err != nil {
 				log.Error("Failed to set old-style messages to %s: %v", setting.Langs[i], err)
 			}
 
@@ -320,6 +327,14 @@ func (l *locale) PrettyNumber(v any) string {
 	return l.msgPrinter.Sprintf("%v", number.Decimal(v))
 }
 
+func GetPluralRule(l Locale) int {
+	return GetPluralRuleImpl(l.Language())
+}
+
+func GetDefaultPluralRule() int {
+	return GetPluralRuleImpl(i18n.DefaultLocales.GetDefaultLang())
+}
+
 func init() {
 	// prepare a default matcher, especially for tests
 	supportedTags = []language.Tag{language.English}
diff --git a/modules/translation/translation_test.go b/modules/translation/translation_test.go
index 356b85f946..7584490941 100644
--- a/modules/translation/translation_test.go
+++ b/modules/translation/translation_test.go
@@ -16,19 +16,19 @@ import (
 func TestTrSize(t *testing.T) {
 	l := NewLocale("")
 	size := int64(1)
-	assert.EqualValues(t, "1 munits.data.b", l.TrSize(size).String())
+	assert.Equal(t, "1 munits.data.b", l.TrSize(size).String())
 	size *= 2048
-	assert.EqualValues(t, "2 munits.data.kib", l.TrSize(size).String())
+	assert.Equal(t, "2 munits.data.kib", l.TrSize(size).String())
 	size *= 2048
-	assert.EqualValues(t, "4 munits.data.mib", l.TrSize(size).String())
+	assert.Equal(t, "4 munits.data.mib", l.TrSize(size).String())
 	size *= 2048
-	assert.EqualValues(t, "8 munits.data.gib", l.TrSize(size).String())
+	assert.Equal(t, "8 munits.data.gib", l.TrSize(size).String())
 	size *= 2048
-	assert.EqualValues(t, "16 munits.data.tib", l.TrSize(size).String())
+	assert.Equal(t, "16 munits.data.tib", l.TrSize(size).String())
 	size *= 2048
-	assert.EqualValues(t, "32 munits.data.pib", l.TrSize(size).String())
+	assert.Equal(t, "32 munits.data.pib", l.TrSize(size).String())
 	size *= 128
-	assert.EqualValues(t, "4 munits.data.eib", l.TrSize(size).String())
+	assert.Equal(t, "4 munits.data.eib", l.TrSize(size).String())
 }
 
 func TestPrettyNumber(t *testing.T) {
@@ -38,15 +38,15 @@ func TestPrettyNumber(t *testing.T) {
 	allLangMap["id-ID"] = &LangType{Lang: "id-ID", Name: "Bahasa Indonesia"}
 
 	l := NewLocale("id-ID")
-	assert.EqualValues(t, "1.000.000", l.PrettyNumber(1000000))
-	assert.EqualValues(t, "1.000.000,1", l.PrettyNumber(1000000.1))
-	assert.EqualValues(t, "1.000.000", l.PrettyNumber("1000000"))
-	assert.EqualValues(t, "1.000.000", l.PrettyNumber("1000000.0"))
-	assert.EqualValues(t, "1.000.000,1", l.PrettyNumber("1000000.1"))
+	assert.Equal(t, "1.000.000", l.PrettyNumber(1000000))
+	assert.Equal(t, "1.000.000,1", l.PrettyNumber(1000000.1))
+	assert.Equal(t, "1.000.000", l.PrettyNumber("1000000"))
+	assert.Equal(t, "1.000.000", l.PrettyNumber("1000000.0"))
+	assert.Equal(t, "1.000.000,1", l.PrettyNumber("1000000.1"))
 
 	l = NewLocale("nosuch")
-	assert.EqualValues(t, "1,000,000", l.PrettyNumber(1000000))
-	assert.EqualValues(t, "1,000,000.1", l.PrettyNumber(1000000.1))
+	assert.Equal(t, "1,000,000", l.PrettyNumber(1000000))
+	assert.Equal(t, "1,000,000.1", l.PrettyNumber(1000000.1))
 }
 
 func TestGetPluralRule(t *testing.T) {
diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go
index a8fc70e54c..8cb1513a88 100644
--- a/modules/typesniffer/typesniffer.go
+++ b/modules/typesniffer/typesniffer.go
@@ -24,6 +24,16 @@ const (
 	AvifMimeType = "image/avif"
 	// ApplicationOctetStream MIME type of binary files.
 	ApplicationOctetStream = "application/octet-stream"
+	// GLTFMimeType MIME type of GLTF files.
+	GLTFMimeType = "model/gltf+json"
+	// GLBMimeType MIME type of GLB files.
+	GLBMimeType = "model/gltf-binary"
+	// OBJMimeType MIME type of OBJ files.
+	OBJMimeType = "model/obj"
+	// STLMimeType MIME type of STL files.
+	STLMimeType = "model/stl"
+	// 3MFMimeType MIME type of 3MF files.
+	ThreeMFMimeType = "model/3mf"
 )
 
 var (
@@ -67,6 +77,36 @@ func (ct SniffedType) IsAudio() bool {
 	return strings.Contains(ct.contentType, "audio/")
 }
 
+// Is3DModel detects if data is a 3D format
+func (ct SniffedType) Is3DModel() bool {
+	return strings.Contains(ct.contentType, "model/")
+}
+
+// IsGLTFFile detects if data is an SVG image format
+func (ct SniffedType) IsGLTF() bool {
+	return strings.Contains(ct.contentType, GLTFMimeType)
+}
+
+// IsGLBFile detects if data is an GLB image format
+func (ct SniffedType) IsGLB() bool {
+	return strings.Contains(ct.contentType, GLBMimeType)
+}
+
+// IsOBJFile detects if data is an OBJ image format
+func (ct SniffedType) IsOBJ() bool {
+	return strings.Contains(ct.contentType, OBJMimeType)
+}
+
+// IsSTLTextFile detects if data is an STL text format
+func (ct SniffedType) IsSTL() bool {
+	return strings.Contains(ct.contentType, STLMimeType)
+}
+
+// Is3MFFile detects if data is an 3MF image format
+func (ct SniffedType) Is3MF() bool {
+	return strings.Contains(ct.contentType, ThreeMFMimeType)
+}
+
 // IsRepresentableAsText returns true if file content can be represented as
 // plain text or is empty.
 func (ct SniffedType) IsRepresentableAsText() bool {
@@ -75,7 +115,7 @@ func (ct SniffedType) IsRepresentableAsText() bool {
 
 // IsBrowsableBinaryType returns whether a non-text type can be displayed in a browser
 func (ct SniffedType) IsBrowsableBinaryType() bool {
-	return ct.IsImage() || ct.IsSvgImage() || ct.IsPDF() || ct.IsVideo() || ct.IsAudio()
+	return ct.IsImage() || ct.IsSvgImage() || ct.IsPDF() || ct.IsVideo() || ct.IsAudio() || ct.Is3DModel()
 }
 
 // GetMimeType returns the mime type
@@ -84,7 +124,7 @@ func (ct SniffedType) GetMimeType() string {
 }
 
 // DetectContentType extends http.DetectContentType with more content types. Defaults to text/unknown if input is empty.
-func DetectContentType(data []byte) SniffedType {
+func DetectContentType(data []byte, filename string) SniffedType {
 	if len(data) == 0 {
 		return SniffedType{"text/unknown"}
 	}
@@ -135,11 +175,25 @@ func DetectContentType(data []byte) SniffedType {
 			ct = "audio/ogg" // for most cases, it is used as an audio container
 		}
 	}
+
+	if ct == "application/octet-stream" &&
+		filename != "" &&
+		!strings.HasSuffix(strings.ToUpper(filename), ".LCOM") &&
+		bytes.Contains(data, []byte("(DEFINE-FILE-INFO ")) {
+		ct = "text/vnd.interlisp"
+	}
+
+	// GLTF is unsupported by http.DetectContentType
+	// hexdump -n 4 -C glTF.glb
+	if bytes.HasPrefix(data, []byte("glTF")) {
+		ct = GLBMimeType
+	}
+
 	return SniffedType{ct}
 }
 
 // DetectContentTypeFromReader guesses the content type contained in the reader.
-func DetectContentTypeFromReader(r io.Reader) (SniffedType, error) {
+func DetectContentTypeFromReader(r io.Reader, filename string) (SniffedType, error) {
 	buf := make([]byte, sniffLen)
 	n, err := util.ReadAtMost(r, buf)
 	if err != nil {
@@ -147,5 +201,5 @@ func DetectContentTypeFromReader(r io.Reader) (SniffedType, error) {
 	}
 	buf = buf[:n]
 
-	return DetectContentType(buf), nil
+	return DetectContentType(buf, filename), nil
 }
diff --git a/modules/typesniffer/typesniffer_test.go b/modules/typesniffer/typesniffer_test.go
index 8d80b4ddb4..d2b7ed4f21 100644
--- a/modules/typesniffer/typesniffer_test.go
+++ b/modules/typesniffer/typesniffer_test.go
@@ -16,63 +16,63 @@ import (
 
 func TestDetectContentTypeLongerThanSniffLen(t *testing.T) {
 	// Pre-condition: Shorter than sniffLen detects SVG.
-	assert.Equal(t, "image/svg+xml", DetectContentType([]byte(`<!-- Comment --><svg></svg>`)).contentType)
+	assert.Equal(t, "image/svg+xml", DetectContentType([]byte(`<!-- Comment --><svg></svg>`), "").contentType)
 	// Longer than sniffLen detects something else.
-	assert.NotEqual(t, "image/svg+xml", DetectContentType([]byte(`<!-- `+strings.Repeat("x", sniffLen)+` --><svg></svg>`)).contentType)
+	assert.NotEqual(t, "image/svg+xml", DetectContentType([]byte(`<!-- `+strings.Repeat("x", sniffLen)+` --><svg></svg>`), "").contentType)
 }
 
 func TestIsTextFile(t *testing.T) {
-	assert.True(t, DetectContentType([]byte{}).IsText())
-	assert.True(t, DetectContentType([]byte("lorem ipsum")).IsText())
+	assert.True(t, DetectContentType([]byte{}, "").IsText())
+	assert.True(t, DetectContentType([]byte("lorem ipsum"), "").IsText())
 }
 
 func TestIsSvgImage(t *testing.T) {
-	assert.True(t, DetectContentType([]byte("<svg></svg>")).IsSvgImage())
-	assert.True(t, DetectContentType([]byte("    <svg></svg>")).IsSvgImage())
-	assert.True(t, DetectContentType([]byte(`<svg width="100"></svg>`)).IsSvgImage())
-	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?><svg></svg>`)).IsSvgImage())
+	assert.True(t, DetectContentType([]byte("<svg></svg>"), "").IsSvgImage())
+	assert.True(t, DetectContentType([]byte("    <svg></svg>"), "").IsSvgImage())
+	assert.True(t, DetectContentType([]byte(`<svg width="100"></svg>`), "").IsSvgImage())
+	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?><svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<!-- Comment -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<!-- Multiple -->
 	<!-- Comments -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<!-- Multiline
 	Comment -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN"
 	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
 	<!-- Comment -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
 	<!-- Multiple -->
 	<!-- Comments -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
 	<!-- Multiline
 	Comment -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 	assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
 	<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 	<!-- Multiline
 	Comment -->
-	<svg></svg>`)).IsSvgImage())
+	<svg></svg>`), "").IsSvgImage())
 
 	// the DetectContentType should work for incomplete data, because only beginning bytes are used for detection
-	assert.True(t, DetectContentType([]byte(`<svg>....`)).IsSvgImage())
+	assert.True(t, DetectContentType([]byte(`<svg>....`), "").IsSvgImage())
 
-	assert.False(t, DetectContentType([]byte{}).IsSvgImage())
-	assert.False(t, DetectContentType([]byte("svg")).IsSvgImage())
-	assert.False(t, DetectContentType([]byte("<svgfoo></svgfoo>")).IsSvgImage())
-	assert.False(t, DetectContentType([]byte("text<svg></svg>")).IsSvgImage())
-	assert.False(t, DetectContentType([]byte("<html><body><svg></svg></body></html>")).IsSvgImage())
-	assert.False(t, DetectContentType([]byte(`<script>"<svg></svg>"</script>`)).IsSvgImage())
+	assert.False(t, DetectContentType([]byte{}, "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte("svg"), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte("<svgfoo></svgfoo>"), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte("text<svg></svg>"), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte("<html><body><svg></svg></body></html>"), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte(`<script>"<svg></svg>"</script>`), "").IsSvgImage())
 	assert.False(t, DetectContentType([]byte(`<!-- <svg></svg> inside comment -->
-	<foo></foo>`)).IsSvgImage())
+	<foo></foo>`), "").IsSvgImage())
 	assert.False(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
 	<!-- <svg></svg> inside comment -->
-	<foo></foo>`)).IsSvgImage())
+	<foo></foo>`), "").IsSvgImage())
 
 	assert.False(t, DetectContentType([]byte(`
 <!-- comment1 -->
@@ -80,7 +80,7 @@ func TestIsSvgImage(t *testing.T) {
 	<!-- comment2 -->
 	<svg></svg>
 </div>
-`)).IsSvgImage())
+`), "").IsSvgImage())
 
 	assert.False(t, DetectContentType([]byte(`
 <!-- comment1
@@ -90,48 +90,56 @@ func TestIsSvgImage(t *testing.T) {
 -->
 	<svg></svg>
 </div>
-`)).IsSvgImage())
-	assert.False(t, DetectContentType([]byte(`<html><body><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg></svg></body></html>`)).IsSvgImage())
-	assert.False(t, DetectContentType([]byte(`<html><body><?xml version="1.0" encoding="UTF-8"?><svg></svg></body></html>`)).IsSvgImage())
+`), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte(`<html><body><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg></svg></body></html>`), "").IsSvgImage())
+	assert.False(t, DetectContentType([]byte(`<html><body><?xml version="1.0" encoding="UTF-8"?><svg></svg></body></html>`), "").IsSvgImage())
 }
 
 func TestIsPDF(t *testing.T) {
 	pdf, _ := base64.StdEncoding.DecodeString("JVBERi0xLjYKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVhbQp4nF3NPwsCMQwF8D2f4s2CNYk1baF0EHRwOwg4iJt/NsFb/PpevUE4Mjwe")
-	assert.True(t, DetectContentType(pdf).IsPDF())
-	assert.False(t, DetectContentType([]byte("plain text")).IsPDF())
+	assert.True(t, DetectContentType(pdf, "").IsPDF())
+	assert.False(t, DetectContentType([]byte("plain text"), "").IsPDF())
 }
 
 func TestIsVideo(t *testing.T) {
 	mp4, _ := base64.StdEncoding.DecodeString("AAAAGGZ0eXBtcDQyAAAAAGlzb21tcDQyAAEI721vb3YAAABsbXZoZAAAAADaBlwX2gZcFwAAA+gA")
-	assert.True(t, DetectContentType(mp4).IsVideo())
-	assert.False(t, DetectContentType([]byte("plain text")).IsVideo())
+	assert.True(t, DetectContentType(mp4, "").IsVideo())
+	assert.False(t, DetectContentType([]byte("plain text"), "").IsVideo())
 }
 
 func TestIsAudio(t *testing.T) {
 	mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl")
-	assert.True(t, DetectContentType(mp3).IsAudio())
-	assert.False(t, DetectContentType([]byte("plain text")).IsAudio())
+	assert.True(t, DetectContentType(mp3, "").IsAudio())
+	assert.False(t, DetectContentType([]byte("plain text"), "").IsAudio())
 
-	assert.True(t, DetectContentType([]byte("ID3Toy\000")).IsAudio())
-	assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ...")).IsText())          // test ID3 tag for plain text
-	assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ..."+"🌛"[0:2])).IsText()) // test ID3 tag with incomplete UTF8 char
+	assert.True(t, DetectContentType([]byte("ID3Toy\000"), "").IsAudio())
+	assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ..."), "").IsText())          // test ID3 tag for plain text
+	assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ..."+"🌛"[0:2]), "").IsText()) // test ID3 tag with incomplete UTF8 char
+}
+
+func TestIsGLB(t *testing.T) {
+	glb, _ := hex.DecodeString("676c5446")
+	assert.True(t, DetectContentType(glb, "").IsGLB())
+	assert.True(t, DetectContentType(glb, "").Is3DModel())
+	assert.False(t, DetectContentType([]byte("plain text"), "").IsGLB())
+	assert.False(t, DetectContentType([]byte("plain text"), "").Is3DModel())
 }
 
 func TestDetectContentTypeFromReader(t *testing.T) {
 	mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl")
-	st, err := DetectContentTypeFromReader(bytes.NewReader(mp3))
+	st, err := DetectContentTypeFromReader(bytes.NewReader(mp3), "")
 	require.NoError(t, err)
 	assert.True(t, st.IsAudio())
 }
 
 func TestDetectContentTypeOgg(t *testing.T) {
 	oggAudio, _ := hex.DecodeString("4f67675300020000000000000000352f0000000000007dc39163011e01766f72626973000000000244ac0000000000000071020000000000b8014f6767530000")
-	st, err := DetectContentTypeFromReader(bytes.NewReader(oggAudio))
+	st, err := DetectContentTypeFromReader(bytes.NewReader(oggAudio), "")
 	require.NoError(t, err)
 	assert.True(t, st.IsAudio())
 
 	oggVideo, _ := hex.DecodeString("4f676753000200000000000000007d9747ef000000009b59daf3012a807468656f7261030201001e00110001e000010e00020000001e00000001000001000001")
-	st, err = DetectContentTypeFromReader(bytes.NewReader(oggVideo))
+	st, err = DetectContentTypeFromReader(bytes.NewReader(oggVideo), "")
 	require.NoError(t, err)
 	assert.True(t, st.IsVideo())
 }
@@ -140,8 +148,34 @@ func TestDetectContentTypeAvif(t *testing.T) {
 	avifImage, err := hex.DecodeString("000000206674797061766966")
 	require.NoError(t, err)
 
-	st, err := DetectContentTypeFromReader(bytes.NewReader(avifImage))
+	st, err := DetectContentTypeFromReader(bytes.NewReader(avifImage), "")
 	require.NoError(t, err)
 
 	assert.True(t, st.IsImage())
 }
+
+func TestDetectContentTypeModelGLB(t *testing.T) {
+	glb, err := hex.DecodeString("676c5446")
+	require.NoError(t, err)
+
+	st, err := DetectContentTypeFromReader(bytes.NewReader(glb), "")
+	require.NoError(t, err)
+
+	// print st for debugging
+	assert.Equal(t, "model/gltf-binary", st.GetMimeType())
+	assert.True(t, st.IsGLB())
+}
+
+func TestDetectInterlisp(t *testing.T) {
+	interlisp, err := base64.StdEncoding.DecodeString("ICAKKERFRklORS1GSUxFLUlORk8gHlBBQ0tBR0UgIklOVEVSTElTUCIgHlJFQURUQUJMRSAiSU5URVJMSVNQIiAeQkFTRSAxMCkKCgYB")
+	require.NoError(t, err)
+	st, err := DetectContentTypeFromReader(bytes.NewReader(interlisp), "test")
+	require.NoError(t, err)
+	assert.True(t, st.IsText())
+	st, err = DetectContentTypeFromReader(bytes.NewReader(interlisp), "")
+	require.NoError(t, err)
+	assert.False(t, st.IsText())
+	st, err = DetectContentTypeFromReader(bytes.NewReader(interlisp), "test.lcom")
+	require.NoError(t, err)
+	assert.False(t, st.IsText())
+}
diff --git a/modules/util/io.go b/modules/util/io.go
index 1559b019a0..4c99004c0c 100644
--- a/modules/util/io.go
+++ b/modules/util/io.go
@@ -4,7 +4,6 @@
 package util
 
 import (
-	"bytes"
 	"errors"
 	"io"
 )
@@ -20,42 +19,6 @@ func ReadAtMost(r io.Reader, buf []byte) (n int, err error) {
 	return n, err
 }
 
-// ReadWithLimit reads at most "limit" bytes from r into buf.
-// If EOF or ErrUnexpectedEOF occurs while reading, err will be nil.
-func ReadWithLimit(r io.Reader, n int) (buf []byte, err error) {
-	return readWithLimit(r, 1024, n)
-}
-
-func readWithLimit(r io.Reader, batch, limit int) ([]byte, error) {
-	if limit <= batch {
-		buf := make([]byte, limit)
-		n, err := ReadAtMost(r, buf)
-		if err != nil {
-			return nil, err
-		}
-		return buf[:n], nil
-	}
-	res := bytes.NewBuffer(make([]byte, 0, batch))
-	bufFix := make([]byte, batch)
-	eof := false
-	for res.Len() < limit && !eof {
-		bufTmp := bufFix
-		if res.Len()+batch > limit {
-			bufTmp = bufFix[:limit-res.Len()]
-		}
-		n, err := io.ReadFull(r, bufTmp)
-		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			eof = true
-		} else if err != nil {
-			return nil, err
-		}
-		if _, err = res.Write(bufTmp[:n]); err != nil {
-			return nil, err
-		}
-	}
-	return res.Bytes(), nil
-}
-
 // ErrNotEmpty is an error reported when there is a non-empty reader
 var ErrNotEmpty = errors.New("not-empty")
 
diff --git a/modules/util/io_test.go b/modules/util/io_test.go
deleted file mode 100644
index 870e713646..0000000000
--- a/modules/util/io_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package util
-
-import (
-	"bytes"
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-type readerWithError struct {
-	buf *bytes.Buffer
-}
-
-func (r *readerWithError) Read(p []byte) (n int, err error) {
-	if r.buf.Len() < 2 {
-		return 0, errors.New("test error")
-	}
-	return r.buf.Read(p)
-}
-
-func TestReadWithLimit(t *testing.T) {
-	bs := []byte("0123456789abcdef")
-
-	// normal test
-	buf, err := readWithLimit(bytes.NewBuffer(bs), 5, 2)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("01"), buf)
-
-	buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 5)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("01234"), buf)
-
-	buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 6)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("012345"), buf)
-
-	buf, err = readWithLimit(bytes.NewBuffer(bs), 5, len(bs))
-	require.NoError(t, err)
-	assert.Equal(t, []byte("0123456789abcdef"), buf)
-
-	buf, err = readWithLimit(bytes.NewBuffer(bs), 5, 100)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("0123456789abcdef"), buf)
-
-	// test with error
-	buf, err = readWithLimit(&readerWithError{bytes.NewBuffer(bs)}, 5, 10)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("0123456789"), buf)
-
-	buf, err = readWithLimit(&readerWithError{bytes.NewBuffer(bs)}, 5, 100)
-	require.ErrorContains(t, err, "test error")
-	assert.Empty(t, buf)
-
-	// test public function
-	buf, err = ReadWithLimit(bytes.NewBuffer(bs), 2)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("01"), buf)
-
-	buf, err = ReadWithLimit(bytes.NewBuffer(bs), 9999999)
-	require.NoError(t, err)
-	assert.Equal(t, []byte("0123456789abcdef"), buf)
-}
diff --git a/modules/util/paginate_test.go b/modules/util/paginate_test.go
index 6e69dd19cc..3dc5095071 100644
--- a/modules/util/paginate_test.go
+++ b/modules/util/paginate_test.go
@@ -13,23 +13,23 @@ func TestPaginateSlice(t *testing.T) {
 	stringSlice := []string{"a", "b", "c", "d", "e"}
 	result, ok := PaginateSlice(stringSlice, 1, 2).([]string)
 	assert.True(t, ok)
-	assert.EqualValues(t, []string{"a", "b"}, result)
+	assert.Equal(t, []string{"a", "b"}, result)
 
 	result, ok = PaginateSlice(stringSlice, 100, 2).([]string)
 	assert.True(t, ok)
-	assert.EqualValues(t, []string{}, result)
+	assert.Equal(t, []string{}, result)
 
 	result, ok = PaginateSlice(stringSlice, 3, 2).([]string)
 	assert.True(t, ok)
-	assert.EqualValues(t, []string{"e"}, result)
+	assert.Equal(t, []string{"e"}, result)
 
 	result, ok = PaginateSlice(stringSlice, 1, 0).([]string)
 	assert.True(t, ok)
-	assert.EqualValues(t, []string{"a", "b", "c", "d", "e"}, result)
+	assert.Equal(t, []string{"a", "b", "c", "d", "e"}, result)
 
 	result, ok = PaginateSlice(stringSlice, 1, -1).([]string)
 	assert.True(t, ok)
-	assert.EqualValues(t, []string{"a", "b", "c", "d", "e"}, result)
+	assert.Equal(t, []string{"a", "b", "c", "d", "e"}, result)
 
 	type Test struct {
 		Val int
@@ -38,9 +38,9 @@ func TestPaginateSlice(t *testing.T) {
 	testVar := []*Test{{Val: 2}, {Val: 3}, {Val: 4}}
 	testVar, ok = PaginateSlice(testVar, 1, 50).([]*Test)
 	assert.True(t, ok)
-	assert.EqualValues(t, []*Test{{Val: 2}, {Val: 3}, {Val: 4}}, testVar)
+	assert.Equal(t, []*Test{{Val: 2}, {Val: 3}, {Val: 4}}, testVar)
 
 	testVar, ok = PaginateSlice(testVar, 2, 2).([]*Test)
 	assert.True(t, ok)
-	assert.EqualValues(t, []*Test{{Val: 4}}, testVar)
+	assert.Equal(t, []*Test{{Val: 4}}, testVar)
 }
diff --git a/modules/util/path.go b/modules/util/path.go
index 9039f27cbf..3ef3925c49 100644
--- a/modules/util/path.go
+++ b/modules/util/path.go
@@ -34,9 +34,10 @@ func PathJoinRel(elem ...string) string {
 		elems[i] = path.Clean("/" + e)
 	}
 	p := path.Join(elems...)
-	if p == "" {
+	switch p {
+	case "":
 		return ""
-	} else if p == "/" {
+	case "/":
 		return "."
 	}
 	return p[1:]
diff --git a/modules/util/string.go b/modules/util/string.go
index cf50f591c6..ca3d43ec6e 100644
--- a/modules/util/string.go
+++ b/modules/util/string.go
@@ -95,3 +95,25 @@ func UnsafeBytesToString(b []byte) string {
 func UnsafeStringToBytes(s string) []byte {
 	return unsafe.Slice(unsafe.StringData(s), len(s))
 }
+
+// AsciiEqualFold is taken from Golang, but reimplemented here, since the original is not exposed to public
+// Taken from: https://cs.opensource.google/go/go/+/refs/tags/go1.24.4:src/net/http/internal/ascii/print.go
+func ASCIIEqualFold(s, t string) bool {
+	if len(s) != len(t) {
+		return false
+	}
+	for i := 0; i < len(s); i++ {
+		if ASCIILower(s[i]) != ASCIILower(t[i]) {
+			return false
+		}
+	}
+	return true
+}
+
+// AsciiLower returns the ASCII lowercase version of b.
+func ASCIILower(b byte) byte {
+	if 'A' <= b && b <= 'Z' {
+		return b + ('a' - 'A')
+	}
+	return b
+}
diff --git a/modules/util/string_test.go b/modules/util/string_test.go
index 0a4a8bbcfb..1012ab32a4 100644
--- a/modules/util/string_test.go
+++ b/modules/util/string_test.go
@@ -45,3 +45,29 @@ func TestToSnakeCase(t *testing.T) {
 		assert.Equal(t, expected, ToSnakeCase(input))
 	}
 }
+
+func TestASCIIEqualFold(t *testing.T) {
+	cases := map[string]struct {
+		First    string
+		Second   string
+		Expected bool
+	}{
+		"Empty String":          {First: "", Second: "", Expected: true},
+		"Single Letter Ident":   {First: "h", Second: "h", Expected: true},
+		"Single Letter Equal":   {First: "h", Second: "H", Expected: true},
+		"Single Letter Unequal": {First: "h", Second: "g", Expected: false},
+		"Simple Match Ident":    {First: "someString", Second: "someString", Expected: true},
+		"Simple Match Equal":    {First: "someString", Second: "someSTRIng", Expected: true},
+		"Simple Match Unequal":  {First: "someString", Second: "sameString", Expected: false},
+		"Different Length":      {First: "abcdef", Second: "abcdefg", Expected: false},
+		"Unicode Kelvin":        {First: "ghijklm", Second: "GHIJ\u212ALM", Expected: false},
+	}
+
+	for name := range cases {
+		c := cases[name]
+		t.Run(name, func(t *testing.T) {
+			Actual := ASCIIEqualFold(c.First, c.Second)
+			assert.Equal(t, c.Expected, Actual)
+		})
+	}
+}
diff --git a/modules/util/truncate.go b/modules/util/truncate.go
index f2edbdc673..7207a89177 100644
--- a/modules/util/truncate.go
+++ b/modules/util/truncate.go
@@ -54,3 +54,12 @@ func SplitTrimSpace(input, sep string) []string {
 
 	return stringList
 }
+
+// TruncateRunes returns a truncated string with given rune limit,
+// it returns input string if its rune length doesn't exceed the limit.
+func TruncateRunes(str string, limit int) string {
+	if utf8.RuneCountInString(str) < limit {
+		return str
+	}
+	return string([]rune(str)[:limit])
+}
diff --git a/modules/util/truncate_test.go b/modules/util/truncate_test.go
index dfe1230fd4..8187b13eb2 100644
--- a/modules/util/truncate_test.go
+++ b/modules/util/truncate_test.go
@@ -44,3 +44,18 @@ func TestSplitString(t *testing.T) {
 	}
 	test(tc, SplitStringAtByteN)
 }
+
+func TestTruncateRunes(t *testing.T) {
+	assert.Empty(t, TruncateRunes("", 0))
+	assert.Empty(t, TruncateRunes("", 1))
+
+	assert.Empty(t, TruncateRunes("ab", 0))
+	assert.Equal(t, "a", TruncateRunes("ab", 1))
+	assert.Equal(t, "ab", TruncateRunes("ab", 2))
+	assert.Equal(t, "ab", TruncateRunes("ab", 3))
+
+	assert.Empty(t, TruncateRunes("测试", 0))
+	assert.Equal(t, "测", TruncateRunes("测试", 1))
+	assert.Equal(t, "测试", TruncateRunes("测试", 2))
+	assert.Equal(t, "测试", TruncateRunes("测试", 3))
+}
diff --git a/modules/util/util.go b/modules/util/util.go
index da405c9c4b..548fd1e90b 100644
--- a/modules/util/util.go
+++ b/modules/util/util.go
@@ -14,22 +14,11 @@ import (
 	"strconv"
 	"strings"
 
-	"forgejo.org/modules/optional"
-
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
 
-// OptionalBoolParse get the corresponding optional.Option[bool] of a string using strconv.ParseBool
-func OptionalBoolParse(s string) optional.Option[bool] {
-	v, e := strconv.ParseBool(s)
-	if e != nil {
-		return optional.None[bool]()
-	}
-	return optional.Some(v)
-}
-
 // IsEmptyString checks if the provided string is empty
 func IsEmptyString(s string) bool {
 	return len(strings.TrimSpace(s)) == 0
@@ -99,10 +88,16 @@ func CryptoRandomString(length int64) (string, error) {
 // CryptoRandomBytes generates `length` crypto bytes
 // This differs from CryptoRandomString, as each byte in CryptoRandomString is generated by [0,61] range
 // This function generates totally random bytes, each byte is generated by [0,255] range
-func CryptoRandomBytes(length int64) ([]byte, error) {
+func CryptoRandomBytes(length int64) []byte {
+	// crypto/rand.Read is documented to never return a error.
+	// https://go.dev/issue/66821
 	buf := make([]byte, length)
-	_, err := rand.Read(buf)
-	return buf, err
+	n, err := rand.Read(buf)
+	if err != nil || n != int(length) {
+		panic(err)
+	}
+
+	return buf
 }
 
 // ToUpperASCII returns s with all ASCII letters mapped to their upper case.
diff --git a/modules/util/util_test.go b/modules/util/util_test.go
index 5e0c4a9a0b..21988fd0f8 100644
--- a/modules/util/util_test.go
+++ b/modules/util/util_test.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"testing"
 
-	"forgejo.org/modules/optional"
 	"forgejo.org/modules/test"
 	"forgejo.org/modules/util"
 
@@ -164,36 +163,21 @@ func Test_RandomString(t *testing.T) {
 }
 
 func Test_RandomBytes(t *testing.T) {
-	bytes1, err := util.CryptoRandomBytes(32)
-	require.NoError(t, err)
-
-	bytes2, err := util.CryptoRandomBytes(32)
-	require.NoError(t, err)
+	bytes1 := util.CryptoRandomBytes(32)
+	bytes2 := util.CryptoRandomBytes(32)
 
+	assert.Len(t, bytes1, 32)
+	assert.Len(t, bytes2, 32)
 	assert.NotEqual(t, bytes1, bytes2)
 
-	bytes3, err := util.CryptoRandomBytes(256)
-	require.NoError(t, err)
-
-	bytes4, err := util.CryptoRandomBytes(256)
-	require.NoError(t, err)
+	bytes3 := util.CryptoRandomBytes(256)
+	bytes4 := util.CryptoRandomBytes(256)
 
+	assert.Len(t, bytes3, 256)
+	assert.Len(t, bytes4, 256)
 	assert.NotEqual(t, bytes3, bytes4)
 }
 
-func TestOptionalBoolParse(t *testing.T) {
-	assert.Equal(t, optional.None[bool](), util.OptionalBoolParse(""))
-	assert.Equal(t, optional.None[bool](), util.OptionalBoolParse("x"))
-
-	assert.Equal(t, optional.Some(false), util.OptionalBoolParse("0"))
-	assert.Equal(t, optional.Some(false), util.OptionalBoolParse("f"))
-	assert.Equal(t, optional.Some(false), util.OptionalBoolParse("False"))
-
-	assert.Equal(t, optional.Some(true), util.OptionalBoolParse("1"))
-	assert.Equal(t, optional.Some(true), util.OptionalBoolParse("t"))
-	assert.Equal(t, optional.Some(true), util.OptionalBoolParse("True"))
-}
-
 // Test case for any function which accepts and returns a single string.
 type StringTest struct {
 	in, out string
@@ -272,8 +256,8 @@ func TestGeneratingEd25519Keypair(t *testing.T) {
 
 	publicKey, privateKey, err := util.GenerateSSHKeypair()
 	require.NoError(t, err)
-	assert.EqualValues(t, testPublicKey, string(publicKey))
-	assert.EqualValues(t, testPrivateKey, string(privateKey))
+	assert.Equal(t, testPublicKey, string(publicKey))
+	assert.Equal(t, testPrivateKey, string(privateKey))
 }
 
 func TestOptionalArg(t *testing.T) {
diff --git a/modules/validation/email.go b/modules/validation/email.go
index fb563c2b81..8e1ffc203d 100644
--- a/modules/validation/email.go
+++ b/modules/validation/email.go
@@ -8,7 +8,6 @@ package validation
 import (
 	"fmt"
 	"net/mail"
-	"regexp"
 	"strings"
 
 	"forgejo.org/modules/setting"
@@ -20,21 +19,6 @@ import (
 // ErrEmailNotActivated e-mail address has not been activated error
 var ErrEmailNotActivated = util.NewInvalidArgumentErrorf("e-mail address has not been activated")
 
-// ErrEmailCharIsNotSupported e-mail address contains unsupported character
-type ErrEmailCharIsNotSupported struct {
-	Email string
-}
-
-// IsErrEmailCharIsNotSupported checks if an error is an ErrEmailCharIsNotSupported
-func IsErrEmailCharIsNotSupported(err error) bool {
-	_, ok := err.(ErrEmailCharIsNotSupported)
-	return ok
-}
-
-func (err ErrEmailCharIsNotSupported) Error() string {
-	return fmt.Sprintf("e-mail address contains unsupported character [email: %s]", err.Email)
-}
-
 // ErrEmailInvalid represents an error where the email address does not comply with RFC 5322
 // or has a leading '-' character
 type ErrEmailInvalid struct {
@@ -55,8 +39,6 @@ func (err ErrEmailInvalid) Unwrap() error {
 	return util.ErrInvalidArgument
 }
 
-var emailRegexp = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]*@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")
-
 // check if email is a valid address with allowed domain
 func ValidateEmail(email string) error {
 	if err := validateEmailBasic(email); err != nil {
@@ -77,15 +59,12 @@ func validateEmailBasic(email string) error {
 		return ErrEmailInvalid{email}
 	}
 
-	if !emailRegexp.MatchString(email) {
-		return ErrEmailCharIsNotSupported{email}
-	}
-
-	if email[0] == '-' {
+	parsedAddress, err := mail.ParseAddress(email)
+	if err != nil {
 		return ErrEmailInvalid{email}
 	}
 
-	if _, err := mail.ParseAddress(email); err != nil {
+	if parsedAddress.Name != "" {
 		return ErrEmailInvalid{email}
 	}
 
diff --git a/modules/validation/email_test.go b/modules/validation/email_test.go
index ffdc6fd4ee..b7ee766ddb 100644
--- a/modules/validation/email_test.go
+++ b/modules/validation/email_test.go
@@ -35,7 +35,7 @@ func TestEmailAddressValidate(t *testing.T) {
 		`first|last@iana.org`:            nil,
 		`first}last@iana.org`:            nil,
 		`first~last@iana.org`:            nil,
-		`first;last@iana.org`:            ErrEmailCharIsNotSupported{`first;last@iana.org`},
+		`first;last@iana.org`:            ErrEmailInvalid{`first;last@iana.org`},
 		".233@qq.com":                    ErrEmailInvalid{".233@qq.com"},
 		"!233@qq.com":                    nil,
 		"#233@qq.com":                    nil,
@@ -45,7 +45,7 @@ func TestEmailAddressValidate(t *testing.T) {
 		"'233@qq.com":                    nil,
 		"*233@qq.com":                    nil,
 		"+233@qq.com":                    nil,
-		"-233@qq.com":                    ErrEmailInvalid{"-233@qq.com"},
+		"-233@qq.com":                    nil,
 		"/233@qq.com":                    nil,
 		"=233@qq.com":                    nil,
 		"?233@qq.com":                    nil,
@@ -56,13 +56,14 @@ func TestEmailAddressValidate(t *testing.T) {
 		"|233@qq.com":                    nil,
 		"}233@qq.com":                    nil,
 		"~233@qq.com":                    nil,
-		";233@qq.com":                    ErrEmailCharIsNotSupported{";233@qq.com"},
-		"Foo <foo@bar.com>":              ErrEmailCharIsNotSupported{"Foo <foo@bar.com>"},
-		string([]byte{0xE2, 0x84, 0xAA}): ErrEmailCharIsNotSupported{string([]byte{0xE2, 0x84, 0xAA})},
+		"\"~@ \"@famfo.xyz":              nil,
+		"Foo <foo@bar.com>":              ErrEmailInvalid{"Foo <foo@bar.com>"},
+		";233@qq.com":                    ErrEmailInvalid{";233@qq.com"},
+		string([]byte{0xE2, 0x84, 0xAA}): ErrEmailInvalid{string([]byte{0xE2, 0x84, 0xAA})},
 	}
 	for kase, err := range kases {
 		t.Run(kase, func(t *testing.T) {
-			assert.EqualValues(t, err, ValidateEmail(kase))
+			assert.Equal(t, err, ValidateEmail(kase))
 		})
 	}
 }
diff --git a/modules/validation/helpers.go b/modules/validation/helpers.go
index 1f573564e6..4b28dead03 100644
--- a/modules/validation/helpers.go
+++ b/modules/validation/helpers.go
@@ -75,6 +75,11 @@ func IsValidExternalURL(uri string) bool {
 	return true
 }
 
+// IsValidReleaseAssetURL checks if the URL is valid for external release assets
+func IsValidReleaseAssetURL(uri string) bool {
+	return IsValidURL(uri)
+}
+
 // IsValidExternalTrackerURLFormat checks if URL matches required syntax for external trackers
 func IsValidExternalTrackerURLFormat(uri string) bool {
 	if !IsValidExternalURL(uri) {
diff --git a/modules/validation/helpers_test.go b/modules/validation/helpers_test.go
index 01a17f0d6b..7e32184691 100644
--- a/modules/validation/helpers_test.go
+++ b/modules/validation/helpers_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -47,7 +48,7 @@ func Test_IsValidURL(t *testing.T) {
 }
 
 func Test_IsValidExternalURL(t *testing.T) {
-	setting.AppURL = "https://try.gitea.io/"
+	defer test.MockVariableValue(&setting.AppURL, "https://code.forgejo.org/")()
 
 	cases := []struct {
 		description string
@@ -56,7 +57,7 @@ func Test_IsValidExternalURL(t *testing.T) {
 	}{
 		{
 			description: "Current instance URL",
-			url:         "https://try.gitea.io/test",
+			url:         "https://code.forgejo.org/test",
 			valid:       true,
 		},
 		{
@@ -66,7 +67,7 @@ func Test_IsValidExternalURL(t *testing.T) {
 		},
 		{
 			description: "Current instance API URL",
-			url:         "https://try.gitea.io/api/v1/user/follow",
+			url:         "https://code.forgejo.org/api/v1/user/follow",
 			valid:       false,
 		},
 		{
@@ -89,7 +90,7 @@ func Test_IsValidExternalURL(t *testing.T) {
 }
 
 func Test_IsValidExternalTrackerURLFormat(t *testing.T) {
-	setting.AppURL = "https://try.gitea.io/"
+	defer test.MockVariableValue(&setting.AppURL, "https://code.forgejo.org/")()
 
 	cases := []struct {
 		description string
@@ -156,7 +157,8 @@ func Test_IsValidExternalTrackerURLFormat(t *testing.T) {
 }
 
 func TestIsValidUsernameAllowDots(t *testing.T) {
-	setting.Service.AllowDotsInUsernames = true
+	defer test.MockVariableValue(&setting.Service.AllowDotsInUsernames, true)()
+
 	tests := []struct {
 		arg  string
 		want bool
@@ -188,10 +190,7 @@ func TestIsValidUsernameAllowDots(t *testing.T) {
 }
 
 func TestIsValidUsernameBanDots(t *testing.T) {
-	setting.Service.AllowDotsInUsernames = false
-	defer func() {
-		setting.Service.AllowDotsInUsernames = true
-	}()
+	defer test.MockVariableValue(&setting.Service.AllowDotsInUsernames, false)()
 
 	tests := []struct {
 		arg  string
diff --git a/modules/validation/validatable.go b/modules/validation/validatable.go
index bc565bd194..7bcca03bf8 100644
--- a/modules/validation/validatable.go
+++ b/modules/validation/validatable.go
@@ -1,5 +1,4 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
-// Copyright 2023 The Forgejo Authors. All rights reserved.
+// Copyright 2023, 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package validation
@@ -11,6 +10,8 @@ import (
 	"unicode/utf8"
 
 	"forgejo.org/modules/timeutil"
+
+	ap "github.com/go-ap/activitypub"
 )
 
 // ErrNotValid represents an validation error
@@ -33,15 +34,22 @@ type Validateable interface {
 }
 
 func IsValid(v Validateable) (bool, error) {
-	if err := v.Validate(); len(err) > 0 {
+	if valdationErrors := v.Validate(); len(valdationErrors) > 0 {
 		typeof := reflect.TypeOf(v)
-		errString := strings.Join(err, "\n")
+		errString := strings.Join(valdationErrors, "\n")
 		return false, ErrNotValid{fmt.Sprint(typeof, ": ", errString)}
 	}
 
 	return true, nil
 }
 
+func ValidateIDExists(value ap.Item, name string) []string {
+	if value == nil {
+		return []string{fmt.Sprintf("Field %v must not be nil", name)}
+	}
+	return ValidateNotEmpty(value.GetID().String(), name)
+}
+
 func ValidateNotEmpty(value any, name string) []string {
 	isValid := true
 	switch v := value.(type) {
@@ -53,6 +61,10 @@ func ValidateNotEmpty(value any, name string) []string {
 		if v.IsZero() {
 			isValid = false
 		}
+	case uint16:
+		if v == 0 {
+			isValid = false
+		}
 	case int64:
 		if v == 0 {
 			isValid = false
@@ -64,12 +76,12 @@ func ValidateNotEmpty(value any, name string) []string {
 	if isValid {
 		return []string{}
 	}
-	return []string{fmt.Sprintf("%v should not be empty", name)}
+	return []string{fmt.Sprintf("Value %v should not be empty", name)}
 }
 
 func ValidateMaxLen(value string, maxLen int, name string) []string {
 	if utf8.RuneCountInString(value) > maxLen {
-		return []string{fmt.Sprintf("Value %v was longer than %v", name, maxLen)}
+		return []string{fmt.Sprintf("Value %v is longer than expected length %v", name, maxLen)}
 	}
 	return []string{}
 }
@@ -80,5 +92,5 @@ func ValidateOneOf(value any, allowed []any, name string) []string {
 			return []string{}
 		}
 	}
-	return []string{fmt.Sprintf("Value %v is not contained in allowed values %v", value, allowed)}
+	return []string{fmt.Sprintf("Field %s contains the value %v, which is not in allowed subset %v", name, value, allowed)}
 }
diff --git a/modules/validation/validatable_test.go b/modules/validation/validatable_test.go
index 0802d5cc92..1fe407b343 100644
--- a/modules/validation/validatable_test.go
+++ b/modules/validation/validatable_test.go
@@ -1,4 +1,4 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package validation
@@ -7,6 +7,9 @@ import (
 	"testing"
 
 	"forgejo.org/modules/timeutil"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/stretchr/testify/assert"
 )
 
 type Sut struct {
@@ -37,33 +40,50 @@ func Test_IsValid(t *testing.T) {
 
 func Test_ValidateNotEmpty_ForString(t *testing.T) {
 	sut := ""
-	if len(ValidateNotEmpty(sut, "dummyField")) == 0 {
-		t.Errorf("sut should be invalid")
-	}
+	res := ValidateNotEmpty(sut, "dummyField")
+	assert.Len(t, res, 1)
+
 	sut = "not empty"
-	if res := ValidateNotEmpty(sut, "dummyField"); len(res) > 0 {
-		t.Errorf("sut should be valid but was %q", res)
-	}
+	res = ValidateNotEmpty(sut, "dummyField")
+	assert.Empty(t, res, 0)
 }
 
 func Test_ValidateNotEmpty_ForTimestamp(t *testing.T) {
 	sut := timeutil.TimeStamp(0)
-	if res := ValidateNotEmpty(sut, "dummyField"); len(res) == 0 {
-		t.Errorf("sut should be invalid")
-	}
+	res := ValidateNotEmpty(sut, "dummyField")
+	assert.Len(t, res, 1)
+
 	sut = timeutil.TimeStampNow()
-	if res := ValidateNotEmpty(sut, "dummyField"); len(res) > 0 {
-		t.Errorf("sut should be valid but was %q", res)
+	res = ValidateNotEmpty(sut, "dummyField")
+	assert.Empty(t, res, 0)
+}
+
+func Test_ValidateIDExists_ForItem(t *testing.T) {
+	sut := ap.Activity{
+		Object: nil,
 	}
+	res := ValidateIDExists(sut.Object, "dummyField")
+	assert.Len(t, res, 1)
+
+	sut = ap.Activity{
+		Object: ap.IRI(""),
+	}
+	res = ValidateIDExists(sut.Object, "dummyField")
+	assert.Len(t, res, 1)
+
+	sut = ap.Activity{
+		Object: ap.IRI("https://dummy.link/id"),
+	}
+	res = ValidateIDExists(sut.Object, "dummyField")
+	assert.Empty(t, res, 0)
 }
 
 func Test_ValidateMaxLen(t *testing.T) {
 	sut := "0123456789"
-	if len(ValidateMaxLen(sut, 9, "dummyField")) == 0 {
-		t.Errorf("sut should be invalid")
-	}
+	res := ValidateMaxLen(sut, 9, "dummyField")
+	assert.Len(t, res, 1)
+
 	sut = "0123456789"
-	if res := ValidateMaxLen(sut, 11, "dummyField"); len(res) > 0 {
-		t.Errorf("sut should be valid but was %q", res)
-	}
+	res = ValidateMaxLen(sut, 11, "dummyField")
+	assert.Empty(t, res, 0)
 }
diff --git a/modules/web/middleware/binding.go b/modules/web/middleware/binding.go
index 9083e9b485..123eb29015 100644
--- a/modules/web/middleware/binding.go
+++ b/modules/web/middleware/binding.go
@@ -79,6 +79,11 @@ func GetInclude(field reflect.StructField) string {
 	return getRuleBody(field, "Include(")
 }
 
+func GetRange(field reflect.StructField) (string, string) {
+	min, max, _ := strings.Cut(getRuleBody(field, "Range("), ",")
+	return min, max
+}
+
 // Validate populates the data with validation error (if any).
 func Validate(errs binding.Errors, data map[string]any, f any, l translation.Locale) binding.Errors {
 	if errs.Len() == 0 {
@@ -131,6 +136,9 @@ func Validate(errs binding.Errors, data map[string]any, f any, l translation.Loc
 				data["ErrorMsg"] = trName + l.TrString("form.url_error", errs[0].Message)
 			case binding.ERR_INCLUDE:
 				data["ErrorMsg"] = trName + l.TrString("form.include_error", GetInclude(field))
+			case binding.ERR_RANGE:
+				min, max := GetRange(field)
+				data["ErrorMsg"] = trName + l.TrString("alert.range_error", l.PrettyNumber(min), l.PrettyNumber(max))
 			case validation.ErrGlobPattern:
 				data["ErrorMsg"] = trName + l.TrString("form.glob_pattern_error", errs[0].Message)
 			case validation.ErrRegexPattern:
diff --git a/modules/web/route_test.go b/modules/web/route_test.go
index d8015d6e0d..44626ec141 100644
--- a/modules/web/route_test.go
+++ b/modules/web/route_test.go
@@ -23,17 +23,17 @@ func TestRoute1(t *testing.T) {
 	r := NewRoute()
 	r.Get("/{username}/{reponame}/{type:issues|pulls}", func(resp http.ResponseWriter, req *http.Request) {
 		username := chi.URLParam(req, "username")
-		assert.EqualValues(t, "gitea", username)
+		assert.Equal(t, "gitea", username)
 		reponame := chi.URLParam(req, "reponame")
-		assert.EqualValues(t, "gitea", reponame)
+		assert.Equal(t, "gitea", reponame)
 		tp := chi.URLParam(req, "type")
-		assert.EqualValues(t, "issues", tp)
+		assert.Equal(t, "issues", tp)
 	})
 
 	req, err := http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, http.StatusOK, recorder.Code)
 }
 
 func TestRoute2(t *testing.T) {
@@ -48,23 +48,23 @@ func TestRoute2(t *testing.T) {
 		r.Group("", func() {
 			r.Get("/{type:issues|pulls}", func(resp http.ResponseWriter, req *http.Request) {
 				username := chi.URLParam(req, "username")
-				assert.EqualValues(t, "gitea", username)
+				assert.Equal(t, "gitea", username)
 				reponame := chi.URLParam(req, "reponame")
-				assert.EqualValues(t, "gitea", reponame)
+				assert.Equal(t, "gitea", reponame)
 				tp := chi.URLParam(req, "type")
-				assert.EqualValues(t, "issues", tp)
+				assert.Equal(t, "issues", tp)
 				hit = 0
 			})
 
 			r.Get("/{type:issues|pulls}/{index}", func(resp http.ResponseWriter, req *http.Request) {
 				username := chi.URLParam(req, "username")
-				assert.EqualValues(t, "gitea", username)
+				assert.Equal(t, "gitea", username)
 				reponame := chi.URLParam(req, "reponame")
-				assert.EqualValues(t, "gitea", reponame)
+				assert.Equal(t, "gitea", reponame)
 				tp := chi.URLParam(req, "type")
-				assert.EqualValues(t, "issues", tp)
+				assert.Equal(t, "issues", tp)
 				index := chi.URLParam(req, "index")
-				assert.EqualValues(t, "1", index)
+				assert.Equal(t, "1", index)
 				hit = 1
 			})
 		}, func(resp http.ResponseWriter, req *http.Request) {
@@ -77,11 +77,11 @@ func TestRoute2(t *testing.T) {
 		r.Group("/issues/{index}", func() {
 			r.Get("/view", func(resp http.ResponseWriter, req *http.Request) {
 				username := chi.URLParam(req, "username")
-				assert.EqualValues(t, "gitea", username)
+				assert.Equal(t, "gitea", username)
 				reponame := chi.URLParam(req, "reponame")
-				assert.EqualValues(t, "gitea", reponame)
+				assert.Equal(t, "gitea", reponame)
 				index := chi.URLParam(req, "index")
-				assert.EqualValues(t, "1", index)
+				assert.Equal(t, "1", index)
 				hit = 2
 			})
 		})
@@ -90,26 +90,26 @@ func TestRoute2(t *testing.T) {
 	req, err := http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 0, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 0, hit)
 
 	req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 1, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 1, hit)
 
 	req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1?stop=100", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 100, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 100, hit)
 
 	req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1/view", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 2, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 2, hit)
 }
 
 func TestRoute3(t *testing.T) {
@@ -150,30 +150,30 @@ func TestRoute3(t *testing.T) {
 	req, err := http.NewRequest("GET", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 0, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 0, hit)
 
 	req, err = http.NewRequest("POST", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code, http.StatusOK)
-	assert.EqualValues(t, 1, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code, http.StatusOK)
+	assert.Equal(t, 1, hit)
 
 	req, err = http.NewRequest("GET", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 2, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 2, hit)
 
 	req, err = http.NewRequest("PATCH", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 3, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 3, hit)
 
 	req, err = http.NewRequest("DELETE", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
-	assert.EqualValues(t, http.StatusOK, recorder.Code)
-	assert.EqualValues(t, 4, hit)
+	assert.Equal(t, http.StatusOK, recorder.Code)
+	assert.Equal(t, 4, hit)
 }
diff --git a/modules/web/routemock_test.go b/modules/web/routemock_test.go
index 43d4b28830..46f0296046 100644
--- a/modules/web/routemock_test.go
+++ b/modules/web/routemock_test.go
@@ -35,9 +35,9 @@ func TestRouteMock(t *testing.T) {
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
 	assert.Len(t, recorder.Header(), 3)
-	assert.EqualValues(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
-	assert.EqualValues(t, "m2", recorder.Header().Get("X-Test-Middleware2"))
-	assert.EqualValues(t, "h", recorder.Header().Get("X-Test-Handler"))
+	assert.Equal(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
+	assert.Equal(t, "m2", recorder.Header().Get("X-Test-Middleware2"))
+	assert.Equal(t, "h", recorder.Header().Get("X-Test-Handler"))
 	RouteMockReset()
 
 	// mock at "mock-point"
@@ -50,8 +50,8 @@ func TestRouteMock(t *testing.T) {
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
 	assert.Len(t, recorder.Header(), 2)
-	assert.EqualValues(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
-	assert.EqualValues(t, "a", recorder.Header().Get("X-Test-MockPoint"))
+	assert.Equal(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
+	assert.Equal(t, "a", recorder.Header().Get("X-Test-MockPoint"))
 	RouteMockReset()
 
 	// mock at MockAfterMiddlewares
@@ -64,8 +64,8 @@ func TestRouteMock(t *testing.T) {
 	require.NoError(t, err)
 	r.ServeHTTP(recorder, req)
 	assert.Len(t, recorder.Header(), 3)
-	assert.EqualValues(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
-	assert.EqualValues(t, "m2", recorder.Header().Get("X-Test-Middleware2"))
-	assert.EqualValues(t, "b", recorder.Header().Get("X-Test-MockPoint"))
+	assert.Equal(t, "m1", recorder.Header().Get("X-Test-Middleware1"))
+	assert.Equal(t, "m2", recorder.Header().Get("X-Test-Middleware2"))
+	assert.Equal(t, "b", recorder.Header().Get("X-Test-MockPoint"))
 	RouteMockReset()
 }
diff --git a/modules/web/routing/logger.go b/modules/web/routing/logger.go
index 760e092914..8fd24c9733 100644
--- a/modules/web/routing/logger.go
+++ b/modules/web/routing/logger.go
@@ -90,7 +90,7 @@ func logPrinter(logger log.Logger) func(trigger Event, record *requestRecord) {
 			status = v.WrittenStatus()
 		}
 		logf := logger.Info
-		if strings.HasPrefix(req.RequestURI, "/assets/") {
+		if strings.HasPrefix(req.RequestURI, "/assets/") || req.RequestURI == "/api/actions/runner.v1.RunnerService/FetchTask" || req.RequestURI == "/api/actions/runner.v1.RunnerService/UpdateLog" {
 			logf = logger.Trace
 		}
 		message := completedMessage
diff --git a/modules/webhook/structs.go b/modules/webhook/structs.go
index 927a91a74c..6c0161bfc2 100644
--- a/modules/webhook/structs.go
+++ b/modules/webhook/structs.go
@@ -4,6 +4,7 @@
 package webhook
 
 // HookEvents is a set of web hook events
+// update TestCreateWebhook in models/webhook/webhook_test.go when adding or changing values here
 type HookEvents struct {
 	Create                   bool `json:"create"`
 	Delete                   bool `json:"delete"`
@@ -26,9 +27,12 @@ type HookEvents struct {
 	Repository               bool `json:"repository"`
 	Release                  bool `json:"release"`
 	Package                  bool `json:"package"`
+	ActionRunFailure         bool `json:"action_run_failure"`
+	ActionRunRecover         bool `json:"action_run_recover"`
+	ActionRunSuccess         bool `json:"action_run_success"`
 }
 
-// HookEvent represents events that will delivery hook.
+// HookEvent represents events that will deliver a hook.
 type HookEvent struct {
 	PushOnly       bool   `json:"push_only"`
 	SendEverything bool   `json:"send_everything"`
diff --git a/modules/webhook/type.go b/modules/webhook/type.go
index 244dc423c1..e833f90f58 100644
--- a/modules/webhook/type.go
+++ b/modules/webhook/type.go
@@ -7,6 +7,7 @@ package webhook
 type HookEventType string
 
 // Types of hook events
+// update TestCreateWebhook in models/webhook/webhook_test.go when adding or changing values here
 const (
 	HookEventCreate                    HookEventType = "create"
 	HookEventDelete                    HookEventType = "delete"
@@ -33,6 +34,9 @@ const (
 	HookEventPackage                   HookEventType = "package"
 	HookEventSchedule                  HookEventType = "schedule"
 	HookEventWorkflowDispatch          HookEventType = "workflow_dispatch"
+	HookEventActionRunFailure          HookEventType = "action_run_failure"
+	HookEventActionRunRecover          HookEventType = "action_run_recover"
+	HookEventActionRunSuccess          HookEventType = "action_run_success"
 )
 
 // Event returns the HookEventType as an event string
@@ -65,6 +69,12 @@ func (h HookEventType) Event() string {
 		return "repository"
 	case HookEventRelease:
 		return "release"
+	case HookEventActionRunFailure:
+		return "action_run_failure"
+	case HookEventActionRunRecover:
+		return "action_run_recover"
+	case HookEventActionRunSuccess:
+		return "action_run_success"
 	}
 	return ""
 }
diff --git a/options/locale/locale_ar.ini b/options/locale/locale_ar.ini
index b7b3a0c883..d41677d540 100644
--- a/options/locale/locale_ar.ini
+++ b/options/locale/locale_ar.ini
@@ -10,7 +10,7 @@ preview = عاين
 disabled = معطّل
 go_back = عُد للوراء
 licenses = التراخيص
-sign_in = سجل الدخول
+sign_in = تسجيل الدخول
 activities = الأنشطة
 copy_content = انسخ المحتوى
 collaborative = مشترك
@@ -50,7 +50,7 @@ concept_user_organization = المنظمة
 link_account = ربط الحساب
 rerun_all = أعِد تشغيل جميع الوظائف
 your_profile = الملف الشخصي
-sign_out = سجل الخروج
+sign_out = سجّل الخروج
 settings = الإعدادات
 locked = مقفول
 error = خطأ
@@ -87,7 +87,7 @@ add_all = أضف الكل
 new_fork = اشتقاق جديد لمستودع
 new_project_column = عمود جديد
 add = أضف
-active_stopwatch = تتبع وقت الإنجاز
+active_stopwatch = متتبِّع وقت النشاط
 organization = منظمة
 new_migrate = ترحيل جديد
 save = احفظ
@@ -114,7 +114,7 @@ twofa_scratch = الرمز الاحتياطي للمصادقة بعاملين
 home = الرئيسية
 email = عنوان البريد الإلكتروني
 issues = المسائل
-error404 = الصفحة التي تحاول الوصول لها إما <strong>لا توجد</strong> أو <strong>أنت لست مأذون لك</strong> بعرضها.
+error404 = الصفحة التي تحاول الوصول لها إما <strong>غير موجودو</strong> أو <strong>أنك غير مصرح لك</strong> بعرضها.
 powered_by = مدعوم بواسطة %s
 retry = أعد المحاولة
 tracked_time_summary = ملخص للتتبع الزمني وفقًا لنتائج تصفية قائمة المسائل
@@ -127,8 +127,8 @@ toggle_menu = تبديل القائمة
 more_items = عناصر اضافية
 copy_generic = نسخ إلى الحافظة
 invalid_data = بيانات غير صالحة: %v
-filter.clear = مسح المرشحات
-filter = مرشح
+filter.clear = مسح عوامل التصفية
+filter = عامل تصفية
 filter.is_archived = مؤرشف
 filter.is_template = قوالب
 filter.not_mirror = ليست مرايا
@@ -137,13 +137,17 @@ filter.is_mirror = مرايا
 filter.is_fork = الاشتقاقات
 filter.not_fork = ليست اشتقاقات
 filter.not_archived = ليس مؤرشف
-filter.public = علني
+filter.public = عام
 filter.private = خاص
 new_repo.title = مستودع جديد
 new_migrate.title = انتقال جديد
 new_org.title = منظمة جديدة
 new_repo.link = مستودع جديد
 new_migrate.link = انتقال جديد
+copy_path = نسخ المسار
+test = اختبار
+new_org.link = منظمة جديدة
+error413 = لقد استنفدت حصتك.
 
 [install]
 db_name = اسم قاعدة البيانات
@@ -170,7 +174,7 @@ reinstall_confirm_check_2 = وقد يلزم إعادة تزامن المستود
 run_user = شغّل عبر مستخدم
 err_admin_name_is_invalid = اسم مستخدم المدير غير صالح
 reinstall_confirm_check_3 = أنتِ تؤكد أنكِ متأكد تماماً من أن فورجيو يعمل مع مسار app.ini الصحيح وأنك متأكد من أنه يجب عليك إعادة تثبيته. أنت تُؤكّدُ بأنّك تُقرّ بالمخاطر السالفة الذكر.
-repo_path = المسار الجذري للمستودع
+repo_path = المسار الجذر للمستودع
 err_empty_admin_email = عنوان بريد المدير لا يمكن أن يكون فارغ.
 no_admin_and_disable_registration = لا يمكنك تعطيل التسجيل الذاتي للمستخدمين بدون إنشاء حساب إداري.
 err_admin_name_pattern_not_allowed = اسم مستخدم المدير غير صالح، هذا الأسم يطابق نمطا محجوز
@@ -179,10 +183,10 @@ repo_path_helper = ستُحفظ كلّ مستودعات جِت البعيدة ف
 general_title = الإعدادات العامة
 lfs_path_helper = الملفات التي تم تعقبها بواسطة Git LFS ستُخزن في هذا الدليل. اتركه فارغًا لتعطيله.
 err_empty_db_path = طريق قاعدة بيانات SQLite3 لا يمكن أن يكون فارغا.
-lfs_path = مسار جذر جِت LFS
-app_name_helper = يمكنك إدخال اسم شركتك هنا.
+lfs_path = مسار جذر Git LFS
+app_name_helper = أدخل اسم المثيل هنا. سيظهر هذا الاسم في كل الصفحات.
 err_admin_name_is_reserved = اسم مستخدم المدير غير صالح، هذا الأسم محجوز
-app_name = عنوان الموقع
+app_name = عنوان المثيل
 log_root_path = مسار السجل
 log_root_path_helper = ستُكتب ملفات السجل في هذا الدليل.
 smtp_addr = مضيف SMTP
@@ -190,7 +194,7 @@ smtp_port = منفذ SMTP
 mailer_password = كلمة مرور SMTP
 app_url_helper = العنوان الأساسي لاستنساخ عناوين URL HTTP(S) وإشعارات البريد الإلكتروني.
 mailer_user = اسم مستخدم SMTP
-disable_gravatar.description = عطل جرافاتار والجهات الخارجية للصور الرمزية. ستُستخدم صورة رمزية مبدئية حتى يرفع المستخدم صورة.
+disable_gravatar.description = عطل Gravatar والجهات الخارجية للصور الرمزية. ستُستخدم صورة رمزية مبدئية حتى يرفع المستخدم صورة.
 offline_mode.description = عطل خدمات توصيل المحتوى من الجهات الخارجية، واخدم كل المحتوى محلياً.
 run_user_helper = اسم مستخدم نظام التشغيل الذي يشغل فورجيو. ملاحظة: هذا المستخدم يجب أن يكون له حق الوصول إلى المسار الجذري للمستودع.
 domain = نطاق الخادم
@@ -199,28 +203,28 @@ smtp_from = أرسل البريد الإلكتروني كـ
 federated_avatar_lookup = تفعيل الصور الرمزية الاتحادية
 optional_title = إعدادات اختيارية
 domain_helper = نطاق أو عنوان المضيف لخادمك.
-mail_notify = فعّل التنبيه عبر البريد الإلكتروني
-app_url = الرابط الأساس لفورجيو
+mail_notify = فعّل التنبيهات عبر البريد الإلكتروني
+app_url = الرابط الأساس
 smtp_from_helper = عنوان البريد الإلكتروني الذي سيستخدمه فورجيو. أدخل عنوان بريد إلكتروني عادي أو استخدم صيغة"Name" <email@example.com>.
 ssh_port_helper = رقم المنفذ الذي يستمع له خادم SSH. اتركه فارغاً لتعطيله.
-http_port_helper = المنفذ الذي سيستمع إليه خادم الويب لفورجيو.
-http_port = منفذ استماع HTTP لفورجيو
+http_port_helper = المنفذ الذي سيستمع إليه خادم ويب Forgejo.
+http_port = منفذ استماع HTTP
 ssh_port = منفذ خادم SSH
 email_title = إعدادات البريد الإلكتروني
 offline_mode = فعل الوضع المحلي
 server_service_title = إعدادات الخادم وخدمات الجهات الخارجية
 register_confirm = الزم تأكيد البريد الإلكتروني للتسجيل
-allow_only_external_registration.description = لا يسمح بالتسجيل إلا من خلال الخدمات الخارجية
+allow_only_external_registration.description = لن يتمكن المستخدمون من إنشاء حسابات جديدة إلا باستخدام خدمات خارجية مهيأة.
 disable_registration = عطّل التسجيل الذاتي
-federated_avatar_lookup.description = تفعيل الصور الرمزية الاتحادية باستخدام ليبرافاتار.
+federated_avatar_lookup.description = تفعيل الصور الرمزية الاتحادية باستخدام Libravatar.
 openid_signup = فعّل التسجيل الذاتي عبر OpenID
-disable_registration.description = عطل التسجيل الذاتي. المديرون فقط سيكونون قادرين على إنشاء حسابات جديدة للمستخدمين.
+disable_registration.description = سيتمكن مسؤولو المثيل فقط من إنشاء حسابات مستخدمين جديدة. يوصى بشدة بإبقاء التسجيل معطلاً إلا إذا كنت تنوي استضافة مثيل عام للجميع ومستعد للتعامل مع كميات كبيرة من الحسابات غير المرغوب بها.
 openid_signin = فعّل تسجيل الدخول عبر OpenID
 openid_signin.description = فعّل تسجيل دخول المستخدمين عبر OpenID.
 enable_captcha = فعّل كابتشا التسجيل
-enable_captcha.description = الزم وجود كابتشا للتسجيل الذاتي للمستخدمين.
+enable_captcha.description = مطالبة المستخدمين باجتياز اختبار CAPTCHA من أجل إنشاء حسابات.
 openid_signup.description = فعّل التسجيل الذاتي للمستخدمين عبر OpenID.
-require_sign_in_view = الزم تسجيل الدخول لعرض الصفحات
+require_sign_in_view = يتطلب تسجيل الدخول لعرض محتوى المثيل
 require_sign_in_view.description = مكّن وصول الصفحات للمستخدمين فقط. لن يرى الزائرون سوى صفحات التسجيل والتسجيل.
 admin_setting.description = إنشاء حساب إداري هو اختياري. أول مستخدم مُسجل سيصبح تلقائيا مديرا.
 admin_password = كلمة المرور
@@ -233,7 +237,7 @@ test_git_failed = يتعذر اختبار أمر جِت: %v
 confirm_password = أكّد كلمة المرور
 invalid_admin_setting = إعداد حساب المدير غير صالح: %v
 invalid_log_root_path = مسار السجل غير صالح: %v
-default_enable_timetracking = فعّل تتبع الوقت مبدئيا
+default_enable_timetracking = فعّل التتبع الزمني افتراضيًا
 env_config_keys_prompt = ستطبق المتغيرات البيئية التالية أيضاً على ملف الإعدادات:
 admin_title = إعدادات حساب المدير
 no_reply_address_helper = النطاق للمستخدمين بعنوان بريد إلكتروني مخفي. مثلاً، اسم المستخدم "sarah" سوف يسجل في جِت كـ"sarah@noreply.example.org" لو كان نطاق البريد الإلكتروني الخفي مدخل كـ"noreply.example.org".
@@ -242,9 +246,9 @@ default_enable_timetracking.description = فعل تتبع الوقت للمست
 run_user_not_match = مستخدم التشغيل غير مطابق لأسم المستخدم الحالي: %s -> %s
 invalid_db_setting = إعدادات قاعدة البيانات غير صالحة: %v
 invalid_db_table = جدول قاعدة البيانات "%s" غير صالح: %v
-default_keep_email_private.description = أخفِ عناوين البريد الإلكتروني للحسابات الجديدة مبدئيا.
+default_keep_email_private.description = قم بتمكين إخفاء عنوان البريد الإلكتروني للمستخدمين الجدد افتراضيًا حتى لا يتم تسريب هذه المعلومات فور التسجيل.
 env_config_keys = إعدادات بيئية
-default_allow_create_organization = اسمح بإنشاء المنظمات مبدئيا
+default_allow_create_organization = اسمح بإنشاء المنظمات بشكل افتراضي
 invalid_app_data_path = مسار بيانات التطبيق غير صالح: %v
 enable_update_checker_helper = يفحص لإيجاد اصدارات جديدة عن طريق الإتصال بسيرفرات فورجيو.
 invalid_repo_path = المسار الجزري للمستودع غير صالح: %v
@@ -252,10 +256,15 @@ internal_token_failed = فشل توليد الرمز الداخلي: %v
 no_reply_address = نطاقات البريد الإلكتروني المخفية
 default_keep_email_private = أخفِ عناوين البريد الإلكتروني مبدئيا
 admin_name = اسم مستخدم المدير
-default_allow_create_organization.description = اسمح بحسابات المستخدمين الجديدة بإنشاء المنظمات مبدئيا.
+default_allow_create_organization.description = السماح للمستخدمين الجدد بإنشاء منتديات المجموعة بشكل افتراضي. عند تعطيل هذا الخيار، سيتعين على المسؤول منح إذن لإنشاء منتديات المجموعة للمستخدمين الجدد.
 password_algorithm = خوارزمية تجزئة كلمة المرور
 invalid_password_algorithm = خوارزمية بصمة كلمة المرور غير صالحة
 password_algorithm_helper = اختر خوارزمية بصمة كلمة المرور. تختلف الخوارزميات في متطلباتها وقوتها. خوارزمية argon2 آمنة لكن تتطلب الكثير من الذاكرة ولذلك قد تكون غير ملائمة للأنظمة الصغيرة.
+app_slogan_helper = أدخل شعار المثيل الخاص بك هنا. اتركه فارغاً لتعطيله.
+app_slogan = شعار المثيل
+allow_only_external_registration = السماح بالتسجيل عبر الخدمات الخارجية فقط
+config_location_hint = سيتم حفظ خيارات التهيئة هذه في:
+smtp_from_invalid = عنوان "،بريد الإرسال كـ" غير صالح
 
 [editor]
 buttons.list.ordered.tooltip = أضف قائمة مرقمة
@@ -272,10 +281,22 @@ buttons.mention.tooltip = اذكر مستخدمًا أو فريقًا
 buttons.italic.tooltip = أضف نصًا مائلًا
 buttons.link.tooltip = اضف رابط
 buttons.disable_monospace_font = عطّل الخط الثابت العرض
+buttons.unindent.tooltip = ‪عناصر غير متساوية من نفس المستوى
+buttons.indent.tooltip = تداخل العناصر بنفس المستوى
+table_modal.header = إضافة جدول
+table_modal.placeholder.header = الترويسة
+table_modal.placeholder.content = المحتوى
+table_modal.label.rows = الصفوف
+table_modal.label.columns = الأعمدة
+link_modal.url = Url
+link_modal.description = الوصف
+buttons.new_table.tooltip = إضافة جدول
+link_modal.header = إضافة رابط
+link_modal.paste_reminder = تلميح: باستخدام عنوان URL في حافظتك، يمكنك اللصق مباشرةً في المحرر لإنشاء رابط.
 
 [aria]
 navbar = شريط التنقل
-footer.software = عن البرمجية
+footer.software = عن هذه البرمجية
 footer.links = روابط
 footer = الذيل
 
@@ -288,31 +309,31 @@ blocked_since = محظور منذ %s
 comment_type_group_milestone = الأهداف
 ui = السمة
 email_notifications.disable = عطّل إشعارات البريد الإلكتروني
-passcode_invalid = رمز الدخول خطأ. حاول مرة أخرى.
+passcode_invalid = رمز الدخول خطأ. حاول مجدداً.
 openid_deletion = أزل عنوان OpenID
 activate_email = أرسل التفعيل
 uploaded_avatar_not_a_image = الملف المرفوع ليس صورة.
 theme_update_error = السمة المختارة غير موجودة.
-twofa_disabled = عُطِّل الاستيثاق الثنائي.
+twofa_disabled = تم تعطيل المصادقة الثنائية.
 theme_desc = ستكون هذه السمة المبدئية لك عبر الموقع.
 new_password = كلمة المرور الجديدة
-twofa_disable_desc = تعطيل الاستيثاق الثنائي سيجعل حسابك أقل أمانًا. أتريد الاستمرار؟
-manage_themes = اختر السمة المبدئية
-delete_prompt = هذه العملية ستحذف حسابك إلى الأبد. <strong>لا يمكن</strong> التراجع عنها بعد ذلك.
-cancel = ألغ
-repos_none = ليس لديك أي مستودع.
+twofa_disable_desc = تعطيل المصادقة الثنائية سيجعل حسابك أقل أماناً. الاستمرار؟
+manage_themes = الموضوع الافتراضي
+delete_prompt = هذه العملية ستحذف حسابك إلى الأبد. <strong>لا يمكن</strong> التراجع عن ذلك.
+cancel = إلغاء
+repos_none = لا تملك أية مستودع.
 twofa_desc = لحماية حسابك من سرقة كلمة المرور، يمكنك استخدام هاتف ذكي أو جهاز آخر لاستلام كلمة مرور مؤقتة ذات استخدام واحد ("TOTP").
-email_notifications.submit = اضبط تفضيلات البريد الإلكتروني
+email_notifications.submit = ضبط تفضيلات البريد الإلكتروني
 update_user_avatar_success = حُدِّثت صورة المستخدم الرمزية.
 activations_pending = في انتظار التفعيل
-language = اللغة
+language = اللّغة
 primary = الأساسي
 update_avatar_success = حُدِّثت صورتك الرمزية.
 keep_email_private = أخفِ عنوان البريد
 delete_current_avatar = احذف الصورة الرمزية الحالية
 avatar = صورة رمزية
 email_preference_set_success = حُدِّثت تفضيلات البريد الإلكتروني.
-scan_this_image = امسح هذه الصورة بتطبيق الاستيثاق الذي تستخدمه:
+scan_this_image = امسح هذه الصورة بتطبيق المصادقة الذي تستخدمه:
 orgs_none = لست عضوًا في أي منظمة.
 delete_email = أزله
 theme_update_success = حُدِّثت السمة.
@@ -339,14 +360,14 @@ openid_deletion_success = أزيل عنوان OpenID.
 add_email_success = أضيف عنوان البريد الجديد.
 enable_custom_avatar = استخدم صورة رمزية مخصصة
 update_avatar = حدّث الصورة الرمزية
-twofa_disable = تعطيل الاستيثاق الثنائي
+twofa_disable = تعطيل المصادقة الثنائية
 retype_new_password = تأكيد كلمة المرور الجديدة
 manage_emails = أدر عناوين البريد الإلكتروني
 then_enter_passcode = وأدخل رمز الدخول الظاهر في التطبيق:
 update_password = حدّث كلمة المرور
 continue = استمر
 emails = عناوين البريد الإلكتروني
-confirm_delete_account = أكُد الحذف
+confirm_delete_account = تأكيد الحذف
 change_password_success = حُدِّثت كلمة مرورك. سجّل الدخول بكلمة مرورك الجديدة من الآن فصاعدا.
 email_deletion_desc = سيُزال عنوان البريد هذا مع كل المعلومات المرتطبة به من حسابك. لكن ستبقى إيداعات Git المودعة به بلا تغيير. أتريد الاستمرار؟
 or_enter_secret = أو أدخل السر: %s
@@ -365,14 +386,14 @@ saved_successfully = حُدِّثت إعداداتك بنجاح.
 update_theme = حدِّث السمة
 access_token_deletion_confirm_action = احذف
 website = الموقع الإلكتروني
-delete_token = احذف
+delete_token = حذف
 hidden_comment_types.ref_tooltip = التعليقات التي تقول أن هذه المسألة قد أشير إليها في مسألة أخرى أو إيداع أو غير ذلك…
 update_language_success = تم تحديث اللغة.
 privacy = الخصوصية
 comment_type_group_label = التصنيفات
 account_link = الحسابات المرتبطة
 comment_type_group_assignee = المكلفون
-update_language = حدِّث اللغة
+update_language = تغيير اللغة
 organization = المنظمات
 update_language_not_found = اللغة "%s" غير متاحة.
 update_profile_success = تم تحديث ملفك الشخصي.
@@ -390,7 +411,7 @@ account = الحساب
 uploaded_avatar_is_too_big = حجم الملف المرفوع (%d كي‌ب) يتخطى الحجم الأقصى (%d كي‌ب).
 biography_placeholder = أخبرنا شيئا عن نفسك! (يمكنك استخدام ماركداون)
 comment_type_group_reference = الإشارات
-orgs = إدارة المنظمات
+orgs = المنظمات
 update_profile = حدِّث الملف الشخصي
 profile = الملف الشخصي
 comment_type_group_dependency = الاعتماديات
@@ -400,7 +421,7 @@ can_write_info = كتابة
 delete = احذف الحساب
 oauth2_application_name = اسم التطبيق
 key_state_desc = هذا المفتاح أستُعمل خلال آخر 7 أيام
-webauthn_delete_key = أزِل مفتاح الأمان
+webauthn_delete_key = إزالة مفتاح الأمان
 valid_forever = صالح للأبد
 can_read_info = قراءة
 create_oauth2_application_button = أنشئ تطبيقا
@@ -412,16 +433,16 @@ select_permissions = أختر التصاريح
 added_on = مُضاف في %s
 show_openid = أظهر على الملف الشخصي
 hide_openid = أخفي من الملف الشخصي
-webauthn_delete_key_desc = إذا أزلت مفتاح الأمان، فلن تتمكن من تسجيل الدخول باستخدامه. اكمل؟
+webauthn_delete_key_desc = إذا أزلت مفتاح الأمان، فلن تتمكن من تسجيل الدخول باستخدامه. المتابعة؟
 permissions_list = التصاريح:
 webauthn_key_loss_warning = إذا فقدت مفاتيح الأمان الخاصة بك، فسوف تفقد الوصول إلى حسابك.
-hooks.desc = أضف خطاطيف ويب تُطلق <strong>لكل مستودعاتك</strong>.
+hooks.desc = إضافة خطاطيف ويب سيتم تشغيلها لـ <strong>جميع المستودعات</strong> التي تمتلكها.
 keep_activity_private_popup = يجعل النشاط مرأياً لك وللمديرين فقط
 keep_email_private_popup = سيؤدي هذا إلى إخفاء عنوان بريدك الإلكتروني من ملفك الشخصي، وكذلك عند تقديم طلب سحب أو تحرير ملف باستخدام واجهة الويب. لن يتم تعديل الالتزامات المدفوعة. استخدم %s في الإيداعات لربطها بحسابك.
 ssh_key_name_used = هناك مفتاح SSH بنفس الاسم موجود بالفعل على حسابك.
-authorized_oauth2_applications = تطبيقات OAuth2 المأذونة
+authorized_oauth2_applications = تطبيقات OAuth2 المأذون لها
 uid = المعرّف الرمزي
-manage_openid = إدارة عناوين OpenID
+manage_openid = عناوين OpenID
 webauthn = استيثاق ثنائي (مفاتيح الأمان)
 comment_type_group_deadline = الموعد النهائي
 add_key = أضف مفتاح
@@ -444,11 +465,11 @@ key_content_gpg_placeholder = يبدأ بـ '-----BEGIN PGP PUBLIC KEY BLOCK----
 add_email_confirmation_sent = بريد تفعيل جديد تم إرساله إلى "%s". يُرجى التحقق من البريد الوارد خلال %s لتأكيد عنوان البريد الإلكتروني.
 ssh_desc = مفاتيح SSH العمومية هذه مرتبطة بحسابك. وتسمح المفاتيح الخصوصية المرافقة بالوصول الكامل إلى مستودعاتك. ويمكن استعمال مفاتيح SSH الموثَّقة لتوثيق إيداعات جت الموقَّعة بمفاتيح SSH.
 ssh_gpg_keys = مفاتيح SSH / GPG
-authorized_oauth2_applications_description = لقد منحتَ إمكانية الوصول إلى حسابك الشخصي على فورجيو لهذه التطبيقات من تطبيقات خارجية. الرجاء إلغاء وصول التطبيقات التي لم تعد بحاجة إليها.
+authorized_oauth2_applications_description = لقد منحت حق الوصول إلى حسابك الشخصي في Forgejo لهذه التطبيقات الخارجية. يرجى إلغاء الوصول للتطبيقات التي لم تعد قيد الاستخدام.
 ssh_key_been_used = هذا المفتاح الـSSH تم إضافته بالفعل إلى هذا الخادم.
 password_change_disabled = المستخدمين غير المحليين لا يمكنهم تغيير كلمة مرورهم عن طريق واجهة ويب فورجيو.
 token_state_desc = هذا الرمز استخدم خلال آخر 7 أيام
-delete_key = أزله
+delete_key = إزالة
 ssh_invalid_token_signature = مفتاح SSH المزود، والتوقيع والرمز لا يتطابقوا أو الرمز قديم.
 ssh_token_help = يمكنك توليد توقيع باستخدام:
 gpg_key_verify = تحقق
@@ -462,10 +483,10 @@ unbind = الغ الربط
 verify_ssh_key_success = تم التحقق من مفتاح SSH "%s".
 gpg_token_required = يجب أن تقدم توقيعاً للرمز التالي
 ssh_key_verified_long = تم التحقق من المفتاح مع رمز ويمكن استخدامه للتحقق من الإيداعات المتطابقة مع أي عناوين البريد المفعلة لهذا المستخدم.
-gpg_key_deletion = أزل مفتاح GPG
+gpg_key_deletion = إزالة مفتاح GPG
 gpg_token_help = يمكنك توليد توقيع باستخدام:
-ssh_key_deletion = أزل مفتاح SSH
-ssh_token = رمز
+ssh_key_deletion = إزالة مفتاح SSH
+ssh_token = رمز فريد
 ssh_disabled = SSH مُعطل
 gpg_key_verified_long = تم التحقق من المفتاح بواسطة رمز ويمكن استخدامه للتحقق من إيداعات متطابقة لعناوين البريد المفعلة لهذا المستخدم بالإضافة إلى أي هويات متطابقة لهذا المفتاح.
 change_username_redirect_prompt = اسم المستخدم القديم سوف يعاد توجيهه حتى يطالب به شخص آخر.
@@ -473,7 +494,7 @@ add_key_success = تم إضافة مفتاح SSH "%s".
 key_name = اسم المفتاح
 comment_type_group_time_tracking = تتبع الوقت
 gpg_invalid_token_signature = مفتاح GPG المزود، والتوقيع والرمز لا يتطابقوا أو الرمز قديم.
-ssh_key_verified = مفتاح مُتحقق منه
+ssh_key_verified = مفتاح تم التحقق منه
 ssh_key_deletion_success = تم إزالة مفتاح SSH.
 key_signature_ssh_placeholder = يبدأ بـ'-----BEGIN SSH SIGNATURE-----'
 gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig
@@ -487,7 +508,7 @@ gpg_key_deletion_desc = إزالة مفتاح GPG يُلغي تحقق الإيد
 permission_read = القراءة
 ssh_token_signature = توقيع SSH مصفح
 ssh_key_deletion_desc = إزالة مفتاح SSH يلغي وصوله إلى حسابك. أكمل؟
-revoke_key = أسحب
+revoke_key = سحب
 gpg_token = رمز
 gpg_key_matched_identities_long = الهويات المدمجة في هذا المفتاح تطابق عناوين البريد الإلكتروني المفعلة التالية لهذا المستخدم. ويمكن التحقق من صحة الإيداعات المطابقة لهذه العناوين البريدية مع هذا المفتاح.
 key_content = المحتوى
@@ -501,7 +522,120 @@ remove_oauth2_application_success = أُزيل التطبيق.
 update_oauth2_application_success = لقد حدّثت بنجاح تطبيق OAuth2.
 oauth2_redirect_uris = روابط إعادة التوجيه. نرجو وضع كل رابط في سطر وحده.
 remove_account_link = أزل الحساب المربوط
-remove_account_link_success = أُزيل الحساب المربوط.
+remove_account_link_success = أُزيل الحساب المرتبط.
+quota = كوتا
+update_hints = حدِّث التلميحات
+keep_activity_private.description = سيكون <a href="%s">نشاطك العام</a> مرئيًا لك ولمشرفي المثيل فقط.
+manage_ssh_principals = إدارة مدراء شهادات SSH الرئيسية
+pronouns = الضمائر
+pronouns_unspecified = غير محدد
+ssh_principal_been_used = تمت إضافة هذه الهوية الرئيسية إلى الخادم مسبقاً.
+principal_desc = هذه الهُويات الرئيسية لشهادات SSH مرتبطة بحسابك وتتيح وصولاً كاملاً إلى مستودعاتك.
+gpg_helper = <strong>تحتاج لمساعدة؟</strong> اطّلع على الدليل <a href="%s">حول GPG</a>.
+ssh_helper = <strong>هل تحتاج مساعدة؟</strong> اطلع على الدليل لـ <a href="%s">إنشاء مفاتيح SSH الخاصة بك</a> أو لحل <a href="%s">المشكلات الشائعة</a> التي قد تواجهها عند استخدام SSH.
+add_new_principal = إضافة هوية رئيسية
+keep_pronouns_private.description = سيؤدي ذلك إلى إخفاء ضمائرك عن الزوار الذين لم يقوموا بتسجيل الدخول.
+language.description = سيتم حفظ هذه اللغة في حسابك واستخدامها كلغة افتراضية بعد تسجيل الدخول.
+storage_overview = نظرة عامة على التخزين
+hints = تلميحات
+language.title = اللغة الافتراضية
+update_hints_success = تم تحديث التلميحات.
+language.localization_project = "ساعدنا في ترجمة Forgejo إلى لغتك! <a href="%s">المزيد من المعلومات</a>.
+change_username_redirect_prompt.with_cooldown.one = سيصبح اسم المستخدم القديم متاحًا للجميع بعد فترة تباطؤ تبلغ %[1]d يومًا. لا يزال بإمكانك استعادة اسم المستخدم القديم خلال فترة التهدئة.
+additional_repo_units_hint = اقتراح تفعيل وحدات المستودعات الإضافية
+additional_repo_units_hint_description = اعرض تلميح "تفعيل المزيد" للمستودعات التي لم يتم تفعيل جميع الوحدات المتاحة بها.
+change_password = غيّر كلمة المرور
+keep_pronouns_private = إظهار الضمائر للمستخدمين الذين تمت مصادقتهم فقط
+change_username_redirect_prompt.with_cooldown.few = سيصبح اسم المستخدم القديم متاحًا للجميع بعد فترة تباطؤ تبلغ يومًا. لا يزال بإمكانك استعادة اسم المستخدم القديم خلال فترة التهدئة.
+no_activity = لا يوجد نشاط حديث
+generate_token_success = تم إنشاء الرمز الفريد الجديد الخاص بك. انسخه الآن لأنه لن يظهر مرة أخرى.
+manage_access_token = رموز الوصول الفريدة
+token_name = اسم الرمز الفريد
+generate_token_name_duplicate = اسم التطبيق <strong>%s</strong> مُستخدم مسبقًا. يُرجى استخدام اسم جديد.
+regenerate_token = إعادة التوليد
+access_token_regeneration = إعادة توليد رمز وصول فريد
+permission_write = قراءة وكتابة
+delete_token_success = تم حذف الرمز الفريد. لم يعد بإمكان التطبيقات التي تستخدمه الوصول إلى حسابك.
+gpg_key_matched_identities = الهويات المتطابقة:
+tokens_desc = تمنح هذه الرموز الفريدة إمكانية الوصول إلى حسابك باستخدام واجهة برمجة تطبيقات Forgejo.
+generate_token = توليد رمز فريد
+access_token_deletion = حذف رمز الوصول الفريد
+generate_new_token = توليد رمز جديد
+access_token_deletion_desc = حذف الرمز الفريد سيسحب صلاحية الوصول إلى حسابك من التطبيقات التي تستخدمه. لا يمكن التراجع عن هذا الإجراء. تريد المتابعة؟
+access_token_desc = تقتصر صلاحيات الرمز المحددة على مسارات <a href="%[1]s" target="_blank">واجهة البرمجة (API)</a> المقابلة فقط. اطلع على <a href="%[2]s" target="_blank">الوثائق</a> لمزيد من المعلومات.
+oauth2_application_remove_description = ستؤدي إزالة تطبيق OAuth2 إلى منعه من الوصول إلى حسابات المستخدمين المصرح لهم على هذا المثيل. المتابعة؟
+ssh_principal_deletion = إزالة الهوية الرئيسية لشهادة SSH
+at_least_one_permission = يجب عليك تحديد صلاحية واحدة على الأقل لإنشاء رمز فريد
+subkeys = المفاتيح الفرعية
+ssh_principal_deletion_desc = إزالة هوية رئيسية لشهادة SSH ستسحب صلاحية وصولها إلى حسابك. تريد المتابعة؟
+principal_state_desc = استخدمت هذه الهوية في آخر 7 أيام
+ssh_signonly = SSH معطّل حاليًا، لذا تُستخدم هذه المفاتيح فقط للتحقق من توقيع الإيداع.
+ssh_externally_managed = يتم إدارة مفتاح SSH هذا خارجيًا لهذا المستخدم
+access_token_regeneration_desc = سيؤدي إعادة إنشاء رمز فريد إلى إبطال الوصول إلى حسابك للتطبيقات التي تستخدمه. لا يمكن التراجع عن ذلك. المتابعة؟
+regenerate_token_success = تم إعادة إنشاء الرمز الغريد. لم يعد بإمكان التطبيقات التي تستخدمه الوصول إلى حسابك ويجب تحديثها بالرمز الجديد.
+repo_and_org_access = الوصول إلى المستودع والمنظمة
+add_principal_success = تمت إضافة الهوية الرئيسية لشهادة "SSH "%s.
+ssh_principal_deletion_success = تم إزالة الهوية.
+oauth2_applications_desc = تمكّن تطبيقات OAuth2 تطبيقات الطرف الثالث من مصادقة المستخدمين بأمان في مثيل Forgejo هذا.
+oauth2_client_secret = سر العميل
+oauth2_regenerate_secret = تجديد السر
+oauth2_regenerate_secret_hint = فقدت سرك؟
+oauth2_client_id = معرف العميل
+permission_no_access = لا وصول
+remove_oauth2_application_desc = ستؤدي إزالة تطبيق OAuth2 إلى إبطال الوصول إلى جميع رموز الوصول الفريدة الموقعة. المتابعة؟
+oauth2_confidential_client = العميل السري. حدد للتطبيقات التي تحافظ على السرية، مثل تطبيقات الويب. لا تحدد للتطبيقات الأصلية بما في ذلك تطبيقات سطح المكتب وتطبيقات الأجهزة المحمولة.
+oauth2_client_secret_hint = لن يظهر السر مرة أخرى بعد مغادرة هذه الصفحة أو تحديثها. يرجى التأكد من أنك قمت بحفظه.
+oauth2_application_create_description = ‪تمنح تطبيقات OAuth2 تطبيقات الطرف الثالث حق الوصول إلى حسابات المستخدمين على هذا المثيل.
+oauth2_application_locked = يقوم Forgejo بالتسجيل المسبق لبعض تطبيقات OAuth2 عند بدء التشغيل إذا تم تمكينها في التكوين. لمنع السلوك غير المتوقع، لا يمكن تحريرها أو إزالتها. يرجى الرجوع إلى وثائق OAuth2 لمزيد من المعلومات.
+twofa_recovery_tip = إذا فقدت جهازك، ستتمكن من استخدام مفتاح الاسترداد للاستخدام مرة واحدة لاستعادة الوصول إلى حسابك.
+twofa_not_enrolled = حسابك غير مسجّل حالياً في المصادقة الثنائية.
+twofa_scratch_token_regenerate = إعادة إنشاء مفتاح الاسترداد للاستخدام مرة واحدة
+regenerate_scratch_token_desc = إذا فقدت مفتاح الاسترداد الخاص بك في غير محله أو استخدمته بالفعل لتسجيل الدخول، يمكنك إعادة تعيينه هنا.
+twofa_failed_get_secret = إخفاق في الحصول على سر.
+manage_account_links_desc = هذه الحسابات الخارجية مرتبطة بحسابك في Forgejo.
+revoke_oauth2_grant_description = سيؤدي إبطال الوصول لهذا التطبيق التابع لجهة خارجية إلى منع هذا التطبيق من الوصول إلى بياناتك. أنت متأكد؟
+revoke_oauth2_grant_success = تم سحب صلاحية الوصول بنجاح.
+webauthn_alternative_tip = قد ترغب في تكوين أسلوب مصادقة إضافي.
+webauthn_register_key = إضافة مفتاح تشفير
+webauthn_nickname = الاسم المستعار
+manage_account_links = الحسابات المرتبطة
+revoke_oauth2_grant = سحب صلاحية الوصول
+twofa_enroll = التسجيل في المصادقة الثنائية
+twofa_is_enrolled = حسابك<strong> مسجّل</strong> حاليًا في المصادقة الثنائية.
+twofa_scratch_token_regenerated = مفتاح الاسترداد للاستخدام مرة واحدة هو %s الآن. قم بتخزينه في مكان آمن، فلن يتم عرضه مجدداً.
+twofa_enrolled = تم تسجيل حسابك بنجاح. قم بتخزين مفتاح الاسترداد للاستخدام لمرة واحدة (%s) في مكان آمن، فلن يتم عرضه مجدداً.
+webauthn_desc = مفاتيح الأمان هي أجهزة فعلية تحوي على مفاتيح تشفير. يمكن استخدامها للتحقق بخطوتين. يجب أن تدعم مفاتيح الأمان معيار <a rel="noreferrer" target="_blank" href="%s">WebAuthn Authenticator</a>.
+remove_account_link_desc = ستؤدي إزالة حساب مرتبط إلى إلغاء وصوله إلى حساب Forgejo الخاص بك. المتابعة؟
+email_notifications.onmention = البريد الإلكتروني فقط عند الإشارة
+email_notifications.andyourown = والإشعارات الخاصة بك
+visibility = رؤية المستخدم
+visibility.public_tooltip = مرئي للجميع
+visibility.private_tooltip = مرئي فقط لأعضاء المؤسسات التي انضممت إليها
+visibility.public = عام
+delete_account_desc = هل أنت متأكد من رغبتك في حذف حساب المستخدم هذا نهائيًا؟
+user_block_yourself = لا يمكنك حظر نفسك.
+delete_with_all_comments = حسابك أصغر من %s. لتجنب التعليقات الوهمية، سيتم حذف جميع تعليقات المشكلة/المسؤولية الشخصية معها.
+visibility.limited_tooltip = مرئية فقط للمستخدمين الذين قاموا بتسجيل الدخول
+visibility.limited = محدود
+visibility.private = خاص
+quota.applies_to_org = تنطبق قواعد الحصص التالية على هذه المنظمة
+quota.rule.no_limit = غير محدود
+quota.sizes.all = الكل
+quota.sizes.repos.all = المستودعات
+quota.sizes.repos.public = مستودعات عامة
+quota.sizes.repos.private = مستودعات خاصة
+quota.sizes.git.all = محتوى Git
+quota.sizes.git.lfs = Git LFS
+quota.sizes.assets.all = الأصول
+quota.sizes.assets.attachments.all = المرفقات
+quota.sizes.assets.attachments.issues = إصدار المرفقات
+quota.sizes.assets.attachments.releases = تحرير المرفقات
+quota.sizes.assets.artifacts = التحف الفنية
+quota.sizes.assets.packages.all = الحزم
+quota.rule.exceeded.helper = لقد تجاوز الحجم الإجمالي للكائنات لهذه القاعدة الحصة النسبية.
+quota.rule.exceeded = تم تجاوزه
+quota.applies_to_user = تنطبق قواعد الحصص التالية على حسابك
+quota.sizes.wiki = الموسوعة
 
 [org]
 follow_blocked_user = لا يمكنك إتباع هذه المنظمة لأن هذه المنظمة حظرتك.
@@ -610,7 +744,7 @@ pulls.blocked_by_user = لا يمكنك أن ترسل طلب سحب في هذا
 migrate.migrating_milestones = ترحيل الأهداف
 migrate_items_milestones = أهداف
 repo_size = حجم المستودع
-object_format = صيغة الكائنات
+object_format = تنسيق الكائنات
 use_template = استخدم هذا القالب
 migrate_items_merge_requests = طلبات الدمج
 repo_name = اسم المستودع
@@ -618,11 +752,11 @@ template = القالب
 projects.modify = عدّل المشروع
 tree_path_not_found_commit = المسار %[1]s غير موجود في الإيداع %[2]s
 repo_lang = اللغة
-fork_repo = اشتق المستودع
+fork_repo = اشتقاق المستودع
 fork_no_valid_owners = لا يمكن اشتقاق هذا المستودع لعدم وجود مالك صالح.
 license = الترخيص
 fork_branch = الفرع الذي سيُستنسخ إلى الاشتقاق
-template_helper = اجعل المستودع قالبا
+template_helper = اجعل المستودع قالباً
 owner = المالك
 projects.deletion_success = تم حذف المشروع.
 projects.deletion = احذف المشروع
@@ -632,14 +766,14 @@ projects.edit = عدّل المشروع
 template.avatar = الصورة الرمزية
 migrate_items_wiki = الموسوعة
 repo_desc = الوصف
-template_select = اختر قالبا.
+template_select = اختر قالبا
 repo_name_helper = الأسماء الحسنة للمستودعات تستخدم كلمات مفتاحية قصيرة وسهلة التذكر وفريدة.
-default_branch = الفرع المبدئي
+default_branch = الفرع الافتراضي
 all_branches = كل الفروع
-migrate_items_issues = المسائل
+migrate_items_issues = البلاغات
 projects.deletion_desc = حذف مشروع يحذف كل المسائل المرتبطة به. أتريد الاستمرار؟
-repo_desc_helper = أدخل وصفا قصيرا (اختياريا)
-create_repo = أنشئ مستودعا
+repo_desc_helper = أدخل وصفاً قصيراً (اختياري)
+create_repo = إنشاء مستودع
 migrate_items_releases = الإصدارات
 already_forked = لقد اشتققت %s بالفعل
 license_helper = اختر ملف ترخيص.
@@ -660,7 +794,7 @@ issues.remove_milestone_at = `أزال هذه المسألة من الهدف <b>
 issues.filter_assginee_no_assignee = بلا مكلف
 issues.new.no_milestone = بلا هدف
 issues.new.projects = المشروعات
-delete_preexisting_label = احذف
+delete_preexisting_label = حذف
 issues.context.edit = عدّل
 branch.rename = غيّر اسم الفرع "%s"
 issue_labels = تصنيفات المسائل
@@ -699,7 +833,7 @@ issues.filter_milestone_all = كل الأهداف
 issues.unlock.notice_2 = - يمكنك دوما إقفال هذه المسألة من جديد في المستقبل.
 issues.num_participants_few = %d متحاور
 release.title = عنوان الإصدار
-issues.closed_at = `أغلق هذه المسألة <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at = `أغلق هذه المسألة %s`
 issues.lock.title = إقفال التحاور في هذه المسألة.
 issues.new.no_label = بلا تصنيف
 issues.filter_sort.mostforks = الأعلى اشتقاقا
@@ -756,10 +890,10 @@ milestones.deletion_desc = حذف هدف يحذفه من كل المسائل ا
 issues.desc = نظّم إبلاغات العلل، والمهام، والأهداف.
 issues.choose.ignore_invalid_templates = أُهمِلت القوالب التالفة
 branch.renamed = غُيّر اسم الفرع %s إلى %s.
-delete_preexisting = احذف الملفات الموجودة سابقا
+delete_preexisting = حذف الملفات الموجودة مسبقاً
 branch.included_desc = هذا الفرع جزء من الفرع المبدئي
 trust_model_helper_collaborator_committer = مشترك+مودع: ثق بتوقيعات المشتركين التي تطابق المودع
-issues.reopened_at = `أعاد فتح هذه المسألة <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.reopened_at = `أعاد فتح هذه المسألة %s`
 issues.action_milestone = هدف
 issues.new.assignees = المكلَّفون
 release.tag_name_protected = اسم الوسم محمي.
@@ -830,7 +964,7 @@ issues.reopen_comment_issue = علّق وأعد فتحها
 issues.dependency.add = أضف اعتمادية…
 issues.label_deletion_desc = حذف تصنيف يحذفه من كل المسائل، أتريد الاستمرار؟
 labels = التصنيفات
-delete_preexisting_content = احذف الملفات في %s
+delete_preexisting_content = حذف الملفات في %s
 milestones.deletion = احذف الهدف
 issues.comment_pull_merged_at = دمج الإيداع %[1]s إلى %[2]s %[3]s
 issues.new.closed_milestone = الأهداف التامة
@@ -872,7 +1006,7 @@ issues.dependency.issue_no_dependencies = بلا اعتمادية.
 issues.filter_sort.mostcomment = الأكثر تعليقات
 issues.label.filter_sort.reverse_by_size = الأكبر حجما
 release.message = صِف هذا الإصدار
-editor.cancel_lower = ألغِ
+editor.cancel_lower = إلغاء
 issues.label.filter_sort.reverse_alphabetically = أبجديا معكوسا
 trust_model_helper = اختر نموذج الثقة للتحقق من التوقيعات. الخيارات المتاحة هي:
 issues.unlock_error = لا يمكن فك قفل مسألة غير مقفلة.
@@ -906,7 +1040,7 @@ issues.label_archive = أرشف التصنيف
 issues.choose.blank_about = أنشئ مسألة من القالب المبدئي.
 issues.filter_poster = منشئ
 release.delete_release = احذف الإصدار
-editor.cancel = ألغِ
+editor.cancel = إلغاء
 issues.change_title_at = `غيّر العنوان من <b><strike>%s</strike></b> إلى <b>%s</b> %s`
 branch.new_branch_from = أنشئ فرعًا جديدًا من "%s"
 issues.due_date_form_edit = "عدّل"
@@ -918,7 +1052,7 @@ issues.filter_assignee = مكلف
 issues.open_title = حالية
 download_file = نزّل الملف
 issues.attachment.download = `انقر لتنزيل "%s"`
-download_archive = نزّل المستودع
+download_archive = تنزيل المستودع
 download_tar = نزّل TAR.GZ
 download_zip = نزّل ZIP
 releases.desc = تتبع إصدارات المشروع وتنزيلاته.
@@ -931,15 +1065,15 @@ projects.desc = أدر المسائل وطلبات الدمج في لوحات م
 ambiguous_runes_header = `يحتوي هذا الملف على محارف يونيكود غامضة`
 executable_file = ملف تنفيذي
 settings.webhook.response = الاستجابة
-editor.delete = احذف %s
-file_view_raw = أظهر المجرد
+editor.delete = حذف %s
+file_view_raw = أظهر الخام
 settings.add_webhook = أضف خطاف ويب
 settings.slack_channel = قناة
 commits = إيداعات
 commit = إيداع
-editor.upload_file = ارفع ملفا
+editor.upload_file = رفع ملف
 settings.webhook.headers = الترويسات
-org_labels_desc_manage = أدرها
+org_labels_desc_manage = إدارة
 editor.patch = طبّق الرقعة
 editor.must_have_write_access = يجب أن يكون لديك إمكانية الكتابة حتى تعدّل هذا الملف أو تقترح تعديلات.
 template.webhooks = خطاطيف الويب
@@ -963,12 +1097,12 @@ settings.webhook.payload = المحتوى
 invisible_runes_header = `يحتوي هذا الملف على محارف يونيكود غير مرئية`
 editor.filename_help = أضف مجلدا بكتابة اسمه ثم شرطة مائلة ('/'). احذف مجلدا بضغط زر Backspace أول شيء في خانة الاسم.
 editor.commit_changes = أودع التعديلات
-editor.add_file = أضف ملفا
+editor.add_file = إضافة ملف
 settings.githook_name = اسم الخطاف
 editor.fork_before_edit = يجب أن تشتق هذا المستودع حتى تعدّل هذا الملف أو تقترح تعديلات.
 projects.description_placeholder = الوصف
 tag = وسم
-file_raw = مجرد
+file_raw = خام
 projects.create = أنشئ مشروعا
 settings.update_webhook = حدّث خطاف الويب
 editor.push_rejected_no_message = لقد رفض الخادوم التعديل بغير رسالة. نرجو مراجعة خطاطيف جت.
@@ -987,7 +1121,7 @@ editor.no_changes_to_show = لا توجد تعديلات لعرضها.
 settings.webhook.test_delivery = اختبار التوصيل
 commit_graph.hide_pr_refs = أخفِ طلبات الدمج
 editor.new_file = ملف جديد
-file_view_source = أظهر المصدر
+file_view_source = عرض المصدر
 settings.webhook_deletion_success = أزيل خطاف الويب.
 projects.title = العنوان
 settings.slack_domain = النطاق
@@ -1016,11 +1150,11 @@ settings.add_hook_success = أضيف خطاف الويب.
 commit.revert-header = إرجاع: %s
 editor.file_already_exists = يوجد فعلا في هذا المستودع ملف باسم "%s".
 settings.web_hook_name_matrix = متركس
-editor.filename_cannot_be_empty = لا يمكن ترك اسم الملف فارغا.
+editor.filename_cannot_be_empty = لا يمكن ترك اسم الملف فارغاً.
 editor.add_tmpl = أضف '<%s>'
 editor.new_branch_name_desc = اسم الفرع الجديد…
 release = إصدار
-editor.delete_this_file = احذف الملف
+editor.delete_this_file = حذف الملف
 editor.or = أو
 editor.push_rejected_summary = رسالة الرفض الكاملة:
 settings.webhook_deletion = أزل خطاف الويب
@@ -1166,7 +1300,7 @@ pulls.status_checking = في انتظار بعض الفحوص
 pulls.status_checks_failure = بعض الفحوص فشلت
 pulls.status_checks_success = جميع الفحوص ناجحة
 pulls.status_checks_warning = بعض الفحوص تعطي تحذيرات
-pulls.commit_ref_at = `أشار إلى طلب الدمج من إيداع <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `أشار إلى طلب الدمج من إيداع %s`
 pulls.cmd_instruction_hint = `أظهر شرح استخدام سطر الأوامر.`
 pulls.cmd_instruction_checkout_title = اسحب
 pulls.cmd_instruction_checkout_desc = من مستودع مشروعك، اسحب (check out) فرعا جديدا واختبر التغييرات.
@@ -1257,8 +1391,8 @@ pulls.status_checks_details = تفاصيل
 pulls.status_checks_hide_all = أخفِ كل الفحوص
 pulls.status_checks_show_all = أظهر كل الفحوص
 pulls.close = أغلق طلب الدمج
-pulls.closed_at = `أغلق طلب الدمج <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at = `أعاد فتح طلب الدمج <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `أغلق طلب الدمج %s`
+pulls.reopened_at = `أعاد فتح طلب الدمج %s`
 milestones.title = العنوان
 milestones.desc = الوصف
 milestones.edit = عدّل الهدف
@@ -1302,11 +1436,11 @@ issues.closed_by_fake = من %[2]s أُغلقت %[1]s
 issues.num_comments_1 = %d تعليق
 issues.num_comments = %d تعليقا
 issues.commented_at = `علّق <a href="#%s">%s</a>`
-issues.commit_ref_at = `أشار إلى هذه المسألة من إيداع <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from = `<a href="%[3]s">أشار إلى هذه المسألة %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from = `<a href="%[3]s">أشار إلى هذا الطلب %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from = `<a href="%[3]s">أشار إلى طلب دمج %[4]s سيغلق هذه المسألة</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from = `<a href="%[3]s">أشار إلى طلب دمج %[4]s سيعيد فتح هذه المسألة</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at = `أشار إلى هذه المسألة من إيداع %s`
+issues.ref_issue_from = `<a href="%[2]s">أشار إلى هذه المسألة %[3]s</a> %[1]s`
+issues.ref_pull_from = `<a href="%[2]s">أشار إلى هذا الطلب %[3]s</a> %[1]s`
+issues.ref_closing_from = `<a href="%[2]s">أشار إلى طلب دمج %[3]s سيغلق هذه المسألة</a> %[1]s`
+issues.ref_reopening_from = `<a href="%[2]s">أشار إلى طلب دمج %[3]s سيعيد فتح هذه المسألة</a> %[1]s`
 issues.ref_closed_from = `<a href="%[3]s">أغلق هذه المسألة %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from = `<a href="%[3]s">أعاد فتح هذه المسألة %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reference_issue.body = المحتوى
@@ -1327,6 +1461,210 @@ pulls.fast_forward_only_merge_pull_request = تسريع وحسب
 pulls.merge_conflict = تعذر الدمج: حدث نزاع خلال الدمج. مساعدة: جرب طريقة أخرى
 pulls.rebase_conflict = تعذر الدمج: حدث نزاع خلال إعادة تأسيس الإيداع: %[1]s. مساعدة: جرب طريقة أخرى
 pulls.has_merged = فشل: لقد تم دمج هذا الطلب، فلا يمكنك دمجه مجددا أو تغيير الفرع الهدف.
+new_repo_helper = يحتوي المستودع على جميع ملفات المشروع، بما في ذلك سجل التعديلات. هل تستضيف واحدًا بالفعل على منصة أخرى؟ <a href="%s">نقل المستودع</a>.
+new_from_template = استخدم قالباً
+new_advanced = إعدادات مقتدمة
+new_advanced_expand = انقر للتوسعة
+new_from_template_description = يمكنك تحديد قالب مستودع موجود على هذا المثيل وتطبيق إعداداته.
+owner_helper = قد لا تظهر بعض منتديات المجموعة في القائمة المنسدلة بسبب الحد الأقصى لعدد المستودعات.
+fork_from = اشتق من
+fork_visibility_helper = لا يمكن تغيير ظهور المستودع المشتّق.
+generate_repo = توليد لمستودع
+readme_helper_desc = هذا هو المكان الذي يمكنك فيه كتابة وصف كامل لمشروعك.
+repo_gitignore_helper = حدد قوالب .gitignore
+auto_init = تهيئة المستودع
+default_branch_label = افتراضي
+auto_init_description = ابدأ سجل Git بملف README، مع إمكانية إضافة ملفات الرخصة و.gitignore اختيارياً.
+mirror_use_ssh.text = استخدم مصادقة SSH
+mirror_address = استنساخ عبر URL
+mirror_prune_desc = إزالة مراجع التتبع عن بُعد القديمة
+mirror_interval_invalid = الفاصل الزمني للمرآة غير صالح.
+readme_helper = حدد قالب ملف README
+generate_from = التوليد من
+mirror_use_ssh.not_available = المصادقة عبر SSH غير متاحة.
+open_with_editor = افتح بـ %s
+mirror_prune = تنقية
+visibility_fork_helper = (سيؤثر تغيير ذلك على رؤية جميع المشتقات.)
+clone_helper = تحتاج مساعدة في الاستنساخ؟ زُر <a target="_blank" rel="noopener noreferrer" href="%s">المساعدة</a>.
+mirror_public_key = مفتاح SSH عام
+size_format = %[1]s: %[2]s, %[3]s: %[4]s
+visibility_description = فقط المالك أو أعضاء المؤسسة إذا كان لديهم حقوق، سيتمكنون من رؤيته.
+license_helper_desc = تحدد الرخصة ما يمكن للآخرين فعله أو عدم فعله بشيفرة برمجيتك. لست متأكدًا من الرخصة المناسبة لمشروعك؟ طالع <a target="_blank" rel="noopener noreferrer" href="%s">اختيار الرخصة</a>.
+mirror_denied_combination = لا يمكن استخدام المصادقة المستندة إلى المفتاح العام وكلمة المرور معاً.
+repo_gitignore_helper_desc = اختر الملفات التي لا تريد تتبعها من قائمة القوالب الخاصة باللغات الشائعة. يتم تضمين القطع الأثرية النموذجية التي تم إنشاؤها بواسطة أدوات البناء الخاصة بكل لغة في .gitignore بشكل افتراضي.
+stars = النجوم
+default_branch_helper = الفرع الافتراضي هو الفرع الأساسي لطلبات السحب ،وعمليات إلإيداع.
+mirror_use_ssh.helper = سيقوم Forgejo بعكس المستودع عبر Git عبر SSH وإنشاء زوج مفاتيح لك عند تحديد هذا الخيار. يجب عليك التأكد من أن المفتاح العام الذي تم إنشاؤه مخول للدفع إلى المستودع الوجهة. لا يمكنك استخدام التخويل المستند إلى كلمة المرور عند تحديد هذا الخيار.
+desc.private = خاص
+readme = README
+mirror_interval = الفاصل الزمني للمرآة (وحدات الوقت الصحيحة هي 'h' ،'m' ،'s'). 0 لتعطيل المزامنة الدورية. (الحد الأدنى: %s)
+desc.template = قالب
+desc.public = عام
+visibility = الرؤية
+migrate_options_mirror_helper = سيكون هذا المستودع مرآة
+adopt_preexisting_success = الملفات المعتمدة والمستودع الذي تم إنشاؤه من %s
+archive.title_date = تمت أرشفة هذا المستودع على %s. يمكنك عرض الملفات واستنساخه، لكن لا يمكنك إجراء أي تغييرات على حالته، مثل دفع وإنشاء بلاغات أو طلبات سحب أو تعليقات جديدة.
+migrate_options_lfs_endpoint.label = نقطة نهاية LFS
+transfer.reject_desc = إلغاء النقل إلى ”%s“
+archive.title = تمت أرشفة هذا المستودع. يمكنك عرض الملفات واستنساخه، لكن لا يمكنك إجراء أي تغييرات على حالته، مثل دفع وإنشاء بلاغات أو طلبات سحب أو تعليقات جديدة.
+stargazers = المميِّزون بنجمة
+form.reach_limit_of_creation_n = لقد وصل المالك بالفعل إلى الحد الأقصى للمستودعات %d.
+mirror_sync_on_commit = المزامنة عند دفع الإيداعات
+mirror_lfs_desc = تنشيط النسخ المتطابق لبيانات LFS.
+author_search_tooltip = عرض كحد أقصى 30 مستخدمًا
+template.git_content = محتوى Git (الفرع الافتراضي)
+need_auth = المصادقة
+migrate_options_lfs_endpoint.description.local = يتم دعم مسار الخادم المحلي أيضاً.
+template.one_item = يجب على الأقل تحديد عنصر قالب واحد
+archive.pull.noreview = هذا المستودع مؤرشف. لا يمكنك مراجعة طلبات السحب.
+migrate.clone_address = ترحيل / استنساخ من عنوان URL
+migrate.repo_desc_helper = اتركه فارغاً لاستيراد الوصف الموجود
+archive.nocomment = التعليق غير ممكن لأن المستودع تمت أرشفته.
+mirror_address_protocol_invalid = عنوان URL المقدم غير صالح. يمكن استخدام مواقع http(s):// أو git:// فقط للنسخ المتطابق.
+mirror_lfs_endpoint = نقطة نهاية LFS
+mirror_lfs_endpoint_desc = ستحاول المزامنة استخدام عنوان url المستنسخ إلى <a target="_blank" rel="noopener noreferrer" href="%s">تحديد خادم LFS</a>. يمكنك أيضًا تحديد نقطة نهاية مخصصة إذا كانت بيانات LFS المستودع مخزنة في مكان آخر.
+mirror_password_blank_placeholder = (بلا تعيين)
+delete_preexisting_success = الملفات المحذوفة غير المعتمدة في %s
+blame_prior = عرض النّقد قبل هذا التغيير
+blame.ignore_revs = جاري تجاهل المراجعات في <a href="%s">.git-blame-ignore-revs</a>. <a href="%s">انقر هنا لتجاوز</a> وعرض واجهة blame العادية.
+desc.archived = مؤرشف
+template.issue_labels = وسوم الإبلاغات
+sync_fork.branch_behind_one = هذا الفرع هو %[1]d إيداع خلف %[2]s
+sync_fork.button = مزامنة
+transfer.no_permission_to_reject = لا تملك الصلاحية لرفض هذا النقل.
+form.string_too_long = السلسلة المحددة أطول من d حرفاً.
+migrate_options = خيارات الترحيل
+migrate_options_lfs = ترحيل ملفات LFS
+migrate.clone_local_path = أو مسار خادم محلي
+mirror_password_help = تغيير اسم المستخدم لمسح كلمة المرور المخزنة.
+watchers = المراقبون
+template.items = عناصر القالب
+template.topics = المواضيع
+migrate_options_lfs_endpoint.placeholder = إذا تُركت فارغة، سيتم اشتقاق نقطة النهاية من عنوان URL المستنسخ
+migrate.clone_address_desc = رابط HTTP(S) أو Git لاستنساخ مستودع موجود
+migrate.github_token_desc = يمكنك وضع رمز فريد أو أكثر هنا مفصول بفواصل لجعل الترحيل أسرع من خلال التحايل على حد معدل GitHub API. تحذير: قد يؤدي إساءة استخدام هذه الميزة إلى انتهاك سياسة مزود الخدمة وقد يؤدي إلى حظر حسابك (حساباتك).
+transfer.no_permission_to_accept = لا تملك الصلاحية لقبول هذا النقل.
+transfer.reject = رفض النقل
+transfer.accept_desc = النقل إلى ”%s“
+desc.internal = داخلي
+summary_card_alt = بطاقة ملخص المستودع %s
+transfer.accept = قبول النقل
+blame.ignore_revs.failed = فشل تجاهل المراجعات في <a href="%s">.git-blame-ignore-revs</a>.
+form.name_pattern_not_allowed = النمط ”%s“ غير مسموح به في اسم المستودع.
+migrate_options_lfs_endpoint.description = سيحاول الترحيل استخدام مسار Git البعيد (remote) لـ <a target="_blank" rel="noopener noreferrer" href="%s">تحديد خادم LFS</a>. يمكنك أيضًا تحديد نقطة نهاية مخصصة إذا كانت بيانات LFS للمستودع مخزنة في مكان آخر.
+migrate_items = عناصر الترحيل
+adopt_preexisting_content = إنشاء مستودع من %s
+migrate_repo = ترحيل المستودع
+mirror_password_placeholder = (لم يتم تعديله)
+sync_fork.branch_behind_few = هذا الفرع هو %[1]d إيداعات خلف %[2]s
+mirror_address_desc = ضع أي بيانات اعتماد مطلوبة في قسم المصادقة.
+mirror_last_synced = آخر مزامنة
+mirror_lfs = تخزين الملفات الكبيرة (LFS)
+stars_remove_warning = سيؤدي ذلك إلى إزالة جميع النجوم من هذا المستودع.
+reactions_more = و %d أكثر
+template.invalid = يجب تحديد مستودع القوالب
+adopt_search = أدخل اسم المستخدم للبحث عن مستودعات غير معتمدة... (اتركه فارغاً للعثور على الكل)
+adopt_preexisting = اعتماد الملفات الموجودة مسبقاً
+language_other = أُخرى
+adopt_preexisting_label = اعتماد الملفات
+form.reach_limit_of_creation_1 = لقد وصل المالك بالفعل إلى الحد الأقصى للمستودع %d.
+form.name_reserved = تم حجز اسم المستودع ”%s“.
+mirror_address_url_invalid = عنوان URL المقدم غير صالح. تأكد من تحرير مكونات عنوان URL بشكل صحيح.
+migrate.migrate = الترحيل من %s
+migrate.gogs.description = ترحيل البيانات من notabug.org أو مثيلات Gogs الأخرى.
+migrate.onedev.description = ترحيل البيانات من code.onedev.io أو مثيلات OneDev الأخرى.
+migrate.migrating_topics = ترحيل المواضيع
+migrate.cancel_migrating_title = إلغاء الترحيل
+generated_from = تم توليده من
+star_guest_user = قم بتسجيل الدخول لإعطاء نجمة لهذا المستودع.
+subscribe.pull.guest.tooltip = سجّل الدخول للاشتراك في طلب السحب هذا.
+unwatch = إلغاء المشاهدة
+quick_guide = دليل سريع
+empty_message = لا يحتوي هذا المستودع على أي محتوى.
+migrate.migrating_labels = ترحيل الوسوم
+migrate.migrating_releases = ترحيل الإصدارات
+watch_guest_user = سجّل الدخول لمشاهدة هذا المستودع.
+star = نجمة
+cite_this_repo = الاستشهاد بهذا المستودع
+no_desc = لا يوجد وصف
+migrate.github.description = ترحيل البيانات من github.com أو خادم GitHub Enterprise.
+migrated_from_fake =تم الترحيل من %[1]s
+clone_this_repo = استنسخ هذا المستودع
+fork_from_self = لا يمكنك اشتقاق مستودع تملكه.
+fork_guest_user = سجّل الدخول لاشتقاق هذا المستودع.
+subscribe.issue.guest.tooltip = سجّل الدخول للاشتراك في هذا البلاغ.
+more_operations = المزيد من العمليات
+push_exist_repo = دفع مستودع موجود من موجّه الأوامر
+broken_message = لا يمكن قراءة بيانات Git التي يستند إليها هذا المستودع. اتصل بمسؤول هذا المثيل أو احذف هذا المستودع.
+migrate.git.description = ترحيل مستودع فقط من أي خدمة Git.
+watch = شاهد
+migrate.migrating_git = ترحيل بيانات Git
+migrate.gitea.description = ترحيل البيانات من gitea.com أو مثيلات Gitea الأخرى.
+migrate.gitbucket.description = ترحيل البيانات من مثيلات GitBucket.
+migrate.cancel_migrating_confirm = تريد إلغاء عملية الترحيل هذه؟
+migrate.permission_denied_blocked = لا يمكنك الاستيراد من مضيفين غير مسموح بهم، يُرجى الطلب من المسؤول التحقق من إعدادات ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
+migrate.gitlab.description = ترحيل البيانات من gitlab.com أو مثيلات GitLab الأخرى.
+migrate.migrating = الترحيل من <b>%s</b> …
+migrate.migrating_failed.error = أخفق الترحيل: %s
+migrate.codebase.description = ترحيل البيانات من codebasehq.com.
+migrate.invalid_local_path = المسار المحلي غير صالح. فهو غير موجود أو ليس مجلداً.
+migrate.permission_denied = لا يُسمح لك باستيراد المستودعات المحلية.
+migrate.failed = أخفق الترحيل: %v
+migrate.migrate_items_options = رمز الوصول الفريد مطلوب لترحيل العناصر الإضافية
+migrated_from = تم الترحيل من <a href="%[1]s">%[2]s</a>
+mirror_from = مرآة لـ
+forked_from = مشتقّ من
+create_new_repo_command = إنشاء مستودع جديد على موجّه الأوامر
+fork = اشتقاق
+migrate.migrating_failed_no_addr = أخفق الترحيل.
+unstar = إزالة النجمة
+migrate.migrating_issues = ترحيل البلاغات
+migrate.migrating_pulls = ترحيل طلبات السحب
+code = الكود
+migrate.invalid_lfs_endpoint = نقطة نهاية LFS غير صالحة.
+migrate.migrating_failed = فشل الترحيل من <b>%s</b>.
+branch = فرع
+template.git_hooks_tooltip = يتعذر عليك حاليًا تعديل أو إزالة خطافات Git بمجرد إضافتها. حدد هذا فقط إذا كنت تثق بمستودع القالب.
+code.desc = الوصول إلى الشيفرة المصدرية والملفات والالتزامات والفروع.
+tree = شجرة
+clear_ref = 'مسح المرجع الحالي'
+project = المشارييع
+filter_branch_and_tag = تصفية الفرع أو العلامة
+find_tag = البحث عن علامة
+commit_graph = الرسم البياني للإيداع
+editor.edit_this_file = عدل الملف
+editor.signoff_desc = أضف مقطورة موقّعة من قِبل المُجرّد في نهاية رسالة سجل الدخول.
+n_release_one = %s إصدار
+symbolic_link = رابط رمزي
+editor.cannot_edit_lfs_files = لا يمكن تحرير ملفات LFS في واجهة الويب.
+editor.this_file_locked = الملف مقفل
+n_commit_few = %s إيداعات
+editor.file_delete_success = تم حذف الملف "%s".
+editor.edit_file = عدّل الملف
+commit.contained_in_default_branch = هذا الإيداع جزء من الفرع الافتراضي
+line = سطر
+lines = أسطر
+normal_view = عرض عادي
+n_branch_one = %s فرع
+n_commit_one = %s إيداع
+view_git_blame = عرض مسؤول تعديل git
+editor.add_tmpl.filename = اسم الملف
+editor.name_your_file = اسم ملفك…
+editor.propose_file_change = اقتراح تغيير الملف
+editor.new_branch_name = تسمية الفرع الجديد لهذا الإيداع
+from_comment = (تعليق)
+no_eol.text = لا EOL
+no_eol.tooltip = هذا الملف لا يحتوي على نهاية لخط الشخصية.
+stored_lfs = مخزن مع Git LFS
+commit.contained_in = هذا الإيداع موجود في:
+file_view_rendered = عرض المُخرج النهائي
+n_branch_few = %s فروع
+n_tag_one = %s علامة
+n_tag_few = ‪%s علامات
+n_release_few = %s إصدارات
+file.title = %s عند %s
+vendored = مضمن
+file_follow = متابعة الروابط الرمزية
 
 [mail]
 admin.new_user.text = من فضلك <a href="%s">اضغط هنا</a> لإدارة هذا المستخدم من لوحة الإدارة.
@@ -1385,6 +1723,21 @@ repo.transfer.subject_to = %s يود نقل ملكية "%s" إلى %s
 issue.action.ready_for_review = <b>@%[1]s</b> علّم هذا الطلب للسحب كجاهز للمراجعة.
 issue_assigned.pull = @%[1]s عيّنك إلى طلب سحب %[2]s في مستودع %[3]s.
 issue.action.review_dismissed = <b>@%[1]s</b> أستبعد آخر مراجعة من %[2]s لهذا الطلب للسحب.
+password_change.subject = تم تغيير كلمة مرورك
+totp_disabled.subject = تم تعطيل TOTP
+totp_disabled.text_1 = تم تعطيل كلمة المرور لمرة واحدة المستندة إلى الوقت (TOTP) على حسابك للتو.
+totp_enrolled.text_1.has_webauthn = لقد قمت للتو بتمكين TOTP لحسابك. هذا يعني أنه بالنسبة لجميع عمليات تسجيل الدخول المستقبلية إلى حسابك، يمكنك استخدام TOTP كطريقة للمصادقة الثنائية ، أو استخدام أي من مفاتيح الأمان الخاصة بك.
+totp_enrolled.subject = لقد قمت بتشيط TOTP كطريقة 2FA
+removed_security_key.subject = تمت إزالة مفتاح الأمان
+removed_security_key.text_1 = تم إزالة مفتاح الأمان ”%[1] s“ للتو من حسابك.
+account_security_caution.text_1 = إذا كان هذا أنت، فيمكنك تجاهل هذا البريد بأمان.
+totp_disabled.no_2fa = لم تعد هناك طرق أُخرى للمصادقة الثنائية (2FA) قيد التهيئة عد الآن ، أي أنه لم يعد من الضروري تسجيل الدخول إلى حسابك باستخدام المصادقة الثنائية (2FA).
+removed_security_key.no_2fa = لم تعد هناك طرق أخرى للمصادقة الثنائية (2FA) قيد التهيئة بعد الآن، أي لم يعد من الضروري تسجيل الدخول إلى حسابك باستخدام المصادقة الثنائية (2FA).
+primary_mail_change.subject = تم تغيير البريد الأساسي الخاص بك
+password_change.text_1 = تم تغيير كلمة مرور حسابك للتو.
+primary_mail_change.text_1 = تم تغيير البريد الإلكتروني الأساسي لحسابك إلى %[1]s. هذا يعني أن عنوان البريد الإلكتروني هذا لن يتلقى إشعارات البريد لحسابك بعد الآن.
+account_security_caution.text_2 = إذا لم تكن أنت، فهذا يعني أن حسابك مخترق. يرجى الاتصال بمسؤولي هذا الموقع.
+totp_enrolled.text_1.no_webauthn = لقد قمت للتو بتمكين TOTP لحسابك. هذا يعني أنه بالنسبة لجميع عمليات تسجيل الدخول المستقبلية إلى حسابك، يجب عليك استخدام TOTP كطريقة للمصادقة الثنائية.
 
 [error]
 not_found = تعذر العثور على الهدف.
@@ -1420,7 +1773,7 @@ joined_on = انضم في %s
 user_bio = السيرة الذاتية
 repositories = المستودعات
 activity = النشاط العام
-projects = مشاريع
+projects = المشاريع
 unfollow = إلغِ المتابعة
 settings = إعدادات المستخدم
 following_few = %d يتابع
@@ -1428,7 +1781,7 @@ follow = تابع
 followers_few = %d متابعين
 form.name_reserved = اسم المستخدم "%s" محجوز.
 email_visibility.limited = عنوان بريدك الإلكتروني ظاهر لكل المستخدمين المُستَوثَقين
-code = البرمجية
+code = الكود
 overview = نظرة عامة
 watched = المستودعات المشاهدة
 disabled_public_activity = هذا المستخدم عطّل الظهور العام للنشاط.
@@ -1437,6 +1790,17 @@ email_visibility.private = عنوان بريدك الإلكتروني ظاهر 
 starred = المستودعات المميّزة بنجمة
 form.name_chars_not_allowed = اسم المستخدم "%s" يحتوي على رموز غير صالحة.
 form.name_pattern_not_allowed = النمط "s%" غير مسموح به في إسم المستخدم.
+followers.title.one = متابِع
+public_activity.visibility_hint.admin_private = هذا النشاط مرئي لك لأنك مسؤول، ولكن المستخدم يريد أن يظل خاصاً.
+public_activity.visibility_hint.self_private = نشاطك مرئي لك ولسُعاة المثيل فقط. <a href="%s">تعديل الإعدادات</a>.
+followers_one = %d متابِع
+following.title.one = متابعة
+followers.title.few = متابعين
+following_one = %d يُتابع
+following.title.few = متابعة
+public_activity.visibility_hint.self_public = نشاطك مرئي للجميع، باستثناء التفاعلات في المساحات الخاصة. <a href="%s">اضبط الإعدادات</a>.
+public_activity.visibility_hint.admin_public = هذا النشاط مرئي للجميع، ولكن بصفتك مسؤولاً يمكنك أيضًا رؤية التفاعلات في المساحات الخاصة.
+public_activity.visibility_hint.self_private_profile = نشاطك مرئي لك ولسُعاة المثيل فقط لأن ملفك الشخصي خاص. <a href="%s">تعديل الإعدادات</a>.
 
 [auth]
 change_unconfirmed_email_error = تعذر تغيير البريد الإلكتروني: %v
@@ -1457,11 +1821,11 @@ active_your_account = فعّل حسابك
 register_helper_msg = هل لديك حساب بالفعل؟ سجل الدخول!
 manual_activation_only = تواصل مع مدير موقعك لإكمال التفعيل.
 must_change_password = حدّث كلمة المرور الخاصة بك
-send_reset_mail = أرسل رسالة استعادة حساب
+send_reset_mail = أرسل بريد الاستعادة
 resend_mail = اضغط هنا لإعادة إرسالة رسالة تفعيل حسابك
 has_unconfirmed_mail = أهلا يا %s، لديك عنوان بريد إلكتروني غير مؤكَّد (<b>%s</b>). إن لم تستلم رسالة تأكيد أو تريد إرسال واحدة جديدة، فنرجو الضغط على الزر الذي بالأسفل.
 email_not_associate = عنوان البريد هذا غير مرتبط بأي حساب.
-reset_password = استعادة حساب
+reset_password = استعادة الحساب
 oauth_signin_tab = أربط بحساب موجود
 invalid_password = كلمة المرور الخاصة بك لا تطابق كلمة المرور التي استخدمت لتسجيل الحساب.
 oauth_signin_title = سجّل الدخول لتأذن للحساب المربوط
@@ -1482,13 +1846,13 @@ reset_password_wrong_user = أنت مُسجل كـ %s، لكن رابط أعاد
 openid_connect_title = اتصل بحساب موجود
 confirmation_mail_sent_prompt = تم إرسال بريد تأكيد جديد إلى <b>%s</b>. يرجى التأكد من صندوق بريدك في خلال %s حتى تكتمل عملية التسجيل. إذا كان عنوان البريد خاطئ، يمكنك تسجيل الدخول وطلب بريد تأكيد جديد يُرسل إلى عنوان آخر.
 scratch_code = رمز الخدش
-invalid_code_forgot_password = رمز تأكيدك غير صحيح أو انتهى اضغط <a href="%s">هنا</a> للإعادة.
+invalid_code_forgot_password = رمز تأكيدك غير صحيح أو انتهت صلاحيته. اضغط <a href="%s">هنا</a> للإعادة.
 openid_register_title = أنشئ حسابًا جديدًا
 verify = تحقق
 twofa_scratch_used = لقد استخدمت رمز الخدش الخاص بك. لقد تم إعادة توجيهك إلى إعدادات المصادقة الثنائية حتى يمكنك إزالة تسجيل جهازك أو توليد رمز خدش جديد.
 oauth_signup_submit = أكمل الحساب
 oauth.signin.error = كان هناك خطأ في تجهيز طلب الإذن إذا استمر هذا الخطأ، يرجى الاتصال بالمدير.
-invalid_code = رمز تأكيدك غير صحيح أو انتهى.
+invalid_code = رمز تأكيدك غير صحيح أو انتهت صلاحيته.
 oauth_signup_title = أكمل حساب جديد
 resent_limit_prompt = لقد طلبت بالفعل بريداً إلكترونياً للتفعيل مؤخراً من فضلك انتظر 3 دقائق وحاول مرة أخرى.
 reset_password_mail_sent_prompt = تم إرسال بريد تأكيد جديد إلى <b>%s</b>. يرجى التأكد من صندوق بريدك في خلال %s حتى تكتمل عملية استعادة الحساب.
@@ -1512,6 +1876,13 @@ openid_register_desc = مسار الـOpenID المختار مجهول. اربط
 remember_me = تذكر هذا الجهاز
 remember_me.compromised = رمز الاحتفاظ بتسجيل الدخول لم يعد صالحا، مما قد يعني اختراق الحساب. نرجو مراجعة حسابك لرؤية أي نشاط غير مألوف.
 authorization_failed_desc = فشل التفويض لأننا اكتشفنا طلبًا غير صالح. يرجى الاتصال بمشرف التطبيق الذي حاولت ترخيصه.
+sign_in_openid = المتابعة باستخدام OpenID
+hint_login = لديك حساب بالفعل؟ <a href="%s">سجّل الدخول الآن!</a>
+hint_register = يلزمك حساب ؟ <a href="%s">سجِّل الآن.</a>
+sign_up_button = سجِّل الآن.
+back_to_sign_in = العودة إلى تسجيل الدخول
+use_onetime_code = استخدم رمزًا لمرة واحدة
+unauthorized_credentials = بيانات الاعتماد غير صحيحة أو انتهت صلاحيتها. أعد محاولة تنفيذ الأمر أو راجع %s لمزيد من المعلومات
 
 [packages]
 rpm.repository.multiple_groups = هذه الحزمة متوفرة في مجموعات متعددة.
@@ -1555,6 +1926,9 @@ less = أقل
 number_of_contributions_in_the_last_12_months = %s مساهم في آخر 12 شهر
 contributions_zero = بلا مساهمات
 more = أكثر
+contributions_format = {contributions} مساهمة في {day} {month} {year}
+contributions_one = المساهمة
+contributions_few = المساهمات
 
 [admin]
 self_check.database_fix_mysql = لمستخدمين ميسكول/ماريا دي بي، يمكنك استخدام أمر "forgejo doctor convert" لإصلاح مشاكل التجمّع، أو يمكنك أيضاً إصلاح المشكلة عن طريق تعديل السيكول يدوياً.
@@ -1706,7 +2080,7 @@ enterred_invalid_org_name = اسم المنظمة التي أدخلته خطأ.
 lang_select_error = اختر لغة من القائمة.
 alpha_dash_error = ` لا يجب أن يحتوي إلا على الحروف الإنجليزية والأرقام والشرطة ("-") والشرطة السفلية ("_").`
 alpha_dash_dot_error = ` لا يجب أن يحتوي إلا على الحروف الإنجليزية والأرقام والشرطة ("-") والشرطة السفلية ("_") والنقطة (".").`
-repo_name_been_taken = اسم المستودع مستعمل بالفعل.
+repo_name_been_taken = اسم المستودع مستخدم بالفعل.
 Email = البريد الإلكتروني
 auth_failed = فشل الاستيثاق: %v
 email_error = ` ليس عنوان بريد إلكتروني صالح.`
@@ -1726,10 +2100,10 @@ still_has_org = "حسابك عضو في منظمة أو أكثر؛ غادرهم
 repository_files_already_exist.adopt_or_delete = الملفات موجودة بالفعل لهذا المستودع. إما اعتمادها أو حذفها.
 repository_files_already_exist.delete = الملفات موجودة بالفعل لهذا المستودع. يجب عليك حذفها.
 repository_files_already_exist.adopt = الملفات موجودة بالفعل لهذا المستودع ويمكن اعتمادها فقط.
-repository_files_already_exist = الملفات موجودة بالفعل لهذا المستودع. تواصل مع مدير النظام.
+repository_files_already_exist = الملفات موجودة بالفعل لهذا المستودع. اتصل بمدير النظام.
 TeamName = اسم الفريق
 username_has_not_been_changed = لم يتم تغيير اسم المستخدم
-username_change_not_local_user = المستخدمين غير المحليين غير مسموح لهم بتغيير أسماؤهم.
+username_change_not_local_user = المستخدمين غير المحليين غير مسموح لهم بتغيير أسمائهم.
 captcha_incorrect = الكابتشا خاطئة.
 AdminEmail = عنوان البريد الإلكتروني للمدير
 team_no_units_error = اسمح بالوصول إلى قسم واحد على الأقل في المستودعات.
@@ -1756,6 +2130,23 @@ glob_pattern_error = `النمط الشامل غير صالح: %s.`
 CommitChoice = إختيار الإداع
 regex_pattern_error = ` نمط التعبير النمطي غير صالح: %s.`
 username_error = ` يُمكنه أن يحتوي على حروف إنجليزية وأرقام وشرطة ("-") وشرطة سفلية ("_") و نقطة (".") فقط. ويمكنه ان يبدأ وينتهي بحرف او برقم.`
+Biography = النبذة
+Website = موقع الويب
+To = اسم الفرع
+AccessToken = رمز الوصول
+repository_force_private = وضع الخاص الإجباري مفعّل: لا يمكن تحويل المستودعات الخاصة إلى عامة.
+FullName = الاسم الكامل
+Description = الوصف
+Pronouns = الضمائر
+username_claiming_cooldown = لا يمكن المطالبة باسم المستخدم، لأن فترة تباطؤه لم تنتهِ بعد. يمكن المطالبة به عند %[1]s.
+Location = الموقع
+invalid_group_team_map_error = ` التعيين غير صالح: %s `
+visit_rate_limit = تناولت الزيارة عن بُعد الحد من معدلها.
+email_domain_is_not_allowed = نطاق البريد الإلكتروني للمستخدم <b>%s</b> يتعارض مع قائمة النطاقات المسموحة ، أو الممنوعة. يرجى التأكد من إدخال عنوان البريد الإلكتروني بشكل صحيح.
+unset_password = المستخدم المسجل لم يقم بتعيين كلمة مرور.
+unsupported_login_type = نوع تسجيل الدخول غير مدعوم لحذف الحساب.
+invalid_ssh_principal = أصل غير صالح: %s
+required_prefix = المُدخل يجب أن يبدأ مع "%s"
 
 [home]
 filter = تصفيات أخرى
@@ -1802,6 +2193,10 @@ code_no_results = لم يتم العثور على برمجية تطابق الب
 relevant_repositories_tooltip = تم أخفاء المستودعات التي هي مشتقات وأيضاً التي ليس لها موضوع، ولا أيقونة، ولا يوجد وصف.
 relevant_repositories = يتم اظهار المستودعات المتعلقة فقط. <a href="%s">أظهر النتائج غير المصفاة</a>.
 code_last_indexed_at = فُهرس آخر مرة %s
+stars_few = %d نجوم
+forks_one = %d نسخة
+forks_few = %d نُسَخ
+stars_one = %d نجمة
 
 [actions]
 variables.none = لا توجد متغيرات بعد.
@@ -1973,21 +2368,30 @@ component_failed_to_load = حدث خطأ غير متوقع.
 
 
 [search]
-org_kind = بحث في المنظمات...
+org_kind = بحث في المنظمات…
 code_search_unavailable = البحث في الكود غير متوفر حاليًا. يرجى الاتصال بمدير الموقع.
-search = ابحث...
+search = البحث…
 type_tooltip = نوع البحث
 fuzzy = أجعد
 fuzzy_tooltip = قم بتضمين النتائج التي تتطابق أيضًا مع مصطلح البحث بشكل وثيق
 match = تتناسب
 match_tooltip = قم بتضمين النتائج التي تطابق مصطلح البحث المحدد فقط
-repo_kind = بحث في المستودعات...
-user_kind = بحث عن المستخدمين...
-team_kind = بحث عن الفرق ...
-code_kind = بحث في الكود...
-project_kind = البحث ضمن المشاريع...
-branch_kind = البحث ضمن الفروع...
+repo_kind = بحث في المستودعات…
+user_kind = بحث عن المستخدمين…
+team_kind = بحث عن الفرق…
+code_kind = بحث ضمن الكود…
+project_kind = البحث ضمن المشاريع…
+branch_kind = البحث ضمن الفروع…
 no_results = لا توجد نتائج مطابقة.
-issue_kind = البحث ضمن الأعطال...
-pull_kind = البحث ضمن طلبات السحب...
+issue_kind = البحث ضمن الأعطال…
+pull_kind = البحث ضمن طلبات السحب…
 keyword_search_unavailable = البحث من خلال الكلمات المفتاحية ليس متوفر حالياً. رجاءاً تواصل مع مشرف الموقع.
+package_kind = البحث ضمن الحزم…
+regexp_tooltip = تعامل مع عبارة البحث على أنها تعبير نمطي
+commit_kind = البحث ضمن الإيداعات…
+union = مطابقة عامة
+runner_kind = البحث ضمن المشغِّلات…
+exact = مطابق
+exact_tooltip = عرض النتائج التي تطابق مصطلح البحث بالضبط فقط
+regexp = RegExp
+union_tooltip = عرض النتائج التي تطابق أي من الكلمات المفتاحية المفصولة بمسافات
diff --git a/options/locale/locale_be.ini b/options/locale/locale_be.ini
index fe04dadc3e..25aff3019c 100644
--- a/options/locale/locale_be.ini
+++ b/options/locale/locale_be.ini
@@ -7,10 +7,20 @@ sign_in = Увайсці
 sign_in_or = або
 sign_out = Выйсці
 sign_up = Зарэгістравацца
-link_account = Звязаць Уліковы запіс
+link_account = Звязаць уліковы запіс
 register = Рэгістрацыя
 version = Версія
 powered_by = Працуе на ℅s
 page = Старонка
 home = Галоўная Старонка
-sign_in_with_provider = Увайсці з %s
\ No newline at end of file
+sign_in_with_provider = Увайсці з %s
+template = Шаблон
+language = Мова
+notifications = Апавяшчэнні
+create_new = Стварыць…
+user_profile_and_more = Профіль і налады…
+signed_in_as = Увайшоў як
+enable_javascript = Гэты вэб-сайт патрабуе JavaScript.
+toc = Змест
+licenses = Ліцэнзіі
+return_to_forgejo = Вярнуцца да Forgejo
\ No newline at end of file
diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini
index 6fc4b55eae..a1e9aa4aba 100644
--- a/options/locale/locale_bg.ini
+++ b/options/locale/locale_bg.ini
@@ -11,7 +11,7 @@ copy_content = Копиране на съдържанието
 user_profile_and_more = Профил и настройки…
 view = Преглед
 your_settings = Настройки
-mirrors = Огледала
+mirrors = Огледални
 explore = Разглеждане
 write = Писане
 twofa = Двуфакторно удостоверяване
@@ -36,7 +36,7 @@ dashboard = Табло
 logo = Лого
 toc = Съдържание
 copy_url = Копиране на URL
-new_mirror = Ново огледало
+new_mirror = Ново огледално
 re_type = Потвърдете паролата
 copy = Копиране
 enabled = Включено
@@ -61,7 +61,7 @@ ok = Добре
 manage_org = Управление на организациите
 new_repo = Ново хранилище
 register = Регистрация
-mirror = Огледало
+mirror = Огледално
 username = Потребителско име
 password = Парола
 template = Шаблон
@@ -69,7 +69,7 @@ signed_in_as = Влезли сте като
 sign_up = Регистриране
 enable_javascript = Този сайт изисква JavaScript.
 home = Начало
-email = Адрес на ел. поща
+email = Адрес за ел. поща
 issues = Задачи
 retry = Повторен опит
 remove = Премахване
@@ -93,8 +93,8 @@ filter.not_fork = Не разклонения
 filter.is_template = Шаблони
 filter.not_template = Не шаблони
 filter.private = Частни
-filter.is_mirror = Огледала
-filter.not_mirror = Не огледала
+filter.is_mirror = Огледални
+filter.not_mirror = Не огледални
 copy_hash = Копиране на контролната сума
 artifacts = Артефакти
 show_log_seconds = Показване на секундите
@@ -102,7 +102,7 @@ remove_all = Премахване на всичко
 test = Проба
 remove_label_str = Премахване на елемента „%s“
 copy_branch = Копиране на името на клона
-error404 = Страницата, която се опитвате да отворите, или <strong>не съществува</strong> или <strong>не сте упълномощени</strong> да я видите.
+error404 = Страницата, която се опитвате да отворите, или <strong>не съществува</strong>, или <strong>е премахната</strong>, или <strong>не сте упълномощени</strong> да я видите.
 new_repo.link = Ново хранилище
 new_migrate.title = Нова миграция
 new_repo.title = Ново хранилище
@@ -112,6 +112,36 @@ new_org.link = Нова организация
 copy_generic = Копиране в клипборда
 copy_error = Неуспешно копиране
 copy_path = Копиране на пътя
+toggle_menu = Превключване на менюто
+confirm_delete_artifact = Сигурни ли сте, че искате да изтриете артефакта „%s“?
+more_items = Още елементи
+twofa_scratch = Резервен код за двуфакторно удостоверяване
+webauthn_use_twofa = Използвайте двуфакторен код от телефона си
+webauthn_error_insecure = WebAuthn поддържа само сигурни връзки. За тестване през HTTP можете да използвате произход „localhost“ или „127.0.0.1“
+error413 = Изчерпали сте квотата си.
+go_back = Връщане
+invalid_data = Невалидни данни: %v
+archived = Архивирано
+concept_system_global = Глобално
+concept_user_individual = Индивидуално
+show_full_screen = Показване на цял екран
+show_timestamps = Показване на времеви отпечатъци
+rerun = Повторно изпълнение
+copy_type_unsupported = Този тип файл не може да бъде копиран
+webauthn_error_unknown = Възникна неизвестна грешка. Моля, опитайте отново.
+webauthn_error_unable_to_process = Сървърът не можа да обработи заявката ви.
+webauthn_error_empty = Трябва да зададете име за този ключ.
+webauthn_error_timeout = Времето за изчакване изтече преди ключът ви да бъде прочетен. Моля, презаредете страницата и опитайте отново.
+return_to_forgejo = Връщане към Forgejo
+unknown = Неизвестно
+confirm_delete_selected = Потвърждавате ли изтриването на всички избрани елементи?
+webauthn_insert_key = Поставете вашия ключ за сигурност
+webauthn_press_button = Моля, натиснете бутона на вашия ключ за сигурност…
+webauthn_sign_in = Натиснете бутона на вашия ключ за сигурност. Ако ключът ви за сигурност няма бутон, поставете го отново.
+webauthn_error = Неуспешно прочитане на вашия ключ за сигурност.
+webauthn_unsupported_browser = Вашият браузър в момента не поддържа WebAuthn.
+webauthn_error_duplicated = Ключът за сигурност не е разрешен за тази заявка. Моля, уверете се, че ключът не е вече регистриран.
+tracked_time_summary = Обобщение на проследеното време въз основа на филтрите в списъка със задачи
 
 [settings]
 ui = Тема
@@ -157,7 +187,7 @@ account = Акаунт
 update_avatar = Обновяване на профилната снимка
 ssh_gpg_keys = SSH / GPG ключове
 comment_type_group_milestone = Етап
-manage_emails = Управление на адресите на ел. поща
+manage_emails = Управление на адресите за ел. поща
 permission_read = Четене
 update_password = Обновяване на паролата
 biography_placeholder = Разкажете на другите малко за себе си! (Можете да използвате Маркдаун)
@@ -183,7 +213,7 @@ user_block_success = Потребителят е блокиран успешно
 update_profile_success = Профилът ви е обновен.
 update_user_avatar_success = Профилната снимка на потребителя е обновена.
 remove_oauth2_application_success = Приложението е изтрито.
-email_deletion_success = Адресът на ел. поща е премахнат.
+email_deletion_success = Адресът за ел. поща е премахнат.
 update_avatar_success = Профилната ви снимка е обновена.
 change_username = Потребителското ви име е променено.
 comment_type_group_assignee = Изпълнител
@@ -191,22 +221,22 @@ enable_custom_avatar = Използване на персонализирана
 requires_activation = Изисква активиране
 activated = Активиран
 primary = Основен
-email_deletion = Премахване на адреса на ел. поща
-add_new_email = Добавяне на нов адрес на ел. поща
-add_email = Добавяне на адрес на ел. поща
+email_deletion = Премахване на адреса за ел. поща
+add_new_email = Добавяне на нов адрес за ел. поща
+add_email = Добавяне на адрес за ел. поща
 key_content_gpg_placeholder = Започва с „-----BEGIN PGP PUBLIC KEY BLOCK-----“
 comment_type_group_title = Заглавие
 comment_type_group_label = Етикет
-change_username_prompt = Забележка: Промяната на потребителското ви име променя също URL на вашия акаунт.
+change_username_prompt = Бележка: Промяната на потребителското ви име променя също URL на вашия акаунт.
 update_language_not_found = Езикът „%s“ не е наличен.
 keep_activity_private_popup = Вашата дейност ще бъде видима само за вас и администраторите на сайта
 uploaded_avatar_not_a_image = Каченият файл не е изображение.
 uploaded_avatar_is_too_big = Размерът на качения файл (%d KiB) надвишава максималния размер (%d KiB).
-change_password_success = Паролата ви е обновена. Влизайте с новата си парола от сега нататък.
+change_password_success = Паролата ви е обновена. Отсега нататък използвайте новата си парола, за да влезете.
 manage_themes = Тема по подразбиране
 manage_openid = OpenID адреси
 primary_email = Да е основен
-keep_email_private = Скриване на адреса на ел. поща
+keep_email_private = Скриване на адреса за ел. поща
 theme_update_error = Избраната тема не съществува.
 theme_update_success = Темата ви е обновена.
 key_content_ssh_placeholder = Започва с „ssh-ed25519“, „ssh-rsa“, „ecdsa-sha2-nistp256“, „ecdsa-sha2-nistp384“, „ecdsa-sha2-nistp521“, „sk-ecdsa-sha2-nistp256@openssh.com“, или „sk-ssh-ed25519@openssh.com“
@@ -227,7 +257,7 @@ saved_successfully = Настройките бяха запазени успеш
 no_activity = Няма скорошна дейност
 theme_desc = Тази тема ще се използва за уеб интерфейса, когато сте влезли.
 keep_activity_private = Скриване на дейността от профилната страница
-lookup_avatar_by_mail = Търсене на профилна снимка по адреса на ел. поща
+lookup_avatar_by_mail = Търсене на профилна снимка по адреса за ел. поща
 password_incorrect = Текущата парола е неправилна.
 change_username_redirect_prompt = Старото потребителско име ще се пренасочва, докато някой не го вземе.
 principal_content = Съдържание
@@ -246,7 +276,7 @@ delete_prompt = Тази операция ще изтрие перманентн
 email_notifications.disable = Изключване на известията по ел. поща
 delete_account = Изтриване на акаунта ви
 confirm_delete_account = Потвърждаване на изтриването
-email_notifications.onmention = Ел. поща само при споменаване
+email_notifications.onmention = Ел. писмо само при споменаване
 pronouns_unspecified = Непосочени
 pronouns = Местоимения
 gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig
@@ -254,8 +284,116 @@ language.title = Език по подразбиране
 language.localization_project = Помогнете ни да преведем Forgejo на вашия език! <a href="%s">Научете повече</a>.
 language.description = Този език ще бъде запазен във вашия акаунт и ще се използва като език по подразбиране, след като влезете.
 pronouns_custom = Персонализирани
-visibility.limited_tooltip = Видимо само за влезли потребители
+visibility.limited_tooltip = Видим само за влезли потребители
 pronouns_custom_label = Персонализирани местоимения
+comment_type_group_review_request = Искане за рецензия
+ssh_key_been_used = Този SSH ключ вече е добавен към сървъра.
+create_oauth2_application = Създаване на ново OAuth2 приложение
+update_oauth2_application_success = Успешно обновихте OAuth2 приложението.
+authorized_oauth2_applications = Упълномощени OAuth2 приложения
+manage_account_links = Свързани акаунти
+revoke_oauth2_grant = Отнемане на достъпа
+added_on = Добавен на %s
+comment_type_group_dependency = Зависимост
+update_hints_success = Подсказките са обновени.
+manage_oauth2_applications = Управление на OAuth2 приложения
+gpg_key_id_used = Вече съществува публичен GPG ключ със същото ID.
+oauth2_applications_desc = OAuth2 приложенията позволяват на вашето приложение от трета страна да удостоверява сигурно потребители в тази инстанция на Forgejo.
+blocked_since = Блокиран от %s
+hidden_comment_types.ref_tooltip = Коментари, в които тази задача е спомената от друга задача/подаване/…
+create_oauth2_application_success = Успешно създадохте ново OAuth2 приложение.
+quota.applies_to_org = Следните правила за квота се прилагат за тази организация
+keep_activity_private.description = Вашата <a href="%s">публична дейност</a> ще бъде видима само за вас и администраторите на инстанцията.
+ssh_helper = <strong>Нуждаете се от помощ?</strong> Разгледайте ръководството за <a href="%s">създаване на собствени SSH ключове</a> или за решаване на <a href="%s">често срещани проблеми</a>, които може да срещнете при използване на SSH.
+twofa_desc = За да защитите акаунта си от кражба на парола, можете да използвате смартфон или друго устройство за получаване на еднократни пароли, базирани на време („TOTP“).
+scan_this_image = Сканирайте това изображение с вашето приложение за удостоверяване:
+quota.rule.exceeded.helper = Общият размер на обектите за това правило надвиши квотата.
+password_change_disabled = Нелокални потребители не могат да обновяват паролата си през уеб интерфейса на Forgejo.
+twofa_disable_note = Можете да изключите двуфакторното удостоверяване, ако е необходимо.
+hooks.desc = Добавете уеб-куки, които ще се задействат за <strong>всички хранилища</strong>, които притежавате.
+delete_account_desc = Сигурни ли сте, че искате да изтриете перманентно този потребителски акаунт?
+last_used = Последно използван на
+revoke_oauth2_grant_description = Отнемането на достъпа за това приложение от трета страна ще му попречи да има достъп до вашите данни. Сигурни ли сте?
+password_username_disabled = Нелокални потребители не могат да променят потребителското си име. Моля, свържете се с администратора на сайта за повече подробности.
+change_username_redirect_prompt.with_cooldown.one = Старото потребителско име ще бъде достъпно за всички след период на изчакване от %[1]d ден. Все още можете да си върнете старото потребителско име по време на периода на изчакване.
+change_username_redirect_prompt.with_cooldown.few = Старото потребителско име ще бъде достъпно за всички след период на изчакване от %[1]d дни. Все още можете да си върнете старото потребителско име по време на периода на изчакване.
+generate_token_name_duplicate = <strong>%s</strong> вече е използвано като име на приложение. Моля, използвайте ново.
+quota.rule.exceeded = Надвишена
+repo_and_org_access = Достъп до хранилища и организации
+permissions_public_only = Само публични
+permissions_list = Разрешения:
+edit_oauth2_application = Редактиране на OAuth2 приложение
+remove_oauth2_application = Премахване на OAuth2 приложение
+twofa_recovery_tip = Ако загубите устройството си, ще можете да използвате ключ за еднократно възстановяване, за да си върнете достъпа до акаунта.
+visibility.private_tooltip = Видим само за участници в организации, в които участвате
+quota.applies_to_user = Следните правила за квота се прилагат за вашия акаунт
+quota.rule.no_limit = Неограничена
+hints = Подсказки
+comment_type_group_issue_ref = Препратка към задача
+activate_email = Изпращане на активация
+ssh_disabled = SSH е изключен
+twofa_disable_desc = Изключването на двуфакторното удостоверяване ще направи акаунта ви по-малко сигурен. Продължаване?
+keep_pronouns_private = Показване на местоименията само на удостоверени потребители
+keep_pronouns_private.description = Това ще скрие вашите местоимения от посетители, които не са влезли в системата.
+gpg_helper = <strong>Нуждаете се от помощ?</strong> Разгледайте ръководството <a href="%s">относно GPG</a>.
+valid_until_date = Валиден до %s
+ssh_externally_managed = Този SSH ключ се управлява външно за този потребител
+regenerate_scratch_token_desc = Ако сте загубили ключа си за възстановяване или вече сте го използвали, за да влезете, можете да го нулирате тук.
+create_oauth2_application_button = Създаване на приложение
+revoke_oauth2_grant_success = Достъпът е отнет успешно.
+comment_type_group_deadline = Краен срок
+comment_type_group_time_tracking = Проследяване на времето
+activations_pending = Чакащи активации
+valid_forever = Валиден завинаги
+key_state_desc = Този ключ е използван през последните 7 дни
+revoke_key = Отнемане
+delete_account_title = Изтриване на потребителския акаунт
+update_hints = Обновяване на подсказките
+permissions_access_all = Всички (публични, частни и ограничени)
+oauth2_application_name = Име на приложението
+visibility.public_tooltip = Видим за всички
+user_block_yourself = Не можете да блокирате себе си.
+hidden_comment_types.issue_ref_tooltip = Коментари, в които потребителят променя клона/маркера, свързан със задачата
+comment_type_group_reference = Препратка
+comment_type_group_branch = Клон
+comment_type_group_pull_request_push = Добавени подавания
+quota = Квота
+webauthn_delete_key = Премахване на ключ за сигурност
+webauthn_register_key = Добавяне на ключ за сигурност
+webauthn_nickname = Прякор
+webauthn_delete_key_desc = Ако премахнете ключ за сигурност, вече няма да можете да влизате с него. Продължаване?
+additional_repo_units_hint = Предлагане за включване на допълнителни елементи на хранилището
+twofa_is_enrolled = Вашият акаунт в момента е <strong>включен</strong> в двуфакторно удостоверяване.
+twofa_not_enrolled = Вашият акаунт в момента не е включен в двуфакторно удостоверяване.
+webauthn_key_loss_warning = Ако загубите ключовете си за сигурност, ще загубите достъп до акаунта си.
+email_desc = Вашият основен адрес за ел. поща ще се използва за известия, възстановяване на парола и, при условие че не е скрит, за уеб-базирани Git операции.
+email_preference_set_success = Предпочитанията за ел. поща са зададени успешно.
+add_email_confirmation_sent = Изпратено е ел. писмо за потвърждение до „%s“. За да потвърдите адреса си за ел. поща, моля, проверете входящата си кутия и последвайте предоставената връзка в рамките на следващите %s.
+additional_repo_units_hint_description = Показване на подсказка „Включване на повече“ за хранилища, които нямат включени всички налични елементи.
+email_notifications.submit = Задаване на предпочит. за ел. поща
+email_notifications.andyourown = И вашите собствени известия
+email_deletion_desc = Адресът за ел. поща и свързаната информация ще бъдат премахнати от вашия акаунт. Git подаванията от този адрес за ел. поща ще останат непроменени. Продължаване?
+add_email_success = Новият адрес за ел. поща е добавен.
+remove_account_link = Премахване на свързан акаунт
+webauthn_alternative_tip = Може да искате да конфигурирате допълнителен метод за удостоверяване.
+hidden_comment_types_description = Типовете коментари, отметнати тук, няма да се показват в страниците на задачите. Например, отмятането на „Етикет“ премахва всички коментари от типа „<потребител> добави/премахна <етикет>“.
+hidden_comment_types = Скрити типове коментари
+comment_type_group_lock = Състояние на заключване
+can_not_add_email_activations_pending = Има чакаща активация, опитайте отново след няколко минути, ако искате да добавите нова ел. поща.
+storage_overview = Преглед на съхранението
+webauthn = Двуфакторно удостоверяване (Ключове за сигурност)
+quota.sizes.repos.public = Публични хранилища
+quota.sizes.repos.private = Частни хранилища
+quota.sizes.git.all = Git съдържание
+quota.sizes.git.lfs = Git LFS
+quota.sizes.assets.attachments.all = Прикачени файлове
+quota.sizes.assets.attachments.releases = Прикачени файлове към издания
+quota.sizes.assets.artifacts = Артефакти
+quota.sizes.assets.packages.all = Пакети
+quota.sizes.wiki = Уики
+quota.sizes.all = Всички
+quota.sizes.repos.all = Хранилища
+quota.sizes.assets.attachments.issues = Прикачени файлове към задачи
 
 [packages]
 container.labels.value = Стойност
@@ -287,6 +425,139 @@ generic.download = Изтеглете пакета от командния ре
 container.details.type = Тип образ
 alpine.repository = За хранилището
 container.images.title = Образи
+arch.version.description = Описание
+search_in_external_registry = Търсене в %s
+filter.type = Тип
+filter.container.untagged = Без маркер
+filter.type.all = Всички
+registry.documentation = За повече информация относно регистъра %s, вижте <a target="_blank" rel="noopener noreferrer" href="%s">документацията</a>.
+filter.no_result = Вашият филтър не даде резултати.
+filter.container.tagged = С маркер
+arch.pacman.repo.multi = %s има същата версия в различни дистрибуции.
+arch.pacman.helper.gpg = Добавете доверителен сертификат за pacman:
+alpine.repository.architectures = Архитектури
+arch.version.provides = Доставя
+arch.version.groups = Група
+details.project_site = Уебсайт на проекта
+arch.pacman.conf = Добавете сървър със свързаната дистрибуция и архитектура към <code>/etc/pacman.conf</code> :
+arch.pacman.sync = Синхронизирайте пакета с pacman:
+details.repository_site = Уебсайт на хранилището
+arch.version.depends = Зависимости
+arch.version.optdepends = Допълнителни зависимости
+arch.version.replaces = Заменя
+go.install = Инсталирайте пакета от командния ред:
+cargo.registry = Настройте този регистър в конфигурационния файл на Cargo (например <code>~/.cargo/config.toml</code>):
+cargo.install = За да инсталирате пакета с Cargo, изпълнете следната команда:
+details.documentation_site = Уебсайт на документацията
+arch.version.conflicts = В конфликт
+alpine.repository.branches = Клонове
+arch.pacman.repo.multi.item = Конфигурация за %s
+container.multi_arch = ОС / Архитектура
+rpm.repository = Информация за хранилището
+container.pull = Издърпайте образа от командния ред:
+helm.registry = Настройте този регистър от командния ред:
+debian.repository.distributions = Дистрибуции
+npm.dependencies.optional = Опционални зависимости
+owner.settings.cargo.title = Индекс на регистъра на Cargo
+owner.settings.cleanuprules.keep.pattern.container = Версията <code>latest</code> винаги се запазва за Container пакети.
+owner.settings.cleanuprules.remove.pattern = Премахване на версии, съответстващи на
+rpm.distros.suse = на дистрибуции, базирани на SUSE
+owner.settings.cleanuprules.preview.overview = %d пакета са насрочени за премахване.
+owner.settings.cleanuprules.preview = Преглед на правило за почистване
+arch.version.properties = Свойства на версията
+conan.registry = Настройте този регистър от командния ред:
+conan.details.repository = Хранилище
+composer.install = За да инсталирате пакета с Composer, изпълнете следната команда:
+chef.install = За да инсталирате пакета, изпълнете следната команда:
+chef.registry = Настройте този регистър във вашия файл <code>~/.chef/config.rb</code>:
+pub.install = За да инсталирате пакета с Dart, изпълнете следната команда:
+npm.details.tag = Маркер
+npm.install = За да инсталирате пакета с npm, изпълнете следната команда:
+maven.registry = Настройте този регистър във файла на вашия проект <code>pom.xml</code>:
+debian.repository.components = Компоненти
+debian.install = За да инсталирате пакета, изпълнете следната команда:
+cran.install = За да инсталирате пакета, изпълнете следната команда:
+cran.registry = Настройте този регистър във вашия файл <code>Rprofile.site</code>:
+rpm.distros.redhat = на дистрибуции, базирани на RedHat
+alt.registry = Настройте този регистър от командния ред:
+rpm.repository.architectures = Архитектури
+alt.registry.install = За да инсталирате пакета, изпълнете следната команда:
+alt.setup = Добавете хранилище към списъка със свързани хранилища (изберете необходимата архитектура вместо „_arch_“):
+alt.repository = Информация за хранилището
+owner.settings.cargo.initialize.error = Неуспешно инициализиране на индекса на Cargo: %v
+owner.settings.cargo.initialize = Инициализиране на индекс
+settings.delete.description = Изтриването на пакет е трайно и не може да бъде отменено.
+alt.repository.multiple_groups = Този пакет е наличен в няколко групи.
+alt.repository.architectures = Архитектури
+owner.settings.chef.title = Регистър на Chef
+owner.settings.cleanuprules.remove.days = Премахване на версии, по-стари от
+owner.settings.cleanuprules.keep.pattern = Запазване на версии, съответстващи на
+owner.settings.cleanuprules.keep.count.n = %d версии на пакет
+owner.settings.cleanuprules.keep.count.1 = 1 версия на пакет
+owner.settings.cleanuprules.keep.count = Запазване на най-новите
+owner.settings.cleanuprules.enabled = Включено
+owner.settings.cleanuprules.preview.none = Правилото за почистване не съвпада с нито един пакет.
+owner.settings.cleanuprules.none = Все още няма правила за почистване.
+owner.settings.cleanuprules.add = Добавяне на правило за почистване
+owner.settings.cleanuprules.title = Правила за почистване
+owner.settings.cargo.rebuild.success = Индексът на Cargo беше успешно преизграден.
+alpine.registry.key = Изтеглете публичния RSA ключ на регистъра в папката <code>/etc/apk/keys/</code>, за да проверите подписа на индекса:
+alpine.registry.info = Изберете $branch и $repository от списъка по-долу.
+arch.version.checkdepends = Зависимости за проверката
+composer.dependencies = Зависимости
+swift.install = Добавете пакета във вашия файл <code>Package.swift</code>:
+settings.link.error = Неуспешно обновяване на връзката на хранилището.
+swift.install2 = и изпълнете следната команда:
+rpm.repository.multiple_groups = Този пакет е наличен в няколко групи.
+conda.registry = Настройте този регистър като Conda хранилище във вашия файл <code>.condarc</code>:
+conda.install = За да инсталирате пакета с Conda, изпълнете следната команда:
+owner.settings.cargo.rebuild.error = Неуспешно преизграждане на индекса на Cargo: %v
+owner.settings.cargo.rebuild = Преизграждане на индекс
+settings.link.button = Обновяване на връзката на хранилището
+settings.link.select = Изберете хранилище
+debian.repository.architectures = Архитектури
+rpm.registry = Настройте този регистър от командния ред:
+debian.registry = Настройте този регистър от командния ред:
+helm.install = За да инсталирате пакета, изпълнете следната команда:
+swift.registry = Настройте този регистър от командния ред:
+settings.link = Свързване на този пакет с хранилище
+settings.link.description = Ако свържете пакет с хранилище, пакетът се изброява в списъка с пакети на хранилището.
+settings.link.success = Връзката на хранилището беше успешно обновена.
+owner.settings.cleanuprules.pattern_full_match = Прилагане на шаблона към пълното име на пакета
+owner.settings.cleanuprules.keep.title = Версиите, които съответстват на тези правила, се запазват, дори ако съответстват на правило за премахване по-долу.
+debian.repository = Информация за хранилището
+maven.install = За да използвате пакета, включете следното в блока <code>dependencies</code> във файла <code>pom.xml</code>:
+nuget.install = За да инсталирате пакета с NuGet, изпълнете следната команда:
+alt.install = Инсталиране на пакет
+owner.settings.cleanuprules.edit = Редактиране на правилото за почистване
+rpm.install = За да инсталирате пакета, изпълнете следната команда:
+pypi.install = За да инсталирате пакета с pip, изпълнете следната команда:
+arch.version.makedepends = Зависимости за изграждането
+alpine.install = За да инсталирате пакета, изпълнете следната команда:
+desc = Управление на пакетите на хранилището.
+owner.settings.cargo.rebuild.no_index = Не може да се преизгради, няма инициализиран индекс.
+owner.settings.cargo.rebuild.description = Преизграждането може да бъде полезно, ако индексът не е синхронизиран със съхранените Cargo пакети.
+owner.settings.cargo.initialize.description = Необходимо е специално Git хранилище за индекс, за да се използва регистърът на Cargo. Използването на тази опция ще (пре)създаде хранилището и ще го конфигурира автоматично.
+pypi.requires = Изисква Python
+debian.registry.info = Изберете $distribution и $component от списъка по-долу.
+alpine.registry = Настройте този регистър, като добавите URL адреса във вашия файл <code>/etc/apk/repositories</code>:
+owner.settings.cargo.initialize.success = Индексът на Cargo беше успешно създаден.
+npm.registry = Настройте този регистър във файла на вашия проект <code>.npmrc</code>:
+owner.settings.chef.keypair = Генериране на двойка ключове
+owner.settings.chef.keypair.description = Заявките, изпратени до регистъра на Chef, трябва да бъдат криптографски подписани като средство за удостоверяване. При генериране на двойка ключове, само публичният ключ се съхранява във Forgejo. Частният ключ ви се предоставя, за да се използва с knife. Генерирането на нова двойка ключове ще презапише предишната.
+owner.settings.cleanuprules.remove.title = Версиите, които съответстват на тези правила, се премахват, освен ако правило по-горе не казва да се запазят.
+nuget.registry = Настройте този регистър от командния ред:
+owner.settings.cleanuprules.success.update = Правилото за почистване е обновено.
+settings.delete.notice = На път сте да изтриете %s (%s). Тази операция е необратима, сигурни ли сте?
+npm.install2 = или го добавете във файла package.json:
+owner.settings.cleanuprules.success.delete = Правилото за почистване е изтрито.
+vagrant.install = За да добавите Vagrant box, изпълнете следната команда:
+nuget.dependency.framework = Целева платформа
+maven.install2 = Изпълнете през командния ред:
+maven.download = За да изтеглите зависимостта, изпълнете през командния ред:
+container.layers = Слоеве на образа
+conan.install = За да инсталирате пакета с Conan, изпълнете следната команда:
+composer.registry = Настройте този регистър във вашия файл <code>~/.composer/config.json</code>:
 
 [tool]
 hours = %d часа
@@ -447,7 +718,7 @@ projects.template.desc = Шаблон
 projects.card_type.text_only = Само текст
 projects.card_type.images_and_text = Изображения и текст
 wiki = Уики
-wiki.welcome = Добре дошли в Уикито.
+wiki.welcome = Добре дошли в уикито.
 wiki.create_first_page = Създаване на първата страница
 editor.upload_file = Качване на файл
 projects.column.color = Цвят
@@ -598,7 +869,7 @@ settings.admin_settings = Администраторски настройки
 issues.role.owner = Притежател
 settings.transfer.title = Прехвърляне на притежанието
 issues.author = Автор
-issues.closed_at = `затвори тази задача <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at = `затвори тази задача %s`
 settings.collaborator_deletion_desc = Премахването на сътрудник ще отнеме достъпа му до това хранилище. Продължаване?
 commits.message = Съобщение
 issues.due_date_not_set = Няма зададен краен срок.
@@ -622,9 +893,9 @@ issues.filter_type.all_issues = Всички задачи
 issues.filter_poster_no_select = Всички автори
 issues.opened_by = отворена %[1]s от <a href="%[2]s">%[3]s</a>
 issues.action_open = Отваряне
-pulls.closed_at = `затвори тази заявка за сливане <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at = `отвори наново тази заявка за сливане <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at = `отвори наново тази задача <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `затвори тази заявка за сливане %s`
+pulls.reopened_at = `отвори наново тази заявка за сливане %s`
+issues.reopened_at = `отвори наново тази задача %s`
 projects.column.edit = Редактиране на колоната
 issues.close = Затваряне на задачата
 issues.ref_reopened_from = `<a href="%[3]s">отвори наново тази задача %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@@ -644,7 +915,7 @@ milestones.filter_sort.latest_due_date = Най-далечен краен сро
 diff.view_file = Преглед на файла
 release.deletion_success = Изданието е изтрито.
 projects.column.delete = Изтриване на колоната
-migrate.migrating = Мигриране от <b>%s</b> ...
+migrate.migrating = Мигриране от <b>%s</b> …
 escape_control_characters = Екраниране
 issues.label_deletion_success = Етикетът е изтрит.
 pulls.is_closed = Заявката за сливане е затворена.
@@ -789,9 +1060,9 @@ editor.no_changes_to_show = Няма промени за показване.
 issues.choose.get_started = Първи стъпки
 issues.change_milestone_at = `промени етапа от <b>%s</b> на <b>%s</b> %s`
 issues.change_project_at = `промени проекта от <b>%s</b> на <b>%s</b> %s`
-issues.self_assign_at = `си само-възложи това %s`
+issues.self_assign_at = `си самовъзложи това %s`
 issues.remove_assignee_at = `е премахнат като изпълнител от <b>%s</b> %s`
-issues.remove_self_assignment = `се само-премахна като изпълнител %s`
+issues.remove_self_assignment = `се самопремахна като изпълнител %s`
 issues.add_assignee_at = `му бе възложено това от <b>%s</b> %s`
 pulls.merged_by = от <a href="%[2]s">%[3]s</a> бе слята %[1]s
 pulls.merged_by_fake = от %[2]s бе слята %[1]s
@@ -1025,7 +1296,7 @@ issues.content_history.edited = редактирано
 pulls.title_desc_one = иска да слее %[1]d подаване от <code>%[2]s</code> в <code id="%[4]s">%[3]s</code>
 pulls.showing_specified_commit_range = Показани са само промените между %[1]s..%[2]s
 pulls.merged_title_desc_one = сля %[1]d подаване от <code>%[2]s</code> в <code>%[3]s</code> %[4]s
-pulls.no_merge_access = Не сте упълномощени за сливане на тази заявка за сливане.
+pulls.no_merge_access = Не сте упълномощени да слеете тази заявка за сливане.
 activity.navbar.code_frequency = Честота на промените
 activity.git_stats_pushed_1 = е изтласкал
 activity.git_stats_push_to_branch = към %s и
@@ -1054,7 +1325,7 @@ issues.dependency.cancel = Отказ
 issues.dependency.add_error_dep_exists = Зависимостта вече съществува.
 issues.dependency.add_error_dep_not_exist = Зависимостта не съществува.
 issues.remove_ref_at = `премахна препратката <b>%s</b> %s`
-issues.ref_pull_from = `<a href="%[3]s">спомена тази заявка за сливане %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_pull_from = `<a href="%[2]s">спомена тази заявка за сливане %[3]s</a> %[1]s`
 issues.dependency.pr_no_dependencies = Няма зададени зависимости.
 issues.dependency.remove_info = Премахване на тази зависимост
 issues.dependency.removed_dependency = `премахна зависимостта %s`
@@ -1079,11 +1350,11 @@ issues.dependency.title = Зависимости
 issues.dependency.issue_no_dependencies = Няма зададени зависимости.
 issues.dependency.pr_close_blocked = Трябва да затворите всички задачи, блокиращи тази заявка за сливане, преди да можете да я слеете.
 issues.dependency.pr_close_blocks = Тази заявка за сливане блокира затварянето на следните задачи
-issues.ref_issue_from = `<a href="%[3]s">спомена тази задача %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at = `спомена тази задача в подаване <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_issue_from = `<a href="%[2]s">спомена тази задача %[3]s</a> %[1]s`
+issues.commit_ref_at = `спомена тази задача в подаване %s`
 issues.add_ref_at = `добави препратка <b>%s</b> %s`
 pulls.merged_info_text = Клонът %s вече може да бъде изтрит.
-pulls.commit_ref_at = `спомена тази заявка за сливане в подаване <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `спомена тази заявка за сливане в подаване %s`
 issues.change_ref_at = `промени препратката от <b><strike>%s</strike></b> на <b>%s</b> %s`
 diff.review.reject = Поискване на промени
 diff.bin_not_shown = Двоичният файл не е показан.
@@ -1121,7 +1392,7 @@ issues.review.show_resolved = Показване на решено
 issues.review.hide_resolved = Скриване на решено
 issues.review.resolve_conversation = Решаване на обсъждането
 diff.comment.markdown_info = Поддържа се стилизиране с Маркдаун.
-diff.file_suppressed = Разликите не са показани, защото са твърде много
+diff.file_suppressed = Разликите във файла са потиснати, защото са твърде много
 pulls.reject_count_n = %d поискани промени
 settings.pulls.default_allow_edits_from_maintainers = Позволяване на редакции от поддържащите по подразбиране
 fork_branch = Клон за клониране в разклонението
@@ -1139,7 +1410,7 @@ issues.review.review = Рецензия
 issues.review.comment = рецензира %s
 branch.deleted_by = Изтрит от %s
 branch.restore = Възстановяване на клона „%s“
-archive.title_date = Това хранилище е архивирано на %s. Можете да преглеждате файлове и да го клонирате, но не можете да изтласквате или отваряте задачи или заявки за сливане.
+archive.title_date = Това хранилище е архивирано на %s. Можете да преглеждате файлове и да го клонирате, но не можете да правите промени в състоянието му, като изтласкване и създаване на нови задачи, заявки за сливане или коментари.
 release.download_count_one = %s изтегляне
 release.download_count_few = %s изтегляния
 branch.restore_success = Клонът „%s“ е възстановен.
@@ -1148,15 +1419,15 @@ branch.create_new_branch = Създаване на клон от клон:
 pulls.status_checks_show_all = Показване на всички проверки
 size_format = %[1]s: %[2]s; %[3]s: %[4]s
 pulls.filter_changes_by_commit = Филтриране по подаване
-issues.ref_closing_from = `<a href="%[3]s">спомена тази задача в заявка за сливане %[4]s, която ще я затвори</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_closing_from = `<a href="%[2]s">спомена тази задача в заявка за сливане %[3]s, която ще я затвори</a>, %[1]s`
 issues.ref_from = `от %[1]s`
-issues.ref_reopening_from = `<a href="%[3]s">спомена тази задача в заявка за сливане %[4]s, която ще я отвори наново </a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_reopening_from = `<a href="%[2]s">спомена тази задача в заявка за сливане %[3]s, която ще я отвори наново </a>, %[1]s`
 issues.draft_title = Чернова
 pulls.reopen_to_merge = Моля, отворете наново тази заявка за сливане, за да извършите сливане.
 pulls.cant_reopen_deleted_branch = Тази заявка за сливане не може да бъде отворена наново, защото клонът е изтрит.
 pulls.status_checks_hide_all = Скриване на всички проверки
 pulls.status_checks_failure = Някои проверки са неуспешни
-issues.review.add_review_request = поиска рецензия от %s %s
+issues.review.add_review_request = поиска рецензия от %[1]s %[2]s
 wiki.no_search_results = Няма резултати
 wiki.search = Търсене в уикито
 issues.author.tooltip.pr = Този потребител е авторът на тази заявка за сливане.
@@ -1196,7 +1467,7 @@ settings.default_branch_desc = Изберете стандартен клон з
 settings.transfer.button = Прехвърляне на притежанието
 settings.transfer.modal.title = Прехвърляне на притежанието
 ambiguous_runes_line = `Този ред съдържа двусмислени Уникод знаци`
-ambiguous_character = `%[1]c [U+%04[1]X] може да бъде объркан с %[2]c [U+%04[2]X]`
+ambiguous_character = `%[1]c [U+%04[1]X] може да бъде объркан със %[2]c [U+%04[2]X]`
 invisible_runes_header = `Този файл съдържа невидими Уникод знаци`
 issues.all_title = Общо
 issues.new.assign_to_me = Възлагане на мен
@@ -1290,6 +1561,311 @@ issues.reaction.alt_few = %[1]s реагира с %[2]s.
 issues.reaction.alt_many = %[1]s и още %[2]d реагираха с %[3]s.
 issues.reaction.alt_add = Добавяне на реакция %[1]s към коментара.
 issues.reaction.alt_remove = Премахване на реакция %[1]s от коментара.
+already_forked = Вече сте разклонили %s
+generated_from = генерирано от
+clear_ref = `Изчистване на текущата препратка`
+file_follow = Последване на символната връзка
+commitstatus.failure = Неуспех
+issues.filter_label_exclude = Използвайте <kbd>Alt</kbd> + <kbd>Click</kbd>, за да изключите етикети
+migrate.migrating_failed = Мигрирането от <b>%s</b> е неуспешно.
+migrate.migrating_issues = Мигриране на задачи
+mirror_from = огледално на
+fork_from_self = Не можете да разклоните хранилище, което притежавате.
+commit_graph.hide_pr_refs = Скриване на заявките за сливане
+generated = Генерирано
+broken_message = Git данните, лежащи в основата на това хранилище, не могат да бъдат прочетени. Свържете се с администратора на тази инстанция или изтрийте това хранилище.
+editor.file_is_a_symlink = `„%s“ е символна връзка. Символните връзки не могат да се редактират в уеб редактора`
+commits.browse_further = Разглеждане нататък
+commits.older = По-стари
+form.reach_limit_of_creation_n = Притежателят вече е достигнал лимита от %d хранилища.
+issues.edit.already_changed = Неуспешно запазване на промените в задачата. Изглежда съдържанието вече е променено от друг потребител. Моля, презаредете страницата и опитайте да редактирате отново, за да избегнете презаписването на техните промени
+transfer.accept_desc = Прехвърляне към „%s“
+archive.title = Това хранилище е архивирано. Можете да преглеждате файлове и да го клонирате, но не можете да правите промени в състоянието му, като изтласкване и създаване на нови задачи, заявки за сливане или коментари.
+form.reach_limit_of_creation_1 = Притежателят вече е достигнал лимита от %d хранилище.
+editor.patching = Прилагане на кръпка:
+editor.fail_to_apply_patch = Неуспешно прилагане на кръпка „%s“
+commits.no_commits = Няма общи подавания. „%s“ и „%s“ имат напълно различни истории.
+migrate.migrating_pulls = Мигриране на заявки за сливане
+migrate.migrating_topics = Мигриране на теми
+projects.desc = Управлявайте задачи и заявки за сливане в проектни табла.
+issues.choose.invalid_templates = %v невалидни шаблона са намерени
+pulls.edit.already_changed = Неуспешно запазване на промените в заявката за сливане. Изглежда съдържанието вече е променено от друг потребител. Моля, презаредете страницата и опитайте да редактирате отново, за да избегнете презаписването на техните промени
+migrate.gitbucket.description = Мигриране на данни от GitBucket инстанции.
+migrate.migrating_git = Мигриране на Git данни
+commits.newer = По-нови
+issues.choose.blank_about = Създаване на задача от стандартен шаблон.
+issues.filter_no_results = Няма резултати
+issues.filter_no_results_placeholder = Опитайте да коригирате филтрите си за търсене.
+archive.nocomment = Коментирането не е възможно, тъй като хранилището е архивирано.
+migrate.gitlab.description = Мигриране на данни от gitlab.com или други GitLab инстанции.
+transfer.no_permission_to_accept = Нямате разрешение да приемете това прехвърляне.
+transfer.no_permission_to_reject = Нямате разрешение да отхвърлите това прехвърляне.
+editor.file_changed_while_editing = Съдържанието на файла е променено, откакто сте го отворили. <a target="_blank" rel="noopener noreferrer" href="%s">Щракнете тук</a>, за да го видите, или <strong>Подайте промените отново</strong>, за да ги презапишете.
+sync_fork.button = Синхронизиране
+migrate.onedev.description = Мигриране на данни от code.onedev.io или други OneDev инстанции.
+migrate.codebase.description = Мигриране на данни от codebasehq.com.
+migrate.migrating_labels = Мигриране на етикети
+migrate.migrating_releases = Мигриране на издания
+editor.push_rejected_no_message = Промяната беше отхвърлена от сървъра без съобщение. Моля, проверете Git куките.
+issues.choose.open_external_link = Отваряне
+comments.edit.already_changed = Неуспешно запазване на промените в коментара. Изглежда съдържанието вече е променено от друг потребител. Моля, презаредете страницата и опитайте да редактирате отново, за да избегнете презаписването на техните промени
+commits.nothing_to_compare = Тези клонове са равни.
+transfer.reject_desc = Отказ от прехвърляне към „%s“
+subscribe.pull.guest.tooltip = Влезте, за да се абонирате за тази заявка за сливане.
+commit.contained_in_default_branch = Това подаване е част от стандартния клон
+normal_view = Нормален изглед
+issues.context.menu = Меню за коментара
+form.name_reserved = Името на хранилището „%s“ е резервирано.
+need_auth = Упълномощаване
+subscribe.issue.guest.tooltip = Влезте, за да се абонирате за тази задача.
+commitstatus.pending = В очакване
+commitstatus.success = Успех
+editor.cannot_commit_to_protected_branch = Не може да се подава в защитения клон „%s“.
+editor.no_commit_to_branch = Не може да се подава директно в клона, защото:
+editor.push_rejected = Промяната беше отхвърлена от сървъра. Моля, проверете Git куките.
+cite_this_repo = Цитиране на това хранилище
+migrate.gitea.description = Мигриране на данни от gitea.com или други Gitea инстанции.
+editor.push_rejected_summary = Пълно съобщение на отхвърлянето:
+sync_fork.branch_behind_one = Този клон е %[1]d подаване зад %[2]s
+sync_fork.branch_behind_few = Този клон е %[1]d подавания зад %[2]s
+form.string_too_long = Даденият низ е по-дълъг от %d знака.
+editor.commit_id_not_matching = Файлът е променен, докато сте го редактирали. Подайте в нов клон и след това слейте.
+editor.user_no_push_to_branch = Потребителят не може да изтласква в клона
+archive.pull.noreview = Това хранилище е архивирано. Не можете да рецензирате заявки за сливане.
+migrate.migrating_failed.error = Неуспешно мигриране: %s
+migrate.github.description = Мигриране на данни от github.com или GitHub Enterprise сървър.
+migrate.forgejo.description = Мигриране на данни от codeberg.org или други Forgejo инстанции.
+migrate.gogs.description = Мигриране на данни от notabug.org или други Gogs инстанции.
+migrate.migrating_milestones = Мигриране на етапи
+migrate.failed = Мигрирането е неуспешно: %v
+pulls.nothing_to_compare_and_allow_empty_pr = Тези клонове са равни. Тази заявка за сливане ще бъде празна.
+pulls.has_pull_request = `Вече съществува заявка за сливане между тези клонове: <a href="%[1]s">%[2]s#%[3]d</a>`
+pulls.is_checking = Проверката за конфликти при сливане е в ход. Опитайте отново след няколко минути.
+pulls.cannot_merge_work_in_progress = Тази заявка за сливане е отбелязана като в процес на работа.
+pulls.blocked_by_approvals = Тази заявка за сливане все още няма достатъчно одобрения. Дадени са %d от %d одобрения.
+pulls.blocked_by_rejection = Тази заявка за сливане има поискани промени от официален рецензент.
+pulls.waiting_count_1 = %d чакаща рецензия
+pulls.status_checks_requested = Задължително
+pulls.update_branch_success = Обновяването на клона е успешно
+pulls.cannot_auto_merge_helper = Слейте ръчно, за да разрешите конфликтите.
+migrate.clone_address_desc = HTTP(S) или Git „clone“ URL на съществуващо хранилище
+pulls.add_prefix = Добавете префикс <strong>%s</strong>
+pulls.merge_pull_request = Създаване на подаване със сливане
+pulls.waiting_count_n = %d чакащи рецензии
+pulls.is_ancestor = Този клон вече е включен в целевия клон. Няма какво да се слива.
+pulls.required_status_check_missing = Някои задължителни проверки липсват.
+pulls.change_target_branch_at = `промени целевия клон от <b>%s</b> на <b>%s</b> %s`
+issues.time_spent_total = Общо изразходвано време
+issues.del_time_history = `изтри изразходваното време %s`
+pulls.nothing_to_compare_have_tag = Избраните клон/маркер са равни.
+pulls.cannot_auto_merge_desc = Тази заявка за сливане не може да бъде слята автоматично поради конфликти.
+issues.tracker_auto_close = Таймерът ще бъде спрян автоматично, когато тази задача бъде затворена
+issues.force_push_codes = `изтласка принудително %[1]s от <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s към <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
+pulls.blocked_by_official_review_requests = Тази заявка за сливане е блокирана, защото липсва одобрение от един или повече официални рецензенти.
+issues.tracker = Проследяване на времето
+issues.add_time_history = `добави изразходвано време %s`
+migrate.repo_desc_helper = Оставете празно, за да внесете съществуващото описание
+migrate.git.description = Мигриране само на хранилище от всяка Git услуга.
+mirror_sync = синхронизирано
+migrate_repo = Мигриране на хранилище
+migrate_options = Опции за мигрирането
+editor.fork_before_edit = Трябва да разклоните това хранилище, за да направите или предложите промени в този файл.
+editor.must_have_write_access = Трябва да имате право на запис, за да правите или предлагате промени в този файл.
+editor.new_branch_name = Дайте име на новия клон за това подаване
+editor.invalid_commit_mail = Невалидна ел. поща за създаване на подаване.
+pulls.required_status_check_failed = Някои задължителни проверки не са успешни.
+issues.time_spent_from_all_authors = `Общо изразходвано време: %s`
+issues.attachment.download = `Щракнете, за да изтеглите „%s“`
+issues.attachment.open_tab = `Щракнете, за да видите „%s“ в нов раздел`
+pulls.update_branch = Обновяване на клона чрез сливане
+migrate_items = Елементи за мигриране
+commit.load_referencing_branches_and_tags = Зареждане на клонове и маркери, препращащи към това подаване
+pulls.files_conflicted = Тази заявка за сливане има промени, които са в конфликт с целевия клон.
+pulls.still_in_progress = Все още е в процес на работа?
+pulls.ready_for_review = Готово е за рецензиране?
+pulls.is_empty = Промените в този клон вече са в целевия клон. Това ще бъде празно подаване.
+issues.start_tracking = Започване на проследяване на времето
+migrate_options_mirror_helper = Това хранилище ще бъде огледално
+migrate_options_lfs = Мигриране на LFS файлове
+editor.upload_file_is_locked = Файлът „%s“ е заключен от %s.
+issues.tracking_already_started = `Вече сте започнали проследяване на времето по <a href="%s">друга задача</a>!`
+pulls.remove_prefix = Премахнете префикса <strong>%s</strong>
+author_search_tooltip = Показва максимум 30 потребители
+migrate.migrating_failed_no_addr = Мигрирането е неуспешно.
+issues.force_push_compare = Сравняване
+pulls.status_checking = Някои проверки са в очакване
+pulls.nothing_to_compare = Тези клонове са равни. Не е нужно да създавате заявка за сливане.
+admin.flags_replaced = Флаговете на хранилището са заменени
+editor.cannot_edit_lfs_files = LFS файлове не могат да се редактират в уеб интерфейса.
+commits.ssh_key_fingerprint = Отпечатък на SSH ключ
+issues.comment_on_locked = Не можете да коментирате заключена задача.
+commit.revert = Връщане
+migrate.cancel_migrating_title = Отказ от миграцията
+migrate.cancel_migrating_confirm = Искате ли да откажете тази миграция?
+issues.choose.invalid_config = Конфигурацията на задачите съдържа грешки:
+unit_disabled = Администраторът на сайта е изключил тази секция на хранилището.
+issues.blocked_by_user = Не можете да създавате задачи в това хранилище, защото сте блокирани от притежателя на хранилището.
+commits.signed_by = Подписано от
+commits.signed_by_untrusted_user = Подписано от недоверен потребител
+commits.signed_by_untrusted_user_unmatched = Подписано от недоверен потребител, който не съвпада с подаващия
+issues.lock.notice_1 = - Други потребители не могат да добавят нови коментари към тази задача.
+issues.unlock.notice_2 = - Винаги можете да заключите тази задача отново в бъдеще.
+issues.unlock.title = Отключване на обсъждането по тази задача.
+issues.dependency.no_permission_1 = Нямате разрешение да прочетете %d зависимост
+issues.reopen.blocked_by_user = Не можете да отворите наново тази задача, защото сте блокирани от притежателя на хранилището или от автора на тази задача.
+compare.compare_base = основа
+compare.compare_head = сравняване
+template.one_item = Трябва да изберете поне един елемент от шаблона
+admin.failed_to_replace_flags = Неуспешна замяна на флаговете на хранилището
+mirror_interval_invalid = Интервалът на огледалото не е валиден.
+mirror_use_ssh.not_available = SSH удостоверяването не е налично.
+mirror_address_desc = Поставете всички необходими данни за удостоверяване в секцията „Упълномощаване“.
+template.git_hooks = Git куки
+template.invalid = Трябва да изберете шаблонно хранилище
+issues.review.outdated = Остарял
+issues.dependency.add_error_dep_issue_not_exist = Зависимата задача не съществува.
+template.items = Елементи на шаблона
+issues.review.dismissed = отхвърли рецензията на %s %s
+audio_not_supported_in_browser = Вашият браузър не поддържа HTML5 тага „audio“.
+stored_lfs = Съхранено с Git LFS
+commit_graph.select = Изберете клонове
+issues.content_history.options = Опции
+editor.commit_email = Ел. поща на подаването
+commit.revert-header = Връщане: %s
+commits.desc = Разглеждане на историята на промените в програмния код.
+commits.search.tooltip = Можете да добавите префикс към ключовите думи с „author:“, „committer:“, „after:“ или „before:“, напр. „revert author:Alice before:2019-01-13“.
+issues.unlock_error = Не може да се отключи задача, която не е заключена.
+issues.lock.unknown_reason = Не може да се заключи задача с неизвестна причина.
+issues.cancel_tracking_history = `отмени проследяването на времето %s`
+issues.dependency.add_error_dep_not_same_repo = И двете задачи трябва да са в едно и също хранилище.
+issues.review.remove_review_requests = премахна заявките за рецензия за %[1]s %[2]s
+issues.review.content.empty = Трябва да оставите коментар, посочващ исканите промени.
+issues.review.hide_outdated = Скриване на остарели
+pulls.desc = Включване на заявки за сливане и рецензии на код.
+issues.review.show_outdated = Показване на остарели
+ambiguous_runes_header = `Този файл съдържа двусмислени Уникод знаци`
+admin.update_flags = Обновяване на флаговете
+issues.dependency.blocked_by_short = Зависи от
+mirror_lfs = Съхранение на големи файлове (LFS)
+mirror_use_ssh.text = Използване на SSH удостоверяване
+mirror_denied_combination = Не може да се използва удостоверяване с публичен ключ и парола едновременно.
+rss.must_be_on_branch = Трябва да сте на клон, за да имате RSS емисия.
+admin.manage_flags = Управление на флаговете
+admin.enabled_flags = Флагове, включени за хранилището:
+mirror_password_help = Променете потребителското име, за да изтриете запазена парола.
+issues.review.remove_review_request = премахна заявката за рецензия за %[1]s %[2]s
+issues.review.outdated_description = Съдържанието е променено, след като е направен този коментар
+issues.dependency.setting = Включване на зависимости за задачи и заявки за сливане
+issues.dependency.add_error_same_issue = Не можете да направите задача зависима от самата нея.
+issues.review.self.rejection = Не можете да поискате промени в собствената си заявка за сливане.
+issues.filter_type.all_pull_requests = Всички заявки за сливане
+fork_to_different_account = Разклоняване в друг акаунт
+mirror_sync_on_commit = Синхронизиране при изтласкване на подавания
+mirror_address_protocol_invalid = Предоставеният URL е невалиден. Само http(s):// или git:// адреси могат да се използват за огледални хранилища.
+template.git_hooks_tooltip = В момента не можете да променяте или премахвате Git куки, след като са добавени. Изберете това само ако се доверявате на шаблонното хранилище.
+editor.commit_signed_changes = Подаване на подписани промени
+editor.require_signed_commit = Клонът изисква подписано подаване
+issues.desc = Организирайте доклади за грешки, задачи и етапи.
+issues.lock_duplicate = Задача не може да бъде заключена два пъти.
+issues.lock.notice_2 = - Вие и други сътрудници с достъп до това хранилище все още можете да оставяте коментари, които другите да виждат.
+issues.due_date_invalid = Крайният срок е невалиден или извън обхвата. Моля, използвайте формата „гггг-мм-дд“.
+mirror_interval = Интервал на огледалото (валидни единици за време са „h“, „m“, „s“). 0 за изключване на периодичната синхронизация. (Минимален интервал: %s)
+summary_card_alt = Карта с обобщение на хранилище %s
+file_copy_permalink = Копиране на постоянна връзка
+view_git_blame = Преглед на git blame
+commit.revert-content = Изберете клон, върху който да се върне:
+issues.unlock.notice_1 = - Всеки ще може отново да коментира тази задача.
+issues.delete.text = Наистина ли искате да изтриете тази задача? (Това ще премахне трайно цялото съдържание. Помислете дали вместо това да не я затворите, ако възнамерявате да я запазите архивирана)
+issues.add_time_sum_to_small = Не е въведено време.
+issues.dependency.no_permission_n = Нямате разрешение да прочетете %d зависимости
+issues.review.pending.tooltip = Този коментар в момента не е видим за други потребители. За да изпратите изчакващите си коментари, изберете „%s“ -> „%s/%s/%s“ в горната част на страницата.
+invisible_runes_description = `Този файл съдържа невидими Уникод знаци, които са неразличими за хората, но могат да бъдат обработени по различен начин от компютър. Ако смятате, че това е умишлено, можете спокойно да пренебрегнете това предупреждение. Използвайте бутона „Екраниране“, за да ги разкриете.`
+video_not_supported_in_browser = Вашият браузър не поддържа HTML5 тага „video“.
+editor.filename_help = Добавете директория, като въведете името ѝ, последвано от наклонена черта („/“). Премахнете директория, като натиснете backspace в началото на полето за въвеждане.
+commits.view_single_diff = Преглед на промените в този файл, въведени в това подаване
+issues.choose.ignore_invalid_templates = Невалидните шаблони са игнорирани
+issues.due_date_form = гггг-мм-дд
+issues.dependency.no_permission.can_remove = Нямате разрешение да прочетете тази зависимост, но можете да я премахнете
+issues.review.remove_review_request_self = отказа да рецензира %s
+mirror_use_ssh.helper = Forgejo ще създаде огледало на хранилището чрез Git през SSH и ще генерира двойка ключове за вас, когато изберете тази опция. Трябва да се уверите, че генерираният публичен ключ е упълномощен да изтласква към целевото хранилище. Не можете да използвате удостоверяване, базирано на парола, когато избирате това.
+mirror_address_url_invalid = Предоставеният URL е невалиден. Трябва да екранирате правилно всички компоненти на URL адреса.
+template.git_content = Git съдържание (стандартен клон)
+ambiguous_runes_description = `Този файл съдържа Уникод знаци, които могат да бъдат объркани с други знаци. Ако смятате, че това е умишлено, можете спокойно да пренебрегнете това предупреждение. Използвайте бутона „Екраниране“, за да ги разкриете.`
+issues.lock.notice_3 = - Винаги можете да отключите тази задача отново в бъдеще.
+issues.lock.title = Заключване на обсъждането по тази задача.
+issues.dependency.issue_batch_close_blocked = Не могат да бъдат затворени групово избраните задачи, защото задача #%d все още има отворени зависимости
+issues.dependency.add_error_cannot_create_circular = Не можете да създадете зависимост с две задачи, които се блокират взаимно.
+issues.review.add_review_requests = поиска рецензии от %[1]s %[2]s
+comment.blocked_by_user = Коментирането не е възможно, защото сте блокирани от притежателя на хранилището или от автора.
+pulls.view = Преглед на заявката за сливане
+pulls.no_merge_desc = Тази заявка за сливане не може да бъде слята, защото всички опции за сливане в хранилището са изключени.
+pulls.no_merge_wip = Тази заявка за сливане не може да бъде слята, защото е отбелязана като в процес на работа.
+pulls.switch_comparison_type = Превключване на типа сравнение
+pulls.has_changed_since_last_review = Променено след последната ви рецензия
+pulls.filter_branch = Филтриране на клон
+pulls.squash_merge_pull_request = Създаване на сплескано подаване
+pulls.rebase_conflict_summary = Съобщение за грешка
+pulls.auto_merge_button_when_succeed = (Когато проверките са успешни)
+pulls.auto_merge_newly_scheduled_comment = `насрочи тази заявка за сливане за автоматично сливане, когато всички проверки са успешни %[1]s`
+pulls.auto_merge_canceled_schedule_comment = `отмени автоматичното сливане на тази заявка за сливане, когато всички проверки са успешни %[1]s`
+pulls.merge_manually = Ръчно слята
+pulls.merge_commit_id = ID на подаването със сливане
+pulls.require_signed_wont_sign = Клонът изисква подписани подавания, но това сливане няма да бъде подписано
+pulls.no_merge_helper = Включете опциите за сливане в настройките на хранилището или слейте заявката за сливане ръчно.
+pulls.review_only_possible_for_full_diff = Рецензирането е възможно само при преглед на пълните разлики
+pulls.push_rejected = Изтласкването е неуспешно: Изтласкването е отхвърлено. Прегледайте Git куките за това хранилище.
+pulls.auto_merge_canceled_schedule = Автоматичното сливане е отменено за тази заявка за сливане.
+pulls.allow_edits_from_maintainers_err = Обновяването е неуспешно
+pulls.auto_merge_cancel_schedule = Отмяна на автоматичното сливане
+pulls.auto_merge_not_scheduled = Тази заявка за сливане не е насрочена за автоматично сливане.
+pulls.outdated_with_base_branch = Този клон е остарял спрямо основния клон
+pulls.update_not_allowed = Нямате разрешение да обновявате клона
+pulls.wrong_commit_id = ID на подаването трябва да бъде ID на подаване в целевия клон
+pulls.blocked_by_user = Не можете да създадете заявка за сливане в това хранилище, защото сте блокирани от притежателя на хранилището.
+pulls.merge_conflict_summary = Съобщение за грешка
+pulls.editable_explanation = Тази заявка за сливане позволява редакции от поддържащите. Можете да допринесете директно към нея.
+pulls.allow_edits_from_maintainers_desc = Потребители с право на запис в основния клон могат също да изтласкват към този клон
+pulls.merge_conflict = Сливането е неуспешно: Възникна конфликт по време на сливането. Подсказка: Опитайте различна стратегия
+pulls.has_merged = Неуспешно: Заявката за сливане е слята, не можете да слеете отново или да промените целевия клон.
+pulls.cmd_instruction_merge_warning = <b>Предупреждение:</b> Настройката „Автоматично откриване на ръчно сливане“ не е включена за това хранилище, ще трябва да отбележите тази заявка за сливане като ръчно слята след това.
+pulls.delete.title = Да се изтрие ли тази заявка за сливане?
+pulls.push_rejected_no_message = Изтласкването е неуспешно: Изтласкването е отхвърлено, но няма отдалечено съобщение. Прегледайте Git куките за това хранилище
+pulls.auto_merge_newly_scheduled = Заявката за сливане е насрочена за сливане, когато всички проверки са успешни.
+pulls.delete.text = Наистина ли искате да изтриете тази заявка за сливане? (Това ще премахне трайно цялото съдържание. Помислете дали вместо това да не я затворите, ако възнамерявате да я запазите архивирана)
+pulls.auto_merge_has_pending_schedule = %[1]s насрочи тази заявка за сливане за автоматично сливане, когато всички проверки са успешни %[2]s.
+pulls.auto_merge_when_succeed = Автоматично сливане, когато всички проверки са успешни
+error.csv.invalid_field_count = Не може да се визуализира този файл, защото има грешен брой полета на ред %d.
+diff.bin = ДВОИЧЕН
+release.add_tag_msg = Използване на заглавието и съдържанието на изданието като съобщение на маркера.
+release.hide_archive_links_helper = Скрийте автоматично генерираните архиви с програмен код за това издание. Например, ако качвате свои собствени.
+diff.data_not_available = Съдържанието на разликите не е налично
+diff.has_escaped = Този ред има скрити Уникод знаци
+branch.protected_deletion_failed = Клонът „%s“ е защитен. Не може да бъде изтрит.
+branch.default_deletion_failed = Клонът „%s“ е стандартният клон. Не може да бъде изтрит.
+diff.generated = генериран
+diff.comment.add_line_comment = Добавяне на коментар към ред
+diff.comment.add_review_comment = Добавяне на коментар
+diff.review.self_approve = Авторите на заявки за сливане не могат да одобряват собствените си заявки
+release.tag_name_protected = Името на маркера е защитено.
+branch.warning_rename_default_branch = Преименувате стандартния клон.
+find_file.no_matching = Не е намерен съвпадащ файл
+issues.role.member_helper = Този потребител е участник в организацията, притежаваща това хранилище.
+diff.image.overlay = Наслагване
+diff.image.swipe = Плъзгане
+branch.included = Включен
+diff.file_suppressed_line_too_long = Разликите във файла са потиснати, защото един или повече редове са твърде дълги
+error.broken_git_hook = Git куките на това хранилище изглеждат повредени. Моля, последвайте <a target="_blank" rel="noreferrer" href="%s">документацията</a>, за да ги поправите, след което изтласкайте подавания, за да обновите статуса.
+error.csv.unexpected = Не може да се визуализира този файл, защото съдържа неочакван знак на ред %d и колона %d.
+topic.count_prompt = Не можете да изберете повече от 25 теми
+release.hide_archive_links = Скриване на автоматично генерираните архиви
+diff.show_more = Показване на още
+diff.too_many_files = Някои файлове не бяха показани, защото твърде много файлове имат промени в тези разлики
+diff.review.self_reject = Авторите на заявки за сливане не могат да поискват промени в собствените си заявки
+branch.included_desc = Този клон е част от стандартния клон
+diff.image.side_by_side = Едно до друго
+release.summary_card_alt = Карта с обобщение на издание със заглавие „%s“ в хранилище %s
+release.asset_external_url = Външен URL адрес
+error.csv.too_large = Не може да се визуализира този файл, защото е твърде голям.
 
 [modal]
 confirm = Потвърждаване
@@ -1319,6 +1895,11 @@ table_modal.placeholder.content = Съдържание
 table_modal.placeholder.header = Заглавка
 buttons.new_table.tooltip = Добавяне на таблица
 table_modal.header = Добавяне на таблица
+link_modal.description = Описание
+link_modal.header = Добавяне на връзка
+buttons.indent.tooltip = Вмъкване на елементи с едно ниво
+buttons.unindent.tooltip = Изваждане на елементи с едно ниво
+link_modal.paste_reminder = Подсказка: С URL адрес в клипборда можете да поставите директно в редактора, за да създадете връзка.
 
 [org]
 teams.write_access = Писане
@@ -1373,18 +1954,18 @@ follow_blocked_user = Не можете да следвате тази орга
 settings.delete_prompt = Организацията ще бъде премахната завинаги. Това <strong>НЕ МОЖЕ</strong> да бъде отменено!
 settings.labels_desc = Добавете етикети, които могат да се използват за задачи за <strong>всички хранилища</strong> в тази организация.
 teams.none_access = Без достъп
-teams.members.none = Няма членове в този екип.
+teams.members.none = Няма участници в този екип.
 repo_updated = Обновено %s
 teams.delete_team_success = Екипът е изтрит.
 teams.search_repo_placeholder = Потърсете хранилище…
 teams.delete_team_title = Изтриване на екипа
-teams.add_team_member = Добавяне на член на екипа
+teams.add_team_member = Добавяне на участник в екипа
 teams.read_access_helper = Членовете могат да преглеждат и клонират хранилищата на екипа.
 teams.invite.description = Моля, щракнете върху бутона по-долу, за да се присъедините към екипа.
 teams.invite.title = Поканени сте да се присъедините към екип <strong>%s</strong> в организация <strong>%s</strong>.
 team_permission_desc = Разрешение
 members.public_helper = Да е скрит
-teams.members = Членове на екипа
+teams.members = Участници в екипа
 teams.delete_team = Изтриване на екипа
 members.owner = Притежател
 members.member_role = Роля на участника:
@@ -1393,11 +1974,43 @@ members.private_helper = Да е видим
 teams.no_desc = Този екип няма описание
 settings.delete_org_desc = Тази организация ще бъде изтрита перманентно. Продължаване?
 open_dashboard = Отваряне на таблото
+settings.change_orgname_prompt = Бележка: Промяната на името на организацията ще промени и URL адреса на вашата организация и ще освободи старото име.
+teams.add_duplicate_users = Потребителят вече е участник в екипа.
+team_unit_disabled = (Изключено)
+form.name_reserved = Името на организацията „%s“ е резервирано.
+settings.update_avatar_success = Профилната снимка на организацията е обновена.
+teams.invite_team_member.list = Чакащи покани
+teams.remove_all_repos_desc = Това ще премахне всички хранилища от екипа.
+form.create_org_not_allowed = Нямате разрешение да създавате организация.
+form.name_pattern_not_allowed = Шаблонът „%s“ не е разрешен в име на организация.
+members.invite_now = Поканване сега
+teams.specific_repositories = Конкретни хранилища
+teams.repos.none = Няма хранилища, до които този екип да има достъп.
+teams.add_all_repos_title = Добавяне на всички хранилища
+settings.hooks_desc = Добавете уеб-куки, които ще се задействат за <strong>всички хранилища</strong> в тази организация.
+teams.add_all_repos_desc = Това ще добави всички хранилища на организацията към екипа.
+members.invite_desc = Добавяне на нов участник към %s:
+members.private = Скрит
+settings.change_orgname_redirect_prompt.with_cooldown.few = Старото име на организацията ще бъде достъпно за всички след период на изчакване от %[1]d дни. Все още можете да си върнете старото име по време на периода на изчакване.
+team_access_desc = Достъп до хранилище
+teams.specific_repositories_helper = Участниците ще имат достъп само до хранилища, изрично добавени към екипа. Избирането на това <strong>няма</strong> автоматично да премахне хранилища, вече добавени с <i>Всички хранилища</i>.
+teams.delete_team_desc = Изтриването на екип отнема достъпа до хранилището от неговите участници. Продължаване?
+members.membership_visibility = Видимост на участничеството:
+members.public = Видим
+teams.all_repositories_helper = Екипът има достъп до всички хранилища. Избирането на това ще <strong>добави всички съществуващи</strong> хранилища към екипа.
+team_unit_desc = Разрешаване на достъп до секции на хранилището
+settings.update_setting_success = Настройките на организацията са обновени.
+settings.change_orgname_redirect_prompt = Старото име ще се пренасочва, докато не бъде взето.
+teams.invite_team_member = Поканване в %s
+teams.admin_access = Администраторски достъп
+settings.change_orgname_redirect_prompt.with_cooldown.one = Старото име на организацията ще бъде достъпно за всички след период на изчакване от %[1]d ден. Все още можете да си върнете старото име по време на периода на изчакване.
+teams.add_nonexistent_repo = Хранилището, което се опитвате да добавите, не съществува, моля, първо го създайте.
+teams.invite.by = Поканен от %s
 
 [install]
 admin_password = Парола
 user = Потребителско име
-admin_email = Адрес на ел. поща
+admin_email = Адрес за ел. поща
 path = Път
 password = Парола
 host = Хост
@@ -1427,13 +2040,17 @@ admin_title = Настройки на администраторския ака
 err_empty_admin_password = Администраторската парола не може да бъде празна.
 docker_helper = Ако стартирате Forgejo в Docker, моля, прочетете <a target="_blank" rel="noopener noreferrer" href="%s">документацията</a> преди да промените настройки.
 sqlite_helper = Път на файла за SQLite3 базата данни.<br>Въведете абсолютен път, ако стартирате Forgejo като service.
-err_empty_admin_email = Администраторският адрес на ел. поща не може да бъде празен.
+err_empty_admin_email = Администраторският адрес за ел. поща не може да бъде празен.
 password_algorithm = Алгоритъм за хеш. на паролите
-default_keep_email_private = Скриване на адресите на ел. поща по подразбиране
+default_keep_email_private = Скриване на адресите за ел. поща по подразбиране
 invalid_password_algorithm = Невалиден алгоритъм за хеш. на паролите
 err_admin_name_is_reserved = Потребителското име на администратора е невалидно, потребителското име е резервирано
 err_admin_name_pattern_not_allowed = Потребителското име на администратора е невалидно, потребителското име съответства с резервиран шаблон
 err_admin_name_is_invalid = Потребителското име на администратора е невалидно
+db_schema_helper = Оставете празно за схемата по подразбиране на базата данни („public“).
+reinstall_error = Опитвате се да инсталирате върху съществуваща Forgejo база данни
+reinstall_confirm_message = Преинсталирането със съществуваща Forgejo база данни може да причини множество проблеми. В повечето случаи трябва да използвате съществуващия си „app.ini“, за да стартирате Forgejo. Ако знаете какво правите, потвърдете следното:
+app_slogan = Слоган на инстанцията
 
 [filter]
 string.asc = А - Я
@@ -1462,8 +2079,8 @@ link_not_working_do_paste = Ако връзката не работи, опит
 activate_account = Моля, активирайте своя акаунт
 admin.new_user.subject = Нов потребител %s току-що се регистрира
 activate_account.text_1 = Здравейте, <b>%[1]s</b>, благодарим ви за регистрацията в %[2]s!
-activate_email.text = Моля, щракнете върху следната връзка, за да потвърдите своя адрес на ел. поща в рамките на <b>%s</b>:
-activate_email = Потвърдете своя адрес на ел. поща
+activate_email.text = Моля, щракнете върху следната връзка, за да потвърдите своя адрес за ел. поща в рамките на <b>%s</b>:
+activate_email = Потвърдете своя адрес за ел. поща
 activate_account.text_2 = Моля, щракнете върху следната връзка, за да активирате своя акаунт в рамките на <b>%s</b>:
 issue_assigned.issue = @%[1]s ви възложи задача %[2]s в хранилище %[3]s.
 issue.action.push_n = <b>@%[1]s</b> изтласка %[3]d подавания към %[2]s
@@ -1473,6 +2090,28 @@ issue.action.merge = <b>@%[1]s</b> сля #%[2]d в %[3]s.
 issue_assigned.pull = @%[1]s ви възложи заявката за сливане %[2]s в хранилище %[3]s.
 issue.action.ready_for_review = <b>@%[1]s</b> отбеляза тази заявка за сливане като готова за рецензиране.
 repo.transfer.subject_to = %s иска да прехвърли хранилище "%s" към %s
+password_change.subject = Вашата парола е променена
+admin.new_user.text = Моля, <a href="%s">щракнете тук</a>, за да управлявате този потребител от администраторския панел.
+password_change.text_1 = Паролата за вашия акаунт току-що беше променена.
+reset_password = Възстановете своя акаунт
+account_security_caution.text_1 = Ако това сте били вие, можете спокойно да игнорирате това ел. писмо.
+issue.action.force_push = <b>%[1]s</b> изтласка принудително <b>%[2]s</b> от %[3]s към %[4]s.
+team_invite.text_3 = Бележка: Тази покана е предназначена за %[1]s. Ако не сте очаквали тази покана, можете да игнорирате това ел. писмо.
+view_it_on = Вижте го на %s
+register_notify.text_1 = това е ел. писмо за потвърждение на вашата регистрация в %s!
+register_notify.text_2 = Можете да влезете в акаунта си с потребителско име: %s
+register_notify.text_3 = Ако някой друг е създал този акаунт за вас, първо ще трябва да <a href="%s">зададете парола</a>.
+repo.collaborator.added.subject = %s ви добави към %s като сътрудник
+primary_mail_change.text_1 = Основният адрес за ел. поща на вашия акаунт току-що беше променен на %[1]s. Това означава, че този адрес за ел. поща повече няма да получава известия по ел. поща за вашия акаунт.
+team_invite.text_2 = Моля, щракнете върху следната връзка, за да се присъедините към екипа:
+repo.transfer.body = За да го приемете или отхвърлите, посетете %s или просто го игнорирайте.
+repo.collaborator.added.text = Бяхте добавени като сътрудник в хранилище:
+team_invite.subject = %[1]s ви покани да се присъедините към организацията %[2]s
+team_invite.text_1 = %[1]s ви покани да се присъедините към екип %[2]s в организация %[3]s.
+reply = или отговорете директно на това ел. писмо
+reset_password.text = Ако това сте вие, моля, щракнете върху следната връзка, за да възстановите акаунта си в рамките на <b>%s</b>:
+primary_mail_change.subject = Основният ви адрес за ел. поща е променен
+account_security_caution.text_2 = Ако това не сте били вие, акаунтът ви е компрометиран. Моля, свържете се с администраторите на този сайт.
 
 [user]
 joined_on = Присъединени на %s
@@ -1493,7 +2132,7 @@ follow = Последване
 followers_few = %d последователи
 block_user = Блокиране на потребителя
 change_avatar = Променете профилната си снимка…
-email_visibility.limited = Вашият адрес на ел. поща е видим за всички удостоверени потребители
+email_visibility.limited = Вашият адрес за ел. поща е видим за всички удостоверени потребители
 disabled_public_activity = Този потребител е изключил публичната видимост на дейността.
 email_visibility.private = Вашият адрес на ел. поща е видим само за вас и администраторите
 show_on_map = Показване на това място на картата
@@ -1507,6 +2146,15 @@ public_activity.visibility_hint.self_public = Вашата дейност е в
 form.name_pattern_not_allowed = Шаблонът "%s" не е разрешен в потребителско име.
 form.name_reserved = Потребителското име "%s" е резервирано.
 public_activity.visibility_hint.self_private_profile = Вашата дейност е видима само за вас и администраторите на инстанцията, тъй като вашият профил е частен. <a href="%s">Конфигуриране</a>.
+block_user.detail = Моля, имайте предвид, че блокирането на потребител има и други ефекти, като например:
+block_user.detail_2 = Този потребител няма да може да взаимодейства с хранилищата, които притежавате, или със задачите и коментарите, които сте създали.
+block_user.detail_3 = Няма да можете да се добавяте един друг като сътрудници на хранилище.
+public_activity.visibility_hint.self_private = Вашата дейност е видима само за вас и администраторите на инстанцията. <a href="%s">Конфигуриране</a>.
+form.name_chars_not_allowed = Потребителското име „%s“ съдържа невалидни знаци.
+public_activity.visibility_hint.admin_private = Тази дейност е видима за вас, защото сте администратор, но потребителят иска тя да остане частна.
+public_activity.visibility_hint.admin_public = Тази дейност е видима за всички, но като администратор можете да виждате и взаимодействия в частни пространства.
+follow_blocked_user = Не можете да последвате този потребител, защото сте го блокирали или той ви е блокирал.
+block_user.detail_1 = Ще спрете да се следвате един друг и няма да можете да се последвате отново.
 
 [home]
 filter = Други филтри
@@ -1530,6 +2178,7 @@ view_home = Преглед на %s
 collaborative_repos = Съвместни хранилища
 switch_dashboard_context = Превключване на контекста на таблото
 show_only_public = Показване само на публични
+filter_by_team_repositories = Филтриране по хранилища на екипа
 
 [admin]
 packages.version = Версия
@@ -1587,7 +2236,7 @@ config.server_config = Сървърна конфигурация
 packages.size = Размер
 settings = Админ. настройки
 users = Потребителски акаунти
-emails.duplicate_active = Този адрес на ел. поща вече е активен за друг потребител.
+emails.duplicate_active = Този адрес за ел. поща вече е активен за друг потребител.
 config.app_ver = Forgejo версия
 config.custom_conf = Път на конфигурационния файл
 config.git_version = Git версия
@@ -1606,16 +2255,20 @@ users.details = Потребителски данни
 packages.total_size = Общ размер: %s
 dashboard.new_version_hint = Forgejo %s вече е наличен, вие изпълнявате %s. Проверете <a target="_blank" rel="noreferrer" href="%s">блога</a> за повече подробности.
 total = Общо: %d
+config.db_type = Тип
+monitor.queue.type = Тип
+notices.type = Тип
 
 [error]
 not_found = Целта не може да бъде намерена.
 report_message = Ако смятате, че това е грешка на Forgejo, моля, потърсете в задачите на <a href="%s" target="_blank">Codeberg</a> или отворете нова задача, ако е необходимо.
 network_error = Мрежова грешка
 occurred = Възникна грешка
+server_internal = Вътрешна грешка на сървъра
 
 [form]
 UserName = Потребителско име
-Email = Адрес на ел. поща
+Email = Адрес за ел. поща
 Password = Парола
 RepoName = Име на хранилището
 username_been_taken = Потребителското име вече е заето.
@@ -1633,8 +2286,8 @@ url_error = `„%s“ не е валиден URL.`
 Content = Съдържание
 team_not_exist = Екипът не съществува.
 TeamName = Име на екипа
-email_error = ` не е валиден адрес на ел. поща.`
-email_invalid = Адресът на ел. поща е невалиден.
+email_error = ` не е валиден адрес за ел. поща.`
+email_invalid = Адресът за ел. поща е невалиден.
 SSHTitle = Име на SSH ключ
 repo_name_been_taken = Името на хранилището вече е използвано.
 team_name_been_taken = Името на екипа вече е заето.
@@ -1647,6 +2300,55 @@ Pronouns = Местоимения
 Biography = Биография
 Website = Уебсайт
 Location = Местоположение
+cannot_add_org_to_team = Организация не може да бъде добавена като участник в екип.
+auth_failed = Неуспешно удостоверяване: %v
+team_no_units_error = Разрешете достъп до поне една секция на хранилището.
+password_uppercase_one = Поне един голям знак
+CommitSummary = Обобщение на подаването
+username_error = ` може да съдържа само буквено-цифрови знаци („0-9“, „a-z“, „A-Z“), тире („-“), долна черта („_“) и точка („.“). Не може да започва или завършва с не-буквено-цифрови знаци, като също така са забранени и последователни не-буквено-цифрови знаци.`
+username_error_no_dots = ` може да съдържа само буквено-цифрови знаци („0-9“, „a-z“, „A-Z“), тире („-“) и долна черта („_“). Не може да започва или завършва с не-буквено-цифрови знаци, като също така са забранени и последователни не-буквено-цифрови знаци.`
+duplicate_invite_to_team = Потребителят вече е поканен като участник в екипа.
+must_use_public_key = Ключът, който предоставихте, е частен ключ. Моля, не качвайте частния си ключ никъде. Вместо това използвайте публичния си ключ.
+org_still_own_packages = Тази организация все още притежава един или повече пакети, първо ги изтрийте.
+admin_cannot_delete_self = Не можете да изтриете себе си, когато сте администратор. Моля, първо премахнете администраторските си привилегии.
+To = Име на клон
+CommitMessage = Съобщение на подаването
+include_error = ` трябва да съдържа подниз „%s“.`
+alpha_dash_error = ` трябва да съдържа само буквено-цифрови знаци, тире („-“) и долна черта („_“).`
+alpha_dash_dot_error = ` трябва да съдържа само буквено-цифрови знаци, тире („-“), долна черта („_“) и точка („.“).`
+size_error = ` трябва да е с размер %s.`
+min_size_error = ` трябва да съдържа поне %s знака.`
+max_size_error = ` трябва да съдържа най-много %s знака.`
+invalid_group_team_map_error = ` съпоставянето е невалидно: %s`
+password_complexity = Паролата не отговаря на изискванията за сложност:
+password_lowercase_one = Поне един малък знак
+password_digit_one = Поне една цифра
+password_special_one = Поне един специален знак (препинателни знаци, скоби, кавички и др.)
+enterred_invalid_repo_name = Името на хранилището, което въведохте, е неправилно.
+enterred_invalid_org_name = Името на организацията, което въведохте, е неправилно.
+enterred_invalid_password = Паролата, която въведохте, е неправилна.
+organization_leave_success = Успешно напуснахте организацията %s.
+still_has_org = Вашият акаунт е участник в една или повече организации, първо ги напуснете.
+org_still_own_repo = Тази организация все още притежава едно или повече хранилища, първо ги изтрийте или прехвърлете.
+target_branch_not_exist = Целевият клон не съществува.
+glob_pattern_error = ` glob шаблонът е невалиден: %s.`
+openid_been_used = OpenID адресът „%s“ вече е използван.
+unknown_error = Неизвестна грешка:
+TreeName = Път до файла
+AdminEmail = Администраторски адрес за ел. поща
+email_domain_is_not_allowed = Домейнът на адреса за ел. поща на потребителя <b>%s</b> е в конфликт с EMAIL_DOMAIN_ALLOWLIST или EMAIL_DOMAIN_BLOCKLIST. Уверете се, че сте въвели правилно адреса за ел. поща.
+email_been_used = Адресът за ел. поща вече се използва.
+unable_verify_ssh_key = Не може да се потвърди SSH ключът, проверете го отново за грешки.
+enterred_invalid_owner_name = Името на новия притежател не е валидно.
+NewBranchName = Име на новия клон
+invalid_ssh_key = Не може да се потвърди вашият SSH ключ: %s
+required_prefix = Въведеният текст трябва да започва с „%s“
+regex_pattern_error = ` шаблонът на регулярния израз е невалиден: %s.`
+repository_files_already_exist = Вече съществуват файлове за това хранилище. Свържете се със системния администратор.
+repository_files_already_exist.delete = Вече съществуват файлове за това хранилище. Трябва да ги изтриете.
+invalid_gpg_key = Не може да се потвърди вашият GPG ключ: %s
+git_ref_name_error = ` трябва да е правилно форматирано име на Git препратка.`
+last_org_owner = Не можете да премахнете последния потребител от екипа на „притежателите“. Трябва да има поне един притежател за организация.
 
 [action]
 close_issue = `затвори задача <a href="%[1]s">%[3]s#%[2]s</a>`
@@ -1666,7 +2368,7 @@ merge_pull_request = `сля заявка за сливане <a href="%[1]s">%[
 auto_merge_pull_request = `сля автоматично заявка за сливане <a href="%[1]s">%[3]s#%[2]s</a>`
 watched_repo = започна да наблюдава <a href="%[1]s">%[2]s</a>
 delete_tag = изтри маркера %[2]s от <a href="%[1]s">%[3]s</a>
-delete_branch = изтри клона %[2]s от <a href="%[1]s">%[3]s</a>
+delete_branch = изтри клона <code>%[2]s</code> от <a href="%[1]s">%[3]s</a>
 create_branch = създаде клон <a href="%[2]s">%[3]s</a> на <a href="%[1]s">%[4]s</a>
 publish_release = `публикува издание <a href="%[2]s">%[4]s</a> на <a href="%[1]s">%[3]s</a>`
 push_tag = изтласка маркер <a href="%[2]s">%[3]s</a> към <a href="%[1]s">%[4]s</a>
@@ -1675,6 +2377,11 @@ reject_pull_request = `предложи промени за <a href="%[1]s">%[3]
 compare_branch = Сравняване
 compare_commits_general = Сравняване на подавания
 compare_commits = Сравнете %d подавания
+transfer_repo = прехвърли хранилище <code>%s</code> към <a href="%s">%s</a>
+mirror_sync_push = синхронизира подавания към <a href="%[2]s">%[3]s</a> на <a href="%[1]s">%[4]s</a> от огледало
+mirror_sync_create = синхронизира нова препратка <a href="%[2]s">%[3]s</a> към <a href="%[1]s">%[4]s</a> от огледало
+review_dismissed = `отхвърли рецензия от <b>%[4]s</b> за <a href="%[1]s">%[3]s#%[2]s</a>`
+mirror_sync_delete = синхронизира и изтри препратка <code>%[2]s</code> на <a href="%[1]s">%[3]s</a> от огледало
 
 [auth]
 tab_openid = OpenID
@@ -1709,11 +2416,38 @@ sign_up_button = Регистрирайте се.
 back_to_sign_in = Назад към Вход
 sign_in_openid = Продължаване с OpenID
 send_reset_mail = Изпращане на ел. писмо за възстановяване
+authorize_application = Упълномощаване на приложение
+password_pwned_err = Неуспешно завършване на заявката към HaveIBeenPwned
+last_admin = Не можете да премахнете последния администратор. Трябва да има поне един администратор.
+allow_password_change = Изискване потребителят да смени паролата си (препоръчително)
+authorize_title = Упълномощавате ли „%s“ да има достъп до вашия акаунт?
+reset_password_mail_sent_prompt = Изпратено е ел. писмо за потвърждение до <b>%s</b>. За да завършите процеса по възстановяване на акаунта, моля, проверете входящата си поща и последвайте предоставената връзка в рамките на следващите %s.
+reset_password_wrong_user = Вие сте влезли като %s, но връзката за възстановяване на акаунта е предназначена за %s
+authorize_redirect_notice = Ще бъдете пренасочени към %s, ако упълномощите това приложение.
+authorize_application_description = Ако предоставите достъп, то ще може да осъществява достъп и да записва цялата информация за вашия акаунт, включително частни хранилища и организации.
+twofa_scratch_used = Използвали сте своя резервен код. Пренасочени сте към страницата с настройки за двуфакторно удостоверяване, за да можете да премахнете регистрацията на устройството си или да генерирате нов резервен код.
+reset_password_helper = Възстановяване на акаунт
+invalid_password = Вашата парола не съвпада с паролата, използвана за създаване на акаунта.
+invalid_code = Вашият код за потвърждение е невалиден или е изтекъл.
+invalid_code_forgot_password = Вашият код за потвърждение е невалиден или е изтекъл. Щракнете <a href="%s">тук</a>, за да започнете нова сесия.
+scratch_code = Резервен код
+use_scratch_code = Използвайте резервен код
+use_onetime_code = Използвайте еднократен код
+twofa_scratch_token_incorrect = Вашият резервен код е неправилен.
+authorize_application_created_by = Това приложение е създадено от %s.
+authorization_failed = Неуспешно упълномощаване
+resent_limit_prompt = Вече сте поискали ел. писмо за активация наскоро. Моля, изчакайте 3 минути и опитайте отново.
+has_unconfirmed_mail = Здравейте, %s, имате непотвърден адрес за ел. поща (<b>%s</b>). Ако не сте получили ел. писмо за потвърждение или трябва да изпратите ново, моля, щракнете върху бутона по-долу.
+change_unconfirmed_email_error = Неуспешна промяна на адреса за ел. поща: %v
+resend_mail = Щракнете тук, за повторно изпращане на ел. писмо за активация
+change_unconfirmed_email_summary = Промяна на адреса, на който се изпраща ел. писмо за активация.
+change_unconfirmed_email = Ако сте въвели грешен адрес за ел. поща по време на регистрацията, можете да го промените по-долу и потвърждение ще бъде изпратено на новия адрес.
 
 [aria]
 footer.software = Относно този софтуер
 footer.links = Връзки
 footer = Долен колонтитул
+navbar = Навигационна лента
 
 [startpage]
 install = Лесен за инсталиране
@@ -1780,6 +2514,15 @@ runs.no_workflows.help_no_write_access = За да научите повече 
 variables.management = Управление на променливи
 variables.not_found = Променливата не е открита.
 variables.id_not_exist = Променлива с идентификатор %d не съществува.
+runners.owner_type = Тип
+status.cancelled = Отменено
+status.running = Изпълнява се
+status.success = Успешно
+status.waiting = Изчаква се
+status.unknown = Неизвестно
+status.failure = Неуспешно
+status.skipped = Пропуснато
+unit.desc = Управление на интегрирани CI/CD pipelines с Forgejo Actions.
 
 [heatmap]
 less = По-малко
@@ -1809,9 +2552,10 @@ invalid_input_type = Не можете да качвате файлове от 
 component_loading_failed = Неуспешно зареждане на %s
 contributors.what = приноси
 recent_commits.what = скорошни подавания
-component_loading = Зареждане на %s...
+component_loading = Зареждане на %s…
 component_loading_info = Това може да отнеме известно време…
 code_frequency.what = честота на промените
+component_failed_to_load = Възникна неочаквана грешка.
 
 [projects]
 type-1.display_name = Индивидуален проект
@@ -1820,20 +2564,29 @@ deleted.display_name = Изтрит проект
 
 [search]
 no_results = Няма намерени съответстващи резултати.
-team_kind = Търсене на екипи...
-repo_kind = Търсене на хранилища...
-org_kind = Търсене на организации...
-user_kind = Търсене на потребители...
-code_kind = Търсене на код...
-commit_kind = Търсене на подавания...
-project_kind = Търсене на проекти...
-package_kind = Търсене на пакети...
-search = Търсене...
-branch_kind = Търсене на клонове...
-pull_kind = Търсене на заявки за сливане...
-issue_kind = Търсене на задачи...
+team_kind = Търсене на екипи…
+repo_kind = Търсене на хранилища…
+org_kind = Търсене на организации…
+user_kind = Търсене на потребители…
+code_kind = Търсене на код…
+commit_kind = Търсене на подавания…
+project_kind = Търсене на проекти…
+package_kind = Търсене на пакети…
+search = Търсене…
+branch_kind = Търсене на клонове…
+pull_kind = Търсене на заявки за сливане…
+issue_kind = Търсене на задачи…
 fuzzy = Приблизително
 exact = Прецизно
+regexp = Регекс
+regexp_tooltip = Третиране на термина за търсене като регулярен израз
+fuzzy_tooltip = Включване на резултати, които също съвпадат приблизително с термина за търсене
+exact_tooltip = Включване само на резултати, които съвпадат точно с термина за търсене
+code_search_unavailable = Търсенето на код в момента не е достъпно. Моля, свържете се с администратора на сайта.
+keyword_search_unavailable = Търсенето по ключова дума в момента не е достъпно. Моля, свържете се с администратора на сайта.
+union_tooltip = Включване на резултати, които съвпадат с някоя от ключовите думи, разделени с интервал
+union = Обединение
+type_tooltip = Тип търсене
 
 [markup]
 filepreview.lines = Редове от %[1]d до %[2]d в %[3]s
@@ -1851,3 +2604,33 @@ eib = ЕиБ
 
 [translation_meta]
 test = окей
+
+
+[gpg]
+default_key = Подписано с ключ по подразбиране
+error.no_gpg_keys_found = Не е намерен известен ключ за този подпис в базата данни
+error.not_signed_commit = Не е подписано подаване
+error.generate_hash = Неуспешно генериране на хеш на подаването
+error.extract_sign = Неуспешно извличане на подпис
+error.probable_bad_signature = ВНИМАНИЕ! Въпреки че има ключ с това ID в базата данни, той не потвърждава това подаване! Това подаване е ПОДОЗРИТЕЛНО.
+error.failed_retrieval_gpg_keys = Неуспешно извличане на ключ, свързан с акаунта на подаващия
+error.probable_bad_default_signature = ВНИМАНИЕ! Въпреки че ключът по подразбиране има това ID, той не потвърждава това подаване! Това подаване е ПОДОЗРИТЕЛНО.
+error.no_committer_account = Няма акаунт, свързан с адреса за ел. поща на подаващия
+
+[repo.permissions]
+projects.read = <b>Четене:</b> Достъп до проектните табла на хранилището.
+wiki.write = <b>Писане:</b> Създаване, обновяване и изтриване на страници в интегрираното уики.
+issues.read = <b>Четене:</b> Четене и създаване на задачи и коментари.
+pulls.read = <b>Четене:</b> Четене и създаване на заявки за сливане.
+pulls.write = <b>Писане:</b> Затваряне на заявки за сливане и управление на метаданни като етикети, етапи, изпълнители, крайни срокове и зависимости.
+projects.write = <b>Писане:</b> Създаване и редактиране на проекти и колони.
+releases.read = <b>Четене:</b> Преглед и изтегляне на издания.
+wiki.read = <b>Четене:</b> Четене на интегрираното уики и неговата история.
+code.read = <b>Четене:</b> Достъп и клониране на кода на хранилището.
+code.write = <b>Писане:</b> Изтласкване към хранилището, създаване на клонове и маркери.
+issues.write = <b>Писане:</b> Затваряне на задачи и управление на метаданни като етикети, етапи, изпълнители, крайни срокове и зависимости.
+
+[units]
+error.no_unit_allowed_repo = Нямате разрешение за достъп до никоя секция на това хранилище.
+unit = Елемент
+error.unit_not_allowed = Нямате разрешение за достъп до тази секция на хранилището.
\ No newline at end of file
diff --git a/options/locale/locale_ca.ini b/options/locale/locale_ca.ini
index 9cb7d5e50c..ea2af3b645 100644
--- a/options/locale/locale_ca.ini
+++ b/options/locale/locale_ca.ini
@@ -153,26 +153,26 @@ fuzzy = Difusa
 search = Cerca...
 type_tooltip = Tipus de cerca
 fuzzy_tooltip = Inclou resultats que s'assemblen al terme de la cerca
-repo_kind = Cerca repos...
-user_kind = Cerca usuaris...
+repo_kind = Cerca repos…
+user_kind = Cerca usuaris…
 code_search_unavailable = La cerca de codi no està disponible actualment. Si us plau concteu amb l'administrador del lloc.
 code_search_by_git_grep = Els resultats actuals de la cerca de codi són proporcionats per "git grep". Podríen haver-hi millors resultats si l'administrador del lloc habilita l'indexador de codi.
-package_kind = Cerca paquets...
-project_kind = Cerca projectes...
-branch_kind = Cerca branques...
-commit_kind = Cerca commits...
-runner_kind = Cerca executors...
+package_kind = Cerca paquets…
+project_kind = Cerca projectes…
+branch_kind = Cerca branques…
+commit_kind = Cerca commits…
+runner_kind = Cerca executors…
 no_results = Cap resultat coincident trobat.
 keyword_search_unavailable = La cerca per paraula clau no està disponible ara mateix. Si us plau contacteu amb l'administrador del lloc.
 union = Paraules clau
 union_tooltip = Inclou resultats que encaixen amb qualsevol paraula clau separada per espais
-org_kind = Cerca organitzacions...
-team_kind = Cerca teams...
-code_kind = Cerca codi...
-pull_kind = Cerca "pulls"...
+org_kind = Cerca organitzacions…
+team_kind = Cerca teams…
+code_kind = Cerca codi…
+pull_kind = Cerca "pulls"…
 exact = Exacte
 exact_tooltip = Inclou només resultats que són exactament el terme de cerca
-issue_kind = Cerca problemes...
+issue_kind = Cerca problemes…
 regexp = RegExp
 regexp_tooltip = Interpreta el terme de cerca com una expressió regular
 
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index 6f8953af04..b079bc839a 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -118,7 +118,7 @@ go_back=Zpět
 never=Nikdy
 unknown=Neznámý
 
-rss_feed=RSS kanál
+rss_feed=Kanál RSS
 
 pin=Připnout
 unpin=Odepnout
@@ -340,7 +340,7 @@ no_reply_address=Skrytá e-mailová doména
 no_reply_address_helper=Název domény pro uživatele se skrytou e-mailovou adresou. Příklad: pokud je název skryté e-mailové domény nastaven na „noreply.example.org“, uživatelské jméno „joe“ bude zaznamenáno v Gitu jako „joe@noreply.example.org“.
 password_algorithm=Hashovací algoritmus hesla
 invalid_password_algorithm=Neplatný algoritmus hashe hesla
-password_algorithm_helper=Nastavte algoritmus hashování hesla. Algoritmy mají odlišné požadavky a sílu. Algoritmus argon2 je poměrně bezpečný, ale používá spoustu paměti a může být nevhodný pro malé systémy.
+password_algorithm_helper=Nastavte algoritmus hashování hesla. Algoritmy mají odlišné požadavky a síly. Algoritmus argon2 je poměrně bezpečný, ale používá spoustu paměti a může být nevhodný pro malé systémy.
 enable_update_checker=Povolit kontrolu aktualizací
 env_config_keys=Konfigurace prostředí
 env_config_keys_prompt=Následující proměnné prostředí budou také použity pro váš konfigurační soubor:
@@ -468,7 +468,7 @@ email_domain_blacklisted=Nemůžete se registrovat s vaší e-mailovou adresou.
 authorize_application=Autorizovat aplikaci
 authorize_redirect_notice=Budete přesměrováni na %s, pokud autorizujete tuto aplikaci.
 authorize_application_created_by=Tuto aplikaci vytvořil %s.
-authorize_application_description=Pokud povolíte přístup, bude moci přistupovat a zapisovat do všech vašich informací o účtu včetně soukromých repozitářů a organizací.
+authorize_application_description=Pokud udělíte přístup, bude moci přistupovat a zapisovat do všech vašich informací o účtu včetně soukromých repozitářů a organizací.
 authorize_title=Autorizovat „%s“ pro přístup k vašemu účtu?
 authorization_failed=Autorizace selhala
 authorization_failed_desc=Autorizace selhala, protože jsme detekovali neplatný požadavek. Kontaktujte prosím správce aplikace, kterou jste se pokoušeli autorizovat.
@@ -493,16 +493,16 @@ use_onetime_code = Použít jednorázový kód
 view_it_on=Zobrazit na %s
 reply=nebo přímo odpovědět na tento e-mail
 link_not_working_do_paste=Odkaz nefunguje? Zkuste jej zkopírovat a vložit do adresního řádku svého prohlížeče.
-hi_user_x=Ahoj <b>%s</b>,
+hi_user_x=Dobrý den, uživateli <b>%s</b>,
 
 activate_account=Prosíme, aktivujte si váš účet
 activate_account.title=%s, prosím aktivujte si váš účet
-activate_account.text_1=Ahoj <b>%[1]s</b>, děkujeme za registraci na %[2]s!
+activate_account.text_1=Dobrý den, uživateli <b>%[1]s</b>, děkujeme za registraci ve službě %[2]s!
 activate_account.text_2=Pro aktivaci vašeho účtu klikněte <b>%s</b> na následující odkaz :
 
 activate_email=Ověřte vaši e-mailovou adresu
 activate_email.title=%s, prosím ověřte vaši e-mailovou adresu
-activate_email.text=Pro ověření vaší e-mailové adresy klikněte <b>%s</b> na následující odkaz:
+activate_email.text=Pro ověření vaší e-mailové adresy klikněte do <b>%s</b> na následující odkaz:
 
 register_notify=Vítejte v %s
 register_notify.title=%[1]s vítejte v %[2]s
@@ -724,7 +724,7 @@ following_one = %d sledovaný
 followers.title.one = Sledující
 followers.title.few = Sledující
 following.title.one = Sleduje
-following.title.few = Sleudje
+following.title.few = Sleduje
 public_activity.visibility_hint.self_private = Vaše aktivita je viditelná pouze vám a správcům instance. <a href="%s">Nastavení</a>.
 public_activity.visibility_hint.admin_private = Tato aktivita je pro vás viditelná, protože jste administrátor, ale uživatel chce, aby zůstala soukromá.
 public_activity.visibility_hint.self_public = Vaše aktivita je viditelná všem, mimo interakcí v soukromých prostorech. <a href="%s">Nastavení</a>.
@@ -828,7 +828,7 @@ activations_pending=Čekající aktivace
 can_not_add_email_activations_pending=Existuje čekající aktivace, zkuste to znovu za pár minut, pokud chcete přidat nový e-mail.
 delete_email=Smazat
 email_deletion=Odstranit e-mailovou adresu
-email_deletion_desc=E-mailová adresa a přidružené informace budou z vašeho účtu odstraněny. Revize Gitu s touto e-mailovou adresou zůstanou nezměněny. Pokračovat?
+email_deletion_desc=Tato e-mailová adresa a přidružené informace budou z vašeho účtu odstraněny. Revize Gitu s touto e-mailovou adresou zůstanou nezměněny. Pokračovat?
 email_deletion_success=E-mailová adresa byla odstraněna.
 theme_update_success=Váš motiv vzhledu byl aktualizován.
 theme_update_error=Vybraný motiv vzhledu neexistuje.
@@ -932,7 +932,7 @@ generate_new_token=Vygenerovat nový token
 tokens_desc=Tyto tokeny umožňují přístup k vašemu účtu pomocí Forgejo API.
 token_name=Název tokenu
 generate_token=Vygenerovat token
-generate_token_success=Nový token byl vygenerován. Zkopírujte jej nyní, jelikož již nebude znovu zobrazen.
+generate_token_success=Nový token byl vygenerován. Zkopírujte si jej nyní, jelikož již nebude znovu zobrazen.
 generate_token_name_duplicate=<strong>%s</strong> byl již použit jako název aplikace. Použijte prosím nový.
 delete_token=Smazat
 access_token_deletion=Odstranit přístupový token
@@ -1063,7 +1063,7 @@ language.localization_project = Pomozte nám s překladem Forgejo do vašeho jaz
 user_block_yourself = Nemůžete zablokovat sami sebe.
 pronouns_custom_label = Vlastní zájmena
 change_username_redirect_prompt.with_cooldown.few = Staré uživatelské jméno bude dostupné ostatním po %[1]d dnech. Do té doby budete moci své staré uživatelské jméno znovu získat.
-change_username_redirect_prompt.with_cooldown.one = Staré uživatelské jméno bude dostupné ostatním po %[1]d dni. Do té doby budete moci své staré uživatelské jméno znovu získat.
+change_username_redirect_prompt.with_cooldown.one = Staré uživatelské jméno bude dostupné ostatním po %[1]d dnu. Do té doby budete moci své staré uživatelské jméno znovu získat.
 keep_pronouns_private = Zobrazovat zájmena pouze přihlášeným uživatelům
 keep_pronouns_private.description = Toto nastavení skryje vaše zájmena před návštěvníky, kteří nejsou přihlášeni.
 quota = Kvóta
@@ -1083,13 +1083,14 @@ quota.sizes.assets.artifacts = Artefakty
 quota.sizes.assets.packages.all = Balíčky
 quota.sizes.wiki = Wiki
 storage_overview = Přehled úložiště
-quota.applies_to_user = Následující pravidla kvóty se vztahují na váš účet
+quota.applies_to_user = Na váš účet se vztahují následující pravidla kvóty
 quota.rule.exceeded.helper = Celková velikost objektů pro toto pravidlo přesáhla kvótu.
 quota.sizes.assets.attachments.releases = Přílohy vydání
 regenerate_token_success = Token byl znovu vygenerován. Aplikace, které jej používají, již nemají přístup k vašemu účtu a je třeba je aktualizovat s novým tokenem.
 regenerate_token = Resetovat
 access_token_regeneration = Znovu vygenerovat přístupový token
 access_token_regeneration_desc = Opětovným vygenerováním tokenu znemožníte přístup k vašemu účtu aplikacím, které jej používají. Tato akce je nevratná. Chcete pokračovat?
+ssh_token_help_ssh_agent = nebo, pokud používáte agenta SSH (s nastavenou proměnnou SSH_AUTH_SOCK):
 
 [repo]
 new_repo_helper=Repozitář obsahuje všechny soubory projektu, včetně historie revizí. Už jej hostujete jinde? <a href="%s">Migrovat repozitář</a>.
@@ -1155,7 +1156,7 @@ mirror_interval_invalid=Interval zrcadlení není platný.
 mirror_sync_on_commit=Synchronizovat při nahrávání revizí
 mirror_address=Klonovat z URL
 mirror_address_desc=Zadejte požadované přístupové údaje do sekce Ověření.
-mirror_address_url_invalid=Poskytnutá URL je neplatná. Všechny části musíte správně nahradit escape sekvencí.
+mirror_address_url_invalid=Zadaná adresa URL je neplatná. Ujistěte se, že jsou všechny části adresy správně escapované.
 mirror_address_protocol_invalid=Zadaná URL je neplatná. Mohou být zrcadleny pouze umístění http(s):// nebo git://.
 mirror_lfs=Úložiště velkých souborů (LFS)
 mirror_lfs_desc=Aktivovat zrcadlení dat LFS.
@@ -1213,7 +1214,7 @@ template.issue_labels=Štítky problémů
 template.one_item=Musíte vybrat alespoň jednu položku šablony
 template.invalid=Musíte vybrat repositář šablony
 
-archive.title=Tento repozitář je archivovaný. Můžete prohlížet soubory, klonovat, ale nemůžete provádět žádné změny jeho stavu, jako nahrávání a vytváření nových problémů, žádostí nebo komentářů.
+archive.title=Tento repozitář byl archivován. Můžete prohlížet soubory, klonovat, ale nemůžete provádět žádné změny jeho stavu, jako nahrávání a vytváření nových problémů, žádostí nebo komentářů.
 archive.title_date=Tento repozitář byl archivován %s. Můžete prohlížet soubory, klonovat, ale nemůžete provádět žádné změny jeho stavu, jako nahrávání a vytváření nových problémů, žádostí nebo komentářů.
 archive.issue.nocomment=Tento repozitář je archivovaný. Nemůžete komentovat problémy.
 archive.pull.nocomment=Tento repozitář je archivovaný. Nemůžete komentovat žádosti o sloučení.
@@ -1243,7 +1244,7 @@ migrate_items_releases=Vydání
 migrate_repo=Migrovat repozitář
 migrate.clone_address=Migrovat / klonovat z URL
 migrate.clone_address_desc=HTTP(S) nebo URL Git „clone“ existujícího repozitáře
-migrate.github_token_desc=Můžete sem vložit jeden nebo více tokenů oddělených čárkou, abyste urychlili migraci kvůli omezení rychlosti rozhraní GitHub API. VAROVÁNÍ: Zneužití této funkce může vést k porušení zásad poskytovatele služeb a zablokování účtu.
+migrate.github_token_desc=Sem můžete vložit jeden nebo více tokenů oddělených čárkami, abyste urychlili migraci obejitím omezení rychlosti rozhraní GitHub API. VAROVÁNÍ: Zneužití této funkce může vést k porušení zásad poskytovatele služeb a zablokování účtu.
 migrate.clone_local_path=nebo místní cesta serveru
 migrate.permission_denied=Není dovoleno importovat místní repozitáře.
 migrate.permission_denied_blocked=Nelze importovat z nepovolených hostitelů, prosím požádejte správce, aby zkontroloval nastavení ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
@@ -1556,7 +1557,7 @@ issues.label_templates.info=Zatím nebyly vytvořeny žádné štítky. Vytvořt
 issues.label_templates.helper=Vyberte přednastavené značky
 issues.label_templates.use=Použít přednastavené štítky
 issues.label_templates.fail_to_load_file=Nepodařilo se načíst soubor šablony popisku „%s“: %v
-issues.add_label=přidal/a %s štítek %s
+issues.add_label=přidal/a štítek %s %s
 issues.add_labels=přidal/a %s štítky %s
 issues.remove_label=odstranil/a %s štítek %s
 issues.remove_labels=odstranil/a %s štítky %s
@@ -1579,7 +1580,7 @@ issues.remove_ref_at=`odstranil/a referenci <b>%s</b> %s`
 issues.add_ref_at=`přidal/a referenci <b>%s</b> %s`
 issues.delete_branch_at=`odstranil/a větev <b>%s</b> %s`
 issues.filter_label=Štítek
-issues.filter_label_exclude=`Chcete-li vyloučit štítky, použijte <code>alt</code> + <code>click/enter</code>`
+issues.filter_label_exclude=Chcete-li vyloučit štítky, použijte <kbd>Alt</kbd> + <kbd>kliknutí</kbd>
 issues.filter_label_no_select=Všechny štítky
 issues.filter_label_select_no_label=Bez štítku
 issues.filter_milestone=Milník
@@ -1633,13 +1634,13 @@ issues.opened_by_fake=otevřeno %[1]s uživatelem %[2]s
 issues.closed_by_fake=od %[2]s byl uzavřen %[1]s
 issues.previous=Předchozí
 issues.next=Další
-issues.open_title=Otevřeno
-issues.closed_title=Uzavřeno
+issues.open_title=Otevřené
+issues.closed_title=Uzavřené
 issues.draft_title=Koncept
 issues.num_comments_1=%d komentář
 issues.num_comments=%d komentářů
 issues.commented_at=`okomentoval/a <a href="#%s">%s</a>`
-issues.delete_comment_confirm=Jste si jist, že chcete smazat tento komentář?
+issues.delete_comment_confirm=Opravdu chcete smazat tento komentář?
 issues.context.copy_link=Kopírovat odkaz
 issues.context.quote_reply=Citovat odpověď
 issues.context.reference_issue=Odkázat v novém problému
@@ -1653,13 +1654,13 @@ issues.close_comment_issue=Zavřít s komentářem
 issues.reopen_issue=Znovu otevřít
 issues.reopen_comment_issue=Znovu otevřít s komentářem
 issues.create_comment=Komentovat
-issues.closed_at=`uzavřel/a tento problém <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`znovu otevřel/a tento problém <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`odkázal/a na tento problém z revize <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">odkázal/a na tento problém %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">odkázal/a na tuto žádost o sloučení %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">odkazoval/a na tento problém ze žádosti o sloučení %[4]s, která jej uzavře</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">odkazoval/a na tento problém ze žádosti o sloučení %[4]s, která jej znovu otevře</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`uzavřel/a tento problém %s`
+issues.reopened_at=`znovu otevřel/a tento problém %s`
+issues.commit_ref_at=`odkázal/a na tento problém z revize %s`
+issues.ref_issue_from=`<a href="%[2]s">odkázal/a na tento problém %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">odkázal/a na tuto žádost o sloučení %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">odkázal/a na tento problém ze žádosti o sloučení %[3]s, která jej uzavře</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">odkázal/a na tento problém ze žádosti o sloučení %[3]s, která jej znovu otevře</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">uzavřel/a tento problém %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">znovu otevřel/a tento problém %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`z %[1]s`
@@ -1763,7 +1764,7 @@ issues.error_modifying_due_date=Změna termínu dokončení selhala.
 issues.error_removing_due_date=Odstranění termínu dokončení selhalo.
 issues.push_commit_1=přidal/a %d revizi %s
 issues.push_commits_n=přidal/a %d revize %s
-issues.force_push_codes=`vynucené nahrání %[1]s od <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> do <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`vynutil/a nahrání %[1]s od <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s do <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Porovnat
 issues.due_date_form=rrrr-mm-dd
 issues.due_date_form_add=Přidat termín dokončení
@@ -1813,7 +1814,7 @@ issues.review.approve=schválil/a tyto změny %s
 issues.review.comment=posoudil/a %s
 issues.review.dismissed=zamítl/a posouzení uživatele %s %s
 issues.review.dismissed_label=Zamítnuto
-issues.review.left_comment=zanechal komentář
+issues.review.left_comment=zanechal/a komentář
 issues.review.content.empty=Je potřeba zanechat poznámku s uvedením požadované změny (požadovaných změn).
 issues.review.reject=požádal/a o změny %s
 issues.review.wait=byl/a požádán/a o posouzení %s
@@ -1875,7 +1876,7 @@ pulls.select_commit_hold_shift_for_range=Vyberte revizi. Podržte klávesu Shift
 pulls.review_only_possible_for_full_diff=Posouzení je možné pouze při zobrazení plného rozlišení
 pulls.filter_changes_by_commit=Filtrovat podle revize
 pulls.nothing_to_compare=Tyto větve jsou stejné. Není třeba vytvářet žádost o sloučení.
-pulls.nothing_to_compare_have_tag = Vybraná větev a značka jsou shodné.
+pulls.nothing_to_compare_have_tag = Vybrané větve a značky jsou shodné.
 pulls.nothing_to_compare_and_allow_empty_pr=Tyto větve jsou stejné. Tato žádost o sloučení bude prázdná.
 pulls.has_pull_request=`Žádost o sloučení mezi těmito větvemi již existuje: <a href="%[1]s">%[2]s#%[3]d</a>`
 pulls.create=Vytvořit žádost o sloučení
@@ -1966,8 +1967,8 @@ pulls.update_branch_success=Aktualizace větve byla úspěšná
 pulls.update_not_allowed=Nemáte oprávnění aktualizovat větev
 pulls.outdated_with_base_branch=Tato větev je zastaralá oproti základní větvi
 pulls.close=Zavřít žádost o sloučení
-pulls.closed_at=`uzavřel/a tuto žádost o sloučení <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`znovu otevřel/a tuto žádost o sloučení <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`uzavřel/a tuto žádost o sloučení %s`
+pulls.reopened_at=`znovu otevřel/a tuto žádost o sloučení %s`
 pulls.cmd_instruction_hint=Zobrazit instrukce příkazové řádky
 pulls.cmd_instruction_checkout_desc=Z vašeho repositáře projektu se podívejte na novou větev a vyzkoušejte změny.
 pulls.cmd_instruction_merge_title=Sloučit
@@ -2023,7 +2024,7 @@ milestones.filter_sort.most_issues=Nejvíce problémů
 milestones.filter_sort.least_issues=Nejméně problémů
 
 signing.will_sign=Tato revize bude podepsána klíčem „%s“.
-signing.wont_sign.error=Došlo k chybě při kontrole, zda může být revize podepsána.
+signing.wont_sign.error=Při kontrole, zda může být revize podepsána, došlo k chybě.
 signing.wont_sign.nokey=Tato instance nemá žádný klíč k podepsání této revize.
 signing.wont_sign.never=Revize nebudou nikdy podepsány.
 signing.wont_sign.always=Revize budou vždy podepsány.
@@ -2758,7 +2759,7 @@ settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Tuto ak
 settings.new_owner_blocked_doer = Nový majitel vás zablokoval.
 settings.mirror_settings.pushed_repository = Odeslaný repozitář
 settings.add_collaborator_blocked_our = Nepodařilo se přidat spolupracovníka, jelikož byl zablokován majitelem repozitáře.
-pulls.commit_ref_at = `se odkázal/a na tuto žádost o sloučení z revize <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `odkázal/a na tuto žádost o sloučení z revize %s`
 settings.wiki_rename_branch_main = Normalizovat název větve wiki
 settings.wiki_rename_branch_main_desc = Přejmenovat větev interně používanou pro wiki na „%s“. Tato změna je trvalá a nelze ji vrátit.
 pulls.fast_forward_only_merge_pull_request = Pouze zrychlené
@@ -2909,6 +2910,20 @@ issues.reopen.blocked_by_user = Tento problém nemůžete znovu otevřít, proto
 pulls.comment.blocked_by_user = Tuto žádost o sloučení nemůžete okomentovat, protože jste byli zablokováni majitelem repozitáře nebo autorem žádosti.
 issues.filter_no_results_placeholder = Zkuste upravit filtry vyhledávání.
 issues.filter_no_results = Žádné výsledky
+migrate.repo_desc_helper = Ponechte prázdné pro importování existujícího popisu
+archive.nocomment = Komentování není možné, protože je repozitář archivován.
+comment.blocked_by_user = Komentování není možné, protože jste byli zablokováni majitelem repozitáře nebo autorem.
+sync_fork.branch_behind_few = Tato větev je %[1]d revizí pozadu za %[2]s
+sync_fork.button = Synchronizovat
+sync_fork.branch_behind_one = Tato větev je %[1]d revizi pozadu za %[2]s
+settings.event_action_failure = Selhání
+settings.event_action_failure_desc = Běh akce selhal.
+settings.event_action_recover = Obnovit
+settings.event_action_success = Úspěch
+settings.event_action_success_desc = Běh akce byl úspěšný.
+settings.event_header_action = Události běhu akce
+settings.event_action_recover_desc = Běh akce byl úspěšný, předchozí běh akce ve stejném workflow selhal.
+issues.filter_type.all_pull_requests = Všechny žádosti o sloučení
 
 [graphs]
 component_loading_info = Tohle může chvíli trvat…
@@ -3044,7 +3059,7 @@ teams.invite.by=Pozvání od %s
 teams.invite.description=Pro připojení k týmu klikněte na tlačítko níže.
 follow_blocked_user = Tuto organizaci nemůžete sledovat, protože jste v ní zablokováni.
 open_dashboard = Otevřít nástěnku
-settings.change_orgname_redirect_prompt.with_cooldown.one = Starý název organizace bude dostupný ostatním po %[1]d dni. Do té doby budete moci staré jméno znovu získat.
+settings.change_orgname_redirect_prompt.with_cooldown.one = Starý název organizace bude dostupný ostatním po %[1]d dnu. Do té doby budete moci staré jméno znovu získat.
 settings.change_orgname_redirect_prompt.with_cooldown.few = Starý název organizace bude dostupný ostatním po %[1]d dnech. Do té doby budete moci starý název znovu získat.
 
 [admin]
@@ -3562,7 +3577,7 @@ notices.type=Typ
 notices.type_1=Repozitář
 notices.type_2=Úloha
 notices.desc=Popis
-notices.op=Akce
+notices.op=Op.
 notices.delete_success=Systémové upozornění bylo smazáno.
 dashboard.sync_repo_branches = Synchronizovat vynechané větve z dat Gitu do databáze
 monitor.queue.activeworkers = Aktivní workery
@@ -3622,7 +3637,7 @@ auto_merge_pull_request=`automaticky sloučen požadavek na natažení <a href="
 transfer_repo=předal/a repozitář <code>%s</code> uživateli/organizaci <a href="%s">%s</a>
 push_tag=nahrál/a značku <a href="%[2]s">%[3]s</a> do <a href="%[1]s">%[4]s</a>
 delete_tag=smazal/a značku %[2]s z <a href="%[1]s">%[3]s</a>
-delete_branch=smazal/a větev %[2]s z <a href="%[1]s">%[3]s</a>
+delete_branch=smazal/a větev <code>%[2]s</code> z <a href="%[1]s">%[3]s</a>
 compare_branch=Porovnat
 compare_commits=Porovnat %d revizí
 compare_commits_general=Porovnat revize
@@ -3820,7 +3835,7 @@ owner.settings.cargo.initialize.error=Nepodařilo se inicializovat Cargo index:
 owner.settings.cargo.initialize.success=Index Cargo byl úspěšně vytvořen.
 owner.settings.cargo.rebuild=Znovu vytvořit index
 owner.settings.cargo.rebuild.error=Obnovení Cargo indexu se nezdařilo: %v
-owner.settings.cargo.rebuild.success=Cargo Index byl úspěšně obnoven.
+owner.settings.cargo.rebuild.success=Index Cargo byl úspěšně znovu sestaven.
 owner.settings.cleanuprules.title=Pravidla čištění
 owner.settings.cleanuprules.add=Přidat pravidlo pro čištění
 owner.settings.cleanuprules.edit=Upravit pravidlo pro čištění
@@ -3843,7 +3858,7 @@ owner.settings.cleanuprules.success.update=Pravidlo pro čištění bylo aktuali
 owner.settings.cleanuprules.success.delete=Pravidlo pro čištění bylo odstraněno.
 owner.settings.chef.title=Registr Chef
 owner.settings.chef.keypair=Generovat pár klíčů
-owner.settings.chef.keypair.description=Pro autentizaci do registru Chef je zapotřebí pár klíčů. Pokud jste předtím vytvořili pár klíčů, nově vygenerovaný pár klíčů vyřadí starý pár klíčů.
+owner.settings.chef.keypair.description=Žádosti odeslané do registru Chef musí být kryptograficky podepsané jako způsob ověření. Při generování páru klíčů je ve službě Forgejo uložen pouze veřejný klíč. Soukromý klíč je poskytnut vám, abyste jej mohli použít s programem knife. Vygenerováním nového páru klíčů přepíšete ten předchozí.
 owner.settings.cargo.rebuild.description = Opětovné sestavení může být užitečné, pokud není index synchronizován s uloženými balíčky Cargo.
 owner.settings.cargo.rebuild.no_index = Opětovné vytvoření selhalo, nebyl inicializován žádný index.
 npm.dependencies.bundle = Přidružené závislosti
@@ -3927,7 +3942,7 @@ runners.delete_runner=Odstranit tento runner
 runners.delete_runner_success=Runner byl úspěšně odstraněn
 runners.delete_runner_failed=Odstranění runneru selhalo
 runners.delete_runner_header=Potvrdit odstranění tohoto runneru
-runners.delete_runner_notice=Pokud na tomto runneru běží úloha, bude ukončena a označena jako neúspěšná. Může dojít k přerušení vytváření pracovního postupu.
+runners.delete_runner_notice=Pokud na tomto runneru běží úloha, bude ukončena a označena jako neúspěšná. Může dojít k přerušení vytváření workflow.
 runners.status.unspecified=Neznámý
 runners.status.idle=Nečinný
 runners.status.active=Aktivní
@@ -3977,7 +3992,7 @@ variables.update.success=Proměnná byla upravena.
 runners.none = Nejsou dostupné žádné runnery
 runs.workflow = Workflow
 runners = Runnery
-runs.pushed_by = pushnuto uživatelem
+runs.pushed_by = pushnuta uživatelem
 need_approval_desc = Potřebovat schválení pro spouštění workflowů pro žádosti o sloučení forků.
 runners.runner_manage_panel = Správa runnerů
 runs.no_job_without_needs = Workflow musí obsahovat alespoň jednu práci bez závislostí.
diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini
index 5d8e6d8791..179ceb07ca 100644
--- a/options/locale/locale_da.ini
+++ b/options/locale/locale_da.ini
@@ -1,3 +1,6 @@
+
+
+
 [common]
 home = Hjem
 dashboard = Instrumentpanel
@@ -7,7 +10,7 @@ logo = Logo
 sign_in = Login
 sign_in_with_provider = Login med %s
 sign_in_or = eller
-sign_out = Logud
+sign_out = Log ud
 sign_up = Register
 return_to_forgejo = Vend tilbage til Forgejo
 new_repo.title = Ny repository
@@ -975,8 +978,8 @@ delete_with_all_comments = Din konto er yngre end %s. For at undgå spøgelsesko
 delete_account_title = Slet brugerkonto
 user_block_yourself = Du kan ikke blokere dig selv.
 pronouns_custom_label = Brugerdefinerede stedord
-change_username_redirect_prompt.with_cooldown.one = Det gamle brugernavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, du kan stadig kræve det gamle brugernavn tilbage i nedkølingsperioden.
-change_username_redirect_prompt.with_cooldown.few = Det gamle brugernavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, du kan stadig kræve det gamle brugernavn tilbage i nedkølingsperioden.
+change_username_redirect_prompt.with_cooldown.one = Det gamle brugernavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, år. Du kan stadig kræve det gamle brugernavn tilbage i nedkølingsperioden.
+change_username_redirect_prompt.with_cooldown.few = Det gamle brugernavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, år. Du kan stadig kræve det gamle brugernavn tilbage i nedkølingsperioden.
 keep_pronouns_private = Vis kun stedord til godkendte brugere
 keep_pronouns_private.description = Dette vil skjule dine stedord for besøgende, der ikke er logget ind.
 quota.applies_to_user = Følgende kvoteregler gælder for din konto
@@ -1132,8 +1135,8 @@ mirror_public_key = Offentlig SSH-nøgle
 blame.ignore_revs = Ignorerer revisioner i <a href="%s">.git-blame-ignore-revs</a>. Klik <a href="%s">her for at omgå</a> og se den normale skyldvisning.
 mirror_address_protocol_invalid = Den angivne URL er ugyldig. Kun http(s):// eller git:// placeringer kan bruges til spejling.
 transfer.reject_desc = Annuller overførsel til "%s"
-archive.title = Dette depot er arkiveret. Du kan se filer og klone dem, men du kan ikke pushe eller åbne problemer eller pull-anmodninger.
-archive.title_date = Dette depot er blevet arkiveret på %s. Du kan se filer og klone dem, men du kan ikke pushe eller åbne problemer eller pull-anmodninger.
+archive.title = Dette depot er arkiveret. Du kan se filer og klone det, men du kan ikke foretage ændringer i dets tilstand, f.eks. pushe og oprette nye problemer, pull-anmodninger eller kommentarer.
+archive.title_date = Dette depot er blevet arkiveret på %s. Du kan se filer og klone det, men du kan ikke foretage ændringer i dets tilstand, såsom at pushe og oprette nye problemer, pull-anmodninger eller kommentarer.
 archive.issue.nocomment = Denne depot er arkiveret. Du kan ikke kommentere på problemer.
 form.reach_limit_of_creation_1 = Ejeren har allerede nået grænsen på %d depot.
 form.reach_limit_of_creation_n = Ejeren har allerede nået grænsen på %d depoterne.
@@ -1429,7 +1432,7 @@ issues.new.no_items = Ingen elementer
 issues.new.milestone = Milepæl
 issues.new.no_milestone = Ingen milepæl
 issues.filter_assignees = Filter tildelt
-issues.filter_milestones = Filter Milepæl
+issues.filter_milestones = Filter milepæl
 issues.filter_projects = Filter projekt
 issues.filter_labels = Filter etiket
 issues.filter_reviewers = Filter anmelder
@@ -1517,15 +1520,15 @@ issues.add_labels = tilføjede %s etiketterne %s
 issues.add_remove_labels = tilføjede %s og fjernede %s etiketter %s
 issues.add_milestone_at = `føjede dette til <b>%s</b> milepælen %s`
 issues.add_project_at = `føjede dette til <b>%s</b>- projektet %s`
-issues.ref_reopening_from = `<a href="%[3]s">henviste til dette problem fra en pull-anmodning %[4]s, der vil genåbne den</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_reopening_from = `<a href="%[2]s">henviste til dette problem fra en pull-anmodning %[3]s, der vil genåbne det</a>, %[1]s`
 issues.ref_closed_from = `<a href="%[3]s">lukkede dette problem %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2 ]s</a>`
 issues.ref_reopened_from = `<a href="%[3]s">genåbnede dette problem %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2 ]s</a>`
 issues.ref_from = `fra %[1]s`
 issues.author = Forfatter
-issues.commit_ref_at = `henviste til dette problem fra en commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from = `<a href="%[3]s">henviste til dette problem %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2 ]s</a>`
-issues.ref_pull_from = `<a href="%[3]s">henviste til denne pull-anmodning %[4]s</a> <a id="%[1]s" href="#%[1]s">%[ 2]s</a>`
-issues.ref_closing_from = `<a href="%[3]s">henviste til dette problem fra en pull-anmodning %[4]s, der vil lukke det</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at = `henviste til dette problem fra en commit %s`
+issues.ref_issue_from = `<a href="%[2]s">henviste til dette problem %[3]s</a> %[1]s`
+issues.ref_pull_from = `<a href="%[2]s">henviste til denne pull-anmodning %[3]s</a> %[1]s`
+issues.ref_closing_from = `<a href="%[2]s">henviste til dette problem fra en pull-anmodning %[3]s, der vil lukke det</a>, %[1]s`
 issues.author.tooltip.issue = Denne bruger er forfatteren til dette problem.
 issues.author.tooltip.pr = Denne bruger er forfatteren af denne pull-anmodning.
 issues.role.owner = Ejer
@@ -1561,8 +1564,8 @@ issues.reaction.alt_add = Tilføj %[1]s reaktion til kommentar.
 issues.context.menu = Kommentar menu
 issues.reopen_comment_issue = Genåbner med kommentar
 issues.create_comment = Kommentar
-issues.closed_at = `lukkede dette problem <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at = `genåbnede dette problem <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at = `lukkede dette problem %s`
+issues.reopened_at = `genåbnede dette problem %s`
 issues.remove_label = fjernede %s etiketten %s
 issues.remove_labels = fjernede %s etiketterne %s
 issues.change_project_at = `modificerede projektet fra <b>%s</b> til <b>%s</b> %s`
@@ -1579,7 +1582,7 @@ issues.change_ref_at = `ændret reference fra <b><strike>%s</strike></b> til <b>
 issues.remove_ref_at = `fjernet reference <b>%s</b> %s`
 issues.add_ref_at = `tilføjet reference <b>%s</b> %s`
 issues.delete_branch_at = `slettet gren <b>%s</b> %s`
-issues.filter_label_exclude = `Brug <code>alt</code> + <code>klik/enter</code> for at ekskludere etiketter`
+issues.filter_label_exclude = Brug <kbd>Alt</kbd> + <kbd>klik</kbd> for at ekskludere etiketter
 issues.filter_milestone = Milepæl
 issues.filter_milestone_all = Alle milepæle
 issues.filter_milestone_none = Ingen milepæle
@@ -1693,7 +1696,7 @@ issues.due_date_overdue = Forfalden
 issues.lock.unknown_reason = Kan ikke låse et problem med en ukendt årsag.
 issues.lock.notice_3 = - Du kan altid låse op for dette problem igen i fremtiden.
 issues.push_commits_n = tilføjet %d commits %s
-issues.force_push_codes = `force-pushed %[1]s fra <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> til <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes = `force-pushed %[1]s fra <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s til <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare = Sammenlign
 issues.due_date_form = yyyy-mm-dd
 issues.due_date_form_edit = Redigere
@@ -1908,10 +1911,10 @@ pulls.editable_explanation = Denne pull-anmodning tillader redigeringer fra vedl
 pulls.auto_merge_button_when_succeed = (Når kontroller lykkes)
 pulls.status_checks_requested = Påkrævet
 pulls.close = Luk pull anmodning
-pulls.commit_ref_at = `henviste til denne pull-anmodning fra en commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `henviste til denne pull-anmodning fra en commit %s`
 pulls.cmd_instruction_hint = Se instruktionerne på kommandolinjen
-pulls.reopened_at = `genåbnede denne pull-anmodning <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.closed_at = `lukkede denne pull-anmodning <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.reopened_at = `genåbnede denne pull-anmodning %s`
+pulls.closed_at = `lukkede denne pull-anmodning %s`
 pulls.cmd_instruction_checkout_desc = Fra dit projektdepot, tjek en ny gren og test ændringerne.
 pulls.editable = Redigerbar
 pulls.made_using_agit = AGit
@@ -2015,7 +2018,7 @@ settings.lfs_pointers.inRepo = i depot
 settings.lfs_pointers.exists = Eksisterer i lager
 settings.lfs_pointers.accessible = Tilgængeligt for bruger
 signing.wont_sign.not_signed_in = Du er ikke logget ind.
-wiki.welcome = Velkommen til Wikien
+wiki.welcome = Velkommen til wikien
 milestones.modify = Opdater milepæl
 milestones.edit_success = Milepæl "%s" er blevet opdateret.
 milestones.filter_sort.least_issues = Mindst problemer
@@ -2259,7 +2262,7 @@ settings.wiki_delete_notices_1 = - Dette vil permanent slette og deaktivere depo
 settings.wiki_branch_rename_failure = Det lykkedes ikke at normalisere depotwikiens filialnavn.
 settings.add_collaborator_duplicate = Samarbejdspartneren er allerede føjet til dette depot.
 settings.add_collaborator_owner = Kan ikke tilføje en ejer som samarbejdspartner.
-settings.collaborator_deletion = Fjern Samarbejdspartner
+settings.collaborator_deletion = Fjern samarbejdspartner
 settings.collaborator_deletion_desc = Fjernelse af en samarbejdspartner vil tilbagekalde deres adgang til dette depot. Vil du fortsætte?
 settings.add_team_duplicate = Teamet har allerede depotet
 settings.add_collaborator_blocked_our = Samarbejdspartneren kan ikke tilføjes, fordi depots ejer har blokeret dem.
@@ -2522,87 +2525,31 @@ settings.ignore_stale_approvals_desc = Tæl ikke godkendelser, der er foretaget
 settings.require_signed_commits = Kræv underskrevne commits
 settings.remove_protected_branch_success = Grenbeskyttelse for reglen "%s" er blevet fjernet.
 settings.enforce_on_admins = Håndhæv denne regel for depotadministratorer
-
-settings.tags.protection.allowed.teams = Tilladte hold
-settings.tags.protection.allowed.noone = Ingen
-settings.tags.protection.create = Tilføj regel
-settings.tags.protection.none = Der er ingen beskyttede tags.
-settings.tags.protection.pattern.description = Du kan bruge et enkelt navn eller et globmønster eller regulært udtryk til at matche flere tags. Læs mere i <a target="_blank" rel="noopener" href="%s">guiden til beskyttede tags</a>.
-settings.bot_token = Bot token
-settings.chat_id = Chat ID
-settings.thread_id = Thread ID
 settings.matrix.homeserver_url = Hjemmeserver URL
 settings.matrix.room_id = Rum ID
-settings.matrix.message_type = Meddelelsestype
-settings.matrix.access_token_helper = Det anbefales at opsætte en dedikeret Matrix-konto til dette. Adgangstokenet kan hentes fra Element-webklienten (i en privat/inkognito-fane) > Brugermenu (øverst til venstre) > Alle indstillinger > Hjælp og om > Avanceret > Adgangstoken (lige under hjemmeserverens URL). Luk privat-/inkognitofanen (logging ud ville ugyldiggøre tokenet).
-settings.matrix.room_id_helper = Rum-id'et kan hentes fra Element-webklienten > Rumindstillinger > Avanceret > Internt rum-id. Eksempel: %s.
-settings.archive.button = Arkivere depot
-settings.archive.header = Arkivere dette depot
-settings.archive.text = Arkivering af depotet vil gøre den fuldstændig skrivebeskyttet. Det vil blive skjult fra dashboardet. Ingen (ikke engang dig!) vil være i stand til at foretage nye commits eller åbne nogen problemer eller pull-anmodninger.
-settings.archive.success = Depotet blev arkiveret.
+branch.branch_name_conflict = Gren navn "%s" er i konflikt med den allerede eksisterende gren "%s".
+release.tag_name_protected = Tagnavnet er beskyttet.
+branch.name = Gren navn
 settings.archive.error = Der opstod en fejl under forsøg på at arkivere depotet. Se loggen for flere detaljer.
 settings.archive.error_ismirror = Du kan ikke arkivere et spejlet depot.
-settings.archive.branchsettings_unavailable = Indstillinger for gren er ikke tilgængelige i arkiverede depoter.
-settings.archive.tagsettings_unavailable = Tag-indstillinger er ikke tilgængelige i arkiverede depoter.
-settings.archive.mirrors_unavailable = Spejle er ikke tilgængelige i arkiverede depoter.
 settings.unarchive.button = Fjern arkivering af depot
 settings.unarchive.header = Fjern arkivering af dette depot
-settings.unarchive.text = Fjernelse af arkivering af depotet vil genoprette dens evne til at modtage commits og push, såvel som nye problemer og pull-anmodninger.
-settings.unarchive.success = Depotet blev fjernet fra arkivet.
-settings.unarchive.error = Der opstod en fejl under forsøg på at fjerne depotet fra arkivet. Se loggen for flere detaljer.
-settings.update_avatar_success = Depot avataren er blevet opdateret.
 settings.lfs = LFS
 settings.lfs_filelist = LFS-filer gemt i dette depot
 settings.lfs_no_lfs_files = Ingen LFS-filer gemt i dette depot
+settings.lfs_locks = Låse
 settings.lfs_findcommits = Find commits
 settings.lfs_lfs_file_no_commits = Ingen commits fundet for denne LFS-fil
 settings.lfs_noattribute = Denne sti har ikke den låsbare attribut i standardgrenen
 settings.lfs_delete = Slet LFS-fil med OID %s
 settings.lfs_delete_warning = Sletning af en LFS-fil kan forårsage "objekt findes ikke"-fejl ved checkout. Er du sikker?
 settings.lfs_findpointerfiles = Find pointer-filer
-settings.lfs_locks = Låse
-settings.lfs_invalid_locking_path = Ugyldig sti: %s
-settings.lfs_invalid_lock_directory = Kan ikke låse mappe: %s
-settings.lfs_lock_already_exists = Låsen findes allerede: %s
-settings.lfs_pointers.associateAccessible = Tilknyt tilgængelige %d OID'er
-settings.rename_branch_failed_protected = Kan ikke omdøbe grenen %s, fordi den er en beskyttet gren.
-settings.rename_branch_failed_exist = Kan ikke omdøbe grenen, fordi målgrenen %s eksisterer.
-settings.rename_branch_failed_not_exist = Kan ikke omdøbe grenen %s, fordi den ikke eksisterer.
-settings.rename_branch_success = Grenen %s blev omdøbt til %s.
-settings.rename_branch = Omdøb gren
-diff.browse_source = Gennemse kilde
-diff.parent = forælder
-diff.commit = commit
-diff.git-notes = Noter
-diff.git-notes.add = Tilføj note
-diff.git-notes.remove-header = Fjern note
-diff.git-notes.remove-body = Denne note vil blive fjernet.
-diff.data_not_available = Diff-indhold er ikke tilgængeligt
-diff.options_button = Diff muligheder
 diff.download_patch = Download patch-fil
-diff.download_diff = Download diff fil
-diff.show_split_view = Opdelt visning
-diff.show_unified_view = Samlet visning
-diff.whitespace_button = Blanke mellemrum
-diff.whitespace_show_everything = Vis alle ændringer
-diff.whitespace_ignore_all_whitespace = Ignorer blanke mellemrum, når du sammenligner linjer
-diff.whitespace_ignore_amount_changes = Ignorer ændringer i mængden af blanke mellemrum
 diff.whitespace_ignore_at_eol = Ignorer ændringer i blanke mellemrum på EOL
 diff.stats_desc = <strong> %d ændrede filer</strong> med <strong>%d tilføjelser</strong> og <strong>%d sletninger</strong>
 diff.stats_desc_file = %d ændringer: %d tilføjelser og %d sletninger
 diff.bin = BIN
-diff.bin_not_shown = Binær fil vises ikke.
-diff.view_file = Se fil
-diff.file_before = Før
-diff.file_after = Efter
-diff.file_image_width = Bredde
-diff.file_image_height = Højde
-diff.file_byte_size = Størrelse
 diff.file_suppressed = Filforskellen er undertrykt, fordi den er for stor
-diff.file_suppressed_line_too_long = Filforskellen er undertrykt, fordi en eller flere linjer er for lange
-diff.too_many_files = Nogle filer blev ikke vist, fordi der er ændret for mange filer i denne diff
-diff.show_more = Vis mere
-diff.load = Load diff
 diff.generated = genereret
 diff.vendored = forhandlet
 diff.comment.add_line_comment = Tilføj linjekommentar
@@ -2610,11 +2557,33 @@ diff.comment.placeholder = Efterlad en kommentar
 diff.comment.markdown_info = Styling med Markdown understøttes.
 diff.comment.add_single_comment = Tilføj en enkelt kommentar
 diff.comment.add_review_comment = Tilføj kommentar
+diff.has_escaped = Denne linje har skjulte Unicode-tegn
+release.tag_name = Tag navn
+release.tag_helper_new = Nyt tag. Dette tag vil blive oprettet fra målet.
+release.deletion_tag_desc = Vil slette dette tag fra depotet. Depotindhold og -historik forbliver uændret. Vil du fortsætte?
+release.tag_already_exist = Dette tagnavn findes allerede.
+release.add_tag_msg = Brug udgivelsens titel og indhold som tagmeddelelse.
+release.tags_for = Tags for %s
+release.asset_external_url = Ekstern URL
+release.add_external_asset = Tilføj eksternt aktiv
+branch.already_exists = En gren med navnet "%s" eksisterer allerede.
+branch.tag_collision = Gren "%s" kan ikke oprettes, da et tag med samme navn allerede eksisterer i depotet.
+releases.desc = Spor projektversioner og downloads.
+release.detail = Udgivelsesdetaljer
+release.tags = Tags
+release.new_release = Ny udgivelse
+release.stable = Stabil
+release.compare = Sammenlign
+release.deletion_desc = Sletning af en udgivelse fjerner den kun fra Forgejo. Det vil ikke påvirke Git-tagget, indholdet af dit depot eller dets historie. Vil du fortsætte?
+release.deletion_tag_success = Tagget er blevet slettet.
+release.tag_name_already_exist = Der findes allerede en udgivelse med dette tagnavn.
+release.tag_name_invalid = Tagnavnet er ikke gyldigt.
+release.downloads = Downloads
+release.system_generated = Denne vedhæftede fil genereres automatisk.
+release.invalid_external_url = Ugyldig ekstern URL: "%s"
+branch.deleted_by = Slettet af %s
 diff.comment.start_review = Start anmeldelse
 diff.comment.reply = Svar
-diff.review = Afslut gennemgangen
-diff.review.header = Send anmeldelse
-diff.review.placeholder = Gennemgå kommentar
 diff.review.comment = Kommentar
 diff.review.approve = Godkend
 diff.review.self_reject = Forfattere af pull-anmodninger kan ikke anmode om ændringer på deres egen pull-anmodning
@@ -2625,151 +2594,195 @@ diff.protected = Beskyttet
 diff.image.side_by_side = Side om side
 diff.image.swipe = Swipe
 diff.image.overlay = Overlejring
-diff.has_escaped = Denne linje har skjulte Unicode-tegn
-diff.show_file_tree = Vis filtræ
-diff.hide_file_tree = Skjul filtræ
-releases.desc = Spor projektversioner og downloads.
-release.releases = Udgivelser
-release.detail = Udgivelsesdetaljer
-release.tags = Tags
-release.new_release = Ny udgivelse
-release.draft = Udkast
 release.prerelease = Forhåndsudgivelse
-release.stable = Stabil
-release.compare = Sammenlign
-release.ahead.commits = <strong>%d</strong> commits
-release.ahead.target = til %s siden denne udgivelse
-tag.ahead.target = til %s siden dette tag
-release.source_code = Kildekode
-release.new_subheader = Udgivelser organiserer projektversioner.
-release.edit_subheader = Udgivelser organiserer projektversioner.
-release.tag_name = Tag navn
-release.target = Mål
-release.tag_helper = Vælg et eksisterende tag, eller opret et nyt tag.
-release.tag_helper_new = Nyt tag. Dette tag vil blive oprettet fra målet.
-release.tag_helper_existing = Eksisterende tag.
-release.title = Udgivelsestitel
-release.title_empty = Titel må ikke være tom.
-release.message = Beskriv denne udgivelse
-release.prerelease_desc = Markér som pre-release
-release.prerelease_helper = Marker denne udgivelse uegnet til produktionsbrug.
-release.deletion_desc = Sletning af en udgivelse fjerner den kun fra Forgejo. Det vil ikke påvirke Git-tagget, indholdet af dit depot eller dets historie. Vil du fortsætte?
-release.deletion_success = Udgivelsen er blevet slettet.
-release.deletion_tag_desc = Vil slette dette tag fra depotet. Depotindhold og -historik forbliver uændret. Vil du fortsætte?
-release.deletion_tag_success = Tagget er blevet slettet.
-release.tag_name_already_exist = Der findes allerede en udgivelse med dette tagnavn.
-release.tag_name_invalid = Tagnavnet er ikke gyldigt.
-release.tag_name_protected = Tagnavnet er beskyttet.
-release.tag_already_exist = Dette tagnavn findes allerede.
-release.downloads = Downloads
-release.download_count_one = %s download
-release.download_count_few = %s downloads
-release.add_tag_msg = Brug udgivelsens titel og indhold som tagmeddelelse.
+settings.tags.protection.allowed.teams = Tilladte hold
+settings.tags.protection.create = Tilføj regel
+settings.tags.protection.none = Der er ingen beskyttede tags.
+settings.tags.protection.pattern.description = Du kan bruge et enkelt navn eller et globmønster eller regulært udtryk til at matche flere tags. Læs mere i <a target="_blank" rel="noopener" href="%s">guiden til beskyttede tags</a>.
+settings.thread_id = Thread ID
+settings.matrix.message_type = Meddelelsestype
+settings.matrix.access_token_helper = Det anbefales at opsætte en dedikeret Matrix-konto til dette. Adgangstokenet kan hentes fra Element-webklienten (i en privat/inkognito-fane) > Brugermenu (øverst til venstre) > Alle indstillinger > Hjælp og om > Avanceret > Adgangstoken (lige under hjemmeserverens URL). Luk privat-/inkognitofanen (logging ud ville ugyldiggøre tokenet).
+settings.lfs_invalid_locking_path = Ugyldig sti: %s
+settings.lfs_invalid_lock_directory = Kan ikke låse mappe: %s
+diff.options_button = Diff muligheder
 release.hide_archive_links = Skjul automatisk genererede arkiver
 release.hide_archive_links_helper = Skjul automatisk genererede kildekodearkiver for denne udgivelse. For eksempel hvis du uploader din egen.
 release.add_tag = Opret tag
 release.releases_for = Udgivelser for %s
-release.tags_for = Tags for %s
-release.system_generated = Denne vedhæftede fil genereres automatisk.
-release.type_attachment = Vedhæftning
-release.type_external_asset = Eksternt aktiv
-release.asset_name = Aktivets navn
-release.asset_external_url = Ekstern URL
-release.add_external_asset = Tilføj eksternt aktiv
-release.invalid_external_url = Ugyldig ekstern URL: "%s"
-release.summary_card_alt = Oversigtskort for en udgivelse med titlen "%s" i depots %s
-branch.name = Gren navn
-branch.already_exists = En gren med navnet "%s" eksisterer allerede.
 branch.delete_branch_has_new_commits = Gren "%s" kan ikke slettes, fordi nye commits er blevet tilføjet efter fletning.
 branch.create_branch = Opret gren %s
 branch.create_from = fra "%s"
 branch.create_success = Gren "%s" er blevet oprettet.
 branch.branch_already_exists = Gren "%s" findes allerede i dette depot.
-branch.branch_name_conflict = Gren navn "%s" er i konflikt med den allerede eksisterende gren "%s".
-branch.tag_collision = Gren "%s" kan ikke oprettes, da et tag med samme navn allerede eksisterer i depotet.
-branch.deleted_by = Slettet af %s
+release.releases = Udgivelser
+release.draft = Udkast
+release.type_attachment = Vedhæftning
+release.type_external_asset = Eksternt aktiv
+release.asset_name = Aktivets navn
+release.tag_helper_existing = Eksisterende tag.
+release.title_empty = Titel må ikke være tom.
+release.message = Beskriv denne udgivelse
+settings.bot_token = Bot token
+settings.chat_id = Chat ID
+diff.show_file_tree = Vis filtræ
+diff.hide_file_tree = Skjul filtræ
+release.ahead.commits = <strong>%d</strong> commits
+release.ahead.target = til %s siden denne udgivelse
+release.source_code = Kildekode
+release.edit_subheader = Udgivelser organiserer projektversioner.
+release.tag_helper = Vælg et eksisterende tag, eller opret et nyt tag.
+release.target = Mål
+tag.ahead.target = til %s siden dette tag
+release.new_subheader = Udgivelser organiserer projektversioner.
+release.title = Udgivelsestitel
+release.prerelease_desc = Markér som pre-release
+release.prerelease_helper = Marker denne udgivelse uegnet til produktionsbrug.
+release.deletion_success = Udgivelsen er blevet slettet.
+release.summary_card_alt = Oversigtskort for en udgivelse med titlen "%s" i depots %s
+settings.unarchive.text = Fjernelse af arkivering af depotet vil genoprette dens evne til at modtage commits og push, såvel som nye problemer og pull-anmodninger.
+settings.unarchive.success = Depotet blev fjernet fra arkivet.
+settings.unarchive.error = Der opstod en fejl under forsøg på at fjerne depotet fra arkivet. Se loggen for flere detaljer.
+settings.update_avatar_success = Depot avataren er blevet opdateret.
 branch.restore_success = Gren "%s" er blevet gendannet.
 branch.restore_failed = Kunne ikke gendanne grenen "%s".
 branch.protected_deletion_failed = Gren "%s" er beskyttet. Det kan ikke slettes.
 branch.default_deletion_failed = Gren "%s" er standardgrenen. Det kan ikke slettes.
+tag.create_tag_operation = Opret tag
+tag.confirm_create_tag = Opret tag
+settings.tags.protection.allowed.noone = Ingen
+settings.archive.header = Arkivere dette depot
+settings.matrix.room_id_helper = Rum-id'et kan hentes fra Element-webklienten > Rumindstillinger > Avanceret > Internt rum-id. Eksempel: %s.
+settings.archive.text = Arkivering af depotet vil gøre den fuldstændig skrivebeskyttet. Det vil blive skjult fra dashboardet. Ingen (ikke engang dig!) vil være i stand til at foretage nye commits eller åbne nogen problemer eller pull-anmodninger.
+settings.archive.success = Depotet blev arkiveret.
+settings.archive.button = Arkivere depot
+settings.rename_branch_success = Grenen %s blev omdøbt til %s.
+diff.whitespace_ignore_amount_changes = Ignorer ændringer i mængden af blanke mellemrum
+diff.download_diff = Download diff fil
+diff.show_split_view = Opdelt visning
+diff.show_unified_view = Samlet visning
+diff.whitespace_button = Blanke mellemrum
+diff.whitespace_show_everything = Vis alle ændringer
+diff.whitespace_ignore_all_whitespace = Ignorer blanke mellemrum, når du sammenligner linjer
+diff.too_many_files = Nogle filer blev ikke vist, fordi der er ændret for mange filer i denne diff
+diff.show_more = Vis mere
+diff.load = Load diff
+settings.archive.branchsettings_unavailable = Indstillinger for gren er ikke tilgængelige i arkiverede depoter.
+settings.archive.tagsettings_unavailable = Tag-indstillinger er ikke tilgængelige i arkiverede depoter.
+settings.archive.mirrors_unavailable = Spejle er ikke tilgængelige i arkiverede depoter.
+settings.lfs_lock_already_exists = Låsen findes allerede: %s
+settings.lfs_pointers.associateAccessible = Tilknyt tilgængelige %d OID'er
+settings.rename_branch_failed_protected = Kan ikke omdøbe grenen %s, fordi den er en beskyttet gren.
+settings.rename_branch_failed_exist = Kan ikke omdøbe grenen, fordi målgrenen %s eksisterer.
+settings.rename_branch_failed_not_exist = Kan ikke omdøbe grenen %s, fordi den ikke eksisterer.
+settings.rename_branch = Omdøb gren
+diff.browse_source = Gennemse kilde
+diff.parent = forælder
+diff.commit = commit
+diff.git-notes = Noter
+diff.git-notes.add = Tilføj note
+diff.git-notes.remove-header = Fjern note
+diff.git-notes.remove-body = Denne note vil blive fjernet.
+diff.data_not_available = Diff-indhold er ikke tilgængeligt
+diff.bin_not_shown = Binær fil vises ikke.
+diff.view_file = Se fil
+diff.file_before = Før
+diff.file_after = Efter
+diff.file_image_width = Bredde
+diff.file_image_height = Højde
+diff.file_byte_size = Størrelse
+diff.file_suppressed_line_too_long = Filforskellen er undertrykt, fordi en eller flere linjer er for lange
+diff.review = Afslut gennemgangen
+diff.review.header = Send anmeldelse
+diff.review.placeholder = Gennemgå kommentar
+release.download_count_one = %s download
+release.download_count_few = %s downloads
+topic.format_prompt = Emner skal starte med et bogstav eller tal, kan indeholde bindestreger ("-") og prikker ("."), kan være op til 35 tegn lange. Bogstaver skal være små.
+branch.warning_rename_default_branch = Du omdøber standardgrenen.
+topic.done = Færdig
+topic.count_prompt = Du kan ikke vælge mere end 25 emner
+find_file.go_to_file = Find en fil
+find_file.no_matching = Ingen matchende fil fundet
+topic.manage_topics = Administrer emner
+tag.create_tag_from = Opret nyt tag fra "%s"
+tag.create_success = Tag "%s" er blevet oprettet.
 branch.restore = Gendan grenen "%s"
+branch.new_branch_from = Opret ny gren fra "%s"
+branch.create_branch_operation = Opret gren
+branch.renamed = Gren %s blev omdøbt til %s.
+branch.new_branch = Opret ny gren
+tag.create_tag = Opret tag %s
+error.csv.too_large = Denne fil kan ikke gengives, fordi den er for stor.
+error.csv.unexpected = Denne fil kan ikke gengives, fordi den indeholder et uventet tegn i linje %d og kolonne %d.
+error.csv.invalid_field_count = Denne fil kan ikke gengives, fordi den har et forkert antal felter i linje %d.
 branch.download = Download gren "%s"
 branch.rename = Omdøb grenen "%s"
 branch.included_desc = Denne gren er en del af standardgrenen
 branch.included = Inkluderet
+error.broken_git_hook = Git hooks af dette depot ser ud til at være brudt. Følg venligst <a target="_blank" rel="noreferrer" href="%s">dokumentationen</a> for at rette dem, og push derefter på nogle commits for at opdatere statussen.
 branch.create_new_branch = Opret en gren fra gren:
 branch.confirm_create_branch = Opret gren
-branch.warning_rename_default_branch = Du omdøber standardgrenen.
 branch.rename_branch_to = Omdøb "%s" til:
-branch.create_branch_operation = Opret gren
-branch.new_branch = Opret ny gren
-branch.new_branch_from = Opret ny gren fra "%s"
-branch.renamed = Gren %s blev omdøbt til %s.
-tag.create_tag = Opret tag %s
-tag.create_tag_operation = Opret tag
-tag.confirm_create_tag = Opret tag
-tag.create_tag_from = Opret nyt tag fra "%s"
-tag.create_success = Tag "%s" er blevet oprettet.
-topic.manage_topics = Administrer emner
-topic.done = Færdig
-topic.count_prompt = Du kan ikke vælge mere end 25 emner
-topic.format_prompt = Emner skal starte med et bogstav eller tal, kan indeholde bindestreger ("-") og prikker ("."), kan være op til 35 tegn lange. Bogstaver skal være små.
-find_file.go_to_file = Find en fil
-find_file.no_matching = Ingen matchende fil fundet
-error.csv.too_large = Denne fil kan ikke gengives, fordi den er for stor.
-error.csv.unexpected = Denne fil kan ikke gengives, fordi den indeholder et uventet tegn i linje %d og kolonne %d.
-error.csv.invalid_field_count = Denne fil kan ikke gengives, fordi den har et forkert antal felter i linje %d.
-error.broken_git_hook = Git hooks af dette depot ser ud til at være brudt. Følg venligst <a target="_blank" rel="noreferrer" href="%s">dokumentationen</a> for at rette dem, og push derefter på nogle commits for at opdatere statussen.
+migrate.repo_desc_helper = Lad være tom for at importere eksisterende beskrivelse
+archive.nocomment = Det er ikke muligt at kommentere, fordi depotet er arkiveret.
+comment.blocked_by_user = Det er ikke muligt at kommentere, fordi du er blokeret af depots ejer eller forfatteren.
+sync_fork.branch_behind_few = Denne gren er %[1]d commits bag %[2]s
+sync_fork.button = Sync
+sync_fork.branch_behind_one = Denne gren er %[1]d commit bag %[2]s
+settings.event_header_action = Handling Run-begivenheder
+settings.event_action_failure = Mislykket
+settings.event_action_success_desc = Handlingen blev udført.
+settings.event_action_success = Success
+settings.event_action_recover_desc = Handlingskørsel lykkedes efter at den sidste handlingskørsel i samme arbejdsgang mislykkedes.
+settings.event_action_failure_desc = Handlingskørsel sluttede som en fejl.
+settings.event_action_recover = Gendan
+issues.filter_type.all_pull_requests = Alle pull-anmodninger
 
 [notification]
 watching = Overvåger
 read = Læs
-
 notifications = Notifikationer
-unread = Ulæst
 no_unread = Ingen ulæste notifikationer.
-no_read = Ingen læste notifikationer.
+unread = Ulæst
 mark_as_read = Markér som læst
-mark_as_unread = Markér som ulæst
+no_read = Ingen læste notifikationer.
 mark_all_as_read = Markér alle som læste
+mark_as_unread = Markér som ulæst
 subscriptions = Abonnementer
 no_subscriptions = Ingen abonnementer
-
 pin = Fastgør notifikation
 
 [action]
 watched_repo = begyndte at overvåge <a href="%[1]s">%[2]s</a>
-
-create_repo = oprettede depot <a href="%s">%s</a>
-rename_repo = omdøbt depot fra <code>%[1]s</code> til <a href="%[2]s">%[3]s</a>
 commit_repo = pushed til <a href="%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+comment_pull = `kommenterede pull request <a href="%[1]s">%[3]s#%[2]s</a>`
+mirror_sync_push = synkroniserede commits til <a href="%[2]s">%[3]s</a> ved <a href="%[1]s">%[4]s</a> fra spejl
 create_issue = `åbnet problem <a href="%[1]s">%[3]s#%[2]s</a>`
-close_issue = `lukket problem <a href="%[1]s">%[3]s#%[2]s</a>`
+mirror_sync_create = synkroniseret ny reference <a href="%[2]s">%[3]s</a> til <a href="%[1]s">%[4]s</a> fra spejl
+reopen_pull_request = `genåbnet pull request <a href="%[1]s">%[3]s#%[2]s</a>`
+create_repo = oprettede depot <a href="%s">%s</a>
+compare_branch = Sammenlign
+rename_repo = omdøbt depot fra <code>%[1]s</code> til <a href="%[2]s">%[3]s</a>
 reopen_issue = `genåbnet problem <a href="%[1]s">%[3]s#%[2]s</a>`
 create_pull_request = `oprettet pull-anmodning <a href="%[1]s">%[3]s#%[2]s</a>`
 close_pull_request = `lukket pull request <a href="%[1]s">%[3]s#%[2]s</a>`
-reopen_pull_request = `genåbnet pull request <a href="%[1]s">%[3]s#%[2]s</a>`
+starred_repo = stjernemarkerede <a href="%[1]s">%[2]s</a>
+close_issue = `lukket problem <a href="%[1]s">%[3]s#%[2]s</a>`
 comment_issue = `kommenterede problem <a href="%[1]s">%[3]s#%[2]s</a>`
-comment_pull = `kommenterede pull request <a href="%[1]s">%[3]s#%[2]s</a>`
+delete_branch = slettede gren <code>%[2]s</code> fra <a href="%[1]s">%[3]s</a>
+compare_commits = Sammenlign %d commits
+compare_commits_general = Sammenlign commits
+review_dismissed = `afvist anmeldelse fra <b>%[4]s</b> for <a href="%[1]s">%[3]s#%[2]s</a>`
+review_dismissed_reason = Årsag:
+create_branch = oprettede gren <a href="%[2]s">%[3]s</a> i <a href="%[1]s">%[4]s</a>
 merge_pull_request = `sammenflettet pull request <a href="%[1]s">%[3]s#%[2]s</a>`
 auto_merge_pull_request = `automatisk flettet pull-anmodning <a href="%[1]s">%[3]s#%[2]s</a>`
 transfer_repo = overførte lager <code>%s</code> til <a href="%s">%s</a>
 push_tag = skubbet tag <a href="%[2]s">%[3]s</a> til <a href="%[1]s">%[4]s</a>
 delete_tag = slettede tag %[2]s fra <a href="%[1]s">%[3]s</a>
-delete_branch = slettede gren %[2]s fra <a href="%[1]s">%[3]s</a>
-compare_branch = Sammenlign
-compare_commits = Sammenlign %d commits
-compare_commits_general = Sammenlign commits
-mirror_sync_push = synkroniserede commits til <a href="%[2]s">%[3]s</a> ved <a href="%[1]s">%[4]s</a> fra spejl
-mirror_sync_create = synkroniseret ny reference <a href="%[2]s">%[3]s</a> til <a href="%[1]s">%[4]s</a> fra spejl
 mirror_sync_delete = synkroniseret og slettet reference <code>%[2]s</code> ved <a href="%[1]s">%[3]s</a> fra spejl
 approve_pull_request = `godkendt <a href="%[1]s">%[3]s#%[2]s</a>`
 reject_pull_request = `foreslået ændringer for <a href="%[1]s">%[3]s#%[2]s</a>`
 publish_release = `udgivet <a href="%[2]s">%[4]s</a> på <a href="%[1]s">%[3]s</a>`
-review_dismissed = `afvist anmeldelse fra <b>%[4]s</b> for <a href="%[1]s">%[3]s#%[2]s</a>`
-review_dismissed_reason = Årsag:
-create_branch = oprettede gren <a href="%[2]s">%[3]s</a> i <a href="%[1]s">%[4]s</a>
-starred_repo = stjernemarkerede <a href="%[1]s">%[2]s</a>
 
 [org]
 repo_updated = Opdateret %s
@@ -2799,93 +2812,92 @@ settings.location = Lokation
 settings.permission = Tilladelser
 settings.visibility = Synlighed
 members.remove = Slet
-
 org_name_holder = Organisationens navn
+create_team = Opret team
 org_full_name_holder = Organisationens fulde navn
+open_dashboard = Åbn dashboard
+lower_repositories = depoter
+team_unit_desc = Tillad adgang til depotsektioner
+follow_blocked_user = Du kan ikke følge denne organisation, fordi denne organisation har blokeret dig.
 org_name_helper = Organisationsnavne skal være korte og mindeværdige.
 create_org = Opret organisation
-open_dashboard = Åbn dashboard
-code = Kode
-lower_repositories = depoter
+form.name_reserved = Organisationsnavnet "%s" er reserveret.
 create_new_team = Nyt team
-create_team = Opret team
+team_unit_disabled = (Deaktiveret)
+code = Kode
 team_name = Team navn
 team_name_helper = Team navne skal være korte og mindeværdige.
 team_desc_helper = Beskriv teamets formål eller rolle.
 team_access_desc = Depot adgang
 team_permission_desc = Tilladelse
-team_unit_desc = Tillad adgang til depotsektioner
-team_unit_disabled = (Deaktiveret)
-follow_blocked_user = Du kan ikke følge denne organisation, fordi denne organisation har blokeret dig.
-form.name_reserved = Organisationsnavnet "%s" er reserveret.
-form.name_pattern_not_allowed = Mønsteret "%s" er ikke tilladt i et organisationsnavn.
-form.create_org_not_allowed = Du har ikke tilladelse til at oprette en organisation.
-settings.email = Kontakt email
-settings.update_settings = Opdater indstillinger
-settings.update_setting_success = Organisationsindstillingerne er blevet opdateret.
+members.member = Medlem
 settings.change_orgname_prompt = Bemærk: Ændring af organisationens navn vil også ændre din organisations URL og frigøre det gamle navn.
 settings.change_orgname_redirect_prompt = Det gamle navn vil omdirigere, indtil det gøres krav på.
-settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, du kan stadig kræve det gamle navn tilbage i nedkølingsperioden.
-settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, du kan stadig kræve det gamle navn tilbage i .
+settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dag, år. Du kan stadig kræve det gamle navn tilbage i nedkølingsperioden.
+settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil være tilgængeligt for alle efter en nedkølingsperiode på %[1]d dage, år. Du kan stadig kræve det gamle navn tilbage i.
 settings.update_avatar_success = Organisationens avatar er blevet opdateret.
-settings.delete = Slet organisation
+members.public_helper = Gør skjult
+members.private = Skjult
+members.private_helper = Gør synlig
+members.member_role = Medlemsrolle:
+members.remove.detail = Vil du fjerne %[1]s fra %[2]s?
+members.invite_desc = Tilføj et nyt medlem til %s:
+teams.read_permission_desc = Dette team giver <strong>læse</strong> adgang: medlemmer kan se og klone teamdepoter.
+teams.remove_all_repos_title = Slet alle team depoter
+members.leave.detail = Er du sikker på, at du vil forlade organisationen "%s"?
+settings.email = Kontakt email
 settings.delete_account = Slet denne organisation
+teams.can_create_org_repo_helper = Medlemmer kan oprette nye arkiver i organisationen. Skaberen får administratoradgang til det nye lager.
+teams.remove_all_repos_desc = Dette vil slette alle depoter fra teamet
+teams.add_all_repos_title = Tilføj alle depoter
+settings.update_settings = Opdater indstillinger
+settings.update_setting_success = Organisationsindstillingerne er blevet opdateret.
+settings.delete = Slet organisation
+members.invite_now = Inviter nu
+teams.members = Team medlemmer
+teams.owners_permission_desc = Ejere har fuld adgang til <strong>alle depoter</strong> og har <strong>administratoradgang</strong> til organisationen.
+teams.update_settings = Opdater indstillinger
+settings.labels_desc = Tilføj etiketter, som kan bruges til problemer for <strong>alle lagre</strong> under denne organisation.
+members.membership_visibility = Medlemskabs synlighed:
+members.public = Synlig
 settings.delete_prompt = Organisationen fjernes permanent. Dette <strong>KAN IKKE</strong> fortrydes!
 settings.confirm_delete_account = Bekræft sletning
 settings.delete_org_title = Slet organisation
 settings.delete_org_desc = Denne organisation vil blive slettet permanent. Vil du fortsætte?
 settings.hooks_desc = Tilføj webhooks, som vil blive udløst for <strong>alle lagre</strong> under denne organisation.
-settings.labels_desc = Tilføj etiketter, som kan bruges til problemer for <strong>alle lagre</strong> under denne organisation.
-members.membership_visibility = Medlemskabs synlighed:
-members.public = Synlig
-members.public_helper = Gør skjult
-members.private = Skjult
-members.private_helper = Gør synlig
-members.member_role = Medlemsrolle:
-members.member = Medlem
-members.remove.detail = Vil du fjerne %[1]s fra %[2]s?
-members.leave = Forlad
-members.leave.detail = Er du sikker på, at du vil forlade organisationen "%s"?
-members.invite_desc = Tilføj et nyt medlem til %s:
-members.invite_now = Inviter nu
-teams.join = Deltag
-teams.leave = Forlad
 teams.leave.detail = Er du sikker på, at du vil forlade teamet "%s"?
 teams.can_create_org_repo = Opret depoter
-teams.can_create_org_repo_helper = Medlemmer kan oprette nye arkiver i organisationen. Skaberen får administratoradgang til det nye lager.
+teams.general_access_helper = Medlemmers tilladelser bestemmes af nedenstående tilladelsestabell.
+teams.delete_team = Slet team
+teams.add_team_member = Slet team
+form.name_pattern_not_allowed = Mønsteret "%s" er ikke tilladt i et organisationsnavn.
+form.create_org_not_allowed = Du har ikke tilladelse til at oprette en organisation.
 teams.none_access = Ingen adgang
 teams.none_access_helper = Muligheden "ingen adgang" har kun effekt på private arkiver.
 teams.general_access = Brugerdefineret adgang
-teams.general_access_helper = Medlemmers tilladelser bestemmes af nedenstående tilladelsestabell.
-teams.owners_permission_desc = Ejere har fuld adgang til <strong>alle depoter</strong> og har <strong>administratoradgang</strong> til organisationen.
-teams.members = Team medlemmer
-teams.update_settings = Opdater indstillinger
-teams.delete_team = Slet team
-teams.add_team_member = Slet team
+members.leave = Forlad
+teams.leave = Forlad
+teams.join = Deltag
+teams.delete_team_success = Teamet er blevet slettet.
+teams.write_permission_desc = Dette team giver <strong>Skrive</strong> adgang: medlemmer kan læse fra og skubbe til teamdepoter.
 teams.invite_team_member = Inviter til %s
 teams.invite_team_member.list = Afventende invitationer
-teams.delete_team_title = Slet team
-teams.delete_team_desc = Sletning af et team tilbagekalder depotadgang fra dets medlemmer. Vil du fortsætte?
-teams.delete_team_success = Teamet er blevet slettet.
-teams.read_permission_desc = Dette team giver <strong>læse</strong> adgang: medlemmer kan se og klone teamdepoter.
-teams.write_permission_desc = Dette team giver <strong>Skrive</strong> adgang: medlemmer kan læse fra og skubbe til teamdepoter.
 teams.admin_permission_desc = Dette team giver <strong>Administrator</strong> adgang: medlemmer kan læse fra, skubbe til og tilføje samarbejdspartnere til teamdepoter.
 teams.create_repo_permission_desc = Derudover giver dette team tilladelse til <strong>Opret depot</strong>: medlemmer kan oprette nye lagre i organisationen.
+teams.delete_team_title = Slet team
 teams.repositories = Team depoter
-teams.remove_all_repos_title = Slet alle team depoter
-teams.remove_all_repos_desc = Dette vil slette alle depoter fra teamet
-teams.add_all_repos_title = Tilføj alle depoter
+teams.delete_team_desc = Sletning af et team tilbagekalder depotadgang fra dets medlemmer. Vil du fortsætte?
 teams.add_all_repos_desc = Dette vil tilføje alle organisationens depoter til teamet.
 teams.add_nonexistent_repo = Depotet, du forsøger at tilføje, eksisterer ikke, opret det først.
+teams.invite.by = Inviteret af %s
+teams.all_repositories_helper = Teamet har adgang til alle depoter. Hvis du vælger dette, <strong>føjes alle eksisterende</strong> depoter til teamet.
+teams.invite.title = Du er blevet inviteret til at deltage i teamet <strong>%s</strong> i organisationen <strong>%s</strong>.
 teams.add_duplicate_users = Brugeren er allerede et teammedlem.
 teams.repos.none = Ingen depoter kunne tilgås af dette team.
 teams.members.none = Ingen medlemmer på dette team.
 teams.specific_repositories = Specifikke depoter
 teams.specific_repositories_helper = Medlemmer vil kun have adgang til depoter, der udtrykkeligt er føjet til teamet. Hvis du vælger dette <strong>vil det ikke</strong> automatisk fjerne depoter, der allerede er tilføjet med <i>Alle depoter</i>.
 teams.all_repositories = Alle depoter
-teams.all_repositories_helper = Teamet har adgang til alle depoter. Hvis du vælger dette, <strong>føjes alle eksisterende</strong> depoter til teamet.
-teams.invite.title = Du er blevet inviteret til at deltage i teamet <strong>%s</strong> i organisationen <strong>%s</strong>.
-teams.invite.by = Inviteret af %s
 teams.invite.description = Klik venligst på knappen nedenfor for at blive medlem af teamet.
 
 [admin]
@@ -2927,412 +2939,466 @@ config.allow_dots_in_usernames = Tillad brugere at bruge prikker i deres brugern
 auths.oauth2_icon_url = Icon URL
 users.edit = Redigere
 users.auth_source = Godkendelseskilde
-
-dashboard = Instrumentpanel
-self_check = Selvtjek
-identity_access = Identitet og adgang
-users = Brugerkonti
-organizations = Organisationer
-assets = Kode aktiver
-repositories = Depoter
-hooks = Webhooks
-integrations = Integrationer
-authentication = Godkendelseskilder
-emails = Bruger e-mails
-config = Konfiguration
-notices = Systemmeddelelser
-config_summary = Oversigt
-monitor = Overvågning
-first_page = Først
-last_page = Sidst
-total = Total: %d
-settings = Admin indstillinger
-dashboard.new_version_hint = Forgejo %s er nu tilgængelig, du kører %s. Tjek <a target="_blank" rel="noreferrer" href="%s">bloggen</a> for flere detaljer.
-dashboard.statistic = Oversigt
-dashboard.operations = Vedligeholdelses operationer
-dashboard.system_status = System status
-dashboard.operation_name = Operations navn
-dashboard.operation_switch = Skift
-dashboard.operation_run = Kør
-dashboard.clean_unbind_oauth = Rens ubundne OAuth-forbindelser
-dashboard.clean_unbind_oauth_success = Alle ubundne OAuth-forbindelser er blevet slettet.
-dashboard.task.started = Startet opgave: %[1]s
-dashboard.task.process = Opgave: %[1]s
-dashboard.task.cancelled = Opgave: %[1]s annulleret: %[3]s
-dashboard.task.error = Fejl i Opgave: %[1]s: %[3]s
-dashboard.task.finished = Opgave: %[1]s startet af %[2]s er afsluttet
-dashboard.task.unknown = Ukendt opgave: %[1]s
-dashboard.cron.started = Startede Cron: %[1]s
-dashboard.cron.process = Cron: %[1]s
-dashboard.cron.cancelled = Cron: %[1]s annulleret: %[3]s
-dashboard.cron.error = Fejl i Cron: %s: %[3]s
-dashboard.cron.finished = Cron: %[1]s er færdig
-dashboard.delete_inactive_accounts = Slet alle uaktiverede konti
-dashboard.delete_inactive_accounts.started = Slet alle uaktiverede konti opgave startet.
-dashboard.delete_repo_archives = Slet alle depoters arkiver (ZIP, TAR.GZ osv..)
-dashboard.delete_repo_archives.started = Slet alle repository arkiver opgave startet.
-dashboard.delete_missing_repos = Slet alle depoter, der mangler deres Git-filer
-dashboard.delete_missing_repos.started = Slet alle depoter, der mangler deres Git-filopgave startet.
-dashboard.delete_generated_repository_avatars = Slet genererede depot avatarer
-dashboard.sync_repo_branches = Synkroniser mistede grene fra Git-data til databasen
-dashboard.sync_repo_tags = Synkroniser tags fra Git-data til database
-dashboard.update_mirrors = Opdater spejle
-dashboard.repo_health_check = Sundhedstjek alle depoter
-dashboard.check_repo_stats = Tjek alle depotstatistikker
-dashboard.archive_cleanup = Slet gamle depotarkiver
-dashboard.deleted_branches_cleanup = Ryd op i slettede grene
-dashboard.update_migration_poster_id = Opdater migrationsplakat-id'er
-dashboard.git_gc_repos = Samle alt affald fra alle depoter
-dashboard.resync_all_sshkeys = Opdater filen ".ssh/authorized_keys" med Forgejo SSH-nøgler.
-dashboard.resync_all_sshprincipals = Opdater ".ssh/authorized_principals" filen med Forgejo SSH principals.
-dashboard.resync_all_hooks = Gensynkroniser pre-receive, update og post-receive hooks for alle depoter
-dashboard.reinit_missing_repos = Geninitialiser alle manglende Git-depoter, som der findes poster for
-dashboard.sync_external_users = Synkroniser eksterne brugerdata
-dashboard.cleanup_hook_task_table = Oprydning hook_task tabel
-dashboard.cleanup_packages = Ryd udløbne pakker
-dashboard.cleanup_actions = Oprydning af udløbne logfiler og artefakter fra handlinger
-dashboard.server_uptime = Server oppetid
-dashboard.current_goroutine = Nuværende goroutiner
-dashboard.current_memory_usage = Aktuel hukommelsesbrug
-dashboard.total_memory_allocated = Samlet hukommelse tildelt
-dashboard.memory_obtained = Hukommelse opnået
-dashboard.pointer_lookup_times = Pointer-opslagstider
-dashboard.memory_allocate_times = Hukommelsestildelinger
-dashboard.memory_free_times = Hukommelses frigørelse
-dashboard.current_heap_usage = Nuværende heap-brug
-dashboard.heap_memory_obtained = Heap-hukommelse opnået
-dashboard.heap_memory_idle = Heap hukommelse inaktiv
-dashboard.heap_memory_in_use = Heap hukommelse i brug
-dashboard.heap_memory_released = Heap-hukommelse frigivet
-dashboard.heap_objects = Heap genstande
-dashboard.bootstrap_stack_usage = Brug af bootstrap-stak
-dashboard.stack_memory_obtained = Stakhukommelse opnået
-dashboard.mspan_structures_usage = MSpan strukturer brug
-dashboard.mspan_structures_obtained = Mspan strukturer opnået
-dashboard.mcache_structures_usage = MCache strukturer brug
-dashboard.mcache_structures_obtained = MCache-strukturer opnået
-dashboard.profiling_bucket_hash_table_obtained = Profilering bucket hash tabel opnået
-dashboard.gc_metadata_obtained = GC-metadata opnået
-dashboard.other_system_allocation_obtained = Anden systemallokering opnået
-dashboard.next_gc_recycle = Næste GC genbrug
-dashboard.last_gc_time = Tid siden sidste GC
-dashboard.total_gc_pause = Total GC-pause
-dashboard.last_gc_pause = Sidste GC-pause
-dashboard.gc_times = GC times
-dashboard.delete_old_actions = Slet alle gamle aktiviteter fra databasen
-dashboard.delete_old_actions.started = Slet alle gamle aktiviteter fra den påbegyndte database.
-dashboard.update_checker = Opdateringskontrol
-dashboard.delete_old_system_notices = Slet alle gamle systemmeddelelser fra databasen
-dashboard.gc_lfs = Affaldssamler LFS-metaobjekter
-dashboard.stop_zombie_tasks = Stop zombiehandlingsopgaver
-dashboard.stop_endless_tasks = Stop endeløse handlingsopgaver
-dashboard.cancel_abandoned_jobs = Annuller forladte handlingsjob
-dashboard.start_schedule_tasks = Start planlæg handlingsopgaver
-dashboard.sync_branch.started = Gren synkronisering startede
-dashboard.sync_tag.started = Tag-synkronisering er startet
-dashboard.rebuild_issue_indexer = Genopbyg problemindekser
-users.user_manage_panel = Administrer brugerkonti
-users.new_account = Opret brugerkonto
-users.admin = Admin
-users.restricted = Begrænset
-users.reserved = Reserveret
-users.bot = Bot
-users.remote = Remote
-users.2fa = 2FA
-users.repos = Depoter
-users.created = Oprettet
-users.last_login = Sidst logget ind
-users.never_login = Aldrig logget ind
-users.send_register_notify = Giv besked om tilmelding via e-mail
-users.new_success = Brugerkontoen "%s" er blevet oprettet.
-users.local = Lokal
-users.auth_login_name = Godkendelses-loginnavn
-users.password_helper = Lad adgangskoden være tom for at bevare den uændret.
-users.update_profile_success = Brugerkontoen er blevet opdateret.
-users.edit_account = Rediger brugerkonto
-users.max_repo_creation = Maksimalt antal depoter
-users.max_repo_creation_desc = (Indtast -1 for at bruge den globale standardgrænse.)
-users.is_activated = Aktiveret konto
-users.activated.description = Afslutning af e-mailbekræftelse. Ejeren af en uaktiveret konto vil ikke være i stand til at logge ind, før e-mailbekræftelsen er gennemført.
-users.prohibit_login = Suspenderet konto
-users.block.description = Bloker denne bruger i at interagere med denne tjeneste via deres konto, og forbyd at logge ind.
-users.is_admin = Administrator konto
-users.admin.description = Giv denne bruger fuld adgang til alle administrative funktioner, der er tilgængelige via web-UI og API.
-users.is_restricted = Begrænset konto
-users.restricted.description = Tillad kun interaktion med de depoter og organisationer, hvor denne bruger er tilføjet som en samarbejdspartner. Dette forhindrer adgang til offentlige arkiver i denne instans.
-users.allow_git_hook = Kan skabe Git hooks
-users.allow_git_hook_tooltip = Git hooks udføres som OS-brugeren, der kører Forgejo og vil have samme niveau af værtsadgang. Som et resultat kan brugere med dette specielle Git hook-privilegium få adgang til og ændre alle Forgejo-depoter såvel som databasen, der bruges af Forgejo. Derfor er de også i stand til at opnå Forgejo-administratorrettigheder.
-users.allow_import_local = Kan importere lokale depoter
-users.local_import.description = Tillad import af depoter fra serverens lokale filsystem. Dette kan være et sikkerhedsproblem.
-users.allow_create_organization = Kan skabe organisationer
-users.organization_creation.description = Tillad oprettelse af nye organisationer.
-users.update_profile = Opdater brugerkonto
-users.delete_account = Slet brugerkonto
-users.cannot_delete_self = Du kan ikke slette dig selv
-users.still_own_repo = Denne bruger ejer stadig et eller flere arkiver. Slet eller overfør disse depoter først.
-users.still_has_org = Denne bruger er medlem af en organisation. Fjern først brugeren fra enhver organisation.
-users.purge = Udrens bruger
-users.purge_help = Tvangsslet brugeren og eventuelle depoter, organisationer og pakker, der ejes af brugeren. Alle kommentarer og problemer indsendt af denne bruger vil også blive slettet.
-users.still_own_packages = Denne bruger ejer stadig en eller flere pakker, slet disse pakker først.
-users.deletion_success = Brugerkontoen er blevet slettet.
-users.reset_2fa = Nulstil 2FA
-users.list_status_filter.menu_text = Filter
-users.list_status_filter.reset = Nulstil
-users.list_status_filter.is_active = Aktiv
-users.list_status_filter.not_active = Inaktiv
-users.list_status_filter.is_admin = Admin
-users.list_status_filter.not_admin = Ikke admin
-users.list_status_filter.is_restricted = Begrænset
-users.list_status_filter.not_restricted = Ikke begrænset
-users.list_status_filter.is_prohibit_login = Forbyd login
-users.list_status_filter.not_prohibit_login = Tillad login
-users.list_status_filter.is_2fa_enabled = 2FA aktiveret
-users.list_status_filter.not_2fa_enabled = 2FA deaktiveret
-users.details = Brugeroplysninger
-emails.email_manage_panel = Administrer bruger-e-mails
-emails.primary = Primær
-emails.filter_sort.email_reverse = E-mail (omvendt)
-emails.filter_sort.name_reverse = Brugernavn (omvendt)
-emails.updated = E-mail opdateret
-emails.not_updated = Kunne ikke opdatere den anmodede e-mailadresse: %v
-emails.duplicate_active = Denne e-mailadresse er allerede aktiv for en anden bruger.
-emails.change_email_header = Opdater e-mail-egenskaber
-emails.change_email_text = Er du sikker på, at du vil opdatere denne e-mailadresse?
-emails.delete = Slet e-mail
-emails.delete_desc = Er du sikker på, at du vil slette denne e-mailadresse?
-emails.deletion_success = E-mailadressen er blevet slettet.
-emails.delete_primary_email_error = Du kan ikke slette den primære e-mail.
-orgs.org_manage_panel = Administrer organisationer
-repos.repo_manage_panel = Administrer depoter
-repos.unadopted = Ikke-adopterede depoter
-repos.unadopted.no_more = Ingen ikke-adopterede depoter fundet.
-repos.issues = Problemer
-repos.size = Størrelse
-repos.lfs_size = LFS størrelse
-packages.package_manage_panel = Administrer pakker
-packages.total_size = Samlet størrelse: %s
-packages.unreferenced_size = Ikke-referencestørrelse: %s
-packages.version = Version
-packages.type = Type
-packages.size = Størrelse
-packages.published = Offentliggjort
-auths.type = Type
-auths.syncenabled = Slå brugersynkronisering til
-auths.updated = Opdateret
-auths.security_protocol = Sikkerhedsprotokol
-auths.domain = Domæne
-auths.host = Host
-auths.port = Port
 monitor.queue.settings.maxnumberworkers.placeholder = I øjeblikket %[1]d
 monitor.queue.settings.submit = Opdater indstillinger
 monitor.queue.settings.changed = Indstillinger opdateret
 monitor.queue.settings.remove_all_items = Slet alle
 monitor.queue.settings.remove_all_items_done = Alle varer i køen er blevet fjernet.
 notices.system_notice_list = Systemmeddelelser
-
+dashboard.delete_repo_archives = Slet alle depoters arkiver (ZIP, TAR.GZ osv..)
+organizations = Organisationer
+dashboard.delete_repo_archives.started = Slet alle repository arkiver opgave startet.
+dashboard.statistic = Oversigt
+dashboard.task.finished = Opgave: %[1]s startet af %[2]s er afsluttet
+dashboard.task.unknown = Ukendt opgave: %[1]s
+dashboard.cron.error = Fejl i Cron: %s: %[3]s
+dashboard.operation_name = Operations navn
+dashboard.delete_missing_repos.started = Slet alle depoter, der mangler deres Git-filopgave startet.
+dashboard.delete_generated_repository_avatars = Slet genererede depot avatarer
+dashboard.sync_repo_branches = Synkroniser mistede grene fra Git-data til databasen
+dashboard.sync_repo_tags = Synkroniser tags fra Git-data til database
+dashboard.archive_cleanup = Slet gamle depotarkiver
+dashboard.deleted_branches_cleanup = Ryd op i slettede grene
+dashboard = Instrumentpanel
+self_check = Selvtjek
+assets = Kode aktiver
+repositories = Depoter
+authentication = Godkendelseskilder
+emails = Bruger e-mails
+monitor = Overvågning
+settings = Admin indstillinger
+dashboard.new_version_hint = Forgejo %s er nu tilgængelig, du kører %s. Tjek <a target="_blank" rel="noreferrer" href="%s">bloggen</a> for flere detaljer.
+dashboard.operation_switch = Skift
+dashboard.operation_run = Kør
+dashboard.clean_unbind_oauth = Rens ubundne OAuth-forbindelser
+dashboard.delete_inactive_accounts.started = Slet alle uaktiverede konti opgave startet.
+dashboard.delete_missing_repos = Slet alle depoter, der mangler deres Git-filer
+dashboard.update_migration_poster_id = Opdater migrationsplakat-id'er
+dashboard.memory_obtained = Hukommelse opnået
+dashboard.pointer_lookup_times = Pointer-opslagstider
+hooks = Webhooks
+dashboard.cron.finished = Cron: %[1]s er færdig
+dashboard.delete_inactive_accounts = Slet alle uaktiverede konti
+config = Konfiguration
+notices = Systemmeddelelser
+config_summary = Oversigt
+dashboard.system_status = System status
+dashboard.update_mirrors = Opdater spejle
+dashboard.server_uptime = Server oppetid
+dashboard.current_goroutine = Nuværende goroutiner
+dashboard.current_memory_usage = Aktuel hukommelsesbrug
+dashboard.total_memory_allocated = Samlet hukommelse tildelt
+integrations = Integrationer
+dashboard.operations = Vedligeholdelses operationer
+dashboard.repo_health_check = Sundhedstjek alle depoter
+dashboard.check_repo_stats = Tjek alle depotstatistikker
+dashboard.git_gc_repos = Samle alt affald fra alle depoter
+dashboard.resync_all_sshkeys = Opdater filen ".ssh/authorized_keys" med Forgejo SSH-nøgler.
+dashboard.resync_all_sshprincipals = Opdater ".ssh/authorized_principals" filen med Forgejo SSH principals.
+users = Brugerkonti
+identity_access = Identitet og adgang
+first_page = Først
+last_page = Sidst
+dashboard.task.process = Opgave: %[1]s
+total = Total: %d
+dashboard.cron.started = Startede Cron: %[1]s
+dashboard.cron.process = Cron: %[1]s
+dashboard.cron.cancelled = Cron: %[1]s annulleret: %[3]s
+dashboard.clean_unbind_oauth_success = Alle ubundne OAuth-forbindelser er blevet slettet.
+dashboard.task.started = Startet opgave: %[1]s
+dashboard.task.cancelled = Opgave: %[1]s annulleret: %[3]s
+dashboard.task.error = Fejl i Opgave: %[1]s: %[3]s
+dashboard.resync_all_hooks = Gensynkroniser pre-receive, update og post-receive hooks for alle depoter
+dashboard.reinit_missing_repos = Geninitialiser alle manglende Git-depoter, som der findes poster for
+dashboard.sync_external_users = Synkroniser eksterne brugerdata
+dashboard.cleanup_hook_task_table = Oprydning hook_task tabel
+dashboard.cleanup_packages = Ryd udløbne pakker
+dashboard.cleanup_actions = Oprydning af udløbne logfiler og artefakter fra handlinger
+users.remote = Remote
+users.password_helper = Lad adgangskoden være tom for at bevare den uændret.
+dashboard.cancel_abandoned_jobs = Annuller forladte handlingsjob
+users.activated.description = Afslutning af e-mailbekræftelse. Ejeren af en uaktiveret konto vil ikke være i stand til at logge ind, før e-mailbekræftelsen er gennemført.
+users.admin.description = Giv denne bruger fuld adgang til alle administrative funktioner, der er tilgængelige via web-UI og API.
+users.update_profile = Opdater brugerkonto
+users.still_has_org = Denne bruger er medlem af en organisation. Fjern først brugeren fra enhver organisation.
+users.purge_help = Tvangsslet brugeren og eventuelle depoter, organisationer og pakker, der ejes af brugeren. Alle kommentarer og problemer indsendt af denne bruger vil også blive slettet.
+users.is_admin = Administrator konto
+dashboard.mspan_structures_obtained = Mspan strukturer opnået
+dashboard.mcache_structures_usage = MCache strukturer brug
+dashboard.mspan_structures_usage = MSpan strukturer brug
+dashboard.mcache_structures_obtained = MCache-strukturer opnået
+dashboard.profiling_bucket_hash_table_obtained = Profilering bucket hash tabel opnået
+dashboard.gc_metadata_obtained = GC-metadata opnået
+dashboard.other_system_allocation_obtained = Anden systemallokering opnået
+dashboard.next_gc_recycle = Næste GC genbrug
+dashboard.total_gc_pause = Total GC-pause
+dashboard.last_gc_time = Tid siden sidste GC
+dashboard.delete_old_system_notices = Slet alle gamle systemmeddelelser fra databasen
+dashboard.gc_lfs = Affaldssamler LFS-metaobjekter
+dashboard.start_schedule_tasks = Start planlæg handlingsopgaver
+dashboard.sync_branch.started = Gren synkronisering startede
+dashboard.sync_tag.started = Tag-synkronisering er startet
+dashboard.rebuild_issue_indexer = Genopbyg problemindekser
+users.update_profile_success = Brugerkontoen er blevet opdateret.
+users.created = Oprettet
+users.max_repo_creation = Maksimalt antal depoter
+users.prohibit_login = Suspenderet konto
+users.is_restricted = Begrænset konto
+dashboard.memory_allocate_times = Hukommelsestildelinger
+dashboard.memory_free_times = Hukommelses frigørelse
+dashboard.current_heap_usage = Nuværende heap-brug
+dashboard.heap_memory_obtained = Heap-hukommelse opnået
+dashboard.heap_objects = Heap genstande
+dashboard.bootstrap_stack_usage = Brug af bootstrap-stak
+dashboard.update_checker = Opdateringskontrol
+dashboard.delete_old_actions.started = Slet alle gamle aktiviteter fra den påbegyndte database.
+dashboard.stop_zombie_tasks = Stop zombiehandlingsopgaver
+dashboard.stop_endless_tasks = Stop endeløse handlingsopgaver
+users.2fa = 2FA
+users.last_login = Sidst logget ind
+users.never_login = Aldrig logget ind
+users.new_success = Brugerkontoen "%s" er blevet oprettet.
+users.local_import.description = Tillad import af depoter fra serverens lokale filsystem. Dette kan være et sikkerhedsproblem.
+users.organization_creation.description = Tillad oprettelse af nye organisationer.
+users.delete_account = Slet brugerkonto
+users.cannot_delete_self = Du kan ikke slette dig selv
+users.still_own_repo = Denne bruger ejer stadig et eller flere arkiver. Slet eller overfør disse depoter først.
+users.list_status_filter.is_admin = Admin
+users.block.description = Bloker denne bruger i at interagere med denne tjeneste via deres konto, og forbyd at logge ind.
+users.restricted.description = Tillad kun interaktion med de depoter og organisationer, hvor denne bruger er tilføjet som en samarbejdspartner. Dette forhindrer adgang til offentlige arkiver i denne instans.
+users.list_status_filter.menu_text = Filter
+dashboard.heap_memory_idle = Heap hukommelse inaktiv
+dashboard.heap_memory_in_use = Heap hukommelse i brug
+dashboard.heap_memory_released = Heap-hukommelse frigivet
+dashboard.stack_memory_obtained = Stakhukommelse opnået
+dashboard.last_gc_pause = Sidste GC-pause
+dashboard.gc_times = GC times
+dashboard.delete_old_actions = Slet alle gamle aktiviteter fra databasen
+users.allow_create_organization = Kan skabe organisationer
+users.list_status_filter.not_admin = Ikke admin
+users.allow_import_local = Kan importere lokale depoter
+users.send_register_notify = Giv besked om tilmelding via e-mail
+users.local = Lokal
+users.auth_login_name = Godkendelses-loginnavn
+users.allow_git_hook = Kan skabe Git hooks
+users.allow_git_hook_tooltip = Git hooks udføres som OS-brugeren, der kører Forgejo og vil have samme niveau af værtsadgang. Som et resultat kan brugere med dette specielle Git hook-privilegium få adgang til og ændre alle Forgejo-depoter såvel som databasen, der bruges af Forgejo. Derfor er de også i stand til at opnå Forgejo-administratorrettigheder.
+users.repos = Depoter
+users.still_own_packages = Denne bruger ejer stadig en eller flere pakker, slet disse pakker først.
+users.deletion_success = Brugerkontoen er blevet slettet.
+users.reset_2fa = Nulstil 2FA
+users.max_repo_creation_desc = (Indtast -1 for at bruge den globale standardgrænse.)
+users.is_activated = Aktiveret konto
+users.edit_account = Rediger brugerkonto
+packages.version = Version
+users.list_status_filter.reset = Nulstil
+users.list_status_filter.is_active = Aktiv
+users.list_status_filter.not_active = Inaktiv
+users.purge = Udrens bruger
+users.user_manage_panel = Administrer brugerkonti
+users.new_account = Opret brugerkonto
+users.admin = Admin
+users.restricted = Begrænset
+users.reserved = Reserveret
+users.bot = Bot
+emails.primary = Primær
+emails.updated = E-mail opdateret
+emails.not_updated = Kunne ikke opdatere den anmodede e-mailadresse: %v
+packages.package_manage_panel = Administrer pakker
+packages.total_size = Samlet størrelse: %s
+packages.unreferenced_size = Ikke-referencestørrelse: %s
+users.list_status_filter.is_2fa_enabled = 2FA aktiveret
+users.list_status_filter.not_2fa_enabled = 2FA deaktiveret
+emails.filter_sort.email_reverse = E-mail (omvendt)
+emails.filter_sort.name_reverse = Brugernavn (omvendt)
+emails.delete = Slet e-mail
+emails.delete_desc = Er du sikker på, at du vil slette denne e-mailadresse?
+emails.deletion_success = E-mailadressen er blevet slettet.
+users.list_status_filter.is_restricted = Begrænset
+emails.duplicate_active = Denne e-mailadresse er allerede aktiv for en anden bruger.
+emails.change_email_header = Opdater e-mail-egenskaber
+emails.change_email_text = Er du sikker på, at du vil opdatere denne e-mailadresse?
+repos.issues = Problemer
+repos.size = Størrelse
+repos.lfs_size = LFS størrelse
+users.list_status_filter.not_restricted = Ikke begrænset
+users.details = Brugeroplysninger
+emails.email_manage_panel = Administrer bruger-e-mails
+users.list_status_filter.is_prohibit_login = Forbyd login
+users.list_status_filter.not_prohibit_login = Tillad login
+emails.delete_primary_email_error = Du kan ikke slette den primære e-mail.
+orgs.org_manage_panel = Administrer organisationer
+repos.repo_manage_panel = Administrer depoter
+repos.unadopted = Ikke-adopterede depoter
+repos.unadopted.no_more = Ingen ikke-adopterede depoter fundet.
+auths.domain = Domæne
+auths.port = Port
+auths.host = Host
+packages.size = Størrelse
+auths.security_protocol = Sikkerhedsprotokol
+auths.updated = Opdateret
+auths.type = Type
+auths.syncenabled = Slå brugersynkronisering til
+packages.published = Offentliggjort
+packages.type = Type
 packages.cleanup = Ryd op i udløbne data
 packages.cleanup.success = Der er ryddet op i udløbne data
-packages.creator = Skaber
-defaulthooks = Default webhooks
-defaulthooks.desc = Webhooks foretager automatisk HTTP POST-anmodninger til en server, når visse Forgejo-hændelser udløses. Webhooks defineret her er standarder og vil blive kopieret til alle nye repositories. Læs mere i <a target="_blank" rel="noopener" href="%s">webhooks-guiden</a>.
 defaulthooks.add_webhook = Tilføj standard webhook
 defaulthooks.update_webhook = Opdater standardwebhook
 systemhooks = System webhooks
 systemhooks.desc = Webhooks foretager automatisk HTTP POST-anmodninger til en server, når visse Forgejo-hændelser udløses. Webhooks, der er defineret her, vil virke på alle repositories på systemet, så overvej venligst eventuelle præstationsimplikationer, dette kan have. Læs mere i <a target="_blank" rel="noopener" href="%s">webhooks-guiden</a>.
-systemhooks.add_webhook = Tilføj System Webhook
+defaulthooks = Default webhooks
+defaulthooks.desc = Webhooks foretager automatisk HTTP POST-anmodninger til en server, når visse Forgejo-hændelser udløses. Webhooks defineret her er standarder og vil blive kopieret til alle nye repositories. Læs mere i <a target="_blank" rel="noopener" href="%s">webhooks-guiden</a>.
+packages.creator = Skaber
 systemhooks.update_webhook = Opdater System Webhook
+config.enable_openid_signin = Aktiver OpenID-logon
+config.cache_test = Test cache
+config.cache_item_ttl = Cache element TTL
+self_check.database_inconsistent_collation_columns = Databasen bruger sortering %s, men disse kolonner bruger uoverensstemmende sorteringer. Det kan forårsage nogle uventede problemer.
+auths.oauth2_group_claim_name = Gør krav på navn med gruppenavne for denne kilde. (Valgfri)
+auths.oauth2_map_group_to_team_removal = Fjern brugere fra synkroniserede teams, hvis brugeren ikke tilhører den tilsvarende gruppe.
+auths.tips.oauth2.general.tip = Når du registrerer en ny OAuth2-godkendelse, skal URL-adressen til tilbagekald/omdirigering være:
+auths.tip.nextcloud = Registrer en ny OAuth-bruger på din instans ved hjælp af følgende menu "Indstillinger -> Sikkerhed -> OAuth 2.0-klient"
+auths.tip.dropbox = Opret en ny applikation på %s
+auths.tip.github = Registrer en ny OAuth-applikation på %s
+auths.tip.gitlab_new = Registrer en ny applikation på %s
+auths.tip.yandex = Opret en ny applikation på %s. Vælg følgende tilladelser fra afsnittet "Yandex.Passport API": "Adgang til e-mailadresse", "Adgang til brugeravatar" og "Adgang til brugernavn, fornavn og efternavn, køn"
+config.run_mode = Kør tilstand
+config.ssh_config = SSH konfiguration
+config.allow_only_internal_registration = Tillad kun registrering gennem Forgejo selv
+config.ssh_minimum_key_size_check = Minimum nøglestørrelse kontrol
+config.enable_captcha = Aktiver CAPTCHA
+config.ssh_minimum_key_sizes = Minimum nøglestørrelser
+config.default_keep_email_private = Skjul e-mailadresser som standard
+config.default_allow_create_organization = Tillad oprettelse af organisationer som standard
+config.queue_length = Kø længde
+config.default_enable_dependencies = Aktiver problemafhængigheder som standard
+config.webhook_config = Webhook-konfiguration
+config.deliver_timeout = Lever timeout
+config.skip_tls_verify = Spring over TLS-bekræftelse
+config.mailer_config = Mailer konfiguration
+config.https_only = Kun HTTPS
+monitor.next = Næste gang
+monitor.processes_count = %d Processer
+monitor.duration = Varighed (r)
+config.session_life_time = Session levetid
+monitor.start = Starttid
+notices.deselect_all = Fravælg alle
+notices.view_detail_header = Bemærk detaljer
+notices.select_all = Vælg alle
+self_check.database_collation_case_insensitive = Databasen bruger en sortering %s, som er en ufølsom sortering. Selvom Forgejo kunne arbejde med det, kan der være nogle sjældne tilfælde, som ikke fungerer som forventet.
+config.git_max_diff_line_characters = Maks. diff-tegn pr. linje
+config.access_log_template = Skabelon til adgangslog
+monitor.process.children = Børn
+monitor.queues = Køer
+monitor.queue.settings.desc = Puljer vokser dynamisk som reaktion på deres blokering af arbejderkø.
 auths.auth_manage_panel = Administrer godkendelseskilder
-auths.new = Tilføj godkendelseskilde
 auths.auth_type = Godkendelsestype
-auths.auth_name = Godkendelsesnavn
-auths.bind_dn = Bind DN
-auths.bind_password = Bind adgangskode
-auths.user_base = Bruger søgebase
-auths.user_dn = Bruger DN
-auths.attribute_username = Brugernavn attribut
-auths.attribute_username_placeholder = Lad stå tomt for at bruge brugernavnet indtastet i Forgejo.
-auths.attribute_name = Fornavn attribut
-auths.attribute_surname = Efternavn attribut
-auths.attribute_mail = E-mail attribut
-auths.attribute_ssh_public_key = Offentlig SSH-nøgleattribut
-auths.attribute_avatar = Avatar attribut
-auths.attributes_in_bind = Hent attributter i bind DN-kontekst
-auths.default_domain_name = Standard domænenavn, der bruges til e-mailadressen
-auths.allow_deactivate_all = Tillad et tomt søgeresultat for at deaktivere alle brugere
-auths.use_paged_search = Brug sidesøgning
-auths.search_page_size = Sidestørrelse
-auths.filter = Bruger filter
-auths.admin_filter = Admin filter
-auths.restricted_filter = Begrænset filter
-auths.restricted_filter_helper = Lad være tom for ikke at angive nogen brugere som begrænset. Brug en stjerne ("*") for at indstille alle brugere, der ikke matcher Admin-filteret, som begrænset.
-auths.verify_group_membership = Bekræft gruppemedlemskab i LDAP (lad filteret stå tomt for at springe over)
-auths.group_search_base = Gruppesøgningsbase DN
-auths.group_attribute_list_users = Gruppeattribut, der indeholder en liste over brugere
-auths.user_attribute_in_group = Brugerattribut angivet i gruppen
-auths.map_group_to_team = Tilknyt LDAP-grupper til organisationsteams (lad feltet stå tomt for at springe over)
 auths.map_group_to_team_removal = Fjern brugere fra synkroniserede teams, hvis brugeren ikke tilhører den tilsvarende LDAP-gruppe
-auths.enable_ldap_groups = Aktiver LDAP-grupper
-auths.ms_ad_sa = MS AD søgeattributter
-auths.smtp_auth = SMTP-godkendelsestype
-auths.smtphost = SMTP vært
-auths.smtpport = SMTP port
-auths.allowed_domains = Tilladte domæner
-auths.allowed_domains_helper = Lad være tomt for at tillade alle domæner. Adskil flere domæner med et komma (",").
-auths.skip_tls_verify = Spring over TLS-bekræftelse
-auths.force_smtps = Tving SMTPS
-auths.force_smtps_helper = SMTPS bruges altid på port 465. Indstil denne til at tvinge SMTPS på andre porte. (Ellers vil STARTTLS blive brugt på andre porte, hvis det understøttes af værten.)
+auths.attribute_name = Fornavn attribut
+auths.map_group_to_team = Tilknyt LDAP-grupper til organisationsteams (lad feltet stå tomt for at springe over)
 auths.helo_hostname = HELO værtsnavn
 auths.helo_hostname_helper = Værtsnavn sendt med HELO. Lad stå tomt for at sende det nuværende værtsnavn.
 auths.disable_helo = Deaktiver HELO
+auths.oauth2_authURL = Godkend URL
+auths.oauth2_profileURL = Profil-URL
+auths.skip_local_two_fa_helper = Hvis du ikke er indstillet, betyder det, at lokale brugere med 2FA indstillet stadig skal bestå 2FA for at logge på
+auths.oauth2_required_claim_name_helper = Indstil dette navn for at begrænse login fra denne kilde til brugere med et krav med dette navn
+auths.tips.gmail_settings = Gmail-indstillinger:
+auths.update_success = Godkendelseskilden er blevet opdateret.
+auths.tip.mastodon = Indtast en brugerdefineret instans-URL for den mastodon-instans, du vil godkende med (eller brug standarden)
+auths.activated = Denne godkendelseskilde er aktiveret
+auths.new_success = Godkendelsen "%s" er blevet tilføjet.
+config.enable_openid_signup = Aktiver OpenID-selvregistrering
+config.show_registration_button = Vis registreringsknap
+config.require_sign_in_view = Kræv at logge ind for at se indhold
+config.cache_conn = Cacheforbindelse
+config.xorm_log_sql = Log SQL
+monitor.stacktrace = Stakspor
+monitor.execute_time = Udførelsestid
+monitor.last_execution_result = Resultat
+monitor.process.cancel_notices = Annuller: <strong>%s</strong>?
+monitor.queue.type = Type
+monitor.queue.exemplar = Eksempler type
+auths.auth_name = Godkendelsesnavn
+auths.attribute_username = Brugernavn attribut
+auths.attribute_username_placeholder = Lad stå tomt for at bruge brugernavnet indtastet i Forgejo.
+auths.enable_ldap_groups = Aktiver LDAP-grupper
+auths.ms_ad_sa = MS AD søgeattributter
+auths.smtpport = SMTP port
+auths.allowed_domains = Tilladte domæner
+auths.skip_tls_verify = Spring over TLS-bekræftelse
+auths.force_smtps = Tving SMTPS
+auths.force_smtps_helper = SMTPS bruges altid på port 465. Indstil denne til at tvinge SMTPS på andre porte. (Ellers vil STARTTLS blive brugt på andre porte, hvis det understøttes af værten.)
+auths.oauth2_emailURL = E-mail URL
+auths.oauth2_scopes = Yderligere omfang
+auths.oauth2_admin_group = Gruppekravværdi for administratorbrugere. (Valgfrit – kræver kravnavn ovenfor)
+auths.oauth2_restricted_group = Gruppekravsværdi for begrænsede brugere. (Valgfrit – kræver kravnavn ovenfor)
+auths.oauth2_map_group_to_team = Kortlæg hævdede grupper til organisationsteams. (Valgfrit – kræver kravnavn ovenfor)
+auths.tip.google_plus = Hent OAuth2-klientlegitimationsoplysninger fra Google API-konsollen på %s
+auths.tip.openid_connect = Brug OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) til at angive slutpunkterne
+auths.tip.gitea = Registrer en ny OAuth2-applikation. Guide kan findes på %s
+auths.edit = Rediger godkendelseskilden
+auths.update = Opdater godkendelseskilden
+config.offline_mode = Lokal tilstand
+config.disable_router_log = Deaktiver routerlog
+config.git_version = Git version
+config.app_data_path = Appens datasti
+config.repo_root_path = Depotets rodsti
+config.log_file_root_path = Logsti
+config.script_type = Script type
+config.reverse_auth_user = Omvendt proxy-godkendelsesbruger
+config.ssh_key_test_path = Nøgleteststi
+config.ssh_keygen_path = Keygen ("ssh-keygen") sti
+config.active_code_lives = Aktiveringskodens udløbstid
+config.no_reply_address = Skjult e-mail-domæne
+config.mailer_enable_helo = Aktiver HELO
+config.mailer_protocol = Protokol
+config.mailer_use_sendmail = Brug Sendmail
+config.mailer_sendmail_path = Sendmail sti
+config.mailer_sendmail_args = Ekstra argumenter til Sendmail
+config.cache_test_failed = Kunne ikke undersøge cachen: %v.
+config.cache_test_slow = Cachetest lykkedes, men svaret er langsomt: %s.
+config.gc_interval_time = GC interval tid
+config.git_max_diff_files = Max diff filer vist
+config.git_gc_args = GC argumenter
+monitor.queue.settings.maxnumberworkers.error = Max antal arbejdere skal være et tal
+notices.inverse_selection = Omvendt valg
+notices.delete_selected = Slet valgte
+auths.allowed_domains_helper = Lad være tomt for at tillade alle domæner. Adskil flere domæner med et komma (",").
+auths.skip_local_two_fa = Spring over lokal 2FA
+auths.oauth2_required_claim_value_helper = Indstil denne værdi for at begrænse login fra denne kilde til brugere med et krav med dette navn og denne værdi
+monitor.queue.settings.maxnumberworkers = Max antal arbejdere
+notices.delete_all = Slet alle meddelelser
+auths.smtp_auth = SMTP-godkendelsestype
+config.default_visibility_organization = Standardsynlighed for nye organisationer
+auths.tip.facebook = Registrer en ny applikation på %s og tilføj produktet "Facebook Login"
+auths.tip.twitter = Gå til %s, opret en applikation og sørg for, at "Tillad, at denne applikation bruges til at logge på med Twitter" er aktiveret
+self_check.database_fix_mysql = For MySQL/MariaDB-brugere kan du bruge kommandoen "forgejo doctor convert" til at løse sorteringsproblemerne, eller du kan også løse problemet ved at "ALTER ... COLLATE ..." SQLs manuelt.
+auths.tips.oauth2.general = OAuth2-godkendelse
+systemhooks.add_webhook = Tilføj System Webhook
+auths.new = Tilføj godkendelseskilde
+auths.unable_to_initialize_openid = Kan ikke initialisere OpenID Connect Provider: %s
+auths.tip.oauth2_provider = OAuth2-udbyder
+auths.tip.bitbucket = Registrer en ny OAuth-bruger på %s og tilføj tilladelsen "Konto" - "Læs"
+auths.login_source_exist = Godkendelseskilden "%s" findes allerede.
+auths.invalid_openIdConnectAutoDiscoveryURL = Ugyldig Auto Discovery URL (dette skal være en gyldig URL, der starter med http:// eller https://)
+config.lfs_root_path = LFS rodsti
+auths.login_source_of_type_exist = Der findes allerede en godkendelseskilde af denne type.
+config.lfs_content_path = LFS indholdssti
+config.lfs_http_auth_expiry = LFS HTTP-godkendelsesudløbstid
+config.disable_register = Deaktiver selvregistrering
+config.register_email_confirm = Kræv e-mail-bekræftelse for at tilmelde dig
+config.mailer_user = Bruger
+auths.openIdConnectAutoDiscoveryURL = OpenID Connect Auto Discovery URL
+auths.oauth2_use_custom_url = Brug tilpassede webadresser i stedet for standardwebadresser
 auths.pam_service_name = PAM-tjenestenavn
 auths.pam_email_domain = PAM e-mail domæne (valgfrit)
 auths.oauth2_provider = OAuth2-udbyder
 auths.oauth2_clientID = Klient-id (nøgle)
 auths.oauth2_clientSecret = Klientens hemmelighed
-auths.openIdConnectAutoDiscoveryURL = OpenID Connect Auto Discovery URL
-auths.oauth2_use_custom_url = Brug tilpassede webadresser i stedet for standardwebadresser
-auths.oauth2_tokenURL = Token URL
-auths.oauth2_authURL = Godkend URL
-auths.oauth2_profileURL = Profil-URL
-auths.oauth2_emailURL = E-mail URL
-auths.skip_local_two_fa = Spring over lokal 2FA
-auths.skip_local_two_fa_helper = Hvis du ikke er indstillet, betyder det, at lokale brugere med 2FA indstillet stadig skal bestå 2FA for at logge på
-auths.oauth2_tenant = Lejer
-auths.oauth2_scopes = Yderligere omfang
-auths.oauth2_required_claim_name = Påkrævet kravnavn
-auths.oauth2_required_claim_name_helper = Indstil dette navn for at begrænse login fra denne kilde til brugere med et krav med dette navn
 auths.oauth2_required_claim_value = Påkrævet kravværdi
-auths.oauth2_required_claim_value_helper = Indstil denne værdi for at begrænse login fra denne kilde til brugere med et krav med dette navn og denne værdi
-auths.oauth2_group_claim_name = Gør krav på navn med gruppenavne for denne kilde. (Valgfri)
-auths.oauth2_admin_group = Gruppekravværdi for administratorbrugere. (Valgfrit – kræver kravnavn ovenfor)
-auths.oauth2_restricted_group = Gruppekravsværdi for begrænsede brugere. (Valgfrit – kræver kravnavn ovenfor)
-auths.oauth2_map_group_to_team = Kortlæg hævdede grupper til organisationsteams. (Valgfrit – kræver kravnavn ovenfor)
-auths.oauth2_map_group_to_team_removal = Fjern brugere fra synkroniserede teams, hvis brugeren ikke tilhører den tilsvarende gruppe.
+config.db_config = Database konfiguration
+config.db_host = Vært
+config.ssh_start_builtin_server = Brug indbygget server
+config.lfs_config = LFS-konfiguration
+config.service_config = Tjenestekonfiguration
+config.mailer_smtp_port = SMTP-port
+config.disabled_logger = Deaktiveret
+config.access_log_mode = Adgang til logtilstand
+config.allow_only_external_registration = Tillad kun registrering via eksterne tjenester
+config.mailer_smtp_addr = SMTP vært
+config.mailer_sendmail_timeout = Sendmail timeout
+auths.oauth2_tokenURL = Token URL
+auths.oauth2_tenant = Lejer
+config.custom_conf = Konfigurationsfilstien
+config.custom_file_root_path = Brugerdefineret fil rodsti
+config.app_ver = Forgejo version
+config.app_url = Base URL
+config.ssh_domain = SSH server domæne
+config.ssh_port = Port
+config.ssh_listen_port = Lyt port
+config.ssh_root_path = Rodsti
+config.db_type = Type
+config.reset_password_code_lives = Gendannelseskodens udløbstid
+config.mailer_use_dummy = Attrapp
+config.test_mail_failed = Kunne ikke sende en test-e-mail til "%s": %v
+config.cache_adapter = Cache adapter
+config.test_mail_sent = En test-e-mail er blevet sendt til "%s".
+config.oauth_config = OAuth-konfiguration
+config.test_email_placeholder = E-mail (f.eks. test@example.com)
+config.send_test_mail = Send test-e-mail
+config.send_test_mail_submit = Send
+config.cache_config = Cache konfiguration
+config.cookie_name = Cookie navn
+config.session_config = Sessionskonfiguration
+config.session_provider = Session udbyder
+config.provider_config = Udbyder konfig
+notices.op = Op.
+notices.delete_success = Systemmeddelelserne er blevet slettet.
+self_check.no_problem_found = Intet problem fundet endnu.
+self_check.database_collation_mismatch = Forvent, at databasen bruger sortering: %s
+auths.user_dn = Bruger DN
+auths.bind_dn = Bind DN
+auths.bind_password = Bind adgangskode
+auths.user_base = Bruger søgebase
+auths.verify_group_membership = Bekræft gruppemedlemskab i LDAP (lad filteret stå tomt for at springe over)
+auths.group_search_base = Gruppesøgningsbase DN
+auths.smtphost = SMTP vært
+auths.oauth2_required_claim_name = Påkrævet kravnavn
 auths.tips = Tips
-auths.tips.gmail_settings = Gmail-indstillinger:
-auths.tips.oauth2.general = OAuth2-godkendelse
-auths.tips.oauth2.general.tip = Når du registrerer en ny OAuth2-godkendelse, skal URL-adressen til tilbagekald/omdirigering være:
-auths.tip.oauth2_provider = OAuth2-udbyder
-auths.tip.bitbucket = Registrer en ny OAuth-bruger på %s og tilføj tilladelsen "Konto" - "Læs"
-auths.tip.nextcloud = Registrer en ny OAuth-bruger på din instans ved hjælp af følgende menu "Indstillinger -> Sikkerhed -> OAuth 2.0-klient"
-auths.tip.dropbox = Opret en ny applikation på %s
-auths.tip.facebook = Registrer en ny applikation på %s og tilføj produktet "Facebook Login"
-auths.tip.github = Registrer en ny OAuth-applikation på %s
-auths.tip.gitlab_new = Registrer en ny applikation på %s
-auths.tip.google_plus = Hent OAuth2-klientlegitimationsoplysninger fra Google API-konsollen på %s
-auths.tip.openid_connect = Brug OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) til at angive slutpunkterne
-auths.tip.twitter = Gå til %s, opret en applikation og sørg for, at "Tillad, at denne applikation bruges til at logge på med Twitter" er aktiveret
-auths.tip.discord = Registrer en ny applikation på %s
-auths.tip.gitea = Registrer en ny OAuth2-applikation. Guide kan findes på %s
-auths.tip.yandex = Opret en ny applikation på %s. Vælg følgende tilladelser fra afsnittet "Yandex.Passport API": "Adgang til e-mailadresse", "Adgang til brugeravatar" og "Adgang til brugernavn, fornavn og efternavn, køn"
-auths.tip.mastodon = Indtast en brugerdefineret instans-URL for den mastodon-instans, du vil godkende med (eller brug standarden)
-auths.edit = Rediger godkendelseskilden
-auths.activated = Denne godkendelseskilde er aktiveret
-auths.new_success = Godkendelsen "%s" er blevet tilføjet.
-auths.update_success = Godkendelseskilden er blevet opdateret.
-auths.update = Opdater godkendelseskilden
 auths.delete = Slet godkendelseskilden
 auths.delete_auth_title = Slet godkendelseskilden
 auths.delete_auth_desc = Sletning af en godkendelseskilde forhindrer brugere i at bruge den til at logge ind. Vil du fortsætte?
 auths.still_in_used = Godkendelseskilden er stadig i brug. Konverter eller slet alle brugere, der bruger denne godkendelseskilde først.
 auths.deletion_success = Godkendelseskilden er blevet slettet.
-auths.login_source_exist = Godkendelseskilden "%s" findes allerede.
-auths.login_source_of_type_exist = Der findes allerede en godkendelseskilde af denne type.
-auths.unable_to_initialize_openid = Kan ikke initialisere OpenID Connect Provider: %s
-auths.invalid_openIdConnectAutoDiscoveryURL = Ugyldig Auto Discovery URL (dette skal være en gyldig URL, der starter med http:// eller https://)
-config.server_config = Server konfiguration
+config.run_user = Bruger at køre som
+config.mail_notify = Aktiver e-mailmeddelelser
+config.git_migrate_timeout = Migration timeout
+config.log_config = Log konfiguration
+auths.default_domain_name = Standard domænenavn, der bruges til e-mailadressen
+auths.attribute_mail = E-mail attribut
+auths.allow_deactivate_all = Tillad et tomt søgeresultat for at deaktivere alle brugere
+auths.use_paged_search = Brug sidesøgning
+auths.search_page_size = Sidestørrelse
+auths.attribute_ssh_public_key = Offentlig SSH-nøgleattribut
+auths.attribute_avatar = Avatar attribut
+auths.attributes_in_bind = Hent attributter i bind DN-kontekst
 config.app_name = Instans titel
 config.app_slogan = instans slogan
-config.app_ver = Forgejo version
-config.app_url = Base URL
-config.custom_conf = Konfigurationsfilstien
-config.custom_file_root_path = Brugerdefineret fil rodsti
-config.domain = Server domæne
-config.offline_mode = Lokal tilstand
-config.disable_router_log = Deaktiver routerlog
-config.run_user = Bruger at køre som
-config.run_mode = Kør tilstand
-config.git_version = Git version
-config.app_data_path = Appens datasti
-config.repo_root_path = Depotets rodsti
-config.lfs_root_path = LFS rodsti
-config.log_file_root_path = Logsti
-config.script_type = Script type
-config.reverse_auth_user = Omvendt proxy-godkendelsesbruger
-config.ssh_config = SSH konfiguration
-config.ssh_start_builtin_server = Brug indbygget server
-config.ssh_domain = SSH server domæne
-config.ssh_port = Port
-config.ssh_listen_port = Lyt port
-config.ssh_root_path = Rodsti
-config.ssh_key_test_path = Nøgleteststi
-config.ssh_keygen_path = Keygen ("ssh-keygen") sti
-config.ssh_minimum_key_size_check = Minimum nøglestørrelse kontrol
-config.ssh_minimum_key_sizes = Minimum nøglestørrelser
-config.lfs_config = LFS-konfiguration
-config.lfs_content_path = LFS indholdssti
-config.lfs_http_auth_expiry = LFS HTTP-godkendelsesudløbstid
-config.db_config = Database konfiguration
-config.db_type = Type
-config.db_host = Vært
+config.cache_interval = Cache interval
+monitor.queue.settings.title = Pool indstillinger
+notices.type = Type
+notices.type_2 = Opgave
 config.db_schema = Skematisk
 config.db_ssl_mode = SSL
 config.db_path = Sti
-config.service_config = Tjenestekonfiguration
-config.register_email_confirm = Kræv e-mail-bekræftelse for at tilmelde dig
-config.disable_register = Deaktiver selvregistrering
-config.allow_only_internal_registration = Tillad kun registrering gennem Forgejo selv
-config.allow_only_external_registration = Tillad kun registrering via eksterne tjenester
-config.enable_openid_signup = Aktiver OpenID-selvregistrering
-config.enable_openid_signin = Aktiver OpenID-logon
-config.show_registration_button = Vis registreringsknap
-config.require_sign_in_view = Kræv at logge ind for at se indhold
-config.mail_notify = Aktiver e-mailmeddelelser
-config.enable_captcha = Aktiver CAPTCHA
-config.active_code_lives = Aktiveringskodens udløbstid
-config.reset_password_code_lives = Gendannelseskodens udløbstid
-config.default_keep_email_private = Skjul e-mailadresser som standard
-config.default_allow_create_organization = Tillad oprettelse af organisationer som standard
-config.no_reply_address = Skjult e-mail-domæne
-config.default_visibility_organization = Standardsynlighed for nye organisationer
-config.default_enable_dependencies = Aktiver problemafhængigheder som standard
-config.webhook_config = Webhook-konfiguration
-config.queue_length = Kø længde
-config.deliver_timeout = Lever timeout
-config.skip_tls_verify = Spring over TLS-bekræftelse
-config.mailer_config = Mailer konfiguration
-config.mailer_enable_helo = Aktiver HELO
-config.mailer_protocol = Protokol
-config.mailer_smtp_addr = SMTP vært
-config.mailer_smtp_port = SMTP-port
-config.mailer_user = Bruger
-config.mailer_use_sendmail = Brug Sendmail
-config.mailer_sendmail_path = Sendmail sti
-config.mailer_sendmail_args = Ekstra argumenter til Sendmail
-config.mailer_sendmail_timeout = Sendmail timeout
-config.mailer_use_dummy = Attrapp
-config.test_email_placeholder = E-mail (f.eks. test@example.com)
-config.send_test_mail = Send test-e-mail
-config.send_test_mail_submit = Send
-config.test_mail_failed = Kunne ikke sende en test-e-mail til "%s": %v
-config.test_mail_sent = En test-e-mail er blevet sendt til "%s".
-config.oauth_config = OAuth-konfiguration
-config.cache_config = Cache konfiguration
-config.cache_adapter = Cache adapter
-config.cache_interval = Cache interval
-config.cache_conn = Cacheforbindelse
-config.cache_item_ttl = Cache element TTL
-config.cache_test = Test cache
-config.cache_test_failed = Kunne ikke undersøge cachen: %v.
-config.cache_test_slow = Cachetest lykkedes, men svaret er langsomt: %s.
+notices.operations = Operationer
+auths.restricted_filter_helper = Lad være tom for ikke at angive nogen brugere som begrænset. Brug en stjerne ("*") for at indstille alle brugere, der ikke matcher Admin-filteret, som begrænset.
+auths.group_attribute_list_users = Gruppeattribut, der indeholder en liste over brugere
+auths.tip.discord = Registrer en ny applikation på %s
+config.server_config = Server konfiguration
+config.domain = Server domæne
+config.set_setting_failed = Indstilling af %s mislykkedes
+monitor.previous = Tidligere tid
+monitor.process = Kørende processer
+monitor.execute_times = Udførelser
+monitor.download_diagnosis_report = Hent diagnoserapport
+monitor.process.cancel = Annuller processen
+monitor.process.cancel_desc = Annullering af en proces kan medføre tab af data
+monitor.queue = Kø: %s
+monitor.queue.numberworkers = Antal arbejdere
+monitor.queue.activeworkers = Aktive arbejdere
+monitor.queue.maxnumberworkers = Max antal arbejdere
+monitor.queue.numberinqueue = Nummer i kø
+monitor.queue.review_add = Gennemgå / tilføj arbejdere
+config.git_pull_timeout = Pull Operation timeout
+config.git_clone_timeout = Klone Operation timeout
+config.git_gc_timeout = GC Operation timeout
+config.logger_name_fmt = Logger: %s
+monitor.stats = Statistik
+monitor.cron = Cron opgaver
+monitor.schedule = Tidsplan
 config.cache_test_succeeded = Cachetest gennemført, fik et svar i %s.
-config.session_config = Sessionskonfiguration
-config.session_provider = Session udbyder
-config.provider_config = Udbyder konfig
-config.cookie_name = Cookie navn
-config.gc_interval_time = GC interval tid
-config.session_life_time = Session levetid
-config.https_only = Kun HTTPS
 config.cookie_life_time = Cookie levetid
 config.picture_config = Billede og avatar konfiguration
 config.picture_service = Billedservice
@@ -3342,68 +3408,12 @@ config.open_with_editor_app_help = "Åbn med"-editorerne til klonmenuen. Hvis de
 config.git_config = Git konfiguration
 config.git_disable_diff_highlight = Deaktiver diff-syntaksfremhævning
 config.git_max_diff_lines = Max diff-linjer pr. fil
-config.git_max_diff_line_characters = Maks. diff-tegn pr. linje
-config.git_max_diff_files = Max diff filer vist
-config.git_gc_args = GC argumenter
-config.git_migrate_timeout = Migration timeout
 config.git_mirror_timeout = Spejlopdateringstimeout
-config.git_clone_timeout = Klone Operation timeout
-config.git_pull_timeout = Pull Operation timeout
-config.git_gc_timeout = GC Operation timeout
-config.log_config = Log konfiguration
-config.logger_name_fmt = Logger: %s
-config.disabled_logger = Deaktiveret
-config.access_log_mode = Adgang til logtilstand
-config.access_log_template = Skabelon til adgangslog
-config.xorm_log_sql = Log SQL
-config.set_setting_failed = Indstilling af %s mislykkedes
-monitor.stats = Statistik
-monitor.cron = Cron opgaver
-monitor.schedule = Tidsplan
-monitor.next = Næste gang
-monitor.previous = Tidligere tid
-monitor.execute_times = Udførelser
-monitor.process = Kørende processer
-monitor.stacktrace = Stakspor
-monitor.processes_count = %d Processer
-monitor.download_diagnosis_report = Hent diagnoserapport
-monitor.duration = Varighed (r)
-monitor.start = Starttid
-monitor.execute_time = Udførelsestid
-monitor.last_execution_result = Resultat
-monitor.process.cancel = Annuller processen
-monitor.process.cancel_desc = Annullering af en proces kan medføre tab af data
-monitor.process.cancel_notices = Annuller: <strong>%s</strong>?
-monitor.process.children = Børn
-monitor.queues = Køer
-monitor.queue = Kø: %s
-monitor.queue.type = Type
-monitor.queue.exemplar = Eksempler type
-monitor.queue.numberworkers = Antal arbejdere
-monitor.queue.activeworkers = Aktive arbejdere
-monitor.queue.maxnumberworkers = Max antal arbejdere
-monitor.queue.numberinqueue = Nummer i kø
-monitor.queue.review_add = Gennemgå / tilføj arbejdere
-monitor.queue.settings.title = Pool indstillinger
-monitor.queue.settings.desc = Puljer vokser dynamisk som reaktion på deres blokering af arbejderkø.
-monitor.queue.settings.maxnumberworkers = Max antal arbejdere
-monitor.queue.settings.maxnumberworkers.error = Max antal arbejdere skal være et tal
-notices.view_detail_header = Bemærk detaljer
-notices.operations = Operationer
-notices.select_all = Vælg alle
-notices.deselect_all = Fravælg alle
-notices.inverse_selection = Omvendt valg
-notices.delete_selected = Slet valgte
-notices.delete_all = Slet alle meddelelser
-notices.type = Type
-notices.type_2 = Opgave
-notices.op = Op.
-notices.delete_success = Systemmeddelelserne er blevet slettet.
-self_check.no_problem_found = Intet problem fundet endnu.
-self_check.database_collation_mismatch = Forvent, at databasen bruger sortering: %s
-self_check.database_collation_case_insensitive = Databasen bruger en sortering %s, som er en ufølsom sortering. Selvom Forgejo kunne arbejde med det, kan der være nogle sjældne tilfælde, som ikke fungerer som forventet.
-self_check.database_inconsistent_collation_columns = Databasen bruger sortering %s, men disse kolonner bruger uoverensstemmende sorteringer. Det kan forårsage nogle uventede problemer.
-self_check.database_fix_mysql = For MySQL/MariaDB-brugere kan du bruge kommandoen "forgejo doctor convert" til at løse sorteringsproblemerne, eller du kan også løse problemet ved at "ALTER ... COLLATE ..." SQLs manuelt.
+auths.attribute_surname = Efternavn attribut
+auths.filter = Bruger filter
+auths.admin_filter = Admin filter
+auths.restricted_filter = Begrænset filter
+auths.user_attribute_in_group = Brugerattribut angivet i gruppen
 
 [packages]
 arch.version.description = Beskrivelse
@@ -3449,64 +3459,39 @@ rpm.repository = Depot info
 rpm.repository.architectures = Arkitekturer
 alt.registry = Konfigurer dette register fra kommandolinjen:
 alt.repository = Depot info
-
-dependency.version = Version
+alpine.repository.repositories = Depoter
 search_in_external_registry = Søg i %s
+dependency.version = Version
 alpine.registry = Konfigurer dette register ved at tilføje url'en i din <code>/etc/apk/repositories</code> fil:
 alpine.registry.key = Download den offentlige RSA-nøgle til registreringsdatabasen i mappen <code>/etc/apk/keys/</code> for at bekræfte indekssignaturen:
 alpine.registry.info = Vælg $branch og $repository fra listen nedenfor.
-alpine.repository.repositories = Depoter
-
+empty = Der er ingen pakker endnu.
+filter.type.all = Alle
+filter.container.untagged = Umærket
+about = Om denne pakke
+filter.no_result = Dit filter gav ingen resultater.
+dependencies = Afhængigheder
+empty.documentation = For mere information om pakkeregistret, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
+filter.type = Type
+registry.documentation = For mere information om %s registreringsdatabasen, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
 title = Pakker
 desc = Administrer depotpakker.
-empty = Der er ingen pakker endnu.
-empty.documentation = For mere information om pakkeregistret, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
 empty.repo = Har du uploadet en pakke, men den vises ikke her? Gå til <a href="%[1]s">pakkeindstillinger</a> og link den til denne repo.
-registry.documentation = For mere information om %s registreringsdatabasen, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
-filter.type = Type
-filter.type.all = Alle
-filter.no_result = Dit filter gav ingen resultater.
 filter.container.tagged = Tagget
-filter.container.untagged = Umærket
 published_by = Udgivet %[1]s af <a href="%[2]s">%[3]s</a>
 published_by_in = Udgivet %[1]s af <a href="%[2]s">%[3]s</a> i <a href="%[4]s"><strong>%[5]s</strong></a>
 installation = Installation
-about = Om denne pakke
 requirements = Krav
-dependencies = Afhængigheder
-keywords = Keywords
-details = Detaljer
-details.author = Forfatter
-details.project_site = Projektets hjemmeside
-details.repository_site = Depots hjemmeside
-details.documentation_site = Dokumentations hjemmeside
-details.license = Licens
-assets = Aktiver
-versions = Versioner
-versions.view_all = Se alle
-dependency.id = ID
-alpine.repository.branches = Grene
-arch.pacman.helper.gpg = Tilføj tillidscertifikat til pacman:
-arch.pacman.repo.multi = %s har den samme version i forskellige distributioner.
+cran.registry = Konfigurer dette register i din <code>Rprofile.site</code> fil:
+rubygems.required.rubygems = Kræver RubyGem version
+owner.settings.chef.title = Kokkeregister
+owner.settings.chef.keypair = Generer nøglepar
 arch.pacman.repo.multi.item = Konfiguration for %s
-arch.pacman.conf = Tilføj server med relateret distribution og arkitektur til <code>/etc/pacman.conf</code>:
 arch.pacman.sync = Synkroniser pakke med pacman:
 arch.version.properties = Versionsegenskaber
 arch.version.provides = Forsyner
-arch.version.groups = Gruppe
-arch.version.depends = Afhænger
-arch.version.optdepends = Valgfri afhænger
-arch.version.makedepends = Gør afhænger
 arch.version.checkdepends = Check afhænger
-arch.version.conflicts = Konflikter
 arch.version.replaces = Erstatter
-arch.version.backup = Backup
-cargo.registry = Konfigurer dette register i Cargo-konfigurationsfilen (for eksempel <code>~/.cargo/config.toml</code>):
-cargo.install = For at installere pakken ved hjælp af Cargo skal du køre følgende kommando:
-chef.registry = Konfigurer dette register i din <code>~/.chef/config.rb</code> fil:
-composer.registry = Konfigurer dette register i din <code>~/.composer/config.json</code> fil:
-composer.install = For at installere pakken ved hjælp af Composer skal du køre følgende kommando:
-composer.dependencies = Afhængigheder
 conan.install = For at installere pakken ved hjælp af Conan skal du køre følgende kommando:
 conda.registry = Konfigurer dette register som et Conda-depot i din <code>.condarc</code>-fil:
 conda.install = For at installere pakken ved hjælp af Conda skal du køre følgende kommando:
@@ -3515,292 +3500,310 @@ container.details.type = Billedtype
 container.details.platform = Platform
 container.pull = Træk billedet fra kommandolinjen:
 container.digest = Fordøje
+alt.setup = Tilføj et depot til listen over tilsluttede arkiver (vælg den nødvendige arkitektur i stedet for "_arch_"):
+vagrant.install = For at tilføje en Vagrant-boks skal du køre følgende kommando:
+swift.install2 = og kør følgende kommando:
+settings.link = Link denne pakke til et depot
+settings.link.success = Depotlinket blev opdateret.
+owner.settings.cargo.initialize.description = Et særligt indeks Git-depot er nødvendigt for at bruge Cargo-registret. Brug af denne mulighed vil (gen-)oprette depotet og konfigurere det automatisk.
+settings.delete.notice = Du er ved at slette %s (%s). Denne operation er uigenkaldeligt, er du sikker?
+owner.settings.cargo.title = Lastregisterindeks
+owner.settings.cargo.initialize = Initialiser indeks
+owner.settings.cleanuprules.preview.none = Oprydningsreglen matcher ikke nogen pakker.
+owner.settings.cleanuprules.none = Der er endnu ingen oprydningsregler.
+owner.settings.cleanuprules.keep.count.1 = 1 version pr. pakke
+owner.settings.cleanuprules.preview.overview = %d pakker er planlagt til at blive fjernet.
+owner.settings.cleanuprules.keep.pattern.container = Den <code>seneste</code> version bevares altid for containerpakker.
+settings.delete = Slet pakke
+settings.delete.description = Sletning af en pakke er permanent og kan ikke fortrydes.
+owner.settings.cleanuprules.keep.count.n = %d versioner pr. pakke
+arch.version.makedepends = Gør afhænger
+alt.install = Installer pakken
+composer.registry = Konfigurer dette register i din <code>~/.composer/config.json</code> fil:
+composer.dependencies = Afhængigheder
+settings.delete.success = Pakken er blevet slettet.
+settings.delete.error = Kunne ikke slette pakken.
+owner.settings.cargo.rebuild.error = Kunne ikke genopbygge Cargo-indeks: %v
+owner.settings.cargo.rebuild = Genopbyg indeks
+owner.settings.cleanuprules.preview = Forhåndsvisning af oprydningsregel
+owner.settings.cleanuprules.keep.count = Behold den nyeste
+owner.settings.cleanuprules.keep.pattern = Hold versionerne matchende
+owner.settings.chef.keypair.description = Anmodninger sendt til Chef-registret skal være kryptografisk signeret som et middel til godkendelse. Når et nøglepar genereres, gemmes kun den offentlige nøgle på Forgejo. Den private nøgle gives til dig til brug med Knife. Generering af et nyt nøglepar vil overskrive det forrige.
+maven.install = For at bruge pakken skal du inkludere følgende i blokken <code>afhængigheder</code> i filen <code>pom.xml</code>:
+details = Detaljer
+cargo.registry = Konfigurer dette register i Cargo-konfigurationsfilen (for eksempel <code>~/.cargo/config.toml</code>):
+cargo.install = For at installere pakken ved hjælp af Cargo skal du køre følgende kommando:
+composer.install = For at installere pakken ved hjælp af Composer skal du køre følgende kommando:
 container.multi_arch = OS / Arch
+rubygems.required.ruby = Kræver Ruby version
+swift.install = Tilføj pakken i din <code>Package.swift</code>-fil:
+settings.link.select = Vælg depot
+settings.link.button = Opdater depot link
+settings.link.error = Kunne ikke opdatere depotlinket.
+owner.settings.cargo.initialize.success = Cargo-indekset blev oprettet.
+owner.settings.cargo.rebuild.description = Genopbygning kan være nyttig, hvis indekset ikke er synkroniseret med de lagrede Cargo-pakker.
+owner.settings.cargo.rebuild.success = Cargo-indekset blev genopbygget med succes.
+owner.settings.cleanuprules.add = Tilføj oprydningsregel
+owner.settings.cleanuprules.edit = Rediger oprydningsregel
+owner.settings.cleanuprules.title = Oprydningsregler
+maven.registry = Konfigurer denne registreringsdatabasen i din projekt <code>pom.xml</code> fil:
+npm.install2 = eller føj det til filen package.json:
+nuget.dependency.framework = Mål Framework
+npm.registry = Konfigurer denne registreringsdatabase i din projekt-<code>.npmrc</code>-fil:
+nuget.install = For at installere pakken ved hjælp af NuGet skal du køre følgende kommando:
+npm.dependencies = Afhængigheder
+settings.link.description = Hvis du forbinder en pakke med et depot, vises pakken i depotets pakkeliste.
+owner.settings.cargo.initialize.error = Kunne ikke initialisere Cargo index: %v
+owner.settings.cleanuprules.keep.title = Versioner, der matcher disse regler, bevares, selvom de matcher en fjernelsesregel nedenfor.
+generic.download = Download pakken fra kommandolinjen:
+go.install = Installer pakken fra kommandolinjen:
 container.layers = Billedlag
 container.labels.key = Nøgle
 container.labels.value = Værdi
-cran.registry = Konfigurer dette register i din <code>Rprofile.site</code> fil:
 debian.registry.info = Vælg $distribution og $component fra listen nedenfor.
-generic.download = Download pakken fra kommandolinjen:
-go.install = Installer pakken fra kommandolinjen:
-maven.registry = Konfigurer denne registreringsdatabasen i din projekt <code>pom.xml</code> fil:
-maven.install = For at bruge pakken skal du inkludere følgende i blokken <code>afhængigheder</code> i filen <code>pom.xml</code>:
-maven.install2 = Kør via kommandolinje:
 maven.download = For at downloade afhængigheden skal du køre via kommandolinjen:
-nuget.install = For at installere pakken ved hjælp af NuGet skal du køre følgende kommando:
-nuget.dependency.framework = Mål Framework
-npm.registry = Konfigurer denne registreringsdatabase i din projekt-<code>.npmrc</code>-fil:
-npm.install = For at installere pakken ved hjælp af npm skal du køre følgende kommando:
-npm.install2 = eller føj det til filen package.json:
-npm.dependencies = Afhængigheder
-rpm.distros.redhat = på RedHat-baserede distributioner
 rpm.distros.suse = på SUSE-baserede distributioner
-alt.install = Installer pakken
-alt.setup = Tilføj et depot til listen over tilsluttede arkiver (vælg den nødvendige arkitektur i stedet for "_arch_"):
-rubygems.required.ruby = Kræver Ruby version
-rubygems.required.rubygems = Kræver RubyGem version
-swift.install = Tilføj pakken i din <code>Package.swift</code>-fil:
-swift.install2 = og kør følgende kommando:
-vagrant.install = For at tilføje en Vagrant-boks skal du køre følgende kommando:
-settings.link = Link denne pakke til et depot
-settings.link.description = Hvis du forbinder en pakke med et depot, vises pakken i depotets pakkeliste.
-settings.link.select = Vælg Depot
-settings.link.button = Opdater Depot Link
-settings.link.success = Depotlinket blev opdateret.
-settings.link.error = Kunne ikke opdatere depotlinket.
-settings.delete = Slet pakke
-settings.delete.description = Sletning af en pakke er permanent og kan ikke fortrydes.
-settings.delete.notice = Du er ved at slette %s (%s). Denne operation er uigenkaldeligt, er du sikker?
-settings.delete.success = Pakken er blevet slettet.
-settings.delete.error = Kunne ikke slette pakken.
-owner.settings.cargo.title = Lastregisterindeks
-owner.settings.cargo.initialize = Initialiser indeks
-owner.settings.cargo.initialize.description = Et særligt indeks Git-depot er nødvendigt for at bruge Cargo-registret. Brug af denne mulighed vil (gen-)oprette depotet og konfigurere det automatisk.
-owner.settings.cargo.initialize.error = Kunne ikke initialisere Cargo index: %v
-owner.settings.cargo.initialize.success = Cargo-indekset blev oprettet.
-owner.settings.cargo.rebuild = Genopbyg indeks
-owner.settings.cargo.rebuild.description = Genopbygning kan være nyttig, hvis indekset ikke er synkroniseret med de lagrede Cargo-pakker.
-owner.settings.cargo.rebuild.error = Kunne ikke genopbygge Cargo-indeks: %v
-owner.settings.cargo.rebuild.success = Cargo-indekset blev genopbygget med succes.
-owner.settings.cargo.rebuild.no_index = Kan ikke genopbygge, intet indeks er initialiseret.
-owner.settings.cleanuprules.title = Oprydningsregler
-owner.settings.cleanuprules.add = Tilføj oprydningsregel
-owner.settings.cleanuprules.edit = Rediger oprydningsregel
-owner.settings.cleanuprules.none = Der er endnu ingen oprydningsregler.
-owner.settings.cleanuprules.preview = Forhåndsvisning af oprydningsregel
-owner.settings.cleanuprules.preview.overview = %d pakker er planlagt til at blive fjernet.
-owner.settings.cleanuprules.preview.none = Oprydningsreglen matcher ikke nogen pakker.
+rpm.distros.redhat = på RedHat-baserede distributioner
 owner.settings.cleanuprules.pattern_full_match = Anvend mønster på det fulde pakkenavn
-owner.settings.cleanuprules.keep.title = Versioner, der matcher disse regler, bevares, selvom de matcher en fjernelsesregel nedenfor.
-owner.settings.cleanuprules.keep.count = Behold den nyeste
-owner.settings.cleanuprules.keep.count.1 = 1 version pr. pakke
-owner.settings.cleanuprules.keep.count.n = %d versioner pr. pakke
-owner.settings.cleanuprules.keep.pattern = Hold versionerne matchende
-owner.settings.cleanuprules.keep.pattern.container = Den <code>seneste</code> version bevares altid for containerpakker.
+details.author = Forfatter
+details.repository_site = Depots hjemmeside
+details.documentation_site = Dokumentations hjemmeside
+details.license = Licens
+assets = Aktiver
+versions = Versioner
+details.project_site = Projektets hjemmeside
+versions.view_all = Se alle
+dependency.id = ID
+alpine.repository.branches = Grene
+arch.version.optdepends = Valgfri afhænger
 owner.settings.cleanuprules.remove.title = Versioner, der matcher disse regler, fjernes, medmindre en regel ovenfor siger, at de skal beholdes.
 owner.settings.cleanuprules.remove.days = Fjern versioner ældre end
 owner.settings.cleanuprules.remove.pattern = Fjern matchende versioner
 owner.settings.cleanuprules.success.update = Oprydningsreglen er blevet opdateret.
 owner.settings.cleanuprules.success.delete = Oprydningsregel er blevet slettet.
-owner.settings.chef.title = Kokkeregister
-owner.settings.chef.keypair = Generer nøglepar
-owner.settings.chef.keypair.description = Et nøglepar er nødvendigt for at autentificere til Chef-registret. Hvis du har genereret et nøglepar før, vil generering af et nyt nøglepar kassere det gamle nøglepar.
+arch.version.backup = Backup
+chef.registry = Konfigurer dette register i din <code>~/.chef/config.rb</code> fil:
+npm.install = For at installere pakken ved hjælp af npm skal du køre følgende kommando:
+owner.settings.cargo.rebuild.no_index = Kan ikke genopbygge, intet indeks er initialiseret.
+maven.install2 = Kør via kommandolinje:
+keywords = Keywords
+arch.pacman.helper.gpg = Tilføj tillidscertifikat til pacman:
+arch.pacman.repo.multi = %s har den samme version i forskellige distributioner.
+arch.pacman.conf = Tilføj server med relateret distribution og arkitektur til <code>/etc/pacman.conf</code>:
+arch.version.groups = Gruppe
+arch.version.depends = Afhænger
+arch.version.conflicts = Konflikter
 
 [actions]
 runners.description = Beskrivelse
 runners.labels = Etiketter
 runners.name = Navn
 runners.task_list.repository = Depot
-
 runners.status.active = Aktiv
 runners.status.offline = Offline
 runners.version = Version
-
-actions = Handlinger
+runners.owner_type = Type
+runners = Runners
 unit.desc = Administrer integrerede CI/CD-pipelines med Forgejo Actions.
 status.unknown = Ukendt
-status.waiting = Venter
-status.running = Kører
-status.success = Succes
-status.failure = Fiasko
-status.cancelled = Annulleret
-status.skipped = Oversprunget
-status.blocked = Blokeret
-runners = Runners
-runners.runner_manage_panel = Administrer runners
-runners.new = Opret ny runner
-runners.new_notice = Hvordan man starter en runner
-runners.status = Status
-runners.id = ID
-runners.owner_type = Type
-runners.last_online = Sidste online tid
 runners.runner_title = Runner
 runners.task_list = Seneste opgaver på denne løber
-runners.task_list.no_tasks = Der er ingen opgave endnu.
 runners.task_list.run = Kør
-runners.task_list.status = Status
 runners.task_list.commit = Commit
-runners.task_list.done_at = Udført kl
 runners.edit_runner = Rediger Runner
-runners.update_runner = Opdater ændringer
-runners.update_runner_success = Runner blev opdateret
-runners.update_runner_failed = Løberen kunne ikke opdateres
-runners.delete_runner = Slet denne runner
-runners.delete_runner_success = Runner blev slettet
-runners.delete_runner_failed = Runner kunne ikke slettes
-runners.delete_runner_header = Bekræft for at slette denne runner
-runners.delete_runner_notice = Hvis en opgave kører på denne runner, vil den blive afsluttet og markeret som mislykket. Det kan bryde bygningens arbejdsgang.
-runners.none = Ingen runners tilgængelige
-runners.status.unspecified = Ukendt
-runners.status.idle = Tomgang
-runners.reset_registration_token = Nulstil registreringstoken
-runners.reset_registration_token_success = Runner registreringstoken blev nulstillet
-runs.all_workflows = Alle arbejdsgange
 runs.commit = Commit
 runs.scheduled = Planlagt
 runs.pushed_by = pushed af
+status.running = Kører
+status.waiting = Venter
+runners.new_notice = Hvordan man starter en runner
+status.success = Succes
+variables.not_found = Variablen kunne ikke findes.
 runs.workflow = Arbejdsgang
-runs.invalid_workflow_helper = Workflow-konfigurationsfilen er ugyldig. Tjek venligst din konfigurationsfil: %s
-runs.no_matching_online_runner_helper = Ingen matchende online-runner med etiket: %s
+runners.last_online = Sidste online tid
+runners.task_list.done_at = Udført kl
+runners.update_runner = Opdater ændringer
+runners.update_runner_success = Runner blev opdateret
+runners.update_runner_failed = Løberen kunne ikke opdateres
+runners.delete_runner_failed = Runner kunne ikke slettes
+runners.delete_runner_header = Bekræft for at slette denne runner
+runners.status.idle = Tomgang
 runs.no_job_without_needs = Arbejdsgangen skal indeholde mindst ét job uden afhængigheder.
 runs.no_job = Arbejdsgangen skal indeholde mindst ét job
-runs.actor = Aktør
-runs.status = Status
-runs.actors_no_select = Alle aktører
-runs.status_no_select = Alle status
 runs.no_results = Ingen resultater matchede.
 runs.no_workflows = Der er endnu ingen arbejdsgange.
-runs.no_workflows.help_write_access = Ved du ikke, hvordan du starter med Forgejo Actions? Tjek <a target="_blank" rel="noopener noreferrer" href="%s">hurtigstarten i brugerdokumentationen</a> for at skrive dit første workflow, og <a target="_blank" rel="noopener noreferrer" href="%s">opsæt en Forgejo-løber</a> til at udføre dine opgaver.
-runs.no_workflows.help_no_write_access = For at lære om Forgejo Actions, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
-runs.no_runs = Workflowet har ingen kørsler endnu.
-runs.empty_commit_message = (tom commit besked)
-runs.expire_log_message = Logfiler er blevet renset, fordi de var for gamle.
-workflow.disable = Deaktiver arbejdsgang
-workflow.disable_success = Arbejdsgangen "%s" blev deaktiveret.
 workflow.enable = Aktiver arbejdsgang
 workflow.enable_success = Arbejdsgangen "%s" blev aktiveret.
+variables.none = Der er ingen variabler endnu.
+variables.edit = Rediger variabel
+variables.deletion.success = Variablen er blevet fjernet.
+variables.creation.failed = Kunne ikke tilføje variabel.
+runners.delete_runner_notice = Hvis en opgave kører på denne runner, vil den blive afsluttet og markeret som mislykket. Det kan bryde bygningens arbejdsgang.
+runs.no_workflows.help_write_access = Ved du ikke, hvordan du starter med Forgejo Actions? Tjek <a target="_blank" rel="noopener noreferrer" href="%s">hurtigstarten i brugerdokumentationen</a> for at skrive dit første workflow, og <a target="_blank" rel="noopener noreferrer" href="%s">opsæt en Forgejo-løber</a> til at udføre dine opgaver.
+runners.delete_runner_success = Runner blev slettet
+variables.update.success = Variablen er blevet redigeret.
+status.cancelled = Annulleret
+status.skipped = Oversprunget
+status.blocked = Blokeret
+workflow.disable_success = Arbejdsgangen "%s" blev deaktiveret.
+workflow.disable = Deaktiver arbejdsgang
+workflow.dispatch.use_from = Brug arbejdsgangen fra
 workflow.disabled = Arbejdsgangen er deaktiveret.
 workflow.dispatch.trigger_found = Denne arbejdsgang har en <c>workflow_dispatch</c>-hændelsestrigger.
-workflow.dispatch.use_from = Brug arbejdsgangen fra
-workflow.dispatch.run = Kør arbejdsgang
+workflow.dispatch.warn_input_limit = Viser kun de første %d input.
 workflow.dispatch.success = Kørsel af arbejdsgang blev anmodet om.
 workflow.dispatch.input_required = Kræv værdi for input "%s".
 workflow.dispatch.invalid_input_type = Ugyldig inputtype "%s".
-workflow.dispatch.warn_input_limit = Viser kun de første %d input.
-need_approval_desc = Har brug for godkendelse for at køre arbejdsgange for fork pull-anmodning.
-variables = Variabler
-variables.management = Administrer variabler
 variables.creation = Tilføj variabel
-variables.none = Der er ingen variabler endnu.
-variables.deletion = Fjern variabel
-variables.deletion.description = Fjernelse af en variabel er permanent og kan ikke fortrydes. Vil du fortsætte?
-variables.description = Variabler vil blive videregivet til visse handlinger og kan ikke læses på anden vis.
-variables.id_not_exist = Variabel med ID %d findes ikke.
-variables.edit = Rediger variabel
-variables.not_found = Variablen kunne ikke findes.
-variables.deletion.failed = Variablen kunne ikke fjernes.
-variables.deletion.success = Variablen er blevet fjernet.
-variables.creation.failed = Kunne ikke tilføje variabel.
+need_approval_desc = Har brug for godkendelse for at køre arbejdsgange for fork pull-anmodning.
+runners.delete_runner = Slet denne runner
+runners.status.unspecified = Ukendt
+runners.reset_registration_token_success = Runner registreringstoken blev nulstillet
+runs.all_workflows = Alle arbejdsgange
+runners.reset_registration_token = Nulstil registreringstoken
+runs.empty_commit_message = (tom commit besked)
+runs.expire_log_message = Logfiler er blevet renset, fordi de var for gamle.
+variables = Variabler
+runs.actor = Aktør
+actions = Handlinger
+runners.status = Status
+runners.task_list.status = Status
+runners.id = ID
+runners.task_list.no_tasks = Der er ingen opgave endnu.
+runs.status = Status
+runs.actors_no_select = Alle aktører
+runs.status_no_select = Alle status
+runners.none = Ingen runners tilgængelige
+variables.management = Administrer variabler
 variables.creation.success = Variablen "%s" er blevet tilføjet.
 variables.update.failed = Variablen kunne ikke redigeres.
-variables.update.success = Variablen er blevet redigeret.
+runs.no_workflows.help_no_write_access = For at lære om Forgejo Actions, se <a target="_blank" rel="noopener noreferrer" href="%s">dokumentationen</a>.
+variables.deletion = Fjern variabel
+variables.id_not_exist = Variabel med ID %d findes ikke.
+variables.deletion.description = Fjernelse af en variabel er permanent og kan ikke fortrydes. Vil du fortsætte?
+variables.description = Variabler vil blive videregivet til visse handlinger og kan ikke læses på anden vis.
+variables.deletion.failed = Variablen kunne ikke fjernes.
+runs.no_matching_online_runner_helper = Ingen matchende online-runner med etiket: %s
+runners.runner_manage_panel = Administrer runners
+runners.new = Opret ny runner
+workflow.dispatch.run = Kør arbejdsgang
+runs.invalid_workflow_helper = Workflow-konfigurationsfilen er ugyldig. Tjek venligst din konfigurationsfil: %s
+status.failure = Fiasko
+runs.no_runs = Workflowet har ingen kørsler endnu.
 
 [tool]
 1d = 1 dag
 1w = 1 uge
 1mon = 1 måned
 1y = 1 år
-future = fremtid
-1s = 1 sekund
-1m = 1 minut
-1h = 1 time
-seconds = %d sekunder
-minutes = %d minutter
-hours = %d timer
-days = %d dage
-weeks = %d uger
 months = %d måneder
 years = %d år
 raw_seconds = sekunder
 raw_minutes = minutter
-
+future = fremtid
+1h = 1 time
+seconds = %d sekunder
+minutes = %d minutter
+hours = %d timer
+weeks = %d uger
+1s = 1 sekund
+1m = 1 minut
+days = %d dage
 now = nu
 
 [repo.permissions]
-code.read = <b>Læs:</b> Få adgang til og klon koden for depotet.
-code.write = <b>Skriv:</b> Skub til depotet, opret filialer og tags.
-issues.read = <b>Læs:</b> Læs og opret problemer og kommentarer.
-issues.write = <b>Skriv:</b> Luk problemer og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder.
-pulls.read = <b>Læs:</b> Læsning og oprettelse af pull-anmodninger.
-pulls.write = <b>Skriv:</b> Luk pull-anmodninger og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder.
-releases.read = <b>Læs:</b> Se og download udgivelser.
+actions.read = <b>Læs:</b> Se integrerede CI/CD-pipelines og deres logfiler.
 releases.write = <b>Skriv:</b> Udgiv, rediger og slet udgivelser og deres aktiver.
 wiki.read = <b>Læs:</b> Læs den integrerede wiki og dens historie.
 wiki.write = <b>Skriv:</b> Opret, opdater og slet sider i den integrerede wiki.
+actions.write = <b>Skriv:</b> Udløs, genstart, annuller eller godkend afventende CI/CD-pipelines manuelt.
+ext_issues = Få adgang til linket til en ekstern problemsporing. Tilladelserne administreres eksternt.
+issues.write = <b>Skriv:</b> Luk problemer og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder.
+releases.read = <b>Læs:</b> Se og download udgivelser.
 projects.read = <b>Læs:</b> Få adgang til depot-projekttavler.
 projects.write = <b>Skriv:</b> Opret projekter og kolonner, og rediger dem.
 packages.read = <b>Læs:</b> Se og download pakker, der er tildelt depotet.
 packages.write = <b>Skriv:</b> Udgiv og slet pakker, der er tildelt depotet.
-actions.read = <b>Læs:</b> Se integrerede CI/CD-pipelines og deres logfiler.
-actions.write = <b>Skriv:</b> Udløs, genstart, annuller eller godkend afventende CI/CD-pipelines manuelt.
-ext_issues = Få adgang til linket til en ekstern problemsporing. Tilladelserne administreres eksternt.
 ext_wiki = Få adgang til linket til en ekstern wiki. Tilladelserne administreres eksternt.
+pulls.read = <b>Læs:</b> Læsning og oprettelse af pull-anmodninger.
+pulls.write = <b>Skriv:</b> Luk pull-anmodninger og administrer metadata som etiketter, milepæle, modtagere, forfaldsdatoer og afhængigheder.
+code.read = <b>Læs:</b> Få adgang til og klon koden for depotet.
+code.write = <b>Skriv:</b> Skub til depotet, opret filialer og tags.
+issues.read = <b>Læs:</b> Læs og opret problemer og kommentarer.
 
 [graphs]
-component_loading = Indlæser %s…
-component_loading_failed = Kunne ikke indlæse %s
-component_loading_info = Dette kan tage lidt tid…
 component_failed_to_load = Der skete en uventet fejl.
 code_frequency.what = kode frekvens
 contributors.what = bidrag
+component_loading = Indlæser %s…
+component_loading_info = Dette kan tage lidt tid…
 recent_commits.what = nylige commits
+component_loading_failed = Kunne ikke indlæse %s
+
+[secrets]
+creation.name_placeholder = uafhængig af store og små bogstaver, alfanumeriske tegn eller understregninger, kan ikke starte med GITEA_ eller GITHUB_
+creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt.
+creation = Tilføj hemmelighed
+description = Hemmeligheder vil blive videregivet til visse handlinger og kan ikke læses på anden vis.
+secrets = Hemmeligheder
+creation.success = Hemmeligheden "%s" er blevet tilføjet.
+deletion = Fjern hemmelighed
+deletion.success = Hemmeligheden er blevet fjernet.
+deletion.failed = Hemmeligheden kunne ikke fjernes.
+management = Håndter hemmeligheder
+deletion.description = Fjernelse af en hemmelighed er permanent og kan ikke fortrydes. Vil du fortsætte?
+none = Der er ingen hemmeligheder endnu.
+creation.failed = Kunne ikke tilføje hemmelighed.
 
 [dropzone]
 invalid_input_type = Filer af denne type må ikke uploades.
 remove_file = Fjern fil
-
 default_message = Slip filer eller klik her for at uploade.
 file_too_big = Filstørrelsen ({{filesize}} MB) overstiger den maksimale størrelse på ({{maxFilesize}} MB).
 
 [gpg]
 default_key = Underskrevet med standardnøglen
-
-error.extract_sign = Kunne ikke udtrække signatur
 error.generate_hash = Kunne ikke generere hash af commit
 error.no_committer_account = Ingen konto knyttet til committers e-mailadresse
+error.probable_bad_default_signature = ADVARSEL! Selvom standardnøglen har dette ID, bekræfter den ikke denne commit! Denne commit er MISTÆNLIG.
 error.no_gpg_keys_found = Ingen kendt nøgle fundet for denne signatur i databasen
 error.not_signed_commit = Ikke en underskrevet commit
 error.failed_retrieval_gpg_keys = Kunne ikke hente nogen nøgle knyttet til committerens konto
 error.probable_bad_signature = ADVARSEL! Selvom der er en nøgle med dette ID i databasen, bekræfter den ikke denne commit! Denne commit er MISTÆNLIG.
-error.probable_bad_default_signature = ADVARSEL! Selvom standardnøglen har dette ID, bekræfter den ikke denne commit! Denne commit er MISTÆNLIG.
-
-[secrets]
-creation.name_placeholder = uafhængig af store og små bogstaver, alfanumeriske tegn eller understregninger, kan ikke starte med GITEA_ eller GITHUB_
-creation.value_placeholder = Indtast ethvert indhold. Mellemrum i starten og slutningen vil blive udeladt.
-secrets = Hemmeligheder
-description = Hemmeligheder vil blive videregivet til visse handlinger og kan ikke læses på anden vis.
-none = Der er ingen hemmeligheder endnu.
-creation = Tilføj hemmelighed
-creation.success = Hemmeligheden "%s" er blevet tilføjet.
-creation.failed = Kunne ikke tilføje hemmelighed.
-deletion = Fjern hemmelighed
-deletion.description = Fjernelse af en hemmelighed er permanent og kan ikke fortrydes. Vil du fortsætte?
-deletion.success = Hemmeligheden er blevet fjernet.
-deletion.failed = Hemmeligheden kunne ikke fjernes.
-management = Håndter hemmeligheder
+error.extract_sign = Kunne ikke udtrække signatur
 
 [munits.data]
-b = B
 kib = KiB
-mib = MiB
-gib = GiB
-tib = TiB
+b = B
 pib = PiB
+mib = MiB
+tib = TiB
 eib = EiB
+gib = GiB
 
 [units]
-unit = Enhed
 error.no_unit_allowed_repo = Du har ikke tilladelse til at få adgang til nogen sektion af dette depot.
+unit = Enhed
 error.unit_not_allowed = Du har ikke tilladelse til at få adgang til denne depotsektion.
 
 [projects]
+type-3.display_name = Organisationsprojekt
+type-2.display_name = Depotprojekt
 deleted.display_name = Slettet projekt
 type-1.display_name = Individuelt projekt
-type-2.display_name = Depotprojekt
-type-3.display_name = Organisationsprojekt
-
-[git.filemode]
-changed_filemode = %[1]s → %[2]s
-directory = Directory
-normal_file = Normal fil
-executable_file = Eksekverbar fil
-symbolic_link = Symbolsk link
-submodule = Submodule
 
 [markup]
 filepreview.line = Linje %[1]d i %[2]s
 filepreview.lines = Linjer %[1]d til %[2]d i %[3]s
 filepreview.truncated = Forhåndsvisningen er blevet afkortet
 
+[git.filemode]
+symbolic_link = Symbolsk link
+submodule = Submodule
+changed_filemode = %[1]s → %[2]s
+directory = Directory
+normal_file = Normal fil
+executable_file = Eksekverbar fil
+
 [translation_meta]
 test = (OK) DA was translated by Tacaly
\ No newline at end of file
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 0bc8fb7739..937d8d90e2 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -251,12 +251,12 @@ db_schema_helper=Leer lassen, um den Datenbank-Standardwert („public“) zu ve
 ssl_mode=SSL
 path=Pfad
 sqlite_helper=Dateipfad zur SQLite3-Datenbank.<br>Gib einen absoluten Pfad an, wenn Forgejo als Service gestartet wird.
-reinstall_error=Du versuchst, in eine bereits existierende Forgejo Datenbank zu installieren
+reinstall_error=Du versuchst, in eine bereits existierende Forgejo-Datenbank zu installieren
 reinstall_confirm_message=Eine Neuinstallation mit einer bestehenden Forgejo-Datenbank kann mehrere Probleme verursachen. In den meisten Fällen solltest du deine vorhandene „app.ini“ verwenden, um Forgejo auszuführen. Wenn du weißt, was du tust, bestätige die folgenden Angaben:
 reinstall_confirm_check_1=Die von der SECRET_KEY in app.ini verschlüsselten Daten können verloren gehen: Benutzer können sich unter Umständen nicht mit 2FA/OTP einloggen und Spiegel könnten nicht mehr richtig funktionieren. Mit der Ankreuzung dieses Kästchens bestätigst du, dass die aktuelle app.ini-Datei den korrekten SECRET_KEY enthält.
 reinstall_confirm_check_2=Die Repositorys und Einstellungen müssen eventuell neu synchronisiert werden. Durch das Ankreuzen dieses Kästchens bestätigst du, dass du die Hooks für die Repositorys und die authorized_keys-Datei manuell neu synchronisierst. Du bestätigst, dass du sicherstellst, dass die Repository- und Spiegeleinstellungen korrekt sind.
 reinstall_confirm_check_3=Du bestätigst, dass du absolut sicher bist, dass diese Forgejo mit der richtigen app.ini läuft, und du sicher bist, dass du neu installieren musst. Du bestätigst, dass du die oben genannten Risiken anerkennst.
-err_empty_db_path=Der SQLite3 Datenbankpfad darf nicht leer sein.
+err_empty_db_path=Der SQLite3-Datenbankpfad darf nicht leer sein.
 no_admin_and_disable_registration=Du kannst Selbst-Registrierungen nicht deaktivieren, ohne ein Administratorkonto zu erstellen.
 err_empty_admin_password=Das Administrator-Passwort darf nicht leer sein.
 err_empty_admin_email=Die Administrator-E-Mail darf nicht leer sein.
@@ -463,7 +463,7 @@ openid_register_title=Neues Konto einrichten
 openid_register_desc=Die gewählte OpenID-URI ist unbekannt. Ordne sie hier einem neuen Account zu.
 openid_signin_desc=Gib deine OpenID-URI ein, zum Beispiel alice.openid.example.org oder https://openid.example.org/alice.
 disable_forgot_password_mail=Die Kontowiederherstellung ist deaktiviert, da keine E-Mail eingerichtet ist. Bitte kontaktiere den zuständigen Administrator.
-disable_forgot_password_mail_admin=Die Kontowiederherstellung ist nur verfügbar, wenn eine E-Mail eingerichtet wurde. Bitte richte eine E-Mail Adresse ein, um die Kontowiederherstellung freizuschalten.
+disable_forgot_password_mail_admin=Die Kontowiederherstellung ist nur verfügbar, wenn eine E-Mail eingerichtet wurde. Bitte richte eine E-Mail-Adresse ein, um die Kontowiederherstellung freizuschalten.
 email_domain_blacklisted=Du kannst dich nicht mit deiner E-Mail-Adresse registrieren.
 authorize_application=Anwendung autorisieren
 authorize_redirect_notice=Du wirst zu %s weitergeleitet, wenn du diese Anwendung autorisierst.
@@ -530,8 +530,8 @@ issue.action.merge=<b>@%[1]s</b> hat #%[2]d in %[3]s zusammengeführt.
 issue.action.approve=<b>@%[1]s</b> hat diesen Pull-Request genehmigt.
 issue.action.reject=<b>@%[1]s</b> hat Änderungen auf diesem Pull-Request angefordert.
 issue.action.review=<b>@%[1]s</b> hat diesen Pull-Request kommentiert.
-issue.action.review_dismissed=<b>@%[1]s</b> hat das letzte Review von %[2]s für diesen Pull-Request verworfen.
-issue.action.ready_for_review=<b>@%[1]s</b> hat diesen Pull-Request zum Review freigegeben.
+issue.action.review_dismissed=<b>@%[1]s</b> hat die letzte Sichtung von %[2]s für diesen Pull-Request verworfen.
+issue.action.ready_for_review=<b>@%[1]s</b> hat diesen Pull-Request für die Sichtung freigegeben.
 issue.action.new=<b>@%[1]s</b> hat #%[2]d geöffnet.
 issue.in_tree_path=In %s:
 
@@ -540,8 +540,8 @@ release.new.text=<b>@%[1]s</b> hat %[2]s in %[3]s released
 release.title=Titel: %s
 release.note=Anmerkung:
 release.downloads=Downloads:
-release.download.zip=Quellcode (ZIP Datei)
-release.download.targz=Quellcode (TAR.GZ Datei)
+release.download.zip=Quellcode (ZIP)
+release.download.targz=Quellcode (TAR.GZ)
 
 repo.transfer.subject_to=%s möchte „%s“ an %s übertragen
 repo.transfer.subject_to_you=%s möchte dir „%s“ übertragen
@@ -633,7 +633,7 @@ repository_files_already_exist=Dateien für dieses Repository sind bereits vorha
 repository_files_already_exist.adopt=Dateien für dieses Repository existieren bereits und können nur übernommen werden.
 repository_files_already_exist.delete=Dateien für dieses Repository sind bereits vorhanden. Du must sie löschen.
 repository_files_already_exist.adopt_or_delete=Dateien für dieses Repository existieren bereits. Du musst sie entweder übernehmen oder löschen.
-visit_rate_limit=Das Rate-Limit bei der Gegenseite wurde erreicht.
+visit_rate_limit=Die Ratenbegrenzung bei der Gegenseite wurde erreicht.
 2fa_auth_required=Die Gegenseite benötigt Zweifaktorauthentifikation.
 org_name_been_taken=Der Organisationsname ist bereits vergeben.
 team_name_been_taken=Der Teamname ist bereits vergeben.
@@ -745,14 +745,14 @@ social=Soziale Konten
 applications=Anwendungen
 orgs=Organisationen
 repos=Repositorys
-delete=Konto löschen
+delete=Account löschen
 twofa=Zwei-Faktor-Authentifizierung (TOTP)
 account_link=Verknüpfte Benutzerkonten
 organization=Organisationen
 uid=UID
 webauthn=Hardware-Sicherheitsschlüssel
 
-public_profile=Öffentliches Profil
+public_profile=Öffentliches profil
 biography_placeholder=Erzähle anderen ein wenig über dich selbst! (Markdown wird unterstützt)
 location_placeholder=Teile deinen ungefähren Standort mit anderen
 profile_desc=Über dich
@@ -787,7 +787,7 @@ comment_type_group_time_tracking=Zeiterfassung
 comment_type_group_deadline=Frist
 comment_type_group_dependency=Abhängigkeit
 comment_type_group_lock=Sperrstatus
-comment_type_group_review_request=Angeforderte Reviews
+comment_type_group_review_request=Angeforderte Sichtungen
 comment_type_group_pull_request_push=Hinzugefügte Commits
 comment_type_group_project=Projekt
 comment_type_group_issue_ref=Issue-Referenz
@@ -830,7 +830,7 @@ activations_pending=Aktivierung ausstehend
 can_not_add_email_activations_pending=Es gibt eine ausstehende Aktivierung, versuche es in ein paar Minuten erneut, wenn du eine neue E-Mail hinzufügen möchtest.
 delete_email=Löschen
 email_deletion=E-Mail-Adresse löschen
-email_deletion_desc=Die E-Mail-Adresse und die damit verbundenen Informationen werden von deinem Konto entfernt. Git-Commits von dieser E-Mail-Addresse bleiben unverändert. Fortfahren?
+email_deletion_desc=Diese E-Mail-Adresse und die damit verbundenen Informationen werden von deinem Konto entfernt. Git-Commits von dieser E-Mail-Addresse bleiben unverändert. Fortfahren?
 email_deletion_success=Die E-Mail-Adresse wurde entfernt.
 theme_update_success=Deine Theme-Auswahl wurde gespeichert.
 theme_update_error=Das ausgewählte Theme existiert nicht.
@@ -873,7 +873,7 @@ gpg_key_matched_identities_long=Die eingebetteten Identitäten in diesem Schlüs
 gpg_key_verified=Verifizierter Schlüssel
 gpg_key_verified_long=Der Schlüssel wurde mit einem Token verifiziert. Er kann verwendet werden, um Commits zu verifizieren, die mit irgendeiner für diesen Nutzer aktivierten E-Mail-Adresse und irgendeiner Identität dieses Schlüssels übereinstimmen.
 gpg_key_verify=Verifizieren
-gpg_invalid_token_signature=Der GPG-Key, die Signatur, und das Token stimmen nicht überein, oder das Token ist veraltet.
+gpg_invalid_token_signature=Der GPG-Key, die Signatur und das Token stimmen nicht überein, oder das Token ist veraltet.
 gpg_token_required=Du musst eine Signatur für das folgende Token angeben
 gpg_token=Token
 gpg_token_help=Du kannst eine Signatur wie folgt generieren:
@@ -885,9 +885,9 @@ ssh_key_verified=Verifizierter Schlüssel
 ssh_key_verified_long=Der Schlüssel wurde mit einem Token verifiziert. Er kann verwendet werden, um Commits zu verifizieren, die mit irgendeiner für diesen Nutzer aktivierten E-Mail-Adresse und irgendeiner Identität dieses Schlüssels übereinstimmen.
 ssh_key_verify=Verifizieren
 ssh_invalid_token_signature=Der gegebene SSH-Schlüssel, Signatur oder Token stimmen nicht überein oder der Token ist veraltet.
-ssh_token_required=Du musst eine Signatur für den Token unten angeben
+ssh_token_required=Sie müssen eine Signatur für das Token unten angeben
 ssh_token=Token
-ssh_token_help=Du kannst eine Signatur wie folgt generieren:
+ssh_token_help=Sie können eine Signatur wie folgt generieren:
 ssh_token_signature=SSH-Textsignatur (armored signature)
 key_signature_ssh_placeholder=Beginnt mit „-----BEGIN SSH SIGNATURE-----“
 verify_ssh_key_success=SSH-Key „%s“ wurde verifiziert.
@@ -902,10 +902,10 @@ add_principal_success=Die SSH-Zertifikatsidentität „%s“ wurde hinzugefügt.
 delete_key=Entfernen
 ssh_key_deletion=SSH-Schlüssel entfernen
 gpg_key_deletion=GPG-Schlüssel entfernen
-ssh_principal_deletion=SSH-Zertifik-Identität entfernen
+ssh_principal_deletion=SSH-Zertifikats-Principal entfernen
 ssh_key_deletion_desc=Wenn du einen SSH-Key entfernst, hast du mit diesem Key keinen Zugriff mehr. Fortfahren?
 gpg_key_deletion_desc=Wenn du einen GPG-Schlüssel entfernst, können damit unterschriebene Commits nicht mehr verifiziert werden. Fortfahren?
-ssh_principal_deletion_desc=Das Entfernen einer SSH-Zertifikat-Identität entzieht den Zugriff auf dein Konto. Fortfahren?
+ssh_principal_deletion_desc=Das Entfernen eines SSH-Zertifikats-Principals entzieht den Zugriff auf dein Konto. Fortfahren?
 ssh_key_deletion_success=Der SSH-Schlüssel wurde entfernt.
 gpg_key_deletion_success=Der GPG-Schlüssel wurde entfernt.
 ssh_principal_deletion_success=Die Identität wurde entfernt.
@@ -931,7 +931,7 @@ unbind_success=Das soziale Konto wurde erfolgreich entfernt.
 
 manage_access_token=Zugriffstokens
 generate_new_token=Neuen Token erzeugen
-tokens_desc=Diese Tokens gewähren vollen Zugriff auf dein Konto via die Forgejo-API.
+tokens_desc=Diese Tokens gewähren vollen Zugriff auf dein Konto mit der Forgejo-API.
 token_name=Token-Name
 generate_token=Token generieren
 generate_token_success=Ein neuer Token wurde generiert. Kopiere diesen jetzt, da er nicht erneut angezeigt wird.
@@ -970,8 +970,8 @@ save_application=Speichern
 oauth2_client_id=Client-ID
 oauth2_client_secret=Client-Geheimnis
 oauth2_regenerate_secret=Geheimnis neu generieren
-oauth2_regenerate_secret_hint=Secret verloren?
-oauth2_client_secret_hint=Das Secret wird nach dem Verlassen oder Aktualisieren dieser Seite nicht mehr angezeigt. Bitte stelle sicher, dass du es gespeichert hast.
+oauth2_regenerate_secret_hint=Geheimnis verloren?
+oauth2_client_secret_hint=Das Geheimnis wird nach dem Verlassen oder Aktualisieren dieser Seite nicht mehr angezeigt. Bitte stelle sicher, dass du es gespeichert hast.
 oauth2_application_edit=Bearbeiten
 oauth2_application_create_description=OAuth2-Anwendungen geben deiner Drittanwendung Zugriff auf Benutzeraccounts dieser Forgejo-Instanz.
 oauth2_application_remove_description=Das Entfernen einer OAuth2-Anwendung hat zur Folge, dass diese nicht mehr auf autorisierte Benutzeraccounts auf dieser Instanz zugreifen kann. Möchtest Du fortfahren?
@@ -996,11 +996,11 @@ twofa_disable_desc=Wenn du die Zwei-Faktor-Authentifizierung deaktivierst, wird
 regenerate_scratch_token_desc=Wenn du deinen Wiederherstellungsschlüssel verlegst oder es bereits benutzt hast, kannst du es hier zurücksetzen.
 twofa_disabled=Zwei-Faktor-Authentifizierung wurde deaktiviert.
 scan_this_image=Scanne diese Grafik mit deiner Authentifizierungs-App:
-or_enter_secret=Oder gib das Secret ein: %s
+or_enter_secret=Oder gib das Geheimnis ein: %s
 then_enter_passcode=Und gib dann die angezeigte PIN der Anwendung ein:
 passcode_invalid=Die PIN ist falsch. Probiere es erneut.
 twofa_enrolled=Die Zwei-Faktor-Authentifizierung wurde für dein Konto aktiviert. Bewahre deinen einmalig verwendbaren Wiederherstellungsschlüssel (%s) an einem sicheren Ort auf, da er nicht wieder angezeigt werden wird.
-twofa_failed_get_secret=Fehler beim Abrufen des Secrets.
+twofa_failed_get_secret=Fehler beim Abrufen des Geheimnisses.
 
 webauthn_desc=Sicherheitsschlüssel sind Geräte, die kryptografische Schlüssel beeinhalten. Diese können für die Zwei-Faktor-Authentifizierung verwendet werden. Der Sicherheitsschlüssel muss den Standard „<a rel="noreferrer" target="_blank" href="%s">WebAuthn</a>“ unterstützen.
 webauthn_register_key=Sicherheitsschlüssel hinzufügen
@@ -1092,6 +1092,7 @@ regenerate_token_success = Der Token wurde regeneriert. Anwendungen, die ihn ben
 access_token_regeneration = Zugangstoken regenerieren
 access_token_regeneration_desc = Einen Token zu regenerieren, wird den Zugriff auf deinen Account von Anwendungen, die ihn nutzen, zurückziehen. Dies kann nicht rückgängig gemacht werden. Fortsetzen?
 regenerate_token = Regenerieren
+ssh_token_help_ssh_agent = , oder, falls Sie einen SSH-Agenten benutzen (mit der Variable SSH_AUTH_SOCK gesetzt):
 
 [repo]
 owner=Besitzer
@@ -1154,7 +1155,7 @@ mirror_interval_invalid=Das Spiegel-Intervall ist ungültig.
 mirror_sync_on_commit=Synchronisieren, wenn Commits gepusht wurden
 mirror_address=Klonen via URL
 mirror_address_desc=Gib alle erforderlichen Anmeldedaten im Abschnitt „Authentifizierung“ ein.
-mirror_address_url_invalid=Die angegebene URL ist ungültig. Achte darauf, alle Komponenten der URL korrekt zu maskieren.
+mirror_address_url_invalid=Die angegebene URL ist ungültig. Achte darauf, dass alle Komponenten der URL korrekt escaped wurden.
 mirror_address_protocol_invalid=Die angegebene URL ist ungültig. Nur Orte mit „http(s)://“ oder „git://“ können fürs Spiegeln benutzt werden.
 mirror_lfs=Großdatei-Speicher (LFS)
 mirror_lfs_desc=Spiegeln von LFS-Dateien aktivieren.
@@ -1185,9 +1186,9 @@ blame.ignore_revs=Revisionen in <a href="%s">.git-blame-ignore-revs</a> werden i
 blame.ignore_revs.failed=Fehler beim Ignorieren der Revisionen in <a href="%s">.git-blame-ignore-revs</a>.
 author_search_tooltip=Zeigt maximal 30 Benutzer
 
-tree_path_not_found_commit=Pfad %[1]s existiert nicht in Commit%[2]s
-tree_path_not_found_branch=Pfad %[1]s existiert nicht in Branch %[2]s
-tree_path_not_found_tag=Pfad %[1]s existiert nicht in Tag %[2]s
+tree_path_not_found_commit=Pfad %[1]s existiert nicht im Commit %[2]s
+tree_path_not_found_branch=Pfad %[1]s existiert nicht im Branch %[2]s
+tree_path_not_found_tag=Pfad %[1]s existiert nicht im Tag %[2]s
 
 transfer.accept=Übertragung akzeptieren
 transfer.accept_desc=Übertragung nach „%s“
@@ -1213,7 +1214,7 @@ template.issue_labels=Issue-Labels
 template.one_item=Es muss mindestens ein Vorlagenelement ausgewählt werden
 template.invalid=Es muss ein Vorlagen-Repository ausgewählt werden
 
-archive.title=Dieses Repository ist archiviert. Du kannst Dateien ansehen und es klonen, kannst aber du kannst seinen Status nicht verändern, zum Beispiel nichts pushen, und keine Issues eröffnen, oder Pull-Requests oder Kommentare erstellen.
+archive.title=Dieses Repository ist archiviert. Du kannst Dateien ansehen und es klonen, kannst aber seinen Status nicht verändern, zum Beispiel nichts pushen, keine Issues eröffnen und keine Pull-Requests oder Kommentare erstellen.
 archive.title_date=Dieses Repository wurde am %s archiviert. Du kannst Dateien ansehen und es klonen, kannst aber seinen Status nicht verändern, zum Beispiel nichts pushen, und keine Issues eröffnen, oder Pull-Requests oder Kommentare erstellen.
 archive.issue.nocomment=Dieses Repository ist archiviert. Du kannst Issues nicht kommentieren.
 archive.pull.nocomment=Dieses Repository ist archiviert. Du kannst Pull-Requests nicht kommentieren.
@@ -1243,12 +1244,12 @@ migrate_items_releases=Releases
 migrate_repo=Repository migrieren
 migrate.clone_address=Migrations-/Klon-URL
 migrate.clone_address_desc=Die HTTP(S)- oder „git clone“-URL eines bereits existierenden Repositorys
-migrate.github_token_desc=Du kannst hier ein oder mehrere Token durch Komma getrennt eintippen, um die Migration aufgrund der GitHub-API-Ratenlimitierung zu beschleunigen. WARNUNG: Der Missbrauch dieser Funktion kann gegen die Richtlinien des Diensteanbieters verstoßen und zur Kontosperrung führen.
+migrate.github_token_desc=Du kannst hier ein oder mehrere Tokens durch Komma getrennt eingeben, um die Migration schneller zu machen, indem die GitHub-API-Ratenbegrenzung umgangen wird. WARNUNG: Der Missbrauch dieser Funktion kann gegen die Richtlinien des Diensteanbieters verstoßen und zur Sperrung deines Kontos bzw. deiner Konten führen.
 migrate.clone_local_path=oder ein lokaler Serverpfad
 migrate.permission_denied=Du hast keine Berechtigung zum Importieren lokaler Repositorys.
 migrate.permission_denied_blocked=Du kannst von keinen nicht erlaubten Hosts importieren. Bitte fragen deinen Administrator, die Einstellungen ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS zu überprüfen.
 migrate.invalid_local_path=Der lokale Pfad ist ungültig. Er existiert nicht oder ist kein Verzeichnis.
-migrate.invalid_lfs_endpoint=Ungültiger LFS Endpunkt.
+migrate.invalid_lfs_endpoint=Der LFS-Endpunkt ist nicht gültig.
 migrate.failed=Fehler bei der Migration: %v
 migrate.migrate_items_options=Zugangs-Token wird benötigt, um zusätzliche Elemente zu migrieren
 migrated_from=Migriert von <a href="%[1]s">%[2]s</a>
@@ -1324,7 +1325,7 @@ commit=Commit
 release=Release
 releases=Releases
 tag=Tag
-released_this=hat released
+released_this=hat releast
 tagged_this=hat getaggt
 file.title=%s an %s
 file_raw=Originalformat
@@ -1448,7 +1449,7 @@ commits.older=Älter
 commits.newer=Neuer
 commits.signed_by=Signiert von
 commits.signed_by_untrusted_user=Signiert von nicht vertrauenswürdigen Benutzern
-commits.signed_by_untrusted_user_unmatched=Signiert von nicht vertrauenswürdigen Benutzern, der nicht mit dem Committer übereinstimmt
+commits.signed_by_untrusted_user_unmatched=Von einem nicht vertrauenswürdigen Benutzer, der nicht auf den Committer passt, signiert
 commits.gpg_key_id=GPG-Schlüssel-ID
 commits.ssh_key_fingerprint=SSH-Schlüssel-Fingerabdruck
 commits.view_path=An diesem Punkt im Verlauf anzeigen
@@ -1459,7 +1460,7 @@ commit.revert-header=Setze zurück: %s
 commit.revert-content=Branch auswählen, der zurückgesetzt werden soll:
 commit.cherry-pick=Cherry-Pick
 commit.cherry-pick-header=Cherry-Picke: %s
-commit.cherry-pick-content=Branch auswählen, auf dem Cherry-Picked werden soll:
+commit.cherry-pick-content=Branch auswählen, zu dem das Ergebnis des Cherry-Picks angewendet werden soll:
 
 commitstatus.error=Fehler
 commitstatus.failure=Fehler
@@ -1511,11 +1512,11 @@ projects.card_type.images_and_text=Bilder und Text
 projects.card_type.text_only=Nur Text
 
 issues.desc=Verwalte Bug-Reports, Aufgaben und Meilensteine.
-issues.filter_assignees=Filter
+issues.filter_assignees=Verantwortliche filtern
 issues.filter_milestones=Meilenstein filtern
 issues.filter_projects=Projekt filtern
 issues.filter_labels=Label filtern
-issues.filter_reviewers=Reviewer filtern
+issues.filter_reviewers=Prüfer filtern
 issues.new=Neues Issue
 issues.new.title_empty=Der Titel kann nicht leer sein
 issues.new.labels=Labels
@@ -1535,7 +1536,7 @@ issues.new.closed_milestone=Geschlossene Meilensteine
 issues.new.assignees=Zuständige
 issues.new.clear_assignees=Zuständige entfernen
 issues.new.no_assignees=Niemand zuständig
-issues.new.no_reviewers=Keine Reviewer
+issues.new.no_reviewers=Keine Prüfer
 issues.choose.get_started=Los geht's
 issues.choose.open_external_link=Öffnen
 issues.choose.blank=Standard
@@ -1577,7 +1578,7 @@ issues.remove_ref_at=`hat die Referenz <b>%s</b> %s entfernt`
 issues.add_ref_at=`hat die Referenz <b>%s</b> %s hinzugefügt`
 issues.delete_branch_at=`löschte den Branch <b>%s</b> %s`
 issues.filter_label=Label
-issues.filter_label_exclude=`<code>Alt</code> + <code>Klick/Enter</code> verwenden, um Labels auszuschließen`
+issues.filter_label_exclude=`Verwende <kbd>Alt</kbd> + <kbd>Klick/Enter</kbd>, um Labels auszuschließen`
 issues.filter_label_no_select=Alle Labels
 issues.filter_label_select_no_label=Kein Label
 issues.filter_milestone=Meilenstein
@@ -1598,8 +1599,8 @@ issues.filter_type.all_issues=Alle Issues
 issues.filter_type.assigned_to_you=Dir zugewiesen
 issues.filter_type.created_by_you=Von dir erstellt
 issues.filter_type.mentioning_you=Hat dich erwähnt
-issues.filter_type.review_requested=Review angefordert
-issues.filter_type.reviewed_by_you=Von dir gereviewt
+issues.filter_type.review_requested=Sichtung angefordert
+issues.filter_type.reviewed_by_you=Von dir überprüft
 issues.filter_sort=Sortieren
 issues.filter_sort.latest=Neueste
 issues.filter_sort.oldest=Älteste
@@ -1621,8 +1622,8 @@ issues.action_milestone=Meilenstein
 issues.action_milestone_no_select=Kein Meilenstein
 issues.action_assignee=Zuständig
 issues.action_assignee_no_select=Niemand zuständig
-issues.action_check=Auswählen/Auswahl aufheben
-issues.action_check_all=Alles auswählen/Auswahl aufheben
+issues.action_check=Auswählen / Auswahl aufheben
+issues.action_check_all=Alles auswählen / Auswahl aufheben
 issues.opened_by=%[1]s von <a href="%[2]s">%[3]s</a> geöffnet
 pulls.merged_by=von <a href="%[2]s">%[3]s</a> wurde %[1]s zusammengeführt
 pulls.merged_by_fake=von %[2]s %[1]s zusammengeführt
@@ -1651,13 +1652,13 @@ issues.close_comment_issue=Mit Kommentar schließen
 issues.reopen_issue=Wieder öffnen
 issues.reopen_comment_issue=Mit Kommentar wieder öffnen
 issues.create_comment=Kommentieren
-issues.closed_at=`hat diesen Issue <a id="%[1]s" href="#%[1]s">%[2]s</a> geschlossen`
-issues.reopened_at=`hat dieses Issue <a id="%[1]s" href="#%[1]s">%[2]s</a> wieder geöffnet`
-issues.commit_ref_at=`hat dieses Issue <a id="%[1]s" href="#%[1]s">%[2]s</a> aus einem Commit referenziert`
-issues.ref_issue_from=`<a href="%[3]s">hat</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">auf dieses Issue verwiesen %[4]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">hat</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">auf diesen Pull-Request verwiesen %[4]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">hat</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">in einem Pull-Request %[4]s auf dieses Issue verwiesen, welcher es schließen wird</a>`
-issues.ref_reopening_from=`<a href="%[3]s">hat</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s"> in einem Pull-Request %[4]s auf dieses Issue verwiesen, welcher es erneut öffnen wird</a>`
+issues.closed_at=`hat dieses Issue %s geschlossen`
+issues.reopened_at=`hat dieses Issue %s wieder geöffnet`
+issues.commit_ref_at=`hat dieses Issue %s aus einem Commit referenziert`
+issues.ref_issue_from=`<a href="%[2]s">auf dieses Issue verwiesen %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">referenzierte diesen Pull-Request %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">referenzierte dieses Issue aus einem Pull-Request %[3]s der es schließen wird</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">referenzierte dieses Issue aus einem Pull-Request %[3]s der es wieder öffnen wird</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">hat dieses Issue %[4]s geschlossen</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">hat dieses Issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> wieder geöffnet`
 issues.ref_from=`von %[1]s`
@@ -1673,12 +1674,12 @@ issues.role.first_time_contributor=Erstmaliger Mitwirkender
 issues.role.first_time_contributor_helper=Dies ist der erste Beitrag dieses Benutzers zum Repository.
 issues.role.contributor=Mitwirkender
 issues.role.contributor_helper=Dieser Benutzer hat schon zuvor zu dem Repository beigetragen.
-issues.re_request_review=Review erneut anfordern
-issues.is_stale=Seit diesem Review gab es Änderungen an diesem PR
-issues.remove_request_review=Review-Anfrage entfernen
-issues.remove_request_review_block=Review-Anfrage kann nicht entfernt werden
-issues.dismiss_review=Review verwerfen
-issues.dismiss_review_warning=Bist du dir sicher, dass du dieses Review verwerfen willst?
+issues.re_request_review=Sichtung erneut anfordern
+issues.is_stale=Seit dieser Sichtung gab es Änderungen an diesem PR
+issues.remove_request_review=Sichtungsanfrage entfernen
+issues.remove_request_review_block=Sichtungsanfrage kann nicht entfernt werden
+issues.dismiss_review=Sichtung verwerfen
+issues.dismiss_review_warning=Bist du dir sicher, dass du diese Sichtung verwerfen willst?
 issues.sign_in_require_desc=<a href="%s">Anmelden</a>, um an der Diskussion teilzunehmen.
 issues.edit=Bearbeiten
 issues.cancel=Abbrechen
@@ -1762,7 +1763,7 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
 issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
 issues.push_commit_1=hat %d Commit %s hinzugefügt
 issues.push_commits_n=hat %d Commits %s hinzugefügt
-issues.force_push_codes=`hat %[6]s %[1]s von <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> zu <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> force-gepusht`
+issues.force_push_codes=`hat %[6]s %[1]s von <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s zu <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s force-gepusht`
 issues.force_push_compare=Vergleichen
 issues.due_date_form=JJJJ-MM-TT
 issues.due_date_form_add=Fälligkeitsdatum hinzufügen
@@ -1809,20 +1810,20 @@ issues.dependency.add_error_dep_not_same_repo=Beide Issues müssen sich im selbe
 issues.review.self.approval=Du kannst nicht dein eigenen Pull-Request genehmigen.
 issues.review.self.rejection=Du kannst keine Änderungen an deinem eigenen Pull-Request anfragen.
 issues.review.approve=hat die Änderungen %s genehmigt
-issues.review.comment=hat %s gereviewt
+issues.review.comment=hat %s überprüft
 issues.review.dismissed=verwarf %ss Review %s
 issues.review.dismissed_label=Verworfen
 issues.review.left_comment=hat einen Kommentar hinterlassen
 issues.review.content.empty=Du musst einen Kommentar hinterlassen, der die gewünschte(n) Änderung(en) beschreibt.
 issues.review.reject=hat %s Änderungen angefragt
-issues.review.wait=wurde für ein Review %s angefragt
-issues.review.add_review_request=hat ein Review von %[1]s %[2]s angefragt
-issues.review.remove_review_request=hat die Aufforderung zum Review an %[1]s %[2]s entfernt
-issues.review.remove_review_request_self=hat das Review verweigert %s
+issues.review.wait=wurde für eine Sichtung von %s angefragt
+issues.review.add_review_request=hat eine Sichtung von %[1]s %[2]s angefragt
+issues.review.remove_review_request=hat die Sichtungsanfrage an %[1]s %[2]s entfernt
+issues.review.remove_review_request_self=hat die Sichtung %s verweigert
 issues.review.pending=Ausstehend
 issues.review.pending.tooltip=Dieser Kommentar ist derzeit nicht für andere Benutzer sichtbar. Um deine ausstehenden Kommentare einzureichen, wähle „%s“ -> „%s/%s/%s“ oben auf der Seite.
 issues.review.review=Review
-issues.review.reviewers=Reviewer
+issues.review.reviewers=Prüfer
 issues.review.outdated=Veraltet
 issues.review.outdated_description=Der Inhalt hat sich geändert, seit dieser Kommentar abgegeben wurde
 issues.review.option.show_outdated_comments=Veraltete Kommentare anzeigen
@@ -1833,7 +1834,7 @@ issues.review.show_resolved=Erledigte anzeigen
 issues.review.hide_resolved=Erledigte ausblenden
 issues.review.resolve_conversation=Diskussion als „erledigt“ markieren
 issues.review.un_resolve_conversation=Diskussion als „nicht erledigt“ markieren
-issues.review.resolved_by=markierte diese Unterhaltung als gelöst
+issues.review.resolved_by=markierte diese Unterhaltung als „erledigt“
 issues.assignee.error=Aufgrund eines unerwarteten Fehlers konnten nicht alle Zuständigen hinzugefügt werden.
 issues.reference_issue.body=Beschreibung
 issues.content_history.deleted=gelöscht
@@ -1847,7 +1848,7 @@ issues.reference_link=Referenz: %s
 compare.compare_base=Basis
 compare.compare_head=vergleichen
 
-pulls.desc=Pull-Requests und Code-Reviews aktivieren.
+pulls.desc=Pull-Requests und Code-Sichtungen aktivieren.
 pulls.new=Neuer Pull-Request
 pulls.view=Pull-Request ansehen
 pulls.compare_changes=Neuer Pull-Request
@@ -1856,7 +1857,7 @@ pulls.allow_edits_from_maintainers_desc=Nutzer mit Schreibzugriff auf den Basisb
 pulls.allow_edits_from_maintainers_err=Aktualisieren fehlgeschlagen
 pulls.compare_changes_desc=Wähle den Zielbranch, in das zusammengeführt werden soll, und den Quellbranch, von dem gepullt werden soll, aus.
 pulls.has_viewed_file=Gesehen
-pulls.has_changed_since_last_review=Seit deinem letzten Review geändert
+pulls.has_changed_since_last_review=Seit deiner letzten Sichtung geändert
 pulls.viewed_files_label=%[1]d / %[2]d Dateien betrachtet
 pulls.expand_files=Alle Dateien ausklappen
 pulls.collapse_files=Alle Dateien einklappen
@@ -1867,11 +1868,11 @@ pulls.switch_head_and_base=Head und Base vertauschen
 pulls.filter_branch=Branch filtern
 pulls.no_results=Keine Ergebnisse verfügbar.
 pulls.show_all_commits=Alle Commits anzeigen
-pulls.show_changes_since_your_last_review=Zeige Änderungen seit deinem letzten Review
+pulls.show_changes_since_your_last_review=Zeige Änderungen seit deiner letzten Sichtung
 pulls.showing_only_single_commit=Nur Änderungen aus Commit %[1]s werden angezeigt
 pulls.showing_specified_commit_range=Zeige nur die Änderungen zwischen %[1]s..%[2]s
 pulls.select_commit_hold_shift_for_range=Commit auswählen. Halte Shift + klicke, um eine Reihe auszuwählen
-pulls.review_only_possible_for_full_diff=Ein Review ist nur möglich, wenn das vollständige Diff angezeigt wird
+pulls.review_only_possible_for_full_diff=Eine Sichtung ist nur möglich, wenn der vollständige Diff angezeigt wird
 pulls.filter_changes_by_commit=Nach Commit filtern
 pulls.nothing_to_compare=Diese Branches sind identisch. Es muss kein Pull-Request erstellt werden.
 pulls.nothing_to_compare_and_allow_empty_pr=Diese Branches sind gleich. Der Pull-Request wird leer sein.
@@ -1905,8 +1906,8 @@ pulls.required_status_check_failed=Einige erforderliche Prüfungen waren nicht e
 pulls.required_status_check_missing=Einige erforderliche Prüfungen fehlen.
 pulls.required_status_check_administrator=Als Administrator kannst du diesen Pull-Request weiterhin zusammenführen.
 pulls.blocked_by_approvals=Dieser Pull-Request hat noch nicht genügend Genehmigungen. %d von %d Genehmigungen erteilt.
-pulls.blocked_by_rejection=Dieser Pull-Request hat Änderungen, die von einem offiziellen Reviewer angefragt wurden.
-pulls.blocked_by_official_review_requests=Dieser Pull-Request ist blockiert, weil ihm die Genehmigung von einem oder mehreren offiziellen Reviewern fehlt.
+pulls.blocked_by_rejection=Dieser Pull-Request hat Änderungen, die von einem offiziellen Prüfer angefragt wurden.
+pulls.blocked_by_official_review_requests=Dieser Pull-Request ist blockiert, weil ihm die Genehmigung von einem oder mehreren offiziellen Prüfern fehlt.
 pulls.blocked_by_outdated_branch=Dieser Pull-Request ist blockiert, da er veraltet ist.
 pulls.blocked_by_changed_protected_files_1=Dieser Pull-Request ist blockiert, weil er eine geschützte Datei ändert:
 pulls.blocked_by_changed_protected_files_n=Dieser Pull-Request ist blockiert, weil er geschützte Dateien ändert:
@@ -1919,14 +1920,14 @@ pulls.approve_count_1=%d Genehmigung
 pulls.approve_count_n=%d Genehmigungen
 pulls.reject_count_1=%d Änderungsanfrage
 pulls.reject_count_n=%d Änderungsanfragen
-pulls.waiting_count_1=%d wartendes Review
-pulls.waiting_count_n=%d wartende Reviews
+pulls.waiting_count_1=%d wartende Sichtung
+pulls.waiting_count_n=%d wartende Sichtungen
 pulls.wrong_commit_id=die Commit-ID muss eine Commit-ID auf dem Zielbranch sein
 
 pulls.no_merge_desc=Dieser Pull-Request kann nicht zusammengeführt werden, da alle Repository-Merge-Optionen deaktiviert sind.
 pulls.no_merge_helper=Aktiviere Mergeoptionen in den Repositoryeinstellungen oder führe den Pull-Request manuell zusammen.
 pulls.no_merge_wip=Dieser Pull-Request kann nicht zusammengeführt werden, da er als „Work in Progress“ (in Bearbeitung) markiert ist.
-pulls.no_merge_not_ready=Dieser Pull-Request kann nicht zusammengeführt werden, überprüfe den Reviewstatus und die Statusprüfungen.
+pulls.no_merge_not_ready=Dieser Pull-Request kann nicht zusammengeführt werden, überprüfe den Sichtungsstatus und die Statusprüfungen.
 pulls.no_merge_access=Du bist nicht berechtigt, diesen Pull-Request zusammenzuführen.
 pulls.merge_pull_request=Merge-Commit erstellen
 pulls.rebase_merge_pull_request=Rebasen und dann fast-forwarden
@@ -1962,8 +1963,8 @@ pulls.update_branch_success=Branch-Aktualisierung erfolgreich
 pulls.update_not_allowed=Du hast keine Berechtigung, den Branch zu updaten
 pulls.outdated_with_base_branch=Dieser Branch enthält nicht die neusten Commits des Basis-Branches
 pulls.close=Pull-Request schließen
-pulls.closed_at=`hat diesen Pull-Request <a id="%[1]s" href="#%[1]s">%[2]s</a> geschlossen`
-pulls.reopened_at=`hat diesen Pull-Request <a id="%[1]s" href="#%[1]s">%[2]s</a> wieder geöffnet`
+pulls.closed_at=`hat diesen Pull-Request %s geschlossen`
+pulls.reopened_at=`hat diesen Pull-Request %s wieder geöffnet`
 pulls.clear_merge_message=Merge-Nachricht löschen
 pulls.clear_merge_message_hint=Das Löschen der Merge-Nachricht wird nur den Inhalt der Commit-Nachricht entfernen und generierte Git-Trailer wie „Co-Authored-By …“ erhalten.
 
@@ -2202,7 +2203,7 @@ settings.tracker_issue_style.numeric=Numerisch
 settings.tracker_issue_style.alphanumeric=Alphanumerisch
 settings.tracker_issue_style.regexp=Regulärer Ausdruck
 settings.tracker_issue_style.regexp_pattern=Regulärer Ausdruck
-settings.tracker_issue_style.regexp_pattern_desc=Die erste gecapturte Gruppe wird statt <code>{index}</code> verwendet.
+settings.tracker_issue_style.regexp_pattern_desc=Die erste gefundene Gruppe wird statt <code>{index}</code> verwendet.
 settings.tracker_url_format_desc=Du kannst die Platzhalter <code>{user}</code>, <code>{repo}</code>, <code>{index}</code> für den Benutzernamen, den Namen des Repositorys und die Issue-Nummer verwenden.
 settings.enable_timetracker=Zeiterfassung aktivieren
 settings.allow_only_contributors_to_track_time=Nur Mitarbeitern erlauben, die Zeiterfassung zu nutzen
@@ -2261,14 +2262,14 @@ settings.trust_model.collaborator=Mitarbeiter
 settings.trust_model.collaborator.long=Mitarbeiter: Vertraue Signaturen von Mitarbeitern
 settings.trust_model.collaborator.desc=Gültige Signaturen von Mitarbeitern dieses Projekts werden als „vertrauenswürdig“ markiert (egal, ob sie mit dem Committer übereinstimmen oder nicht). Andernfalls werden gültige Signaturen als „nicht vertrauenswürdig“ markiert, falls die Signatur zum Committer passt, ansonsten werden sie als „nicht übereinstimmend“ markiert.
 settings.trust_model.committer=Committer
-settings.trust_model.committer.long=Committer: Vertraue Signaturen, die zu Committern passen (Dies stimmt mit GitHub überein und zwingt signierte Commits von Forgejo dazu, Forgejo als Committer zu haben)
+settings.trust_model.committer.long=Committer: Vertraue Signaturen, die zu Committern passen (dies stimmt mit GitHub überein und zwingt signierte Commits von Forgejo dazu, Forgejo als Committer zu haben)
 settings.trust_model.committer.desc=Gültige Signaturen werden nur dann als „vertrauenswürdig“ gekennzeichnet, wenn sie mit ihrem Committer übereinstimmen. Ansonsten werden sie als „nicht übereinstimmend“ markiert. Das führt dazu, dass Forgejo auf signierten Commits, bei denen der echte Committer als „Co-authored-by:“ oder „Co-committed-by:“ in der Beschreibung eingetragen wurde, als Committer gilt. Der Forgejo-Standard-Key muss zu einem Benutzer in der Datenbank passen.
 settings.trust_model.collaboratorcommitter=Mitarbeiter+Committer
 settings.trust_model.collaboratorcommitter.long=Mitarbeiter+Committer: Signaturen der Mitarbeiter vertrauen die mit dem Committer übereinstimmen
 settings.trust_model.collaboratorcommitter.desc=Gültige Signaturen von Mitarbeitern dieses Projekts werden als „vertrauenswürdig“ markiert, wenn sie mit dem Committer übereinstimmen. Andernfalls werden gültige Signaturen als „nicht vertrauenswürdig“ markiert, wenn die Signatur mit dem Committer übereinstimmt. Ansonsten werden sie als „nicht übereinstimmend“ markiert. Dies zwingt Forgejo, als Committer bei signierten Commits mit dem echten Committer als „Co-Authored-By:“ und „Co-Committed-By:“ im Commit zu markieren. Der Standard-Forgejo-Schlüssel muss mit einem Benutzer in der Datenbank übereinstimmen.
 settings.wiki_delete=Wiki-Daten löschen
 settings.wiki_delete_desc=Das Löschen von Wiki-Daten kann nicht rückgängig gemacht werden. Bitte sei vorsichtig.
-settings.wiki_delete_notices_1=– Dies löscht und deaktiviert das Wiki für %s.
+settings.wiki_delete_notices_1=– Dies wird das Repository-Wiki für %s dauerhaft löschen und deaktivieren.
 settings.confirm_wiki_delete=Wiki-Daten löschen
 settings.wiki_deletion_success=Repository-Wiki-Daten wurden gelöscht.
 settings.delete=Dieses Repository löschen
@@ -2323,11 +2324,11 @@ settings.githook_edit_desc=Wenn ein Hook nicht aktiv ist, wird der Standardinhal
 settings.githook_name=Hook-Name
 settings.githook_content=Hook-Inhalt
 settings.update_githook=Hook aktualisieren
-settings.add_webhook_desc=Forgejo sendet einen <code>POST</code>-Request mit festgelegtem Content-Type an die Ziel-URL. Mehr Informationen findest du in der <a target="_blank" rel="noopener noreferrer" href="%s">Anleitung zu Webhooks (Englisch)</a>.
+settings.add_webhook_desc=Forgejo sendet eine <code>POST</code>-Anfrage mit festgelegtem Content-Type an die Ziel-URL. Mehr Informationen findest du in der <a target="_blank" rel="noopener noreferrer" href="%s">Anleitung zu Webhooks (Englisch)</a>.
 settings.payload_url=Ziel-URL
 settings.http_method=HTTP-Methode
 settings.content_type=POST-Content-Type
-settings.secret=Secret
+settings.secret=Geheimnis
 settings.slack_username=Benutzername
 settings.slack_icon_url=Icon-URL
 settings.slack_color=Farbe
@@ -2374,18 +2375,18 @@ settings.event_pull_request_milestone=Meilensteine
 settings.event_pull_request_milestone_desc=Meilenstein hinzugefügt, entfernt oder bearbeitet.
 settings.event_pull_request_comment=Kommentare
 settings.event_pull_request_comment_desc=Pull-Request-Kommentar angelegt, geändert oder gelöscht.
-settings.event_pull_request_review=Reviews
-settings.event_pull_request_review_desc=Pull-Request genehmigt, abgelehnt oder Review-Kommentare hinterlassen.
+settings.event_pull_request_review=Sichtungen
+settings.event_pull_request_review_desc=Pull-Request genehmigt, abgelehnt oder Sichtungskommentare hinterlassen.
 settings.event_pull_request_sync=Synchronisiert
 settings.event_pull_request_sync_desc=Branch automatisch mit Zielbranch aktualisiert.
-settings.event_pull_request_review_request=Review-Anfragen
-settings.event_pull_request_review_request_desc=Überprüfung des Pull-Requests angefragt oder die Anfrage entfernt.
+settings.event_pull_request_review_request=Sichtungsanfragen
+settings.event_pull_request_review_request_desc=Pull-Request-Sichtung angefragt oder Sichtungsanfrage entfernt.
 settings.event_pull_request_approvals=Genehmigungen zum Pull-Request
 settings.event_pull_request_merge=Pull-Request-Merge
 settings.event_package=Paket
 settings.event_package_desc=Paket wurde in einem Repository erstellt oder gelöscht.
 settings.branch_filter=Branch-Filter
-settings.branch_filter_desc=Positivliste für Branches für Push-, Erzeugungs- und Löschevents, als glob-Pattern beschrieben. Es werden Events für alle Branches gemeldet, falls das Pattern <code>*</code> ist, oder falls es leer ist. Siehe die <a href="%[1]s">%[2]s</a>-Dokumentation für die Syntax (Englisch). Beispiele: <code>master</code>, <code>{master,release*}</code>.
+settings.branch_filter_desc=Positivliste für Branches für Push-, Erzeugungs- und Löschevents, als glob-Pattern beschrieben. Es werden Events für alle Branches gemeldet, falls das Pattern <code>*</code> ist oder falls es leer ist. Siehe die <a href="%[1]s">%[2]s</a>-Dokumentation für die Syntax (Englisch). Beispiele: <code>master</code>, <code>{master,release*}</code>.
 settings.authorization_header=Authorization-Header
 settings.authorization_header_desc=Wird, falls vorhanden, als Authorization-Header mitgesendet. Beispiele: %s.
 settings.active=Aktiv
@@ -2467,11 +2468,11 @@ settings.protect_status_check_matched=Übereinstimmung
 settings.protect_invalid_status_check_pattern=Ungültiges Statusprüfungspattern: „%s“.
 settings.protect_no_valid_status_check_patterns=Keine gültigen Statuscheck-Muster.
 settings.protect_required_approvals=Erforderliche Genehmigungen
-settings.protect_required_approvals_desc=Erlaube das Zusammenführen des Pull-Requests nur mit genügend positiven Reviews.
+settings.protect_required_approvals_desc=Erlaube das Zusammenführen des Pull-Requests nur mit genügend positiven Sichtungen.
 settings.protect_approvals_whitelist_enabled=Genehmigungen auf Benutzer oder Teams auf der Positivliste beschränken
-settings.protect_approvals_whitelist_enabled_desc=Nur Reviews von Benutzern oder Teams auf der Positivliste zählen zu den erforderlichen Genehmigungen. Existiert keine Positivliste, so zählen Reviews von jedem mit Schreibzugriff zu den erforderlichen Genehmigungen.
-settings.protect_approvals_whitelist_users=Nutzer, die reviewen dürfen
-settings.protect_approvals_whitelist_teams=Teams, die reviewen dürfen
+settings.protect_approvals_whitelist_enabled_desc=Nur Sichtungen von Benutzern oder Teams auf der Positivliste zählen zu den erforderlichen Genehmigungen. Existiert keine Positivliste, so zählen Sichtungen von jedem mit Schreibzugriff zu den erforderlichen Genehmigungen.
+settings.protect_approvals_whitelist_users=Autorisierte Prüfer
+settings.protect_approvals_whitelist_teams=Teams, autorisiert zum Prüfen
 settings.dismiss_stale_approvals=Entferne alte Genehmigungen
 settings.dismiss_stale_approvals_desc=Wenn neue Commits gepusht werden, die den Inhalt des Pull-Requests ändern, werden alte Genehmigungen entfernt.
 settings.require_signed_commits=Signierte Commits erforderlich
@@ -2479,9 +2480,9 @@ settings.require_signed_commits_desc=Pushes auf diesen Branch ablehnen, wenn Com
 settings.protect_branch_name_pattern=Muster für geschützte Branchnamen
 settings.protect_patterns=Muster
 settings.protect_protected_file_patterns=Geschützte Dateimuster (durch Semikolon „;“ getrennt)
-settings.protect_protected_file_patterns_desc=Geschützte Dateien dürfen nicht direkt geändert werden, auch wenn der Benutzer Rechte hat, Dateien in diesem Branch hinzuzufügen, zu bearbeiten oder zu löschen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe <a href="%s">%s</a> Dokumentation zur Mustersyntax. Beispiele: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
+settings.protect_protected_file_patterns_desc=Geschützte Dateien dürfen nicht direkt geändert werden, auch wenn der Benutzer Rechte hat, Dateien in diesem Branch hinzuzufügen, zu bearbeiten oder zu löschen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe <a href="%s">%s</a>-Dokumentation zur Mustersyntax. Beispiele: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
 settings.protect_unprotected_file_patterns=Ungeschützte Dateimuster (durch Semikolon „;“ getrennt)
-settings.protect_unprotected_file_patterns_desc=Ungeschützte Dateien, die direkt geändert werden dürfen, wenn der Benutzer Schreibzugriff hat, können die Push-Beschränkung umgehen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe <a href="%[1]s">%[2]s</a> Dokumentation zur Mustersyntax. Beispiele: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
+settings.protect_unprotected_file_patterns_desc=Ungeschützte Dateien, die direkt geändert werden dürfen, wenn der Benutzer Schreibzugriff hat, können die Push-Beschränkung umgehen. Mehrere Muster können mit Semikolon („;“) getrennt werden. Siehe <a href="%[1]s">%[2]s</a>-Dokumentation zur Mustersyntax. Beispiele: <code>.drone.yml</code>, <code>/docs/**/*.txt</code>.
 settings.add_protected_branch=Schutz aktivieren
 settings.delete_protected_branch=Schutz deaktivieren
 settings.update_protect_branch_success=Branchschutzregel „%s“ wurde aktualisiert.
@@ -2489,10 +2490,10 @@ settings.remove_protected_branch_success=Branchschutzregel „%s“ wurde entfer
 settings.remove_protected_branch_failed=Entfernen der Branchschutzregel „%s“ fehlgeschlagen.
 settings.protected_branch_deletion=Branch-Schutz löschen
 settings.protected_branch_deletion_desc=Wenn du den Branch-Schutz deaktivierst, können alle Nutzer mit Schreibrechten auf den Branch pushen. Fortfahren?
-settings.block_rejected_reviews=Zusammenführung bei abgelehnten Reviews blockieren
-settings.block_rejected_reviews_desc=Merge ist nicht möglich, wenn Änderungen durch offizielle Reviewer angefragt werden, auch wenn genügend Genehmigungen existieren.
-settings.block_on_official_review_requests=Merge bei offiziellen Review-Anfragen blockieren
-settings.block_on_official_review_requests_desc=Merge ist nicht möglich, wenn offizielle Review-Anfrangen vorliegen, selbst wenn genügend Genehmigungen existieren.
+settings.block_rejected_reviews=Zusammenführung bei abgelehnten Sichtungen blockieren
+settings.block_rejected_reviews_desc=Merge ist nicht möglich, wenn Änderungen durch offizielle Prüfer angefragt werden, auch wenn genügend Genehmigungen existieren.
+settings.block_on_official_review_requests=Merge bei offiziellen Sichtungsanfragen blockieren
+settings.block_on_official_review_requests_desc=Merge ist nicht möglich, wenn offizielle Sichtungsanfrangen vorliegen, selbst wenn genügend Genehmigungen existieren.
 settings.block_outdated_branch=Merge blockieren, wenn der Pull-Request veraltet ist
 settings.block_outdated_branch_desc=Merge ist nicht möglich, wenn der Head-Branch hinter dem Basis-Branch ist.
 settings.default_branch_desc=Wähle einen Standardbranch für Pull-Requests und Code-Commits:
@@ -2539,7 +2540,7 @@ settings.lfs_filelist=LFS-Dateien, die in diesem Repository gespeichert sind
 settings.lfs_no_lfs_files=In diesem Repository sind keine LFS-Dateien gespeichert
 settings.lfs_findcommits=Commits finden
 settings.lfs_lfs_file_no_commits=Keine Commits für diese LFS-Datei gefunden
-settings.lfs_noattribute=Dieser Pfad hat nicht das sperrbare Attribut im Standard-Branch
+settings.lfs_noattribute=Dieser Pfad hat nicht das „lockable“-Attribut im Standard-Branch
 settings.lfs_delete=LFS-Datei mit OID %s löschen
 settings.lfs_delete_warning=Das Löschen einer LFS-Datei kann dazu führen, dass „Objekt existiert nicht“-Fehler beim Checkout auftreten. Bist du sicher?
 settings.lfs_findpointerfiles=Pointer-Dateien finden
@@ -2580,8 +2581,8 @@ diff.show_unified_view=Gesamtansicht
 diff.whitespace_button=Leerzeichen
 diff.whitespace_show_everything=Alle Änderungen anzeigen
 diff.whitespace_ignore_all_whitespace=Ignoriere Leerzeichen beim Zeilen vergleichen
-diff.whitespace_ignore_amount_changes=Ignoriere whitespace-Änderungen
-diff.whitespace_ignore_at_eol=Ignoriere EOL-whitespace-Änderungen
+diff.whitespace_ignore_amount_changes=Änderungen in der Anzahl der Leerzeichen und ähnlichen Zeichen ignorieren
+diff.whitespace_ignore_at_eol=Änderungen an den Leerzeichen und ähnlichen Zeichen am Zeilenende ignorieren
 diff.stats_desc=<strong> %d geänderte Dateien</strong> mit <strong>%d neuen</strong> und <strong>%d gelöschten</strong> Zeilen
 diff.stats_desc_file=%d Änderungen: %d Ergänzungen und %d Löschungen
 diff.bin=BIN
@@ -2604,11 +2605,11 @@ diff.comment.placeholder=Kommentieren
 diff.comment.markdown_info=Styling mit Markdown wird unterstützt.
 diff.comment.add_single_comment=Einzelnen Kommentar hinzufügen
 diff.comment.add_review_comment=Kommentar hinzufügen
-diff.comment.start_review=Review starten
+diff.comment.start_review=Sichtung starten
 diff.comment.reply=Antworten
-diff.review=Review abschließen
-diff.review.header=Review einreichen
-diff.review.placeholder=Kommentar zum Review
+diff.review=Sichtung abschließen
+diff.review.header=Sichtung einreichen
+diff.review.placeholder=Kommentar zur Sichtung
 diff.review.comment=Kommentieren
 diff.review.approve=Genehmigen
 diff.review.self_reject=Pull-Request-Autoren können keine Änderungen an ihren eigenen Pull-Request anfordern
@@ -2656,7 +2657,7 @@ release.edit_release=Release aktualisieren
 release.delete_release=Release löschen
 release.delete_tag=Tag löschen
 release.deletion=Release löschen
-release.deletion_desc=Beim Entfernen wird ein Release nur von Forgejo gelöscht. Es betrifft weder den Git-Tag, noch den Inhalt des Repos oder seinen Änderungsverlauf. Fortfahren?
+release.deletion_desc=Beim Entfernen wird ein Release nur von Forgejo gelöscht. Es betrifft weder den Git-Tag noch den Inhalt des Repos oder seinen Änderungsverlauf. Fortfahren?
 release.deletion_success=Das Release wurde gelöscht.
 release.deletion_tag_desc=Löscht dieses Tag aus dem Projektarchiv. Repository-Inhalt und Verlauf bleiben unverändert. Fortfahren?
 release.deletion_tag_success=Der Tag wurde gelöscht.
@@ -2666,7 +2667,7 @@ release.tag_name_protected=Der Tag-Name ist geschützt.
 release.tag_already_exist=Dieser Tag-Name existiert bereits.
 release.downloads=Downloads
 release.download_count=Downloads: %s
-release.add_tag_msg=Titel und Beschreibung des Releases als Tag Nachricht verwenden.
+release.add_tag_msg=Titel und Beschreibung des Releases als Tag-Nachricht verwenden.
 release.add_tag=Tag erstellen
 release.releases_for=Releases für %s
 release.tags_for=Tags für %s
@@ -2685,7 +2686,7 @@ branch.create_from=`von „%s“`
 branch.create_success=Branch „%s“ wurde erstellt.
 branch.branch_already_exists=Branch „%s“ existiert bereits in diesem Repository.
 branch.branch_name_conflict=Der Branch-Name „%s“ steht in Konflikt mit dem bestehenden Branch „%s“.
-branch.tag_collision=Branch „%s“ kann nicht erstellt werden, da in diesem Repository bereits ein Tag mit dem selben Namen existiert.
+branch.tag_collision=Branch „%s“ kann nicht erstellt werden, da in diesem Repository bereits ein Tag mit demselben Namen existiert.
 branch.deleted_by=Von %s gelöscht
 branch.restore_success=Branch „%s“ wurde wiederhergestellt.
 branch.restore_failed=Wiederherstellung vom Branch „%s“ gescheitert.
@@ -2757,7 +2758,7 @@ generated = Erzeugt
 editor.invalid_commit_mail = Ungültige E-Mail für die Erstellung eines Commits.
 commits.renamed_from = Umbenannt von %s
 commits.browse_further = Weiter browsen
-pulls.nothing_to_compare_have_tag = Der gewählte Branch/Tag ist gleich.
+pulls.nothing_to_compare_have_tag = Die gewählten Branches/Tags sind gleich.
 pulls.status_checks_hide_all = Alle Prüfungen verbergen
 pulls.status_checks_show_all = Alle Prüfungen anzeigen
 pulls.cmd_instruction_hint = Anweisungen für die Kommandozeile betrachten
@@ -2766,8 +2767,8 @@ wiki.cancel = Abbrechen
 settings.wiki_globally_editable = Allen erlauben, das Wiki zu bearbeiten
 settings.protect_branch_name_pattern_desc = Geschützte Branch-Namens-Patterns. Siehe <a href="%s">die Dokumentation</a> für Pattern-Syntax. Beispiele: main, release/**
 settings.ignore_stale_approvals = Abgestandene Genehmigungen ignorieren
-settings.ignore_stale_approvals_desc = Genehmigungen, welche für ältere Commits gemacht wurden (abgestandene Reviews), nicht in die Gesamtzahl der Genehmigung des PRs mitzählen. Irrelevant, falls abgestandene Reviews bereits verworfen werden.
-pulls.commit_ref_at = `hat sich auf diesen Pull-Request von einem Commit <a id="%[1]s" href="#%[1]s">%[2]s</a> bezogen`
+settings.ignore_stale_approvals_desc = Genehmigungen, welche für ältere Commits gemacht wurden (abgestandene Sichtungen), nicht in die Gesamtzahl der Genehmigung des PRs mitzählen. Irrelevant, falls abgestandene Sichtungen bereits verworfen werden.
+pulls.commit_ref_at = `referenzierte diesen Pull-Request aus einem Commit %s`
 pulls.fast_forward_only_merge_pull_request = Nur Fast-forward
 pulls.cmd_instruction_checkout_desc = Checke einen neuen Branch aus deinem Projekt-Repository aus und teste die Änderungen.
 pulls.cmd_instruction_merge_title = Zusammenführen
@@ -2782,7 +2783,7 @@ activity.navbar.contributors = Mitwirkende
 contributors.contribution_type.deletions = Löschungen
 contributors.contribution_type.additions = Einfügungen
 contributors.contribution_type.filter_label = Art des Beitrags:
-vendored = Vendored
+vendored = Gevendort
 activity.navbar.pulse = Puls
 pulls.made_using_agit = AGit
 settings.confirmation_string = Bestätigungsstring
@@ -2790,12 +2791,12 @@ pulls.agit_explanation = Mittels AGit-Workflow erstellt. AGit erlaubt Mitwirkend
 activity.navbar.recent_commits = Neueste Commits
 activity.navbar.code_frequency = Code-Häufigkeit
 file_follow = Symlink folgen
-error.broken_git_hook = Die Git-Hooks des Repositorys scheinen kaputt zu sein. Bitte folge der <a target="_blank" rel="noreferrer" href="%s">Dokumentation</a> um sie zu reparieren, dann pushe einige Commits um den Status zu aktualisieren.
+error.broken_git_hook = Die Git-Hooks des Repositorys scheinen kaputt zu sein. Bitte folge der <a target="_blank" rel="noreferrer" href="%s">Dokumentation</a>, um sie zu reparieren, dann pushe einige Commits, um den Status zu aktualisieren.
 pulls.merged_title_desc_one = hat %[1]d Commit von <code>%[2]s</code> nach <code>%[3]s</code> %[4]s zusammengeführt
 pulls.title_desc_one = möchte %[1]d Commit von <code>%[2]s</code> nach <code id="%[4]s">%[3]s</code> zusammenführen
 open_with_editor = Öffnen mit %s
 commits.search_branch = Dieser Branch
-pulls.ready_for_review = Bereit zum Review?
+pulls.ready_for_review = Bereit zur Sichtung?
 settings.rename_branch_failed_protected = Branch %s kann nicht umbenannt werden, weil er ein geschützter Branch ist.
 editor.commit_id_not_matching = Die Datei wurde geändert, während du sie bearbeitet hast. Committe in einen neuen Branch, dann führe einen Merge durch.
 editor.push_out_of_date = Der Push scheint veraltet zu sein.
@@ -2815,7 +2816,7 @@ issues.archived_label_description = (Archiviert) %s
 release.download_count_one = %s Download
 release.download_count_few = %s Downloads
 release.system_generated = Dieser Anhang wurde automatisch generiert.
-settings.add_webhook.invalid_path = Der Pfad darf kein „.“ oder „..“ enhalten, und darf auch nicht leer sein. Er darf auch nicht mit einem Slash anfangen oder enden.
+settings.add_webhook.invalid_path = Der Pfad darf kein „.“ oder „..“ enhalten und darf auch nicht leer sein. Er darf auch nicht mit einem Schrägstrich anfangen oder enden.
 settings.sourcehut_builds.graphql_url = GraphQL-URL (z.B. https://builds.sr.ht/query)
 settings.sourcehut_builds.manifest_path = Build-Manifest-Pfad
 settings.sourcehut_builds.visibility = Job-Sichtbarkeit
@@ -2823,9 +2824,9 @@ settings.sourcehut_builds.secrets = Geheimnisse
 settings.sourcehut_builds.secrets_helper = Dem Job zugriff auf die Build-Geheimnisse geben (benötigt die SECRETS:RO-Berechtigung)
 settings.web_hook_name_sourcehut_builds = SourceHut-Builds
 settings.graphql_url = GraphQL-URL
-settings.matrix.room_id_helper = Die Raum-ID kann über den Element-Webclient ermittelt werden: Raumeinstellungen > Erweitert > Interne Raum-ID. Beispielsweise %s.
-settings.sourcehut_builds.access_token_helper = Zugangstoken, der die JOBS:RW-Freigabe hat. Generiere auf meta.sr.ht einen <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-Token</a> oder einen <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-Token mit Zugriff auf die Secrets</a>.
-settings.matrix.access_token_helper = Es wird empfohlen, einen dedizierten Matrix-Account hierfür anzulegen. Der Zugangstoken kann in einem Incognito-Tab über den Element-Webclient geholt werden: Benutzermenü (oben links) > Alle Einstellungen > Hilfe & Über > Erweitert > Zugangstoken (direkt unter der Homeserver-URL). Schließe das Incognito-Tab dann (Abmelden würde den Token ungültig werden lassen).
+settings.matrix.room_id_helper = Die Raum-ID kann über den Element-Webclient ermittelt werden: Raumeinstellungen > erweitert > interne Raum-ID. Beispielsweise %s.
+settings.sourcehut_builds.access_token_helper = Zugangstoken, der die JOBS:RW-Freigabe hat. Generiere auf meta.sr.ht einen <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-Token</a> oder einen <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-Token mit Zugriff auf die Geheimnisse</a>.
+settings.matrix.access_token_helper = Es wird empfohlen, hierfür ein dediziertes Matrix-Konto anzulegen. Der Zugangstoken kann in einem Inkognito-Tab über den Element-Webclient geholt werden: Benutzermenü (oben links) > alle Einstellungen > Hilfe & Info > erweitert > Zugriffstoken (direkt unter der Heim-Server-URL). Schließe dann den Inkognito-Tab (Abmelden würde den Token ungültig machen).
 release.hide_archive_links = Automatisch generierte Archive verstecken
 release.hide_archive_links_helper = Verstecke automatisch generierte Quellcodearchive für diesen Release. Zum Beispiel, wenn du deine eigenen hochlädst.
 settings.transfer.button = Besitz übertragen
@@ -2873,9 +2874,9 @@ mirror_use_ssh.not_available = SSH-Authentifizierung ist nicht verfügbar.
 issues.new.assign_to_me = Mir selbst zuweisen
 issues.all_title = Alle
 settings.discord_icon_url.exceeds_max_length = Die Icon-URL darf eine Länge von 2048 Zeichen nicht überschreiten
-issues.review.add_review_requests = hat Reviews von %[1]s %[2]s angefragt
-issues.review.remove_review_requests = hat Aufforderungen zum Review an %[1]s %[2]s entfernt
-issues.review.add_remove_review_requests = hat Reviews von %[1]s angefragt und hat die Aufforderungen zum Review an %[2]s %[3]s entfernt
+issues.review.add_review_requests = hat Sichtungen von %[1]s %[2]s angefragt
+issues.review.remove_review_requests = hat die Sichtungsanfragen an %[1]s %[2]s entfernt
+issues.review.add_remove_review_requests = hat Sichtungen von %[1]s angefragt und die Sichtungsanfragen an %[2]s %[3]s entfernt
 pulls.delete_after_merge.head_branch.is_default = Der Head-Branch, den du löschen willst, ist der Standardbranch und kann nicht gelöscht werden.
 pulls.delete_after_merge.head_branch.is_protected = Der Head-Branch, den du löschen willst, ist ein geschützter Branch und kann nicht gelöscht werden.
 pulls.delete_after_merge.head_branch.insufficient_branch = Du hast keine Erlaubnis, den Head-Branch zu löschen.
@@ -2883,9 +2884,9 @@ issues.filter_sort.relevance = Relevanz
 diff.git-notes.add = Anmerkung hinzufügen
 diff.git-notes.remove-header = Anmerkung entfernen
 diff.git-notes.remove-body = Diese Anmerkung wird entfernt.
-issues.num_reviews_one = %d Review
+issues.num_reviews_one = %d Sichtung
 issues.summary_card_alt = Zusammenfassung eines Issues mit dem Titel „%s“ im Repository %s
-issues.num_reviews_few = %d Reviews
+issues.num_reviews_few = %d Sichtungen
 editor.add_tmpl.filename = Dateiname
 settings.default_update_style_desc = Standard-Aktualisierungsart um Pull-Requests zu aktualisieren, die hinter dem Base-Branch sind.
 new_advanced = Erweiterte Einstellungen
@@ -2902,7 +2903,7 @@ issues.reaction.alt_add = Füge %[1]s Reaktion zum Kommentar hinzu.
 issues.reaction.alt_remove = Entferne %[1]s Reaktion von diesem Kommentar.
 summary_card_alt = Zusammenfassungskarte des Repositorys %s
 release.summary_card_alt = Übersichtskarte eines Releases mit dem Titel „%s“ im Repository %s
-archive.pull.noreview = Dieses Repository ist archiviert. Pull-Requests können nicht gereviewt werden.
+archive.pull.noreview = Dieses Repository ist archiviert. Pull-Requests können nicht überprüft werden.
 editor.commit_email = Commit-E-Mail
 commits.view_single_diff = Änderungen an dieser Datei, die in diesem Commit eingeführt wurden, betrachten
 pulls.editable = Bearbeitbar
@@ -2911,6 +2912,20 @@ issues.reopen.blocked_by_user = Du kannst dieses Issue nicht wieder eröffnen, w
 pulls.comment.blocked_by_user = Du kannst diesen Pull-Request nicht kommentieren, da du vom Repository-Besitzer oder Ersteller des Pull-Requests blockiert wurdest.
 issues.filter_no_results = Keine Ergebnisse
 issues.filter_no_results_placeholder = Versuche, deine Suchfilter anzupassen.
+migrate.repo_desc_helper = Leer lassen, um vorhandene Beschreibung zu importieren
+archive.nocomment = Kommentieren ist nicht möglich, da das Repository archiviert ist.
+comment.blocked_by_user = Kommentieren ist nicht möglich, da du vom Repository-Besitzer oder vom Autor blockiert wurdest.
+sync_fork.branch_behind_one = Dieser Branch ist %[1]d Commit hinter %[2]s
+sync_fork.branch_behind_few = Dieser Branch ist %[1]d Commits hinter %[2]s
+sync_fork.button = Sync
+settings.event_action_failure_desc = Action-Run endete im Fehlschlag.
+settings.event_action_success_desc = Action-Run war erfolgreich.
+settings.event_action_failure = Fehlschlag
+settings.event_action_success = Erfolg
+settings.event_header_action = Action-Run-Ereignisse
+settings.event_action_recover_desc = Action-Run war erfolgreich, nachdem der letzte Action-Run im selben Workflow fehlgeschlagen ist.
+settings.event_action_recover = Wiederherstellen
+issues.filter_type.all_pull_requests = Alle Pull-Requests
 
 [graphs]
 component_loading_failed = Konnte %s nicht laden
@@ -2927,7 +2942,7 @@ org_name_holder=Name der Organisation
 org_full_name_holder=Vollständiger Name der Organisation
 org_name_helper=Organisationsnamen sollten kurz und einprägsam sein.
 create_org=Organisation erstellen
-repo_updated=Aktualisiert %s
+repo_updated=%s aktualisiert
 members=Mitglieder
 teams=Teams
 code=Quelltext
@@ -3000,7 +3015,7 @@ teams.leave.detail=Bist du dir sicher, dass du das Team „%s“ verlassen wills
 teams.can_create_org_repo=Repositorys erstellen
 teams.can_create_org_repo_helper=Mitglieder können neue Repositorys in der Organisation erstellen. Der Ersteller erhält Administrator-Zugriff auf das neue Repository.
 teams.none_access=Kein Zugriff
-teams.none_access_helper=Die Option „Kein Zugriff“ hat nur eine Auswirkung auf private Repositorys.
+teams.none_access_helper=Die Option „kein Zugriff“ hat nur Auswirkungen auf private Repositorys.
 teams.general_access=Benutzerdefinierter Zugriff
 teams.general_access_helper=Mitgliederberechtigungen werden durch folgende Berechtigungstabelle festgelegt.
 teams.read_access=Lesen
@@ -3047,8 +3062,8 @@ teams.invite.by=Von %s eingeladen
 teams.invite.description=Bitte klicke auf die folgende Schaltfläche, um dem Team beizutreten.
 follow_blocked_user = Du kannst dieser Organisation nicht folgen, weil diese Organisation dich blockiert hat.
 open_dashboard = Übersicht öffnen
-settings.change_orgname_redirect_prompt.with_cooldown.one = Der alte Organisationsname ist nach einer Abkühldauer von einem Tag wieder für alle Verfügbar. Du kannst den alten Namen während dieser Abkühldauer erneut beanspruchen.
-settings.change_orgname_redirect_prompt.with_cooldown.few = Der alte Organisationsname ist nach einer Abkühldauer von %[1]d Tagen wieder für alle Verfügbar. Du kannst den alten Namen während dieser Abkühldauer erneut beanspruchen.
+settings.change_orgname_redirect_prompt.with_cooldown.one = Der alte Organisationsname ist nach einer Schutzzeit von einem Tag wieder für alle verfügbar. Du kannst den alten Namen während dieser Schutzzeit erneut beanspruchen.
+settings.change_orgname_redirect_prompt.with_cooldown.few = Der alte Organisationsname ist nach einer Schutzzeit von %[1]d Tagen wieder für alle verfügbar. Du kannst den alten Namen während dieser Schutzzeit erneut beanspruchen.
 
 [admin]
 dashboard=Übersicht
@@ -3060,7 +3075,7 @@ repositories=Repositorys
 hooks=Webhooks
 integrations=Integrationen
 authentication=Authentifizierungsquellen
-emails=Benutzer E-Mails
+emails=Benutzer-E-Mails
 config=Konfiguration
 notices=Systemmitteilungen
 monitor=Monitoring
@@ -3102,7 +3117,7 @@ dashboard.repo_health_check=Healthchecks für alle Repositorys ausführen
 dashboard.check_repo_stats=Überprüfe alle Repository-Statistiken
 dashboard.archive_cleanup=Alte Repository-Archive löschen
 dashboard.deleted_branches_cleanup=Gelöschte Branches bereinigen
-dashboard.update_migration_poster_id=Migration Poster-IDs updaten
+dashboard.update_migration_poster_id=Migrations-Poster-IDs aktualisieren
 dashboard.git_gc_repos=Garbage-Collection für alle Repositorys ausführen
 dashboard.resync_all_sshkeys=Die Datei „.ssh/authorized_keys“ mit Forgejo-SSH-Schlüsseln aktualisieren.
 dashboard.resync_all_sshprincipals=Aktualisiere die Datei „.ssh/authorized_principals“ mit Forgejo-SSH-Principals.
@@ -3110,7 +3125,7 @@ dashboard.resync_all_hooks=Die „pre-receive“-, „update“- und „post-rec
 dashboard.reinit_missing_repos=Alle Git-Repositorys neu einlesen, für die Einträge existieren
 dashboard.sync_external_users=Externe Benutzerdaten synchronisieren
 dashboard.cleanup_hook_task_table=Hook-Task-Tabelle bereinigen
-dashboard.cleanup_packages=Veraltete Pakete löschen
+dashboard.cleanup_packages=Veraltete Pakete bereinigen
 dashboard.cleanup_actions=Abgelaufene Logs und Artefakte von Actions bereinigen
 dashboard.server_uptime=Server-Uptime
 dashboard.current_goroutine=Aktuelle Goroutinen
@@ -3123,7 +3138,7 @@ dashboard.memory_free_times=Speicherfreigaben
 dashboard.current_heap_usage=Aktuelle Heap-Auslastung
 dashboard.heap_memory_obtained=Erhaltener Heap-Memory
 dashboard.heap_memory_idle=Unbenutzter Heap-Memory
-dashboard.heap_memory_in_use=Benutzter Heap-Memory
+dashboard.heap_memory_in_use=Benutzter-Heap-Memory
 dashboard.heap_memory_released=Freigegebener Heap-Memory
 dashboard.heap_objects=Heap-Objekte
 dashboard.bootstrap_stack_usage=Bootstrap-Stack-Auslastung
@@ -3133,7 +3148,7 @@ dashboard.mspan_structures_obtained=Erhaltene MSpan-Structures
 dashboard.mcache_structures_usage=MCache-Structures-Auslastung
 dashboard.mcache_structures_obtained=Erhaltene MCache-Structures
 dashboard.profiling_bucket_hash_table_obtained=Erhaltene Analysesatz-Hashtabellen
-dashboard.gc_metadata_obtained=Erhaltene GC-Metadata
+dashboard.gc_metadata_obtained=Erhaltene GC-Metadaten
 dashboard.other_system_allocation_obtained=Andere erhaltene System-Allokationen
 dashboard.next_gc_recycle=Nächster GC-Zyklus
 dashboard.last_gc_time=Seit letztem GC-Zyklus
@@ -3145,7 +3160,7 @@ dashboard.delete_old_actions=Alle alten Aktivitäten aus der Datenbank löschen
 dashboard.delete_old_actions.started=Löschen aller alten Aktivitäten aus der Datenbank gestartet.
 dashboard.update_checker=Update-Checker
 dashboard.delete_old_system_notices=Alle alten Systemmeldungen aus der Datenbank löschen
-dashboard.gc_lfs=Garbage-Collection für LFS Meta-Objekte ausführen
+dashboard.gc_lfs=Garbage-Collection für LFS-Meta-Objekte ausführen
 dashboard.stop_zombie_tasks=Zombie-Actions-Aufgaben stoppen
 dashboard.stop_endless_tasks=Endlose Actions-Aufgaben stoppen
 dashboard.cancel_abandoned_jobs=Aufgegebene Actions-Jobs abbrechen
@@ -3256,7 +3271,7 @@ packages.size=Größe
 packages.published=Veröffentlicht
 
 defaulthooks=Standard-Webhooks
-defaulthooks.desc=Webhooks senden automatisch ein HTTP-POST-Anfragen an einen Server, wenn bestimmte Forgejo-Events ausgelöst werden. Hier definierte Webhooks sind die Standardwerte, die in alle neuen Repositorys kopiert werden. Mehr Infos findest du in der <a target="_blank" rel="noopener" href="%s">Webhooks-Anleitung</a> (auf Englisch).
+defaulthooks.desc=Webhooks senden automatisch HTTP-POST-Anfragen an einen Server, wenn bestimmte Forgejo-Events ausgelöst werden. Hier definierte Webhooks sind die Standardwerte, die in alle neuen Repositorys kopiert werden. Mehr Infos findest du in der <a target="_blank" rel="noopener" href="%s">Webhooks-Anleitung</a> (auf Englisch).
 defaulthooks.add_webhook=Standard-Webhook hinzufügen
 defaulthooks.update_webhook=Standard-Webhook aktualisieren
 
@@ -3321,7 +3336,7 @@ auths.pam_email_domain=PAM-E-Mail-Domain (optional)
 auths.oauth2_provider=OAuth2-Anbieter
 auths.oauth2_icon_url=Symbol-URL
 auths.oauth2_clientID=Client-ID (Schlüssel)
-auths.oauth2_clientSecret=Client-Secret
+auths.oauth2_clientSecret=Client-Geheimnis
 auths.openIdConnectAutoDiscoveryURL=OpenID-Connect-Auto-Discovery-URL
 auths.oauth2_use_custom_url=Benutzerdefinierte URLs anstelle von Standard-URLs verwenden
 auths.oauth2_tokenURL=Token-URL
@@ -3329,17 +3344,17 @@ auths.oauth2_authURL=Authorisierungs-URL
 auths.oauth2_profileURL=Profil-URL
 auths.oauth2_emailURL=E-Mail-URL
 auths.skip_local_two_fa=Lokale 2FA überspringen
-auths.skip_local_two_fa_helper=Leer lassen bedeutet, dass lokale User die 2FA immer noch bestehen müssen, um sich anzumelden
+auths.skip_local_two_fa_helper=Das Leerlassen bedeutet, dass lokale User die 2FA immer noch bestehen müssen, um sich anzumelden
 auths.oauth2_tenant=Inhaber
 auths.oauth2_scopes=Zusätzliche Bereiche
 auths.oauth2_required_claim_name=Benötigter Claim-Name
 auths.oauth2_required_claim_name_helper=Setze diesen Namen, damit Nutzer aus dieser Quelle sich nur anmelden dürfen, wenn sie einen Claim mit diesem Namen besitzen
 auths.oauth2_required_claim_value=Benötigter Claim-Wert
 auths.oauth2_required_claim_value_helper=Setze diesen Wert, damit Nutzer aus dieser Quelle sich nur anmelden dürfen, wenn sie einen Claim mit diesem Namen und Wert besitzen
-auths.oauth2_group_claim_name=Claim-Name, der Gruppennamen für diese Quelle angibt. (Optional)
-auths.oauth2_admin_group=Gruppen-Claim-Wert für Administratoren. (Optional – erfordert Claim-Namen oben)
+auths.oauth2_group_claim_name=Claim-Name, der Gruppennamen für diese Quelle angibt (optional).
+auths.oauth2_admin_group=Gruppen-Claim-Wert für Administratoren (optional – erfordert Claim-Namen oben).
 auths.oauth2_restricted_group=Gruppen-Claim-Wert für eingeschränkte User. (Optional – erfordert Claim-Namen oben)
-auths.oauth2_map_group_to_team=Gruppen aus OAuth-Claims den Organisationsteams zuordnen. (Optional – oben muss der Name des Claims angegeben werden)
+auths.oauth2_map_group_to_team=Gruppen aus OAuth-Claims den Organisationsteams zuordnen (optional – oben muss der Name des Claims angegeben werden).
 auths.oauth2_map_group_to_team_removal=Benutzer aus synchronisierten Teams entfernen, wenn der Benutzer nicht zur entsprechenden Gruppe gehört.
 auths.enable_auto_register=Automatische Registrierung aktivieren
 auths.sspi_auto_create_users=Benutzer automatisch anlegen
@@ -3381,7 +3396,7 @@ auths.still_in_used=Diese Authentifizierungsquelle wird noch verwendet. Bearbeit
 auths.deletion_success=Die Authentifizierungsquelle „%s“ wurde gelöscht.
 auths.login_source_exist=Die Authentifizierungsquelle „%s“ existiert bereits.
 auths.login_source_of_type_exist=Eine Authentifizierungart dieses Typs existiert bereits.
-auths.unable_to_initialize_openid=OpenID Connect Provider konnte nicht initialisiert werden: %s
+auths.unable_to_initialize_openid=Provider für OpenID Connect konnte nicht initialisiert werden: %s
 auths.invalid_openIdConnectAutoDiscoveryURL=Ungültige Auto-Discovery-URL (dies muss eine gültige URL sein, die mit http:// oder https:// beginnt)
 
 config.server_config=Serverkonfiguration
@@ -3433,7 +3448,7 @@ config.service_config=Service-Konfiguration
 config.register_email_confirm=E-Mail-Bestätigung benötigt zum Registrieren
 config.disable_register=Selbstregistrierung deaktivieren
 config.allow_only_internal_registration=Registrierung nur über Forgejo selbst erlauben
-config.allow_only_external_registration=Registrierung nur über externe Services erlauben
+config.allow_only_external_registration=Registrierung nur über externe Dienste erlauben
 config.enable_openid_signup=OpenID-Selbstregistrierung aktivieren
 config.enable_openid_signin=OpenID-Anmeldung aktivieren
 config.show_registration_button=Schaltfläche zum Registrieren anzeigen
@@ -3486,7 +3501,7 @@ config.cache_conn=Cache-Anbindung
 config.cache_item_ttl=Cache-Item-TTL
 
 config.session_config=Session-Konfiguration
-config.session_provider=Session-Provider
+config.session_provider=Session-Anbieter
 config.provider_config=Provider-Einstellungen
 config.cookie_name=Cookie-Name
 config.gc_interval_time=GC-Intervall
@@ -3495,7 +3510,7 @@ config.https_only=Nur HTTPS
 config.cookie_life_time=Cookie-Lebensdauer
 
 config.picture_config=Bild-und-Profilbild-Konfiguration
-config.picture_service=Bilderservice
+config.picture_service=Bilderdienst
 config.disable_gravatar=Gravatar deaktivieren
 config.enable_federated_avatar=Föderierte Profilbilder einschalten
 
@@ -3511,11 +3526,11 @@ config.git_clone_timeout=Zeitlimit für Klon
 config.git_pull_timeout=Zeitlimit für Pull
 config.git_gc_timeout=Zeitlimit für GC
 
-config.log_config=Konfiguration des Loggings
-config.logger_name_fmt=Logger: %s
+config.log_config=Protokollierungs-Konfiguration
+config.logger_name_fmt=Protokollierer: %s
 config.disabled_logger=Deaktiviert
-config.access_log_mode=Zugriffslog-Modus
-config.access_log_template=Zugriffslog-Vorlage
+config.access_log_mode=Zugriffsprotokoll-Modus
+config.access_log_template=Zugriffsprotokoll-Vorlage
 config.xorm_log_sql=SQL protokollieren
 
 config.set_setting_failed=Konfiguration von %s ist fehlgeschlagen
@@ -3550,7 +3565,7 @@ monitor.queue.numberworkers=Anzahl der Worker
 monitor.queue.activeworkers=Aktive Worker
 monitor.queue.maxnumberworkers=Maximale Anzahl der Worker
 monitor.queue.numberinqueue=Nummer in der Warteschlange
-monitor.queue.review_add=Worker hinzufügen / prüfen
+monitor.queue.review_add=Worker hinzufügen/prüfen
 monitor.queue.settings.title=Pool-Einstellungen
 monitor.queue.settings.desc=Pools wachsen dynamisch basierend auf der Blockierung der Arbeitswarteschlange.
 monitor.queue.settings.maxnumberworkers=Maximale Anzahl an Workern
@@ -3596,12 +3611,12 @@ config.cache_test_failed = Konnte den Cache nicht untersuchen: %v.
 config.cache_test_succeeded = Cache-Test erfolgreich, eine Antwort erhalten in %s.
 config.cache_test = Cache testen
 config.cache_test_slow = Cache-Test erfolgreich, aber die Antwort ist langsam: %s.
-users.block.description = Interaktionen mit diesen Dienst für diesen Benutzer mit seinem Account blockierten und Einloggen verhindern.
+users.block.description = Diesem Benutzer verbieten, durch sein Konto mit diesem Dienst zu interagieren, und ihn am Einloggen hindern.
 users.restricted.description = Nur Interaktionen mit den Repositorys und Organisationen erlauben, wo der Benutzer als Mitarbeiter hinzugefügt wurde. Dies verhindert Zugriff auf öffentliche Repositorys in dieser Instanz.
 users.local_import.description = Import von Repositorys aus dem lokalen Dateisystem des Servers erlauben. Dies kann ein Sicherheitsproblem sein.
 users.organization_creation.description = Erstellung neuer Organisationen erlauben.
 users.activated.description = Abschluss der E-Mail-Verifizierung. Der Besitzer eines nicht aktivierten Accounts wird nicht in der Lage sein, sich einzuloggen, bis die E-Mail-Verifikation abgeschlossen wurde.
-users.admin.description = Diesen Benutzer vollständigen Zugriff zu allen administrativen Features gewähren mittels der Web-UI und der API.
+users.admin.description = Diesem Benutzer vollständigen Zugriff zu allen administrativen Funktionen gewähren, die über das Web-UI und die API verfügbar sind.
 emails.delete = E-Mail löschen
 emails.deletion_success = Die E-Mail-Adresse wurde gelöscht.
 emails.delete_primary_email_error = Du kannst die primäre E-Mail nicht löschen.
@@ -3626,7 +3641,7 @@ auto_merge_pull_request=`führte Pull-Request <a href="%[1]s">%[3]s#%[2]s</a> au
 transfer_repo=hat Repository <code>%s</code> übertragen zu <a href="%s">%s</a>
 push_tag=hat Tag <a href="%[2]s">%[3]s</a> auf <a href="%[1]s">%[4]s</a> gepusht
 delete_tag=hat Tag %[2]s in <a href="%[1]s">%[3]s</a> gelöscht
-delete_branch=hat Branch %[2]s in <a href="%[1]s">%[3]s</a> gelöscht
+delete_branch=hat Branch <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> gelöscht
 compare_branch=Vergleichen
 compare_commits=Vergleiche %d Commits
 compare_commits_general=Commits vergleichen
@@ -3636,7 +3651,7 @@ mirror_sync_delete=hat die Referenz des Spiegels <code>%[2]s</code> in <a href="
 approve_pull_request=`hat <a href="%[1]s">%[3]s#%[2]s</a> genehmigt`
 reject_pull_request=`schlug Änderungen für <a href="%[1]s">%[3]s#%[2]s</a> vor`
 publish_release=`veröffentlichte Release <a href="%[2]s">%[4]s</a> in <a href="%[1]s">%[3]s</a>`
-review_dismissed=`verwarf das Review von <b>%[4]s</b> in <a href="%[1]s">%[3]s#%[2]s</a>`
+review_dismissed=`verwarf die Sichtung von <b>%[4]s</b> in <a href="%[1]s">%[3]s#%[2]s</a>`
 review_dismissed_reason=Grund:
 create_branch=legte den Branch <a href="%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> an
 starred_repo=favorisierte <a href="%[1]s">%[2]s</a>
@@ -3751,9 +3766,9 @@ conda.registry=Richte diese Registry als Conda-Repository in deiner <code>.conda
 conda.install=Um das Paket mit Conda zu installieren, führe den folgenden Befehl aus:
 container.details.type=Abbildtyp
 container.details.platform=Plattform
-container.pull=Downloade das Container-Image aus der Kommandozeile:
-container.digest=Digest
-container.multi_arch=Betriebsystem / Architektur
+container.pull=Lade das Container-Image von der Kommandozeile aus herunter:
+container.digest=Prüfsumme
+container.multi_arch=Betriebsystem/Architektur
 container.layers=Abbildebenen
 container.labels=Labels
 container.labels.key=Schlüssel
@@ -3767,12 +3782,12 @@ debian.repository=Repository-Informationen
 debian.repository.distributions=Distributionen
 debian.repository.components=Komponenten
 debian.repository.architectures=Architekturen
-generic.download=Downloade das Paket aus der Kommandozeile:
+generic.download=Lade das Paket mit der Kommandozeile herunter:
 go.install=Installiere das Paket über die Kommandozeile:
 helm.registry=Diese Paketverwaltung über die Kommandozeile einrichten:
 helm.install=Nutze folgenden Befehl, um das Paket zu installieren:
 maven.registry=Setze diese Paketverwaltung in der <code>pom.xml</code> deines Projektes auf:
-maven.install=Um das Paket zu verwenden, nimm folgendes in den <code>dependencies</code>-Block in der <code>pom.xml</code>-Datei auf:
+maven.install=Um das Paket zu verwenden, nimm Folgendes in den <code>dependencies</code>-Block in der <code>pom.xml</code>-Datei auf:
 maven.install2=Über die Kommandozeile ausführen:
 maven.download=Nutze folgendes Kommando, um die Abhängigkeit herunterzuladen:
 nuget.registry=Diese Registry über die Kommandozeile einrichten:
@@ -3799,10 +3814,10 @@ rubygems.install=Um das Paket mit gem zu installieren, führe den folgenden Befe
 rubygems.install2=oder füg es zum Gemfile hinzu:
 rubygems.dependencies.runtime=Laufzeitabhängigkeiten
 rubygems.dependencies.development=Entwicklungsabhängigkeiten
-rubygems.required.ruby=Benötigt Ruby Version
-rubygems.required.rubygems=Benötigt RubyGem Version
+rubygems.required.ruby=Benötigt Ruby-Version
+rubygems.required.rubygems=Benötigt RubyGem-Version
 swift.registry=Diese Registry über die Kommandozeile einrichten:
-swift.install=Füge das Paket deiner <code>Package.swift</code> Datei hinzu:
+swift.install=Füge das Paket deiner <code>Package.swift</code>-Datei hinzu:
 swift.install2=und führe den folgenden Befehl aus:
 vagrant.install=Um eine Vagrant-Box hinzuzufügen, führe den folgenden Befehl aus:
 settings.link=Dieses Paket einem Repository zuweisen
@@ -3847,7 +3862,7 @@ owner.settings.cleanuprules.success.update=Bereinigungsregel wurde aktualisiert.
 owner.settings.cleanuprules.success.delete=Bereinigungsregel wurde gelöscht.
 owner.settings.chef.title=Chef-Registry
 owner.settings.chef.keypair=Schlüsselpaar generieren
-owner.settings.chef.keypair.description=Ein Schlüsselpaar ist notwendig, um mit der Chef-Registry zu authentifizieren. Wenn du bereits eins erstellt hast, wird dieses durch eine Neuerstellung verworfen.
+owner.settings.chef.keypair.description=Anfragen an die Chef-Registry müssen zur Authentifizierung kryptografisch signiert werden. Beim Erstellen eines Schlüsselpaars wird nur der öffentliche Schlüssel in Forgejo gespeichert. Der private Schlüssel wird dir für die Verwendung mit knife bereitgestellt. Das Generieren eines neuen Schlüsselpaars überschreibt das vorherige.
 rpm.repository.multiple_groups = Dieses Paket ist in mehreren Gruppen verfügbar.
 owner.settings.cargo.rebuild.no_index = Kann nicht erneut erzeugen, es wurde kein Index initialisiert.
 npm.dependencies.bundle = Gebündelte Abhängigkeiten
@@ -3878,19 +3893,19 @@ alt.repository.architectures = Architekturen
 alt.repository.multiple_groups = Dieses Paket ist in verschiedenen Gruppen verfügbar.
 
 [secrets]
-secrets=Secrets
-description=Secrets werden an bestimmte Aktionen weitergegeben und können nicht anderweitig ausgelesen werden.
-none=Noch keine Secrets vorhanden.
-creation=Secret hinzufügen
+secrets=Geheimnisse
+description=Geheimnisse werden an bestimmte Aktionen weitergegeben und können nicht anderweitig ausgelesen werden.
+none=Noch keine Geheimnisse vorhanden.
+creation=Geheimnis hinzufügen
 creation.name_placeholder=Groß-/Kleinschreibung wird ignoriert, nur alphanumerische Zeichen oder Unterstriche, darf nicht mit GITEA_ oder GITHUB_ beginnen
 creation.value_placeholder=Beliebigen Inhalt eingeben. Leerzeichen am Anfang und Ende werden weggelassen.
-creation.success=Das Secret „%s“ wurde hinzugefügt.
-creation.failed=Secret konnte nicht hinzugefügt werden.
-deletion=Secret entfernen
-deletion.description=Das Entfernen eines Secrets kann nicht rückgängig gemacht werden. Fortfahren?
-deletion.success=Das Secret wurde entfernt.
-deletion.failed=Secret konnte nicht entfernt werden.
-management=Secrets verwalten
+creation.success=Das Geheimnis „%s“ wurde hinzugefügt.
+creation.failed=Geheimnis konnte nicht hinzugefügt werden.
+deletion=Geheimnis entfernen
+deletion.description=Das Entfernen eines Geheimnisses kann nicht rückgängig gemacht werden. Fortfahren?
+deletion.success=Das Geheimnis wurde entfernt.
+deletion.failed=Geheimnis konnte nicht entfernt werden.
+management=Geheimnisse verwalten
 
 [actions]
 actions=Actions
@@ -4025,7 +4040,7 @@ repo_kind = Repos suchen …
 user_kind = Benutzer suchen …
 org_kind = Orgs suchen …
 team_kind = Teams suchen …
-code_kind = Code suchen…
+code_kind = Code durchsuchen …
 package_kind = Pakete suchen …
 project_kind = Projekte suchen …
 branch_kind = Branches suchen …
@@ -4073,12 +4088,12 @@ releases.read = <b>Lesen:</b> Releases ansehen und herunterladen.
 releases.write = <b>Schreiben:</b> Releases und ihre Assets veröffentlichen, bearbeiten und löschen.
 wiki.read = <b>Lesen:</b> Das integrierte Wiki und seine Historie lesen.
 wiki.write = <b>Schreiben:</b> Seiten im integrierten Wiki erstellen, aktualisieren und löschen.
-projects.read = <b>Lesen:</b> Zugriff auf Projektboards des Repositories.
+projects.read = <b>Lesen:</b> Zugriff auf Projektboards des Repositorys.
 projects.write = <b>Schreiben:</b> Projekte und Spalten erstellen und bearbeiten.
-packages.read = <b>Lesen:</b> Pakete dieses Repositories betrachten und herunterladen.
-packages.write = <b>Schreiben:</b> Pakete dieses Repositories veröffentlichen und löschen.
+packages.read = <b>Lesen:</b> Pakete dieses Repositorys betrachten und herunterladen.
+packages.write = <b>Schreiben:</b> Pakete dieses Repositorys veröffentlichen und löschen.
 actions.read = <b>Lesen:</b> Integrierte CI/CD-Pipelines und ihre Logs betrachten.
-actions.write = <b>Schreiben:</b> Ausstehende CI/CD-Pipelines manuell auslösen, neustarten, abbrechen oder genehmigen.
+actions.write = <b>Schreiben:</b> Ausstehende CI/CD-Pipelines manuell auslösen, neu starten, abbrechen oder genehmigen.
 ext_issues = Zugriff auf den Link zu einem externen Issue-Tracker. Die Berechtigungen werden extern verwaltet.
 ext_wiki = Zugriff auf den Link zu einem externen Wiki. Die Berechtigungen werden extern verwaltet.
 pulls.write = <b>Schreiben:</b> Pull-Requests schließen und Metadaten wie Labels, Meilensteine, Zuweisungen, Fälligkeitsdaten und Abhängigkeiten verwalten.
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
index a3b211ea2c..a33117db22 100644
--- a/options/locale/locale_el-GR.ini
+++ b/options/locale/locale_el-GR.ini
@@ -112,7 +112,7 @@ preview=Προεπισκόπηση
 loading=Φόρτωση…
 
 error=Σφάλμα
-error404=Η σελίδα που προσπαθείτε να φτάσετε είτε <strong>δεν υπάρχει</strong> είτε <strong>δεν είστε εξουσιοδοτημένοι</strong> για να την δείτε.
+error404=Η σελίδα που προσπαθείτε να φτάσετε είτε <strong>δεν υπάρχει</strong>, <strong>έχει αφαιρεθεί</strong> είτε <strong>δεν είστε εξουσιοδοτημένοι</strong> για να την δείτε.
 go_back=Επιστροφή
 
 never=Ποτέ
@@ -206,7 +206,6 @@ table_modal.placeholder.content = Περιεχόμενο
 table_modal.label.rows = Σειρές
 table_modal.label.columns = Στήλες
 buttons.new_table.tooltip = Προσθήκη πίνακα
-
 link_modal.header = Προσθήκη υπερσυνδέσμου
 link_modal.url = URL
 link_modal.description = Περιγραφή
@@ -260,7 +259,7 @@ err_empty_db_path=Η διαδρομή της βάσης δεδομένων SQLit
 no_admin_and_disable_registration=Δεν μπορείτε να απενεργοποιήσετε την ιδιο-εγγραφή χρήστη χωρίς να έχετε δημιουργήσει διαχειριστικό λογαριασμό.
 err_empty_admin_password=Ο κωδικός πρόσβασης του διαχειριστή δεν μπορεί να είναι κενός.
 err_empty_admin_email=Το email του διαχειριστή δεν μπορεί να είναι κενό.
-err_admin_name_is_reserved=Το όνομα χρήστη του Διαχειριστή δεν είναι έγκυρο, αυτό το όνομα είναι δεσμευμένο
+err_admin_name_is_reserved=Το όνομα χρήστη Administrator δεν είναι έγκυρο, είναι δεσμευμένο
 err_admin_name_pattern_not_allowed=Το Όνομα χρήστη του Διαχειριστή δεν είναι έγκυρο, ταιριάζει σε μια δεσμευμένη μορφή
 err_admin_name_is_invalid=Το όνομα χρήστη του Διαχειριστή δεν είναι έγκυρο
 
@@ -462,7 +461,7 @@ openid_connect_title=Σύνδεση σε υπάρχων λογαριασμό
 openid_connect_desc=Το επιλεγμένο OpenID URI είναι άγνωστο. Συνδέστε το με ένα νέο λογαριασμό εδώ.
 openid_register_title=Δημιουργία νέου λογαριασμού
 openid_register_desc=Το επιλεγμένο OpenID URI είναι άγνωστο. Συνδέστε το με ένα νέο λογαριασμό εδώ.
-openid_signin_desc=Εισάγετε το OpenID URI σας. Για παράδειγμα: ioanna.openid.example.org ή https://openid.example.org/grigoris.
+openid_signin_desc=Εισάγετε το OpenID URI σας. Για παράδειγμα: ioanna.openid.example.org ή https://openid.example.org/ioanna.
 disable_forgot_password_mail=Ο λογαριασμός δεν μπορεί να ανακτηθεί επειδή δεν αντιστοιχείται κάποιο email με αυτόν τον λογαριασμό. Παρακαλούμε επικοινωνήστε με τον διαχειριστή σας.
 disable_forgot_password_mail_admin=Η ανάκτηση λογαριασμού είναι διαθέσιμη μόνο όταν έχει οριστεί το email. Παρακαλούμε ορίστε το email σας για να ενεργοποιήσετε την ανάκτηση λογαριασμού.
 email_domain_blacklisted=Δεν μπορείτε να εγγραφείτε με τη διεύθυνση email σας.
@@ -1627,13 +1626,13 @@ issues.close_comment_issue=Αποστολή σχολίου και κλείσιμ
 issues.reopen_issue=Ανοίξτε ξανά
 issues.reopen_comment_issue=Αποστολή σχολίου και επανάνοιγμα ζητήματος
 issues.create_comment=Προσθήκη Σχολίου
-issues.closed_at=`αυτό το ζήτημα έκλεισε <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`ξανά άνοιξε αυτό το ζήτημα <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`αναφορά σε αυτό το ζήτημα από την παραπομπή <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">αναφέρθηκε σε αυτό το ζήτημα %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">αναφέρθηκε σε αυτό το pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">ανέφερε αυτό το ζήτημα σε ένα pull request %[4]s που στοχεύει να κλείσει το ζήτημα</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">αναφέρθηκε σε αυτό το ζήτημα σε ένα pull request %[4]s που θα ξαναανοίξει αυτό το ζήτημα</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`αυτό το ζήτημα έκλεισε %s`
+issues.reopened_at=`ξανά άνοιξε αυτό το ζήτημα %s`
+issues.commit_ref_at=`αναφορά σε αυτό το ζήτημα από την παραπομπή %s`
+issues.ref_issue_from=`<a href="%[2]s">αναφέρθηκε σε αυτό το ζήτημα %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">αναφέρθηκε σε αυτό το pull request %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">ανέφερε αυτό το ζήτημα σε ένα pull request %[3]s που στοχεύει να κλείσει το ζήτημα</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">αναφέρθηκε σε αυτό το ζήτημα σε ένα pull request %[3]s που θα ξαναανοίξει αυτό το ζήτημα</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">έκλεισε αυτό το ζήτημα %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">άνοιξε ξανά αυτό το ζήτημα %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`από %[1]s`
@@ -1738,7 +1737,7 @@ issues.error_modifying_due_date=Προέκυψε σφάλμα κατά την α
 issues.error_removing_due_date=Προέκυψε σφάλμα κατά την κατάργηση ημερομηνίας παράδοσης.
 issues.push_commit_1=πρόσθεσε %d υποβολή %s
 issues.push_commits_n=πρόσθεσε %d υποβολές %s
-issues.force_push_codes=`έκανε force-push %[1]s από το <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> στο <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`έκανε force-push %[1]s από το <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s στο <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Σύγκριση
 issues.due_date_form=εεεε-μμ-ηη
 issues.due_date_form_add=Προσθήκη ημερομηνίας παράδοσης
@@ -1940,8 +1939,8 @@ pulls.update_branch_success=Η ενημέρωση του κλάδου ήταν 
 pulls.update_not_allowed=Δεν επιτρέπεται να ενημερώσετε τον κλάδο
 pulls.outdated_with_base_branch=Αυτός ο κλάδος δεν είναι ενημερωμένος με τον βασικό κλάδο
 pulls.close=Κλείσιμο pull request
-pulls.closed_at=`έκλεισε αυτό το pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`άνοιξε ξανά αυτό το pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`έκλεισε αυτό το pull request %s`
+pulls.reopened_at=`άνοιξε ξανά αυτό το pull request %s`
 pulls.cmd_instruction_hint=Προβολή οδηγιών γραμμής εντολών
 pulls.cmd_instruction_checkout_title=Έλεγχος
 pulls.cmd_instruction_checkout_desc=Από το repository του έργου σας, ελέγξτε έναν νέο κλάδο και δοκιμάστε τις αλλαγές.
@@ -2721,7 +2720,7 @@ settings.new_owner_blocked_doer = Ο νέος κάτοχος του αποθετ
 settings.enter_repo_name = Γράψτε το όνομα του κατόχου και του αποθετηρίου ακριβώς όπως το βλέπετε:
 settings.confirmation_string = Κείμενο επιβεβαίωσης
 settings.units.overview = Επισκόπηση
-pulls.commit_ref_at = `ανέφερε το pull request στο commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `ανέφερε το pull request στο commit %s`
 contributors.contribution_type.filter_label = Είδος συνεισφοράς:
 settings.wiki_rename_branch_main_notices_1 = Αυτή η ενέργεια <strong>ΔΕΝ</strong> αναιρείται.
 activity.navbar.contributors = Συνεισφέροντες
@@ -3564,7 +3563,7 @@ auto_merge_pull_request=`αυτόματη συγχώνευση του pull reque
 transfer_repo=μετέφερε το repository <code>%s</code> σε <a href="%s">%s</a>
 push_tag=ώθησε την ετικέτα <a href="%[2]s">%[3]s</a> σε <a href="%[1]s">%[4]s</a>
 delete_tag=διέγραψε την ετικέτα %[2]s από <a href="%[1]s">%[3]s</a>
-delete_branch=διέγραψε το κλάδο %[2]s από <a href="%[1]s">%[3]s</a>
+delete_branch=διέγραψε το κλάδο <code>%[2]s</code> από <a href="%[1]s">%[3]s</a>
 compare_branch=Σύγκριση
 compare_commits=Σύγκριση %d commit
 compare_commits_general=Σύγκριση commits
@@ -3940,31 +3939,31 @@ submodule=Υπομονάδα
 [search]
 code_search_unavailable = Η αναζήτηση κώδικα δεν είναι επί του παρόντος διαθέσιμη. Παρακαλώ επικοινωνήστε με τον διαχειριστή σας.
 keyword_search_unavailable = Η αναζήτηση με την χρήση λέξεων-κλειδιών δεν είναι επί του παρόντος διαθέσιμη. Παρακαλώ επικοινωνήστε με τον διαχειριστή σας.
-runner_kind = Αναζήτηση runner...
+runner_kind = Αναζήτηση runner…
 code_search_by_git_grep = Για την αναζήτηση κώδικα, χρησιμοποιείται η εντολή «git grep». Ίσως να παρουσιαστούν καλύτερα αποτελέσματα, αν ο διαχειριστής σας ενεργοποιήσει ένα ευρετήριο για αποθετήρια («Repository Indexer»).
-package_kind = Αναζήτηση πακέτων...
-project_kind = Αναζήτηση έργων...
-branch_kind = Αναζήτηση κλάδων...
-commit_kind = Αναζήτηση commit...
+package_kind = Αναζήτηση πακέτων…
+project_kind = Αναζήτηση έργων…
+branch_kind = Αναζήτηση κλάδων…
+commit_kind = Αναζήτηση commit…
 no_results = Δεν βρέθηκαν κατάλληλα αποτελέσματα.
-search = Αναζήτηση...
+search = Αναζήτηση…
 type_tooltip = Είδος αναζήτησης
 fuzzy = Στο περίπου
 fuzzy_tooltip = Να συμπεριληφθούν αποτελέσματα που μοιάζουν με τον όρο αναζήτησης
 match = Ακριβής
 match_tooltip = Να συμπεριληφθούν αποτελέσματα που ταιριάζουν με τον όρο αναζήτησης
-repo_kind = Αναζήτηση αποθετηρίων...
-user_kind = Αναζήτηση χρηστών...
-org_kind = Αναζήτηση οργανισμών...
-team_kind = Αναζήτηση ομαδών...
-code_kind = Αναζήτηση κώδικα...
+repo_kind = Αναζήτηση αποθετηρίων…
+user_kind = Αναζήτηση χρηστών…
+org_kind = Αναζήτηση οργανισμών…
+team_kind = Αναζήτηση ομαδών…
+code_kind = Αναζήτηση κώδικα…
 exact_tooltip = Να συμπεριληφθούν μόνο αποτελέσματα που ταιριάζουν με τον όρο αναζήτησης
-issue_kind = Αναζήτηση ζητημάτων...
-pull_kind = Αναζήτηση pull...
+issue_kind = Αναζήτηση ζητημάτων…
+pull_kind = Αναζήτηση pull…
 exact = Ακριβής
 milestone_kind = Αναζήτηση ορόσημων...
 union = Ένωση
-union_tooltip = Να συμπεριληφθούν αποτελέσματα που περιέχουν οποιαδήποτε από τις λέξεις που έχουν εισαχθεί και διαχωριστεί με κενό
+union_tooltip = Να συμπεριληφθούν αποτελέσματα που περιέχουν οποιαδήποτε από τις λέξεις χωρισμένες με κενό
 regexp = Κανονική Έκφραση
 regexp_tooltip = Ερμηνεία του όρου αναζήτησης ως κανονική έκφραση
 
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index bfdcdb9112..1dc6d38c8c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -7,9 +7,9 @@ logo = Logo
 sign_in = Sign in
 sign_in_with_provider = Sign in with %s
 sign_in_or = or
-sign_out = Sign Out
+sign_out = Sign out
 sign_up = Register
-link_account = Link Account
+link_account = Link account
 register = Register
 version = Version
 powered_by = Powered by %s
@@ -372,7 +372,7 @@ no_reply_address = Hidden email domain
 no_reply_address_helper = Domain name for users with a hidden email address. For example, the username "joe" will be logged in Git as "joe@noreply.example.org" if the hidden email domain is set to "noreply.example.org".
 password_algorithm = Password hash algorithm
 invalid_password_algorithm = Invalid password hash algorithm
-password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
+password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strengths. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems.
 enable_update_checker = Enable update checker
 env_config_keys = Environment Configuration
 env_config_keys_prompt = The following environment variables will also be applied to your configuration file:
@@ -479,7 +479,7 @@ email_domain_blacklisted = You cannot register with your email address.
 authorize_application = Authorize Application
 authorize_redirect_notice = You will be redirected to %s if you authorize this application.
 authorize_application_created_by = This application was created by %s.
-authorize_application_description = If you grant the access, it will be able to access and write to all your account information, including private repos and organizations.
+authorize_application_description = If you grant access, it will be able to access and write to all your account information, including private repos and organizations.
 authorize_title = Authorize "%s" to access your account?
 authorization_failed = Authorization failed
 authorization_failed_desc = The authorization failed because we detected an invalid request. Please contact the maintainer of the app you have tried to authorize.
@@ -740,7 +740,7 @@ ssh_gpg_keys = SSH / GPG keys
 applications = Applications
 orgs = Organizations
 repos = Repositories
-delete = Delete Account
+delete = Delete account
 twofa = Two-factor authentication (TOTP)
 organization = Organizations
 uid = UID
@@ -768,8 +768,8 @@ update_profile_success = Your profile has been updated.
 change_username = Your username has been changed.
 change_username_prompt = Note: Changing your username also changes your account URL.
 change_username_redirect_prompt = The old username will redirect until someone claims it.
-change_username_redirect_prompt.with_cooldown.one = The old username will be available to everyone after a cooldown period of %[1]d day, you can still reclaim the old username during the cooldown period.
-change_username_redirect_prompt.with_cooldown.few = The old username will be available to everyone after a cooldown period of %[1]d days, you can still reclaim the old username during the cooldown period.
+change_username_redirect_prompt.with_cooldown.one = The old username will be available to everyone after a cooldown period of %[1]d day. You can still reclaim the old username during the cooldown period.
+change_username_redirect_prompt.with_cooldown.few = The old username will be available to everyone after a cooldown period of %[1]d days. You can still reclaim the old username during the cooldown period.
 continue = Continue
 cancel = Cancel
 language = Language
@@ -838,7 +838,7 @@ activations_pending = Activations pending
 can_not_add_email_activations_pending = There is a pending activation, try again in a few minutes if you want to add a new email.
 delete_email = Remove
 email_deletion = Remove email address
-email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue?
+email_deletion_desc = This email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue?
 email_deletion_success = The email address has been removed.
 theme_update_success = Your theme was updated.
 theme_update_error = The selected theme does not exist.
@@ -895,6 +895,7 @@ ssh_invalid_token_signature = The provided SSH key, signature or token do not ma
 ssh_token_required = You must provide a signature for the below token
 ssh_token = Token
 ssh_token_help = You can generate a signature using:
+ssh_token_help_ssh_agent = or, if you're using an SSH agent (with the SSH_AUTH_SOCK variable set):
 ssh_token_signature = Armored SSH signature
 key_signature_ssh_placeholder = Begins with "-----BEGIN SSH SIGNATURE-----"
 verify_ssh_key_success = SSH key "%s" has been verified.
@@ -1056,7 +1057,7 @@ user_block_success = The user has been blocked successfully.
 user_block_yourself = You cannot block yourself.
 
 quota.applies_to_user = The following quota rules apply to your account
-quota.applies_to_org = The following quota rules apply to this organisation
+quota.applies_to_org = The following quota rules apply to this organization
 quota.rule.exceeded = Exceeded
 quota.rule.exceeded.helper = The total size of objects for this rule has exceeded the quota.
 quota.rule.no_limit = Unlimited
@@ -1153,7 +1154,7 @@ mirror_sync = synced
 mirror_sync_on_commit = Sync when commits are pushed
 mirror_address = Clone from URL
 mirror_address_desc = Put any required credentials in the Authorization section.
-mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the URL correctly.
+mirror_address_url_invalid = The provided URL is invalid. Make sure that components of the URL are escaped correctly.
 mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring.
 mirror_lfs = Large File Storage (LFS)
 mirror_lfs_desc = Activate mirroring of LFS data.
@@ -1215,12 +1216,15 @@ template.issue_labels = Issue labels
 template.one_item = Must select at least one template item
 template.invalid = Must select a template repository
 
-archive.title = This repository is archived. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.
-archive.title_date = This repository has been archived on %s. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.
-archive.issue.nocomment = This repository is archived. You cannot comment on issues.
-archive.pull.nocomment = This repository is archived. You cannot comment on pull requests.
+archive.title = This repository is archived. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
+archive.title_date = This repository has been archived on %s. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
+archive.nocomment = Commenting is not possible because the repository is archived.
 archive.pull.noreview = This repository is archived. You cannot review pull requests.
 
+sync_fork.branch_behind_one = This branch is %[1]d commit behind %[2]s
+sync_fork.branch_behind_few = This branch is %[1]d commits behind %[2]s
+sync_fork.button = Sync
+
 form.reach_limit_of_creation_1 = The owner has already reached the limit of %d repository.
 form.reach_limit_of_creation_n = The owner has already reached the limit of %d repositories.
 form.name_reserved = The repository name "%s" is reserved.
@@ -1245,9 +1249,10 @@ migrate_items_pullrequests = Pull requests
 migrate_items_merge_requests = Merge requests
 migrate_items_releases = Releases
 migrate_repo = Migrate repository
+migrate.repo_desc_helper = Leave empty to import existing description
 migrate.clone_address = Migrate / Clone from URL
 migrate.clone_address_desc = The HTTP(S) or Git "clone" URL of an existing repository
-migrate.github_token_desc = You can put one or more tokens with comma separated here to make migrating faster because of GitHub API rate limit. WARN: Abusing this feature may violate the service provider's policy and lead to account blocking.
+migrate.github_token_desc = You can put one or more tokens here separated by commas to make migrating faster by circumventing the GitHub API rate limit. WARNING: Abusing this feature may violate the service provider's policy and may lead to getting your account(s) blocked.
 migrate.clone_local_path = or a local server path
 migrate.permission_denied = You are not allowed to import local repositories.
 migrate.permission_denied_blocked = You cannot import from disallowed hosts, please ask the admin to check ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS settings.
@@ -1536,11 +1541,11 @@ projects.card_type.images_and_text = Images and text
 projects.card_type.text_only = Text only
 
 issues.desc = Organize bug reports, tasks and milestones.
-issues.filter_assignees = Filter Assignee
-issues.filter_milestones = Filter Milestone
-issues.filter_projects = Filter Project
-issues.filter_labels = Filter Label
-issues.filter_reviewers = Filter Reviewer
+issues.filter_assignees = Filter assignee
+issues.filter_milestones = Filter milestone
+issues.filter_projects = Filter project
+issues.filter_labels = Filter label
+issues.filter_reviewers = Filter reviewer
 issues.filter_no_results = No results
 issues.filter_no_results_placeholder = Try adjusting your search filters.
 issues.new = New issue
@@ -1606,7 +1611,7 @@ issues.remove_ref_at = `removed reference <b>%s</b> %s`
 issues.add_ref_at = `added reference <b>%s</b> %s`
 issues.delete_branch_at = `deleted branch <b>%s</b> %s`
 issues.filter_label = Label
-issues.filter_label_exclude = `Use <code>alt</code> + <code>click/enter</code> to exclude labels`
+issues.filter_label_exclude = Use <kbd>Alt</kbd> + <kbd>Click</kbd> to exclude labels
 issues.filter_label_no_select = All labels
 issues.filter_label_select_no_label = No label
 issues.filter_milestone = Milestone
@@ -1624,6 +1629,7 @@ issues.filter_poster = Author
 issues.filter_poster_no_select = All authors
 issues.filter_type = Type
 issues.filter_type.all_issues = All issues
+issues.filter_type.all_pull_requests = All pull requests
 issues.filter_type.assigned_to_you = Assigned to you
 issues.filter_type.created_by_you = Created by you
 issues.filter_type.mentioning_you = Mentioning you
@@ -1689,15 +1695,13 @@ issues.close_comment_issue = Close with comment
 issues.reopen_issue = Reopen
 issues.reopen_comment_issue = Reopen with comment
 issues.create_comment = Comment
-issues.closed_at = `closed this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at = `reopened this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from = `<a href="%[3]s">referenced this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from = `<a href="%[3]s">referenced this pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from = `<a href="%[3]s">referenced this issue from a pull request %[4]s that will close it</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from = `<a href="%[3]s">referenced this issue from a pull request %[4]s that will reopen it</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closed_from = `<a href="%[3]s">closed this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopened_from = `<a href="%[3]s">reopened this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at = `closed this issue %s`
+issues.reopened_at = `reopened this issue %s`
+issues.commit_ref_at = `referenced this issue from a commit %s`
+issues.ref_issue_from = `<a href="%[2]s">referenced this issue %[3]s</a> %[1]s`
+issues.ref_pull_from = `<a href="%[2]s">referenced this pull request %[3]s</a> %[1]s`
+issues.ref_closing_from = `<a href="%[2]s">referenced this issue from a pull request %[3]s that will close it</a>, %[1]s`
+issues.ref_reopening_from = `<a href="%[2]s">referenced this issue from a pull request %[3]s that will reopen it</a>, %[1]s`
 issues.ref_from = `from %[1]s`
 issues.author = Author
 issues.author.tooltip.issue = This user is the author of this issue.
@@ -1800,7 +1804,7 @@ issues.time_spent_from_all_authors = `Total time spent: %s`
 issues.due_date = Due date
 issues.push_commit_1 = added %d commit %s
 issues.push_commits_n = added %d commits %s
-issues.force_push_codes = `force-pushed %[1]s from <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> to <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes = `force-pushed %[1]s from <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s to <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare = Compare
 issues.due_date_form = yyyy-mm-dd
 issues.due_date_form_edit = Edit
@@ -1879,9 +1883,8 @@ issues.content_history.created = created
 issues.content_history.delete_from_history = Delete from history
 issues.content_history.delete_from_history_confirm = Delete from history?
 issues.content_history.options = Options
-issues.reference_link = Reference: %s
 issues.blocked_by_user = You cannot create issues in this repository because you are blocked by the repository owner.
-issues.comment.blocked_by_user = You cannot comment on this issue because you are blocked by the repository owner or the poster of the issue.
+comment.blocked_by_user = Commenting is not possible because you are blocked by the repository owner or the author.
 issues.reopen.blocked_by_user = You cannot reopen this issue because you are blocked by the repository owner or the poster of this issue.
 issues.summary_card_alt = Summary card of an issue titled "%s" in repository %s
 
@@ -1917,7 +1920,7 @@ pulls.select_commit_hold_shift_for_range = Select commit. Hold shift + click to
 pulls.review_only_possible_for_full_diff = Review is only possible when viewing the full diff
 pulls.filter_changes_by_commit = Filter by commit
 pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request.
-pulls.nothing_to_compare_have_tag = The selected branch/tag are equal.
+pulls.nothing_to_compare_have_tag = The selected branches/tags are equal.
 pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty.
 pulls.has_pull_request = `A pull request between these branches already exists: <a href="%[1]s">%[2]s#%[3]d</a>`
 pulls.create = Create pull request
@@ -1966,7 +1969,6 @@ pulls.waiting_count_1 = %d waiting review
 pulls.waiting_count_n = %d waiting reviews
 pulls.wrong_commit_id = commit id must be a commit id on the target branch
 pulls.blocked_by_user = You cannot create a pull request on this repository because you are blocked by the repository owner.
-pulls.comment.blocked_by_user = You cannot comment on this pull request because you are blocked by the repository owner or the poster of the pull request.
 
 pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
 pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
@@ -2010,9 +2012,9 @@ pulls.update_branch_success = Branch update was successful
 pulls.update_not_allowed = You are not allowed to update branch
 pulls.outdated_with_base_branch = This branch is out-of-date with the base branch
 pulls.close = Close pull request
-pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.commit_ref_at = `referenced this pull request from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `closed this pull request %s`
+pulls.reopened_at = `reopened this pull request %s`
+pulls.commit_ref_at = `referenced this pull request from a commit %s`
 pulls.cmd_instruction_hint = View command line instructions
 pulls.cmd_instruction_checkout_title = Checkout
 pulls.cmd_instruction_checkout_desc = From your project repository, check out a new branch and test the changes.
@@ -2087,7 +2089,7 @@ milestones.filter_sort.most_issues = Most issues
 milestones.filter_sort.least_issues = Least issues
 
 signing.will_sign = This commit will be signed with key "%s".
-signing.wont_sign.error = There was an error whilst checking if the commit could be signed.
+signing.wont_sign.error = There was an error while checking if the commit could be signed.
 signing.wont_sign.nokey = This instance has no key to sign this commit with.
 signing.wont_sign.never = Commits are never signed.
 signing.wont_sign.always = Commits are always signed.
@@ -2103,7 +2105,7 @@ signing.wont_sign.not_signed_in = You are not signed in.
 ext_wiki = External Wiki
 
 wiki = Wiki
-wiki.welcome = Welcome to the Wiki.
+wiki.welcome = Welcome to the wiki.
 wiki.welcome_desc = The wiki lets you write and share documentation with collaborators.
 wiki.desc = Write and share documentation with collaborators.
 wiki.create_first_page = Create the first page
@@ -2386,7 +2388,7 @@ settings.add_collaborator_duplicate = The collaborator is already added to this
 settings.add_collaborator_blocked_our = Cannot add the collaborator, because the repository owner has blocked them.
 settings.add_collaborator_blocked_them = Cannot add the collaborator, because they have blocked the repository owner.
 settings.delete_collaborator = Remove
-settings.collaborator_deletion = Remove Collaborator
+settings.collaborator_deletion = Remove collaborator
 settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
 settings.remove_collaborator_success = The collaborator has been removed.
 settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator.
@@ -2483,6 +2485,13 @@ settings.event_pull_request_review_request_desc = Pull request review requested
 settings.event_pull_request_approvals = Pull request approvals
 settings.event_pull_request_merge = Pull request merge
 settings.event_pull_request_enforcement = Enforcement
+settings.event_header_action = Action Run events
+settings.event_action_failure = Failure
+settings.event_action_failure_desc = Action Run ended as failure.
+settings.event_action_recover = Recover
+settings.event_action_recover_desc = Action Run succeeded after last Action Run in the same workflow failed.
+settings.event_action_success = Success
+settings.event_action_success_desc = Action Run succeeded.
 settings.event_package = Package
 settings.event_package_desc = Package created or deleted in a repository.
 settings.branch_filter = Branch filter
@@ -2642,36 +2651,36 @@ settings.unarchive.text = Unarchiving the repo will restore its ability to recei
 settings.unarchive.success = The repo was successfully unarchived.
 settings.unarchive.error = An error occurred while trying to unarchive the repo. See the log for more details.
 settings.update_avatar_success = The repository avatar has been updated.
-settings.lfs=LFS
-settings.lfs_filelist=LFS files stored in this repository
-settings.lfs_no_lfs_files=No LFS files stored in this repository
-settings.lfs_findcommits=Find commits
-settings.lfs_lfs_file_no_commits=No commits found for this LFS file
-settings.lfs_noattribute=This path does not have the lockable attribute in the default branch
-settings.lfs_delete=Delete LFS file with OID %s
-settings.lfs_delete_warning=Deleting an LFS file may cause "object does not exist" errors on checkout. Are you sure?
-settings.lfs_findpointerfiles=Find pointer files
-settings.lfs_locks=Locks
-settings.lfs_invalid_locking_path=Invalid path: %s
-settings.lfs_invalid_lock_directory=Cannot lock directory: %s
-settings.lfs_lock_already_exists=Lock already exists: %s
-settings.lfs_lock=Lock
-settings.lfs_lock_path=Filepath to lock…
-settings.lfs_locks_no_locks=No locks
-settings.lfs_lock_file_no_exist=Locked file does not exist in default branch
-settings.lfs_force_unlock=Force unlock
-settings.lfs_pointers.found=Found %d blob pointer(s) - %d associated, %d unassociated (%d missing from store)
-settings.lfs_pointers.sha=Blob hash
-settings.lfs_pointers.oid=OID
-settings.lfs_pointers.inRepo=In repo
-settings.lfs_pointers.exists=Exists in store
-settings.lfs_pointers.accessible=Accessible to user
-settings.lfs_pointers.associateAccessible=Associate accessible %d OIDs
-settings.rename_branch_failed_protected=Cannot rename branch %s because it is a protected branch.
-settings.rename_branch_failed_exist=Cannot rename branch because target branch %s exists.
-settings.rename_branch_failed_not_exist=Cannot rename branch %s because it does not exist.
-settings.rename_branch_success =Branch %s was successfully renamed to %s.
-settings.rename_branch=Rename branch
+settings.lfs = LFS
+settings.lfs_filelist = LFS files stored in this repository
+settings.lfs_no_lfs_files = No LFS files stored in this repository
+settings.lfs_findcommits = Find commits
+settings.lfs_lfs_file_no_commits = No commits found for this LFS file
+settings.lfs_noattribute = This path does not have the lockable attribute in the default branch
+settings.lfs_delete = Delete LFS file with OID %s
+settings.lfs_delete_warning = Deleting an LFS file may cause "object does not exist" errors on checkout. Are you sure?
+settings.lfs_findpointerfiles = Find pointer files
+settings.lfs_locks = Locks
+settings.lfs_invalid_locking_path = Invalid path: %s
+settings.lfs_invalid_lock_directory = Cannot lock directory: %s
+settings.lfs_lock_already_exists = Lock already exists: %s
+settings.lfs_lock = Lock
+settings.lfs_lock_path = Filepath to lock…
+settings.lfs_locks_no_locks = No locks
+settings.lfs_lock_file_no_exist = Locked file does not exist in default branch
+settings.lfs_force_unlock = Force unlock
+settings.lfs_pointers.found = Found %d blob pointer(s) - %d associated, %d unassociated (%d missing from store)
+settings.lfs_pointers.sha = Blob hash
+settings.lfs_pointers.oid = OID
+settings.lfs_pointers.inRepo = In repo
+settings.lfs_pointers.exists = Exists in store
+settings.lfs_pointers.accessible = Accessible to user
+settings.lfs_pointers.associateAccessible = Associate accessible %d OIDs
+settings.rename_branch_failed_protected = Cannot rename branch %s because it is a protected branch.
+settings.rename_branch_failed_exist = Cannot rename branch because target branch %s exists.
+settings.rename_branch_failed_not_exist = Cannot rename branch %s because it does not exist.
+settings.rename_branch_success = Branch %s was successfully renamed to %s.
+settings.rename_branch = Rename branch
 
 diff.browse_source = Browse source
 diff.parent = parent
@@ -2843,7 +2852,6 @@ find_file.no_matching = No matching file found
 error.csv.too_large = Can't render this file because it is too large.
 error.csv.unexpected = Can't render this file because it contains an unexpected character in line %d and column %d.
 error.csv.invalid_field_count = Can't render this file because it has a wrong number of fields in line %d.
-error.broken_git_hook = Git hooks of this repository seem to be broken. Please follow the <a target="_blank" rel="noreferrer" href="%s">documentation</a> to fix them, then push some commits to refresh the status.
 
 [repo.permissions]
 code.read = <b>Read:</b> Access and clone the code of the repository.
@@ -2922,8 +2930,8 @@ settings.update_settings = Update settings
 settings.update_setting_success = Organization settings have been updated.
 settings.change_orgname_prompt = Note: Changing the organization name will also change your organization's URL and free the old name.
 settings.change_orgname_redirect_prompt = The old name will redirect until it is claimed.
-settings.change_orgname_redirect_prompt.with_cooldown.one = The old organization name will be available to everyone after a cooldown period of %[1]d day, you can still reclaim the old name during the cooldown period.
-settings.change_orgname_redirect_prompt.with_cooldown.few = The old organization name will be available to everyone after a cooldown period of %[1]d days, you can still reclaim the old name during the cooldown period.
+settings.change_orgname_redirect_prompt.with_cooldown.one = The old organization name will be available to everyone after a cooldown period of %[1]d day. You can still reclaim the old name during the cooldown period.
+settings.change_orgname_redirect_prompt.with_cooldown.few = The old organization name will be available to everyone after a cooldown period of %[1]d days. You can still reclaim the old name during the cooldown period.
 settings.update_avatar_success = The organization's avatar has been updated.
 settings.delete = Delete organization
 settings.delete_account = Delete this organization
@@ -2975,8 +2983,6 @@ teams.invite_team_member.list = Pending invitations
 teams.delete_team_title = Delete team
 teams.delete_team_desc = Deleting a team revokes repository access from its members. Continue?
 teams.delete_team_success = The team has been deleted.
-teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone team repositories.
-teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to team repositories.
 teams.admin_permission_desc = This team grants <strong>Administrator</strong> access: members can read from, push to and add collaborators to team repositories.
 teams.create_repo_permission_desc = Additionally, this team grants <strong>Create repository</strong> permission: members can create new repositories in organization.
 teams.repositories = Team repositories
@@ -3059,9 +3065,9 @@ dashboard.resync_all_sshprincipals = Update the ".ssh/authorized_principals" fil
 dashboard.resync_all_hooks = Resynchronize pre-receive, update and post-receive hooks of all repositories
 dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist
 dashboard.sync_external_users = Synchronize external user data
-dashboard.cleanup_hook_task_table = Cleanup hook_task table
-dashboard.cleanup_packages = Cleanup expired packages
-dashboard.cleanup_actions = Cleanup expired logs and artifacts from actions
+dashboard.cleanup_hook_task_table = Clean up hook_task table
+dashboard.cleanup_packages = Clean up expired packages
+dashboard.cleanup_actions = Clean up expired logs and artifacts from actions
 dashboard.server_uptime = Server uptime
 dashboard.current_goroutine = Current goroutines
 dashboard.current_memory_usage = Current memory usage
@@ -3557,7 +3563,7 @@ auto_merge_pull_request = `automatically merged pull request <a href="%[1]s">%[3
 transfer_repo = transferred repository <code>%s</code> to <a href="%s">%s</a>
 push_tag = pushed tag <a href="%[2]s">%[3]s</a> to <a href="%[1]s">%[4]s</a>
 delete_tag = deleted tag %[2]s from <a href="%[1]s">%[3]s</a>
-delete_branch = deleted branch %[2]s from <a href="%[1]s">%[3]s</a>
+delete_branch = deleted branch <code>%[2]s</code> from <a href="%[1]s">%[3]s</a>
 compare_branch = Compare
 compare_commits = Compare %d commits
 compare_commits_general = Compare commits
@@ -3774,8 +3780,8 @@ swift.install2 = and run the following command:
 vagrant.install = To add a Vagrant box, run the following command:
 settings.link = Link this package to a repository
 settings.link.description = If you link a package with a repository, the package is listed in the repository's package list.
-settings.link.select = Select Repository
-settings.link.button = Update Repository Link
+settings.link.select = Select repository
+settings.link.button = Update repository link
 settings.link.success = Repository link was successfully updated.
 settings.link.error = Failed to update repository link.
 settings.delete = Delete package
@@ -3791,7 +3797,7 @@ owner.settings.cargo.initialize.success = The Cargo index was successfully creat
 owner.settings.cargo.rebuild = Rebuild index
 owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index is not synchronized with the stored Cargo packages.
 owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v
-owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild.
+owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuilt.
 owner.settings.cargo.rebuild.no_index = Cannot rebuild, no index is initialized.
 owner.settings.cleanuprules.title = Cleanup rules
 owner.settings.cleanuprules.add = Add cleanup rule
@@ -3815,13 +3821,13 @@ owner.settings.cleanuprules.success.update = Cleanup rule has been updated.
 owner.settings.cleanuprules.success.delete = Cleanup rule has been deleted.
 owner.settings.chef.title = Chef registry
 owner.settings.chef.keypair = Generate key pair
-owner.settings.chef.keypair.description = A key pair is necessary to authenticate to the Chef registry. If you have generated a key pair before, generating a new key pair will discard the old key pair.
+owner.settings.chef.keypair.description = Requests sent to the Chef registry must be cryptographically signed as a means of authentication. When generating a keypair, only the public key is stored on Forgejo. The private key is provided to you to be used with knife. Generating a new keypair will overwrite the previous one.
 
 [secrets]
 secrets = Secrets
 description = Secrets will be passed to certain actions and cannot be read otherwise.
 none = There are no secrets yet.
-creation = Add Secret
+creation = Add secret
 creation.name_placeholder = case-insensitive, alphanumeric characters or underscores only, cannot start with GITEA_ or GITHUB_
 creation.value_placeholder = Input any content. Whitespace at the start and end will be omitted.
 creation.success = The secret "%s" has been added.
@@ -3863,7 +3869,7 @@ runners.task_list.run = Run
 runners.task_list.status = Status
 runners.task_list.repository = Repository
 runners.task_list.commit = Commit
-runners.task_list.done_at = Done At
+runners.task_list.done_at = Done at
 runners.edit_runner = Edit Runner
 runners.update_runner = Update changes
 runners.update_runner_success = Runner updated successfully
@@ -3872,7 +3878,7 @@ runners.delete_runner = Delete this runner
 runners.delete_runner_success = Runner deleted successfully
 runners.delete_runner_failed = Failed to delete runner
 runners.delete_runner_header = Confirm to delete this runner
-runners.delete_runner_notice = If a task is running on this runner, it will be terminated and mark as failed. It may break building workflow.
+runners.delete_runner_notice = If a task is running on this runner, it will be terminated and marked as failed. It may break building workflow.
 runners.none = No runners available
 runners.status.unspecified = Unknown
 runners.status.idle = Idle
@@ -3936,7 +3942,7 @@ variables.update.failed = Failed to edit variable.
 variables.update.success = The variable has been edited.
 
 [projects]
-deleted.display_name = Deleted Project
+deleted.display_name = Deleted project
 type-1.display_name = Individual project
 type-2.display_name = Repository project
 type-3.display_name = Organization project
diff --git a/options/locale/locale_eo.ini b/options/locale/locale_eo.ini
index e4fb8cdbc7..5a06120e9e 100644
--- a/options/locale/locale_eo.ini
+++ b/options/locale/locale_eo.ini
@@ -103,7 +103,7 @@ ok = Bone
 download_logs = Elsuti protokolojn
 unknown = Nekonata
 issues = Eraroj
-error404 = Aŭ tiu ĉi paĝo <strong>ne ekzistas</strong> aŭ <strong>vi ne rajtas</strong> vidi ĝin.
+error404 = Aŭ tiu ĉi paĝo <strong>ne ekzistas</strong>, <strong>estis forigita</strong> aŭ <strong>vi ne rajtas</strong> vidi ĝin.
 retry = Reprovi
 activities = Aktivecoj
 confirm_delete_selected = Konfirmi forigon de ĉiu elektito?
@@ -171,6 +171,7 @@ table_modal.placeholder.header = Kapo
 table_modal.placeholder.content = Enhavo
 table_modal.label.rows = Horizontaloj
 table_modal.label.columns = Vertikaloj
+link_modal.description = Priskribo
 
 [aria]
 navbar = Esplora breto
@@ -523,6 +524,7 @@ totp_enrolled.text_1.has_webauthn = Vi ĵus aktivigis TOTP-n por via konto. Tio
 totp_enrolled.text_1.no_webauthn = Vi ĵus aktivigis TOTP-n por via konto. Tio volas diri ke por ĉiuj venontaj salutoj al via konto, vi devos uzi TOTP-n kiel 2FA metodo.
 removed_security_key.no_2fa = Ne estas aliaj 2FA agorditaj metodoj, tio estas ke ne plus necesas uzi 2FA-n por saluti.
 totp_disabled.no_2fa = Ne estas plu aliaj 2FA agorditaj metodoj, tio estas ke ne plus necesas uzi 2FA-n por saluti.
+account_security_caution.text_1 = Se tio estis vi, vi povas sekure ignori ĉi tiun retmesaĝon.
 
 [form]
 TeamName = Gruponomo
@@ -628,7 +630,7 @@ account = Konto
 ssh_gpg_keys = SSH / GPG-ŝlosiloj
 twofa_disable = Malaktivigi duoblan aŭtentikigon
 twofa_enroll = Ŝalti duoblan aŭtentikigon
-orgs = Mastrumi organizaĵojn
+orgs = Organizaĵoj
 blocked_users = Blokitaj uzantoj
 profile = Profilo
 ui = Haŭto
@@ -684,7 +686,7 @@ verify_ssh_key_success = SSH-ŝlosilo «%s» jam konfirmiĝis.
 edit_oauth2_application = Redakti OAuth2-programon
 gpg_key_deletion = Forigi GPG-ŝlosilon
 gpg_key_matched_identities = Akordaj identecoj:
-manage_themes = Elekti implicitan haŭton
+manage_themes = Defaŭlta temo
 ssh_key_deletion = Forigi SSH-ŝlosilon
 key_state_desc = Ĉi tiu ŝlosilo uziĝis dum la pasintaj 7 tagoj
 valid_forever = Validos dumĉiame
@@ -698,7 +700,7 @@ primary = Ĉefa
 ssh_disabled = SSH malaktivigita
 update_avatar_success = Via profilbildo konserviĝis.
 keep_email_private = Kaŝi retpoŝtadreson
-manage_openid = Mastrumi OpenID-adresojn
+manage_openid = OpenID-adresoj
 delete_current_avatar = Forigi nunan profilbildon
 email_preference_set_success = Retpoŝta prefero konserviĝis sukcese.
 permissions_access_all = Ĉiu (publika, privata, kaj limigita)
@@ -861,30 +863,30 @@ npm.details.tag = Etikedo
 
 
 [search]
-search = Serĉi...
+search = Serĉi…
 regexp = RegEsp
 milestone_kind = Serĉi celojn...
 code_search_by_git_grep = Nunaj rezultoj de kodoserĉo estas provizitaj de "git grep". Eble estas plibonaj rezultoj se la retejestro aktivigas la indeksilon de kodo.
 code_search_unavailable = Kodoserĉo ne haveblas nune. Bonvolu kontakti la retejestron.
-package_kind = Serĉi pakojn...
+package_kind = Serĉi pakojn…
 type_tooltip = Serĉotipo
-user_kind = Serĉi uzantojn...
+user_kind = Serĉi uzantojn…
 fuzzy_tooltip = Inkluzivas rezultojn proksime kongruantajn kun la serĉoterminoj
-repo_kind = Serĉi deponejojn...
-org_kind = Serĉi organizaĵojn...
-code_kind = Serĉi kodon...
-project_kind = Serĉi projektojn...
-team_kind = Serĉi teamojn...
+repo_kind = Serĉi deponejojn…
+org_kind = Serĉi organizaĵojn…
+code_kind = Serĉi kodon…
+project_kind = Serĉi projektojn…
+team_kind = Serĉi teamojn…
 keyword_search_unavailable = Serĉo per ŝlosilvortoj ne haveblas nune. Bonvolu kontakti la retejestron.
 union = Ŝlosilvortoj
 union_tooltip = Inkluzivas rezultojn kongruantajn kun la ajnaj blankaspacitaj ŝlosilvortoj
-commit_kind = Serĉi enmetojn...
+commit_kind = Serĉi enmetojn…
 no_results = Ne trovis kongruantajn rezultojn.
 exact = Ĝusta
 exact_tooltip = Inkluzivas nur rezultojn kongruantajn kun la ĝustaj serĉoterminoj
-issue_kind = Serĉi erarojn...
+issue_kind = Serĉi erarojn…
 regexp_tooltip = Interpretas la serĉoterminoj kiel regulesprimo
 fuzzy = Svaga
-branch_kind = Serĉi disbranĉigojn...
-runner_kind = Serĉi rulantojn...
-pull_kind = Serĉi tirpetojn...
\ No newline at end of file
+branch_kind = Serĉi disbranĉigojn…
+runner_kind = Serĉi rulantojn…
+pull_kind = Serĉi tirpetojn…
\ No newline at end of file
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 06437882ac..f6b2459f51 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -194,7 +194,7 @@ buttons.list.unordered.tooltip=Añadir una lista
 buttons.list.ordered.tooltip=Añadir una lista numerada
 buttons.list.task.tooltip=Añadir una lista de tareas
 buttons.mention.tooltip=Mencionar un usuario o equipo
-buttons.ref.tooltip=Referir a una incidencia o pull request
+buttons.ref.tooltip=Referir a una incidencia o solicitud de incorporación de cambios
 buttons.switch_to_legacy.tooltip=Utilizar el editor antiguo en su lugar
 buttons.enable_monospace_font=Activar fuente monoespaciada
 buttons.disable_monospace_font=Desactivar fuente monoespaciada
@@ -209,7 +209,6 @@ table_modal.placeholder.content = Contenido
 link_modal.header = Añadir enlace
 link_modal.description = Descripción
 link_modal.paste_reminder = Pista: Con una URL en tu portapapeles, puedes pegar directamente en el editor para crear un enlace.
-
 link_modal.url = URL
 
 [filter]
@@ -234,7 +233,7 @@ platform_desc=Se ha confirmado que Forgejo funciona en sistemas operativos libre
 lightweight=Ligero
 lightweight_desc=Forgejo tiene pocos requisitos y puede funcionar en una Raspberry Pi barata. ¡Ahorra energía!
 license=Código abierto
-license_desc=¡Pasa a conseguir <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Únete a nosotros y <a target="_blank" rel="noopener noreferrer" href="%[2]s">colabora</a> para mejorar este proyecto. ¡No seas tímido y colabora!
+license_desc=¡Pasa a conseguir <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Únete a nosotros y <a target="_blank" rel="noopener noreferrer" href="%[2]s">colabora</a> para hacer este proyecto aún mejor. ¡No seas tímido y colabora!
 
 [install]
 install=Instalación
@@ -418,7 +417,7 @@ remember_me=Recordar este dispositivo
 forgot_password_title=Contraseña olvidada
 forgot_password=¿Has olvidado tu contraseña?
 sign_up_now=¿Necesitas una cuenta? Regístrate ahora.
-sign_up_successful=La cuenta se ha creado correctamente. ¡Bienvenido!
+sign_up_successful=La cuenta se ha creado correctamente. ¡Le damos la bienvenida!
 confirmation_mail_sent_prompt=Se ha enviado un nuevo correo de confirmación a <b>%s</b>. Para completar el proceso de registro, revisa tu bandeja de entrada y sigue el enlace proporcionado dentro de los próximos %s. Si la dirección no es correcto, puedes iniciar sesión y solicitar otro correo de confirmación para ser enviado a una dirección diferente.
 must_change_password=Actualizar su contraseña
 allow_password_change=Obligar al usuario a cambiar la contraseña (recomendado)
@@ -510,27 +509,27 @@ register_notify.text_1=este es tu correo de confirmación de registro para %s!
 register_notify.text_2=Puede iniciar sesión con su nombre de usuario: %s
 register_notify.text_3=Si otra persona creó esta cuenta para usted, tendrá que <a href="%s">establecer su contraseña</a> primero.
 
-reset_password=Recupere su cuenta
+reset_password=Recupera tu cuenta
 reset_password.title=%s, has solicitado recuperar tu cuenta
 reset_password.text=Haga clic en el siguiente enlace para recuperar su cuenta dentro de <b>%s</b>:
 
 register_success=Registro completado
 
-issue_assigned.pull=@%[1]s le asignó al pull request %[2]s en el repositorio %[3]s.
+issue_assigned.pull=@%[1]s le asignó la solicitud de incorporación de cambios %[2]s en el repositorio %[3]s.
 issue_assigned.issue=@%[1]s le asignó a la incidencia %[2]s en el repositorio %[3]s.
 
 issue.x_mentioned_you=<b>@%s</b> te mencionó:
 issue.action.force_push=<b>%[1]s</b> empujó a la fuerza el <b>%[2]s</b> de %[3]s a %[4]s.
 issue.action.push_1=<b>@%[1]s</b> hizo %[3]d commit al %[2]s
-issue.action.push_n=<b>@%[1]s</b> push %[3]d commits a %[2]s
+issue.action.push_n=<b>@%[1]s</b> empujó %[3]d confirmaciones a %[2]s
 issue.action.close=<b>@%[1]s</b> cerró #%[2]d.
 issue.action.reopen=<b>@%[1]s</b> reabrió #%[2]d.
 issue.action.merge=<b>@%[1]s</b> fusionó #%[2]d en %[3]s.
-issue.action.approve=<b>@%[1]s</b> aprobó este pull request.
-issue.action.reject=<b>@%[1]s</b> solicitó cambios en este pull request.
-issue.action.review=<b>@%[1]s</b> comentó en este pull request.
-issue.action.review_dismissed=<b>@%[1]s</b> descartó la última revisión de %[2]s para este pull request.
-issue.action.ready_for_review=<b>@%[1]s</b> marcó este pull request listo para ser revisado.
+issue.action.approve=<b>@%[1]s</b> aprobó esta solicitud de incorporación de cambios.
+issue.action.reject=<b>@%[1]s</b> solicitó cambios en esta solicitud de incorporación de cambios.
+issue.action.review=<b>@%[1]s</b> comentó en esta solicitud de incorporación de cambios.
+issue.action.review_dismissed=<b>@%[1]s</b> descartó la última revisión de %[2]s para esta solicitud de incorporación de cambios.
+issue.action.ready_for_review=<b>@%[1]s</b> marcó esta solicitud de incorporación de cambios lista para ser revisada.
 issue.action.new=<b>@%[1]s</b> creó #%[2]d.
 issue.in_tree_path=En %s:
 
@@ -570,7 +569,7 @@ account_security_caution.text_2 = Si no fuiste tú, tu cuenta está comprometida
 totp_enrolled.subject = Has activado TOTP como método 2FA
 totp_enrolled.text_1.no_webauthn = Acabas de activar TOTP para tu cuenta. Esto significa que para todos los futuros inicios de sesión en tu cuenta, debes utilizar TOTP como método 2FA.
 removed_security_key.text_1 = La clave de seguridad "%[1]s" acaba de ser eliminada de tu cuenta.
-primary_mail_change.text_1 = El correo principal de tu cuenta acaba de ser cambiado a %[1]s. Esto significa que esta dirección de correo electrónico ya no recibirá notificaciones por correo electrónico relativas a tu cuenta.
+primary_mail_change.text_1 = El correo principal de su cuenta acaba de cambiar a %[1]s. Esto significa que esta dirección de correo electrónico ya no recibirá notificaciones por correo electrónico de su cuenta.
 totp_enrolled.text_1.has_webauthn = Acabas de activar TOTP para tu cuenta. Esto significa que para todos los futuros inicios de sesión en tu cuenta, podrás utilizar TOTP como método 2FA o bien utilizar cualquiera de tus claves de seguridad.
 
 [modal]
@@ -594,7 +593,7 @@ AuthName=Nombre de autorización
 AdminEmail=Correo electrónico del administrador
 
 NewBranchName=Nuevo nombre de rama
-CommitSummary=Resumen del commit
+CommitSummary=Resumen de la confirmación
 CommitMessage=Mensaje de commit
 CommitChoice=Hacer commit de la elección
 TreeName=Ruta del archivo
@@ -741,7 +740,7 @@ avatar=Avatar
 ssh_gpg_keys=Claves SSH / GPG
 social=Redes sociales
 applications=Aplicaciones
-orgs=Administrar organizaciones
+orgs=Organizaciones
 repos=Repositorios
 delete=Eliminar cuenta
 twofa=Autenticación de dos factores (TOTP)
@@ -786,10 +785,10 @@ comment_type_group_deadline=Fecha límite
 comment_type_group_dependency=Dependencia
 comment_type_group_lock=Estado de bloqueo
 comment_type_group_review_request=Revisión solicitada
-comment_type_group_pull_request_push=Commits añandidos
+comment_type_group_pull_request_push=Confirmaciones añadidas
 comment_type_group_project=Proyecto
 comment_type_group_issue_ref=Referencia del incidente
-saved_successfully=Tus ajustes se han guardado correctamente.
+saved_successfully=Su configuración se ha guardado correctamente.
 privacy=Privacidad
 keep_activity_private=Ocultar actividad de la página de perfil
 keep_activity_private_popup=Hace la actividad visible sólo para ti y los administradores
@@ -828,7 +827,7 @@ activations_pending=Activaciones pendientes
 can_not_add_email_activations_pending=Hay una activación pendiente, inténtelo de nuevo en unos minutos si desea agregar un nuevo correo electrónico.
 delete_email=Eliminar
 email_deletion=Eliminar dirección de correo electrónico
-email_deletion_desc=La dirección de correo electrónico e información relacionada se eliminará de su cuenta. Los commits de Git hechos por esta dirección de correo electrónico permanecerán inalterados. ¿Continuar?
+email_deletion_desc=La dirección de correo electrónico e información relacionada se eliminará de su cuenta. Las confirmaciones de Git hechas por esta dirección de correo electrónico permanecerán inalteradas. ¿Continuar?
 email_deletion_success=La dirección de correo electrónico ha sido eliminada.
 theme_update_success=Su tema fue actualizado.
 theme_update_error=El tema seleccionado no existe.
@@ -1064,31 +1063,32 @@ pronouns_custom_label = Pronombres personalizados
 user_block_yourself = No puede bloquearse a sí mismo.
 quota = Cuota
 quota.sizes.assets.attachments.all = Archivos adjuntos
-
-storage_overview = Resumen del almacenamiento
-keep_pronouns_private = Mostrar pronombres solo a personas autenticadas
+quota.sizes.repos.private = Repositorios privados
+quota.sizes.assets.packages.all = Paquetes
 regenerate_token = Regenerar
 quota.sizes.all = Todo
 quota.sizes.repos.all = Repositorios
 quota.sizes.repos.public = Repositorios públicos
-quota.sizes.repos.private = Repositorios privados
 quota.sizes.git.all = Contenido de Git
-quota.sizes.assets.attachments.releases = Archivos adjuntos del lanzamiento
-quota.sizes.assets.artifacts = Artefactos
-quota.sizes.assets.packages.all = Paquetes
 quota.sizes.wiki = Wiki
-
-change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d día, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera.
-change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d días, aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera.
+keep_pronouns_private = Mostrar pronombres solo a personas autenticadas
+storage_overview = Resumen del almacenamiento
+quota.sizes.assets.artifacts = Artefactos
+quota.sizes.assets.attachments.releases = Archivos adjuntos del lanzamiento
+change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d días. Aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera.
+change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estará disponible para todos después un periodo de tiempo de espera de %[1]d día. Aún puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera.
 quota.rule.exceeded = Excedido
 quota.rule.no_limit = Ilimitado
 quota.sizes.assets.all = Activos
-
-access_token_regeneration = Regenerar token de acceso
 quota.sizes.git.lfs = Git LFS
 quota.sizes.assets.attachments.issues = Archivos adjuntos de incidencia
-
+access_token_regeneration = Regenerar token de acceso
 keep_pronouns_private.description = Esto ocultará sus pronombres a los visitantes que no hayan iniciado sesión.
+access_token_regeneration_desc = Regenerar el token revocará el acceso a tu cuenta para todas las aplicaciones que lo estén usando. Esto no se puede deshacer. ¿Continuar?
+regenerate_token_success = El token se ha regenerado. Las aplicaciones que lo utilizan ya no tienen acceso a tu cuenta y deben actualizarse con el nuevo token.
+quota.applies_to_user = Las siguientes reglas de cuota se aplican a tu cuenta
+quota.applies_to_org = Las siguientes reglas de cuota se aplican a esta organización
+quota.rule.exceeded.helper = El tamaño total de los objetos para esta regla ha superado la cuota.
 
 [repo]
 owner=Propietario
@@ -1108,7 +1108,7 @@ visibility_fork_helper=(Cambiar esto afectará a la visibilidad de todas las bif
 clone_helper=¿Necesita ayuda para clonar? Visite <a target="_blank" rel="noopener noreferrer" href="%s">Ayuda</a>.
 fork_repo=Hacer una bifurcación del repositorio
 fork_from=Crear una bifurcación desde
-already_forked=Ya ha forkeado %s
+already_forked=Ya has bifurcado %s
 fork_to_different_account=Bifurcar a una cuenta diferente
 fork_visibility_helper=No se puede cambiar la visibilidad de un repositorio bifurcado.
 fork_branch=Rama a clonar en la bifurcación
@@ -1373,7 +1373,7 @@ editor.cannot_edit_non_text_files=Los archivos binarios no se pueden editar en l
 editor.edit_this_file=Editar archivo
 editor.this_file_locked=El archivo está bloqueado
 editor.must_be_on_a_branch=Debes estar en una rama para hacer o proponer cambios en este archivo.
-editor.fork_before_edit=Debes hacer fork a este repositorio para hacer o proponer cambios a este archivo.
+editor.fork_before_edit=Debes hacer una bifurcación a este repositorio para hacer o proponer cambios a este archivo.
 editor.delete_this_file=Eliminar archivo
 editor.must_have_write_access=Debes tener permisos de escritura para hacer o proponer cambios a este archivo.
 editor.file_delete_success=El archivo "%s" ha sido eliminado.
@@ -1574,7 +1574,7 @@ issues.remove_ref_at=`eliminó la referencia <b>%s</b> %s`
 issues.add_ref_at=`añadió la referencia <b>%s</b> %s`
 issues.delete_branch_at=`eliminó la rama <b>%s</b> %s`
 issues.filter_label=Etiqueta
-issues.filter_label_exclude=`Usa <code>alt</code> + <code>clic/enter</code> para excluir etiquetas`
+issues.filter_label_exclude=Usa <kbd>Alt</kbd> + <kbd>Click</kbd> para excluir etiquetas
 issues.filter_label_no_select=Todas las etiquetas
 issues.filter_label_select_no_label=Sin etiqueta
 issues.filter_milestone=Hito
@@ -1648,17 +1648,17 @@ issues.close_comment_issue=Cerrar con comentario
 issues.reopen_issue=Reabrir
 issues.reopen_comment_issue=Reabrir con comentario
 issues.create_comment=Comentar
-issues.closed_at=`cerró esta incidencia <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`reabrió esta incidencia <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`referenció esta incidencia en un commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">referenció esta incidencia %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">referenció este pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">hizo referencia a esta incidencia desde un pull request %[4]s que lo cerrará</a> , <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">hizo referencia a esta incidencia desde un pull request %[4]s que lo reabrirá</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`cerró esta incidencia %s`
+issues.reopened_at=`reabrió esta incidencia %s`
+issues.commit_ref_at=`referenció esta incidencia en un commit %s`
+issues.ref_issue_from=`<a href="%[2]s">referenció esta incidencia %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">referenció este pull request %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">hizo referencia a esta incidencia desde un pull request %[3]s que lo cerrará</a> , %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">hizo referencia a esta incidencia desde un pull request %[3]s que lo reabrirá</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">cerró esta incidencia %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">reabrió esta incidencia %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`de %[1]s`
-issues.author=Autoría
+issues.author=Autor
 issues.author_helper=Este usuario es el autor.
 issues.role.owner=Propietario
 issues.role.owner_helper=Este usuario es el dueño de este repositorio.
@@ -1759,7 +1759,7 @@ issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento.
 issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento.
 issues.push_commit_1=añadió %d commit %s
 issues.push_commits_n=añadió %d commits %s
-issues.force_push_codes=`empujó forzosamente %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> a <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`empujó forzosamente %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s a <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Añadir fecha de vencimiento
@@ -1959,8 +1959,8 @@ pulls.update_branch_success=La actualización de la rama ha finalizado correctam
 pulls.update_not_allowed=No tiene permisos para actualizar esta rama
 pulls.outdated_with_base_branch=Esta rama está desactualizada con la rama base
 pulls.close=Cerrar pull request
-pulls.closed_at=`cerró este pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`reabrió este pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`cerró este pull request %s`
+pulls.reopened_at=`reabrió este pull request %s`
 pulls.clear_merge_message=Borrar mensaje de fusión
 pulls.clear_merge_message_hint=Limpiar el mensaje de fusión solo eliminará el contenido del mensaje de commit y mantendrá frases generadas como "Co-Autorizado por …".
 
@@ -2260,9 +2260,9 @@ settings.trust_model.collaborator.long=Colaborador: Confiar en firmas de colabor
 settings.trust_model.collaborator.desc=Las firmas válidas de los colaboradores de este repositorio serán marcadas como "confiables" - (coincidan o no con el committer). De lo contrario, las firmas válidas serán marcadas como "no confiables" si la firma coincide con el committer y "no coincidente" si no lo es.
 settings.trust_model.committer=Confirmador
 settings.trust_model.committer.long=Committer: Firmas de confianza que coinciden con los committers (Esto coincide con GitHub y obligará a Forgejo a firmar los commits a tener a Forgejo como el committer)
-settings.trust_model.committer.desc=Las firmas válidas sólo se marcarán como "confiables" si coinciden con el committer, de lo contrario se marcarán como "no confiable". Esto obliga a Forgejo a ser el committer en commits firmados con el commit real marcado como Co-autorizado por: y Co-commited por: en el tráiler. La clave de Forgejo por defecto debe coincidir con un usuario en la base de datos.
-settings.trust_model.collaboratorcommitter=Colaborador+Comitter
-settings.trust_model.collaboratorcommitter.long=Colaborador+Comitter: Confiar en firmas de colaboradores que coincidan con el committer
+settings.trust_model.committer.desc=Las firmas válidas sólo se marcarán como "confiables" si coinciden con el confirmador, de lo contrario se marcarán como "no confiables". Esto obliga a Forgejo a ser el confirmador en confirmaciones firmadas por el confirmador real marcado como Co-autorizado por: y Co-confirmador por: en el tráiler. La clave de Forgejo por defecto debe coincidir con un usuario en la base de datos.
+settings.trust_model.collaboratorcommitter=Colaborador+Confirmador
+settings.trust_model.collaboratorcommitter.long=Colaborador+Confirmador: Confiar en firmas de colaboradores que coincidan con el confirmador
 settings.trust_model.collaboratorcommitter.desc=Las firmas válidas de los colaboradores de este repositorio se marcarán como "de confianza" si coinciden con el confirmador. De lo contrario, las firmas válidas se marcarán como "no confiables" si la firma coincide con el autor de la confirmación y como "no coincidentes" en caso contrario. Esto obligará a Forgejo a ser marcado como el confirmador en los compromisos firmados con el confirmador real marcado como Coautor por: y Cocommitido por: tráiler en el compromiso. La clave Forgejo predeterminada debe coincidir con un usuario en la base de datos.
 settings.wiki_delete=Eliminar datos del wiki
 settings.wiki_delete_desc=Eliminar los datos del wiki del repositorio es permanente y no se puede deshacer.
@@ -2459,7 +2459,7 @@ settings.protect_merge_whitelist_teams=Equipos en la lista blanca para fusionar
 settings.protect_check_status_contexts=Habilitar comprobación de estado
 settings.protect_status_check_patterns=Patrones de verificación de estado
 settings.protect_status_check_patterns_desc=Introduzca los patrones para especificar qué comprobaciones de estado deben pasar antes de que las ramas puedan ser fusionadas en una rama que coincida con esta regla. Cada línea especifica un patrón. Los patrones no pueden estar vacíos.
-settings.protect_check_status_contexts_desc=Requiere verificaciones de estado para pasar antes de fusionar. Elija qué verificaciones de estado deben pasar antes de que las ramas puedan fusionarse en una rama que coincida con esta regla. Cuando se active, los commits primero deben ser empujados a otra rama, y luego fusionados o empujados directamente a una rama que coincida con esta regla luego de que las verificaciones de estado hayan pasado. Si no se selecciona ningún contexto, el último commit debe ser exitoso sin importar el contexto.
+settings.protect_check_status_contexts_desc=Requiere verificaciones de estado para pasar antes de fusionar. Elija qué verificaciones de estado deben pasar antes de que las ramas puedan fusionarse en una rama que coincida con esta regla. Cuando se active, las confirmaciones primero deben ser empujadas a otra rama, y luego fusionadas o empujadas directamente a una rama que coincida con esta regla luego de que las verificaciones de estado hayan pasado. Si no se selecciona ningún contexto, la última confirmación debe ser exitosa independientemente del contexto.
 settings.protect_check_status_contexts_list=Comprobaciones de estado para este repositorio encontradas durante la semana pasada
 settings.protect_status_check_matched=Coincide
 settings.protect_invalid_status_check_pattern=Patrón de verificación de estado no válido: "%s".
@@ -2471,9 +2471,9 @@ settings.protect_approvals_whitelist_enabled_desc=Solo las revisiones de usuario
 settings.protect_approvals_whitelist_users=Lista blanca de usuarios revisores
 settings.protect_approvals_whitelist_teams=Lista blanca de equipos revisores
 settings.dismiss_stale_approvals=Descartar aprobaciones obsoletas
-settings.dismiss_stale_approvals_desc=Cuando los nuevos commits que cambien el contenido de la pull request sean empujados a la rama, se descartarán las aprobaciones antiguas.
+settings.dismiss_stale_approvals_desc=Cuando las nuevas confirmaciones que cambien el contenido de la solicitud de incorporación de cambios sean empujados a la rama, se descartarán las aprobaciones antiguas.
 settings.require_signed_commits=Exigir confirmaciones firmadas
-settings.require_signed_commits_desc=Rechazar push en esta rama si los commits no están firmados o no son verificables.
+settings.require_signed_commits_desc=Rechazar empujes en esta rama si las confirmaciones no están firmadas o no son verificables.
 settings.protect_branch_name_pattern=Patrón de nombre de ramas protegidas
 settings.protect_patterns=Patrones
 settings.protect_protected_file_patterns=Patrones de archivos protegidos (separados con punto y coma ';')
@@ -2492,8 +2492,8 @@ settings.block_rejected_reviews_desc=Fusionar no será posible cuando los reviso
 settings.block_on_official_review_requests=Fusionar bloques en solicitudes de revisión oficiales
 settings.block_on_official_review_requests_desc=Fusionar no será posible cuando tenga pedidos de revisión oficial, incluso si hay suficientes aprobaciones.
 settings.block_outdated_branch=Bloquear fusión si la pull request está desactualizada
-settings.block_outdated_branch_desc=La fusión no será posible cuando la rama principal esté detrás de la rama base.
-settings.default_branch_desc=Seleccione una rama de repositorio por defecto para los pull request y los commits:
+settings.block_outdated_branch_desc=La fusión no será posible cuando la rama de cabeza esté por detrás de la rama base.
+settings.default_branch_desc=Seleccione una rama de repositorio por defecto para las solicitudes de incorporación de cambios y las confirmaciones:
 settings.merge_style_desc=Estilos de fusión
 settings.default_merge_style_desc=Estilo de fusión por defecto
 settings.choose_branch=Elija una rama…
@@ -2520,7 +2520,7 @@ settings.matrix.room_id=ID de sala
 settings.matrix.message_type=Tipo de mensaje
 settings.archive.button=Archivar repositorio
 settings.archive.header=Archivar este repositorio
-settings.archive.text=Archivar el repositorio lo hará de sólo lectura. Se ocultará del tablero. Nadie (¡ni siquiera tú!) será capaz de hacer nuevos commits, o abrir nuevas incidencias o pull requests.
+settings.archive.text=Archivar el repositorio lo hará de sólo lectura. Se ocultará del tablero. Nadie (¡ni siquiera tú!) será capaz de hacer nuevas confirmaciones, o abrir nuevas incidencias o solicitudes de incorporación de cambios.
 settings.archive.success=El repositorio ha sido archivado exitosamente.
 settings.archive.error=Ha ocurrido un error al intentar archivar el repositorio. Vea el registro para más detalles.
 settings.archive.error_ismirror=No puede archivar un repositorio replicado.
@@ -2631,7 +2631,7 @@ release.prerelease=Pre-lanzamiento
 release.stable=Estable
 release.compare=Comparar
 release.edit=Editar
-release.ahead.commits=<strong>%d</strong> commits
+release.ahead.commits=<strong>%d</strong> confirmaciones
 release.ahead.target=a %s desde esta versión
 tag.ahead.target=a %s desde esta etiqueta
 release.source_code=Código fuente
@@ -2650,7 +2650,7 @@ release.prerelease_helper=Marcar este lanzamiento como no es adecuada para usar
 release.cancel=Cancelar
 release.publish=Publicar lanzamiento
 release.save_draft=Guardar borrador
-release.edit_release=Actualizar Lanzamiento
+release.edit_release=Actualizar lanzamiento
 release.delete_release=Eliminar lanzamiento
 release.delete_tag=Eliminar tag
 release.deletion=Eliminar lanzamiento
@@ -2771,7 +2771,7 @@ mirror_use_ssh.helper = Forgejo replicará el repositorio vía Git sobre SSH y c
 issues.edit.already_changed = No fue posible guardar los cambios a la incidencia. Parece que el contenido ya fue modificado por otro usuario. Actualiza la página e intenta editar de nuevo para evitar sobrescribir los cambios
 issues.author.tooltip.issue = Este usuario es el autor de esta incidencia.
 mirror_use_ssh.not_available = La autenticación por SSH no está disponible.
-issues.author.tooltip.pr = Este usuario es el autor de este pull request.
+issues.author.tooltip.pr = Este usuario es el autor de esta solicitud de incorporación de cambios.
 issues.blocked_by_user = No puedes crear una incidencia en este repositorio porque estas bloqueado por el propietario del repositorio.
 pulls.merged_title_desc_one = fusionó %[1]d commit de <code>%[2]s</code> en <code>%[3]s</code> %[4]s
 pulls.fast_forward_only_merge_pull_request = Sólo fast-forward
@@ -2789,7 +2789,7 @@ pulls.status_checks_hide_all = Ocultar todas las verificaciones
 settings.federation_not_enabled = La federación no está habilitada en tu instancia.
 wiki.search = Buscar en wiki
 pulls.status_checks_show_all = Mostrar todas las verificaciones
-pulls.commit_ref_at = `hizo referencia a este pull request desde un commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `hizo referencia a este pull request desde un commit %s`
 pulls.cmd_instruction_merge_title = Fusionar
 contributors.contribution_type.deletions = Eliminaciones
 contributors.contribution_type.filter_label = Tipo de contribución:
@@ -2832,7 +2832,7 @@ settings.confirmation_string = Cadena de confirmación
 issues.filter_sort.relevance = Relevancia
 settings.transfer_quota_exceeded = El nuevo propietario (%s) ha sobrepasado la cuota. El repositorio no ha sido transferido.
 settings.web_hook_name_sourcehut_builds = Builds de SourceHut
-settings.wiki_rename_branch_main_notices_2 =Se va a renombrar de forma permanente la rama interna de la wiki del repositorio %s. Se actualizaran los checkouts existentes.
+settings.wiki_rename_branch_main_notices_2 =Se renombrará permanentemente la rama interna de la wiki del repositorio %s. Los checkouts existentes necesitarán ser actualizados.
 settings.wiki_rename_branch_main = Normalizar el nombre de la rama de la wiki
 settings.wiki_rename_branch_main_desc = Renombrar la rama interna usada por la wiki a "%s". Este cambio es permanente y no se puede deshacer.
 settings.confirm_wiki_branch_rename = Renombrar la rama de la wiki
@@ -2875,15 +2875,20 @@ pulls.cmd_instruction_checkout_title = Cambiar rama
 release.add_external_asset = Añadir un recurso externo
 settings.enforce_on_admins_desc = Los administradores del repositorio no pueden saltarse esta regla.
 pulls.editable = Editable
-
 issues.filter_no_results = No hay resultados
-
 release.type_attachment = Archivo adjunto
-
-issues.reaction.alt_few = %[1]s reaccionado con %[2]s.
-settings.event_pull_request_enforcement = Aplicación
+sync_fork.button = Sincronizar
 settings.sourcehut_builds.visibility = Visibilidad de trabajo
 settings.ignore_stale_approvals = Ignorar las aprobaciones obsoletas
+settings.event_pull_request_enforcement = Aplicación
+issues.reaction.alt_few = %[1]s reaccionado con %[2]s.
+issues.filter_no_results_placeholder = Intenta ajustar tus filtros de búsqueda.
+pulls.delete_after_merge.head_branch.is_default = La rama actual que desea eliminar es la rama por defecto y no se puede eliminar.
+summary_card_alt = Tarjeta de resumen del repositorio %s
+settings.pull_mirror_sync_quota_exceeded = Cuota excedida, no se empujan los cambios.
+archive.nocomment = No es posible hacer comentarios porque el repositorio está archivado.
+sync_fork.branch_behind_one = Esta rama esta %[1]d cambios detrás de %[2]s
+sync_fork.branch_behind_few = Esta rama está %[1]d confirmaciones detrás de %[2]s
 
 [graphs]
 component_loading = Cargando %s…
@@ -3025,21 +3030,21 @@ settings.change_orgname_redirect_prompt.with_cooldown.one = El antiguo nombre de
 [admin]
 dashboard=Panel de control
 identity_access=Identidad y acceso
-users=Cuenta de Usuario
+users=Cuentas de usuario
 organizations=Organizaciones
-assets=Assets de código
+assets=Activos de código
 repositories=Repositorios
 hooks=Webhooks
 integrations=Integraciones
-authentication=Orígenes de autenticación
-emails=Correos de usuario
+authentication=Fuentes de autenticación
+emails=Correos electrónicos de usuario
 config=Configuración
-notices=Notificaciones del sistema
+notices=Avisos del sistema
 monitor=Monitorización
 first_page=Primera
 last_page=Última
 total=Total: %d
-settings=Configuración de Admin
+settings=Configuración del administrador
 
 dashboard.new_version_hint=Forgejo %s ya está disponible, estás ejecutando %s. Revisa <a target="_blank" rel="noreferrer" href="%s">el blog</a> para más detalles.
 dashboard.statistic=Resumen
@@ -3088,7 +3093,7 @@ dashboard.server_uptime=Tiempo de actividad del servidor
 dashboard.current_goroutine=Gorutinas actuales
 dashboard.current_memory_usage=Uso de memoria actual
 dashboard.total_memory_allocated=Total de Memoria Reservada
-dashboard.memory_obtained=Memoria Obtenida
+dashboard.memory_obtained=Memoria obtenida
 dashboard.pointer_lookup_times=Tiempos de búsqueda de punteros
 dashboard.memory_allocate_times=Asignaciones de memoria
 dashboard.memory_free_times=Liberaciones de memoria
@@ -3561,11 +3566,10 @@ emails.delete_primary_email_error = No puedes eliminar el correo electrónico pr
 config.cache_test =Caché de prueba
 emails.delete_desc = ¿Estás seguro que quieres eliminar esta dirección de correo electrónico?
 monitor.duration = Duración (es)
-
-
 self_check = Autocomprobación
-dashboard.sync_tag.started = Sincronización de etiquetas iniciada
 config.app_slogan = Eslogan de la instancia
+dashboard.sync_tag.started = Sincronización de etiquetas iniciada
+
 
 [action]
 create_repo=creó el repositorio <a href="%s">%s</a>
@@ -3584,7 +3588,7 @@ auto_merge_pull_request=`fusionado automáticamente pull request <a href="%[1]s"
 transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>
 push_tag=hizó push la etiqueta <a href="%[2]s">%[3]s</a> a <a href="%[1]s">%[4]s</a>
 delete_tag=etiqueta eliminada %[2]s de <a href="%[1]s">%[3]s</a>
-delete_branch=rama %[2]s eliminada, de <a href="%[1]s">%[3]s</a>
+delete_branch=rama <code>%[2]s</code> eliminada, de <a href="%[1]s">%[3]s</a>
 compare_branch=Comparar
 compare_commits=Comparar %d commits
 compare_commits_general=Comparar commits
@@ -3593,7 +3597,7 @@ mirror_sync_create=sincronizó la nueva referencia <a href="%[2]s">%[3]s</a> a <
 mirror_sync_delete=sincronizada y eliminada referencia <code>%[2]s</code> en <a href="%[1]s">%[3]s</a> desde réplica
 approve_pull_request=`aprobó <a href="%[1]s">%[3]s#%[2]s</a>`
 reject_pull_request=`sugirió cambios para <a href="%[1]s">%[3]s#%[2]s</a>`
-publish_release=`se lanzó <a href="%[2]s"> "%[4]s" </a> en <a href="%[1]s">%[3]s</a>`
+publish_release=`lanzó <a href="%[2]s">%[4]s</a> en <a href="%[1]s">%[3]s</a>`
 review_dismissed=`descartó la revisión de <b>%[4]s</b> para <a href="%[1]s">%[3]s#%[2]s</a>`
 review_dismissed_reason=Motivo:
 create_branch=creó rama <a href="%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a>
@@ -3676,7 +3680,7 @@ requirements=Requisitos
 dependencies=Dependencias
 keywords=Palabras clave
 details=Detalles
-details.author=Autoría
+details.author=Autor
 details.project_site=Sitio del proyecto
 details.repository_site=Sitio del repositorio
 details.documentation_site=Sitio de documentación
@@ -3825,15 +3829,12 @@ alt.install = Instalar paquete
 alt.repository = Información del repositorio
 alt.repository.architectures = Arquitecturas
 alt.repository.multiple_groups = Este paquete está disponible en múltiples grupos.
-
 arch.version.description = Descripción
 arch.version.provides = Proveedores
-
+npm.dependencies.bundle = Empaquetar dependencias
+arch.version.checkdepends = Comprobar dependencias
 arch.version.optdepends = Dependencias opcionales
 arch.version.makedepends = Construir dependencias
-arch.version.checkdepends = Comprobar dependencias
-npm.dependencies.bundle = Empaquetar dependencias
-
 arch.pacman.helper.gpg = Añade el certificado de confianza para pacman:
 
 [secrets]
@@ -3939,15 +3940,16 @@ variables.update.success=La variable ha sido editada.
 variables.id_not_exist = Variable con id %d no existe.
 runs.empty_commit_message = (mensaje de commit vacío)
 runs.expire_log_message = Los registros han sido eliminados porque eran demasiado antiguos.
-
 runs.workflow = Flujo de trabajo
-
-workflow.dispatch.use_from = Usar el flujo de trabajo de
 workflow.dispatch.run = Correr flujo de trabajo
-
+workflow.dispatch.use_from = Usar el flujo de trabajo de
+workflow.dispatch.invalid_input_type = Tipo de entrada inválida "%s".
 runs.no_workflows = Aún no hay flujos de trabajo.
 workflow.dispatch.success = La ejecución del flujo de trabajo se ha solicitado correctamente.
-workflow.dispatch.invalid_input_type = Tipo de entrada inválida "%s".
+variables.not_found = No se ha encontrado la variable.
+workflow.dispatch.input_required = Se requiere valor para la entrada "%s".
+workflow.dispatch.trigger_found = Este flujo de trabajo tiene un disparador de eventos <c>workflow_dispatch</c>.
+workflow.dispatch.warn_input_limit = Sólo se muestran las primeras %d entradas.
 
 [projects]
 type-1.display_name=Proyecto individual
@@ -3997,7 +3999,6 @@ regexp = Expresión Regular
 [markup]
 filepreview.lines = Líneas %[1]d a %[2]d en %[3]s
 filepreview.line = Línea %[1]d en %[2]s
-
 filepreview.truncated = La vista previa se ha truncado
 
 [repo.permissions]
@@ -4018,11 +4019,12 @@ code.write = <b>Escritura:</b> Push al repositorio, crear ramas y tags.
 issues.write = <b>Escritura:</b> Cerrar incidencias y gestion de metadatos como etiquetas, hitos, asignaciones, fechas de vencimiento y dependencias.
 packages.write = <b>Escritura:</b> Publicar y eliminar paquetes asignados al repositorio.
 
+
 [munits.data]
-b = B
-kib = KiB
-mib = MiB
-gib = GiB
-tib = TiB
-pib = PiB
 eib = EiB
+gib = GiB
+pib = PiB
+kib = KiB
+tib = TiB
+mib = MiB
+b = B
\ No newline at end of file
diff --git a/options/locale/locale_et.ini b/options/locale/locale_et.ini
index e54ceadbb5..79361cf43d 100644
--- a/options/locale/locale_et.ini
+++ b/options/locale/locale_et.ini
@@ -1,67 +1,67 @@
 [common]
 tracked_time_summary = Kokkuvõte jälgitavast ajast, mis põhineb probleemide nimekirja filtritel
-your_settings = Seaded
+your_settings = Seadistused
 home = Avaleht
-dashboard = Armatuurlaud
-explore = Uurige
-help = Abi
+dashboard = Töölaud
+explore = Uuri
+help = Abiteave
 logo = Logo
 sign_in = Logi sisse
-sign_in_with_provider = Logi sisse koos %s
+sign_in_with_provider = Logi sisse kasutajakontoga: %s
 sign_in_or = või
-sign_out = Registreeru välja
+sign_out = Logi välja
 sign_up = Registreeru
-link_account = Lingi konto
+link_account = Lingi väline kasutajakonto
 register = Registreeru
 version = Versioon
 page = Lehekülg
 template = Mall
 language = Keel
-notifications = Teated
+notifications = Teavitused
 active_stopwatch = Aktiivne aja jälgimine
 create_new = Loo…
-user_profile_and_more = Profiil ja seaded…
+user_profile_and_more = Profiil ja seadistused…
 signed_in_as = Sisselogitud kui
-enable_javascript = See veebileht nõuab JavaScripti.
+enable_javascript = See veebileht eeldab JavaScripti kasutamise lubamist.
 toc = Sisukord
 licenses = Litsentsid
 username = Kasutajanimi
-webauthn_error_unable_to_process = Server ei saanud teie taotlust töödelda.
-webauthn_error_duplicated = Turvalisuse võti ei ole selle taotluse puhul lubatud. Palun veenduge, et võti ei ole juba registreeritud.
+webauthn_error_unable_to_process = Server ei saanud sinu päringut töödelda.
+webauthn_error_duplicated = Turvavõti ei ole selle päringu puhul lubatud. Palun veendu, et võti ei ole juba registreeritud.
 return_to_forgejo = Tagasi Forgejo'sse
-toggle_menu = Lülitage menüü
-more_items = Rohkem esemeid
+toggle_menu = Lülita menüü sisse/välja
+more_items = Rohkem objekte
 email = E-posti aadress
-password = Parool
-access_token = Juurdepääsutähis
-re_type = Kinnita parool
+password = Salasõna
+access_token = Tunnusluba
+re_type = Kinnita salasõna
 twofa = Kahefaktoriline autentimine
 twofa_scratch = Kahefaktoriline kriipsukood
-passcode = Passkood
-webauthn_insert_key = Sisestage oma turvavõti
-webauthn_sign_in = Vajutage turvavõtme nuppu. Kui teie turvavõtmel ei ole nuppu, sisestage see uuesti.
-webauthn_press_button = Palun vajutage turvavõtme nuppu…
-webauthn_use_twofa = Kasutage oma telefonist kahefaktorilist koodi
-webauthn_error = Teie turvavõti ei saanud lugeda.
-webauthn_unsupported_browser = Teie brauser ei toeta praegu WebAuthn.
-webauthn_error_unknown = Tekkis tundmatu viga. Palun proovige uuesti.
-webauthn_error_insecure = WebAuthn toetab ainult turvalisi ühendusi. HTTP kaudu testimiseks võite kasutada päritolu "localhost" või "127.0.0.1"
-webauthn_error_empty = Sellele võtmele tuleb määrata nimi.
-webauthn_error_timeout = Ajakatkestus saavutati enne võtme lugemist. Palun laadige see lehekülg uuesti ja proovige uuesti.
+passcode = Salakood
+webauthn_insert_key = Sisesta oma turvavõti
+webauthn_sign_in = Vajuta turvavõtme nuppu. Kui sinu turvavõtmel ei ole nuppu, sisesta see uuesti.
+webauthn_press_button = Palun vajuta turvavõtme nuppu…
+webauthn_use_twofa = Sisesta oma telefonist kahefaktorilise autentimise kood
+webauthn_error = Sinu turvavõtit ei saanud lugeda.
+webauthn_unsupported_browser = Sinu veebibrauser ei toeta praegu WebAuthn-liidestust.
+webauthn_error_unknown = Tekkis tundmatu viga. Palun proovi uuesti.
+webauthn_error_insecure = WebAuthn toetab ainult turvalisi ühendusi. HTTP kaudu testimiseks võid kasutada lähteaadressina „localhost“ või „127.0.0.1“
+webauthn_error_empty = Palun lisa sellele võtmele täisnimi.
+webauthn_error_timeout = Päring aegus enne võtme lugemist. Palun laadi see lehekülg uuesti ja proovi uuesti.
 repository = Hoidla
 organization = Organisatsioon
-new_fork = Uus hoidla haru
+new_fork = Uus lähekoodihoidla haru
 new_project = Uus projekt
 new_project_column = Uus veerg
-admin_panel = Saidi administreerimine
-settings = Seaded
+admin_panel = Saidi haldus
+settings = Seadistused
 your_profile = Profiil
 your_starred = Tähistatud tärniga
-new_repo.title = Uus hoidla
-new_migrate.title = Uus sisseränne
+new_repo.title = Uus lähtekoodi hoidla
+new_migrate.title = Uus kolimine
 new_org.title = Uus organisatsioon
-new_repo.link = Uus hoidla
-new_migrate.link = Uus sisseränne
+new_repo.link = Uus lähtekoodi hoidla
+new_migrate.link = Uus kolimine
 new_org.link = Uus organisatsioon
 all = Kõik
 sources = Allikad
@@ -69,10 +69,10 @@ mirror = Peegelpilt
 mirrors = Peegelpildid
 forks = Harud
 activities = Tegevused
-pull_requests = Tõmbepäringud
-issues = Probleemid
+pull_requests = Päringud koodi mestimiseks
+issues = Veahaldus
 milestones = Verstapostid
-ok = OK
+ok = Sobib
 cancel = Tühista
 retry = Proovi uuesti
 rerun = Käivita uuesti
@@ -81,120 +81,136 @@ add = Lisa
 add_all = Lisa kõik
 remove = Eemalda
 remove_all = Eemalda kõik
-remove_label_str = Eemalda ühik "%s"
-edit = Redigeeri
+remove_label_str = Eemalda „%s“ objekt
+edit = Muuda
 view = Vaata
-test = Test
-enabled = Võimaldatud
-disabled = Välja lülitatud
-locked = Lukkus
+test = Testi
+enabled = Kasutusel
+disabled = Pole kasutusel
+locked = Lukustatud
 copy = Kopeeri
-copy_url = Kopeeri URL
-copy_hash = Kooperi hash
+copy_url = Kopeeri võrguaadress
+copy_hash = Kopeeri räsi
 copy_content = Kopeeri sisu
 copy_branch = Kopeeri haru nimi
 copy_success = Kopeeritud!
-copy_error = Kopeerimine ebaõnnestus
+copy_error = Kopeerimine ei õnnestunud
 copy_type_unsupported = Seda failitüüpi ei saa kopeerida
 write = Kirjuta
 preview = Eelvaade
-loading = Laadimine…
+loading = Laadin…
 error = Viga
-error404 = Lehekülge, millele te üritate jõuda, kas <strong>ei ole olemas</strong> või <strong>teil ei ole õigust</strong> seda vaadata.
+error404 = Lehekülge, millele sa üritad jõuda, kas <strong>ei ole olemas</strong>, <strong>ta on eemaldatud</strong> või <strong>sul ei ole õigust</strong> seda vaadata.
 error413 = Sa oled oma kvoodi ammendanud.
 go_back = Mine tagasi
-invalid_data = Kehtetud andmed: %v
+invalid_data = Vigased andmed: %v
 never = Mitte kunagi
 unknown = Teadmata
-rss_feed = RSS infovoog
-confirm_delete_artifact = Kas oled kindel et soovite artefakti "%s" kustutada?
-pin =
+rss_feed = RSS-voog
+confirm_delete_artifact = Kas oled kindel et soovid „%s“ artefakti kustutada?
+pin =Tõsta esile
 artifacts = Artefaktid
 archived = Arhiveeritud
-concept_system_global = Ülemaailmne
+concept_system_global = Üldine
 concept_user_individual = Individuaalne
-concept_code_repository = Hoidla
+concept_code_repository = Lähtekoodi hoidla
 concept_user_organization = Organisatsioon
-show_timestamps = Näita ajatemplid
-show_log_seconds = Näita sekundit
-download_logs = Logide allalaadimine
+show_timestamps = Näita ajatempleid
+show_log_seconds = Näita sekundeid
+download_logs = Laadi logid alla
 name = Nimi
 value = Väärtus
 filter = Filter
-filter.clear = Tühjendage filtrid
+filter.clear = Tühjenda filtrid
 filter.is_archived = Arhiveeritud
-filter.not_archived = Mitte arhiveeritud
-filter.is_fork = Harud
-filter.not_fork = Mitte harud
-filter.is_mirror = Peegelpiltid
-filter.not_mirror = Mitte peegelpiltid
+filter.not_archived = Arhiveerimata
+filter.is_fork = Koodiharud
+filter.not_fork = Pole koodiharud
+filter.is_mirror = Peegelpildid
+filter.not_mirror = Pole peegelpilte
 filter.is_template = Mallid
-filter.not_template = Mitte Mallid
+filter.not_template = Pole mallid
 filter.public = Avalik
 filter.private = Privaatne
 rerun_all = Käivita uuesti kõik tööd
 new_mirror = Uus peegelpilt
 copy_generic = Kopeeri lõikelauale
-confirm_delete_selected = Kinnitage et kustutada kõik valitud elemendid?
-show_full_screen = Näita täisekraanil
+confirm_delete_selected = Kas kinnitad kõikide valitud objektide kustutamise?
+show_full_screen = Näita täisekraanivaates
+copy_path = Kopeeri asukoht
+captcha = Robotilõks
+unpin = Lõpeta esiletõstmine
+powered_by = Siin on kasutusel %s
 
 [search]
-search = Otsi...
+search = Otsi…
 fuzzy = Hägus
-fuzzy_tooltip = Lisage tulemused mis vastavad ka otsingu terminile
+fuzzy_tooltip = Lisa tulemused mis lähedalt vastavad otsingusõnale
 union = Märksõnad
 exact = Täpne
-exact_tooltip = Sisaldab ainult tulemusi mis vastavad täpsele otsingusõnale
-repo_kind = Otsi hoidlad...
-user_kind = Otsi kasutajaid...
-org_kind = Otsi organisatsioone...
-team_kind = Otsi meeskonnad...
-code_kind = Otsi koodi...
+exact_tooltip = Sisaldab ainult tulemusi, mis vastavad täpsele otsingusõnale
+repo_kind = Otsi lähtekoodihoidlad…
+user_kind = Otsi kasutajaid…
+org_kind = Otsi organisatsioone…
+team_kind = Otsi tiime…
+code_kind = Otsi koodi…
 code_search_by_git_grep = Praeguse koodi otsingu tulemused annab "git grep". Paremaid tulemusi võib saada, kui saidi administraator lubab koodi indekseerija.
-package_kind = Otsi pakette...
-project_kind = Otsi projekte...
-branch_kind = Otsi harusid...
-commit_kind = Otsi kommiteid...
-runner_kind = Otsi jooksjaid...
+package_kind = Otsi pakette…
+project_kind = Otsi projekte…
+branch_kind = Otsi harusid…
+commit_kind = Otsi kommiteid…
+runner_kind = Otsi jooksjaid…
 no_results = Sobivaid tulemusi ei leitud.
-issue_kind = Otsi probleeme...
+issue_kind = Otsi probleeme…
 milestone_kind = Otsi verstapostid...
 type_tooltip = Otsingu tüüp
-code_search_unavailable = Koodide otsing ei ole praegu saadaval. Palun võtke ühendust saidi administraatoriga.
-union_tooltip = Sisaldab tulemused mis vastavad mis tahes tühikutega eraldatud võtmesõnadele
-keyword_search_unavailable = Otsing märksõna järgi ei ole praegu saadaval. Palun võtke ühendust saidi administraatoriga.
-pull_kind = Otsi tõmbepäringuid...
+code_search_unavailable = Koodiotsing ei ole praegu saadaval. Palun võta ühendust saidi administraatoriga.
+union_tooltip = Kaasa tulemusi, mis vastavad mis tahes tühikutega eraldatud märksõnadele
+keyword_search_unavailable = Otsing märksõna järgi ei ole praegu saadaval. Palun võtke ühendust saidi haldajaga.
+pull_kind = Otsi tõmbepäringuid…
 
 [aria]
 navbar = Navigatsiooniriba
-footer.software = Selle tarkvara kohta
+footer.software = Teave selle tarkvara kohta
 footer.links = Lingid
+footer = Jalus
 
 [heatmap]
-number_of_contributions_in_the_last_12_months = %s panused viimase 12 kuu jooksul
-contributions_zero = Panused ei ole
+number_of_contributions_in_the_last_12_months = %s kaastööd viimase 12 kuu jooksul
+contributions_zero = Kaastöid ei ole
 contributions_format = {contributions} {day} {month}, {year}
-contributions_few = panused
+contributions_few = kaastööd
 less = Vähem
 more = Rohkem
-contributions_one = panus
+contributions_one = kaastöö
 
 [editor]
 buttons.heading.tooltip = Lisa pealkiri
-buttons.italic.tooltip = Lisa kursiivne tekst
-buttons.quote.tooltip = Tsitaadi tekst
+buttons.italic.tooltip = Lisa kaldkirjas tekst
+buttons.quote.tooltip = Tsiteeri teksti
 buttons.code.tooltip = Lisa kood
 buttons.link.tooltip = Lisa link
 buttons.list.ordered.tooltip = Lisa nummerdatud nimekiri
 buttons.list.unordered.tooltip = Lisa nimekiri
 buttons.list.task.tooltip = Lisa ülesannete nimekiri
-buttons.ref.tooltip = Viide probleemile või tõmbepäringule
-buttons.switch_to_legacy.tooltip = Kasutage selle asemel pärandredaktorit
-buttons.enable_monospace_font = Võimalda püsisammkiri
-buttons.disable_monospace_font = Lülita välja püsisammkiri
-buttons.indent.tooltip = Pesa esemed ühe taseme võrra
-buttons.bold.tooltip = Lisa rasvane tekst
-buttons.mention.tooltip = Mainige kasutajat või meeskonda
+buttons.ref.tooltip = Viide probleemile või mestimispäringule
+buttons.switch_to_legacy.tooltip = Selle asemel kasuta pärandredaktorit
+buttons.enable_monospace_font = Kasuta püsisammkirja
+buttons.disable_monospace_font = Lülita püsisammkiri välja
+buttons.indent.tooltip = Liiguta objekte ühe taseme võrra
+buttons.bold.tooltip = Lisa paks tekst
+buttons.mention.tooltip = Maini kasutajat või tiimi
+buttons.unindent.tooltip = Võta tagasi objektide liigutamine ühe taseme võrra
+buttons.new_table.tooltip = Lisa tabel
+table_modal.header = Lisa tabel
+table_modal.placeholder.header = Päis
+table_modal.placeholder.content = Sisu
+table_modal.label.rows = Read
+table_modal.label.columns = Veerud
+link_modal.header = Lisa link
+link_modal.url = Võrguaadress
+link_modal.description = Kirjeldus
+link_modal.paste_reminder = Soovitus: kui link on uba lõikelaual olemas, siis võis ta otse lisada ja link luuakse automaatselt.
 
 [filter]
 string.asc = A - Z
@@ -205,114 +221,179 @@ occurred = Tekkis viga
 invalid_csrf = Halb taotlus: vigane CSRF token
 not_found = Sihtmärki ei leitud.
 network_error = Võrguviga
-server_internal = Sisemine serveri viga
-report_message = Kui usute et tegemist on Forgejo veaga siis otsige probleeme <a href="%s" target="_blank">Codebergist</a> või avage vajadusel uus probleem.
+server_internal = Serveri sisemine viga
+report_message = Kui usud, et tegemist on Forgejo veaga, siis otsige sarnaseid vigu <a href="%s" target="_blank">Codebergist</a> või vajadusel koosta uus veakirjeldus.
 
 [startpage]
-app_desc = Valutu, isehostitatud Git'i teenus
+app_desc = Muretu Git'i teenus sinu omas serveris
 install = Lihtne paigaldada
 platform = Platvormiülene
-platform_desc = Forgejo on kinnitust leidnud et töötab nii libre operatsioonisüsteemides nagu Linux ja FreeBSD, kui ka erinevatel protsessorarhitektuuridel. Valige see mis teile meeldib!
+platform_desc = On kinnitust leidnud, et Forgejo töötab nii avatud operatsioonisüsteemides nagu Linux ja FreeBSD, kui ka erinevatel protsessorarhitektuuridel. Vali see mis sulle meeldib!
 lightweight = Kergekaaluline
-lightweight_desc = Forgejo on väikeste miinimumnõuetega ja seda saab kasutada odaval Raspberry Pi'l. Säästa oma masina energiat!
+lightweight_desc = Forgejo on väikeste miinimumnõuetega ja seda saad kasutada odaval Raspberry Pi'l. Säästa oma masina energiat!
 license = Avatud lähtekood
-install_desc = Lihtsalt <a target="_blank" rel="noopener noreferrer" href="%[1]s">käivitage oma platvormi binaarsüsteem</a>, tarnige see koos <a target="_blank" rel="noopener noreferrer" href="%[2]s">Dockeriga</a>, või saada see <a target="_blank" rel="noopener noreferrer" href="%[3]s">pakendatud</a>.
-license_desc = Mine võta <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Liitu meiega andes <a target="_blank" rel="noopener noreferrer" href="%[2]s">oma panuse</a> et muuta see projekt veelgi paremaks. Ärge häbenege olla kaasaaitaja!
+install_desc = Lihtsalt <a target="_blank" rel="noopener noreferrer" href="%[1]s">käivita rakenduse fail oma platvormil</a>, pane ta tööle <a target="_blank" rel="noopener noreferrer" href="%[2]s">Dockeriga</a> või laadi ta <a target="_blank" rel="noopener noreferrer" href="%[3]s">pakendatuna</a>.
+license_desc = Laadi <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a> alla! Liitu meiega andes <a target="_blank" rel="noopener noreferrer" href="%[2]s">oma panuse</a>, et muuta see projekt veelgi paremaks. Ära pelga osalemist!
 
 [install]
 install = Paigaldamine
 title = Esialgne konfiguratsioon
-docker_helper = Kui käivitate Forgejo't Dockeri sees, lugege <a target="_blank" rel="noopener noreferrer" href="%s">dokumentatsiooni</a> enne seadete muutmine.
-require_db_desc = Forgejo vajab MySQL, PostgreSQL, SQLite3 või TiDB (MySQL protokoll).
-db_title = Andmebaasi seaded
+docker_helper = Kui käivitad Forgejo't Dockeris, loe enne seadistuste muutmist <a target="_blank" rel="noopener noreferrer" href="%s">dokumentatsiooni</a>.
+require_db_desc = Forgejo vajab tööks ühte järgnevast andmebaasidest: MySQL, PostgreSQL, SQLite3 või TiDB (MySQL protokoll).
+db_title = Andmebaasi seadistused
 db_type = Andmebaasi tüüp
-host = Vastuvõtja
+host = Server
 user = Kasutajanimi
-password = Parool
+password = Salasõna
 db_name = Andmebaasi nimi
-db_schema = Skeem
-db_schema_helper = Jäta tühjaks andmebaasi vaikimisi ("avalik").
+db_schema = Andmeskeem
+db_schema_helper = Vaikimisi valiku kasutamiseks jäta tühjaks („public“).
 ssl_mode = SSL
-path = Tee
-sqlite_helper = SQLite3 andmebaasi failitee.<br>Sisestage absoluutne tee, kui käivitate Forgejo't teenusena.
-reinstall_error = Sa üritad installeerida olemasolevasse Forgejo andmebaasi
-reinstall_confirm_message = Olemasoleva Forgejo andmebaasi uuesti paigaldamine võib põhjustada mitmeid probleeme. Enamasti peaksite Forgejo käivitamiseks kasutama olemasolevat "app.ini". Kui te teate, mida teete, kinnitage järgmist:
-reinstall_confirm_check_1 = Andmed, mis on krüpteeritud SECRET_KEY'ga app.ini's, võivad kaduda: kasutajad ei pruugi saada 2FA/OTP-ga sisse logima ja peegelpiltid ei pruugi õigesti toimida. Selle kasti märkimisega kinnitate, et praegune app.ini fail sisaldab õiget SECRET_KEY'd.
-reinstall_confirm_check_3 = Te kinnitate, et olete täiesti kindel, et see Forgejo töötab õiges app.ini asukohas ja et olete kindel, et peate uuesti installima. Te kinnitate, et tunnistate ülaltoodud riske.
-err_empty_db_path = SQLite3 andmebaasi tee ei saa olla tühi.
-no_admin_and_disable_registration = Kasutajate iseregistreerimist ei saa keelata ilma administraatori kontot loomata.
-err_empty_admin_password = Administraatori parool ei saa olla tühi.
-err_empty_admin_email = Administraatori e-posti aadress ei saa olla tühi.
-err_admin_name_is_reserved = Administraatori kasutajanimi on kehtetu, kasutajanimi on reserveeritud
-err_admin_name_pattern_not_allowed = Administraatori kasutajanimi on kehtetu, kasutajanimi vastab reserveeritud mustrile
-err_admin_name_is_invalid = Administraatori kasutajanimi on kehtetu
-general_title = Üldised seaded
-app_name = Instantsi pealkiri
-app_name_helper = Sisestage siia oma instantsi nimi. See kuvatakse igal leheküljel.
-app_slogan = Instantse loosung
-repo_path = Hoidla juurte tee
-lfs_path = Git LFS'i juurte tee
-lfs_path_helper = Failid jälgitatud Git LFS'ist salvestatakse sellesse kaustale. Jätke tühjaks et välja lülitada.
+path = Asukoht
+sqlite_helper = SQLite3 andmebaasi aukoht.<br>Kui käivitad Forgejo'd teenusena, siis sisesta absoluutne asukoht.
+reinstall_error = Sa üritad paigaldada olemasolevasse Forgejo andmebaasi
+reinstall_confirm_message = Olemasoleva Forgejo andmebaasi uuesti paigaldamine võib põhjustada mitmeid probleeme. Enamasti peaksid Forgejo käivitamiseks kasutama olemasolevat „app.ini“. Kui te tead, mida teed, kinnita järgmist:
+reinstall_confirm_check_1 = Andmed, mis on krüpteeritud SECRET_KEY'ga app.ini's, võivad kaduda: kasutajad ei pruugi saada sisselogimisel kaasutada 2FA/OTP võimalusi ja peegelpildid ei pruugi õigesti toimida. Selle kasti märkimisega kinnitad, et praegune app.ini fail sisaldab õiget SECRET_KEY'd.
+reinstall_confirm_check_3 = Sa kinnitad, et oled täiesti kindel, et see Forgejo töötab õiges app.ini asukohas ja et oled kindel, et pead uuesti paigaldama. Sa kinnitad, et oled teadlik ülaltoodud riskidest.
+err_empty_db_path = SQLite3 andmebaasi asukoht ei saa olla tühi.
+no_admin_and_disable_registration = Kasutajate iseregistreerimist ei saa keelata ilma peakasutaja kontot loomata.
+err_empty_admin_password = Peakasutaja salasõna ei saa olla tühi.
+err_empty_admin_email = Peakasutaja e-posti aadress ei saa olla tühi.
+err_admin_name_is_reserved = Peakasutaja kasutajanimi on vigane, kasutajanimi on reserveeritud
+err_admin_name_pattern_not_allowed = Peakasutaja kasutajanimi on vigane, kasutajanimi vastab reserveeritud mustrile
+err_admin_name_is_invalid = Peakasutaja kasutajanimi on vigane
+general_title = Üldised seadistused
+app_name = Serveri nimi või pealkiri
+app_name_helper = Sisestage siia oma serveri või teenuse nimi. See kuvatakse igal leheküljel.
+app_slogan = Serveri tunnuslause
+repo_path = Hoidla juurkausta asukoht
+lfs_path = Git LFS'i juurkausta asukoht
+lfs_path_helper = Git LFS'ist jälgitud failid salvestatakse siia kausta. Kui jätad tühjaks, siis pole see võimalus kasutusel.
 run_user = Kasutaja kellena käivitada
-run_user_helper = Operatsioonisüsteemi kasutajanimi, mille all Forgejo töötab. Pange tähele, et sellel kasutajal peab olema juurdepääs hoidlate juurte teele.
+run_user_helper = Operatsioonisüsteemi kasutajanimi, kellena Forgejo töötab. Pane tähele, et sellel kasutajal peab olema juurdepääs hoidlate juurkaustale.
 domain = Serveri domeen
-domain_helper = Serveri domeen või hostiaadress.
+domain_helper = Serveri domeen või hosti aadress.
 ssh_port = SSH-serveri port
-ssh_port_helper = Pordi number, mida SSH-server kasutab. Jätke tühjaks et välja lülitada SSH-serveri.
-http_port = HTTP-kuulamise port
+ssh_port_helper = Pordi number, mida SSH-server kasutab. SSH-serveri väljalülitamiseks jäta tühjaks.
+http_port = Serveri HTTP port
 http_port_helper = Pordi number, mida Forgejo veebiserver kasutab.
-app_url = Baasi URL
-app_url_helper = Baasaadress HTTP(S) kloonimise URL-ide ja e-posti teadete jaoks.
-log_root_path = Logi tee
-log_root_path_helper = Logifailid kirjutatakse sellesse kaustale.
-optional_title = Vabatahtlikud seaded
-email_title = E-posti seaded
-smtp_addr = SMTP vastuvõtja
+app_url = Juur-võrguaadress
+app_url_helper = Lähteaadress HTTP(S) kloonimise võrguaadresside ja e-posti teadete jaoks.
+log_root_path = Logi asukoht
+log_root_path_helper = Logifailid kirjutatakse siia kausta.
+optional_title = Täiendavad seadistused
+email_title = E-posti seadistused
+smtp_addr = SMTP server
 smtp_port = SMTP port
 smtp_from = Saada e-kirjad nagu
-smtp_from_invalid = "Saada e-kirjad nagu" aadress on kehtetu
-smtp_from_helper = E-posti aadress, mida Forgejo kasutab. Sisestage tavaline e-posti aadress või kasutage formaati "Nimi" <email@example.com>.
+smtp_from_invalid = „Saada e-kirjad nagu“ aadress on vigane
+smtp_from_helper = E-posti aadress, mida Forgejo kasutab. Sisesta tavaline e-posti aadress või kasutage vormingut "Nimi" <email@example.com>.
 mailer_user = SMTP kasutajanimi
-mailer_password = SMTP parool
-register_confirm = Registreerimiseks on vaja e-posti kinnitust
-mail_notify = Lubage e-posti teated
-server_service_title = Serveri ja kolmanda osapoole teenuste seaded
-offline_mode = Lülita sisse lokaalse režiimi
-disable_gravatar = Lülita välja Gravatar
-federated_avatar_lookup = Lülita sisse föderaalsed avatarid
-federated_avatar_lookup.description = Otsige avatare kasutades Libravatar'i.
+mailer_password = SMTP salasõna
+register_confirm = Registreerimiseks on vaja e-posti kinnitamist
+mail_notify = Kasuta teavitamist e-posti teel
+server_service_title = Serveri ja kolmanda osapoole teenuste seadistused
+offline_mode = Lülita sisse lokaalne režiim
+disable_gravatar = Lülita Gravatar välja
+federated_avatar_lookup = Kaasuta födereeritud tunnuspilte
+federated_avatar_lookup.description = Otsi tunnuspilte Libravatari teenusest.
 disable_registration = Lülita välja iseregistreerimine
 allow_only_external_registration = Luba registreerimine ainult väliste teenuste kaudu
 allow_only_external_registration.description = Kasutajad saavad uusi kontosid luua ainult seadistatud väliste teenuste abil.
-openid_signin = Lülita sisse OpenID sisselogimise
-openid_signin.description = Luba kasutajatel OpenID kaudu sisse logida.
-openid_signup = Lülita sisse OpenID iseregistreerimine
-enable_captcha = Lülita sisse registreerimise CAPTCHA
-enable_captcha.description = Nõudke kasutajatelt CAPTCHA läbimist kontode loomiseks.
-require_sign_in_view = Nõua sisselogimist et vaadata instantsi sisu
-default_keep_email_private = Peida e-posti aadressid vaikimisi
-default_keep_email_private.description = Lülita sisse uute kasutajate e-posti aadressi varjamine vaikimisi, et see teave ei lekiks kohe pärast registreerimist.
-default_allow_create_organization = Lubada organisatsioonide loomine vaikimisi
-default_enable_timetracking = Aja jälgimise sisselülitamine vaikimisi
-default_enable_timetracking.description = Lubage uute repositooriumide jaoks vaikimisi aja jälgimise funktsiooni kasutamine.
-admin_title = Administraatori konto seaded
-admin_setting.description = Administraatori konto loomine on vabatahtlik. Esimesest registreeritud kasutajast saab automaatselt administraator.
-admin_name = Administraatori kasutajanimi
-admin_password = Parool
-confirm_password = Parooli kinnitamine
+openid_signin = Kasuta OpenID abil sisselogimist
+openid_signin.description = Luba kasutajatel OpenID abil sisse logida.
+openid_signup = Kasuta OpenID abil iseregistreerimist
+enable_captcha = Kasuta registreerimisel robotilõksu
+enable_captcha.description = Eelda, et kasutajad lahendavad registreerimisel robotilõksu ülesande.
+require_sign_in_view = Serveri sisu vaatamiseks eelda sisselogimist
+default_keep_email_private = Vaikimisi peida e-posti aadressid
+default_keep_email_private.description = Lülita sisse uute kasutajate e-posti aadresside vaikimisi varjamine - see väldib vastava teabe lekkimist kohe pärast registreerimist.
+default_allow_create_organization = Vaikimisi luba organisatsioonide loomine
+default_enable_timetracking = Vaikimisi lülita sisse aja jälgimine
+default_enable_timetracking.description = Vaikimisi luba uute lähtekoodihoidlate jaoks aja jälgimise funktsiooni kasutamise.
+admin_title = Peakasutaja konto seaded
+admin_setting.description = Peakasutaja konto loomine on vabatahtlik. Esimesest registreeritud kasutajast saab automaatselt peakasutaja.
+admin_name = Peakasutaja kasutajanimi
+admin_password = Salasõna
+confirm_password = Kinnita salasõna
 admin_email = E-posti aadress
-config_location_hint = Need konfiguratsioonivalikud salvestatakse sees:
+config_location_hint = Need konfiguratsioonivalikud salvestatakse siin:
 install_btn_confirm = Paigalda Forgejo
-test_git_failed = Ei saanud testida käsku "git": %v
-invalid_db_setting = Andmebaasi seaded on vigased: %v
-invalid_db_table = Andmebaasi tabel "%s" on vigane: %v
+test_git_failed = Ei saanud testida käsku „git“: %v
+invalid_db_setting = Andmebaasi seadistused on vigased: %v
+invalid_db_table = Andmebaasi tabel „%s“ on vigane: %v
 allow_dots_in_usernames = Luba kasutajatel kasutada oma kasutajanimedes punkte. Ei mõjuta olemasolevaid kontosid.
-default_allow_create_organization.description = Lubage uutel kasutajatel vaikimisi luua organisatsioone. Kui see valik on välja lülitatud, peab administraator andma uutele kasutajatele organisatsioonide loomise loa.
-disable_gravatar.description = Lülita välja Gravatari või muude kolmandate osapoolte avatariallikate kasutamine. Kasutajate avatarite jaoks kasutatakse vaikimisi pilte, kui nad ei lae oma avatari üles.
-openid_signup.description = Luba kasutajatel luua kontosid OpenID kaudu, kui iseregistreerimine on sisse lülitatud.
-require_sign_in_view.description = Piirake sisule juurdepääsu sisselogitud kasutajatele. Külalised saavad külastada ainult autentimislehti.
-reinstall_confirm_check_2 = Hoidlad ja seadeid võib olla vaja uuesti sünkroniseerida. Selle kasti märkimisega kinnitate, et sünkroniseerite hoidlate ja authorized_keys'i faili konksud käsitsi uuesti. Te kinnitate, et tagate, et hoidlate ja peegelpilti seaded on õiged.
-app_slogan_helper = Sisestage siia oma loosung. Jätke tühjaks, et välja lülitada.
-repo_path_helper = Kauged Git-hoidlad salvestatakse sellesse kaustale.
-sqlite3_not_available = See Forgejo versioon ei toeta SQLite3. Palun laadige alla ametlik binaarversioon %s (mitte "gobuild"i versioon).
-offline_mode.description = Lülitage kolmandate osapoolte sisu edastamise võrgud välja ja teenindage kõiki ressursse lokaalselt.
\ No newline at end of file
+default_allow_create_organization.description = Luba uutel kasutajatel vaikimisi luua organisatsioone. Kui see valik on välja lülitatud, peab peakasutaja andma uutele kasutajatele organisatsioonide loomise loa.
+disable_gravatar.description = Lülita välja Gravatari või muude kolmandate osapoolte tunnuspiltide allikate kasutamine. Kasutajate tunnuspiltidena kasutatakse vaikimisi pilte, kui nad enda oma ei laadi üles.
+openid_signup.description = Kui iseregistreerimine on kasutusel, luba kasutajatel luua kontosid OpenID abil.
+require_sign_in_view.description = Piira juurdepääsu vaid sisselogitud kasutajatega. Külalised saavad külastada ainult autentimislehti.
+reinstall_confirm_check_2 = Hoidlad ja seadistused võivad uuesti vajada sünkroniseerimist. Selle kasti märkimisega kinnitad, et sünkroniseerid hoidlate ja authorized_keys'i faili haagid käsitsi uuesti. Sa kinnitad, et tagad, et hoidlate ja peegelpiltide seadistused on õiged.
+app_slogan_helper = Sisesta siia oma serveri tunnuslause. Kui jätad tühjaks, siis pole tunnuslause kasutusel.
+repo_path_helper = Kaugseadmete Git-hoidlad salvestatakse siia kausta.
+sqlite3_not_available = See Forgejo versioon ei toeta SQLite3 andmebaasi. Palun laadi alla ametlik binaarversioon %s (mitte „gobuild“-versioon).
+offline_mode.description = Lülitage kolmandate osapoolte sisuedastusvõrgud välja ja jaga kõiki ressursse kohalikust serverist.
+password_algorithm = Salasõna räsialgoritm
+invalid_password_algorithm = Vigane salasõna räsialgoritm
+
+[auth]
+allow_password_change = Eelda, et kasutajad muudavad oma salasõna (soovitatav)
+forgot_password_title = Ununenud salasõna
+must_change_password = Muuda oma salasõna
+forgot_password = Kas salasõna ununes?
+
+[mail]
+password_change.subject = Sinu salasõna on muutunud
+password_change.text_1 = Sinu kasutajakonto salasõna on just muutunud.
+totp_disabled.text_1 = Lisaautentimine ehk ajapõhise salasõna (TOTP) kasutamine on sinu kasutajakontol just välja lülitatud.
+
+[form]
+Retype = Korda salasõna
+password_not_match = Salasõnad ei klapi.
+Password = Salasõna
+username_password_incorrect = Kassutajanimi või salasõna pole õige.
+
+[settings]
+retype_new_password = Korda uut salasõna
+password_incorrect = Senine salasõna pole õige.
+change_password_success = Sina salasõna on nüüd muudetud. Edaspidi kasuta sisselogimiseks seda uut salasõna.
+update_password = Muuda salasõna
+old_password = Senine salasõna
+new_password = Uus salasõna
+
+[repo]
+mirror_sync_on_commit = Sünkrooni sissekannete tegemisel
+mirror_interval_invalid = Peegelpildi välp pole korrektne.
+mirror_sync = sünkroonis
+mirror_use_ssh.text = Kasuta SSH-autentimist
+mirror_public_key = Avalik SSH-võti
+mirror_password_placeholder = (Muutmata)
+mirror_password_help = Salvestatud salasõna kustutamiseks muuda kasutajanime.
+mirror_address = Klooni võrguaadressilt
+mirror_password_blank_placeholder = (Seadistamata)
+commits.message = Sõnum
+commits.search_all = Kõik harud
+commits.author = Autor
+commits.browse_further = Sirvi edasi
+commits.renamed_from = Nimi muudetud, vana nimi oli „%s“
+commits.date = Kuupäev
+commits.older = Vanemad
+commits.newer = Uuemad
+commitstatus.error = Viga
+commits.search_branch = See haru
+projects = Projektid
+commitstatus.failure = Tõrge
+commitstatus.pending = Ootel
+commitstatus.success = Valmis
+ext_issues = Välised vead
+
+[actions]
+variables = Muutujad
+variables.deletion = Eemalda muutuja
+variables.creation = Lisa muutuja
+variables.none = Muutujaid veel pole.
+variables.management = Halda muutujaid
+
+[admin]
+users.password_helper = Kui sa ei taha salasõna muuta, siis jäta väli tühjaks.
+config.reset_password_code_lives = Taastekoodi aegumine
+auths.bind_password = Seo salasõna
\ No newline at end of file
diff --git a/options/locale/locale_eu.ini b/options/locale/locale_eu.ini
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/options/locale/locale_eu.ini
@@ -0,0 +1 @@
+
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 804b48b2b2..9d568ba2e4 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -301,7 +301,7 @@ federated_avatar_lookup=فعال سازی آواتار مشترک
 federated_avatar_lookup.description=پیدا کردن آواتار با استفاده از Libravatar.
 disable_registration=غیرفعال‌کردن خود ثبت نامی
 disable_registration.description=غیرفعال کردن ثبت نام کاربر. تنها مدیر ها قادر خواهند بود حساب کاربری جدید اضافه کنند.
-allow_only_external_registration.description=اجازه ثبت نام فقط از طریق خدمات خارجی
+allow_only_external_registration.description=اجازه ثبت نام فقط از طریق خدمات خارجی.
 openid_signin=فعالسازی ورود با OpenID
 openid_signin.description=فعالسازی ورود کاربر با OpenID.
 openid_signup=فعالسازی ثبت نام با OpenID
@@ -608,7 +608,7 @@ avatar=آواتار
 ssh_gpg_keys=کلید‌های SSH / GPG
 social=حساب های اجتماعی
 applications=برنامه‌ها
-orgs=مدیریت سازمان‌ها
+orgs=سازمان‌ها
 repos=مخازن
 delete=حذف حساب کاربری
 twofa=احراز هویت دوگانه
@@ -653,8 +653,8 @@ password_change_disabled=کاربران غیر محلی نمیتوانند گذ
 
 emails=نشانی‌های ایمیل
 manage_emails=مدیریت نشانی‌های ایمیل
-manage_themes=تم پیش فرض را انتخاب کنید
-manage_openid=مدیریت نشانی‌های OpenID
+manage_themes=تم پیش فرض
+manage_openid=آدرس‌های OpenID
 theme_desc=این پوشته پیش فرض شما در سراسر سایت می باشد.
 primary=اصلی
 activated=فعال شده
@@ -1250,13 +1250,13 @@ issues.close_comment_issue=ثبت دیدگاه و بستن
 issues.reopen_issue=بازگشایی
 issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی
 issues.create_comment=دیدگاه
-issues.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> این موضوع را بست`
-issues.reopened_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> این موضوع را دوباره باز کرد`
-issues.commit_ref_at=`ارجاع این مسئله به کامیت <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s"> ارجاعات این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s"> ارجاعات این تقاضای ادغام %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s"> ارجاعات این تقاضای واکشی %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s"> تقاضای واکشی ارجاع شده %[4] که مسائله بازگشایی خواهد کرد</a> <a id="%[1]s" href="#%[1]s">%[2] </a>`
+issues.closed_at=`%s این موضوع را بست`
+issues.reopened_at=`%s این موضوع را دوباره باز کرد`
+issues.commit_ref_at=`ارجاع این مسئله به کامیت %s`
+issues.ref_issue_from=`<a href="%[2]s"> ارجاعات این مسائله %[3]</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s"> ارجاعات این تقاضای ادغام %[4]</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s"> ارجاعات این تقاضای واکشی %[4]</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s"> تقاضای واکشی ارجاع شده %[3]sکه مسائله بازگشایی خواهد کرد</a> <a id="%[1]s" href="#%[1]s">%[2] </a>`
 issues.ref_closed_from=`<a href="%[3]s"> بسته شده این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s"> بازگشایی این مسائله %[4]</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`از %[1]`
@@ -1338,7 +1338,7 @@ issues.error_modifying_due_date=تغییر موعد مقرر با شکست مو
 issues.error_removing_due_date=حذف موعد مقرر با شکست مواجه شد.
 issues.push_commit_1=%d اعمال تغییر اضافه شده است %s
 issues.push_commits_n=%d اعمال تغییرات اضافه شده است %s
-issues.force_push_codes=`پوش شده اجباری %[1]s از <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> به <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`پوش شده اجباری %[1]s از <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s به <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=مقایسه
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=افزودن موعد مقرر
@@ -1493,8 +1493,8 @@ pulls.update_branch_rebase=بروزآوری شاخه با بازسازی مجد
 pulls.update_branch_success=شاخه به موفقیت بروز شد
 pulls.update_not_allowed=شما اجازه بروزرسانی شاخه را ندارید
 pulls.outdated_with_base_branch=این شاخه با شاخه پایه منسوخ شده است
-pulls.closed_at=`این درخواست pull بسته شده <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`این درخواست pull را بازگشایی کرد <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`این درخواست pull بسته شده %s`
+pulls.reopened_at=`این درخواست pull را بازگشایی کرد %s`
 
 
 
@@ -2762,27 +2762,27 @@ directory = پوشه
 
 [search]
 type_tooltip = جستجو گونه
-search = جستجو...
+search = جستجو…
 fuzzy = درهم
 fuzzy_tooltip = پیامدهایی را درج کنید که دقیقا با عبارت جستجو همخوانی داشته باشند
 regexp = عبارات باقاعده
-pull_kind = جستجو واکشی‌ها...
+pull_kind = جستجو واکشی‌ها…
 no_results = نتیجه درخوری یافت نشد.
-runner_kind = جستجو دونده‌ها...
+runner_kind = جستجو دونده‌ها…
 keyword_search_unavailable = جستجو کلیدواژه اکنون در درسترس نیست. لطفا با مدیر سایت در میان بگذارید.
-repo_kind = جستجو مخازن...
+repo_kind = جستجو مخازن…
 regexp_tooltip = اصطلاح جستجو شده را با عبارات باقاعده تفسیر کن
-user_kind = جستجو کاربران...
-org_kind = جستجو سازمان‌ها...
-team_kind = جستجو گروه‌ها...
-package_kind = جستجو بسته‌ها...
-project_kind = جستجو پروژه‌ها...
+user_kind = جستجو کاربران…
+org_kind = جستجو سازمان‌ها…
+team_kind = جستجو گروه‌ها…
+package_kind = جستجو بسته‌ها…
+project_kind = جستجو پروژه‌ها…
 code_search_unavailable = جستجوی کد اکنون در دسترس نیست. لطفا با مدیر سایت درمیان بگذارید.
-code_kind = جستجو کدها...
+code_kind = جستجو کدها…
 union = بهم پیوستگی
 union_tooltip = نتایجی را در بر بگیر که با هر یک از کلیدواژه‌های جدا شده از فضای‌خالی مطابقت دارد
-branch_kind = جستجو شاخه‌ها...
-commit_kind = جستجو سپرده‌ها...
-issue_kind = جستجو مشکلات...
+branch_kind = جستجو شاخه‌ها…
+commit_kind = جستجو سپرده‌ها…
+issue_kind = جستجو مشکلات…
 exact = مو به مو
 exact_tooltip = نتایجی را در بر بگیر که مو به مو با اصطلاح جستجو شده یکی باشد
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
index 5f087b2bf9..263fab8774 100644
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@@ -8,7 +8,7 @@ sign_in=Kirjaudu sisään
 sign_in_or=tai
 sign_out=Kirjaudu ulos
 sign_up=Rekisteröidy
-link_account=Yhdistä tili
+link_account=Linkitä tili
 register=Rekisteröidy
 version=Versio
 powered_by=Voimanlähteenä %s
@@ -23,7 +23,7 @@ toc=Sisällysluettelo
 licenses=Lisenssit
 return_to_forgejo=Palaa Forgejohon
 
-username=Käyttäjätunnus
+username=Käyttäjänimi
 email=Sähköpostiosoite
 password=Salasana
 access_token=Pääsypoletti
@@ -31,29 +31,29 @@ re_type=Vahvista salasana
 captcha=CAPTCHA
 twofa=Kaksivaiheinen todennus
 twofa_scratch=Kaksivaiheinen kertakäyttöinen koodi
-passcode=Tunnuskoodi
+passcode=Pääsykoodi
 
 webauthn_insert_key=Aseta turva-avaimesi
-webauthn_sign_in=Paina turva-avaimesi painiketta. Jos turva-avaimessasi ei ole painiketta, irroita se ja aseta uudelleen.
+webauthn_sign_in=Paina turva-avaimesi painiketta. Jos turva-avaimessasi ei ole painiketta, irrota se ja aseta uudelleen.
 webauthn_press_button=Paina turva-avaimesi painiketta…
-webauthn_use_twofa=Käytä kaksivaihesta vahvistusta puhelimestasi
+webauthn_use_twofa=Käytä kaksivaihesta todennusta puhelimestasi
 webauthn_error=Turva-avainta ei voitu lukea.
 webauthn_unsupported_browser=Selaimesi ei tällä hetkellä tue WebAuthnia.
 webauthn_error_unknown=Tuntematon virhe. Yritä uudelleen.
-webauthn_error_insecure=`WebAuthn tukee vain suojattuja yhteyksiä. Testaukseen HTTP:n yli, voit käyttää osoitetta "localhost" tai "127.0.0.1"`
+webauthn_error_insecure=WebAuthn tukee vain suojattuja yhteyksiä. Testatessa HTTP-yhteydellä voit käyttää osoitetta "localhost" tai "127.0.0.1"
 webauthn_error_unable_to_process=Palvelin ei pystynyt käsittelemään pyyntöä.
 webauthn_error_duplicated=Turva-avainta ei ole sallittu tässä pyynnössä. Varmista, ettei avainta ole jo rekisteröity.
 webauthn_error_empty=Sinun täytyy asettaa nimi tälle avaimelle.
-webauthn_error_timeout=Aikakatkaisu saavutettu ennenkuin avaintasi on voitu lukea. Lataa tämä sivu uudelleen ja yritä uudelleen.
+webauthn_error_timeout=Aikakatkaisu ennen kuin avaintasi voitiin lukea. Lataa tämä sivu uudelleen ja yritä uudelleen.
 webauthn_reload=Päivitä
 
-repository=Repo
+repository=Tietovarasto
 organization=Organisaatio
 mirror=Peili
 new_repo=Uusi repo
 new_migrate=Uusi migraatio
-new_mirror=Uusi peilipalvelin
-new_fork=Uusi repoforkki
+new_mirror=Uusi peili
+new_fork=Uusi tietovarastoforkki
 new_org=Uusi organisaatio
 new_project=Uusi projekti
 manage_org=Ylläpidä organisaatioita
@@ -68,7 +68,7 @@ all=Kaikki
 sources=Lähteet
 mirrors=Peilit
 collaborative=Yhteistyössä
-forks=Haarat
+forks=Forkit
 
 activities=Toimet
 pull_requests=Vetopyynnöt
@@ -98,7 +98,7 @@ preview=Esikatselu
 loading=Ladataan…
 
 error=Virhe
-error404=Sivu, jota yrität nähdä, joko <strong>ei löydy</strong>, <strong>on poistettu</strong> tai <strong>et ole oikeutettu</strong> katsomaan sitä.
+error404=Sivu, jolle yrität päästä, <strong>ei joko ole olemassa</strong>, <strong>on poistettu</strong> tai <strong>sinulla ei ole oikeutta</strong> nähdä sitä.
 
 never=Ei koskaan
 
@@ -108,13 +108,13 @@ rss_feed=RSS-syöte
 
 archived=Arkistoidut
 
-concept_code_repository=Repo
+concept_code_repository=Tietovarasto
 concept_user_organization=Organisaatio
 
 
 
 name=Nimi
-enable_javascript = Tämä sivu vaatii Javascriptin.
+enable_javascript = Tämä sivu vaatii JavaScriptin.
 new_project_column = Uusi sarake
 retry = Yritä uudelleen
 copy_type_unsupported = Tätä tiedostotyyppiä ei voi kopioida
@@ -147,26 +147,26 @@ value = Arvo
 rerun = Suorita uudelleen
 filter.clear = Tyhjennä suodattimet
 invalid_data = Virheellistä dataa: %v
-new_repo.title = Uusi repositorio
+new_repo.title = Uusi tietovarasto
 new_org.title = Uusi organisaatio
 new_org.link = Uusi organisaatio
-new_repo.link = Uusi repositorio
+new_repo.link = Uusi tietovarasto
 new_migrate.link = Uusi migraatio
-rerun_all = Uudelleensuorita kaikki työt
-artifacts = Artifaktit
-confirm_delete_artifact = Haluatko varmasti poistaa artifaktin "%s"?
+rerun_all = Suorita uudelleen kaikki työt
+artifacts = Artefaktit
+confirm_delete_artifact = Haluatko varmasti poistaa artefaktin "%s"?
 new_migrate.title = Uusi migraatio
 test = Testi
-concept_system_global = Globaali
+concept_system_global = Yleisesti pätevä
 sign_in_with_provider = Kirjaudu %s-tilillä
 filter.is_fork = Forkit
-filter.is_mirror = Peilattu
+filter.is_mirror = Peilit
 filter.is_template = Mallipohjat
-filter.not_fork = Ei forkkeja
+filter.not_fork = Ei forkit
 filter.not_template = Ei mallipohjat
-filter.not_mirror = Ei peilattu
+filter.not_mirror = Ei peilit
 copy_path = Kopioi polku
-concept_user_individual = Yksittäinen
+concept_user_individual = Yksittäinen käyttäjä
 
 [aria]
 footer.links = Linkit
@@ -196,8 +196,8 @@ buttons.list.unordered.tooltip = Lisää järjestämätön lista
 buttons.list.ordered.tooltip = Lisää numeroitu lista
 buttons.switch_to_legacy.tooltip = Käytä vanhentunutta tekstieditoria
 buttons.indent.tooltip = Sisennä yhden tason verran
-buttons.quote.tooltip = Lainaa tekstiä
-buttons.enable_monospace_font = Käytä tasalevyistä fonttia
+buttons.quote.tooltip = Aseta lainaustekstiksi
+buttons.enable_monospace_font = Ota tasalevyinen fontti käyttöön
 buttons.ref.tooltip = Viittaa ongelmaa tai vetopyyntöä
 buttons.new_table.tooltip = Lisää taulukko
 table_modal.header = Lisää taulukko
@@ -228,22 +228,22 @@ report_message = Jos uskot tämän olevan Forgejon virhe, etsi ongelmia <a href=
 app_desc=Kivuton, itsehostattu Git-palvelu
 install=Helppo asentaa
 platform=Alustariippumaton
-platform_desc=Forgejo on mahdollista suorittaa vapaissa käyttöjärjestelmissä kuten Linux ja FreeBSD, ja se toimii eri suoritinarkkitehtuureilla. Valitse omasi!
+platform_desc=Forgejo on mahdollista suorittaa Linuxin ja FreeBSD:n kaltaisissa vapaissa käyttöjärjestelmissä, ja se toimii eri suoritinarkkitehtuureilla. Valitse omasi!
 lightweight=Kevyt
 lightweight_desc=Forgejolla on vähäiset vähimmäisvaatimukset, joten se toimii jopa halvassa Raspberry Pi:ssä. Säästä koneesi energiaa!
 license=Avoin lähdekoodi
-license_desc=Mene osoitteeseen <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Liity mukaan tekemään <a target="_blank" rel="noopener noreferrer" href="%[2]s">projektista</a> entistäkin parempi. Älä ujostele avustamista!
-install_desc = Suorita alustallesi suunnattu <a target="_blank" rel="noopener noreferrer" href="%[1]s">binääritiedosto</a>, jaa se <a target="_blank" rel="noopener noreferrer" href="%[2]s">kontitettuna</a> tai hanki se <a target="_blank" rel="noopener noreferrer" href="%[3]s">pakattuna</a>.
+license_desc=Mene ja lataa <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Liity tekemään <a target="_blank" rel="noopener noreferrer" href="%[2]s">projektista</a> entistäkin parempi. Älä ujostele avustamista!
+install_desc = <a target="_blank" rel="noopener noreferrer" href="%[1]s">Suorita alustallesi tarkoitettu binääritiedosto</a>, <a target="_blank" rel="noopener noreferrer" href="%[2]s">kontita se</a>, tai <a target="_blank" rel="noopener noreferrer" href="%[3]s">hanki se paketoituna</a>.
 
 [install]
 install=Asennus
 title=Aloitusasetukset
-docker_helper=Jos ajat Forgejoa Dockerin sisällä, lue <a target="_blank" rel="noopener noreferrer" href="%s">ohjeet</a> ennen minkään asetuksen muuttamista.
+docker_helper=Jos suoritat Forgejoa kontitettuna, lue <a target="_blank" rel="noopener noreferrer" href="%s">ohjeet</a>, ennen kuin muutat yhtäkään asetusta.
 require_db_desc=Forgejo tarvitsee toimiakseen MySQL-, PostgreSQL-, SQLite3- tai TiDB- (MySQL-protokolla) tietokannan.
 db_title=Tietokannan asetukset
 db_type=Tietokannan tyyppi
 host=Isäntä
-user=Käyttäjätunnus
+user=Käyttäjänimi
 password=Salasana
 db_name=Tietokannan nimi
 db_schema=Skeema
@@ -251,32 +251,32 @@ ssl_mode=SSL
 path=Polku
 sqlite_helper=SQLite3-tietokannan tiedostopolku.<br>Syötä absoluuttinen polku, jos ajat Forgejoa palveluna.
 reinstall_error=Yrität asentaa olemassa olevaan Forgejo-tietokantaan
-reinstall_confirm_message=Asentaminen uudelleen olemassa olevalla Forgejo-tietokannalla voi aiheuttaa useita ongelmia. Useimmissa tapauksissa sinun pitäisi käyttää olemassa olevia "app.ini" asetuksia Forgejon käyttöön. Jos tiedät mitä teet, vahvista seuraavat seikat:
-reinstall_confirm_check_1=Tiedot, jotka on salattu SECRET_KEY:llä app.ini:ssä saatetaan menettää: käyttäjät eivät ehkä voi kirjautua sisään 2FA/OTP:lla ja peilit eivät välttämättä toimi oikein. Ruksaamalla tämän vahvistat, että nykyinen app.ini -tiedosto sisältää oikean SECRET_KEY:n.
-reinstall_confirm_check_2=Repot ja asetukset saattaa olla tarpeen uudelleensynkronoida. Valitsemalla tämän vahvistat, että uudelleensynkronoit repojen koukut ja authorized_keys -tiedoston manuaalisesti. Varmistat, että repon ja peilin asetukset ovat oikeat.
-reinstall_confirm_check_3=Vahvistat, että olet täysin varma siitä, että tämä Forgejo toimii oikealla app.ini sijainnilla ja että olet varma, että sinun täytyy asentaa uudelleen. Vahvistat, että tunnustat edellä mainitut riskit.
+reinstall_confirm_message=Asentaminen uudelleen olemassa olevalla Forgejo-tietokannalla voi aiheuttaa useita ongelmia. Useimmissa tapauksissa sinun pitäisi käyttää olemassa olevia "app.ini"-asetuksia Forgejon suorittamiseksi. Jos tiedät mitä teet, vahvista seuraavat seikat:
+reinstall_confirm_check_1=Tiedot, jotka on salattu SECRET_KEY:llä app.ini:ssä saatetaan menettää: käyttäjät eivät ehkä voi kirjautua sisään 2FA/OTP:lla ja peilit eivät välttämättä toimi oikein. Ruksaamalla tämän vahvistat, että nykyinen app.ini-tiedosto sisältää oikean SECRET_KEY:n.
+reinstall_confirm_check_2=Tietovarastot ja asetukset saattaa olla tarpeen synkronoida uudelleen. Valitsemalla tämän vahvistat, että synkronoit uudelleen tietovarastojen koukut ja authorized_keys-tiedoston manuaalisesti. Varmistat, että tietovaraston ja peilin asetukset ovat oikeat.
+reinstall_confirm_check_3=Vahvistat, että olet täysin varma siitä, että tämä Forgejo toimii oikealla app.ini-sijainnilla ja että olet varma, että sinun täytyy asentaa uudelleen. Vahvistat, että tunnustat edellä mainitut riskit.
 err_empty_db_path=SQLite3-tietokannan polku ei voi olla tyhjä.
 no_admin_and_disable_registration=Et voi kytkeä rekisteröintiä pois luomatta sitä ennen ylläpitotiliä.
 err_empty_admin_password=Ylläpitäjän salasana ei voi olla tyhjä.
 err_empty_admin_email=Ylläpitäjän sähköpostiosoite ei voi olla tyhjä.
-err_admin_name_is_reserved=`Ylläpitäjän käyttäjätunnus on virheellinen; käyttäjätunnus on varattu`
-err_admin_name_is_invalid=Ylläpitäjän käyttäjätunnus on virheellinen
+err_admin_name_is_reserved=Ylläpitäjän käyttäjänimi on virheellinen; käyttäjänimi on varattu
+err_admin_name_is_invalid=Ylläpitäjän käyttäjänimi on virheellinen
 
 general_title=Yleiset asetukset
 app_name=Instanssin otsikko
 app_name_helper=Syötä instanssin nimi tähän. Se näytetään kaikilla sivuilla.
-repo_path=Repositorion juuren polku
-repo_path_helper=Muualla olevat git-repositoriot tullaan tallentamaan tähän kansioon.
+repo_path=Tietovaraston juuren polku
+repo_path_helper=Muualla olevat git-tietovarastot tullaan tallentamaan tähän kansioon.
 lfs_path=Git LFS -juuripolku
 lfs_path_helper=Git LFS:n ylläpitämät tiedostot tullaan tallentamaan tähän hakemistoon. Jätä tyhjäksi kytkeäksesi toiminnon pois.
 run_user=Aja käyttäjänä
-domain=Palvelimen verkkotunnus
+domain=Palvelimen toimialue
 ssh_port=SSH-palvelimen portti
 ssh_port_helper=Porttinumero, jossa SSH-palvelimesi kuuntelee. Jätä tyhjäksi kytkeäksesi SSH-palvelimen pois päältä.
 http_port=HTTP-kuunteluportti
-http_port_helper=Portti, jota Forgejon web-palvelin käyttää.
+http_port_helper=Forgejo-verkkopalvelimen käyttämä porttinumero.
 app_url=Juuriosoite
-app_url_helper=Juuriosoite HTTP(S)-klooniosoitteille ja sähköpostimuistutuksille.
+app_url_helper=Juuriosoite HTTP(S)-klooniosoitteille ja sähköposti-ilmoituksille.
 log_root_path=Lokitiedostojen polku
 log_root_path_helper=Lokitiedostot kirjoitetaan tähän kansioon.
 
@@ -285,21 +285,21 @@ email_title=Sähköpostiasetukset
 smtp_addr=SMTP-isäntä
 smtp_port=SMTP-portti
 smtp_from=Lähetä sähköpostit osoitteella
-smtp_from_helper=Sähköpostiosoite, jota Forgejo käyttää. Kirjoita osoite ”nimi” <email@example.com> -muodossa.
-mailer_user=SMTP-käyttäjätunnus
+smtp_from_helper=Sähköpostiosoite, jota Forgejo käyttää. Kirjoita pelkkä sähköpostiosoite tai "Nimi” <email@example.com> -muodossa.
+mailer_user=SMTP-käyttäjänimi
 mailer_password=SMTP-salasana
 register_confirm=Vaadi sähköpostinvahvistus rekisteröinnin edellytykseksi
 mail_notify=Ota sähköposti-ilmoitukset käyttöön
 server_service_title=Palvelimen ja kolmansien osapuolten palveluiden asetukset
-offline_mode=Ota käyttöön paikallinen tila
+offline_mode=Ota paikallinen tila käyttöön
 offline_mode.description=Poista kolmannen osapuolen sisällönjakeluverkot ja tarjoa kaikki resurssit paikallisesti.
 disable_gravatar=Poista Gravatar käytöstä
-disable_gravatar.description=Poista Gravatar- tai muiden kolmansien osapuolien avatar-lähteet käytöstä. Oletuskuvia käytetään käyttäjien avatareissa, elleivät he uloslataa omaa avatariaan ilmentymään.
+disable_gravatar.description=Poista Gravatar- tai muiden kolmansien osapuolien avatar-lähteet käytöstä. Oletuskuvia käytetään käyttäjien avatareissa, elleivät käyttäjät lähetä omaa avatariaan Forgejo-instanssiin.
 federated_avatar_lookup=Käytä federoituja profiilikuvia
 federated_avatar_lookup.description=Käytä Libravatar-palvelua profiilikuvien hakemiseen.
-disable_registration=Poista omatoiminen rekisteröityminen käytöstä
-disable_registration.description=Vain järjestelmänvalvojat voivat luoda uusia käyttäjiä. On suositeltavaa pitää rekisteröinti suljettuna mikäli kyseessä ei ole julkinen instanssi jota varten tarvitsee hallinnoida suuria määriä roskapostikäyttäjiä.
-allow_only_external_registration.description=Käyttäjät voivat luoda uusia käyttäjiä vain erikseen konfiguroituja ulkoisia palveluja käyttäen.
+disable_registration=Poista itserekisteröinti käytöstä
+disable_registration.description=Vain ylläpitäjät voivat luoda uusia käyttäjiä. On suositeltavaa pitää rekisteröinti suljettuna, jos kyseessä ei ole julkinen instanssi, ja et olet valmis hallinnoimaan suuria määriä mahdollisia bottikäyttäjiä.
+allow_only_external_registration.description=Käyttäjät voivat luoda uusia tilejä vain erikseen määritettyjä ulkoisia palveluja käyttäen.
 openid_signin=Ota OpenID-kirjautuminen käyttöön
 openid_signin.description=Salli OpenID:n kautta kirjautuminen.
 openid_signup=Ota OpenID-itserekisteröinti käyttöön
@@ -309,7 +309,7 @@ enable_captcha.description=Vaadi CAPTCHA rekisteröinnin yhteydessä.
 require_sign_in_view=Vaadi sisäänkirjautuminen sisällön näkemiseksi
 admin_setting.description=Ylläpitotilin luominen on valinnaista. Ensimmäisestä rekisteröityneestä käyttäjästä tulee automaattisesti ylläpitäjä.
 admin_title=Ylläpitotilin asetukset
-admin_name=Ylläpitäjän käyttäjätunnus
+admin_name=Ylläpitäjän käyttäjänimi
 admin_password=Salasana
 confirm_password=Varmista salasana
 admin_email=Sähköpostiosoite
@@ -324,48 +324,48 @@ save_config_failed=Asetusten tallentaminen epäonnistui: %v
 default_keep_email_private=Piilota sähköpostiosoitteet oletuksena
 default_keep_email_private.description=Piilota oletusarvoisesti uusien käyttäjätilien sähköpostiosoitteet estääksesi tietojen vuotamisen rekisteröinnin yhteydessä.
 default_enable_timetracking=Ota ajanseuranta oletusarvoisesti käyttöön
-default_enable_timetracking.description=Salli uusien repositorioiden aikaseurannan käyttöönotto oletusarvoisesti.
-no_reply_address=Piilotetun sähköpostin verkkotunnus
-no_reply_address_helper=Verkkotunnuksen nimi käyttäjille, joilla on piilotettu sähköpostiosoite. Esimerkiksi käyttäjätunnus 'joe' kirjataan Git-palveluun nimellä 'joe@noreply.example.org' jos piilotetun sähköpostiosoitteen arvoksi on asetettu 'noreply.example.org'.
+default_enable_timetracking.description=Salli ajanseuranta-ominaisuuden käyttöönotto oletuksena uusille tietovarastoille.
+no_reply_address=Piilotetun sähköpostin toimialue
+no_reply_address_helper=Verkkotunnuksen nimi käyttäjille, joilla on piilotettu sähköpostiosoite. Esimerkiksi käyttäjänimi 'joe' kirjataan Git-palveluun nimellä 'joe@noreply.example.org' jos piilotetun sähköpostiosoitteen arvoksi on asetettu 'noreply.example.org'.
 password_algorithm=Salasanan hajautusalgoritmi
-enable_update_checker_helper_forgejo = Se tarkistaa tietyin väliajoin uusia Forgejo-versioita tutkimalla sen TXT DNS record -tietoja osoitteesta release.forgejo.org .
-invalid_admin_setting = Järjestelmänvalvojatilin asetukset eivät kelpaa: %v
+enable_update_checker_helper_forgejo = Se tarkistaa väliajoin uusia Forgejo-versioita tutkimalla TXT DNS -tietueen osoitteesta release.forgejo.org .
+invalid_admin_setting = Ylläpitotilin asetukset eivät kelpaa: %v
 env_config_keys = Ympäristökonfiguraatio
-run_user_helper = Käyttöjärjestelmätason käyttäjänimi, jona Forgejo ajetaan. Huomaa, että kyseinen käyttäjä tarvitsee pääsyn repositorion juuripolkuun.
-env_config_keys_prompt = Seuraavat ympäristömuuttujat sisällytetään myös asetustiedostoonne:
+run_user_helper = Käyttöjärjestelmätason käyttäjänimi, jona Forgejo ajetaan. Huomaa, että kyseinen käyttäjän on oltava pääsy tietovaraston juuripolkuun.
+env_config_keys_prompt = Seuraavat ympäristömuuttujat sisällytetään myös asetustiedostoon:
 secret_key_failed = Salausavaimen generointi epäonnistui: %v
 default_allow_create_organization.description = Salli organisaatioiden luonti uusille käyttäjille oletuksena. Järjestelmänvalvojan tarvitsee antaa lupa luoda organisaatioita mikäli tämä asetus on pois päältä.
 config_location_hint = Tallennettujen asetusten sijainti:
 invalid_db_table = Tietokantataulu "%s" ei kelpaa: %v
-invalid_password_algorithm = Salasananhajautusalgoritmi ei kelpaa
-password_algorithm_helper = Aseta salasananhajautusalgoritmi. Eri algoritmeilla on erilaisia vaatimuksia ja vahvuuksia - argon2-algoritmi on erityisen turvallinen mutta vaatii paljon muistia ja voi näin ollen olla pienille järjestelmille soveltumaton.
+invalid_password_algorithm = Salasanan hajautusalgoritmi on virheellinen
+password_algorithm_helper = Aseta salasanan hajautusalgoritmi. Eri algoritmeilla on erilaisia vaatimuksia ja vahvuuksia. Argon2-algoritmi on erityisen turvallinen, mutta vaatii paljon muistia ja voi siten olla pienille järjestelmille soveltumaton.
 db_schema_helper = Jätä tyhjäksi käyttääksesi oletusarvoa ("public").
 run_user_not_match = Tämänhetkinen käyttäjänimi ei täsmää tiettynä käyttäjänä ajettavan käyttäjänimen kanssa: %s -> %s
 invalid_log_root_path = Lokitiedoston polku ei kelpaa: %v
 require_sign_in_view.description = Rajoita sisältö vain kirjautuneille. Vieraat pääsevät vain autentikaatiosivuille.
 allow_only_external_registration = Salli rekisteröinti vain ulkoisia palveluja käyttäen
 default_allow_create_organization = Salli organisaatioiden luonti oletuksena
-allow_dots_in_usernames = Salli pisteiden käyttö käyttäjänimissä. Ei vaikuta olemassaoleviin käyttäjiin.
+allow_dots_in_usernames = Salli pisteiden käyttö käyttäjänimissä. Ei vaikuta olemassa oleviin käyttäjiin.
 enable_update_checker = Ota päivitystentarkistus käyttöön
 app_slogan = Instanssin tunnuslause
 app_slogan_helper = Syötä instanssin tunnuslause tähän. Jätä tyhjäksi poistaaksesi käytöstä.
-domain_helper = Palvelimen verkkotunnus tai isäntänimi.
-smtp_from_invalid = "Lähetä sähköpostit osoitteella"-osoite on virheellinen
-err_admin_name_pattern_not_allowed = Ylläpitäjän käyttäjätunnus on virheellinen, se vastaa varattua kaaviota
+domain_helper = Palvelimen toimialue tai isäntänimi.
+smtp_from_invalid = "Lähetä sähköpostit osoitteella"-osoite on epäkelvollinen
+err_admin_name_pattern_not_allowed = Ylläpitäjän käyttäjänimi on epäkelpo, se vastaa varattua kaavaa
 
 [home]
-uname_holder=Käyttäjätunnus tai sähköpostiosoite
+uname_holder=käyttäjänimi tai sähköpostiosoite
 password_holder=Salasana
 switch_dashboard_context=Vaihda kojelaudan kontekstia
-my_repos=Repot
+my_repos=Tietovarastot
 show_more_repos=Näytä lisää repoja…
 collaborative_repos=Yhteistyö repot
-my_orgs=Organisaationi
+my_orgs=Organisaatiot
 my_mirrors=Peilini
 view_home=Näytä %s
 search_repos=Etsi repo…
 filter=Muut suodattimet
-filter_by_team_repositories=Suodata tiimin repojen mukaan
+filter_by_team_repositories=Suodata tiimin tietovarastojen mukaan
 feed_of=`Syöte "%s"`
 
 show_archived=Arkistoidut
@@ -378,10 +378,10 @@ show_both_private_public=Näytetään sekä julkiset että yksityiset
 show_only_private=Näytetään vain yksityiset
 show_only_public=Näytetään vain julkiset
 
-issues.in_your_repos=Repoissasi
+issues.in_your_repos=Tietovarastoissasi
 
 [explore]
-repos=Repot
+repos=Tietovarastot
 users=Käyttäjät
 organizations=Organisaatiot
 search=Hae
@@ -394,44 +394,44 @@ code_no_results=Hakuehtoasi vastaavaa lähdekoodia ei löytynyt.
 code_last_indexed_at=Viimeksi indeksoitu %s
 stars_one = %d tähti
 stars_few = %d tähteä
-relevant_repositories = Vain relevantit repositoriot näytetään, <a href="%s">näytä suodattamattomat tulokset</a>.
+relevant_repositories = Vain asiaankuuluvat tietovarastot näytetään, <a href="%s">näytä suodattamattomat tulokset</a>.
 forks_one = %d forkki
 forks_few = %d forkkia
 go_to = Siirry
-relevant_repositories_tooltip = Repot, jotka ovat forkkeja, joilla ei ole aiheita, ei kuvakkeita ja ei kuvausta, ovat piilotettuja.
+relevant_repositories_tooltip = Tietovarastot, jotka ovat forkkeja tai joilla ei ole aihetta, kuvaketta tai kuvausta, piilotetaan.
 
 [auth]
 create_new_account=Rekisteröi tili
 register_helper_msg=On jo tili? Kirjaudu sisään nyt!
 social_register_helper_msg=Onko sinulla jo tili? Linkitä se nyt!
-disable_register_prompt=Rekisteröinti on estetty. Ota yhteys ylläpitäjääsi.
+disable_register_prompt=Rekisteröinti on estetty. Ota yhteys sivuston ylläpitäjään.
 disable_register_mail=Sähköpostivahvistus rekisteröinnille on estetty.
 remember_me=Muista tämä laite
 forgot_password_title=Unohtuiko salasana
 forgot_password=Unohtuiko salasana?
 sign_up_now=Tarvitsetko tilin? Rekisteröidy nyt.
-confirmation_mail_sent_prompt=Uusi varmistussähköposti on lähetetty osoitteeseen <b>%s</b>. Tarkista sähköpostisi ja seuraa saamaasi linkkiä seuraavan %s aikana saadaksesi rekisteröintiprosessin valmiiksi. Mikäli annettu sähköpostiosoite on väärin, voit kirjautua sisään ja pyytää uutta varmistussähköpostia toiseen osoitteeseen.
+confirmation_mail_sent_prompt=Uusi vahvistussähköposti on lähetetty osoitteeseen <b>%s</b>. Tarkista sähköpostisi ja seuraa saamaasi linkkiä seuraavan %s aikana viimeistelläksesi rekisteröinnin. Mikäli annettu sähköpostiosoite on väärin, voit kirjautua sisään ja pyytää uutta vahvistussähköpostia toiseen osoitteeseen.
 must_change_password=Vaihda salasanasi
 allow_password_change=Vaadi käyttäjää vaihtamaan salasanansa (suositeltava)
-reset_password_mail_sent_prompt=Varmistussähköposti on lähetetty osoitteeseen <b>%s</b>. Tarkista sähköpostisi ja seuraa annettua linkkiä seuraavan %s aikana saadaksesi tilin palauttamisen valmiiksi.
+reset_password_mail_sent_prompt=Vahvistussähköposti on lähetetty osoitteeseen <b>%s</b>. Tarkista sähköpostisi ja seuraa annettua linkkiä seuraavan %s aikana saadaksesi tilin palauttamisen valmiiksi.
 active_your_account=Aktivoi tilisi
 account_activated=Tili on aktivoitu
 prohibit_login=Tili on jäädytetty
-resent_limit_prompt=Olet jo tilannut aktivointisähköpostin hetki sitten. Ole hyvä ja odota 3 minuuttia ja yritä sitten uudelleen.
-has_unconfirmed_mail=Hei %s, sinulla on varmistamaton sähköposti osoite (<b>%s</b>). Jos et ole saanut varmistus sähköpostia tai tarvitset uudelleenlähetyksen, ole hyvä ja klikkaa allaolevaa painiketta.
-resend_mail=Klikkaa tästä uudelleenlähettääksesi aktivointi sähköpostisi
+resent_limit_prompt=Olet jo tilannut aktivointisähköpostin äskettäin. Odota kolme minuuttia ja yritä sitten uudelleen.
+has_unconfirmed_mail=Hei %s, sinulla on vahvistamaton sähköpostiosoite (<b>%s</b>). Jos et ole saanut vahvistussähköpostia tai tarvitset uudelleenlähetyksen, ole hyvä ja napsauta alla olevaa painiketta.
+resend_mail=Napsauta tästä lähettääksesi aktivointisähköpostin uudelleen
 email_not_associate=Tätä sähköpostiosoitetta ei ole liitetty mihinkään tiliin.
 send_reset_mail=Lähetä palautussähköposti
 reset_password=Tilin palautus
-invalid_code=Vahvistusavain on virheellinen tai vanhentunut.
+invalid_code=Vahvistuskoodi on virheellinen tai vanhentunut.
 reset_password_helper=Palauta käyttäjätili
 password_too_short=Salasanan pituus ei voi olla vähemmän kuin %d merkkiä.
-non_local_account=Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Forgejon web-käyttöliittymän kautta.
+non_local_account=Muut kuin lokaalit käyttäjät eivät voi päivittää salasanojaan Forgejo-selainkäyttöliittymän kautta.
 verify=Vahvista
 scratch_code=Kertakäyttökoodi
 use_scratch_code=Käytä kertakäyttökoodia
 twofa_scratch_used=Olet käyttänyt kertakäyttökoodisi. Sinut on uudelleenohjattu kaksivaiheisen kirjautumisen asetussivulle, jotta voit kytkeä sen pois tai luoda uuden kertakäyttökoodin.
-twofa_passcode_incorrect=Salasanasi on väärä. Jos olet hukannut laitteesi, käytäthän kertakäyttökoodia sisäänkirjautumiseen.
+twofa_passcode_incorrect=Pääsykoodi on väärä. Jos olet hukannut laitteesi, käytäthän kertakäyttökoodia sisäänkirjautumiseen.
 twofa_scratch_token_incorrect=Kertakäyttökoodisi on virheellinen.
 login_userpass=Kirjaudu sisään
 tab_openid=OpenID
@@ -440,26 +440,26 @@ oauth_signup_title=Viimeistele uusi tili
 oauth_signup_submit=Viimeistele tili
 oauth_signin_tab=Linkitä olemassa olevaan tiliin
 oauth_signin_title=Kirjaudu sisään valtuuttaaksesi linkitetyn tilin
-oauth_signin_submit=Yhdistä tiliin
+oauth_signin_submit=Linkitä tili
 oauth.signin.error.access_denied=Valtuutuspyyntö on evätty.
-openid_connect_submit=Connect
-openid_connect_title=Yhdistä olemassaolevaan tiliin
+openid_connect_submit=Yhdistä
+openid_connect_title=Yhdistä olemassa olevaan tiliin
 openid_connect_desc=Valittu OpenID-osoite on tuntematon. Liitä se uuteen tiliin täällä.
 openid_register_title=Luo uusi tili
 openid_register_desc=Valittu OpenID-osoite on tuntematon. Liitä se uuteen tiliin täällä.
 email_domain_blacklisted=Et voi rekisteröityä sähköpostiosoittellasi.
 authorize_application=Valtuuta sovellus
 authorize_redirect_notice=Sinut uudelleen ohjataan osoitteeseen %s jos valtuutat tämän sovelluksen.
-authorize_application_created_by=Tämän sovelluksen on luonnut %s.
-authorize_application_description=Jos myönnät valtuuden, sovellus voi käyttää kaikkia tilitietojasi ja kirjoittaa niihin, mukaan lukien yksityiset repositoriot ja organisaatiot.
+authorize_application_created_by=Tämän sovelluksen on luonut %s.
+authorize_application_description=Jos myönnät valtuuden, se pystyy pääsemään kaikkiin tilitietoihisi ja kirjoittamaan niihin, mukaan lukien yksityiset tietovarastot ja organisaatiot.
 authorize_title=Valtuutatko "%s" pääsemään tilillesi?
-authorization_failed=Käyttöoikeuden varmistus epäonnistui
+authorization_failed=Valtuuttaminen epäonnistui
 sspi_auth_failed=SSPI todennus epäonnistui
 sign_up_successful = Käyttäjätili luotiin onnistuneesti. Tervetuloa!
 hint_login = Onko sinulla jo käyttäjätili? <a href="%s">Kirjaudu sisään!</a>
 hint_register = Tarvitsetko käyttäjätilin? <a href="%s">Rekisteröidy nyt.</a>
 sign_up_button = Rekisteröidy nyt.
-manual_activation_only = Ota yhteyttä järjestelmänvalvojaanne viimeistelläksesi aktivoinnin.
+manual_activation_only = Ota yhteys sivuston ylläpitoon viimeistelläksesi aktivoinnin.
 change_unconfirmed_email_error = Sähköpostiosoitteen vaihtaminen ei onnistu: %v
 invalid_password = Salasanasi ei vastaa tilin luomisen yhteydessä käytettyä salasanaa.
 back_to_sign_in = Takaisin kirjautumiseen
@@ -471,7 +471,7 @@ change_unconfirmed_email_summary = Vaihda sähköpostiosoite, johon aktivointis
 reset_password_wrong_user = Olet kirjautuneena tilillä %s, mutta tilin palautuslinkki on tarkoitettu tilille %s
 last_admin = Et voi poistaa viimeistä ylläpitäjää. Ylläpitäjiä tulee olla vähintään yksi.
 password_pwned = Valitsemasi salasana on <a target="_blank" rel="noopener noreferrer" href="%s">varastettujen salasanojen listalla</a>, eli se on paljastanut jossain julkisessa tietovuodossa. Kokeile asettaa eri salasana, ja jos käytät samaa salasanaa muissa palveluissa, vaihda kyseinen salasana.
-use_onetime_code = Käytä kertakäyttöiskoodia
+use_onetime_code = Käytä kertakäyttökoodia
 unauthorized_credentials = Kirjautumistiedot ovat virheelliset tai vanhentuneet. Yritä suorittaa komento uudelleen tai katso %s saadaksesi lisätietoja
 oauth.signin.error.temporarily_unavailable = Valtuus epäonnistui, koska todennuspalvelin ei ole tällä hetkellä käytettävissä. Yritä uudelleen myöhemmin.
 disable_forgot_password_mail = Tilin palautus ei ole käytössä, koska sähköpostia ei ole määritetty. Ota yhteys sivuston ylläpitoon.
@@ -479,11 +479,11 @@ password_pwned_err = Pyyntöä HaveIBeenPwned-palveluun ei voitu suorittaa
 authorization_failed_desc = Valtuus epäonnistui, koska havaitsimme virheellisen pyynnön. Ota yhteys sen sovelluksen ylläpitäjään, jota yritit valtuuttaa.
 oauth.signin.error = Valtuuspyynnön käsittelyssä tapahtui virhe. Jos virhe toistuu, ota yhteys sivuston ylläpitoon.
 disable_forgot_password_mail_admin = Tilin palautus on käytössä vain, jos sähköposti on määritetty. Aseta sähköposti, jotta tilin palauttaminen on mahdollista ottaa käyttöön.
-prohibit_login_desc = Tilinne on estetty kanssakäymästä tämän instanssin kanssa. Ota yhteys instanssin järjestelmävalvojaan pääsyn uudelleenmahdollistamiseksi.
+prohibit_login_desc = Tilisi käyttö instanssin kanssa on estetty. Ota yhteyttä instanssin ylläpitoon saadaksesi pääsyn takaisin.
 
 [mail]
 view_it_on=Näytä %s
-link_not_working_do_paste=Eikö linkki toimi? Yritä kopioida ja liittää se selaimesi osoitepalkkiin.
+link_not_working_do_paste=Eikö linkki toimi? Kopioi ja liitä se selaimesi osoiteriville.
 hi_user_x=Hei <b>%s</b>,
 
 activate_account=Ole hyvä ja aktivoi tilisi
@@ -491,7 +491,7 @@ activate_account=Ole hyvä ja aktivoi tilisi
 activate_email=Vahvista sähköpostiosoitteesi
 
 register_notify=Tervetuloa %s-palveluun
-register_notify.text_2=Voit nyt kirjautua tilillesi käyttäjätunnuksella: %s
+register_notify.text_2=Voit nyt kirjautua tilillesi käyttäjänimellä: %s
 
 reset_password=Palauta käyttäjätili
 reset_password.title=%s, olet pyytänyt tilisi palauttamista
@@ -500,8 +500,8 @@ register_success=Rekisteröinti onnistui
 
 
 issue.x_mentioned_you=<b>@%s</b> mainitsi sinut:
-issue.action.push_1=<b>@%[1]s</b> työnsi %[3]d commitin kohteeseen %[2]s
-issue.action.push_n=<b>@%[1]s</b> työnsi %[3]d committia kohteeseen %[2]s
+issue.action.push_1=<b>@%[1]s</b> työnsi %[3]d kommitin kohteeseen %[2]s
+issue.action.push_n=<b>@%[1]s</b> työnsi %[3]d kommittia kohteeseen %[2]s
 issue.action.reject=<b>@%[1]s</b> pyysi muutoksia tässä vetopyynnössä.
 
 release.title=Otsikko: %s
@@ -517,14 +517,14 @@ removed_security_key.subject = Turva-avain on poistettu
 removed_security_key.text_1 = Turva-avain "%[1]s" on poistettu tililtäsi.
 team_invite.text_2 = Napsauta seuraavaa linkkiä liittyäksesi tiimiin:
 activate_account.text_1 = Hei <b>%[1]s</b>, kiitos kun rekisteröidyit palveluun %[2]s!
-activate_account.text_2 = Aktivoidaksesi tilin, napsauta alla olevaa linkkiä aikaikkunan <b>%s</b> sisällä:
+activate_account.text_2 = Aktivoi tilisi napsauttamalla alla olevaa linkkiä aikaikkunan <b>%s</b> sisällä:
 totp_disabled.subject = TOTP on poistettu käytöstä
 primary_mail_change.subject = Ensisijainen sähköpostiosoitteesi on vaihdettu
 admin.new_user.user_info = Käyttäjätiedot
 activate_email.text = Vahvista sähköpostiosoitteesi napsauttamalla linkkiä aikaikkunan <b>%s</b> sisällä:
 admin.new_user.subject = Uusi käyttäjä %s rekisteröityi juuri
 register_notify.text_3 = Jos joku muu teki tämän tilin puolestasi, <a href="%s">aseta salasana</a> ensin.
-repo.transfer.subject_to_you = %s haluaa siirtää repon "%s" sinulle
+repo.transfer.subject_to_you = %s haluaa siirtää tietovaraston "%s" sinulle
 reply = tai vastaa tähän sähköpostiin suoraan
 issue.action.new = <b>@%[1]s</b> loi #%[2]d.
 team_invite.subject = %[1]s kutsui sinut liittymään organisaatioon %[2]s
@@ -537,36 +537,42 @@ totp_disabled.text_1 = Tilisi aikapohjainen kertakäyttösalasana (TOTP) poistet
 issue.action.close = <b>@%[1]s</b> sulki ongelman #%[2]d.
 issue.action.reopen = <b>@%[1]s</b> avasi uudelleen ongelman #%[2]d.
 admin.new_user.text = <a href="%s">Napsauta tästä</a> hallitaksesi tätä käyttäjää ylläpitonäkymästä.
-repo.collaborator.added.text = Sinut on lisätty avustajaksi repoon:
+repo.collaborator.added.text = Sinut on lisätty avustajaksi tietovarastoon:
 primary_mail_change.text_1 = Tilisi ensisijaiseksi sähköpostiosoitteeksi asetettiin %[1]s. Se tarkoittaa, että tämä sähköpostiosoite ei enää vastaanota tilisi ilmoituksia sähköpostitse.
 team_invite.text_1 = %[1]s on kutsunut sinut liittymään tiimiin %[2]s organisaatiossa %[3]s.
-issue_assigned.pull = @%[1]s osoitti sinulle vetopyynnön %[2]s repossa %[3]s.
-issue_assigned.issue = @%[1]s osoitti sinulle ongelman %[2]s repossa %[3]s.
+issue_assigned.pull = @%[1]s osoitti sinulle vetopyynnön %[2]s tietovarastossa %[3]s.
+issue_assigned.issue = @%[1]s osoitti sinulle ongelman %[2]s tietovarastossa %[3]s.
 register_notify.text_1 = tämä on %s:n rekistöröitymisen vahvistussähköposti!
-reset_password.text = jos tämä oli sinun toimestasi, ole hyvä ja klikkaa oheista linkkiä palauttaaksesi tilisi <b>%s</b> sisällä:
-totp_disabled.no_2fa = Muita kaksivaiheisen tunnistautumisen menetelmiä ei ole konfiguroituna, joten et tarvitse kaksivaiheista tunnistautumista kirjautuaaksesi tilillesi.
-
-
-
+reset_password.text = jos se olit sinä, napsauta oheista linkkiä palauttaaksesi tilisi <b>%s</b> sisällä:
+totp_disabled.no_2fa = Muita kaksivaiheisen todennuksen menetelmiä ei ole määritetty, joten et enää tarvitse kaksivaiheista todennusta kirjautuaksesi tilillesi.
 totp_enrolled.subject = Olet aktivoinut TOTP:in kaksivaiheisen todennuksen menetelmäksi
+totp_enrolled.text_1.no_webauthn = Otit TOTP:n käyttöön tilillesi. Tämä tarkoittaa, että kirjautuessasi tilillesi sinun täytyy käyttää TOTP-menetelmää kaksivaiheisena todennuksena.
+team_invite.text_3 = Huomaa: Tämä kutsu on tarkoitettu käyttäjälle %[1]s. Jos et odottanut tätä kutsua, voit jättää tämän sähköpostin huomiotta.
+removed_security_key.no_2fa = Yhtäkään kaksivaiheisen todennuksen menetelmää ei ole määritelty, joten tilillesi ei enää tarvitse kirjautua kaksivaiheisella todennuksella.
+totp_enrolled.text_1.has_webauthn = Otit TOTP:n käyttöön tilillesi. Tämä tarkoittaa, että kirjautuessasi tilillesi voit käyttää TOTP-menetelmää kaksivaiheisena tunnistautumisena tai mitä tahansa turva-avaintasi.
+repo.collaborator.added.subject = %s lisäsi sinut tietovaraston %s avustajaksi
+release.new.text = <b>@%[1]s</b> julkaisi %[2]s projektissa %[3]s
+issue.action.review_dismissed = <b>@%[1]s</b> hylkäsi viimeisimmän katselmoinnin taholta %[2]s tälle vetopyynnölle.
+release.new.subject = %s %s:ssa julkaistu
+issue.in_tree_path = %s:ssa:
+issue.action.force_push = <b>%[1]s</b> pakkotyönsi <b>%[2]s</b> lähteestä %[3]s kohteeseen %[4]s:hen.
+issue.action.merge = <b>@%[1]s</b> yhdisti kohteen #%[2]d kohteeseen %[3]s.
+repo.transfer.subject_to = %s haluaa siirtää tietovaraston "%s" taholle %s
+repo.transfer.body = Hyväksy tai hylkää se käymällä %s tai jätä se huomiotta.
+
 
-removed_security_key.no_2fa = Yhtään kaksivaiheisen tunnistautumisen menetelmää ei ole määritelty, joten tilillesi ei enää tarvitse kirjautua kaksivaiheisella tunnistautumisella.
-totp_enrolled.text_1.no_webauthn = Otit TOTP:n käyttöön tilillesi. Tämä tarkoittaa, että kirjauduttaessa sisään tilillesi sinun täytyy käyttää TOTP menetelmää kaksivaiheisena tunnistautumisena.
-totp_enrolled.text_1.has_webauthn = Otit TOTP:n käyttöön tilillesi. Tämä tarkoittaa, että kirjauduttaessa sisään tilillesi voit käyttää TOTP menetelmää kaksivaiheisena tunnistautumisena tai mitä tahansa turva-avaimiasi.
-repo.collaborator.added.subject = %s lisäsi sinut %s yhteistyökumppaniksi
-team_invite.text_3 = Huomaa: Tämä kutsu on tarkoitettu %[1]s:lle. Jos et odottanut tätä kutsua, voit jättää tämän sähköpostin huomiotta.
 
 [modal]
 yes=Kyllä
 no=Ei
 cancel=Peruuta
-modify=Päivitys
+modify=Päivitä
 confirm = Vahvista
 
 [form]
-UserName=Käyttäjätunnus
-RepoName=Repon nimi
-Email=Sähköposti osoite
+UserName=Käyttäjänimi
+RepoName=Tietovaraston nimi
+Email=Sähköpostiosoite
 Password=Salasana
 Retype=Vahvista salasana
 SSHTitle=SSH avain nimi
@@ -576,9 +582,9 @@ AuthName=Luvan nimi
 AdminEmail=Ylläpitäjän sähköposti
 
 NewBranchName=Uuden haaran nimi
-CommitSummary=Commitin yhteenveto
-CommitMessage=Commitin viesti
-CommitChoice=Commitin valinta
+CommitSummary=Kommitin yhteenveto
+CommitMessage=Kommitointiviesti
+CommitChoice=Kommitin valinta
 TreeName=Tiedostopolku
 Content=Sisältö
 
@@ -591,18 +597,18 @@ min_size_error=` täytyy sisältää vähintään %s merkkiä.`
 max_size_error=` täytyy sisältää enintään %s merkkiä.`
 email_error=` ei ole kelvollinen sähköpostiosoite.`
 unknown_error=Tuntematon virhe:
-captcha_incorrect=CAPTCHA koodi on virheellinen.
+captcha_incorrect=CAPTCHA-koodi on virheellinen.
 password_not_match=Salasanat eivät täsmää.
 lang_select_error=Valitse kieli listalta.
 
-username_been_taken=Käyttäjätunnus on jo varattu.
-repo_name_been_taken=Repon nimi on jo käytössä.
-repository_force_private=Pakotettu yksityisyys käytössä: yksityisiä repoja ei voida muuttaa julkisiksi.
+username_been_taken=Käyttäjänimi on jo varattu.
+repo_name_been_taken=Tietovaraston nimi on jo käytössä.
+repository_force_private=Pakotettu yksityisyys käytössä: yksityisiä tietovarastoja ei voida muuttaa julkisiksi.
 org_name_been_taken=Organisaation nimi on jo käytössä.
 team_name_been_taken=Tiimin nimi on jo varattu.
 email_been_used=Sähköpostiosoite on jo käytössä.
 email_invalid=Sähköpostiosoite on virheellinen.
-username_password_incorrect=Käyttäjätunnus tai salasana on virheellinen.
+username_password_incorrect=Käyttäjänimi tai salasana on virheellinen.
 password_lowercase_one=Ainakin yksi pieni kirjan
 password_uppercase_one=Ainakin yksi iso kirjain
 password_digit_one=Ainakin yksi numero
@@ -618,7 +624,7 @@ invalid_gpg_key=GPG-avaintasi ei voi vahvistaa: %s
 auth_failed=Todennus epäonnistui: %v
 
 
-target_branch_not_exist=Kohde branchia ei ole olemassa.
+target_branch_not_exist=Kohdehaaraa ei ole olemassa.
 Pronouns = Pronomini
 FullName = Koko nimi
 Description = Kuvaus
@@ -626,9 +632,9 @@ Biography = Biografia
 Website = Verkkosivusto
 Location = Sijainti
 To = Haaran nimi
-still_own_repo = Tilisi omistaa yhden tai useamman repon, poista tai siirrä ne ensin.
+still_own_repo = Tilisi omistaa yhden tai useamman tietovaraston; poista tai siirrä ne ensin.
 organization_leave_success = Olet poistunut organisaatiosta %s.
-enterred_invalid_repo_name = Kirjoittamasi repon nimi on virheellinen.
+enterred_invalid_repo_name = Syöttämäsi tietovaraston nimi on epäkelpo.
 openid_been_used = OpenID-osoite "%s" on jo käytetty.
 password_complexity = Salasana ei täytä monimutkaisuusvaatimuksia:
 still_has_org = Tilisi on jäsen yhdessä tai useamassa organisaatiossa, poistu niistä ensin.
@@ -638,14 +644,43 @@ must_use_public_key = Antamasi avain on yksityinen avain. Älä lähetä yksityi
 still_own_packages = Tilisi omistaa yhden tai useamman paketin, poista ne ensin.
 AccessToken = Pääsypoletti
 enterred_invalid_owner_name = Uuden omistajan nimi ei ole kelvollinen.
+git_ref_name_error = `täytyy olla oikein muodostettu Git-viittausnimi`
+username_error = `saa sisältää vain aakkosnumeerisia merkkejä ("0–9", "a–z", "A–Z"), yhdysviivaa ("-"), alaviivaa ("_") ja pistettä (".). Se ei voi alkaa tai päättyä muihin kuin aakkosnumeerisiin merkkeihin, ja peräkkäiset muut kuin aakkosnumeeriset merkit ovat myös kiellettyjä.`
+alpha_dash_dot_error = `saa sisältää vain aakkosnumeerisia merkkejä, yhdysmerkkiä ("-"), alaviivaa ("_") ja pistettä (".").`
+alpha_dash_error = `saa sisältää vain aakkosnumeerisia merkkejä, yhdysmerkkiä ("-") ja alaviivaa ("_").`
+include_error = `täytyy sisältää alimerkkijonon "%s".`
+glob_pattern_error = `glob-kuvio on epäkelvollinen: %s.`
+regex_pattern_error = `regex-kuvio on epäkelvollinen: %s.`
+username_error_no_dots = `voi sisältää vain aakkosnumeerisia merkkejä ("0–9", "a–z", "A–Z"), yhdysviivaa ("-") ja alaviivaa ("_"). Se ei voi alkaa tai päättyä muihin kuin aakkosnumeerisiin merkkeihin, ja peräkkäiset muut kuin aakkosnumeeriset merkit ovat myös kiellettyjä.`
+PayloadUrl = Hyötykuorman URL-osoite
+repository_files_already_exist.adopt = Tälle tietovarastolle on jo olemassa tiedostoja, ja ne voidaan vain omaksua.
+repository_files_already_exist = Tässä tietovarastossa on jo tiedostoja. Ota yhteys järjestelmän ylläpitäjään.
+last_org_owner = Et voi poistaa viimeistä käyttäjää "owners"-tiimistä. Organisaatiolla tulee olla vähintään yksi omistaja.
+required_prefix = Syötteen tulee alkaa "%s"
+repository_files_already_exist.delete = Tässä tietovarastossa on jo tiedostoja. Poista ne.
+duplicate_invite_to_team = Käyttäjä oli jo kutsuttu tiimin jäseneksi.
+org_still_own_repo = Organisaatio omistaa yhden tai useamman tietovaraston. Poista tai siirrä ne ensin.
+org_still_own_packages = Organisaatio omistaa yhden tai useamman paketin. Poista ne ensin.
+team_no_units_error = Salli pääsy vähintään yhteen tietovaraston osioon.
+repository_files_already_exist.adopt_or_delete = Tässä tietovarastossa on jo tiedostoja. Omaksu ne itsellesi tai poista ne.
+username_change_not_local_user = Ei-paikallisten käyttäjien ei sallita vaihtaa käyttäjänimeä.
+admin_cannot_delete_self = Et voi poistaa itseäsi, kun olet ylläpitäjä. Poista ensin ylläpito-oikeudet itseltäsi.
+username_claiming_cooldown = Käyttäjänimeä ei voi ottaa käyttöön, koska siihen kohdistuva suojaamisjakso ei ole vielä päättynyt. Käyttäjänimen voi ottaa käyttöön %[1]s.
+email_domain_is_not_allowed = Käyttäjän sähköpostiosoitteen <b>%s</b> verkkotunnus on ristiriidassa EMAIL_DOMAIN_ALLOWLIST:in tai EMAIL_DOMAIN_BLOCKLIST:in kanssa. Varmista, että olen asettanut sähköpostiosoitteen oikein.
+unsupported_login_type = Tällä kirjautumistavalla ei voi poistaa tunnusta.
+invalid_ssh_principal = Väärä toimija: %s
+unset_password = Kirjautuneen käyttäjän salasanaa ei ole asetettu.
+invalid_group_team_map_error = ` kuvaus ei ole kelvollinen: %s`
+2fa_auth_required = Etävierailu vaati kaksivaiheisen todennuksen.
+visit_rate_limit = Etävierailujen pyyntörajoitukset.
 
 
 [user]
 change_avatar=Vaihda profiilikuvasi…
-repositories=Repot
+repositories=Tietovarastot
 activity=Julkinen toiminta
 followers_few=%d seuraajaa
-starred=Tähdelliset repot
+starred=Tähdelliset tietovarastot
 projects=Projektit
 overview=Yleiskatsaus
 following_few=%d seurataan
@@ -669,15 +704,19 @@ unblock = Poista esto
 following_one = %d seurataan
 block_user.detail = Huomaa, että käyttäjän estämisellä on muita vaikutuksia, kuten:
 show_on_map = Näytä paikka kartalla
-form.name_chars_not_allowed = Käyttäjätunnus "%s" sisältää virheellisiä merkkejä.
+form.name_chars_not_allowed = Käyttäjänimi "%s" sisältää virheellisiä merkkejä.
 follow_blocked_user = Et voi seurata tätä käyttäjää, koska olet estänyt kyseisen käyttäjän tai kyseinen käyttäjä on estänyt sinut.
 disabled_public_activity = Käyttäjä on poistanut käytöstä toiminnan julkisen näkyvyyden.
-form.name_reserved = Käyttäjätunnus "%s" on varattu.
-form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu käyttäjätunnuksessa.
-
-
+form.name_reserved = Käyttäjänimi "%s" on varattu.
+form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu käyttäjänimessä.
 public_activity.visibility_hint.admin_private = Aktiivisuus on näkyvissä sinulle, koska olet ylläpitäjä, mutta käyttäjä haluaa pitää aktiivisuutensa yksityisenä.
 public_activity.visibility_hint.self_private_profile = Aktiivisuutesi on näkyvissä vain sinulle ja instanssin ylläpitäjille, koska profiilisi on yksityinen. <a href="%s">Määritä</a>.
+watched = Tarkaillut tietovarastot
+block_user.detail_2 = Tämä käyttäjä ei voi olla vuorovaikutuksessa omistamiesi tietovarastojen kanssa, tai luomiesi ongelmien ja kommenttien kanssa.
+block_user.detail_3 = Ette voi lisätä toisianne tietovaraston avustajiksi.
+block_user.detail_1 = Lopetatte toistenne seuraamisen, ettekä pysty enää seurata toisianne.
+public_activity.visibility_hint.admin_public = Tämä aktiviteetti on näkyvissä kaikille, mutta ylläpitäjänä voit nähdä myös vuorovaikutukset yksityisissä tiloissa.
+
 
 [settings]
 profile=Profiili
@@ -690,7 +729,7 @@ ssh_gpg_keys=SSH-/GPG-avaimet
 social=Sosiaaliset tilit
 applications=Sovellukset
 orgs=Organisaatiot
-repos=Repot
+repos=Tietovarastot
 delete=Poista tili
 twofa=Kaksivaiheinen todennus (TOTP)
 account_link=Linkitetyt tilit
@@ -698,7 +737,7 @@ organization=Organisaatiot
 webauthn=Kaksivaiheinen todennus (Turva-avaimet)
 
 public_profile=Julkinen profiili
-password_username_disabled=Ei-paikalliset käyttäjät eivät voi muuttaa käyttäjätunnustaan. Ole hyvä ja ota yhteyttä sivuston ylläpitäjään saadaksesi lisätietoa.
+password_username_disabled=Ei-paikalliset käyttäjät eivät voi muuttaa käyttäjänimeään. Ota yhteys sivuston ylläpitoon saadaksesi lisätietoa.
 full_name=Koko nimi
 website=Verkkosivusto
 location=Sijainti
@@ -707,14 +746,14 @@ update_profile=Päivitä profiili
 update_language=Vaihda kieli
 update_language_success=Kieli on päivitetty.
 update_profile_success=Profiilisi on päivitetty.
-change_username=Käyttäjätunnuksesi on muutettu.
+change_username=Käyttäjänimesi on muutettu.
 continue=Jatka
 cancel=Peruuta
 language=Kieli
 ui=Teema
 hidden_comment_types=Piilotetut kommenttityypit
 comment_type_group_reference=Viittaus
-comment_type_group_label=Tunniste
+comment_type_group_label=Nimilappu
 comment_type_group_milestone=Merkkipaalu
 comment_type_group_assignee=Osoitettu henkilölle
 comment_type_group_title=Otsikko
@@ -723,8 +762,8 @@ comment_type_group_time_tracking=Ajanseuranta
 comment_type_group_deadline=Määräaika
 comment_type_group_dependency=Riippuvuus
 comment_type_group_lock=Lukituksen tila
-comment_type_group_review_request=Arviointipyyntö
-comment_type_group_pull_request_push=Lisätyt commitit
+comment_type_group_review_request=Katselmointipyyntö
+comment_type_group_pull_request_push=Lisätyt kommitit
 comment_type_group_project=Projekti
 saved_successfully=Asetuksesi tallennettiin onnistuneesti.
 privacy=Yksityisyys
@@ -742,7 +781,7 @@ update_avatar_success=Profiilikuva on päivitetty.
 update_password=Päivitä salasana
 old_password=Nykyinen salasana
 new_password=Uusi salasana
-password_incorrect=Nykyinen salasanasi on virheellinen.
+password_incorrect=Nykyinen salasana on virheellinen.
 password_change_disabled=Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Forgejon web-käyttöliittymän kautta.
 
 emails=Sähköposti osoitteet
@@ -753,12 +792,12 @@ theme_desc=Tätä teemaa käytetään verkkosivuston käyttöliittymässä, kun
 primary=Ensisijainen
 activated=Aktivoitu
 requires_activation=Vaatii aktivoinnin
-primary_email=Tee ensisijainen
+primary_email=Aseta ensisijaiseksi
 activate_email=Lähetä aktivointi
 activations_pending=Odottaa aktivointia
 delete_email=Poista
 email_deletion=Poista sähköpostiosoite
-email_deletion_desc=Sähköpostiosoite ja siihen liittyvät tiedot poistetaan tililtäsi. Kyseisen sähköpostiosoitteen sisältävät commitit pysyvät muuttumattomia. Jatketaanko?
+email_deletion_desc=Sähköpostiosoite ja siihen liittyvät tiedot poistetaan tililtäsi. Kyseisen sähköpostiosoitteen sisältävät kommitit pysyvät muuttumattomia. Jatketaanko?
 email_deletion_success=Sähköpostiosoite on poistettu.
 theme_update_success=Teemasi on päivitetty.
 theme_update_error=Valittua teemaa ei löydy.
@@ -772,48 +811,48 @@ add_email_success=Uusi sähköpostiosoite on lisätty.
 email_preference_set_success=Sähköpostin asetukset on asetettu onnistuneesti.
 add_openid_success=Uusi OpenID-osoite on lisätty.
 keep_email_private=Piilota sähköpostiosoite
-openid_desc=OpenID mahdollistaa todentamisen delegoinnin ulkopuoliselle palvelun tarjoajalle.
+openid_desc=OpenID mahdollistaa todentamisen delegoinnin ulkopuoliselle palveluntarjoajalle.
 
 manage_ssh_keys=Hallitse SSH-avaimia
 manage_gpg_keys=Hallitse GPG-avaimia
 add_key=Lisää avain
-ssh_desc=Nämä julkiset SSH-avaimet on liitetty tiliisi. Vastaavat yksityiset avaimet antavat täyden pääsyn repoihisi. Vahvistettuja SSH-avaimia voi käyttää SSH-allekirjoitettujen Git-kommittien vahvistamiseen.
-gpg_desc=Nämä julkiset GPG-avaimet on liitetty tiliisi, ja niitä käytetään kommittien vahvistamiseen. Pidä yksityiset avaimet turvassa, koska ne mahdollistavat kommittien allekirjoittamisen sinun nimissä.
+ssh_desc=Nämä julkiset SSH-avaimet on liitetty tiliisi. Vastaavat yksityiset avaimet antavat täyden pääsyn tietovarastoihisi. Vahvistettuja SSH-avaimia voidaan käyttää SSH-allekirjoitettujen Git-kommittien varmentamiseen.
+gpg_desc=Nämä julkiset GPG-avaimet liitetään tiliisi ja niitä käytetään tekemiesi kommittien vahvistamiseen. Pidä yksityiset avaimesi turvassa, koska niiden avulla voit allekirjoittaa kommitteja henkilöllisyytesi kanssa.
 ssh_helper=<strong>Tarvitsetko apua?</strong> Tutustu GitHubin oppaaseen <a href="%s">omien SSH-avainten luonnista</a> tai <a href="%s">yleisistä ongelmista</a>, joita voit kohdata SSH:n kanssa.
 gpg_helper=<strong>Tarvitsetko apua?</strong> Katso GitHubin opas <a href="%s">GPG</a>:stä.
 add_new_key=Lisää SSH avain
 add_new_gpg_key=Lisää GPG-avain
 key_content_ssh_placeholder=Alkaa sanoilla "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com" tai "sk-ssh-ed25519@openssh.com"
 key_content_gpg_placeholder=Alkaa sanoilla "-----BEGIN PGP PUBLIC KEY BLOCK-----"
-ssh_key_name_used=Samanniminen SSH avain on jo olemassa tililläsi.
-gpg_key_id_used=Julkinen GPG-avain samalla tunnuksella on jo olemassa.
-gpg_no_key_email_found=Tämä GPG-avain ei vastaa mitään tiliisi liitettyä aktivoitua sähköpostiosoitetta. Se voidaan silti lisätä, jos allekirjoitat annetun pääsymerkin.
+ssh_key_name_used=SSH-avain samalla nimellä on jo olemassa tililläsi.
+gpg_key_id_used=Julkinen GPG-avain samalla ID-tunnisteella on jo olemassa.
+gpg_no_key_email_found=Tämä GPG-avain ei vastaa mitään tiliisi liitettyä aktivoitua sähköpostiosoitetta. Se voidaan silti lisätä, jos allekirjoitat annetun pääsypoletin.
 gpg_key_verified=Vahvistettu avain
-gpg_key_verified_long=Avain on vahvistettu pääsymerkillä ja sitä voidaan käyttää todentamaan commitit, jotka vastaavat tämän käyttäjän aktivoituja sähköpostiosoitteita tämän avaimen kaikkien vastaavien identiteettien lisäksi.
+gpg_key_verified_long=Avain on vahvistettu poletilla ja sitä voidaan käyttää vahvistamaan kommitit, jotka vastaavat tämän käyttäjän aktivoituja sähköpostiosoitteita tämän avaimen kaikkien vastaavien identiteettien lisäksi.
 gpg_key_verify=Vahvista
-gpg_token_required=Sinun täytyy antaa allekirjoitus alla olevalle pääsymerkille
-gpg_token=Pääsymerkki
+gpg_token_required=Sinun täytyy antaa allekirjoitus alla olevalle poletille
+gpg_token=Poletti
 gpg_token_help=Voit luoda allekirjoituksen käyttäen:
 gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig
 gpg_token_signature=Panssaroitu GPG-allekirjoitus
 key_signature_gpg_placeholder=Alkaa sanoilla "-----BEGIN PGP SIGNATURE-----"
 ssh_key_verified=Vahvistettu avain
-ssh_key_verified_long=Avain on vahvistettu pääsymerkillä ja sitä voidaan käyttää todentamaan commitit, jotka vastaavat tämän käyttäjän aktivoituja sähköpostiosoitteita.
+ssh_key_verified_long=Avain on vahvistettu poletilla ja sitä voidaan käyttää vahvistamaan kommitit, jotka vastaavat tämän käyttäjän aktivoituja sähköpostiosoitteita.
 ssh_key_verify=Vahvista
-ssh_token_required=Sinun täytyy antaa allekirjoitus alla olevalle pääsymerkille
-ssh_token=Pääsymerkki
+ssh_token_required=Sinun täytyy antaa allekirjoitus alla olevalle poletille
+ssh_token=Poletti
 ssh_token_help=Voit luoda allekirjoituksen käyttäen:
 ssh_token_signature=Panssaroitu SSH-allekirjoitus
 key_signature_ssh_placeholder=Alkaa sanoilla "-----BEGIN SSH SIGNATURE-----"
 subkeys=Aliavaimet
-key_id=Avain ID
+key_id=Avain-ID
 key_name=Avaimen nimi
 key_content=Sisältö
 principal_content=Sisältö
 delete_key=Poista
 ssh_key_deletion=Poista SSH-avain
 gpg_key_deletion=Poista GPG-avain
-gpg_key_deletion_desc=GPG-avaimen poistaminen peruuttaa sillä allekirjoitettujen committien vahvistukset. Jatketaanko?
+gpg_key_deletion_desc=GPG-avaimen poistaminen peruuttaa sillä allekirjoitettujen kommittien vahvistukset. Jatketaanko?
 gpg_key_deletion_success=GPG-avain on poistettu.
 valid_forever=Voimassa ikuisesti
 last_used=Käytetty viimeksi
@@ -825,16 +864,16 @@ hide_openid=Piilota profiilista
 ssh_disabled=SSH on pois käytöstä
 manage_social=Hallitse liitettyjä sosiaalisia tilejä
 
-manage_access_token=Hallitse pääsymerkkejä
-generate_new_token=Luo uusi pääsymerkki
-token_name=Pääsymerkin nimi
-generate_token=Luo pääsymerkki
-generate_token_success=Uusi pääsymerkkisi on nyt luotu. Kopioi se nyt, koska sitä ei näytetä enää uudelleen.
+manage_access_token=Pääsypoletit
+generate_new_token=Luo uusi poletti
+token_name=Poletin nimi
+generate_token=Luo pääsypoletti
+generate_token_success=Uusi pääsypolettisi on nyt luotu. Kopioi se nyt, koska sitä ei näytetä enää uudelleen.
 delete_token=Poista
-access_token_deletion=Poista pääsymerkki
+access_token_deletion=Poista pääsypoletti
 access_token_deletion_cancel_action=Peruuta
 access_token_deletion_confirm_action=Poista
-permission_read=Luettu
+permission_read=Lue
 
 edit_oauth2_application=Muokkaa OAuth2-sovellusta
 remove_oauth2_application=Poista OAuth2-sovellus
@@ -844,26 +883,26 @@ create_oauth2_application_button=Luo sovellus
 oauth2_application_name=Sovelluksen nimi
 save_application=Tallenna
 oauth2_regenerate_secret=Luo salaisuus uudelleen
-oauth2_regenerate_secret_hint=Kadotitko secretin?
+oauth2_regenerate_secret_hint=Kadotitko salaisuuden?
 oauth2_application_edit=Muokkaa
 
 
 twofa_desc=Kaksivaiheinen todennus parantaa tilisi turvallisuutta.
-twofa_is_enrolled=Tilisi <strong>käyttää</strong> kaksivaiheista vahvistusta.
-twofa_not_enrolled=Tilisi ei tällä hetkellä käytä kaksivaiheista vahvistusta.
-twofa_enroll=Ota kaksivaiheinen vahvistus käyttöön
+twofa_is_enrolled=Tilisi <strong>käyttää</strong> kaksivaiheista todennusta.
+twofa_not_enrolled=Tilisi ei tällä hetkellä käytä kaksivaiheista todennusta.
+twofa_enroll=Ota kaksivaiheinen todennus käyttöön
 twofa_disabled=Kaksivaiheinen todennus on otettu pois käytöstä.
-scan_this_image=Skannaa tämä kuva tunnistautumissovelluksellasi:
+scan_this_image=Skannaa tämä kuva todennussovelluksellasi:
 or_enter_secret=Tai kirjoita salainen avain: %s
-twofa_enrolled=Tiliisi on otettu käyttöön kaksivaiheinen vahvistus. Ota palautustunnus (%s) talteen turvalliseen paikkaan, sillä se näytetään vain kerran!
+twofa_enrolled=Tiliisi on otettu käyttöön kaksivaiheinen todennus. Ota kertakäyttöinen palautusavain (%s) talteen turvalliseen paikkaan, sillä se näytetään vain kerran!
 
 webauthn_nickname=Nimimerkki
 
-manage_account_links=Yhdistetyt tilit
+manage_account_links=Linkitetyt tilit
 manage_account_links_desc=Nämä ulkoiset tilit on linkitetty Forgejo-tiliisi.
-link_account=Yhdistä tili
-remove_account_link=Poista yhdistetty tili
-remove_account_link_desc=Linkitetyn tilin poistaminen peruuttaa pääsyn Forgejo-tiliisi linkitetyn tili kautta. Jatketaanko?
+link_account=Linkitä tili
+remove_account_link=Poista linkitetty tili
+remove_account_link_desc=Linkitetyn tilin poistaminen peruuttaa pääsyn Forgejo-tiliisi linkitetyn tilin kautta. Jatketaanko?
 remove_account_link_success=Linkitetty tili on poistettu.
 
 
@@ -901,7 +940,7 @@ blocked_users_none = Käyttäjiä ei ole estetty.
 location_placeholder = Jaa likimääräinen sijaintisi muiden kanssa
 retype_new_password = Vahvista uusi salasana
 create_oauth2_application_success = Loit uuden OAuth2-sovelluksen.
-repos_none = Et omista yhtäkään repositoriota.
+repos_none = Et omista yhtäkään tietovarastoa.
 visibility.limited_tooltip = Näkyvissä vain kirjautuneille käyttäjille
 email_notifications.disable = Poista sähköposti-ilmoitukset käytöstä
 webauthn_register_key = Lisää turva-avain
@@ -914,20 +953,20 @@ webauthn_key_loss_warning = Jos menetät turva-avaimesi, menetät pääsyn tilil
 keep_activity_private.description = <a href="%s">Julkinen toimintasi</a> näkyy vain sinulle ja instanssin ylläpitäjille.
 email_desc = Ensisijaista sähköpostiosoitettasi käytetään ilmoituksiin, salasanan palautukseen ja jos sähköpostiosoite ei ole piilotettu, web-pohjaisiin Git-toimenpiteisiin.
 tokens_desc = Nämä poletit mahdollistavat pääsyn tilillesi Forgejon rajapintaa vasten.
-keep_email_private_popup = Tämä piilottaa sähköpostiosoitteesi profiilistasi. Se ei ole enää oletus verkkosivukäyttöliittymän kautta tehdyissä kommiteissa, kuten tiedostojen lähetyksissä ja muokkauksissa, eikä sitä käytetä yhdistämiskommiteissa. Sen sijaan erikoisosoitetta %s voidaan käyttää kommittien liittämisessä tiliisi. Ota huomioon, ettei tämän asetuksen muuttaminen vaikuta olemassa oleviin kommitteihin.
+keep_email_private_popup = Sähköpostiosoitettasi ei näytetä profiilissasi, eikä sitä käytetä oletuksena verkkokäyttöliittymän kautta tehtävissä kommiteissa, kuten tiedostojen lähetyksissä, muokkauksissa ja yhdistämiskommiteissa. Sen sijaan voit käyttää erityistä osoitetta %s kommittien linkittämiseen tiliisi. Tämä vaihtoehto ei vaikuta olemassa oleviin kommitteihin.
 added_on = Lisätty %s
-additional_repo_units_hint = Ehdota repositorion lisäyksiköiden käyttöönottoa
+additional_repo_units_hint = Ehdota tietovaraston lisäyksiköiden käyttöönottoa
 revoke_oauth2_grant_success = Pääsy mitätöity.
 revoke_oauth2_grant = Mitätöi pääsy
 webauthn_desc = Turva-avaimet ovat kryptografisia avaimia sisältäviä laitteita. Niitä on mahdollista käyttää kaksivaiheiseen todennukseen. Turva-avainten on pakko tukea <a rel="noreferrer" target="_blank" href="%s">WebAuthn Authenticator</a> -standardia.
 permissions_public_only = Vain julkinen
-repo_and_org_access = Repojen ja organisaatioiden pääsy
+repo_and_org_access = Tietovarastojen ja organisaatioiden pääsy
 revoke_oauth2_grant_description = Pääsyn mitätöinti tälle kolmannen osapuolen sovellukselle estää sitä pääsemästä dataasi. Oletko varma?
 twofa_recovery_tip = Jos menetät laitteesi, voit palauttaa pääsyn tiliisi käyttämällä kertakäyttöisen palautusavaimen.
-hooks.desc = Lisää webkoukkuja, jotka suoritetaan <strong>kaikille omistamillesi repoille</strong>.
+hooks.desc = Lisää web-koukkuja, jotka aktivoituvat <strong>kaikissa omistamissasi tietovarastoissa</strong>.
 revoke_key = Mitätöi
 permissions_list = Käyttöoikeudet:
-at_least_one_permission = Pääsymerkin luominen vaatii vähintään yhden käyttöoikeuden
+at_least_one_permission = Pääsypoletin luominen vaatii vähintään yhden käyttöoikeuden
 select_permissions = Valitse käyttöoikeudet
 twofa_disable_note = Voit poistaa kaksivaiheisen todennuksen käytöstä, jos tarve.
 authorized_oauth2_applications_description = Olet myöntänyt pääsyn henkilökohtaiseen Forgejo-tiliisi näille kolmannen osapuolen sovelluksille. Jos et enää käytä sovellusta, mitätöi sen pääsy tilillesi.
@@ -939,14 +978,14 @@ webauthn_alternative_tip = Saatat haluta määrittää lisätodennusmenetelmän.
 twofa_disable = Poista kaksivaiheinen todennus käytöstä
 twofa_disable_desc = Kaksivaiheisen todennuksen poistaminen asettaa tilisi aiempaa suurempaan uhkaan. Jatketaanko?
 update_language_not_found = Kieli "%s" ei ole käytettävissä.
-change_username_prompt = Huomio: Käyttäjätunnuksen vaihtaminen muuttaa myös tilisi URL-osoitteen.
+change_username_prompt = Huomio: Käyttäjänimen vaihtaminen muuttaa myös tilisi URL-osoitteen.
 oauth2_client_secret_hint = Tätä salaisuutta ei näytetä uudelleen, kun olet poistunut sivulta tai päivittänyt sivun. Varmista, että olet ottanut salaisuuden talteen.
 blocked_since = Estetty %s lähtien
 user_unblock_success = Käyttäjän esto on poistettu.
 oauth2_redirect_uris = Uudelleenohjaus-URI:t. Käytä uutta riviä (newline) jokaista URI:a kohden.
 oauth2_client_secret = Asiakkaan salaisuus
 verify_ssh_key_success = SSH-avain "%s" on vahvistettu.
-change_username_redirect_prompt = Vanha käyttäjätunnus uudelleenohjaa, kunnes joku muu ottaa käyttäjätunnuksen käyttönsä.
+change_username_redirect_prompt = Vanha käyttäjänimi uudelleenohjaa, kunnes joku muu ottaa käyttäjänimen käyttöönsä.
 uploaded_avatar_is_too_big = Lähetetyn tiedoston koko (%d KiB) ylittää enimmäiskoon (%d KiB).
 ssh_key_been_used = Tämä SSH-avain on jo lisätty palvelimelle.
 verify_gpg_key_success = GPG-avain "%s" on vahvistettu.
@@ -977,53 +1016,76 @@ quota.applies_to_org = Seuraavia kiintiösääntöjä sovelletaan tähän organi
 quota.rule.exceeded = Ylitetty
 quota.rule.no_limit = Rajoittamaton
 quota.sizes.all = Kaikki
-quota.sizes.repos.all = Repot
-quota.sizes.repos.public = Julkiset repot
-quota.sizes.repos.private = Yksityiset repot
+quota.sizes.repos.all = Tietovarastot
+quota.sizes.repos.public = Julkiset tietovarastot
+quota.sizes.repos.private = Yksityiset tietovarastot
 quota.sizes.git.all = Git-sisältö
 quota.sizes.assets.packages.all = Paketit
 quota.sizes.wiki = Wiki
+update_hints_success = Vihjeet on päivitetty.
+twofa_scratch_token_regenerate = Luo uudelleen kertakäyttöinen palautusavain
+token_state_desc = Tätä polettia on käytetty viimeisen 7 päivän aikana
+quota.sizes.assets.artifacts = Artefaktit
+update_user_avatar_success = Käyttäjän profiilikuva on päivitetty.
+access_token_regeneration = Luo uudelleen pääsypoletti
+regenerate_token = Luo uudelleen
+keep_pronouns_private = Näytä pronominit vain tunnistautuneille käyttäjille
+keep_pronouns_private.description = Tämä piilottaa pronominisi käyttäjiltä, jotka eivät ole kirjautuneet sisään.
+comment_type_group_issue_ref = Ongelmaviittaus
+twofa_scratch_token_regenerated = Kertakäyttöinen palautusavaimesi on nyt %s. Talleta se turvalliseen sijaintiin, koska sitä ei näytetä uudelleen.
+change_username_redirect_prompt.with_cooldown.few = Vanha käyttäjänimi on kenen tahansa saatavilla %[1]d päivän suojaamisjakson jälkeen. Voit palauttaa käyttäjänimen itsellesi suojaamisjakson aikana.
+additional_repo_units_hint_description = Näytä "Ota lisää käyttöön"-vihje tietovarastoissa, missä kaikki saatavilla olevat yksiköt eivät ole käytössä.
+change_username_redirect_prompt.with_cooldown.one = Vanha käyttäjänimi on kenen tahansa saatavilla %[1]d päivän suojaamisjakson jälkeen. Voit palauttaa käyttäjänimen itsellesi suojaamisjakson aikana.
+gpg_key_matched_identities = Vastaavat identiteetit:
+delete_token_success = Pääsypoletti on poistettu. Sitä käyttävillä sovelluksilla ei ole enää pääsyä tilillesi.
+ssh_externally_managed = Tämän käyttäjän SSH-avainta hallitaan ulkoisesti
+passcode_invalid = Virheellinen pääsykoodi. Yritä uudelleen.
+then_enter_passcode = Kirjoita sovelluksessa näkyvä pääsykoodi:
+gpg_key_matched_identities_long = Tähän avaimeen upotetut identiteetit vastaavat tämän käyttäjän seuraavia aktivoituja sähköpostiosoitteita. Kommitit, jotka vastaavat näitä sähköpostiosoitteita, voidaan vahvistaa tällä avaimella.
+twofa_failed_get_secret = Salaisuuden saaminen epäonnistui.
+uid = UID
+hidden_comment_types.ref_tooltip = Kommentit missä tähän ongelmaan viitattiin toisesta ongelmasta/kommitista/…
 
 [repo]
 owner=Omistaja
-owner_helper=Jotkin organisaatiot eivät välttämättä näy pudotusvalikossa, koska repojen maksimimäärää on rajoitettu.
-repo_name=Repon nimi
-repo_name_helper=Hyvä repon nimi on lyhyt, mieleenpainuva ja yksilöllinen.
-repo_size=Repon koko
-template=Malli
-template_select=Valitse malli
-template_helper=Tee reposta mallipohja
+owner_helper=Jotkin organisaatiot eivät välttämättä näy pudotusvalikossa, koska tietovarastojen enimmäismäärää on rajoitettu.
+repo_name=Tietovaraston nimi
+repo_name_helper=Hyvä tietovaraston nimi on lyhyt, mieleenpainuva ja yksilöllinen.
+repo_size=Tietovaraston koko
+template=Mallipohja
+template_select=Valitse mallipohja
+template_helper=Tee tietovarastosta mallipohja
 visibility=Näkyvyys
 visibility_description=Vain omistaja tai organisaation jäsenet, jos heillä on oikeudet, voivat nähdä sen.
-visibility_helper_forced=Sivuston ylläpitäjä pakottaa uudet repot olemaan yksityisiä.
-fork_repo=Forkkaa repo
+visibility_helper_forced=Sivuston ylläpitäjä pakottaa uudet tietovarastot olemaan yksityisiä.
+fork_repo=Forkkaa tietovarasto
 fork_from=Forkkaa lähteestä
-fork_visibility_helper=Forkatun repon näkyvyyttä ei voi muuttaa.
+fork_visibility_helper=Forkatun tietovaraston näkyvyyttä ei voi muuttaa.
 clone_in_vsc=Kloonaa VS Codessa
 download_zip=Lataa ZIP
 download_tar=Lataa TAR.GZ
 repo_desc=Kuvaus
 repo_lang=Kieli
 repo_gitignore_helper=Valitse .gitignore-mallit
-issue_labels=Tunnisteet
-issue_labels_helper=Valitse nimiöjoukko
+issue_labels=Nimilaput
+issue_labels_helper=Valitse nimilappujoukko
 license=Lisenssi
 license_helper=Valitse lisenssitiedosto
 readme=README
-auto_init=Alusta repo
-create_repo=Luo repo
+auto_init=Alusta tietovarasto
+create_repo=Luo tietovarasto
 default_branch=Oletushaara
 mirror_prune=Karsi
 watchers=Tarkkailijat
 stargazers=Tähtiharrastajat
-forks=Haarat
+forks=Forkit
 delete_preexisting_label=Poista
 
 
 
 desc.private=Yksityinen
 desc.public=Julkinen
-desc.template=Malli
+desc.template=Mallipohja
 desc.internal=Sisäinen
 desc.archived=Arkistoidut
 
@@ -1031,41 +1093,41 @@ template.git_hooks=Git-koukut
 template.webhooks=Webkoukut
 template.topics=Aiheet
 template.avatar=Profiilikuva
-template.issue_labels=Ongelmien tunnisteet
+template.issue_labels=Ongelmanimilaput
 
 
 
-migrate_items=Siirrettävät asiat
+migrate_items=Migraation kohteet
 migrate_items_wiki=Wiki
 migrate_items_milestones=Merkkipaalut
-migrate_items_labels=Tunnisteet
+migrate_items_labels=Nimilaput
 migrate_items_issues=Ongelmat
 migrate_items_pullrequests=Vetopyynnöt
 migrate_items_releases=Julkaisut
-migrate_repo=Tee repomigraatio
+migrate_repo=Suorita tietovaraston migraatio
 migrate.clone_address=Migraatio/kloonaus URL-osoitteesta
-migrate.github_token_desc=Voit laittaa yhden tai useamman pääsymerkin pilkulla erotellen tähän nopeuttaaksesi migraatiota GitHub APIn vauhtirajojen takia. VAROITUS: Tämän ominaisuuden väärinkäyttö voi rikkoa palveluntarjoajan ehtoja ja johtaa tilin estämiseen.
-migrate.permission_denied=Sinun ei sallita tuovan paikallisia repoja.
-migrate.failed=Siirto epäonnistui: %v
-migrate.migrate_items_options=Pääsymerkki vaaditaan lisäkohteiden siirtämiseen
-migrate.migrating=Tuodaan kohteesta <b>%s</b> …
-migrate.migrating_failed=Tuonti kohteesta <b>%s</b> epäonnistui.
-migrate.migrating_git=Tuodaan Git-tietoja
+migrate.github_token_desc=Voit laittaa yhden tai useamman pääsypoletin pilkulla erotellen tähän nopeuttaaksesi migraatiota GitHubin rajapinnan tahtirajojen takia. VAROITUS: Tämän ominaisuuden väärinkäyttö voi rikkoa palveluntarjoajan ehtoja ja johtaa tilin estämiseen.
+migrate.permission_denied=Paikallisten tietovarastojen tuominen ei ole sallittua.
+migrate.failed=Migraatio epäonnistui: %v
+migrate.migrate_items_options=Lisäkohteiden migraatiota varten vaaditaan pääsypoletti
+migrate.migrating=Suoritetaan migraatio lähteestä <b>%s</b> …
+migrate.migrating_failed=Migraatio lähteestä <b>%s</b> epäonnistui.
+migrate.migrating_git=Suoritetaan Git-datan migraatiota
 
-mirror_from=peilaus alkaen
+mirror_from=peili kohteelle
 forked_from=forkattu lähteestä
 unwatch=Lopeta tarkkailu
 watch=Tarkkaile
 unstar=Poista tähti
 star=Tähti
-download_archive=Lataa repo
+download_archive=Lataa tietovarasto
 
 no_desc=Ei kuvausta
 quick_guide=Pikaopas
-clone_this_repo=Kloonaa tämä repo
+clone_this_repo=Kloonaa tämä tietovarasto
 
 code=Koodi
-code.desc=Pääsy lähdekoodiin, tiedostoihin, committeihin ja haaroihin.
+code.desc=Pääsy lähdekoodiin, tiedostoihin, kommitteihin ja haaroihin.
 branch=Haara
 tree=Puu
 filter_branch_and_tag=Suodata haara tai tagi
@@ -1075,22 +1137,22 @@ issues=Ongelmat
 pulls=Vetopyynnöt
 project_board=Projektit
 packages=Paketit
-labels=Tunnisteet
+labels=Nimilaput
 
 milestones=Merkkipaalut
-commits=Commitit
-commit=Commit
+commits=Kommitit
+commit=Kommitti
 releases=Julkaisut
 tag=Tagi
 released_this=julkaisi tämän
 file_raw=Raaka
 file_history=Historia
 file_view_raw=Näytä raaka
-file_permalink=Pysyvä linkki
+file_permalink=Pysyväislinkki
 
 video_not_supported_in_browser=Selaimesi ei tue HTML5:n video-tagia.
 audio_not_supported_in_browser=Selaimesi ei tue HTML5:n audio-tagia.
-blame=Selitys
+blame=Blame
 download_file=Lataa tiedosto
 normal_view=Normaali näkymä
 line=rivi
@@ -1104,22 +1166,22 @@ editor.edit_this_file=Muokkaa tiedostoa
 editor.this_file_locked=Tiedosto on lukittu
 editor.delete_this_file=Poista tiedosto
 editor.name_your_file=Nimeä tiedostosi…
-editor.filename_help=Lisää hakemisto kirjoittamalla sen nimi ja sen jälkeen kauttamerkki ('/'). Poista hakemisto askelpalauttimella kentän alussa.
+editor.filename_help=Lisää hakemisto kirjoittamalla sen nimi ja perään kauttaviiva ("/"). Poista hakemisto kirjoittamalla askelpalautin syöttökentän alkuun.
 editor.or=tai
-editor.cancel_lower=Peru
-editor.commit_signed_changes=Commitoi vahvistetut muutokset
+editor.cancel_lower=Peruuta
+editor.commit_signed_changes=Kommitoi allekirjoitetut muutokset
 editor.commit_changes=Kommitoi muutokset
 editor.add_tmpl=Lisää "<%s>"
-editor.commit_directly_to_this_branch=Commitoi suoraan <strong class="%[2]s">%[1]s</strong> haaraan.
-editor.create_new_branch=Luo <strong>uusi haara</strong> tälle commitille ja aloita vetopyyntö.
-editor.create_new_branch_np=Luo <strong>uusi haara</strong> tälle commitille.
+editor.commit_directly_to_this_branch=Kommitoi suoraan haaraan <strong class="%[2]s">%[1]s</strong>.
+editor.create_new_branch=Luo <strong>uusi haara</strong> tälle kommitille ja aloita vetopyyntö.
+editor.create_new_branch_np=Luo <strong>uusi haara</strong> tälle kommitille.
 editor.cancel=Peruuta
 editor.filename_cannot_be_empty=Tiedostonimi ei voi olla tyhjä.
 editor.no_changes_to_show=Ei muutoksia näytettäväksi.
 editor.add_subdir=Lisää hakemisto…
-editor.require_signed_commit=Haara vaatii vahvistetun commitin
+editor.require_signed_commit=Haara vaatii allekirjoitetun kommitin
 
-commits.commits=Commitit
+commits.commits=Kommitit
 commits.nothing_to_compare=Nämä haarat vastaavat toisiaan.
 commits.find=Haku
 commits.search_all=Kaikki haarat
@@ -1158,9 +1220,9 @@ issues.desc=Ongelmien, tehtävien ja merkkipaalujen hallinta.
 issues.filter_assignees=Suodata käyttäjiä
 issues.filter_milestones=Suodata merkkipaalu
 issues.new=Uusi ongelma
-issues.new.labels=Tunnisteet
-issues.new.no_label=Ei tunnisteita
-issues.new.clear_labels=Tyhjennä tunnisteet
+issues.new.labels=Nimilaput
+issues.new.no_label=Ei nimilappuja
+issues.new.clear_labels=Tyhjennä nimilaput
 issues.new.projects=Projektit
 issues.new.no_items=Ei kohteita
 issues.new.milestone=Merkkipaalu
@@ -1175,11 +1237,11 @@ issues.choose.open_external_link=Avaa
 issues.choose.blank=Oletus
 issues.no_ref=Haaraa/tagia ei määritelty
 issues.create=Luo ongelma
-issues.new_label=Uusi tunniste
-issues.new_label_placeholder=Tunnisteen nimi
+issues.new_label=Uusi nimilappu
+issues.new_label_placeholder=Nimilapun nimi
 issues.new_label_desc_placeholder=Kuvaus
-issues.create_label=Luo tunniste
-issues.label_templates.helper=Valitse tunnisteen esiasetus
+issues.create_label=Luo nimilappu
+issues.label_templates.helper=Valitse nimilapun esiasetus
 issues.add_milestone_at=`lisäsi tämän merkkipaaluun <b>%s</b> %s`
 issues.change_milestone_at=`vaihtoi merkkipaalun <b>%s</b> merkkipaaluun <b>%s</b> %s`
 issues.remove_milestone_at=`poisti tämän <b>%s</b> merkkipaalusta %s`
@@ -1189,12 +1251,12 @@ issues.deleted_project=`(poistettu)`
 issues.self_assign_at=`itse otti tämän käsittelyyn %s`
 issues.change_title_at=`muutti otsikon <b><strike>%s</strike></b> otsikoksi <b>%s</b> %s`
 issues.delete_branch_at=`poisti haaran <b>%s</b> %s`
-issues.filter_label=Tunniste
-issues.filter_label_exclude=`Käytä <code>alt</code> + <code>klikkaus/rivinvaihto</code> poissulkeaksesi tunnisteita`
-issues.filter_label_no_select=Kaikki tunnisteet
+issues.filter_label=Nimilappu
+issues.filter_label_exclude=`Käytä <code>alt</code> + <code>napsautus/rivinvaihto</code> poissulkeaksesi nimilappuja`
+issues.filter_label_no_select=Kaikki nimilaput
 issues.filter_milestone=Merkkipaalu
 issues.filter_project=Projekti
-issues.filter_assignee=Osoitettu
+issues.filter_assignee=Käsittelijä
 issues.filter_poster=Tekijä
 issues.filter_type=Tyyppi
 issues.filter_type.all_issues=Kaikki ongelmat
@@ -1209,15 +1271,15 @@ issues.filter_sort.recentupdate=Äskettäin päivitetty
 issues.filter_sort.leastupdate=Kauiten aikaa sitten päivitetty
 issues.filter_sort.mostcomment=Eniten kommentoidut
 issues.filter_sort.leastcomment=Vähiten kommentoidut
-issues.filter_sort.nearduedate=Lähin määräpäivä
-issues.filter_sort.farduedate=Kaukaisin määräpäivä
+issues.filter_sort.nearduedate=Lähin eräpäivä
+issues.filter_sort.farduedate=Kaukaisin eräpäivä
 issues.filter_sort.moststars=Eniten tähtiä
 issues.filter_sort.feweststars=Vähiten tähtiä
 issues.filter_sort.mostforks=Eniten forkattu
 issues.filter_sort.fewestforks=Vähiten forkattu
 issues.action_open=Avaa
 issues.action_close=Sulje
-issues.action_label=Tunniste
+issues.action_label=Nimilappu
 issues.action_milestone=Merkkipaalu
 issues.action_milestone_no_select=Ei merkkipaalua
 issues.action_assignee=Osoitettu henkilölle
@@ -1226,7 +1288,7 @@ issues.previous=Edellinen
 issues.next=Seuraava
 issues.open_title=Avoinna
 issues.closed_title=Suljettu
-issues.draft_title=Työversio
+issues.draft_title=Luonnos
 issues.num_comments=%d kommenttia
 issues.commented_at=`kommentoi <a href="#%s">%s</a>`
 issues.delete_comment_confirm=Haluatko varmasti poistaa tämän kommentin?
@@ -1239,24 +1301,24 @@ issues.close_comment_issue=Kommentoi ja sulje
 issues.reopen_issue=Avaa uudelleen
 issues.reopen_comment_issue=Kommentoi ja avaa uudelleen
 issues.create_comment=Kommentoi
-issues.closed_at=`sulki tämän ongelman <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`uudelleenavasi tämän ongelman <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`viittasi tähän ongelmaan commitissa <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`sulki tämän ongelman %s`
+issues.reopened_at=`uudelleenavasi tämän ongelman %s`
+issues.commit_ref_at=`viittasi tähän ongelmaan kommitissa %s`
 issues.author=Tekijä
 issues.role.owner=Omistaja
 issues.role.member=Jäsen
 issues.edit=Muokkaa
 issues.cancel=Peruuta
 issues.save=Tallenna
-issues.label_title=Tunnisteen nimi
+issues.label_title=Nimi
 issues.label_description=Kuvaus
-issues.label_color=Tunnisteen väri
-issues.label_count=%d tunnistetta
-issues.label_open_issues=%d avointa ongelmaa
+issues.label_color=Väri
+issues.label_count=%d nimilappua
+issues.label_open_issues=%d avointa ongelmaa/vetopyyntöä
 issues.label_edit=Muokkaa
 issues.label_delete=Poista
-issues.label_modify=Muokkaa tunnistetta
-issues.label_deletion=Poista tunniste
+issues.label_modify=Muokkaa nimilappua
+issues.label_deletion=Poista nimilappu
 issues.label.filter_sort.alphabetically=Aakkosjärjestyksessä
 issues.label.filter_sort.reverse_alphabetically=Käänteisessä aakkosjärjestyksessä
 issues.label.filter_sort.by_size=Pienin koko
@@ -1266,7 +1328,7 @@ issues.subscribe=Tilaa
 issues.unsubscribe=Lopeta tilaus
 issues.lock=Lukitse keskustelu
 issues.unlock=Avaa keskustelu
-issues.unlock_comment=aukaisi tämän keskustelun uudelleen %s
+issues.unlock_comment=avasi tämän keskustelun lukituksen %s
 issues.lock_confirm=Lukitse
 issues.unlock_confirm=Avaa
 issues.lock.notice_1=- Muut käyttäjät eivät voi lisätä uusia kommentteja tähän ongelmaan.
@@ -1291,19 +1353,19 @@ issues.add_time_hours=Tuntia
 issues.add_time_minutes=Minuuttia
 issues.add_time_sum_to_small=Aikaa ei syötetty.
 issues.time_spent_from_all_authors=`Käytetty kokonaisaika: %s`
-issues.due_date=Määräpäivä
-issues.push_commit_1=lisäsi %d commitin %s
-issues.push_commits_n=lisäsi %d committia %s
+issues.due_date=Eräpäivä
+issues.push_commit_1=lisäsi %d kommitin %s
+issues.push_commits_n=lisäsi %d kommittia %s
 issues.due_date_form=vvvv-kk-pp
 issues.due_date_form_edit=Muokkaa
 issues.due_date_form_remove=Poista
-issues.due_date_not_set=Määräpäivää ei ole asetettu.
+issues.due_date_not_set=Eräpäivää ei ole asetettu.
 issues.due_date_overdue=Myöhässä
 issues.dependency.title=Riippuvuudet
-issues.dependency.issue_no_dependencies=Riippuvuuksia ei asetettu.
-issues.dependency.pr_no_dependencies=Riippuvuuksia ei asetettu.
+issues.dependency.issue_no_dependencies=Riippuvuuksia ei ole asetettu.
+issues.dependency.pr_no_dependencies=Riippuvuuksia ei ole asetettu.
 issues.dependency.add=Lisää riippuvuus…
-issues.dependency.cancel=Peru
+issues.dependency.cancel=Peruuta
 issues.dependency.remove=Poista
 issues.dependency.remove_info=Poistä tämä riippuvuus
 issues.review.self.approval=Et voi hyväksyä omia vetopyyntöjä.
@@ -1320,11 +1382,11 @@ issues.content_history.created=luotu
 
 
 pulls.new=Uusi vetopyyntö
-pulls.compare_changes=Uusi pull-pyyntö
+pulls.compare_changes=Uusi vetopyyntö
 pulls.has_viewed_file=Katsottu
 pulls.viewed_files_label=%[1]d / %[2]d tiedostoa katsottu
 pulls.compare_compare=vedä kohteesta
-pulls.filter_branch=Suodata branch
+pulls.filter_branch=Suodata haara
 pulls.no_results=Tuloksia ei löytynyt.
 pulls.nothing_to_compare=Nämä haarat vastaavat toisiaan. Ei ole tarvetta luoda vetopyyntöä.
 pulls.nothing_to_compare_and_allow_empty_pr=Nämä haarat vastaavat toisiaan. Vetopyyntö tulee olemaan tyhjä.
@@ -1333,13 +1395,13 @@ pulls.create=Luo vetopyyntö
 pulls.title_desc_few=haluaa yhdistää %[1]d committia lähteestä <code>%[2]s</code> kohteeseen <code id="%[4]s">%[3]s</code>
 pulls.merged_title_desc_few=yhdistetty %[1]d committia lähteestä <code>%[2]s</code> kohteeseen <code>%[3]s</code> %[4]s
 pulls.tab_conversation=Keskustelu
-pulls.tab_commits=Commitit
+pulls.tab_commits=Kommitit
 pulls.tab_files=Muuttuneet tiedostot
 pulls.merged=Yhdistetty
 pulls.title_wip_desc=`<a href="#">Aloita otsikko sanalla <strong>%s</strong></a> estääksesi vetopyynnön yhdistämisen vahingossa.`
-pulls.add_prefix=Lisää <strong>%s</strong> etuliite
-pulls.remove_prefix=Poista <strong>%s</strong> etuliite
-pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
+pulls.add_prefix=Lisää etuliite <strong>%s</strong>
+pulls.remove_prefix=Poista etuliite <strong>%s</strong>
+pulls.can_auto_merge_desc=Tämä vetopyyntö voidaan yhdistää automaattisesti.
 
 
 
@@ -1351,13 +1413,13 @@ pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti
 
 milestones.new=Uusi merkkipaalu
 milestones.closed=Suljettu %s
-milestones.no_due_date=Ei määräpäivää
+milestones.no_due_date=Ei eräpäivää
 milestones.open=Avaa uudelleen
 milestones.close=Sulje
 milestones.create=Luo merkkipaalu
 milestones.title=Otsikko
 milestones.desc=Kuvaus
-milestones.due_date=Määräpäivä (valinnainen)
+milestones.due_date=Eräpäivä (valinnainen)
 milestones.clear=Tyhjennä
 milestones.edit=Muokkaa merkkipaalua
 milestones.cancel=Peruuta
@@ -1368,11 +1430,11 @@ milestones.filter_sort.least_issues=Vähiten ongelmia
 
 
 wiki=Wiki
-wiki.welcome=Tervetuloa Wikiin.
+wiki.welcome=Tervetuloa wikiin.
 wiki.welcome_desc=Wikissä voit kirjoittaa ja jakaa dokumentaatiota käyttäjien kesken.
 wiki.create_first_page=Luo ensimmäinen sivu
 wiki.page=Sivu
-wiki.filter_page=Suodatin sivu
+wiki.filter_page=Suodata sivu
 wiki.new_page=Sivu
 wiki.default_commit_message=Kirjoita muistiinpano tästä päivityksestä (valinnainen).
 wiki.save_page=Tallenna sivu
@@ -1401,7 +1463,7 @@ activity.active_issues_count_1=<strong>%d</strong> aktiivinen ongelma
 activity.active_issues_count_n=<strong>%d</strong> aktiivista ongelmaa
 activity.closed_issues_count_1=suljettu ongelma
 activity.closed_issues_count_n=suljettua ongelmaa
-activity.title.issues_created_by=%s luonnut %s
+activity.title.issues_created_by=%s luonut %s
 activity.closed_issue_label=Suljettu
 activity.new_issues_count_1=Uusi ongelma
 activity.new_issues_count_n=uutta ongelmaa
@@ -1424,7 +1486,7 @@ search.match=Osuma
 search.code_no_results=Hakuehtoasi vastaavaa lähdekoodia ei löytynyt.
 
 settings=Asetukset
-settings.options=Repo
+settings.options=Tietovarasto
 settings.collaboration.admin=Ylläpitäjä
 settings.collaboration.write=Kirjoita
 settings.collaboration.read=Lue
@@ -1435,31 +1497,31 @@ settings.githooks=Git-koukut
 settings.basic_settings=Perusasetukset
 settings.mirror_settings=Peilauksen asetukset
 
-settings.site=Nettisivu
+settings.site=Verkkosivusto
 settings.update_settings=Tallenna asetukset
 settings.advanced_settings=Lisäasetukset
 settings.use_internal_wiki=Käytä sisäänrakennettua wikiä
 settings.use_external_wiki=Käytä ulkoista wikiä
 settings.external_wiki_url=Ulkoisen wikin URL-osoite
-settings.external_wiki_url_desc=Wiki-välilehden klikkaus ohjaa vierailijat ulkoisen wiki-URL-osoitteeseen.
-settings.tracker_url_format=Ulkoisen vikaseurannan URL muoto
+settings.external_wiki_url_desc=Wiki-välilehden napsauttaminen ohjaa vierailijat ulkoiseen wiki-URL-osoitteeseen.
+settings.tracker_url_format=Ulkoisen ongelmanseurannan URL-muoto
 settings.tracker_issue_style.numeric=Numeerinen
 settings.tracker_issue_style.alphanumeric=Aakkosnumeerinen
-settings.enable_timetracker=Käytä ajan seurantaa
+settings.enable_timetracker=Ota ajanseuranta käyttöön
 settings.danger_zone=Vaaravyöhyke
-settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen repo. Ole hyvä ja valitse toinen nimi.
+settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen tietovarasto. Valitse toinen nimi.
 settings.transfer.title=Siirrä omistajuus
 settings.transfer_form_title=Syötä repon nimi vahvistuksena:
-settings.transfer_notices_3=- Jos arkisto on yksityinen ja se siirretään yksittäiselle käyttäjälle, tämä toiminto varmistaa, että käyttäjällä on ainakin lukuoikeudet (ja muuttaa käyttöoikeuksia tarvittaessa).
+settings.transfer_notices_3=- Jos tietovarasto on yksityinen ja se siirretään yksittäiselle käyttäjälle, tämä toiminto varmistaa, että käyttäjällä on ainakin lukuoikeudet (ja muuttaa käyttöoikeuksia tarvittaessa).
 settings.transfer_owner=Uusi omistaja
 settings.wiki_delete=Poista wikidata
-settings.wiki_delete_desc=Repon wikin data poistaminen on pysyvä eikä voi peruuttaa.
+settings.wiki_delete_desc=Tietovaraston wikin data poistaminen on pysyvä, eikä sitä voi perua.
 settings.confirm_wiki_delete=Poista wikidata
-settings.wiki_deletion_success=Repon wiki data on poistettu.
-settings.delete=Poista tämä repo
-settings.delete_desc=Repon poistaminen on pysyvä eikä voi peruuttaa.
-settings.delete_notices_1=- Tätä toimintoa <strong>EI VOI</strong> peruuttaa myöhemmin.
-settings.update_settings_success=Repon asetukset on päivitetty.
+settings.wiki_deletion_success=Tietovaraston wikidata on poistettu.
+settings.delete=Poista tämä tietovarasto
+settings.delete_desc=Tietovaraston poistaminen on pysyvä, eikä sitä voi perua.
+settings.delete_notices_1=- Tätä toimintoa <strong>EI VOI</strong> perua myöhemmin.
+settings.update_settings_success=Tietovaraston asetukset on päivitetty.
 settings.delete_collaborator=Poista
 settings.search_user_placeholder=Etsi käyttäjä…
 settings.teams=Tiimit
@@ -1469,51 +1531,51 @@ settings.webhook_deletion=Poista webkoukku
 settings.webhook.test_delivery=Testitoimitus
 settings.webhook.request=Pyyntö
 settings.webhook.response=Vastaus
-settings.webhook.headers=Otsikot
+settings.webhook.headers=Otsakkeet
 settings.webhook.payload=Sisältö
 settings.webhook.body=Sisältö
 settings.githook_edit_desc=Jos koukku ei ole käytössä, esitellään esimerkkisisältö. Sisällön jättäminen tyhjäksi arvoksi poistaa tämän koukun käytöstä.
 settings.githook_name=Koukun nimi
 settings.githook_content=Koukun sisältö
 settings.update_githook=Päivitä koukku
-settings.payload_url=Kohde URL
+settings.payload_url=Kohde-URL
 settings.http_method=HTTP-menetelmä
-settings.secret=Salaus
-settings.slack_username=Käyttäjätunnus
-settings.slack_icon_url=Kuvakkeen URL
-settings.discord_username=Käyttäjätunnus
-settings.event_desc=Triggeröi:
+settings.secret=Salaisuus
+settings.slack_username=Käyttäjänimi
+settings.slack_icon_url=Kuvakkeen URL-osoite
+settings.discord_username=Käyttäjänimi
+settings.event_desc=Laukaisu päällä:
 settings.event_send_everything=Kaikki tapahtumat
 settings.event_choose=Mukautetut tapahtumat…
-settings.event_header_repository=Repon tapahtumat
+settings.event_header_repository=Tietovaraston tapahtumat
 settings.event_create=Luo
 settings.event_create_desc=Haara tai tagi luotu.
 settings.event_delete=Poista
 settings.event_delete_desc=Haara tai tagi poistettu.
 settings.event_wiki=Wiki
-settings.event_release_desc=Julkaisu julkaistu, päivitetty tai poistettu varastosta.
+settings.event_release_desc=Julkaisu julkaistu, päivitetty tai poistettu tietovarastosta.
 settings.event_push=Työnnä
-settings.event_push_desc=Git push repoon.
-settings.event_repository=Repo
-settings.event_repository_desc=Repo luotu tai poistettu.
+settings.event_push_desc=Git-työntö tietovarastoon.
+settings.event_repository=Tietovarasto
+settings.event_repository_desc=Tietovarasto luotu tai poistettu.
 settings.event_header_issue=Ongelmien tapahtumat
 settings.event_issues=Muokkaus
 settings.event_issues_desc=Ongelma avattu, suljettu, avattu uudelleen tai muokattu.
-settings.event_issue_assign=Ongelma määritetty
+settings.event_issue_assign=Toimeksianto
 settings.event_issue_assign_desc=Ongelma osoitettu tai osoitus poistettu.
-settings.event_issue_label_desc=Ongelman tunnisteet päivitetty tai tyhjennetty.
+settings.event_issue_label_desc=Ongelmanimilaput lisätty tai poistettu.
 settings.event_issue_milestone_desc=Merkkipaalu lisätty, poistettu tai muokattu.
 settings.event_issue_comment_desc=Ongelman kommentti luotu, muokattu tai poistettu.
 settings.event_header_pull_request=Vetopyyntöjen tapahtumat
 settings.event_pull_request=Muokkaus
-settings.event_package_desc=Paketti on luotu tai poistettu repossa.
+settings.event_package_desc=Paketti on luotu tai poistettu tietovarastossa.
 settings.active_helper=Tiedot käynnistetyistä tapahtumista lähetetään tähän webkoukun URL-osoitteeseen.
 settings.add_hook_success=Uusi webkoukku on lisätty.
 settings.update_webhook=Päivitä webkoukku
 settings.delete_webhook=Poista webkoukku
 settings.recent_deliveries=Viimeisimmät toimitukset
 settings.hook_type=Koukun tyyppi
-settings.slack_token=Pääsymerkki
+settings.slack_token=Poletti
 settings.slack_domain=Verkkotunnus
 settings.slack_channel=Kanava
 settings.add_web_hook_desc=Integroi <a target="_blank" rel="noreferrer" href="%s">%s</a> repoon.
@@ -1528,55 +1590,55 @@ settings.web_hook_name_matrix=Matrix
 settings.web_hook_name_feishu_only =Feishu
 settings.web_hook_name_larksuite_only =Lark Suite
 settings.web_hook_name_packagist=Packagist
-settings.deploy_keys=Julkaisuavaimet
-settings.add_deploy_key=Lisää julkaisuavain
-settings.deploy_key_desc=Julkaisuavaimilla on vain-luku oikeudet repoon.
-settings.is_writable_info=Salli tämän julkaisuavaimen <strong>puskea</strong> repoon.
-settings.no_deploy_keys=Julkaisuavaimia ei ole käytössä vielä.
+settings.deploy_keys=Toimitusavaimet
+settings.add_deploy_key=Lisää toimitusavain
+settings.deploy_key_desc=Toimitusavaimilla on pelkkä lukuoikeus tietovarastoon.
+settings.is_writable_info=Salli tämän toimitusavaimen <strong>työntää</strong> tietovarastoon.
+settings.no_deploy_keys=Toimitusavaimia ei ole käytössä vielä.
 settings.title=Otsikko
 settings.deploy_key_content=Sisältö
-settings.key_been_used=Julkaisuavain identtisellä sisällöllä on jo käytössä.
-settings.key_name_used=Julkaisuavain samalla nimellä on jo olemassa.
-settings.deploy_key_deletion=Poista julkaisuavain
-settings.deploy_key_deletion_desc=Julkaisuavaimen poistaminen kumoaa sen pääsyn tähän repoon. Jatketaanko?
-settings.deploy_key_deletion_success=Julkaisuavain on poistettu.
+settings.key_been_used=Toimitusavain identtisellä sisällöllä on jo käytössä.
+settings.key_name_used=Toimitusavain samalla nimellä on jo olemassa.
+settings.deploy_key_deletion=Poista toimitusavain
+settings.deploy_key_deletion_desc=Toimitusavaimen poistaminen kumoaa sen pääsyn tähän tietovarastoon. Jatketaanko?
+settings.deploy_key_deletion_success=Toimitusavain on poistettu.
 settings.branches=Haarat
 settings.protected_branch=Haaran suojaus
 settings.branch_protection=Haaran "<b>%s</b>" suojaussäännöt
 settings.protect_this_branch=Ota haaran suojaus käyttöön
-settings.protect_whitelist_deploy_keys=Lisää julkaisuavaimet sallittujen listalle mahdollistaaksesi repohin kirjoituksen.
-settings.protect_whitelist_users=Sallitut käyttäjät suhteessa työntämiseen
+settings.protect_whitelist_deploy_keys=Lisää toimitusavaimet sallittujen listalle mahdollistaaksesi tietovarastoihin kirjoituksen.
+settings.protect_whitelist_users=Työntämiseen oikeutettujen käyttäjien lista
 settings.protect_whitelist_search_users=Etsi käyttäjiä…
 settings.protect_merge_whitelist_committers_desc=Salli vain listaan merkittyjen käyttäjien ja tiimien yhdistää vetopyynnöt tähän haaraan.
-settings.protect_merge_whitelist_users=Sallitut käyttäjät suhteessa yhdistämiseen
+settings.protect_merge_whitelist_users=Yhdistämiseen oikeutettujen käyttäjien lista
 settings.protect_required_approvals=Vaadittavat hyväksynnät
-settings.protect_approvals_whitelist_users=Sallittujen tarkastajien lista
+settings.protect_approvals_whitelist_users=Sallittujen katselmoijien lista
 settings.choose_branch=Valitse haara…
 settings.no_protected_branch=Suojattuja haaroja ei ole.
 settings.edit_protected_branch=Muokkaa
-settings.protected_branch_required_approvals_min=Vaadittavat hyväksynnät ei voi olla negatiivinen.
+settings.protected_branch_required_approvals_min=Vaadittavat hyväksynnät eivät voi olla negatiivisia.
 settings.tags=Tagit
-settings.tags.protection=Tagien suojaaminen
-settings.tags.protection.pattern=Tagin kuvio
+settings.tags.protection=Tagien suojaus
+settings.tags.protection.pattern=Tagin kaava
 settings.tags.protection.allowed=Sallitut
 settings.tags.protection.allowed.users=Sallitut käyttäjät
 settings.tags.protection.allowed.teams=Sallitut tiimit
 settings.tags.protection.allowed.noone=Ei kukaan
 settings.tags.protection.create=Lisää sääntö
 settings.tags.protection.none=Suojattuja tageja ei ole.
-settings.bot_token=Botti pääsymerkki
+settings.bot_token=Botti-poletti
 settings.matrix.homeserver_url=Kotipalvelimen URL
-settings.archive.button=Arkistoi repo
-settings.archive.header=Arkistoi tämä repo
-settings.archive.tagsettings_unavailable=Tagien asetukset eivät ole saatavilla, jos repo on arkistoitu.
+settings.archive.button=Arkistoi tietovarasto
+settings.archive.header=Arkistoi tämä tietovarasto
+settings.archive.tagsettings_unavailable=Tagi-asetukset eivät ole käytettävissä arkistoiduissa tietovarastoissa.
 settings.lfs=LFS
-settings.lfs_filelist=LFS-tiedostot tallennettu tähän repoon
-settings.lfs_no_lfs_files=LFS-tiedostoja ei ole tallennettu tähän repoon.
-settings.lfs_findcommits=Etsi commitit
-settings.lfs_lfs_file_no_commits=LFS-tiedostolle ei löytynyt kommitteja
+settings.lfs_filelist=Tähän tietovarastoon tallennetut LFS-tiedostot
+settings.lfs_no_lfs_files=LFS-tiedostoja ei ole tallennettu tähän tietovarastoon.
+settings.lfs_findcommits=Etsi kommitteja
+settings.lfs_lfs_file_no_commits=Tälle LFS-tiedostolle ei löytynyt kommitteja
 settings.lfs_noattribute=Tällä polulla ei ole lukittavaa attribuuttia oletushaarassa
 settings.lfs_delete=Poista LFS-tiedosto OID:lla %s
-settings.lfs_delete_warning=LFS-tiedoston poistaminen voi aiheuttaa 'object does not exists'-virheitä checkouttattaessa. Oletko varma?
+settings.lfs_delete_warning=LFS-tiedoston poistaminen saattaa aiheuttaa "objektia ei ole olemassa"-virheitä uloskuittauksessa. Oletko varma?
 settings.lfs_findpointerfiles=Etsi osoitintiedostoja
 settings.lfs_locks=Lukot
 settings.lfs_invalid_locking_path=Virheellinen polku: %s
@@ -1586,17 +1648,17 @@ settings.lfs_lock_path=Lukittavan tiedostopolku…
 settings.lfs_locks_no_locks=Ei lukkoja
 settings.lfs_lock_file_no_exist=Lukittua tiedostoa ei ole olemassa oletushaarassa
 settings.lfs_force_unlock=Pakota lukituksen avaus
-settings.lfs_pointers.found=Löytyi %d blob osoitinta - %d yhdistettyö, %d yhdistämätöntä (%d puuttuu varastosta)
-settings.lfs_pointers.sha=Blob SHA
+settings.lfs_pointers.found=Löytyi %d blob-osoitinta - %d assosioitu, %d assosioitumaton (%d puuttuu varastosta)
+settings.lfs_pointers.sha=Blob-tiiviste
 settings.lfs_pointers.oid=OID
-settings.lfs_pointers.inRepo=Repossa
+settings.lfs_pointers.inRepo=Tietovarastossa
 settings.lfs_pointers.exists=Löytyy varastosta
 settings.lfs_pointers.accessible=Saatavilla käyttäjälle
 
 diff.browse_source=Selaa lähdekoodia
 diff.parent=vanhempi
-diff.commit=commit
-diff.git-notes=Muistiinpanot
+diff.commit=kommitti
+diff.git-notes=Huomautukset
 diff.options_button=Vertailun asetukset
 diff.show_split_view=Jaettu näkymä
 diff.show_unified_view=Yhdistetty näkymä
@@ -1605,7 +1667,7 @@ diff.whitespace_show_everything=Näytä kaikki muutokset
 diff.whitespace_ignore_all_whitespace=Ohita tyhjämerkit rivejä verratessa
 diff.whitespace_ignore_amount_changes=Ohita tyhjämerkin määrän muutokset
 diff.whitespace_ignore_at_eol=Ohita muutokset rivin lopun tyhjämerkeissä
-diff.stats_desc=<strong>%d muutettua tiedostoa</strong> jossa <strong>%d lisäystä</strong> ja <strong>%d poistoa</strong>
+diff.stats_desc=<strong>%d muutettua tiedostoa</strong> joissa <strong>%d lisäystä</strong> ja <strong>%d poistoa</strong>
 diff.bin=BIN
 diff.view_file=Näytä tiedosto
 diff.file_image_width=Leveys
@@ -1614,7 +1676,7 @@ diff.file_byte_size=Koko
 diff.comment.markdown_info=Muotoilu Markdownilla on tuettu.
 diff.comment.add_single_comment=Lisää yksittäinen kommentti
 diff.comment.add_review_comment=Lisää kommentti
-diff.comment.start_review=Aloita tarkistus
+diff.comment.start_review=Aloita katselmointi
 diff.comment.reply=Vastaa
 diff.review.header=Lähetä katselmointi
 diff.review.placeholder=Katselmoinnin kommentti
@@ -1625,14 +1687,14 @@ diff.review.reject=Pyydä muutoksia
 release.releases=Julkaisut
 release.tags=Tagit
 release.new_release=Uusi julkaisu
-release.draft=Työversio
+release.draft=Luonnos
 release.prerelease=Esijulkaisu
 release.stable=Vakaa
 release.edit=Muokkaa
 release.source_code=Lähdekoodi
 release.new_subheader=Julkaisut organisoivat projektien versioita.
 release.edit_subheader=Julkaisut organisoivat projektien versioita.
-release.tag_name=Taginimi
+release.tag_name=Tagin nimi
 release.target=Kohde
 release.tag_helper=Valitse olemassa oleva tagi tai luo uusi tagi.
 release.prerelease_desc=Merkitse esijulkaisuksi
@@ -1644,7 +1706,7 @@ release.edit_release=Päivitä julkaisu
 release.delete_release=Poista julkaisu
 release.delete_tag=Poista tagi
 release.deletion=Poista julkaisu
-release.deletion_tag_desc=Poistetaanko tämä tagi reposta? Repon sisältö ja historia pysyvät muuttumattomina. Jatketaanko?
+release.deletion_tag_desc=Poistetaan tämä tagi tietovarastosta. Tietovaraston sisältö ja historia pysyvät muuttumattomina. Jatketaanko?
 release.deletion_tag_success=Tagi on poistettu.
 release.tag_name_invalid=Tagin nimi ei ole kelvollinen.
 release.downloads=Lataukset
@@ -1663,10 +1725,10 @@ release.compare = Vertaa
 release.ahead.commits = <strong>%d</strong> kommittia
 all_branches = Kaikki haarat
 n_tag_few = %s tagia
-settings.event_fork_desc = Repo forkattu.
-actions = Actions
-fork_guest_user = Kirjaudu sisään forkataksesi tämän repon.
-fork_from_self = Et voi forkata omistamaasi repoa.
+settings.event_fork_desc = Tietovarasto forkattu.
+actions = Toiminnat
+fork_guest_user = Kirjaudu sisään forkataksesi tämän tietovaraston.
+fork_from_self = Et voi forkata omistamaasi tietovarastoa.
 visibility_fork_helper = (Tämän muuttaminen vaikuttaa kaikkien forkkien näkyvyyteen.)
 fork = Forkkaa
 activity.git_stats_commit_n = %d kommittia
@@ -1674,7 +1736,7 @@ commits.search_branch = Tämä haara
 n_branch_few = %s haaraa
 pulls.show_all_commits = Näytä kaikki kommitit
 commit_graph.select = Valitse haarat
-activity.navbar.recent_commits = Viimeisimmät kommitit
+activity.navbar.recent_commits = Viimeaikaiset kommitit
 settings.branches.add_new_rule = Lisää uusi sääntö
 n_commit_few = %s kommittia
 issues.force_push_compare = Vertaa
@@ -1699,9 +1761,9 @@ issues.num_comments_1 = %d kommentti
 activity.title.issues_n = %d ongelmaa
 release.detail = Julkaisun tiedot
 diff.hide_file_tree = Piilota tiedostopuu
-issues.role.owner_helper = Tämä käyttäjä on tämän repositorion omistaja.
+issues.role.owner_helper = Tämä käyttäjä on tämän tietovaraston omistaja.
 issues.all_title = Kaikki
-issues.label_archived_filter = Näytä arkistoidut tunnisteet
+issues.label_archived_filter = Näytä arkistoidut nimilaput
 pulls.close = Sulje vetopyyntö
 branch.already_exists = Haara nimellä "%s" on jo olemassa.
 diff.show_file_tree = Näytä tiedostopuu
@@ -1716,7 +1778,7 @@ diff.show_more = Näytä enemmän
 release.deletion_success = Tämä julkaisu on poistettu.
 issues.filter_milestone_closed = Suljetut merkkipaalut
 file_copy_permalink = Kopioi pysyväislinkki
-empty_message = Tässä repossa ei ole sisältöä.
+empty_message = Tämä tietovarasto ei sisällä mitään sisältöä.
 activity.git_stats_files_changed_n = on muutettu
 settings.event_pull_request_milestone_desc = Merkkipaalu lisätty, poistettu tai muokattu.
 settings.event_pull_request_comment = Kommentit
@@ -1724,10 +1786,10 @@ settings.event_issue_comment = Kommentit
 diff.download_patch = Lataa patch-tiedosto
 issues.filter_milestone_none = Ei merkkipaaluja
 issues.filter_milestone_open = Avoimet merkkipaalut
-new_repo_helper = Tietovarasto sisältää kaikki projektitiedostot, mukaan lukien tarkistushistoria. Järjestätkö jo sellaisen muualla? <a href="%s">Siirrä tietovarasto</a>.
+new_repo_helper = Tietovarasto sisältää kaikki projektitiedostot, mukaan lukien versiohistorian. Onko sinulla tietovarasto jo muualla? <a href="%s">Siirrä tietovarasto</a>.
 use_template = Käytä tätä mallipohjaa
-star_guest_user = Kirjaudu sisään lisätäksesi tähden tähän repoon.
-watch_guest_user = Kirjaudu sisään tarkkaillaksesi tätä repoa.
+star_guest_user = Kirjaudu sisään lisätäksesi tähden tähän tietovarastoon.
+watch_guest_user = Kirjaudu sisään tarkkaillaksesi tätä tietovarastoa.
 activity.git_stats_author_n = %d tekijää
 issues.dependency.add_error_dep_exists = Riippuvuus on jo olemassa.
 wiki.page_content = Sivun sisältö
@@ -1750,12 +1812,12 @@ milestones.deletion_success = Merkkipaalu on poistettu.
 project = Projektit
 pulls.delete.title = Poistetaanko tämä vetopyyntö?
 activity.title.issues_1 = %d ongelma
-contributors.contribution_type.filter_label = Avustuksen tyyppi:
+contributors.contribution_type.filter_label = Kontribuution tyyppi:
 settings.protected_branch.delete_rule = Poista sääntö
-settings.archive.success = Repo arkistoitiin onnistuneesti.
+settings.archive.success = Tietovarasto arkistoitiin onnistuneesti.
 diff.comment.placeholder = Jätä kommentti
 release.message = Kuvaile tätä julkaisua
-branch.delete_desc = Haaran poistaminen on pysyvä toimenpide. Vaikka poistettu haara voi jäädä olemaan lyhyeksi ajaksi, ennen kuin todellisesti poistetaan, poistoa EI VOI perua useimmiten. Jatketaanko?
+branch.delete_desc = Haaran poistaminen on pysyvä toimenpide. Vaikka poistettu haara voi jäädä olemaan lyhyeksi ajaksi, ennen kuin se todellisesti poistetaan, poistoa EI VOI perua useimmiten. Jatketaanko?
 branch.protected_deletion_failed = Haara "%s" on suojattu. Sitä ei voi poistaa.
 open_with_editor = Avaa sovelluksella %s
 download_bundle = Lataa BUNDLE
@@ -1768,15 +1830,15 @@ diff.download_diff = Lataa diff-tiedosto
 settings.event_package = Paketti
 issues.new.closed_projects = Suljetut projektit
 settings.event_issue_milestone = Merkkipaalut
-branch.branch_already_exists = Haara "%s" on jo olemassa repossa.
+branch.branch_already_exists = Haara "%s" on jo olemassa tässä tietovarastossa.
 projects.card_type.images_and_text = Kuvat ja teksti
-default_branch_helper = Oletusarvoinen haara on oletushaara vetopyynnöille ja koodikommiteille.
+default_branch_helper = Oletushaara on kantahaara vetopyyntöjä ja koodikommitteja varten.
 author_search_tooltip = Näyttää enintään 30 käyttäjää
-migrate_options_mirror_helper = Tästä reposta tulee peili
+migrate_options_mirror_helper = Tästä tietovarastosta tulee peili
 commit_graph.color = Väri
 commit_graph.hide_pr_refs = Piilota vetopyynnöt
 executable_file = Suoritettava tiedosto
-editor.file_already_exists = Tiedosto nimeltä "%s" on jo olemassa tässä repossa.
+editor.file_already_exists = Tiedosto nimeltä "%s" on jo olemassa tässä tietovarastossa.
 branch.restore = Palauta haara "%s"
 branch.default_deletion_failed = Haara "%s" on oletushaara. Sitä ei voi poistaa.
 branch.new_branch = Luo uusi haara
@@ -1789,7 +1851,7 @@ issues.dependency.pr_remove_text = Riippuvuus poistetaan tästä vetopyynnöstä
 release.download_count_few = %s latausta
 diff.data_not_available = Diff-sisältö ei ole saatavilla
 diff.image.side_by_side = Rinnakkain
-release.ahead.target = projektiin %s tämän julkaisun jälkeen
+release.ahead.target = haaraan %s tämän julkaisun jälkeen
 issues.close = Sulje ongelma
 issues.no_content = Ei kuvausta.
 pulls.reject_count_1 = %d muutospyyntö
@@ -1803,10 +1865,10 @@ find_file.no_matching = Vastaavaa tiedostoa ei löytynyt
 editor.file_delete_success = Tiedosto "%s" on poistettu.
 settings.transfer.button = Siirrä omistajuus
 settings.slack_color = Väri
-release.tag_name_already_exist = Julkaisu tällä taginimellä on jo olemassa.
+release.tag_name_already_exist = Julkaisu tällä tagin nimellä on jo olemassa.
 pulls.allow_edits_from_maintainers_err = Päivittäminen epäonnistui
 stars = Tähdet
-editor.branch_already_exists = Haara "%s" on jo olemassa tässä repossa.
+editor.branch_already_exists = Haara "%s" on jo olemassa tässä tietovarastossa.
 projects.column.delete = Poista sarake
 projects.column.color = Väri
 settings.admin_settings = Ylläpitäjän asetukset
@@ -1815,17 +1877,17 @@ readme_helper = Valitse README-tiedoston mallipohja
 settings.default_merge_style_desc = Oletusarvoinen yhdistämistyyli
 wiki.back_to_wiki = Takaisin wikisivulle
 wiki.delete_page_notice_1 = Wikisivun "%s" poistamista ei voi perua. Jatketaanko?
-activity.merged_prs_count_1 = yhdistetty vetopyyntö
-activity.merged_prs_count_n = yhdistettyä vetopyyntöä
-activity.opened_prs_count_1 = ehdotettu vetopyyntö
-activity.opened_prs_count_n = ehdotettua vetopyyntöä
+activity.merged_prs_count_1 = Yhdistetty vetopyyntö
+activity.merged_prs_count_n = Yhdistettyä vetopyyntöä
+activity.opened_prs_count_1 = Ehdotettu vetopyyntö
+activity.opened_prs_count_n = Ehdotettua vetopyyntöä
 activity.title.user_1 = %d käyttäjä
 activity.title.prs_n = %d vetopyyntöä
 settings.sourcehut_builds.secrets = Salaisuudet
 commit_graph = Kommittikaavio
-visibility_helper = Tee reposta yksityinen
+visibility_helper = Tee tietovarastosta yksityinen
 pulls.approve_count_1 = %d hyväksyntä
-settings.confirm_delete = Poista repositorio
+settings.confirm_delete = Poista tietovarasto
 milestones.new_subheader = Merkkipaalut auttavat hallinnoimaan ongelmia ja seuraamaan niiden korjausten edistymistä.
 activity.title.user_n = %d käyttäjää
 activity.title.prs_1 = %d vetopyyntö
@@ -1834,7 +1896,7 @@ activity.navbar.pulse = Pulssi
 wiki.no_search_results = Ei tuloksia
 settings.federation_settings = Federaation asetukset
 pull.deleted_branch = (poistettu):%s
-settings.transfer.rejected = Repositorion siirto hylättiin.
+settings.transfer.rejected = Tietovaraston siirto hylättiin.
 settings.transfer.modal.title = Siirrä omistajuus
 settings.event_pull_request_sync = Synkronoitu
 editor.commit_empty_file_text = Tiedosto, jonka olet aikeissa kommitoida, on tyhjä. Jatketaanko?
@@ -1854,7 +1916,7 @@ pulls.expand_files = Laajenna kaikki tiedostot
 issues.content_history.delete_from_history = Poista historiasta
 milestones.filter_sort.name = Nimi
 issues.filter_milestone_all = Kaikki merkkipaalut
-issues.filter_label_select_no_label = Ei tunnistetta
+issues.filter_label_select_no_label = Ei nimilappua
 projects.column.set_default = Aseta oletukseksi
 projects.edit_success = Projekti "%s" on päivitetty.
 desc.sha256 = SHA256
@@ -1863,7 +1925,7 @@ transfer.accept = Hyväksy siirto
 transfer.reject = Hylkää siirto
 default_branch_label = oletus
 repo_desc_helper = Kirjoita lyhyt kuvaus (valinnainen)
-create_new_repo_command = Uuden repon luominen komentoriviltä
+create_new_repo_command = Uuden tietovaraston luominen komentoriviltä
 subscribe.issue.guest.tooltip = Kirjaudu sisään tilataksesi tämän ongelman päivitykset.
 subscribe.pull.guest.tooltip = Kirjaudu sisään tilataksesi tämän vetopyynnön päivitykset.
 migrate.migrating_failed_no_addr = Migraatio epäonnistui.
@@ -1872,7 +1934,7 @@ migrate_options = Migraatioasetukset
 projects.create_success = Projekti "%s" on luotu.
 projects.description = Kuvaus (valinnainen)
 editor.commit_empty_file_header = Kommitoi tyhjä tiedosto
-editor.branch_does_not_exist = Haaraa "%s" ei ole olemassa repossa.
+editor.branch_does_not_exist = Haaraa "%s" ei ole olemassa tässä tietovarastossa.
 editor.delete = Poista %s
 editor.patching = Paikkaus:
 editor.patch = Toteuta paikkaus
@@ -1896,10 +1958,10 @@ milestones.filter_sort.least_complete = Vähiten valmis
 milestones.filter_sort.most_complete = Eniten valmis
 activity.title.releases_1 = %d julkaisu
 settings.branches.update_default_branch = Päivitä oletushaara
-settings.transfer.success = Repositorion siirto onnistui.
+settings.transfer.success = Tietovaraston siirto onnistui.
 settings.transfer_abort = Peru siirto
 settings.sync_mirror = Synkronoi nyt
-settings.mirror_settings.docs.doc_link_title = Miten peilaan repoja?
+settings.mirror_settings.docs.doc_link_title = Kuinka peilaan tietovarastoja?
 tag.create_tag_operation = Luo tagi
 branch.rename = Nimeä haara "%s" uudelleen
 branch.download = Lataa haara "%s"
@@ -1924,9 +1986,9 @@ issues.delete.title = Poistetaanko tämä ongelma?
 migrate.github.description = Tee migraatio github.comista tai GitHub Enterprise -palvelimelta.
 settings.merge_style_desc = Yhdistämistyylit
 settings.protected_branch_deletion = Poista haaran suojaus
-settings.deletion_success = Repositorio on poistettu.
+settings.deletion_success = Tietovarasto on poistettu.
 editor.filename_is_invalid = Tiedoston nimi on virheellinen: "%s".
-push_exist_repo = Olemassa olevan repon työntäminen komentoriviltä
+push_exist_repo = Olemassa olevan tietovaraston työntäminen komentoriviltä
 issues.new.title_empty = Otsikko ei voi olla tyhjä
 settings.transfer_perform = Suorita siirto
 activity.git_stats_pushed_n = on työntänyt
@@ -1939,13 +2001,13 @@ stored_lfs = Talletettu Git LFS:llä
 activity.git_stats_author_1 = %d tekijä
 issues.choose.blank_about = Luo ongelma oletusarvoisesta mallipohjasta.
 pulls.made_using_agit = AGit
-editor.cannot_edit_lfs_files = LFS-tiedostoja ei voi muokata web-käyttöliittymässä.
+editor.cannot_edit_lfs_files = LFS-tiedostoja ei voi muokata selainkäyttöliittymässä.
 pulls.cmd_instruction_hint = Näytä komentoriviohjeet
 settings.wiki_globally_editable = Salli kenen tahansa muokata wikiä
 pulls.rebase_conflict_summary = Virheviesti
 wiki.search = Etsi wikistä
 activity.commit = Kommittitoiminta
-editor.cannot_edit_non_text_files = Binääritiedostoja ei voi muokata web-käyttöliittymässä.
+editor.cannot_edit_non_text_files = Binääritiedostoja ei voi muokata selainkäyttöliittymässä.
 projects.template.desc_helper = Valitse projektin mallipohja aloittaaksesi
 commit.contained_in_default_branch = Tämä kommitti on osa oletushaaraa
 activity.git_stats_exclude_merges = Poissulkien yhdistämiset
@@ -1954,7 +2016,7 @@ activity.git_stats_commit_1 = %d kommitin
 activity.git_stats_push_to_all_branches = kaikkiin haaroihin.
 settings.graphql_url = GraphQL:n URL-osoite
 branch.create_new_branch = Luo haara haarasta:
-settings.archive.error_ismirror = Et voi arkistoida peilattua repoa.
+settings.archive.error_ismirror = Et voi arkistoida peilattua tietovarastoa.
 branch.warning_rename_default_branch = Olet nimeämässä oletushaaran uudelleen.
 settings.web_hook_name_msteams = Microsoft Teams
 release.download_count_one = %s lataus
@@ -1963,31 +2025,31 @@ diff.file_before = Ennen
 diff.file_after = Jälkeen
 settings.protect_new_rule = Luo uusi haaran suojaussääntö
 settings.branch_filter = Haarasuodatin
-object_format_helper = Repositorion objektimuoto. Tätä ei voi muuttaa myöhemmin. SHA1 on yhteensopivin muoto.
+object_format_helper = Tietovaraston objektimuoto. Tätä ei voi muuttaa myöhemmin. SHA1 on yhteensopivin muoto.
 migrate.gogs.description = Tee migraatio notabug.orgista tai muista Gogs-instansseista.
 migrate.forgejo.description = Tee migraatio codeberg.orgista tai muista Forgejo-instansseista.
 migrate.gitbucket.description = Tee migraatio GitBucket-instansseista.
 migrate.onedev.description = Tee migraatio code.onedev.io:sta tai muista OneDev-instansseista.
 migrate.codebase.description = Tee migraatio codebasehq.comista.
-migrate.git.description = Tee repomigraatio mistä tahansa Git-palvelusta.
+migrate.git.description = Suorita tietovaraston migraatio mistä tahansa Git-palvelusta.
 migrate.gitlab.description = Tee migraatio gitlab.comista tai muista GitLab-instansseista.
 migrate.gitea.description = Tee migraatio gitea.comista tai muista Gitea-instansseista.
 repo_gitignore_helper_desc = Valitse mitä tiedostoja ei seurata yleisimpien kielten mallipohjista. Tyypilliset artefaktit, joita eri kielten koostamistyökalut tuottavat, lisätään .gitignore-tiedostoon oletusarvoisesti.
-milestones.filter_sort.latest_due_date = Kaukaisin määräpäivä
+milestones.filter_sort.latest_due_date = Kaukaisin eräpäivä
 license_helper_desc = Lisenssi määrää, mitä muut voivat ja eivät voi tehdä koodillasi. Etkö ole varma, mikä lisenssi soveltuu projektillesi? Lue <a target="_blank" rel="noopener noreferrer" href="%s">ohje lisenssin valinnasta</a>.
-milestones.filter_sort.earliest_due_data = Lähin määräpäivä
+milestones.filter_sort.earliest_due_data = Lähin eräpäivä
 issues.filter_type.reviewed_by_you = Katselmoitu toimestasi
 settings.units.overview = Yleisnäkymä
-settings.remove_team_success = Tiimin pääsy repositorioon on poistettu.
+settings.remove_team_success = Tiimin pääsy tietovarastoon on poistettu.
 migrate.cancel_migrating_confirm = Haluatko perua tämän migraation?
 settings.units.units = Yksiköt
-settings.update_settings_no_unit = Repositorion tulisi sallia edes jonkinlainen vuorovaikutus.
+settings.update_settings_no_unit = Tietovaraston tulisi sallia edes jonkinlainen vuorovaikutus.
 settings.units.add_more = Ota lisää käyttöön
-settings.add_team_success = Tiimillä on nyt pääsy repositorioon.
-settings.use_external_issue_tracker = Käytä ulkoista ongelmienseurantaa
-settings.transfer_started = Tämä repositorio on merkitty siirrettäväksi ja se odottaa vahvistusta käyttäjältä "%s"
-signing.wont_sign.pubkey = Kommittia ei allekirjoiteta, koska sinulla ei ole yhtäkään julkista avainta liitetty tiliisi.
-settings.transfer_succeed = Repositorio on siirretty.
+settings.add_team_success = Tiimillä on nyt pääsy tietovarastoon.
+settings.use_external_issue_tracker = Käytä ulkoista ongelmanseurantaa
+settings.transfer_started = Tämä tietovarasto on merkitty siirrettäväksi ja se odottaa vahvistusta käyttäjältä "%s"
+signing.wont_sign.pubkey = Kommittia ei allekirjoiteta, koska sinulla ei ole julkista avainta liitetty tiliisi.
+settings.transfer_succeed = Tietovarasto on siirretty.
 activity.git_stats_on_default_branch = Haarassa %s,
 settings.tracker_issue_style.regexp = Säännöllinen lauseke
 wiki.reserved_page = Wikisivun nimi "%s" on varattu.
@@ -1995,18 +2057,18 @@ pulls.recently_pushed_new_branches = Työnsit haaraan <a href="%[3]s"><strong>%[
 signing.will_sign = Tämä kommitti allekirjoitetaan avaimella "%s".
 signing.wont_sign.never = Kommitit eivät ole koskaan allekirjoitettuja.
 settings.mirror_settings.direction = Suunta
-settings.mirror_settings.push_mirror.remote_url = Git-etärepon URL-osoite
-settings.issues_desc = Käytä repositorion ongelmienseurantaa
-settings.use_internal_issue_tracker = Käytä sisäänrakennettua ongelmienseurantaa
-settings.external_tracker_url = Ulkoisen ongelmienseurannan URL-osoite
-settings.transfer_abort_success = Repositorion siirto käyttäjälle %s peruttiin.
-settings.transfer_quota_exceeded = Uuden omistajan (%s) tilakiintiö on täynnä. Repositoriota ei ole siirretty.
-settings.projects_desc = Käytä repositorion projekteja
-settings.releases_desc = Käytä repositorion julkaisuja
-settings.packages_desc = Käytä repositorion pakettirekisteriä
+settings.mirror_settings.push_mirror.remote_url = Git-etätietovaraston URL-osoite
+settings.issues_desc = Ota tietovaraston ongelmanseuranta käyttöön
+settings.use_internal_issue_tracker = Käytä sisäänrakennettua ongelmanseurantaa
+settings.external_tracker_url = Ulkoisen ongelmanseurannan URL-osoite
+settings.transfer_abort_success = Tietovaraston siirto käyttäjälle %s peruttiin.
+settings.transfer_quota_exceeded = Uusi omistaja (%s) on ylittänyt kiintiön. Tietovarastoa ei ole siirretty.
+settings.projects_desc = Ota tietovarastoprojektit käyttöön
+settings.releases_desc = Ota tietovaraston julkaisut käyttöön
+settings.packages_desc = Ota tietovarastopakettien rekisteri käyttöön
 activity.git_stats_push_to_branch = haaraan %s ja
 wiki.wiki_page_revisions = Sivun versiot
-settings.wiki_desc = Käytä repositorion wikiä
+settings.wiki_desc = Ota tietovaraston wiki käyttöön
 signing.wont_sign.always = Kommitit ovat aina allekirjoitettuja.
 milestones.edit_subheader = Merkkipaalut järjestävät ongelmia ja seuraavat edistymistä.
 view_git_blame = Näytä git blame
@@ -2021,20 +2083,20 @@ branch.new_branch_from = Luo uusi haara kohteesta "%s"
 settings.matrix.message_type = Viestin tyyppi
 diff.committed_by = kommitoinut
 invisible_runes_line = `Tällä rivillä on näkymättömiä Unicode-merkkejä`
-editor.fork_before_edit = Sinun täytyy forkata tämä repo tehdäksesi tai ehdottaaksesi muutoksia tähän tiedostoon.
-editor.file_deleting_no_longer_exists = Poistettava tiedosto, "%s", ei ole enää olemassa tässä repossa.
+editor.fork_before_edit = Sinun täytyy forkata tämä tietovarasto tehdäksesi tai ehdottaaksesi muutoksia tähän tiedostoon.
+editor.file_deleting_no_longer_exists = Poistettavaa tiedostoa "%s" ei enää ole tässä tietovarastossa.
 editor.add_tmpl.filename = tiedostonimi
 editor.fail_to_apply_patch = Ei voitu toteuttaa paikkaa "%s"
 editor.propose_file_change = Ehdota tiedostomuutosta
 editor.new_branch_name = Nimeä uusi haara tätä kommittia varten
 editor.new_branch_name_desc = Uuden haaran nimi…
-editor.file_editing_no_longer_exists = Muokattava tiedosto, "%s", ei ole enää olemassa tässä repossa.
+editor.file_editing_no_longer_exists = Muokattavaa tiedostoa "%s" ei enää ole tässä tietovarastossa.
 editor.cannot_commit_to_protected_branch = Suojattuun haaraan "%s" ei voi kommitoida.
 issues.remove_request_review = Poista katselmointipyyntö
 issues.remove_request_review_block = Katselmointipyyntöä ei voi poistaa
-pulls.require_signed_wont_sign = Tämä haara vaatii allekirjoitetut kommitit, mutta tätä yhdistämistä ei allekirjoiteta
+pulls.require_signed_wont_sign = Haara vaatii allekirjoitettuja kommitteja, mutta tätä yhdistämistä ei allekirjoiteta
 pulls.push_rejected_summary = Koko hylkäysviesti
-settings.unarchive.button = Poista repon arkistointi
+settings.unarchive.button = Kumoa tietovaraston arkistointi
 release.type_attachment = Liite
 tag.create_tag_from = Luo uusi tagi kohteesta"%s"
 topic.count_prompt = Voit valita korkeintaan 25 aihetta
@@ -2050,11 +2112,11 @@ editor.must_have_write_access = Sinulla täytyy olla kirjoitusoikeus tehdäksesi
 issues.re_request_review = Pyydä katselmointia uudelleen
 pulls.status_checks_details = Yksityiskohdat
 release.title_empty = Nimi ei voi olla tyhjä.
-archive.title = Tämä repo on arkistoitu. Voit katsella sen sisältämiä tiedostoja ja kloonata repon, mutta et voi pushata, avata ongelmia tai luoda vetopyyntöjä.
+archive.title = Tämä tietovarasto on arkistoitu. Voit tarkastella sen tiedostoja ja kloonata sen, mutta et voi tehdä muutoksia sen tilaan, kuten tehdä työntöjä tai luoda uusia ongelmia, vetopyyntöjä tai kommentteja.
 reactions_more = ja %d lisää
 mirror_address = Kloonaa URL-osoitteesta
 migrate_items_merge_requests = Yhdistämispyynnöt
-stars_remove_warning = Tämä poistaa kaikki tähdet tästä reposta.
+stars_remove_warning = Tämä poistaa kaikki tähdet tästä tietovarastosta.
 archive.issue.nocomment = Tämä repo on arkistoitu. Et voi kommentoida ongelmia.
 archive.pull.nocomment = Tämä repo on arkistoitu. Et voi kommentoida vetopyyntöjä.
 settings.webhook_deletion_desc = Webkoukun poistaminen poistaa sen asetukset ja toimitushistorian. Jatketaanko?
@@ -2062,14 +2124,14 @@ settings.discord_icon_url.exceeds_max_length = Kuvakkeen URL-osoite voi sisält
 settings.event_wiki_desc = Wiki-sivu luotu, nimetty uudelleen, muokattu tai poistettu.
 settings.event_pull_request_desc = Vetopyyntö avattu, suljettu, avattu uudelleen tai muokattu.
 settings.protect_branch_name_pattern = Suojatun haaran nimen kaava
-issues.dependency.add_error_dep_not_same_repo = Molempien ongelmien tulee olla samassa repossa.
+issues.dependency.add_error_dep_not_same_repo = Molempien ongelmien tulee olla samassa tietovarastossa.
 settings.event_release = Julkaisu
 pulls.merge_pull_request = Luo yhdistämiskommitti
 settings.pull_mirror_sync_quota_exceeded = Kiintiö ylitetty, ei vedetä muutoksia.
 settings.wiki_rename_branch_main_notices_1 = Tätä toimintoa <strong>EI VOI</strong> perua.
 settings.webhook.test_delivery_desc_disabled = Aktivoi webkoukku testataksesi sitä tekaistulla tapahtumalla.
 settings.discord_icon_url = Kuvakkeen URL-osoite
-settings.archive.branchsettings_unavailable = Haaran asetukset eivät ole saatavilla arkistoiduissa repoissa.
+settings.archive.branchsettings_unavailable = Haaran asetukset eivät ole saatavilla arkistoiduissa tietovarastoissa.
 pulls.ready_for_review = Valmiina katselmointiin?
 issues.time_spent_total = Käytetty kokonaisaika
 settings.webhook.test_delivery_desc = Testaa tätä webkoukkua tekaistulla tapahtumalla.
@@ -2077,32 +2139,32 @@ pulls.switch_comparison_type = Vaihda vertailutyyppiä
 settings.hooks_desc = Webkoukut tekevät automaattisesti HTTP POST -pyyntöjä palvelimelle, kun jotkin Forgejo-tapahtumat käynnistyvät. Lue lisää <a target="_blank" rel="noopener noreferrer" href="%s">webkoukkujen oppaasta</a>.
 issues.num_participants_one = %d osallistuja
 issues.reference_link = Viittaus: %s
-settings.transfer_desc = Siirrä tämä repo käyttäjälle tai organisaatiolle, johon sinulla ylläpito-oikeus.
+settings.transfer_desc = Siirrä tämä tietovarasto käyttäjälle tai organisaatiolle, johon sinulla on ylläpito-oikeudet.
 settings.add_collaborator = Lisää avustaja
-settings.mirror_settings.push_mirror.none = Push-peilejä ei ole määritetty
-settings.collaborator_deletion_desc = Avustajan poistaminen estää hänen pääsyn tähän repoon. Jatketaanko?
-settings.archive.text = Repon arkistointi asettaa sen pelkkään lukutilaan. Se piilotetaan hallintapaneelista. Kukaan (et edes sinä!) ei pysty tehdä uusia kommitteja, avata uusia ongelmia tai avata vetopyyntöjä.
-settings.mirror_settings.docs = Määritä reposi automaattisesti synkronoimaan kommitit, tagit ja haarat toiseen repoon.
-settings.add_collaborator_duplicate = Avustaja on jo lisätty tähän repoon.
-settings.add_collaborator_blocked_them = Avustajaa ei voi lisätä, koska kyseinen avustaja on estänyt repon omistajan.
-settings.add_collaborator_blocked_our = Avustajaa ei voi lisätä, koska repon omistaja on estänyt hänet.
-settings.default_branch_desc = Valitse repon oletushaara, johon vetopyynnöt ja koodikommitit kohdistetaan:
+settings.mirror_settings.push_mirror.none = Työntöpeilejä ei ole määritetty
+settings.collaborator_deletion_desc = Avustajan poistaminen peruuttaa hänen pääsynsä tähän tietovarastoon. Jatketaanko?
+settings.archive.text = Tietovaraston arkistointi asettaa sen pelkkään lukutilaan. Se piilotetaan kojelaudalta. Kukaan ei voi tehdä (et edes sinä) uusia kommitteja, tai avata ongelmia tai vetopyyntöjä.
+settings.mirror_settings.docs = Määritä tietovarastosi synkronoimaan kommitit, tagit ja haarat automaattisesti toisen tietovaraston kanssa.
+settings.add_collaborator_duplicate = Avustaja on jo lisätty tähän tietovarastoon.
+settings.add_collaborator_blocked_them = Avustajaa ei voi lisätä, koska hän on estänyt tietovaraston omistajan.
+settings.add_collaborator_blocked_our = Avustajaa ei voi lisätä, koska tietovaraston omistaja on estänyt hänet.
+settings.default_branch_desc = Valitse tietovaraston oletushaara vetopyyntöjä ja koodin kommitteja varten:
 issues.role.collaborator = Avustaja
 settings.trust_model.collaboratorcommitter.long = Avustaja+kommitoija: Luota avustajien allekirjoituksiin, jotka vastaavat kommitoijaa
 settings.collaborator_deletion = Poista avustaja
 wiki.desc = Kirjoita ja jaa dokumentaatiota avustajien kesken.
 settings.trust_model.collaborator = Avustaja
-mirror_sync_on_commit = Synkronoi kun kommitit pushataan
-settings.mirror_settings.docs.disabled_pull_mirror.instructions = Määritä projektisi automaattisesti pushaamaan kommitit, tagit ja haarat toiseen repoon. Pull-peilit on poistettu käytöstä tämän sivuston ylläpitäjän toimesta.
-settings.mirror_settings.docs.more_information_if_disabled = Löydät lisätietoja push- ja pull-peileistä täältä:
-settings.mirror_settings.push_mirror.add = Lisää push-peili
+mirror_sync_on_commit = Synkronoi, kun kommitteja työnnetään
+settings.mirror_settings.docs.disabled_pull_mirror.instructions = Määritä projektisi työntämään kommitit, tagit ja haarat automaattisesti toiseen tietovarastoon. Sivustosi järjestelmänvalvoja on poistanut vetopeilit käytöstä.
+settings.mirror_settings.docs.more_information_if_disabled = Löydät lisätietoja työntö- ja vetopeileistä täältä:
+settings.mirror_settings.push_mirror.add = Lisää työntöpeili
 settings.mirror_settings.push_mirror.edit_sync_time = Muokkaa peilin synkronoinnin aikaväliä
 settings.trust_model.collaboratorcommitter = Avustaja+kommitoija
 settings.trust_model.default = Oletusarvoinen luottamusmalli
-settings.admin_enable_health_check = Käytä repositorion terveystarkastuksia (git fsck)
+settings.admin_enable_health_check = Ota tietovaraston terveystarkastukset käyttöön (git fsck)
 settings.remove_collaborator_success = Avustaja on poistettu.
-issues.role.collaborator_helper = Tämä käyttäjä on kutsuttu avustajaksi tähän repoon.
-settings.pulls_desc = Käytä repositorion vetopyyntöjä
+issues.role.collaborator_helper = Tämä käyttäjä on kutsuttu avustajaksi tietovarastoon.
+settings.pulls_desc = Ota tietovaraston vetopyynnöt käyttöön
 mirror_interval_invalid = Peilauksen aikaväli ei ole kelvollinen.
 settings.collaboration = Avustajat
 settings.trust_model = Allekirjoituksen luottamusmalli
@@ -2111,94 +2173,427 @@ mirror_interval = Peilauksen aikaväli (kelvolliset yksiköt ovat "h", "m", "s")
 settings.add_collaborator_success = Avustaja on lisätty.
 settings.add_collaborator_owner = Omistajaa ei voi lisätä avustajaksi.
 settings.signing_settings = Allekirjoituksen vahvistuksen asetukset
-settings.mirror_settings.docs.disabled_push_mirror.instructions = Määritä projektisi automaattisesti vetämään kommitit, tagit ja haarat toisesta reposta.
+settings.mirror_settings.docs.disabled_push_mirror.instructions = Määritä projektisi automaattisesti vetämään kommitit, tagit ja haarat toisesta tietovarastosta.
 settings.trust_model.collaborator.long = Avustaja: Luota avustajien allekirjoituksiin
 issues.dependency.setting = Käytä riippuvuuksia ongelmiin ja vetopyyntöihin
 settings.allow_only_contributors_to_track_time = Salli vain avustajien seurata aikaa
 settings.actions_desc = Käytä integroituja CI-/CD-putkia Forgejo Actionsia hyödyntäen
-settings.admin_enable_close_issues_via_commit_in_any_branch = Sulje ongelma kommitin toimesta, joka on tehty muuhun kuin oletusarvoiseen haaraan
-settings.mirror_settings.pushed_repository = Työnnetty repo
+settings.admin_enable_close_issues_via_commit_in_any_branch = Sulje ongelma muussa kuin oletushaarassa tehdyllä kommitilla
+settings.mirror_settings.pushed_repository = Työnnetty tietovarasto
 pulls.compare_changes_desc = Valitse haara, johon yhdistetään, ja haara, josta vedetään.
 no_eol.text = Ei EOL:ää
 auto_init_description = Aloita Git-historia README-tiedostolla ja valinnaisesti License- ja .gitignore-tiedostoilla.
 new_from_template = Käytä mallipohjaa
-new_from_template_description = Voit valita olemassa olevan repon mallipohjan ja toteuttaa sen asetukset.
+new_from_template_description = Voit valita olemassa olevan tietovarastomallipohjan tässä instanssissa ja käyttää sen asetuksia.
 new_advanced = Lisäasetukset
 new_advanced_expand = Laajenna napsauttamalla
-template_description = Repojen mallipohjat mahdollistavat uusien repojen luomisen halutulla hakemistorakenteella, tiedostoilla ja valinnaisilla asetuksilla.
-settings.enter_repo_name = Kirjoita omistajan ja repon nimi täsmälleen kuten esitetty:
+template_description = Mallipohjaisten tietovarastojen avulla käyttäjät voivat luoda uusia tietovarastoja, joilla on sama hakemistorakenne, tiedostot ja valinnaiset asetukset.
+settings.enter_repo_name = Syötä omistajan ja tietovaraston nimi täsmälleen kuten esitetty:
 settings.confirmation_string = Vahvistusteksti
-settings.delete_notices_2 = - Tämä toiminto poistaa pysyvästi repon <strong>%s</strong> mukaan lukien koodin, ongelmat, kommentit, wikidatan ja avustaja-asetukset.
+settings.delete_notices_2 = - Tämä toiminto poistaa pysyvästi tietovaraston <strong>%s</strong> mukaan lukien koodin, ongelmat, kommentit, wikidatan ja avustaja-asetukset.
 issues.filter_assginee_no_select = Kaikki käsittelijät
 issues.new.assign_to_me = Osoita itselle
-pulls.closed_at = `sulki tämän vetopyynnön <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `sulki tämän vetopyynnön %s`
 tree_path_not_found_branch = Polkua %[1]s ei ole olemassa haarassa %[2]s
 transfer.no_permission_to_reject = Sinulla ei ole oikeutta hylätä tätä siirtoa.
-generate_repo = Luo repo
+generate_repo = Luo tietovarasto
 tree_path_not_found_commit = Polkua %[1]s ei ole olemassa kommitissa %[2]s
-archive.pull.noreview = Tämä repo on arkistoitu. Et voi katselmoida vetopyyntöjä.
+archive.pull.noreview = Tämä tietovarasto on arkistoitu. Et voi katselmoida vetopyyntöjä.
 tree_path_not_found_tag = Polkua %[1]s ei ole olemassa tagissa %[2]s
 transfer.no_permission_to_accept = Sinulla ei ole oikeutta hyväksyä tätä siirtoa.
 settings.web_hook_name_feishu = Feishu / Lark Suite
-
-
-
-delete_preexisting = Poista olemassa olevat tiedostot
-projects.edit_subheader = Projektit organisoivat ongelmia ja seuraavat edistymistä.
-issues.filter_no_results = Ei tuloksia
-issues.filter_no_results_placeholder = Kokeile määrittää eri hakusuodattimet.
+issues.review.reviewers = Katselmoijat
 issues.new.no_reviewers = Ei katselmoijia
-issues.choose.get_started = Aloitetaan
-issues.label_templates.title = Lataa tunnisteen esiasetus
-issues.label_templates.use = Käytä tunnisteen esiasetusta
-issues.add_label = lisäsi tunnisteen %s %s
-issues.add_labels = lisäsi tunnisteet %s %s
-issues.num_reviews_one = %d katselmointi
-issues.num_reviews_few = %d katselmointia
-issues.reaction.add = Lisää reaktio
-issues.ref_pull_from = `<a href="%[3]s">viittasi tähän vetopyyntöön %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.add_label = lisäsi nimilapun %s %s
+issues.due_date_added = lisäsi eräpäivän %s %s
+issues.review.add_review_request = pyysi katselmointia käyttäjältä %[1]s %[2]s
+issues.ref_pull_from = `<a href="%[2]s">viittasi tähän vetopyyntöön %[3]s</a> %[1]s`
+pulls.commit_ref_at = `viittasi tähän vetopyyntöön kommitista %s`
+issues.review.comment = katselmoi %s
+issues.add_labels = lisäsi nimilaput %s %s
+issues.review.add_review_requests = pyysi katselmointeja käyttäjiltä %[1]s %[2]s
+pulls.blocked_by_official_review_requests = Tämä vetopyyntö on estetty, koska siltä puuttuu hyväksyntä yhdeltä tai useammalta viralliselta katselmoijalta.
 issues.author.tooltip.issue = Tämä käyttäjä on tämän ongelman tekijä.
 issues.author.tooltip.pr = Tämä käyttäjä on tämän vetopyynnön tekijä.
-issues.role.contributor_helper = Tämä käyttäjä on aiemmin kommitoinut tähän repoon.
-issues.label_deletion_desc = Tunnisteen poistaminen poistaa sen kaikista ongelmista. Jatketaanko?
-issues.label_deletion_success = Tunniste on poistettu.
-issues.attachment.open_tab = `Napsauta nähdäksesi "%s" uudessa välilehdessä`
-issues.attachment.download = `Napsauta ladataksesi "%s"`
-issues.unpin_issue = Poista ongelman kiinnitys
+issues.role.contributor_helper = Tämä käyttäjä on aiemmin kommitoinut tähän tietovarastoon.
+settings.event_pull_request_label = Nimilaput
+issues.due_date_remove = poisti eräpäivän %s %s
+settings.event_issue_label = Nimilaput
+settings.authorization_header = Authorization-otsake
+diff.has_escaped = Tällä rivillä on piilotettuja Unicode-merkkejä
 issues.max_pinned = Et voi kiinnittää enempää ongelmia
-issues.cancel_tracking = Hylkää
-issues.due_date_added = lisäsi määräpäivän %s %s
-issues.due_date_remove = poisti määräpäivän %s %s
-issues.review.comment = katselmoi %s
-issues.review.add_review_request = pyysi katselmointia käyttäjältä %[1]s %[2]s
-issues.review.add_review_requests = pyysi katselmointeja käyttäjiltä %[1]s %[2]s
-issues.review.reviewers = Katselmoijat
-issues.review.outdated = Vanhentunut
-issues.review.outdated_description = Sisältö on muuttunut siitä ajanhetkestä, kun tämä kommentti luotiin
-issues.review.option.show_outdated_comments = Näytä vanhentuneet kommentit
+settings.external_tracker_url_error = Ulkoisen ongelmanseurannan URL-osoite ei ole kelvollinen.
+settings.event_pull_request_review = Katselmoinnit
+settings.event_pull_request_review_request = Katselmointipyynnöt
+issues.num_reviews_one = %d katselmointi
+issues.num_reviews_few = %d katselmointia
+issues.filter_no_results = Ei tuloksia
+issues.filter_no_results_placeholder = Kokeile määrittää eri hakusuodattimet.
+projects.edit_subheader = Projektit organisoivat ongelmia ja seuraavat edistymistä.
+issues.label_templates.title = Lataa nimilapun esiasetus
+issues.label_deletion_desc = Nimilapun poistaminen poistaa sen kaikista ongelmista. Jatketaanko?
+issues.attachment.download = `Napsauta ladataksesi "%s"`
 issues.review.option.hide_outdated_comments = Piilota vanhentuneet kommentit
 issues.review.show_outdated = Näytä vanhentuneet
 issues.review.hide_outdated = Piilota vanhentuneet
-pulls.sign_in_require = <a href="%s">Kirjaudu sisään</a> luodaksesi uuden vetopyynnön.
-pulls.blocked_by_official_review_requests = Tämä vetopyyntö on estetty, koska siltä puuttuu hyväksyntä yhdeltä tai useammalta viralliselta katselmoijalta.
-pulls.no_merge_access = Sinulla ei ole valtuutta yhdistää tätä vetopyyntöä.
-pulls.commit_ref_at = `viittasi tähän vetopyyntöön kommitista <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 settings.external_wiki_url_error = Ulkoisen wikin URL-osoite ei ole kelvollinen.
-settings.external_tracker_url_error = Ulkoisen ongelmienseurannan URL-osoite ei ole kelvollinen.
+issues.attachment.open_tab = `Napsauta nähdäksesi "%s" uudessa välilehdessä`
+issues.unpin_issue = Poista ongelman kiinnitys
+issues.review.outdated_description = Sisältö on muuttunut siitä ajanhetkestä, kun tämä kommentti luotiin
+issues.review.option.show_outdated_comments = Näytä vanhentuneet kommentit
+issues.review.outdated = Vanhentunut
+issues.label_templates.use = Käytä nimilapun esiasetusta
+issues.label_deletion_success = Nimilappu on poistettu.
+issues.cancel_tracking = Hylkää
+issues.choose.get_started = Aloitetaan
 settings.event_fork = Forkkaus
-settings.event_issue_label = Tunnisteet
-settings.event_pull_request_label = Tunnisteet
-settings.event_pull_request_review = Katselmoinnit
-settings.event_pull_request_review_request = Katselmointipyynnöt
-settings.authorization_header = Authorization-otsake
-diff.has_escaped = Tällä rivillä on piilotettuja Unicode-merkkejä
+pulls.no_merge_access = Sinulla ei ole valtuutta yhdistää tätä vetopyyntöä.
+pulls.sign_in_require = <a href="%s">Kirjaudu sisään</a> luodaksesi uuden vetopyynnön.
+delete_preexisting = Poista olemassa olevat tiedostot
+issues.reaction.add = Lisää reaktio
+pulls.merged_by = <a href="%[2]s">%[3]s</a>:n yhdistettiin %[1]s
+pulls.merged_by_fake = %[2]s:n yhdistettiin %[1]s
+delete_preexisting_success = Poistetut omaksumattomat tiedostot kohteesta %s
+pulls.no_merge_wip = Tätä vetopyyntöä ei voida yhdistää, koska se on merkitty keskeneräiseksi työksi.
+pulls.clear_merge_message = Tyhjennä yhdistämisviesti
+activity.title.prs_merged_by = %s yhdisti %s
+settings.protect_status_check_patterns_desc = Syötä kaavat määrittääksesi, mitkä tilatarkistukset on läpäistävä, ennen kuin haarat voidaan yhdistää tätä sääntöä vastaavaan haaraan. Jokainen rivi määrittää kaavan. Kaavat eivät saa olla tyhjiä.
+adopt_search = Syötä käyttäjänimi etsiäksesi omaksumattomia tietovarastoja… (jätä tyhjäksi löytääksesi kaikki)
+pulls.cmd_instruction_merge_warning = <b>Varoitus:</b> Asetusta ”Tunnista manuaalinen yhdistäminen automaattisesti” ei ole otettu käyttöön tässä tietovarastossa. Sinun on merkittävä tämä vetopyyntö manuaalisesti yhdistetyksi jälkikäteen.
+pulls.cmd_instruction_merge_desc = Yhdistä muutokset ja päivitä Forgejossa.
+pulls.cannot_auto_merge_desc = Tätä vetopyyntöä ei voida yhdistää automaattisesti ristiriitojen vuoksi.
+adopt_preexisting_success = Omaksuttu tiedostot ja luotu tietovarasto lähteestä %s
+issues.comment_manually_pull_merged_at = manuaalisesti yhdisti kommitin %[1]s %[2]s tietovarastoon %[3]s
+pulls.cmd_instruction_merge_title = Yhdistä
+pulls.has_merged = Epäonnistui: vetopyyntö on yhdistetty, joten et voi yhdistää uudelleen tai muuttaa kohdehaaraa.
+pulls.cmd_instruction_checkout_title = Uloskuittaus
+pulls.cmd_instruction_checkout_desc = Kuittaa ulos uusi haara projektitietovarastostasi ja testaa muutokset.
+pulls.clear_merge_message_hint = Yhdistämisviestin tyhjentäminen poistaa vain kommittiviestin sisällön ja säilyttää luodut git-trailerit, kuten "Co-Authored-By…".
+settings.protect_check_status_contexts_desc = Vaadi tilatarkistusten läpäisy ennen yhdistämistä. Kun käytössä, kommitit on ensin työnnettävä toiseen haaraan ja sitten yhdistettävä tai työnnettävä suoraan tätä sääntöä vastaavaan haaraan tilantarkistuksen jälkeen. Jos konteksteja ei löydy, viimeisen kommitin on oltava onnistunut kontekstista riippumatta.
+issues.comment_pull_merged_at = yhdisti kommitin %[1]s %[2]s haaraan %[3]s
+settings.pulls.enable_autodetect_manual_merge = Ota Tunnista manuaalinen yhdistäminen automaattisesti -asetus käyttöön (Huomaa: joissakin erityistapauksissa voi esiintyä virhearviointeja)
+pulls.no_merge_desc = Tätä vetopyyntöä ei voida yhdistää, koska kaikki tietovaraston yhdistämisvaihtoehdot ovat poistettu käytöstä.
+pulls.no_merge_not_ready = Tämä vetopyyntö ei ole valmis yhdistettäväksi. Tarkista katselmoinnin tila ja tilantarkistukset.
+issues.is_stale = Tähän vetopyyntöön on kohdistunut muutoksia tämän katselmoinnin jälkeen
+migrate.repo_desc_helper = Jätä tyhjäksi tuodaksesi olemassa olevan kuvauksen
+issues.role.first_time_contributor = Avustaja ensimmäistä kertaa
+issues.role.contributor = Avustaja
+activity.opened_prs_label = Ehdotettu
+settings.require_signed_commits_desc = Hylkää työnnöt tähän haaraan, jos niitä ei ole allekirjoitettu tai ne eivät ole vahvistettuja.
+issues.role.first_time_contributor_helper = Tämä on käyttäjän ensimmäinen kontribuutio tähän tietovarastoon.
+editor.upload_files_to_dir = Lähetä tiedostot hakemistoon "%s"
+adopt_preexisting = Omaksu olemassa olevat tiedostot
+issues.dismiss_review_warning = Haluatko hylätä katselmoinnin?
+commit.operations = Toimenpiteet
+commits.view_single_diff = Näytä tässä kommitissa tähän tiedostoon kohdistuneet muutokset
+issues.choose.ignore_invalid_templates = Virheelliset mallipohjat on jätetty huomiotta
+migrate.migrating_milestones = Suoritetaan merkkipaalujen migraatiota
+migrate.migrating_issues = Suoritetaan ongelmien migraatiota
+migrate.clone_local_path = tai paikallisen palvelimen polku
+pulls.filter_changes_by_commit = Suodata kommitin perusteella
+pulls.show_changes_since_your_last_review = Näytä viimeisimmän katselmointisi jälkeiset muutokset
+pulls.cant_reopen_deleted_branch = Tätä vetopyyntöä ei voi avata uudelleen, koska haara poistettiin.
+mirror_sync = synkronoitu
+mirror_lfs_endpoint = LFS-päätepiste
+language_other = Muu
+adopt_preexisting_label = Omaksu tiedostot
+issues.role.member_helper = Tämä käyttäjä on tietovaraston omistavan organisaation jäsen.
+migrate.invalid_local_path = Paikallinen polku on virheellinen. Sitä ei ole olemassa tai se ei ole hakemisto.
+migrate.invalid_lfs_endpoint = LFS-päätepiste ei ole kelvollinen.
+issues.new.clear_projects = Tyhjennä projektit
+mirror_denied_combination = Julkiseen avaimeen ja salasanaan pohjautuvaa todennusta ei voi käyttää yhdessä.
+template.git_content = Git-sisältö (Oletushaara)
+migrate.migrating_releases = Suoritetaan julkaisujen migraatiota
+unit_disabled = Sivuston ylläpitäjä on poistanut käytöstä tämän tietovarasto-osion.
+issues.filter_sort.relevance = Asiaankuuluvuus
+pulls.reopen_to_merge = Avaa tämä vetopyyntö uudelleen suorittaaksesi yhdistämisen.
+archive.nocomment = Kommentointi ei ole mahdollista, koska tietovarasto on arkistoitu.
+projects.column.set_default_desc = Aseta tämä sarake oletukseksi luokittelemattomille ongelmille ja vedoille
+issues.review.remove_review_request_self = kieltäytyi katselmoimasta %s
+from_comment = (kommentti)
+issues.dismiss_review = Hylkää katselmointi
+editor.file_changed_while_editing = Tiedoston sisältö on muuttunut sen avaamisen jälkeen. <a target="_blank" rel="noopener noreferrer" href="%s">Napsauta tästä</a> nähdäksesi muutokset tai <strong>kommitoi muutokset uudelleen</strong> korvataksesi muutokset.
+sync_fork.button = Synkronoi
+migrated_from = Suoritettu migraatio lähteestä <a href="%[1]s">%[2]s</a>
+migrate.migrating_topics = Suoritetaan aiheiden migraatiota
+migrate.migrating_pulls = Suoritetaan vetopyyntöjen migraatiota
+migrate.cancel_migrating_title = Peruuta migraatio
+file_follow = Seuraa symbolista linkkiä
+commit.load_referencing_branches_and_tags = Lataa haarat ja tagit, jotka viittaavat tähän kommittiin
+editor.commit_id_not_matching = Tiedosto muuttui sillä aikaa, kun muokkasit sitä. Kommitoi uuteen haaraan ja yhdistä sen jälkeen.
+projects.new_subheader = Koordinoi, seuraa ja päivitä työtä yhdessä paikassa, jotta projektit pysyvät läpinäkyvinä ja aikataulussa.
+issues.del_time_history = `poisti käytetyn ajan %s`
+issues.dependency.removed_dependency = `poisti riippuvuuden %s`
+issues.dependency.add_error_same_issue = Et voi tehdä ongelmaa riippuvaiseksi itsestään.
+projects.card_type.desc = Korttiesikatselut
+issues.dependency.added_dependency = `lisäsi uuden riippuvuuden %s`
+fork_no_valid_owners = Tätä tietovarastoa ei voi forkata, koska sillä ei ole kelvollisia omistajia.
+fork_branch = Forkkiin kloonattava haara
+editor.must_be_on_a_branch = Sinun tulee olla haarassa, jotta voit tehdä tai ehdottaa muutoksia tähän tiedostoon.
+editor.commit_message_desc = Lisää valinnainen, laajennettu kuvaus…
+migrate_options_lfs = Tee migraatio LFS-tiedostoille
+migrate_options_lfs_endpoint.label = LFS-päätepiste
+commits.browse_further = Selaa kauemmas
+issues.filter_projects = Suodata projekti
+issues.filter_labels = Suodata nimilappu
+commits.no_commits = Ei yhteisiä kommitteja. "%s" ja "%s" omaavat täysin eri historiat.
+projects.column.deletion_desc = Projektin sarakkeen poistaminen siirtää kaikki siihen liittyvät ongelmat oletussarakkeeseen. Jatketaanko?
+issues.del_time = Poista tämä aikaloki
+migrated_from_fake = Suoritettu migraatio lähteestä %[1]s
+migrate.migrate = Tee migraatio lähteestä %s
+migrate.migrating_labels = Suoritetaan nimilappujen migraatiota
+file_view_rendered = Näytä renderöitynä
+editor.invalid_commit_mail = Virheellinen sähköposti kommitin luomista varten.
+sync_fork.branch_behind_one = Tämä haara on %[1]d kommitin jäljessä %[2]s
+sync_fork.branch_behind_few = Tämä haara on %[1]d kommittia jäljessä %[2]s
+no_eol.tooltip = Tämä tiedosto ei sisällä lopussa olevaa rivin loppu -merkkiä.
+issues.filter_reviewers = Suodata katselmoija
+commits.view_path = Näytä tässä historian kohdassa
+commit.revert = Palauta
+commit.revert-header = Palauta: %s
+mirror_use_ssh.not_available = SSH-todennus ei ole käytettävissä.
+pulls.showing_specified_commit_range = Näytetään vain muutokset välillä %[1]s..%[2]s
+pulls.select_commit_hold_shift_for_range = Valitse kommitti. Pidä pohjassa shift + napsauta valitaksesi alueen
+blame_prior = Näytä blame ennen tätä muutosta
+migrate.migrating_failed.error = Migraatio epäonnistui: %s
+editor.no_commit_to_branch = Kommitointi suoraan haaraan ei onnistu syystä:
+editor.user_no_push_to_branch = Käyttäjä ei voi työntää haaraan
+issues.delete.text = Haluatko varmasti poistaa tämän ongelman? (Sisältö poistetaan pysyvästi. Harkitse sen sijaan sulkemista, jos haluat pitää ongelman arkistoituna)
+issues.context.menu = Kommenttivalikko
+archive.title_date = Tämä tietovarasto arkistoitiin %s. Voit tarkastella sen tiedostoja ja kloonata sen, mutta et voi tehdä muutoksia sen tilaan, kuten tehdä työntöjä tai luoda uusia ongelmia, vetopyyntöjä tai kommentteja.
+pulls.cannot_auto_merge_helper = Yhdistä manuaalisesti selvittääksesi konfliktit.
+pulls.merge_conflict = Yhdistäminen epäonnistui: Yhdistämisen aikana tapahtui ristiriita. Vihje: Kokeile eri strategiaa
+pulls.is_checking = Yhdistämisen ristiriidan tarkistus on meneillään. Kokeile uudelleen hetken kuluttua.
+pulls.is_empty = Tässä haarassa olevat muutokset ovat jo kohdehaarassa. Tästä tulee tyhjä kommitti.
+pulls.required_status_check_administrator = Ylläpitäjänä voit silti yhdistää tämän vetopyynnön.
+pulls.required_status_check_failed = Jotkin vaaditut tarkistukset eivät onnistuneet.
+pulls.required_status_check_missing = Jotkin vaaditut tarkistukset puuttuvat.
+pulls.status_checks_failure = Jotkin tarkistukset epäonnistuivat
+pulls.status_checks_show_all = Näytä kaikki tarkistukset
+pulls.auto_merge_cancel_schedule = Peru automaattinen yhdistäminen
+pulls.auto_merge_newly_scheduled = Tämä vetopyyntö aikataulutettiin yhdistettäväksi, kun kaikki tarkistukset onnistuvat.
+pulls.auto_merge_not_scheduled = Tätä vetopyyntöä ei ole aikataulutettu automaattisesti yhdistettäväksi.
+comments.edit.already_changed = Muutosten tallentaminen kommenttiin epäonnistui. Vaikuttaa siltä, että sisältöä on jo muutettu toisen käyttäjän toimesta. Päivitä sivu ja muokkaa uudelleen välttääksesi ylikirjoittamasta muiden muutoksia
+signing.wont_sign.nokey = Tässä instanssissa ei ole avainta tämän kommitin allekirjoittamiseksi.
+pulls.is_ancestor = Tämä haara on jo sisällytetty kohdehaaraan. Yhdistettävää ei ole.
+pulls.blocked_by_rejection = Tämä vetopyyntö sisältää virallisen katselmoijan vaatimisia muutoksia.
+pulls.status_checks_success = Kaikki tarkistukset onnistuivat
+pulls.agit_explanation = Luotu käyttäen AGit-työnkulkua. AGit antaa avustajien ehdottaa muutoksia käyttämällä "git push" ilman, että uutta forkkia tai uutta haaraa luodaan.
+milestones.invalid_due_date_format = Eräpäivän muodon tulee olla "yyyy-mm-dd".
+wiki.original_git_entry_tooltip = Näytä alkuperäinen Git-tiedosto sen sijaan, että ystävällistä linkkiä käytetään.
+pulls.blocked_by_approvals = Tällä vetopyynnöllä ei ole riittävästi hyväksyntöjä. %d/%d hyväksyntää myönnetty.
+pulls.status_checks_hide_all = Piilota kaikki tarkistukset
+pulls.blocked_by_user = Et voi luoda vetopyyntöä tähän tietovarastoon, koska tietovarastojan omistaja on estänyt sinut.
+pulls.delete.text = Haluatko varmasti poistaa tämän vetopyynnön? (Kaikki sisältö poistetaan pysyvästi. Harkitse sen sijaan sulkemista, jos haluat pitää arkistoituna)
+wiki.page_name_desc = Kirjoita tämän wikisivun nimi. Joitain erikoisnimiä ovat: "Home", "_Sidebar" ja "_Footer".
+pulls.blocked_by_changed_protected_files_1 = Tämä vetopyyntö sisältää suojatun tiedoston ja on siksi estetty:
+pulls.status_checks_warning = Jotkin tarkistukset raportoivat varoituksia
+pulls.status_checks_error = Jotkin tarkistukset raportoivat virheitä
+pulls.reopened_at = `avasi uudelleen tämän vetopyynnön %s`
+pulls.auto_merge_when_succeed = Yhdistä automaatisesti kun kaikki tarkistukset onnistuvat
+signing.wont_sign.error = Tapahtui virhe tarkistaessa voiko kommitin allekirjoittaa.
+signing.wont_sign.twofa = Sinulla tulee olla kaksivaiheinen todennus käytössä, jotta kommitit voi allekirjoittaa.
+pulls.data_broken = Tämä vetopyyntö on rikki johtuen puuttuvasta forkkitiedosta.
+pulls.files_conflicted = Tämä vetopyyntö sisältää muutoksia, jotka ovat ristiriidassa kohdehaaran kanssa.
+pulls.auto_merge_button_when_succeed = (Kun tarkistukset onnistuvat)
+pulls.blocked_by_outdated_branch = Tämä vetopyyntö on vanhentunut ja siksi estetty.
+pulls.blocked_by_changed_protected_files_n = Tämä vetopyyntö on estetty, koske se muuttaa suojattuja tiedostoja:
+pulls.status_checking = Jotkin tarkistukset odottavat
+pulls.auto_merge_canceled_schedule = Tämän vetopyynnön automaattinen yhdistäminen peruttiin.
+activity.title.prs_opened_by = %s ehdottanut %s
+settings.convert_fork = Konvertoi tavalliseksi tietovarastoksi
+settings.convert_fork_confirm = Konvertoi tietovarasto
+settings.add_collaborator_inactive_user = Inaktiivista käyttäjää ei voi lisätä avustajaksi.
+settings.mirror_settings.docs.pulling_remote_title = Etätietovarastosta vetäminen
+settings.pull_mirror_sync_in_progress = Vedetään muutoksia etäpuolelta %s tällä hetkellä.
+settings.convert = Konvertoi tavalliseksi tietovarastoksi
+settings.transfer_in_progress = Meneillään on jo siirto. Peruuta siirto, jos haluat siirtää tämän tietovaraston toiselle käyttäjälle.
+settings.trust_model.collaborator.desc = Tämän tietovaraston avustajien kelvolliset allekirjoitukset merkitään luotetuiksi ("trusted") - (ottamatta kantaa, vastaavatko he kommitoijaa vai eivät). Muussa tapauksessa allekirjoitetukset merkitään ei-luotetuiksi ("untrusted"), jos allekirjoitus vastaa kommitoijaa, ja vastaamaton ("unmatched") jos ei.
+settings.confirm_wiki_branch_rename = Nimeä uudelleen wikin haara
+settings.event_pull_request_assign = Toimeksianto
+settings.event_pull_request_assign_desc = Vetopyynnön toimeksianto luotu tai toimeksiannon osoitus poistettu.
+settings.event_pull_request_label_desc = Vetopyynnön nimilappuja lisätty tai poistettu.
+settings.active = Aktiivinen
+settings.packagist_api_token = API-poletti
+settings.protect_whitelist_committers = Sallittujen listalla rajoitettu työntö
+settings.protect_enable_merge = Ota yhdistäminen käyttöön
+settings.protect_enable_merge_desc = Kenen tahansa kirjoituspääsyllä sallitaan yhdistää vetopyynnöt tähän haaraan.
+settings.protect_status_check_patterns = Tilatarkistuskaavat
+settings.protect_invalid_status_check_pattern = Virheellinen tilatarkistuksen kaava: "%s".
+settings.protect_no_valid_status_check_patterns = Ei kelvollisia tilatarkistuksen kaavoja.
+settings.protect_required_approvals_desc = Salli yhdistäminen vain vetopyynnöille, joilla on riittävästi positiivisia katselmointeja.
+settings.protect_protected_file_patterns = Suojattujen tiedostojen kaavat (erotettu puolipisteellä ";")
+settings.remove_protected_branch_success = Haaran suojaus säännölle "%s" on poistettu.
+settings.enforce_on_admins = Pakota tämä sääntö tietovaraston ylläpitäjiin
+settings.add_key_success = Toimitusavain "%s" on lisätty.
+settings.update_mirror_settings = Päivitä peilin asetukset
+settings.tracker_url_format_error = Ulkoisen ongelmanseurannan URL-muoto ei ole kelvollinen URL-osoite.
+settings.wiki_rename_branch_main = Normalisoi Wiki-haaran nimi
+settings.wiki_delete_notices_1 = - Tämä poistaa pysyvästi wikin ja poistaa tietovaraston %s wikin käytöstä.
+settings.webhook.replay.description_disabled = Toista webkoukku aktivoimalla se.
+settings.add_webhook_desc = Forgejo lähettää <code>POST</code>-pyyntöjä määritetyllä "Content-Type":llä kohde-URL-osoitteeseen. Lue lisää <a target="_blank" rel="noopener noreferrer" href="%s">webkoukkujen oppaasta</a>.
+activity.title.unresolved_conv_n = %d selvittämätöntä keskustelua
+activity.title.releases_published_by = %s julkaissut %s
+settings.desc = Asetuksissa voit hallita tietovaraston asetuksia
+settings.external_tracker_url_desc = Kävijät ohjataan ulkoisen ongelmanseurannan URL-osoitteeseen, kun Ongelmat-välilehteä napsautetaan.
+settings.tracker_issue_style = Ulkoisen ongelmanseurannan numeromuoto
+settings.tracker_issue_style.regexp_pattern = Säännöllisen lausekkeen kaava
+settings.convert_confirm = Konvertoi tietovarasto
+settings.webhook.delivery.success = Tapahtuma on lisätty toimitusjonoon. Saattaa kestää muutama sekunti, ennen kuin se näkyy toimitushistoriassa.
+settings.event_pull_request_approvals = Vetopyynnön hyväksynnät
+settings.protect_enable_push = Ota työntö käyttöön
+settings.protect_whitelist_committers_desc = Vain sallittujen listalla olevat käyttäjät tai tiimit sallitaan työntää tähän haaraan (mutta ei työntää väkisin).
+settings.block_rejected_reviews = Estä yhdistäminen hylätyillä katselmoinneilla
+settings.is_writable = Ota kirjoituspääsy käyttöön
+settings.delete_notices_fork_1 = - Poistamisen jälkeen tämän tietovaraston forkeista tulee itsenäisiä.
+settings.event_pull_request_review_request_desc = Vetopyynnön katselmointi pyydetty tai katselmointipyyntö poistettu.
+settings.event_pull_request_merge = Vetopyynnön yhdistäminen
+settings.protect_approvals_whitelist_enabled = Rajoita hyväksynnät vain sallittujen käyttäjien tai tiimien listoilla oleviin
+settings.packagist_package_url = Packagist-paketin URL-osoite
+settings.packagist_username = Packagist-käyttäjänimi
+settings.sourcehut_builds.manifest_path = Koontimanifestin polku
+settings.event_pull_request_sync_desc = Haara päivitetty automaattisesti kohdehaaralla.
+settings.trust_model.committer = Kommitoija
+settings.convert_succeed = Peili on konvertoitu tavalliseksi tietovarastoksi.
+settings.transfer_notices_1 = - Menetät pääsyn tähän tietovarastoon, jos siirrät sen yksittäiselle käyttäjälle.
+settings.githooks_desc = Git-koukuista vastaa Git itse. Voit muokata koukkutiedostoja alla määrittääksesi omavalintaisia toimenpiteitä.
+settings.update_protect_branch_success = Haaran suojaus säännölle "%s" on päivitetty.
+settings.mirror_settings.direction.push = Työntö
+settings.convert_desc = Voit konvertoida tämän peilin tavalliseksi tietovarastoksi. Tätä ei voi perua.
+settings.trust_model.committer.long = Kommitoija: Luota allekirjoituksiin, jotka vastaavat kommitoijia (Tämä vastaa GitHubia ja pakottaa Forgejo-allekirjoitetut kommitit olemaan Forgejo-käyttäjän kommitoimia)
+settings.protected_branch_deletion_desc = Haaran suojauksen poistaminen käytöstä sallii käyttäjien kirjoitusoikeudella työntää haaraan. Jatketaanko?
+settings.admin_code_indexer = Koodin indeksoija
+settings.remove_protected_branch_failed = Haaran suojaussäännön "%s" poistaminen epäonnistui.
+settings.block_outdated_branch = Estä yhdistäminen jos vetopyyntö on vanhentunut
+settings.protect_branch_name_pattern_desc = Suojattujen haarojen nimien kaavat. Lue <a href="%s">dokumentaatio</a> kaavojen syntaksista. Esimerkkejä: main, release/**
+settings.block_rejected_reviews_desc = Yhdistäminen ei ole mahdollista, kun viralliset katselmoijat pyytävät muutoksia, siitä huolimatta että hyväksyntöjä olisi riittävästi.
+settings.convert_notices_1 = Tämä toimenpide konvertoi peilin tavalliseksi tietovarastoksi, eikä toimenpidettä voi perua.
+settings.convert_fork_notices_1 = Tämä toimenpide konvertoi forkin tavalliseksi tietovarastoksi, eikä toimenpidettä voi perua.
+settings.convert_fork_succeed = Forkki on konvertoitu tavalliseksi tietovarastoksi.
+settings.transfer_abort_invalid = Et voi perua olematonta tietovaraston siirtoa.
+settings.trust_model.default.desc = Käytä oletusarvoista tietovaraston luottamusmallia tälle asennukselle.
+settings.enforce_on_admins_desc = Tietovaraston ylläpitäjät eivät voi ohittaa tätä sääntöä.
+settings.reindex_requested = Uudelleenindeksointi pyydetty
+settings.admin_stats_indexer = Kooditilastojen indeksoija
+settings.admin_indexer_commit_sha = Viimeksi indeksoitu kommitti
+settings.webhook.replay.description = Toista webkoukku uudelleen.
+settings.event_push_only = Työntötapahtumat
+settings.authorization_header_desc = Sisällytetään Authorization-otsakkeeseen pyynnöissä. Esimerkkejä: %s.
+settings.protect_approvals_whitelist_teams = Katselmointeihin oikeutettujen tiimien lista
+settings.federation_not_enabled = Federaatiota ei ole käytössä käyttämässäsi instanssissa.
+settings.mirror_settings.push_mirror.none_ssh = Ei mitään
+settings.mirror_settings.direction.pull = Veto
+settings.push_mirror_sync_in_progress = Työnnetään muutoksia etäpuoleen %s tällä hetkellä.
+settings.transfer_notices_2 = - Säilytät pääsyn tietovarastoon, jos siirrät sen organisaatiolle, jonka omistat kokonaan tai osittain.
+settings.protect_merge_whitelist_teams = Yhdistämiseen oikeutettujen tiimien lista
+settings.protect_check_status_contexts_list = Tilatarkistuksia löytyi tälle tietovarastolle viime viikolta
+settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Tällä hetkellä tämä on mahdollista vain valitsemalla "Uusi migraatio" valikosta. Saadaksesi lisätietoja:
+settings.mirror_settings.docs.disabled_push_mirror.info = Työntöpeilit on poistettu käytöstä sivuston ylläpidon toimesta.
+settings.mirror_settings.mirrored_repository = Peilattu tietovarasto
+settings.protect_check_status_contexts = Ota tilatarkistus käyttöön
+settings.pulls.default_delete_branch_after_merge = Poista vetopyynnön haara yhdistämisen jälkeen oletusarvoisesti
+settings.content_type = POST-sisältötyyppi
+settings.event_pull_request_comment_desc = Vetopyynnön kommentti luotu, muokattu tai poistettu.
+settings.event_pull_request_review_desc = Vetopyyntö hyväksytty, hylätty tai katselmoinnin kommentteja lisätty.
+settings.admin_indexer_unindexed = Indeksöimätön
+settings.reindex_button = Lisää uudelleenindeksoinnin jonoon
+settings.web_hook_name_wechatwork = WeCom (Wechat Work)
+settings.delete_team_tip = Tällä tiimillä on pääsy kaikkiin tietovarastoihin, eikä sitä voi poistaa
+settings.sourcehut_builds.visibility = Työn näkyvyys
+settings.sourcehut_builds.access_token_helper = Pääsypoletti, jolla on myöntö JOBS:RW. Luo <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-poletti</a> tai <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht-poletti pääsyllä salaisuuksiin</a> meta.sr.ht:ssä.
+settings.team_not_in_organization = Tiimi ei ole samassa organisaatiossa kuin tietovarasto
+settings.add_team_duplicate = Tiimillä on jo tietovarasto
+settings.add_webhook.invalid_channel_name = Webkoukun kanavan nimi ei voi olla tyhjä, eikä se voi sisältää vain merkkiä #.
+settings.sourcehut_builds.secrets_helper = Anna työlle pääsy koontisalaisuuksiin (vaatii myönnön SECRETS:RO)
+settings.protect_disable_push_desc = Tähän haaraan ei sallita työntämistä.
+settings.protect_disable_push = Poista työntö käytöstä
+activity.unresolved_conv_desc = Näitä äskettäin muuttuneita ongelmia ja vetopyyntöjä ei ole vielä selvitetty.
+activity.title.unresolved_conv_1 = %d selvittämätön keskustelu
+activity.git_stats_files_changed_1 = on muuttunut
+settings.convert_fork_desc = Voit konvertoida tämän forkin tavalliseksi tietovarastoksi. Tätä ei voi perua.
+settings.protect_merge_whitelist_committers = Ota yhdistämiseen sallittu lista käyttöön
+settings.protect_whitelist_teams = Työntämiseen oikeutettujen tiimien lista
+settings.protect_enable_push_desc = Kenen tahansa kirjoituspääsyllä sallitaan työntää tähän haaraan (mutta ei työntää väkisin).
+settings.change_team_access_not_allowed = Tiimin pääsyn muuttaminen tietovarastoon on rajoitettu organisaation omistajaan
+settings.change_team_permission_tip = Tiimin käyttöoikeus on asetettu tiimin asetussivulla, eikä sitä voi muuttaa tietovarastokohtaisesti
+settings.rename_branch_failed_protected = Haaraa %s ei voi nimetä uudelleen, koska se on suojattu haara.
+release.hide_archive_links = Piilota automaattisesti luodut arkistot
+diff.review.self_reject = Vetopyyntöjen tekijät eivät voi pyytää muutoksia omiin vetopyyntöihinsä
+settings.unarchive.text = Tietovaraston arkistoinnin kumoaminen palauttaa mahdollisuuden vastaanottaa kommitteja ja työntöjä, sekä luoda uusia ongelmia ja vetopyyntöjä.
+settings.unarchive.success = Tietovaraston arkistointi kumottiin.
+settings.update_avatar_success = Tietovaraston profiilikuva päivitettiin.
+diff.review.self_approve = Vetopyyntöjen tekijät eivät voi hyväksyä omia vetopyyntöjään
+tag.ahead.target = haaraan %s tämän tagin jälkeen
+release.add_tag_msg = Käytä otsikkoa ja julkaisun sisältöä tagin viestinä.
+branch.rename_branch_to = Aseta haaran "%s" uudeksi nimeksi:
+error.csv.too_large = Tätä tiedostoa ei voi renderöidä, koska se on liian suuri.
+settings.unarchive.error = Tietovaraston arkistointia kumotessa tapahtui virhe. Katso lisätietoja lokista.
+settings.rename_branch_failed_exist = Haaraa ei voi nimetä uudelleen, koska kohdehaara %s on olemassa.
+release.tag_helper_new = Uusi tagi. Tämä tagi luodaan kohteesta.
+diff.review = Viimeistele katselmointi
+error.broken_git_hook = Tämän tietovaraston Git-koukut vaikuttavat olevan rikki. Seuraa <a target="_blank" rel="noreferrer" href="%s">dokumentaation</a> ohjeita korjataksesi koukut, sen jälkeen työnnä kommitteja päivittääksesi tilan.
+error.csv.unexpected = Tätä tiedostoa ei voi renderöidä, koska se sisältää odottamattoman merkin rivillä %d ja sarakkeessa %d.
+settings.archive.error = Tietovarastoa arkistoitaessa tapahtui virhe. Katso lisätietoja lokista.
+diff.comment.add_line_comment = Lisää rivikommentti
+settings.lfs_lock = Lukitse
+settings.chat_id = Keskustelun ID-tunniste
+settings.thread_id = Ketjun ID-tunniste
+settings.archive.mirrors_unavailable = Peilit eivät ole saatavilla arkistoiduissa tietovarastoissa.
+branch.tag_collision = Haaraa "%s" ei voi luoda, koska tagi samalla nimellä on jo olemassa tietovarastossa.
+diff.git-notes.remove-header = Poista huomautus
+diff.git-notes.remove-body = Tämä huomautus poistetaan.
+diff.git-notes.add = Lisää huomautus
+release.invalid_external_url = Virheellinen ulkoinen URL-osoite: "%s"
+release.asset_external_url = Ulkoinen URL-osoite
+branch.delete_branch_has_new_commits = Haaraa "%s" ei voi poistaa, koska uusia kommitteja on lisätty yhdistämisen jälkeen.
+branch.branch_name_conflict = Haaran nimi "%s" on ristiriidassa olemassa olevan haaran "%s" kanssa.
+settings.unarchive.header = Kumoa tämän tietovaraston arkistointi
+settings.matrix.room_id = Huoneen ID-tunniste
+issues.blocked_by_user = Et voi luoda ongelmia tähän tietovarastoon, koska tietovaraston omistaja on estänyt sinut.
+pulls.desc = Ota vetopyynnöt ja koodikatselmoinnit käyttöön.
+pulls.push_rejected = Työntö epäonnistui: Työntö hylättiin. Katselmoi tämän tietovaraston Git-koukut.
+form.name_reserved = Tietovaraston nimi "%s" on varattu.
+form.reach_limit_of_creation_1 = Omistajan %d tietovaraston rajoitus on jo täynnä.
+form.reach_limit_of_creation_n = Omistajan %d tietovaraston rajoitus on jo täynnä.
+form.string_too_long = Merkkijono on pidempi kuin %d merkkiä.
+mirror_address_protocol_invalid = Määritetty URL-osoite on virheellinen. Vain http(s):// tai git:// -sijainteja voi käyttää peilaukseen.
+form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu tietovaraston nimessä.
+migrate_options_lfs_endpoint.description.local = Paikallinen palvelinpolku on myös tuettu.
+pulls.showing_only_single_commit = Näytetään vain kommitin %[1]s muutokset
+pulls.invalid_merge_option = Et voi käyttää tätä yhdistämisvalintaa tälle vetopyynnölle.
+pulls.squash_merge_pull_request = Luo squash-kommitti
+issues.label_templates.info = Nimilappuja ei ole. Luo nimilappu napsauttamalla "Uusi nimilappu" tai käytä nimilapun esiasetusta:
+issues.label_archive = Arkistoi nimilappu
+mirror_lfs_desc = Aktivoi LFS-datan peilaaminen.
+editor.directory_is_a_file = Hakemiston nimi "%s" on jo käytössä tiedoston nimenä tässä tietovarastossa.
+projects.desc = Hallitse ongelmia ja vetoja projektitauluilla.
+ext_issues = Ulkoiset ongelmat
+issues.label_archive_tooltip = Arkistoidut nimilaput on suljettu pois ehdotuksista oletusarvoisesti, kun haku suoritetaan nimilapulla.
+issues.ref_reopened_from = `<a href="%[3]s">avasi uudelleen tämän ongelman %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_closed_from = `<a href="%[3]s">sulki tämän ongelman %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+migrate_options_lfs_endpoint.description = Migraatio yrittää käyttää Git-etätietovarastoasi <a target="_blank" rel="noopener noreferrer" href="%s">LFS-palvelimen määrittämiseen</a>. Voit määrittää omavalintaisen päätepisteen, jos tietovarastosi LFS-data on talletettu jonnekin muualle.
+settings.mirror_settings.docs.pull_mirror_instructions = Vetopeilin määrittämiseksi konsultoi:
+issues.archived_label_description = (Arkistoitu) %s
+editor.filename_is_a_directory = Tiedoston nimi "%s" on jo käytössä hakemiston nimenä tässä tietovarastossa.
+pulls.fast_forward_only_merge_pull_request = Pelkkä fast-forward
+pulls.rebase_merge_commit_pull_request = Rebase, luo sitten yhdistämiskommitti
+pulls.rebase_merge_pull_request = Rebase, sitten fast-forward
+admin.enabled_flags = Tässä tietovarastossa käytössä olevat liput:
+admin.update_flags = Päivitä liput
+admin.failed_to_replace_flags = Tietovaraston lippujen korvaaminen epäonnistui
+admin.flags_replaced = Tietovaraston liput korvattu
+admin.manage_flags = Hallitse lippuja
+editor.file_is_a_symlink = `"%s" on symbolinen linkki. Symbolisia linkkejä ei voi muokata selainkäyttöliittymän editorissa`
+rss.must_be_on_branch = Sinun täytyy olla haarassa saadaksesi RSS-syötteen.
+
+
 
 [graphs]
 component_loading_info = Tämä saattaa kestää hetken…
 component_failed_to_load = Odottamaton virhe.
 component_loading = Ladataan %s…
 contributors.what = kontribuutiot
-recent_commits.what = viimeisimmät kommitit
+recent_commits.what = viimeaikaiset kommitit
 code_frequency.what = koodifrekvenssi
 component_loading_failed = Ei voitu ladata %s
 
@@ -2211,7 +2606,7 @@ repo_updated=Päivitetty %s
 members=Jäsenet
 teams=Tiimit
 lower_members=jäsentä
-lower_repositories=repot
+lower_repositories=tietovarastot
 create_new_team=Uusi tiimi
 create_team=Luo tiimi
 org_desc=Kuvaus
@@ -2220,16 +2615,16 @@ team_desc=Kuvaus
 team_name_helper=Tiimin nimen tulisi olla lyhyt ja mieleenpainuva.
 team_desc_helper=Kuvaile tiimin tarkoitusta tai roolia.
 team_permission_desc=Käyttöoikeus
-team_unit_desc=Salli pääsy repon osioihin
+team_unit_desc=Salli pääsy tietovaraston osioihin
 
 
 settings=Asetukset
 settings.options=Organisaatio
 settings.full_name=Koko nimi
-settings.website=Nettisivu
+settings.website=Verkkosivusto
 settings.location=Sijainti
 settings.permission=Käyttöoikeudet
-settings.repoadminchangeteam=Repon ylläpitäjä voi lisätä ja poistaa pääsyn tiimeihin
+settings.repoadminchangeteam=Tietovaraston ylläpitäjä voi lisätä ja poistaa pääsyn tiimeihin
 settings.visibility=Näkyvyys
 settings.visibility.public=Julkinen
 settings.visibility.limited_shortname=Rajattu
@@ -2239,83 +2634,92 @@ settings.visibility.private_shortname=Yksityinen
 settings.update_settings=Päivitä asetukset
 settings.delete=Poista organisaatio
 settings.delete_account=Poista tämä organisaatio
-settings.delete_prompt=Organisaatio poistetaan pysyvästi, ja tätä <strong>EI VOI</strong> peruuttaa myöhemmin!
+settings.delete_prompt=Organisaatio poistetaan pysyvästi, ja tätä <strong>EI VOI</strong> perua myöhemmin!
 settings.confirm_delete_account=Vahvista poisto
 settings.delete_org_title=Poista organisaatio
-settings.hooks_desc=Lisää webkoukkuja, jotka suoritetaan <strong>kaikissa repoissa</strong> tässä organisaatiossa.
+settings.hooks_desc=Lisää webkoukkuja, jotka suoritetaan <strong>kaikissa tietovarastoissa</strong> tässä organisaatiossa.
 
 
 members.membership_visibility=Jäsenyyden näkyvyys:
 members.public=Näkyvä
-members.public_helper=tee piilotettu
+members.public_helper=Tee piilotetuksi
 members.private=Piilotettu
-members.private_helper=tee näkyvä
+members.private_helper=Tee näkyväksi
 members.member_role=Jäsenen rooli:
 members.owner=Omistaja
 members.member=Jäsen
 members.remove=Poista
 members.leave=Poistu
-members.invite_desc=Lisää uusi jäsen %s:
+members.invite_desc=Lisää uusi jäsen organisaatioon %s:
 members.invite_now=Kutsu nyt
 
 teams.join=Liity
 teams.leave=Poistu
-teams.read_access=Luettu
+teams.read_access=Lue
 teams.read_access_helper=Tiimin jäsenet voivat katsella ja kloonata tiimin varastoja.
 teams.write_access_helper=Tiimin jäsenet voivat lukea ja työntää tiimin varastoja/varastoihin.
-teams.admin_access=Ylläpito-oikeus
-teams.admin_access_helper=Tiimin jäsenet voivat työntää (push) ja vetää (pull) tiimin varastoista/varastoihin ja lisätä yhteistyökumppaneita.
+teams.admin_access=Ylläpitopääsy
+teams.admin_access_helper=Tiimin jäsenet voivat työntää (push) ja vetää (pull) tiimin varastoista/varastoihin ja lisätä avustajia.
 teams.no_desc=Tällä tiimillä ei ole kuvausta
 teams.settings=Asetukset
-teams.owners_permission_desc=Omistajilla on täydet käyttöoikeudet <strong>kaikkiin organisaation repoihin</strong> sekä organisaation <strong>ylläpitäjän oikeudet</strong>.
+teams.owners_permission_desc=Omistajilla on täydet käyttöoikeudet <strong>kaikkiin organisaation tietovarastoihin</strong> sekä organisaation <strong>ylläpitäjän oikeudet</strong>.
 teams.members=Tiimin jäsenet
 teams.update_settings=Päivitä asetukset
 teams.delete_team=Poista tiimi
 teams.add_team_member=Lisää tiimin jäsen
 teams.delete_team_title=Poista tiimi
-teams.delete_team_desc=Tiimin poisto peruuttaa sen jäseniltä oikeuden päästä tiimin varastoihin. Jatketaanko?
+teams.delete_team_desc=Tiimin poisto peruuttaa sen jäseniltä oikeuden päästä tiimin tietovarastoihin. Jatketaanko?
 teams.delete_team_success=Tiimi on poistettu.
-teams.read_permission_desc=Tämä tiimi myöntää jäsenille <strong>Luku</strong> oikeudet: tiimin jäsenet voivat katsella ja kloonata tiimin varastoja.
-teams.write_permission_desc=Tämä tiimi myöntää jäsenille <strong>Kirjoitus</strong> oikeuden: tiimin jäsenet voivat lukea ja kirjoittaa tiimin repoihin.
-teams.admin_permission_desc=Tämä tiimi myöntää jäsenille <strong>Ylläpito</strong>-oikeudet: Tiimin jäsenet voivat työntää (push) ja vetää (pull) tiimin varastoista/varastoihin ja lisätä yhteistyökumppaneita.
-teams.repositories=Tiimin repot
+teams.read_permission_desc=Tämä tiimi myöntää jäsenille <strong>Lue</strong>-oikeuden: tiimin jäsenet voivat katsella ja kloonata tiimin tietovarastoja.
+teams.write_permission_desc=Tämä tiimi myöntää jäsenille <strong>Kirjoita</strong>-oikeuden: tiimin jäsenet voivat lukea ja kirjoittaa tiimin tietovarastoihin.
+teams.admin_permission_desc=Tämä tiimi myöntää <strong>Ylläpito</strong>-oikeuden: jäsenet voivat lukea tiimin tietovarastoista, työntää ja lisätä avustajia niihin.
+teams.repositories=Tiimin tietovarastot
 teams.members.none=Ei jäseniä tässä tiimissä.
-teams.all_repositories=Kaikki repot
+teams.all_repositories=Kaikki tietovarastot
 teams.invite.by = Kutsunut %s
 members.leave.detail = Haluatko varmasti poistua organisaatiosta "%s"?
-teams.add_all_repos_title = Lisää kaikki repot
+teams.add_all_repos_title = Lisää kaikki tietovarastot
 teams.invite_team_member.list = Odottavat kutsut
 teams.invite.description = Napsauta alla olevaa painiketta liittyäksesi tiimiin.
-settings.update_setting_success = Organisaatioasetukset on päivitetty.
+settings.update_setting_success = Organisaation asetukset on päivitetty.
 form.create_org_not_allowed = Sinulla ei ole oikeutta luoda organisaatiota.
 teams.leave.detail = Haluatko varmasti poistua tiimistä "%s"?
 teams.invite.title = Sinut on kutsuttu tiimiin <strong>%s</strong> organisaatiossa <strong>%s</strong>.
-teams.add_duplicate_users = Käyttäjä on jo tiimijäsen.
+teams.add_duplicate_users = Käyttäjä on jo tiimin jäsen.
 settings.visibility.limited = Rajattu (näkyvissä vain kirjautuneille käyttäjille)
 code = Koodi
-teams.remove_all_repos_title = Poista kaikki tiimin repot
+teams.remove_all_repos_title = Poista kaikki tiimin tietovarastot
 form.name_reserved = Organisaation nimi "%s" on varattu.
 settings.delete_org_desc = Organisaatio poistetaan pysyvästi. Jatketaanko?
-team_access_desc = Repositorion käyttö
-teams.specific_repositories = Määritetyt repositoriot
+team_access_desc = Tietovarastopääsy
+teams.specific_repositories = Määritetyt tietovarastot
 open_dashboard = Avaa kojelauta
-teams.remove_all_repos_desc = Tämä poistaa kaikki repot tiimiltä.
-teams.add_all_repos_desc = Tämä lisää kaikki organisaation repot tiimille.
+teams.remove_all_repos_desc = Tämä poistaa kaikki tietovarastot tiimiltä.
+teams.add_all_repos_desc = Tämä lisää kaikki organisaation tietovarastot tiimille.
 team_unit_disabled = (Pois käytöstä)
 follow_blocked_user = Et voi seurata tätä organisaatiota, koska organisaatio on estänyt sinut.
-teams.can_create_org_repo = Luo repoja
+teams.can_create_org_repo = Luo tietovarastoja
 teams.none_access = Ei pääsyä
 form.name_pattern_not_allowed = Kaava "%s" ei ole sallittu organisaation nimessä.
 settings.email = Yhteydenoton sähköposti
 teams.general_access = Mukautettu pääsy
 settings.change_orgname_redirect_prompt = Vanha nimi uudelleenohjaa, kunnes nimi otetaan uudelleen käyttöön.
 settings.change_orgname_prompt = Huomio: organisaation nimen vaihtaminen vaihtaa myös organisaation URL-osoitteen ja vapauttaa vanhan nimen.
+teams.write_access = Kirjoita
+settings.update_avatar_success = Organisaation profiilikuva on päivitetty.
+teams.can_create_org_repo_helper = Jäsenet voivat luoda uusia tietovarastoja organisaatiossa. Tietovaraston luonut saa ylläpito-oikeuden uuteen tietovarastoon.
+teams.create_repo_permission_desc = Lisäksi tämä tiimi myöntää <strong>Luo tietovarasto</strong> -oikeuden: jäsenet voivat luoda uusia tietovarastoja organisaatiossa.
+teams.add_nonexistent_repo = Tietovarasto, jota yrität lisätä, ei ole olemassa. Luo se ensin.
+teams.repos.none = Tällä tiimillä ei ole pääsyä tietovarastoihin.
+settings.change_orgname_redirect_prompt.with_cooldown.one = Vanha organisaation nimi on kenen tahansa saatavilla %[1]d päivän suojaamisjakson jälkeen. Voit palauttaa organisaation nimen itsellesi suojaamisjakson aikana.
+settings.change_orgname_redirect_prompt.with_cooldown.few = Vanha organisaation nimi on kenen tahansa saatavilla %[1]d päivän suojaamisjakson jälkeen. Voit palauttaa organisaation nimen itsellesi suojaamisjakson aikana.
+teams.all_repositories_helper = Tiimillä on pääsy kaikkiin tietovarastoihin. Tämän valitseminen <strong>lisää kaikki olemassa olevat</strong> tietovarastot tiimiin.
 
 [admin]
 dashboard=Kojelauta
 users=Käyttäjätilit
 organizations=Organisaatiot
-repositories=Repot
+repositories=Tietovarastot
 authentication=Todennuslähteet
 emails=Käyttäjien sähköpostit
 config=Asetukset
@@ -2328,48 +2732,48 @@ total=Yhteensä: %d
 dashboard.statistic=Yhteenveto
 dashboard.operations=Huoltotoimet
 dashboard.system_status=Järjestelmän tila
-dashboard.operation_name=Toiminnon nimi
+dashboard.operation_name=Toimenpiteen nimi
 dashboard.operation_switch=Vaihda
 dashboard.operation_run=Suorita
-dashboard.delete_inactive_accounts=Poista kaikki aktivoimattomat käyttäjät
-dashboard.delete_repo_archives=Poista kaikki repojen arkistot (ZIP, TAR.GZ, jne..)
+dashboard.delete_inactive_accounts=Poista kaikki aktivoimattomat tilit
+dashboard.delete_repo_archives=Poista kaikki tietovarastojen arkistot (ZIP, TAR.GZ, jne.)
 dashboard.server_uptime=Palvelimen uptime
 dashboard.current_goroutine=Nykyiset goroutinet
 dashboard.current_memory_usage=Nykyinen muistinkäyttö
 dashboard.total_memory_allocated=Yhteensä muistia varattu
 dashboard.memory_obtained=Muistia saatu
-dashboard.pointer_lookup_times=Pointteri lookup ajat
-dashboard.current_heap_usage=Nykyinen heap käyttö
-dashboard.heap_memory_obtained=Heap muistia saatu
-dashboard.heap_memory_idle=Heap muistia tyhjäkäynnillä
-dashboard.heap_memory_in_use=Heap muistia käytössä
-dashboard.heap_memory_released=Heap muisti vapautettu
-dashboard.heap_objects=Heap objekteja
-dashboard.bootstrap_stack_usage=Bootstrap pinon käyttö
-dashboard.stack_memory_obtained=Pino muistia saatu
-dashboard.mspan_structures_usage=MSpan rakenteiden käyttö
-dashboard.mspan_structures_obtained=MSpan rakenteita saatu
-dashboard.mcache_structures_usage=MCache rakenteiden käyttö
-dashboard.mcache_structures_obtained=MCache rakenteita saatu
-dashboard.profiling_bucket_hash_table_obtained=Profilointi Bucket Hash Table saatu
-dashboard.gc_metadata_obtained=GC metatietoja saatu
-dashboard.other_system_allocation_obtained=Muita järjestestelmän varauksia saatu
-dashboard.next_gc_recycle=Seuraava GC-kierrätys
-dashboard.last_gc_time=Edellisen GC ajan jälkeen
+dashboard.pointer_lookup_times=Osoittimen hakuajat
+dashboard.current_heap_usage=Nykyinen heapin käyttö
+dashboard.heap_memory_obtained=Heap-muisti saatu
+dashboard.heap_memory_idle=Heap-muisti tyhjäkäynnillä
+dashboard.heap_memory_in_use=Heap-muisti käytössä
+dashboard.heap_memory_released=Heap-muisti vapautettu
+dashboard.heap_objects=Heap-objektit
+dashboard.bootstrap_stack_usage=Bootstrap-pinon käyttö
+dashboard.stack_memory_obtained=Pinonmuisti saatu
+dashboard.mspan_structures_usage=MSpan-rakenteiden käyttö
+dashboard.mspan_structures_obtained=MSpan-rakenteet saatu
+dashboard.mcache_structures_usage=MCache-rakenteiden käyttö
+dashboard.mcache_structures_obtained=MCache-rakenteet saatu
+dashboard.profiling_bucket_hash_table_obtained=Profilointiämpäritiivistetaulukko saatu
+dashboard.gc_metadata_obtained=Roskienkeruumetatiedot saatu
+dashboard.other_system_allocation_obtained=Muu järjestestelmän varaus saatu
+dashboard.next_gc_recycle=Seuraava roskienkeruukierrätys
+dashboard.last_gc_time=Aika edellisestä roskienkeruusta
 dashboard.total_gc_time=Yhteensä GC tauko
-dashboard.total_gc_pause=Yhteensä GC tauko
-dashboard.last_gc_pause=Viime GC tauko
-dashboard.gc_times=GC aikoja
+dashboard.total_gc_pause=Yhteensä roskienkeruutauko
+dashboard.last_gc_pause=Viimeinen roskienkeruutauko
+dashboard.gc_times=Roskienkeruuajat
 
 users.user_manage_panel=Käyttäjätilien hallinta
 users.new_account=Luo käyttäjätili
-users.name=Käyttäjätunnus
+users.name=Käyttäjänimi
 users.full_name=Koko nimi
 users.activated=Aktivoitu
 users.admin=Ylläpito
 users.restricted=Rajoitettu
 users.2fa=2FA
-users.repos=Repot
+users.repos=Tietovarastot
 users.created=Luotu
 users.last_login=Viimeksi kirjautunut
 users.never_login=Ei koskaan kirjautunut
@@ -2381,7 +2785,7 @@ users.update_profile_success=Käyttäjän tili on päivitetty.
 users.edit_account=Muokkaa käyttäjätiliä
 users.max_repo_creation_desc=(Aseta -1 käyttääksesi globaalia oletusrajaa.)
 users.is_activated=Aktivoitu tili
-users.prohibit_login=Ota sisäänkirjautuminen pois käytöstä
+users.prohibit_login=Jäädytetty tili
 users.is_admin=Ylläpitäjätili
 users.is_restricted=Rajoitettu tili
 users.allow_git_hook=Voi luoda Git-koukkuja
@@ -2416,7 +2820,7 @@ orgs.teams=Tiimit
 orgs.members=Jäsenet
 orgs.new_orga=Uusi organisaatio
 
-repos.repo_manage_panel=Repojen hallinta
+repos.repo_manage_panel=Tietovarastojen hallinta
 repos.owner=Omistaja
 repos.name=Nimi
 repos.private=Yksityinen
@@ -2429,7 +2833,7 @@ repos.size=Koko
 packages.owner=Omistaja
 packages.name=Nimi
 packages.type=Tyyppi
-packages.repository=Repo
+packages.repository=Tietovarasto
 packages.size=Koko
 
 
@@ -2446,8 +2850,8 @@ auths.domain=Verkkotunnus
 auths.host=Isäntä
 auths.port=Portti
 auths.bind_dn=Liitä DN
-auths.bind_password=Liitä salasana
-auths.user_base=Käyttäjä hakuperuste
+auths.bind_password=Sido salasana
+auths.user_base=Käyttäjähakukanta
 auths.user_dn=Käyttäjä DN
 auths.search_page_size=Sivukoko
 auths.filter=Käyttäjäsuodatin
@@ -2458,8 +2862,8 @@ auths.smtphost=SMTP-isäntä
 auths.smtpport=SMTP-portti
 auths.allowed_domains=Sallitut verkkotunnukset
 auths.skip_tls_verify=Ohita TLS-vahvistus
-auths.pam_service_name=PAM palvelun nimi
-auths.oauth2_tokenURL=Pääsymerkki URL
+auths.pam_service_name=PAM-palvelun nimi
+auths.oauth2_tokenURL=Pääsypoletin URL-osoite
 auths.enable_auto_register=Ota käyttöön automaattinen rekisteröinti
 auths.tips=Vinkit
 auths.tips.oauth2.general=OAuth2-autentikointi
@@ -2474,21 +2878,21 @@ auths.deletion_success=Todennuslähde on poistettu.
 config.server_config=Palvelimen asetukset
 config.app_name=Instanssin otsikko
 config.app_ver=Forgejo-versio
-config.disable_router_log=Poista käytöstä reitittimen loki
+config.disable_router_log=Poista reitittimen lokinkirjaaminen käytöstä
 config.run_mode=Suoritustila
 config.git_version=Git-versio
-config.repo_root_path=Repon juuren polku
-config.script_type=Komentosarjan tyyppi
-config.reverse_auth_user=Käänteinen todennus käyttäjä
+config.repo_root_path=Tietovaraston juuren polku
+config.script_type=Komentosarjatyyppi
+config.reverse_auth_user=Käänteinen välityspalvelin -todennuskäyttäjä
 
 config.ssh_config=SSH-asetukset
 config.ssh_enabled=Käytössä
 config.ssh_port=Portti
 config.ssh_listen_port=Kuuntele porttia
 config.ssh_root_path=Juuren polku
-config.ssh_key_test_path=Polku jossa avaimet testataan
-config.ssh_keygen_path=Keygen ('ssh-keygen') polku
-config.ssh_minimum_key_size_check=Avaimen vähimmäiskoko tarkistus
+config.ssh_key_test_path=Avaimen testipolku
+config.ssh_keygen_path=Keygen-polku ('ssh-keygen')
+config.ssh_minimum_key_size_check=Avaimen vähimmäiskoon tarkistus
 config.ssh_minimum_key_sizes=Avaimen vähimmäiskoot
 
 config.lfs_enabled=Käytössä
@@ -2497,7 +2901,7 @@ config.db_config=Tietokannan asetukset
 config.db_type=Tyyppi
 config.db_host=Isäntä
 config.db_name=Nimi
-config.db_user=Käyttäjätunnus
+config.db_user=Käyttäjänimi
 config.db_ssl_mode=SSL
 config.db_path=Polku
 
@@ -2524,25 +2928,25 @@ config.oauth_enabled=Käytössä
 config.cache_config=Välimuistin asetukset
 config.cache_adapter=Välimuistin sovitin
 config.cache_interval=Välimuistin aikaväli
-config.cache_conn=Välimuistin yhteys merkkijono
+config.cache_conn=Välimuistiyhteys
 
 config.session_config=Istunnon asetukset
 config.session_provider=Istunnon toimittaja
-config.provider_config=Toimittajan asetukset
+config.provider_config=Toimittajan määritys
 config.cookie_name=Evästeen nimi
-config.gc_interval_time=GC aikaväli aika
+config.gc_interval_time=Roskienkeruuaikaväli
 config.session_life_time=Istunnon elinikä
 config.https_only=Vain HTTPS
 config.cookie_life_time=Evästeen elinikä
 
 config.picture_service=Kuvapalvelu
-config.disable_gravatar=Poista käytöstä Gravatar
+config.disable_gravatar=Poista Gravatar käytöstä
 
-config.git_gc_args=Roskienkeruun parametrit
-config.git_migrate_timeout=Migraatio aikakatkaistiin
-config.git_mirror_timeout=Peilauspäivitys aikakatkaistiin
-config.git_clone_timeout=Kloonaus aikakatkaistiin
-config.git_gc_timeout=Roskienkeruu aikakatkaistiin
+config.git_gc_args=Roskienkeruu-argumentit
+config.git_migrate_timeout=Migraation aikakatkaisu
+config.git_mirror_timeout=Peilin päivityksen aikakatkaisu
+config.git_clone_timeout=Kloonaustoimenpiteen aikakatkaisu
+config.git_gc_timeout=Roskienkeruun aikakatkaisu
 
 config.log_config=Lokiasetukset
 config.disabled_logger=Pois käytöstä
@@ -2572,12 +2976,12 @@ notices.inverse_selection=Käänteinen valinta
 notices.delete_selected=Poista valitut
 notices.delete_all=Poista kaikki ilmoitukset
 notices.type=Tyyppi
-notices.type_1=Repo
+notices.type_1=Tietovarasto
 notices.desc=Kuvaus
 notices.op=Toiminta
 auths.sspi_auto_create_users = Luo käyttäjät automaattisesti
 integrations = Integraatiot
-emails.change_email_header = Päivitä sähköpostiominaisuudet
+emails.change_email_header = Päivitä sähköpostin ominaisuudet
 emails.change_email_text = Haluatko varmasti päivittää tämän sähköpostiosoitteen?
 emails.updated = Sähköpostiosoite päivitetty
 users.organization_creation.description = Salli uusien organisaatioiden luonti.
@@ -2593,8 +2997,8 @@ auths.force_smtps = Pakota SMTPS
 config.mailer_use_sendmail = Käytä Sendmailia
 users.new_success = Käyttäjätili "%s" on luotu.
 config.disable_register = Poista itserekisteröinti käytöstä
-config.enable_openid_signin = Käytä OpenID-kirjautumista
-config.enable_openid_signup = Käytä OpenID-itserekisteröintiä
+config.enable_openid_signin = Ota OpenID-kirjautuminen käyttöön
+config.enable_openid_signup = Ota OpenID-itserekisteröinti käyttöön
 monitor.queue.settings.changed = Asetukset päivitetty
 config.db_schema = Skeema
 settings = Ylläpitäjän asetukset
@@ -2610,7 +3014,7 @@ users.details = Käyttäjän tiedot
 config_summary = Yhteenveto
 config.send_test_mail = Lähetä testisähköposti
 auths.oauth2_icon_url = Kuvakkeen URL-osoite
-config.mail_notify = Käytä sähköposti-ilmoituksia
+config.mail_notify = Ota sähköposti-ilmoitukset käyttöön
 config.send_test_mail_submit = Lähetä
 systemhooks = Järjestelmän webkoukut
 packages.total_size = Koko yhteensä: %s
@@ -2641,7 +3045,7 @@ config.register_email_confirm = Vaadi sähköpostivahvistus rekisteröitymiseen
 config.ssh_domain = SSH-palvelimen verkkotunnus
 config.app_slogan = Instanssin tunnuslause
 config.lfs_content_path = LFS-sisällön polku
-users.max_repo_creation = Repojen enimmäismäärä
+users.max_repo_creation = Tietovarastojen enimmäismäärä
 defaulthooks.update_webhook = Päivitä oletusarvoinen webkoukku
 auths.auth_manage_panel = Todennuslähteiden hallinta
 config.custom_conf = Asetustiedoston polku
@@ -2663,27 +3067,117 @@ config.default_allow_only_contributors_to_track_time = Salli vain avustajien seu
 monitor.download_diagnosis_report = Lataa diagnostiikkaraportti
 monitor.duration = Kesto (s)
 monitor.last_execution_result = Tulos
-
-
+users.bot = Botti
+auths.syncenabled = Ota käyttäjäsynkronointi käyttöön
+auths.enable_ldap_groups = Ota LDAP-ryhmät käyttöön
 dashboard.sync_branch.started = Haarasynkronointi aloitettu
 dashboard.sync_tag.started = Tagisynkronointi aloitettu
-users.bot = Botti
-auths.syncenabled = Käytä käyttäjäsynkronointia
-auths.enable_ldap_groups = Käytä LDAP-ryhmiä
 auths.login_source_exist = Todennuslähde "%s" on jo olemassa.
+config.enable_timetracking = Ota ajanseuranta käyttöön
+config.default_enable_timetracking = Ota ajanseuranta käyttöön oletuksena
+config.no_reply_address = Piilotetun sähköpostin verkkotunnus
+config.allow_dots_in_usernames = Salli käyttäjien käyttää pisteitä käyttäjänimissään. Ei vaikuta olemassa oleviin tileihin.
+repos.unadopted.no_more = Omaksumattomia tietovarastoja ei löytynyt.
+repos.unadopted = Omaksumattomat tietovarastot
+dashboard.repo_health_check = Tee terveystarkastus kaikille tietovarastoille
+users.reserved = Varattu
+users.purge = Hävitä käyttäjä
+dashboard.cron.process = Cron: %[1]s
+auths.tip.github = Rekisteröi uusi OAuth-sovellus %sissa
+config.app_data_path = Sovellusdatan polku
+config.cache_test_slow = Välimuistin testi onnistui, mutta vastaus on hidas: %s.
+dashboard.delete_repo_archives.started = Poista kaikki tietovarastojen arkistot -tehtävä aloitettu.
+dashboard.check_repo_stats = Tarkista kaikkien tietovarastojen tilastot
+users.still_own_packages = Tämä käyttäjä omistaa yhden tai useamman paketin. Poista paketit ensin.
+users.block.description = Estä tätä käyttäjää olemasta vuorovaikutuksessa tämän palvelun kanssa tilinsä välityksellä ja estä sisäänkirjautuminen.
+auths.attribute_username = Käyttäjänimen attribuutti
+auths.oauth2_emailURL = Sähköpostin URL-osoite
+auths.tip.discord = Rekisteröi uusi sovellus %sissa
+config.default_enable_dependencies = Ota ongelmariippuvuudet käyttöön oletuksena
+config.mailer_config = Postittimen asetukset
+config.cache_test_succeeded = Välimuistin testi onnistui, vastauksen saamisessa kesti %s.
+dashboard.sync_external_users = Synkronoi ulkoinen käyttäjädata
+auths.tip.gitea = Rekisteröi uusi OAuth2-sovellus. Ohje on osoitteessa %s
+config.test_mail_failed = Testisähköpostin lähettäminen osoitteeseen "%s" epäonnistui: %v
+auths.attribute_surname = Sukunimen attribuutti
+config.mailer_enable_helo = Ota HELO käyttöön
+auths.attribute_username_placeholder = Jätä tyhjäksi käyttääksesi Forgejo:ssa asetettua käyttänimeä.
+auths.oauth2_authURL = Valtuutuksen URL-osoite
+auths.new_success = Todennus "%s" on lisätty.
+users.still_own_repo = Tämä käyttäjä omistaa yhden tai useamman tietovaraston. Poista tai siirrä nämä tietovarastot ensin.
+dashboard.cleanup_hook_task_table = Siivoa hook_task-taulu
+dashboard.delete_old_actions = Poista kaikki vanhat aktiviteetit tietokannasta
+auths.attribute_mail = Sähköpostiosoitteen attribuutti
+auths.attribute_ssh_public_key = Julkisen SSH-avaimen attribuutti
+auths.group_attribute_list_users = Ryhmäattribuutti sisältäen listan käyttäjistä
+auths.oauth2_profileURL = Profiilin URL-osoite
+auths.skip_local_two_fa = Ohita paikallinen 2FA
+auths.oauth2_scopes = Lisäskoopit
+auths.tip.gitlab_new = Rekisteröi uusi sovellus %sissa
+config.cache_test = Testaa välimuisti
+auths.still_in_used = Todennuslähde on edelleen käytössä. Konvertoi tai poista ensin käyttäjät, jotka käyttävät tätä todennuslähdettä.
+users.admin.description = Myönnä tälle käyttäjälle täydet oikeudet selainkäyttöliittymän ja rajapinnan kautta saatavilla oleviin ylläpito-ominaisuuksiin.
+dashboard.delete_inactive_accounts.started = Poista kaikki aktivoimattomat tilit -tehtävä aloitettu.
+config.run_user = Suorita käyttäjänä
+config.mailer_sendmail_args = Lisäargumentit Sendmailille
+dashboard.archive_cleanup = Poista vanhat tietovarastojen arkistot
+dashboard.deleted_branches_cleanup = Siivoa poistetut haarat
+dashboard.update_checker = Päivitysten tarkistaja
+auths.allowed_domains_helper = Jätä tyhjäksi salliaksesi kaikki verkkotunnukset. Erota useat verkkotunnukset pilkulla (",").
+auths.activated = Tämä todennuslähde on aktivoitu
+auths.login_source_of_type_exist = Tätä tyyppiä oleva todennuslähde on jo olemassa.
+dashboard.memory_allocate_times = Muistiallokaatiot
+users.send_register_notify = Ilmoita rekisteröitymisestä sähköpostitse
+config.offline_mode = Paikallinen tila
+config.cache_item_ttl = Välimuistitietueen TTL
+config.log_file_root_path = Lokipolku
+config.lfs_root_path = LFS-juuren polku
+users.allow_import_local = Voi tuoda paikallisia tietovarastoja
+users.still_has_org = Tämä käyttäjä on organisaation jäsen. Poista käyttäjä organisaatiosta ensin.
+packages.creator = Luoja
+auths.attribute_avatar = Profiilikuvan attribuutti
+users.remote = Etä
+auths.disable_helo = Poista HELO käytöstä
+defaulthooks.desc = Webkoukut tekevät automaattisesti HTTP POST -pyyntöjä palvelimelle, kun tietyt Forgejo-tapahtumat ilmenevät. Tässä määritetyt webkoukut ovat oletusarvot ja ne kopioidaan kaikkiin uusiin tietovarastoihin. Lue lisää <a target="_blank" rel="noopener" href="%s">webkoukkujen oppaasta</a>.
+auths.attribute_name = Etunimen attribuutti
+users.local_import.description = Salli tietovarastojen tuominen palvelimen paikallisesta tiedostojärjestelmästä. Tämä voi olla tietoturvaongelma.
+emails.not_updated = Pyydetyn sähköpostiosoitteen päivittäminen epäonnistui: %v
+dashboard.update_mirrors = Päivitä peilit
+config.mailer_protocol = Protokolla
+users.activated.description = Sähköpostivahvistuksen valmistuminen. Aktivoimattoman tilin omistaja ei voi kirjautua sisään, ennen kuin sähköpostivahvistus on suoritettu.
+users.purge_help = Poista käyttäjä pakottaen, sekä kaikki käyttäjän omistamat tietovarastot, organisaatiot ja paketit. Kaikki käyttäjän luomat kommentit ja ongelmat poistetaan myös.
+users.restricted.description = Salli vuorovaikutus vain niihin tietovarastoihin ja organisaatioihin, joissa käyttäjä on avustajan roolissa. Tämä estää pääsyn tässä instanssissa oleviin julkisiin tietovarastoihin.
+config.git_pull_timeout = Vetotoimenpiteen aikakatkaisu
+monitor.process.cancel_desc = Prosessin peruuttaminen saattaa aiheuttaa datan menetyksen
+self_check.no_problem_found = Ongelmia ei ole vielä löytynyt.
+config.git_disable_diff_highlight = Poista diff-syntaksin korostus käytöstä
+config.git_max_diff_lines = Diff-rivejä enintään tiedostoa kohden
+config.access_log_template = Pääsylokin mallipohja
+monitor.process.cancel_notices = Perutaanko: <strong>%s</strong>?
+config.enable_federated_avatar = Ota federoidut profiilikuvat käyttöön
+notices.operations = Toimenpiteet
+config.xorm_log_sql = Lokita SQL
+monitor.queue.settings.remove_all_items_done = Kaikki jonossa olleet tietueet on poistettu.
+config.logger_name_fmt = Lokittaja: %s
+config.git_max_diff_line_characters = Diff-merkkejä enintään riviä kohden
+config.git_max_diff_files = Diff-tiedostoja enintään näytettäväksi
+config.access_log_mode = Pääsylokin tila
+config.picture_config = Kuvan ja avatarin asetukset
+notices.delete_success = Järjestelmäilmoitukset on poistettu.
+
 
 [action]
-create_repo=loi repon <a href="%s">%s</a>
-rename_repo=uudelleennimetty repo <code>%[1]s</code> nimelle <a href="%[2]s">%[3]s</a>
-transfer_repo=siirretty repo <code>%s</code> kohteeseen <a href="%s">%s</a>
+create_repo=loi tietovaraston <a href="%s">%s</a>
+rename_repo=asetti tietovaraston <code>%[1]s</code> uudeksi nimeksi <a href="%[2]s">%[3]s</a>
+transfer_repo=siirsi tietovaraston <code>%s</code> käyttäjälle <a href="%s">%s</a>
 push_tag=työnsi tagin <a href="%[2]s">%[3]s</a> kohteeseen <a href="%[1]s">%[4]s</a>
 delete_tag=poisti tagin %[2]s kohteesta <a href="%[1]s">%[3]s</a>
-compare_commits_general=Vertaa committeja
-create_branch=loi haaran <a href="%[2]s">%[3]s</a> repossa <a href="%[1]s">%[4]s</a>
+compare_commits_general=Vertaa kommitteja
+create_branch=loi haaran <a href="%[2]s">%[3]s</a> tietovarastossa <a href="%[1]s">%[4]s</a>
 compare_commits = Vertaa %d kommittia
 compare_branch = Vertaa
 review_dismissed_reason = Syy:
-commit_repo = työnsi haaraan <a href="%[2]s">%[3]s</a> repossa <a href="%[1]s">%[4]s</a>
+commit_repo = työnsi haaraan <a href="%[2]s">%[3]s</a> tietovarastossa <a href="%[1]s">%[4]s</a>
 create_issue = `avasi ongelman <a href="%[1]s">%[3]s#%[2]s</a>`
 reopen_issue = `avasi uudelleen ongelman <a href="%[1]s">%[3]s#%[2]s</a>`
 create_pull_request = `loi vetopyynnön <a href="%[1]s">%[3]s#%[2]s</a>`
@@ -2693,6 +3187,12 @@ comment_issue = `kommentoi ongelmaa <a href="%[1]s">%[3]s#%[2]s</a>`
 close_issue = `sulki ongelman <a href="%[1]s">%[3]s#%[2]s</a>`
 merge_pull_request = `yhdisti vetopyynnön <a href="%[1]s">%[3]s#%[2]s</a>`
 comment_pull = `kommentoi vetopyyntöä <a href="%[1]s">%[3]s#%[2]s</a>`
+auto_merge_pull_request = `automaattisesti yhdisti vetopyynnön <a href="%[1]s">%[3]s#%[2]s</a>`
+delete_branch = poisti haaran <code>%[2]s</code> tietovarastosta <a href="%[1]s">%[3]s</a>
+watched_repo = aloitti tietovaraston <a href="%[1]s">%[2]s</a> tarkkailun
+approve_pull_request = `hyväksyi <a href="%[1]s">%[3]s#%[2]s</a>`
+starred_repo = lisäsi tähden tietovarastolle <a href="%[1]s">%[2]s</a>
+reject_pull_request = `ehdotti muutoksia kohteeseen <a href="%[1]s">%[3]s#%[2]s</a>`
 
 [tool]
 now=nyt
@@ -2714,8 +3214,8 @@ raw_seconds=sekuntia
 raw_minutes=minuuttia
 
 [dropzone]
-default_message=Pudota tiedostot tähän tai klikkaa aluetta ladataksesi tiedoston.
-invalid_input_type=Tämäntyyppisiä tiedostoja ei voi ladata.
+default_message=Pudota tiedostot tähän tai napsauta tästä lähettääksesi tiedoston.
+invalid_input_type=Tätä tyyppiä olevia tiedostoja ei voi lähettää.
 remove_file=Poista tiedosto
 file_too_big = Tiedoston koko ({{filesize}} Mt) ylittää enimmäisrajan ({{maxFilesize}} Mt).
 
@@ -2725,7 +3225,7 @@ unread=Lukematon
 read=Luettu
 no_unread=Ei lukemattomia ilmoituksia.
 no_read=Ei luettuja ilmoituksia.
-pin=Merkitse ilmoitus
+pin=Kiinnitä ilmoitus
 mark_as_read=Merkitse luetuksi
 mark_as_unread=Merkitse lukemattomaksi
 mark_all_as_read=Merkitse kaikki luetuiksi
@@ -2734,19 +3234,24 @@ no_subscriptions = Ei tilauksia
 subscriptions = Tilaukset
 
 [gpg]
-error.no_committer_account=Committaajan sähköpostiosoitteeseen ei ole linkitetty tiliä
+error.no_committer_account=Kommitin tekijän sähköpostiosoitteeseen ei ole linkitetty tiliä
 error.not_signed_commit=Kommitti ei ole allekirjoitettu
 error.extract_sign = Allekirjoituksen purkaminen epäonnistui
 default_key = Allekirjoitettu oletusavaimella
 error.failed_retrieval_gpg_keys = Ei saatu yhtäkään kommitin tekijän tiliin liitettyä avainta
-error.generate_hash = Tiivisteen luominen kommitista epäonnistui
+error.generate_hash = Kommitin tiivisteen luominen epäonnistui
+error.probable_bad_signature = VAROITUS! Vaikka tietokannassa on avain tällä ID-tunnistella, se ei vahvista tätä kommittia! Tämä kommitti on EPÄILYTTÄVÄ.
+error.probable_bad_default_signature = VAROITUS! Vaikka oletusavaimella on tämä ID-tunniste, se ei vahvista tätä kommittia! Tämä kommitti on EPÄILYTTÄVÄ.
+error.no_gpg_keys_found = Tälle allekirjoitukselle ei löytynyt tunnettua avainta tietokannasta
 
 [units]
 unit = Yksikkö
+error.unit_not_allowed = Sinulla ei ole pääsyä tähän tietovaraston osioon.
+error.no_unit_allowed_repo = Sinulla ei ole pääsyä mihinkään tämän tietovaraston osioon.
 
 [packages]
 title=Paketit
-desc=Hallitse repon paketteja.
+desc=Hallitse tietovaraston paketteja.
 empty=Täällä ei vielä ole paketteja.
 filter.type=Tyyppi
 filter.type.all=Kaikki
@@ -2754,16 +3259,16 @@ filter.no_result=Suodattimesi ei tuottanut tuloksia.
 installation=Asennus
 details.author=Tekijä
 alpine.repository.branches=Haarat
-alpine.repository.repositories=Repot
-conan.details.repository=Repo
+alpine.repository.repositories=Tietovarastot
+conan.details.repository=Tietovarasto
 owner.settings.cleanuprules.enabled=Käytössä
 details.license = Lisenssi
 about = Tietoja tästä paketista
-debian.install = Asenna paketti seuraavalla komennolla:
+debian.install = Asenna paketti komennolla:
 owner.settings.cleanuprules.edit = Muokkaa siivoussääntöä
 arch.version.groups = Ryhmä
 details.project_site = Projektin verkkosivusto
-details.repository_site = Repositorion verkkosivusto
+details.repository_site = Tietovaraston verkkosivusto
 container.pull = Vedä levykuva komentoriviltä:
 generic.download = Lataa paketti komentoriviltä:
 dependency.version = Versio
@@ -2771,11 +3276,11 @@ keywords = Avainsanat
 dependencies = Riippuvuudet
 container.labels.key = Avain
 container.labels.value = Arvo
-pypi.install = Asenna paketti pipillä seuraavalla komennolla:
-npm.install = Asenna paketti npm:llä seuraavalla komennolla:
+pypi.install = Asenna paketti pipillä komennolla:
+npm.install = Asenna paketti npm:llä komennolla:
 npm.install2 = tai lisää se package.json-tiedostoon:
 empty.documentation = Lisätietoja pakettirekisteristä on saatavilla <a target="_blank" rel="noopener noreferrer" href="%s">dokumentaatiossa</a>.
-helm.install = Asenna paketti seuraavalla komennolla:
+helm.install = Asenna paketti komennolla:
 owner.settings.chef.keypair = Luo avainpari
 settings.delete.error = Paketin poistaminen epäonnistui.
 requirements = Vaatimukset
@@ -2783,8 +3288,8 @@ published_by_in = Julkaistu %[1]s, julkaisija <a href="%[2]s">%[3]s</a> projekti
 pypi.requires = Vaatii Pythonin
 alpine.install = Asenna paketti seuraavalla komennolla:
 debian.repository.components = Komponentit
-cran.install = Asenna paketti seuraavalla komennolla:
-settings.link.select = Valitse repo
+cran.install = Asenna paketti komennolla:
+settings.link.select = Valitse tietovarasto
 owner.settings.chef.title = Chef-rekisteri
 owner.settings.cleanuprules.add = Lisää siivoussääntö
 versions = Versiot
@@ -2792,7 +3297,7 @@ versions.view_all = Näytä kaikki
 debian.repository.architectures = Arkkitehtuurit
 container.details.type = Levykuvan tyyppi
 arch.version.properties = Version ominaisuudet
-rpm.install = Asenna paketti seuraavalla komennolla:
+rpm.install = Asenna paketti komennolla:
 owner.settings.cleanuprules.none = Siivoussääntöjä ei vielä ole.
 container.details.platform = Alusta
 npm.dependencies = Riippuvuudet
@@ -2804,59 +3309,59 @@ settings.delete.success = Paketti on poistettu.
 npm.dependencies.optional = Valinnaiset riippuvuudet
 debian.repository.distributions = Jakelut
 composer.dependencies = Riippuvuudet
-chef.install = Asenna paketti seuraavalla komennolla:
+chef.install = Asenna paketti komennolla:
 details.documentation_site = Dokumentaation verkkosivusto
 go.install = Asenna paketti komentoriviltä:
 alpine.repository.architectures = Arkkitehtuurit
 composer.registry = Määritä tämä rekisteri <code>~/.composer/config.json</code>-tiedostossa:
 debian.registry = Määritä tämä rekisteri komentoriviltä:
 rpm.registry = Määritä rekisteri komentoriviltä:
-maven.install = Käytä pakettia sisällyttämällä seuraava <code>dependencies</code>-lohkoon <code>pom.xml</code>-tiedostossa:
+maven.install = Käytä pakettia sisällyttämällä seuraava sisältö <code>dependencies</code>-lohkoon <code>pom.xml</code>-tiedostossa:
 npm.registry = Määritä rekisteri projektin <code>.npmrc</code>-tiedostossa:
-alpine.repository = Repositorion tiedot
+alpine.repository = Tietovaraston tiedot
 cargo.registry = Määritä tämä rekisteri Cargon asetustiedostossa (esimerkiksi <code>~/.cargo/config.toml</code>):
 cargo.install = Asenna paketti Cargolla suorittamalla seuraava komento:
-composer.install = Asenna paketti Composerilla suorittamalla seuraava komento:
+composer.install = Asenna paketti Composerilla suorittamalla komento:
 rpm.distros.redhat = RedHatiin pohjautuvilla jakeluilla
 rpm.distros.suse = SUSE:en pohjautuvilla jakeluilla
 rpm.repository.architectures = Arkkitehtuurit
 cran.registry = Määritä rekisteri <code>Rprofile.site</code>-tiedostossa:
-swift.install2 = ja suorita seuraava komento:
+swift.install2 = ja suorita komento:
 maven.registry = Määritä tämä rekisteri projektin <code>pom.xml</code>-tiedostossa:
 maven.install2 = Suorita komentoriviltä:
 nuget.registry = Määritä rekisteri komentoriviltä:
-nuget.install = Asenna paketti NuGetillä suorittamalla seuraava komento:
-rubygems.install = Asenna paketti gemillä suorittamalla seuraava komento:
+nuget.install = Asenna paketti NuGetillä suorittamalla komento:
+rubygems.install = Asenna paketti gemillä suorittamalla komento:
 rubygems.install2 = tai lisää se Gemfileen:
 swift.registry = Määritä rekisteri komentoriviltä:
 swift.install = Lisää paketti <code>Package.swift</code>-tiedostoon:
 owner.settings.cleanuprules.keep.count.1 = 1 versio per paketti
 owner.settings.cleanuprules.keep.count.n = %d versiota per paketti
-conan.install = Asenna paketti Conanilla suorittamalla seuraava komento:
+conan.install = Asenna paketti Conanilla suorittamalla komento:
 chef.registry = Määritä tämä rekisteri <code>~/.chef/config.rb</code>-tiedostossa:
 conan.registry = Määritä tämä rekisteri komentoriviltä:
-conda.install = Asenna paketti Condalla suorittamalla seuraava komento:
+conda.install = Asenna paketti Condalla suorittamalla komento:
 helm.registry = Määritä tämä rekisteri komentoriviltä:
-pub.install = Asenna paketti Dartilla suorittamalla seuraava komento:
-owner.settings.cargo.title = Cargon rekisteri-indeksi
+pub.install = Asenna paketti Dartilla suorittamalla komento:
+owner.settings.cargo.title = Cargo-rekisterin indeksi
 settings.delete.description = Paketin poistaminen on peruuttamaton toimenpide, sitä ei voi perua.
-settings.link.success = Repositorion linkki päivitettiin onnistuneesti.
-settings.link.button = Päivitä repositorion linkki
+settings.link.success = Tietovaraston linkki päivitettiin onnistuneesti.
+settings.link.button = Päivitä tietovaraston linkki
 owner.settings.cleanuprules.preview.overview = %d pakettia on ajastettu poistettavaksi.
 owner.settings.cargo.initialize.success = Cargo-indeksi luotiin onnistuneesti.
-vagrant.install = Lisää Vagrant-boksi suorittamalla seuraava komento:
+vagrant.install = Lisää Vagrant-boksi suorittamalla komento:
 rubygems.dependencies.development = Kehitysriippuvuudet
 owner.settings.cleanuprules.preview = Siivoussäännön esikatselu
 npm.dependencies.development = Kehitysriippuvuudet
 composer.dependencies.development = Kehitysriippuvuudet
 owner.settings.cleanuprules.success.update = Siivoussääntö on päivitetty.
 owner.settings.cleanuprules.success.delete = Siivoussääntö on poistettu.
-settings.link = Linkitä tämä paketti repositorioon
+settings.link = Linkitä tämä paketti tietovarastoon
 maven.download = Lataa riippuvuus suorittamalla komentorivillä:
 registry.documentation = Lisätietoja %s-rekisteristä on <a target="_blank" rel="noopener noreferrer" href="%s">dokumentaatiossa</a>.
-owner.settings.chef.keypair.description = Avainpari vaaditaan Chef-rekisteriin tunnistautumista varten. Jos olet luonut avainparin aiemmin, uuden avainparin luominen hylkää aiemman avainparin.
+owner.settings.chef.keypair.description = Chef-rekisteriin lähetettävät pyynnöt on allekirjoitettava salauskirjoituksella todennuskeinona. Avainparia luotaessa vain julkinen avain tallennetaan Forgejoon. Yksityinen avain toimitetaan sinulle käytettäväksi knifen kanssa. Uuden avainparin luominen korvaa edellisen.
 owner.settings.cleanuprules.keep.pattern = Säilytä kaavaa vastaavat versiot
-owner.settings.cleanuprules.pattern_full_match = Toteuta kaavio paketin koko nimeen
+owner.settings.cleanuprules.pattern_full_match = Toteuta kaava paketin koko nimeen
 owner.settings.cleanuprules.keep.title = Näitä sääntöjä vastaavat versiot säilytetään, vaikka ne vastaisivat alla olevaa poistosääntöä.
 owner.settings.cleanuprules.keep.count = Säilytä viimeisimmät
 owner.settings.cleanuprules.remove.pattern = Poista kaavaa vastaavat versiot
@@ -2872,20 +3377,35 @@ owner.settings.cleanuprules.preview.none = Siivoussääntö ei vastaa yhtäkää
 arch.pacman.conf = Lisää palvelin asiaan liittyvällä jakelulla ja arkkitehtuurilla tiedostoon <code>/etc/pacman.conf</code> :
 published_by = Julkaistu %[1]s käyttäjän <a href="%[2]s">%[3]s</a> toimesta
 alpine.registry.key = Lataa rekisterin julkinen RSA-avain hakemistoon <code>/etc/apk/keys/</code> vahvistaaksesi indeksin allekirjoituksen:
-alpine.registry = Määritä tämä rekisteri lisäämällä URL-osoite tiedostoon <code>/etc/apk/repositories</code>:
+alpine.registry = Aseta tämä rekisteri lisäämällä URL-osoite tiedostoon <code>/etc/apk/tietovarastot</code>:
 rubygems.dependencies.runtime = Ajonaikaiset riippuvuudet
 owner.settings.cargo.rebuild.error = Cargo-indeksin rakentaminen uudelleen epäonnistui: %v
 owner.settings.cargo.rebuild = Rakenna indeksi uudelleen
-empty.repo = Lähetitkö paketin, mutta se ei näy täällä? Siirry <a href="%[1]s">paketin asetuksiin</a> ja linkitä se tähän repoon.
+empty.repo = Lähetitkö paketin, mutta se ei näy täällä? Siirry <a href="%[1]s">paketin asetuksiin</a> ja linkitä se tähän tietovarastoon.
 alpine.registry.info = Valitse $branch ja $repository alla olevasta listasta.
 container.images.title = Levykuvat
 owner.settings.cargo.initialize = Alusta indeksi
-owner.settings.cargo.initialize.description = Erityinen Git-repoindeksi vaaditaan Cargo-rekisterin käyttämiseksi. Tämän valinnan käyttäminen luo (tarvittaessa uudelleen) repon ja määrittää sen asetukset automaattisesti.
-settings.link.error = Repositorion linkin päivittäminen epäonnistui.
+owner.settings.cargo.initialize.description = Cargo-rekisterin käyttöä varten tarvitaan erityinen indeksi Git -tietovarasto. Tämän vaihtoehdon käyttäminen luo (uudelleen) tietovaraston ja määrittää sen automaattisesti.
+settings.link.error = Tietovaraston linkin päivittäminen epäonnistui.
 alt.repository.multiple_groups = Tämä paketti on saatavilla useissa ryhmissä.
 alt.repository.architectures = Arkkitehtuurit
 alt.install = Asenna paketti
-alt.registry.install = Asenna paketti suorittamalla komento:
+alt.registry.install = Asenna paketti komennolla:
+details = Yksityiskohdat
+arch.version.provides = Tarjoaa
+rpm.repository = Tietovaraston tiedot
+rubygems.required.ruby = Vaatii Ruby-version
+settings.delete.notice = Olet aikeissa poistaa %s (%s). Tätä toimenpidettä ei voi perua. Haluatko varmasti jatkaa?
+owner.settings.cargo.initialize.error = Cargo-indeksin alustaminen epäonnistui: %v
+owner.settings.cargo.rebuild.no_index = Ei voi rakentaa uudelleen, indeksiä ei ole alustettu.
+rubygems.required.rubygems = Vaatii RubyGem-version
+alt.registry = Määritä tämä rekisteri komentoriviltä:
+alt.repository = Tietovaraston tiedot
+arch.version.replaces = Korvaa
+debian.repository = Tietovaraston tiedot
+conda.registry = Määritä tämä rekisteri Conda-tietovarastoksi <code>.condarc</code>-tiedostossa:
+container.labels = Nimilaput
+settings.link.description = Jos linkität paketin tietovarastoon, paketti listataan tietovaraston pakettilistalla.
 
 [secrets]
 creation.failed = Salaisuuden lisääminen epäonnistui.
@@ -2899,16 +3419,18 @@ secrets = Salaisuudet
 deletion.description = Salaisuuden poistaminen on pysyvä toimenpide, eikä sitä voi perua. Jatketaanko?
 deletion.success = Salaisuus on poistettu.
 description = Salaisuudet välitetään tietyille toimenpiteille, eikä niitä voi muuten lukea.
+creation.name_placeholder = kirjoinkoolla ei merkitystä, vain aakkosnumeerisia merkkejä ja alaviivoja, ei voi alkaa GITEA_ tai GITHUB_
+creation.value_placeholder = Syötä mitä tahansa sisältöä. Tyhjätila alussa ja lopussa jätetään huomiotta.
 
 [actions]
 runners.name=Nimi
 runners.owner_type=Tyyppi
 runners.description=Kuvaus
 runners.task_list.run=Suorita
-runners.task_list.repository=Repo
-runners.task_list.commit=Commit
+runners.task_list.repository=Tietovarasto
+runners.task_list.commit=Kommitti
 
-runs.commit=Commit
+runs.commit=Kommitti
 status.success = Onnistunut
 status.unknown = Tuntematon
 status.waiting = Odotustilassa
@@ -2923,21 +3445,21 @@ runners.update_runner = Päivitä muutokset
 runners.edit_runner = Muokkaa testinajajaa
 runners.update_runner_success = Testinajaja päivitetty onnistuneesti
 runners.delete_runner_success = Testinajaja poistettu onnistuneesti
-runners.reset_registration_token = Uudelleenaseta rekisteröintiavain
+runners.reset_registration_token = Uudelleenaseta rekisteröintipoletti
 runs.scheduled = Ajastettu
 runs.status = Tila
-runs.empty_commit_message = (tyhjä commit-viesti)
+runs.empty_commit_message = (tyhjä kommittiviesti)
 variables.deletion = Poista muuttuja
 runners.new_notice = Testinajajan aloitusohjeet
 workflow.dispatch.input_required = Arvo syötteelle "%s" vaadittu.
 runners.status.active = Aktiivinen
 runs.no_workflows.documentation = Katso lisätietoja Forgejo Actions -ohjelmistosta <a target="_blank" rel="noopener noreferrer" href="%s">dokumentaatiosta</a>.
 variables.description = Muuttujat asetetaan tietyille toiminnoille eikä niitä voida lukea muutoin.
-runners.labels = Tunnisteet
+runners.labels = Nimilaput
 runners.delete_runner_failed = Testinajajan poisto epäonnistui
 runners.delete_runner_header = Varmista testinajajan poisto
 runners.task_list.status = Tila
-runners.reset_registration_token_success = Testiajajan rekisteröintiavain uudelleenasetettu onnistuneesti
+runners.reset_registration_token_success = Testiajajan rekisteröintipoletti asetettu uudelleen onnistuneesti
 variables.none = Ei muuttujia vielä.
 runners.id = Tunniste
 runners.status = Tila
@@ -2946,21 +3468,21 @@ runners.task_list.no_tasks = Tehtäviä ei ole vielä määritelty.
 runners.last_online = Viimeisin käynnissäoloajankohta
 runners.runner_title = Testinajaja
 runners.task_list.done_at = Valmistunut ajankohtana
-runs.no_matching_online_runner_helper = Testiajajaa tunnisteella %s ei löytynyt
+runs.no_matching_online_runner_helper = Testiajajaa nimilapulla %s ei löytynyt
 runs.no_results = Ei tuloksia.
 runners.delete_runner = Poista testinajaja
-variables.deletion.description = Muuttujan poistaminen on lopullista eikä sitä voi peruuttaa. Jatketaanko?
+variables.deletion.description = Muuttujan poistaminen on lopullista, eikä sitä voi perua. Jatketaanko?
 workflow.dispatch.invalid_input_type = Syötetyyppi "%s" ei kelpaa.
 workflow.dispatch.warn_input_limit = Näytetään vain ensimmäiset %d syötettä.
 runners.runner_manage_panel = Hallinnoi testinajajia
 variables = Muuttujat
-variables.management = Hallinnoi muuttujia
+variables.management = Hallitse muuttujia
 variables.creation = Lisää muuttuja
 runs.no_workflows.quick_start = Etkö tiedä kuinka Forgejo Actions toimii? Katso <a target="_blank" rel="noopener noreferrer" href="%s">aloitusohje</a>.
 runners.new = Luo uusi testinajaja
 runners.version = Versio
 runs.expire_log_message = Lokitiedostot on tyhjätty vanhenemisen vuoksi.
-runners.delete_runner_notice = Mikäli testinajajalla on keskeneräinen tehtävä, se pysäytetään ja merkitään epäonnistuneeksi. Tämä saattaa johtaa testinajoprosessin rikkoutumiseen.
+runners.delete_runner_notice = Jos tehtävä on käynnissä tällä testinajajalla, se lopetetaan ja merkitään epäonnistuneeksi. Se voi rikkoa koonnin työnkulun.
 runners.update_runner_failed = Testinajajan päivitys epäonnistui
 variables.deletion.success = Muuttuja poistettu.
 variables.edit = Muokkaa muuttujaa
@@ -2972,11 +3494,11 @@ variables.update.success = Muuttuja muokattu.
 variables.id_not_exist = Muuttujaa tunnisteella %d ei ole olemassa.
 runs.all_workflows = Kaikki työnkulut
 workflow.dispatch.run = Suorita työnkulku
-workflow.enable = Käytä työnkulkua
+workflow.enable = Ota työnkulku käyttöön
 runs.no_workflows = Ei työnkulkuja vielä.
 runs.actors_no_select = Kaikki toimijat
 runs.workflow = Työnkulku
-workflow.enable_success = Työnkulku "%s" otettu käyttöön.
+workflow.enable_success = Työnkulku "%s" on otettu käyttöön.
 workflow.disabled = Työnkulku on poistettu käytöstä.
 runs.actor = Toimija
 workflow.disable = Poista työnkulku käytöstä
@@ -2985,9 +3507,15 @@ runs.no_job = Työnkulun tulee sisältää vähintään yksi työ
 runs.invalid_workflow_helper = Työnkulun asetustiedosto on virheellinen. Tarkista asetustiedosto: %s
 runners = Ajajat
 actions = Actions
-unit.desc = Hallitse integroituja CI/CD-putkia Forgejo Actionsia hyödyntäen.
+unit.desc = Hallitse integroituja CI-/CD-putkia Forgejo Actionsia hyödyntäen.
 runs.pushed_by = työntänyt
 runs.no_workflows.help_no_write_access = Lisätietoja Forgejo Actionsista on saatavilla <a target="_blank" rel="noopener noreferrer" href="%s">dokumentaatiosta</a>.
+runners.status.idle = Jouten
+runners.status.offline = Ei-verkkotilassa
+runs.no_job_without_needs = Työnkulun tulee sisältää vähintään yksi työ ilman riippuvuuksia.
+runs.no_runs = Työnkululla ei ole vielä suorituksia.
+variables.not_found = Muuttujaa ei löytynyt.
+runs.no_workflows.help_write_access = Etkö tiedä, miten aloittaa Forgejo Actionsin käyttö? Lue <a target="_blank" rel="noopener noreferrer" href="%s">pikaopas</a> kirjoittaaksesi ensimmäisen työnkulun, sen jälkeen <a target="_blank" rel="noopener noreferrer" href="%s">määritä Forgejo-ajaja</a> suorittamaan asettamiasi töitä.
 
 
 
@@ -2995,13 +3523,16 @@ runs.no_workflows.help_no_write_access = Lisätietoja Forgejo Actionsista on saa
 [projects]
 type-1.display_name = Yksittäinen projekti
 deleted.display_name = Poistettu projekti
+type-3.display_name = Organisaatioprojekti
+type-2.display_name = Tietovarastoprojekti
 
 [git.filemode]
 changed_filemode = %[1]s -> %[2]s
-executable_file = Ajettava tiedosto
+executable_file = Suoritettava tiedosto
 symbolic_link = Symbolinen linkki
 normal_file = Tavallinen tiedosto
-directory = Kansio
+directory = Hakemisto
+submodule = Alimoduuli
 
 [search]
 search = Hae…
@@ -3014,20 +3545,38 @@ exact = Täsmällinen
 exact_tooltip = Sisällytä vain täsmälleen hakusanaa vastaavat tulokset
 team_kind = Etsi tiimejä…
 code_kind = Etsi koodia…
-code_search_unavailable = Koodihaku ei tällä hetkellä ole saatavilla. Ota yhteyttä järjestelmänvalvojaan.
+code_search_unavailable = Koodihaku ei tällä hetkellä ole saatavilla. Ota yhteyttä sivuston ylläpitoon.
 union = yhdistelmähaku
 union_tooltip = Sisällytä tulokset, jotka vastaavat minkä tahansa välilyönnillä erotetuista avainsanoista
 project_kind = Etsi projekteja…
 no_results = Hakutuloksia ei löytynyt.
-keyword_search_unavailable = Avainsanahaku ei tällä hetkellä ole saatavilla. Ota yhteyttä järjestelmänvalvojaan.
-repo_kind = Etsi repositorioita…
+keyword_search_unavailable = Avainsanahaku ei tällä hetkellä ole saatavilla. Ota yhteyttä sivuston ylläpitoon.
+repo_kind = Etsi tietovarastoja…
 user_kind = Etsi käyttäjiä…
 org_kind = Etsi organisaatioita…
 branch_kind = Etsi haaroja…
 issue_kind = Etsi ongelmia…
 milestone_kind = Etsi merkkipaaluja...
-pull_kind = Etsi pull-vetoja…
+pull_kind = Etsi vetoja…
 commit_kind = Etsi kommitteja…
 fuzzy = Sumea
 runner_kind = Etsi ajajia…
 code_search_by_git_grep = Nykyiset koodin hakutulokset pohjautuvat komentoon "git grep". Parempia tuloksia on mahdollista saada, jos sivuston ylläpitäjä ottaa käyttöön koodin indeksoijan.
+
+
+[repo.permissions]
+code.read = <b>Lue:</b> Pääsy koodiin ja tietovaraston kloonaaminen.
+code.write = <b>Kirjoita:</b> Työnnä tietovarastoon, luo haaroja ja tageja.
+issues.read = <b>Lue:</b> Lue ja luo ongelmia ja kommentteja.
+releases.read = <b>Lue:</b> Katsele ja lataa julkaisuja.
+pulls.read = <b>Lue:</b> Vetopyyntöjen lukeminen ja luominen.
+ext_issues = Pääsy ulkoisen ongelmanseurannan linkkiin. Käyttöoikeuksia hallitaan ulkoisesti.
+ext_wiki = Pääsy ulkoisen wikin linkkiin. Käyttöoikeuksia hallitaan ulkoisesti.
+projects.read = <b>Lue:</b> Pääsy tietovaraston projektitauluille.
+wiki.write = <b>Kirjoita:</b> Luo, päivitä ja poista integroidun wikin sivuja.
+
+[markup]
+filepreview.truncated = Esikatselu on typistetty
+
+[translation_meta]
+test = This is a test string. It is not displayed in Forgejo UI but is used for testing purposes. Feel free to enter "ok" to save time (or a fun fact of your choice) to hit that sweet 100% completion mark :) :) :)
\ No newline at end of file
diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini
index b88e76956c..ed1128ceb6 100644
--- a/options/locale/locale_fil.ini
+++ b/options/locale/locale_fil.ini
@@ -38,9 +38,9 @@ logo = Logo
 sign_in = Mag-sign in
 sign_in_with_provider = Mag-sign in gamit ang %s
 sign_in_or = o
-sign_out = Mag-Sign Out
+sign_out = Mag-sign out
 sign_up = Magrehistro
-link_account = Mag-link ng Account
+link_account = Mag-link ng account
 template = Template
 tracked_time_summary = Buod ng mga nakasubaybay na oras base sa filter ng listahan ng isyu
 webauthn_sign_in = Pindutin ang button ng iyong security key. Kung walang button ang iyong security key, ilagay muli.
@@ -313,7 +313,7 @@ no_reply_address = Domain ng nakatagong email
 no_reply_address_helper = Domain name para sa mga user na may nakatagong email address. Halimbawa, ang username na "kita" ay mala-log sa Git bilang "kita@noreply.example.org" kapag ang nakatagong email domain ay nakatakda sa "noreply.example.org".
 password_algorithm = Algorithm ng password hash
 invalid_password_algorithm = Hindi angkop na algorithm ng password hash
-password_algorithm_helper = Itakda ang password hashing algorithm. Ang mga algorithm ay may magkakaibang mga kinakailangan at lakas. Ang algorithm ng Argon2 ay sa halip ay ligtas ngunit gumagamit ng maraming memory at maaaring hindi naaangkop para sa mga maliliit na sistema.
+password_algorithm_helper = Itakda ang password hashing algorithm. Ang mga algorithm ay may magkakaibang mga kinakailangan at lakas. Ang algorithm na Argon2 ay sa halip ay ligtas ngunit gumagamit ng maraming memory at maaaring hindi naaangkop para sa mga maliliit na sistema.
 enable_update_checker = I-enable ang tagasuri ng update
 env_config_keys = Configuration ng Environment
 env_config_keys_prompt = Ang mga sumusunod na mga environment variable ay ilalapat rin sa iyong configuration file:
@@ -365,7 +365,7 @@ table_modal.label.columns = Mga Column
 link_modal.header = Magdagdag ng link
 link_modal.url = Url
 link_modal.description = Deskripsyon
-link_modal.paste_reminder = Pahiwatig: Kapag may URL sa clipboard, maari mong direktang i-paste sa editor para gumawa ng link.
+link_modal.paste_reminder = Pahiwatig: Kapag may URL sa clipboard, maaari mong direktang i-paste sa editor para gumawa ng link.
 
 [filter]
 string.asc = A - Z
@@ -432,7 +432,7 @@ openid_connect_desc = Ang piniling OpenID URI ay hindi alam. Iugnay iyan sa bago
 invalid_code = Ang iyong confirmation code ay hindi wasto o nag-expire na.
 oauth_signin_title = Mag-sign in para pahintulutan ang naka-link na account
 invalid_code_forgot_password = Ang iyong confirmation code ay hindi wasto o nag-expire na. Mag-click <a href="%s">dito</a> para magsimula ng bagong session.
-confirmation_mail_sent_prompt = Ang isang bagong email na pang-kumpirma ay ipinadala sa <b>%s</b>. Para kumpletuhin ang proseso ng pagrehistro, pakisuri ang iyong inbox at sundan ang ibinigay na link sa loob ng %s. Kung mali ang email, maari kang mag-log in, at humingi ng isa pang email pang-kumpirma na ipapadala sa ibang address.
+confirmation_mail_sent_prompt = Ang isang bagong email na pang-kumpirma ay ipinadala sa <b>%s</b>. Para kumpletuhin ang proseso ng pagrehistro, pakisuri ang iyong inbox at sundan ang ibinigay na link sa loob ng %s. Kung mali ang email, maaari kang mag-log in, at humingi ng isa pang email pang-kumpirma na ipapadala sa ibang address.
 invalid_password = Ang iyong password ay hindi tugma sa password na ginamit para gawin ang account.
 twofa_scratch_used = Ginamit mo na ang scratch code. Na-redirect ka sa two-factor settings page para tanggalin ang device enrollment o mag-generate ng bagong scratch code.
 manual_activation_only = Makipag-ugnayan sa tagapangangasiwa ng site para kumpletuhin ang pagrehistro.
@@ -484,7 +484,7 @@ admin.new_user.text = Mangyaring <a href="%s">mag-click dito</a> para ipamahala
 register_notify = Maligayang Pagdating sa %s
 register_notify.title = %[1]s, maligayang pagdating sa %[2]s
 register_notify.text_1 = ito ang iyong registration confirmation email para sa %s!
-register_notify.text_2 = Maari kang mag-sign in sa iyong account gamit ng iyong username: %s
+register_notify.text_2 = Maaari kang mag-sign in sa iyong account gamit ng iyong username: %s
 reset_password = I-recover ang iyong account
 reset_password.title = %s, nagkaroon kami ng hiling para i-recover ang iyong account
 reset_password.text = Kung ikaw ito, paki-click ang sumusunod na link para i-recover ang iyong account sa loob ng <b>%s</b>:
@@ -535,7 +535,7 @@ totp_disabled.text_1 = Ngayon lang na-disable ang Time-based one-time password (
 totp_disabled.no_2fa = Wala nang mga ibang paraan ng 2FA ang naka-configure, nangangahulugan na hindi na kailangang mag-log in sa iyong account gamit ang 2FA.
 removed_security_key.subject = May tinanggal na security key
 removed_security_key.text_1 = Tinanggal ngayon lang ang security key na "%[1]s" sa iyong account.
-account_security_caution.text_1 = Kung ikaw ito, maari mong ligtas na huwag pansinin ang mail na ito.
+account_security_caution.text_1 = Kung ikaw ito, maaari mong ligtas na huwag pansinin ang mail na ito.
 account_security_caution.text_2 = Kung hindi ito ikaw, nakompromiso ang iyong account. Mangyaring makipag-ugnayan sa mga tagapangasiwa ng site na ito.
 totp_enrolled.subject = Nag-activate ka ng TOTP bilang paraan ng 2FA
 totp_enrolled.text_1.has_webauthn = Na-enable mo lang ang TOTP para sa iyong account. Nangangahulugan ito na para sa lahat ng mga hinaharap na pag-login sa iyong account, kailangan mong gumamit ng TOTP bilang paraan ng 2FA o gamitin ang iyong mga security key.
@@ -644,7 +644,7 @@ AccessToken = Token ng pag-access
 Biography = Byograpya
 Location = Lokasyon
 visit_rate_limit = Natugunan ang limitasyon sa rate ng malayuang pagbisita.
-username_claiming_cooldown = Hindi ma-claim ang username na ito, dahil hindi pa tapos ang panahon ng cooldown. Maari itong i-claim sa %[1]s.
+username_claiming_cooldown = Hindi ma-claim ang username na ito, dahil hindi pa tapos ang panahon ng cooldown. Maaari itong i-claim sa %[1]s.
 email_domain_is_not_allowed = Sumasalungat ang domain ng email address ng user <b>%s</b> sa EMAIL_DOMAIN_ALLOWLIST o EMAIL_DOMAIN_BLOCKLIST. Siguraduhing natakda mo ang email address nang tama.
 
 [user]
@@ -685,7 +685,7 @@ followers.title.few = Mga tagasunod
 following.title.one = Sinusundan
 followers.title.one = Tagasunod
 public_activity.visibility_hint.self_public = Nakikita ng lahat ang iyong aktibidad, maliban sa mga interaksyon sa pribadong espasyo. <a href="%s">I-configure</a>.
-public_activity.visibility_hint.admin_public = Nakikita ng lahat ang aktibidad na ito, ngunit bilang tagapangasiwa maari mo ring makita ang mga interaksyon sa mga pribadong espasyo.
+public_activity.visibility_hint.admin_public = Nakikita ng lahat ang aktibidad na ito, ngunit bilang tagapangasiwa maaari mo ring makita ang mga interaksyon sa mga pribadong espasyo.
 public_activity.visibility_hint.self_private = Nakikita mo lang at mga tagapangasiwa ng instansya ang iyong aktibidad. <a href="%s">I-configure</a>.
 public_activity.visibility_hint.admin_private = Nakikita mo ang aktibidad na ito dahil isa kang tagapangasiwa, ngunit gusto ng user na panatilihin itong pribado.
 public_activity.visibility_hint.self_private_profile = Ikaw lang at ang mga tagapangasiwa ng instansya ang makakakita ng iyong aktibidad dahil pribado ang iyong profile. <a href="%s">I-configure</a>.
@@ -699,15 +699,15 @@ security = Seguridad
 avatar = Avatar
 ssh_gpg_keys = Mga SSH / GPG key
 applications = Mga Aplikasyon
-orgs = Ipamahala ang mga organisasyon
+orgs = Mga organisasyon
 repos = Mga Repositoryo
-delete = Burahin ang Account
+delete = Burahin ang account
 twofa = Authentikasyong two-factor (TOTP)
 account_link = Mga naka-link na account
 uid = UID
 webauthn = Authentikasyong two-factor (Mga security key)
 blocked_users = Mga hinarang na user
-public_profile = Pampublikong Profile
+public_profile = Pampublikong profile
 location_placeholder = Ibahagi ang iyong tinatayang lokasyon sa iba
 password_username_disabled = Ang mga di-lokal na gumagamit ay hindi pinapayagan na baguhin ang kanilang username. Mangyaring makipag-ugnayan sa iyong tagapangasiwa ng site para sa higit pang mga detalye.
 full_name = Buong pangalan
@@ -760,7 +760,7 @@ comment_type_group_milestone = Milestone
 comment_type_group_issue_ref = Pagsangguni ng isyu
 keep_activity_private_popup = Makikita mo lang at mga tagapangasiwa ang iyong aktibidad
 can_not_add_email_activations_pending = Mayroong isang nakabinbing pag-activate, subukang muli sa loob ng ilang minuto kung nais mong magdagdag ng isang bagong email.
-email_deletion_desc = Ang email address at mga kaugnay na impormasyon ay tatanggalin sa iyong account. Ang mga Git commit sa itong email address ay iiwanang hindi nabago. Magpatuloy?
+email_deletion_desc = Ang email address na ito at mga kaugnay na impormasyon ay tatanggalin sa iyong account. Ang mga Git commit sa itong email address ay iiwanang hindi nabago. Magpatuloy?
 add_email = Idagdag ang email eddress
 gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig
 delete_token_success = Nabura na ang token. Ang mga application na gumagamit nito ay hindi na maa-access ang iyong account.
@@ -842,7 +842,7 @@ gpg_key_verify = I-verify
 gpg_invalid_token_signature = Ang ibinigay na GPG key, signature, at token ay hindi tumutugma o luma.
 gpg_token_required = Kailangan mong magbigay ng signature para sa token sa ibaba
 gpg_token = Token
-gpg_token_help = Maari kang mag-generate ng signature gamit ng:
+gpg_token_help = Maaari kang mag-generate ng signature gamit ng:
 gpg_token_signature = Naka-armor na GPG signature
 key_signature_gpg_placeholder = Nagsisimula sa "-----BEGIN PGP SIGNATURE-----"
 verify_gpg_key_success = Na-verify na ang GPG key na "%s".
@@ -851,7 +851,7 @@ ssh_key_verify = I-verify
 ssh_invalid_token_signature = Ang ibinigay na SSH key, signature, o token ay hindi tumutugma o luma.
 ssh_token_required = Kailangan mong magbigay ng signature para sa token sa ibaba
 ssh_token = Token
-ssh_token_help = Maari kang mag-generate ng signature gamit ng:
+ssh_token_help = Maaari kang mag-generate ng signature gamit ng:
 ssh_token_signature = Naka-armor na SSH signature
 key_signature_ssh_placeholder = Nagsisimula sa "-----BEGIN SSH SIGNATURE-----"
 verify_ssh_key_success = Na-verify na ang SSH key na "%s".
@@ -912,10 +912,10 @@ create_oauth2_application_success = Matagumpay kang gumawa ang bagong OAuth2 app
 oauth2_confidential_client = Kumpidensyal na kliyente. Piliin para sa mga app na pinapatilihing kumpidensyal ang sikreto, tulad ng mga web app. Huwag piliin para sa mga web app kasama ang mga desktop at mobile app.
 twofa_desc = Para protektahin ang iyong account laban sa pagnanakaw ng password, pwede mo gamitin ang iyong smartphone o ibang device para sa pagtanggap ng time-based one-time password ("TOTP").
 twofa_scratch_token_regenerated = Ang iyong isang-beses na paggamit na recovery key ngayon ay %s. Ilagay ito sa ligtas na lugar, dahil hindi na ito ipapakita muli.
-regenerate_scratch_token_desc = Kapag nawala mo ang iyong recovery key o ginamit mo na oara mag-sign in, maari mong i-reset dito.
+regenerate_scratch_token_desc = Kapag nawala mo ang iyong recovery key o ginamit mo na oara mag-sign in, maaari mong i-reset dito.
 twofa_disable_desc = Ang pag-disable ng authentikasyong two-factor ay gagawing hindi gaanong ligtas ang iyong account. Magpatuloy?
 twofa_enrolled = Matagumpay na na-enroll ang iyong account. Ilagay ang iyong isang-beses na paggamit na recovery key (%s) sa isang ligtas na lugar, dahil hindi na ito ipapakita muli.
-webauthn_desc = Ang mga security key ay isang hardware device na naglalaman ng mga cryptographic key. Maari silang gamitin para sa authentikasyong two-factor. Ang mga security key ay dapat suportahan ang <a rel="noreferrer" target="_blank" href="%s">WebAuthn Authenticator</a> na standard.
+webauthn_desc = Ang mga security key ay isang hardware device na naglalaman ng mga cryptographic key. Maaari silang gamitin para sa authentikasyong two-factor. Ang mga security key ay dapat suportahan ang <a rel="noreferrer" target="_blank" href="%s">WebAuthn Authenticator</a> na standard.
 remove_oauth2_application = Tanggalin ang OAuth2 Application
 remove_oauth2_application_desc = Ang pagtanggal ng OAuth2 application ay babawiin ang access sa lahat ng mga naka-sign na access token. Magpatuloy?
 remove_oauth2_application_success = Binura na ang application.
@@ -931,13 +931,13 @@ oauth2_regenerate_secret = I-regenerate ang sikreto
 oauth2_regenerate_secret_hint = Nawala mo ang iyong sikreto?
 oauth2_client_secret_hint = Ang sikreto ay hindi ipapakita muli pagkatapos umalis ka o i-refresh ang page na ito. Mangyaring siguraduhin na na-save mo iyan.
 oauth2_application_edit = I-edit
-twofa_recovery_tip = Kapag mawala mo ang iyong device, maari kang gumamit ng isang isang-beses na paggamit na recovery key para makakuha muli ng access sa iyong account.
+twofa_recovery_tip = Kapag mawala mo ang iyong device, maaari kang gumamit ng isang isang-beses na paggamit na recovery key para makakuha muli ng access sa iyong account.
 twofa_is_enrolled = Ang iyong account ay kasalukuyang <strong>naka-enroll</strong> sa autentikasyong two-factor.
 twofa_not_enrolled = Kasalukuyang hindi naka-enroll ang iyong account sa authentikasyong two-factor.
 twofa_disable = I-disable ang authentikasyong two-factor
 twofa_scratch_token_regenerate = I-regenerate ang isang-beses na paggamit na recovery key
 twofa_enroll = Mag-enroll sa authentikasyong two-factor
-twofa_disable_note = Maari mong i-disable ang authentikasyong two-factor kapag kinakailangan.
+twofa_disable_note = Maaari mong i-disable ang authentikasyong two-factor kapag kinakailangan.
 twofa_disabled = Na-disable na ang authentikasyong two-factor.
 scan_this_image = I-scan ang image na ito gamit ng iyong aplikasyong pang-authentikasyon:
 or_enter_secret = O ilagay ang sikreto: %s
@@ -1005,8 +1005,8 @@ language.description = Mase-save ang wika sa iyong account at gagamitin bilang d
 language.localization_project = Tulungan kaming isalin ang Forgejo sa iyong wika! <a href="%s">Matuto pa</a>.
 pronouns_custom_label = Mga pasadyang pronoun
 user_block_yourself = Hindi mo maaaring harangan ang sarili mo.
-change_username_redirect_prompt.with_cooldown.one = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown.
-change_username_redirect_prompt.with_cooldown.few = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown.
+change_username_redirect_prompt.with_cooldown.one = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw. Maaari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown.
+change_username_redirect_prompt.with_cooldown.few = Magiging available ang lumang username sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw. Maaari mo pa ring ma-claim muli ang lumang username sa panahon ng panahon ng cooldown.
 keep_pronouns_private = Ipakita lang ang mga panghalip sa mga naka-authenticate na user
 keep_pronouns_private.description = Itatago nito ang iyong mga panghalip mula sa mga bisita na hindi naka-log in.
 quota.applies_to_user = Nag-aapply ang mga sumusunod na panuntunan ng quota sa iyong account
@@ -1033,6 +1033,7 @@ access_token_regeneration = I-regenerate ang access token
 regenerate_token = I-regenerate
 access_token_regeneration_desc = Ang pag-regenerate ng token ay babawiin ang access sa iyong account para sa mga application na gumagamit nito. Hindi ito mababawi. Magpatuloy?
 regenerate_token_success = Na-generate muli ang token. Ang mga application na gumagamit nito ay hindi na maa-access ang iyong account at dapat ma-update gamit ang bagong token.
+ssh_token_help_ssh_agent = o, kung gumagamit ka ng SSH agent (na nakatakda ang variable na SSH_AUTH_SOCK):
 
 [repo]
 template_description = Ang mga template na repositoryo ay pinapayagan ang mga gumagamit na mag-generate ng mga bagong repositoryo na may magkatulad na istraktura ng direktoryo, mga file, at opsyonal na mga setting.
@@ -1071,7 +1072,7 @@ readme_helper_desc = Ito ang lugar kung saan makakasulat ka ng kumpletong deskri
 trust_model_helper_collaborator_committer = Katulong+Committer: I-trust ang mga signature batay sa mga katulong na tumutugma sa committer
 mirror_interval = Interval ng mirror (ang mga wastong unit ng oras ay "h", "m", "s"). 0 para i-disable ang periodic sync. (Pinakamababang interval: %s)
 transfer.reject_desc = Kanselahin ang pag-transfer mula sa "%s"
-mirror_lfs_endpoint_desc = Ang sync ay susubukang gamitin ang clone url upang <a target="_blank" rel="noopener noreferrer" href="%s">matukoy ang LFS server</a>. Maari ka rin tumukoy ng isang custom na endpoint kapag ang LFS data ng repositoryo ay nilalagay sa ibang lugar.
+mirror_lfs_endpoint_desc = Ang sync ay susubukang gamitin ang clone url upang <a target="_blank" rel="noopener noreferrer" href="%s">matukoy ang LFS server</a>. Maaari ka rin tumukoy ng isang custom na endpoint kapag ang LFS data ng repositoryo ay nilalagay sa ibang lugar.
 adopt_search = Ilagay ang username para maghanap ng mga unadopted na repositoryo… (iwanang walang laman para hanapin lahat)
 object_format = Format ng object
 readme_helper = Pumili ng README file template
@@ -1115,7 +1116,7 @@ default_branch = Default na branch
 default_branch_label = default
 mirror_prune = Pungusan
 mirror_prune_desc = Tanggalin ang mga antikuwado na sangguni ng remote-tracking
-mirror_address_url_invalid = Ang ibinigay na url ay hindi wasto. Kailangan mong i-escape ang lahat ng mga components ng URL ng tama.
+mirror_address_url_invalid = Hindi wasto ang ibinigay na URL. Siguraduhin na ang mga component ng URL ay na-escape nang tama.
 mirror_address_protocol_invalid = Ang ibinigay na URL ay hindi wasto. Ang http(s):// o git:// na lokasyon lamang ay magagamit para sa pag-mirror.
 mirror_lfs = Imbakan ng Malaking File (LFS)
 mirror_lfs_desc = I-activate ang pag-mirror ng LFS data.
@@ -1164,8 +1165,8 @@ tree_path_not_found_commit = Hindi umiiral ang path na %[1]s sa commit %[2]s
 tree_path_not_found_branch = Hindi umiiral ang daanang %[1]s sa branch %[2]s
 migrate_items_pullrequests = Mga hiling sa paghila
 archive.pull.nocomment = Naka-archive ang repositoryong ito. Hindi ka makakakomento sa mga pull request.
-archive.title = Naka-archive ang repositoryong ito. Maari mong itignan ang mga file at i-clone ito, pero hindi ka makakagawa ng anumang pagbabago sa estado ito, tulad ng pagtulak at paggawa ng mga isyu, pull request o mga komento.
-archive.title_date = Naka-archive ang repositoryo na ito noong %s. Maari mong itignan ang mga file at i-clone ito, pero hindi ka makakagawa ng anumang pagbabago sa estado nito, tulad ng pagtulak o paggawa ng mga bagong isyu, mga pull request, o komento.
+archive.title = Naka-archive ang repositoryong ito. Maaari mong itignan ang mga file at i-clone ito, pero hindi ka makakagawa ng anumang pagbabago sa estado ito, tulad ng pagtulak at paggawa ng mga isyu, pull request o mga komento.
+archive.title_date = Naka-archive ang repositoryo na ito noong %s. Maaari mong itignan ang mga file at i-clone ito, pero hindi ka makakagawa ng anumang pagbabago sa estado nito, tulad ng pagtulak o paggawa ng mga bagong isyu, mga pull request, o komento.
 pulls = Mga hiling sa paghila
 activity.merged_prs_count_n = Mga naisamang hiling sa paghila
 wiki.last_updated = Huling binago %s
@@ -1183,7 +1184,7 @@ issues.action_open = Buksan
 issues.closed_title = Sarado
 issues.reopen_issue = Buksang muli
 pulls.merged = Naisama na
-pulls.merged_info_text = Maari nang burahin ang branch %s.
+pulls.merged_info_text = Maaari nang burahin ang branch %s.
 milestones.update_ago = Binago %s
 activity.closed_issue_label = Sarado
 activity.merged_prs_label = Naisama
@@ -1203,9 +1204,9 @@ template.avatar = Avatar
 migrate_options = Mga opsyon sa paglipat
 migrate.clone_address_desc = Ang HTTP(S) o Git "clone" URL ng umiiral na repositoryo
 need_auth = Awtorisasyon
-migrate.github_token_desc = Maaari kang maglagay ng isa o higit pang mga token na hinihiwalay ng kuwit dito upang gawing mas-mabilis ang pagmigrate dahil sa rate limit ng GitHub API. BABALA: Ang pagabuso ng feature na ito ay maaaring maglabag sa patakaran ng tagapagbigay ng serbisyo at maaaring magdulot ng pag-block ng account.
+migrate.github_token_desc = Maaari kang maglagay ng isa o higit pang mga token dito na hinihiwalay ng mga kuwit upang gawing mas-mabilis ang pag-migrate sa pamamagitan ng pag-iwas sa rate limit ng GitHub API. BABALA: Ang pagabuso ng feature na ito ay maaaring maglabag sa patakaran ng tagapagbigay ng serbisyo at maaaring magdulot ng pag-block ng iyong (mga) account.
 template.invalid = Kailangang pumili ng kahit isang template na repositoryo
-migrate_options_lfs_endpoint.description = Susubukan ng migration na gamitin ang iyong Git remote upang <a target="_blank" rel="noopener noreferrer" href="%s">matukoy ang LFS server</a>. Maari mong magtiyak ng custom na endpoint kapag ang LFS data ng repositoryo ay nakalagay sa ibang lugar.
+migrate_options_lfs_endpoint.description = Susubukan ng migration na gamitin ang iyong Git remote upang <a target="_blank" rel="noopener noreferrer" href="%s">matukoy ang LFS server</a>. Maaari mong magtiyak ng custom na endpoint kapag ang LFS data ng repositoryo ay nakalagay sa ibang lugar.
 blame.ignore_revs.failed = Nabigong hindi pansinin ang mga rebisyon sa <a href="%s">.git-blame-ignore-revs</a>.
 tree_path_not_found_tag = Hindi umiiral ang path na %[1]s sa tag %[2]s
 form.reach_limit_of_creation_n = Naabot na ng may-ari ang limitasyon na %d mga repositoryo.
@@ -1471,10 +1472,10 @@ activity.new_issue_label = Nabuksan
 activity.merged_prs_count_1 = Naisamang hiling sa paghila
 activity.opened_prs_count_1 = Inimungkahing hiling sa paghila
 activity.opened_prs_label = Inimungkahi
-pulls.reopened_at = `nabuksang muli ang hiling sa paghatak na <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.reopened_at = `binuksan muli ang hiling sa paghila %s`
 issues.opened_by_fake = binuksan ang %[1]s ni/ng %[2]s
 pulls.reopen_failed.base_branch = Hindi mabuksang muli ang hiling sa paghatak na ito dahil hindi na umiiral ang base branch.
-issues.reopened_at = `binuksang muli ang isyung ito <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.reopened_at = `binuksang muli ang isyung ito %s`
 pulls.reopen_failed.head_branch = Hindi mabubuksan muli ang hiling sa paghila, dahil hindi na umiiral ang head branch.
 settings.event_pull_request_desc = Binuksan, sinara, muling binuksan, o binago ang hiling sa paghatak.
 activity.opened_prs_count_n = Mga inimungkahing hiling sa paghila
@@ -1500,7 +1501,7 @@ issues.content_history.created = ginawa
 editor.patching = Pina-patch:
 editor.fail_to_apply_patch = Hindi malapat ang patch na "%s"
 settings.danger_zone = Mapanganib na lugar
-issues.closed_at = `isinara ang isyung <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at = `isinara ang isyung ito %s`
 settings.collaboration.admin = Tagapangasiwa
 settings.admin_settings = Mga setting ng tagapangasiwa
 issues.start_tracking_history = `sinimulan ang trabaho %s`
@@ -1627,8 +1628,8 @@ projects.column.edit_title = Pangalan
 projects.column.new_title = Pangalan
 projects.card_type.desc = Mga preview ng card
 commits.desc = I-browse ang history ng pagbabago ng source code.
-commits.search.tooltip = Maari kang mag-prefix ng mga keyword gamit ang "author:", "committer:", "after:", o "before:", hal. "revert author:Nijika before:2022-10-09".
-issues.force_push_codes = `puwersahang itinulak ang %[1]s mula <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> sa <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+commits.search.tooltip = Maaari kang mag-prefix ng mga keyword gamit ang "author:", "committer:", "after:", o "before:", hal. "revert author:Nijika before:2022-10-09".
+issues.force_push_codes = `puwersahang itinulak ang %[1]s mula <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s sa <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.push_commit_1 = idinagdag ang %d commit %s
 issues.push_commits_n = idinagdag ang %d mga commit %s
 issues.new.no_reviewers = Walang mga tagasuri
@@ -1674,10 +1675,10 @@ issues.new_label = Bagong label
 issues.label_templates.title = Mag-load ng isang label preset
 issues.new.clear_milestone = I-clear ang milestone
 issues.new.open_milestone = Mga bukas na milestone
-issues.filter_milestones = I-filter ang Milestone
-issues.filter_projects = I-filter ang Proyekto
-issues.filter_labels = I-filter ang Label
-issues.filter_reviewers = I-filter ang Tagasuri
+issues.filter_milestones = I-filter ang milestone
+issues.filter_projects = I-filter ang proyekto
+issues.filter_labels = I-filter ang label
+issues.filter_reviewers = I-filter ang tagasuri
 issues.remove_labels = tinanggal ang mga label na %s %s
 issues.add_remove_labels = idinagdag ang %s at tinanggal ang %s na mga label %s
 issues.add_milestone_at = `idinagdag ito sa <b>%s</b> na milestone %s`
@@ -1688,7 +1689,7 @@ issues.add_label = idinagdag ang %s na label %s
 issues.add_labels = idinagdag ang mga label na %s %s
 issues.remove_label = tinanggal ang %s na label %s
 issues.desc = Ayusin ang mga ulat ng bug, gawain, at milestone.
-issues.filter_assignees = I-filter ang Mangangasiwa
+issues.filter_assignees = I-filter ang mangangasiwa
 issues.new.labels = Mga label
 issues.new.no_label = Walang mga label
 issues.new.clear_labels = I-clear ang mga label
@@ -1707,7 +1708,7 @@ issues.action_milestone = Milestone
 issues.action_milestone_no_select = Walang milestone
 issues.delete_branch_at = `binura ang branch na <b>%s</b> %s`
 issues.filter_label = Label
-issues.filter_label_exclude = `Gamitin ang <code>alt</code> + <code>click/enter</code> para hindi isama ang mga label`
+issues.filter_label_exclude = `Gamitin ang <kbd>Alt</kbd> + <kbd>Click</kbd> para hindi isama ang mga label`
 issues.filter_label_no_select = Lahat ng mga label
 issues.filter_milestone_closed = Mga nakasarang milestone
 issues.filter_assignee = Mangangasiwa
@@ -1771,7 +1772,7 @@ issues.lock = I-lock ang usapan
 issues.unlock = I-unlock ang usapan
 issues.unlock_comment = na-unlock ang usapang ito %s
 issues.unlock.notice_1 = - Makakakomento muli ang lahat ng mga tao sa isyung ito.
-issues.unlock.notice_2 = - Maari mong i-lock muli ang isyung ito sa hinaharap.
+issues.unlock.notice_2 = - Maaari mong i-lock muli ang isyung ito sa hinaharap.
 issues.comment_on_locked = Hindi ka makakakomento sa naka-lock na isyu.
 issues.closed_by_fake = ni/ng %[2]s ay isinara %[1]s
 issues.comment_manually_pull_merged_at = manwal na isinama ang commit %[1]s sa %[2]s %[3]s
@@ -1787,10 +1788,10 @@ issues.label_archive_tooltip = Ang mga naka-archive na label ay hindi isasama bi
 issues.is_stale = May mga pagbabago sa PR na ito mula sa pagsuri na ito
 issues.role.first_time_contributor = Unang-beses na contributor
 issues.lock.notice_1 = - Hindi makakadagdag ng mga bagong komento ang mga ibang user sa isyu na ito.
-issues.lock.notice_3 = - Maari mong i-unlock muli ang isyung ito sa hinaharap.
+issues.lock.notice_3 = - Maaari mong i-unlock muli ang isyung ito sa hinaharap.
 issues.label_deletion_desc = Ang pagbura ng label ay tatanggalin ito sa lahat ng mga isyu. Magpatuloy?
-issues.commit_ref_at = `isinangguni ang isyu na ito mula sa commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from = `<a href="%[3]s">isinangguni ang isyu na ito sa %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at = `isinangguni ang isyu na ito mula sa commit %s`
+issues.ref_issue_from = `<a href="%[2]s">isinangguni ang isyu na ito sa %[3]s</a> %[1]s`
 issues.num_participants_one = %d kasali
 issues.attachment.download = `I-click para i-download ang "%s" `
 issues.num_participants_few = %d mga kasali
@@ -1815,10 +1816,10 @@ issues.sign_in_require_desc = <a href="%s">Mag-sign in</a> upang sumali sa usapa
 issues.num_comments = %d mga komento
 issues.role.contributor_helper = Nakaraang nag-commit ang user na ito sa repositoryo na ito.
 issues.comment_pull_merged_at = isinama ang commit %[1]s sa %[2]s %[3]s
-pulls.commit_ref_at = `isinangguni ang hiling sa paghila mula sa isang commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `isinangguni ang hiling sa paghila mula sa isang commit %s`
 wiki.last_commit_info = Binago ni %s ang pahinang ito %s
 issues.content_history.edited = binago
-issues.ref_pull_from = `<a href="%[3]s">isinangguni ang hiling sa paghila na ito %[4]s </a><a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_pull_from = `<a href="%[2]s">isinangguni ang hiling sa paghila na ito %[3]s</a> %[1]s`
 pulls.merged_title_desc_few = isinali ang %[1]d mga commit mula sa <code>%[2]s</code> patungong <code>%[3]s</code> %[4]s
 settings.org_not_allowed_to_be_collaborator = Hindi maaaring idagdag ang mga organisasyon bilang tagatulong.
 settings.add_collaborator_success = Naidagdag ang tagatulong.
@@ -1828,7 +1829,7 @@ pulls.create = Gumawa ng hiling sa paghila
 issues.dependency.pr_close_blocked = Kailangan mong isara ang lahat ng mga isyu na humaharang sa hiling sa paghila na ito bago mo ito isama.
 pulls.delete.title = Burahin ang hiling sa paghila na ito?
 issues.dependency.pr_closing_blockedby = Hinarang ng mga sumusunod na isyu mula sa pagsara ng hiling sa paghila na ito
-pulls.closed_at = `isinara ang hiling sa paghila na <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `isinara ang hiling sa paghila na ito %s`
 pulls.close = Isara ang hiling sa paghila
 pulls.cmd_instruction_hint = Tingnan ang mga panuto para sa command line
 project = Mga proyekto
@@ -1836,8 +1837,8 @@ issues.content_history.deleted = binura
 pulls.no_results = Walang mga nahanap na resulta.
 pulls.closed = Sarado ang hiling sa paghila
 pulls.is_closed = Naisara na ang hiling sa paghila.
-issues.ref_closing_from = `<a href="%[3]s">nagsangguni ang isyu mula sa hiling sa paghila %[4]s na magsasara sa isyu</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from = `<a href="%[3]s">nagsangguni ang isyu na ito mula sa hiling sa paghila %[4]s na muling bubukas</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_closing_from = `<a href="%[2]s">nagsangguni ang isyu mula sa hiling sa paghila %[3]s na magsasara sa isyu</a>, %[1]s`
+issues.ref_reopening_from = `<a href="%[2]s">nagsangguni ang isyu na ito mula sa hiling sa paghila %[3]s na muling bubukas nito</a>, %[1]s`
 issues.ref_closed_from = `<a href="%[3]s">isinara ang isyung ito %[4]s</a><a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.review.wait = hiniling sa pagsuri %s
 issues.review.reject = hinihiling ang mga pagbago %s
@@ -1893,7 +1894,7 @@ settings.collaboration.owner = May-ari
 pulls.showing_only_single_commit = Ipinapakita lamang ang mga pagbago ng commit na %[1]s
 comments.edit.already_changed = Hindi maimbak ang mga pagbabago sa komento. Mukhang nabago na ng ibang tagagamit ang nilalaman. Mangyaring i-refresh ang pahina at subukang baguhin muli upang maiwasang ma-overwrite ang kanilang pagbago
 milestones.completeness = <strong>%d%%</strong> nakumpleto
-wiki.welcome = Maligayang pagdating sa Wiki.
+wiki.welcome = Maligayang pagdating sa wiki.
 wiki.create_first_page = Gawin ang unang pahina
 pulls.switch_comparison_type = Ilipat ang uri ng pagkumpara
 settings.collaboration.read = Basahin
@@ -2015,14 +2016,14 @@ wiki.cancel = Kanselahin
 settings.collaboration.undefined = Hindi Natukoy
 settings.federation_settings = Mga Setting ng Federation
 settings = Mga Setting
-settings.desc = Ang mga setting ang lugar kung saan maari mong ipamahala ang mga setting para sa repositoryo
+settings.desc = Ang mga setting ang lugar kung saan maaari mong ipamahala ang mga setting para sa repositoryo
 pulls.collapse_files = I-collapse ang lahat ng mga file
 pulls.add_prefix = Magdagdag ng <strong>%s</strong> na prefix
 pulls.still_in_progress = Ginagawa pa?
 activity.title.prs_1 = %d hiling sa paghila
 activity.active_issues_count_n = <strong>%d</strong> mga aktibong isyu
 pulls.required_status_check_missing = Nawawala ang ilang mga kinakailangang pagsusuri.
-pulls.required_status_check_administrator = Bilang tagapangasiwa, maari mo pa ring isama ang hiling sa paghila na ito.
+pulls.required_status_check_administrator = Bilang tagapangasiwa, maaari mo pa ring isama ang hiling sa paghila na ito.
 pulls.blocked_by_approvals = Wala pang sapat na pag-apruba ang hiling sa paghila na ito. %d ng %d na pag-apruba ang ibinigay.
 settings.options = Repositoryo
 wiki.back_to_wiki = Bumalik sa pahina ng wiki
@@ -2110,7 +2111,7 @@ settings.actions_desc = I-enable ang mga kasamang CI/CD pipeline gamit ang Forge
 settings.admin_indexer_commit_sha = Huling na-index na commit
 settings.admin_indexer_unindexed = Hindi naka-index
 settings.transfer_notices_3 = - Kung pribado ang repositoryo at ilipat sa isang indibidwal na user, ang aksyon na ito ay sinisigurado na ang user ay may pahintulot na basahin (at palitan ang mga pahintulot kung kailangan).
-settings.convert_desc = Maari mong i-convert ang repositoryo na ito sa regular na repositoryo. Hindi ito mababawi.
+settings.convert_desc = Maaari mong i-convert ang repositoryo na ito sa regular na repositoryo. Hindi ito mababawi.
 settings.transfer.button = Ilipat ang pagmamay-ari
 settings.signing_settings = Mga setting sa pagpapatunay ng pag-sign
 settings.admin_enable_close_issues_via_commit_in_any_branch = Isara ang isyu sa pamamagitan ng commit na ginawa sa hindi default na branch
@@ -2137,7 +2138,7 @@ settings.deploy_key_deletion = Tanggalin ang deploy key
 settings.protect_enable_push = I-enable ang pagtulak
 settings.discord_icon_url.exceeds_max_length = Kailangang bababa o equal sa 2048 characters ang URL ng icon
 settings.protected_branch.save_rule = I-save ang rule
-settings.mirror_settings.docs.can_still_use = Bagama't na hindi ka makakabago ng mga umiiral na mirror o gumawa ng bago, maari mo pa rin gamitin ang iyong umiiral na mirror.
+settings.mirror_settings.docs.can_still_use = Bagama't na hindi ka makakabago ng mga umiiral na mirror o gumawa ng bago, maaari mo pa rin gamitin ang iyong umiiral na mirror.
 settings.slack_color = Kulay
 settings.discord_icon_url = URL ng icon
 settings.convert_fork_confirm = I-convert ang repositoryo
@@ -2225,7 +2226,7 @@ milestones.modify = I-update ang milestone
 milestones.filter_sort.earliest_due_data = Pinakamalapit na takdang petsa
 milestones.filter_sort.least_complete = Hindi bababa sa kumpleto
 signing.will_sign = Isa-sign ang commit gamit ang key na "%s".
-signing.wont_sign.error = May error na naganap habang sinusuri kung masa-sign ang commit.
+signing.wont_sign.error = May error na naganap habang sinusuri kung mailalagda ang commit.
 signing.wont_sign.always = Palaging naka-sign ang mga commit.
 signing.wont_sign.twofa = Kailangang naka-enable ang authentikasyong two factor para naka-sign ang mga commit.
 wiki.delete_page_notice_1 = Ang pagtanggal sa pahina ng wiki na "%s" ay hindi na mababawi. Magpatuloy?
@@ -2254,7 +2255,7 @@ settings.pulls.allow_rebase_update = I-enable ang pag-update ng hiling sa paghil
 settings.admin_enable_health_check = I-enable ang pagsusuri ng kalusugan ng repositoryo (git fsck)
 settings.new_owner_has_same_repo = Ang bagong may-ari ay may repositoryo na may katulad na pangalan. Mangyaring pumili ng ibang pangalan.
 settings.convert = I-convert sa regular na repositoryo
-settings.convert_fork_desc = Maari mong i-convert ang fork na ito bilang regular na repositoryo. Hindi ito mababawi.
+settings.convert_fork_desc = Maaari mong i-convert ang fork na ito bilang regular na repositoryo. Hindi ito mababawi.
 settings.convert_fork_notices_1 = Ang operasyon na ito ay ico-convert ang fork bilang regular na repositoryo at hindi mababawi.
 settings.transfer_abort_invalid = Hindi mo makakansela ang isang hindi umiiral na paglipat ng repositoryo.
 settings.transfer_quota_exceeded = Ang bagong may-ari (%s) ay lumalagpas sa quota. Hindi nailipat ang repositoryo.
@@ -2278,7 +2279,7 @@ settings.add_collaborator = Magdagdag ng katulong
 settings.add_collaborator_duplicate = Nadagdag na ang tagatulong na ito sa repositoryo.
 settings.add_collaborator_blocked_our = Hindi madagdag ang tagatulong, dahil hinarang siya ng may-ari ng repositoryo.
 settings.add_collaborator_blocked_them = Hindi madagdag ang tagatulong, dahil hinarang niya ang may-ari ng repositoryo.
-settings.collaborator_deletion = Tanggalin ang Tagatulong
+settings.collaborator_deletion = Tanggalin ang tagatulong
 settings.team_not_in_organization = Ang koponan ay hindi nasa katulad na organisasyon sa repositoryo
 settings.teams = Mga Koponan
 settings.add_team_success = May access na ang koponan sa repositoryo na ito.
@@ -2290,8 +2291,8 @@ settings.webhook.headers = Mga header
 settings.webhook.payload = Nilalaman
 settings.webhook.body = Katawan
 settings.webhook.replay.description = I-replay ang webhook na ito.
-settings.webhook.delivery.success = May nadagdag na event sa delivery queue. Maari magtagal ng ilang segundo bago makita sa delivery history.
-settings.githooks_desc = Pinapagana ng Git ang mga Git hook. Maari mong baguhin ang mga hook file sa ibaba para mag-set up ng mga custom na operasyon.
+settings.webhook.delivery.success = May nadagdag na event sa delivery queue. Maaari magtagal ng ilang segundo bago makita sa delivery history.
+settings.githooks_desc = Pinapagana ng Git ang mga Git hook. Maaari mong baguhin ang mga hook file sa ibaba para mag-set up ng mga custom na operasyon.
 settings.githook_name = Pangalan ng hook
 settings.githook_content = Nilalaman ng hook
 settings.update_githook = I-update ang hook
@@ -2362,7 +2363,7 @@ settings.mirror_settings.docs.pull_mirror_instructions = Para mag-set up ng pull
 milestones.invalid_due_date_format = Kailangang "yyyy-mm-dd" na format ang takdang petsa.
 signing.wont_sign.nokey = Walang key ang instansya na ito para i-sign ang commit na ito.
 activity.title.releases_1 = %d paglabas
-settings.mirror_settings.docs.more_information_if_disabled = Maari kang matuto pa tungkol sa mga push at pull na mirror dito:
+settings.mirror_settings.docs.more_information_if_disabled = Maaari kang matuto pa tungkol sa mga push at pull na mirror dito:
 settings.branches.switch_default_branch = Magpalit ng default branch
 settings.convert_notices_1 = Ang operasyon na ito ay ico-covert ang mirror sa regular na repositoryo at hindi mababawi.
 settings.convert_fork_succeed = Na-convert na ang fork sa regular na repositoryo.
@@ -2732,7 +2733,7 @@ settings.protect_protected_file_patterns = Mga pattern ng nakaprotektang file (h
 settings.update_protect_branch_success = Binago na ang branch protection rule na "%s".
 settings.remove_protected_branch_success = Tinanggal ang branch protection rule na "%s".
 settings.tags.protection.pattern = Pattern ng tag
-settings.tags.protection.pattern.description = Maari kang gumamit ng iisang pangalan o glob pattern o regular expression para magtugma ng maraming tag. Magbasa pa sa <a target="_blank" rel="noopener" href="%s">guide ng mga nakaprotektang tag</a>.
+settings.tags.protection.pattern.description = Maaari kang gumamit ng iisang pangalan o glob pattern o regular expression para magtugma ng maraming tag. Magbasa pa sa <a target="_blank" rel="noopener" href="%s">guide ng mga nakaprotektang tag</a>.
 settings.thread_id = ID ng thread
 settings.matrix.room_id = ID ng room
 diff.has_escaped = May mga nakatagong Unicode character ang linya na ito
@@ -2746,7 +2747,7 @@ diff.bin = BIN
 settings.default_update_style_desc = Ang default na istilio na gagamitin sa pag-update ng mga hiling sa paghila na nalilipas sa base branch.
 pulls.sign_in_require = <a href="%s">Mag-sign in</a> para gumawa ng bagong hiling sa paghila.
 new_from_template = Gumamit ng template
-new_from_template_description = Maari kang pumili ng umiiral na repository template sa instansya na ito at i-apply ang mga setting nito.
+new_from_template_description = Maaari kang pumili ng umiiral na repository template sa instansya na ito at i-apply ang mga setting nito.
 new_advanced = Mga advanced na setting
 new_advanced_expand = I-click para i-expand
 auto_init_description = Simulan ang kasaysayan ng Git gamit ang README at opsyonal na magdagdag ng mga lisensya at .gitignore na file.
@@ -2767,6 +2768,20 @@ issues.reopen.blocked_by_user = Hindi mo maaaring buksan muli ang isyung ito dah
 pulls.comment.blocked_by_user = Hindi ka maaaring magkomento sa hiling sa paghila na ito dahil hinarang ka ng may-ari ng repositoryo o ng may-akda ng hiling sa paghila.
 issues.filter_no_results = Walang mga resulta
 issues.filter_no_results_placeholder = Subukang ayusin ang iyong mga filter sa paghahanap.
+migrate.repo_desc_helper = Iwanang walang laman para i-import ang umiiral na paglalarawan
+archive.nocomment = Hindi posible ang pagkomento dahil naka-archive ang repositoryo.
+comment.blocked_by_user = Hindi posible ang pagkomento dahil hinarang ka ng may-ari ng repositoryo o ng may-akda.
+sync_fork.button = I-sync
+sync_fork.branch_behind_one = Ang branch na ito ay %[1]d commit sa likod ng %[2]s
+sync_fork.branch_behind_few = Ang branch na ito ay %[1]d mga commit sa likod ng %[2]s
+settings.event_header_action = Mga event sa run ng aksyon
+settings.event_action_failure = Pagkabigo
+settings.event_action_failure_desc = Natapos ang action run bilang pagkabigo.
+settings.event_action_recover = I-recover
+settings.event_action_success = Matagumpay
+settings.event_action_success_desc = Matagumpay na natapos ang Action Run.
+settings.event_action_recover_desc = Matagumpay na natapos ang Action Run pagkatapos na nabigo ang huling Action Run sa katulad na workflow.
+issues.filter_type.all_pull_requests = Lahat ng mga hiling sa paghila
 
 [search]
 commit_kind = Maghanap ng mga commit…
@@ -2850,7 +2865,7 @@ dashboard.resync_all_sshprincipals = I-update ang ".ssh/authorized_principals" f
 dashboard.resync_all_hooks = I-resychronize ang mga pre-receive, update at post-receive hook para sa lahat ng mga repositoryo
 dashboard.cleanup_hook_task_table = Linisin ang hook_task table
 dashboard.cleanup_packages = Linisin ang mga na-expire na package
-dashboard.cleanup_actions = Linisin ang mga na-expire na log at artifact mula sa mga aksyon
+dashboard.cleanup_actions = Linisin ang mga nag-expire na log at artifact mula sa mga aksyon
 dashboard.server_uptime = Uptime ng server
 dashboard.current_goroutine = Mga kasalukuyang goroutine
 dashboard.total_memory_allocated = Kabuuan na na-allocate na memory
@@ -3192,7 +3207,7 @@ self_check.database_collation_mismatch = Inaasahan ang database na gamitin ang c
 auths.oauth2_admin_group = Group claim value para sa mga tagapangasiwa. (Opsyonal - kinakailangan ang claim name sa itaas)
 auths.tip.facebook = Magrehistro ng bagong application sa %s at idagdag ang produktong "Facebook Login"
 users.restricted.description = Payagan lamang ang interaksyon sa mga repositoryo at organisasyon kung saan ang user ay dinagdag bilang tagatulong. Iniiwasan nito ang pag-access sa publikong repositoryo sa instansya na ito.
-users.local_import.description = Payagan ang pag-import ng mga repositoryo mula sa local file system ng user. Maari itong maging isyu sa seguridad.
+users.local_import.description = Payagan ang pag-import ng mga repositoryo mula sa local file system ng user. Maaari itong maging isyu sa seguridad.
 emails.delete = Burahin ang Email
 emails.deletion_success = Binura na ang email address.
 auths.oauth2_required_claim_value = Kinakailangan na claim value
@@ -3437,8 +3452,8 @@ teams.owners_permission_desc = Ang mga owner ay may punong access sa <strong>lah
 teams.add_nonexistent_repo = Hindi pa umiiral ang repositoryo na sinusubukan mong idagdag. Mangyaring gawin iyan muna.
 teams.all_repositories = Lahat ng mga repositoryo
 teams.all_repositories_helper = Ang koponan ay may access sa lahat ng mga repositoryo. Ang pagpili nito ay <strong>idadagdag ang lahat ng mga umiiral</strong> na repositoryo sa koponan.
-settings.change_orgname_redirect_prompt.with_cooldown.few = Magiging available ang lumang pangalan ng organisasyon sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang pangalan sa panahon ng cooldown.
-settings.change_orgname_redirect_prompt.with_cooldown.one = Magiging available ang lumang pangalan ng organisasyon sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw, maari mo pa ring ma-claim muli ang lumang pangalan ng panahon ng cooldown.
+settings.change_orgname_redirect_prompt.with_cooldown.few = Magiging available ang lumang pangalan ng organisasyon sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw. Maaari mo pa ring ma-claim muli ang lumang pangalan sa panahon ng cooldown.
+settings.change_orgname_redirect_prompt.with_cooldown.one = Magiging available ang lumang pangalan ng organisasyon sa lahat pagkatapos ng panahon ng cooldown ng %[1]d araw. Maaari mo pa ring ma-claim muli ang lumang pangalan ng panahon ng cooldown.
 
 
 [packages]
@@ -3534,7 +3549,7 @@ container.details.type = Uri ng image
 rubygems.required.ruby = Kinakailangan ang bersyon ng Ruby
 npm.dependencies.bundle = Mga kasamang dependency
 owner.settings.cleanuprules.success.delete = Nabura na ang cleanup rule.
-owner.settings.chef.keypair.description = Ang isang key pair ay kinakailangan upang mapatotohanan sa Chef registry. Kung nakabuo ka na ng key pair dati, ang pagbuo ng bagong key pair ay itapon ang lumang key pair.
+owner.settings.chef.keypair.description = Ang mga hiling na pinapadala sa Chef registry ay dapat na cryptographically na nakalagda bilang paraan ng authentication. Kapag nag-ge-generate ng isang keypair, ang pampublikong key lamang ang iniimbak ng Forgejo. Ang pribadong key ay binibigay sa iyo na gagamitin sa knife. Ang pag-generate ng bagong keypair i io-overwrite ang luma.
 npm.dependencies = Mga dependency
 npm.dependencies.peer = Mga peer dependency
 rubygems.install = Para i-install ang package sa pamamagitan ng gem, patakbuhin ang sumusunod na command:
@@ -3562,8 +3577,8 @@ npm.details.tag = Tag
 swift.install = Idagdag ang package sa iyong <code>Package.swift</code> na file:
 vagrant.install = Para magdagdag ng Vagrant box, patakbuhin ang sumusunod na command:
 settings.link = I-link ang package na ito sa repository
-settings.link.select = Pumili ng Repositoryo
-settings.link.button = I-update ang Link ng Repositoryo
+settings.link.select = Pumili ng repositoryo
+settings.link.button = I-update ang link ng repositoryo
 settings.link.error = Nabigong i-update ang link ng repositoryo.
 settings.delete = Burahin ang package
 owner.settings.cargo.initialize = I-initialize ang index
@@ -3706,7 +3721,7 @@ runners.reset_registration_token = I-reset ang token ng pagrehistro
 runners.status.offline = Offline
 workflow.dispatch.invalid_input_type = Hindi wastong input type "%s".
 runners.task_list.commit = Commit
-runners.task_list.done_at = Natapos Sa
+runners.task_list.done_at = Natapos sa
 runners.reset_registration_token_success = Matagumpay na na-reset ang token ng pagrehistro ng runner
 workflow.dispatch.input_required = Kumailangan ng value para sa input na "%s".
 workflow.dispatch.warn_input_limit = Pinapakita lamang ang unang %d na mga input.
@@ -3744,7 +3759,7 @@ close_issue = `sinara ang isyu na <a href="%[1]s">%[3]s#%[2]s</a>`
 review_dismissed = `na-dismiss ang pagsusuri mula <b>%[4]s</b> para sa <a href="%[1]s">%[3]s#%[2]s</a>`
 close_pull_request = `sinara ang hiling sa paghila na <a href="%[1]s">%[3]s#%[2]s</a>`
 transfer_repo = nilipat ang repositoryo na <code>%s</code> sa <a href="%s">%s</a>
-delete_branch = binura ang branch %[2]s mula <a href="%[1]s">%[3]s</a>
+delete_branch = binura ang branch <code>%[2]s</code> mula <a href="%[1]s">%[3]s</a>
 mirror_sync_push = na-sync ang mga commit sa <a href="%[2]s">%[3]s</a> sa <a href="%[1]s">%[4]s</a> mula sa mirror
 mirror_sync_create = na-syng ang bagong reference <a href="%[2]s">%[3]s</a> sa <a href="%[1]s">%[4]s</a> mula sa mirror
 publish_release = `inilabas ang <a href="%[2]s">%[4]s</a> sa <a href="%[1]s">%[3]s</a>`
@@ -3824,7 +3839,7 @@ deletion.success = Natanggal na ang lihim.
 deletion.failed = Nabigong tanggalin ang lihim.
 creation.failed = Nabigong idagdag ang lihim.
 deletion = Tanggalin ang lihim
-creation = Idagdag ang Lihim
+creation = Idagdag ang lihim
 description = Ang mga sikreto ay ipapasa sa ilang mga aksyon at hindi mababasa kung hindi.
 none = Wala pang mga sikreto sa ngayon.
 creation.name_placeholder = case-insensitive, alphanumeric character o underscore lamang, hindi dapat magsimula sa GITEA_ o GITHUB_
@@ -3838,7 +3853,7 @@ filepreview.truncated = Na-truncate ang preview
 filepreview.lines = Mga linya %[1]d hanggang %[2]d sa %[3]s
 
 [projects]
-deleted.display_name = Binurang Proyekto
+deleted.display_name = Binurang proyekto
 type-2.display_name = Proyekto ng repositoryo
 type-1.display_name = Indibidwal na proyekto
 type-3.display_name = Proyekto ng organisasyon
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index a319eb9948..2f1aba4609 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -9,7 +9,7 @@ sign_in_with_provider=Se connecter avec %s
 sign_in_or=ou
 sign_out=Déconnexion
 sign_up=S'inscrire
-link_account=Lier un Compte
+link_account=Lier un compte
 register=S'inscrire
 version=Version
 powered_by=Propulsé par %s
@@ -207,7 +207,6 @@ table_modal.label.rows = Lignes
 table_modal.label.columns = Colonnes
 link_modal.header = Ajouter un lien
 link_modal.url = Url
-
 link_modal.description = Description
 link_modal.paste_reminder = Indice : avec une URL dans votre clipboard, vous pouvez copier directement dans l'éditeur pour créer un lien.
 
@@ -341,7 +340,7 @@ no_reply_address=Domaine pour les courriels cachés
 no_reply_address_helper=Nom de domaine pour les utilisateurs ayant une adresse courriel cachée. Par exemple, l’utilisateur « fred » sera associé à « fred@noreply.example.org » par Git si le domaine est « noreply.example.org ».
 password_algorithm=Algorithme de hachage du mot de passe
 invalid_password_algorithm=Algorithme de hachage du mot de passe invalide
-password_algorithm_helper=Définissez l’algorithme de hachage du mot de passe. Les algorithmes ont des exigences matérielles et une résistance différentes. L’algorithme argon2 est bien sécurisé mais utilise beaucoup de mémoire et peut être inapproprié pour les systèmes limités en ressources.
+password_algorithm_helper=Définissez l’algorithme de hachage du mot de passe. Les algorithmes ont des exigences et une résistance différentes. L’algorithme argon2 est bien sécurisé mais utilise beaucoup de mémoire et peut être inapproprié pour les systèmes limités en ressources.
 enable_update_checker=Activer la vérification des mises-à-jour
 env_config_keys=Configuration de l'environnement
 env_config_keys_prompt=Les variables d'environnement suivantes seront également ajoutées à votre fichier de configuration :
@@ -774,7 +773,7 @@ language=Langue
 ui=Thème
 hidden_comment_types=Catégories de commentaires masqués
 hidden_comment_types_description=Cochez les catégories suivantes pour masquer les commentaires correspondants des fils d'activité. Par exemple, « Label » cache les commentaires du genre « Cerise a attribué le label Bug il y a 2 heures».
-hidden_comment_types.ref_tooltip=Commentaires où ce ticket a été référencé sur un autre ticket, révision, etc.
+hidden_comment_types.ref_tooltip=Commentaires où ce ticket a été référencé sur un autre ticket/révision/…
 hidden_comment_types.issue_ref_tooltip=Commentaires où l’utilisateur change la branche/étiquette associée au ticket
 comment_type_group_reference=Référence
 comment_type_group_label=Label
@@ -1063,21 +1062,14 @@ language.localization_project = Aidez-nous à traduire Forgejo dans votre langue
 language.description = Cette langue sera enregistrée dans votre compte et utilisée comme langue par défaut après votre connexion.
 user_block_yourself = Vous ne pouvez pas vous bloquer vous même.
 pronouns_custom_label = Pronoms personnalisés
-change_username_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période.
-change_username_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période.
-
-storage_overview = Vue d'ensemble du stockage
-quota = Quota
-keep_pronouns_private = Ne montrer les pronoms qu'aux utilisateurs authentifiés
-keep_pronouns_private.description = Cela masquera votre pronoms aux visiteurs qui ne sont pas authentifiés.
+change_username_redirect_prompt.with_cooldown.one = L'ancien pseudonyme sera disponible pour n'importe qui après une période d'%[1]d jour. Vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période.
+change_username_redirect_prompt.with_cooldown.few = L'ancien pseudonyme sera disponible pour n'importe qui après une période de %[1]d jours. Vous pouvez toujours réclamer votre ancien pseudonyme pendant cette période.
+quota.rule.exceeded = Dépassé
 regenerate_token = Régénérer
 access_token_regeneration = Régénérer le token d'accès
 access_token_regeneration_desc = La régénération d'un token révoquera l'accès à votre compte pour les applications qui l'utilisaient. Cela n'est pas reversible. Continuer ?
 regenerate_token_success = Le token a été régénéré. Les applications qui l'utilisent n'ont plus accès à votre compte et doivent être mises à jour avec le nouveau token.
-quota.applies_to_user = Les quotas suivants s'appliquent à votre compte
 quota.applies_to_org = Les quotas suivants s'applique à cette organisation
-quota.rule.exceeded = Dépassé
-quota.rule.exceeded.helper = La taille totale des objets pour cette règle ont dépassé le quota.
 quota.rule.no_limit = Sans limite
 quota.sizes.all = Tout
 quota.sizes.repos.all = Dépôts
@@ -1092,6 +1084,12 @@ quota.sizes.assets.attachments.releases = Attachements de version
 quota.sizes.assets.artifacts = Artefacts
 quota.sizes.assets.packages.all = Paquets
 quota.sizes.wiki = Wiki
+quota.applies_to_user = Les quotas suivants s'appliquent à votre compte
+quota.rule.exceeded.helper = La taille totale des objets pour cette règle ont dépassé le quota.
+keep_pronouns_private = Ne montrer les pronoms qu'aux utilisateurs authentifiés
+keep_pronouns_private.description = Cela masquera votre pronoms aux visiteurs qui ne sont pas authentifiés.
+storage_overview = Vue d'ensemble du stockage
+quota = Quota
 
 [repo]
 new_repo_helper=Un dépôt contient tous les fichiers d’un projet, ainsi que l’historique de leurs modifications. Vous avez déjà ça ailleurs ? <a href="%s">Migrez-le ici.</a>.
@@ -1156,7 +1154,7 @@ mirror_sync = synchronisé
 mirror_sync_on_commit=Synchroniser quand les révisions sont soumis
 mirror_address=Cloner depuis une URL
 mirror_address_desc=Insérez tous les identifiants requis dans la section Autorisation.
-mirror_address_url_invalid=L’URL fournie est invalide. Vous devez échapper tous les composants de l'URL correctement.
+mirror_address_url_invalid=L’URL fournie est invalide. Assurez vous que tous les composants de l'URL sont correctement échappés.
 mirror_address_protocol_invalid=L'URL fournie est invalide. Seuls les protocoles http(s):// ou git:// peuvent référencer un miroir.
 mirror_lfs=Stockage de fichiers volumineux (LFS)
 mirror_lfs_desc=Activer la mise en miroir des données LFS.
@@ -1215,8 +1213,8 @@ template.issue_labels=Labels de ticket
 template.one_item=Vous devez sélectionner au moins un élément du modèle
 template.invalid=Vous devez sélectionner un modèle de dépôt
 
-archive.title=Ce dépôt est archivé. Vous pouvez voir ses fichiers ou le cloner, mais pas ouvrir de ticket ou de demandes d'ajout, ni soumettre de changements.
-archive.title_date=Ce dépôt a été archivé le %s. Vous pouvez voir ses fichiers ou le cloner, mais pas ouvrir de ticket ou de demandes d'ajout, ni soumettre de changements.
+archive.title=Ce dépôt est archivé. Vous pouvez voir ses fichiers ou le cloner, mais pas ouvrir de ticket ou de demandes d'ajout, ni soumettre des changements ou des commentaires.
+archive.title_date=Ce dépôt a été archivé le %s. Vous pouvez voir ses fichiers et le cloner, mais pas ouvrir de ticket ou de demandes d'ajout, ni soumettre de changements ou faire des commentaires.
 archive.issue.nocomment=Ce dépôt est archivé. Vous ne pouvez pas commenter de tickets.
 archive.pull.nocomment=Ce dépôt est archivé. Vous ne pouvez pas commenter de demande d'ajout.
 
@@ -1518,7 +1516,7 @@ issues.desc=Organiser les rapports de bug, les tâches et les jalons.
 issues.filter_assignees=Filtrer par assignation
 issues.filter_milestones=Filtrer le jalon
 issues.filter_projects=Filtrer par projet
-issues.filter_labels=Filtrer par labels
+issues.filter_labels=Filtrer par étiquettes
 issues.filter_reviewers=Filtrer par évaluateur
 issues.new=Nouveau ticket
 issues.new.title_empty=Le titre ne peut pas être vide
@@ -1581,7 +1579,7 @@ issues.remove_ref_at=`a supprimé la référence <b>%s</b> %s.`
 issues.add_ref_at=`a ajouté la référence <b>%s</b> %s.`
 issues.delete_branch_at=`a supprimé la branche <b>%s</b> %s.`
 issues.filter_label=Label
-issues.filter_label_exclude=`Utilisez <code>Alt</code> + <code>Clic/entrée</code> pour exclure les labels.`
+issues.filter_label_exclude=`Utilisez <kbd>Alt</kbd> + <kbd>Click</kbd> pour exclure les étiquettes.`
 issues.filter_label_no_select=Toutes les labels
 issues.filter_label_select_no_label=Aucun label
 issues.filter_milestone=Jalon
@@ -1655,13 +1653,13 @@ issues.close_comment_issue=Fermer avec le commentaire
 issues.reopen_issue=Rouvrir
 issues.reopen_comment_issue=Réouvrir avec le commentaire
 issues.create_comment=Commenter
-issues.closed_at=`a fermé ce ticket <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-issues.reopened_at=`a rouvert ce ticket <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-issues.commit_ref_at=`a référencé ce ticket depuis une révision <a id="%[1]s" href="#%[1]s"> %[2]s</a>.`
-issues.ref_issue_from=`<a href="%[3]s">a fait référence à %[4]s</a> ce ticket <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-issues.ref_pull_from=`<a href="%[3]s">a fait référence</a> à cette demande d'ajout %[4]s <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-issues.ref_closing_from=`<a href="%[3]s">a fait référence</a> à une demande d'ajout %[4]s qui clora ce ticket, <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-issues.ref_reopening_from=`<a href="%[3]s">a référencé une pull request %[4]s qui va ré-ouvrir ce ticket</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`a fermé ce ticket %s`
+issues.reopened_at=`a rouvert ce ticket %s`
+issues.commit_ref_at=`a référencé ce ticket depuis une révision %s`
+issues.ref_issue_from=`<a href="%[2]s">a fait référence à ce ticket %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">a fait référence à cette demande d'ajout %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">a fait référence à une demande d'ajout %[3]s qui clora ce ticket</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">a référencé ce ticket dans une pull request %[3]s qui va ré-ouvrir ce ticket</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">a fermé ce ticket %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">a rouvert</a> ce ticket %[4]s <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
 issues.ref_from=`de %[1]s`
@@ -1766,7 +1764,7 @@ issues.error_modifying_due_date=Impossible de modifier l'échéance.
 issues.error_removing_due_date=Impossible de supprimer l'échéance.
 issues.push_commit_1=a ajouté %d révision %s
 issues.push_commits_n=a ajouté %d révisions %s
-issues.force_push_codes=`a forcé %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> à <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s.`
+issues.force_push_codes=`a forcé %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s à <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s.`
 issues.force_push_compare=Comparer
 issues.due_date_form=aaaa-mm-jj
 issues.due_date_form_add=Ajouter une échéance
@@ -1969,8 +1967,8 @@ pulls.update_branch_success=La mise à jour de la branche a réussi
 pulls.update_not_allowed=Vous n'êtes pas autorisé à mettre à jour la branche
 pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branche de base
 pulls.close=Fermer la demande d’ajout
-pulls.closed_at=`a fermé cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
-pulls.reopened_at=`a rouvert cette demande d'ajout <a id="%[1]s" href="#%[1]s">%[2]s</a>.`
+pulls.closed_at=`a fermé cette demande d'ajout %s`
+pulls.reopened_at=`a rouvert cette demande d'ajout %s`
 pulls.cmd_instruction_hint=Voir les instructions en ligne de commande
 pulls.cmd_instruction_checkout_title=Basculer
 pulls.cmd_instruction_checkout_desc=Depuis votre dépôt, basculer sur une nouvelle branche et tester des modifications.
@@ -2029,7 +2027,7 @@ milestones.filter_sort.most_issues=Le plus de tickets
 milestones.filter_sort.least_issues=Le moins de tickets
 
 signing.will_sign=Cette révision sera signée avec la clé « %s ».
-signing.wont_sign.error=Impossible de vérifier la signature de la révision.
+signing.wont_sign.error=Une erreur s'est produite lors des vérifications préliminaires à la signature de la révision.
 signing.wont_sign.nokey=Aucune clé n’est disponible sur cette instance pour signer cette révision.
 signing.wont_sign.never=Les révisions ne sont jamais signées.
 signing.wont_sign.always=Les révisions sont toujours signées.
@@ -2046,7 +2044,7 @@ ext_wiki=Wiki externe
 ext_wiki.desc=Lier un wiki externe.
 
 wiki=Wiki
-wiki.welcome=Bienvenue sur le Wiki.
+wiki.welcome=Bienvenue sur le wiki.
 wiki.welcome_desc=Le wiki vous permet d'écrire ou de partager de la documentation avec vos collaborateurs.
 wiki.desc=Écrire et partager de la documentation avec vos collaborateurs.
 wiki.create_first_page=Créer la première page
@@ -2759,12 +2757,12 @@ issues.comment.blocked_by_user = Vous ne pouvez pas créer un commentaire sur ce
 editor.invalid_commit_mail = Courriel invalide pour la création d'un commit.
 commits.browse_further = Continuer la navigation
 commits.renamed_from = Renommé depuis %s
-pulls.nothing_to_compare_have_tag = La branche ou le tag sélectionné sont identiques.
+pulls.nothing_to_compare_have_tag = La branche/tag sélectionné sont identiques.
 issues.blocked_by_user = Vous ne pouvez pas créer de tickets sur ce dépôt car vous avez été bloqué par son propriétaire.
 pulls.blocked_by_user = Vous ne pouvez pas créer une pull request sur ce dépôt car vous êtes bloqué par son propriétaire.
 wiki.cancel = Annuler
 settings.wiki_globally_editable = Permettre l'édition du wiki a tout le monde
-pulls.commit_ref_at = `a référencé cette pull request depuis le commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `a référencé cette pull request depuis un commit %s`
 settings.new_owner_blocked_doer = Le nouveau propriétaire vous a bloqué.
 settings.enter_repo_name = Confirmez en entrant le propriétaire et le nom du dépôt exactement comme affiché :
 settings.wiki_rename_branch_main = Normalise le nom de la branche du Wiki
@@ -2904,12 +2902,25 @@ summary_card_alt = Carte résumé du dépôt %s
 archive.pull.noreview = Ce dépôt est archivé. Vous ne pouvez pas faire de revue de demandes d'ajout.
 editor.commit_email = Courriel de commit
 commits.view_single_diff = Voir les changements dans ce fichier introduit par ce commit
-
+issues.reopen.blocked_by_user = Vous ne pouvez pas ré-ouvrir ce ticket care vous êtes bloqués par le propriétaire du dépôt ou le créateur de ce ticket.
+migrate.repo_desc_helper = Laisser vide afin d'importer une description existante
 issues.filter_no_results = Pas de résultats
 issues.filter_no_results_placeholder = Essayez d'ajuster vos critères de recherche.
-issues.reopen.blocked_by_user = Vous ne pouvez pas ré-ouvrir ce ticket care vous êtes bloqués par le propriétaire du dépôt ou le créateur de ce ticket.
+archive.nocomment = Il n'est pas possible de commenter car le dépôt est archivé.
+comment.blocked_by_user = Il n'est pas possible de commenter car vous avez été bloqué par le propriétaire du dépôt ou l'auteur.
 pulls.editable = Editable
 pulls.editable_explanation = Cette pull request peut être éditée par les mainteneurs. Vous pouvez y contribuer directement.
+sync_fork.branch_behind_one = Cette branche a %[1]d commits de retard sur %[2]s
+sync_fork.branch_behind_few = Cettte branche a %[1]d commits de retard sur %[2]s
+sync_fork.button = Sync
+settings.event_action_failure = Échec
+settings.event_action_recover = Récupérer
+settings.event_action_success = Réussite
+settings.event_header_action = Événements d'exécution d'action
+settings.event_action_success_desc = L'exécution de l'action a réussi.
+settings.event_action_failure_desc = L'exécution de l'action a échoué.
+settings.event_action_recover_desc = L'exécution de l'action a réussi après l'échec de la dernière exécution de l'action dans le même workflow.
+issues.filter_type.all_pull_requests = Toutes les demandes d'ajout
 
 [graphs]
 component_loading = Chargement %s…
@@ -2918,7 +2929,7 @@ component_loading_failed = Échec de chargement de %s
 component_loading_info = Cela peut prendre du temps…
 component_failed_to_load = Une erreur inattendue s'est produite.
 contributors.what = contributions
-code_frequency.what = fŕequence de code
+code_frequency.what = fréquence de code
 recent_commits.what = commits récents
 
 
@@ -3047,8 +3058,8 @@ teams.invite.by=Invité par %s
 teams.invite.description=Veuillez cliquer sur le bouton ci-dessous pour rejoindre l’équipe.
 follow_blocked_user = Vous ne pouvez pas suivre cette organisation car elle vous a bloqué.
 open_dashboard = Ouvrir le tableau de bord
-settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien nom d'organisation sera disponible pour n'importe qui après une période de %[1]d jours, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période.
-settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien nom d'organisation sera disponible pour n'importe qui après une période d'%[1]d jour, vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période.
+settings.change_orgname_redirect_prompt.with_cooldown.few = L'ancien nom d'organisation sera disponible pour n'importe qui après une période de %[1]d jours. Vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période.
+settings.change_orgname_redirect_prompt.with_cooldown.one = L'ancien nom d'organisation sera disponible pour n'importe qui après une période d'%[1]d jour. Vous pouvez toujours réclamer votre ancien nom d'organisation pendant cette période.
 
 [admin]
 dashboard=Tableau de bord
@@ -3625,7 +3636,7 @@ auto_merge_pull_request=`a fusionné automatiquement la demande d’ajout <a hre
 transfer_repo=a transféré le dépôt <code>%s</code> vers <a href="%s">%s</a>
 push_tag=a poussé l’étiquette <a href="%[2]s">%[3]s</a> de <a href="%[1]s">%[4]s</a>
 delete_tag=a supprimé l’étiquette %[2]s de <a href="%[1]s">%[3]s</a>
-delete_branch=a supprimée la branche %[2]s de <a href="%[1]s">%[3]s</a>
+delete_branch=a supprimée la branche <code>%[2]s</code> de <a href="%[1]s">%[3]s</a>
 compare_branch=Comparer
 compare_commits=Comparer %d révisions
 compare_commits_general=Comparer les révisions
@@ -3847,7 +3858,7 @@ owner.settings.cleanuprules.success.update=La règle de nettoyage a été mise 
 owner.settings.cleanuprules.success.delete=La règle de nettoyage a été supprimée.
 owner.settings.chef.title=Dépôt Chef
 owner.settings.chef.keypair=Générer une paire de clés
-owner.settings.chef.keypair.description=Une paire de clés est nécessaire pour s'authentifier au registre Chef. Si vous avez déjà généré une paire de clés, la génération d'une nouvelle paire de clés supprimera l'ancienne.
+owner.settings.chef.keypair.description=Les requêtes envoyées au registre Chef doivent être signées cryptographiquement à des fin d'authentification. Lorsqu'une paire de clés est générée, seule la clé publique est conservée dans Forgejo. La clé privée est fournie afin que vous puissiez l'utiliser avec knife. La génération d'une nouvelle clé remplace la précédente.
 owner.settings.cargo.rebuild.no_index = Incapable de reconstruire, index non initialisé.
 npm.dependencies.bundle = Bundles de dépendances
 arch.pacman.helper.gpg = Ajouter un certificat de confiance pour pacman :
@@ -4001,7 +4012,7 @@ variables.not_found = La variable n'a pas été trouvée.
 type-1.display_name=Projet personnel
 type-2.display_name=Projet du dépôt
 type-3.display_name=Projet de l'organisation
-deleted.display_name = Projet Supprimé
+deleted.display_name = Projet supprimé
 
 [git.filemode]
 changed_filemode=%[1]s → %[2]s
@@ -4080,4 +4091,4 @@ issues.write = <b>Écrire :</b> Fermer des tickets et gérer les métadonnées t
 pulls.read = <b>Lire :</b> Lire et créer des demandes de tirage.
 
 [translation_meta]
-test = Ceci est une chaîne de test. Elle n'est pas affichée dans l'interface de Forgejo mais est utilisée à des fins de test. N'hésitez pas à entrer 'ok' pour gagner du temps (ou un fait amusant de votre choix) pour atteindre ce doux 100 % de complétion. :-)
+test = Ceci est une chaîne de test. Elle n'est pas affichée dans Forgejo même mais est utilisée à des fins de test. N'hésitez pas à entrer 'ok' pour gagner du temps (ou un fait amusant de votre choix) pour atteindre ce difficile 100 % de complétion. :-)
diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini
index d2d960b627..1d7414a0d8 100644
--- a/options/locale/locale_ga-IE.ini
+++ b/options/locale/locale_ga-IE.ini
@@ -132,20 +132,20 @@ fuzzy = Doiléir
 fuzzy_tooltip = Cuir san áireamh torthaí a mheaitseálann an téarma cuardaigh go dlúth freisin
 exact = Beacht
 exact_tooltip = Ní chuir san áireamh ach torthaí a mheaitseálann leis an téarma
-repo_kind = Cuardaigh stórtha...
-user_kind = Cuardaigh úsáideoirí...
-org_kind = Cuardaigh eagraíochtaí...
-team_kind = Cuardaigh foirne...
-code_kind = Cód cuardaigh...
+repo_kind = Cuardaigh stórtha…
+user_kind = Cuardaigh úsáideoirí…
+org_kind = Cuardaigh eagraíochtaí…
+team_kind = Cuardaigh foirne…
+code_kind = Cód cuardaigh…
 code_search_unavailable = Níl cuardach cód ar fáil faoi láthair. Déan teagmháil le riarthóir an láithreáin.
-package_kind = Cuardaigh pacáistí...
-project_kind = Cuardaigh tionscadail...
-branch_kind = Cuardaigh brainsí...
-commit_kind = Cuardaigh tiomáintí...
-runner_kind = Cuardaigh reathaithe...
+package_kind = Cuardaigh pacáistí…
+project_kind = Cuardaigh tionscadail…
+branch_kind = Cuardaigh brainsí…
+commit_kind = Cuardaigh tiomáintí…
+runner_kind = Cuardaigh reathaithe…
 no_results = Níl aon torthaí meaitseála le fáil.
-issue_kind = Saincheisteanna cuardaigh...
-pull_kind = Cuardaigh iarratais tarraingthe...
+issue_kind = Saincheisteanna cuardaigh…
+pull_kind = Cuardaigh iarratais tarraingthe…
 keyword_search_unavailable = Níl cuardach de réir eochairfhocal ar fáil faoi láthair. Déan teagmháil le riarthóir an láithreáin.
 
 [aria]
@@ -507,12 +507,12 @@ avatar = Abhatár
 ssh_gpg_keys = Eochracha SSH/GPG
 applications = Iarratais
 repos = Stórais
-delete = Scrios Cuntas
+delete = Scrios cuntas
 twofa = Fíordheimhniú Dhá Fachtóir (TOTP)
 organization = Eagraíochtaí
 uid = UID
 webauthn = Fíordheimhniú Dhá-Fachtóir (Eochracha Slándála)
-public_profile = Próifíl Phoiblí
+public_profile = Próifíl phoiblí
 location_placeholder = Comhroinn do shuíomh thart le daoine eile
 full_name = Ainm Iomlán
 website = Láithreán Gréasáin
@@ -1219,11 +1219,11 @@ issues.close_comment_issue = Dún le trácht
 issues.reopen_issue = Athoscail
 issues.reopen_comment_issue = Athoscail le trácht
 issues.create_comment = Trácht
-issues.closed_at = `dhún an cheist seo <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at = `athoscail an t-eagrán seo <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at = `rinne tagairt don cheist seo ó ghealltanas <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from = `<a href="%[3]s">rinne dagairt don cheist seo %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from = `<a href="%[3]s">rinne dagairt don iarratas tarraingthe seo %[4]s</a> <a id="%[1]s" href="#%[1]s">%[ 2]s</a>`
+issues.closed_at = `dhún an cheist seo %s`
+issues.reopened_at = `athoscail an t-eagrán seo %s`
+issues.commit_ref_at = `rinne tagairt don cheist seo ó ghealltanas %s`
+issues.ref_issue_from = `<a href="%[2]s">rinne dagairt don cheist seo %[3]s</a> %[1]s`
+issues.ref_pull_from = `<a href="%[2]s">rinne dagairt don iarratas tarraingthe seo %[3]s</a> %[1]s`
 issues.ref_closed_from = `<a href="%[3]s">dhún an cheist seo %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from = `<a href="%[3]s">d'athoscail an eagrán seo %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from = `ó %[1]s`
@@ -1456,8 +1456,8 @@ pulls.update_branch_success = Bhí nuashonrú brainse rathúil
 pulls.update_not_allowed = Ní cheadaítear duit brainse a nuashonrú
 pulls.outdated_with_base_branch = Tá an brainse seo as dáta leis an mbunbhrainse
 pulls.close = Dún Iarratas Tarraing
-pulls.closed_at = `dhún an t-iarratas tarraingthe seo <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at = `athoscail an t-iarratas tarraingthe seo <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at = `dhún an t-iarratas tarraingthe seo %s`
+pulls.reopened_at = `athoscail an t-iarratas tarraingthe seo %s`
 pulls.cmd_instruction_checkout_title = Seiceáil
 pulls.cmd_instruction_checkout_desc = Ó stór tionscadail, seiceáil brainse nua agus déan tástáil ar na hathruithe.
 pulls.cmd_instruction_merge_title = Cumaisc
@@ -2678,7 +2678,7 @@ auto_merge_pull_request = `iarratas tarraingthe cumasctha go huathoibríoch <a h
 transfer_repo = aistrithe stóras <code>%s</code> go <a href="%s">%s</a>
 push_tag = brú <a href="%[2]s">%[3]s</a> go <a href="%[1]s">%[4]s</a>
 delete_tag = scriosta clib %[2]s ó <a href="%[1]s">%[3]s</a>
-delete_branch = brainse scriosta %[2]s ó <a href="%[1]s">%[3]s</a>
+delete_branch = brainse scriosta <code>%[2]s</code> ó <a href="%[1]s">%[3]s</a>
 compare_branch = Déan comparáid
 compare_commits = Déan comparáid idir tiomáintí %d
 compare_commits_general = Déan comparáid idir tiomáintí
diff --git a/options/locale/locale_gl.ini b/options/locale/locale_gl.ini
index 75763775eb..c380e9b2ff 100644
--- a/options/locale/locale_gl.ini
+++ b/options/locale/locale_gl.ini
@@ -190,34 +190,35 @@ table_modal.placeholder.header = Cabeceira
 link_modal.header = Engadir ligazón
 link_modal.url = Url
 link_modal.description = Descrición
+link_modal.paste_reminder = Consello: Coa URL no portapapeis, podes pegala directamente no editor para crear unha ligazón.
 
 
 [search]
 search = Buscar...
 type_tooltip = Tipo de procura
-repo_kind = Buscar repositorios...
-user_kind = Buscar usuarios...
+repo_kind = Buscar repositorios…
+user_kind = Buscar usuarios…
 regexp = RegExp
 regexp_tooltip = Interpretar o termo da procura como expresión regular
-org_kind = Procurar organizacións...
-team_kind = Procurar equipos...
-code_kind = Procurar código...
+org_kind = Procurar organizacións…
+team_kind = Procurar equipos…
+code_kind = Procurar código…
 code_search_unavailable = A procura de código non está dispoñible neste momento. Por favor contacte coa persoa responsable da administración da páxina.
-package_kind = Buscar paquetes...
+package_kind = Buscar paquetes…
 fuzzy = Difusa
 fuzzy_tooltip = Incluír resultados que tamén coincidan estreitamente co termo da procura
 union = Palabras clave
 union_tooltip = Incluír resultados correspondentes a calquera dal palabras clave separadas por espazos en branco
 exact = Exacta
 exact_tooltip = Incluír só resultados correspondentes ao termo exacto da procura
-issue_kind = Procurar incidencias...
-project_kind = Buscar proxectos...
-branch_kind = Buscar ramas...
+issue_kind = Procurar incidencias…
+project_kind = Buscar proxectos…
+branch_kind = Buscar ramas…
 no_results = Non se atoparon resultados coincidentes.
 keyword_search_unavailable = A busca por palabra clave non está dispoñible actualmente. Póñase en contacto co administrador do sitio.
-commit_kind = Buscar achegas...
-runner_kind = Buscar executores...
-pull_kind = Buscar pulls...
+commit_kind = Buscar achegas…
+runner_kind = Buscar executores…
+pull_kind = Buscar pulls…
 
 [startpage]
 platform = Multiplataforma
@@ -225,6 +226,8 @@ app_desc = Um servizo Git autoxestionado e fácil de usar
 install = Fácil de instalar
 install_desc = Simplemente <a target="_blank" rel="noopener noreferrer" href="%[1]s">executa o binario</a> para a túa plataforma, envíao con <a target="_blank" rel="noopener noreferrer" href="%[2]s">Docker</a> ou consígueo <a target="_blank" rel="noopener noreferrer" href="%[3]s">empaquetado</a>.
 license = Código aberto
+lightweight_desc = Forgejo precisa duns requerimentos mínimos e pode funcionar nunha Raspberry Pi barata. Aforra enerxía na túa máquina!
+lightweight = Lixeiro
 
 [error]
 occurred = Ocorreu un erro
@@ -290,4 +293,10 @@ db_type = Tipo de base de datos
 app_slogan = Slogan da instancia
 app_slogan_helper = Escribe o slogan da túa instancia aqui. Ou deixao baleiro para desabilitala.
 domain = Dominio do servidor
-ssh_port = Porto do servidor SSH
\ No newline at end of file
+ssh_port = Porto do servidor SSH
+require_db_desc = Forgejo precisa MySQL, PostgreSQL, SQLite3 ou TiDB (protocolo MySQL).
+
+[repo]
+sync_fork.branch_behind_few = Esta rama ten %d achegas por detrás de %s
+sync_fork.button = Sincronizar
+sync_fork.branch_behind_one = Esta rama ten %d achega por detrás de %s
\ No newline at end of file
diff --git a/options/locale/locale_he.ini b/options/locale/locale_he.ini
index bff7682a95..8a5bc86163 100644
--- a/options/locale/locale_he.ini
+++ b/options/locale/locale_he.ini
@@ -150,24 +150,24 @@ union = מילות מפתח
 exact = מדויק
 exact_tooltip = תוצאות יתאימו במדויק לתוכן תיבת החיפוש
 regexp = רג'קס
-user_kind = חיפוש אנשים...
-code_kind = חיפוש קוד...
-team_kind = חיפוש צוותים...
+user_kind = חיפוש אנשים…
+code_kind = חיפוש קוד…
+team_kind = חיפוש צוותים…
 no_results = לא נמצאו תוצאות.
 union_tooltip = תוצאות יכללו לפחות מילת מפתח אחת; אפשר להפריד מילות מפתח עם רווחים
-org_kind = חיפוש ארגונים...
-package_kind = חיפוש חבילות...
-project_kind = חיפוש פרוייקטים...
-branch_kind = חיפוש ענפים...
-commit_kind = חיפוש קומיטים...
-issue_kind = חיפוש סוגיות...
+org_kind = חיפוש ארגונים…
+package_kind = חיפוש חבילות…
+project_kind = חיפוש פרוייקטים…
+branch_kind = חיפוש ענפים…
+commit_kind = חיפוש קומיטים…
+issue_kind = חיפוש סוגיות…
 fuzzy_tooltip = תוצאות יתאימו לתוכן תיבת החיפוש בקירוב; מומלץ כנגד שגיאות כתיב
-repo_kind = חיפוש קרפיפים...
+repo_kind = חיפוש קרפיפים…
 code_search_by_git_grep = תוצאות החיפוש יוצרו על ידי "git grep"; יכול להיות שיתקבלו תוצאות טובות יותר אם מנהלי המערכת יפעילו את המפתחן.
-runner_kind = חיפוש מריצים...
+runner_kind = חיפוש מריצים…
 keyword_search_unavailable = חיפוש מילות מפתח לא זמין. נא לדווח למנהלי המערכת.
 code_search_unavailable = חיפוש קוד לא זמין. נא לדווח למנהלי המערכת.
-pull_kind = חיפוש בקשות מיזוג...
+pull_kind = חיפוש בקשות מיזוג…
 
 [heatmap]
 number_of_contributions_in_the_last_12_months = % תרומות ב־12 החודשים האחרונים
@@ -384,6 +384,8 @@ allow_password_change = הכרחת המשתמש לעדכן את סיסמת חש
 account_activated = חשבונך הופעל
 resent_limit_prompt = כבר ביקשת מייל אימות בשלושת הדקות האחרונות. נא לחכות ולנסות שוב.
 has_unconfirmed_mail = שלום %s, חשבונך משויך לכתובת אימייל לא מאומתת (<b>%s</b>). אם לא קיבלת הודעת אימות באימייל, או שאתה צריך חדשה, נא ללחוץ על הכפתור למטה.
+confirmation_mail_sent_prompt = אימייל אימות חדש נשלח ל־<b>%s</b>. יש לבדוק את תיבת הדואר וללחוץ על הלינק תוך %s על מנת להשלים את רישום החשבון. אם כתובת המייל שגוייה, אפשר להיכנס לחשבון ולבקש דוא"ל אימות לכתובת אחרת.
+reset_password_mail_sent_prompt = אימייל אימות חדש נשלח ל־<b>%s</b>. יש לבדוק את תיבת הדואר וללחוץ על הלינק תוך %s על מנת להשלים את רישום החשבון.
 
 [settings]
 key_content = תוכן
@@ -661,6 +663,15 @@ issues.label_exclusive = בחירה בודדת
 issues.label_archive = לארכיון
 issues.label_archived_filter = הצגת תוויות מהארכיון
 issues.label_archive_tooltip = תוויות בארכיון לא מוצעות בחיפוש על־בסיס תווית כברירת מחדל.
+issues.deleted_milestone = נמחק
+issues.self_assign_at = `שייךה עצמית %s`
+issues.deleted_project = נמחק
 
 [translation_meta]
-test = ואהבת לרעך כמוך
\ No newline at end of file
+test = ואהבת לרעך כמוך
+
+[git.filemode]
+executable_file = קובץ הרצה
+directory = תיקיה
+normal_file = קובץ רגיל
+symbolic_link = קישור סמלי
\ No newline at end of file
diff --git a/options/locale/locale_hi.ini b/options/locale/locale_hi.ini
index 59f66b4d0f..e666db425d 100644
--- a/options/locale/locale_hi.ini
+++ b/options/locale/locale_hi.ini
@@ -25,7 +25,6 @@ user_profile_and_more = प्रोफ़ाइल और सेटिंग्
 enable_javascript = इस पन्ने के लिये जावा चाहिए
 toc = विषय सूची
 licenses = लाइसेंस
-return_to_forgejo = फ़ोर्जेगो पे वापस जाएं
 more_items = और वस्तुएं
 username = यूजरनाम
 email = ईमेल पता
@@ -39,4 +38,171 @@ repository = भंडार
 organization = संगठन
 mirror = छवि
 settings = सेटिंग्स
-your_settings = आपकी सेटिंग्स
\ No newline at end of file
+your_settings = आपकी सेटिंग्स
+return_to_forgejo = फ़ोर्जेगो पे वापस जाएं
+access_token = एक्सेस टोकन
+webauthn_insert_key = अपनी सिक्योरिटी की डालें
+webauthn_press_button = अपनी सिक्योरिटी की पर बटन दबाएं…
+webauthn_use_twofa = अपने फ़ोन से दो फैक्टर कोड लाएं
+webauthn_unsupported_browser = आपका ब्राउज़र वेबौथ सपोर्ट नहीं करता।
+webauthn_error_unknown = कोई अंजान एरर हुई, फिर से कोशिश करें।
+webauthn_error_unable_to_process = सर्वर आपकी रिक्वेस्ट प्रोसेस नहीं कर पाया।
+webauthn_error_empty = कृपया इस चाभी का नाम रखें।
+webauthn_error_timeout = आपकी की पढ़ने से पहले टाइमआउट हो गया। पृष्ट रीलोड करें और फिर कोशिश करें।
+new_project = नया प्रोजेक्ट
+test = टेस्ट
+locked = लॉक्ड
+copy = कॉपी
+copy_generic = क्लिपबोर्ड पर कॉपी करें
+copy_url = URL कॉपी करें
+copy_hash = कॉपी हैश
+copy_path = राह कॉपी करें
+admin_panel = वेबसाइट प्रबंधन
+your_profile = प्रोफाइल
+your_starred = सीतारित
+new_mirror = नया मिरर
+new_fork = नयी रिपॉजिटरी फोर्क
+all = सब
+sources = स्रोत
+new_project_column = नया स्तम्भ
+mirrors = मिर्रोर्स
+toggle_menu = चालू-बंद करें
+add_all = सब जोड़ें
+remove_all = सारा हटाएं
+new_org.title = नई संस्था
+new_repo.link = नई रिपॉजिटरी
+new_migrate.link = नया प्रवासन
+new_org.link = नई संस्था
+collaborative = सहयोगी
+forks = फोर्क्स
+issues = इश्यूज
+milestones = महत्वपूर्ण
+ok = ओके
+cancel = रद्द करें
+retry = फिर से करें
+rerun = फिर से
+save = सेव करें
+add = जोड़ें
+remove = हटाएं
+remove_label_str = हटाएं आइटम “%s”
+edit = संपादित करना
+view = देखें
+disabled = असक्षम किया गया
+webauthn_sign_in = सिक्योरिटी की का बटन दबाएं, नहीं है तो फिर से प्लग करें।
+webauthn_error_insecure = वेबौथ पर सिर्फ सुरक्षित कनेक्शन हो. HTTP टेस्ट के लिए ओरिजिन “लोकलहोस्ट” या “127.0.0.1”
+new_repo.title = नई रिपॉजिटरी
+pull_requests = पुल्ल करें
+enabled = सक्षम किया गया
+webauthn_error = सिक्योरिटी की रीड नहीं हो पा रही।
+webauthn_error_duplicated = सिक्योरिटी की इस रिक्वेस्ट के लिए नहीं है। कृपया देखें की पहले से रजिस्टर्ड तो नहीं।
+new_migrate.title = नया प्रवासन
+activities = गतिविधियाँ
+rerun_all = फिर से सारे काम करें
+filter.is_template = टेम्पलेट्स
+filter.not_template = टेम्पलेट्स नहीं
+filter.public = सार्वजनिक
+filter.private = निजी
+copy_success = कॉपी हो गया!
+copy_content = विषय-वस्तु कॉपी करें
+copy_branch = शाखा नाम कॉपी करें
+write = लिखें
+archived = संग्रहीत
+show_timestamps = समय-मोहर दिखाएं
+value = मूल्य
+confirm_delete_selected = ये सारे डिलीट कर दें?
+filter = फ़िल्टर
+filter.is_fork = फोर्क्स
+filter.not_fork = फोर्क्स नहीं
+filter.is_mirror = मिर्रोर्स
+copy_error = कॉपी नहीं हुआ
+copy_type_unsupported = इस तरह की फाइल कॉपी नहीं होगी
+loading = लोड हो रहा…
+error = त्रुटि
+go_back = वापस जाएं
+unknown = अनजान
+pin = पिन
+unpin = पिन हटाएं
+artifacts = पुरावशेष
+concept_system_global = वैश्विक
+show_log_seconds = सेकंड दिखाएं
+show_full_screen = पूरी स्क्रीन पे दिखाएं
+name = नाम
+filter.clear = फ़िल्टर हटाएं
+filter.is_archived = संगृहीत
+filter.not_archived = संगृहीत नहीं
+filter.not_mirror = मिर्रोर्स नहीं
+error413 = आपका कोटा ख़तम हो गया।
+concept_user_individual = एकल
+confirm_delete_artifact = क्या आप ये पुरावशेष हटाना चाहते हैं "%s" ?
+concept_code_repository = रिपॉजिटरी
+concept_user_organization = संस्था
+download_logs = लॉग डाउनलोड करें
+rss_feed = RSS फीड
+preview = पूर्वावलोकन
+error404 = जो पृष्ट आप देखना चाहते हैं या <strong> तो है ही नहीं </strong>, <strong> हटा दिया गया </strong> या <strong> आप देखने को अधिकृत नहीं </strong> की देख पाएं।
+invalid_data = डाटा मान्य नहीं: %v
+never = कभी नहीं
+
+[search]
+search = ढूंढें…
+type_tooltip = ढूंढ़ने का जैसे
+commit_kind = कमिट्स ढूढें…
+runner_kind = रनर्स ढूंढें…
+fuzzy = फ़ज़्ज़ी
+fuzzy_tooltip = जो उपाय ढूंढे गए टर्म से जुड़े हैं भी दिखाएं
+exact_tooltip = सिर्फ वो रिजल्ट दिखाएं जो एकदम सर्च टर्म से मिलते हैं
+repo_kind = रेपो ढूंढें…
+user_kind = यूजर ढूंढें…
+org_kind = संस्था ढूंढें…
+issue_kind = इश्यूज ढूंढें…
+union_tooltip = वो उपाय भी दिखाएं जो जगह छोढ़े कीवर्ड्स से मिलते हैं
+union = केंद्र
+team_kind = टीम ढूंढें…
+exact = एकदम
+branch_kind = शाखा ढूंढें…
+pull_kind = पुल्स ढूंढें…
+regexp = रेगएक्सप्
+code_kind = कोड ढूंढें…
+code_search_unavailable = कोड ढूंढ़ना अभी नहीं हो सकता। कृपया एडमिनिस्ट्रेटर से बात करें।
+no_results = मिलता उपाय नहीं है।
+regexp_tooltip = व्याख्या करें सर्च टर्म की व्यावहारिक तरीके से
+package_kind = पैकेजेस ढूंढें…
+project_kind = प्रोजेक्ट्स ढूंढें…
+keyword_search_unavailable = कीवर्ड से ढूंढ़ना अभी नहीं हो सकता। कृपया एडमिनिस्ट्रेटर से बात करें।
+
+[aria]
+navbar = संचालन बार
+footer = फुटर
+footer.software = इस सॉफ्टवेयर के बारे में
+footer.links = संयोजक
+
+[heatmap]
+contributions_few = योगदानों
+more = ज़्यादा
+contributions_zero = कोई योगदान नहीं
+contributions_format = {योगदान} आज {दिन} {महीना} {साल}
+contributions_one = योगदान
+less = कम
+number_of_contributions_in_the_last_12_months = %s योगदान पिछले 12 महीनो में
+
+[editor]
+buttons.italic.tooltip = इटैलिक लेख जोड़ें
+buttons.heading.tooltip = शीर्षक जोड़ें
+buttons.bold.tooltip = बोल्ड लेख जोड़ें
+buttons.list.unordered.tooltip = बुलेट लिस्ट जोड़ें
+buttons.quote.tooltip = पाठ जोड़ें
+buttons.list.ordered.tooltip = अंकित लिस्ट जोड़ें
+buttons.list.task.tooltip = कार्यों की सूचि जोड़ें
+buttons.mention.tooltip = यूजर या टीम को ज़ाहिर करें
+buttons.ref.tooltip = इशू या पुल्ल निवेदन ज़ाहिर करें
+buttons.disable_monospace_font = एकसमान रिक्ति फ़ॉन्ट बंद करें
+buttons.indent.tooltip = चीज़ों को एक लेवल नेस्ट करें
+buttons.code.tooltip = कोड जोड़ें
+buttons.link.tooltip = संयोजक जोड़ें
+buttons.enable_monospace_font = एकसमान रिक्ति फ़ॉन्ट चालू करें
+buttons.switch_to_legacy.tooltip = पुराना एडिटर इस्तेमाल करें
+table_modal.header = टेबल जोड़ें
+table_modal.placeholder.header = शीर्षक
+table_modal.placeholder.content = विषयवस्तु
+buttons.new_table.tooltip = टेबल जोड़ें
+buttons.unindent.tooltip = चीज़ों को एक लेवल नेस्ट से निकालें
\ No newline at end of file
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
index 411bad835a..841fb76bbe 100644
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@@ -330,7 +330,7 @@ code_no_results=Nincs találat a keresési kifejezésedre.
 code_last_indexed_at=Utoljára indexelve: %s
 
 [auth]
-create_new_account=Regisztráció
+create_new_account=Fiók regisztrálása
 register_helper_msg=Van már felhasználói fiókja? Jelentkezzen be!
 social_register_helper_msg=Van már felhasználói fiókja? Csatlakoztassa most!
 disable_register_prompt=Regisztráció le van tiltva. Kérjük, lépjen kapcsolatba az oldal adminisztrátorával.
@@ -532,8 +532,8 @@ password_change_disabled=A nem helyi felhasználók nem frissíthetik jelszavuka
 
 emails=E-mail címek
 manage_emails=E-mail címek kezelése
-manage_themes=Válassza ki az alapértelmezett témát
-manage_openid=OpenID címek kezelése
+manage_themes=Alapértelmezett téma
+manage_openid=OpenID címek
 theme_desc=Ez lesz az alapértelmezett téma az oldalon.
 primary=Elsődleges
 activated=Aktivált
@@ -932,7 +932,7 @@ issues.close_comment_issue=Hozzászólás és lezárás
 issues.reopen_issue=Újranyitás
 issues.reopen_comment_issue=Hozzászólás és újranyitás
 issues.create_comment=Hozzászólás
-issues.commit_ref_at=`hivatkozott erre a hibajegyre egy commit-ból <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`hivatkozott erre a hibajegyre egy commit-ból %s`
 issues.role.owner=Tulajdonos
 issues.role.member=Tag
 issues.re_request_review=Véleményezés újrakérése
@@ -1694,7 +1694,7 @@ create_repo=létrehozott tárolót: <a href="%s"> %s</a>
 rename_repo=átnevezte a(z) <code>%[1]s</code> tárolót <a href="%[2]s">%[3]s</a>-ra/re
 transfer_repo=áthelyezett egy tárolót innen: <code>%s</code> ide: <a href="%s">%s</a>
 delete_tag=címke %[2]s törölve innen: <a href="%[1]s">%[3]s</a>
-delete_branch=ág %[2]s törölve innen: <a href="%[1]s">%[3]s</a>
+delete_branch=ág <code>%[2]s</code> törölve innen: <a href="%[1]s">%[3]s</a>
 compare_branch=Összehasonlítás
 compare_commits=%d commit összehasonlítása
 compare_commits_general=Commitok összehasonlítása
@@ -1779,14 +1779,14 @@ directory = Könyvtár
 [search]
 search = Keresés...
 type_tooltip = Keresés típusa
-code_kind = Kód keresése...
+code_kind = Kód keresése…
 code_search_unavailable = A kódban való keresés jelenleg nem elérhető. Kérem vegye fel a kapcsolatot az oldal adminisztrátorával.
-package_kind = Csomagok keresése...
-project_kind = Projektek keresése...
-user_kind = Felhasználók keresése...
-repo_kind = Tárak keresése...
-org_kind = Szervezetek keresése...
-team_kind = Csapatok keresése...
+package_kind = Csomagok keresése…
+project_kind = Projektek keresése…
+user_kind = Felhasználók keresése…
+repo_kind = Tárak keresése…
+org_kind = Szervezetek keresése…
+team_kind = Csapatok keresése…
 exact = Pontos
 code_search_by_git_grep = A kódkeresés jelenleg a "git grep" parancsot használja. Lehet, hogy jobb találatok is lennének, ha a webhely adminisztrátora bekapcsolja a forráskód indexelését.
 milestone_kind = Mérföldkövek keresése...
@@ -1794,8 +1794,8 @@ fuzzy_tooltip = A keresési kifejezéshez hasonló találatok mutatása
 fuzzy = Hasonlók
 union = Kulcsszavakra
 union_tooltip = A szóközzel elválasztott kulcsszavak bármelyikét tartalmazó találatok mutatása
-branch_kind = Ágak keresése...
+branch_kind = Ágak keresése…
 no_results = Nincsenek megfelelő találatok.
-issue_kind = Hibajegyek keresése...
+issue_kind = Hibajegyek keresése…
 exact_tooltip = Csak a keresési kifejezést pontosan tartalmazó találatok mutatása
 keyword_search_unavailable = A kulcsszó alapú keresés jelenleg nem elérhető. Kérlek értesítsd az oldal rendszergazdáját.
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
index 673d1464b1..c935bd9540 100644
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@@ -206,9 +206,9 @@ email_title = Pengaturan email
 smtp_from = Kirim Email Sebagai
 
 [home]
-uname_holder=Nama Pengguna atau Alamat Surel
+uname_holder=Nama pengguna atau alamat surel
 password_holder=Kata Sandi
-switch_dashboard_context=Alihkan Dasbor Konteks
+switch_dashboard_context=Alihkan dasbor konteks
 my_repos=Repositori
 show_more_repos=Tampilkan repositori lainnya…
 collaborative_repos=Repositori Kolaboratif
@@ -236,7 +236,7 @@ org_no_results=Tidak ada organisasi yang cocok ditemukan.
 code_no_results=Tidak ada kode sumber yang cocok dengan istilah yang anda cari.
 
 [auth]
-create_new_account=Daftar Akun
+create_new_account=Daftar akun
 register_helper_msg=Sudah memiliki akun? Masuk sekarang!
 social_register_helper_msg=Sudah memiliki akun? Hubungkan sekarang!
 disable_register_prompt=Maaf, pendaftaran telah dinonaktifkan. Silakan hubungi administrator situs.
@@ -269,11 +269,11 @@ twofa_passcode_incorrect=Kata sandi Anda salah. Jika Anda salah tempatkan perang
 twofa_scratch_token_incorrect=Kode coretan anda tidak tepat.
 login_userpass=Masuk
 tab_openid=OpenID
-oauth_signup_tab=Daftar Akun Baru
-oauth_signup_submit=Akun Lengkap
-oauth_signin_tab=Tautkan ke Akun yang Tersedia
-oauth_signin_title=Masuk untuk Izinkan Akun Tertaut
-oauth_signin_submit=Taut Akun
+oauth_signup_tab=Daftar akun baru
+oauth_signup_submit=Akun lengkap
+oauth_signin_tab=Tautkan ke akun yang tersedia
+oauth_signin_title=Masuk untuk izinkan akun tertaut
+oauth_signin_submit=Taut akun
 openid_connect_submit=Sambungkan
 openid_connect_title=Sambungkan ke akun yang sudah ada
 openid_connect_desc=OpenID URI yang dipilih tak dikenal. Asosiasikan dengan akun baru disini.
@@ -398,14 +398,14 @@ avatar=Avatar
 ssh_gpg_keys=Kunci SSH / GPG
 social=Akun Sosial
 applications=Aplikasi
-orgs=Kelola organisasi
+orgs=Organisasi
 repos=Repositori
-delete=Hapus Akun
+delete=Hapus akun
 twofa=Otentikasi Dua-Faktor
 account_link=Akun Tertaut
 organization=Organisasi
 
-public_profile=Profil Publik
+public_profile=Profil publik
 password_username_disabled=Pengguna non-lokal tidak diizinkan untuk mengubah nama pengguna mereka. Silakan hubungi administrator sistem anda untuk lebih lanjut.
 full_name=Nama Lengkap
 website=Situs Web
@@ -438,8 +438,8 @@ password_change_disabled=Pengguna non-lokal tidak dapat mengganti kata sandi mer
 
 emails=Alamat Surel
 manage_emails=Kelola Alamat Surel
-manage_themes=Pilih tema default
-manage_openid=Kelola alamat OpenID
+manage_themes=Tema default
+manage_openid=Alamat OpenID
 theme_desc=Ini akan menjadi tema asal Anda pada keseluruhan situs.
 primary=Utama
 activated=Diaktifkan
@@ -796,7 +796,7 @@ issues.close_comment_issue=Komentar dan Tutup
 issues.reopen_issue=Buka kembali
 issues.reopen_comment_issue=Komentar dan Buka Kembali
 issues.create_comment=Komentar
-issues.commit_ref_at=`merujuk masalah dari komit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`merujuk masalah dari komit %s`
 issues.role.owner=Pemilik
 issues.role.member=Anggota
 issues.sign_in_require_desc=<a href="%s">Masuk</a> untuk bergabung dengan percakapan ini.
@@ -1368,7 +1368,7 @@ create_repo=repositori dibuat <a href="%s">%s</a>
 rename_repo=ganti nama gudang penyimpanan dari <code>%[1]s</code> ke <a href="%[2]s">%[3]s</a>
 transfer_repo=ditransfer repositori <code>%s</code> ke <a href="%s">%s</a>
 delete_tag=tag dihapus %[2]s dari <a href="%[1]s">%[3]s</a>
-delete_branch=cabang dihapus %[2]s dari <a href="%[1]s">%[3]s</a>
+delete_branch=cabang dihapus <code>%[2]s</code> dari <a href="%[1]s">%[3]s</a>
 compare_commits=Bandingkan %d melakukan
 
 [tool]
@@ -1484,10 +1484,10 @@ search = Cari...
 type_tooltip = Tipe pencarian
 fuzzy_tooltip = Termasuk juga hasil yang mendekati kata pencarian
 exact_tooltip = Hanya menampilkan hasil yang cocok dengan istilah pencarian
-repo_kind = Cari repo...
-user_kind = Telusuri pengguna...
-org_kind = Cari organisasi...
-team_kind = Cari tim...
-code_kind = Cari kode...
+repo_kind = Cari repo…
+user_kind = Telusuri pengguna…
+org_kind = Cari organisasi…
+team_kind = Cari tim…
+code_kind = Cari kode…
 code_search_unavailable = Pencarian kode saat ini tidak tersedia. Silahkan hubungi administrator.
-branch_kind = Cari cabang...
+branch_kind = Cari cabang…
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
index 9b1d56fed9..f3333dbea2 100644
--- a/options/locale/locale_is-IS.ini
+++ b/options/locale/locale_is-IS.ini
@@ -223,7 +223,7 @@ default_keep_email_private.description=Fela sjálfgefið netföng nýrra notenda
 no_reply_address_helper=Lén fyrir notendur með falið netfang. Til dæmis notandanafnið „joe“ verður skráð í Git sem „joe@noreply.example.org“ ef falið tölvupóstlén er stillt á „noreply.example.org“.
 
 [home]
-uname_holder=Notandanafn eða Netfang
+uname_holder=Notandanafn eða netfang
 password_holder=Lykilorð
 my_repos=Hugbúnaðarsöfn
 show_more_repos=Sýna fleiri hugbúnaðarsöfn…
@@ -255,7 +255,7 @@ org_no_results=Engar samsvarandi stofnanir fundust.
 code_no_results=Enginn samsvarandi frumkóði fannst eftur þínum leitarorðum.
 
 [auth]
-create_new_account=Skrá Notanda
+create_new_account=Skrá notanda
 register_helper_msg=Ertu nú þegar með notanda? Skráðu þig inn núna!
 social_register_helper_msg=Ertu nú þegar með reikning? Tengdu hann núna!
 manual_activation_only=Hafðu samband við stjórnanda vefsvæðisins til að ljúka virkjun.
@@ -276,13 +276,13 @@ verify=Staðfesta
 scratch_code=Skrapkóði
 use_scratch_code=Nota skrapkóða
 twofa_scratch_token_incorrect=Skrapkóði þinn er rangur.
-login_userpass=Skrá Inn
+login_userpass=Skrá inn
 tab_openid=OpenID
-oauth_signup_tab=Skrá Nýjan Notanda
-oauth_signup_title=Klára Nýjum Notanda
-oauth_signup_submit=Klára Notanda
-oauth_signin_tab=Tengja Núverandi Reikning
-oauth_signin_submit=Tengja Notanda
+oauth_signup_tab=Skrá nýjan notanda
+oauth_signup_title=Klára nýjum notanda
+oauth_signup_submit=Klára notanda
+oauth_signin_tab=Tengja núverandi reikning
+oauth_signin_submit=Tengja notanda
 openid_connect_submit=Tengjast
 openid_register_title=Skrá nýjan notanda
 disable_forgot_password_mail=Endurheimting reiknings er óvirk vegna þess að enginn tölvupóstur er uppsettur. Vinsamlegast hafðu samband við síðustjórann þinn.
@@ -434,15 +434,15 @@ avatar=Notandamynd
 ssh_gpg_keys=SSH og GPG Lyklar
 social=Félagsreikningar
 applications=Forrit
-orgs=Stjórna Stofnunum
+orgs=Stofnanir
 repos=Hugbúnaðarsöfn
-delete=Eyða Reikningi
+delete=Eyða reikningi
 twofa=Tvíþætt Auðkenning
 account_link=Tengdir Reikningar
 organization=Stofnanir
 webauthn=Öryggislyklar
 
-public_profile=Opinber Notandasíða
+public_profile=Opinber notandasíða
 password_username_disabled=Notendum utan staðarins er ekki heimilt að breyta notendanafni sínu. Vinsamlegast hafðu samband við síðustjórann þinn til að fá frekari upplýsingar.
 full_name=Fullt Nafn
 website=Vefsíða
@@ -805,8 +805,8 @@ issues.close_comment_issue=Senda ummæli og Loka
 issues.reopen_issue=Enduropna
 issues.reopen_comment_issue=Senda ummæli og Enduropna
 issues.create_comment=Senda Ummæli
-issues.closed_at=`lokaði þessu vandamáli <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`enduropnaði þetta vandamál <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`lokaði þessu vandamáli %s`
+issues.reopened_at=`enduropnaði þetta vandamál %s`
 issues.ref_reopened_from=`<a href="%[3]s">enduropnaði þetta vandamál %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.author=Höfundur
 issues.role.owner=Eigandi
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index c4083f0ce8..ca1d1433b6 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -8,7 +8,7 @@ sign_in=Accedi
 sign_in_or=o
 sign_out=Esci
 sign_up=Registrati
-link_account=Collega Profilo
+link_account=Collega profilo
 register=Registrati
 version=Versione
 powered_by=Gestito da %s
@@ -54,7 +54,7 @@ mirror=Mirror
 new_repo=Nuovo repository
 new_migrate=Nuova migrazione
 new_mirror=Nuovo mirror
-new_fork=Nuova derivazione
+new_fork=Nuova biforcazione
 new_org=Nuova organizzazione
 new_project=Nuovo progetto
 manage_org=Gestisci le organizzazioni
@@ -99,7 +99,7 @@ preview=Anteprima
 loading=Caricamento…
 
 error=Errore
-error404=La pagina che stai cercando di raggiungere <strong>non esiste</strong> oppure <strong>non sei autorizzato</strong> a visualizzarla.
+error404=La pagina che stai cercando di raggiungere <strong>non esiste</strong>, <strong>è stata rimossa</strong> oppure <strong>non sei autorizzato</strong> a visualizzarla.
 
 never=Mai
 
@@ -143,12 +143,12 @@ confirm_delete_selected = Confermare l'eliminazione di tutti gli elementi selezi
 sign_in_with_provider = Accedi con %s
 new_project_column = Nuova colonna
 toggle_menu = Mostra/Nascondi menu
-filter.not_fork = Non fork
+filter.not_fork = Non biforcazioni
 filter = Filtro
 filter.clear = Rimuovi filtri
 filter.is_archived = Archiviato
 filter.not_archived = Non archiviato
-filter.is_fork = Da fork
+filter.is_fork = Biforcazioni
 filter.is_mirror = Mirror
 filter.not_mirror = Non mirror
 filter.is_template = Modelli
@@ -209,6 +209,7 @@ table_modal.label.columns = Colonne
 link_modal.header = Aggiungi collegamento
 link_modal.url = Url
 link_modal.description = Descrizione
+link_modal.paste_reminder = Suggerimento: se hai già copiato un URL negli appunti, puoi incollarlo direttamente nell’editor per creare un collegamento.
 
 [filter]
 string.asc = A - Z
@@ -232,6 +233,7 @@ lightweight_desc=Forgejo ha requisiti minimi bassi e può funzionare su un econo
 license=Open Source
 license_desc=Ottieni <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Partecipa per <a target="_blank" rel="noopener noreferrer" href="%[2]s">contribuire</a> a rendere questo progetto ancora più bello. Non aver paura di diventare collaborante!
 install_desc = Semplicemente <a target="_blank" rel="noopener noreferrer" href="%[1]s">avvia l'eseguibile</a> per la tua piattaforma, distribuiscilo con <a target="_blank" rel="noopener noreferrer" href="%[2]s">Docker</a>, oppure scarica il <a target="_blank" rel="noopener noreferrer" href="%[3]s">pacchetto</a>.
+platform_desc = È stato verificato che Forgejo è pienamente compatibile con sistemi operativi liberi, come Linux e FreeBSD, nonché con diverse architetture CPU. Scegli liberamente la piattaforma che preferisci!
 
 [install]
 install=Installazione
@@ -396,12 +398,12 @@ go_to = Vai a
 search.type.tooltip = Tipo di ricerca
 search.fuzzy.tooltip = Includi anche i risultati che corrispondono parzialmente ai termini di ricerca
 code_search_results = Risultati di ricerca per "%s"
-relevant_repositories_tooltip = I repositori derivati o che non hanno argomento, icona, né descrizione sono nascosti.
+relevant_repositories_tooltip = I repositori che sono biforcazioni o che non hanno argomento, icona, né descrizione sono nascosti.
 relevant_repositories = Sono visibili solo i repositori pertinenti, <a href="%s">mostra risultati non filtrati</a>.
 search.match.tooltip = Includi solo risultati che combaciano perfettamente con i termini di ricerca
 stars_few = %d stelle
-forks_one = %d fork
-forks_few = %d fork
+forks_one = %d biforcazioni
+forks_few = %d biforcazioni
 stars_one = %d stella
 
 [auth]
@@ -421,7 +423,7 @@ allow_password_change=Richiede all'utente di cambiare la password (scelta consig
 reset_password_mail_sent_prompt=Un'e-mail di conferma è stata inviata a <b>%s</b>. Per completare il processo di recupero dell'account, controlla la tua posta in arrivo e clicca sul link entro i prossimi %s secondi.
 active_your_account=Attiva il tuo account
 account_activated=L'account è stato attivato
-prohibit_login=L'accesso è proibito
+prohibit_login=L'account è sospeso
 resent_limit_prompt=Hai già richiesto un'e-mail d'attivazione recentemente. Si prega di attenere 3 minuti e poi riprovare.
 has_unconfirmed_mail=Ciao %s, hai un indirizzo di posta elettronica non confermato (<b>%s</b>). Se non hai ricevuto una e-mail di conferma o vuoi riceverla nuovamente, fare clic sul pulsante qui sotto.
 resend_mail=Clicca qui per inviare nuovamente l'e-mail di attivazione
@@ -485,6 +487,8 @@ sign_in_openid = Procedi con OpenID
 hint_login = Hai già un'utenza? <a href="%s">Accedi!</a>
 hint_register = Non hai un'utenza? <a href="%s">Registrati ora.</a>
 sign_up_button = Registrati ora.
+unauthorized_credentials = Le credenziali non sono corrette o sono scadute. Controlla il comando o vedi %s per maggiori informazioni
+use_onetime_code = Usa un codice monouso
 
 [mail]
 view_it_on=Visualizza su %s
@@ -680,6 +684,8 @@ Location = Posizione
 AccessToken = Token di accesso
 FullName = Nome e cognome
 To = Nome del ramo
+email_domain_is_not_allowed = Il dominio dell'indirizzo email dell'utente <b>%s</b> è in conflitto con EMAIL_DOMAIN_ALLOWLIST o EMAIL_DOMAIN_BLOCKLIST. Assicurati di aver inserito correttamente l'indirizzo email.
+username_claiming_cooldown = Il nome utente non può essere assegnato, poiché il periodo di attesa non è ancora terminato. Sarà disponibile il %[1]s.
 
 
 [user]
@@ -723,6 +729,7 @@ followers.title.one = Seguace
 followers.title.few = Seguaci
 following.title.one = Seguito
 following.title.few = Osservato
+public_activity.visibility_hint.self_private_profile = Poiché il tuo profilo è privato, la tua attività è visibile solo a te e agli amministratori dell'istanza. <a href="%s">Configura</a>.
 
 
 [settings]
@@ -735,7 +742,7 @@ avatar=Avatar
 ssh_gpg_keys=Chiavi SSH / GPG
 social=Account Sociali
 applications=Applicazioni
-orgs=Gestisci le organizzazioni
+orgs=Organizzazioni
 repos=Repositori
 delete=Elimina account
 twofa=Verifica in due passaggi
@@ -796,8 +803,8 @@ password_change_disabled=Gli utenti non locali non possono cambiare la loro pass
 
 emails=Indirizzi email
 manage_emails=Gestisci indirizzi email
-manage_themes=Seleziona il tema predefinito
-manage_openid=Gestisci gli indirizzi OpenID
+manage_themes=Tema predefinito
+manage_openid=Indirizzi OpenID
 theme_desc=Questo sarà il tuo tema di predefinito in tutto il sito.
 primary=Primario
 activated=Attivato
@@ -1045,7 +1052,7 @@ added_on = Aggiunto su %s
 additional_repo_units_hint = Suggerisci l'attivazione di unità aggiuntive nel repositorio
 update_hints = Aggiorna suggerimenti
 update_hints_success = I suggerimenti sono stati aggiornati.
-additional_repo_units_hint_description = Mostra un pulsante "Aggiungi più sezioni..." per i repositori che non hanno tutte le sezioni disponibili aggiunte.
+additional_repo_units_hint_description = Visualizza un suggerimento “Abilita altro” per i repositori che non hanno tutte le unità disponibili abilitate.
 hints = Suggerimenti
 pronouns = Pronomi
 pronouns_custom = Personalizzato
@@ -1053,6 +1060,34 @@ pronouns_unspecified = Non specificato
 language.title = Lingua predefinita
 language.description = Questa lingua verrà salvata nella tua utenza e verrà usata come predefinita ogni volta che farai l'accesso.
 language.localization_project = Aiutaci a tradurre Forgejo nella tua lingua! <a href="%s">Più informazioni</a>.
+quota.sizes.assets.attachments.all = Allegati
+quota.rule.no_limit = Illimitato
+quota.sizes.assets.attachments.releases = Allegati del rilascio
+quota.rule.exceeded = Superato
+regenerate_token = Rigenera
+access_token_regeneration = Rigenera il token d'accesso
+access_token_regeneration_desc = Rigenerare un token comporterà la revoca dell'accesso al tuo account per tutte le applicazioni che lo utilizzano. Questa operazione è irreversibile. Vuoi procedere?
+regenerate_token_success = Il token è stato rigenerato. Le applicazioni che lo utilizzano non hanno più accesso alla tua utenza e devono essere aggiornate con il nuovo token.
+user_block_yourself = Non puoi bloccare te stesso.
+quota.applies_to_user = Le seguenti regole di quota si applicano al tuo account
+quota.applies_to_org = Le seguenti regole di quota si applicano a questa organizzazione
+quota.rule.exceeded.helper = La dimensione totale degli oggetti per questa regola ha superato la quota.
+quota.sizes.all = Tutti
+quota.sizes.repos.all = Repositori
+quota.sizes.repos.public = Repositori pubblici
+quota.sizes.repos.private = Repositori privati
+quota.sizes.git.all = Contenuto git
+quota.sizes.git.lfs = Git LFS
+quota.sizes.assets.all = Risorse
+quota.sizes.assets.attachments.issues = Allegati della segnalazione
+quota.sizes.assets.artifacts = Artefatti
+quota.sizes.assets.packages.all = Pacchetti
+quota.sizes.wiki = Wiki
+keep_pronouns_private = Mostra i pronomi solo agli utenti che hanno effettuato il login
+keep_pronouns_private.description = Questa impostazione nasconderà i tuoi pronomi agli utenti non ancora autenticati.
+storage_overview = Panoramica spazio di archiviazione
+quota = Quota
+change_username_redirect_prompt.with_cooldown.one = Il vecchio nome utente sarà disponibile per tutti dopo un periodo di protezione di %\[1]d giorni. Durante questo periodo di attesa potrai comunque tornare al vecchio nome utente.
 
 [repo]
 owner=Proprietario
@@ -1067,10 +1102,10 @@ template_description=I modelli di repositori consentono allɜ utenti di generare
 visibility=Visibilità
 visibility_description=Solo il proprietario o i membri dell'organizzazione se hanno diritti, saranno in grado di vederlo.
 visibility_helper_forced=L'amministratorə del sito impone che i nuovi repositori siano privati.
-visibility_fork_helper=(Questa modifica influenzerà la visibilità di tutti i fork.)
+visibility_fork_helper=(Questa modifica influenzerà la visibilità di tutte le biforcazioni.)
 clone_helper=Hai bisogno di aiuto per la clonazione? Visita <a target="_blank" rel="noopener noreferrer" href="%s">Help</a>.
 fork_repo=Deriva repositorio
-fork_from=Deriva da
+fork_from=Biforcazione di
 already_forked=Hai già fatto il fork di %s
 fork_to_different_account=Fai Fork a un account diverso
 fork_visibility_helper=La visibilità di un repositorio derivato non può essere modificata.
@@ -1514,13 +1549,13 @@ issues.close_comment_issue=Commenta e chiudi
 issues.reopen_issue=Riapri
 issues.reopen_comment_issue=Commenta e riapri
 issues.create_comment=Commento
-issues.closed_at=`ha chiuso questa segnalazione <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`ha riaperto questa segnalazione <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`ha fatto riferimento a questa segnalazione dal commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">ha fatto riferimento a questa segnalazione %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">ha fatto riferimento a questa richiesta di modifica %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">ha fatto riferimento a questa segnalazione da una richiesta di modifica %[4]s che la chiuderà</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">ha fatto riferimento a questa segnalazione da una richiesta di modifica %[4]s che la riaprirà</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`ha chiuso questa segnalazione %s`
+issues.reopened_at=`ha riaperto questa segnalazione %s`
+issues.commit_ref_at=`ha fatto riferimento a questa segnalazione dal commit %s`
+issues.ref_issue_from=`<a href="%[2]s">ha fatto riferimento a questa segnalazione %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">ha fatto riferimento a questa richiesta di modifica %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">ha fatto riferimento a questa segnalazione da una richiesta di modifica %[3]s che la chiuderà</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">ha fatto riferimento a questa segnalazione da una richiesta di modifica %[3]s che la riaprirà</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">chiuso questa segnalazione %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">ha riaperto questa segnalazione %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`da %[1]s`
@@ -1605,7 +1640,7 @@ issues.error_modifying_due_date=Impossibile modificare la scadenza.
 issues.error_removing_due_date=Impossibile rimuovere la scadenza.
 issues.push_commit_1=ha aggiunto %d commit %s
 issues.push_commits_n=ha aggiunto %d commit %s
-issues.force_push_codes=`ha forzato l'immissione %[1]s da <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> a <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`ha forzato l'immissione %[1]s da <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s a <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Confronta
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Aggiungi scadenza
@@ -1718,7 +1753,7 @@ pulls.cannot_merge_work_in_progress=Questa richiesta di modifica è contrassegna
 pulls.still_in_progress=Ancora in corso?
 pulls.add_prefix=Aggiungi prefisso <strong>%s</strong>
 pulls.remove_prefix=Rimuovi il prefisso <strong>%s</strong>
-pulls.data_broken=Questa richiesta di modifica è rovinata a causa di informazioni mancanti riguardo la derivazione.
+pulls.data_broken=Questa richiesta di modifica non è valida a causa di informazioni mancanti sulla biforcazione.
 pulls.files_conflicted=Questa richiesta di modifica va in conflitto con il ramo di destinazione.
 pulls.is_checking=Verifica dei conflitti di fusione in corso. Riprova tra qualche istante.
 pulls.is_ancestor=Questo ramo è già incluso nel ramo di destinazione. Non c'è nulla da fondere.
@@ -1776,8 +1811,8 @@ pulls.update_branch_rebase=Aggiorna il ramo per cambio base
 pulls.update_branch_success=Ramo aggiornato con successo
 pulls.update_not_allowed=Non ti è permesso aggiornare il ramo
 pulls.outdated_with_base_branch=Questo ramo non è aggiornato con il ramo di base
-pulls.closed_at=`ha chiuso questa richiesta di modifica <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`ha riaperto questa richiesta di modifica <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`ha chiuso questa richiesta di modifica %s`
+pulls.reopened_at=`ha riaperto questa richiesta di modifica %s`
 
 pulls.auto_merge_button_when_succeed=(Quando i controlli sono superati)
 pulls.auto_merge_when_succeed=Unione automatica quando tutti i controlli sono superati
@@ -2100,7 +2135,7 @@ settings.event_create_desc=Ramo o etichetta creati.
 settings.event_delete=Elimina
 settings.event_delete_desc=Ramo o etichetta eliminati.
 settings.event_fork=Deriva
-settings.event_fork_desc=Repository derivato.
+settings.event_fork_desc=Creata una biforcazione del repositorio.
 settings.event_wiki=Wiki
 settings.event_release=Release
 settings.event_release_desc=Release pubblicata, aggiornata o rimossa in una repository.
@@ -2137,7 +2172,7 @@ settings.event_pull_request_sync_desc=Pull request sincronizzata.
 settings.event_package=Pacchetto
 settings.event_package_desc=Pacchetto creato o eliminato in un repository.
 settings.branch_filter=Filtro rami
-settings.branch_filter_desc=Whitelist dei rami per gli eventi di spinta, creazione dei rami e cancellazione dei rami, specificati come modello globo. Se vuoto o <code>*</code>, gli eventi per tutti i rami sono segnalati. Vedi la documentazione <a href="%[1]s">%[2]s</a> per la sintassi. Esempi: <code>master</code>, <code>{master,release*}</code>.
+settings.branch_filter_desc=Filtro, scritto come pattern glob, da applicare ai rami per gli eventi di tipo immissione, creazione di rami e rimozione di rami. Se vuoto o <code>*</code>, vengono considerati tutti gli eventi di tutti i rami. Maggiori dettagli sulla sintassi presso <a href="%[1]s">%[2]s</a>. Esempi: <code>master</code>, <code>{master,release*}</code>.
 settings.active=Attivo
 settings.active_helper=Le informazioni sugli eventi innescati saranno inviate a questo URL del webhook.
 settings.add_hook_success=Il webhook è stato aggiunto.
@@ -2167,8 +2202,8 @@ settings.web_hook_name_packagist=Packagist
 settings.packagist_username=Nome utente Packagist
 settings.packagist_api_token=API token
 settings.packagist_package_url=Url pacchetto pacchetti
-settings.deploy_keys=Dispiega chiavi
-settings.add_deploy_key=Aggiungi chiave di dispiego
+settings.deploy_keys=Chiavi di distribuzione
+settings.add_deploy_key=Aggiungi chiave di distribuzione
 settings.deploy_key_desc=Le deploy key possiedono l'accesso solamente alla lettura di un repository.
 settings.is_writable=Abilita accesso scrittura
 settings.is_writable_info=Permetti a questa deploy key di <strong>pushare</strong> nella repository.
@@ -2177,7 +2212,7 @@ settings.title=Titolo
 settings.deploy_key_content=Contenuto
 settings.key_been_used=Una deploy key con contenuto identico è già in uso.
 settings.key_name_used=Esiste già una deploy key con questo nome.
-settings.deploy_key_deletion=Rimuovi chiave di dispiego
+settings.deploy_key_deletion=Rimuovi chiave di distribuzione
 settings.deploy_key_deletion_desc=Rimuovere una chiave di distribuzione ne revocherà l'accesso a questo repository. Continuare?
 settings.deploy_key_deletion_success=La chiave di distribuzione è stata rimossa.
 settings.branches=Rami
@@ -2620,7 +2655,7 @@ issues.filter_type.reviewed_by_you = Revisionati da te
 projects.edit_success = Il progetto "%s" è stato aggiornato.
 issues.keyword_search_unavailable = La ricerca per parola chiave non è attualmente disponibile. Contatta l'amministratore del sito.
 issues.role.collaborator_helper = Quest*utente è statə invitatə a collaborare al progetto.
-pulls.commit_ref_at = `ha fatto riferimento a questa richiesta di modifica da un commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `ha fatto riferimento a questa richiesta di modifica da un commit %s`
 settings.thread_id = ID della discussione
 release.title = Titolo del rilascio
 visibility_helper = Rendi il repositorio privato
@@ -2660,7 +2695,7 @@ wiki.page_title = Titolo della pagina
 wiki.page_content = Contenuto della pagina
 settings.mirror_settings.pushed_repository = Repositorio immesso
 settings.mirror_settings.push_mirror.edit_sync_time = Modifica intervallo di sincronizzazione degli specchi
-settings.units.units = Unità della repository
+settings.units.units = Sezioni del repositorio
 settings.units.add_more = Aggiungi ancora...
 settings.wiki_globally_editable = Consenti a tutti di modificare la wiki
 settings.pull_mirror_sync_in_progress = Prelevando cambiamenti dal progetto remoto %s.
@@ -2732,7 +2767,7 @@ pulls.merged_title_desc_one = ha fuso %[1]d commit da <code>%[2]s</code> in <cod
 settings.event_pull_request_approvals = Approvazioni della richiesta di modifica
 settings.event_pull_request_merge = Fusione della richiesta di modifica
 settings.authorization_header = Intestazione dell'autorizzazione
-settings.add_key_success = La chiave di dispiego "%s" è stata aggiunta.
+settings.add_key_success = La chiave di distribuzione "%s" è stata aggiunta.
 settings.protected_branch.save_rule = Salva regola
 settings.protected_branch.delete_rule = Elimina regola
 settings.protect_invalid_status_check_pattern = Sequenza per il controllo dello stato non valida: "%s".
@@ -2810,6 +2845,79 @@ wiki.search = Cerca nel wiki
 wiki.no_search_results = Nessun risultato
 mirror_use_ssh.helper = Selezionando quest'opzione, Forgejo replicherà il repositorio tramite Git con SSH e creerà un paio di chiavi per te. Assicurati che la chiave pubblica generata sia autorizzata per l'immissione nel repositorio di destinazione. Non puoi usare l'autorizzazione tramite password se selezioni quest'opzione.
 archive.pull.noreview = Il repositorio è archiviato. Non puoi revisionare le richieste di modifica.
+settings.event_action_failure = Fallimento
+release.asset_external_url = URL esterno
+release.add_external_asset = Aggiungi risorsa esterna
+pulls.delete_after_merge.head_branch.insufficient_branch = Non hai i permessi per eliminare il ramo genitore.
+settings.mirror_settings.push_mirror.copy_public_key = Copia chiave pubblica
+issues.context.menu = Menu commenti
+activity.published_tag_label = Etichetta
+settings.event_header_action = Eventi di esecuzione delle azioni
+settings.event_action_failure_desc = L'esecuzione dell'azione è terminata con un fallimento.
+settings.event_action_recover_desc = L'esecuzione dell'azione ha avuto successo dopo che l'ultima esecuzione dell'azione nello stesso flusso di lavoro è fallita.
+mirror_use_ssh.text = Utilizza SSH per l'autenticazione
+mirror_use_ssh.not_available = L'autenticazione tramite SSH non è disponibile.
+archive.nocomment = Non è possibile commentare perché il repositorio è archiviato.
+settings.event_action_recover = Recupera
+issues.all_title = Tutti
+issues.review.add_remove_review_requests = aggiunte richieste di revisione da %\[1]s e rimosse richieste di revisione da %\[2]s %\[3]s
+commits.view_single_diff = Visualizza le modifiche apportate a questo file in questo commit
+issues.new.assign_to_me = Assegna a me
+issues.reaction.alt_few = %[1] ha reagito %[2]s.
+pulls.delete_after_merge.head_branch.is_protected = Il ramo head che desideri eliminare è protetto e non può essere eliminato.
+issues.filter_type.all_pull_requests = Tutte le richieste di modifica
+migrate.repo_desc_helper = Lascia vuoto per importare una descrizione esistente
+settings.discord_icon_url.exceeds_max_length = L'URL dell'icona non deve essere più lungo di 2048 caratteri
+issues.review.add_review_requests = richiesto revisioni da %[1]s %[2]s
+diff.git-notes.add = Aggiunti nota
+release.type_external_asset = Risorsa esterna
+issues.reopen.blocked_by_user = Non puoi riaprire questa segnalazione perché sei bloccato dal proprietario del repositorio o dall’autore di questa segnalazione.
+pulls.editable_explanation = Questa richiesta di modifica consente modifiche da parte dei manutentori. Puoi contribuire direttamente.
+activity.published_prerelease_label = Pre-rilascio
+settings.pull_mirror_sync_quota_exceeded = Quota superata, non è possibile unire le modifiche.
+settings.default_update_style_desc = Stile di aggiornamento predefinito utilizzato per aggiornare le richieste di modifica che sono indietro rispetto al ramo di base.
+release.asset_name = Nome della risorsa
+settings.transfer_quota_exceeded = Il nuovo proprietario (%s) è sopra la sua quota. Il repositorio non è stato trasferito.
+release.summary_card_alt = Scheda riepilogativa di un rilascio con titolo "%s" nel repositorio %s
+issues.filter_no_results = Nessun risultato
+issues.filter_no_results_placeholder = Prova a modificare i filtri di ricerca.
+auto_init_description = Inizializza la cronologia Git con un README e, opzionalmente, aggiungi i file di licenza e .gitignore.
+sync_fork.button = Sincronizza
+pulls.editable = Modificabile
+pulls.sign_in_require = <a href="%s">Accedi</a> per creare una richiesta di modifica.
+settings.mirror_settings.push_mirror.none_ssh = Nessuno
+sync_fork.branch_behind_one = Questo ramo è indietro di %[1]d commit rispetto a %[2]s
+sync_fork.branch_behind_few = Questo ramo è indietro di %[1]d commit rispetto a %[2]s
+no_eol.text = Nessun fine linea
+no_eol.tooltip = Questo file non contiene un carattere di fine linea finale.
+milestones.filter_sort.name = Nome
+settings.protect_new_rule = Crea una nuova regola di protezione dei rami
+editor.commit_email = E-mail di commit
+mirror_public_key = Chiave SSH pubblica
+mirror_denied_combination = Non è possibile utilizzare contemporaneamente l'autenticazione tramite chiave pubblica e password.
+release.type_attachment = Allegato
+release.invalid_external_url = URL esterno invalido: "%s"
+new_from_template = Utilizza un modello
+new_from_template_description = Puoi selezionare un modello di repositorio esistente su questa istanza e applicare le sue impostazioni.
+new_advanced = Impostazioni avanzate
+new_advanced_expand = Clicca per espandere
+summary_card_alt = Scheda riepilogativa del repository %s
+issues.filter_sort.relevance = Rilevanza
+issues.num_reviews_one = %d revisioni
+issues.num_reviews_few = %d revisioni
+issues.reaction.add = Aggiungi reazione
+issues.reaction.alt_many = %[1] e altri %[2]d hanno reagito %[3]s.
+issues.reaction.alt_remove = Rimuovi la reazione %[1]s dal commento.
+issues.reaction.alt_add = Aggiungi la reazione %[1]s al commento.
+issues.review.remove_review_requests = rimosso richieste di revisione per %\[1]s %\[2]s
+comment.blocked_by_user = Non è possibile commentare perché sei stato bloccato dal proprietario del repositorio o dall'autore.
+issues.summary_card_alt = Scheda riepilogativa di una segnalazione intitolata "%s" nel repositorio %s
+pulls.delete_after_merge.head_branch.is_default = Il ramo head che desideri eliminare è il ramo predefinito e non può essere eliminato.
+settings.event_action_success = Successo
+settings.event_action_success_desc = L'esecuzione dell'azione è andata a buon fine.
+diff.git-notes.remove-header = Rimuovi nota
+diff.git-notes.remove-body = Questa nota verrà rimossa.
+activity.commit = Attività di commit
 
 [graphs]
 contributors.what = contribuzioni
@@ -2839,7 +2947,7 @@ team_name_helper=I nomi dei team devono essere brevi e semplici da ricordare.
 team_desc_helper=Descrivi lo scopo o il ruolo del team.
 team_access_desc=Accesso al repository
 team_permission_desc=Autorizzazione
-team_unit_desc=Consenti l'accesso a sezioni di progetto
+team_unit_desc=Consenti l'accesso alle sezioni del repositorio
 team_unit_disabled=(Disabilitato)
 
 form.create_org_not_allowed=Non disponi dell'autorizzazione per creare un organizzazione.
@@ -3493,6 +3601,12 @@ config.cache_test_slow = Successo nel controllo della cache, ma la risposta è l
 config.app_slogan = Slogan dell'istanza
 auths.default_domain_name = Nome di dominio predefinito utilizzato per l'indirizzo e-mail
 users.restricted.description = Permetti di interagire solo con i repositori e le organizzazioni in cui l'utente è aggiuntə come collaborante. Ciò evita l'accesso ai repositori pubblici di quest'istanza.
+emails.deletion_success = L'indirizzo e-mail è stato eliminato.
+monitor.duration = Durata (s)
+emails.delete_desc = Confermare l’eliminazione di questo indirizzo email?
+emails.delete_primary_email_error = Non puoi eliminare la e-mail primaria.
+emails.delete = Elimina e-mail
+users.organization_creation.description = Abilita la creazione di nuove organizzazioni.
 
 
 [action]
@@ -3510,7 +3624,7 @@ merge_pull_request=`ha fuso la richiesta di modifica <a href="%[1]s">%[3]s#%[2]s
 transfer_repo=repository <code>%s</code> trasferito in <a href="%s">%s</a>
 push_tag=ha inviato il tag <a href="%[2]s">%[3]s</a> su <a href="%[1]s">%[4]s</a>
 delete_tag=tag eliminato %[2]s da <a href="%[1]s">%[3]s</a>
-delete_branch=branch eliminato %[2]s da <a href="%[1]s">%[3]s</a>
+delete_branch=branch eliminato <code>%[2]s</code> da <a href="%[1]s">%[3]s</a>
 compare_branch=Confronta
 compare_commits=Confronta %d commits
 compare_commits_general=Confronta commit
@@ -3737,6 +3851,31 @@ owner.settings.cargo.initialize.success = L'indice di Cargo è stato creato corr
 owner.settings.cargo.rebuild.no_index = Impossibile ricostruire, nessun indice è inizializzato.
 owner.settings.cargo.rebuild.description = La ricostruzione può essere utile se l'indice non è sincronizzato con i pacchetti Cargo conservati.
 npm.dependencies.bundle = Dipendenze raggruppate
+arch.version.groups = Gruppo
+arch.version.conflicts = Va in conflitto con
+arch.version.depends = Dipende da
+arch.version.makedepends = Dipendenze di build
+arch.version.checkdepends = Dipendenze di controllo
+arch.version.replaces = Sostituisce
+arch.version.optdepends = Dipende opzionalmente da
+arch.version.backup = Backup
+search_in_external_registry = Cerca in %s
+arch.version.provides = Fornisce
+arch.pacman.conf = Aggiungi il server con la relativa distribuzione e architettura a <code>/etc/pacman.conf</code>:
+alt.setup = Aggiungi il repositorio alla lista dei repositori in rete (seleziona l'architettura necessaria al posto di "_arch_"):
+container.images.title = Immagini
+arch.version.properties = Proprietà della versione
+alt.registry.install = Per installare il pacchetto, esegui il comando seguente:
+alt.install = Installa pacchetto
+alt.registry = Configura questo registro dalla riga di comando:
+arch.pacman.helper.gpg = Aggiungi il certificato a pacman:
+arch.pacman.repo.multi = %s ha la stessa versione in diverse distribuzioni.
+arch.pacman.repo.multi.item = Configurazione per %s
+arch.pacman.sync = Sincronizza il paccketto con pacman:
+arch.version.description = Descrizione
+alt.repository = Informazioni del repositorio
+alt.repository.architectures = Architetture
+alt.repository.multiple_groups = Questo pacchetto è disponibile per più gruppi.
 
 [secrets]
 secrets = Segreti
@@ -3834,7 +3973,7 @@ runs.empty_commit_message = (messaggio di commit vuoto)
 runs.no_runs = Il flusso di lavoro non è stato ancora eseguito.
 variables.creation.success = La variabile "%s" è stata aggiunta.
 variables.description = Le variabili saranno passate a determinate azioni e non possono essere lette altrimenti.
-need_approval_desc = È necessaria l'approvazione per eseguire flussi di lavoro per richieste di modifica da derivazioni.
+need_approval_desc = È necessaria l'approvazione per eseguire flussi di lavoro per richieste di modifica da biforcazioni.
 runs.no_workflows.documentation = Per ulteriori informazioni sulle Forgejo Actions vedi <a target="_blank" rel="noopener noreferrer" href="%s">la documentazione</a>.
 runs.no_workflows.quick_start = Non sai come iniziare con le Forgejo Actions? Vedi <a target="_blank" rel="noopener noreferrer" href="%s">la guida rapida</a>.
 runners.delete_runner_notice = Se un'attività è in esecuzione su questo esecutore sarà terminata ed etichettata fallito. Potrebbe rompere flussi di lavoro di costruzione.
@@ -3848,6 +3987,8 @@ workflow.dispatch.invalid_input_type = Tipo ingresso "%s" non valido.
 workflow.dispatch.warn_input_limit = Visualizzati solo i primi %d ingressi.
 runs.no_job = Il flusso di lavoro deve contenere almeno un incarico
 workflow.dispatch.use_from = Usa flusso di lavoro da
+variables.not_found = Non è stato possibile trovare la variabile.
+runs.expire_log_message = I log sono stati eliminati in quanto troppo vecchi.
 
 
 
@@ -3856,6 +3997,7 @@ workflow.dispatch.use_from = Usa flusso di lavoro da
 type-3.display_name = Progetto dell'organizzazione
 type-1.display_name = Progetto individuale
 type-2.display_name = Progetto
+deleted.display_name = Progetto eliminato
 
 [git.filemode]
 symbolic_link=Link Simbolico
@@ -3869,33 +4011,34 @@ changed_filemode = %[1]s → %[2]s
 
 [search]
 type_tooltip = Tipo ricerca
-search = Cerca...
+search = Cerca…
 fuzzy = Approssimativa
 match = Precisa
-org_kind = Cerca organizzazioni...
-package_kind = Ricerca pacchetti...
+org_kind = Cerca organizzazioni…
+package_kind = Ricerca pacchetti…
 code_search_unavailable = La ricerca del codice non è attualmente disponibile. Contatta l'amministratorə del sito.
-code_kind = Cerca nel codice...
-team_kind = Cerca team...
+code_kind = Cerca nel codice…
+team_kind = Cerca team…
 code_search_by_git_grep = I risultati della ricerca del codice sono forniti da "git grep". Potrebbero esserci risultati migliori se l'amministratore del sito avesse abilitato l'indicizzatore del codice.
-project_kind = Ricerca progetti...
-commit_kind = Ricerca commit...
-branch_kind = Ricerca rami...
+project_kind = Ricerca progetti…
+commit_kind = Ricerca commit…
+branch_kind = Ricerca rami…
 no_results = Non è stato trovato alcun risultato.
 keyword_search_unavailable = La ricerca per parole chiave non è attualmente disponibile. Contatta l'amministratore del sito.
-runner_kind = Ricerca esecutori...
+runner_kind = Ricerca esecutori…
 match_tooltip = Includi solo risultati che corrispondono precisamente al termine di ricerca
 fuzzy_tooltip = Includi anche risultati che corrispondono approssimativamente al termine di ricerca
-user_kind = Cerca utenti...
-repo_kind = Cerca repo...
+user_kind = Cerca utenti…
+repo_kind = Cerca repo…
 exact_tooltip = Includi solo i risultati che corrispondono esattamente al termine di ricerca
-issue_kind = Cerca segnalazioni...
-pull_kind = Cerca richieste...
+issue_kind = Cerca segnalazioni…
+pull_kind = Cerca richieste…
 exact = Esatto
 milestone_kind = Ricerca tappe...
 regexp_tooltip = Interpreta i termini di ricerca come un'espressione regolare
 regexp = Espressione Regolare
 union_tooltip = Include i risultati che combaciano con una qualsiasi delle parole chiave separata da spazi
+union = Parole chiavi
 
 [munits.data]
 gib = GiB
@@ -3914,4 +4057,16 @@ filepreview.line = Linea %[1]d in %[2]s
 
 [repo.permissions]
 issues.write = <b>Scrittura:</b> Chiudere segnalazioni e gestire metadati come etichette, traguardi, assegnatarɜ, scadenze e dipendenze.
-pulls.write = <b>Scrittura:</b> Chiudere richieste di modifica e gestire metadati come etichette, traguardi, assegnatarɜ, scadenze e dipendenze.
\ No newline at end of file
+pulls.write = <b>Scrittura:</b> Chiudere richieste di modifica e gestire metadati come etichette, traguardi, assegnatarɜ, scadenze e dipendenze.
+releases.write = <b>Scrittura:</b> Può pubblicare, modificare ed eliminare rilasci e le risorse ad essi allegate.
+code.write = <b>Scrittura:</b> Può aggiungere commit al repositorio, creare rami ed etichette.
+wiki.read = <b>Lettura:</b> Può leggere la wiki integrata e la sua cronologia.
+releases.read = <b>Lettura:</b> Può visualizzare e scaricare i rilasci.
+projects.read = <b>Lettura:</b> Può accedere alle board di progetto del repositorio.
+code.read = <b>Lettura:</b> Può accedere e clonare il codice del repositorio.
+wiki.write = <b>Scrittura:</b> Può creare, aggiornare ed eliminare pagine nella wiki integrata.
+issues.read = <b>Lettura:</b> Può leggere e creare segnalazioni e commenti.
+pulls.read = <b>Lettura:</b> Può leggere e creare richieste di modifica.
+
+[translation_meta]
+test = daje Roma
\ No newline at end of file
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index d4d7024f5d..5b8e8019f2 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -250,7 +250,7 @@ err_empty_db_path=SQLite3のデータベースパスを空にすることはで
 no_admin_and_disable_registration=管理者アカウントを作成せずに、セルフ登録を無効にすることはできません。
 err_empty_admin_password=管理者パスワードは空にできません。
 err_empty_admin_email=管理者のメールアドレスは空にできません。
-err_admin_name_is_reserved=管理者のユーザー名が不正です。予約済みのユーザー名です。
+err_admin_name_is_reserved=管理者のユーザー名が不正です。予約済みのユーザー名です
 err_admin_name_pattern_not_allowed=管理者のユーザー名が不正です。 予約済みのパターンにマッチしています
 err_admin_name_is_invalid=管理者のユーザー名が不正です
 
@@ -1047,6 +1047,7 @@ language.title = 既定の言語
 keep_activity_private.description = <a href="%s">公開アクティビティ</a>は、あなたとインスタンス管理者にのみ表示されます。
 language.description = この言語はアカウントに保存され、ログイン後にデフォルトとして使用されます。
 language.localization_project = Forgejo をあなたの言語に翻訳するのを手伝ってください。<a href="%s">詳細はこちら</a>。
+quota = クオータ
 
 [repo]
 new_repo_helper=リポジトリには、プロジェクトのすべてのファイルとリビジョン履歴が入ります。 すでにほかの場所でホストしていますか？ <a href="%s">リポジトリを移行</a> もどうぞ。
@@ -1610,13 +1611,13 @@ issues.close_comment_issue=コメントしてクローズ
 issues.reopen_issue=再オープンする
 issues.reopen_comment_issue=コメントして再オープン
 issues.create_comment=コメントする
-issues.closed_at=`がイシューをクローズ <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`がイシューを再オープン <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`がコミットでこのイシューを参照 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">が%[4]s、このイシューを参照</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">が%[4]s、このプルリクエストを参照</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">が%[4]s、プルリクエストがこのイシューをクローズするよう参照</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">が%[4]s、プルリクエストがこのイシューを再オープンするよう参照</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`がイシューをクローズ %s`
+issues.reopened_at=`がイシューを再オープン %s`
+issues.commit_ref_at=`がコミットでこのイシューを参照 %s`
+issues.ref_issue_from=`<a href="%[2]s">が%[3]s、このイシューを参照</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">が%[3]s、このプルリクエストを参照</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">が%[3]s、プルリクエストがこのイシューをクローズするよう参照</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">が%[3]s、プルリクエストがこのイシューを再オープンするよう参照</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">が%[4]s、このイシューをクローズ</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">が%[4]s、このイシューを再オープン</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=` %[1]s にて`
@@ -1721,7 +1722,7 @@ issues.error_modifying_due_date=期日を変更できませんでした。
 issues.error_removing_due_date=期日を削除できませんでした。
 issues.push_commit_1=が %d コミット追加 %s
 issues.push_commits_n=が %d コミット追加 %s
-issues.force_push_codes=`が %[1]s を強制プッシュ ( <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> から <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> へ ) %[6]s`
+issues.force_push_codes=`が %[1]s を強制プッシュ ( <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s から <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s へ ) %[6]s`
 issues.force_push_compare=比較
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=期日の追加
@@ -1923,8 +1924,8 @@ pulls.update_branch_success=ブランチの更新が成功しました
 pulls.update_not_allowed=ブランチを更新する権限がありません
 pulls.outdated_with_base_branch=このブランチはベースブランチに対して最新ではありません
 pulls.close=プルリクエストをクローズ
-pulls.closed_at=`がプルリクエストをクローズ <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`がプルリクエストを再オープン <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`がプルリクエストをクローズ %s`
+pulls.reopened_at=`がプルリクエストを再オープン %s`
 pulls.cmd_instruction_hint=コマンドラインの手順を表示
 pulls.cmd_instruction_checkout_title=チェックアウト
 pulls.cmd_instruction_checkout_desc=プロジェクトリポジトリから新しいブランチをチェックアウトし、変更内容をテストします。
@@ -2721,7 +2722,7 @@ settings.wiki_rename_branch_main = wikiのブランチ名を正規化する
 settings.wiki_rename_branch_main_desc = wikiによって内部的に使われているブランチ名を "%s" に変更します。これは恒久的で元に戻すことはできません。
 contributors.contribution_type.additions = 追加
 vendored = vendor済み
-pulls.commit_ref_at = `このプルリクエストを言及するコミット <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `このプルリクエストを言及するコミット %s`
 pulls.fast_forward_only_merge_pull_request = Fast-forwardのみ
 admin.manage_flags = フラグ管理
 admin.update_flags = フラグを更新
@@ -3536,7 +3537,7 @@ auto_merge_pull_request=`がプルリクエスト <a href="%[1]s">%[3]s#%[2]s</a
 transfer_repo=がリポジトリ <code>%s</code> を <a href="%s">%s</a> へ移転しました
 push_tag=がタグ <a href="%[2]s">%[3]s</a> を <a href="%[1]s">%[4]s</a> にプッシュしました
 delete_tag=がタグ %[2]s を <a href="%[1]s">%[3]s</a> から削除しました
-delete_branch=がブランチ %[2]s を <a href="%[1]s">%[3]s</a> から削除しました
+delete_branch=がブランチ <code>%[2]s</code> を <a href="%[1]s">%[3]s</a> から削除しました
 compare_branch=比較
 compare_commits=%d件のコミットを比較
 compare_commits_general=コミットを比較
@@ -3903,20 +3904,20 @@ submodule=サブモジュール
 [search]
 search = 検索...
 type_tooltip = 検索タイプ
-org_kind = 組織の検索...
-code_kind = コードの検索...
+org_kind = 組織を検索…
+code_kind = コードを検索…
 fuzzy = あいまい
-repo_kind = リポジトリの検索...
+repo_kind = リポジトリを検索…
 code_search_unavailable = コード検索は現在利用できません。サイト管理者にお問い合わせください。
-branch_kind = ブランチの検索...
-commit_kind = コミットの検索...
-user_kind = ユーザーの検索...
-team_kind = チームの検索...
+branch_kind = ブランチを検索…
+commit_kind = コミットを検索…
+user_kind = ユーザーを検索…
+team_kind = チームを検索…
 code_search_by_git_grep = 現在のコード検索結果は「git grep」によって提供されます。サイト管理者がコード インデクサーを有効にすると、より良い結果が得られる可能性があります。
-package_kind = パッケージの検索...
-project_kind = プロジェクトの検索...
+package_kind = パッケージを検索…
+project_kind = プロジェクトを検索…
 keyword_search_unavailable = キーワードによる検索は現在ご利用いただけません。サイト管理者にお問い合わせください。
-runner_kind = ランナーの検索...
+runner_kind = ランナーを検索…
 no_results = 一致する結果が見つかりませんでした。
 fuzzy_tooltip = 入力された語句に近いものも結果に含める
 match = 一致
@@ -3924,8 +3925,8 @@ match_tooltip = 検索語句に厳密に一致するもののみ結果に含め
 milestone_kind = マイルストーンを検索...
 union_tooltip = 空白で区切られたキーワードのいずれかに一致する結果を含める
 exact_tooltip = 検索語句と完全に一致する結果のみを含める
-issue_kind = イシューを検索...
-pull_kind = プルを検索...
+issue_kind = イシューを検索…
+pull_kind = プルを検索…
 exact = 完全一致
 regexp_tooltip = 検索語句を正規表現として解釈する
 regexp = 正規表現
diff --git a/options/locale/locale_jbo.ini b/options/locale/locale_jbo.ini
new file mode 100644
index 0000000000..947bb298de
--- /dev/null
+++ b/options/locale/locale_jbo.ini
@@ -0,0 +1,13 @@
+
+
+
+[common]
+home = zdani
+dashboard = jitypalna
+explore = sisku
+help = se sidju
+logo = se'isni
+sign_in = co'a nerkla
+sign_in_with_provider = co'a nerka sepi'o la .%s.
+sign_out = co'a cliva
+sign_up = co'a gumri
\ No newline at end of file
diff --git a/options/locale/locale_ka.ini b/options/locale/locale_ka.ini
index b1e1df74b3..bebd021965 100644
--- a/options/locale/locale_ka.ini
+++ b/options/locale/locale_ka.ini
@@ -1,56 +1,43 @@
+
+
+
 [common]
+register = რეგისტრაცია
+pin = ამაგრება
+copy = კოპირება
+filter = ფილტრი
+edit = ჩასწორება
 home = საწყისი
 dashboard = სამუშაო მაგიდა
 explore = დათვალიერება
 help = დახმარება
 logo = ლოგო
-sign_in = შესვლა
 sign_in_or = ან
-sign_out = გასვლა
 sign_up = რეგისტრაცია
-link_account = ანგარიშის მიბმა
-register = რეგისტრაცია
+language = ენა
+username = მომხმარებლის სახელი
 version = ვერსია
 page = გვერდი
 template = ნიმუში
-language = ენა
 notifications = გაფრთხილებები
 create_new = შექმნა…
 licenses = ლიცენზიები
-toggle_menu = მენიუს გადართვა
-more_items = მეტი ელემენტი
-username = მომხმარებლის სახელი
-email = ელფოსტის მისამართი
 password = პაროლი
-access_token = წვდომის ტოკენი
-re_type = დაადასტურეთ პაროლი
 captcha = კაპჩა
-twofa = 2FA
 passcode = საკვანძო კოდი
 repository = რეპოზიტორია
 organization = ორგანიზაცია
 mirror = სარკე
-new_mirror = ახალი სარკე
-new_project = ახალი პროექტი
-new_project_column = ახალი სვეტი
-admin_panel = საიტის ადმინისტრირება
 settings = მორგება
 your_profile = პროფილი
 your_starred = ვარსკვლავიანი
 your_settings = მორგება
-new_repo.title = ახალი რეპოზიტორია
-new_migrate.title = ახალი მიგრაცია
-new_org.title = ახალი ორგანიზაცია
-new_repo.link = ახალი რეპოზიტორია
-new_migrate.link = ახალი მიგრაცია
-new_org.link = ახალი ორგანიზაცია
 all = ყველა
 sources = წყაროები
 mirrors = სარკეები
 collaborative = საერთო
 forks = ფორკები
 activities = აქტივობები
-pull_requests = შერწყმის მოთხოვნები
 issues = პრობლემები
 milestones = მისაღწევი გეგმები
 ok = დიახ
@@ -59,45 +46,71 @@ retry = თავიდან ცდა
 rerun = თავიდან გაშვება
 save = შენახვა
 add = დამატება
-add_all = ყველას დამატება
 remove = წაშლა
-remove_all = ყველას წაშლა
-edit = ჩასწორება
 view = ხედი
 test = შემოწმება
 enabled = ჩართულია
 disabled = გამორთულია
 locked = ჩაკეტილია
-copy = კოპირება
-copy_url = ბმულის კოპირება
-copy_hash = ჰეშის კოპირება
-copy_path = ბილიკის კოპირება
-copy_content = შემცველობის კოპირება
-copy_success = დაკოპირებულია!
-copy_error = კოპირება ჩავარდა
 write = ჩაწერა
 preview = მინიატურა
 loading = ჩატვირთვა…
 error = შეცდომა
 never = არასდროს
 unknown = უცნობი
-pin = ამაგრება
 unpin = ჩამოხსნა
 artifacts = არტეფაქტები
-archived = დაარქივებული
-concept_system_global = გლობალური
 concept_user_individual = ინდივიდუალური
 concept_code_repository = რეპოზიტორია
 concept_user_organization = ორგანიზაცია
 name = სახელი
 value = მნიშვნელობა
-filter = ფილტრი
+archived = დაარქივებული
 filter.is_archived = დაარქივებული
 filter.is_fork = ფორკები
 filter.is_mirror = სარკეები
 filter.is_template = ნიმუშები
-filter.public = საჯარო
 filter.private = პირადი
+copy_success = დაკოპირებულია!
+concept_system_global = გლობალური
+filter.public = საჯარო
+sign_in = შესვლა
+sign_out = გასვლა
+link_account = ანგარიშის მიბმა
+toggle_menu = მენიუს გადართვა
+more_items = მეტი ელემენტი
+email = ელფოსტის მისამართი
+access_token = წვდომის ტოკენი
+re_type = დაადასტურეთ პაროლი
+twofa = 2FA
+new_mirror = ახალი სარკე
+new_project = ახალი პროექტი
+new_project_column = ახალი სვეტი
+admin_panel = საიტის ადმინისტრირება
+new_repo.title = ახალი რეპოზიტორია
+new_migrate.title = ახალი მიგრაცია
+new_org.title = ახალი ორგანიზაცია
+new_repo.link = ახალი რეპოზიტორია
+new_migrate.link = ახალი მიგრაცია
+new_org.link = ახალი ორგანიზაცია
+pull_requests = შერწყმის მოთხოვნები
+add_all = ყველას დამატება
+remove_all = ყველას წაშლა
+copy_url = ბმულის კოპირება
+copy_hash = ჰეშის კოპირება
+copy_path = ბილიკის კოპირება
+copy_content = შემცველობის კოპირება
+copy_error = კოპირება ჩავარდა
+
+[install]
+path = ბილიკი
+install = დაყენება
+host = ჰოსტი
+user = მომხმარებლის სახელი
+password = პაროლი
+db_schema = სქემა
+ssl_mode = SSL
+admin_password = პაროლი
 
 [search]
 search = ძებნა…
@@ -124,40 +137,26 @@ table_modal.label.columns = სვეტი
 link_modal.url = Url
 link_modal.description = აღწერა
 
-[startpage]
-platform = პლატფორმათაშორისი
-lightweight = მსუბუქი
-
-[install]
-install = დაყენება
-host = ჰოსტი
-user = მომხმარებლის სახელი
-password = პაროლი
-db_schema = სქემა
-ssl_mode = SSL
-path = ბილიკი
-admin_password = პაროლი
-
 [home]
 my_repos = რეპოზიტორიები
-my_orgs = ორგანიზაციები
 show_archived = დაარქივებული
+my_orgs = ორგანიზაციები
 show_private = პირადი
 
 [explore]
 repos = რეპოზიტორიები
-users = მომხმარებლები
 organizations = ორგანიზაციები
 code = კოდი
+users = მომხმარებლები
 
 [auth]
-verify = გადამოწმება
 openid_connect_submit = მიერთება
+verify = გადამოწმება
 
 [mail]
-release.note = შენიშვნა:
 release.downloads = გადმოწერები:
 repo.transfer.to_you = თქვენ
+release.note = შენიშვნა:
 
 [modal]
 yes = დიახ
@@ -167,14 +166,14 @@ cancel = გაუქმება
 modify = განახლება
 
 [form]
-UserName = მომხმარებლის სახელი
 Description = აღწერა
 Pronouns = ნაცვალსახელები
 Biography = ბიოგრაფია
 Website = ვებგვერდი
 Location = მდებარეობა
-Password = პაროლი
 Content = შემცველობა
+UserName = მომხმარებლის სახელი
+Password = პაროლი
 
 [user]
 repositories = რეპოზიტორიები
@@ -204,17 +203,14 @@ repos = რეპოზიტორიები
 organization = ორგანიზაციები
 uid = UID
 quota = კვოტა
-website = ვებგვერდი
 location = მდებარეობა
 pronouns = ნაცვალსახელები
-pronouns_unspecified = მითითებული არაა
 continue = გაგრძელება
 cancel = გაუქმება
 language = ენა
 ui = თემა
 hints = მინიშნებები
 comment_type_group_reference = მიმართვა
-comment_type_group_label = ჭდე
 comment_type_group_milestone = მისაღწევი მიზანი
 comment_type_group_assignee = მიმნიჭებელი
 comment_type_group_title = სათაური
@@ -236,26 +232,33 @@ principal_content = შემცველობა
 delete_key = წაშლა
 can_read_info = წაკითხვა
 can_write_info = ჩაწერა
-delete_token = წაშლა
-regenerate_token = რეგენერაცია
 permission_read = წაკითხვა
 permissions_list = წვდომები:
+pronouns_unspecified = მითითებული არაა
+regenerate_token = რეგენერაცია
+website = ვებგვერდი
+comment_type_group_label = ჭდე
+delete_token = წაშლა
 save_application = შენახვა
 oauth2_application_edit = ჩასწორება
 revoke_key = გაუქმება
-webauthn_nickname = მეტსახელი
 visibility.public = საჯარო
 visibility.limited = შეზღუდული
-visibility.private = პირადი
 quota.rule.exceeded = გადაცილებულია
 quota.rule.no_limit = შეუზღუდავი
 quota.sizes.all = ყველა
 quota.sizes.repos.all = რეპოზიტორიები
-quota.sizes.assets.all = ობიექტები
-quota.sizes.assets.attachments.all = მიმაგრებული ფაილები
 quota.sizes.assets.artifacts = არტეფაქტები
 quota.sizes.assets.packages.all = პაკეტები
 quota.sizes.wiki = ვიკი
+visibility.private = პირადი
+quota.sizes.assets.all = ობიექტები
+webauthn_nickname = მეტსახელი
+quota.sizes.assets.attachments.all = მიმაგრებული ფაილები
+
+[startpage]
+lightweight = მსუბუქი
+platform = პლატფორმათაშორისი
 
 [repo]
 owner = მფლობელი
@@ -277,46 +280,37 @@ forks = ფორკები
 stars = ვარსკვლავები
 language_other = სხვა
 delete_preexisting_label = წაშლა
-desc.private = პირადი
 desc.public = საჯარო
 desc.template = ნიმუში
 desc.internal = შიდა
-desc.archived = დაარქივებული
 desc.sha256 = SHA256
 template.webhooks = ვებჰუკები
 template.topics = თემები
 template.avatar = ავატარი
 need_auth = ავტორიზაცია
 migrate_items_wiki = ვიკი
-migrate_items_milestones = მისაღწევი გეგმები
 migrate_items_labels = ჭდეები
 migrate_items_issues = პრობლემები
 migrate_items_releases = რელიზები
-watch = თვალყურის დევნება
-unwatch = თვალყურის დევნების გაუქმება
 star = ვარსკვლავი
 unstar = ვარსკვლავის მოხსნა
 fork = ფორკი
 code = კოდი
 branch = ბრენჩი
-tree = ხე
 branches = ბრენჩები
 tag = ჭდე
 tags = ჭდეები
 issues = პრობლემები
-project = პროექტები
 packages = პაკეტები
 actions = ქმედებები
 release = რელიზი
 releases = რელიზები
 labels = ჭდეები
-milestones = მისაღწევი გეგმები
 org_labels_desc_manage = მართვა
 commits = კომიტები
 commit = კომიტი
 file_raw = დაუმუშავებელი
 file_history = ისტორია
-file_permalink = მუდმივი ბმული
 escape_control_characters = დაეკრანება
 unescape_control_characters = დაეკრანების მოხსნა
 vendored = გარედან მოწოდებული
@@ -338,9 +332,7 @@ commits.message = შეტყობინება
 commits.date = თარიღი
 commits.older = უფრო ძველი
 commits.newer = უფრო ახალი
-commit.operations = ოპერაციები
 commit.revert = დაბრუნება
-commit.cherry-pick = ზუსტი არჩევა
 commitstatus.error = შეცდომა
 commitstatus.failure = ჩავარდნა
 commitstatus.pending = რიგშია
@@ -349,7 +341,6 @@ projects = პროექტები
 projects.description_placeholder = აღწერა
 projects.title = სათაური
 projects.type.none = არცერთი
-projects.template.desc = ნიმუში
 projects.column.edit_title = სახელი
 projects.column.new_title = სახელი
 projects.column.color = ფერი
@@ -362,12 +353,10 @@ issues.new.assignees = მიმნიჭებლები
 issues.choose.open_external_link = გახსნა
 issues.choose.blank = ნაგულისხმევი
 issues.new_label_desc_placeholder = აღწერა
-issues.deleted_milestone = `(წაშლილია)`
 issues.deleted_project = `(წაშლილია)`
 issues.filter_label = ჭდე
 issues.filter_milestone = მისაღწევი მიზანი
 issues.filter_project = პროექტი
-issues.filter_assignee = მიმნიჭებელი
 issues.filter_poster = ავტორი
 issues.filter_type = ტიპი
 issues.filter_sort = დალაგება
@@ -386,9 +375,7 @@ issues.open_title = გახსნა
 issues.closed_title = დახურული
 issues.all_title = ყველა
 issues.draft_title = მონახაზი
-issues.context.edit = ჩასწორება
 issues.context.delete = წაშლა
-issues.reopen_issue = თავიდან გახსნა
 issues.create_comment = კომენტარი
 issues.author = ავტორი
 issues.role.owner = მფლობელი
@@ -397,18 +384,14 @@ issues.role.collaborator = თანამონაწილე
 issues.role.contributor = მოხალისე
 issues.edit = ჩასწორება
 issues.cancel = გაუქმება
-issues.save = შენახვა
 issues.label_title = სახელი
 issues.label_description = აღწერა
 issues.label_color = ფერი
 issues.label_exclusive = ექსკლუზიური
-issues.label_edit = ჩასწორება
 issues.label_delete = წაშლა
 issues.label.filter_sort.alphabetically = ანბანის მიხედვით
-issues.subscribe = გამოწერა
 issues.unsubscribe = გამოწერის გაუქმება
 issues.lock_confirm = ჩაკეტვა
-issues.unlock_confirm = ჩაკეტვის გაუქმება
 issues.delete = წაშლა
 issues.cancel_tracking = მოცილება
 issues.add_time_cancel = გაუქმება
@@ -422,16 +405,13 @@ issues.due_date_overdue = გადაცილებული
 issues.dependency.title = დამოკიდებულებები
 issues.dependency.cancel = გაუქმება
 issues.dependency.remove = წაშლა
-issues.dependency.blocks_short = ბლოკები
 issues.review.dismissed_label = მოცილებულია
 issues.review.pending = რიგშია
 issues.review.reviewers = გადამხედავები
-issues.review.outdated = ვადაგადაცილებული
 issues.reference_issue.body = სხეული
 issues.content_history.deleted = წაშლილია
 issues.content_history.edited = ჩასწორებულია
 issues.content_history.created = შეიქმნა
-issues.content_history.options = მორგება
 compare.compare_base = ბაზა
 compare.compare_head = შედარება
 pulls.has_viewed_file = ნანახია
@@ -440,11 +420,9 @@ pulls.tab_commits = კომიტები
 pulls.merged = შერწყმულია
 pulls.status_checks_requested = აუცილებელია
 pulls.status_checks_details = დეტალები
-pulls.cmd_instruction_checkout_title = გამოთხოვა
 pulls.cmd_instruction_merge_title = შერწყმა
 pulls.made_using_agit = AGit
 pulls.editable = ჩასწორებადი
-pull.deleted_branch = (წაშლილია):%s
 milestones.open = გახსნა
 milestones.close = დახურვა
 milestones.title = სათაური
@@ -455,15 +433,12 @@ milestones.filter_sort.name = სახელი
 wiki = ვიკი
 wiki.page = გვერდი
 wiki.new_page = გვერდი
-wiki.cancel = გაუქმება
 wiki.edit_page_button = ჩასწორება
 wiki.pages = გვერდები
-activity = აქტივობა
 activity.navbar.pulse = უახლესი აქტივობები
 activity.navbar.contributors = მოხალისეები
 activity.period.filter_label = პერიოდი:
 activity.overview = გადახედვა
-activity.merged_prs_label = შერწყმულია
 activity.opened_prs_label = შეთავაზებულია
 activity.closed_issue_label = დახურულია
 activity.new_issue_label = ღიაა
@@ -484,30 +459,21 @@ settings.collaboration.read = წაკითხვა
 settings.collaboration.owner = მფლობელი
 settings.collaboration.undefined = აღუწერელი
 settings.hooks = ვებჰუკები
-settings.mirror_settings.direction = მიმართულება
-settings.mirror_settings.direction.pull = მიღება
 settings.mirror_settings.direction.push = გაგზავნა
 settings.mirror_settings.push_mirror.none_ssh = არცერთი
 settings.units.units = ერთეულები
 settings.units.overview = გადახედვა
 settings.site = ვებგვერდი
-settings.tracker_issue_style.numeric = რიცხვითი
 settings.tracker_issue_style.alphanumeric = ალფარიცხვითი
 settings.admin_indexer_unindexed = არადაინდექსებული
 settings.trust_model.collaborator = თანამონაწილე
 settings.trust_model.committer = გადამცემი
-settings.trust_model.collaboratorcommitter = თანამონაწილე+გადამცემი
-settings.delete_collaborator = წაშლა
 settings.teams = გუნდები
-settings.webhook.request = მოთხოვნა
-settings.webhook.response = გამოხმაურება
 settings.webhook.headers = თავსართები
-settings.webhook.payload = შემცველობა
 settings.webhook.body = სხეული
 settings.secret = საიდუმლო
 settings.slack_username = მომხმარებლის სახელი
 settings.slack_color = ფერი
-settings.discord_username = მომხმარებლის სახელი
 settings.event_create = შექმნა
 settings.event_delete = წაშლა
 settings.event_fork = ფორკი
@@ -515,16 +481,14 @@ settings.event_wiki = ვიკი
 settings.event_release = რელიზი
 settings.event_push = გაგზავნა
 settings.event_repository = რეპოზიტორია
-settings.event_issues = ცვლილება
+settings.webhook.response = გამოხმაურება
 settings.event_issue_assign = მინიჭება
 settings.event_issue_label = ჭდეები
-settings.event_issue_milestone = მისაღწევი გეგმები
 settings.event_issue_comment = კომენტარები
 settings.event_pull_request = ცვლილება
 settings.event_pull_request_assign = მინიჭება
 settings.event_pull_request_label = ჭდეები
 settings.event_pull_request_milestone = მისაღწევი გეგმები
-settings.event_pull_request_comment = კომენტარები
 settings.event_pull_request_review = გადახედვები
 settings.event_pull_request_sync = სინქრონიზებულია
 settings.event_pull_request_enforcement = ფორსირება
@@ -539,35 +503,25 @@ settings.web_hook_name_gogs = Gogs
 settings.web_hook_name_slack = Slack
 settings.web_hook_name_discord = Discord
 settings.web_hook_name_dingtalk = DingTalk
-settings.web_hook_name_telegram = Telegram
 settings.web_hook_name_matrix = Matrix
 settings.web_hook_name_feishu_only = Feishu
 settings.web_hook_name_packagist = Packagist
 settings.sourcehut_builds.secrets = საიდუმლოები
 settings.title = სათაური
-settings.deploy_key_content = შემცველობა
 settings.branches = ბრენჩები
-settings.protect_status_check_matched = დამთხვეული
 settings.protect_patterns = ნიმუშები
-settings.edit_protected_branch = ჩასწორება
 settings.tags = ჭდეები
-settings.tags.protection.allowed = დაშვებულია
-settings.lfs = LFS
-settings.lfs_locks = დაბლოკვა
 settings.lfs_lock = ჩაკეტვა
 settings.lfs_pointers.oid = OID
 diff.parent = მშობელი
 diff.commit = კომიტი
 diff.git-notes = შენიშვნები
-diff.whitespace_button = ჰარე
 diff.bin = BIN
-diff.file_before = მანამდე
 diff.file_after = შემდეგ
 diff.file_image_width = სიგანე
 diff.file_image_height = სიმაღლე
 diff.file_byte_size = ზომა
 diff.generated = გენერირებულია
-diff.vendored = გარედან შემოტანილია
 diff.comment.reply = პასუხი
 diff.review.comment = კომენტარი
 diff.review.approve = დადასტურება
@@ -575,22 +529,68 @@ diff.protected = დაცულია
 diff.image.swipe = გაუსვით
 diff.image.overlay = ზემოდან დადება
 release.releases = რელიზები
-release.tags = ჭდეები
 release.draft = მონახაზი
 release.prerelease = პრე-რელიზი
 release.stable = სტაბილური
 release.compare = შედარება
-release.edit = ჩასწორება
 release.target = სამიზნე
 release.cancel = გაუქმება
 release.downloads = გადმოწერები
-release.type_attachment = მიმაგრებული ფაილი
 branch.delete_head = წაშლა
 branch.included = ჩასმულია
+commit.cherry-pick = ზუსტი არჩევა
+issues.deleted_milestone = `(წაშლილია)`
+issues.content_history.options = მორგება
+settings.mirror_settings.direction = მიმართულება
+settings.tracker_issue_style.numeric = რიცხვითი
+settings.delete_collaborator = წაშლა
+release.tags = ჭდეები
+unwatch = თვალყურის დევნების გაუქმება
+tree = ხე
+issues.context.edit = ჩასწორება
+wiki.cancel = გაუქმება
+settings.event_issue_milestone = მისაღწევი გეგმები
+diff.file_before = მანამდე
+commit.operations = ოპერაციები
+issues.label_edit = ჩასწორება
+issues.unlock_confirm = ჩაკეტვის გაუქმება
+issues.dependency.blocks_short = ბლოკები
+pulls.cmd_instruction_checkout_title = გამოთხოვა
+pull.deleted_branch = (წაშლილია):%s
+desc.private = პირადი
+desc.archived = დაარქივებული
+watch = თვალყურის დევნება
+project = პროექტები
+milestones = მისაღწევი გეგმები
+file_permalink = მუდმივი ბმული
+projects.template.desc = ნიმუში
+issues.filter_assignee = მიმნიჭებელი
+issues.reopen_issue = თავიდან გახსნა
+issues.save = შენახვა
+activity = აქტივობა
+settings.mirror_settings.direction.pull = მიღება
+settings.trust_model.collaboratorcommitter = თანამონაწილე+გადამცემი
+settings.webhook.request = მოთხოვნა
+settings.discord_username = მომხმარებლის სახელი
+settings.event_issues = ცვლილება
+settings.web_hook_name_telegram = Telegram
+settings.protect_status_check_matched = დამთხვეული
+settings.edit_protected_branch = ჩასწორება
+settings.tags.protection.allowed = დაშვებულია
+diff.whitespace_button = ჰარე
+diff.vendored = გარედან შემოტანილია
+release.edit = ჩასწორება
+release.type_attachment = მიმაგრებული ფაილი
 topic.done = დასრულება
-
-[graphs]
-contributors.what = მოხალისეები
+migrate_items_milestones = მისაღწევი გეგმები
+issues.subscribe = გამოწერა
+issues.review.outdated = ვადაგადაცილებული
+activity.merged_prs_label = შერწყმულია
+settings.webhook.payload = შემცველობა
+settings.event_pull_request_comment = კომენტარები
+settings.deploy_key_content = შემცველობა
+settings.lfs = LFS
+settings.lfs_locks = დაბლოკვა
 
 [org]
 members = წევრები
@@ -599,29 +599,29 @@ code = კოდი
 lower_members = წევრები
 lower_repositories = რეპოზიტორიები
 org_desc = აღწერა
-team_desc = აღწერა
-team_permission_desc = წვდომა
 team_unit_disabled = (გათიშულია)
 settings = მორგება
 settings.options = ორგანიზაცია
 settings.website = ვებგვერდი
-settings.location = მდებარეობა
 settings.permission = წვდომები
 settings.visibility = ხილვადობა
 settings.visibility.public = საჯარო
 settings.visibility.limited_shortname = შეზღუდული
 settings.visibility.private_shortname = პირადი
 members.public = ხილული
-members.private = დამალული
 members.owner = მფლობელი
 members.member = წევრი
 members.remove = წაშლა
 members.leave = გასვლა
 teams.join = შეერთება
-teams.leave = გასვლა
 teams.read_access = წაკითხვა
 teams.write_access = ჩაწერა
 teams.settings = მორგება
+team_desc = აღწერა
+members.private = დამალული
+team_permission_desc = წვდომა
+settings.location = მდებარეობა
+teams.leave = გასვლა
 
 [admin]
 dashboard = სამუშაო მაგიდა
@@ -636,7 +636,6 @@ monitor = მონიტორინგი
 first_page = პირველი
 last_page = ბოლო
 dashboard.statistic = შეჯამება
-dashboard.operation_switch = გადართვა
 dashboard.operation_run = გაშვება
 users.name = მომხმარებლის სახელი
 users.activated = გააქტიურებულია
@@ -650,10 +649,8 @@ users.repos = რეპოები
 users.created = შეიქმნა
 users.edit = ჩასწორება
 users.local = ლოკალური
-users.list_status_filter.menu_text = ფილტრი
 users.list_status_filter.reset = ჩამოყრა
 users.list_status_filter.is_active = აქტიურია
-users.list_status_filter.not_active = არააქტიურია
 users.list_status_filter.is_admin = ადმინი
 users.list_status_filter.is_restricted = შეზღუდული
 emails.primary = ძირითადი
@@ -662,20 +659,17 @@ emails.filter_sort.email = ელფოსტა
 emails.filter_sort.name = მომხმარებლის სახელი
 orgs.name = სახელი
 orgs.teams = გუნდები
-orgs.members = წევრები
 repos.owner = მფლობელი
 repos.name = სახელი
 repos.private = პირადი
 repos.issues = პრობლემები
 repos.size = ზომა
 packages.owner = მფლობელი
-packages.creator = შემქმნელი
 packages.name = სახელი
 packages.version = ვერსია
 packages.type = ტიპი
 packages.repository = რეპოზიტორია
 packages.size = ზომა
-packages.published = გამოქვეყნებულია
 auths.name = სახელი
 auths.type = ტიპი
 auths.enabled = ჩართულია
@@ -695,12 +689,10 @@ config.db_user = მომხმარებლის სახელი
 config.db_schema = სქემა
 config.db_ssl_mode = SSL
 config.db_path = ბილიკი
-config.mailer_enabled = ჩართულია
 config.mailer_name = სახელი
 config.mailer_protocol = პროტოკოლი
 config.mailer_user = მომხმარებელი
 config.mailer_use_dummy = სულელი
-config.send_test_mail_submit = გაგზავნა
 config.oauth_enabled = ჩართულია
 config.disabled_logger = გამორთულია
 monitor.stats = სტატისტიკა
@@ -720,16 +712,24 @@ notices.type_1 = რეპოზიტორია
 notices.type_2 = ამოცანა
 notices.desc = აღწერა
 notices.op = ოპ.
+users.list_status_filter.menu_text = ფილტრი
+users.list_status_filter.not_active = არააქტიურია
+config.send_test_mail_submit = გაგზავნა
+packages.creator = შემქმნელი
+dashboard.operation_switch = გადართვა
+orgs.members = წევრები
+packages.published = გამოქვეყნებულია
+config.mailer_enabled = ჩართულია
 
 [action]
-compare_branch = შედარება
 review_dismissed_reason = მიზეზი:
+compare_branch = შედარება
 
 [tool]
 now = ახლა
-future = მომავალში
 raw_seconds = წამი
 raw_minutes = წუთი
+future = მომავალში
 
 [munits.data]
 b = ბ
@@ -742,10 +742,10 @@ eib = ეიბ
 
 [notification]
 notifications = გაფრთხილებები
-unread = წაკითხულობის გაუქმება
 read = წაკითხვა
 subscriptions = გამოწერები
 watching = უყურებთ
+unread = წაკითხულობის გაუქმება
 
 [units]
 unit = ერთეული
@@ -770,21 +770,17 @@ dependency.version = ვერსია
 alpine.repository.branches = ბრენჩები
 alpine.repository.repositories = რეპოზიტორიები
 alpine.repository.architectures = არქიტექტურები
-arch.version.description = აღწერა
 arch.version.provides = მოგაწვდით
-arch.version.groups = ჯგუფი
 arch.version.depends = დამოკიდებულია
 arch.version.conflicts = კონფლიქტშია
 arch.version.replaces = ანაცვლებს
 arch.version.backup = მარქაფი
-composer.dependencies = დამოკიდებულებები
 conan.details.repository = რეპოზიტორია
 container.images.title = ასლის ფაილები
 container.details.platform = პლატფორმა
 container.digest = დაიჯესტი
 container.labels = ჭდეები
 container.labels.key = გასაღები
-container.labels.value = მნიშვნელობა
 debian.repository.distributions = დისტრიბუტივები
 debian.repository.components = კომპონენტები
 debian.repository.architectures = არქიტექტურები
@@ -793,6 +789,10 @@ npm.details.tag = ჭდე
 rpm.repository.architectures = არქიტექტურები
 alt.repository.architectures = არქიტექტურები
 owner.settings.cleanuprules.enabled = ჩართულია
+arch.version.description = აღწერა
+arch.version.groups = ჯგუფი
+composer.dependencies = დამოკიდებულებები
+container.labels.value = მნიშვნელობა
 
 [secrets]
 secrets = საიდუმლოები
@@ -810,7 +810,6 @@ status.blocked = დაბლოკილია
 runners = გამსვებები
 runners.status = სტატუსი
 runners.id = ID
-runners.name = სახელი
 runners.owner_type = ტიპი
 runners.description = აღწერა
 runners.labels = ჭდეები
@@ -830,7 +829,11 @@ runs.workflow = შრომის პროცესი
 runs.actor = ავტორი
 runs.status = სტატუსი
 variables = ცვლადები
+runners.name = სახელი
 
 [git.filemode]
 directory = საქაღალდე
 submodule = ქვემოდული
+
+[graphs]
+contributors.what = მოხალისეები
\ No newline at end of file
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
index fe8ba8e13a..8e8d9b1d6b 100644
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@@ -312,7 +312,7 @@ default_allow_create_organization=조직 생성 허용을 기본값으로 설정
 default_allow_create_organization.description=신규 사용자에게 기본적으로 조직 생성 권한을 부여합니다. 이 옵션이 꺼져있다면, 관리자가 신규 사용자에게 조직 생성 권한을 부여해야합니다.
 default_enable_timetracking=시간 기록 기능을 기본적으로 사용
 default_enable_timetracking.description=신규 저장소가 시간기록 기능을 기본적으로 사용할 수 있습니다.
-no_reply_address=가려진 이메일 도메인
+no_reply_address=숨겨진 이메일 도메인
 no_reply_address_helper=이메일을 가린 사용자에게 적용될 이메일 도메인입니다. 예를 들어, 사용자명 'joe'가 도메인'noreply.example.org'로 이메일을 가리면 Git에 'joe@noreply.example.org'로 로그인 하게 됩니다.
 db_schema_helper = 데이터베이스 기본값 ("공개")를 사용하려면 빈 칸으로 두세요.
 require_db_desc = Forgejo를 사용하려면 MySQL, PostgreSQL, SQLite3 또는 TiDB (MySQL 프로토콜) 이 설치되어 있어야 합니다.
@@ -330,6 +330,12 @@ app_slogan_helper = 인스턴스의 슬로건을 입력하세요. 비워두면 
 reinstall_confirm_check_1 = app.ini의 SECRET_KEY로 암호화 되어있는 데이터를 잃을 수 있습니다: 2FA/OTP를 통해 로그인 할 수 없으며 & 미러가 제대로 작동하지 않게됩니다. app.ini 파일에 정확한 SECRET_KEY가 있는것이 확실하다면 체크하세요.
 run_user_helper = Forgejo를 구동하는 운영체제의 사용자명입니다. 이 사용자는 저장소 루트 경로에 접근권한이 있어야 합니다.
 reinstall_confirm_check_2 = 저장소와 설정에 재동기화가 요구될 수 있습니다. 이 박스에 체크하면 저장소의 훅과 authorized_key 들을 수동으로 재동기화해야 한다는 것을 인지한다는 것을 의미합니다. 저장소와 미러의 설정이 올바른지 확인하세요.
+password_algorithm = 암호 해시 알고리즘
+enable_update_checker = 업데이트 확인 활성화
+secret_key_failed = 비밀 키 생성 실패: %v
+env_config_keys = 환경 설정
+invalid_password_algorithm = 올바르지 않은 암호 해시 알고리즘
+invalid_db_table = 데이터베이스 테이블 "%s"이(가) 올바르지 않습니다: %v
 
 [home]
 uname_holder=사용자명 또는 이메일 주소
@@ -347,6 +353,8 @@ search_repos=저장소 찾기..
 show_private=비공개
 
 issues.in_your_repos=당신의 저장소에
+feed_of = "%s"의 피드
+filter = 다른 필터
 
 [explore]
 repos=저장소
@@ -376,7 +384,7 @@ allow_password_change=사용자에게 비밀번호 변경을 요청 (권장됨)
 reset_password_mail_sent_prompt=확인 메일이 <b>%s</b>로 전송되었습니다. 받은 편지함으로 도착한 메일을 %s 안에 확인해서 비밀번호 찾기 절차를 완료하십시오.
 active_your_account=계정 활성화
 account_activated=계정이 활성화 되었습니다
-prohibit_login = 
+prohibit_login =
 resent_limit_prompt=활성화를 위한 이메일을 이미 전송했습니다. 3분 내로 이메일을 받지 못한 경우 재시도해주세요.
 has_unconfirmed_mail=안녕하세요 %s, 이메일 주소(<b>%s</b>)가 확인되지 않았습니다. 확인 메일을 받으시지 못하겼거나 새로운 확인 메일이 필요하다면, 아래 버튼을 클릭해 재발송하실 수 있습니다.
 resend_mail=여기를 눌러 확인 메일 재전송
@@ -580,8 +588,8 @@ password_change_disabled=로컬 유저가 아닌 경우 Forgejo 웹 인터페이
 
 emails=이메일 주소
 manage_emails=이메일 주소 관리
-manage_themes=기본 테마 선택
-manage_openid=OpenID 주소 관리
+manage_themes=기본 테마
+manage_openid=OpenID 주소
 theme_desc=이 테마가 사이트 전체 기본 테마가 됩니다.
 primary=대표
 activated=활성화됨
@@ -935,7 +943,7 @@ issues.close_comment_issue=클로즈 및 코멘트
 issues.reopen_issue=다시 열기
 issues.reopen_comment_issue=다시 오픈 및 코멘트
 issues.create_comment=코멘트
-issues.commit_ref_at=` 커밋 <a id="%[1]s" href="#%[1]s">%[2]s</a>에서 이 이슈 언급`
+issues.commit_ref_at=` 커밋 %s에서 이 이슈 언급`
 issues.role.owner=소유자
 issues.role.member=멤버
 issues.sign_in_require_desc=<a href="%s">로그인</a>하여 이 대화에 참여하세요.
@@ -1370,7 +1378,7 @@ issues.closed_by_fake = %[2]s님이 %[1]s에 닫음
 issues.new.closed_projects = 닫힌 프로젝트
 pulls.merged_by_fake = %[2]s님이 %[1]s 병합함
 issues.closed_by = <a href="%[2]s">%[3]s</a>님이 %[1]s에 닫음
-issues.closed_at = `<a id="%[1]s" href="#%[1]s">%[2]s</a>`에 이 이슈를 닫음
+issues.closed_at = `%s`에 이 이슈를 닫음
 issues.filter_milestone_closed = 닫힌 마일스톤
 issues.opened_by_fake = %[2]s님이 %[1]s에 열음
 issues.filter_project_none = 프로젝트 없음
@@ -1892,9 +1900,9 @@ runs.commit=커밋
 
 [search]
 code_search_by_git_grep = 현재 코드 검색 결과는 "git grep"에 의해 제공됩니다.관리자가 코드 인덱서를 활성화하면 더 나은 결과가 제공될 수 있습니다.
-branch_kind = 브랜치 검색...
+branch_kind = 브랜치 검색…
 keyword_search_unavailable = 지금은 키워드로 검색이 지원되지 않습니다. 사이트 관리자에게 문의하십시오.
-commit_kind = 커밋 검색...
+commit_kind = 커밋 검색…
 no_results = 일치하는 결과를 찾을 수 없습니다.
 search = 검색…
 type_tooltip = 검색 타입
@@ -1902,11 +1910,11 @@ fuzzy_tooltip = 검색어와 밀접하게 일치하는 결과도 포함
 repo_kind = 저장소 검색…
 user_kind = 사용자 검색…
 org_kind = 조직 검색…
-team_kind = 팀 검색...
-code_kind = 코드 검색...
+team_kind = 팀 검색…
+code_kind = 코드 검색…
 code_search_unavailable = 코드 검색은 현재 허용되지 않았습니다. 사이트 관리자와 연락하세요.
-package_kind = 패키지 검색...
-project_kind = 프로젝트 검색...
+package_kind = 패키지 검색…
+project_kind = 프로젝트 검색…
 exact_tooltip = 검색어와 정확하게 일치하는 결과만 포함
 issue_kind = 이슈 검색…
 pull_kind = 풀 검색…
diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini
index 868e5bff6e..9d1c938379 100644
--- a/options/locale/locale_lt.ini
+++ b/options/locale/locale_lt.ini
@@ -149,24 +149,24 @@ fuzzy = Tikslintinas
 union_tooltip = Įtraukti rezultatus, atitinkančius bet kurį iš matomą tarpą atskirtų raktažodžių
 exact = Tiksliai
 exact_tooltip = Įtraukti tik tuos rezultatus, kurie atitinka tikslią paieškos frazę
-user_kind = Ieškoti naudotojų...
-team_kind = Ieškoti komandų...
-code_kind = Ieškoti kodo...
+user_kind = Ieškoti naudotojų…
+team_kind = Ieškoti komandų…
+code_kind = Ieškoti kodo…
 fuzzy_tooltip = Įtraukti rezultatus, kurie taip pat labai atitinka paieškos terminą
-repo_kind = Ieškoti saugyklų...
+repo_kind = Ieškoti saugyklų…
 code_search_unavailable = Kodų paieška šiuo metu nepasiekiama. Kreipkis į svetainės administratorių.
-org_kind = Ieškoti organizacijų...
+org_kind = Ieškoti organizacijų…
 union = Bendrinis
 code_search_by_git_grep = Dabartiniai kodo paieškos rezultatai pateikiami atliekant „git grep“. Rezultatai gali būti geresni, jei svetainės administratorius įjungs kodo indeksuotoją.
-package_kind = Ieškoti paketų...
-project_kind = Ieškoti projektų...
-commit_kind = Ieškoti įsipareigojimų...
-runner_kind = Ieškoti vykdyklių...
+package_kind = Ieškoti paketų…
+project_kind = Ieškoti projektų…
+commit_kind = Ieškoti įsipareigojimų…
+runner_kind = Ieškoti vykdyklių…
 no_results = Nerasta atitinkamų rezultatų.
-issue_kind = Ieškoti problemų...
-branch_kind = Ieškoti šakų...
+issue_kind = Ieškoti problemų…
+branch_kind = Ieškoti šakų…
 milestone_kind = Ieškoti gairių...
-pull_kind = Ieškoti sujungimų...
+pull_kind = Ieškoti sujungimų…
 keyword_search_unavailable = Ieškoti pagal raktažodį šiuo metu nepasiekiamas. Susisiekite su svetainės administratoriumi.
 regexp = Reguliarusis reiškinys
 regexp_tooltip = Interpretuoti paieškos terminą kaip reguliariąją reiškinį
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 108463401c..868babacfb 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -162,7 +162,7 @@ filter.not_archived = Nav arhivētas
 filter.is_fork = Atzarojumi
 filter.not_fork = Nav atzarojumi
 filter.is_mirror = Spoguļglabātavas
-filter.public = Atklātas
+filter.public = Publiskas
 filter.private = Privātas
 filter.clear = Notīrīt atlasi
 confirm_delete_artifact = Vai tiešām izdzēst artefaktu '%s'?
@@ -374,9 +374,9 @@ show_only_archived=Attēlot tikai arhivētos
 show_only_unarchived=Attēlot tikai nearhivētos
 
 show_private=Privāts
-show_both_private_public=Rāda gan atklātās, gan privātās
+show_both_private_public=Rāda gan publiskās, gan privātās
 show_only_private=Attēlot tikai privātos
-show_only_public=Attēlo tikai atklātās
+show_only_public=Tiek rādītas tikai publiskās
 
 issues.in_your_repos=Manās glabātavās
 
@@ -690,7 +690,7 @@ email_domain_is_not_allowed = Lietotāja e-pasta adreses <b>%s</b> domēna vārd
 change_avatar=Mainīt profila attēlu…
 joined_on=Pievienojās %s
 repositories=Glabātavas
-activity=Atklāti notikumi
+activity=Publiskas darbības
 followers_few=%d sekotāji
 starred=Izlasei pievienotās glabātavas
 watched=Vērotās glabātavas
@@ -701,7 +701,7 @@ following_few=%d seko
 follow=Sekot
 unfollow=Pārtraukt sekot
 user_bio=Apraksts par sevi
-disabled_public_activity=Šis lietotājs ir atspējojis darbību redzamību visiem.
+disabled_public_activity=Šis lietotājs ir atspējojis darbību redzamību citiem.
 email_visibility.limited=E-pasta adrese ir redzama visiem autentificētajiem lietotājiem
 email_visibility.private=E-pasta adrese ir redzama tikai administratoriem
 show_on_map=Rādīt šo vietu kartē
@@ -749,7 +749,7 @@ organization=Apvienības
 uid=UID
 webauthn=Divpakāpju pieteikšanās (drošības atslēgas)
 
-public_profile=Visiem pieejamais profils
+public_profile=Publiskais profils
 biography_placeholder=Pastāsti citiem mazliet par sevi! (Tiek atbalstīts Markdown)
 location_placeholder=Kopīgot savu aptuveno atrašanās vietu ar citiem
 profile_desc=Par Tevi
@@ -940,8 +940,8 @@ access_token_deletion_confirm_action=Dzēst
 access_token_deletion_desc=Pilnvaras izdzēšana atsauks lietotņu, kas to izmanto, piekļuvi kontam. Šo darbību nevar atsaukt. Turpināt?
 delete_token_success=Pilnvara tika izdzēsta. Lietotnēm, kas to izmanto, vairs nav piekļuves kontam.
 repo_and_org_access=Glabātavas un apvienības piekļuve
-permissions_public_only=Tikai atklātās
-permissions_access_all=Visas (atklātās, privātās un ierobežotās)
+permissions_public_only=Tikai publiskās
+permissions_access_all=Visas (publiskās, privātās un ierobežotās)
 select_permissions=Atlasīt atļaujas
 permission_no_access=Nav piekļuves
 permission_read=Lasīt
@@ -1035,14 +1035,14 @@ email_notifications.submit=Iestatīt e-pasta iestatījumus
 email_notifications.andyourown=Un manus paziņojumus
 
 visibility=Lietotāja redzamība
-visibility.public=Atklāta
+visibility.public=Publiska
 visibility.public_tooltip=Redzams ikvienam
 visibility.limited=Ierobežota
 visibility.limited_tooltip=Redzams tikai lietotājiem, kuri ir pieteikušies
 visibility.private=Privāta
 visibility.private_tooltip=Redzams tikai apvienību, kurās pievienojies, dalībniekiem
 change_password = Mainīt paroli
-keep_activity_private.description = Tavas <a href="%s">atklātās darbības</a> būs redzamas tikai Tev un servera pārvaldītājiem.
+keep_activity_private.description = Tavas <a href="%s">publiskās darbības</a> būs redzamas tikai Tev un servera pārvaldītājiem.
 update_hints = Atjaunināt norādes
 update_hints_success = Norādes tika atjauninātas.
 user_block_success = Lietotājs tika sekmīgi liegts.
@@ -1083,12 +1083,13 @@ quota.applies_to_org = Uz apvienību attiecas zemāk esošās ierobežojuma kār
 quota.rule.no_limit = Neierobežots
 quota.sizes.all = Viss
 quota.sizes.repos.all = Glabātavas
-quota.sizes.repos.public = Atklātās glabātavas
+quota.sizes.repos.public = Publiskās glabātavas
 quota.sizes.repos.private = Privātās glabātavas
 regenerate_token = Izveidot no jauna
 access_token_regeneration = Izveidot piekļuves pilnvaru no jauna
 regenerate_token_success = Pilnvara tika izveidota no jauna. Lietotnēm, kas to izmanto, vairs nav piekļuve kontam, un tajās ir jāizmanto jaunā pilnvara.
 access_token_regeneration_desc = Pilnvaras izveidošana no jauna atsauks piekļuvi kontam lietotnēm, kuras to izmanto. Darbība ir neatgriezeniska. Turpināt?
+ssh_token_help_ssh_agent = vai, ja izmanto SSH aģentu (ar iestatītu mainīgo SSH_AUTH_SOCK):
 
 [repo]
 new_repo_helper=Glabātava satur visas projekta datnes, tajā skaitā izmaiņu vēsturi. Jau tiek izmantota kaut kur citur? <a href="%s">Pārcelt glabātavu</a>.
@@ -1152,7 +1153,7 @@ mirror_interval_invalid=Starplaiks starp spoguļošanu nav derīgs.
 mirror_sync_on_commit=Sinhronizēt, kad tiek aizgādāti iesūtījumi
 mirror_address=Klonēt no URL
 mirror_address_desc=Nepieciešamie pieslēgšanās dati jānorāda pilnvarošanas sadaļā.
-mirror_address_url_invalid=Norādītais URL ir nederīgs. Visas URL daļas ir jānorāda pareizi.
+mirror_address_url_invalid=Norādītais URL ir nederīgs. Jāpārliecinās, ka visas URL daļas ir pareizi norādītas.
 mirror_address_protocol_invalid=Norādītais URL ir nederīgs. Var spoguļot tikai no http(s):// vai git:// adresēm.
 mirror_lfs=Lielu datņu krātuve (LFS)
 mirror_lfs_desc=Aktivēt LFS datu spoguļošanu.
@@ -1195,7 +1196,7 @@ transfer.no_permission_to_accept=Nav atļaujas pieņemt šo nodošanu.
 transfer.no_permission_to_reject=Nav atļaujas noraidīt šo nodošanu.
 
 desc.private=Privāts
-desc.public=Atklāts
+desc.public=Publisks
 desc.template=Sagatave
 desc.internal=Iekšējs
 desc.archived=Arhivēts
@@ -1242,7 +1243,7 @@ migrate_items_releases=Laidienus
 migrate_repo=Pārcelt glabātavu
 migrate.clone_address=Pārcelt/klonēt no URL
 migrate.clone_address_desc=Esošas glabātavas HTTP(S) vai Git "clone" URL
-migrate.github_token_desc=Šeit var pievienot vienu vai vairākas ar komatiem atdalītas pilnvaras, lai pārcelšana būtu ātrāka, ja tā tiek ierobežota no GitHub API puses. Uzmanību: šīs iespējas ļaunprātīga izmantošana var pārkāpt pakalpojumu sniedzēja noteikumus un novest pie piekļuves liegšanas kontam.
+migrate.github_token_desc=Šeit var pievienot vienu vai vairākas ar komatiem atdalītas pilnvaras, lai padarītu pārcelšanu ātrāku ar GitHub API pieprasījumu biežuma ierobežojuma apiešanu. Uzmanību: šīs iespējas ļaunprātīga izmantošana var pārkāpt pakalpojumu sniedzēja noteikumus un var novest pie piekļuves liegšanas kontam/iem.
 migrate.clone_local_path=vai servera lokālais ceļš
 migrate.permission_denied=Nav ļauts ievietot vietējas glabātavas.
 migrate.permission_denied_blocked=Nav iespējams ievietot no neatļautiem saimniekdatoriem, lūgums vaicāt pārvaldītājam pārbaudīt ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS iestatījumus.
@@ -1464,7 +1465,7 @@ commit.cherry-pick-content=Atlasīt zaru, uz kuru izlasīt:
 commitstatus.error=Kļūda
 commitstatus.failure=Atteice
 commitstatus.pending=Nav iesūtīts
-commitstatus.success=Pabeigts
+commitstatus.success=Sekmīgs
 
 ext_issues=Ārēji pieteikumi
 ext_issues.desc=Saite uz ārējo problēmu sekotāju.
@@ -1515,7 +1516,7 @@ issues.filter_assignees=Atlasīt pēc atbildīgajiem
 issues.filter_milestones=Atlasīt pēc atskaites punkta
 issues.filter_projects=Atlasīt pēc projekta
 issues.filter_labels=Atlasīt pēc iezīmes
-issues.filter_reviewers=Atlasīt izskatītājus
+issues.filter_reviewers=Atlasīt pēc izskatītājiem
 issues.new=Jauns pieteikums
 issues.new.title_empty=Nosaukums nevar būt tukšs
 issues.new.labels=Iezīmes
@@ -1577,7 +1578,7 @@ issues.remove_ref_at=`noņēma atsauci no <b>%s</b> %s`
 issues.add_ref_at=`pievienoja atsauci uz <b>%s</b> %s`
 issues.delete_branch_at=`izdzēsa zaru <b>%s</b> %s`
 issues.filter_label=Iezīme
-issues.filter_label_exclude=`Jāizmanto <code>alt</code> + <code>klikšķis/Enter</code>, lai neiekļautu iezīmes`
+issues.filter_label_exclude=Jāizmanto <kbd>Alt</kbd> + <kbd>klikšķis</kbd>, lai neiekļautu iezīmes
 issues.filter_label_no_select=Visas iezīmes
 issues.filter_label_select_no_label=Bez iezīmes
 issues.filter_milestone=Atskaites punkts
@@ -1602,7 +1603,7 @@ issues.filter_type.review_requested=Pieprasīta izskatīšana
 issues.filter_type.reviewed_by_you=Manis izskatītie
 issues.filter_sort=Kārtot
 issues.filter_sort.latest=Jaunākie
-issues.filter_sort.oldest=Vecakie
+issues.filter_sort.oldest=Vecākie
 issues.filter_sort.recentupdate=Nesen atjauninātie
 issues.filter_sort.leastupdate=Vissenāk atjauninātie
 issues.filter_sort.mostcomment=Visvairāk piebilžu
@@ -1631,7 +1632,7 @@ issues.opened_by_fake=%[2]s atvēra %[1]s
 issues.closed_by_fake=%[2]s aizvēra %[1]s
 issues.previous=Iepriekšējā
 issues.next=Nākamā
-issues.open_title=Atvērti
+issues.open_title=Atvērts
 issues.closed_title=Aizvērts
 issues.draft_title=Melnraksts
 issues.num_comments_1=%d piebilde
@@ -1651,13 +1652,13 @@ issues.close_comment_issue=Aizvērt ar piebildi
 issues.reopen_issue=Atvērt atkārtoti
 issues.reopen_comment_issue=Atkārtoti atvērt ar piebildi
 issues.create_comment=Pievienot piebildi
-issues.closed_at=`aizvēra šo pieteikumu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`atkārtoti atvēra šo pieteikumu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`atsaucās uz šo pieteikumu iesūtījumā <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">atsaucās uz šo pieteikumu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">atsaucās uz šo izmaiņu pieprasījumu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">atsaucās uz šo pieteikumu izmaiņu pieprasījumā %[4]s, kas aizvērs to</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">atsaucās uz šo pieteikumu izmaiņu pieprasījumā %[4]s, kas atkārtoti atvērs to</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`aizvēra šo pieteikumu %s`
+issues.reopened_at=`atkārtoti atvēra šo pieteikumu %s`
+issues.commit_ref_at=`atsaucās uz šo pieteikumu iesūtījumā %s`
+issues.ref_issue_from=`<a href="%[2]s">atsaucās uz šo pieteikumu %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">atsaucās uz šo izmaiņu pieprasījumu %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">atsaucās uz šo pieteikumu izmaiņu pieprasījumā %[3]s, kas aizvērs to</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">atsaucās uz šo pieteikumu izmaiņu pieprasījumā %[3]s, kas atkārtoti atvērs to</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">aizvēra pieteikumu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">atkārtoti atvēra pieteikumu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`no %[1]s`
@@ -1693,7 +1694,7 @@ issues.label_archive_tooltip=Arhivētās iezīmes pēc noklusējuma netiek iekļ
 issues.label_exclusive_desc=Iezīme jānodēvē <code>tvērums/vienums</code>, lai padarītu to savstarpēji sevišķu ar citām <code>tvērums/</code> iezīmēm.
 issues.label_exclusive_warning=Jebkura nesaderīga tvēruma iezīme tiks noņemta, kad tiks labotas pieteikuma vai izmaiņu pieprasījuma iezīmes.
 issues.label_count=%d iezīmes
-issues.label_open_issues=%d atvērti pieteikumi/izmaiņu pieprasījumi
+issues.label_open_issues=%d atvērti pieteikumi / izmaiņu pieprasījumi
 issues.label_edit=Labot
 issues.label_delete=Izdzēst
 issues.label_modify=Labot iezīmi
@@ -1762,7 +1763,7 @@ issues.error_modifying_due_date=Neizdevās izmainīt izpildes termiņu.
 issues.error_removing_due_date=Neizdevās noņemt izpildes termiņu.
 issues.push_commit_1=pievienoja %d iesūtījumu %s
 issues.push_commits_n=pievienoja %d iesūtījumus %s
-issues.force_push_codes=`veica uzspiestu aizgādāšanu zarā %[1]s no <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> uz <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`veica uzspiestu aizgādāšanu zarā %[1]s no <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s uz <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Salīdzināt
 issues.due_date_form=dd.mm.gggg.
 issues.due_date_form_add=Pievienot izpildes termiņu
@@ -1964,8 +1965,8 @@ pulls.update_branch_success=Zara atjaunināšana bija sekmīga
 pulls.update_not_allowed=Nav ļauts atjaunināt zaru
 pulls.outdated_with_base_branch=Šis zars ir novecojis salīdzinājumā ar pamata zaru
 pulls.close=Aizvērt izmaiņu pieprasījumu
-pulls.closed_at=`aizvēra šo izmaiņu pieprasījumu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`atkārtoti atvēra šo izmaiņu pieprasījumu <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`aizvēra šo izmaiņu pieprasījumu %s`
+pulls.reopened_at=`atkārtoti atvēra šo izmaiņu pieprasījumu %s`
 pulls.cmd_instruction_hint=Apskatīt komandrindas izmantošanas norādes
 pulls.cmd_instruction_checkout_title=Paņemt
 pulls.cmd_instruction_checkout_desc=Projekta glabātavā jāizveido jauns zars un jāpārbauda izmaiņas.
@@ -2041,7 +2042,7 @@ ext_wiki=Ārēja vikivietne
 ext_wiki.desc=Ārējā vikivietne norāda uz ārējo vikivietnes adresi.
 
 wiki=Vikivietne
-wiki.welcome=Laipni lūdzam vikivietnē.
+wiki.welcome=Laipni lūdzam vikivietnē!
 wiki.welcome_desc=Vikivietne ļauj rakstīt un kopīgot dokumentāciju ar līdzdalībniekiem.
 wiki.desc=Dokumentācijas rakstīšana un kopīgošana ar līdzdalībniekiem.
 wiki.create_first_page=Izveidot pirmo lapu
@@ -2769,7 +2770,7 @@ no_eol.text = Nav EOL
 size_format = %[1]s: %[2]s; %[3]s: %[4]s
 mirror_public_key = Publiskā SSH atslēga
 mirror_use_ssh.text = Izmantot SSH autentificēšanos
-mirror_use_ssh.helper = Forgejo spoguļos glabātavu ar Git un SSH un izveidos atslēgu pāri, kad tiks atlasīta šī iespēja. Jānodrošina, ka izveidotais atslēgu pāris ir pilnvarots aizgādāt mērķa glabātavā. Nevarēs izmantot pilnvarošanu ar paroli, kad šis tiek atlasīts.
+mirror_use_ssh.helper = Forgejo spoguļos glabātavu ar Git un SSH un izveidos atslēgu pāri, kad tiks atlasīta šī iespēja. Jānodrošina, ka izveidotā publiskāš atslēga ir pilnvarota aizgādāt mērķa glabātavā. Nevarēs izmantot pilnvarošanu ar paroli, kad šis tiek atlasīts.
 mirror_use_ssh.not_available = SSH autentificēšanās nav pieejama.
 mirror_denied_combination = Nevar izmantot autentificēšanos ar publiskās atslēgas un paroles apvienojumu.
 migrate.forgejo.description = Pārcelt datus no codeberg.org vai citiem Fogejo serveriem.
@@ -2826,7 +2827,7 @@ issues.author.tooltip.pr = Šis lietotājs ir šī izmaiņu pieprasījuma izveid
 pulls.edit.already_changed = Neizdevās saglabāt izmaiņu pieprasījuma izmaiņas. Izskatās, ka saturu jau ir mainījis kāds cits lietotājs. Lūgums atsvaidzināt lapu un mēģināt labot vēlreiz, lai izvairītos no izmaiņu pārrakstīšanas
 pulls.blocked_by_user = Tu nevari izveidot izmaiņu pieprasījumu šajā glabātavā, jo tās īpašnieks ir Tevi liedzis.
 issues.all_title = Visi
-pulls.commit_ref_at = ` atsaucāš uz šo izmaiņu pieprasījumu iesūtījumā <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = ` atsaucās uz šo izmaiņu pieprasījumu iesūtījumā %s`
 issues.num_participants_one = %d dalībnieks
 pulls.title_desc_one = vēlas iekļaut %[1]d iesūtījumu no <code>%[2]s</code> <code id="%[4]s">%[3]s</code>
 issues.archived_label_description = (Arhivēts) %s
@@ -2907,6 +2908,20 @@ issues.reopen.blocked_by_user = Tu nevari atkārtoti atvērt šo pieteikumu, jo
 pulls.comment.blocked_by_user = Tu šim izmaiņu pieprasījumam nevari pievienot piebildi, jo tā izveidotājs vai glabātavas īpašnieks ir liedzis Tevi.
 issues.filter_no_results = Nav vienumu
 issues.filter_no_results_placeholder = Jāmēģina pielāgot meklēšanas atlasītāji.
+migrate.repo_desc_helper = Atstāt tukšu, lai ievietotu esošo aprakstu
+archive.nocomment = Piebilžu pievienošana nav iespējama, jo glabātava ir arhivēta.
+comment.blocked_by_user = Piebilžu pievienošana nav iespējama, jo glabātavas īpašnieks vai autors ir nolieguši Tevi.
+sync_fork.branch_behind_one = Šis zars ir %[1]d iesūtījumu aiz %[2]s
+sync_fork.button = Sinhronizēt
+sync_fork.branch_behind_few = Šis zars ir %[1]d iesūtījumus aiz %[2]s
+settings.event_action_failure = Kļūme
+settings.event_action_failure_desc = Darbības izpilde beidzās ar kļūmi.
+settings.event_header_action = Darbības izpildes notikumi
+settings.event_action_recover = Atgūt
+settings.event_action_recover_desc = Darbības izpilde bija sekmīga pēc kļūmes iepriekšējā darbības izpildē tajā pašā darbplūsmā.
+settings.event_action_success = Sekmīgi
+settings.event_action_success_desc = Darbības izpilde bija sekmīga.
+issues.filter_type.all_pull_requests = Visi izmaiņu pieprasījumi
 
 [graphs]
 component_loading=Ielādē %s…
@@ -2953,7 +2968,7 @@ settings.location=Atrašanās vieta
 settings.permission=Tiesības
 settings.repoadminchangeteam=Glabātavas pārvaldītājs var pievienot un noņemt komandu piekļuvi
 settings.visibility=Redzamība
-settings.visibility.public=Atklāta
+settings.visibility.public=Publiska
 settings.visibility.limited=Ierobežota (redzama tikai lietotājiem, kuri ir pieteikušies)
 settings.visibility.limited_shortname=Ierobežota
 settings.visibility.private=Privāta (redzama tikai apvienības dalībniekiem)
@@ -3588,7 +3603,7 @@ self_check.database_collation_mismatch = Sagaidīt, ka datubāzē tiek izmantota
 self_check.database_fix_mysql = MySQL/MariaDB lietotāji var izmantot komandu "forgejo doctor convert", lai novērstu salīdzināšanas sarežģījumus, vai arī tos var pašrocīgi novērst ar "ALTER ... COLLATE ..." vaicājumiem.
 config.app_slogan = Servera sauklis
 config.allow_dots_in_usernames = Ļaut lietotājiem izmantot punktus savā lietotājvārdā. Neietekmē esošos kontus.
-users.restricted.description = Ļaut mijiedarbību tikai ar glabātavām un apvienībām, kurās šis lietotājs ir pievienots kā līdzdalībnieks. Tas neļauj piekļūt šī servera atklātajām glabātavām.
+users.restricted.description = Ļaut mijiedarbību tikai ar glabātavām un apvienībām, kurās šis lietotājs ir pievienots kā līdzdalībnieks. Tas neļauj piekļūt šī servera publiskajām glabātavām.
 dashboard.sync_tag.started = Uzsākta birku sinhronizēšana
 users.organization_creation.description = Ļaut jaunu apvienību izveidošanu.
 users.block.description = Liegt šī lietotāja mijiedarbību ar šo serveri caur tā kontu un neļaut pieteikšanos.
@@ -3621,7 +3636,7 @@ auto_merge_pull_request=`automātiski iekļāva izmaiņu pieprasījumu <a href="
 transfer_repo=glabātavu <code>%s</code> nodeva <a href="%s">%s</a>
 push_tag=aizgādāja birku <a href="%[2]s">%[3]s</a> uz <a href="%[1]s">%[4]s</a>
 delete_tag=izdzēsa birku %[2]s no <a href="%[1]s">%[3]s</a>
-delete_branch=izdzēsa zaru %[2]s no <a href="%[1]s">%[3]s</a>
+delete_branch=izdzēsa zaru <code>%[2]s</code> no <a href="%[1]s">%[3]s</a>
 compare_branch=Salīdzināt
 compare_commits=Salīdzināt %d iesūtījumus
 compare_commits_general=Salīdzināt iesūtījumus
@@ -3702,7 +3717,7 @@ empty.repo=Šeit netiek parādīta augšupielādēta pakotne? Jādodas uz <a hre
 registry.documentation=Vairāk informācijas par %s reģistru ir <a target="_blank" rel="noopener noreferrer" href="%s">dokumentācijā</a>.
 filter.type=Veids
 filter.type.all=Visas
-filter.no_result=Pēc norādītajiem kritērijiem nekas netika atrasts.
+filter.no_result=Norādītajām atlasīšanas vērtībām nekas neatbilst.
 filter.container.tagged=Ar birku
 filter.container.untagged=Bez birkas
 published_by=Laida klajā <a href="%[2]s">%[3]s</a> %[1]s
@@ -3823,10 +3838,10 @@ owner.settings.cargo.rebuild.success=Cargo indekss tika sekmīgi pārbūvēts.
 owner.settings.cleanuprules.title=Notīrīšanas kārtulas
 owner.settings.cleanuprules.add=Pievienot notīrīšanas kārtulu
 owner.settings.cleanuprules.edit=Labot notīrīšanas kārtulu
-owner.settings.cleanuprules.none=Vēl nav pieejama neviena tīrīšanas kārtula.
-owner.settings.cleanuprules.preview=Attīrīšanas kārtulas priekšskatījums
+owner.settings.cleanuprules.none=Vēl nav pieejama neviena notīrīšanas kārtula.
+owner.settings.cleanuprules.preview=Notīrīšanas kārtulas priekšskatījums
 owner.settings.cleanuprules.preview.overview=Ir paredzēta %d pakotņu noņemšana.
-owner.settings.cleanuprules.preview.none=Attīrīšanas kārtulai neatbilst neviena pakotne.
+owner.settings.cleanuprules.preview.none=Notīrīšanas kārtulai neatbilst neviena pakotne.
 owner.settings.cleanuprules.enabled=Iespējots
 owner.settings.cleanuprules.pattern_full_match=Pielietot paraugu visam pakotnes nosaukumam
 owner.settings.cleanuprules.keep.title=Versijas, kas atbilst šīm kārtulām, tiks paturētas, pat ja tās atbildīs zemāk esošajai noņemšanas kārtulai.
@@ -3842,7 +3857,7 @@ owner.settings.cleanuprules.success.update=Notīrīšanas kārtula tika atjaunin
 owner.settings.cleanuprules.success.delete=Notīrīšanas kārtula tika izdzēsta.
 owner.settings.chef.title=Chef reģistrs
 owner.settings.chef.keypair=Izveidot atslēgu pāri
-owner.settings.chef.keypair.description=Atslēgu pāris ir nepieciešams, lai autentificētos Chef reģistrā. Ja iepriekš ir izveidots atslēgu pāris, jauna pāra izveidošana veco atslēgu pāri padarīs nederīgu.
+owner.settings.chef.keypair.description=Pieprasījumiem, kuri tiek nosūtīti Chef reģistram, jābūt kriptogrāfiski parakstītam, kas ir autentificēšanās līdzeklis. Kad tiek izveidots atslēgu pāris, Forgejo tiek glabāta tikai publiskā atslēga. Privātā atslēga tiek sniegta, lai to izmantotu ar komandrindas rīku knife. Jauna atslēgu pāra izveidošana aizvietos iepriekšējo.
 arch.version.properties = Versijas īpašības
 arch.pacman.helper.gpg = Jāpievieno uzticēšanās sertifikāts pacman:
 arch.pacman.repo.multi = %s ir tāda pati versija dažādās distribūcijās.
@@ -3919,7 +3934,7 @@ runners.task_list.run=Izpildījums
 runners.task_list.status=Stāvoklis
 runners.task_list.repository=Glabātava
 runners.task_list.commit=Iesūtījums
-runners.task_list.done_at=Beigu laiks
+runners.task_list.done_at=Pabeigts
 runners.edit_runner=Labot izpildītāju
 runners.update_runner=Atjaunināt izmaiņas
 runners.update_runner_success=Izpildītājs sekmīgi atjaunināts
diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini
index fcc9888d8e..c4c266ad86 100644
--- a/options/locale/locale_ml-IN.ini
+++ b/options/locale/locale_ml-IN.ini
@@ -356,7 +356,7 @@ avatar=അവതാര്‍
 ssh_gpg_keys=SSH / GPG കീകള്‍
 social=സോഷ്യൽ അക്കൗണ്ടുകൾ
 applications=അപ്ലിക്കേഷനുകൾ
-orgs=സംഘടനകളെ നിയന്ത്രിക്കുക
+orgs=സംഘടനകൾ
 repos=കലവറകള്‍
 delete=അക്കൗണ്ട് ഇല്ലാതാക്കുക
 twofa=ഇരട്ട ഘടക പ്രാമാണീകരണം
@@ -400,8 +400,8 @@ password_change_disabled=പ്രാദേശിക ഇതര ഉപയോക
 
 emails=ഇ-മെയില്‍ വിലാസങ്ങള്‍
 manage_emails=ഇമെയിൽ വിലാസങ്ങൾ നിയന്ത്രിക്കുക
-manage_themes=സ്ഥിരസ്ഥിതി പ്രമേയം തിരഞ്ഞെടുക്കുക
-manage_openid=ഓപ്പൺഐഡി വിലാസങ്ങൾ നിയന്ത്രിക്കുക
+manage_themes=ഡിഫോൾട്ട് തീം
+manage_openid=OpenID വിലാസങ്ങൾ
 email_desc=അറിയിപ്പുകൾക്കും മറ്റ് പ്രവർത്തനങ്ങൾക്കുമായി നിങ്ങളുടെ പ്രാഥമിക ഇമെയിൽ വിലാസം ഉപയോഗിക്കും.
 theme_desc=സൈറ്റിലുടനീളം ഇത് നിങ്ങളുടെ സ്ഥിരസ്ഥിതി പ്രമേയം ആയിരിക്കും.
 primary=പ്രാഥമികം
diff --git a/options/locale/locale_nb_NO.ini b/options/locale/locale_nb_NO.ini
index 2c8b5cfc64..59673fd4e3 100644
--- a/options/locale/locale_nb_NO.ini
+++ b/options/locale/locale_nb_NO.ini
@@ -60,7 +60,7 @@ rerun = Kjør på nytt
 rerun_all = Kjør alle jobber på nytt
 save = Lagre
 cancel = Avbryt
-forks = Forks
+forks = Kopier
 milestones = Milepæler
 ok = OK
 test = Test
@@ -133,14 +133,42 @@ webauthn_error_duplicated = Sikkerhetsnøkkelen er ikke tillatt for denne foresp
 webauthn_error_timeout = Et tidsavbrudd oppsto før nøkkelen din kunne leses. Vennligst last inn siden på nytt og prøv igjen.
 new_fork = Ny fork av repository
 collaborative = Samarbeidende
+error413 = Du har brukt opp kvoten din.
+issues = Saker
+unpin = Løsne
+filter.is_fork = Forks
+filter.not_fork = Ikke forks
+pull_requests = Pull requests
+copy_branch = Kopier branch navn
+error404 = Siden du forsøker å nå <strong>eksisterer ikke</strong>, <strong>er blitt fjernet</strong> eller <strong>du har ikke tilgang til å se den</strong>.
+tracked_time_summary = Oppsummering av sporet tid basert på problemfiltre
 
 [search]
-search = Søk...
+search = Søk…
 type_tooltip = Søketype
 fuzzy = Fuzzy
 union = Union
 regexp = RegExp
 exact = Nøyaktig
+team_kind = Søk i teams…
+code_kind = Søk i kode…
+package_kind = Søk i pakker…
+project_kind = Søk i prosjekter…
+branch_kind = Søk i brancher…
+commit_kind = Søk i commits…
+regexp_tooltip = Tolk søkeordet som et regulæruttrykk
+pull_kind = Søk i pulls…
+keyword_search_unavailable = Søk etter nøkkelord er for øyeblikket ikke tilgjengelig. Kontakt administratoren.
+exact_tooltip = Inkluder kun resultater som samsvarer nøyaktig med søkeordet
+repo_kind = Søk i repositorer…
+fuzzy_tooltip = Inkluder resultater som også stemmer godt overens med søketermen
+org_kind = Søk i organisasjoner…
+issue_kind = Søk i saker…
+runner_kind = Søk i runners…
+no_results = Ingen treff funnet.
+union_tooltip = Inkluder resultater som samsvarer med ett eller flere av nøkkelordene adskilt med mellomrom
+code_search_unavailable = Kodesøk er ikke tilgjengelig. Kontakt administratoren.
+user_kind = Søk i brukere…
 
 [auth]
 verify = Bekreft
@@ -152,4 +180,88 @@ oauth_signup_title = Fullfør ny konto
 oauth_signup_submit = Fullfør konto
 
 [home]
-uname_holder = Brukernavn eller e-postadresse
\ No newline at end of file
+uname_holder = Brukernavn eller e-postadresse
+
+[heatmap]
+contributions_zero = Ingen bidrag
+number_of_contributions_in_the_last_12_months = %s bidrag de siste 12 månedene
+contributions_one = bidrag
+contributions_format = {contributions} den {day} {month} {year}
+less = Mindre
+contributions_few = bidrag
+more = Mer
+
+[editor]
+buttons.heading.tooltip = Legg til overskrift
+buttons.bold.tooltip = Legg til uthevet tekst
+buttons.italic.tooltip = Legg til kursiv text
+buttons.list.unordered.tooltip = Legg til punktliste
+buttons.list.ordered.tooltip = Legg til nummerert liste
+buttons.link.tooltip = Legg til link
+buttons.quote.tooltip = Siter tekst
+buttons.mention.tooltip = Nevn en bruker eller team
+buttons.list.task.tooltip = Legg til liste over saker
+buttons.code.tooltip = Legg til kode
+table_modal.header = Legg til tabell
+table_modal.placeholder.header = Overskrift
+table_modal.placeholder.content = Innhold
+table_modal.label.columns = Kolonner
+buttons.new_table.tooltip = Legg til tabell
+table_modal.label.rows = Rader
+buttons.switch_to_legacy.tooltip = Bruk den gamle editoren istedenfor
+buttons.disable_monospace_font = Deaktiver monospace font
+buttons.ref.tooltip = Referanse til en sak eller pull request
+buttons.indent.tooltip = Grupper elementene med et nivå
+buttons.unindent.tooltip = Pakk ut elementene med et nivå
+link_modal.url = Url
+link_modal.description = Beskrivelse
+link_modal.header = Legg til en link
+buttons.enable_monospace_font = Aktiver monospace font
+link_modal.paste_reminder = Tips: Når du har en URL i utklippstavlen kan du lime den direkte inn i editoren for å lage en lenke.
+
+[aria]
+footer = Bunntekst
+navbar = Navigasjonslinje
+footer.links = Linker
+footer.software = Om dette programmet
+
+[filter]
+string.asc = A - Z
+string.desc = Z - A
+
+[error]
+occurred = En feil oppstod
+not_found = Kunne ikke finne målet.
+report_message = Hvis du mener dette er en feil i Forgejo kan du søke på <a href="%s" target="_blank">Codeberg</a> eller åpne en ny sak.
+network_error = Nettverks feil
+server_internal = Intern server feil
+
+[install]
+docker_helper = Dersom du bruker Forgejo med Docker, anbefales det å lese <a target="_blank" rel="noopener noreferrer" href="%s">dokumentasjonen</a> før du gjør endringer i konfigurasjonen.
+db_title = Database innstillinger
+require_db_desc = Forgejo krever MySQL, PostgreSQL, SQLite3 eller TiDB (MySQL protokoll).
+db_type = Database type
+password = Passord
+user = Brukernavn
+install = Installasjon
+title = Førstegangsoppsett
+host = Server
+db_name = Database navn
+db_schema = Skjema
+db_schema_helper = La stå tomt for databasens standardverdi ("public").
+ssl_mode = SSL
+path = Sti
+sqlite_helper = Sti til SQLite3-databasen.<br>Bruk absolutt filsti dersom Forgejo kjøres som en tjeneste.
+reinstall_error = Du prøver å installere i en eksisterende Forgejo-database
+reinstall_confirm_message = Å installere på nytt med en eksisterende Forgejo-database kan føre til problemer. I de fleste tilfeller bør du bruke din eksisterende "app.ini" for å kjøre Forgejo. Hvis du vet hva du gjør, og vil fortsette, bekreft følgende:
+
+[startpage]
+install = Enkel å installere
+platform = Plattformuavhengig
+install_desc = Du kan enkelt <a target="_blank" rel="noopener noreferrer" href="%[1]s">kjøre programfilen</a> for din platform, bruke <a target="_blank" rel="noopener noreferrer" href="%[2]s">Docker</a>, eller hente den som en <a target="_blank" rel="noopener noreferrer" href="%[3]s">ferdig pakke</a>.
+lightweight_desc = Forgejo krever lite ressurser og kan kjøres på en rimelig Raspberry Pi. Spar strøm og miljøet!
+app_desc = En enkel Git-tjeneste du kan drifte selv
+lightweight = Lettvekt
+license = Åpen kildekode
+platform_desc = Forgejo fungerer på frie operativsystemer som Linux og FreeBSD, og støtter flere CPU-arkitekturer. Velg den plattformen du foretrekker!
+license_desc = Last ned <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Bli med ved å <a target="_blank" rel="noopener noreferrer" href="%[2]s">bidra</a> for å gjøre prosjektet enda bedre. Ikke vær redd for å bli en bidragsyter!
\ No newline at end of file
diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini
index 698f1330d6..bf60b23ef8 100644
--- a/options/locale/locale_nds.ini
+++ b/options/locale/locale_nds.ini
@@ -333,7 +333,7 @@ has_unconfirmed_mail = Moin %s, du hest eene nich utwiesen E-Mail-Adress (<b>%s<
 non_local_account = Frömde Brukers könen hör Passwoord nich dör de Forgejo-Internett-Brukerschnittstee vernejen.
 openid_register_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto.
 disable_forgot_password_mail = Konto-Torügghalen is utknipst, denn keene E-Mail is inricht. Bidde kuntakteer dienen Sied-Chef.
-authorize_application_description = Wenn du de Togang verlöövst, kann dat all diene Konto-Informatioon lesen un schrieven, ok privaate Repos un Vereenigungen.
+authorize_application_description = Wenn du Togang verlöövst, kann dat all diene Konto-Informatioon lesen un schrieven, ok privaate Repos un Vereenigungen.
 authorization_failed_desc = Dat Anmellen is fehlslagen, denn wi hebben eene ungültig Anfraag funnen. Bidde kuntakteer de Chef vun de Programm, wat du anmellen willst.
 twofa_scratch_used = Du hest dien Eenmaalpasswoord bruukt. Du büst to de Twee-Faktooren-Instellens-Sied umleit worden, waar du 2FA utknipsen of een nejes Eenmaalpasswoord maken kannst.
 oauth.signin.error.temporarily_unavailable = Anmellen fehlslagen, denn de Anmell-Server is jüüst nich verföögbaar. Bidde versöök dat naher noch eenmaal.
@@ -568,7 +568,7 @@ organization = Vereenigungen
 uid = UID
 webauthn = Twee-Faktooren-Anmellen (Sekerheids-Slötels)
 blocked_users = Blockeert Brukers
-public_profile = Publikes Profil
+public_profile = Publikes profil
 location_placeholder = Deel waar du umslags büst mit Annerns
 pronouns = Pronomens
 pronouns_custom = Eegene
@@ -843,7 +843,7 @@ profile_desc = Över di
 hidden_comment_types_description = Kommentaar-Arden, wat hier utköört sünd, worden in Gefall-Sieden nich wiest. Wenn du to’n Bispööl »Vermark« utköörst, worden all de »›Bruker‹ hett ›Vermark‹ hentoföögt/wegdaan«-Kommentaren wegdaan.
 email_desc = Diene Höövd-E-Mail-Adress word för Narichtens, Passwoord-Torügghalen un, wenn se nich verburgen is, Git-Aktioonen över ’t Internett bruukt.
 can_not_add_email_activations_pending = Een Aktiveren staht noch ut. Wenn du eene neje E-Mail-Adress hentofögen willst, versöök dat in een paar Menüten noch eenmaal.
-email_deletion_desc = De E-Mail-Adress un daarmit verbunnen Informatioon word ut dienem Konto wegdaan. Git-Kommitterens vun deeser E-Mail-Adress worden nich ännert. Wiedermaken?
+email_deletion_desc = Deese E-Mail-Adress un daarmit verbunnen Informatioon word ut dienem Konto wegdaan. Git-Kommitterens vun deeser E-Mail-Adress worden nich ännert. Wiedermaken?
 principal_desc = Deese SSH-Zertifikaat-Höövdmannen sünd mit dienem Konto verbunnen un geven kumpleten Togriep up diene Repositoriums.
 add_email_confirmation_sent = Eene Utwiesens-E-Mail is an »%s« schickt worden. Um diene E-Mail-Adress uttowiesen, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s.
 ssh_desc = Deese publiken SSH-Slötels sünd mit dienem Konto verbunnen. De tohörig privaate Slötel gifft kumpleten Togriep up diene Repositoriums. SSH-Slötels, wat utwiest worden sünd, könen bruukt worden, um SSH-unnerschreven Git-Kommitterens uttowiesen.
@@ -887,6 +887,7 @@ access_token_regeneration = Togang-Teken neei maken
 regenerate_token = Neei maken
 access_token_regeneration_desc = Wenn du een Teken neei maakst, verlesen Anwennens, wat ’t bruken, Togang to dienem Konto. Dat kann nich torüggnohmen worden. Wiedermaken?
 regenerate_token_success = Dat Teken is neei maakt worden. Anwennens, wat ’t bruken, hebben keenen Togang to dienem Konto mehr un mutten mit de nejen Teken verneeit worden.
+ssh_token_help_ssh_agent = of, wenn du eenen SSH-Agenten bruukst (un de SSH_AUTH_SOCK-Variaabel sett is):
 
 [repo]
 rss.must_be_on_branch = Du muttst up eenem Twieg wesen, um eenen RSS-Schuuv to hebben.
@@ -1347,7 +1348,7 @@ issues.change_title_at = `hett %[3]s de Titel vun <b><strike>%[1]s</strike></b>
 issues.change_ref_at = `hett %[3]s de Nömen vun <b><strike>%[1]s</strike></b> to <b>%[2]s</b> ännert`
 issues.delete_branch_at = `hett %[2]s de Twieg <b>%[1]s</b> lösket`
 issues.filter_label = Vermark
-issues.filter_label_exclude = `Bruuk <code>Alt</code>+<code>Klick/Enter</code>, um Vermarkens uttosluten`
+issues.filter_label_exclude = Bruuk <kbd>Alt</kbd> + <kbd>Klick</kbd>, um Vermarkens uttosluten
 issues.filter_label_no_select = All Vermarkens
 issues.filter_label_select_no_label = Keen Vermark
 issues.filter_milestone = Marksteen
@@ -1434,12 +1435,12 @@ issues.comment_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s tosamenfö
 issues.close_comment_issue = Mit Kommentaar dichtmaken
 issues.reopen_comment_issue = Mit Kommentaar weer opmaken
 issues.create_comment = Kommenteren
-issues.reopened_at = `hett deeses Gefall <a id="%[1]s" href="#%[1]s">%[2]s</a> weer opmaakt`
+issues.reopened_at = `hett deeses Gefall %s weer opmaakt`
 issues.comment_manually_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s vun Hand tosamenföhrt
 issues.reopen_issue = Weer opmaken
-issues.closed_at = `hett deeses Gefall <a id="%[1]s" href="#%[1]s">%[2]s</a> dichtmaakt`
-issues.commit_ref_at = `hett deeses Gefall <a id="%[1]s" href="#%[1]s">%[2]s</a> vun eenem Kommitteren benöömt`
-issues.ref_closing_from = `<a href="%[3]s">hett deeses Gefall vun eenem Haalvörslag, wat ’t %[4]s dichtmaken word,</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">benöömt</a>`
+issues.closed_at = `hett deeses Gefall %s dichtmaakt`
+issues.commit_ref_at = `hett deeses Gefall %s vun eenem Kommitteren benöömt`
+issues.ref_closing_from = `<a href="%[2]s">hett deeses Gefall</a> %[1]s <a href="%[2]s"> vun eenem Haalvörslag, wat ’t %[3]s dichtmaken word, benöömt</a>`
 issues.ref_closed_from = `<a href="%[3]s">hett deeses Gefall %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">dichtmaakt</a>`
 issues.ref_reopened_from = `<a href="%[3]s">hett deeses Gefall %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">weer opmaakt</a>`
 issues.ref_from = `vun %[1]s`
@@ -1477,12 +1478,12 @@ issues.label.filter_sort.reverse_alphabetically = Umdreiht na de Alphabeet
 issues.label.filter_sort.by_size = Lüttste Grött
 issues.num_participants_one = %d Mitmaker
 issues.num_participants_few = %d Mitmakers
-issues.ref_pull_from = `<a href="%[3]s">hett deesen Haalvörslag %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">benöömt</a>`
+issues.ref_pull_from = `<a href="%[2]s">hett deesen Haalvörslag %[3]s</a> %[1]s <a href="%[2]s">benöömt</a>`
 issues.label_title = Naam
 issues.label_archived_filter = Archiveert Vermarkens wiesen
 issues.archived_label_description = (Archiveert) %s
-issues.ref_issue_from = `<a href="%[3]s">hett deeses Gefall %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">benöömt</a>`
-issues.ref_reopening_from = `<a href="%[3]s">hett deeses Gefall vun eenem Haalvörslag, wat ’t %[4]s weer opmaken word,</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">benöömt</a>`
+issues.ref_issue_from = `<a href="%[2]s">hett deeses Gefall %[3]s</a> %[1]s benöömt`
+issues.ref_reopening_from = `<a href="%[2]s">hett deeses Gefall vun eenem Haalvörslag, wat ’t %[3]s weer opmaken word,</a> %[1]s <a href="%[2]s">benöömt</a>`
 issues.author.tooltip.issue = Deeser Bruker is de Autor vun deesem Gefall.
 issues.role.member_helper = Deeser Bruker is een Liddmaat vun de Vereenigung, wat de Eegner vun deesem Repositorium is.
 issues.role.collaborator_helper = Deeser Bruuker is inladen worden, in deesem Repositorium mittoarbeiden.
@@ -1552,7 +1553,7 @@ issues.dependency.pr_close_blocks = Deeser Haalvörslag blockeert dat Dichtmaken
 issues.dependency.issue_batch_close_blocked = Kann de utköört Gefallens nich all tosamen dichtmaken, denn Gefall #%d hett noch open Ofhangens
 issues.dependency.pr_close_blocked = Du muttst all Gefallens, wat deesen Haalvörslag blockeren, dichtmaken, ehr du dat hier tosamenföhren kannst.
 issues.dependency.blocks_short = Blockeert
-issues.dependency.blocked_by_short = Hang of vun
+issues.dependency.blocked_by_short = Hangt of vun
 issues.dependency.remove_header = Ofhangen wegdoon
 issues.dependency.setting = Ofhangens för Gefallens un Haalvörslagen anknipsen
 issues.dependency.add_error_same_issue = Du kannst een Gefall nich vun sik sülvst ofhangen laten.
@@ -1602,7 +1603,7 @@ issues.due_date_invalid = Dat Anstahns-Datum is ungültig of buten de Rieg. Bidd
 issues.dependency.remove = Wegdoon
 issues.dependency.issue_close_blocks = Deeses Gefall blockeert dat Dichtmaken vun deesen Gefallens
 issues.review.outdated_description = Inholl hett sik ännert, siet deeser Kommentaar schreven worden is
-issues.force_push_codes = `hett %[1]s vun <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> to <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s dwangsschuven`
+issues.force_push_codes = `hett %[1]s vun <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s to <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s dwangsschuven`
 issues.dependency.pr_remove_text = Dat word de Ofhangen vun deesem Haalvörslag wegdoon. Wiedermaken?
 issues.review.pending = Staht ut
 issues.review.option.hide_outdated_comments = Verollte Kommentarens verbargen
@@ -1638,7 +1639,7 @@ pulls.showing_specified_commit_range = Blots Ännerns vun Kommitterens %[1]s bit
 pulls.review_only_possible_for_full_diff = Nakieken gaht blots, wenn de hele Unnerscheed wiest word
 pulls.filter_changes_by_commit = Na Kommitteren filtern
 pulls.nothing_to_compare = Deese Twiegen sünd gliek. ’t is nich nödig, eenen Haalvörslag to maken.
-pulls.nothing_to_compare_have_tag = De utköört Twieg/Mark sünd gliek.
+pulls.nothing_to_compare_have_tag = De utköört Twiegen/Marken sünd gliek.
 pulls.create = Haalvörslag maken
 pulls.title_desc_one = will %[1]d Kommitteren vun <code>%[2]s</code> na <code id="%[4]s">%[3]s</code> tosamenföhren
 pulls.merged_title_desc_one = hett %[1]d Kommitteren vun <code>%[2]s</code> na <code>%[3]s</code> %[4]s tosamenföhrt
@@ -1740,8 +1741,8 @@ pulls.status_checks_show_all = All Överprüfens wiesen
 pulls.update_branch_rebase = Twieg mit Umbaseren vernejen
 pulls.outdated_with_base_branch = De Twieg is tegen de Grund-Twieg verollt
 pulls.close = Haalvörslag dichtmaken
-pulls.closed_at = `hett deesen Haalvörslag <a id="%[1]s" href="#%[1]s">%[2]s</a> dichtmaakt`
-pulls.reopened_at = `hett deesen Haalvörslag <a id="%[1]s" href="#%[1]s">%[2]s</a> weer opmaakt`
+pulls.closed_at = `hett deesen Haalvörslag %s dichtmaakt`
+pulls.reopened_at = `hett deesen Haalvörslag %s weer opmaakt`
 pulls.cmd_instruction_hint = Wies Oorderreeg-Instruksjes
 pulls.cmd_instruction_checkout_title = Utchecken
 pulls.cmd_instruction_merge_title = Tosamenföhren
@@ -1771,7 +1772,7 @@ milestones.deletion = Marksteen lösken
 pulls.has_merged = Fehlslagen: De Haalvörslag is tosamenföhrt worden, du kannst nich noch eenmaal tosamenföhren of de Enn-Twieg ännern.
 pulls.unrelated_histories = Tosamenföhren fehlslagen: De Tosamenföhrens-Kopp un -Grund hebben keene gemeensame Histoorje. Wenk: Versöök eene anner Tosamenföhrens-Aard
 pulls.update_not_allowed = Du düürst deesen Twieg nich vernejen
-pulls.commit_ref_at = `hett deesen Haalvörslag <a id="%[1]s" href="#%[1]s">%[2]s</a> vun eenem Kommitteren benöömt`
+pulls.commit_ref_at = `hett deesen Haalvörslag %s vun eenem Kommitteren benöömt`
 pulls.auto_merge_newly_scheduled = De Haalvörslag weer sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd.
 milestones.clear = Leeg maken
 pulls.push_rejected_no_message = Schuven fehlslagen: Dat Schuven is sünner feerne Naricht oflehnt worden. Bidde överprüüf de Git-Hakens för deeses Repositorium
@@ -2547,12 +2548,12 @@ issues.label_exclusive_desc = Benööm de Vermark <code>Rebeet/Ding</code>, daar
 issues.label_exclusive_warning = Elkeen anner Vermark in de sülve Rebeet word wegdaan, wenn de Vermarkens vun eenem Gefall of Haalvörslag bewarkt worden.
 blame.ignore_revs.failed = Kunn de Versioonen in de <a href="%s">.git-blame-ignore-revs</a> nich minnachten.
 invisible_runes_line = `Deese Rieg hett verburgen Unicode-Bookstavens`
-mirror_address_url_invalid = De angeven URL is ungültig. Du muttst all Delen vun de URL recht utkielen.
+mirror_address_url_invalid = De angeven URL is ungültig. Wees wiss, dat de Delen vun de URL recht utkielt sünd.
 mirror_address_protocol_invalid = De angeven URL is ungültig. Blots Steden vun de Aarden »http(s)://« of »git://« könen tum Spegeln bruukt worden.
 mirror_use_ssh.helper = Forgejo spegelt dat Repositorium mit Git över SSH un maakt för di een Slötelpaar, wenn du deese Instellen utköörst. Du muttst wiss maken, dat de maakt publike Slötel dat Recht kriggt, to de Enn-Repositorium to schuven. Wenn du dat utköörst, kannst du keen Anmellen mit Passwoord bruken.
 migrate.permission_denied_blocked = Du kannst nich vun verboden Servers importeren; bidde fraag de Chef, of he de Instellens ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS överprüfen maag.
 blame.ignore_revs = Minnacht Versioonen in <a href="%s">.git-blame-ignore-revs</a>. Klick <a href="%s">hier, um daar överwegtogahn</a> un de normaale Schüld-Ansicht to wiesen.
-migrate.github_token_desc = Du kannst hier een of mehr Tekens angeven, wat mit Kommas trennt sünd, um dat Umtrecken fixer to maken, um de GitHub-API-Togrieps-Begrenz. WAHRSCHAU: Wenn du dat missbruukst, kannst du de Richtlienjen vun de Deenstbedriev verletzen un dien Konto kann sperrt worden.
+migrate.github_token_desc = Du kannst hier een of mehr Tekens angeven, wat mit Kommas trennt sünd, um de GitHub-API-Togrieps-Begrenz to umgahn un so dat Umtrecken fixer to maken. WAHRSCHAU: Wenn du dat missbruukst, kannst du de Richtlienjen vun de Deenstbedriev verletzen un diene Konten könen villicht sperrt worden.
 issues.edit.already_changed = Kann Ännerns an de Gefall nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst
 broken_message = De Git-Daten unner deesem Repositorium könen nich lesen worden. Kuntakteer de Chef vun deeser Instanz of löske dat Repositorium.
 ambiguous_runes_header = `Deese Datei enthollt verwesselbaare Unicode-Bookstavens`
@@ -2608,6 +2609,20 @@ issues.reopen.blocked_by_user = Du kannst deeses Gefall nich weer opmaken, denn
 pulls.comment.blocked_by_user = Du kannst up deesem Haalvörslag nich kommenteren, denn de Repositoriums-Eegner of de Autor vun de Haalvörslag hett di blockeert.
 issues.filter_no_results = Keene Resultaten
 issues.filter_no_results_placeholder = Versöök, diene Söök-Filters antopassen.
+migrate.repo_desc_helper = Leeg laten, um de bestahn Beschrieven to importeren
+comment.blocked_by_user = Kommenteren gaht hier nich, denn du büst vun de Repositoriums-Eegner of de Autor blockeert worden.
+archive.nocomment = Kommenteren gaht hier nich, denn dat Repositorium is archiveert.
+sync_fork.button = Vernejen
+sync_fork.branch_behind_one = Deeser Twieg is %[1]d Kommitteren achter %[2]s
+sync_fork.branch_behind_few = Deeser Twieg is %[1]d Kommitterens achter %[2]s
+settings.event_action_failure = Fehlslagen
+settings.event_action_success = Daankregen
+settings.event_action_success_desc = Aktioons-Loop is all daankregen worden.
+settings.event_action_recover = Verhaalt
+settings.event_header_action = Aktioons-Loop-Vörfallen
+settings.event_action_failure_desc = Aktioons-Loop is as fehlslagen ennt.
+settings.event_action_recover_desc = Aktioons-Loop is daankregen worden, nadeem de leste Aktioons-Loop in de sülven Warkwies fehlslagen is.
+issues.filter_type.all_pull_requests = All Haalvörslagen
 
 [repo.permissions]
 code.read = <b>Lesen:</b> De Quelltext vun deesem Repositorium ankieken un klonen.
@@ -3290,7 +3305,7 @@ comment_issue = `hett up Gefall <a href="%[1]s">%[3]s #%[2]s</a> kommenteert`
 comment_pull = `hett up Haalvörslag <a href="%[1]s">%[3]s #%[2]s</a> kommenteert`
 auto_merge_pull_request = `hett Haalvörslag <a href="%[1]s">%[3]s #%[2]s</a> automatisk tosamenföhrt`
 transfer_repo = hett Repositorium <code>%s</code> na <a href="%s">%s</a> överdragen
-delete_branch = hett Twieg %[2]s vun <a href="%[1]s">%[3]s</a> lösket
+delete_branch = hett Twieg <code>%[2]s</code> vun <a href="%[1]s">%[3]s</a> lösket
 compare_branch = Verglieken
 compare_commits = %d Kommitterens verglieken
 compare_commits_general = Kommitterens verglieken
@@ -3660,7 +3675,7 @@ owner.settings.cargo.rebuild.description = Neeibauen kann nüttelk wesen, wenn d
 owner.settings.cleanuprules.keep.pattern.container = De <code>latest</code>-Versioon word för Behälter-Paketen alltieden behollen.
 owner.settings.chef.title = Chef-Paketlist
 owner.settings.chef.keypair = Slötelpaar maken
-owner.settings.chef.keypair.description = Een Slötelpaar is nödig, um sik bi de Chef-Paketlist antomellen. Wenn du al een Slötelpaar maakt hest, word dat olle Slötelpaar wegdaan, wenn du een nejes Slötelpaar maakst.
+owner.settings.chef.keypair.description = Anfragen, wat to de Chef-Paketlist schickt worden, mutten tum Utwiesen kryptographisk unnerschreven worden. Wenn du een Slötelpaar maakst, word blots de publike Slötel up Forgejo verwahrt. De privaate Slötel word di tum Bruken mit knife geven. Wenn du een nejes Slötelpaar maakst, word dat olle överschrieven.
 conan.install = Um dat Paket mit Conan to installeren, föhr deese Oorder ut:
 container.images.title = Avbillers
 search_in_external_registry = In %s söken
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index bfd6c6878e..c4f586338b 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -8,7 +8,7 @@ sign_in=Aanmelden
 sign_in_or=of
 sign_out=Uitloggen
 sign_up=Registreren
-link_account=Account Koppelen
+link_account=Account koppelen
 register=Registreren
 version=Versie
 powered_by=Mogelijk gemaakt door %s
@@ -343,7 +343,7 @@ invalid_db_table = De database tabel "%s" is ongeldig: %v
 allow_dots_in_usernames = Sta gebruikers toe om punten te gebruiken in hun gebruikersnaam. Heeft geen invloed op bestaande accounts.
 enable_update_checker = Updatecontrole inschakelen
 invalid_password_algorithm = Ongeldig wachtwoord hash-algoritme
-password_algorithm_helper = Stel het hashing-algoritme voor wachtwoorden in. De algoritmes hebben verschillende vereisten en sterkte. Het argon2-algoritme is tamelijk veilig, maar gebruikt veel geheugen en kan ongeschikt zijn voor kleine systemen.
+password_algorithm_helper = Stel het hashing-algoritme voor wachtwoorden in. De algoritmes hebben verschillende vereisten en sterktes. Het argon2-algoritme is tamelijk veilig, maar gebruikt veel geheugen en kan ongeschikt zijn voor kleine systemen.
 run_user_helper = De gebruikersnaam van het besturingssysteem waaronder Forgejo draait. Merk op dat deze gebruiker toegang moet hebben tot de hoofdmap van de repository.
 require_sign_in_view.description = Beperk de inhoudstoegang tot aangemelde gebruikers. Bezoekers kunnen alleen de verificatiepagina's bezoeken.
 enable_update_checker_helper_forgejo = Het zal periodiek controleren op nieuwe Forgejo-versies door een TXT DNS-record op release.forgejo.org te controleren.
@@ -559,7 +559,7 @@ team_invite.text_2 = Klik alstublieft op de volgende link om aan het team deel t
 admin.new_user.text = <a href="%s">Klik hier</a> om deze gebruiker te beheren vanuit het beheerderspaneel.
 password_change.subject = Uw wachtwoord is gewijzigd
 password_change.text_1 = Het wachtwoord voor je account is zojuist gewijzigd.
-reset_password.text_1 = 
+reset_password.text_1 =
 totp_disabled.subject = TOTP is uitgeschakeld
 primary_mail_change.subject = Uw primaire e-mail is gewijzigd
 totp_disabled.no_2fa = Er zijn geen andere 2FA methodes meer geconfigureerd, wat betekent dat het niet langer nodig is om in te loggen op uw account met 2FA.
@@ -815,7 +815,7 @@ activate_email=Stuur activatie
 activations_pending=Activaties in behandeling
 delete_email=Verwijder
 email_deletion=Verwijder e-mailadres
-email_deletion_desc=Het e-mailadres en verwante informatie worden verwijderd uit je account. Git commits van dit e-mailadres blijven ongewijzigd. Wil je doorgaan?
+email_deletion_desc=Dit e-mailadres en verwante informatie worden verwijderd uit je account. Git commits van dit e-mailadres blijven ongewijzigd. Wil je doorgaan?
 email_deletion_success=Het e-mailadres is verwijderd.
 theme_update_success=Je thema is bijgewerkt.
 theme_update_error=Het geselecteerde thema bestaat niet.
@@ -1092,6 +1092,7 @@ access_token_regeneration = Toegangstoken opnieuw genereren
 regenerate_token = Opnieuw genereren
 regenerate_token_success = De token is opnieuw gegenereerd. Toepassingen die het gebruiken, hebben niet langer toegang tot uw account en moeten worden bijgewerkt om de nieuwe token te gebruiken.
 access_token_regeneration_desc = Als u een token opnieuw genereert, wordt de toegang tot uw account ingetrokken voor toepassingen die de token gebruiken. Dit kan niet ongedaan worden gemaakt. Doorgaan?
+ssh_token_help_ssh_agent = of, als u een SSH-agent gebruikt (met de variabele SSH_AUTH_SOCK ingesteld):
 
 [repo]
 owner=Eigenaar
@@ -1222,7 +1223,7 @@ migrate_items_releases=Releases
 migrate_repo=Migreer repository
 migrate.clone_address=Migreer / kloon van URL
 migrate.clone_address_desc=De HTTP(S) of Git "kloon" URL van een bestaande repository
-migrate.github_token_desc=Je kunt hier een of meerdere tokens met komma gescheiden plaatsen om sneller te migreren door de GitHub API limiet te beperken. WAARSCHUWING: Het misbruik van deze functie kan in strijd zijn met het beleid van de serviceprovider en leiden tot het blokkeren van rekeningen.
+migrate.github_token_desc=U kunt hier een of meer tokens plaatsen, gescheiden door komma's, om de migratie te versnellen door de GitHub API-limiet te omzeilen. WAARSCHUWING: Misbruik van deze functie kan in strijd zijn met het beleid van de serviceprovider en kan ertoe leiden dat uw account(s) worden geblokkeerd.
 migrate.clone_local_path=of een lokaal pad
 migrate.permission_denied=U bent niet gemachtigd om deze lokale repositories te importeren.
 migrate.permission_denied_blocked=Je kunt niet importeren uit niet-toegestane hosts, vraag de beheerder om de instellingen ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS te controleren.
@@ -1495,7 +1496,7 @@ issues.remove_ref_at=`heeft referentie <b>%s</b> verwijderd %s`
 issues.add_ref_at=`heeft referentie <b>%s</b> toegevoegd %s`
 issues.delete_branch_at=`heeft %[2]s de branch <b>%[1]s</b> verwijderd.`
 issues.filter_label=Label
-issues.filter_label_exclude=Gebruik <code>alt</code> + <code>klik/voer</code> in om labels uit te sluiten
+issues.filter_label_exclude=Gebruik <kbd>alt</kbd> + <kbd>klik</kbd> om labels uit te sluiten
 issues.filter_label_no_select=Alle labels
 issues.filter_milestone=Mijlpaal
 issues.filter_project=Project
@@ -1554,13 +1555,13 @@ issues.close_comment_issue=Sluit met commentaar
 issues.reopen_issue=Heropen
 issues.reopen_comment_issue=Heropen met commentaar
 issues.create_comment=Reageer
-issues.closed_at=`heeft dit probleem gesloten <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`heropende dit probleem <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`verwees naar dit probleem vanuit commit <a id="%[1]s" href="#%[1]s"> %[2]s'</a>`
-issues.ref_issue_from=`<a href="%[3]s">refereerde aan dit issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">refereerde aan deze pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">verwees naar deze issue van een pull request %[4]s dat het zal sluiten</a>, <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">verwees naar een pull request %[4]s dat dit issue heropent</a> <a id="%[1]s" href="#%[1]s">%[2]s</a> `
+issues.closed_at=`heeft deze issue gesloten %s`
+issues.reopened_at=`heropende deze issue %s`
+issues.commit_ref_at=`verwees naar dit probleem vanuit commit %s`
+issues.ref_issue_from=`<a href="%[2]s">refereerde aan dit issue %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">refereerde aan deze pull request %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">verwees naar deze issue van een pull request %[3]s dat het zal sluiten</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">verwees naar een pull request %[3]s dat dit issue heropent</a> %[1]s `
 issues.ref_closed_from=`<a href="%[3]s">sloot dit issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">heropende dit issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`van %[1]s`
@@ -1644,7 +1645,7 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
 issues.error_removing_due_date=Deadline verwijderen mislukt.
 issues.push_commit_1=toegevoegd %d commit %s
 issues.push_commits_n=toegevoegd %d commits %s
-issues.force_push_codes=`force-push %[1]s van <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> naar <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`force-push %[1]s van <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s naar <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Vergelijk
 issues.due_date_form=jjjj-mm-dd
 issues.due_date_form_add=Vervaldatum toevoegen
@@ -1815,8 +1816,8 @@ pulls.update_branch_rebase=Update branch via herbaseren
 pulls.update_branch_success=Branch update is geslaagd
 pulls.update_not_allowed=Je hebt geen toestemming om branch bij te werken
 pulls.outdated_with_base_branch=Deze branch is verouderd met de basis branch
-pulls.closed_at=`heeft deze pull request gesloten <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`heropende deze pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`heeft deze pull request gesloten %s`
+pulls.reopened_at=`heropende deze pull request %s`
 
 pulls.auto_merge_button_when_succeed=(Bij geslaagde controles)
 pulls.auto_merge_when_succeed=Automatisch samenvoegen wanneer alle controles gelukt zijn
@@ -2031,7 +2032,7 @@ settings.add_collaborator_success=De medewerker is toegevoegd.
 settings.add_collaborator_inactive_user=Kan geen inactieve gebruiker toevoegen als medewerker.
 settings.add_collaborator_duplicate=De collaborator is al toegevoegd aan deze repository.
 settings.delete_collaborator=Verwijder
-settings.collaborator_deletion=Verwijder medewerker
+settings.collaborator_deletion=Verwijder samenwerker
 settings.collaborator_deletion_desc=Het verwijderen van een collaborator zal hun toegang tot deze repository intrekken. Doorgaan?
 settings.remove_collaborator_success=De medewerker is verwijderd.
 settings.search_user_placeholder=Zoek gebruiker…
@@ -2495,7 +2496,7 @@ issues.label_archive = Label archiveren
 issues.label_exclusive_warning = Eventuele conflicterende scoped labels worden verwijderd bij het bewerken van de labels van een issue of pull request.
 issues.unpin_comment = ontpind dit %s
 pulls.show_changes_since_your_last_review = Wijzigingen weergeven sinds je laatste beoordeling
-mirror_address_url_invalid = De opgegeven URL is ongeldig. Je moet alle componenten van de URL correct escapen.
+mirror_address_url_invalid = De opgegeven URL is ongeldig. Zorg ervoor dat de onderdelen van de URL correct worden geëscape.
 desc.sha256 = SHA256
 form.name_reserved = De repository naam "%s" is gereserveerd.
 form.name_pattern_not_allowed = Het patroon "%s" is niet toegestaan in een repository naam.
@@ -2538,7 +2539,7 @@ editor.directory_is_a_file = Mapnaam "%s" wordt al gebruikt als bestandsnaam in
 commits.renamed_from = Hernoemd van %s
 projects.card_type.desc = Kaart voorbeeld
 pulls.filter_changes_by_commit = Filter op commit
-pulls.nothing_to_compare_have_tag = De geselecteerde branch/tag zijn gelijk.
+pulls.nothing_to_compare_have_tag = De geselecteerde branches/tags zijn gelijk.
 pulls.merged_success = Pull request succesvol samengevoegd en gesloten
 pulls.closed = Pull request gesloten
 pulls.merged_info_text = De branch %s kan nu verwijderd worden.
@@ -2557,7 +2558,7 @@ signing.wont_sign.parentsigned = De vastlegging zal niet ondertekend worden, omd
 signing.wont_sign.headsigned = De samenvoeging zal niet ondertekend worden, omdat de hoofd commit niet ondertekend is.
 signing.wont_sign.commitssigned = De samenvoeging zal niet getekend worden, omdat alle geassocieerde commits niet getekend zijn.
 signing.wont_sign.never = Commits worden nooit ondertekend.
-signing.wont_sign.error = Er is een fout opgetreden tijdens het controleren of de commit ondertekend kon worden.
+signing.wont_sign.error = Er is een fout opgetreden bij het controleren of de commit kon worden ondertekend.
 signing.will_sign = Deze commit wordt ondertekend met sleutel "%s".
 milestones.filter_sort.latest_due_date = Uiterste vervaldatum
 milestones.filter_sort.earliest_due_data = Dichtstbijzijnde vervaldatum
@@ -2627,7 +2628,7 @@ projects.column.set_default_desc = Stel deze kolom in als standaard voor ongecat
 issues.action_check = Aanvinken/uitvinken
 issues.dependency.issue_batch_close_blocked = Het is niet mogelijk om de issues die u gekozen heeft in bulk te sluiten, omdat issue #%d nog open afhankelijkheden heeft
 pulls.review_only_possible_for_full_diff = Beoordeling is alleen mogelijk bij het bekijken van de volledige diff
-pulls.commit_ref_at = `heeft naar deze pull request verwezen vanuit een commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `heeft naar deze pull request verwezen vanuit een commit %s`
 pulls.cmd_instruction_hint = Bekijk opdrachtregelinstructies
 pulls.cmd_instruction_checkout_desc = Vanuit uw project repository, schakel over naar een nieuwe branch en test de veranderingen.
 pulls.showing_specified_commit_range = Alleen veranderingen weergeven tussen %[1]s..%[2]s
@@ -2906,6 +2907,20 @@ issues.reopen.blocked_by_user = U kunt deze issue niet heropenen omdat u geblokk
 pulls.comment.blocked_by_user = U kunt niet reageren op deze pull request omdat u geblokkeerd bent door de eigenaar van de repository of de poster van de issue.
 issues.filter_no_results_placeholder = Probeer uw zoekfilters aan te passen.
 issues.filter_no_results = Geen resultaten
+migrate.repo_desc_helper = Leeg laten om bestaande beschrijving te importeren
+archive.nocomment = Commentaar geven is niet mogelijk omdat de repository gearchiveerd is.
+comment.blocked_by_user = Commentaar geven is niet mogelijk omdat u geblokkeerd bent door de eigenaar van de repository of door de auteur.
+sync_fork.button = Synchroniseer
+sync_fork.branch_behind_one = Deze branch is %[1]d commit achter %[2]s
+sync_fork.branch_behind_few = Deze branch is %[1]d commits achter %[2]s
+settings.event_action_failure = Mislukking
+settings.event_action_failure_desc = Action run is mislukt.
+settings.event_action_recover = Herstel
+settings.event_action_success = Succes
+settings.event_action_success_desc = Action run is geslaagd.
+settings.event_header_action = Actie run evenementen
+issues.filter_type.all_pull_requests = Alle pull requests
+settings.event_action_recover_desc = Action run is geslaagd nadat de laatste action run in dezelfde workflow is mislukt.
 
 
 
@@ -3611,7 +3626,7 @@ create_repo=repository aangemaakt in <a href="%s">%s</a>
 rename_repo=hernoemde repository van <code>%[1]s</code> naar <a href="%[2]s">%[3]s</a>
 transfer_repo=repository verplaatst naar <code>%s</code> naar <a href="%s">%s</a>
 delete_tag=heeft label %[2]s van <a href="%[1]s">%[3]s</a> verwijderd
-delete_branch=heeft branch %[2]s in <a href="%[1]s">%[3]s</a> verwijderd
+delete_branch=heeft branch <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> verwijderd
 compare_branch=Vergelijk
 compare_commits=Vergelijk %d commits
 compare_commits_general=Vergelijk commits
@@ -3713,7 +3728,7 @@ owner.settings.chef.title = Chef register
 owner.settings.chef.keypair = Genereer sleutelpaar
 owner.settings.cleanuprules.remove.title = Versies die overeenkomen met deze regels worden verwijderd, tenzij een regel hierboven zegt dat ze bewaard moeten worden.
 owner.settings.cleanuprules.keep.pattern.container = De <code>laatste</code> versie wordt altijd bewaard voor Container pakketten.
-owner.settings.chef.keypair.description = Een sleutelpaar is nodig om te autheniceren met het Chef register. Als je al een sleutelpaar hebt aangemaakt, zal het aanmaken van een nieuw sleutelpaar de oude sleutelpaar verwijderen.
+owner.settings.chef.keypair.description = Verzoeken die naar het Chef-register worden gestuurd, moeten cryptografisch worden ondertekend als authenticatiemiddel. Bij het genereren van een sleutelpaar wordt alleen de publieke sleutel opgeslagen in Forgejo. De privésleutel wordt aan u verstrekt voor gebruik met knife. Het genereren van een nieuw sleutelpaar overschrijft de vorige.
 container.labels.value = Waarde
 cran.install = Voer het volgende commando uit om het pakket te installeren:
 debian.registry = Stel dit register in vanaf de terminal:
@@ -3908,7 +3923,7 @@ runners.task_list.no_tasks = Er is nog geen taak.
 runners.labels = Labels
 runners.last_online = Laatste online tijd
 runners.task_list.status = Status
-runners.task_list.done_at = Gedaan Op
+runners.task_list.done_at = Gedaan op
 runners.id = ID
 runs.actor = Acteur
 actions = Actions
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 86a333a886..1e069b8474 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -1043,8 +1043,8 @@ language.title = Domyślny język
 language.localization_project = Pomóż nam przetłumaczyć Forgejo na twój język! <a href="%s">Dowiedz się więcej</a>.
 update_hints = Zaktualizuj wskazówki
 update_hints_success = Wskazówki zostały zaktualizowane.
-change_username_redirect_prompt.with_cooldown.one = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dzień, nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego.
-change_username_redirect_prompt.with_cooldown.few = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dni, nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego.
+change_username_redirect_prompt.with_cooldown.one = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dzień. Nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego.
+change_username_redirect_prompt.with_cooldown.few = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dni. Nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego.
 language.description = Ten język zostanie zapisany na twoim koncie i będzie używany jako domyślny po zalogowaniu.
 hidden_comment_types_description = Rodzaje komentarzy zaznaczone tutaj nie będą wyświetlały się na stronach zgłoszeń. Zaznaczenie "Etykieta" na przykład usunie wszystkie komentarze "<użytkownik> dodał/usunął <etykieta>".
 principal_desc = Te podmioty certyfikatu SSH będą powiązane z twoim kontem i pozwolą na pełen dostęp do twoich repozytoriów.
@@ -1460,13 +1460,13 @@ issues.close_comment_issue=Zamknij z komentarzem
 issues.reopen_issue=Otwórz ponownie
 issues.reopen_comment_issue=Otwórz ponownie z komentarzem
 issues.create_comment=Skomentuj
-issues.closed_at=`zamknął(-ęła) to zgłoszenie <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`otworzył(-a) ponownie to zgłoszenie <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`wspomniał(-a) to zgłoszenie z commita <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">odwołał(-a) się do tego zgłoszenia %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">odwołał(-a) się do tego Pull Requesta %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">odwołał(-a) się do pull requesta %[4]s, który zamknie to zgłoszenie</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">odwołał(-a) się z pull requesta %[4]s, który otworzy na nowo to zgłoszenie</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`zamknął(-ęła) to zgłoszenie %s`
+issues.reopened_at=`otworzył(-a) ponownie to zgłoszenie %s`
+issues.commit_ref_at=`wspomniał(-a) to zgłoszenie z commita %s`
+issues.ref_issue_from=`<a href="%[2]s">odwołał(-a) się do tego zgłoszenia %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">odwołał(-a) się do tego Pull Requesta %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">odwołał(-a) się do pull requesta %[3]s, który zamknie to zgłoszenie</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">odwołał(-a) się z pull requesta %[3]s, który otworzy na nowo to zgłoszenie</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">zamknął(-ęła) to zgłoszenie %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">ponownie otworzył(-a) to zgłoszenie %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`z %[1]s`
@@ -1679,8 +1679,8 @@ pulls.update_branch_rebase=Aktualizuj branch przez rebase
 pulls.update_branch_success=Aktualizacja gałęzi powiodła się
 pulls.update_not_allowed=Nie masz uprawnień do aktualizacji gałęzi
 pulls.outdated_with_base_branch=Ta gałąź jest przestarzała w stosunku do gałęzi bazowej
-pulls.closed_at=`zamknął(-ęła) ten pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`otworzył(-a) ponownie ten Pull Request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`zamknął(-ęła) ten pull request %s`
+pulls.reopened_at=`otworzył(-a) ponownie ten Pull Request %s`
 
 
 
@@ -2643,7 +2643,7 @@ pulls.closed = Pull request zamknięty
 pulls.blocked_by_outdated_branch = Ten pull request jest zablokowany ponieważ jest przedawniony.
 pulls.blocked_by_changed_protected_files_1 = Ten pull request jest zablokowany ponieważ wprowadza zmiany do chronionego pliku:
 pulls.push_rejected_no_message = Wypchnięcie nie powiodło się: Wypchnięcie zostało odrzucone, ale nie otrzymano zdalnej wiadomości. Sprawdź hooki Git dla tego repozytorium.=
-pulls.commit_ref_at = `odniósł się do tego pull requesta z commita <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `odniósł się do tego pull requesta z commita %s`
 pulls.cmd_instruction_checkout_desc = Ze swojego repozytorium projektu, utwórz nową gałąź i przetestuj zmiany.
 pulls.clear_merge_message_hint = Wyczyszczenie wiadomości scalenia usunie tylko treść wiadomości commitu pozostawiając wygenerowane przez git dopiski takie jak "Co-Authored-By ...".
 pulls.delete_after_merge.head_branch.insufficient_branch = Nie masz uprawnień by usunąć head gałęzi.
@@ -2788,7 +2788,7 @@ pulls.has_pull_request = `Pull request między tymi gałęziami już istnieje: <
 settings.wiki_branch_rename_success = Gałąź wiki dla repozytorium została znormalizowana pomyślnie.
 settings.web_hook_name_larksuite_only = Lark Suite
 settings.packagist_api_token = Token API
-issues.force_push_codes = `wymusił(a) wypchnięcie %[1]s z <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> do <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes = `wymusił(a) wypchnięcie %[1]s z <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s do <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.filter_label_select_no_label = Brak etykiety
 issues.filter_project_all = Wszystkie projekty
 issues.filter_type.reviewed_by_you = Recenzowane przez ciebie
@@ -3552,7 +3552,7 @@ create_repo=tworzy repozytorium <a href="%s">%s</a>
 rename_repo=zmienia nazwę repozytorium <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
 transfer_repo=przenosi repozytorium <code>%s</code> do <a href="%s">%s</a>
 delete_tag=usuwa tag %[2]s z <a href="%[1]s">%[3]s</a>
-delete_branch=usuwa gałąź %[2]s z <a href="%[1]s">%[3]s</a>
+delete_branch=usuwa gałąź <code>%[2]s</code> z <a href="%[1]s">%[3]s</a>
 compare_branch=Porównaj
 compare_commits=Porównaj %d commitów
 compare_commits_general=Porównaj commity
@@ -3951,29 +3951,29 @@ normal_file = Zwykły plik
 search = Wyszukaj...
 type_tooltip = Typ wyszukiwania
 fuzzy = Przybliżone
-package_kind = Wyszukaj pakiety...
+package_kind = Wyszukaj pakiety…
 fuzzy_tooltip = Uwzględnij wyniki, które są bliskie wyszukiwanemu hasłu
 match = Dopasuj
 match_tooltip = Uwzględniaj tylko wyniki pasujące do wyszukiwanego hasła
-repo_kind = Wyszukaj repozytoria...
-user_kind = Wyszukaj użytkownilków...
+repo_kind = Wyszukaj repozytoria…
+user_kind = Wyszukaj użytkownilków…
 code_search_unavailable = Wyszukiwanie kodu jest obecnie niedostępne. Skontakuj sie z administratorem strony.
 no_results = Nie znaleziono pasujących wyników.
-org_kind = Wyszukaj organizacje...
-team_kind = Wyszukaj zespoły...
-code_kind = Wyszukaj kod...
+org_kind = Wyszukaj organizacje…
+team_kind = Wyszukaj zespoły…
+code_kind = Wyszukaj kod…
 code_search_by_git_grep = Obecne wyniki wyszukiwania kodu są dostarczane przez "git grep". Wyniki mogą być lepsze, jeśli administrator witryny włączy indeksator kodu.
-project_kind = Wyszukaj projekty...
-branch_kind = Wyszukaj gałęzie...
-commit_kind = Wyszukaj commity...
-runner_kind = Wyszukaj runnery...
+project_kind = Wyszukaj projekty…
+branch_kind = Wyszukaj gałęzie…
+commit_kind = Wyszukaj commity…
+runner_kind = Wyszukaj runnery…
 keyword_search_unavailable = Wyszukiwanie według słów kluczowych jest obecnie niedostępne. Skontaktuj się z administratorem strony.
 milestone_kind = Wyszukaj kamienie milowe...
 union_tooltip = Uwzględnia wyniki pasujące do dowolnego słowa kluczowego rozdzielonego białymi znakami
 exact = Dokładne
 exact_tooltip = Uwzględniaj tylko wyniki pasujące do wyszukiwanego hasła
-issue_kind = Wyszukaj zgłoszenia...
-pull_kind = Wyszukaj pull requesty...
+issue_kind = Wyszukaj zgłoszenia…
+pull_kind = Wyszukaj pull requesty…
 union = Unia
 regexp = RegExp
 regexp_tooltip = Interpretuj wyszukiwane hasło jako wyrażenie regularne
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
index d36b529972..ccf2c22ab1 100644
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@@ -61,7 +61,7 @@ new_org=Nova organização
 new_project=Novo projeto
 new_project_column=Nova coluna
 manage_org=Gerenciar organizações
-admin_panel=Administração do site
+admin_panel=Administração do servidor
 account_settings=Configurações da conta
 settings=Configurações
 your_profile=Perfil
@@ -76,7 +76,7 @@ forks=Forks
 
 activities=Atividades
 pull_requests=Pull requests
-issues=Problemas
+issues=Questões
 milestones=Marcos
 
 ok=OK
@@ -109,7 +109,7 @@ preview=Pré-visualização
 loading=Carregando…
 
 error=Erro
-error404=A página que você está tentando acessar <strong>não existe</strong>, <strong>foi removida</strong> ou <strong>você não tem autorização</strong> para visualizá-la.
+error404=A página que você está tentando acessar <strong>não existe</strong>, <strong>foi removida</strong> ou <strong>você não possui autorização</strong> para visualizá-la.
 
 never=Nunca
 unknown=Desconhecido
@@ -176,7 +176,7 @@ footer.links=Links
 
 [heatmap]
 number_of_contributions_in_the_last_12_months=%s contribuições nos últimos 12 meses
-contributions_zero=Sem contribuições
+contributions_zero=Nenhuma contribuição
 less=Menos
 more=Mais
 contributions_format = {contributions} em {day} de {month} de {year}
@@ -209,7 +209,7 @@ table_modal.label.columns = Colunas
 link_modal.header = Adicionar um link
 link_modal.url = URL
 link_modal.description = Descrição
-link_modal.paste_reminder = Dica: Com uma URL na sua área de transferência, você pode colar diretamente no editor para criar um link.
+link_modal.paste_reminder = Dica: Você pode colar um URL da sua área de transferência para criar um link no editor.
 
 [filter]
 string.asc=A - Z
@@ -217,7 +217,7 @@ string.desc=Z - A
 
 [error]
 occurred=Ocorreu um erro
-report_message=Se você acredita que esse é um falha do Forgejo, pesquise por issues no <a href="%s" target="_blank">Codeberg</a> ou abra uma nova issue, se necessário.
+report_message=Caso acredite que este é um problema do Forgejo, veja se a questão existe no <a href="%s" target="_blank">repositório do Codeberg</a>, ou crie uma nova questão.
 missing_csrf=Pedido inválido: não tem token CSRF presente
 invalid_csrf=Requisição Inválida: token CSRF inválido
 not_found=Não foi possível encontrar o destino.
@@ -233,7 +233,7 @@ lightweight_desc=Forgejo utiliza poucos recursos e consegue mesmo rodar no barat
 license=Código aberto
 license_desc=Está tudo no <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir!
 install_desc = Apenas <a target="_blank" rel="noopener noreferrer" href="%[1]s">rode o binário</a> para a sua plataforma, execute-o com <a target="_blank" rel="noopener noreferrer" href="%[2]s">Docker</a>, ou obtenha-o <a target="_blank" rel="noopener noreferrer" href="%[3]s">empacotado</a>.
-platform_desc = Foi confirmado que o Forgejo roda em sistemas operacionais livres, como Linux e FreeBSD, assim como em diferentes arquiteturas de CPU. Escolha sua preferida!
+platform_desc = Forgejo roda em sistemas operacionais livres, como Linux e FreeBSD, assim como em diferentes arquiteturas de processador. Escolha o seu sistema preferido!
 
 [install]
 install=Instalação
@@ -267,9 +267,9 @@ err_admin_name_is_invalid=Nome de usuário do administrador inválido
 general_title=Configurações gerais
 app_name=Título do servidor
 app_name_helper=Insira o nome da sua instância aqui. Ele será mostrado em todas as páginas.
-repo_path=Caminho raiz do repositório
+repo_path=Localização dos repositórios
 repo_path_helper=Todos os repositórios remotos do Git serão salvos neste diretório.
-lfs_path=Caminho raiz do Git LFS
+lfs_path=Localização do Git LFS
 lfs_path_helper=Os arquivos armazenados com o Git LFS serão armazenados neste diretório. Deixe em branco para desabilitar.
 run_user=Executar como usuário
 run_user_helper=O nome de usuário do sistema operacional com o qual o Forgejo é executado. Observe que este usuário deve ter acesso ao caminho da raiz do repositório.
@@ -468,7 +468,7 @@ email_domain_blacklisted=Você não pode se cadastrar com seu endereço de e-mai
 authorize_application=Autorizar aplicativo
 authorize_redirect_notice=Você será redirecionado para %s se você autorizar este aplicativo.
 authorize_application_created_by=Este aplicativo foi criado por %s.
-authorize_application_description=Se você conceder o acesso, isso permitirá acessar e alterar todas as informações da sua conta, incluindo repositórios privados e organizações.
+authorize_application_description=Se você conceder acesso, isso permitirá acessar e alterar todas as informações da sua conta, incluindo repositórios privados e organizações.
 authorize_title=Autorizar "%s" para acessar sua conta?
 authorization_failed=Autorização falhou
 authorization_failed_desc=A autorização falhou porque detectamos uma solicitação inválida. Entre em contato com o responsável do aplicativo que você tentou autorizar.
@@ -829,7 +829,7 @@ activations_pending=Ativações pendentes
 can_not_add_email_activations_pending=Há uma ativação pendente, tente novamente em alguns minutos se quiser adicionar um novo e-mail.
 delete_email=Remover
 email_deletion=Remover endereço de e-mail
-email_deletion_desc=O endereço de e-mail e informações relacionadas serão removidos de sua conta. Commits aplicados por este endereço de e-mail permanecerão inalterados. Continuar?
+email_deletion_desc=Este endereço de e-mail e informações relacionadas serão removidos de sua conta. Commits aplicados por este endereço de e-mail permanecerão inalterados. Continuar?
 email_deletion_success=O endereço de e-mail foi removido.
 theme_update_success=Seu tema foi atualizado.
 theme_update_error=O tema selecionado não existe.
@@ -1063,8 +1063,8 @@ language.localization_project = Ajude-nos a traduzir Forgejo para o seu idioma!
 language.description = Essa língua será salva em sua conta e será usada como padrão após você iniciar a sessão.
 user_block_yourself = Você não pode se bloquear.
 pronouns_custom_label = Pronomes personalizados
-change_username_redirect_prompt.with_cooldown.one = O nome de usuário antigo ficará disponível para qualquer pessoa após um período de espera de %[1]d dia, você ainda pode recuperar o nome de usuário antigo durante este período de espera.
-change_username_redirect_prompt.with_cooldown.few = O nome de usuário antigo ficará disponível para qualquer pessoa após um período de espera de %[1]d dias, você ainda pode recuperar o nome de usuário antigo durante este período de espera.
+change_username_redirect_prompt.with_cooldown.one = O nome de usuário antigo ficará disponível para qualquer pessoa após um período de proteção de %[1]d dia. Você ainda pode recuperar o nome de usuário antigo durante este período de proteção.
+change_username_redirect_prompt.with_cooldown.few = O nome de usuário antigo ficará disponível para qualquer pessoa após um período de proteção de %[1]d dias. Você ainda pode recuperar o nome de usuário antigo durante este período de proteção.
 quota.applies_to_user = As seguintes regras de cota se aplicam à sua conta
 quota.rule.exceeded.helper = O tamanho total de objetos para esta regra excedeu a cota.
 keep_pronouns_private = Mostrar pronomes apenas para usuários autenticados
@@ -1151,7 +1151,7 @@ mirror_interval_invalid=O intervalo do espelhamento não é válido.
 mirror_sync_on_commit=Sincronizar quando commits forem enviados
 mirror_address=Clonar a partir de URL
 mirror_address_desc=Coloque todas as credenciais necessárias na seção de autorização.
-mirror_address_url_invalid=A URL fornecida é inválida. Você deve escapar todos os componentes da URL corretamente.
+mirror_address_url_invalid=A URL fornecida é inválida. Certifique-se de escapar os componentes da URL corretamente.
 mirror_address_protocol_invalid=O URL fornecido é inválido. Somente locais http(s):// ou git:// podem ser usados para espelhamento.
 mirror_lfs=Armazenamento de Arquivo Grande (LFS)
 mirror_lfs_desc=Ativar espelhamento de dados LFS.
@@ -1235,7 +1235,7 @@ migrate_items_releases=Versões
 migrate_repo=Migrar repositório
 migrate.clone_address=Migrar / Clonar de URL
 migrate.clone_address_desc=URL HTTP(S) ou comando git "clone" de um repositório existente
-migrate.github_token_desc=Você pode colocar aqui um ou mais tokens separados por vírgulas para tornar a migração mais rápida para compensar o limite de taxa de API do GitHub. AVISO: abusar desse recurso pode violar a política do provedor de serviços e levar ao bloqueio da conta.
+migrate.github_token_desc=Você pode colocar aqui um ou mais tokens separados por vírgulas para tornar a migração mais rápida ao evitar o limite de taxa de API do GitHub. AVISO: abusar desse recurso pode violar a política do provedor de serviços e pode levar ao bloqueio da(s) conta(s).
 migrate.clone_local_path=ou um caminho de servidor local
 migrate.permission_denied=Você não pode importar repositórios locais.
 migrate.permission_denied_blocked=Você não pode importar dos hosts não permitidos, por favor peça ao administrador para verificar as configurações ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
@@ -1278,7 +1278,7 @@ star_guest_user=Entre para adicionar este repositório aos favoritos.
 unwatch=Deixar de observar
 watch=Observar
 unstar=Retirar dos favoritos
-star=Juntar aos favoritos
+star=Adicionar aos favoritos
 fork=Fork
 download_archive=Baixar repositório
 more_operations=Mais operações
@@ -1503,11 +1503,11 @@ projects.card_type.images_and_text=Imagens e texto
 projects.card_type.text_only=Somente texto
 
 issues.desc=Organize relatórios de bugs, tarefas e marcos.
-issues.filter_assignees=Filtrar Atribuição
-issues.filter_milestones=Filtrar Marco
-issues.filter_projects=Filtrar Projeto
-issues.filter_labels=Filtrar Rótulo
-issues.filter_reviewers=Filtrar Revisor
+issues.filter_assignees=Filtrar atribuição
+issues.filter_milestones=Filtrar marco
+issues.filter_projects=Filtrar projeto
+issues.filter_labels=Filtrar rótulo
+issues.filter_reviewers=Filtrar revisor
 issues.new=Novo issue
 issues.new.title_empty=Título não pode ser em branco
 issues.new.labels=Etiquetas
@@ -1568,7 +1568,7 @@ issues.remove_ref_at=`removeu a referência <b>%s</b> %s`
 issues.add_ref_at=`adicionou a referência <b>%s</b> %s`
 issues.delete_branch_at=`excluiu branch <b>%s</b> %s`
 issues.filter_label=Etiqueta
-issues.filter_label_exclude=`Use <code>alt</code> + <code>clique/enter</code> para excluir etiquetas`
+issues.filter_label_exclude=Use <kbd>Alt</kbd> + <kbd>Clique</kbd> para excluir etiquetas
 issues.filter_label_no_select=Todas as etiquetas
 issues.filter_label_select_no_label=Sem etiqueta
 issues.filter_milestone=Marco
@@ -1642,13 +1642,13 @@ issues.close_comment_issue=Comentar e fechar
 issues.reopen_issue=Reabrir
 issues.reopen_comment_issue=Comentar e reabrir
 issues.create_comment=Comentar
-issues.closed_at=`fechou esta issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`reabriu esta issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`citou esta issue em um commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">referenciado esta issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">referenciado este pull request %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">referenciado esta issue de um pull request %[4]s que a fechará</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">referenciado esta issue de um pull request %[4]s que a reabrirá</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`fechou esta issue %s`
+issues.reopened_at=`reabriu esta issue %s`
+issues.commit_ref_at=`citou esta issue de um commit %s`
+issues.ref_issue_from=`<a href="%[2]s">citou esta issue %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">citou este pull request %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">citou esta issue de um pull request %[3]s que a fechará</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">citou esta issue de um pull request %[3]s que a reabrirá</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">fechou esta issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">reabriu esta issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`de %[1]s`
@@ -1744,7 +1744,7 @@ issues.error_modifying_due_date=Falha ao modificar a data limite.
 issues.error_removing_due_date=Falha ao remover a data limite.
 issues.push_commit_1=adicionou %d commit %s
 issues.push_commits_n=adicionou %d commits %s
-issues.force_push_codes=`forçou o push %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> para <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`forçou o push %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s para <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=dd/mm/aaaa
 issues.due_date_form_add=Adicionar data limite
@@ -1934,7 +1934,7 @@ pulls.status_checks_success=Todas as verificações foram bem sucedidas
 pulls.status_checks_warning=Algumas verificações reportaram avisos
 pulls.status_checks_failure=Algumas verificações falharam
 pulls.status_checks_error=Algumas verificações reportaram erros
-pulls.status_checks_requested=Obrigatário
+pulls.status_checks_requested=Obrigatório
 pulls.status_checks_details=Detalhes
 pulls.update_branch=Atualizar branch por merge
 pulls.update_branch_rebase=Atualizar branch por rebase
@@ -1942,8 +1942,8 @@ pulls.update_branch_success=Atualização do branch foi bem-sucedida
 pulls.update_not_allowed=Você não tem permissão para atualizar o branch
 pulls.outdated_with_base_branch=Este branch está desatualizado com o branch base
 pulls.close=Fechar pull request
-pulls.closed_at=`fechou este pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`reabriu este pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`fechou este pull request %s`
+pulls.reopened_at=`reabriu este pull request %s`
 pulls.clear_merge_message=Limpar mensagem do merge
 pulls.clear_merge_message_hint=Limpar a mensagem de merge só irá remover o conteúdo da mensagem de commit e manter trailers git gerados, como "Co-Authored-By …".
 
@@ -2013,7 +2013,7 @@ ext_wiki=Wiki Externa
 ext_wiki.desc=Link para uma wiki externa.
 
 wiki=Wiki
-wiki.welcome=Bem-vindo a wiki.
+wiki.welcome=Bem-vindo à wiki.
 wiki.welcome_desc=A wiki permite que você escreva e compartilhe a documentação com os colaboradores.
 wiki.desc=Escrever e compartilhar a documentação com os colaboradores.
 wiki.create_first_page=Criar a primeira página
@@ -2719,7 +2719,7 @@ issues.label_archive_tooltip = Etiquetas arquivadas não serão exibidas nas sug
 activity.navbar.pulse = Recente
 settings.units.overview = Geral
 settings.units.add_more = Habilitar mais
-pulls.commit_ref_at = `referenciou este pedido de mesclagem no commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `citou este pull request de um commit %s`
 pulls.cmd_instruction_merge_title = Mesclar
 settings.units.units = Unidades
 vendored = Externo
@@ -2773,7 +2773,7 @@ subscribe.issue.guest.tooltip = Faça login para receber notificações desta qu
 settings.federation_not_enabled = O recurso de federação não está habilitado em seu servidor.
 settings.trust_model.committer.desc = Uma assinatura de commit é considerada "confiável" caso corresponda ao autor do commit, caso contrário será definida como "discordante". Isso permite delegar a autoria de commits ao Forgejo, adicionando créditos ao autor original nos campos "Co-authored-by" e "Co-commited-by" no final do commit. A chave padrão do Forgejo deve corresponder à chave de um usuário no banco de dados.
 settings.wiki_branch_rename_success = O nome do ramo da wiki do repositório foi regularizado com sucesso.
-pulls.nothing_to_compare_have_tag = O ramo/etiqueta escolhidos são iguais.
+pulls.nothing_to_compare_have_tag = Os branches/etiquetas escolhidos são iguais.
 settings.sourcehut_builds.secrets = Segredos
 release.download_count_few = %s downloads
 release.hide_archive_links = Ocultar arquivos gerados automaticamente
@@ -2803,7 +2803,7 @@ mirror_use_ssh.helper = Forgejo irá espelhar o repositório via Git através de
 mirror_denied_combination = Não é possível combinar o uso de chave pública e autenticação baseada em senha.
 mirror_public_key = Chave SSH pública
 mirror_use_ssh.text = Usar autenticação por SSH
-mirror_use_ssh.not_available = Autenticação por SSH não está disponível.
+mirror_use_ssh.not_available = A autenticação via SSH não está disponível.
 settings.push_mirror_sync_in_progress = Fazendo push das mudanças para o remoto %s nesse momento.
 settings.federation_apapiurl = URL de federação deste repositório. Copie e cole isso nas Configurações de Federação de outro repositório como uma URL de um Repositório Seguidor.
 pulls.agit_explanation = Criado usando o fluxo de trabalho AGit. AGit permite que contribuidores proponham mudanças usando "git push" sem criar um fork ou novo branch.
@@ -2817,7 +2817,7 @@ settings.mirror_settings.pushed_repository = Repositório enviado
 settings.mirror_settings.docs.disabled_pull_mirror.instructions = Configure seu projeto para automaticamente fazer push de commits, tags e branches para outro repositório. Espelhos de pull foram desativados pelo administrador do seu site.
 settings.mirror_settings.docs.disabled_push_mirror.instructions = Configure seu projeto para automaticamente fazer pull de commits, tags e branches de outro repositório.
 settings.mirror_settings.docs.doc_link_pull_section = a seção "Fazendo pull de um repositório remoto" da documentação.
-subscribe.pull.guest.tooltip = Entre para receber notificações deste pull request.
+subscribe.pull.guest.tooltip = Inicie a sessão para receber notificações deste pull request.
 settings.pull_mirror_sync_quota_exceeded = Cota excedida, não será feito pull das mudanças.
 settings.mirror_settings.docs.more_information_if_disabled = Saiba mais sobre espelhos de push e pull aqui:
 settings.transfer_quota_exceeded = O novo dono (%s) excedeu a cota. O repositório não foi transferido.
@@ -2907,6 +2907,20 @@ issues.reopen.blocked_by_user = Você não pode reabrir este issue porque você
 pulls.comment.blocked_by_user = Você não pode comentar neste pull request porque você foi bloqueado pelo dono do repositório ou pelo autor do pull request.
 issues.filter_no_results = Nenhum resultado
 issues.filter_no_results_placeholder = Tente ajustar seus filtros de pesquisa.
+archive.nocomment = Não é possível comentar pois o repositório foi arquivado.
+migrate.repo_desc_helper = Deixe em branco para importar a descrição existente
+comment.blocked_by_user = Não é possível comentar pois você foi bloqueado pelo dono ou autor do repositório.
+sync_fork.branch_behind_few = Este branch está %[1]d commits atrás de %[2]s
+sync_fork.branch_behind_one = Este branch está %[1]d commit atrás de %[2]s
+sync_fork.button = Sincronizar
+settings.event_header_action = Eventos de execução de Actions
+settings.event_action_failure = Falha
+settings.event_action_failure_desc = Execução da Action terminou com falha.
+settings.event_action_recover = Recuperar
+settings.event_action_recover_desc = A execução da Action teve sucesso após a última execução no mesmo workflow ter falhado.
+settings.event_action_success = Sucesso
+settings.event_action_success_desc = A execução da Action foi bem sucedida.
+issues.filter_type.all_pull_requests = Todos os pull requests
 
 [graphs]
 component_loading = Carregando %s…
@@ -3043,8 +3057,8 @@ open_dashboard = Abrir painel
 settings.change_orgname_prompt = Obs.: Alterar o nome de uma organização resultará na alteração do URL dela e disponibilizará o nome antigo para uso.
 follow_blocked_user = Não foi possível seguir esta organização porque ela bloqueou-o(a).
 form.name_pattern_not_allowed = O padrão "%s" não é permitido no nome de uma organização.
-settings.change_orgname_redirect_prompt.with_cooldown.one = O nome de organização antigo ficará disponível para qualquer pessoa após um período de proteção de %[1]d dia, você ainda pode recuperar o nome antigo durante este período de proteção.
-settings.change_orgname_redirect_prompt.with_cooldown.few = O nome de organização antigo ficará disponível para qualquer pessoa após um período de espera de %[1]d dia, você ainda pode recuperar o nome antigo durante este período de espera.
+settings.change_orgname_redirect_prompt.with_cooldown.one = O nome de organização antigo ficará disponível para qualquer pessoa após um período de proteção de %[1]d dia. Você ainda pode recuperar o nome antigo durante este período de proteção.
+settings.change_orgname_redirect_prompt.with_cooldown.few = O nome de organização antigo ficará disponível para qualquer pessoa após um período de proteção de %[1]d dia. Você ainda pode recuperar o nome antigo durante este período de proteção.
 
 [admin]
 dashboard=Painel
@@ -3589,7 +3603,7 @@ config.cache_test_slow = Teste de cache bem-sucedido, mas a resposta é lenta: %
 config.cache_test = Cache de Teste
 config.cache_test_failed = Falha ao sondar o cache: %v.
 self_check.database_collation_mismatch = Esperar que o banco de dados use o ordenamento: %s
-dashboard.cleanup_actions = Limpar logs expirados e artefatos de ações
+dashboard.cleanup_actions = Limpar logs expirados e artefatos de Actions
 emails.delete = Deletar email
 emails.delete_primary_email_error = Você não pode excluir o email principal.
 emails.deletion_success = O endereço de email foi excluído.
@@ -3622,7 +3636,7 @@ auto_merge_pull_request=`fez merge automático do pull request <a href="%[1]s">%
 transfer_repo=transferiu repositório de <code>%s</code> para <a href="%s">%s</a>
 push_tag=fez push da tag <a href="%[2]s">%[3]s</a> to <a href="%[1]s">%[4]s</a>
 delete_tag=excluiu tag %[2]s de <a href="%[1]s"> %[3]s</a>
-delete_branch=excluiu branch %[2]s de <a href="%[1]s">%[3]s</a>
+delete_branch=excluiu branch <code>%[2]s</code> de <a href="%[1]s">%[3]s</a>
 compare_branch=Comparar
 compare_commits=Compare %d commits
 compare_commits_general=Comparar commits
@@ -3802,8 +3816,8 @@ swift.install2=e execute o seguinte comando:
 vagrant.install=Para adicionar uma Vagrant box, execute o seguinte comando:
 settings.link=Vincular este pacote a um repositório
 settings.link.description=Se você vincular um pacote a um repositório, o pacote será listado na lista de pacotes do repositório.
-settings.link.select=Selecionar Repositório
-settings.link.button=Atualizar Link do Repositório
+settings.link.select=Selecionar repositório
+settings.link.button=Atualizar link do repositório
 settings.link.success=Link do repositório foi atualizado com sucesso.
 settings.link.error=Falha ao atualizar o link do repositório.
 settings.delete=Excluir o pacote
@@ -3862,7 +3876,7 @@ arch.pacman.conf = Adicione o servidor com a distribuição e arquitetura no arq
 arch.version.makedepends = Dependências do make
 arch.version.checkdepends = Verificar dependências
 owner.settings.cargo.initialize.description = É necessário um repositório Git especial de índice para usar o registro Cargo. Usar esta opção irá (re-)criar o repositório e configurá-lo automaticamente.
-owner.settings.chef.keypair.description = É necessário um par de chaves para autenticar no registro Chef. Se você já gerou um par de chaves, gere um novo par e descarte o antigo.
+owner.settings.chef.keypair.description = Requisições enviadas ao registro Chef precisam ser criptograficamente assinadas como uma forma de autenticação. Ao gerar um par de chaves, somente a chave pública é armazenada no Forgejo. A chave privada é fornecida a você para ser usada com o knife. Gerar um novo par de chaves irá sobrescrever o anterior.
 container.images.title = Imagens
 search_in_external_registry = Buscar em %s
 alt.registry.install = Para instalar o pacote, execute o seguinte comando:
@@ -3886,7 +3900,7 @@ deletion=Excluir segredo
 deletion.description=A exclusão de um segredo é permanente e não pode ser desfeita. Continuar?
 deletion.success=O segredo foi excluído.
 deletion.failed=Falha ao excluir segredo.
-management=Gerenciar segredos
+management=Gerenciamento de segredos
 
 [actions]
 actions=Ações
@@ -3895,12 +3909,12 @@ unit.desc=Gerenciar pipelines integradas de CI/CD com Forgejo Actions.
 
 status.unknown=Desconhecido
 status.waiting=Aguardando
-status.running=Rodando
+status.running=Executando
 status.success=Sucesso
 status.failure=Falha
-status.cancelled=Cancelado
-status.skipped=Ignorado
-status.blocked=Bloqueado
+status.cancelled=Cancelada
+status.skipped=Ignorada
+status.blocked=Bloqueada
 
 runners=Runners
 runners.runner_manage_panel=Gerenciar runners
@@ -3998,7 +4012,7 @@ variables.not_found = Não foi possível encontrar a variável.
 type-1.display_name=Projeto individual
 type-2.display_name=Projeto do repositório
 type-3.display_name=Projeto da organização
-deleted.display_name = Projeto Apagado
+deleted.display_name = Projeto apagado
 
 [git.filemode]
 symbolic_link=Ligação simbólica
@@ -4021,7 +4035,7 @@ package_kind = Buscar pacotes…
 project_kind = Buscar projetos…
 search = Buscar…
 fuzzy = Aproximada
-fuzzy_tooltip = Inclui resultados que se aproximam dos termos de busca
+fuzzy_tooltip = Incluir resultados que se aproximam dos termos de busca
 match = Correspondente
 match_tooltip = Inclui apenas os resultados que correspondem exatamente aos termos de busca
 repo_kind = Buscar repositórios…
@@ -4032,14 +4046,14 @@ commit_kind = Buscar commits…
 runner_kind = Buscar runners…
 code_search_unavailable = A pesquisa de código não está disponível no momento. Entre em contato com o administrador do site.
 milestone_kind = Pesquisar marcos...
-union_tooltip = Incluir resultados que correspondam a quaisquer palavras-chave separadas por espaços em branco
+union_tooltip = Incluir resultados que correspondam a quaisquer palavras-chave separadas por espaços
 union = União
 exact = Exato
 exact_tooltip = Incluir apenas resultados que correspondam exatamente ao termo de pesquisa
 issue_kind = Buscar issues…
 pull_kind = Buscar pulls…
 regexp_tooltip = Interpretar o termo de busca como uma expressão regular
-regexp = RegExp
+regexp = ExpReg
 
 [munits.data]
 b = B
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index c7798d4cdf..a8afe522d7 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -9,7 +9,7 @@ sign_in_with_provider=Iniciar sessão com %s
 sign_in_or=ou
 sign_out=Terminar sessão
 sign_up=Fazer inscrição
-link_account=Vincular conta
+link_account=Associar conta
 register=Inscrição
 version=Versão
 powered_by=Implementado com %s
@@ -20,18 +20,18 @@ notifications=Notificações
 active_stopwatch=Cronómetro em andamento
 tracked_time_summary=Resumo do tempo rastreado com base em filtros da lista de questões
 create_new=Criar…
-user_profile_and_more=Perfil e configurações…
+user_profile_and_more=Perfil e definições…
 signed_in_as=Sessão iniciada como
 enable_javascript=Este sítio Web requer JavaScript.
 toc=Índice
 licenses=Licenças
-return_to_forgejo=Retornar ao Forgejo
+return_to_forgejo=Voltar ao Forgejo
 
 username=Nome de utilizador
 email=Endereço de email
 password=Senha
 access_token=Código de acesso
-re_type=Confirme a senha
+re_type=Confirme a palavra-passe
 captcha=CAPTCHA
 twofa=Autenticação com dois passos
 twofa_scratch=Código de uso único em dois passos
@@ -59,10 +59,10 @@ new_migrate=Nova migração
 new_mirror=Nova réplica
 new_fork=Nova derivação do repositório
 new_org=Nova organização
-new_project=Novo planeamento
+new_project=Novo projeto
 new_project_column=Nova coluna
 manage_org=Gerir organizações
-admin_panel=Administração do sítio
+admin_panel=Administração do site
 account_settings=Configurações da conta
 settings=Configurações
 your_profile=Perfil
@@ -155,7 +155,7 @@ invalid_data = Dados inválidos: %v
 filter.clear = Retirar filtros
 filter.is_archived = Arquivado
 filter.not_template = Não modelos
-toggle_menu = Comutar menu
+toggle_menu = Alternar menu
 filter = Filtrar
 copy_generic = Copiar para a área de transferência
 test = Teste
@@ -233,7 +233,7 @@ platform_desc=Está confirmado que Forgejo corre em sistemas operativos livres,
 lightweight=Leve
 lightweight_desc=Forgejo requer poucos recursos e pode correr num simples Raspberry Pi. Economize a energia da sua máquina!
 license=Código aberto
-license_desc=Vá buscá-lo em <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Junte-se a nós dando a <a target="_blank" rel="noopener noreferrer" href="%[2]s">sua contribuição</a> para tornar este programa ainda melhor. Não se acanhe e contribua!
+license_desc=Todas as fontes estão disponíveis no <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>! Junte-se a nós e <a target="_blank" rel="noopener noreferrer" href="%[2]s">contribua</a> para tornar este projeto ainda melhor. Não receie tornar-se colaborador!
 
 [install]
 install=Instalação
@@ -291,7 +291,7 @@ smtp_port=Porto do SMTP
 smtp_from=Email do remetente
 smtp_from_helper=Endereço de email que o Forgejo vai usar. Insira um endereço de email simples ou use o formato "Nome" <email@exemplo.com>.
 mailer_user=Nome de utilizador do SMTP
-mailer_password=Senha do SMTP
+mailer_password=Palavra-passe do SMTP
 register_confirm=Exigir confirmação de email para se inscrever
 mail_notify=Habilitar notificações por email
 server_service_title=Configurações do servidor e de terceiros
@@ -316,7 +316,7 @@ admin_setting.description=A criação de uma conta de administração é opciona
 admin_title=Configurações da conta de administração
 admin_name=Nome de utilizador do administrador
 admin_password=Senha
-confirm_password=Confirme a senha
+confirm_password=Confirme a palavra-passe
 admin_email=Endereço de email
 install_btn_confirm=Instalar Forgejo
 test_git_failed=Não foi possível testar o comando "git": %v
@@ -339,9 +339,9 @@ default_enable_timetracking=Habilitar, por norma, a contagem do tempo
 default_enable_timetracking.description=Habilitar, por norma, a contagem do tempo nos novos repositórios.
 no_reply_address=Domínio dos emails ocultos
 no_reply_address_helper=Nome de domínio para utilizadores com um endereço de email oculto. Por exemplo, o nome de utilizador "silva" será registado no Git como "silva@semresposta.exemplo.org" se o domínio de email oculto estiver definido como "semresposta.exemplo.org".
-password_algorithm=Algoritmo de Hash da Senha
+password_algorithm=Algoritmo de Hash da palavra-passe
 invalid_password_algorithm=Algoritmo de hash da senha inválido
-password_algorithm_helper=Definir o algoritmo de hash da senha. Os algoritmos têm requisitos e resistência distintos. `argon2` é bastante seguro, mas usa muita memória e pode ser inapropriado para sistemas pequenos.
+password_algorithm_helper=Defina o algoritmo de hash da palavra-passe. Os algoritmos têm requisitos e níveis de segurança diferentes. O algoritmo argon2 é bastante seguro, mas consome muita memória e pode não ser apropriado para sistemas com poucos recursos.
 enable_update_checker=Habilitar verificador de novidades
 env_config_keys=Configuração do ambiente
 env_config_keys_prompt=As seguintes variáveis de ambiente também serão aplicadas ao seu ficheiro de configuração:
@@ -415,7 +415,7 @@ disable_register_mail=A confirmação por email da inscrição está desabilitad
 manual_activation_only=Contacte o administrador para completar a habilitação.
 remember_me=Memorizar este dispositivo
 remember_me.compromised=O identificador da sessão já não é válido, o que pode indicar uma conta comprometida. Verifique se a sua conta apresenta operações pouco habituais.
-forgot_password_title=Esqueci-me da senha
+forgot_password_title=Esqueci-me da palavra-passe
 forgot_password=Esqueceu a sua senha?
 sign_up_now=Precisa de uma conta? Inscreva-se agora.
 sign_up_successful=A conta foi criada com sucesso. Bem-vindo/a!
@@ -744,7 +744,7 @@ social=Contas sociais
 applications=Aplicações
 orgs=Organizações
 repos=Repositórios
-delete=Eliminar a conta
+delete=Eliminar conta
 twofa=Autenticação em dois passos (TOTP)
 account_link=Contas vinculadas
 organization=Organizações
@@ -829,7 +829,7 @@ activations_pending=Habilitações pendentes
 can_not_add_email_activations_pending=Existe uma validação pendente. Tente de novo dentro de alguns minutos, se quiser adicionar um novo email.
 delete_email=Remover
 email_deletion=Remover endereço de email
-email_deletion_desc=O endereço de email e informações relacionadas serão removidos da sua conta. Os cometimentos feitos no Git com este endereço de email permanecerão inalterados. Quer continuar?
+email_deletion_desc=Este endereço de email e informações relacionadas serão removidos da sua conta. Os cometimentos feitos no Git com este endereço de email permanecerão inalterados. Quer continuar?
 email_deletion_success=O endereço de email foi removido.
 theme_update_success=O seu tema foi substituído.
 theme_update_error=O tema escolhido não existe.
@@ -1063,8 +1063,8 @@ language.description = Este idioma vai ser guardado na sua conta e ser usado com
 language.localization_project = Ajude-nos a traduzir o Forgejo para o seu idioma! <a href="%s">Saiba mais</a>.
 pronouns_custom_label = Pronomes personalizados
 user_block_yourself = Não se pode bloquear a si próprio.
-change_username_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estará disponível para todos após um período de espera de %[1]d dia, podendo ainda reivindicar o nome de utilizador antigo durante o período de espera.
-change_username_redirect_prompt.with_cooldown.few = O nome de utilizador antigo ficará disponível para todos após um período de espera de %[1]d dias, podendo ainda reivindicar o nome de utilizador antigo durante o período de espera.
+change_username_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estará disponível para todos após um período de espera de %[1]d dia. Pode ainda reivindicar o nome de utilizador antigo durante o período de espera.
+change_username_redirect_prompt.with_cooldown.few = O nome de utilizador antigo ficará disponível para todos após um período de espera de %[1]d dias. Pode ainda reivindicar o nome de utilizador antigo durante o período de espera.
 quota.applies_to_user = As seguintes regras de quotas aplicam-se à sua conta
 quota.sizes.assets.artifacts = Artefactos
 quota.rule.exceeded.helper = O tamanho total dos objectos para esta regra excedeu a quota.
@@ -1093,7 +1093,7 @@ regenerate_token = Regenerar
 access_token_regeneration_desc = A regeneração de um código irá revogar o acesso à sua conta para as aplicações que o utilizam. Isto não pode ser anulado. Continuar?
 
 [repo]
-new_repo_helper=Um repositório contém todos os ficheiros do trabalho, incluindo o histórico das revisões. Já tem um hospedado noutro sítio? <a href="%s">Migre o repositório</a>.
+new_repo_helper=Um repositório contém todos os ficheiros do projeto, incluindo o histórico das revisões. Já tem um hospedado noutro sítio? <a href="%s">Migre o repositório</a>.
 owner=Proprietário(a)
 owner_helper=Algumas organizações podem não aparecer na lista suspensa devido a um limite máximo de contagem de repositórios.
 repo_name=Nome do repositório
@@ -1133,7 +1133,7 @@ issue_labels=Rótulos
 issue_labels_helper=Escolha um conjunto de rótulos
 license=Licença
 license_helper=Escolha um ficheiro de licença
-license_helper_desc=Uma licença rege o que os outros podem, ou não, fazer com o seu código fonte. Não tem a certeza sobre qual a mais indicada para o seu trabalho? Veja: <a target="_blank" rel="noopener noreferrer" href="%s">Escolher uma licença</a>.
+license_helper_desc=Uma licença rege o que os outros podem, ou não, fazer com o seu código fonte. Não tem a certeza sobre qual a mais indicada para o seu projeto? Veja: <a target="_blank" rel="noopener noreferrer" href="%s">Escolher uma licença</a>.
 object_format=Formato dos elementos
 object_format_helper=Formato dos elementos do repositório. Não poderá ser alterado mais tarde. SHA1 é o mais compatível.
 readme=README
@@ -1157,7 +1157,7 @@ mirror_sync=sincronizado
 mirror_sync_on_commit=Sincronizar quando forem enviados cometimentos
 mirror_address=Clonar a partir do URL
 mirror_address_desc=Coloque, na secção de autorização, as credenciais que, eventualmente, sejam necessárias.
-mirror_address_url_invalid=O URL fornecido é inválido. Tem que codificar adequadamente todos os componentes do URL.
+mirror_address_url_invalid=O URL fornecido é inválido. Certifique-se de que os componentes da URL estão codificados corretamente.
 mirror_address_protocol_invalid=O URL fornecido é inválido. Só se pode replicar a partir de endereços http(s):// ou git://.
 mirror_lfs=Armazenamento de Ficheiros Grandes (LFS)
 mirror_lfs_desc=Habilitar a réplica de dados LFS.
@@ -1247,7 +1247,7 @@ migrate_items_releases=Lançamentos
 migrate_repo=Migrar o repositório
 migrate.clone_address=Migrar / clonar a partir do URL
 migrate.clone_address_desc=O URL de clonagem HTTP(S) ou Git de um repositório existente
-migrate.github_token_desc=Pode colocar aqui um ou mais códigos separados por vírgulas para tornar mais rápida a migração, para compensar a limitação de velocidade da API do GitHub. AVISO: O abuso desta funcionalidade poderá violar a política do seu fornecedor de serviço e levar ao bloqueio da conta.
+migrate.github_token_desc=Pode colocar aqui um ou mais códigos aqui, separados por vírgulas, para tornar mais rápida a migração, contornando a limitação de taxa da API do GitHub. AVISO: O uso abusivo desta funcionalidade poderá violar a política do seu fornecedor de serviço e levar ao bloqueio da(s) sua(s) conta(s).
 migrate.clone_local_path=ou uma localização no servidor local
 migrate.permission_denied=Não está autorizado a importar repositórios locais.
 migrate.permission_denied_blocked=Não pode importar de servidores não permitidos, por favor peça ao administrador para verificar as configurações ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
@@ -1479,23 +1479,23 @@ projects=Planeamentos
 projects.desc=Gerir questões e integrações nos quadros do planeamento.
 projects.description=Descrição (opcional)
 projects.description_placeholder=Descrição
-projects.create=Criar planeamento
+projects.create=Criar projeto
 projects.title=Título
-projects.new=Novo planeamento
+projects.new=Novo projeto
 projects.new_subheader=Coordene, acompanhe e modifique o seu trabalho num só lugar, para que os planeamentos se mantenham transparentes e cumpram o calendário.
 projects.create_success=O planeamento "%s" foi criado.
-projects.deletion=Eliminar planeamento
+projects.deletion=Eliminar projeto
 projects.deletion_desc=Eliminar um planeamento remove-o de todas as questões relacionadas. Continuar?
 projects.deletion_success=O planeamento foi eliminado.
-projects.edit=Editar planeamentos
+projects.edit=Editar projeto
 projects.edit_subheader=Planeamentos organizam questões e acompanham o progresso.
-projects.modify=Editar planeamento
+projects.modify=Editar projeto
 projects.edit_success=O planeamento "%s" foi modificado.
 projects.type.none=Nenhum
 projects.type.basic_kanban=Kanban básico
 projects.type.bug_triage=Triagem de erros
 projects.template.desc=Modelo
-projects.template.desc_helper=Escolha um modelo de planeamento para começar
+projects.template.desc_helper=Escolha um modelo de projeto para começar
 projects.type.uncategorized=Sem categoria
 projects.column.edit=Editar coluna
 projects.column.edit_title=Nome
@@ -1507,7 +1507,7 @@ projects.column.set_default_desc=Definir esta coluna como a predefinida para que
 projects.column.unset_default=Deixar de ser a predefinida
 projects.column.unset_default_desc=Faz com que esta coluna deixe de ser a predefinida
 projects.column.delete=Eliminar coluna
-projects.column.deletion_desc=Eliminar uma coluna de um planeamento faz com que todas as questões que nela constam sejam movidas para a coluna padrão. Continuar?
+projects.column.deletion_desc=Eliminar uma coluna de um projeto faz com que todas as questões que nela constam sejam movidas para a coluna padrão. Continuar?
 projects.column.color=Colorido
 projects.open=Abrir
 projects.close=Fechar
@@ -1519,7 +1519,7 @@ projects.card_type.text_only=Apenas texto
 issues.desc=Organize relatórios de erros, tarefas e etapas.
 issues.filter_assignees=Filtrar encarregado
 issues.filter_milestones=Filtrar etapa
-issues.filter_projects=Filtrar planeamento
+issues.filter_projects=Filtrar projeto
 issues.filter_labels=Filtrar rótulo
 issues.filter_reviewers=Filtrar revisor
 issues.new=Questão nova
@@ -1530,8 +1530,8 @@ issues.new.clear_labels=Retirar rótulos
 issues.new.projects=Planeamentos
 issues.new.clear_projects=Limpar planeamentos
 issues.new.no_projects=Nenhum planeamento
-issues.new.open_projects=Planeamentos abertos
-issues.new.closed_projects=Planeamentos fechados
+issues.new.open_projects=Projetos abertos
+issues.new.closed_projects=Projetos fechados
 issues.new.no_items=Sem itens
 issues.new.milestone=Etapa
 issues.new.no_milestone=Sem etapa
@@ -1583,7 +1583,7 @@ issues.remove_ref_at=`removeu a referência <b>%s</b> %s`
 issues.add_ref_at=`adicionou a referência <b>%s</b> %s`
 issues.delete_branch_at=`eliminou o ramo <b>%s</b> %s`
 issues.filter_label=Rótulo
-issues.filter_label_exclude=`Use <code>alt</code> + <code>clique/enter</code> para excluir rótulos`
+issues.filter_label_exclude=Use <kbd>Alt</kbd> + <kbd>Clique</kbd> para excluir rótulos
 issues.filter_label_no_select=Todos os rótulos
 issues.filter_label_select_no_label=Sem rótulo
 issues.filter_milestone=Etapa
@@ -1657,13 +1657,13 @@ issues.close_comment_issue=Fechar com comentário
 issues.reopen_issue=Reabrir
 issues.reopen_comment_issue=Reabrir com comentário
 issues.create_comment=Comentar
-issues.closed_at=`encerrou esta questão <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`reabriu esta questão <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`referenciou esta questão num cometimento <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">referiu esta questão %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">referiu este pedido de integração %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">referiu esta questão a partir de um pedido de integração %[4]s que a fechará</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">referiu esta questão a partir de um pedido de integração %[4]s que a reabrirá</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`encerrou esta questão %s`
+issues.reopened_at=`reabriu esta questão %s`
+issues.commit_ref_at=`referenciou esta questão num cometimento %s`
+issues.ref_issue_from=`<a href="%[2]s">referiu esta questão %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">referiu este pedido de integração %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">referiu esta questão a partir de um pedido de integração %[3]s que a fechará</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">referiu esta questão a partir de um pedido de integração %[3]s que a reabrirá</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">encerrou esta questão %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">reabriu esta questão %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`de %[1]s`
@@ -1768,7 +1768,7 @@ issues.error_modifying_due_date=Falhou a modificação da data de vencimento.
 issues.error_removing_due_date=Falhou a remoção da data de vencimento.
 issues.push_commit_1=adicionou %d cometimento %s
 issues.push_commits_n=adicionou %d cometimentos %s
-issues.force_push_codes=`forçou o envio %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> para <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`forçou o envio %[1]s de <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s para <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Comparar
 issues.due_date_form=aaaa-mm-dd
 issues.due_date_form_add=Adicionar data de vencimento
@@ -1880,7 +1880,7 @@ pulls.select_commit_hold_shift_for_range=Escolha o comentimento. Mantenha premid
 pulls.review_only_possible_for_full_diff=A revisão só é possível ao visualizar o diff completo
 pulls.filter_changes_by_commit=Filtrar por cometimento
 pulls.nothing_to_compare=Estes ramos são iguais. Não há necessidade de criar um pedido de integração.
-pulls.nothing_to_compare_have_tag=O ramo/etiqueta escolhidos são iguais.
+pulls.nothing_to_compare_have_tag=Os ramos/etiquetas escolhidos são iguais.
 pulls.nothing_to_compare_and_allow_empty_pr=Estes ramos são iguais. Este pedido de integração ficará vazio.
 pulls.has_pull_request=`Já existe um pedido de integração entre estes ramos: <a href="%[1]s">%[2]s#%[3]d</a>`
 pulls.create=Criar um pedido de integração
@@ -1972,8 +1972,8 @@ pulls.update_branch_success=A sincronização do ramo foi bem sucedida
 pulls.update_not_allowed=Não tem autorização para sincronizar o ramo
 pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base
 pulls.close=Encerrar pedido de integração
-pulls.closed_at=`fechou este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`reabriu este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`fechou este pedido de integração %s`
+pulls.reopened_at=`reabriu este pedido de integração %s`
 pulls.cmd_instruction_hint=Ver instruções para a linha de comandos
 pulls.cmd_instruction_checkout_title=Conferir
 pulls.cmd_instruction_checkout_desc=No seu repositório, irá criar um novo ramo para que possa testar as modificações.
@@ -2049,7 +2049,7 @@ ext_wiki=Wiki externo
 ext_wiki.desc=Ligação para um wiki externo.
 
 wiki=Wiki
-wiki.welcome=Bem-vindo(a) ao Wiki.
+wiki.welcome=Bem-vindo(a) à wiki.
 wiki.welcome_desc=O wiki permite escrever e partilhar documentação com os colaboradores.
 wiki.desc=Escrever e partilhar documentação com os colaboradores.
 wiki.create_first_page=Criar a primeira página
@@ -2236,7 +2236,7 @@ settings.pulls.default_delete_branch_after_merge=Eliminar, por norma, o ramo do
 settings.pulls.default_allow_edits_from_maintainers=Permitir, por norma, que os responsáveis editem
 settings.releases_desc=Habilitar lançamentos no repositório
 settings.packages_desc=Habilitar o registo de pacotes do repositório
-settings.projects_desc=Habilitar planeamentos no repositório
+settings.projects_desc=Habilitar projetos no repositório
 settings.actions_desc=Habilitar sequências CI/CD integradas com Forgejo Actions
 settings.admin_settings=Configurações do administrador
 settings.admin_enable_health_check=Habilitar verificações de integridade (git fsck) no repositório
@@ -2785,7 +2785,7 @@ settings.wiki_rename_branch_main_desc = Renomear o ramo usado internamente pelo
 settings.add_collaborator_blocked_our = Não foi possível adicionar o/a colaborador/a porque o/a proprietário/a do repositório bloqueou-os.
 settings.add_webhook.invalid_path = A localização não pode conter "." ou ".." ou ficar em branco. Não pode começar ou terminar com uma barra.
 settings.graphql_url = URL do GraphQL
-pulls.commit_ref_at = `referiu este pedido de integração a partir de um cometimento <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `referiu este pedido de integração a partir de um cometimento %s`
 settings.confirm_wiki_branch_rename = Renomear o ramo do wiki
 settings.wiki_branch_rename_success = O nome do ramo do wiki do repositório foi normalizado com sucesso.
 settings.wiki_branch_rename_failure = Falhou a normalização do nome do ramo do wiki do repositório.
@@ -2834,7 +2834,7 @@ form.string_too_long = O texto fornecido é mais comprido do que %d caracteres.
 settings.federation_settings = Configurações da federação
 settings.federation_apapiurl = URL de federação deste repositório. Copie e cole nas configurações de federação de outro repositório como um URL de um repositório que está a ser seguido.
 issues.edit.already_changed = Não foi possível guardar as modificações desta questão. O conteúdo parece ter sido modificado por outro utilizador. Refresque a página e tente editar novamente para evitar sobrescrever as modificações que fizeram
-project = Planeamentos
+project = Projetos
 pulls.edit.already_changed = Não foi possível guardar as modificações do pedido de integração. O conteúdo parece ter sido modificado por outro utilizador. Refresque a página e tente editar novamente para evitar sobrescrever as modificações que fizeram
 subscribe.issue.guest.tooltip = Inicie sessão para subscrever esta questão.
 subscribe.pull.guest.tooltip = Inicie sessão para subscrever este pedido de integração.
@@ -2909,6 +2909,20 @@ pulls.editable = Editável
 pulls.editable_explanation = Este pedido de integração permite edições dos responsáveis. Pode contribuir diretamente para ele.
 issues.filter_no_results = Nenhum resultado
 issues.filter_no_results_placeholder = Tente ajustar os seus filtros de pesquisa.
+migrate.repo_desc_helper = Deixe em branco para importar a descrição existente
+archive.nocomment = Não é possível fazer comentários porque o repositório está arquivado.
+comment.blocked_by_user = Não é possível comentar porque está bloqueado pelo proprietário do repositório ou pelo autor.
+sync_fork.branch_behind_few = Este ramo está %[1]d cometimentos atrás de %[2]s
+sync_fork.button = Sincronizar
+sync_fork.branch_behind_one = Este ramo está %[1]d cometimento atrás de %[2]s
+settings.event_action_failure = Falha
+settings.event_action_failure_desc = A execução da ação terminou com falha.
+settings.event_action_recover = Recuperar
+settings.event_header_action = Eventos da execução de ações
+settings.event_action_recover_desc = A execução de ação foi bem sucedida depois da última execução de ação na mesma sequência de trabalho ter falhado.
+settings.event_action_success = Sucesso
+settings.event_action_success_desc = A Execução de ação foi bem sucedida.
+issues.filter_type.all_pull_requests = Todos os pedidos de integração
 
 [graphs]
 component_loading=A carregar %s…
@@ -3044,8 +3058,8 @@ teams.invite.by=Convidado(a) por %s
 teams.invite.description=Clique no botão abaixo para se juntar à equipa.
 follow_blocked_user = Não pode seguir esta organização porque esta organização bloqueou-o/a.
 open_dashboard = Abrir painel de controlo
-settings.change_orgname_redirect_prompt.with_cooldown.one = O nome antigo da organização estará disponível para todos após um período de espera de %[1]d dia, podendo ainda reivindicar o nome antigo durante o período de espera.
-settings.change_orgname_redirect_prompt.with_cooldown.few = O nome antigo da organização estará disponível para todos após um período de espera de %[1]d dias, podendo ainda reivindicar o nome antigo durante o período de espera.
+settings.change_orgname_redirect_prompt.with_cooldown.one = O nome antigo da organização estará disponível para todos após um período de espera de %[1]d dia. Pode ainda reivindicar o nome antigo durante o período de espera.
+settings.change_orgname_redirect_prompt.with_cooldown.few = O nome antigo da organização estará disponível para todos após um período de espera de %[1]d dias. Pode ainda reivindicar o nome antigo durante o período de espera.
 
 [admin]
 dashboard=Painel de controlo
@@ -3623,7 +3637,7 @@ auto_merge_pull_request=`fez automaticamente a integração constante no pedido
 transfer_repo=transferiu o repositório <code>%s</code> para <a href="%s">%s</a>
 push_tag=enviou a etiqueta <a href="%[2]s">%[3]s</a> para <a href="%[1]s">%[4]s</a>
 delete_tag=eliminou a etiqueta %[2]de <a href="%[1]s">%[3]s</a>
-delete_branch=eliminou o ramo %[2]s de <a href="%[1]s">%[3]s</a>
+delete_branch=eliminou o ramo <code>%[2]s</code> de <a href="%[1]s">%[3]s</a>
 compare_branch=Comparar
 compare_commits=Comparar %d comentimentos
 compare_commits_general=Comparar comentimentos
@@ -3805,7 +3819,7 @@ swift.install2=e execute o seguinte comando:
 vagrant.install=Para adicionar uma máquina virtual Vagrant, execute o seguinte comando:
 settings.link=Vincular este pacote a um repositório
 settings.link.description=Se você vincular um pacote a um repositório, o pacote será listado na lista de pacotes do repositório.
-settings.link.select=Escolha o repositório
+settings.link.select=Escolher repositório
 settings.link.button=Modificar vínculo ao repositório
 settings.link.success=O vínculo ao repositório foi modificado com sucesso.
 settings.link.error=Falhou a modificação do vínculo ao repositório.
@@ -3845,7 +3859,7 @@ owner.settings.cleanuprules.success.update=A regra de limpeza foi modificada.
 owner.settings.cleanuprules.success.delete=A regra de limpeza foi eliminada.
 owner.settings.chef.title=Registo do Chef
 owner.settings.chef.keypair=Gerar par de chaves
-owner.settings.chef.keypair.description=É necessário um par de chaves para autenticar no registro Chef. Se você gerou um par de chaves antes, gerar um novo par de chaves irá descartar o par de chaves antigo.
+owner.settings.chef.keypair.description=Os pedidos enviados para o registo do Chef têm de ser assinados criptograficamente como meio de autenticação. Ao gerar um par de chaves, apenas a chave pública é armazenada no Forgejo. A chave privada é-lhe fornecida para ser utilizada com o knife. A geração de um novo par de chaves substituirá o anterior.
 owner.settings.cargo.rebuild.no_index = Não foi possível reconstruir, não há um índice inicializado.
 npm.dependencies.bundle = Dependências agrupadas
 arch.pacman.repo.multi.item = Configurações para %s
@@ -3996,10 +4010,10 @@ runs.no_workflows.help_write_access = Não sabe como começar com o Forgejo Acti
 variables.not_found = Não foi possível encontrar a variável.
 
 [projects]
-type-1.display_name=Planeamento individual
-type-2.display_name=Planeamento do repositório
-type-3.display_name=Planeamento da organização
-deleted.display_name = Planeamento eliminado
+type-1.display_name=Projeto individual
+type-2.display_name=Projeto do repositório
+type-3.display_name=Projeto da organização
+deleted.display_name = Projeto eliminado
 
 [git.filemode]
 changed_filemode=%[1]s → %[2]s
@@ -4018,7 +4032,7 @@ code_search_by_git_grep = Os resultados da pesquisa no código-fonte neste momen
 no_results = Não foram encontrados resultados correspondentes.
 package_kind = Pesquisar pacotes…
 runner_kind = Pesquisar executores…
-project_kind = Pesquisar planeamentos…
+project_kind = Pesquisar projetos…
 branch_kind = Pesquisar ramos…
 commit_kind = Pesquisar cometimentos…
 search = Procurar…
@@ -4062,8 +4076,8 @@ test = ok :)
 [repo.permissions]
 code.read = <b>Ler:</b> Aceder e clonar o código-fonte do repositório.
 releases.read = <b>Ler:</b> Ver e descarregar lançamentos.
-projects.read = <b>Ler:</b> Aceder aos quadros de planeamento do repositório.
-projects.write = <b>Escrever:</b> Criar planeamentos e colunas e editá-las.
+projects.read = <b>Ler:</b> Aceder aos quadros de projeto do repositório.
+projects.write = <b>Escrever:</b> Criar projetos e colunas e editá-las.
 packages.read = <b>Ler:</b> Ver e descarregar pacotes atribuídos ao repositório.
 packages.write = <b>Escrever:</b> Publicar e eliminar pacotes atribuídos ao repositório.
 actions.read = <b>Ler:</b> Ver sequências CI/CD integrados e os seus registos.
diff --git a/options/locale/locale_ro.ini b/options/locale/locale_ro.ini
index 305c34d013..f12301307d 100644
--- a/options/locale/locale_ro.ini
+++ b/options/locale/locale_ro.ini
@@ -18,7 +18,7 @@ concept_user_organization = Organizație
 logo = Logo
 help = Ajutor
 sign_up = Înregistrare
-link_account = Conectare cont
+link_account = Conectați conturi
 register = Înregistrare
 template = Șablon
 language = Limbă
@@ -91,7 +91,7 @@ remove_label_str = Șterge elementul "%s"
 save = Salvează
 remove = Șterge
 copy_path = Copiază cale
-error404 = Pagina pe care încerci să o vizitezi fie <strong>nu există</strong> sau <strong>nu ești autorizat</strong> să o vezi.
+error404 = Pagina pe care încercați să o vizitați fie <strong>nu există</strong>, <strong>a fost ștearsă</strong> sau <strong>nu sunteți autorizat</strong> să o puteți vedea.
 filter.not_archived = Nearhivat
 activities = Activități
 confirm_delete_selected = Ștergi toate elementele selectate?
@@ -104,8 +104,47 @@ home = Acasă
 dashboard = Panou de Control
 version = Versiune
 powered_by = Susținut de %s
-active_stopwatch = Monitorizor de timp activ
+active_stopwatch = Contor timp activ
 more_items = Mai multe elemente
+tracked_time_summary = Rezumat al timpului monitorizat, bazat pe filtrele listei de probleme
+signed_in_as = Conectat ca
+toggle_menu = Afișează sau ascunde meniul
+passcode = Cod de acces
+repository = Repozitoriu
+new_project_column = Coloană nouă
+new_fork = Bifurcație de repozitoriu nouă
+new_repo.title = Repozitoriu nou
+new_repo.link = Repozitoriu nou
+all = Tot
+forks = Bifurcații
+pull_requests = Cereri de extragere
+issues = Probleme
+milestones = Etape
+twofa_scratch = Cod de rezervă pentru autentificare prin doi factori
+collaborative = Colaborativ
+rerun = Reporniți
+rerun_all = Reporniți toate joburile
+add_all = Adaugă toate
+remove_all = Șterge toate
+copy_branch = Copiați numele ramurii
+write = Scrieți
+error413 = V-ați epuizat cota.
+invalid_data = Date invalide: %v
+unpin = Desprindeți
+concept_code_repository = Repozitoriu
+show_timestamps = Afișați marcajele temporale
+pin = Fixați
+show_full_screen = Afișați pe tot ecranul
+download_logs = Descărcați jurnalele
+value = Valoare
+filter.not_fork = Nu sunt bifurcații
+filter.is_mirror = Copii identice
+filter.not_mirror = Nu sunt copii identice
+filter.public = Publice
+filter.private = Private
+filter.not_template = Nu sunt șabloane
+filter.is_fork = Bifurcații
+filter.is_template = Șabloane
 
 [editor]
 table_modal.header = Adaugă tabel
@@ -121,6 +160,19 @@ buttons.bold.tooltip = Adaugă text aldin
 buttons.code.tooltip = Adaugă cod
 buttons.quote.tooltip = Citează text
 buttons.link.tooltip = Adaugă un link
+buttons.heading.tooltip = Adăugați titlu
+buttons.list.unordered.tooltip = Adăugați o listă
+buttons.list.task.tooltip = Adăugați o listă de sarcini
+buttons.switch_to_legacy.tooltip = Folosiți în schimb editorul vechi
+buttons.ref.tooltip = Faceți o referire la o problemă sau o cerere de extragere
+buttons.enable_monospace_font = Activați fontul monospațiat
+buttons.disable_monospace_font = Dezactivați fontul monospațiat
+buttons.indent.tooltip = Indentați obiectele cu un nivel
+buttons.unindent.tooltip = Nu mai indentați obiectele cu un nivel
+link_modal.url = URL
+link_modal.description = Descriere
+link_modal.header = Adăugați un link
+link_modal.paste_reminder = Indiciu: Cu un URL salvat în clipboard, puteți lipi direct în editor pentru a crea un link.
 
 [filter]
 string.asc = A - Z
@@ -129,10 +181,14 @@ string.desc = Z - A
 [error]
 server_internal = Eroare internă a serverului
 network_error = Eroare de rețea
+occurred = A apărut o eroare
+not_found = Obiectul nu a putut fi găsit.
+report_message = Dacă credeți că aceasta este o problemă cu Forgejo, vă rugăm să căutați probleme pe <a href="%s" target="_blank">Codeberg</a> sau să deschideți o nouă problemă dacă este necesar.
 
 [startpage]
 install = Ușor de instalat
 license = Sursă deschisă
+app_desc = Un serviciu Git fără probleme, auto-găzduit
 
 [install]
 require_db_desc = Forgejo are nevoie de MySQL, PostgreSQL, SQLite3 sau TiDB (protocol MySQL).
@@ -223,15 +279,31 @@ invalid_db_setting = Setările pentru bază de date sunt invalide: %v
 no_reply_address = Domeniu pentru adrese de email ascunse
 
 [search]
-user_kind = Caută utilizatori...
-team_kind = Caută echipe...
-code_kind = Caută cod...
-project_kind = Caută proiecte...
-package_kind = Caută pachete...
-org_kind = Caută organizații...
+user_kind = Căutați utilizatori…
+team_kind = Căutați echipe…
+code_kind = Căutați cod…
+project_kind = Căutați proiecte…
+package_kind = Căutați pachete…
+org_kind = Căutați organizații…
 code_search_unavailable = Căutarea de cod nu este disponibilă momentan. Te rog contactează administratorul site-ului.
 keyword_search_unavailable = Căutarea după cuvânt cheie nu este disponibilă momentan. Te rog contactează administratorul site-ului.
 no_results = Nu a fost găsit niciun rezultat corespunzător.
+search = Căutați…
+type_tooltip = Tipul căutării
+fuzzy = Aproximată
+union = Cuvinte cheie
+union_tooltip = Includeți rezultate care sunt asemănătoare cuvintelor cheie separate prin spațiu
+exact = Exactă
+exact_tooltip = Includeți doar rezultate care se potrivesc exact termenului de căutare
+regexp = Expresie regulată
+regexp_tooltip = Interpretați termenul de căutare ca o expresie regulată
+branch_kind = Căutați ramuri…
+commit_kind = Căutați comiteri…
+issue_kind = Căutați probleme…
+pull_kind = Căutați cereri de extragere…
+fuzzy_tooltip = Includeți rezultate care sunt asemănătoare termenului de căutare
+repo_kind = Căutați repozitorii…
+runner_kind = Căutați executori…
 
 [aria]
 navbar = Bară de navigare
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 41e2cc39ed..3f007ce4ba 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -755,7 +755,7 @@ public_profile=Публичный профиль
 biography_placeholder=Кратко расскажите о себе другим! (Можно использовать Markdown)
 location_placeholder=Пусть все знают, откуда вы
 profile_desc=Ваш профиль
-password_username_disabled=Нелокальным пользователям запрещено изменение их имени пользователя. Для получения более подробной информации обратитесь к администратору сайта.
+password_username_disabled=Нелокальные пользователи не могут изменить имя. Для подробностей обратитесь к администрации сайта.
 full_name=Полное имя
 website=Веб-сайт
 location=Местоположение
@@ -766,7 +766,7 @@ update_language_not_found=Язык «%s» недоступен.
 update_language_success=Язык обновлён.
 update_profile_success=Ваш профиль успешно обновлён.
 change_username=Ваше имя пользователя было изменено.
-change_username_prompt=Обратите внимание: изменение имени пользователя также меняет URL вашей учётной записи.
+change_username_prompt=Учтите, что при изменении имени пользователя ссылка на ваш профиль тоже будет изменена.
 change_username_redirect_prompt=Старое имя будет перенаправлять на новое до тех пор, пока оно не будет занято.
 continue=Далее
 cancel=Отмена
@@ -1053,7 +1053,7 @@ hints = Подсказки
 additional_repo_units_hint = Предлагать включить больше разделов в репозиториях
 update_hints = Обновить подсказки
 update_hints_success = Подсказки обновлены.
-additional_repo_units_hint_description = Показывать подсказку "Включить больше разделов" в репозиториях, в которых включены не все разделы.
+additional_repo_units_hint_description = Показывать подсказку «Включить больше разделов» в репозиториях, в которых включены не все разделы.
 pronouns_custom = Другие
 pronouns = Местоимения
 pronouns_unspecified = Не указаны
@@ -1063,7 +1063,7 @@ language.description = Выбранный язык будет сохранён 
 language.localization_project = Помогите с переводом Forgejo на свой язык! <a href="%s">Подробнее</a>.
 user_block_yourself = Нельзя заблокировать себя.
 pronouns_custom_label = Другие местоимения
-change_username_redirect_prompt.with_cooldown.one = Прежнее имя будет доступно для использования другим пользователям после истечения защиты в %[1]d день. Вы сможете вернуть его себе во время срока защиты.
+change_username_redirect_prompt.with_cooldown.one = Прежнее имя будет доступно для использования другим пользователям после истечения простоя в %[1]d день. Вы сможете вернуть его себе во время срока простоя.
 change_username_redirect_prompt.with_cooldown.few = Прежнее имя будет доступно для использования другим пользователям после истечения защиты в %[1]d дней. Вы сможете вернуть его себе во время срока защиты.
 keep_pronouns_private = Показывать местоимения только зарегистрированным пользователям
 keep_pronouns_private.description = Местоимения будут скрыты от пользователей, не имеющих учётных записей на сервере.
@@ -1232,7 +1232,7 @@ migrate_items_releases=Выпуски
 migrate_repo=Перенос репозитория
 migrate.clone_address=Перенос / Клонирование по URL
 migrate.clone_address_desc=HTTP/HTTPS или Git адрес существующего репозитория
-migrate.github_token_desc=Вы можете указать один или несколько разделенных запятыми токенов, чтобы ускорить перенос за счёт обхода ограничений частоты обращений к API GitHub. ПРЕДУПРЕЖДЕНИЕ: злоупотребление этой функцией может нарушить условия предоставления услуг и привести к блокировке учётной записи.
+migrate.github_token_desc=Вы можете указать один или несколько токенов, разделенных запятыми, чтобы ускорить перенос за счёт обхода ограничения частоты обращений к API GitHub. ПРЕДУПРЕЖДЕНИЕ: злоупотребление этой функцией может нарушить политику поставщика услуг и привести к блокировке вашей учётной записи.
 migrate.clone_local_path=или локальный путь на сервере
 migrate.permission_denied=У вас нет прав на импорт локальных репозиториев.
 migrate.permission_denied_blocked=Вы не можете импортировать с запрещённых хостов, пожалуйста, попросите администратора проверить настройки ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS.
@@ -1408,7 +1408,7 @@ editor.fail_to_update_file=Не удалось обновить/создать 
 editor.fail_to_update_file_summary=Ошибка:
 editor.push_rejected_no_message=Изменение отклонено сервером без сообщения. Пожалуйста, проверьте Git-хуки.
 editor.push_rejected=Изменение отклонено сервером. Пожалуйста, проверьте Git-хуки.
-editor.push_rejected_summary=Причина отклонения:
+editor.push_rejected_summary=Полная причина отклонения:
 editor.add_subdir=Добавить каталог…
 editor.unable_to_upload_files=Не удалось загрузить файлы в «%s» из-за ошибки: %v
 editor.upload_file_is_locked=Файл «%s» заблокирован %s.
@@ -1450,7 +1450,7 @@ commit.cherry-pick-content=Выбрать ветвь для переноса:
 commitstatus.error=Ошибка
 commitstatus.failure=Неудача
 commitstatus.pending=Ожидание
-commitstatus.success=Успешно
+commitstatus.success=Успех
 
 ext_issues=Внешние задачи
 ext_issues.desc=Ссылка на внешнюю систему отслеживания задач.
@@ -1545,27 +1545,27 @@ issues.add_labels=добавлены метки %s %s
 issues.remove_label=удалил(а) метку %s %s
 issues.remove_labels=удалил(а) метки %s %s
 issues.add_remove_labels=добавлены метки %s и убраны метки %s %s
-issues.add_milestone_at=`добавлено в этап <b>%s</b> %s`
-issues.add_project_at=`добавлено в проект <b>%s</b> %s`
-issues.change_milestone_at=`изменил(а) целевой этап с <b>%s</b> на <b>%s</b> %s`
-issues.change_project_at=`изменил(а) проект с <b>%s</b> на <b>%s</b> %s`
-issues.remove_milestone_at=`удалил(а) это из этапа <b>%s</b> %s`
-issues.remove_project_at=`удалил(а) это из проекта <b>%s</b> %s`
+issues.add_milestone_at=`добавление в этап <b>%s</b> %s`
+issues.add_project_at=`добавление в проект <b>%s</b> %s`
+issues.change_milestone_at=`этап изменён с <b>%s</b> на <b>%s</b> %s`
+issues.change_project_at=`проект изменён с <b>%s</b> на <b>%s</b> %s`
+issues.remove_milestone_at=`удаление из этапа <b>%s</b> %s`
+issues.remove_project_at=`удаление из проекта <b>%s</b> %s`
 issues.deleted_milestone=`(удалено)`
 issues.deleted_project=`(удалено)`
-issues.self_assign_at=`назначил(а) на себя %s`
-issues.add_assignee_at=`был(а) назначен(а) <b>%s</b> %s`
-issues.remove_assignee_at=`был снят с назначения <b>%s</b> %s`
-issues.remove_self_assignment=`убрал(а) их назначение %s`
-issues.change_title_at=`изменил(а) заголовок с <b><strike>%s</strike></b> на <b>%s</b> %s`
-issues.change_ref_at=`изменил(а) ссылку с <b><strike>%s</strike></b> на <b>%s</b> %s`
-issues.remove_ref_at=`убрал(а) ссылку <b>%s</b> %s`
-issues.add_ref_at=`добавлена ссылка <b>%s</b> %s`
+issues.self_assign_at=`назначение себя %s`
+issues.add_assignee_at=`назначение <b>%s</b> %s`
+issues.remove_assignee_at=`снятие с назначения <b>%s</b> %s`
+issues.remove_self_assignment=`снято назначение с себя %s`
+issues.change_title_at=`заголовок изменён с <b><strike>%s</strike></b> на <b>%s</b> %s`
+issues.change_ref_at=`изменена ссылка с <b><strike>%s</strike></b> на <b>%s</b> %s`
+issues.remove_ref_at=`убрана ссылка на <b>%s</b> %s`
+issues.add_ref_at=`добавлена ссылка на <b>%s</b> %s`
 issues.delete_branch_at=`удалена ветвь <b>%s</b> %s`
-issues.filter_label=Метка
-issues.filter_label_exclude=`Используйте <code>alt</code> + <code>click/enter</code>, чтобы исключить метки`
-issues.filter_label_no_select=Все метки
-issues.filter_label_select_no_label=Нет метки
+issues.filter_label=Метки
+issues.filter_label_exclude=Исключайте метки с помощью <kbd>Alt</kbd> + <kbd>ЛКМ</kbd>
+issues.filter_label_no_select=Любые метки
+issues.filter_label_select_no_label=Без меток
 issues.filter_milestone=Этап
 issues.filter_milestone_all=Все этапы
 issues.filter_milestone_none=Нет этапов
@@ -1637,13 +1637,13 @@ issues.close_comment_issue=Закрыть комментарием
 issues.reopen_issue=Открыть снова
 issues.reopen_comment_issue=Открыть снова комментарием
 issues.create_comment=Комментировать
-issues.closed_at=`задача была закрыта <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`задача была открыта снова <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`упоминание этой задачи в коммите <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">упоминание этой задачи %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">упоминание этого запроса слияния %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">упоминание из запроса на слияние %[4]s, который закроет эту задачу</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">упоминание из запроса на слияние %[4]s, который повторно откроет эту задачу</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`задача была закрыта %s`
+issues.reopened_at=`задача была открыта снова %s`
+issues.commit_ref_at=`упоминание этой задачи в коммите %s`
+issues.ref_issue_from=`<a href="%[2]s">упоминание этой задачи %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">упомянул этот запрос на слияние %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">упомянул эту задачу в запросе на слияние %[3]s, который закроет её</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">упомянул эту задачу в запросе на слияние %[3]s, который переоткроет эту задачу</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">закрыл этот запрос %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">задача была открыта снова %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`из %[1]s`
@@ -1748,7 +1748,7 @@ issues.error_modifying_due_date=Не удалось изменить срок в
 issues.error_removing_due_date=Не удалось убрать срок выполнения.
 issues.push_commit_1=добавлен %d коммит %s
 issues.push_commits_n=добавлены %d коммита(ов) %s
-issues.force_push_codes=`форсированное обновление изменений %[1]s <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> вместо <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[6]s`
+issues.force_push_codes=`форсированное обновление изменений %[1]s <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[8]s вместо <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Сравнить
 issues.due_date_form=гггг-мм-дд
 issues.due_date_form_add=Добавить срок выполнения
@@ -1943,8 +1943,8 @@ pulls.update_branch_success=Ветвь успешно обновлена
 pulls.update_not_allowed=Недостаточно прав для обновления ветви
 pulls.outdated_with_base_branch=Эта ветвь отстает от базовой ветви
 pulls.close=Закрыть запрос слияния
-pulls.closed_at=`закрыл этот запрос на слияние <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`переоткрыл этот запрос на слияние <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`закрыл этот запрос на слияние %s`
+pulls.reopened_at=`переоткрыл этот запрос на слияние %s`
 pulls.cmd_instruction_hint=Показать инструкции для командной строки
 pulls.cmd_instruction_merge_title=Слейте изменения
 pulls.cmd_instruction_merge_desc=Слейте изменения и отправьте их обратно.
@@ -2698,7 +2698,7 @@ error.csv.invalid_field_count=Не удается отобразить этот
 mirror_address_protocol_invalid = Эта ссылка недействительна. Для зеркалирования можно использовать только расположения http(s):// и git:// .
 fork_no_valid_owners = Невозможно создать ответвление этого репозитория, т.к. здесь нет действующих владельцев.
 new_repo_helper = Репозиторий содержит все файлы проекта и историю изменений. Уже где-то есть репозиторий? <a href="%s">Выполните перенос</a>.
-mirror_address_url_invalid = Эта ссылка недействительна. Необходимо правильно указать все части адреса.
+mirror_address_url_invalid = Указанная ссылка недействительна. Убедитесь, что все части экранированы правильно.
 issues.comment.blocked_by_user = Вы не можете комментировать под этой задачей, т.к. вы заблокированы владельцем репозитория или автором задачи.
 pulls.blocked_by_user = Невозможно создать запрос на слияние в этом репозитории, т.к. вы заблокированы его владельцем.
 settings.add_collaborator_blocked_our = Невозможно добавить соучастника, т.к. он заблокирован в этом репозитории.
@@ -2756,7 +2756,7 @@ ambiguous_runes_description = `Этот файл содержит символы
 editor.invalid_commit_mail = Неправильная почта для создания коммита.
 pulls.has_merged = Слияние не удалось: запрос уже был слит, изменение целевой ветви или повторное слияние невозможно.
 settings.enter_repo_name = Введите имя владельца и название репозитория как указано:
-signing.wont_sign.error = Не удалось проверить возможность подписать коммит.
+signing.wont_sign.error = Не удалось проверить возможность подписания коммита.
 signing.wont_sign.nokey = Сервер не предоставляет ключ для подписи коммита.
 settings.wiki_globally_editable = Разрешить редактирование вики всем пользователям
 settings.webhook.test_delivery_desc_disabled = Активируйте этот веб-хук для проверки тестовым событием.
@@ -2772,7 +2772,7 @@ settings.ignore_stale_approvals = Игнорировать устаревшие
 contributors.contribution_type.additions = Добавления
 contributors.contribution_type.deletions = Удаления
 contributors.contribution_type.filter_label = Вид деятельности:
-pulls.commit_ref_at = `упоминание этого запроса слияния в коммите <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `сослался на этот запрос слияния в коммите %s`
 settings.thread_id = ИД обсуждения
 pulls.made_using_agit = AGit
 activity.navbar.contributors = Соавторы
@@ -2910,6 +2910,20 @@ issues.reopen.blocked_by_user = Повторное открытие задачи
 pulls.comment.blocked_by_user = Вы не можете комментировать под этим запросом слияния, т.к. вы заблокированы владельцем репозитория или автором задачи.
 issues.filter_no_results = Ничего не нашлось
 issues.filter_no_results_placeholder = Попробуйте поискать по-другому.
+migrate.repo_desc_helper = Оставьте пустым, чтобы скопировать описание из источника
+archive.nocomment = Комментирование невозможно, потому что этот репозиторий архивирован.
+comment.blocked_by_user = Комментирование невозможно, потому что вы заблокированы его владельцем или автором обсуждения.
+sync_fork.branch_behind_few = Эта ветвь отстаёт от %[2]s на %[1]d коммитов
+sync_fork.button = Синхронизировать
+sync_fork.branch_behind_one = Эта ветвь отстаёт от %[2]s на %[1]d коммит
+settings.event_header_action = События выполнений Действий
+settings.event_action_failure = Неудача
+settings.event_action_failure_desc = Выполнение завершилось неудачно.
+settings.event_action_recover = Восстановлен
+settings.event_action_recover_desc = После неудачи повторное выполнение рабочего потока было успешно.
+settings.event_action_success = Успех
+settings.event_action_success_desc = Выполнение завершилось успешно.
+issues.filter_type.all_pull_requests = Все запросы на слияние
 
 [graphs]
 component_loading_failed = Не удалось загрузить %s
@@ -3106,7 +3120,7 @@ dashboard.resync_all_hooks=Повторно синхронизировать х
 dashboard.reinit_missing_repos=Переинициализировать все отсутствующие Git репозитории, для которых существуют записи
 dashboard.sync_external_users=Синхронизировать данные сторонних пользователей
 dashboard.cleanup_hook_task_table=Очистить таблицу hook_task
-dashboard.cleanup_packages=Очистка устаревших пакетов
+dashboard.cleanup_packages=Удалить устаревшие пакеты
 dashboard.server_uptime=Время работы
 dashboard.current_goroutine=Выполняемые goroutines
 dashboard.current_memory_usage=Текущее использование памяти
@@ -3568,7 +3582,7 @@ self_check.no_problem_found = Пока проблем не обнаружено.
 auths.tip.gitea = Зарегистрируйте новое приложение OAuth2. Доступна инструкция: %s
 auths.tips.oauth2.general.tip = При регистрации нового приложения OAuth2 ссылка обратного перенаправления должна быть:
 self_check.database_fix_mysql = Пользователи MySQL и MariaDB могут исправить проблемы с сопоставлением командой "forgejo doctor convert". Также можно вручную вписать "ALTER ... COLLATE ..." в SQL.
-dashboard.cleanup_actions = Очистить устаревшие журналы и артефакты Действий
+dashboard.cleanup_actions = Удалить устаревшие журналы и артефакты Действий
 dashboard.sync_repo_branches = Синхронизировать ветви из Git в базу данных
 assets = Кодовые объекты
 dashboard.sync_tag.started = Начата синхронизация тегов
@@ -3625,7 +3639,7 @@ auto_merge_pull_request=`автоматически принят запрос н
 transfer_repo=репозиторий <code>%s</code> был передан: <a href="%s">%s</a>
 push_tag=отправлен тег <a href="%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
 delete_tag=удалён тег %[2]s в <a href="%[1]s">%[3]s</a>
-delete_branch=удалена ветвь %[2]s в <a href="%[1]s">%[3]s</a>
+delete_branch=удалена ветвь <code>%[2]s</code> в <a href="%[1]s">%[3]s</a>
 compare_branch=Сравнить
 compare_commits=Сравнить %d коммитов
 compare_commits_general=Сравнить коммиты
@@ -3831,7 +3845,7 @@ owner.settings.cargo.initialize.error=Не удалось инициализир
 owner.settings.cargo.initialize.success=Индекс Cargo успешно создан.
 owner.settings.cargo.rebuild=Перестроить индекс
 owner.settings.cargo.rebuild.error=Не удалось перестроить индекс Cargo: %v
-owner.settings.cargo.rebuild.success=Индекс Cargo успешно перестроен.
+owner.settings.cargo.rebuild.success=Индекс Cargo был перестроен успешно.
 owner.settings.cleanuprules.title=Правила очистки
 owner.settings.cleanuprules.add=Добавить правило очистки
 owner.settings.cleanuprules.edit=Изменить правило очистки
@@ -3856,7 +3870,7 @@ owner.settings.chef.keypair=Создать пару ключей
 owner.settings.cleanuprules.none = Правил очистки пока нет.
 owner.settings.cargo.rebuild.description = Пересборка может быть полезна в случае, если индекс не синхронизирован с хранящимися пакетами Cargo.
 rpm.repository.multiple_groups = Этот пакет доступен в нескольких группах.
-owner.settings.chef.keypair.description = Для аутентификации реестра Chef необходима пара ключей. Если до этого вы уже сгенерировали пару ключей, генерация новой приведёт к прекращению действия предыдущей.
+owner.settings.chef.keypair.description = Запросы к реестру Chef заверяются криптографическими подписями для аутентификации. При создании пары ключей только публичный ключ сохраняется в базе Forgejo. Закрытый ключ, который вы получите, будет использоваться knife. Создание новой пары ключей удалит старую.
 owner.settings.cargo.rebuild.no_index = Невозможно выполнить пересборку. Нет инициализированного индекса.
 npm.dependencies.bundle = Комплектные зависимости
 arch.pacman.conf = Добавьте адрес с необходимым дистрибутивом и архитектурой в <code>/etc/pacman.conf</code>:
@@ -3908,10 +3922,10 @@ unit.desc=Управление встроенными конвейерами CI/
 status.unknown=Неизвестно
 status.waiting=Ожидает
 status.running=Запущено
-status.success=Успешно
+status.success=Успех
 status.failure=Неудача
 status.cancelled=Отменено
-status.skipped=Пропущено
+status.skipped=Пропущен
 status.blocked=Заблокировано
 
 runners=Исполнители
@@ -3932,7 +3946,7 @@ runners.task_list.run=Запуск
 runners.task_list.status=Состояние
 runners.task_list.repository=Репозиторий
 runners.task_list.commit=Коммит
-runners.task_list.done_at=Время завершения
+runners.task_list.done_at=Завершено
 runners.edit_runner=Изменить исполнитель
 runners.update_runner=Обновить изменения
 runners.update_runner_success=Исполнитель успешно обновлён
@@ -3954,7 +3968,7 @@ runners.reset_registration_token_success=Токен регистрации ис
 runs.all_workflows=Все рабочие потоки
 runs.commit=коммит
 runs.scheduled=Запланировано
-runs.pushed_by=отправлено
+runs.pushed_by=отправлен
 runs.invalid_workflow_helper=Файл конфигурации рабочего потока некорректен. Пожалуйста, проверьте конфигурационный файл: %s
 runs.actor=Автор
 runs.status=Состояние
diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini
index d55b238b1c..4e1690af9f 100644
--- a/options/locale/locale_si-LK.ini
+++ b/options/locale/locale_si-LK.ini
@@ -482,7 +482,7 @@ avatar=අවතාර්
 ssh_gpg_keys=SSH/ජීපීජී යතුරු
 social=සමාජ ගිණුම්
 applications=යෙදුම්
-orgs=සංවිධාන කළමනාකරණය
+orgs=සංවිධාන
 repos=කෝෂ්ඨ
 delete=ගිණුම මකන්න
 twofa=ද්වි-සාධක සත්යාපනය
@@ -527,8 +527,8 @@ password_change_disabled=දේශීය නොවන පරිශීලකය
 
 emails=වි-තැපැල් ලිපින
 manage_emails=වි-තැපැල් ලිපින කළමනාකරණය
-manage_themes=පෙරනිමි තේමාව තෝරන්න
-manage_openid=OpenID ලිපිනයන් කළමනාකරණය කරන්න
+manage_themes=පෙරනිමි තේමාව
+manage_openid=OpenID ලිපින
 theme_desc=මෙම වෙබ් අඩවිය හරහා ඔබගේ පෙරනිමි තේමාව වනු ඇත.
 primary=ප්රාථමික
 activated=සක්රිය
@@ -1100,12 +1100,12 @@ issues.close_comment_issue=අදහස් දක්වා වසන්න
 issues.reopen_issue=නැවත විවෘත කරන්න
 issues.reopen_comment_issue=අදහස් දක්වා විවෘත කරන්න
 issues.create_comment=අදහස
-issues.closed_at=`මෙම ගැටළුව වසා <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`මෙම ගැටළුව නැවත විවෘත කරන ලදි <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">මෙම නිකුතුව %[4]s හි</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">මෙම අදින්න ඉල්ලීම%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">මෙම ගැටළුව වසා දමනු ඇත%[4]s මෙම ගැටළුව</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">මෙම ගැටළුව නැවත විවෘත කරනු ඇත%[4]s මෙම ගැටළුව</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`මෙම ගැටළුව වසා %s`
+issues.reopened_at=`මෙම ගැටළුව නැවත විවෘත කරන ලදි %s`
+issues.ref_issue_from=`<a href="%[2]s">මෙම නිකුතුව %[3]s හි</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">මෙම අදින්න ඉල්ලීම%[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">මෙම ගැටළුව වසා දමනු ඇත%[3]s මෙම ගැටළුව</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">මෙම ගැටළුව නැවත විවෘත කරනු ඇත%[3]s මෙම ගැටළුව</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">මෙම නිකුතුව%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">මෙම නිකුතුව%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>නැවත විවෘත කරන ලදි`
 issues.ref_from=`හිම%[1]s`
@@ -1187,7 +1187,7 @@ issues.error_modifying_due_date=නියමිත දිනය වෙනස්
 issues.error_removing_due_date=නියමිත දිනය ඉවත් කිරීමට අපොහොසත් විය.
 issues.push_commit_1=එකතු %d කැප %s
 issues.push_commits_n=එකතු %d විවරයන් %s
-issues.force_push_codes=`බලය-pushed%[1]s සිට <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> <a class="%[7]s" href="%[5]s"><code>%[4]s ගේ</code></a> %[6]s`
+issues.force_push_codes=`බලය-pushed%[1]s සිට <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s <a class="%[7]s" href="%[5]s"><code>%[4]s ගේ</code></a> %[9]s %[6]s`
 issues.force_push_compare=සසඳන්න
 issues.due_date_form=Yyy-mm-dd
 issues.due_date_form_add=නියමිත දිනය එකතු කරන්න
@@ -1342,8 +1342,8 @@ pulls.update_branch_rebase=රිබේස් මගින් ශාඛාව 
 pulls.update_branch_success=ශාඛා යාවත්කාලීන කිරීම සාර්ථක විය
 pulls.update_not_allowed=ශාඛාව යාවත්කාලීන කිරීමට ඔබට අවසර නැත
 pulls.outdated_with_base_branch=මෙම ශාඛාව මූලික ශාඛාව සමඟ දිවයයි
-pulls.closed_at=`මෙම අදින්න ඉල්ලීම වසා <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන ලදි <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`මෙම අදින්න ඉල්ලීම වසා %s`
+pulls.reopened_at=`මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන ලදි %s`
 
 
 
@@ -2488,7 +2488,7 @@ merge_pull_request=`ඒකාබද්ධ අදින්න ඉල්ලීම
 transfer_repo=මාරු කරන ලද ගබඩාව <code>%s</code> සිට <a href="%s">%s</a>
 push_tag=තල්ලු ටැගය <a href="%[2]s">%[3]s ගේ</a> <a href="%[1]s">%[4]s ගේ</a>
 delete_tag=මකාදැමුවා ටැගය%[2]s සිට <a href="%[1]s">%[3]s</a>
-delete_branch=මකාදැමූ ශාඛාව %[2]s සිට <a href="%[1]s">%[3]s</a>
+delete_branch=මකාදැමූ ශාඛාව <code>%[2]s</code> සිට <a href="%[1]s">%[3]s</a>
 compare_branch=සසඳන්න
 compare_commits=%d විවරයන් සසඳා බලන්න
 compare_commits_general=විවරයන් සසඳා බලන්න
diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini
index ff8f57d7cb..aa2f863b14 100644
--- a/options/locale/locale_sk-SK.ini
+++ b/options/locale/locale_sk-SK.ini
@@ -144,7 +144,6 @@ issues = Problémy
 
 filter.is_archived = Archivované
 filter.private = Súkromný
-
 toggle_menu = Prepni menu
 more_items = Viac vecí
 
@@ -598,7 +597,7 @@ avatar=Avatar
 ssh_gpg_keys=SSH / GPG kľúče
 social=Sociálne účty
 applications=Aplikácie
-orgs=Spravovať organizácie
+orgs=Organizácie
 repos=Repozitáre
 delete=Zmazať účet
 twofa=Dvojfaktorové overenie
@@ -657,8 +656,8 @@ password_change_disabled=Externe overovaní používatelia nemôžu aktualizova
 
 emails=E-mailové adresy
 manage_emails=Správa e-mailových adries
-manage_themes=Nastavenie predvolenej témy
-manage_openid=Správa OpenID adries
+manage_themes=Predvolená téma
+manage_openid=Adresy OpenID
 theme_desc=Toto bude vaša predvolená téma vzhľadu naprieč stránkou.
 primary=Primárny
 activated=Aktivovaný
diff --git a/options/locale/locale_sl.ini b/options/locale/locale_sl.ini
index 7754796558..07ccaed259 100644
--- a/options/locale/locale_sl.ini
+++ b/options/locale/locale_sl.ini
@@ -106,7 +106,7 @@ tracked_time_summary = Povzetek spremljanega časa na podlagi filtrov seznama za
 email = E-poštni naslov
 captcha = CAPTCHA
 sources = Viri
-issues = Vprašanja
+issues = Težave
 milestones = Mejniki
 ok = OK
 copy_branch = Kopiranje imena veje
@@ -126,14 +126,14 @@ filter.not_mirror = Ni zrcaljen
 filter.public = Javni
 filter.private = Zasebno
 filter.not_archived = Ni arhivirano
-pull_requests = Zahteve za umik
+pull_requests = Zahteve za spajanje
 
 [install]
 reinstall_confirm_check_3 = Potrjujete, da ste popolnoma prepričani, da se ta program Forgejo izvaja s pravilno lokacijo app.ini, in da ste prepričani, da ga morate znova namestiti. Potrjujete, da se zavedate zgoraj navedenih tveganj.
 require_db_desc = Forgejo zahteva MySQL, PostgreSQL, SQLite3 ali TiDB (protokol MySQL).
 password_algorithm_helper = Nastavite algoritem za stiskanje gesla. Algoritmi imajo različne zahteve in moč. Algoritem argon2 je precej varen, vendar porabi veliko pomnilnika in je lahko neprimeren za majhne sisteme.
 reinstall_confirm_message = Ponovna namestitev z obstoječo zbirko podatkov Forgejo lahko povzroči več težav. V večini primerov morate za zagon programa Forgejo uporabiti obstoječi "app.ini". Če veste, kaj počnete, potrdite naslednje:
-err_admin_name_is_reserved = Administrator Uporabniško ime je neveljavno, uporabniško ime je rezervirano
+err_admin_name_is_reserved = Administrator uporabniško ime je neveljavno, uporabniško ime je rezervirano
 disable_gravatar.description = Onemogočite vire avatarjev Gravatar in avatarje tretjih oseb. Uporabi se privzeti avatar, razen če uporabnik lokalno naloži avatar.
 install = Namestitev
 title = Začetna nastavitev
@@ -367,7 +367,7 @@ delete = Brisanje računa
 uploaded_avatar_is_too_big = Velikost naložene datoteke (%d KiB) presega največjo velikost (%d KiB).
 webauthn = Dvofaktorsko preverjanje pristnosti (varnostni ključi)
 change_username_redirect_prompt = Staro uporabniško ime bo preusmerjeno, dokler ga nekdo ne prevzame.
-orgs = Upravljanje organizacij
+orgs = Organizacije
 public_profile = Javni profil
 gpg_key_verified_long = Ključ je bil preverjen z žetonom in ga je mogoče uporabiti za preverjanje zavez, ki ustrezajo vsem aktiviranim e-poštnim naslovom tega uporabnika, poleg vseh ujemajočih se identitet za ta ključ.
 
@@ -495,14 +495,14 @@ tab_openid = Odprta identiteta
 
 [home]
 show_both_archived_unarchived = Prikazovanje arhiviranih in nearhiviranih
-switch_dashboard_context = Kontekst stikala Nadzorna plošča
+switch_dashboard_context = Kontekst stikala nadzorna plošča
 search_repos = Poiščite skladišče…
 filter_by_team_repositories = Filtriranje po skupinskih skladiščih
 show_archived = Arhivirano
 collaborative_repos = Sodelovalni repozitoriji
 my_mirrors = Moja ogledala
 show_only_public = Prikazovanje samo javnih
-uname_holder = Uporabniško ime ali E-poštovni naslov
+uname_holder = Uporabniško ime ali e-poštni naslov
 password_holder = Geslo
 my_repos = Repozitoriji
 show_more_repos = Prikaži več skladišč…
diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini
index 56c1a7e650..b14fdc1a35 100644
--- a/options/locale/locale_sr-SP.ini
+++ b/options/locale/locale_sr-SP.ini
@@ -326,7 +326,7 @@ issues.no_content=Још нема садржаја.
 issues.close_issue=Затвори
 issues.reopen_issue=Поново отвори
 issues.create_comment=Коментирај
-issues.commit_ref_at=`поменуо овај задатак у комит <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.commit_ref_at=`поменуо овај задатак у комит %s`
 issues.poster=Аутор
 issues.collaborator=Коаутор
 issues.owner=Власник
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index e2d82ee28b..553db1b19a 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -200,15 +200,24 @@ table_modal.placeholder.header = Sidhuvud
 table_modal.placeholder.content = Innehåll
 table_modal.label.rows = Rader
 table_modal.label.columns = Kolumner
+buttons.switch_to_legacy.tooltip = Använd legacy-redigeraren istället
+link_modal.url = Url
+link_modal.description = Beskrivning
+link_modal.header = Lägg till en länk
+buttons.disable_monospace_font = Avaktivera jämnbrett typsnitt
+link_modal.paste_reminder = Tips: Med ett URL i ditt klippbord, kan du klistra in direkt i textredigeraren för att skapa en länk.
+buttons.enable_monospace_font = Aktivera jämnbrett typsnitt
 
 [filter]
 string.asc = A - Ö
+string.desc = Ö - A
 
 [error]
 occurred = Ett fel har inträffat
 server_internal = Internt serverfel
 network_error = Nätverksfel
 report_message = Om du tror att detta är en Forgejo-bugg, sök efter ärenden på <a href="%s" target="_blank">Codeberg </a> eller öppna ett nytt ärende om det behövs.
+not_found = Målet kunde inte hittas.
 
 [startpage]
 app_desc=En smidig, självhostad Git-tjänst
@@ -328,6 +337,8 @@ invalid_app_data_path = Sökvägen för appdata är ogiltig: %v
 internal_token_failed = Misslyckades att generera intern token: %v
 password_algorithm = Hashalgoritm för lösenord
 invalid_password_algorithm = Ogiltig hashalgoritm för lösenord
+env_config_keys_prompt = Följande miljövariabler kommer också att tillämpas på din konfigurationsfil:
+smtp_from_invalid = "Skicka E-post som" adressen är ogiltig
 
 [home]
 uname_holder=Användarnamn eller e-postadress
@@ -461,6 +472,41 @@ reply = eller svara på detta e-postmeddelande direkt
 hi_user_x = Hej <b>%s</b>,
 admin.new_user.user_info = Användarinformation
 admin.new_user.text = Vänligen <a href="%s">klicka här</a> för att hantera denna användare från administratörspanelen.
+admin.new_user.subject = Ny användare %s har just registrerat sig
+totp_disabled.no_2fa = Det finns inga andra 2FA-metoder konfigurerade längre, vilket innebär att det inte längre är nödvändigt att logga in på ditt konto med 2FA.
+removed_security_key.text_1 = Säkerhetsnyckeln ”%[1]s” har just tagits bort från ditt konto.
+repo.transfer.to_you = dig
+repo.transfer.body = För att acceptera eller avvisa det, besök %s eller ignorera det helt enkelt.
+removed_security_key.no_2fa = Det finns inga andra 2FA-metoder konfigurerade längre, vilket innebär att det inte längre är nödvändigt att logga in på ditt konto med 2FA.
+release.note = Notera:
+totp_enrolled.subject = Du har aktiverat TOTP som 2FA-metod
+totp_enrolled.text_1.no_webauthn = Du har just aktiverat TOTP för ditt konto. Det innebär att du måste använda TOTP som 2FA-metod vid alla framtida inloggningar på ditt konto.
+totp_enrolled.text_1.has_webauthn = Du har just aktiverat TOTP för ditt konto. Det innebär att du vid alla framtida inloggningar på ditt konto kan använda TOTP som 2FA-metod eller någon av dina säkerhetsnycklar.
+link_not_working_do_paste = Fungerar inte länken? Prova att kopiera och klistra in den i webbläsarens adressfält.
+primary_mail_change.text_1 = Den primära e-postadressen för ditt konto har just ändrats till %[1]s. Det innebär att denna e-postadress inte längre kommer att ta emot e-postmeddelanden för ditt konto.
+totp_disabled.subject = TOTP har inaktiverats
+totp_disabled.text_1 = Tidsbaserat engångslösenord (TOTP) på ditt konto har just inaktiverats.
+account_security_caution.text_2 = Om detta inte var du, har ditt konto blivit kompromitterat. Kontakta administratören för denna webbplats.
+account_security_caution.text_1 = Om detta var du, kan du tryggt ignorera detta meddelande.
+activate_account.text_2 = Klicka på följande länk för att aktivera ditt konto inom <b>%s</b>:
+activate_email.text = Klicka på följande länk för att verifiera din e-postadress inom <b>%s</b>:
+register_notify.text_3 = Om någon annan har skapat det här kontot åt dig måste du först <a href="%s">ställa in ditt lösenord</a>.
+issue.x_mentioned_you = <b>@%s2</b> nämnde dig:
+repo.collaborator.added.subject = %s har lagt till dig som medarbetare i %s
+repo.collaborator.added.text = Du har lagts till som medarbetare i förrådet:
+team_invite.subject = %[1]s har bjudit in dig att gå med i organisationen %[2]s
+register_notify.text_1 = detta är din registreringsbekräftelse via e-post för %s!
+release.downloads = Hämtningar:
+release.download.zip = Källkod (ZIP)
+release.download.targz = Källkod (TAR.GZ)
+repo.transfer.subject_to = %s vill överföra förrådet ”%s” till %s
+removed_security_key.subject = En säkerhetsnyckel har tagits bort
+issue_assigned.pull = @%[1] har tilldelat dig pull-begäran %[2]s i förrådet %[3]s.
+issue_assigned.issue = @%[1] har tilldelat dig ärendet %[2] i förrådet %[3].
+register_notify.text_2 = Du kan logga in på ditt konto med ditt användarnamn: %s
+reset_password.text = Om detta var du, klicka på följande länk för att återställa ditt konto inom <b>%s</b>:
+issue.action.force_push = <b>%[1]s2</b> gjorde en force-push av <b>%[2]s</b> från %[3]s till %[4]s.
+repo.transfer.subject_to_you = %s vill överföra förrådet ”%s” till dig
 
 
 
@@ -544,6 +590,12 @@ auth_failed=Autentisering misslyckades: %v
 
 
 target_branch_not_exist=Målgrenen finns inte.
+org_still_own_repo = Denna organisation äger fortfarande ett eller flera förråd, ta bort eller överför dem först.
+must_use_public_key = Den nyckel du angav är en privat nyckel. Skicka inte upp din privata nyckel någonstans. Använd istället din publika nyckel.
+unable_verify_ssh_key = SSH-nyckeln kan inte verifieras. Kontrollera att den är korrekt.
+still_own_repo = Ditt konto äger ett eller flera förråd, ta bort eller överför dem först.
+still_has_org = Ditt konto är medlem i en eller flera organisationer. Lämna dem först.
+still_own_packages = Ditt konto har ett eller flera paket, ta bort dem först.
 
 
 [user]
@@ -559,6 +611,13 @@ follow=Följ
 unfollow=Sluta följa
 user_bio=Biografi
 disabled_public_activity=Den här användaren har inaktiverat den publika synligheten av aktiviteten.
+code = Kod
+watched = Övervakade förråd
+unblock = Avblockera
+email_visibility.limited = Din e-postadress är synlig för alla autentiserade användare
+show_on_map = Visa denna plats på en karta
+settings = Användarinställningar
+block = Blockera
 
 
 [settings]
@@ -759,6 +818,17 @@ email_notifications.submit=Ställ in e-postpreferenser
 visibility.public=Offentlig
 visibility.private=Privat
 change_password = Byt lösenord
+user_block_success = Användaren har blockerats.
+blocked_since = Blockerad sedan %s
+user_unblock_success = Användaren har blivit avblockerad.
+visibility.limited = Begränsad
+visibility.limited_tooltip = Synlig endast för inloggade användare
+visibility.private_tooltip = Synlig endast för medlemmar i organisationer som du har gått med i
+select_permissions = Välj behörigheter
+permission_no_access = Ingen åtkomst
+permission_write = Läs och skriv
+user_block_yourself = Du kan inte blockera dig själv.
+gpg_token_help = Du kan skapa en signatur med hjälp av:
 
 [repo]
 owner=Ägare
@@ -854,7 +924,7 @@ migrate.migrate_items_options=Åtkomsttoken krävs för att migrera ytterligare
 migrated_from=Migrerad från <a href="%[1]s">%[2]s</a>
 migrated_from_fake=Migrerad från %[1]s
 migrate.migrate=Migrera från %s
-migrate.migrating=Migrerar från <b>%s</b> ...
+migrate.migrating=Migrerar från <b>%s</b> …
 migrate.migrating_failed=Migrering från <b>%s</b> misslyckades.
 migrate.migrating_issues=Migrerar ärenden
 
@@ -1093,13 +1163,13 @@ issues.close_comment_issue=Stäng med kommentar
 issues.reopen_issue=Återöppna
 issues.reopen_comment_issue=Öppna igen med kommentar
 issues.create_comment=Kommentera
-issues.closed_at=`stängde ärendet <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`återöppnade detta ärende <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`refererade till detta ärende från en incheckning <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">refererade till detta ärende %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">refererade till denna pull-förfrågan %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">hänvisade till detta ärende från en pull-förfrågan %[4]s som kommer att stänga det</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">hänvisade till detta ärende från en pull-förfrågan %[4]s som kommer att öppna ärendet på nytt</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`stängde ärendet %s`
+issues.reopened_at=`återöppnade detta ärende %s`
+issues.commit_ref_at=`refererade till detta ärende från en incheckning %s`
+issues.ref_issue_from=`<a href="%[2]s">refererade till detta ärende %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">refererade till denna pull-förfrågan %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">hänvisade till detta ärende från en pull-förfrågan %[3]s som kommer att stänga det</a> %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">hänvisade till detta ärende från en pull-förfrågan %[3]s som kommer att öppna ärendet på nytt</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">stängde detta ärende %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">öpnnade detta ärende igen %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`från %[1]s`
@@ -1692,6 +1762,21 @@ topic.manage_topics=Hantera ämnen
 topic.done=Klar
 topic.count_prompt=Du kan inte välja fler än 25 ämnen
 settings.enter_repo_name = Ange ägar- och utvecklingskatalog-namnet exakt som det visas:
+release = Utgåva
+commitstatus.success = Lyckades
+visibility_helper = Gör förrådet privat
+download_bundle = Hämta BUNDLE
+download_zip = Hämta ZIP
+download_tar = Hämta TAR.GZ
+repo_desc_helper = Ange kort beskrivning (valfritt)
+all_branches = Alla grenar
+fork_no_valid_owners = Detta förråd kan inte förgrenas eftersom det inte finns några giltiga ägare.
+fork_to_different_account = Förgrena till ett annat konto
+size_format = %[1]s: %[2]s, %[3]s: %[4]s
+already_forked = Du har redan förgrenat %s
+commitstatus.failure = Fel
+ext_issues = Externa fel
+open_with_editor = Öppna med %s
 
 
 
@@ -2147,7 +2232,7 @@ create_repo=skapade utvecklingskatalog <a href="%s"> %s</a>
 rename_repo=döpte om utvecklingskalatogen från <code>%[1]s</code> till <a href="%[2]s">%[3]s</a>
 transfer_repo=överförde utvecklingskalatogen <code>%s</code> till <a href="%s">%s</a>
 delete_tag=tog bort taggen %[2]s från <a href="%[1]s">%[3]s</a>
-delete_branch=tog bort branchen %[2]s from <a href="%[1]s">%[3]s</a>
+delete_branch=tog bort branchen <code>%[2]s</code> from <a href="%[1]s">%[3]s</a>
 compare_branch=Jämför
 compare_commits=Jämför %d commits
 compare_commits_general=Jämför commits
@@ -2245,17 +2330,17 @@ exact = Exakt
 exact_tooltip = Inkludera bara resultat som exakt matchar söktermen
 repo_kind = Sök repon…
 user_kind = Sök användare…
-code_kind = Sök kod...
-package_kind = Sök paket...
-runner_kind = Sök exekutorer...
-branch_kind = Sök grenar...
-commit_kind = Sök commiter...
-project_kind = Sök projekt...
+code_kind = Sök kod…
+package_kind = Sök paket…
+runner_kind = Sök exekutorer…
+branch_kind = Sök grenar…
+commit_kind = Sök commiter…
+project_kind = Sök projekt…
 search = Sök…
 type_tooltip = Söktyp
-team_kind = Sök lag...
-org_kind = Sök organisationer...
-issue_kind = Sök ärenden...
+team_kind = Sök team…
+org_kind = Sök organisationer…
+issue_kind = Sök ärenden…
 regexp_tooltip = Tolka söktermen som ett reguljärt uttryck
 code_search_unavailable = Kodsökning är för närvarande inte tillgänglig. Vänligen kontakta webbplatsadministratören.
 fuzzy_tooltip = Inkludera resultat som är närliggande till söktermen
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index 60bca95b96..edb32e616f 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -163,10 +163,9 @@ new_repo.link = Yeni depo
 new_org.link = Yeni organizasyon
 error413 = Kotanızı doldurdunuz.
 toggle_menu = Menüyü aç-kapa
-new_migrate.title = Yeni geçiş
-new_migrate.link = Yeni geçiş
+new_migrate.title = Yeni göç
+new_migrate.link = Yeni göç
 copy_path = Dizini kopyala
-
 confirm_delete_artifact = "%s" adlı öğeyi silmek istediğinizden emin misiniz?
 
 [aria]
@@ -180,8 +179,9 @@ number_of_contributions_in_the_last_12_months=son 12 ayda %s katkı
 contributions_zero=Katkı yapılmamış
 less=Daha az
 more=Daha Fazla
-contributions_one = katılım
-contributions_few = katılımlar
+contributions_one = katkı
+contributions_few = katkı
+contributions_format = {day} {month} {year} tarihinde {contributions} katkı
 
 [editor]
 buttons.heading.tooltip=Başlık ekle
@@ -204,6 +204,12 @@ table_modal.placeholder.header = Başlık
 table_modal.placeholder.content = İçerik
 table_modal.label.rows = Satırlar
 table_modal.label.columns = Sütunlar
+link_modal.header = Bağlantı ekle
+link_modal.url = Url
+link_modal.description = Açıklama
+link_modal.paste_reminder = İpucu: Panonuzdaki bir URL'yi doğrudan düzenleyiciye yapıştırarak bir bağlantı oluşturabilirsiniz.
+buttons.unindent.tooltip = Bir seviye girinti azalt
+buttons.indent.tooltip = Bir seviye girinti artır
 
 [filter]
 string.asc=A - Z
@@ -227,6 +233,7 @@ lightweight=Hafif
 lightweight_desc=Forgejo'nın minimal gereksinimleri çok düşüktür ve ucuz bir Raspberry Pi üzerinde çalışabilmektedir. Makine enerjinizden tasarruf edin!
 license=Açık Kaynak
 license_desc=Gidin ve <a target="_blank" rel="noopener noreferrer" href="%[1]s">Forgejo</a>'yı edinin! Bu projeyi daha da iyi yapmak için <a target="_blank" rel="noopener noreferrer" href="%[2]s">katkıda bulunarak</a> bize katılın. Katkıda bulunmaktan çekinmeyin!
+platform_desc = Forgejo'nun Linux ve FreeBSD gibi özgür işletim sistemlerinde ve farklı CPU mimarilerinde çalıştığı doğrulandı. Sevdiğinizi seçin!
 
 [install]
 install=Kurulum
@@ -253,9 +260,9 @@ err_empty_db_path=SQLite3 veritabanı dosya yolu boş olamaz.
 no_admin_and_disable_registration=Bir yönetici hesabı oluşturmadan kullanıcı kaydını kapatamazsınız.
 err_empty_admin_password=Yönetici parolası boş olamaz.
 err_empty_admin_email=Yönetici e-postası boş olamaz.
-err_admin_name_is_reserved=Yönetici Kullanıcı Adı geçersiz, bu kullanıcı adı rezerv edilen bir kelimedir
+err_admin_name_is_reserved=Yönetici kullanıcı adı geçersiz, bu kullanıcı adı rezerv edilen bir kelimedir
 err_admin_name_pattern_not_allowed=Yönetici kullanıcı adı geçersiz, kullanıcı adı ayrılmış bir desenle eşleşiyor
-err_admin_name_is_invalid=Yönetici Kullanıcı Adı geçersiz
+err_admin_name_is_invalid=Yönetici kullanıcı adı geçersiz
 
 general_title=Genel ayarlar
 app_name=Site Başlığı
@@ -297,7 +304,7 @@ federated_avatar_lookup.description=Libravatar kullanarak federe profil resmi ar
 disable_registration=Kendi Kendine Kaydolmayı Devre Dışı Bırak
 disable_registration.description=Kullanıcının kendi kendine kaydolmasını devre dışı bırak. Yalnızca yöneticiler yeni hesaplar oluşturabilecek.
 allow_only_external_registration.description=Sadece belirlenen dış hizmetler aracılığıyla kullanıcı kaydına izin ver.
-openid_signin=OpenID Oturum Açmayı Etkinleştiriniz
+openid_signin=OpenID Oturum Açmayı Etkinleştir
 openid_signin.description=OpenID ile kullanıcı girişini etkinleştir.
 openid_signup=OpenID ile Kendi Kendine Kaydı Etkinleştir
 openid_signup.description=OpenID Tabanlı Kendi Kendi Kullanıcı Kaydını Etkinleştir.
@@ -345,6 +352,7 @@ enable_update_checker_helper_forgejo = release.forgejo.org adresindeki TXT DNS k
 allow_dots_in_usernames = Kullanıcı isimlerinde noktaya izin ver. Var olan kullanıcıları etkilemez.
 
 smtp_from_invalid = `"E-posta Olarak Gönder" adresi geçersiz`
+config_location_hint = Bu yapılandırma seçenekleri şuraya kaydedilecek:
 
 [home]
 uname_holder=Kullanıcı adı veya e-posta adresi
@@ -478,6 +486,7 @@ hint_register = Hesaba ihtiyacın var mı? <a href="%s">Hemen kaydol.</a>
 sign_in_openid = OpenID ile giriş yap
 hint_login = Mevcut hesabın var mı? <a href="%s">Hemen giriş yap!</a>
 use_onetime_code = Tek kullanımlık kod kullan
+change_unconfirmed_email = Kayıt sırasında yanlış e-posta adresi verdiyseniz, aşağıdan değiştirebilirsiniz; yeni adresinize bir onay mesajı gönderilecektir.
 
 [mail]
 view_it_on=%s üzerinde görüntüle
@@ -669,6 +678,7 @@ username_error_no_dots = ` sadece alfanumerik karakterler ("0-9","a-z","A-Z"), t
 
 unset_password = Oturum açma kullanıcısı parola belirlemedi.
 unsupported_login_type = Oturum açma türü hesap silmeyi desteklemiyor.
+email_domain_is_not_allowed = Kullanıcı e-posta adresi <b>%s</b> alan adı EMAIL_DOMAIN_ALLOWLIST veya EMAIL_DOMAIN_BLOCKLIST ile çelişiyor. Lütfen işleminizin beklendiğinden emin olun.
 
 [user]
 change_avatar=Profil resmini değiştir…
@@ -722,16 +732,16 @@ avatar=Avatar
 ssh_gpg_keys=SSH / GPG Anahtarları
 social=Sosyal Medya Hesapları
 applications=Uygulamalar
-orgs=Organizasyonları Yönet
+orgs=Kuruluşlar
 repos=Depolar
-delete=Hesabı Sil
-twofa=İki Aşamalı Doğrulama
+delete=Hesabı sil
+twofa=İki aşamalı doğrulama
 account_link=Bağlı Hesaplar
 organization=Organizasyonlar
 uid=UID
 webauthn=Güvenlik Anahtarları
 
-public_profile=Herkese Açık Profil
+public_profile=Herkese açık profil
 biography_placeholder=Bize kendiniz hakkında birşeyler söyleyin! (Markdown kullanabilirsiniz)
 location_placeholder=Yaklaşık konumunuzu başkalarıyla paylaşın
 profile_desc=Profilinizin başkalarına nasıl gösterildiğini yönetin. Ana e-posta adresiniz bildirimler, parola kurtarma ve web tabanlı Git işlemleri için kullanılacaktır.
@@ -796,8 +806,8 @@ password_change_disabled=Yerel olmayan kullanıcılar parolalarını Forgejo web
 
 emails=E-Posta Adresleri
 manage_emails=E-posta Adreslerini Yönet
-manage_themes=Varsayılan temayı seç
-manage_openid=OpenID Adreslerini Yönet
+manage_themes=Varsayılan tema
+manage_openid=OpenID adresleri
 email_desc=Ana e-posta adresiniz bildirimler, parola kurtarma ve gizlenmemişse eğer web tabanlı Git işlemleri için kullanılacaktır.
 theme_desc=Bu, sitedeki varsayılan temanız olacak.
 primary=Birincil
@@ -1166,7 +1176,7 @@ form.name_reserved=Depo adı "%s" rezerve edilmiş.
 form.name_pattern_not_allowed=Depo adında "%s" deseni kullanılamaz.
 
 need_auth=Yetkilendirme
-migrate_options=Göç Seçenekleri
+migrate_options=Göç seçenekleri
 migrate_service=Göç Hizmeti
 migrate_options_mirror_helper=Bu depo bir yansı olacaktır
 migrate_options_lfs=LFS dosyalarını taşı
@@ -1174,7 +1184,7 @@ migrate_options_lfs_endpoint.label=LFS Uç Noktası
 migrate_options_lfs_endpoint.description=Taşıma, <a target="_blank" rel="noopener noreferrer" href="%s"> LFS sunucusunu belirlemek</a> için Git uzak sunucusunu kullanmaya çalışacak. Eğer LFS veri deposu başka yerdeyse özel bir uç nokta da belirtebilirsiniz.
 migrate_options_lfs_endpoint.description.local=Yerel bir sunucu yolu da destekleniyor.
 migrate_options_lfs_endpoint.placeholder=Boş bırakılırsa, uç nokta klon URL'sinden türetilecektir
-migrate_items=Göç Öğeleri
+migrate_items=Göç öğeleri
 migrate_items_wiki=Wiki
 migrate_items_milestones=Kilometre Taşları
 migrate_items_labels=Etiketler
@@ -1215,7 +1225,7 @@ migrate.migrating_labels=Etiketleri Taşıma
 migrate.migrating_releases=Sürümleri Taşıma
 migrate.migrating_issues=Konuları Taşıma
 migrate.migrating_pulls=Değişiklik İsteklerini Taşıma
-migrate.cancel_migrating_title=Göçü İptal Et
+migrate.cancel_migrating_title=Göçü iptal et
 migrate.cancel_migrating_confirm=Bu göçü iptal etmek istiyor musunuz?
 
 mirror_from=şunun yansıması
@@ -1252,7 +1262,7 @@ find_tag=Etiketi bul
 branches=Dal
 tags=Etiket
 issues=Konular
-pulls=Değişiklik İstekleri
+pulls=Değişiklik istekleri
 project_board=Projeler
 packages=Paketler
 actions=İşlemler
@@ -1443,7 +1453,7 @@ projects.column.set_default=Varsayılanı Ayarla
 projects.column.set_default_desc=Bu sütunu kategorize edilmemiş konular ve değişiklik istekleri için varsayılan olarak ayarlayın
 projects.column.unset_default=Varsayılanları Geri Al
 projects.column.unset_default_desc=Bu sütunu varsayılan olarak geri al
-projects.column.delete=Sutün Sil
+projects.column.delete=Sütunu sil
 projects.column.deletion_desc=Bir proje sütununun silinmesi, ilgili tüm konuları 'Kategorize edilmemiş'e taşır. Devam edilsin mi?
 projects.column.color=Renk
 projects.open=Aç
@@ -1594,13 +1604,13 @@ issues.close_comment_issue=Yorum Yap ve Kapat
 issues.reopen_issue=Yeniden aç
 issues.reopen_comment_issue=Yorum Yap ve Yeniden Aç
 issues.create_comment=Yorum yap
-issues.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> konusunu kapattı`
-issues.reopened_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> konusunu yeniden açtı`
-issues.commit_ref_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> işlemesinde bu konuyu işaret etti`
-issues.ref_issue_from=`<a href="%[3]s">bu konuya referansta bulundu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">bu değişiklik isteğine referansta bulundu %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">bir değişiklik isteğine referansta bulundu %[4]s bu konu kapatılacak </a><a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">bir değişiklik isteğine referansta bulundu %[4]s bu konu yeniden açılacak</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`%s konusunu kapattı`
+issues.reopened_at=%s sorununu yeniden açtı
+issues.commit_ref_at=`%s işlemesinde bu konuyu işaret etti`
+issues.ref_issue_from=`<a href="%[2]s">bu konuya referansta bulundu %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">bu değişiklik isteğine referansta bulundu %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">bir değişiklik isteğine referansta bulundu %[3]s bu konu kapatılacak </a>%[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">bir değişiklik isteğine referansta bulundu %[3]s bu konu yeniden açılacak</a> %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">bu konuyu kapat%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">konuyu yeniden aç%[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`%[1]s'den`
@@ -1647,7 +1657,7 @@ issues.label.filter_sort.alphabetically=Alfabetik
 issues.label.filter_sort.reverse_alphabetically=Ters alfabetik
 issues.label.filter_sort.by_size=En küçük boyut
 issues.label.filter_sort.reverse_by_size=En büyük boyut
-issues.num_participants_few=%d Katılımcı
+issues.num_participants_few=%d katılımcı
 issues.attachment.open_tab=`Yeni bir sekmede "%s" görmek için tıkla`
 issues.attachment.download=`"%s" indirmek için tıkla`
 issues.subscribe=Abone Ol
@@ -1705,7 +1715,7 @@ issues.error_modifying_due_date=Bitiş tarihi değiştirilemedi.
 issues.error_removing_due_date=Bitiş tarihi silinemedi.
 issues.push_commit_1=%d işlemeyi %s ekledi
 issues.push_commits_n=%d işlemeyi %s ekledi
-issues.force_push_codes=`%[1]s <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> hedefinden <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> hedefine zorla gönderildi %[6]s`
+issues.force_push_codes=`%[1]s <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s hedefinden <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s hedefine zorla gönderildi %[6]s`
 issues.force_push_compare=Karşılaştır
 issues.due_date_form=yyyy-aa-gg
 issues.due_date_form_add=Bitiş tarihi ekle
@@ -1907,8 +1917,8 @@ pulls.update_branch_success=Dal güncellemesi başarıyla gerçekleştirildi
 pulls.update_not_allowed=Dalı güncelleme izniniz yok
 pulls.outdated_with_base_branch=Bu dal, temel dal ile güncel değil
 pulls.close=Değişiklik İsteğini Kapat
-pulls.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> değişiklik isteğini kapattı`
-pulls.reopened_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> değişiklik isteğini yeniden açtı`
+pulls.closed_at=`%s değişiklik isteğini kapattı`
+pulls.reopened_at=`%s değişiklik isteğini yeniden açtı`
 pulls.cmd_instruction_hint=`Komut satırı talimatlarını görüntüleyin.`
 pulls.cmd_instruction_checkout_title=Çekme
 pulls.cmd_instruction_checkout_desc=Proje deponuzdan yeni bir dalı çekin ve değişiklikleri test edin.
@@ -1984,7 +1994,7 @@ ext_wiki=Harici Vikiye Erişim
 ext_wiki.desc=Harici bir wiki'ye bağlantı.
 
 wiki=Wiki
-wiki.welcome=Wiki'ye Hoşgeldiniz.
+wiki.welcome=Viki'ye Hoş geldiniz.
 wiki.welcome_desc=Wiki, katkıcılarla belge yazmanıza ve paylaşmanıza olanak tanır.
 wiki.desc=Katkıcılarla belgeler yazın ve paylaşın.
 wiki.create_first_page=İlk sayfayı oluştur
@@ -2140,15 +2150,15 @@ settings.use_external_wiki=Harici Wiki Kullan
 settings.external_wiki_url=Harici Wiki bağlantısı
 settings.external_wiki_url_error=Harici wiki URL'si geçerli bir URL değil.
 settings.external_wiki_url_desc=Ziyaretçiler, wiki sekmesine tıklandığında harici wiki URL'sine yönlendirilir.
-settings.issues_desc=Depo Konu İzleyicisini Etkinleştir
-settings.use_internal_issue_tracker=Yerleşik Konu İzleyici Kullan
-settings.use_external_issue_tracker=Harici Konu İzleyici Kullan
-settings.external_tracker_url=Harici Konu İzleyici URLsi
+settings.issues_desc=Depo sorun izleyicisini etkinleştir
+settings.use_internal_issue_tracker=Yerleşik sorun izleyici kullan
+settings.use_external_issue_tracker=Harici sorun izleyici kullan
+settings.external_tracker_url=Harici sorun izleyici URL'si
 settings.external_tracker_url_error=Harici konu izleyici URL'si geçerli bir URL değil.
 settings.external_tracker_url_desc=Ziyaretçiler, konular sekmesine tıkladığında harici konu izleyici URL'sine yönlendirilir.
-settings.tracker_url_format=Harici Konu İzleyici URL Biçimi
+settings.tracker_url_format=Harici sorun izleyici URL Biçimi
 settings.tracker_url_format_error=Harici konu izleyici URL biçimi geçerli bir URL değil.
-settings.tracker_issue_style=Harici Konu İzleyici Numara Biçimi
+settings.tracker_issue_style=Harici sorun izleyici Numara Biçimi
 settings.tracker_issue_style.numeric=Sayısal
 settings.tracker_issue_style.alphanumeric=Alfanumerik
 settings.tracker_issue_style.regexp=Düzenli ifade
@@ -2158,13 +2168,13 @@ settings.tracker_url_format_desc=Kullanıcı adı, depo adı ve yayın dizini i
 settings.enable_timetracker=Zaman Takibini Etkinleştir
 settings.allow_only_contributors_to_track_time=Sadece Katkıcılar İçin Zaman Takibine İzin Ver
 settings.pulls_desc=Değişiklik İsteklerini Etkinleştir
-settings.pulls.ignore_whitespace=Çakışmalar için Boşlukları Gözardı Et
+settings.pulls.ignore_whitespace=Çakışmalar için boşlukları gözardı et
 settings.pulls.enable_autodetect_manual_merge=Kendiliğinden algılamalı elle birleştirmeyi etkinleştir (Not: Bazı özel durumlarda yanlış kararlar olabilir)
 settings.pulls.allow_rebase_update=Değişiklik isteği dalının yeniden yapılandırmayla güncellenmesine izin ver
 settings.pulls.default_delete_branch_after_merge=Varsayılan olarak birleştirmeden sonra değişiklik isteği dalını sil
 settings.pulls.default_allow_edits_from_maintainers=Bakımcıların düzenlemelerine izin ver
 settings.releases_desc=Depo Sürümlerini Etkinleştir
-settings.packages_desc=Depo Paket Kütüğünü Etkinleştir
+settings.packages_desc=Depo paket kayıt defterini etkinleştir
 settings.projects_desc=Depo Projelerini Etkinleştir
 settings.actions_desc=Depo İşlemlerini Etkinleştir
 settings.admin_settings=Yönetici Ayarları
@@ -2188,7 +2198,7 @@ settings.convert_fork_desc=Bu çatalı normal bir depoya dönüştürebilirsiniz
 settings.convert_fork_notices_1=Bu işlem çatalı normal bir depoya dönüştürür ve geri alınamaz.
 settings.convert_fork_confirm=Depoyu Dönüştür
 settings.convert_fork_succeed=Çatal normal bir depoya dönüştürüldü.
-settings.transfer.title=Sahipliği Aktar
+settings.transfer.title=Sahipliği aktar
 settings.transfer.rejected=Depo aktarımı reddedildi.
 settings.transfer.success=Depo aktarımı başarıyla tamamlandı.
 settings.transfer_abort=Aktarımı iptal et
@@ -2448,7 +2458,7 @@ settings.block_on_official_review_requests_desc=Yeterli onay olsa bile, resmi in
 settings.block_outdated_branch=Değişiklik isteği güncel değilse birleştirmeyi engelle
 settings.block_outdated_branch_desc=Baş dal taban dalın arkasındayken birleştirme mümkün olmayacaktır.
 settings.default_branch_desc=Değişiklik istekleri ve kod işlemeleri için varsayılan bir depo dalı seçin:
-settings.merge_style_desc=Biçimleri Birleştir
+settings.merge_style_desc=Birleştirme biçemleri
 settings.default_merge_style_desc=Değişiklik istekleri için varsayılan birleştirme tarzı:
 settings.choose_branch=Bir dal seç…
 settings.no_protected_branch=Korumalı dal yok.
@@ -2701,7 +2711,7 @@ settings.new_owner_blocked_doer = Yeni sahip sizi engelledi.
 
 open_with_editor = %s ile aç
 object_format = Nesne Biçimi
-mirror_sync = eşitlendi
+mirror_sync = eşitlenme:
 stars = Yıldızlar
 desc.sha256 = SHA256
 vendored = Sağlanmış
@@ -2721,6 +2731,25 @@ settings.mirror_settings.pushed_repository = İtilmiş depo
 settings.ignore_stale_approvals = Eskimiş onayları yoksay
 settings.ignore_stale_approvals_desc = Daha eski işlemelere (eski incelemelere) yapılmış olan onayları, Dİ'nin kaç onayı olduğunu belirlerken sayma. Eskimiş incelemeler atıldıysa bu ilgisizdir.
 error.broken_git_hook = Bu deponun Git İstemcileri bozuk gibi gözüküyor. Onarmak için lütfen <a target="_blank" rel="noreferrer" href="%s">belgelere</a> bakın, daha sonra durumu yenilemek için bazı işlemeler itin.
+commits.browse_further = Daha fazlasına göz at
+settings.units.units = Birimler
+commits.renamed_from = %s adından yeniden adlandırıldı
+mirror_use_ssh.text = SSH yetkilendirme kullan
+settings.default_update_style_desc = Temel dalın ardındaki çekme isteklerini güncellemek için kullanılan varsayılan güncelleme stili.
+mirror_denied_combination = Ortak anahtar ve parola tabanlı kimlik doğrulama birlikte kullanılamaz.
+mirror_public_key = Ortak SSH anahtarı
+n_branch_few = %s dal
+n_commit_few = %s gönderi
+n_tag_few = %s etiket
+settings.wiki_rename_branch_main = Viki dal adını normalleştir
+mirror_use_ssh.not_available = SSH yetkilendirme kullanılamıyor.
+mirror_use_ssh.helper = Forgejo, bu seçeneği seçtiğinizde deponuzu SSH üzerinden Git üzerinden yansıtacak ve sizin için bir anahtar çifti oluşturacaktır. Oluşturulan ortak anahtarın hedef depoya gönderilmek üzere yetkilendirildiğinden emin olmalısınız. Bunu seçerken parola tabanlı yetkilendirme kullanamazsınız.
+n_branch_one = %s dal
+settings.units.add_more = Daha fazlasını etkinleştir
+settings.wiki_globally_editable = Vikiyi herkesin düzenlemesine izin ver
+issues.filter_no_results_placeholder = Arama filtrelerini değiştirmeyi deneyin.
+issues.filter_no_results = Sonuç yok
+issues.num_participants_one = %d katılımcı
 
 [graphs]
 component_loading = %s yükleniyor...
@@ -2736,7 +2765,7 @@ org_name_holder=Organizasyon Adı
 org_full_name_holder=Organizasyon Tam Adı
 org_name_helper=Organizasyon adları kısa ve hatırlanabilir olmalıdır.
 create_org=Organizasyon Oluştur
-repo_updated=Güncellendi %s
+repo_updated=%s güncellendi
 members=Üyeler
 teams=Takımlar
 code=Kod
@@ -2792,7 +2821,7 @@ members.membership_visibility=Üyelik Görünürlüğü:
 members.public=Görünür
 members.public_helper=gizle
 members.private=Gizlenmiş
-members.private_helper=görünür yap
+members.private_helper=Görünür yap
 members.member_role=Üye Rolü:
 members.owner=Sahibi
 members.member=Üye
@@ -3062,13 +3091,13 @@ packages.repository=Depo
 packages.size=Boyut
 packages.published=Yayınlandı
 
-defaulthooks=Varsayılan Web İstemcileri
-defaulthooks.desc=Web İstemcileri, belirli Forgejo olayları tetiklendiğinde otomatik olarak HTTP POST isteklerini sunucuya yapar. Burada tanımlanan Web İstemcileri varsayılandır ve tüm yeni depolara kopyalanır. <a target="_blank" rel="noopener" href="%s">web istemcileri kılavuzunda</a> daha fazla bilgi edinin.
+defaulthooks=Varsayılan web kancaları
+defaulthooks.desc=Web Kancaları, belirli Forgejo olayları tetiklendiğinde otomatik olarak HTTP POST isteklerini sunucuya yapar. Burada tanımlanan Web kancaları varsayılandır ve tüm yeni depolara kopyalanır. <a target="_blank" rel="noopener" href="%s">web kancaları kılavuzunda</a> daha fazla bilgi edinin.
 defaulthooks.add_webhook=Varsayılan Web İstemcisi Ekle
 defaulthooks.update_webhook=Varsayılan Web İstemcisini Güncelle
 
-systemhooks=Sistem Web İstemcileri
-systemhooks.desc=Belirli Forgejo olayları tetiklendiğinde Web istemcileri otomatik olarak bir sunucuya HTTP POST istekleri yapar. Burada tanımlanan web istemcileri sistemdeki tüm depolar üzerinde çalışır, bu yüzden lütfen bunun olabilecek tüm performans sonuçlarını göz önünde bulundurun. <a target="_blank" rel="noopener" href="%s">web istemcileri kılavuzunda</a> daha fazla bilgi edinin.
+systemhooks=Sistem web kancaları
+systemhooks.desc=Belirli Forgejo olayları tetiklendiğinde Web kancaları otomatik olarak bir sunucuya HTTP POST istekleri yapar. Burada tanımlanan web kancaları sistemdeki tüm depolar üzerinde çalışır, bu yüzden lütfen bunun olabilecek tüm performans sonuçlarını göz önünde bulundurun. <a target="_blank" rel="noopener" href="%s">web kancaları kılavuzunda</a> daha fazla bilgi edinin.
 systemhooks.add_webhook=Sistem Web İstemcisi Ekle
 systemhooks.update_webhook=Sistem Web İstemcisi Güncelle
 
@@ -3242,7 +3271,7 @@ config.disable_register=Kullanıcı Kaydını Devre Dışı Bırak
 config.allow_only_internal_registration=Kayda Sadece Forgejo'nın Kendisi Üzerinden İzin Ver
 config.allow_only_external_registration=Sadece Dış Hizmetler Aracılığıyla Kullanıcı Kaydına İzin Ver
 config.enable_openid_signup=OpenID Kendinden Kaydı'nı Etkinleştir
-config.enable_openid_signin=OpenID Oturum Açmayı Etkinleştiriniz
+config.enable_openid_signin=OpenID Oturum Açmayı Etkinleştir
 config.show_registration_button=Kaydolma Düğmesini Göster
 config.require_sign_in_view=Sayfaları Görüntülemek için Giriş Yapmaya Zorla
 config.mail_notify=E-Posta Bildirimlerini Etkinleştir
@@ -3311,7 +3340,7 @@ config.git_max_diff_lines=Maksimum Değişiklik Satırı (tek bir dosya için)
 config.git_max_diff_line_characters=Maksimum Değişiklik Karakteri (tek bir satır için)
 config.git_max_diff_files=Maksimum Değişiklik Dosyaları (gösterilecek)
 config.git_gc_args=GC Argümanları
-config.git_migrate_timeout=Göç İşlemi Zaman Aşımı
+config.git_migrate_timeout=Göç işlemi zaman aşımı
 config.git_mirror_timeout=Yansı Güncelleme Zaman Aşımı
 config.git_clone_timeout=Klonlama İşlemi Zaman Aşımı
 config.git_pull_timeout=Çekme İşlemi Zaman Aşımı
@@ -3363,7 +3392,7 @@ monitor.queue.settings.maxnumberworkers=En fazla çalışan Sayısı
 monitor.queue.settings.maxnumberworkers.placeholder=Şu anda %[1]d
 monitor.queue.settings.maxnumberworkers.error=En fazla çalışan sayısı bir sayı olmalıdır
 monitor.queue.settings.submit=Ayarları Güncelle
-monitor.queue.settings.changed=Ayarlar Güncellendi
+monitor.queue.settings.changed=Ayarlar güncellendi
 monitor.queue.settings.remove_all_items=Tümünü kaldır
 monitor.queue.settings.remove_all_items_done=Kuyruktaki tüm öğeler kaldırıldı.
 
@@ -3417,7 +3446,7 @@ auto_merge_pull_request=`<a href="%[1]s">%[3]s#%[2]s</a> değişiklik isteği ot
 transfer_repo=depo <code>%s</code> <a href="%s">%s</a>'a aktarıldı
 push_tag=<a href="%[2]s">%[3]s</a> etiketini <a href="%[1]s">%[4]s</a> dalına gönderdi
 delete_tag=%[2]s etiketi <a href="%[1]s">%[3]s</a> deposundan silindi
-delete_branch=<a href="%[1]s">%[3]s</a> deposundan %[2]s dalı silindi
+delete_branch=<a href="%[1]s">%[3]s</a> deposundan <code>%[2]s</code> dalı silindi
 compare_branch=Karşılaştır
 compare_commits=%d işlemeyi karşılaştır
 compare_commits_general=İşlemeleri karşılaştır
@@ -3493,7 +3522,7 @@ error.unit_not_allowed=Bu depo bölümüne erişme izniniz yok.
 title=Paketler
 desc=Depo paketlerini yönet.
 empty=Henüz hiçbir paket yok.
-empty.documentation=Paket kütüğü hakkında daha fazla bilgi için, <a target="_blank" rel="noopener noreferrer" href="%s">belgeye</a> bakabilirsiniz.
+empty.documentation=Paket deposu hakkında daha fazla bilgi için, <a target="_blank" rel="noopener noreferrer" href="%s">belgeye</a> bakabilirsiniz.
 empty.repo=Bir paket yüklediniz ama burada gösterilmiyor mu? <a href="%[1]s">Paket ayarları</a>na gidin ve bu depoya bağlantı verin.
 registry.documentation=%s kütüğü hakkında daha fazla bilgi için, <a target="_blank" rel="noopener noreferrer" href="%s">belgeye</a> bakabilirsiniz.
 filter.type=Tür
@@ -3636,9 +3665,9 @@ owner.settings.cleanuprules.remove.days=Şundan eski sürümleri kaldır
 owner.settings.cleanuprules.remove.pattern=Eşleşen sürümlari kaldır
 owner.settings.cleanuprules.success.update=Temizleme kuralı güncellendi.
 owner.settings.cleanuprules.success.delete=Temizleme kuralı silindi.
-owner.settings.chef.title=Chef Kütüğü
+owner.settings.chef.title=Chef deposu
 owner.settings.chef.keypair=Anahtar çifti üret
-owner.settings.chef.keypair.description=Chef kütüğünde kimlik doğrulaması için bir anahtar çifti gereklidir. Eğer daha önce bir anahtar çifti ürettiyseniz, yeni bir anahtar çifti üretmek eski anahtar çiftini ıskartaya çıkartacaktır.
+owner.settings.chef.keypair.description=Chef kayıt defterine gönderilen istekler kimlik doğrulama yöntemi olarak kriptografik olarak imzalanmalıdır. Bir anahtar çifti oluştururken, yalnızca genel anahtar Forgejo'da saklanır. Özel anahtar size knife ile kullanılmak üzere sağlanır. Yeni bir anahtar çifti oluşturmak öncekini geçersiz kılar.
 
 npm.dependencies.bundle = Paketlenmiş Bağımlılıklar
 rpm.repository.multiple_groups = Bu paket birçok grupta mevcut.
@@ -3771,23 +3800,23 @@ submodule=Alt modül
 
 
 [search]
-project_kind = Projeleri ara...
+project_kind = Projeleri ara…
 org_kind = Organizasyonları ara…
 team_kind = Takımları ara…
 search = Ara…
 code_kind = Kod ara…
 type_tooltip = Arama türü
-repo_kind = Depoları ara...
+repo_kind = Depoları ara…
 user_kind = Kullanıcıları ara…
 milestone_kind = Kilometre taşlarını ara...
-branch_kind = Dalları ara...
-package_kind = Paketleri ara...
-commit_kind = Katkıları ara...
-runner_kind = Çalıştırıcıları ara...
+branch_kind = Dalları ara…
+package_kind = Paketleri ara…
+commit_kind = Katkıları ara…
+runner_kind = Çalıştırıcıları ara…
 no_results = Eşleşen sonuç bulunamadı.
 code_search_unavailable = Kod araması şu anda kullanıma açık değildir. Lütfen site yöneticisi ile iletişime geçin.
-issue_kind = Sorunları ara...
-pull_kind = Birleştirme isteklerini ara...
+issue_kind = Sorunları ara…
+pull_kind = Birleştirme isteklerini ara…
 code_search_by_git_grep = Anlık kod araması sonuçları "git grep" komutu tarafından sağlanmaktadır. Site yöneticisinin kod endekslemesini açması durumunda daha iyi sonuçlar verilmesi mümkün olabilir.
 keyword_search_unavailable = Anahtar kelime ile arama şu anda kullanıma açık değildir. Lütfen site yöneticisi ile iletişime geçin.
 fuzzy_tooltip = Arama terimine yakın olan eşleşmeleri dahil et
@@ -3795,3 +3824,16 @@ union_tooltip = Boşlukla ayrılmış anahtar kelime eşleşmelerini dahil et
 exact_tooltip = Sadece arama terimiyle tam uyuşan sonuçları dahit et.
 fuzzy = Bulanık
 exact = Tam
+regexp = Düzenliİfade
+regexp_tooltip = Arama terimini düzenli ifade olarak yorumla
+union = Anahtar sözcük
+
+
+[munits.data]
+tib = TiB
+kib = KiB
+pib = PiB
+mib = MiB
+b = B
+gib = GiB
+eib = EiB
\ No newline at end of file
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 3a5f1b68eb..56294441e9 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -15,7 +15,7 @@ page=Сторінка
 template=Шаблон
 language=Мова
 notifications=Сповіщення
-active_stopwatch=Трекер робочого часу
+active_stopwatch=Облік робочого часу
 create_new=Створити…
 user_profile_and_more=Профіль і налаштування…
 signed_in_as=Увійшов як
@@ -29,7 +29,7 @@ password=Пароль
 access_token=Токен доступу
 re_type=Підтвердження пароля
 captcha=CAPTCHA
-twofa=Двофакторна авторизація
+twofa=Двофакторна автентифікація
 twofa_scratch=Двофакторний одноразовий пароль
 passcode=Код доступу
 
@@ -112,7 +112,7 @@ webauthn_error_unknown = Сталася невідома помилка. Буд
 webauthn_error_unable_to_process = Сервер не зміг обробити запит.
 webauthn_error_duplicated = Запит із наданим ключем безпеки відхилено. Впевніться, що цього ключа ще не зареєстровано.
 webauthn_error_empty = Ключ слід якось назвати.
-new_project_column = Нова колонка
+new_project_column = Новий стовпчик
 retry = Повторити
 rerun = Перезапустити
 rerun_all = Перезапустити всі завдання
@@ -149,7 +149,7 @@ filter.not_archived = Не архівовано
 filter.public = Загальнодоступні
 filter.private = Приватні
 more_items = Більше пунктів
-remove_label_str = Видалити об'єкт «%s»
+remove_label_str = Видалити елемент «%s»
 new_repo.title = Новий репозиторій
 new_migrate.title = Нова міграція
 new_org.title = Нова організація
@@ -195,13 +195,13 @@ buttons.list.task.tooltip = Додати список завдань
 buttons.heading.tooltip = Додати заголовок
 buttons.switch_to_legacy.tooltip = Використовувати застарілий редактор замість поточного
 buttons.disable_monospace_font = Вимкнути моноширинний шрифт
-buttons.indent.tooltip = Вкласти предмет на один рівень
-buttons.unindent.tooltip = Викласти об'єкт на один рівень
+buttons.indent.tooltip = Вкласти елемент на один рівень
+buttons.unindent.tooltip = Викласти елемент на один рівень
 buttons.mention.tooltip = Згадати користувача чи команду
-buttons.ref.tooltip = Послатись на задачу чи на запит на злиття
+buttons.ref.tooltip = Послатися на задачу чи на запит на злиття
 buttons.enable_monospace_font = Увімкнути моноширинний шрифт
 buttons.new_table.tooltip = Додати таблицю
-table_modal.label.columns = Стовпці
+table_modal.label.columns = Стовпчики
 table_modal.header = Додати таблицю
 table_modal.placeholder.header = Заголовок
 table_modal.placeholder.content = Вміст
@@ -320,7 +320,7 @@ sqlite3_not_available=Ця версія Forgejo не підтримує SQLite3.
 invalid_db_setting=Налаштування бази даних є некоректними: %v
 invalid_repo_path=Помилковий шлях до кореня репозиторію: %v
 invalid_app_data_path=Некоректний шлях до даних програми: %v
-run_user_not_match=Ім'я в «Користувач, від якого запустити» не є ім'ям поточного користувача: %s -> %s
+run_user_not_match=Ім'я в «Користувач, від якого запустити» не є ім'ям поточного користувача: %s → %s
 internal_token_failed=Не вдалося згенерувати внутрішній токен: %v
 secret_key_failed=Не вдалося згенерувати секретний ключ: %v
 save_config_failed=Не в змозі зберегти конфігурацію: %v
@@ -343,13 +343,13 @@ enable_update_checker = Увімкнути перевірку оновлень
 require_db_desc = Forgejo вимагає MySQL, PostgreSQL, SQLite3 чи TiDB (протокол MySQL).
 allow_only_external_registration = Дозволити реєстрацію тільки через зовнішні сервіси
 require_sign_in_view.description = Обмежити доступ до контенту лише користувачам, що увійшли. Гості зможуть лише відвідувати сторінки автентифікації.
-password_algorithm_helper = Встановити алгоритм хешування паролів. Алгоритми мають різні вимоги та силу. Алгоритм argon2 є досить безпечним, проте споживає багато памʼяті та є недоречним для малих систем.
+password_algorithm_helper = Установіть алгоритм хешування паролів. Алгоритми мають різні вимоги і стійкість. Алгоритм argon2 є досить безпечним, проте споживає багато памʼяті та є недоречним для малих систем.
 app_slogan = Гасло екземпляра
 app_slogan_helper = Уведіть гасло вашого екземпляра тут. Залиште порожнім, аби вимкнути.
 run_user_helper = Імʼя користувача операційної системи, від якого запущено Forgejo. Зауважте, що цей користувач повинен мати доступ до кореневої теки репозиторію.
 smtp_from_invalid = Адреса з «Відправляти email від імені» недійсна
-allow_dots_in_usernames = Дозволити користувачам використовувати крапки у своїх іменах. Не впливає на облікові записи, що вже існують.
-invalid_password_algorithm = Недійсний варіант алгоритму хешування паролів
+allow_dots_in_usernames = Дозволити використання крапки в іменах користувачів. Не впливає на облікові записи, що вже існують.
+invalid_password_algorithm = Недійсний алгоритм хешування паролів
 enable_update_checker_helper_forgejo = Наявність нових версій Forgejo періодично перевірятиметься через перевірку запису TXT DNS на release.forgejo.org.
 
 [home]
@@ -392,7 +392,7 @@ user_no_results=Відповідних користувачів не знайд
 org_no_results=Відповідних організацій не знайдено.
 code_no_results=Відповідний пошуковому запитанню код не знайдено.
 code_last_indexed_at=Останні індексовані %s
-relevant_repositories = Відображаються лише релевантні репозиторії, <a href="%s">переглянути результати без фільтру</a>.
+relevant_repositories = Показано лише релевантні репозиторії, <a href="%s">переглянути результати без фільтру</a>.
 relevant_repositories_tooltip = Приховано форки, а також репозиторії без теми, значка й опису.
 go_to = Перейти до
 stars_one = %d зірка
@@ -469,7 +469,7 @@ invalid_code_forgot_password = Ваш код підтвердження неді
 reset_password_wrong_user = Ви ввійшли як %s, але посилання на відновлення було передбачене для %s
 back_to_sign_in = Назад до входу
 sign_in_openid = Продовжити з OpenID
-openid_signin_desc = Введіть ваше посилання OpenID. Наприклад: alice.openid.example.org чи https://openid.example.org/alice.
+openid_signin_desc = Уведіть свій OpenID URI. Наприклад: alice.openid.example.org чи https://openid.example.org/alice.
 invalid_password = Ваш пароль не відповідає тому, що був заданий при створенні облікового запису.
 hint_login = Вже маєте обліковий запис? <a href="%s">Увійдіть зараз!</a>
 hint_register = Потрібен обліковий запис? <a href="%s">Зареєструйтеся зараз.</a>
@@ -660,13 +660,13 @@ Location = Розташування
 AccessToken = Токен доступу
 unable_verify_ssh_key = Не вдалося перевірити ключ SSH, перевірте його на наявність помилок.
 repository_force_private = Увімкнено примусову приватність: приватні репозиторії не можна зробити публічними.
-must_use_public_key = Ключ, який ви надали, є приватним. Будь ласка, нікуди не завантажуйте свій приватний ключ. Використовуйте замість нього публічний ключ.
+must_use_public_key = Ключ, який ви надали, є приватним. Будь ласка, нікуди не завантажуйте свій приватний ключ. Використовуйте замість нього відкритий ключ.
 openid_been_used = Адреса OpenID «%s» вже використовується.
 still_has_org = Ваш обліковий запис є учасником однієї або декількох організацій, спочатку покиньте їх.
 duplicate_invite_to_team = Цього користувача вже запрошено як учасника команди.
 organization_leave_success = Ви успішно покинули організацію %s.
 include_error = ` має містити підрядок «%s».`
-invalid_group_team_map_error = ` призначення недійсне: %s`
+invalid_group_team_map_error = ` зіставлення недійсне: %s`
 unsupported_login_type = Цей тип входу не підтримує видалення облікового запису.
 admin_cannot_delete_self = Ви не можете видалити себе, якщо ви є адміністратором. Спочатку зніміть із себе права адміністратора.
 unset_password = Для користувача не встановлено пароль.
@@ -694,7 +694,7 @@ disabled_public_activity=Цей користувач вимкнув публіч
 joined_on = Реєстрація %s
 email_visibility.private = Ваш email видно лише вам і адміністраторам
 email_visibility.limited = Вашу е-пошту видно всім авторизованим
-settings = Користувацькі параметри
+settings = Користувацькі налаштування
 block_user.detail_3 = Ви не зможете додати один одного в якості співавтора репозиторію.
 show_on_map = Показати це місце на мапі
 block_user.detail_2 = Цей користувач не зможе взаємодіяти з репозиторіями, власником яких є ви, а також із задачами та коментарями, які ви створили.
@@ -734,7 +734,7 @@ applications=Додатки
 orgs=Організації
 repos=Репозиторії
 delete=Видалити обліковий запис
-twofa=Двофакторна авторизація (TOTP)
+twofa=Двофакторна автентифікація (TOTP)
 account_link=Прив'язані облікові записи
 organization=Організації
 
@@ -792,7 +792,7 @@ activate_email=Надіслати активацію
 activations_pending=Активації в очікуванні
 delete_email=Видалити
 email_deletion=Видалити адресу електронної пошти
-email_deletion_desc=Електронна адреса та пов'язана з нею інформація буде видалена з вашого облікового запису. Git коміти, здійснені через цю електронну адресу, залишиться без змін. Продовжити?
+email_deletion_desc=Цю електронну адресу та пов'язану з нею інформацію буде видалено з вашого облікового запису. Коміти Git, здійснені через цю електронну адресу, залишаться без змін. Продовжити?
 email_deletion_success=Адресу електронної пошти було видалено.
 theme_update_success=Тему оновлено.
 theme_update_error=Вибрана тема не існує.
@@ -813,9 +813,9 @@ manage_ssh_keys=Керування ключами SSH
 manage_ssh_principals=Управління SSH сертифікатами користувачів
 manage_gpg_keys=Керування ключами GPG
 add_key=Додати ключ
-ssh_desc=Ці відкриті ключі SSH повʼязані з вашим обліковим записом. Відповідні приватні ключі дозволяють отримати повний доступ до ваших репозиторіїв. Підтверджені ключі можна використати для підтвердження комітів Git, підписані з SSH.
+ssh_desc=Ці відкриті ключі SSH повʼязані з вашим обліковим записом. Відповідні приватні ключі дозволяють отримати повний доступ до ваших репозиторіїв. Підтверджені ключі можна використати для підтвердження комітів Git, підписаних із SSH.
 principal_desc=Ці настройки SSH сертифікатів вказані у вашому обліковому записі та надають повний доступ до ваших репозиторіїв.
-gpg_desc=Ці публічні ключі GPG пов'язані з вашим обліковим записом. Тримайте свої приватні ключі в безпеці, оскільки вони дозволяють здійснювати перевірку комітів.
+gpg_desc=Ці відкриті ключі GPG пов'язані з вашим обліковим записом і використовуються для підтвердження комітів. Тримайте свої приватні ключі в безпеці, оскільки вони дозволяють підписувати коміти вашим особистим підписом.
 ssh_helper=<strong>Потрібна допомога?</strong> Дивіться гід на GitHub з <a href="%s"> генерації ключів SSH</a> або виправлення <a href="%s">типових неполадок SSH</a>.
 gpg_helper=<strong> Потрібна допомога? </strong> Перегляньте посібник GitHub <a href="%s"> про GPG </a>.
 add_new_key=Додати SSH ключ
@@ -893,9 +893,9 @@ manage_oauth2_applications=Керування програмами OAuth2
 edit_oauth2_application=Редагувати програму OAuth2
 oauth2_applications_desc=Програми OAuth2 дають можливість вашим стороннім програмам надійно аутентифікувати користувачів у цьому екземплярі Forgejo.
 remove_oauth2_application=Видалити програму OAuth2
-remove_oauth2_application_desc=Видалення програми OAuth2 скасовує доступ до всіх підписаних маркерів доступу. Продовжити?
+remove_oauth2_application_desc=Видалення програми OAuth2 скасує доступ до всіх підписаних токенів доступу. Продовжити?
 remove_oauth2_application_success=Програму видалено.
-create_oauth2_application=Створити новий додаток OAuth2
+create_oauth2_application=Створити нову програму OAuth2
 create_oauth2_application_button=Створити програму
 oauth2_application_name=Назва програми
 save_application=Зберегти
@@ -908,7 +908,7 @@ oauth2_application_create_description=Програми OAuth2 надають в
 
 authorized_oauth2_applications=Авторизовані програми OAuth2
 revoke_key=Відкликати
-revoke_oauth2_grant=Скасувати доступ
+revoke_oauth2_grant=Відкликати доступ
 revoke_oauth2_grant_description=Скасування доступу для цієї програми третьої сторони не дозволить їй отримувати доступ до ваших даних. Ви впевнені?
 
 twofa_desc=Двофакторна автентифікація підвищує безпеку вашого облікового запису.
@@ -934,7 +934,7 @@ manage_account_links_desc=Ці зовнішні акаунти прив'язан
 account_links_not_available=Наразі немає зовнішніх облікових записів, пов'язаних із вашим обліковим записом Forgejo.
 link_account=Прив'язати обліковий запис
 remove_account_link=Видалити пов'язаний обліковий запис
-remove_account_link_desc=Видалення пов'язаного облікового запису відкликає його доступ до вашого облікового запису Forgejo. Продовжити?
+remove_account_link_desc=Видалення пов'язаного облікового запису скасує його доступ до вашого облікового запису Forgejo. Продовжити?
 remove_account_link_success=Зв'язаний обліковий запис видалено.
 
 
@@ -999,7 +999,7 @@ comment_type_group_pull_request_push = Додані коміти
 permissions_public_only = Тільки публічні
 select_permissions = Виберіть дозволи
 permissions_access_all = Усі (публічні, приватні й обмежені)
-create_oauth2_application_success = Ви успішно створили новий додаток OAuth2.
+create_oauth2_application_success = Ви успішно створили нову програму OAuth2.
 keep_email_private_popup = Ваша адреса електронної пошти не буде відображатися у вашому профілі і не буде використовуватися за замовчуванням для комітів, зроблених через веб-інтерфейс, таких як завантаження файлів, редагування і об'єднання комітів. Натомість ви можете використовувати спеціальну адресу %s для прив'язки комітів до свого облікового запису. Ця опція не вплине на існуючі коміти.
 blocked_since = Заблокований з %s
 can_not_add_email_activations_pending = Очікується активація, спробуйте ще раз за кілька хвилин, якщо хочете додати нову адресу електронної пошти.
@@ -1023,7 +1023,7 @@ pronouns_custom_label = Інші займенники
 repo_and_org_access = Доступ до репозиторію та організації
 change_username_redirect_prompt.with_cooldown.few = Старе ім'я користувача буде доступне всім після періоду захисту, який триватиме %[1]d днів. Протягом періоду захисту ви ще можете повернути собі старе ім'я.
 change_username_redirect_prompt.with_cooldown.one = Старе ім'я користувача буде доступне всім після періоду захисту, який триватиме %[1]d день. Протягом періоду захисту ви ще можете повернути собі старе ім'я.
-change_username_redirect_prompt = Старе ім'я користувача буде перенаправленням, поки хтось не присвоїть ім'я собі.
+change_username_redirect_prompt = Старе ім'я користувача буде переспрямуванням, поки хтось не присвоїть ім'я собі.
 comment_type_group_lock = Стан блокування
 webauthn_alternative_tip = Можливо, ви бажаєте налаштувати додатковий спосіб входу.
 user_unblock_success = Користувач_ку успішно розблоковано.
@@ -1075,8 +1075,10 @@ quota.applies_to_org = До цієї організації застосован
 quota.rule.exceeded = Перевищено
 regenerate_token = Згенерувати знову
 access_token_regeneration = Згенерувати новий токен доступу
-
 quota.sizes.assets.all = Ресурси
+access_token_regeneration_desc = Регенерація токена скасує доступ програм, які використовують цей токен, до вашого облікового запису. Це незворотна дія. Продовжити?
+regenerate_token_success = Токен згенеровано наново. Програми, які його використовують, більше не мають доступу до вашого облікового запису; ви повинні відновити доступ за допомогою нового токена.
+ssh_token_help_ssh_agent = або, якщо ви використовуєте агент SSH (із встановленою змінною SSH_AUTH_SOCK):
 
 [repo]
 owner=Власник
@@ -1091,7 +1093,7 @@ template_description=Шаблонні репозиторії дозволяют
 visibility=Видимість
 visibility_description=Тільки власник або члени організації які мають віповідні права, зможуть побачити.
 visibility_helper_forced=Адміністратор вашого сайту налаштував параметри: всі нові репозиторії будуть приватними.
-visibility_fork_helper=(Ці зміни вплинуть на всі форки.)
+visibility_fork_helper=(Буде змінено видимість усіх форків.)
 clone_helper=Потрібна допомога у клонуванні? Відвідайте сторінку <a target="_blank" rel="noopener" href="%s">Допомога</a>.
 fork_repo=Створити форк репозиторію
 fork_from=Форк з
@@ -1144,7 +1146,7 @@ forks=Форки
 reactions_more=додати %d більше
 unit_disabled=Адміністратор сайту вимкнув цей розділ репозиторію.
 language_other=Інші
-adopt_search=Введіть ім'я користувач_ки для пошуку неприйнятих репозиторіїв… (залиште порожнім, щоб знайти всі)
+adopt_search=Уведіть ім'я користувач_ки для пошуку неприйнятих репозиторіїв… (залиште порожнім, щоб знайти всі)
 adopt_preexisting_label=Прийняті файли
 adopt_preexisting=Прийняти вже існуючі файли
 adopt_preexisting_content=Створити репозиторій з %s
@@ -1156,9 +1158,9 @@ delete_preexisting_success=Видалено неприйняті файли в %
 blame_prior=Переглянути анотацію, що передує цій зміні
 
 
-transfer.accept=Дозволити трансфер
+transfer.accept=Прийняти передачу
 transfer.accept_desc=`Перемістити до "%s"`
-transfer.reject=Відхилити трансфер
+transfer.reject=Відхилити передачу
 transfer.reject_desc=`Скасувати переміщення до "%s"`
 
 desc.private=Приватний
@@ -1169,7 +1171,7 @@ desc.archived=Архівний
 
 template.items=Елементи шаблону
 template.git_content=Вміст Git (типова гілка)
-template.git_hooks=Перехоплювачі Git
+template.git_hooks=Git-хуки
 template.webhooks=Webhook'и
 template.topics=Теми
 template.avatar=Аватар
@@ -1199,7 +1201,7 @@ migrate_items_pullrequests=Запити на злиття
 migrate_items_merge_requests=Запити на об'єднання
 migrate_items_releases=Релізи
 migrate_repo=Перенести репозиторій
-migrate.clone_address=Міграція / клонувати з URL-адреси
+migrate.clone_address=Міграція / клонування з URL-адреси
 migrate.clone_address_desc=URL-адреса HTTP(S) або Git «clone» існуючого репозиторію
 migrate.clone_local_path=або шлях до локального серверу
 migrate.permission_denied=Вам не дозволено імпортувати локальні репозиторії.
@@ -1277,7 +1279,7 @@ file_raw=Неформатований
 file_history=Історія
 file_view_source=Переглянути вихідний код
 file_view_rendered=Переглянути відрендерено
-file_view_raw=Перегляд Raw
+file_view_raw=Переглянути неформатований
 file_permalink=Постійне посилання
 file_too_large=Цей файл завеликий щоб бути показаним.
 
@@ -1286,7 +1288,7 @@ video_not_supported_in_browser=Ваш браузер не підтримує т
 audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 «audio».
 stored_lfs=Збережено з Git LFS
 symbolic_link=Символічне посилання
-commit_graph=Графік комітів
+commit_graph=Граф комітів
 commit_graph.select=Виберіть гілки
 commit_graph.hide_pr_refs=Приховати запити на злиття
 commit_graph.monochrome=Монохром
@@ -1403,9 +1405,9 @@ issues.new.open_projects=Відкриті проєкти
 issues.new.closed_projects=Закриті проєкти
 issues.new.no_items=Немає елементів
 issues.new.milestone=Етап
-issues.new.no_milestone=Етап відсутній
+issues.new.no_milestone=Немає етапу
 issues.new.clear_milestone=Очистити етап
-issues.new.open_milestone=Активні етапи
+issues.new.open_milestone=Відкриті етапи
 issues.new.closed_milestone=Закриті етапи
 issues.new.assignees=Виконавці
 issues.new.clear_assignees=Прибрати виконавців
@@ -1448,7 +1450,7 @@ issues.remove_ref_at=`видалив посилання <b>%s</b> %s`
 issues.add_ref_at=`додав посилання <b>%s</b> %s`
 issues.delete_branch_at=`видалена гілка <b>%s</b> %s`
 issues.filter_label=Мітка
-issues.filter_label_exclude=`Використовуйте <code>Alt</code> + <code>клік/Enter</code> для виключення міток`
+issues.filter_label_exclude=Використовуйте <kbd>Alt</kbd> + <kbd>клік</kbd> для виключення міток
 issues.filter_label_no_select=Всі мітки
 issues.filter_milestone=Етап
 issues.filter_project=Проєкт
@@ -1497,17 +1499,17 @@ issues.context.quote_reply=Цитувати відповідь
 issues.context.reference_issue=Послатися в новій задачі
 issues.context.edit=Редагувати
 issues.context.delete=Видалити
-issues.close_comment_issue=Прокоментувати і закрити
+issues.close_comment_issue=Закрити з коментарем
 issues.reopen_issue=Відкрити знову
-issues.reopen_comment_issue=Прокоментувати та відкрити знову
+issues.reopen_comment_issue=Відкрити знову з коментарем
 issues.create_comment=Коментар
-issues.closed_at=`закрив цю задачу <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`повторно відкрив цю задачу <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`згадано цю задачу в коміті <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">посилається на цю задачу %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">послався на цей запит злиття %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">згадав запит на злиття %[4]s, які закриють цю задачу</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">згадав запит на злиття %[4]s, які повторно відкриють цю задачу</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`закриває цю задачу %s`
+issues.reopened_at=`повторно відкриває цю задачу %s`
+issues.commit_ref_at=`посилається на цю задачу в коміті %s`
+issues.ref_issue_from=`<a href="%[2]s">посилається на цю задачу %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">посилається на цей запит на злиття %[3]s</a> %[1]s`
+issues.ref_closing_from=`<a href="%[2]s">посилається в запиті на злиття %[3]s, який закриє цю задачу</a>, %[1]s`
+issues.ref_reopening_from=`<a href="%[2]s">посилається в запиті на злиття %[3]s, який повторно відкриє цю задачу</a>, %[1]s`
 issues.ref_closed_from=`<a href="%[3]s">закрив цю задачу %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">повторно відкрито цю задачу %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`із %[1]s`
@@ -1548,9 +1550,9 @@ issues.unlock=Розблокування обговорення
 issues.lock.unknown_reason=Неможливо заблокувати задачу з невідомою причиною.
 issues.lock_duplicate=Задача не може бути заблокованим двічі.
 issues.unlock_error=Не можливо розблокувати задачу, яка не заблокована.
-issues.lock_with_reason=заблоковано як <strong>%s</strong> та обмежене обговорення для співавторів %s
-issues.lock_no_reason=заблоковано та обмежене обговорення для співавторів %s
-issues.unlock_comment=розблоковане обговорення %s
+issues.lock_with_reason=блокує як <strong>%s</strong> та обмежує обговорення до співавторів %s
+issues.lock_no_reason=блокує та обмежує обговорення до співавторів %s
+issues.unlock_comment=розблоковує обговорення %s
 issues.lock_confirm=Заблокувати
 issues.unlock_confirm=Розблокувати
 issues.lock.notice_1=- Інші користувачі не можуть додавати нові коментарі до цієї задачі.
@@ -1589,7 +1591,7 @@ issues.error_modifying_due_date=Не вдалося змінити дату за
 issues.error_removing_due_date=Не вдалося видалити дату завершення.
 issues.push_commit_1=додає %d коміт %s
 issues.push_commits_n=додає %d коміти(-ів) %s
-issues.force_push_codes=`примусово залито %[1]s з <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> до <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`примусово залито %[1]s з <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s до <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=Порівняти
 issues.due_date_form=рррр-мм-дд
 issues.due_date_form_add=Додати дату завершення
@@ -1700,15 +1702,15 @@ pulls.required_status_check_administrator=Як адміністратор ви 
 pulls.can_auto_merge_desc=Цей запит можна об'єднати автоматично.
 pulls.cannot_auto_merge_desc=Цей запит на злиття не може бути злитий автоматично через конфлікти.
 pulls.cannot_auto_merge_helper=Злийте вручну для вирішення конфліктів.
-pulls.num_conflicting_files_1=%d конфліктуючий файл
-pulls.num_conflicting_files_n=%d конфліктуючі файли
+pulls.num_conflicting_files_1=%d конфліктний файл
+pulls.num_conflicting_files_n=%d конфліктних файлів
 pulls.approve_count_1=%d схвалення
 pulls.approve_count_n=%d схвалень
 pulls.reject_count_1=%d запит на зміну
 pulls.reject_count_n=%d запити на зміну
 pulls.waiting_count_1=очікується %d рецензія
 pulls.waiting_count_n=очікується %d рецензії(й)
-pulls.wrong_commit_id=ID коміта повинен бути ID коміта в цільовій гілці
+pulls.wrong_commit_id=ID коміту повинен бути ID коміту в цільовій гілці
 
 pulls.no_merge_desc=Цей запити на злиття неможливо злити, оскільки всі параметри об'єднання репозиторія вимкнено.
 pulls.no_merge_helper=Увімкніть параметри злиття в налаштуваннях репозиторія або злийте запити на злиття вручну.
@@ -1726,7 +1728,7 @@ pulls.require_signed_wont_sign=Гілка вимагає підписаних к
 pulls.invalid_merge_option=Цей параметр злиття не можна використовувати для цього Pull Request'а.
 pulls.merge_conflict=Не вдалося об'єднати: при об'єднанні виник конфлікт. Підказка: спробуйте іншу стратегію
 pulls.merge_conflict_summary=Повідомлення про помилку
-pulls.rebase_conflict=Не вдалося об'єднати: виник конфлікт під час перебазування коміта: %[1]s. Підказка: спробуйте іншу стратегію
+pulls.rebase_conflict=Не вдалося об'єднати: виник конфлікт під час перебазування коміту: %[1]s. Підказка: спробуйте іншу стратегію
 pulls.rebase_conflict_summary=Повідомлення про помилку
 pulls.unrelated_histories=Не вдалося об'єднати: head та base злиття не мають спільної історії. Підказка: спробуйте іншу стратегію
 pulls.merge_out_of_date=Не вдалося об'єднати: base було оновлено, поки відбувалося об'єднання. Підказка: спробуйте знову.
@@ -1744,8 +1746,8 @@ pulls.update_branch_rebase=Оновити гілку перебазування
 pulls.update_branch_success=Оновлення гілки пройшло успішно
 pulls.update_not_allowed=Ви не можете оновити гілку
 pulls.outdated_with_base_branch=Ця гілка застаріла відносно базової гілки
-pulls.closed_at=`закрив цей запит на злиття <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`повторно відкрив цей запит на злиття <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`закриває цей запит на злиття %s`
+pulls.reopened_at=`повторно відкриває цей запит на злиття %s`
 
 
 
@@ -1781,7 +1783,7 @@ milestones.filter_sort.least_issues=Найменш задач
 ext_wiki.desc=Посилання на зовнішню вікі.
 
 wiki=Вікі
-wiki.welcome=Ласкаво просимо до Вікі.
+wiki.welcome=Ласкаво просимо до вікі.
 wiki.welcome_desc=Wiki дозволяє писати та ділитися документацією з співавторами.
 wiki.desc=Пишіть та обмінюйтеся документацією із співавторами.
 wiki.create_first_page=Створити першу сторінку
@@ -1800,7 +1802,7 @@ wiki.delete_page_button=Видалити сторінку
 wiki.page_already_exists=Вікі-сторінка з таким самим ім'ям вже існує.
 wiki.pages=Сторінки
 wiki.last_updated=Останні оновлення %s
-wiki.page_name_desc=Введіть назву вікі-сторінки. Деякі зі спеціальних імен: «Home», «_Sidebar» та «_Footer».
+wiki.page_name_desc=Уведіть назву вікі-сторінки. Деякі зі спеціальних імен: «Home», «_Sidebar» та «_Footer».
 
 activity=Активність
 activity.period.filter_label=Період:
@@ -1816,7 +1818,7 @@ activity.active_prs_count_1=<strong>%d</strong> активний запит на
 activity.active_prs_count_n=<strong>%d</strong> активних запитів на злиття
 activity.merged_prs_count_1=Об'єднаний запит на злиття
 activity.merged_prs_count_n=Об'єднані запити на злиття
-activity.opened_prs_count_1=Запропонований запит на злиття
+activity.opened_prs_count_1=Запропоновані запити на злиття
 activity.opened_prs_count_n=Запропонованих запитів на злиття
 activity.title.user_1=%d користувачем
 activity.title.user_n=%d користувачами
@@ -1838,14 +1840,14 @@ activity.closed_issue_label=Закрито
 activity.new_issues_count_1=Нова задача
 activity.new_issues_count_n=Нові задачі
 activity.new_issue_label=Відкриті
-activity.title.unresolved_conv_1=%d Незавершене обговорення
-activity.title.unresolved_conv_n=%d Незавершених обговорень
+activity.title.unresolved_conv_1=%d незавершене обговорення
+activity.title.unresolved_conv_n=%d незавершених обговорень
 activity.unresolved_conv_desc=Список всіх старих задач і Pull Request'ів з недавньої активністю, але ще не закритих або прийнятих.
 activity.unresolved_conv_label=Відкрити
 activity.title.releases_1=%d випуск
 activity.title.releases_n=%d випусків
 activity.title.releases_published_by=%s опубліковано %s
-activity.published_release_label=Опубліковано
+activity.published_release_label=Випуск
 activity.no_git_activity=У цей період не було здійснено жодних дій.
 activity.git_stats_exclude_merges=Не враховуючи злиття,
 activity.git_stats_author_1=%d автор
@@ -1887,17 +1889,17 @@ settings.collaboration.read=Читати
 settings.collaboration.owner=Власник
 settings.collaboration.undefined=Не визначено
 settings.hooks=Веб-хуки
-settings.githooks=Git хуки
-settings.basic_settings=Базові налаштування
+settings.githooks=Git-хуки
+settings.basic_settings=Основні налаштування
 settings.mirror_settings=Налаштування дзеркала
 settings.mirror_settings.mirrored_repository=Віддзеркалений репозиторій
 settings.mirror_settings.direction=Напрямок
 settings.mirror_settings.direction.pull=Pull
 settings.mirror_settings.direction.push=Push
 settings.mirror_settings.last_update=Останнє оновлення
-settings.mirror_settings.push_mirror.none=Не налаштовано дзеркало push
+settings.mirror_settings.push_mirror.none=Push-дзеркала не налаштовано
 settings.mirror_settings.push_mirror.remote_url=URL віддаленого репозиторію Git
-settings.mirror_settings.push_mirror.add=Додати Push дзеркало
+settings.mirror_settings.push_mirror.add=Додати push-дзеркало
 
 settings.sync_mirror=Синхронізувати зараз
 settings.site=Веб-сайт
@@ -1910,27 +1912,27 @@ settings.use_external_wiki=Використовувати зовнішню ві
 settings.external_wiki_url=URL зовнішньої вікі
 settings.external_wiki_url_error=Зовнішня URL-адреса wiki не є допустимою URL-адресою.
 settings.external_wiki_url_desc=Відвідувачі будуть перенаправлені на URL-адресу, коли вони клацають по вкладці.
-settings.issues_desc=Увімкнути відстеження задач в репозиторію
+settings.issues_desc=Увімкнути відстеження задач
 settings.use_internal_issue_tracker=Використовувати вбудовану систему відстеження задач
-settings.use_external_issue_tracker=Використовувати зовнішню систему обліку задач
+settings.use_external_issue_tracker=Використовувати зовнішню систему відстеження задач
 settings.external_tracker_url=URL зовнішньої системи відстеження задач
 settings.external_tracker_url_error=URL зовнішнього баг-трекера не є допустимою URL-адресою.
 settings.external_tracker_url_desc=Відвідувачі перенаправляються на зовнішню URL-адресу, коли натискають вкладку 'Задачі'.
-settings.tracker_url_format=Формат URL зовнішнього трекера задач
+settings.tracker_url_format=Формат URL зовнішньої системи відстеження задач
 settings.tracker_url_format_error=Неправильний формат URL-адреси зовнішнього баг-трекера.
-settings.tracker_issue_style=Формат номера для зовнішньої системи обліку задач
+settings.tracker_issue_style=Формат номера для зовнішньої системи відстеження задач
 settings.tracker_issue_style.numeric=Цифровий
 settings.tracker_issue_style.alphanumeric=Буквено-цифровий
 settings.tracker_url_format_desc=Використовуйте шаблони <code>{user}</code>, <code>{repo}</code> та <code>{index}</code> для імені користувача, репозиторію та номеру задічі.
 settings.enable_timetracker=Увімкнути відстеження часу
-settings.allow_only_contributors_to_track_time=Враховувати тільки учасників розробки в підрахунку часу
+settings.allow_only_contributors_to_track_time=Дозволити відстеження часу тільки учасникам розробки
 settings.pulls_desc=Увімкнути запити на злиття в репозиторій
 settings.pulls.ignore_whitespace=Ігнорувати пробіл у конфліктах
 settings.pulls.enable_autodetect_manual_merge=Увімкнути автовизначення ручного злиття (Примітка: у деяких особливий випадках можуть виникнуть помилки)
 settings.pulls.default_delete_branch_after_merge=Видаляти гілку запиту злиття, коли його прийнято
-settings.projects_desc=Увімкнути проєкти у репозиторії
+settings.projects_desc=Увімкнути проєкти в репозиторії
 settings.admin_settings=Налаштування адміністратора
-settings.admin_enable_health_check=Включити перевірки працездатності репозиторію (git fsck)
+settings.admin_enable_health_check=Увімкнути перевірки стану репозиторію (git fsck)
 settings.admin_enable_close_issues_via_commit_in_any_branch=Закрити задачу за допомогою коміта, зробленого не в головній гілці
 settings.danger_zone=Небезпечна зона
 settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою. Будь ласка, виберіть інше ім'я.
@@ -1956,7 +1958,7 @@ settings.transfer_notices_1=- Ви втратите доступ до репоз
 settings.transfer_notices_2=- Ви збережете доступ, якщо новим власником стане організація, власником якої ви є.
 settings.transfer_notices_3=- Якщо репозиторій є приватним і передається окремому користувачеві, ця дія гарантує, що користувач має хоча б дозвіл на читаня репозитарію (і при необхідності змінює права дозволів).
 settings.transfer_owner=Новий власник
-settings.transfer_perform=Здійснити перенесення
+settings.transfer_perform=Здійснити передачу
 settings.transfer_started=`Цей репозиторій чекає підтвердження перенесення від "%s"`
 settings.transfer_succeed=Репозиторій був перенесений.
 settings.signing_settings=Параметри перевірки підпису
@@ -2031,7 +2033,7 @@ settings.slack_icon_url=URL іконки
 settings.slack_color=Колір
 settings.discord_username=Ім'я кристувача
 settings.discord_icon_url=URL іконки
-settings.event_desc=Тригер:
+settings.event_desc=Спрацьовує на:
 settings.event_push_only=Push події
 settings.event_send_everything=Усі події
 settings.event_choose=Власні події…
@@ -2056,12 +2058,12 @@ settings.event_issue_assign=Призначення
 settings.event_issue_assign_desc=Задачу призначено або скасовано.
 settings.event_issue_label=Мітки
 settings.event_issue_label_desc=Додавання або видалення міток задач.
-settings.event_issue_milestone=Задача з етапом
+settings.event_issue_milestone=Етапи
 settings.event_issue_milestone_desc=Етап призначено, видалено або змінено.
 settings.event_issue_comment=Коментарі
 settings.event_issue_comment_desc=Коментар задачі створено, видалено чи відредаговано.
 settings.event_header_pull_request=Події запиту на злиття
-settings.event_pull_request=Запити до злиття
+settings.event_pull_request=Зміна
 settings.event_pull_request_desc=Запит до злиття відкрито, закрито, перевідкрито або відредаговано.
 settings.event_pull_request_assign=Призначення
 settings.event_pull_request_assign_desc=Запит про злиття призначено або скасовано.
@@ -2076,7 +2078,7 @@ settings.event_pull_request_review_desc=Запит на злиття схвал
 settings.event_pull_request_sync=Синхронізовано
 settings.event_pull_request_sync_desc=Гілку автоматично оновлено цільовою гілкою.
 settings.branch_filter=Фільтр гілок
-settings.branch_filter_desc=Білий список гілок для push, створення гілок та видалення гілок, визначається як шаблон glob. Якщо він порожній або містить <code>*</code>, то реєструються події для всіх гілок. Дивіться синтаксис у документації на <a href="%[1]s">%[2]s</a>. Наприклад: <code>master</code>, <code>{master,release*}</code>.
+settings.branch_filter_desc=Білий список гілок для push, створення гілок та видалення гілок, визначається як шаблон glob. Якщо він порожній або містить <code>*</code>, то реєструються події для всіх гілок. Дивіться синтаксис у документації <a href="%[1]s">%[2]s</a>. Приклади: <code>master</code>, <code>{master,release*}</code>.
 settings.active=Активний
 settings.active_helper=Інформацію про викликані події буде надіслано за цією веб-хук URL-адресою.
 settings.add_hook_success=Веб-хук було додано.
@@ -2155,7 +2157,7 @@ settings.edit_protected_branch=Редагувати
 settings.protected_branch_required_approvals_min=Число необхідних схвалень не може бути від'ємним.
 settings.tags=Теги
 settings.tags.protection=Захист тегу
-settings.tags.protection.pattern=Шаблон тега
+settings.tags.protection.pattern=Шаблон тегів
 settings.tags.protection.allowed=Дозволено
 settings.tags.protection.allowed.users=Дозволені користувачі
 settings.tags.protection.allowed.teams=Дозволені команди
@@ -2264,7 +2266,7 @@ release.detail=Деталі релізу
 release.tags=Теги
 release.new_release=Новий випуск
 release.draft=Чернетка
-release.prerelease=Пре-реліз
+release.prerelease=Попередній випуск
 release.stable=Стабільний
 release.compare=Порівняти
 release.edit=Редагувати
@@ -2276,15 +2278,15 @@ release.edit_subheader=Публікація релізів допоможе ва
 release.tag_name=Назва тегу
 release.target=Ціль
 release.tag_helper=Виберіть існуючий тег або створіть новий.
-release.prerelease_desc=Позначити як пре-реліз
+release.prerelease_desc=Позначити як попередній випуск
 release.prerelease_helper=Позначте цей випуск непридатним для ПРОД використання.
 release.cancel=Відмінити
-release.publish=Опублікувати реліз
+release.publish=Опублікувати випуск
 release.save_draft=Зберегти чернетку
-release.edit_release=Оновити реліз
-release.delete_release=Видалити реліз
+release.edit_release=Оновити випуск
+release.delete_release=Видалити випуск
 release.delete_tag=Видалити тег
-release.deletion=Видалити реліз
+release.deletion=Видалити випуск
 release.deletion_success=Реліз, було видалено.
 release.deletion_tag_desc=Буде видалено цей тег із репозиторію. Вміст репозиторія та історія залишаться незмінними. Продовжити?
 release.deletion_tag_success=Тег видалено.
@@ -2334,7 +2336,7 @@ issues.filter_poster_no_select = Усі автори
 pulls.merged_info_text = Гілку %s тепер можна видалити.
 find_file.go_to_file = Знайти файл
 visibility_helper = Зробити репозиторій приватним
-projects.card_type.desc = Попередній вигляд карток
+projects.card_type.desc = Попередній перегляд карток
 projects.card_type.text_only = Лише текст
 projects.card_type.images_and_text = Зображення і текст
 issues.filter_poster = Автор
@@ -2342,7 +2344,7 @@ issues.author = Автор
 issues.author_helper = Цей користувач - автор.
 issues.close = Закрити задачу
 issues.role.owner_helper = Цей користувач є власником цього репозиторію.
-settings.mirror_settings.docs.more_information_if_disabled = Докладніше про push та pull дзеркала можна дізнатися тут:
+settings.mirror_settings.docs.more_information_if_disabled = Докладніше про push- та pull-дзеркала можна дізнатися тут:
 issues.comment.blocked_by_user = Ви не можете коментувати цю задачу, оскільки вас заблокував власник репозиторію або автор цієї задачі.
 editor.add_file = Додати файл
 from_comment = (коментар)
@@ -2430,7 +2432,7 @@ pulls.is_ancestor = Цю гілку вже включено в цільову г
 pulls.has_merged = Помилка: запит на злиття вже об'єднано, неможливо об'єднати знову чи змінити цільову гілку.
 pulls.head_out_of_date = Не вдалося об'єднати: head було оновлено, поки відбувалося об'єднання. Підказка: спробуйте знову.
 no_eol.tooltip = У цьому файлі відсутній символ закінчення рядка (EOL) у кінці.
-settings.trust_model.committer.desc = Допустимі підписи будуть позначатися як «довірені», тільки якщо вони відповідають автору коміта, в іншому випадку вони позначатимуться як «невідповідні». Це змусить Forgejo бути автором підписаних комітів, а фактичного автора зазначати в трейлерах «Co-authored-by» і «Co-committed-by» в описі коміта. Типовий ключ Forgejo повинен відповідати користувачу в базі даних.
+settings.trust_model.committer.desc = Допустимі підписи будуть позначатися як «довірені», тільки якщо вони відповідають авторові коміту, в іншому випадку вони позначатимуться як «невідповідні». Це змусить Forgejo бути автором підписаних комітів, а фактичного автора зазначати в трейлерах «Co-authored-by» і «Co-committed-by» в описі коміту. Типовий ключ Forgejo повинен відповідати користувачу в базі даних.
 pulls.clear_merge_message_hint = Очищення повідомлення про об'єднання видалить лише вміст повідомлення коміту і збереже згенеровані git-трейлери, такі як «Co-Authored-By…».
 branch.delete_branch_has_new_commits = Гілку «%s» не можна видалити, оскільки після об'єднання було додано нові коміти.
 settings.graphql_url = Посилання GraphQL
@@ -2447,7 +2449,7 @@ settings.event_package = Пакунок
 settings.event_package_desc = Пакунок у репозиторії створено або видалено.
 settings.new_owner_blocked_doer = Новий власник заблокував вас.
 settings.transfer_quota_exceeded = Новий власник (%s) перевищив квоту. Репозиторій не передано.
-release.title_empty = Заголовок не може бути порожнім.
+release.title_empty = Назва не може бути порожньою.
 issues.role.member_helper = Цей користувач є членом організації, що володіє цим репозиторієм.
 wiki.page_content = Вміст сторінки
 wiki.page_title = Заголовок сторінки
@@ -2486,7 +2488,7 @@ signing.will_sign = Коміт буде підписано ключем «%s».
 signing.wont_sign.error = Під час перевірки можливості підписати коміт сталася помилка.
 commits.search_branch = У цій гілці
 ext_wiki = Зовнішня вікі
-pulls.commit_ref_at = `посилається на цей запит на злиття в коміті <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.commit_ref_at = `посилається на цей запит на злиття в коміті %s`
 pulls.cmd_instruction_hint = Переглянути інструкції для командного рядка
 issues.max_pinned = Неможливо закріпити більше задач
 issues.unpin_comment = відкріпив %s
@@ -2513,7 +2515,7 @@ projects.column.set_default = Установити за замовчування
 settings.federation_following_repos = URL-адреси відстежуваних репозиторіїв. Через «;», без пробілів.
 settings.federation_not_enabled = Федерацію вимкнено у вашому екземплярі.
 settings.federation_settings = Налаштування федерації
-signing.wont_sign.nokey = Цей екземпляр не має ключа для підписання цього коміта.
+signing.wont_sign.nokey = Цей екземпляр не має ключа для підписання цього коміту.
 settings.federation_apapiurl = URL федерації цього репозиторію. Скопіюйте її та вставте в налаштування федерації іншого репозиторію як URL-адресу відстежуваного репозиторію.
 fork_branch = Гілка, яку буде клоновано у форк
 already_forked = Ви вже створили форк %s
@@ -2529,9 +2531,9 @@ issues.new.assign_to_me = Призначити собі
 contributors.contribution_type.additions = Додавання
 settings.add_web_hook_desc = Інтегрувати <a target="_blank" rel="noreferrer" href="%s">%s</a> у цей репозиторій.
 settings.event_wiki_desc = Вікі-сторінку створено, перейменовано, відредаговано або видалено.
-settings.mirror_settings.push_mirror.copy_public_key = Копіювати публічний ключ
+settings.mirror_settings.push_mirror.copy_public_key = Копіювати відкритий ключ
 editor.add_tmpl.filename = назва файлу
-settings.unarchive.button = Розархівувати репозиторій
+settings.unarchive.button = Розархівувати
 object_format = Формат об'єкта
 settings.archive.mirrors_unavailable = Дзеркала недоступні в архівованих репозиторіях.
 pulls.sign_in_require = <a href="%s">Увійдіть</a>, щоб створити новий запит на злиття.
@@ -2542,8 +2544,8 @@ auto_init_description = Почніть історію Git з README і за ба
 new_from_template_description = Можете вибрати наявний шаблон репозиторію на цьому екземплярі і застосувати його налаштування.
 form.string_too_long = Довжина введеного рядка більша за %d символів.
 form.name_reserved = Назву репозиторію «%s» зарезервовано.
-form.name_pattern_not_allowed = Шаблон «%s» не допускається у назві репозиторію.
-settings.wiki_rename_branch_main_desc = Перейменувати внутрішню гілку, яка використовується у вікі, на «%s». Ця зміна є остаточною і її неможливо скасувати.
+form.name_pattern_not_allowed = Вираз «%s» не може бути частиною назви репозиторію.
+settings.wiki_rename_branch_main_desc = Перейменувати внутрішню гілку, яка використовується для вікі, на «%s». Ця зміна є остаточною і її неможливо скасувати.
 wiki.reserved_page = Назву вікі-сторінки «%s» зарезервовано.
 stars = Зірки
 mirror_public_key = Відкритий SSH-ключ
@@ -2553,7 +2555,7 @@ activity.navbar.pulse = Пульс
 open_with_editor = Відкрити в %s
 commits.view_single_diff = Переглянути зміни до цього файлу, внесені у цьому коміті
 pulls.editable = Редаговане
-pulls.editable_explanation = Цей запит на злиття дозволяє редагування від розробників. Ви можете зробити свій внесок безпосередньо до нього.
+pulls.editable_explanation = Цей запит на злиття дозволено редагувати супроводжувачам. Ви можете зробити свій внесок безпосередньо до нього.
 admin.failed_to_replace_flags = Не вдалося замінити прапорці репозиторія
 admin.enabled_flags = Для репозиторія ввімкнено прапорці:
 admin.flags_replaced = Прапорці репозиторія замінено
@@ -2571,7 +2573,7 @@ new_repo_helper = Репозиторій містить усі файли про
 issues.reference_link = Посилання: %s
 object_format_helper = Формат об'єктів репозиторія. Змінити потім неможливо. SHA1 — найсумісніший.
 mirror_interval = Інтервал синхронізації дзеркала (часові одиниці — «h», «m», «s»). 0 вимикає синхронізацію. (Мінімальний інтервал: %s)
-mirror_address_url_invalid = Вказано хибну URL-адресу. Замініть escape-послідовностями всі неоднозначні складники адреси.
+mirror_address_url_invalid = Вказано хибну URL-адресу. Впевніться, що всі неоднозначні складники адреси замінено escape-послідовностями.
 mirror_address_protocol_invalid = Хибна URL-адреса. Лише адреси http(s):// чи git:// можна використовувати для віддзеркалення.
 stars_remove_warning = Це вилучить усі зірки репозиторія.
 mirror_use_ssh.not_available = SSH-вхід недоступний.
@@ -2652,14 +2654,204 @@ release.asset_external_url = Зовнішня URL-адреса
 branch.download = Завантажити гілку «%s»
 pulls.delete_after_merge.head_branch.insufficient_branch = У вас немає дозволу видаляти головну гілку.
 activity.published_tag_label = Тег
-
-commits.search.tooltip = До ключових слів можна додавати префікси «author:», «committer:», «after:» або «before:», наприклад, «revert author:Alice before:2019-01-13».
+migrate.repo_desc_helper = Залиште порожнім, щоб імпортувати існуючий опис
+comment.blocked_by_user = Ви не можете коментувати, оскільки вас заблокував власник репозиторію або автор.
+archive.nocomment = Ви не можете коментувати, оскільки цей репозиторій архівовано.
 release.type_external_asset = Зовнішній ресурс
 release.asset_name = Назва ресурсу
 release.add_external_asset = Додати зовнішній ресурс
 find_file.no_matching = Не знайдено відповідного файлу
-
+commits.search.tooltip = До ключових слів можна додавати префікси «author:», «committer:», «after:» або «before:», наприклад, «revert author:Alice before:2019-01-13».
+sync_fork.button = Синхронізувати
+sync_fork.branch_behind_one = Ця гілка на %[1]d коміт позаду %[2]s
+sync_fork.branch_behind_few = Ця гілка на %[1]d комітів позаду %[2]s
 issues.role.first_time_contributor = Новий учасник
+settings.event_action_failure = Помилка
+settings.event_action_success = Успіх
+settings.event_action_recover = Відновлено
+commitstatus.success = Успіх
+commitstatus.failure = Збій
+issues.filter_type.all_pull_requests = Усі запити на злиття
+broken_message = Неможливо прочитати дані Git, що лежать в основі цього репозиторію. Зверніться до адміністратора цього екземпляра або видаліть репозиторій.
+migrate.invalid_local_path = Локальний шлях недійсний. Він не існує або не є каталогом.
+editor.filename_is_a_directory = Назва файлу «%s» уже використовується в цьому репозиторії як назва каталогу.
+editor.filename_is_invalid = Хибна назва файлу: «%s».
+migrate_options_lfs_endpoint.placeholder = Якщо залишити порожнім, то кінцеву точку буде визначено з URL-адреси клону
+cite_this_repo = Послатися на цей репозиторій
+editor.directory_is_a_file = Назва каталогу «%s» уже використовується в цьому репозиторії як назва файлу.
+subscribe.issue.guest.tooltip = Увійдіть, щоб підписатися на цю задачу.
+invisible_runes_header = `Цей файл містить невидимі символи Юнікоду`
+invisible_runes_line = `У цьому рядку є невидимі символи Юнікоду`
+subscribe.pull.guest.tooltip = Увійдіть, щоб підписатися на цей запит на злиття.
+ambiguous_runes_header = `Цей файл містить неоднозначні символи Юнікоду`
+ambiguous_runes_line = `У цьому рядку є неоднозначні символи Юнікоду`
+issues.choose.invalid_config = У конфігурації задачі є помилки:
+escape_control_characters = Escape
+ambiguous_runes_description = `Цей файл містить символи Юнікоду, які легко сплутати з іншими символами. Якщо так зроблено навмисно, можете ігнорувати це попередження. Щоб показати ці символи, скористайтеся кнопкою «Escape».`
+unescape_control_characters = Unescape
+invisible_runes_description = `Цей файл містить невидимі символи Юнікоду, які людині неможливо розрізнити, але які по-різному обробляються комп'ютером. Якщо так зроблено навмисно, можете ігнорувати це попередження. Щоб показати ці символи, скористайтеся кнопкою «Escape».`
+ambiguous_character = `%[1]c [U+%04[1]X] можна сплутати з %[2]c [U+%04[2]X]`
+settings.sourcehut_builds.secrets_helper = Надати завданню доступ до секретів збірки (потрібен дозвіл SECRETS:RO)
+no_eol.text = Без EOL
+settings.remove_protected_branch_failed = Не вдалося видалити правило захисту гілок «%s».
+summary_card_alt = Підсумкова картка репозиторію %s
+issues.summary_card_alt = Підсумкова картка задачі «%s» в репозиторії %s
+release.summary_card_alt = Підсумкова картка випуску «%s» в репозиторії %s
+release.hide_archive_links_helper = Приховати для цього випуску архіви вихідного коду, що генеруються автоматично. Наприклад, якщо ви завантажуєте свої архіви.
+activity.published_prerelease_label = Пре-реліз
+release.title = Назва випуску
+release.system_generated = Це вкладення згенеровано автоматично.
+release.hide_archive_links = Приховати автоматично генеровані архіви
+branch.delete_desc = Видалення гілки є остаточним. Хоча видалена гілка може існувати ще деякий час до того, як її буде видалено, цю дію НЕМОЖЛИВО скасувати в більшості випадків. Продовжити?
+release.deletion_desc = Видалення випуску видаляє його лише з Forgejo. При цьому тег Git, вміст репозиторію чи його історію не буде змінено. Продовжити?
+settings.sourcehut_builds.manifest_path = Шлях до маніфесту збірки
+settings.wiki_branch_rename_failure = Не вдалося нормалізувати назву вікі-гілки репозиторію.
+settings.sourcehut_builds.visibility = Видимість завдань
+settings.unarchive.header = Розархівувати цей репозиторій
+settings.unarchive.success = Репозиторій успішно розархівовано.
+diff.git-notes.remove-body = Цю примітку буде видалено.
+tag.ahead.target = до %s після цього тегу
+branch.tag_collision = Неможливо створити гілку «%s», оскільки у репозиторії вже є тег із такою назвою.
+branch.branch_name_conflict = Назва гілки «%s» конфліктує з наявною гілкою «%s».
+settings.wiki_branch_rename_success = Назву вікі-гілки репозиторію успішно нормалізовано.
+diff.has_escaped = У цьому рядку є приховані символи Юнікоду
+settings.unarchive.text = Розархівування репозиторію відновить можливість надсилати до нього коміти і виконувати push, а також створювати задачі і запити на злиття.
+settings.wiki_rename_branch_main_notices_1 = Цю операцію <strong>НЕМОЖЛИВО</strong> скасувати.
+settings.unarchive.error = Сталася помилка при спробі розархівувати репозиторій. Докладнішу інформацію див. у журналі.
+settings.wiki_rename_branch_main = Нормалізувати назву вікі-гілки
+settings.wiki_rename_branch_main_notices_2 = Внутрішню вікі-гілку репозиторію %s буде назавжди перейменовано. Існуючі перевірки потрібно буде оновити.
+settings.pull_mirror_sync_in_progress = Триває отримання змін з віддаленого репозиторію %s.
+settings.enter_repo_name = Уведіть ім'я власника і назву репозиторію, як показано:
+settings.pulls.allow_rebase_update = Увімкнути оновлення гілки запиту на злиття за допомогою перебазування
+settings.mirror_settings.docs.pulling_remote_title = Отримання з віддаленого репозиторію
+settings.mirror_settings.docs.doc_link_pull_section = розділ документації «Отримання з віддаленого репозиторію».
+settings.pull_mirror_sync_quota_exceeded = Перевищено квоту, отримання змін неможливе.
+settings.mirror_settings.push_mirror.none_ssh = Немає
+settings.admin_stats_indexer = Індексатор статистики коду
+settings.admin_indexer_commit_sha = Останній індексований коміт
+settings.discord_icon_url.exceeds_max_length = URL-адреса значка не може бути довшою, ніж 2048 символи
+settings.protect_invalid_status_check_pattern = Недійсний шаблон перевірки стану: «%s».
+settings.protect_no_valid_status_check_patterns = Немає дійсних шаблонів перевірки стану.
+settings.admin_indexer_unindexed = Не індексовано
+settings.push_mirror_sync_in_progress = Триває надсилання змін до віддаленого репозиторію %s.
+settings.releases_desc = Увімкнути випуски в репозиторії
+settings.admin_code_indexer = Індексатор коду
+settings.protect_status_check_patterns_desc = Уведіть шаблони, щоб вказати, які перевірки стану повинні пройти гілки, перш ніж їх буде об'єднано у гілку, що відповідає цьому правилу. Кожен рядок визначає шаблон. Шаблони не можуть бути порожніми.
+settings.add_webhook.invalid_path = Шлях не повинен містити частини «.» або «..» і не повинен бути порожнім. Він не може починатися або закінчуватися косою рискою.
+settings.matrix.access_token_helper = Рекомендується створити окремий обліковий запис Matrix. Токен доступу можна отримати у вебклієнті Element (у приватній/інкогніто вкладці): User menu (вгорі ліворуч) > All settings > Help & About > Advanced > Access Token (під URL-адресою Homeserver). Закрийте приватну вкладку (вихід із системи зробить токен недійсним).
+settings.protect_patterns = Шаблони
+settings.sourcehut_builds.access_token_helper = Токен доступу, який має дозвіл JOBS:RW. Згенеруйте <a target="_blank" rel="noopener noreferrer" href="%s">токен builds.sr.ht</a> або <a target="_blank" rel="noopener noreferrer" href="%s">токен builds.sr.ht з доступом до секретів</a> на meta.sr.ht.
+editor.unable_to_upload_files = Не вдалося завантажити файли в «%s» через помилку: %v
+view_git_blame = Переглянути git blame
+commits.ssh_key_fingerprint = Відбиток ключа SSH
+settings.web_hook_name_telegram = Telegram
+pulls.status_checks_hide_all = Приховати всі перевірки
+settings.thread_id = Thread ID
+settings.matrix.room_id_helper = ID кімнати можна отримати у вебклієнті Element: Room Settings > Advanced > Internal room ID. Приклад: %s.
+editor.push_rejected_no_message = Зміну відхилено сервером без повідомлення. Будь ласка, перевірте Git-хуки.
+editor.upload_files_to_dir = Завантажити файли в «%s»
+issues.filter_sort.relevance = За відповідністю
+editor.cannot_commit_to_protected_branch = Неможливо здійснити коміт до захищеної гілки «%s».
+editor.file_deleting_no_longer_exists = Файл «%s», який ви видаляєте, більше не існує у цьому репозиторії.
+editor.file_editing_no_longer_exists = Файл «%s», який ви редагуєте, більше не існує у цьому репозиторії.
+diff.show_file_tree = Показати дерево файлів
+milestones.filter_sort.name = За назвою
+pulls.allow_edits_from_maintainers_err = Не вдалося оновити
+pulls.has_viewed_file = Переглянуто
+editor.file_already_exists = Файл із назвою «%s» вже є у цьому репозиторії.
+commits.view_path = Переглянути на цьому етапі історії
+editor.push_rejected = Зміну відхилено сервером. Будь ласка, перевірте Git-хуки.
+commits.renamed_from = Перейменовано з %s
+diff.hide_file_tree = Приховати дерево файлів
+pulls.viewed_files_label = %[1]d з %[2]d файлів переглянуто
+settings.protected_branch_duplicate_rule_name = Для цього набору гілок уже є правило
+settings.mirror_settings.push_mirror.edit_sync_time = Змінити інтервал синхронізації дзеркала
+wiki.delete_page_notice_1 = Видалення вікі-сторінки «%s» неможливо скасувати. Продовжити?
+issues.label_archived_filter = Показати архівовані мітки
+milestones.new_subheader = Етапи допомагають організувати задачі та відстежувати прогрес їх виконання.
+issues.closed_by_fake = від %[2]s закрито %[1]s
+issues.closed_by = від <a href="%[2]s">%[3]s</a> закрито %[1]s
+issues.action_check = Поставити/зняти позначку
+issues.action_check_all = Поставити/зняти позначку з усіх елементів
+vendored = Сторонній
+blame.ignore_revs.failed = Не вдалося проігнорувати зміни в <a href="%s">.git-blame-ignore-revs</a>.
+blame.ignore_revs = Зміни в <a href="%s">.git-blame-ignore-revs</a> ігноруються. Натисніть <a href="%s">тут, щоб обійти це</a> і переглянути авторство у звичайному вигляді.
+editor.new_branch_name = Укажіть назву нової гілки для цього коміту
+projects.column.deletion_desc = Видалення стовпчика проєкту призведе до переміщення всіх пов'язаних із ним задач до стовпчика за замовчуванням. Продовжити?
+signing.wont_sign.approved = Злиття не буде підписано, оскільки запит на злиття не схвалено.
+pulls.allow_edits_from_maintainers = Дозволити редагування від супроводжувачів
+pulls.showing_only_single_commit = Показано тільки зміни коміту %[1]s
+pulls.showing_specified_commit_range = Показано тільки зміни між %[1]s..%[2]s
+pulls.blocked_by_outdated_branch = Цей запит на злиття заблоковано, оскільки він застарів.
+pulls.blocked_by_changed_protected_files_n = Цей запит на злиття заблоковано, оскільки він змінює захищені файли:
+pulls.auto_merge_newly_scheduled = Заплановано об'єднати запит на злиття після успішного завершення всіх перевірок.
+pulls.auto_merge_newly_scheduled_comment = `планує автоматично об'єднати цей запит на злиття після успішного завершення всіх перевірок %[1]s`
+comments.edit.already_changed = Не вдається зберегти зміни. Схоже, що хтось інший уже змінив вміст коментаря. Оновіть сторінку і спробуйте відредагувати ще раз, щоб уникнути перезапису чужих змін
+pulls.auto_merge_canceled_schedule_comment = `скасовує автоматичне об'єднання цього запиту на злиття після успішного завершення всіх перевірок %[1]s`
+signing.wont_sign.pubkey = Коміт не буде підписано, оскільки у вас немає відкритого ключа, пов'язаного з вашим обліковим записом.
+signing.wont_sign.basesigned = Злиття не буде підписано, оскільки не підписано базовий коміт.
+signing.wont_sign.headsigned = Злиття не буде підписано, оскільки не підписано головний коміт.
+projects.column.new_submit = Створити стовпчик
+settings.authorization_header_desc = За наявності буде включено як заголовок авторизації для запитів. Приклади: %s.
+template.git_hooks_tooltip = Наразі ви не можете змінювати або видаляти додані Git-хуки. Вибирайте лише якщо ви довіряєте репозиторію шаблону.
+projects.column.edit = Редагувати стовпчик
+projects.column.set_default_desc = Призначити цей стовпчик за замовчуванням для задач і запитів на злиття без категорії
+projects.column.new = Новий стовпчик
+projects.column.delete = Видалити стовпчик
+pulls.blocked_by_official_review_requests = Цей запит на злиття заблоковано, оскільки йому бракує схвалення від одного або кількох офіційних рецензентів.
+pulls.auto_merge_has_pending_schedule = %[1]s планує автоматично об'єднати цей запит на злиття після успішного завершення всіх перевірок %[2]s.
+signing.wont_sign.commitssigned = Злиття не буде підписано, оскільки всі пов'язані з ним коміти не підписані.
+settings.authorization_header = Заголовок авторизації
+issues.archived_label_description = (Архівна) %s
+issues.reaction.add = Додати реакцію
+issues.reaction.alt_add = Додати реакцію %[1]s до коментаря.
+issues.reaction.alt_remove = Прибрати реакцію %[1] з коментаря.
+migrate.github_token_desc = Ви можете ввести тут один або кілька токенів через кому, щоб пришвидшити міграцію в обхід обмеження частоти звернень до API GitHub. ОБЕРЕЖНО: зловживання цією функцією може порушити політику постачальника послуг і призвести до блокування облікового запису.
+issues.edit.already_changed = Не вдається зберегти зміни. Схоже, що хтось інший уже змінив вміст задачі. Оновіть сторінку і спробуйте відредагувати ще раз, щоб уникнути перезапису чужих змін
+pulls.edit.already_changed = Не вдається зберегти зміни. Схоже, що хтось інший уже змінив вміст запиту на злиття. Оновіть сторінку і спробуйте відредагувати ще раз, щоб уникнути перезапису чужих змін
+issues.reaction.alt_many = %[1]s і ще %[2]d реагують %[3]s.
+settings.pulls.default_allow_edits_from_maintainers = За замовчуванням дозволити редагування від супроводжувачів
+pulls.blocked_by_changed_protected_files_1 = Цей запит на злиття заблоковано, оскільки він змінює захищений файл:
+pulls.delete.text = Ви дійсно хочете видалити цей запит на злиття? (Весь його вміст буде остаточно видалено. Можливо, варто його закрити і зберегти в архіві)
+pulls.blocked_by_rejection = Цей запит на злиття містить зміни, запропоновані офіційним рецензентом.
+signing.wont_sign.parentsigned = Цей коміт не буде підписано, оскільки не підписано батьківський коміт.
+settings.ignore_stale_approvals = Ігнорувати застарілі схвалення
+pulls.blocked_by_approvals = Цей запит на злиття ще не має достатньої кількості схвалень. Отримано %d з %d схвалень.
+issues.delete.text = Ви дійсно хочете видалити цю задачу? (Весь її вміст буде остаточно видалено. Можливо, варто її закрити і зберегти в архіві)
+signing.wont_sign.twofa = Щоб підписувати коміти, у вас повинна бути ввімкнена двофакторна автентифікація.
+settings.mirror_settings.docs = Налаштуйте свій репозиторій на автоматичну синхронізацію комітів, тегів і гілок з іншим репозиторієм.
+settings.mirror_settings.docs.disabled_push_mirror.instructions = Налаштуйте свій проєкт на автоматичне отримання комітів, тегів і гілок з іншого репозиторію.
+settings.mirror_settings.docs.disabled_push_mirror.info = Push-дзеркала вимкнено адміністратором сайту.
+settings.mirror_settings.docs.disabled_pull_mirror.instructions = Налаштуйте свій проєкт на автоматичне надсилання комітів, тегів і гілок до іншого репозиторію. Pull-дзеркала вимкнено адміністратором сайту.
+issues.label_templates.fail_to_load_file = Не вдалося завантажити файл шаблону міток «%s»: %v
+migrate.github.description = Перенести дані з github.com або сервера GitHub Enterprise.
+migrate.cancel_migrating_confirm = Бажаєте скасувати перенесення?
+transfer.no_permission_to_accept = У вас немає дозволу прийняти цю передачу.
+transfer.no_permission_to_reject = У вас немає дозволу відхилити цю передачу.
+issues.choose.ignore_invalid_templates = Недійсні шаблони проігноровано
+issues.choose.invalid_templates = Знайдено %v недійсних шаблонів
+settings.transfer_abort_success = Передачу репозиторію %s успішно скасовано.
+pulls.cmd_instruction_checkout_title = Переключення гілок
+pulls.cmd_instruction_checkout_desc = З репозиторію вашого проєкту переключіться на нову гілку і протестуйте зміни.
+issues.review.pending.tooltip = Цей коментар наразі невидимий для інших користувачів. Щоб надіслати коментарі у черзі, виберіть «%s» → «%s/%s/%s» у верхній частині сторінки.
+issues.dependency.issue_batch_close_blocked = Неможливо виконати пакетне закриття вибраних задач, оскільки задача #%d має відкриті залежності
+commit.revert = Вивернути
+commit.revert-header = Вивернути: %s
+editor.revert = Вивернути %s на:
+commit.revert-content = Оберіть гілку, на яку вивернути:
+pulls.cmd_instruction_merge_warning = <b>Увага:</b> в цьому репозиторії не ввімкнено «Автовизначення ручного об'єднання», тож позначити цей запит як об'єднаний вручну вам доведеться самостійно.
+topic.format_prompt = Теми повинні починатися з літери або цифри, можуть містити дефіси («-») і крапки («.») і мати довжину до 35 символів. Дозволено використання лише малих літер.
+issues.label_archive = Архівна мітка
+editor.invalid_commit_mail = Недійсна пошта для створення коміту.
+issues.label_exclusive = Ексклюзивний
+issues.filter_type.reviewed_by_you = Перевірено вами
+editor.push_out_of_date = Схоже, дані для відправки застаріли.
+editor.commit_email = Пошта автора
+issues.cancel_tracking_history = `скасовує відстеження часу %s`
+issues.label_archive_tooltip = Архівовані мітки за замовчуванням виключаються з пропозицій під час пошуку за міткою.
+settings.protect_status_check_matched = Збіг
+settings.webhook.delivery.success = Подію додано до черги доставки. Може знадобитися кілька секунд, перш ніж вона з'явиться в історії доставки.
+settings.protected_branch_required_rule_name = Необхідна назва правила
 
 [graphs]
 contributors.what = внески
@@ -2787,9 +2979,14 @@ settings.change_orgname_redirect_prompt.with_cooldown.few = Стара назв
 teams.none_access = Немає доступу
 teams.invite_team_member = Запросити до %s
 teams.write_access = Запис
-
-teams.invite_team_member.list = Запрошення в очікуванні
 teams.invite.by = Вас запрошує %s
+teams.invite_team_member.list = Запрошення в очікуванні
+form.name_pattern_not_allowed = Вираз «%s» не може бути частиною назви організації.
+teams.add_nonexistent_repo = Репозиторій, який ви намагаєтеся додати, не існує. Спочатку створіть його.
+settings.change_orgname_prompt = Зауважте, зміна назви організації також змінить URL-адресу організації і звільнить стару назву.
+teams.none_access_helper = Опція «Немає доступу» впливає лише на приватні репозиторії.
+teams.general_access_helper = Дозволи учасників будуть визначатися відповідно до наведеної нижче таблиці дозволів.
+teams.general_access = Індивідуальний доступ
 
 [admin]
 dashboard=Панель управління
@@ -2839,22 +3036,22 @@ dashboard.update_migration_poster_id=Оновити мігровані ID авт
 dashboard.git_gc_repos=Виконати очистку сміття для всіх репозиторіїв
 dashboard.resync_all_sshkeys=Оновити файл «.ssh/authorized_keys» з SSH-ключами Forgejo.
 dashboard.resync_all_sshprincipals=Оновити файл «.ssh/authorized_principals» з SSH даними користувача Forgejo.
-dashboard.resync_all_hooks=Пересинхронізувати перед-прийнятні, оновлюючі та пост-прийнятні хуки в усіх репозиторіях
+dashboard.resync_all_hooks=Пересинхронізувати хуки pre-receive, update та post-receive в усіх репозиторіях
 dashboard.reinit_missing_repos=Переініціалізувати усі репозитрії git-файли яких втрачено
 dashboard.sync_external_users=Синхронізувати дані зовнішніх користувачів
-dashboard.cleanup_hook_task_table=Очистити hook_task таблицю
+dashboard.cleanup_hook_task_table=Очистити таблицю hook_task
 dashboard.server_uptime=Час роботи сервера
 dashboard.current_goroutine=Поточна кількість Goroutines
 dashboard.current_memory_usage=Поточне використання пам'яті
 dashboard.total_memory_allocated=Виділено пам'яті загалом
 dashboard.memory_obtained=Отримано пам'яті
 dashboard.pointer_lookup_times=Пошуків вказівника
-dashboard.memory_allocate_times=Виділення пам'яті
+dashboard.memory_allocate_times=Виділень пам'яті
 dashboard.memory_free_times=Звільнень пам'яті
 dashboard.current_heap_usage=Поточне використання динамічної пам'яті
 dashboard.heap_memory_obtained=Отримано динамічної пам'яті
-dashboard.heap_memory_idle=Не використовується динамічною пам'яттю
-dashboard.heap_memory_in_use=Використовується динамічною пам'яттю
+dashboard.heap_memory_idle=Динамічної пам'яті простоює
+dashboard.heap_memory_in_use=Динамічної пам'яті використовується
 dashboard.heap_memory_released=Звільнено динамічної пам'яті
 dashboard.heap_objects=Об'єктів динамічної пам'яті
 dashboard.bootstrap_stack_usage=Використання стеку Bootstrap
@@ -2864,16 +3061,16 @@ dashboard.mspan_structures_obtained=Отримано структур MSpan
 dashboard.mcache_structures_usage=Використання структур MCache
 dashboard.mcache_structures_obtained=Отримано структур MCache
 dashboard.profiling_bucket_hash_table_obtained=Отримано хеш-таблиць профілювання
-dashboard.gc_metadata_obtained=Отримано метаданих збирача сміття (GC)
+dashboard.gc_metadata_obtained=Отримано метаданих збирача сміття
 dashboard.other_system_allocation_obtained=Отримання інших виділень пам'яті
-dashboard.next_gc_recycle=Наступний цикл збирача сміття (GC)
-dashboard.last_gc_time=З останнього запуску збирача сміття (GC)
+dashboard.next_gc_recycle=Наступний цикл збирача сміття
+dashboard.last_gc_time=З останнього запуску збирача сміття
 dashboard.total_gc_time=Загальна пауза збирача сміття (GC)
-dashboard.total_gc_pause=Загальна пауза збирача сміття (GC)
-dashboard.last_gc_pause=Остання пауза збирача сміття (GC)
-dashboard.gc_times=Кількість запусків збирача сміття (GC)
-dashboard.delete_old_actions=Видалити всі старі дії з бази даних
-dashboard.delete_old_actions.started=Видалення всіх старі дії з бази даних розпочато.
+dashboard.total_gc_pause=Загальна пауза збирача сміття
+dashboard.last_gc_pause=Остання пауза збирача сміття
+dashboard.gc_times=Кількість запусків збирача сміття
+dashboard.delete_old_actions=Видалити всі старі активності з бази даних
+dashboard.delete_old_actions.started=Розпочато видалення всіх старих активностей з бази даних.
 
 users.user_manage_panel=Керування обліковими записами
 users.new_account=Створити обліковий запис
@@ -2897,12 +3094,12 @@ users.update_profile_success=Обліковий запис користувач
 users.edit_account=Редагувати обліковий запис
 users.max_repo_creation=Максимальна кількість репозиторіїв
 users.max_repo_creation_desc=(Введіть -1, щоб використовувати глобальний ліміт за замовчуванням.)
-users.is_activated=Обліковий запис користувача увімкнено
-users.prohibit_login=Вимкнути вхід
+users.is_activated=Активований обліковий запис
+users.prohibit_login=Заблокований обліковий запис
 users.is_admin=Обліковий запис адміністратора
-users.is_restricted=Обмежений
-users.allow_git_hook=Може створювати Git хуки
-users.allow_git_hook_tooltip=Git хуки виконуються від імені користувача OS сервісу Forgejo і мають однаковий рівень доступу до хоста. Як результат, користувачі з доступом до Git-хуків можуть отримати доступ і змінювати всі репозиторії Forgejo, а також базу даних, що використовуються в Forgejo. Отже, вони також здатні отримати права адміністратора Forgejo.
+users.is_restricted=Обмежений обліковий запис
+users.allow_git_hook=Може створювати Git-хуки
+users.allow_git_hook_tooltip=Git-хуки виконуються від імені користувача ОС, від якого запущено Forgejo, і мають той самий рівень доступу до хоста. Таким чином, користувачі зі спеціальними правами Git-хуків можуть отримати доступ і змінювати всі репозиторії Forgejo, а також базу даних Forgejo. Вони також здатні отримати права адміністратора Forgejo.
 users.allow_import_local=Може імпортувати локальні репозиторії
 users.allow_create_organization=Може створювати організації
 users.update_profile=Оновити обліковий запис
@@ -2982,16 +3179,16 @@ auths.domain=Домен
 auths.host=Хост
 auths.port=Порт
 auths.bind_dn=Прив'язати DN
-auths.bind_password=Прив'язати пароль
+auths.bind_password=Пароль bind
 auths.user_base=База пошуку користувачів
 auths.user_dn=DN користувача
 auths.attribute_username=Атрибут імені користувача
 auths.attribute_username_placeholder=Залиште порожнім, щоб використовувати ім'я користувача для реєстрації.
 auths.attribute_name=Атрибут імені
-auths.attribute_surname=Атрибут Surname
-auths.attribute_mail=Атрибут Email
-auths.attribute_ssh_public_key=Атрибут Відкритий SSH ключ
-auths.attributes_in_bind=Витягувати атрибути в контексті Bind DN
+auths.attribute_surname=Атрибут прізвища
+auths.attribute_mail=Атрибут адреси email
+auths.attribute_ssh_public_key=Атрибут відкритого ключа SSH
+auths.attributes_in_bind=Отримувати атрибути в контексті bind DN
 auths.allow_deactivate_all=Дозволити порожньому результату пошуку відключити всіх користувачів
 auths.use_paged_search=Використовувати посторінковий пошук
 auths.search_page_size=Розмір сторінки
@@ -3043,20 +3240,20 @@ auths.sspi_default_language_helper=Типова мова для користув
 auths.tips=Поради
 auths.tips.oauth2.general=Автентифікація OAuth2
 auths.tip.oauth2_provider=Постачальник OAuth2
-auths.tip.bitbucket=Створіть OAuth URI на сторінці %s
+auths.tip.bitbucket=Зареєструйте нового споживача OAuth на %s і додайте дозвіл «Обліковий запис» — «Читання»
 auths.tip.nextcloud=`Зареєструйте нового споживача OAuth у вашому екземплярі за допомогою наступного меню "Налаштування -> Безпека -> клієнт OAuth 2.0"`
-auths.tip.dropbox=Створіть новий додаток на %s
-auths.tip.facebook=Зареєструйте новий додаток на %s і додайте модуль «Facebook Login»
-auths.tip.github=Зареєструйте новий додаток OAuth на %s
+auths.tip.dropbox=Створіть нову програму на %s
+auths.tip.facebook=Зареєструйте нову програму на %s і додайте модуль «Facebook Login»
+auths.tip.github=Зареєструйте нову програму OAuth на %s
 auths.tip.gitlab=Додайте новий додаток на https://gitlab.com/profile/applications
 auths.tip.google_plus=Отримайте облікові дані клієнта OAuth2 в консолі Google API на сторінці %s
 auths.tip.openid_connect=Використовуйте OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) для автоматичної настройки входу OAuth
-auths.tip.twitter=Перейдіть на %s, створіть програму і переконайтеся, що включена опція «Дозволити цю програму для входу в систему за допомогою Twitter»
-auths.tip.discord=Зареєструйте новий додаток на %s
-auths.tip.yandex=Створіть новий додаток на %s. У розділі «Yandex.Passport API» виберіть такі дозволи: «Доступ до адреси електронної пошти», «Доступ до аватара» і «Доступ до імені користувача, імені та прізвища, статі»
+auths.tip.twitter=Перейдіть на %s, створіть програму і переконайтеся, що ввімкнено опцію «Дозволити використання цієї програми для входу через Twitter»
+auths.tip.discord=Зареєструйте нову програму на %s
+auths.tip.yandex=Створіть нову програму на %s. У розділі «Yandex.Passport API» виберіть такі дозволи: «Доступ до адреси електронної пошти», «Доступ до аватара» і «Доступ до імені користувача, імені та прізвища, статі»
 auths.tip.mastodon=Введіть URL спеціального екземпляра для екземпляра mastodon, який ви хочете автентифікувати за допомогою (або використовувати за замовчуванням)
 auths.edit=Редагувати джерело автентифікації
-auths.activated=Це джерело авторизації активоване
+auths.activated=Це джерело автентифікація активоване
 auths.update_success=Параметри аутентифікації оновлені.
 auths.update=Оновити джерело автентифікації
 auths.delete=Видалити джерело автентифікації
@@ -3081,8 +3278,8 @@ config.git_version=Версія Git
 config.repo_root_path=Шлях до кореня репозиторію
 config.lfs_root_path=Кореневий шлях LFS
 config.log_file_root_path=Шлях до лог файлу
-config.script_type=Тип скрипта
-config.reverse_auth_user=Ім'я користувача для авторизації на reverse proxy
+config.script_type=Тип скрипту
+config.reverse_auth_user=Користувач для авторизації на зворотному проксі
 
 config.ssh_config=Конфігурація SSH
 config.ssh_enabled=Увімкнено
@@ -3127,10 +3324,10 @@ config.default_keep_email_private=Приховувати адреси елект
 config.default_allow_create_organization=Дозволити створення організацій за замовчуванням
 config.enable_timetracking=Увімкнути відстеження часу
 config.default_enable_timetracking=Увімкнути відстеження часу за замовчуванням
-config.default_allow_only_contributors_to_track_time=Враховувати тільки учасників розробки в підрахунку часу
+config.default_allow_only_contributors_to_track_time=Дозволити відстеження часу тільки учасникам розробки
 config.no_reply_address=Домен прихованих адрес електронної пошти
 config.default_visibility_organization=Видимість за замовчуванням для нових організацій
-config.default_enable_dependencies=Увімкнути залежності задачі за замовчуванням
+config.default_enable_dependencies=Увімкнути залежності задач за замовчуванням
 
 config.webhook_config=Конфігурація вебхуків
 config.queue_length=Довжина черги
@@ -3155,13 +3352,13 @@ config.cache_config=Конфігурація кешу
 config.cache_adapter=Адаптер кешу
 config.cache_interval=Інтервал кешування
 config.cache_conn=Підключення до кешу
-config.cache_item_ttl=Час зберігання даних кешу
+config.cache_item_ttl=Час зберігання даних у кеші
 
 config.session_config=Конфігурація сесії
 config.session_provider=Провайдер сесії
 config.provider_config=Конфігурація постачальника
 config.cookie_name=Назва файлу cookie
-config.gc_interval_time=Інтервал запуску збирача сміття (GC)
+config.gc_interval_time=Інтервал запуску збирача сміття
 config.session_life_time=Час життя сесії
 config.https_only=Тільки HTTPS
 config.cookie_life_time=Час життя файлу cookie
@@ -3176,16 +3373,16 @@ config.git_disable_diff_highlight=Вимкнути підсвітку синта
 config.git_max_diff_lines=Максимум рядків на diff (на один файл)
 config.git_max_diff_line_characters=Максимум символів на diff (на одну строку)
 config.git_max_diff_files=Максимум diff-файлів (для показу)
-config.git_gc_args=Аргументи збирача сміття (GC)
+config.git_gc_args=Аргументи збирача сміття
 config.git_migrate_timeout=Тайм-аут міграції
 config.git_mirror_timeout=Тайм-аут оновлення дзеркала
 config.git_clone_timeout=Тайм-аут операції клонування
-config.git_pull_timeout=Тайм-аут операції Pull
-config.git_gc_timeout=Тайм-аут операції збирача сміття (GC)
+config.git_pull_timeout=Тайм-аут операції отримання змін
+config.git_gc_timeout=Тайм-аут операції збирача сміття
 
 config.log_config=Конфігурація журналу
 config.disabled_logger=Вимкнено
-config.access_log_mode=Режим доступу до журналу
+config.access_log_mode=Режим журналювання доступу
 config.xorm_log_sql=Журнал SQL
 
 
@@ -3220,11 +3417,11 @@ monitor.queue.settings.submit=Оновити налаштування
 monitor.queue.settings.changed=Налаштування оновлено
 
 notices.system_notice_list=Сповіщення системи
-notices.view_detail_header=Переглянути деталі повідомлення
+notices.view_detail_header=Подробиці сповіщення
 notices.select_all=Вибрати все
-notices.deselect_all=Скасувати виділення
-notices.inverse_selection=Інвертувати виділене
-notices.delete_selected=Видалити обране
+notices.deselect_all=Скасувати вибір
+notices.inverse_selection=Інвертувати вибір
+notices.delete_selected=Видалити вибране
 notices.delete_all=Видалити всі cповіщення
 notices.type=Тип
 notices.type_1=Репозиторій
@@ -3242,13 +3439,13 @@ packages.package_manage_panel = Керування пакунками
 packages.published = Опубліковано
 notices.operations = Дії
 packages.cleanup = Очистити недійсні дані
-packages.cleanup.success = Успішно очищено недійсні дані
+packages.cleanup.success = Недійсні дані успішно очищено
 users.still_own_packages = Цей користувач досі володіє одним чи більше пакунками, спочатку видаліть ці пакунки.
 users.purge_help = Примусово видалити користувача і будь-які репозиторії, організації та пакунки, якими він володіє. Всі коментарі та задачі, створені цим користувачем, також будуть видалені.
 dashboard.cleanup_packages = Очистити непридатні пакунки
 monitor.last_execution_result = Результат
 repos.lfs_size = Розмір LFS
-config.allow_dots_in_usernames = Дозволити використання крапки в іменах користувачів. Не впливає на існуючі облікові записи.
+config.allow_dots_in_usernames = Дозволити використання крапки в іменах користувачів. Не впливає на облікові записи, що вже існують.
 config.mailer_enable_helo = Увімкнути HELO
 users.organization_creation.description = Дозволити створення нових організацій.
 users.cannot_delete_self = Ви не можете видалити себе
@@ -3268,8 +3465,8 @@ monitor.queue.settings.desc = Пули динамічно зростають у
 monitor.queue.settings.remove_all_items_done = Усі елементи в черзі видалено.
 monitor.queue.settings.remove_all_items = Видалити всі
 config.app_slogan = Гасло екземпляра
-auths.tip.gitea = Зареєструйте новий додаток OAuth. Інструкцію можна знайти на %s
-auths.tip.gitlab_new = Зареєструйте новий додаток на %s
+auths.tip.gitea = Зареєструйте нову програму OAuth. Інструкцію можна знайти на %s
+auths.tip.gitlab_new = Зареєструйте нову програму на %s
 monitor.duration = Тривалість (с)
 users.reserved = Зарезервовано
 systemhooks.desc = Вебхуки автоматично сповіщають HTTP-сервер POST-запитами, коли в Forgejo відбуваються певні події. Вказані тут вебхуки спрацьовуватимуть для всіх репозиторіїв системи, тож врахуйте всі ймовірні наслідки для швидкодії. Докладніше — в <a target="_blank" rel="noopener" href="%s">посібнику з вебхуків</a>.
@@ -3295,9 +3492,44 @@ dashboard.task.cancelled = Завдання: %[1]s скасовано: %[3]s
 config.mailer_protocol = Протокол
 dashboard.cron.cancelled = Cron: %[1]s скасовано: %[3]s
 defaulthooks.desc = Вебхуки автоматично сповіщають HTTP-сервер POST-запитами, коли в Forgejo відбуваються певні події. Вказані тут вебхуки є типовими і будуть скопійовані до всіх нових репозиторіїв. Докладніше — в <a target="_blank" rel="noopener" href="%s">посібнику з вебхуків</a>.
-
-
 assets = Ресурси коду
+auths.invalid_openIdConnectAutoDiscoveryURL = Неправильна URL-адреса автоматичного виявлення (повинна бути дійсна URL-адреса, що починається з http:// або https://)
+settings = Налаштування адміністратора
+dashboard.start_schedule_tasks = Запустити заплановані завдання дій
+config.logger_name_fmt = Журнал: %s
+config.set_setting_failed = Не вдалося встановити параметр %s
+config.access_log_template = Шаблон журналу доступу
+dashboard.cancel_abandoned_jobs = Скасувати покинуті завдання дій
+monitor.download_diagnosis_report = Завантажити діагностичний звіт
+auths.oauth2_map_group_to_team_removal = Видаляти користувачів із синхронізованих команд, якщо користувачі не належать до відповідної групи.
+config.mailer_smtp_addr = Адреса SMTP
+dashboard.update_checker = Перевірка оновлень
+auths.map_group_to_team_removal = Видаляти користувачів із синхронізованих команд, якщо користувачі не належать до відповідної групи LDAP
+auths.enable_ldap_groups = Увімкнути групи LDAP
+auths.unable_to_initialize_openid = Не вдалося ініціалізувати постачальника OpenID Connect: %s
+auths.new_success = Метод автентифікації «%s» додано.
+config.cache_test_slow = Перевірку кешу завершено успішно, але відповідь повільна: %s.
+config.cache_test_succeeded = Перевірку кешу завершено успішно, відповідь отримано через %s.
+config.cache_test = Перевірити кеш
+config.cache_test_failed = Не вдалося перевірити кеш: %v.
+dashboard.rebuild_issue_indexer = Перебудувати індексатор задач
+users.details = Дані користувача
+auths.login_source_exist = Джерело автентифікації «%s» вже існує.
+dashboard.delete_old_system_notices = Видалити всі старі сповіщення системи з бази даних
+users.purge = Повністю видалити користувач_ку
+auths.tips.oauth2.general.tip = При реєстрації нової програми OAuth2 URL-адреса зворотного виклику/переспрямування повинна бути:
+auths.attribute_avatar = Атрибут аватара
+auths.oauth2_required_claim_name = Необхідна назва заявки
+auths.oauth2_admin_group = Значення групової заявки для адміністраторів. (Необов'язково — потрібна назва заявки вище)
+auths.oauth2_required_claim_name_helper = Вкажіть назву, щоб обмежити вхід з цього джерела користувачами із заявкою з такою назвою
+auths.map_group_to_team = Зіставити групи LDAP з командами організації (залиште поле порожнім, щоб пропустити)
+auths.oauth2_required_claim_value = Необхідне значення заявки
+auths.oauth2_map_group_to_team = Зіставити заявлені групи з командами організації. (Необов'язково — потрібна назва заявки вище)
+auths.oauth2_required_claim_value_helper = Вкажіть значення, щоб обмежити вхід з цього джерела користувачами із заявкою з такими назвою і значенням
+auths.oauth2_group_claim_name = Назва заявки, що надає назви груп для цього джерела. (Необов'язково)
+auths.oauth2_restricted_group = Значення групової заявки для обмежених користувачів. (Необов'язково — потрібна назва заявки вище)
+users.local_import.description = Дозволити імпорт репозиторіїв з локальної файлової системи сервера. Це може становити загрозу безпеці.
+
 
 [action]
 create_repo=створив(ла) репозиторій <a href="%s">%s</a>
@@ -3315,7 +3547,7 @@ merge_pull_request=`прийняв запит злиття <a href="%[1]s">%[3]s
 transfer_repo=перенесено репозиторій <code>%s</code> у <a href="%s">%s</a>
 push_tag=надсилає тег <a href="%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
 delete_tag=видаляє тег %[2]s із <a href="%[1]s">%[3]s</a>
-delete_branch=видалено гілку %[2]s з <a href="%[1]s">%[3]s</a>
+delete_branch=видалено гілку <code>%[2]s</code> з <a href="%[1]s">%[3]s</a>
 compare_branch=Порівняти
 compare_commits=Порівняти %d комітів
 compare_commits_general=Порівняти коміти
@@ -3394,14 +3626,14 @@ alpine.repository.repositories=Репозиторії
 conan.details.repository=Репозиторій
 owner.settings.cleanuprules.enabled=Увімкнено
 about = Про цей пакунок
-empty = Поки що тут немає пакунків.
+empty = Пакунків поки що немає.
 empty.documentation = Докладніше про реєстр пакунків читайте в <a target="_blank" rel="noopener noreferrer" href="%s">документації</a>.
 registry.documentation = Докладніше про реєстр %s читайте в <a target="_blank" rel="noopener noreferrer" href="%s">документації</a>.
 settings.delete.notice = Ви збираєтеся видалити %s (%s). Цю операцію не можна скасувати, ви впевнені?
 details.author = Автор
 title = Пакунки
 arch.version.backup = Резервне копіювання
-arch.version.conflicts = Суперечки
+arch.version.conflicts = Конфлікти
 arch.version.replaces = Заміни
 arch.version.provides = Надає
 arch.version.groups = Група
@@ -3506,17 +3738,48 @@ published_by = %[1]s опубліковано <a href="%[2]s">%[3]s</a>
 swift.install = Додайте пакунок у свій файл <code>Package.swift</code>:
 settings.link.select = Виберіть репозиторій
 alpine.registry.info = Виберіть $branch і $repository зі списку нижче.
-
-alpine.registry = Налаштуйте цей реєстр, додавши URL у файл <code>/etc/apk/repositories</code>:
-arch.pacman.repo.multi.item = Конфігурація %s
-cargo.registry = Налаштуйте цей реєстр у файлі конфігурації Cargo (наприклад, <code>~/.cargo/config.toml</code>):
-chef.registry = Налаштуйте цей реєстр у файлі <code>~/.chef/config.rb</code>:
-composer.registry = Налаштуйте цей реєстр у файлі <code>~/.composer/config.json</code>:
 conda.registry = Встановіть цей реєстр як репозиторій Conda у своєму файлі <code>.condarc</code>:
-cran.registry = Налаштуйте цей реєстр у файлі <code>Rprofile.site</code>:
-maven.registry = Налаштуйте цей реєстр у файлі <code>pom.xml</code> свого проєкту:
-npm.registry = Налаштуйте цей реєстр у файлі <code>.npmrc</code> свого проєкту:
 owner.settings.chef.title = Реєстр Chef
+arch.pacman.repo.multi.item = Конфігурація %s
+maven.registry = Налаштуйте цей реєстр у файлі <code>pom.xml</code> свого проєкту:
+cargo.registry = Налаштуйте цей реєстр у файлі конфігурації Cargo (наприклад, <code>~/.cargo/config.toml</code>):
+composer.registry = Налаштуйте цей реєстр у файлі <code>~/.composer/config.json</code>:
+alpine.registry = Налаштуйте цей реєстр, додавши URL у файл <code>/etc/apk/repositories</code>:
+cran.registry = Налаштуйте цей реєстр у файлі <code>Rprofile.site</code>:
+npm.registry = Налаштуйте цей реєстр у файлі <code>.npmrc</code> свого проєкту:
+chef.registry = Налаштуйте цей реєстр у файлі <code>~/.chef/config.rb</code>:
+owner.settings.chef.keypair.description = Запити до реєстру Chef повинні бути криптографічно підписані як засіб автентифікації. При генерації пари ключів на Forgejo зберігається тільки відкритий ключ. Приватний ключ надається вам для використання команд knife. Генерація нової пари ключів замінить попередню.
+nuget.dependency.framework = Цільовий фреймворк
+owner.settings.cleanuprules.preview.overview = Заплановано видалити %d пакунків.
+owner.settings.cleanuprules.pattern_full_match = Застосувати шаблон до повної назви пакунка
+maven.download = Щоб завантажити залежність, запустіть із командного рядка:
+maven.install2 = Запустити з командного рядка:
+npm.dependencies.bundle = Пакетні залежності
+npm.dependencies.peer = Однорангові залежності
+arch.pacman.repo.multi = %s має одну й ту саму версію в різних дистрибутивах.
+owner.settings.cargo.rebuild = Перебудувати індекс
+owner.settings.cleanuprules.none = Правил очистки ще немає.
+owner.settings.cleanuprules.preview.none = Правило очистки не відповідає жодному пакунку.
+owner.settings.cargo.initialize = Ініціалізувати індекс
+owner.settings.cargo.initialize.description = Для реєстру Cargo потрібен спеціальний Git-репозиторій з індексом. Використання цієї опції (пере)створить репозиторій і автоматично його налаштує.
+owner.settings.cargo.initialize.error = Не вдалося ініціалізувати індекс Cargo: %v
+owner.settings.cargo.initialize.success = Індекс Cargo успішно створено.
+owner.settings.cargo.rebuild.error = Не вдалося перебудувати індекс Cargo: %v
+owner.settings.cargo.title = Індекс реєстру Cargo
+owner.settings.cleanuprules.title = Правила очистки
+owner.settings.cleanuprules.add = Додати правило очистки
+owner.settings.cargo.rebuild.success = Індекс Cargo успішно перебудовано.
+owner.settings.cleanuprules.success.update = Правило очистки оновлено.
+owner.settings.cleanuprules.success.delete = Правило очистки видалено.
+owner.settings.cleanuprules.edit = Редагувати правило очистки
+owner.settings.cleanuprules.preview = Попередній перегляд правила очистки
+owner.settings.cargo.rebuild.description = Перебудування може бути корисним, якщо індекс не синхронізовано зі збереженими пакунками Cargo.
+rpm.distros.redhat = у дистрибутивах на основі RedHat
+rpm.distros.suse = у дистрибутивах на основі SUSE
+owner.settings.cargo.rebuild.no_index = Неможливо перебудувати, індекс не ініціалізовано.
+alpine.registry.key = Завантажте відкритий RSA-ключ реєстру в папку <code>/etc/apk/keys/</code> для перевірки підпису індексу:
+rubygems.required.ruby = Необхідна версія Ruby
+rubygems.required.rubygems = Необхідна версія RubyGem
 
 [secrets]
 deletion = Видалити секрет
@@ -3531,7 +3794,6 @@ none = Секретів ще немає.
 creation.name_placeholder = без урахування регістру, тільки літерно-цифрові символи або підкреслення, не може починатися з GITEA_ або GITHUB_
 secrets = Секрети
 creation.value_placeholder = Уведіть довільний вміст. Пробіли на початку та в кінці будуть пропущені.
-
 description = Секрети передаються певним діям і не можуть бути прочитані інакше.
 
 [actions]
@@ -3571,7 +3833,7 @@ variables.management = Керування змінними
 variables.id_not_exist = Змінної з ідентифікатором %d не існує.
 variables.edit = Редагувати змінну
 runs.expire_log_message = Журнали очищено, тому що вони були занадто старі.
-runs.empty_commit_message = (порожнє повідомлення коміта)
+runs.empty_commit_message = (порожнє повідомлення коміту)
 runners.status.unspecified = Невідомо
 runs.status_no_select = Усі стани
 runs.status = Стан
@@ -3619,6 +3881,13 @@ runners.runner_title = Ранер
 runners.task_list = Нещодавні завдання ранера
 runners.update_runner_success = Ранер оновлено
 runners.delete_runner_header = Підтвердіть видалення ранера
+runners.status.offline = Неактивний
+runners.status.idle = Простоює
+runs.invalid_workflow_helper = Недійсний файл конфігурації робочого потоку. Будь ласка, перевірте файл конфігурації: %s
+runs.no_job = Робочий потік повинен містити принаймні одне завдання
+workflow.dispatch.use_from = Використати робочий потік із
+runs.no_job_without_needs = Робочий потік повинен містити принаймні одне завдання без залежностей.
+workflow.dispatch.trigger_found = Цей робочий потік спрацьовує на події <c>workflow_dispatch</c>.
 
 
 
@@ -3631,7 +3900,7 @@ deleted.display_name = Видалений проєкт
 
 [git.filemode]
 symbolic_link=Символічне посилання
-directory = Тека
+directory = Каталог
 submodule = Підмодуль
 normal_file = Звичайний файл
 executable_file = Виконуваний файл
@@ -3679,15 +3948,17 @@ test = Це тестовий текст. Він не відображаєтьс
 [repo.permissions]
 packages.read = <b>Читати:</b> дивитись та завантажити пакунки, призначені до репозиторію.
 packages.write = <b>Писати:</b> публікувати та видаляти пакунки, призначені до репозиторію.
-
-issues.read = <b>Читати:</b> дивитись і створювати задачі та коментарі.
+releases.write = <b>Писати:</b> публікувати, змінювати і видаляти випуски та їхні ресурси.
 pulls.read = <b>Читати:</b> дивитись і створювати запити на злиття.
 releases.read = <b>Читати:</b> дивитись і завантажувати випуски.
-releases.write = <b>Писати:</b> публікувати, змінювати і видаляти випуски та їхні ресурси.
-wiki.read = <b>Читати:</b> переглядати вбудовану вікі та її історію.
-wiki.write = <b>Писати:</b> створювати, оновлювати та видаляти сторінки вбудованої вікі.
 actions.read = <b>Читати:</b> дивитися вбудовані конвеєри CI/CD та їхні журнали.
+wiki.write = <b>Писати:</b> створювати, оновлювати та видаляти сторінки вбудованої вікі.
+issues.read = <b>Читати:</b> дивитись і створювати задачі та коментарі.
+wiki.read = <b>Читати:</b> переглядати вбудовану вікі та її історію.
 actions.write = <b>Писати:</b> вручну запускати, перезапускати, скасовувати або схвалювати конвеєри CI/CD в очікуванні.
+projects.write = <b>Писати:</b> створювати проєкти і стовпчики та редагувати їх.
+ext_issues = Доступ до посилання на зовнішню систему відстеження задач. Налаштування дозволів відбувається поза сайтом.
+ext_wiki = Доступ до посилання на зовнішню вікі. Налаштування дозволів відбувається поза сайтом.
 
 [munits.data]
 pib = ПіБ
diff --git a/options/locale/locale_vi.ini b/options/locale/locale_vi.ini
index 57e592a209..28577bc3f7 100644
--- a/options/locale/locale_vi.ini
+++ b/options/locale/locale_vi.ini
@@ -9,7 +9,7 @@ sign_up = Đăng ký
 link_account = Liên kết tài khoản
 register = Đăng ký
 version = Phiên bản
-powered_by = Sử dụng %s
+powered_by = Được cung cấp bởi %s
 page = Trang
 template = Mẫu
 language = Ngôn ngữ
@@ -25,7 +25,7 @@ access_token = Mã truy cập
 captcha = CAPTCHA
 twofa = Xác thực hai lớp
 webauthn_insert_key = Cắm khóa bảo mật của bạn vào
-copy_hash = Chép chuỗi băm
+copy_hash = Sao chép chuỗi băm
 sign_in_with_provider = Đăng nhập bằng %s
 webauthn_press_button = Hãy nhấn nút trên khóa bảo mật…
 webauthn_use_twofa = Dùng mã xác thực hai lớp ở trên điện thoại
@@ -36,7 +36,7 @@ webauthn_error_insecure = WebAuthn chỉ hỗ trợ kết nối mã hóa. Nếu
 webauthn_error_unable_to_process = Máy chủ không thể xử lý yêu cầu của bạn.
 webauthn_error_empty = Bạn phải đặt tên cho khóa này.
 webauthn_error_timeout = Hết thời gian đọc khóa mất rồi. Hãy tải lại trang và thử lại.
-copy_type_unsupported = Không chép được
+copy_type_unsupported = Không thể sao chép loại tệp này
 repository = Kho mã
 organization = Tổ chức
 new_fork = Tạo một nhánh mới
@@ -55,17 +55,17 @@ all = Tất cả
 sources = Nguồn
 forks = Các phân nhánh
 activities = Hoạt động
-pull_requests = Yêu cầu thêm mã
+pull_requests = Yêu cầu kéo mã
 save = Lưu
-issues =
+issues =Vấn đề
 enabled = Bật
 disabled = Tắt
-copy = Chép
-copy_generic = Chép vào bộ nhớ tạm
-copy_url = Chép URL
-copy_content = Chép nội dung
-copy_success = Đã chép!
-copy_error = Không chép được
+copy = Sao chép
+copy_generic = Sao chép vào bộ nhớ tạm
+copy_url = Sao chép URL
+copy_content = Sao chép nội dung
+copy_success = Đã sao chép!
+copy_error = Sao chép thất bại
 write = Viết
 preview = Xem trước
 error = Lỗi
@@ -73,7 +73,7 @@ error413 = Bạn đã dùng hết định mức.
 go_back = Quay lại
 invalid_data = Dữ liệu không hợp lệ: %v
 never = Không bao giờ
-unknown = Không biết
+unknown = Không xác định
 unpin = Bỏ ghim
 pin = Ghim
 archived = Đã lưu trữ
@@ -81,6 +81,60 @@ signed_in_as = Đăng nhập bằng
 re_type = Xác nhận mật khẩu
 webauthn_sign_in = Nhấn nút trên khóa bảo mật, nếu không có nút thì bạn hãy rút ra rồi cắm lại.
 new_org.link = Tạo tổ chức
-error404 = Trang bạn đang tìm <strong>không tồn tại</strong> hoặc <strong>bạn không có quyền xem</strong>.
+error404 = Trang bạn đang tìm <strong>không tồn tại</strong>, <strong>đã bị xoá</strong> hoặc <strong>bạn không có quyền</strong> để xem nó.
 edit = Chỉnh sửa
-filter = Lọc
\ No newline at end of file
+filter = Bộ lọc
+dashboard = Trang quản lý
+logo = Logo
+toc = Mục lục
+user_profile_and_more = Hồ sơ và cài đặt…
+passcode = Mã xác thực
+webauthn_error_duplicated = Khóa bảo mật không được phép cho yêu cầu này. Vui lòng đảm bảo rằng khóa chưa được đăng ký trước đó.
+mirror = Bản sao
+new_mirror = Tạo bản sao mới
+your_starred = Đã đánh sao
+mirrors = Các bản sao
+concept_system_global = Chung
+concept_user_individual = Cá nhân
+show_log_seconds = Hiện giây
+show_full_screen = Toàn màn hình
+download_logs = Tải xuống nhật ký
+confirm_delete_selected = Xác nhận xoá tất cả mục được chọn?
+name = Tên
+filter.clear = Xoá bộ lọc
+filter.not_fork = Không phải phân nhánh
+filter.not_archived = Không bị lưu trữ
+filter.is_archived = Bị lưu trữ
+filter.is_fork = Phân nhánh
+filter.is_mirror = Bản sao
+filter.is_template = Mẫu
+filter.not_template = Không phải mẫu
+filter.public = Công khai
+filter.private = Riêng tư
+twofa_scratch = Mã xác thực 2 lớp dự phòng
+collaborative = Cộng tác
+milestones = Cột mốc
+cancel = Huỷ bỏ
+retry = Thử lại
+rerun = Chạy lại
+rerun_all = Chạy lại tất cả
+ok = Đồng ý
+add = Thêm
+add_all = Thêm tất cả
+remove = Xoá
+remove_all = Xoá tất cả
+remove_label_str = Xoá "%s"
+locked = Bị khoá
+copy_branch = Sao chép tên nhánh
+loading = Đang tải…
+rss_feed = Nguồn RSS
+confirm_delete_artifact = Bạn có chắc muốn xoá "%s" ?
+value = Giá trị
+copy_path = Sao chép đường dẫn
+filter.not_mirror = Không phải bản sao
+show_timestamps = Hiện mốc thời gian
+concept_code_repository = Kho mã
+concept_user_organization = Tổ chức
+
+[search]
+search = Tìm kiếm…
\ No newline at end of file
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index bb7b579a02..ab99f94728 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -7,9 +7,9 @@ logo=徽标
 sign_in=登录
 sign_in_with_provider=使用 %s 登录
 sign_in_or=或
-sign_out=退出
+sign_out=登出
 sign_up=注册
-link_account=链接账户
+link_account=链接账号
 register=注册
 version=当前版本
 powered_by=由 %s 提供支持
@@ -18,7 +18,7 @@ template=模板
 language=语言选项
 notifications=通知
 active_stopwatch=活跃时间跟踪器
-tracked_time_summary=基于工单列表过滤器的跟踪时间概要
+tracked_time_summary=议题列表过滤器的跟踪时间摘要
 create_new=创建…
 user_profile_and_more=个人信息与设置…
 signed_in_as=已登录用户
@@ -70,14 +70,14 @@ your_starred=点赞
 your_settings=设置
 
 all=所有
-sources=来源
+sources=原创
 mirrors=镜像
 collaborative=协作
 forks=派生
 
 activities=最近活动
 pull_requests=合并请求
-issues=工单
+issues=议题
 milestones=里程碑
 
 ok=确定
@@ -112,7 +112,7 @@ preview=预览
 loading=正在加载…
 
 error=错误
-error404=您尝试访问的页面<strong>不存在</strong>、<strong>已被移除</strong>或<strong>您无权查看</strong>。
+error404=您正在尝试访问的页面<strong>不存在</strong>、<strong>已被移除</strong>或<strong>您无权查看</strong>。
 go_back=返回
 
 never=从未
@@ -171,7 +171,7 @@ copy_path = 复制路径
 [aria]
 navbar=导航栏
 footer=页脚
-footer.software=关于软件
+footer.software=关于此软件
 footer.links=链接
 
 [heatmap]
@@ -217,7 +217,7 @@ string.desc=Z - A
 
 [error]
 occurred=发生了一个错误
-report_message=如果您确定这是一个 Forgejo 的 bug，请在 <a href="%s" target="_blank">Codeberg</a> 上搜索相关问题或在必要时创建一个新工单。
+report_message=如果您确定这是一个 Forgejo 的 bug，请在 <a href="%s" target="_blank">Codeberg</a> 上搜索相关问题或在必要时创建一个新议题。
 missing_csrf=错误的请求：没有 CSRF 令牌
 invalid_csrf=错误的请求：无效的 CSRF 令牌
 not_found=找不到目标。
@@ -518,7 +518,7 @@ reset_password.text=如果此请求是您本人作出的，则请在 <b>%s</b> 
 register_success=注册成功
 
 issue_assigned.pull=@%[1]s 已将仓库 %[3]s 中的合并请求 %[2]s 指派给您。
-issue_assigned.issue=@%[1]s 已将仓库 %[3]s 中的工单 %[2]s 指派给您。
+issue_assigned.issue=@%[1]s 已将仓库 %[3]s 中的议题 %[2]s 指派给您。
 
 issue.x_mentioned_you=<b>@%s</b> 提到了您：
 issue.action.force_push=<b>%[1]s</b> 强制从 %[3]s 推送 <b>%[2]s</b> 至 [4]s。
@@ -743,7 +743,7 @@ social=社交帐号
 applications=应用
 orgs=组织
 repos=仓库列表
-delete=删除帐户
+delete=删除账号
 twofa=两步验证（TOTP）
 account_link=已绑定的帐户
 organization=组织
@@ -772,7 +772,7 @@ cancel=取消操作
 language=界面语言
 ui=主题
 hidden_comment_types=隐藏的注释类型
-hidden_comment_types_description=此处选中的注释类型不会显示在工单页面中。例如，勾选“标签”将移除所有“<用户>添加/删除了<标签>”注释。
+hidden_comment_types_description=此处选中的注释类型不会显示在议题页面中。例如，勾选“标签”将移除所有“<用户>添加/删除了<标签>”注释。
 hidden_comment_types.ref_tooltip=注释此问题在何处被提及过，如另一个问题、代码提交等…
 hidden_comment_types.issue_ref_tooltip=注释用户在何处更改了与此问题相关联的分支/标签
 comment_type_group_reference=引用
@@ -788,7 +788,7 @@ comment_type_group_lock=锁定状态
 comment_type_group_review_request=评审请求
 comment_type_group_pull_request_push=添加的提交
 comment_type_group_project=项目
-comment_type_group_issue_ref=工单引用
+comment_type_group_issue_ref=议题引用
 saved_successfully=您的设置已成功保存。
 privacy=隐私设置
 keep_activity_private=隐藏个人资料页面中的活动
@@ -828,7 +828,7 @@ activations_pending=等待激活
 can_not_add_email_activations_pending=有一个待处理的激活请求，请稍等几分钟后再尝试添加新的电子邮件地址。
 delete_email=移除
 email_deletion=移除电子邮件地址
-email_deletion_desc=电子邮件地址和相关信息将会被删除。使用此电子邮件地址发送的Git提交将会保留，继续？
+email_deletion_desc=此电子邮件地址及相关信息将被删除。使用此电子邮件地址的Git提交将被保留。继续吗？
 email_deletion_success=您的电子邮件地址已被移除。
 theme_update_success=您的主题已更新。
 theme_update_error=所选主题不存在。
@@ -1024,7 +1024,7 @@ repos_none=你并不拥有任何仓库。
 
 delete_account=删除当前帐户
 delete_prompt=此操作将永久删除您的用户帐户。它 <strong>不能</strong> 被撤消。
-delete_with_all_comments=你的帐户年龄小于 %s。为了避免幽灵评论，所有工单/合并请求的评论都将与它一起被删除。
+delete_with_all_comments=你的帐户年龄小于 %s。为了避免幽灵评论，所有议题/合并请求的评论都将与它一起被删除。
 confirm_delete_account=确认删除帐户
 delete_account_title=删除当前帐户
 delete_account_desc=确实要永久删除此用户帐户吗？
@@ -1062,8 +1062,8 @@ language.description = 此语言将保存到您的账号中，并在您登录后
 language.localization_project = 帮助我们将 Forgejo 翻译成您的语言！<a href="%s">了解更多</a>。
 user_block_yourself = 您不能屏蔽自己。
 pronouns_custom_label = 自定义代词
-change_username_redirect_prompt.with_cooldown.one = 旧的用户名将在%[1]d天的保护期后对所有人可用，您仍可以在此期间重新认领旧的用户名。
-change_username_redirect_prompt.with_cooldown.few = 旧的用户名将在%[1]d天的保护期后对所有人可用，您仍可以在此期间重新认领旧的用户名。
+change_username_redirect_prompt.with_cooldown.one = 旧用户名将在 %[1]d 天的保护期后对所有人可用。您仍可以在此期间重新认领旧用户名。
+change_username_redirect_prompt.with_cooldown.few = 旧用户名将在 %[1]d 天的保护期后对所有人可用，您仍可以在此期间重新认领旧用户名。
 keep_pronouns_private = 仅向已认证用户显示代词
 keep_pronouns_private.description = 这将对未登录的访问者隐藏您的代词。
 quota = 配额
@@ -1078,7 +1078,7 @@ quota.sizes.git.all = Git 内容
 quota.sizes.git.lfs = Git LFS
 quota.sizes.assets.all = 资源
 quota.sizes.assets.attachments.all = 附件
-quota.sizes.assets.attachments.issues = 工单附件
+quota.sizes.assets.attachments.issues = 议题附件
 quota.sizes.assets.attachments.releases = 版本发布附件
 quota.sizes.assets.artifacts = 制品
 quota.sizes.assets.packages.all = 软件包
@@ -1156,7 +1156,7 @@ mirror_sync = 已同步
 mirror_sync_on_commit=推送提交时同步
 mirror_address=从 URL 克隆
 mirror_address_desc=在授权框中输入必要的凭据。
-mirror_address_url_invalid=URL无效。请检查您所输入的URL是否正确。
+mirror_address_url_invalid=URL无效。请检查所输入URL的所有部分是否被正确地转译。
 mirror_address_protocol_invalid=提供的URL无效。只能使用http（s）://或git://地址进行镜像操作。
 mirror_lfs=大文件存储（LFS）
 mirror_lfs_desc=镜像 LFS 数据。
@@ -1211,12 +1211,12 @@ template.git_hooks_tooltip=你目前无法修改或删除被添加过的 Git Hoo
 template.webhooks=Web 钩子
 template.topics=主题
 template.avatar=头像
-template.issue_labels=工单标签
+template.issue_labels=议题标签
 template.one_item=必须至少选择一个模板项
 template.invalid=必须选择一个模板仓库
 
-archive.title=此仓库已存档。您可以查看文件和克隆仓库，但无法对其状态进行任何更改，例如推送和创建新工单、合并请求或评论。
-archive.title_date=此仓库已于 %s 存档。您可以查看文件或克隆它，但无法对其状态进行任何更改，例如推送和创建新工单、合并请求或评论。
+archive.title=此仓库已存档。您可以查看文件和克隆仓库，但无法对其状态进行任何更改，例如推送和创建新议题、合并请求或评论。
+archive.title_date=此仓库已于 %s 存档。您可以查看文件或克隆它，但无法对其状态进行任何更改，例如推送和创建新议题、合并请求或评论。
 archive.issue.nocomment=此仓库已存档，您不能在工单添加评论。
 archive.pull.nocomment=此仓库已存档，您不能在合并请求添加评论。
 
@@ -1238,14 +1238,14 @@ migrate_items=迁移项目
 migrate_items_wiki=百科
 migrate_items_milestones=里程碑
 migrate_items_labels=标签
-migrate_items_issues=工单
+migrate_items_issues=议题
 migrate_items_pullrequests=合并请求
 migrate_items_merge_requests=合并请求
 migrate_items_releases=版本发布
 migrate_repo=迁移仓库
 migrate.clone_address=从 URL 迁移/克隆
 migrate.clone_address_desc=现有仓库的 HTTP（s） 或 Git “clone” URL
-migrate.github_token_desc=由于 GitHub API 速率限制，您可以在此处放置一个或多个以逗号分隔的令牌，以加快迁移速度。 警告：滥用此功能可能会违反服务提供商的政策并导致帐户被封。
+migrate.github_token_desc=您可以在此填写一个或多个以逗号分隔的令牌，以规避 GitHub API 速率限制并加快迁移速度。 警告：滥用此功能可能会违反服务提供商的政策并导致您的帐户被封禁。
 migrate.clone_local_path=或服务器本地路径
 migrate.permission_denied=您没有获得导入本地仓库的权限。
 migrate.permission_denied_blocked=您不能从不允许的主机导入，请询问管理员以检查 ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS 设置。
@@ -1273,7 +1273,7 @@ migrate.migrating_topics=正在迁移主题
 migrate.migrating_milestones=正在迁移里程碑
 migrate.migrating_labels=正在迁移标签
 migrate.migrating_releases=正在迁移发布
-migrate.migrating_issues=正在迁移工单
+migrate.migrating_issues=正在迁移议题
 migrate.migrating_pulls=正在迁移合并请求
 migrate.cancel_migrating_title=取消迁移
 migrate.cancel_migrating_confirm=您想要取消此次迁移吗？
@@ -1311,7 +1311,7 @@ filter_branch_and_tag=过滤分支或标签
 find_tag=查找Git标签
 branches=分支列表
 tags=标签列表
-issues=工单
+issues=议题
 pulls=合并请求
 project_board=项目
 packages=软件包
@@ -1470,11 +1470,11 @@ commitstatus.failure=失败
 commitstatus.pending=待定
 commitstatus.success=成功
 
-ext_issues=外部工单
+ext_issues=外部议题
 ext_issues.desc=链接到外部工单跟踪系统。
 
 projects=项目
-projects.desc=在项目看板中管理工单和合并请求。
+projects.desc=在项目看板中管理议题和合并请求。
 projects.description=描述（可选）
 projects.description_placeholder=描述
 projects.create=创建项目
@@ -1483,10 +1483,10 @@ projects.new=创建项目
 projects.new_subheader=在一个地方协调、跟踪和更新您的工作，让项目保持透明并按计划进行。
 projects.create_success=项目 %s 创建成功。
 projects.deletion=删除项目
-projects.deletion_desc=删除项目会从所有相关的工单中移除它。是否继续？
+projects.deletion_desc=删除项目会从所有相关的议题中移除它。是否继续？
 projects.deletion_success=该项目已被删除。
 projects.edit=编辑项目
-projects.edit_subheader=项目用于组织工单和跟踪进展情况。
+projects.edit_subheader=项目用于组织议题和跟踪进展情况。
 projects.modify=更新项目
 projects.edit_success=项目 %s 更新成功。
 projects.type.none=无
@@ -1501,11 +1501,11 @@ projects.column.new_title=名称
 projects.column.new_submit=创建列
 projects.column.new=创建列
 projects.column.set_default=设为默认
-projects.column.set_default_desc=设置此列为未分类工单和合并请求的默认值
+projects.column.set_default_desc=设置此列为未分类议题和合并请求的默认值
 projects.column.unset_default=取消设为默认
 projects.column.unset_default_desc=取消此列为默认值
 projects.column.delete=删除列
-projects.column.deletion_desc=删除项目列会将所有相关工单移到默认的列。是否继续？
+projects.column.deletion_desc=删除项目列会将所有相关议题移到默认的列。是否继续？
 projects.column.color=颜色
 projects.open=开放中
 projects.close=关闭
@@ -1515,12 +1515,12 @@ projects.card_type.images_and_text=图标和文字
 projects.card_type.text_only=仅文本
 
 issues.desc=组织 bug 报告、任务和里程碑。
-issues.filter_assignees=筛选指派人
+issues.filter_assignees=筛选指派成员
 issues.filter_milestones=筛选里程碑
 issues.filter_projects=筛选项目
 issues.filter_labels=筛选标签
 issues.filter_reviewers=筛选评审员
-issues.new=创建工单
+issues.new=创建议题
 issues.new.title_empty=标题不能为空
 issues.new.labels=标签
 issues.new.no_label=未选择标签
@@ -1543,12 +1543,12 @@ issues.new.no_reviewers=无评审员
 issues.choose.get_started=开始
 issues.choose.open_external_link=开启
 issues.choose.blank=默认模板
-issues.choose.blank_about=从默认模板创建一个工单。
+issues.choose.blank_about=从默认模板创建一个议题。
 issues.choose.ignore_invalid_templates=已忽略无效模板
 issues.choose.invalid_templates=发现了 %v 个无效模板
 issues.choose.invalid_config=问题配置包含错误：
 issues.no_ref=未指定分支或标签
-issues.create=创建工单
+issues.create=创建议题
 issues.new_label=创建标签
 issues.new_label_placeholder=标签名称
 issues.new_label_desc_placeholder=描述
@@ -1581,7 +1581,7 @@ issues.remove_ref_at=`删除了引用 <b>%s</b> %s`
 issues.add_ref_at=`添加了引用 <b>%s</b> %s`
 issues.delete_branch_at=`于 %[2]s 删除了分支 <b>%[1]s</b>`
 issues.filter_label=标签筛选
-issues.filter_label_exclude=`使用 <code>alt</code> + <code>鼠标左键 / 回车</code> 排除标签`
+issues.filter_label_exclude=使用 <kbd>Alt</kbd> + <kbd>单击</kbd> 排除标签
 issues.filter_label_no_select=所有标签
 issues.filter_label_select_no_label=无标签
 issues.filter_milestone=里程碑筛选
@@ -1598,7 +1598,7 @@ issues.filter_assginee_no_assignee=未指派
 issues.filter_poster=作者
 issues.filter_poster_no_select=所有作者
 issues.filter_type=类型筛选
-issues.filter_type.all_issues=所有工单
+issues.filter_type.all_issues=所有议题
 issues.filter_type.assigned_to_you=指派给您的
 issues.filter_type.created_by_you=由您创建的
 issues.filter_type.mentioning_you=提及您的
@@ -1644,7 +1644,7 @@ issues.commented_at=`评论于 <a href="#%s">%s</a>`
 issues.delete_comment_confirm=您确定要删除该条评论吗？
 issues.context.copy_link=复制链接
 issues.context.quote_reply=回复
-issues.context.reference_issue=在新工单中引用
+issues.context.reference_issue=在新议题中引用
 issues.context.edit=编辑
 issues.context.delete=删除
 issues.no_content=没有提供说明。
@@ -1653,17 +1653,17 @@ issues.comment_pull_merged_at=已合并提交 %[1]s 到 %[2]s %[3]s
 issues.comment_manually_pull_merged_at=手动合并提交 %[1]s 到 %[2]s %[3]s
 issues.close_comment_issue=评论并关闭
 issues.reopen_issue=重新开放
-issues.reopen_comment_issue=重新打开评论
+issues.reopen_comment_issue=重新打开并评论
 issues.create_comment=评论
-issues.closed_at=`于<a id="%[1]s" href="#%[1]s">%[2]s</a>关闭此工单`
-issues.reopened_at=`重新打开此问题 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`于<a id="%[1]s" href="#%[1]s">%[2]s</a>在代码提交中引用了该工单`
-issues.ref_issue_from=`<a href="%[3]s">引用了工单 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">引用了合并请求 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`于 <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s">从合并请求 %[4]s引用了此工单，将关闭此工单</a>`
-issues.ref_reopening_from=`于 <a id="%[1]s" href="#%[1]s">%[2]s</a> <a href="%[3]s"> 引用了合并请求 %[4]s 将重新讨论此工单</a> `
-issues.ref_closed_from=`<a href="%[3]s">关闭了这个工单 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopened_from=`<a href="%[3]s">重新打开这个工单 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`于 %s 关闭了此议题`
+issues.reopened_at=`于 %s 重新打开了此议题`
+issues.commit_ref_at=`于 %s 从提交中引用了此议题`
+issues.ref_issue_from=`<a href="%[2]s">引用了此议题 %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">引用了此合并请求 %[3]s</a> %[1]s`
+issues.ref_closing_from=`于 %[1]s <a href="%[2]s">从合并请求 %[3]s 引用了此议题，将关闭此议题</a>`
+issues.ref_reopening_from=`于 %[1]s <a href="%[2]s">从合并请求 %[3]s 引用了此议题，将重新打开此议题</a> `
+issues.ref_closed_from=`<a href="%[3]s">关闭了这个议题 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.ref_reopened_from=`<a href="%[3]s">重新打开这个议题 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`来自 %[1]s`
 issues.author=作者
 issues.author_helper=此用户是作者。
@@ -1695,9 +1695,9 @@ issues.label_archive=存档标签
 issues.label_archived_filter=显示存档标签
 issues.label_archive_tooltip=在标签搜索时，默认情况下存档标签将被排除在外。
 issues.label_exclusive_desc=命名标签为 <code>scope/item</code> 以使其与其他以 <code>scope/</code> 开头的标签互斥。
-issues.label_exclusive_warning=在编辑工单或合并请求的标签时，任何冲突的范围标签都将被删除。
+issues.label_exclusive_warning=在编辑议题或合并请求的标签时，任何冲突的范围标签都将被删除。
 issues.label_count=%d 个标签
-issues.label_open_issues=%d 个开放中的工单
+issues.label_open_issues=%d 个开放中的议题
 issues.label_edit=编辑
 issues.label_delete=删除
 issues.label_modify=编辑标签
@@ -1714,37 +1714,37 @@ issues.attachment.download=`点击下载 '%s'`
 issues.subscribe=订阅
 issues.unsubscribe=取消订阅
 issues.unpin_issue=取消置顶
-issues.max_pinned=您不能置顶更多工单
-issues.pin_comment=于 %s 置顶本工单
-issues.unpin_comment=于 %s 取消置顶本工单
+issues.max_pinned=您不能置顶更多议题
+issues.pin_comment=于 %s 置顶本议题
+issues.unpin_comment=于 %s 取消置顶本议题
 issues.lock=锁定对话
 issues.unlock=解锁对话
 issues.lock.unknown_reason=由于未知原因无法锁定。
-issues.lock_duplicate=一个工单不能被锁定两次。
-issues.unlock_error=无法解锁一个未锁定的工单。
-issues.lock_with_reason=于 %[2]s 以 <strong>%[1]s</strong> 锁定本工单，并限制仅限协作者发言
+issues.lock_duplicate=一个议题不能被锁定两次。
+issues.unlock_error=无法解锁一个未锁定的议题。
+issues.lock_with_reason=于 %[2]s 以 <strong>%[1]s</strong> 锁定本议题，并限制仅限协作者发言
 issues.lock_no_reason=于 %s 锁定本议题并限制仅协作者可发言
 issues.unlock_comment=于 %s 解锁此议题
 issues.lock_confirm=锁定
 issues.unlock_confirm=解锁
-issues.lock.notice_1=- 其他用户不能评论此工单。
+issues.lock.notice_1=- 其他用户不能评论此议题。
 issues.lock.notice_2=- 您和仓库其他协作者仍可评论并可见。
-issues.lock.notice_3=- 您可以在未来再次解锁这个工单。
-issues.unlock.notice_1=- 每个人都可以再次就这一工单发表评论。
-issues.unlock.notice_2=- 您可以在未来再次解锁这个工单。
+issues.lock.notice_3=- 您可以在未来再次解锁这个议题。
+issues.unlock.notice_1=- 每个人都可以再次就这一议题发表评论。
+issues.unlock.notice_2=- 您可以在未来再次解锁这个议题。
 issues.lock.reason=锁定原因
 issues.lock.title=锁定有关此问题的对话。
 issues.unlock.title=解锁有关此问题的对话。
 issues.comment_on_locked=您不能对锁定的问题发表评论。
 issues.delete=删除
-issues.delete.title=是否删除工单?
-issues.delete.text=您真的要删除这个工单吗？（该操作将会永久删除所有内容。如果您需要保留，请关闭它）
+issues.delete.title=是否删除议题?
+issues.delete.text=您真的要删除这个议题吗？（该操作将会永久删除所有内容。如果您需要保留，请关闭它）
 issues.tracker=时间跟踪
 issues.start_tracking_short=启动计时器
 issues.start_tracking=开始时间跟踪
 issues.start_tracking_history=`开始工作 %s`
-issues.tracker_auto_close=当此工单关闭时，自动停止计时器
-issues.tracking_already_started=`你已经开始对 <a href="%s">另一个工单</a> 进行时间跟踪！`
+issues.tracker_auto_close=当此议题关闭时，自动停止计时器
+issues.tracking_already_started=`你已经开始对 <a href="%s">另一个议题</a> 进行时间跟踪！`
 issues.stop_tracking=停止计时器
 issues.stop_tracking_history=`停止工作 %s`
 issues.cancel_tracking=放弃
@@ -1766,7 +1766,7 @@ issues.error_modifying_due_date=修改到期时间失败。
 issues.error_removing_due_date=删除到期时间失败。
 issues.push_commit_1=于 %[2]s 推送了 %[1]d 个提交
 issues.push_commits_n=于 %[2]s 推送了 %[1]d 个提交
-issues.force_push_codes=`于 %[6]s 强制推送 %[1]s，从 <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a>，至 <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a>`
+issues.force_push_codes=`于 %[6]s 强制推送 %[1]s，从 <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s，至 <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s`
 issues.force_push_compare=比较
 issues.due_date_form=yyyy-mm-dd
 issues.due_date_form_add=设置到期时间
@@ -1779,37 +1779,37 @@ issues.due_date_modified=于 %[3]s 将到期日从 %[2]s 修改为 %[1]s
 issues.due_date_remove=于 %[2]s 删除了到期时间 %[1]s
 issues.due_date_overdue=超期
 issues.due_date_invalid=到期日期无效或超出范围。请使用“yyyy-mm-dd”格式。
-issues.dependency.title=依赖工单
+issues.dependency.title=依赖议题
 issues.dependency.issue_no_dependencies=未设置依赖项。
 issues.dependency.pr_no_dependencies=没有设置依赖项。
 issues.dependency.no_permission_1=您没有读取 %d 依赖关系的权限
 issues.dependency.no_permission_n=您没有读取 %d 依赖关系的权限
 issues.dependency.no_permission.can_remove=您没有读取此依赖关系的权限，但可以删除此依赖关系
-issues.dependency.add=添加依赖工单…
+issues.dependency.add=添加依赖议题…
 issues.dependency.cancel=取消
 issues.dependency.remove=删除
 issues.dependency.remove_info=删除此依赖项
 issues.dependency.added_dependency=`添加了一个新的依赖项 %s`
 issues.dependency.removed_dependency=`移除了一个依赖项 %s`
-issues.dependency.pr_closing_blockedby=以下工单阻止了关闭此合并请求
-issues.dependency.issue_closing_blockedby=关闭此工单被以下工单阻止
-issues.dependency.issue_close_blocks=此工单阻止了以下工单的关闭
-issues.dependency.pr_close_blocks=此合并请求阻止以下工单的关闭
-issues.dependency.issue_close_blocked=您需要关闭所有阻止此工单的工单, 然后才能关闭它。
-issues.dependency.issue_batch_close_blocked=无法批量关闭您所选择的工单，因为 #%d 工单仍然有处于打开状态的依赖工单
-issues.dependency.pr_close_blocked=您需要关闭所有阻止此合并请求的工单, 然后才能合并它。
+issues.dependency.pr_closing_blockedby=以下议题阻止了关闭此合并请求
+issues.dependency.issue_closing_blockedby=关闭此议题被以下议题阻止
+issues.dependency.issue_close_blocks=此议题阻止了以下议题的关闭
+issues.dependency.pr_close_blocks=此合并请求阻止以下议题的关闭
+issues.dependency.issue_close_blocked=您需要关闭所有阻止此议题的议题, 然后才能关闭它。
+issues.dependency.issue_batch_close_blocked=无法批量关闭您所选择的议题，因为 #%d 议题仍然有处于打开状态的依赖议题
+issues.dependency.pr_close_blocked=您需要关闭所有阻止此合并请求的议题, 然后才能合并它。
 issues.dependency.blocks_short=阻止
 issues.dependency.blocked_by_short=依赖于
 issues.dependency.remove_header=删除依赖项
-issues.dependency.issue_remove_text=此操作将从工单中删除依赖。是否要继续?
+issues.dependency.issue_remove_text=此操作将从议题中删除依赖。是否要继续?
 issues.dependency.pr_remove_text=此操作将从合并请求中删除依赖。是否要继续?
-issues.dependency.setting=为工单和合并请求启用依赖
-issues.dependency.add_error_same_issue=你不能让一个工单依赖于自己。
+issues.dependency.setting=为议题和合并请求启用依赖
+issues.dependency.add_error_same_issue=你不能让一个议题依赖于自己。
 issues.dependency.add_error_dep_issue_not_exist=依赖项不存在。
 issues.dependency.add_error_dep_not_exist=依赖项不存在。
 issues.dependency.add_error_dep_exists=依赖项已存在。
-issues.dependency.add_error_cannot_create_circular=您不能创建依赖, 使得两个工单相互阻止。
-issues.dependency.add_error_dep_not_same_repo=这两个工单必须在同一仓库。
+issues.dependency.add_error_cannot_create_circular=您不能创建依赖, 使得两个议题相互阻止。
+issues.dependency.add_error_dep_not_same_repo=这两个议题必须在同一仓库。
 issues.review.self.approval=您不能批准您自己的合并请求。
 issues.review.self.rejection=您不能请求对您自己的合并请求进行更改。
 issues.review.approve=于 %s 批准此合并请求
@@ -1969,8 +1969,8 @@ pulls.update_branch_success=分支更新成功
 pulls.update_not_allowed=您无权更新分支
 pulls.outdated_with_base_branch=此分支相比基础分支已过期
 pulls.close=关闭
-pulls.closed_at=`于<a id="%[1]s" href="#%[1]s">%[2]s</a>关闭此合并请求 `
-pulls.reopened_at=`重新打开此合并请求 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`于 %s 关闭了此合并请求 `
+pulls.reopened_at=`于 %s 重新打开了此合并请求`
 pulls.cmd_instruction_hint=查看命令行说明
 pulls.cmd_instruction_checkout_title=检出
 pulls.cmd_instruction_checkout_desc=从你的仓库中检出一个新的分支并测试变更。
@@ -2004,7 +2004,7 @@ milestones.update_ago=已更新 %s
 milestones.no_due_date=暂无截止日期
 milestones.open=开放中
 milestones.close=关闭
-milestones.new_subheader=里程碑可以帮助您组织工单并跟踪其进度。
+milestones.new_subheader=里程碑可以帮助您组织议题并跟踪其进度。
 milestones.completeness=<strong>%d%%</strong> 已完成
 milestones.create=创建里程碑
 milestones.title=标题
@@ -2014,19 +2014,19 @@ milestones.clear=清除
 milestones.invalid_due_date_format=到期时间的格式必须是“yyyy-mm-dd”。
 milestones.create_success=里程碑 %s 创建成功。
 milestones.edit=编辑里程碑
-milestones.edit_subheader=里程碑组织工单，合并请求和跟踪进度。
+milestones.edit_subheader=里程碑组织议题，合并请求和跟踪进度。
 milestones.cancel=取消
 milestones.modify=更新里程碑
 milestones.edit_success=里程碑 %s 已经更新。
 milestones.deletion=删除里程碑
-milestones.deletion_desc=删除该里程碑将会移除所有工单中相关的信息。是否继续？
+milestones.deletion_desc=删除该里程碑将会移除所有议题中相关的信息。是否继续？
 milestones.deletion_success=里程碑已被删除。
 milestones.filter_sort.earliest_due_data=到期日从远到近
 milestones.filter_sort.latest_due_date=到期日从近到远
 milestones.filter_sort.least_complete=完成度从低到高
 milestones.filter_sort.most_complete=完成度从高到低
-milestones.filter_sort.most_issues=工单从多到少
-milestones.filter_sort.least_issues=工单从少到多
+milestones.filter_sort.most_issues=议题从多到少
+milestones.filter_sort.least_issues=议题从少到多
 
 signing.will_sign=这个提交将用密钥 "%s" 签名。
 signing.wont_sign.error=在检查提交是否可以被签名时出错。
@@ -2097,21 +2097,21 @@ activity.title.prs_merged_by=%[2]s 共合并了 %[1]s
 activity.title.prs_opened_by=%[2]s 共创建了 %[1]s
 activity.merged_prs_label=已合并
 activity.opened_prs_label=已创建
-activity.active_issues_count_1=<strong>%d</strong> 项活动的工单
-activity.active_issues_count_n=<strong>%d</strong> 项活动的工单
-activity.closed_issues_count_1=已关闭的工单
-activity.closed_issues_count_n=已关闭的工单
-activity.title.issues_1=%d 项工单
-activity.title.issues_n=%d 项工单
+activity.active_issues_count_1=<strong>%d</strong> 项活动的议题
+activity.active_issues_count_n=<strong>%d</strong> 项活动的议题
+activity.closed_issues_count_1=已关闭的议题
+activity.closed_issues_count_n=已关闭的议题
+activity.title.issues_1=%d 项议题
+activity.title.issues_n=%d 项议题
 activity.title.issues_closed_from=%[2]s 共关闭了 %[1]s
 activity.title.issues_created_by=%[2]s 共创建了 %[1]s
 activity.closed_issue_label=已关闭
-activity.new_issues_count_1=新工单
-activity.new_issues_count_n=新工单
+activity.new_issues_count_1=新议题
+activity.new_issues_count_n=新议题
 activity.new_issue_label=打开的
 activity.title.unresolved_conv_1=%d 项未解决的会话
 activity.title.unresolved_conv_n=%d 项未解决的会话
-activity.unresolved_conv_desc=这些最近更新的工单和合并请求还没有解决。
+activity.unresolved_conv_desc=这些最近更新的议题和合并请求还没有解决。
 activity.unresolved_conv_label=打开
 activity.title.releases_1=%d 个版本发布
 activity.title.releases_n=%d 个版本发布
@@ -2207,21 +2207,21 @@ settings.use_external_wiki=使用外部百科
 settings.external_wiki_url=外部百科链接
 settings.external_wiki_url_error=外部百科链接不是有效的 URL。
 settings.external_wiki_url_desc=当点击百科标签时，访问者将被重定向到外部百科系统的URL。
-settings.issues_desc=启用仓库工单系统
-settings.use_internal_issue_tracker=使用内置的工单系统
-settings.use_external_issue_tracker=使用外部的工单系统
-settings.external_tracker_url=外部工单系统 URL
+settings.issues_desc=启用仓库议题系统
+settings.use_internal_issue_tracker=使用内置的议题系统
+settings.use_external_issue_tracker=使用外部的议题系统
+settings.external_tracker_url=外部议题系统 URL
 settings.external_tracker_url_error=外部百科链接无效。
-settings.external_tracker_url_desc=当点击工单标签时，访问者将被重定向到外部工单系统的URL。
-settings.tracker_url_format=外部工单系统的 URL 格式
-settings.tracker_url_format_error=外部工单追踪器链接无效。
-settings.tracker_issue_style=外部工单系统的编号格式
+settings.external_tracker_url_desc=当点击议题标签时，访问者将被重定向到外部议题系统的URL。
+settings.tracker_url_format=外部议题系统的 URL 格式
+settings.tracker_url_format_error=外部议题追踪器链接无效。
+settings.tracker_issue_style=外部议题系统的编号格式
 settings.tracker_issue_style.numeric=纯数字形式
 settings.tracker_issue_style.alphanumeric=英文字母数字组合形式
 settings.tracker_issue_style.regexp=正则表达式
 settings.tracker_issue_style.regexp_pattern=正则表达式模式
 settings.tracker_issue_style.regexp_pattern_desc=第一个被捕获的组将取代 <code>{index}</code>。
-settings.tracker_url_format_desc=使用占位符 <code>{user}</code>, <code>{repo}</code> 和 <code>{index}</code> 作为用户名、仓库名和工单索引。
+settings.tracker_url_format_desc=使用占位符 <code>{user}</code>, <code>{repo}</code> 和 <code>{index}</code> 作为用户名、仓库名和议题索引。
 settings.enable_timetracker=启用时间跟踪
 settings.allow_only_contributors_to_track_time=仅允许成员跟踪时间
 settings.pulls_desc=启用合并请求
@@ -2242,7 +2242,7 @@ settings.admin_indexer_commit_sha=上次索引的提交
 settings.admin_indexer_unindexed=未索引
 settings.reindex_button=添加到重新索引队列
 settings.reindex_requested=已请求重新索引
-settings.admin_enable_close_issues_via_commit_in_any_branch=通过在非默认分支中提交来关闭工单
+settings.admin_enable_close_issues_via_commit_in_any_branch=通过在非默认分支中提交来关闭议题
 settings.danger_zone=危险操作区
 settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库。请选择另一个名字。
 settings.convert=转换为普通仓库
@@ -2292,7 +2292,7 @@ settings.wiki_deletion_success=已成功删除仓库百科数据。
 settings.delete=删除本仓库
 settings.delete_desc=删除仓库是永久性的, 无法撤消。
 settings.delete_notices_1=- 此操作<strong>不可</strong>被回滚。
-settings.delete_notices_2=- 此操作将永久删除仓库 <strong>%s</strong>，包括 Git 数据、 工单、评论、百科和协作者的操作权限。
+settings.delete_notices_2=- 此操作将永久删除仓库 <strong>%s</strong>，包括 Git 数据、 议题、评论、百科和协作者的操作权限。
 settings.delete_notices_fork_1=- 在此仓库删除后，它的派生仓库将变成独立仓库。
 settings.deletion_success=仓库已被删除。
 settings.update_settings_success=仓库设置已更新。
@@ -2304,7 +2304,7 @@ settings.add_collaborator_inactive_user=无法添加未激活的用户作为合
 settings.add_collaborator_owner=不能将所有者添加为协作者。
 settings.add_collaborator_duplicate=合作者已经被添加到本仓库。
 settings.delete_collaborator=删除
-settings.collaborator_deletion=删除协作者
+settings.collaborator_deletion=移除协作者
 settings.collaborator_deletion_desc=删除协作者后他将无法再对此仓库的访问。继续？
 settings.remove_collaborator_success=已成功删除协作者。
 settings.search_user_placeholder=搜索用户...
@@ -2370,17 +2370,17 @@ settings.event_push=推送
 settings.event_push_desc=推送到 Git 仓库。
 settings.event_repository=仓库
 settings.event_repository_desc=创建或删除仓库。
-settings.event_header_issue=工单事件
+settings.event_header_issue=议题事件
 settings.event_issues=修改
-settings.event_issues_desc=工单已打开、已关闭、已重新打开或已编辑。
+settings.event_issues_desc=议题已打开、已关闭、已重新打开或已编辑。
 settings.event_issue_assign=指派
-settings.event_issue_assign_desc=工单已被指派或取消指派。
+settings.event_issue_assign_desc=议题已被指派或取消指派。
 settings.event_issue_label=标签
-settings.event_issue_label_desc=工单标签被添加或移除。
+settings.event_issue_label_desc=议题标签被添加或移除。
 settings.event_issue_milestone=里程碑
 settings.event_issue_milestone_desc=里程碑被添加、移除或修改。
 settings.event_issue_comment=评论
-settings.event_issue_comment_desc=工单评论被创建、编辑或删除。
+settings.event_issue_comment_desc=议题评论被创建、编辑或删除。
 settings.event_header_pull_request=合并请求事件
 settings.event_pull_request=修改
 settings.event_pull_request_desc=合并请求被打开、被关闭、被重新打开或被编辑。
@@ -2543,7 +2543,7 @@ settings.matrix.room_id=房间ID
 settings.matrix.message_type=消息类型
 settings.archive.button=存档仓库
 settings.archive.header=存档此仓库
-settings.archive.text=存档仓库将使其完全只读。它将在首页隐藏。没有人（甚至包括你！）能够进行新的提交，或打开工单及合并请求。
+settings.archive.text=存档仓库将使其完全只读。它将在首页隐藏。没有人（甚至包括你！）能够进行新的提交，或打开议题及合并请求。
 settings.archive.success=仓库已成功存档。
 settings.archive.error=仓库在存档时出现异常。请通过日志获取详细信息。
 settings.archive.error_ismirror=不能存档镜像仓库。
@@ -2552,7 +2552,7 @@ settings.archive.tagsettings_unavailable=标签设置对已存档的仓库不可
 settings.archive.mirrors_unavailable = 镜像对已存档的仓库不可用。
 settings.unarchive.button=撤销仓库存档
 settings.unarchive.header=撤销此仓库存档
-settings.unarchive.text=撤销存档将恢复仓库接收提交、推送，以及新工单和合并请求的能力。
+settings.unarchive.text=撤销存档将恢复仓库接收提交、推送，以及新议题和合并请求的能力。
 settings.unarchive.success=仓库已成功撤销存档。
 settings.unarchive.error=仓库在取消存档时出现异常。请通过日志获取详细信息。
 settings.update_avatar_success=仓库头像已经更新。
@@ -2754,7 +2754,7 @@ rss.must_be_on_branch = 您必须处于一个分支上才能拥有一个RSS订
 admin.manage_flags = 管理标志
 admin.failed_to_replace_flags = 替换仓库标志失败
 clone_in_vscodium = 在 VSCodium 中克隆
-issues.blocked_by_user = 由于你已被仓库所有者屏蔽，你无法在此仓库创建工单。
+issues.blocked_by_user = 由于你已被仓库所有者屏蔽，你无法在此仓库创建议题。
 issues.comment.blocked_by_user = 因为你已被仓库所有者或工单作者屏蔽，你无法对此工单进行评论。
 settings.wiki_rename_branch_main_desc = 将百科内部使用的分支重命名为“%s”。此更改是永久性的且不可撤销。
 editor.invalid_commit_mail = 用于创建提交的邮件地址无效。
@@ -2770,7 +2770,7 @@ settings.wiki_rename_branch_main = 标准化百科分支名称
 settings.wiki_rename_branch_main_notices_1 = 此操作<strong>无法</strong>撤消。
 settings.wiki_branch_rename_success = 百科仓库的分支名称已成功规范化。
 settings.confirm_wiki_branch_rename = 重命名百科分支
-pulls.commit_ref_at = `在提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中引用了此合并请求`
+pulls.commit_ref_at = `于 %s 从提交中引用了此合并请求`
 settings.wiki_rename_branch_main_notices_2 = 这将永久重命名 %s 的仓库百科的内部分支。现存的检出方式需要更新。
 settings.wiki_branch_rename_failure = 无法标准化仓库百科的分支名称。
 settings.add_collaborator_blocked_our = 因仓库所有者已将其拉黑，不能添加该用户为协作者。
@@ -2834,16 +2834,16 @@ form.string_too_long = 给定的字符串长度超过 %d 个字符。
 n_release_one = %s 版本发布
 n_release_few = %s 版本发布
 project = 项目
-issues.edit.already_changed = 无法保存对工单的更改。工单似乎已经被另一个用户修改了，为了防止修改被覆盖，请刷新页面后再次尝试编辑
+issues.edit.already_changed = 无法保存对议题的更改。议题似乎已经被另一个用户修改了，为了防止修改被覆盖，请刷新页面后再次尝试编辑
 pulls.edit.already_changed = 无法保存对合并请求的更改。内容似乎已经被另一个用户修改了，为了防止修改被覆盖，请刷新页面后再次尝试编辑
 comments.edit.already_changed = 无法保存对评论的更改。内容似乎已经被另一个用户修改了，为了防止修改被覆盖，请刷新页面后再次尝试编辑
-subscribe.issue.guest.tooltip = 登录以订阅工单。
+subscribe.issue.guest.tooltip = 登录以订阅议题。
 subscribe.pull.guest.tooltip = 登录以订阅此合并请求。
 settings.federation_following_repos = 关注的仓库URL地址，多个地址以 “;” 分隔，不需要前后空格。
 settings.federation_settings = 邦联设置
 settings.federation_apapiurl = 此仓库的邦联URL地址。将其作为关注的仓库URL地址填写到另一个仓库的邦联设置中。
 settings.federation_not_enabled = 当前实例未启用邦联功能。
-issues.author.tooltip.issue = 此用户是本工单的作者。
+issues.author.tooltip.issue = 此用户是本议题的作者。
 issues.author.tooltip.pr = 此用户是此合并请求的作者。
 release.type_attachment = 附件
 release.type_external_asset = 外部资源
@@ -2883,7 +2883,7 @@ diff.git-notes.remove-header = 移除注释
 diff.git-notes.remove-body = 此注释将被移除。
 issues.num_reviews_one = %d 评审
 issues.num_reviews_few = %d 评审
-issues.summary_card_alt = 仓库 %[2]s 中标题为 %[1]s 的工单的摘要卡片
+issues.summary_card_alt = 仓库 %[2]s 中标题为 %[1]s 的议题的摘要卡片
 editor.add_tmpl.filename = 文件名
 settings.default_update_style_desc = 用于更新落后于基础分支的合并请求的默认更新样式。
 pulls.sign_in_require = <a href="%s">登录</a>以创建新的合并请求。
@@ -2905,10 +2905,24 @@ archive.pull.noreview = 此仓库已存档，您无法评审合并请求。
 commits.view_single_diff = 查看该提交对本文件的更改
 pulls.editable = 可编辑
 pulls.editable_explanation = 此合并请求允许维护者进行编辑。你可以直接向其贡献。
-issues.reopen.blocked_by_user = 由于你已被仓库所有者或工单作者屏蔽，你不能重新打开此工单。
+issues.reopen.blocked_by_user = 由于你已被仓库所有者或议题作者屏蔽，你不能重新打开此议题。
 pulls.comment.blocked_by_user = 由于你已被仓库所有者或合并请求作者屏蔽，你不能在此合并请求发表评论。
 issues.filter_no_results = 无结果
 issues.filter_no_results_placeholder = 尝试调整搜索筛选条件。
+migrate.repo_desc_helper = 留空以导入现有描述
+archive.nocomment = 您无法评论，因为此仓库已存档。
+comment.blocked_by_user = 您无法评论，因为您已被仓库所有者或作者屏蔽。
+sync_fork.button = 同步
+sync_fork.branch_behind_one = 此分支落后于 %[2]s %[1]d 个提交
+sync_fork.branch_behind_few = 此分支落后于 %[2]s %[1]d 个提交
+settings.event_action_failure = 失败
+settings.event_action_recover = 恢复
+settings.event_action_recover_desc = Action运行在同一工作流上次失败后成功。
+settings.event_action_success = 成功
+settings.event_action_success_desc = Action运行以成功结束。
+settings.event_action_failure_desc = Action运行以失败结束。
+settings.event_header_action = Action运行事件
+issues.filter_type.all_pull_requests = 所有合并请求
 
 [graphs]
 component_loading=正在加载 %s…
@@ -2974,7 +2988,7 @@ settings.delete_org_title=删除组织
 settings.delete_org_desc=此组织将会被永久删除，确认继续吗？
 settings.hooks_desc=在此处添加的 Web 钩子将会应用到该组织下的 <strong>所有仓库</strong>。
 
-settings.labels_desc=添加能够被该组织下的 <strong>所有仓库</strong> 的工单使用的标签。
+settings.labels_desc=添加能够被该组织下的 <strong>所有仓库</strong> 的议题使用的标签。
 
 members.membership_visibility=成员可见性：
 members.public=可见
@@ -3044,8 +3058,8 @@ teams.invite.by=邀请人 %s
 teams.invite.description=请点击下面的按钮加入团队。
 follow_blocked_user = 你无法关注此组织，因为此组织已屏蔽你。
 open_dashboard = 打开仪表盘
-settings.change_orgname_redirect_prompt.with_cooldown.one = 旧的组织名将在%[1]d天的保护期后对所有人可用，您仍可以在此期间重新认领旧的名字。
-settings.change_orgname_redirect_prompt.with_cooldown.few = 旧的组织名将在%[1]d天的保护期后对所有人可用，您仍可以在此期间重新认领旧名字。
+settings.change_orgname_redirect_prompt.with_cooldown.one = 旧组织名将在 %[1]d 天的保护期后对所有人可用，您仍可以在此期间重新认领旧名称。
+settings.change_orgname_redirect_prompt.with_cooldown.few = 旧组织名将在 %[1]d 天的保护期后对所有人可用，您仍可以在此期间重新认领旧名称。
 
 [admin]
 dashboard=管理面板
@@ -3151,7 +3165,7 @@ dashboard.cancel_abandoned_jobs=取消放弃的操作任务
 dashboard.start_schedule_tasks=开始安排操作任务
 dashboard.sync_branch.started=分支同步已开始
 dashboard.sync_tag.started = 标签同步已开始
-dashboard.rebuild_issue_indexer=重建工单索引
+dashboard.rebuild_issue_indexer=重建议题索引
 
 users.user_manage_panel=管理用户帐户
 users.new_account=创建新帐户
@@ -3193,7 +3207,7 @@ users.cannot_delete_self=你不能删除自己
 users.still_own_repo=此用户仍然拥有一个或多个仓库。必须首先删除或转让这些仓库。
 users.still_has_org=此用户是组织的成员。必须先从组织中删除用户。
 users.purge=清理用户
-users.purge_help=强制删除用户和用户拥有的任何仓库、组织和软件包。所有评论和工单也将被删除。
+users.purge_help=强制删除用户和用户拥有的任何仓库、组织和软件包。所有评论和议题也将被删除。
 users.still_own_packages=此用户仍然拥有一个或多个软件包，请先删除这些软件包。
 users.deletion_success=用户帐户已被删除。
 users.reset_2fa=重置两步验证
@@ -3239,7 +3253,7 @@ repos.private=私有
 repos.watches=关注数
 repos.stars=点赞数
 repos.forks=派生数
-repos.issues=工单数
+repos.issues=议题数
 repos.size=大小
 repos.lfs_size=LFS 大小
 
@@ -3452,7 +3466,7 @@ config.allow_dots_in_usernames = 允许用户在用户名中使用英文句号
 config.default_allow_only_contributors_to_track_time=仅允许成员跟踪时间
 config.no_reply_address=隐藏电子邮件域名
 config.default_visibility_organization=新组织的默认可见性
-config.default_enable_dependencies=默认情况下启用工单依赖
+config.default_enable_dependencies=默认情况下启用议题依赖
 
 config.webhook_config=Web 钩子配置
 config.queue_length=队列长度
@@ -3609,20 +3623,20 @@ monitor.duration = 时长（秒）
 create_repo=创建了仓库 <a href="%s">%s</a>
 rename_repo=重命名仓库 <code>%[1]s</code> 为 <a href="%[2]s">%[3]s</a>
 commit_repo=推送到了仓库 <a href="%[1]s">%[4]s</a> 的 <a href="%[2]s">%[3]s</a> 分支
-create_issue=`创建了工单 <a href="%[1]s">%[3]s#%[2]s</a>`
-close_issue=`关闭了工单 <a href="%[1]s">%[3]s#%[2]s</a>`
-reopen_issue=`重新开放了工单 <a href="%[1]s">%[3]s#%[2]s</a>`
+create_issue=`创建了议题 <a href="%[1]s">%[3]s#%[2]s</a>`
+close_issue=`关闭了议题 <a href="%[1]s">%[3]s#%[2]s</a>`
+reopen_issue=`重新开放了议题 <a href="%[1]s">%[3]s#%[2]s</a>`
 create_pull_request=`创建了合并请求 <a href="%[1]s">%[3]s#%[2]s</a>`
 close_pull_request=`关闭了合并请求 <a href="%[1]s">%[3]s#%[2]s</a>`
 reopen_pull_request=`重新开放了合并请求 <a href="%[1]s">%[3]s#%[2]s</a>`
-comment_issue=`评论了工单 <a href="%[1]s">%[3]s#%[2]s</a>`
+comment_issue=`评论了议题 <a href="%[1]s">%[3]s#%[2]s</a>`
 comment_pull=`评论了合并请求 <a href="%[1]s">%[3]s#%[2]s</a>`
 merge_pull_request=`合并了合并请求 <a href="%[1]s">%[3]s#%[2]s</a>`
 auto_merge_pull_request=`自动合并了拉取请求 <a href="%[1]s">%[3]s#%[2]s</a>`
 transfer_repo=将仓库 <code>%s</code> 转移至 <a href="%s">%s</a>
 push_tag=推送了标签 <a href="%[2]s">%[3]s</a> 至仓库 <a href="%[1]s">%[4]s</a>
 delete_tag=从<a href="%[1]s">%[3]s</a> 删除了标签 %[2]s
-delete_branch=从 <a href="%[1]s">%[3]s</a> 删除分支 %[2]s
+delete_branch=删除了 <a href="%[1]s">%[3]s</a> 的 <code>%[2]s</code> 分支
 compare_branch=比较
 compare_commits=比较 %d 提交
 compare_commits_general=比较提交
@@ -3844,7 +3858,7 @@ owner.settings.cleanuprules.success.update=清理规则已更新。
 owner.settings.cleanuprules.success.delete=清理规则已删除。
 owner.settings.chef.title=Chef 注册中心
 owner.settings.chef.keypair=生成密钥对
-owner.settings.chef.keypair.description=需要密钥对才能向 Chef 注册中心进行身份验证。如果您之前已经生成过密钥对，生成新的密钥对将丢弃旧的密钥对。
+owner.settings.chef.keypair.description=发送至 Chef 注册表的请求必须被密码学签名，以进行身份验证。在生成密钥对时，Forgejo仅保存公钥。私钥将被提供给您以和 knife 一同使用。生成新的密钥对将丢弃旧的密钥对。
 owner.settings.cargo.rebuild.no_index = 无法重建，未初始化任何索引。
 npm.dependencies.bundle = 捆绑的依赖项
 arch.pacman.helper.gpg = 为 pacman 添加信任证书：
@@ -3929,7 +3943,7 @@ runners.delete_runner=删除运行器
 runners.delete_runner_success=运行器删除成功
 runners.delete_runner_failed=删除运行器失败
 runners.delete_runner_header=确认要删除此运行器
-runners.delete_runner_notice=如果一个任务正在运行在此运行器上，它将被终止并标记为失败。它可能会打断正在构建的工作流。
+runners.delete_runner_notice=如果有任务正在此运行器上运行，它将被终止并标记为失败。这可能会中断正在构建的工作流。
 runners.none=无可用的运行器
 runners.status.unspecified=未知
 runners.status.idle=空闲
@@ -4032,7 +4046,7 @@ match = 匹配
 match_tooltip = 仅包含与搜索词完全匹配的结果
 fuzzy_tooltip = 包含与搜索词相近的结果
 exact = 精确
-issue_kind = 搜索工单…
+issue_kind = 搜索议题…
 pull_kind = 搜索合并请求…
 exact_tooltip = 仅包含与搜索词精确匹配的结果
 milestone_kind = 搜索里程碑…
@@ -4063,9 +4077,9 @@ test = 好的
 code.write = <b>写入：</b>推送到仓库，创建分支和标签。
 code.read = <b>读取：</b>访问并克隆仓库的代码。
 actions.read = <b>读取：</b>查看集成的 CI/CD 管道及其日志。
-issues.write = <b>写入：</b>关闭工单并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。
+issues.write = <b>写入：</b>关闭议题并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。
 releases.write = <b>写入：</b>发布、编辑和删除版本发布及其资源。
-issues.read = <b>读取：</b>阅读并创建工单和评论。
+issues.read = <b>读取：</b>阅读并创建议题和评论。
 pulls.read = <b>读取：</b>阅读并创建合并请求。
 releases.read = <b>读取：</b>查看并下载版本发布。
 wiki.read = <b>读取：</b>阅读集成的百科及其历史。
@@ -4074,7 +4088,7 @@ projects.read = <b>读取：</b>访问仓库项目看板。
 packages.read = <b>读取：</b>查看并下载指派给仓库的软件包。
 packages.write = <b>写入：</b>发布并删除指派给仓库的软件包。
 actions.write = <b>写入：</b>手动触发、重启、取消或批准待处理的 CI/CD 管道。
-ext_issues = 访问外部工单系统的链接。权限由外部管理。
+ext_issues = 访问外部议题系统的链接。权限由外部管理。
 ext_wiki = 访问外部百科的链接。权限由外部管理。
 projects.write = <b>写入：</b>创建项目和列并进行编辑。
 pulls.write = <b>写入：</b>关闭合并请求并管理元数据，如标签、里程碑、指派成员、截止日期和依赖。
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
index e2cb0d8b2c..45534801de 100644
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@@ -574,7 +574,7 @@ issues.delete_comment_confirm=您確定要刪除該條評論嗎？
 issues.context.edit=編輯
 issues.reopen_issue=重新開啟
 issues.create_comment=評論
-issues.commit_ref_at=`在代碼提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中引用了該問題`
+issues.commit_ref_at=`在代碼提交 %s 中引用了該問題`
 issues.role.owner=管理員
 issues.role.member=普通成員
 issues.sign_in_require_desc=<a href="%s"> 登入</a> 才能加入這對話。
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 0f663bdbe1..d56c397812 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -206,8 +206,10 @@ buttons.new_table.tooltip = 新增表格
 table_modal.header = 新增表格
 buttons.indent.tooltip = 使項目縮排一層
 buttons.unindent.tooltip = 使項目取消縮排一層
-
 link_modal.header = 新增連結
+link_modal.url = 網址
+link_modal.description = 描述
+link_modal.paste_reminder = 提示：當您的剪貼簿中有網址時，可以直接貼到編輯器中來建立連結。
 
 [filter]
 string.asc=A - Z
@@ -219,7 +221,7 @@ missing_csrf=錯誤的請求：未提供 CSRF 符記
 invalid_csrf=錯誤的請求：無效的 CSRF 符記
 not_found=找不到目標。
 network_error=網路錯誤
-report_message = 如果您相信這是一個 Forgejo 的錯誤，請在 <a href="%s" target="_blank">Codeberg</a> 上搜尋相關問題，或在必要時提出一個新問題。
+report_message = 如果您相信這是一個 Forgejo 的錯誤，請在 <a href="%s" target="_blank">Codeberg</a> 上搜尋相關議題，或在必要時提出一個新議題。
 server_internal = 伺服器內部錯誤
 
 [startpage]
@@ -712,7 +714,7 @@ show_on_map = 在地圖上顯示這個地點
 settings = 使用者設定
 block_user = 封鎖使用者
 block_user.detail_1 = 你們將停止互相關注，並且無法互相關注。
-block_user.detail_2 = 此使用者將無法與你擁有的儲存庫或由你建立的問題和評論進行互動。
+block_user.detail_2 = 此使用者將無法與你擁有的儲存庫或由你建立的議題和評論進行互動。
 followers_one = %d 位追蹤者
 following_one = 追蹤 %d 個人
 block_user.detail_3 = 你們將無法互相新增為儲存庫協作者。
@@ -1012,7 +1014,7 @@ uploaded_avatar_is_too_big = 上傳檔案的大小 （%d KiB）超過了上限 
 select_permissions = 選擇權限
 permission_write = 讀寫
 permissions_list = 權限：
-add_email_confirmation_sent = 我們已發送一封確認信至 「%s」。請檢查您的信箱並在 %s 內確認您的信箱地址。
+add_email_confirmation_sent = 確認信已發送至「%s」。請在接下來的 %s 內前往收件匣查看該郵件，並點擊其中的連結以完成電子郵件地址的確認。
 repo_and_org_access = 儲存庫和組織存取權
 permissions_public_only = 僅公開
 permissions_access_all = 全部（公開、私有和受限）
@@ -1026,9 +1028,9 @@ unbind_success = 已成功移除該社群帳號。
 create_oauth2_application_success = 您已成功建立一個新的 OAuth2 應用程式。
 change_username_prompt = 註：更改您的使用者名稱也會更改您的帳號 URL。
 change_username_redirect_prompt = 舊的使用者名稱在被其他使用者認領之前將會轉址到新的使用者名稱。
-visibility.limited_tooltip = 只有已登入的使用者能看見
+visibility.limited_tooltip = 僅對已登入的使用者可見
 visibility.private_tooltip = 只有您加入的組織之成員能看見
-keep_email_private_popup = 這將在您的個人資料頁面、合併請求或網頁檔案編輯器中隱藏您的電子信箱地址。已推送的提交不會被修改。在提交中使用 %s 來將其連結至您的帳號。
+keep_email_private_popup = 您的電子郵件地址不會顯示在個人資料頁面中，也不會成為透過網頁介面（例如上傳檔案、編輯或合併提交）所建立的提交紀錄的預設地址。取而代之的是，可以使用特殊地址 %s 將這些提交關聯到您的帳號。此設定不會影響既有的提交紀錄。
 ssh_signonly = 因為目前 SSH 已被停用，這個金鑰只被用來校驗提交簽署。
 email_desc = 您的主要電子信箱將被用於通知、密碼復原、和網頁 Git 操作（如果您的信箱不是隱藏的）。
 pronouns_custom = 自訂
@@ -1060,9 +1062,35 @@ language.localization_project = 幫助我們翻譯 Forgejo 至您的語言！<a
 language.description = 這個語言會被儲存至您的帳號，並被用作您登入後的預設語言。
 user_block_yourself = 你不能封鎖自己。
 pronouns_custom_label = 自訂代名詞
-change_username_redirect_prompt.with_cooldown.one = 舊的使用者名稱將在 %[1]d 天的冷卻期後對所有人開放，你仍然可以在冷卻期內重新獲得舊的使用者名稱。
+change_username_redirect_prompt.with_cooldown.one = 舊的使用者名稱將在 %[1]d 天的冷卻期後對所有人開放。你仍然可以在冷卻期內重新獲得舊的使用者名稱。
 change_username_redirect_prompt.with_cooldown.few = 舊的使用者名稱將在 %[1]d 天的冷卻期後對所有人開放，你仍然可以在冷卻期內重新獲得舊的使用者名稱。
 keep_activity_private.description = 你的<a href="%s">公開活動</a>只有你和站點管理員可見。
+quota.rule.exceeded = 已超出
+quota.sizes.assets.packages.all = 軟體包
+storage_overview = 儲存空間概覽
+quota.rule.no_limit = 無限制
+quota.sizes.all = 全部
+regenerate_token = 重新產生
+quota.sizes.repos.all = 儲存庫
+quota.sizes.assets.all = 資產
+quota.sizes.assets.attachments.all = 附件
+quota.sizes.assets.artifacts = 製品
+quota.sizes.wiki = 百科
+quota = 配額
+access_token_regeneration = 重新產生存取符記
+access_token_regeneration_desc = 重新產生存取符記將會撤銷使用該符記的應用程式對您帳號的存取權限，此操作無法還原。是否繼續？
+regenerate_token_success = 符記已重新產生。使用該符記的應用程式將不再具有你帳號的存取權限，必須更新為新的符記後才能繼續使用。
+quota.applies_to_user = 以下配額規則適用於您的帳號
+quota.applies_to_org = 以下配額規則適用於此組織
+quota.rule.exceeded.helper = 符合此規則的物件總大小已超出配額限制。
+quota.sizes.repos.public = 公開儲存庫
+quota.sizes.repos.private = 私有儲存庫
+quota.sizes.git.all = Git 內容
+quota.sizes.git.lfs = Git LFS
+quota.sizes.assets.attachments.issues = 問題附件
+quota.sizes.assets.attachments.releases = 版本發布附件
+keep_pronouns_private = 僅向已驗證的使用者顯示代名詞
+keep_pronouns_private.description = 這將對未登入的訪客隱藏您的代名詞。
 
 [repo]
 owner=所有者
@@ -1134,7 +1162,7 @@ forks=分叉
 reactions_more=和其他 %d 個
 unit_disabled=網站管理員已經停用這個儲存庫區域。
 language_other=其他
-adopt_search=輸入帳號以搜尋未接管的儲存庫... (留白以查詢全部)
+adopt_search=輸入帳號以搜尋未接管的儲存庫... （留白以查詢全部）
 adopt_preexisting_label=接管檔案
 adopt_preexisting=接管既有的檔案
 adopt_preexisting_content=從 %s 建立儲存庫
@@ -1349,7 +1377,7 @@ editor.filename_cannot_be_empty=檔案名稱不能為空。
 editor.filename_is_invalid=檔名無效：「%s」。
 editor.branch_does_not_exist=此儲存庫沒有名為「%s」的分支。
 editor.branch_already_exists=此儲存庫已有名為「%s」的分支。
-editor.file_changed_while_editing=檔案內容在您編輯時已被更改。<a target="_blank" rel="noopener noreferrer" href="%s">按一下此處</a>來檢視被更改的地方或<strong>再次提交</strong>以覆蓋這些變更。
+editor.file_changed_while_editing=檔案內容自您開啟後已有變更。<a target="_blank" rel="noopener noreferrer" href="%s">點此查看</a>，或<strong>再次提交變更</strong>以覆寫原內容。
 editor.file_already_exists=此儲存庫已有名為「%s」的檔案。
 editor.commit_empty_file_header=提交空白檔案
 editor.commit_empty_file_text=你準備提交的檔案是空白的，是否繼續？
@@ -1568,7 +1596,7 @@ issues.commented_at=`已留言 <a href="#%s"> %s</a>`
 issues.delete_comment_confirm=您確定要刪除這則留言嗎？
 issues.context.copy_link=複製連結
 issues.context.quote_reply=引用回覆
-issues.context.reference_issue=新增問題並參考
+issues.context.reference_issue=在新問題中引用
 issues.context.edit=編輯
 issues.context.delete=刪除
 issues.close=關閉問題
@@ -1576,13 +1604,13 @@ issues.close_comment_issue=留言並關閉
 issues.reopen_issue=重新開放
 issues.reopen_comment_issue=留言並重新開放
 issues.create_comment=留言
-issues.closed_at=`關閉了這個問題 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`重新開放了這個問題 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`在提交中關聯了這個問題 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_issue_from=`<a href="%[3]s">關聯了這個問題 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_pull_from=`<a href="%[3]s">關聯了這個合併請求 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_closing_from=`<a href="%[3]s">關聯了合併請求 %[4]s 將關閉這個問題</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.ref_reopening_from=`<a href="%[3]s">關聯了合併請求 %[4]s 將重新開放這個問題</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`關閉了這個問題 %s`
+issues.reopened_at=`重新開放了這個問題 %s`
+issues.commit_ref_at=`在提交中關聯了這個問題 %s`
+issues.ref_issue_from=`<a href="%[2]s">關聯了這個問題 %[3]s</a> %[1]s`
+issues.ref_pull_from=`<a href="%[2]s">關聯了這個合併請求 %[3]s</a> %[1]s`
+issues.ref_closing_from=<a href="%[2]s">從將關閉此問題的拉取請求 %[3]s 中提及了此問題</a>，%[1]s
+issues.ref_reopening_from=<a href="%[2]s">從將重新開啟此問題的拉取請求 %[3]s 中提及了此問題</a>，%[1]s
 issues.ref_closed_from=`<a href="%[3]s">關閉了這個問題 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from=`<a href="%[3]s">重新開放了這個問題 %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from=`自 %[1]s`
@@ -1631,8 +1659,8 @@ issues.unlock=解鎖對話
 issues.lock.unknown_reason=由於未知的原因而無法鎖定問題。
 issues.lock_duplicate=問題無法被鎖定兩次。
 issues.unlock_error=無法解鎖未被鎖定的問題。
-issues.lock_with_reason=因為 <strong>%s</strong> 而鎖定，並將對話設為協作者限定 %s
-issues.lock_no_reason=鎖定並將對話設為協作者限定 %s
+issues.lock_with_reason=因為 <strong>%s</strong> 而鎖定，並將對話限制為協作者 %s
+issues.lock_no_reason=鎖定並將對話限制為協作者 %s
 issues.unlock_comment=解鎖這個對話 %s
 issues.lock_confirm=鎖定
 issues.unlock_confirm=解除鎖定
@@ -1674,7 +1702,7 @@ issues.error_modifying_due_date=無法修改截止日期。
 issues.error_removing_due_date=無法移除截止日期。
 issues.push_commit_1=加入了 %d 個提交 %s
 issues.push_commits_n=加入了 %d 個提交 %s
-issues.force_push_codes=`強制推送了 %[1]s 自 <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> 至 <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[6]s`
+issues.force_push_codes=`強制推送了 %[1]s 自 <a class="%[7]s" href="%[3]s"><code>%[2]s</code></a> %[8]s 至 <a class="%[7]s" href="%[5]s"><code>%[4]s</code></a> %[9]s %[6]s`
 issues.force_push_compare=比較
 issues.due_date_form=yyyy年mm月dd日
 issues.due_date_form_add=新增截止日期
@@ -1726,8 +1754,8 @@ issues.review.left_comment=留下了回應
 issues.review.content.empty=您必須留下訊息指出需要修正的地方。
 issues.review.reject=請求了變更 %s
 issues.review.wait=被請求進行審核 %s
-issues.review.add_review_request=請求了 %s 來審核 %s
-issues.review.remove_review_request=移除了對 %s 的審核請求 %s
+issues.review.add_review_request=請求 %[1]s 進行審查 %[2]s
+issues.review.remove_review_request=移除了對 %[1]s 的審查請求 %[2]s
 issues.review.remove_review_request_self=拒絕了審核 %s
 issues.review.pending=待處理
 issues.review.review=審核
@@ -1811,7 +1839,7 @@ pulls.reject_count_1=%d 個變更請求
 pulls.reject_count_n=%d 個變更請求
 pulls.waiting_count_1=%d 個正在等待審核
 pulls.waiting_count_n=%d 個正在等待審核
-pulls.wrong_commit_id=提交 id 必須存在於目標分支上
+pulls.wrong_commit_id=提交 ID 必須存在於目標分支上
 
 pulls.no_merge_desc=無法進行合併，因為所有儲存庫的合併選項已被停用。
 pulls.no_merge_helper=在儲存庫設定啟用合併選項或手動合併該合併請求。
@@ -1827,13 +1855,13 @@ pulls.merge_commit_id=合併提交 ID
 pulls.require_signed_wont_sign=該分支需要經簽署的提交，但此合併將不會被簽署
 
 pulls.invalid_merge_option=您無法對此合併請求使用這個合併選項。
-pulls.merge_conflict=合併失敗：合併時發生衝突。 提示：請嘗試不同的策略
+pulls.merge_conflict=合併失敗：合併時發生衝突。 提示：請嘗試其他的合併策略
 pulls.merge_conflict_summary=錯誤訊息
-pulls.rebase_conflict=合併失敗：Rebase 提交時發生衝突：%[1]s。 提示：請嘗試不同的策略
+pulls.rebase_conflict=合併失敗：Rebase 提交時發生衝突：%[1]s。 提示：請嘗試其他的合併策略
 pulls.rebase_conflict_summary=錯誤訊息
-pulls.unrelated_histories=合併失敗：要合併的 HEAD 和基底分支沒有共同的歷史。 提示：請嘗試不同的策略
+pulls.unrelated_histories=合併失敗：要合併的 HEAD 和基底分支沒有共同的歷史。 提示：請嘗試其他的合併策略
 pulls.merge_out_of_date=合併失敗：產生合併時，基底已被更新。提示：再試一次。
-pulls.head_out_of_date=合併失敗：產生合併時，head 已被更新。提示：再試一次。
+pulls.head_out_of_date=合併失敗：產生合併時，HEAD 已被更新。提示：再試一次。
 pulls.push_rejected=合併失敗：此推送被拒絕。請檢查此儲存庫的 Git Hook。
 pulls.push_rejected_summary=完整的拒絕訊息
 pulls.push_rejected_no_message=推送失敗：此推送被拒絕但未提供其他資訊。請檢查此儲存庫的 Git Hook
@@ -1851,8 +1879,8 @@ pulls.update_branch_success=分支更新成功
 pulls.update_not_allowed=您無權更新分支
 pulls.outdated_with_base_branch=相對於基底分支，此分支已過時
 pulls.close=關閉合併請求
-pulls.closed_at=`關閉了這個合併請求 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-pulls.reopened_at=`重新開放了這個合併請求 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+pulls.closed_at=`關閉了這個合併請求 %s`
+pulls.reopened_at=`重新開放了這個合併請求 %s`
 pulls.clear_merge_message=清除合併訊息
 pulls.clear_merge_message_hint=清除合併訊息將僅移除提交訊息內容，留下產生的 git 結尾，如「Co-Authored-By …」。
 
@@ -1901,7 +1929,7 @@ milestones.filter_sort.most_issues=問題由多到少
 milestones.filter_sort.least_issues=問題由少到多
 
 
-ext_wiki=外部 Wiki
+ext_wiki=外部百科
 ext_wiki.desc=連結外部 Wiki。
 
 wiki=Wiki
@@ -1928,7 +1956,7 @@ wiki.page_already_exists=相同名稱的 Wiki 頁面已經存在。
 wiki.reserved_page=「%s」是保留的 Wiki 頁面名稱。
 wiki.pages=所有頁面
 wiki.last_updated=最後更新於 %s
-wiki.page_name_desc=輸入此 Wiki 頁面的名稱。一些特殊名稱有：「Home」、「_Sidebar」、「_Footer」等。
+wiki.page_name_desc=輸入此百科頁面的名稱。一些特殊名稱有：「Home」、「_Sidebar」、「_Footer」等。
 
 activity=動態
 activity.period.filter_label=期間:
@@ -2037,10 +2065,10 @@ settings.update_settings=儲存設定
 settings.branches.update_default_branch=更新預設分支
 settings.branches.add_new_rule=增加新規則
 settings.advanced_settings=進階設定
-settings.wiki_desc=啟用儲存庫 Wiki
-settings.use_internal_wiki=使用內建 Wiki
-settings.use_external_wiki=使用外部 Wiki
-settings.external_wiki_url=外部 Wiki 網址
+settings.wiki_desc=啟用儲存庫百科
+settings.use_internal_wiki=使用內建百科
+settings.use_external_wiki=使用外部百科
+settings.external_wiki_url=外部百科網址
 settings.external_wiki_url_error=外部 Wiki 網址不是有效的網址。
 settings.external_wiki_url_desc=點擊百科分頁時，使用者會被轉址至外部百科的 URL。
 settings.issues_desc=啟用儲存庫問題追蹤器
@@ -2069,7 +2097,7 @@ settings.pulls.default_allow_edits_from_maintainers=預設允許維護者進行
 settings.releases_desc=啟用儲存庫版本發佈
 settings.packages_desc=啟用儲存庫軟體包註冊中心
 settings.projects_desc=啟用儲存庫專案
-settings.actions_desc=啟用儲存庫 Actions
+settings.actions_desc=啟用與 Forgejo Actions 整合的 CI/CD 流程
 settings.admin_settings=管理員設定
 settings.admin_enable_health_check=啟用儲存庫的健康檢查（git fsck）
 settings.admin_code_indexer=程式碼索引器
@@ -2119,10 +2147,10 @@ settings.trust_model.committer.desc=提交者的有效簽署將被標記為「
 settings.trust_model.collaboratorcommitter=協作者 + 提交者
 settings.trust_model.collaboratorcommitter.long=協作者 + 提交者：信任協作者同時是提交者的簽署
 settings.trust_model.collaboratorcommitter.desc=此儲存庫協作者的有效簽署在他同時是提交者時將被標記為「受信任」，簽署只符合提交者時將標記為「不受信任」，都不符合時標記為「不符合」。這會強制 Forgejo 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-Authored-By:」和「Co-Committed-By:」。預設的 Forgejo 金鑰必須符合資料庫中的一位使用者。
-settings.wiki_delete=刪除 Wiki 資料
+settings.wiki_delete=刪除百科資料
 settings.wiki_delete_desc=刪除儲存庫 Wiki 資料是永久的且不可還原。
 settings.wiki_delete_notices_1=- 這將會永久刪除與停用 %s 的儲存庫 Wiki。
-settings.confirm_wiki_delete=刪除 Wiki 資料
+settings.confirm_wiki_delete=刪除百科資料
 settings.wiki_deletion_success=已刪除儲存庫的 Wiki 資料。
 settings.delete=刪除此儲存庫
 settings.delete_desc=刪除儲存庫是永久的且不可還原。
@@ -2168,7 +2196,7 @@ settings.webhook.payload=內容
 settings.webhook.body=本體
 settings.webhook.replay.description=再次執行此 Webhook。
 settings.webhook.delivery.success=已將事件加入到傳送佇列，可能需要等待幾分鐘才會出現於傳送紀錄。
-settings.githooks_desc=Git Hook 是 Git 本身提供的功能。您可以在下方編輯 hook 檔案以設定自訂作業。
+settings.githooks_desc=Git hook 是 Git 本身提供的功能。您可以在下方編輯 hook 檔案以設定自訂作業。
 settings.githook_edit_desc=如果 Hook 未啟動，則會顯示範例文件中的內容。如果想要刪除某個 Hook，則送出空白內容即可。
 settings.githook_name=Hook 名稱
 settings.githook_content=Hook 內容
@@ -2219,15 +2247,15 @@ settings.event_pull_request_desc=建立、編輯、關閉及重新開放合併
 settings.event_pull_request_assign=指派
 settings.event_pull_request_assign_desc=指派或取消指派合併請求。
 settings.event_pull_request_label=標籤
-settings.event_pull_request_label_desc=更新或清除合併請求標籤。
+settings.event_pull_request_label_desc=已新增或移除合併請求的標籤。
 settings.event_pull_request_milestone=里程碑
 settings.event_pull_request_milestone_desc=里程碑已新增、已移除或已修改。
 settings.event_pull_request_comment=評註
 settings.event_pull_request_comment_desc=建立、編輯或刪除合併請求的留言。
 settings.event_pull_request_review=審核
-settings.event_pull_request_review_desc=核准、退回或提出審核留言。
+settings.event_pull_request_review_desc=合併請求已被核准、拒絕，或已有審查留言新增。
 settings.event_pull_request_sync=同步
-settings.event_pull_request_sync_desc=合併請求同步。
+settings.event_pull_request_sync_desc=分支已自動與目標分支同步更新。
 settings.event_package=軟體包
 settings.event_package_desc=已在儲存庫中建立或刪除軟體包。
 settings.branch_filter=分支篩選
@@ -2339,7 +2367,7 @@ settings.choose_branch=選擇一個分支…
 settings.no_protected_branch=沒有受保護的分支。
 settings.edit_protected_branch=編輯
 settings.protected_branch_required_rule_name=必須填寫規則名稱
-settings.protected_branch_duplicate_rule_name=規則名稱已存在
+settings.protected_branch_duplicate_rule_name=已經存在一條針對這組分支的規則
 settings.protected_branch_required_approvals_min=需要的核可數量不能為負數。
 settings.tags=標籤
 settings.tags.protection=標籤保護
@@ -2473,7 +2501,7 @@ release.tag_helper=新增或選擇現有的標籤。
 release.tag_helper_new=新標籤，將在目標上建立此標籤。
 release.tag_helper_existing=現有的標籤。
 release.title_empty=標題不可為空。
-release.prerelease_desc=標記為 Pre-Release
+release.prerelease_desc=標記為預發行
 release.prerelease_helper=標記此版本不適合生產使用。
 release.cancel=取消
 release.publish=發佈發行
@@ -2557,8 +2585,8 @@ tree_path_not_found_tag = 路徑 %[1]s 不存在於標籤 %[2]s 中
 tree_path_not_found_commit = 路徑 %[1]s 不存在於提交 %[2]s 中
 tree_path_not_found_branch = 路徑 %[1]s 不存在於分支 %[2]s 中
 transfer.no_permission_to_accept = 您沒有權限接受這項轉讓。
-archive.title = 這個儲存庫被封存了。您可以檢視其中的檔案或是 Clone 它，但您無法推送提交，提出問題或合併請求。
-archive.title_date = 這個儲存庫在 %s 被封存了。您可以檢視其中的檔案或 clone 它，但您無法推送提交，提出問題或合併請求。
+archive.title = 這個儲存庫已被封存。您可以檢視其中的檔案或拓製儲存庫，但您無法提交推送和創建新議題、合併請求或評論。
+archive.title_date = 這個儲存庫在 %s 被封存了。您可以檢視其中的檔案或拓製儲存庫，但您無法提交推送和創建新議題、合併請求或評論。
 migrate.forgejo.description = 從 codeberg.org 或其他 Forgejo 站點遷移資料。
 migrate.cancel_migrating_title = 取消遷移
 executable_file = 可執行檔
@@ -2606,7 +2634,7 @@ commits.search_branch = 此分支
 commits.browse_further = 進一步瀏覽
 commits.renamed_from = 自 %s 重新命名
 issues.filter_milestone_none = 沒有里程碑
-issues.num_comments_1 = %s 則留言
+issues.num_comments_1 = %d 則留言
 issues.no_content = 沒有提供敘述。
 settings.new_owner_blocked_doer = 新的所有者已封鎖您。
 new_repo_helper = 一個儲存庫包含專案的所有檔案和它們的修訂歷史。在別處已經有儲存庫了嗎？<a href="%s">遷移儲存庫</a>。
@@ -2616,10 +2644,10 @@ issues.filter_milestone_all = 所有里程碑
 issues.author_helper = 此使用者是作者。
 pulls.blocked_by_approvals = 此合併請求還沒有足夠的核可。已有 %d 個，總共需要 %d 個核可。
 wiki.search = 搜尋百科
-settings.mirror_settings.docs.disabled_pull_mirror.instructions = 設定您的儲存庫以自動推送提交、標簽、和分支至另一個儲存庫。Pull 鏡像已被您的管理員停用。
+settings.mirror_settings.docs.disabled_pull_mirror.instructions = 設定你的專案使其自動將提交、標籤與分支推送到另一個儲存庫。您的網站管理員已停用拉取鏡像功能。
 settings.mirror_settings.docs = 設定您的儲存庫以自動與另一個儲存庫同步提交、標籤、和分支。
 settings.mirror_settings.docs.disabled_push_mirror.info = 推送鏡像已被您的網站管理員停用。
-settings.mirror_settings.docs.pull_mirror_instructions = 如需建立一個 pull 鏡像，請參閱：
+settings.mirror_settings.docs.pull_mirror_instructions = 如需建立一個拉取鏡像，請參閱：
 blame.ignore_revs = <a href="%s">.git-blame-ignore-revs</a> 中的修訂已被忽略。點擊<a href="%s">這裡</a>來檢視一般的責任歸屬界面。
 editor.file_is_a_symlink = `「%s」是一個符號連結。網頁編輯器無法編輯符號連結`
 issues.label_archive = 封存標籤
@@ -2631,7 +2659,7 @@ pulls.showing_only_single_commit = 只顯示提交 %[1]s 的變更
 pulls.cmd_instruction_merge_desc = 合併更改並在 Forgejo 上更新。
 signing.wont_sign.pubkey = 無法簽署該提交，因為您沒有與您帳號連結的公鑰。
 signing.wont_sign.twofa = 您必須啟用兩步驟認證才能簽署提交。
-signing.wont_sign.basesigned = 因為 base 提交沒有被簽署，無法簽署該提交。
+signing.wont_sign.basesigned = 合併將不會被簽署，因為其基礎提交尚未簽署。
 settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = 目前，這個操作只能在「新的遷移」目錄完成。如需更多資訊，請參閱：
 settings.mirror_settings.docs.disabled_push_mirror.instructions = 設定您的儲存庫以自動從另一個儲存庫拉取提交、標籤和分支。
 issues.role.contributor_helper = 該使用者過去曾經提交至此儲存庫。
@@ -2644,14 +2672,14 @@ signing.wont_sign.error = 在檢查是否能簽署提交時發生錯誤。
 issues.num_participants_one = %d 位參與者
 pulls.showing_specified_commit_range = 只顯示 %[1]s 至 %[2]s 之間的變更
 blame.ignore_revs.failed = 忽略 <a href="%s">.git-blame-ignore-revs</a> 中的修訂失敗。
-issues.blocked_by_user = 因為您被該儲存庫的所有者封鎖，您不能提出一個新的問題。
+issues.blocked_by_user = 因為您已被儲存庫擁有者封鎖，您無法在此儲存庫中建立問題。
 pulls.blocked_by_user = 因為您被這個儲存庫的所有者封鎖，您不能在這裡開啟一個合併請求。
 pulls.has_merged = 失敗：該合併請求已被合併，您無法再合併一次或更改目標分支。
 wiki.cancel = 取消
 activity.navbar.code_frequency = 寫程式頻率
 settings.mirror_settings.docs.no_new_mirrors = 您的儲存庫目前是另一個儲存庫的鏡像。請記住，您目前不能建立新的鏡像。
 settings.mirror_settings.docs.can_still_use = 雖然您不能建立新的鏡像，您還是可以使用既有的鏡像。
-pulls.reopen_failed.base_branch = 因為這個合併請求的 base 分支不存在，它無法被開啟。
+pulls.reopen_failed.base_branch = 因為這個合併請求的基礎分支不存在，它無法被開啟。
 issues.label_archive_tooltip = 在預設情況下，標籤搜尋時會排除被封存的標籤。
 signing.wont_sign.approved = 因為合併請求沒有被核可，這個合併不會被簽署。
 activity.navbar.recent_commits = 最近的提交
@@ -2665,8 +2693,8 @@ signing.wont_sign.never = 永不簽署提交。
 editor.push_out_of_date = 該推送似乎過期了。
 issues.cancel_tracking_history = `已取消時間追蹤 %s`
 issues.due_date_not_writer = 您需要有寫入這個儲存庫的權限才能更新其問題的到期日。
-pulls.commit_ref_at = `在提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 引用了這個合併請求`
-pulls.cmd_instruction_checkout_desc = 從您的專案儲存庫 checkout 一個新的分支來測試這些更改。
+pulls.commit_ref_at = `在提交 %s 引用了這個合併請求`
+pulls.cmd_instruction_checkout_desc = 從您的專案儲存庫中，建立並切換到一個新分支以測試這些變更。
 pulls.cmd_instruction_merge_title = 合併
 pulls.ready_for_review = 可以開始審閱了嗎？
 pulls.cmd_instruction_hint = `檢視命令列指示`
@@ -2691,7 +2719,7 @@ pulls.blocked_by_changed_protected_files_1 = 這個合併請求被暫止，因
 pulls.blocked_by_changed_protected_files_n = 這個合併請求被暫止，因為它更改了這些受保護的檔案：
 pulls.status_checks_hide_all = 隱藏所有檢查
 pulls.status_checks_show_all = 顯示所有檢查
-pulls.reopen_failed.head_branch = 因為這個合併請求的 head 分支不存在，它無法被開啟。
+pulls.reopen_failed.head_branch = 因為這個合併請求的 HEAD 分支不存在，無法重新開啟此合併請求。
 activity.navbar.pulse = 動態
 signing.will_sign = 將以金鑰「%s」簽署這個提交。
 signing.wont_sign.headsigned = 因為 head 提交沒有被簽署，這個合併不會被簽署。
@@ -2708,7 +2736,7 @@ pulls.show_changes_since_your_last_review = 顯示自您上次審閱的變更
 pulls.blocked_by_rejection = 這個合併請求有正式審閱者所請求的更改。
 pulls.blocked_by_official_review_requests = 因為這個合併請求還缺少至少一個正式審閱者的核可，它已被暫止。
 wiki.original_git_entry_tooltip = 與其使用友善連結，檢視原始 Git 檔案。
-settings.mirror_settings.docs.more_information_if_disabled = 您可以在這裡找到更多關於 push 和 pull 鏡像的資訊：
+settings.mirror_settings.docs.more_information_if_disabled = 您可以在這裡找到更多關於推送和拉取鏡像的資訊：
 settings.mirror_settings.docs.doc_link_title = 如何建立儲存庫鏡像？
 settings.mirror_settings.docs.pulling_remote_title = 從遠端儲存庫拉取
 issues.author.tooltip.pr = 此使用者是這個合併請求的作者。
@@ -2792,9 +2820,9 @@ settings.unarchive.text = 取消封存儲存庫將恢復其接收提交和推送
 release.hide_archive_links = 隱藏自動產生的封存
 settings.protect_no_valid_status_check_patterns = 沒有有效的狀態檢查式樣。
 settings.enforce_on_admins = 為儲存庫管理員強制執行此規則
-settings.wiki_rename_branch_main_notices_2 = 這將永久重新命名儲存庫 %s 的 Wiki 的內部分支。現有的簽出將需要更新。
+settings.wiki_rename_branch_main_notices_2 = 這將永久重新命名儲存庫 %s 的百科的內部分支。現有的簽出將需要更新。
 settings.discord_icon_url.exceeds_max_length = 圖示網址長度必須小於或等於 2048 個字符
-settings.wiki_branch_rename_success = 儲存庫 Wiki 的分支名稱已成功規範化。
+settings.wiki_branch_rename_success = 儲存庫百科的分支名稱已成功規範化。
 commits.view_single_diff = 查看此提交中對此提交的變更
 issues.new.assign_to_me = 指派給我
 mirror_denied_combination = 不能組合使用公鑰和基於密碼的驗證。
@@ -2806,9 +2834,9 @@ settings.federation_following_repos = 關注儲存庫的網址。以半形分號
 settings.federation_not_enabled = 你的站點上未啟用聯邦。
 settings.federation_apapiurl = 此儲存庫的聯邦網址。將其複製並貼上至另一個儲存庫的聯邦設定中作為關注儲存庫的網址。
 settings.enter_repo_name = 準確輸入擁有者和儲存庫名稱，如下所示：
-settings.wiki_rename_branch_main = 規範化 Wiki 分支名稱
-settings.wiki_branch_rename_failure = 無法規範化儲存庫 Wiki 的分支名稱。
-settings.confirm_wiki_branch_rename = 重新命名 Wiki 分支
+settings.wiki_rename_branch_main = 規範化百科分支名稱
+settings.wiki_branch_rename_failure = 無法規範化儲存庫百科的分支名稱。
+settings.confirm_wiki_branch_rename = 重新命名百科分支
 settings.transfer_quota_exceeded = 新擁有者（%s）已超出配額。儲存庫尚未轉移。
 settings.wiki_rename_branch_main_notices_1 = 此操作<strong>無法</strong>撤銷。
 settings.push_mirror_sync_in_progress = 目前正在將變更推送至遠端 %s。
@@ -2819,13 +2847,13 @@ pulls.delete_after_merge.head_branch.is_protected = 你要刪除的頭分支是
 pulls.delete_after_merge.head_branch.insufficient_branch = 你沒有權限刪除頭分支。
 settings.pull_mirror_sync_in_progress = 目前正在從遠端 %s 拉取變更。
 settings.pull_mirror_sync_quota_exceeded = 配額已超出，不拉取變更。
-settings.wiki_globally_editable = 允許任何人編輯 Wiki
+settings.wiki_globally_editable = 允許任何人編輯百科
 settings.transfer_abort_success = 轉移儲存庫至 %s 已成功取消。
 settings.add_collaborator_blocked_them = 無法新增協作者，因為他們已封鎖儲存庫擁有者。
 settings.add_webhook.invalid_path = 路徑不能包含「.」、「..」或空字串。它不能以斜線開頭或結尾。
 settings.webhook.test_delivery_desc_disabled = 要使用虛假事件測試此 Webhook，請啟動它。
 settings.webhook.replay.description_disabled = 要重播此 Webhook，請啟動它。
-settings.wiki_rename_branch_main_desc = 將 Wiki 內部使用的分支重新命名為「%s」。此變更是永久性的，無法撤消。
+settings.wiki_rename_branch_main_desc = 將百科內部使用的分支重新命名為「%s」。此變更是永久性的，無法撤消。
 settings.mirror_settings.push_mirror.copy_public_key = 複製公鑰
 settings.default_update_style_desc = 用於更新落後於基礎分支的合併請求的預設更新模式。
 summary_card_alt = 儲存庫 %s 的摘要卡
@@ -2859,9 +2887,40 @@ settings.units.units = 功能
 diff.git-notes.add = 增加註釋
 diff.git-notes.remove-header = 移除註釋
 settings.event_pull_request_enforcement = 執行
+sync_fork.branch_behind_few = 此分支落後 %[2]s 共 %[1]d 次提交
+sync_fork.button = 同步
+sync_fork.branch_behind_one = 此分支落後 %[2]s %[1]d 次提交
+issues.review.remove_review_requests = 移除了對 %[1]s 的審查請求 %[2]s
+issues.filter_no_results_placeholder = 嘗試調整您的搜尋篩選條件。
+issues.reaction.alt_add = 對留言添加 %[1]s 個反應。
+issues.reopen.blocked_by_user = 您無法重新開啟此問題，因為您已被儲存庫擁有者或此問題的發佈者封鎖。
+issues.filter_no_results = 沒有結果
+archive.nocomment = 您無法留言，因為此儲存庫已被封存。
+migrate.repo_desc_helper = 如欲匯入現有描述請留空
+comment.blocked_by_user = 您無法留言，因為您已被儲存庫擁有者或作者封鎖。
+pulls.editable_explanation = 此合併請求允許維護者進行編輯。您可以直接參與貢獻。
+pulls.agit_explanation = 此合併請求使用 AGit 工作流程建立。AGit 允許貢獻者透過「git push」提出變更，無需建立分支或分叉。
+issues.review.add_remove_review_requests = 請求 %[1]s 進行審查，並取消了對 %[2]s 的審查請求 %[3]s
+pulls.cmd_instruction_merge_warning = <b>警告：</b>此儲存庫尚未啟用「自動偵測手動合併」設定，您之後需要手動標記此合併請求為已合併。
+issues.review.add_review_requests = 請求 %[1]s 進行審查 %[2]s
+settings.event_header_action = Action 執行事件
+settings.event_action_failure = 失敗
+settings.event_action_recover = 恢復
+settings.event_action_recover_desc = Action 執行成功，先前同一工作流程中的 Action 執行曾經失敗。
+settings.event_action_success = 成功
+settings.event_action_success_desc = Action 執行成功。
+settings.sourcehut_builds.manifest_path = 建置清單路徑
+settings.sourcehut_builds.visibility = 作業可見性
+settings.event_action_failure_desc = Action 執行以失敗結束。
+settings.protect_branch_name_pattern_desc = 受保護分支名稱的模式。請參閱<a href="%s">文件說明</a>以了解模式語法。範例：main、release/**
+settings.sourcehut_builds.access_token_helper = 具有 JOBS:RW 權限的存取權杖。請在 meta.sr.ht 上產生一個 <a target="_blank" rel="noopener noreferrer" href="%s">builds.sr.ht 權杖</a>，或一個 <a target="_blank" rel="noopener noreferrer" href="%s">具有機密存取權限的 builds.sr.ht 權杖</a>。
+settings.matrix.room_id_helper = 可從 Element 網頁版客戶端取得 Room ID：進入房間設定 > 進階 > Internal room ID。範例：%s。
+settings.web_hook_name_sourcehut_builds = SourceHut Builds
+diff.git-notes.remove-body = 此注釋將會被移除。
+settings.sourcehut_builds.secrets_helper = 授權此作業存取建置機密（需要 SECRETS:RO 權限）
 
 [graphs]
-component_loading = %s載入中…
+component_loading = 正在載入 %s…
 code_frequency.what = 寫程式頻率
 recent_commits.what = 最近的提交
 contributors.what = 貢獻
@@ -2904,7 +2963,7 @@ settings.permission=權限
 settings.repoadminchangeteam=儲存庫管理者可增加與移除團隊權限
 settings.visibility=瀏覽權限
 settings.visibility.public=公開
-settings.visibility.limited=受限（只有已驗證的使用者才可以看到）
+settings.visibility.limited=受限（僅對已登入使用者可見）
 settings.visibility.limited_shortname=受限
 settings.visibility.private=私有（只有組織成員才能看到）
 settings.visibility.private_shortname=私有
@@ -3080,8 +3139,8 @@ dashboard.total_gc_time=總 GC 暫停時間
 dashboard.total_gc_pause=總 GC 暫停時間
 dashboard.last_gc_pause=上次 GC 暫停時間
 dashboard.gc_times=GC 執行次數
-dashboard.delete_old_actions=從資料庫刪除所有舊行為
-dashboard.delete_old_actions.started=從資料庫刪除所有舊行為的任務已啟動。
+dashboard.delete_old_actions=從資料庫刪除所有舊操作紀錄
+dashboard.delete_old_actions.started=從資料庫刪除所有舊操作紀錄的任務已啟動。
 dashboard.update_checker=更新檢查器
 dashboard.delete_old_system_notices=從資料庫刪除所有舊系統提示
 dashboard.gc_lfs=對 LFS meta objects 進行垃圾回收
@@ -3101,7 +3160,7 @@ users.repos=儲存庫數
 users.created=建立時間
 users.last_login=上次登入
 users.never_login=從未登入
-users.send_register_notify=寄送使用者註冊通知
+users.send_register_notify=透過電子郵件傳送註冊通知
 users.new_success=已建立新帳號「%s」。
 users.edit=編輯
 users.auth_source=認證來源
@@ -3117,7 +3176,7 @@ users.prohibit_login=已停權帳號
 users.is_admin=管理員帳號
 users.is_restricted=受限制的帳號
 users.allow_git_hook=可以建立 Git Hook
-users.allow_git_hook_tooltip=Git Hook 將以和 Forgejo 相同的作業系統使用者執行，並擁有同等的主機存取權限。因此擁有此特殊 Git Hook 權限的使用者可存取和修改所有的 Forgejo 儲存庫和 Forgejo 的資料庫。他們甚至能取得 Forgejo 的管理員權限。
+users.allow_git_hook_tooltip=Git hooks 會以執行 Forgejo 的作業系統使用者身分執行，並擁有相同等級的主機存取權限。因此，擁有此特殊 Git hook 權限的使用者，可以存取並修改所有 Forgejo 儲存庫，以及 Forgejo 使用的資料庫。換句話說，他們也具備取得 Forgejo 管理員權限的能力。
 users.allow_import_local=可以匯入本地儲存庫
 users.allow_create_organization=可以建立組織
 users.update_profile=更新使用者帳號
@@ -3319,7 +3378,7 @@ config.custom_file_root_path=自訂檔案根路徑
 config.domain=伺服器域名
 config.offline_mode=本地模式
 config.disable_router_log=停用路由日誌
-config.run_user=以使用者名稱執行
+config.run_user=以使用者執行
 config.run_mode=執行模式
 config.git_version=Git 版本
 config.repo_root_path=儲存庫根路徑
@@ -3424,8 +3483,8 @@ config.enable_federated_avatar=啟用聯邦式大頭貼
 
 config.git_config=Git 設定
 config.git_disable_diff_highlight=停用比較語法高亮
-config.git_max_diff_lines=差異比較時顯示的最多行數 (單檔)
-config.git_max_diff_line_characters=差異比較時顯示的最多字元數 (單行)
+config.git_max_diff_lines=差異比較時顯示的最多行數
+config.git_max_diff_line_characters=差異比較時顯示的最多字元數
 config.git_max_diff_files=差異比較時顯示的最多檔案數
 config.git_gc_args=GC 參數
 config.git_migrate_timeout=遷移逾時
@@ -3574,7 +3633,7 @@ auto_merge_pull_request=`自動合併了合併請求 <a href="%[1]s">%[3]s#%[2]s
 transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
 push_tag=推送了標籤 <a href="%[2]s">%[3]s</a> 到 <a href="%[1]s">%[4]s</a>
 delete_tag=刪除了 <a href="%[1]s">%[3]s</a> 的標籤 %[2]s
-delete_branch=刪除了 <a href="%[1]s">%[3]s</a> 的 %[2]s 分支
+delete_branch=刪除了 <a href="%[1]s">%[3]s</a> 的 <code>%[2]s</code> 分支
 compare_branch=比較
 compare_commits=比較 %d 個提交
 compare_commits_general=比較提交
@@ -3583,7 +3642,7 @@ mirror_sync_create=從鏡像同步了新參考 <a href="%[2]s">%[3]s</a> 到 <a
 mirror_sync_delete=已從鏡像同步並從 <a href="%[1]s">%[3]s</a> 刪除了參考 <code>%[2]s</code>
 approve_pull_request=`核可了 <a href="%[1]s">%[3]s#%[2]s</a>`
 reject_pull_request=`提出了修改建議 <a href="%[1]s">%[3]s#%[2]s</a>`
-publish_release=`發布了 <a href="%[1]s">%[3]s</a> 的 <a href="%[2]s"> "%[4]s" </a>`
+publish_release=`已於 <a href="%[1]s">%[3]s</a> 發佈 <a href="%[2]s">%[4]s</a>`
 review_dismissed=`取消了 <b>%[4]s</b> 對 <a href="%[1]s">%[3]s#%[2]s</a> 的審核`
 review_dismissed_reason=原因：
 create_branch=在 <a href="%[1]s">%[4]s</a> 中建立了分支 <a href="%[2]s">%[3]s</a>
@@ -3801,7 +3860,7 @@ arch.version.depends = 依賴
 owner.settings.cargo.rebuild.no_index = 無法重建，未初始化任何索引。
 cran.registry = 在你的 <code>Rprofile.site</code> 檔案中設定此註冊表：
 debian.repository.distributions = 發行版
-owner.settings.chef.keypair.description = 需要金鑰對才能向 Chef 註冊表進行身份驗證。如果你之前已經產生過金鑰對，產生新的金鑰對將會丟棄舊的金鑰對。
+owner.settings.chef.keypair.description = 送往 Chef 註冊表的請求必須經過加密簽署，以作為驗證身分的方式。在產生金鑰對時，只有公鑰會儲存在 Forgejo 上，私鑰則會提供給你用於 knife 工具。產生新的金鑰對將會覆蓋先前的金鑰。
 owner.settings.cargo.initialize.description = 使用 Cargo 註冊表需要一個特殊的索引 Git 儲存庫。使用此選項將會（重新）建立儲存庫並自動配置它。
 rpm.repository.multiple_groups = 此套件可以在多個群組中使用。
 rpm.distros.suse = 在基於 SUSE 的發行版上
@@ -3823,6 +3882,7 @@ registry.documentation = 有關 %s 註冊表的更多資訊，請參閱<a target
 alt.registry.install = 若要安裝軟體包，執行以下命令：
 alt.repository.multiple_groups = 此軟體包在多個群組中可用。
 alt.setup = 新增儲存庫至已連接的儲存庫清單（選擇必要的架構結構而非「_arch_」）：
+arch.version.makedepends = 編譯依賴
 
 [secrets]
 secrets=Secret
@@ -3976,16 +4036,16 @@ code_kind = 搜尋程式碼…
 code_search_unavailable = 目前無法使用程式碼搜尋。請連絡網站管理員。
 no_results = 沒有找到相符的結果。
 keyword_search_unavailable = 關鍵字搜尋目前無法使用。請連絡網站管理員。
-runner_kind = 搜尋 Runners …
+runner_kind = 搜尋 Runners…
 project_kind = 搜尋專案…
 branch_kind = 搜尋分支…
 commit_kind = 搜尋提交…
 code_search_by_git_grep = 目前搜尋結果由「git grep」提供。如果網站管理員啟用程式碼索引，可能會有更好的結果。
 exact = 精確
 milestone_kind = 搜尋里程碑...
-issue_kind = 搜尋問題…
+issue_kind = 搜尋議題…
 exact_tooltip = 只包含與搜尋詞完全相符的結合
-pull_kind = 搜尋拉取…
+pull_kind = 搜尋合併請求…
 regexp = 正規表示式
 regexp_tooltip = 將搜尋詞解釋為正規表示式
 union = 關鍵字
@@ -4011,4 +4071,20 @@ test = 好的
 
 [repo.permissions]
 ext_issues = 存取外部問題追蹤器的連結。權限由外部管理。
-ext_wiki = 存取外部 Wiki 的連結。權限由外部管理。
\ No newline at end of file
+ext_wiki = 存取外部百科的連結。權限由外部管理。
+issues.read = <b>讀取：</b>查看並建立問題與留言。
+releases.write = <b>寫入：</b>發布、編輯與刪除發行版本及其資源。
+wiki.read = <b>讀取：</b>查看整合的 Wiki 及其歷史紀錄。
+code.write = <b>寫入：</b>推送到儲存庫，建立分支與標籤。
+code.read = <b>讀取：</b>存取並複製此儲存庫的原始碼。
+issues.write = <b>寫入：</b>關閉問題，並管理標籤、里程碑、指派對象、到期日與依賴關係等中繼資料。
+pulls.read = <b>讀取：</b>查看並建立合併請求。
+pulls.write = <b>寫入：</b>關閉合併請求，並管理標籤、里程碑、指派對象、到期日與依賴關係等中繼資料。
+releases.read = <b>讀取：</b>檢視並下載發行版本。
+wiki.write = <b>寫入：</b>在整合的 Wiki 中建立、更新與刪除頁面。
+projects.read = <b>讀取：</b>存取儲存庫的專案看板。
+packages.write = <b>寫入：</b>發布與刪除指派給此儲存庫的套件。
+projects.write = <b>寫入：</b>建立專案與欄位，並編輯它們。
+packages.read = <b>讀取：</b>檢視並下載指派給此儲存庫的套件。
+actions.read = <b>讀取：</b>查看整合的 CI/CD 流程及其紀錄。
+actions.write = <b>寫入：</b>手動觸發、重新啟動、取消或核准待處理的 CI/CD 流程。
\ No newline at end of file
diff --git a/options/locale/readme.md b/options/locale/readme.md
index f6f198a936..fe8cd579c0 100644
--- a/options/locale/readme.md
+++ b/options/locale/readme.md
@@ -1,21 +1,4 @@
-# Forgejo translations
-
-This directory contains all .INI translations.
-
-## Working on base language
-
-When you work on Forgejo features, you should only modify `locale_en-US.ini`.
-
-* consult https://forgejo.org/docs/next/contributor/localization-english/
-* add strings when your change requires doing so
-* remove strings when your change renders them unused
-
-## Working on other languages
-
-Translations are done on Codeberg Translate and not via individual pull requests.
-
-* consult https://forgejo.org/docs/next/contributor/localization/
-* see the project: https://translate.codeberg.org/projects/forgejo/forgejo/
+See [locale_readme.md](../locale_readme.md) for modification instructions.
 
 ## Attribution
 
diff --git a/options/locale_next/locale_ar.json b/options/locale_next/locale_ar.json
index 0967ef424b..aafb85cb4e 100644
--- a/options/locale_next/locale_ar.json
+++ b/options/locale_next/locale_ar.json
@@ -1 +1,146 @@
-{}
+{
+    "home.welcome.activity_hint": "لا يوجد شيء في موجزك حتى الآن. ستظهر هنا أفعالك ونشاطاتك من المستودعات التي تتابعها.",
+    "home.welcome.no_activity": "لا يوجد نشاط",
+    "home.explore_repos": "اكتشف المستودعات",
+    "home.explore_users": "اكتشف المستخدمين",
+    "home.explore_orgs": "اكتشف المنظمات",
+    "moderation.abuse_category.illegal_content": "محتوى غير مشروع",
+    "moderation.abuse_category.malware": "برمجية خبيثة",
+    "relativetime.now": "الآن",
+    "relativetime.1month": "الشهر الفائت",
+    "relativetime.2weeks": "منذ أسبوعين",
+    "search.milestone_kind": "معالم البحث…",
+    "moderation.abuse_category.other_violations": "انتهاكات أخرى لقواعد المنصة",
+    "repo.issue_indexer.title": "مفهرس الإبلاغات",
+    "incorrect_root_url": "تم تكوين هذه النسخة من Forgejo لتعمل على العنوان \"%s\". أنت تقوم حاليًا بتصفّح Forgejo عبر رابط مختلف، مما قد يتسبب في تعطل بعض أجزاء التطبيق. يتم تحديد الرابط الرسمي (canonical URL) من قِبل مسؤولي Forgejo من خلال إعداد `ROOT_URL` في ملف `app.ini`.",
+    "error.not_found.title": "الصفحة غير موجودة",
+    "themes.names.forgejo-auto": "فورجيو (اتبع سمة النظام)",
+    "themes.names.forgejo-light": "فورجيجو المضيء",
+    "themes.names.forgejo-dark": "فورجيجو الداكن",
+    "stars.list.none": "لم يقم أحد بتمييز هذا المستودع بنجمة.",
+    "watch.list.none": "لا أحد يشاهد هذا المستودع.",
+    "followers.incoming.list.self.none": "لا أحد يتابع ملفك الشخصي.",
+    "followers.incoming.list.none": "لا أحد يتابع هذا المستخدم.",
+    "followers.outgoing.list.self.none": "أنت لا تتبع أي شخص.",
+    "relativetime.1day": "الأمس",
+    "followers.outgoing.list.none": "لا يتابع %s أي شخص.",
+    "relativetime.1week": "أخر أسبوع",
+    "relativetime.2days": "منذ يومين",
+    "relativetime.2months": "منذ شهرين",
+    "relativetime.1year": "السنة الفائتة",
+    "relativetime.2years": "منذ سنتين",
+    "repo.form.cannot_create": "بلغت جميع المساحات التي يمكنك إنشاء مستودعات بها حدها.",
+    "alert.asset_load_failed": "تعذّر تحميل ملفات الأصول من {path}. تأكد من أن الملفات متاحة للوصول.",
+    "settings.visibility.description": "رؤية ملفك الشخصي تؤثر في قدرة الآخرين على الوصول إلى مستودعاتك غير الخاصة. <a href=\"%s\" target=\"_blank\">اعرف المزيد</a>",
+    "relativetime.mins": {
+        "zero": "الآن",
+        "one": "منذ دقيقة مضت",
+        "two": "منذ دقيقتين مضت",
+        "few": "منذ %d دقائق مضت",
+        "many": "منذ %d دقيقة مضت",
+        "other": "منذ %d دقيقة مضت"
+    },
+    "relativetime.hours": {
+        "zero": "الآن",
+        "one": "منذ ساعة",
+        "two": "منذ ساعتين",
+        "few": "منذ %d ساعات",
+        "many": "منذ %d ساعة",
+        "other": "منذ %d ساعة"
+    },
+    "moderation.report_remarks": "الملاحظات",
+    "repo.diff.commit.next-short": "التالي",
+    "repo.diff.commit.previous-short": "السابق",
+    "admin.dashboard.cleanup_offline_runners": "تنظيف وحدات التشغيل غير المتصلة",
+    "relativetime.days": {
+        "zero": "اليوم",
+        "one": "منذ يوم واحد",
+        "two": "منذ يومين",
+        "few": "منذ %d أيام",
+        "many": "منذ %d يوماً",
+        "other": "منذ %d يوماً"
+    },
+    "relativetime.weeks": {
+        "zero": "هذا الأسبوع",
+        "one": "منذ أسبوع واحد",
+        "two": "منذ أسبوعين",
+        "few": "منذ %d أسابيع",
+        "many": "منذ %d أسبوعاً",
+        "other": "منذ %d أسبوعاً"
+    },
+    "relativetime.years": {
+        "zero": "هذه السنة",
+        "one": "منذ سنة واحدة",
+        "two": "منذ سنتين",
+        "few": "منذ %d سنوات",
+        "many": "منذ %d سنة",
+        "other": "منذ %d سنة"
+    },
+    "repo.settings.push_mirror.branch_filter.label": "تصفية الفرع (اختياري)",
+    "repo.settings.push_mirror.branch_filter.description": "الفروع المطلوب عكسها. اترك الحقل فارغًا لعكس جميع الفروع. راجع توثيق <a href=\"%[1]s\">%[2]s</a> للاطلاع على الصيغة. أمثلة: <code>main, release/*</code>",
+    "og.repo.summary_card.alt_description": "بطاقة تلخيصية للمستودع %[1]، موصوفة بـ %[1]: %[2]s",
+    "meta.last_line": "شكرًا لك على ترجمة Forgejo! هذا السطر لا يراه المستخدمون ولكنه يخدم أغراضًا أخرى في إدارة الترجمة. يمكنك وضع حقيقة ممتعة في الترجمة بدلاً من ترجمتها.",
+    "relativetime.future": "في المستقبل",
+    "avatar.constraints_hint": "لا يمكن أن يتجاوز حجم الصورة الشخصية المخصصة %[1]s، ولا أبعادها عن %[2]d×%[3]d بكسل",
+    "repo.pulls.merged_title_desc": {
+        "zero": "لم دمج أي إيداع من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s",
+        "one": "تم دمج إيداع واحد من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s",
+        "two": "تم دمج إيداعين اثنين من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s",
+        "few": "تم دمج %[1]d إيداعات من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s",
+        "many": "تم دمج %[1]d إيداعاً من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s",
+        "other": "تم دمج %[1]d إيداعاً من <code>%[2]s</code> إلى <code>%[3]s</code> %[4]s"
+    },
+    "relativetime.months": {
+        "zero": "هذا الشهر",
+        "one": "منذ شهر",
+        "two": "منذ شهرين",
+        "few": "منذ %d أشهر",
+        "many": "منذ %d شهراً",
+        "other": "منذ %d شهراً"
+    },
+    "repo.pulls.title_desc": {
+        "zero": "لا يريد دمج أي إيداع من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>",
+        "one": "يريد دمج إيداع واحد من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>",
+        "two": "يريد دمج إيداعين من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>",
+        "few": "يريد دمج %[1]d إيداعات من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>",
+        "many": "يريد دمج %[1]d إيداعًا من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>",
+        "other": "يريد دمج %[1]d إيداعًا من <code>%[2]s</code> إلى <code id=\"%[4]s\">%[3]s</code>"
+    },
+    "mail.actions.run_info_sha": "إيداع: %[1]s",
+    "keys.gpg.link": "مفاتيح GPG",
+    "moderation.abuse_category.spam": "غير مرغوب به",
+    "keys.ssh.link": "مفاتيح SSH",
+    "profile.edit.link": "عدِّل ملف التعريف",
+    "moderation.abuse_category": "الفئة",
+    "moderation.abuse_category.placeholder": "حدد الفئة",
+    "moderation.report_remarks.placeholder": "يُرجى تقديم بعض التفاصيل المتعلقة بالإساءة التي أبلغت عنها.",
+    "moderation.submit_report": "إرسال التقرير",
+    "moderation.reporting_failed": "تعذر إرسال تقرير إساءة الاستخدام الجديد: %v",
+    "moderation.reported_thank_you": "شكراُ لك على تقريرك. وقد تم إبلاغ الإدارة به.",
+    "mail.actions.run_info_trigger": "تم تشغيله بسبب: %[1]s عبر: %[2]s",
+    "install.invalid_lfs_path": "غير قادر على إنشاء جذر LFS في المسار المحدد: %[1]s",
+    "alert.range_error": " يجب أن يكون رقمًا بين %[1]s و %[2]s.",
+    "mail.actions.not_successful_run_subject": "سير العمل %[1]s فشل في المستودت %[2]s",
+    "mail.actions.successful_run_after_failure": "تم استعادة سير العمل %[1]s في المستودع %[2]s",
+    "mail.actions.not_successful_run": "فشل سير العمل %[1]s في المستودع %[2]s",
+    "mail.actions.run_info_cur_status": "حالة هذا التشغيل: %[1]s (تم تحديثها من %[2]s للتو)",
+    "mail.actions.run_info_previous_status": "حالة التشغيل السابقة: %[1]s",
+    "discussion.locked": "تم إغلاق هذه المناقشة. يقتصر التعليق على المساهمين فقط.",
+    "editor.textarea.tab_hint": "السطر مُزاح بالفعل. اضغط <kbd>Tab</kbd> مرة أخرى أو <kbd>Escape</kbd> لمغادرة المحرر.",
+    "editor.textarea.shift_tab_hint": "لا توجد مسافة بادئة في هذا السطر. اضغط <kbd>Shift</kbd> + <kbd>Tab</kbd> مرة أخرى أو <kbd>Escape</kbd> لمغادرة المحرر.",
+    "profile.actions.tooltip": "إجراءات إضافية",
+    "moderation.report_content": "محتوى التقارير",
+    "moderation.report_abuse_form.header": "الإبلاغ عن الإساءة إلى المسؤول",
+    "moderation.report_abuse_form.details": "يتعين استخدام هذا النموذج للإبلاغ عن المستخدمين الذين ينشئون ملفات تعريف ، أو مستودعات ، أو إبلاغات ، أو تعليقات ، أو يتصرفون بشكل غير لائق.",
+    "moderation.report_abuse_form.invalid": "معاملا غير صالحة",
+    "moderation.report_abuse_form.already_reported": "‍لقد قمت بالفعل بالإبلاغ عن هذا المحتوى",
+    "moderation.report_abuse": "الإبلاغ عن إساءة الاستخدام",
+    "feed.atom.link": "موجز Atom",
+    "admin.config.moderation_config": "تهيئة الإشراف",
+    "mail.actions.successful_run_after_failure_subject": "تم استعادة سير العمل %[1]s في المستودع %[2]s",
+    "discussion.sidebar.reference": "مرجع",
+    "admin.moderation.moderation_reports": "تقارير الإشراف",
+    "admin.moderation.reports": "التقارير",
+    "admin.moderation.no_open_reports": "لا يوجد حالياً أية تقارير مفتوحة.",
+    "admin.moderation.deleted_content_ref": "المحتوى المُبلغ عنه بالنوع %[1]v والمعرف %[2]d لم يعد موجوداً"
+}
diff --git a/options/locale_next/locale_be.json b/options/locale_next/locale_be.json
index 0967ef424b..c8ff00bd87 100644
--- a/options/locale_next/locale_be.json
+++ b/options/locale_next/locale_be.json
@@ -1 +1,8 @@
-{}
+{
+    "moderation.abuse_category.malware": "Шкодная праграма",
+    "home.welcome.no_activity": "Няма падзей",
+    "home.welcome.activity_hint": "У вашай стужцы пакуль што нічога няма. Вашыя дзеяньні ды падзеі з рэпазыторыяў зьявяцца тут.",
+    "home.explore_repos": "Агляд рэпазыторыяў",
+    "home.explore_users": "Агляд карыстальнікаў",
+    "home.explore_orgs": "Агляд арганізацый"
+}
diff --git a/options/locale_next/locale_bg.json b/options/locale_next/locale_bg.json
index 02144c8b38..be8477a98a 100644
--- a/options/locale_next/locale_bg.json
+++ b/options/locale_next/locale_bg.json
@@ -1,10 +1,88 @@
 {
-	"repo.pulls.merged_title_desc": {
-		"one": "сля %[1]d подаване от <code>%[2]s</code> в <code>%[3]s</code> %[4]s",
-		"other": "сля %[1]d подавания от <code>%[2]s</code> в <code>%[3]s</code> %[4]s"
-	},
-	"repo.pulls.title_desc": {
-		"one": "иска да слее %[1]d подаване от <code>%[2]s</code> в <code id=\"%[4]s\">%[3]s</code>",
-		"other": "иска да слее %[1]d подавания от <code>%[2]s</code> в <code id=\"%[4]s\">%[3]s</code>"
-	}
+    "repo.pulls.merged_title_desc": {
+        "one": "сля %[1]d подаване от <code>%[2]s</code> в <code>%[3]s</code> %[4]s",
+        "other": "сля %[1]d подавания от <code>%[2]s</code> в <code>%[3]s</code> %[4]s"
+    },
+    "repo.pulls.title_desc": {
+        "one": "иска да слее %[1]d подаване от <code>%[2]s</code> в <code id=\"%[4]s\">%[3]s</code>",
+        "other": "иска да слее %[1]d подавания от <code>%[2]s</code> в <code id=\"%[4]s\">%[3]s</code>"
+    },
+    "mail.actions.run_info_trigger": "Задействано поради: %[1]s от: %[2]s",
+    "meta.last_line": "В България расте най-старото дърво в страната, Байкушевата мура, на възраст над 1300 години.",
+    "relativetime.1day": "вчера",
+    "relativetime.2months": "преди два месеца",
+    "home.explore_repos": "Разглеждане на хранилища",
+    "home.explore_users": "Разглеждане на потребители",
+    "home.explore_orgs": "Разглеждане на организации",
+    "relativetime.mins": {
+        "one": "преди %d минута",
+        "other": "преди %d минути"
+    },
+    "repo.form.cannot_create": "Всички пространства, в които можете да създавате хранилища, са достигнали лимита си на хранилища.",
+    "moderation.report_remarks": "Подробности",
+    "moderation.submit_report": "Изпращане на доклада",
+    "followers.incoming.list.self.none": "Никой не следва вашия профил.",
+    "followers.incoming.list.none": "Никой не следва този потребител.",
+    "relativetime.now": "сега",
+    "home.welcome.no_activity": "Няма дейност",
+    "relativetime.1year": "миналата година",
+    "moderation.abuse_category": "Категория",
+    "moderation.abuse_category.illegal_content": "Незаконно съдържание",
+    "home.welcome.activity_hint": "Все още няма нищо в емисията ви. Вашите действия и дейност от хранилищата, които наблюдавате, ще се появят тук.",
+    "stars.list.none": "Никой не е отбелязал това хранилище със звезда.",
+    "moderation.report_abuse_form.invalid": "Невалидни аргументи",
+    "moderation.report_abuse_form.already_reported": "Вече сте докладвали това съдържание",
+    "moderation.abuse_category.placeholder": "Изберете категория",
+    "moderation.abuse_category.spam": "Спам",
+    "repo.issue_indexer.title": "Индексатор на задачи",
+    "moderation.report_abuse_form.details": "Този формуляр трябва да се използва за докладване на потребители, които създават спам профили, хранилища, задачи, коментари или се държат неподходящо.",
+    "moderation.report_remarks.placeholder": "Моля, предоставете подробности относно злоупотребата, за която докладвате.",
+    "moderation.reporting_failed": "Не може да се изпрати новият доклад за злоупотреба: %v",
+    "moderation.reported_thank_you": "Благодарим ви за доклада. Администрацията е уведомена.",
+    "error.not_found.title": "Страницата не е намерена",
+    "incorrect_root_url": "Тази инстанция на Forgejo е конфигурирана да се сервира на \"%s\". В момента разглеждате Forgejo през друг URL адрес, което може да доведе до неправилно функциониране на части от приложението. Каноничният URL адрес се контролира от администраторите на Forgejo чрез настройката ROOT_URL в app.ini.",
+    "themes.names.forgejo-dark": "Forgejo тъмна",
+    "themes.names.forgejo-auto": "Forgejo (следване на системната тема)",
+    "themes.names.forgejo-light": "Forgejo светла",
+    "watch.list.none": "Никой не наблюдава това хранилище.",
+    "followers.outgoing.list.self.none": "Не следвате никого.",
+    "followers.outgoing.list.none": "%s не следва никого.",
+    "relativetime.future": "в бъдеще",
+    "relativetime.2days": "преди два дни",
+    "relativetime.1week": "миналата седмица",
+    "relativetime.2weeks": "преди две седмици",
+    "relativetime.1month": "миналия месец",
+    "relativetime.2years": "преди две години",
+    "moderation.report_abuse_form.header": "Докладване на злоупотреба до администратора",
+    "moderation.abuse_category.malware": "Зловреден софтуер",
+    "moderation.abuse_category.other_violations": "Други нарушения на правилата на платформата",
+    "alert.asset_load_failed": "Неуспешно зареждане на файлове с ресурси от {path}. Моля, уверете се, че файловете с ресурси са достъпни.",
+    "alert.range_error": " трябва да бъде число между %[1]s и %[2]s.",
+    "install.invalid_lfs_path": "Не може да се създаде LFS корен в посочения път: %[1]s",
+    "search.milestone_kind": "Търсене на етапи…",
+    "admin.config.moderation_config": "Конфигурация на модерацията",
+    "moderation.report_abuse": "Докладване на злоупотреба",
+    "moderation.report_content": "Докладване на съдържание",
+    "relativetime.hours": {
+        "one": "преди %d час",
+        "other": "преди %d часа"
+    },
+    "relativetime.days": {
+        "one": "преди %d ден",
+        "other": "преди %d дни"
+    },
+    "relativetime.weeks": {
+        "one": "преди %d седмица",
+        "other": "преди %d седмици"
+    },
+    "relativetime.months": {
+        "one": "преди %d месец",
+        "other": "преди %d месеца"
+    },
+    "relativetime.years": {
+        "one": "преди %d година",
+        "other": "преди %d години"
+    },
+    "editor.textarea.tab_hint": "Редът вече е с отстъп. Натиснете отново <kbd>Tab</kbd> или <kbd>Escape</kbd>, за да излезете от редактора.",
+    "editor.textarea.shift_tab_hint": "Няма отстъп на този ред. Натиснете отново <kbd>Shift</kbd> + <kbd>Tab</kbd> или <kbd>Escape</kbd>, за да излезете от редактора."
 }
diff --git a/options/locale_next/locale_bn.json b/options/locale_next/locale_bn.json
index 0967ef424b..56a6e6dae4 100644
--- a/options/locale_next/locale_bn.json
+++ b/options/locale_next/locale_bn.json
@@ -1 +1,3 @@
-{}
+{
+    "moderation.abuse_category.malware": "ম্যালওয়্যার"
+}
diff --git a/options/locale_next/locale_ca.json b/options/locale_next/locale_ca.json
index 8eefc65a1a..606ab99173 100644
--- a/options/locale_next/locale_ca.json
+++ b/options/locale_next/locale_ca.json
@@ -1,3 +1,4 @@
 {
-    "search.milestone_kind": "Cerca fites..."
+    "search.milestone_kind": "Cerca fites...",
+    "moderation.abuse_category.malware": "Programari maliciós"
 }
diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json
index 6e1f48b82f..73371a6fc2 100644
--- a/options/locale_next/locale_cs-CZ.json
+++ b/options/locale_next/locale_cs-CZ.json
@@ -19,5 +19,118 @@
     "themes.names.forgejo-auto": "Forgejo (podle motivu systému)",
     "themes.names.forgejo-light": "Forgejo – světlé",
     "themes.names.forgejo-dark": "Forgejo – tmavé",
-    "install.invalid_lfs_path": "Nepodařilo se vytvořit kořen LFS na zvolené cestě: %[1]s"
+    "error.not_found.title": "Stránka nenalezena",
+    "alert.asset_load_failed": "Nepodařilo se načíst soubory příloh z {path}. Ujistěte se, že jsou dané soubory přístupné.",
+    "install.invalid_lfs_path": "Nepodařilo se vytvořit kořen LFS na zvolené cestě: %[1]s",
+    "alert.range_error": " musí být číslo mezi %[1]s a %[2]s.",
+    "meta.last_line": "Díky všem přispěvatelům za pomoc!",
+    "mail.actions.not_successful_run_subject": "Workflow %[1]s selhal v repozitáři %[2]s",
+    "mail.actions.not_successful_run": "Workflow %[1]s selhal v repozitáři %[2]s",
+    "mail.actions.run_info_cur_status": "Stav tohoto procesu: %[1]s (právě aktualizováno z %[2]s)",
+    "mail.actions.run_info_previous_status": "Stav předchozího procesu: %[1]s",
+    "mail.actions.run_info_trigger": "Spuštěno z důvodu: %[1]s od: %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s obnoven v repozitáři %[2]s",
+    "mail.actions.successful_run_after_failure": "Workflow %[1]s obnoven v repozitáři %[2]s",
+    "discussion.locked": "Tato diskuze byla uzamčena. Komentování je omezené na přispěvatele.",
+    "relativetime.future": "v budoucnu",
+    "relativetime.years": {
+        "one": "před %d rokem",
+        "few": "před %d lety",
+        "other": "před %d lety"
+    },
+    "relativetime.1day": "včera",
+    "relativetime.2days": "před dvěma dny",
+    "relativetime.1week": "minulý týden",
+    "relativetime.2weeks": "před dvěma týdny",
+    "relativetime.1month": "minulý měsíc",
+    "relativetime.2months": "před dvěma měsíci",
+    "relativetime.1year": "minulý rok",
+    "relativetime.2years": "před dvěma lety",
+    "relativetime.weeks": {
+        "one": "před %d týdnem",
+        "few": "před %d týdny",
+        "other": "před %d týdny"
+    },
+    "relativetime.days": {
+        "one": "před %d dnem",
+        "few": "před %d dny",
+        "other": "před %d dny"
+    },
+    "relativetime.mins": {
+        "one": "před %d minutou",
+        "few": "před %d minutami",
+        "other": "před %d minutami"
+    },
+    "relativetime.hours": {
+        "one": "před %d hodinou",
+        "few": "před %d hodinami",
+        "other": "před %d hodinami"
+    },
+    "relativetime.now": "nyní",
+    "relativetime.months": {
+        "one": "před %d měsícem",
+        "few": "před %d měsíci",
+        "other": "před %d měsíci"
+    },
+    "moderation.report_content": "Nahlásit obsah",
+    "moderation.report_abuse_form.details": "Tento formulář je určen k nahlašování uživatelů, kteří si vytvářejí spamové profily, repozitáře, problémy, komentáře nebo se chovají nevhodně.",
+    "admin.config.moderation_config": "Nastavení moderování",
+    "moderation.report_abuse": "Nahlásit zneužití",
+    "moderation.report_abuse_form.header": "Nahlásit zneužití administrátorovi",
+    "moderation.report_abuse_form.invalid": "Neplatné argumenty",
+    "moderation.report_abuse_form.already_reported": "Tento obsah jste již nahlásili",
+    "moderation.abuse_category": "Kategorie",
+    "moderation.submit_report": "Odeslat hlášení",
+    "moderation.reporting_failed": "Nepodařilo se odeslat nové hlášení zneužití: %v",
+    "moderation.report_remarks.placeholder": "Zadejte prosím podrobnosti o zneužití, které nahlašujete.",
+    "moderation.reported_thank_you": "Děkujeme za vaše hlášení. Správa platformy na ni byla upozorněna.",
+    "moderation.report_remarks": "Informace",
+    "moderation.abuse_category.placeholder": "Vyberte kategorii",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Nezákonný obsah",
+    "moderation.abuse_category.other_violations": "Jiné porušení pravidel platformy",
+    "repo.form.cannot_create": "Všechny prostory, ve kterých můžete vytvářet repozitáře, dosáhly svého limitu.",
+    "repo.issue_indexer.title": "Indexování problémů",
+    "watch.list.none": "Tento repozitář nikdo nesleduje.",
+    "followers.incoming.list.self.none": "Váš profil nikdo nesleduje.",
+    "followers.incoming.list.none": "Tohoto uživatele nikdo nesleduje.",
+    "followers.outgoing.list.none": "%s nikoho nesleduje.",
+    "stars.list.none": "Tento repozitář si nikdo nepřidal do oblíbených.",
+    "followers.outgoing.list.self.none": "Nikoho nesledujete.",
+    "editor.textarea.tab_hint": "Řádek je již odsazen. Pro opuštění editoru stiskněte znovu <kbd>Tab</kbd> nebo <kbd>Escape</kbd>.",
+    "editor.textarea.shift_tab_hint": "Na tomto řádku není žádné odsazení. Pro opuštění editoru stiskněte znovu <kbd>Shift</kbd> + <kbd>Tab</kbd> nebo <kbd>Escape</kbd>.",
+    "admin.dashboard.cleanup_offline_runners": "Vymazat offline runnery",
+    "settings.visibility.description": "Viditelnost profilu ovlivňuje možnost ostatních přistupovat k vašim veřejným repozitářům. <a href=\"%s\" target=\"_blank\">Zjistit více</a>.",
+    "avatar.constraints_hint": "Velikost vlastního avataru nesmí překročit %[1]s nebo být větší než %[2]dx%[3]d pixelů",
+    "repo.diff.commit.next-short": "Další",
+    "repo.diff.commit.previous-short": "Předchozí",
+    "profile.actions.tooltip": "Další akce",
+    "keys.gpg.link": "Klíče GPG",
+    "profile.edit.link": "Upravit profil",
+    "feed.atom.link": "Zdroj Atom",
+    "keys.ssh.link": "Klíče SSH",
+    "og.repo.summary_card.alt_description": "Karta se souhrnem repozitáře %[1]s, popsaným jako: %[2]s",
+    "mail.actions.run_info_sha": "Revize: %[1]s",
+    "repo.settings.push_mirror.branch_filter.label": "Filtr větve (nepovinný)",
+    "repo.settings.push_mirror.branch_filter.description": "Větve, které mají být zrcadleny. Ponechte prázdné pro zrcadlení všech větví. Syntaxi naleznete v <a href=\"%[1]s\">dokumentaci %[2]s</a>. Příklady: <code>main, release/*</code>",
+    "discussion.sidebar.reference": "Reference",
+    "admin.moderation.moderation_reports": "Hlášení moderace",
+    "admin.moderation.reports": "Hlášení",
+    "admin.moderation.deleted_content_ref": "Nahlášený obsah s typem %[1]v a ID %[2]d již neexistuje",
+    "admin.moderation.no_open_reports": "Momentálně nejsou otevřena žádná hlášení.",
+    "admin.dashboard.remove_resolved_reports": "Odstranit vyřešená hlášení",
+    "compare.branches.title": "Porovnat větve",
+    "repo.commit.load_tags_failed": "Načtení značek selhalo z důvodu interní chyby",
+    "admin.auths.allow_username_change": "Povolit změnu uživatelského jména",
+    "admin.auths.allow_username_change.description": "Povolit uživatelům změnit své uživatelské jméno v nastavení profilu",
+    "warning.repository.out_of_sync": "Databázová reprezentace tohoto repozitáře není synchronizovaná. Pokud se toto varování zobrazuje i po odeslání revize do repozitáře, kontaktujte administrátora.",
+    "repo.pulls.already_merged": "Sloučení selhalo: tato žádost již byla sloučena.",
+    "migrate.pagure.description": "Migrovat data z pagure.io nebo jiných instancí Pagure.",
+    "migrate.pagure.incorrect_url": "Byla zadána nesprávná adresa URL zdrojového repozitáře",
+    "migrate.pagure.project_url": "Adresa projektu Pagure",
+    "migrate.pagure.project_example": "Adresa URL projektu Pagure, např. https://pagure.io/pagure",
+    "migrate.pagure.token_label": "Token",
+    "migrate.pagure.token_body_a": "Zadejte token API Pagure s přístupem k soukromým problémům pro vytvoření repozitáře obsahujícího pouze soukromé problémy",
+    "migrate.pagure.token_body_b": "Nezapomeňte nastavit repozitář jako soukromý výše, pokud chcete, aby byl repozitář soukromý"
 }
diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json
index 2a9381e290..2620127b8c 100644
--- a/options/locale_next/locale_da.json
+++ b/options/locale_next/locale_da.json
@@ -17,7 +17,89 @@
     "themes.names.forgejo-light": "Forgejo lys",
     "themes.names.forgejo-dark": "Forgejo mørk",
     "themes.names.forgejo-auto": "Forgejo (følg systemtema)",
-    "settings.adopt": "Adoptere",
+    "error.not_found.title": "Siden blev ikke fundet",
+    "alert.asset_load_failed": "Kunne ikke indlæse aktivfiler fra {path}. Sørg for, at aktivfilerne er tilgængelige.",
     "install.invalid_lfs_path": "Kan ikke oprette LFS-roden på den angivne sti: %[1]s",
-    "install.lfs_jwt_secret_failed": "Kan ikke generere en LFS JWT-hemmelighed: %[1]s"
+    "alert.range_error": " skal være et tal mellem %[1]s og %[2]s.",
+    "meta.last_line": "Livet er det dejligste eventyr. - (H.C. Andersen)",
+    "mail.actions.not_successful_run_subject": "Arbejdsgangen %[1]s mislykkedes i depotet %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Arbejdsgang %[1]s gendannet i depotet %[2]s",
+    "mail.actions.successful_run_after_failure": "Arbejdsgang %[1]s gendannet i depotet %[2]s",
+    "mail.actions.not_successful_run": "Arbejdsgangen %[1]s mislykkedes i depotet %[2]s",
+    "mail.actions.run_info_cur_status": "Status for denne kørsel: %[1]s (lige opdateret fra %[2]s)",
+    "mail.actions.run_info_previous_status": "Status for forrige kørsel: %[1]s",
+    "mail.actions.run_info_trigger": "Udløst fordi: %[1]s af: %[2]s",
+    "discussion.locked": "Denne diskussion er blevet låst. Kommentarer er begrænset til bidragydere.",
+    "relativetime.now": "nu",
+    "relativetime.future": "i fremtiden",
+    "relativetime.mins": {
+        "one": "%d minut siden",
+        "other": "%d minutter siden"
+    },
+    "relativetime.hours": {
+        "one": "%d time siden",
+        "other": "%d timer siden"
+    },
+    "relativetime.days": {
+        "one": "%d dag siden",
+        "other": "%d dage siden"
+    },
+    "relativetime.months": {
+        "one": "%d måned siden",
+        "other": "%d måneder siden"
+    },
+    "relativetime.1day": "i går",
+    "relativetime.1week": "sidste uge",
+    "relativetime.2weeks": "2 uger siden",
+    "relativetime.2months": "2 måneder siden",
+    "relativetime.1year": "sidste år",
+    "relativetime.weeks": {
+        "one": "%d uge siden",
+        "other": "%d uger siden"
+    },
+    "relativetime.2years": "2 år siden",
+    "relativetime.years": {
+        "one": "%d år siden",
+        "other": "%d år siden"
+    },
+    "relativetime.2days": "2 dage siden",
+    "relativetime.1month": "sidste måned",
+    "repo.form.cannot_create": "Alle områder, hvor du kan oprette depoter, har nået grænsen for antal depoter.",
+    "repo.issue_indexer.title": "Problemindekser",
+    "moderation.report_remarks": "Bemærkninger",
+    "admin.config.moderation_config": "Moderationskonfiguration",
+    "moderation.report_abuse": "Rapportér misbrug",
+    "moderation.report_content": "Rapportér indhold",
+    "moderation.report_abuse_form.header": "Rapportér misbrug til administrator",
+    "moderation.report_abuse_form.details": "Denne formular skal bruges til at rapportere brugere, der opretter spamprofiler, arkiver, problemer, kommentarer eller opfører sig upassende.",
+    "moderation.report_abuse_form.invalid": "Ugyldige argumenter",
+    "moderation.report_abuse_form.already_reported": "Du har allerede rapporteret dette indhold",
+    "moderation.abuse_category": "Kategori",
+    "moderation.abuse_category.placeholder": "Vælg en kategori",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Ulovligt indhold",
+    "moderation.abuse_category.other_violations": "Andre overtrædelser af platformens regler",
+    "moderation.report_remarks.placeholder": "Angiv venligst nogle detaljer vedrørende det misbrug, du anmelder.",
+    "moderation.submit_report": "Indsend rapport",
+    "moderation.reporting_failed": "Den nye misbrugsrapport kunne ikke indsendes: %v",
+    "moderation.reported_thank_you": "Tak for din rapport. Administrationen er blevet gjort opmærksom på den.",
+    "stars.list.none": "Ingen har markeret dette depot med en stjerne.",
+    "watch.list.none": "Ingen ser dette depot.",
+    "followers.incoming.list.self.none": "Ingen følger din profil.",
+    "followers.incoming.list.none": "Ingen følger denne bruger.",
+    "followers.outgoing.list.self.none": "Du følger ikke nogen.",
+    "followers.outgoing.list.none": "%s følger ikke nogen.",
+    "editor.textarea.tab_hint": "Linjen er allerede indrykket. Tryk på <kbd>Tab</kbd> igen eller <kbd>Escape</kbd> for at forlade editoren.",
+    "editor.textarea.shift_tab_hint": "Ingen indrykning på denne linje. Tryk på <kbd>Shift</kbd> + <kbd>Tab</kbd> igen eller <kbd>Escape</kbd> for at forlade editoren.",
+    "admin.dashboard.cleanup_offline_runners": "Ryd op offline runners",
+    "settings.visibility.description": "Profilsynlighed påvirker andres adgang til dine ikke-private depoter. <a href=\"%s\" target=\"_blank\">Læs mere</a>",
+    "avatar.constraints_hint": "Brugerdefineret avatar må ikke overstige %[1]s i størrelse eller være større end %[2]dx%[3]d pixels",
+    "repo.diff.commit.next-short": "Næste",
+    "repo.diff.commit.previous-short": "Forrige",
+    "profile.actions.tooltip": "Flere handlinger",
+    "profile.edit.link": "Redigere profil",
+    "feed.atom.link": "Atom feed",
+    "keys.ssh.link": "SSH Nøgler",
+    "keys.gpg.link": "GPG Nøgler"
 }
diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json
index 82e0b309e2..1b4041074d 100644
--- a/options/locale_next/locale_de-DE.json
+++ b/options/locale_next/locale_de-DE.json
@@ -17,5 +17,112 @@
     "themes.names.forgejo-auto": "Forgejo (folge Systemthema)",
     "themes.names.forgejo-light": "Forgejo hell",
     "themes.names.forgejo-dark": "Forgejo dunkel",
-    "install.invalid_lfs_path": "Der LFS-Root konnte nicht am angegebenen Pfad erstellt werden: %[1]s"
+    "error.not_found.title": "Seite nicht gefunden",
+    "alert.asset_load_failed": "Konnte Asset-Dateien nicht von {path} laden. Bitte stelle sicher, dass auf die Asset-Dateien zugegriffen werden kann.",
+    "install.invalid_lfs_path": "Der LFS-Root konnte nicht am angegebenen Pfad erstellt werden: %[1]s",
+    "alert.range_error": " muss eine Zahl zwischen %[1]s und %[2]s sein.",
+    "meta.last_line": "Vielen Dank für die Übersetzung von Forgejo! Diese Zeile wird von den Benutzern nicht gesehen, dient aber anderen Zwecken im Übersetzungsmanagement. Du kannst eine lustige Tatsache in der Übersetzung platzieren, anstatt sie zu übersetzen.",
+    "mail.actions.successful_run_after_failure_subject": "Arbeitsablauf %[1]s in Repository %[2]s wiederhergestellt",
+    "mail.actions.not_successful_run_subject": "Arbeitsablauf %[1]s in Repository %[2]s fehlgeschlagen",
+    "mail.actions.successful_run_after_failure": "Arbeitsablauf %[1]s in Repository %[2]s wiederhergestellt",
+    "mail.actions.not_successful_run": "Arbeitsablauf %[1]s in Repository %[2]s fehlgeschlagen",
+    "mail.actions.run_info_previous_status": "Vorheriger Status des Runs: %[1]s",
+    "mail.actions.run_info_trigger": "Ausgelöst, weil: %[1]s durch: %[2]s",
+    "mail.actions.run_info_cur_status": "Status dieses Runs: %[1]s (gerade eben von %[2]s aktualisiert)",
+    "discussion.locked": "Diese Diskussion wurde gesperrt. Nur Mitwirkende können kommentieren.",
+    "relativetime.now": "jetzt",
+    "relativetime.hours": {
+        "one": "vor %d Stunde",
+        "other": "vor %d Stunden"
+    },
+    "relativetime.days": {
+        "one": "vor %d Tag",
+        "other": "vor %d Tagen"
+    },
+    "relativetime.months": {
+        "one": "vor %d Monat",
+        "other": "vor %d Monaten"
+    },
+    "relativetime.years": {
+        "one": "vor %d Jahr",
+        "other": "vor %d Jahren"
+    },
+    "relativetime.1week": "letzte Woche",
+    "relativetime.1month": "letzten Monat",
+    "relativetime.2months": "vor zwei Monaten",
+    "relativetime.1year": "letztes Jahr",
+    "relativetime.2years": "vor zwei Jahren",
+    "relativetime.1day": "gestern",
+    "relativetime.weeks": {
+        "one": "vor %d Woche",
+        "other": "vor %d Wochen"
+    },
+    "relativetime.2weeks": "vor zwei Wochen",
+    "relativetime.mins": {
+        "one": "vor %d Minute",
+        "other": "vor %d Minuten"
+    },
+    "relativetime.2days": "vorgestern",
+    "relativetime.future": "in der Zukunft",
+    "admin.config.moderation_config": "Moderations-Konfiguration",
+    "moderation.report_abuse": "Missbrauch melden",
+    "moderation.report_content": "Inhalt melden",
+    "moderation.report_abuse_form.header": "Dem Administrator Missbrauch melden",
+    "moderation.report_abuse_form.details": "Dieses Formular soll genutzt werden um Benutzer zu melden die Spam-Profile, -Repositorys, -Issues, und -Kommentare erstellen, oder sich unangemessen verhalten.",
+    "moderation.report_abuse_form.invalid": "Ungültige Argumente",
+    "moderation.report_abuse_form.already_reported": "Du hast diesen Inhalt bereits gemeldet",
+    "moderation.abuse_category": "Kategorie",
+    "moderation.abuse_category.placeholder": "Eine Kategorie auswählen",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Illegaler Inhalt",
+    "moderation.abuse_category.other_violations": "Andere Verstöße gegen die Plattformregeln",
+    "moderation.report_remarks": "Anmerkungen",
+    "moderation.report_remarks.placeholder": "Bitte stelle Details über den von dir gemeldeten Missbrauch bereit.",
+    "moderation.submit_report": "Meldung absenden",
+    "moderation.reporting_failed": "Kann die neue Missbrauchsmeldung nicht absenden: %v",
+    "moderation.reported_thank_you": "Danke für deine Meldung. Die Administration wurde darüber in Kenntnis gesetzt.",
+    "repo.form.cannot_create": "Alle Orte, wo du Repositorys erstellen kannst, haben die Obergrenze an Repositorys erreicht.",
+    "repo.issue_indexer.title": "Issue-Indexer",
+    "watch.list.none": "Niemand beobachtet dieses Repo.",
+    "followers.incoming.list.self.none": "Niemand folgt deinem Profil.",
+    "followers.outgoing.list.self.none": "Du folgst niemanden.",
+    "followers.outgoing.list.none": "%s folgt niemanden.",
+    "stars.list.none": "Niemand hat dieses Repo favorisiert.",
+    "followers.incoming.list.none": "Niemand folgt diesem Benutzer.",
+    "editor.textarea.tab_hint": "Zeile bereits eingerückt. Drücke nochmals <kbd>Tab</kbd> oder <kbd>Escape</kbd>, um den Editor zu verlassen.",
+    "editor.textarea.shift_tab_hint": "Keine Einrückung auf dieser Zeile. Drücke nochmals <kbd>Shift</kbd> + <kbd>Tab</kbd> oder <kbd>Escape</kbd>, um den Editor zu verlassen.",
+    "admin.dashboard.cleanup_offline_runners": "Aufräumen der Offline-Runner",
+    "settings.visibility.description": "Die Profilsichtbarkeit beeinflusst die Möglichkeit anderer, auf deine nicht-privaten Repositorys zuzugreifen. <a href=\"%s\" target=\"_blank\">Erfahre mehr</a>.",
+    "avatar.constraints_hint": "Individuelles Profilbild darf %[1]s in der Größe nicht überschreiten, und nicht größer als %[2]d×%[3]d Pixel sein",
+    "repo.diff.commit.next-short": "Nächste",
+    "repo.diff.commit.previous-short": "Vorherige",
+    "profile.edit.link": "Profil bearbeiten",
+    "feed.atom.link": "Atom-Feed",
+    "keys.ssh.link": "SSH-Schlüssel",
+    "keys.gpg.link": "GPG-Schlüssel",
+    "profile.actions.tooltip": "Mehr Aktionen",
+    "og.repo.summary_card.alt_description": "Zusammenfassungskarte des Repositorys %[1]s, beschrieben als %[2]s",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "repo.settings.push_mirror.branch_filter.label": "Branch-Filter (optional)",
+    "repo.settings.push_mirror.branch_filter.description": "Zu spiegelnde Branches. Leer lassen, um alle Branches zu spiegeln. Siehe die <a href=\"%[1]s\">„%[2]s“-Dokumentation</a> für die Syntax. Beispiele: <code>main, release/*</code>",
+    "discussion.sidebar.reference": "Referenz",
+    "admin.moderation.deleted_content_ref": "Gemeldeter Inhalt vom Typ %[1]v und ID %[2]d existiert nicht mehr",
+    "admin.moderation.moderation_reports": "Moderationsmeldungen",
+    "admin.moderation.reports": "Meldungen",
+    "admin.moderation.no_open_reports": "Es gibt momentan keine offenen Meldungen.",
+    "admin.dashboard.remove_resolved_reports": "Erledigte Meldungen entfernen",
+    "compare.branches.title": "Branches vergleichen",
+    "repo.commit.load_tags_failed": "Laden von Tags aufgrund eines internen Fehlers fehlgeschlagen",
+    "admin.auths.allow_username_change": "Benutzernamen ändern zulassen",
+    "admin.auths.allow_username_change.description": "Benutzern erlauben, ihren Benutzernamen in den Profileinstellungen zu ändern",
+    "warning.repository.out_of_sync": "Die Datenbankdarstellung dieses Repositorys ist nicht synchronisiert. Falls diese Warnung immer noch angezeigt wird, nachdem ein Commit zu diesem Repository gepusht wurde, kontaktieren Sie den Administrator.",
+    "migrate.pagure.token_body_b": "Stellen Sie sicher, dass das Flag für private Repos oben gesetzt ist, wenn Sie möchten, dass dieses Repo privat ist",
+    "repo.pulls.already_merged": "Zusammenführung fehlgeschlagen. Der Pull-Request wurde bereits zusammengeführt.",
+    "migrate.pagure.incorrect_url": "Falsche Quellrepository-URL wurde angegeben",
+    "migrate.pagure.token_body_a": "Stellen Sie ein Pagure-API-Token mit Zugriff auf die privaten Issues zur Verfügung, um ein Repository mit nur den privaten Issues darin zu erstellen",
+    "migrate.pagure.project_example": "Die URL des Pagure-Projekts, z. B. https://pagure.io/pagure",
+    "migrate.pagure.description": "Daten von pagure.io oder anderen Pagure-Instanzen migrieren.",
+    "migrate.pagure.token_label": "Token",
+    "migrate.pagure.project_url": "Pagure-Projekt-URL"
 }
diff --git a/options/locale_next/locale_el-GR.json b/options/locale_next/locale_el-GR.json
index 3cc62b4a43..cca89efd0e 100644
--- a/options/locale_next/locale_el-GR.json
+++ b/options/locale_next/locale_el-GR.json
@@ -1,11 +1,23 @@
 {
     "repo.pulls.merged_title_desc": {
-        "one": "συγχώνευσε %[1]d υποβολή από τον κλάδο <code>%[2]s</code> στον κλάδο <code>%[3]s</code> %[4]s",
+        "one": "συγχώνευθηκε %[1]d υποβολή από τον κλάδο <code>%[2]s</code> στον κλάδο <code>%[3]s</code> %[4]s",
         "other": "συγχώνευσε %[1]d υποβολές από <code>%[2]s</code> σε <code>%[3]s</code> %[4]s"
     },
     "repo.pulls.title_desc": {
         "one": ": θα ήθελε να συγχωνεύσει %[1]d υποβολή από τον κλάδο <code>%[2]s</code> στον κλάδο <code id=\"%[4]s\">%[3]s</code>",
         "other": "θέλει να συγχωνεύσει %[1]d υποβολές από <code>%[2]s</code> σε <code id=\"%[4]s\">%[3]s</code>"
     },
-    "search.milestone_kind": "Αναζήτηση ορόσημων..."
+    "search.milestone_kind": "Αναζήτηση ορόσημων...",
+    "home.welcome.no_activity": "Καμιά δραστηριότητα",
+    "mail.actions.successful_run_after_failure_subject": "Η ροή εργασίας %[1]s αποκαταστάθηκε στο αποθετήριο  %[2]s",
+    "mail.actions.not_successful_run_subject": "Η ροή εργασίας %[1]s απέτυχε στο αποθετήριο %[2]s",
+    "mail.actions.run_info_trigger": "Ενεργοποιήθηκε επειδή: %[1]s από: %[2]s",
+    "meta.last_line": "Ευχαριστούμε που μεταφράζετε το Forgejo! Αυτή η γραμμή δεν είναι ορατή από τους χρήστες αλλά εξυπηρετεί άλλους σκοπούς στη διαχείριση της μετάφρασης. Μπορείτε να γράψετε κάποιο αστείο αντί για μετάφραση.",
+    "mail.actions.successful_run_after_failure": "Η ροή εργασίας %[1]s αποκαταστάθηκε στο αποθετήριο %[2]s",
+    "discussion.locked": "Αυτή η συζήτηση έχει κλειδωθεί. Ο σχολιασμός περιορίζεται στους συνεισφέροντες.",
+    "incorrect_root_url": "Αυτή η εγκατάσταση  του Forgejo έχει ρυθμιστεί στο \"%s\". Αυτή τη στιγμή βλέπετε το Forgejo μέσω ενός διαφορετικού URL, το οποίο μπορεί να προκαλέσει δυσλειτουργία σε τμήματα της εφαρμογής. Το κανονικό URL ελέγχεται από τους διαχειριστές του Forgejo με τη ρύθμιση ROOT_URL στο αρχείο app.ini.",
+    "home.explore_orgs": "Εξερευνήστε οργανισμούς",
+    "home.welcome.activity_hint": "Δεν υπάρχει τίποτα στην τροφοδοσία σας ακόμα. Οι ενέργειές σας και η δραστηριότητά σας από τα αποθετήρια που παρακολουθείτε θα εμφανίζονται εδώ.",
+    "home.explore_repos": "Εξερευνήστε τα αποθετήρια",
+    "home.explore_users": "Εξερευνήστε τους χρήστες"
 }
diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json
index 4f3c65a68f..24c0835256 100644
--- a/options/locale_next/locale_en-US.json
+++ b/options/locale_next/locale_en-US.json
@@ -4,6 +4,47 @@
     "home.explore_repos": "Explore repositories",
     "home.explore_users": "Explore users",
     "home.explore_orgs": "Explore organizations",
+    "stars.list.none": "No one starred this repo.",
+    "watch.list.none": "No one is watching this repo.",
+    "followers.incoming.list.self.none": "No one is following your profile.",
+    "followers.incoming.list.none": "No one is following this user.",
+    "followers.outgoing.list.self.none": "You are not following anyone.",
+    "followers.outgoing.list.none": "%s isn't following anyone.",
+    "relativetime.now": "now",
+    "relativetime.future": "in future",
+    "relativetime.mins": {
+        "one": "%d minute ago",
+        "other": "%d minutes ago"
+    },
+    "relativetime.hours": {
+        "one": "%d hour ago",
+        "other": "%d hours ago"
+    },
+    "relativetime.days": {
+        "one": "%d day ago",
+        "other": "%d days ago"
+    },
+    "relativetime.weeks": {
+        "one": "%d week ago",
+        "other": "%d weeks ago"
+    },
+    "relativetime.months": {
+        "one": "%d month ago",
+        "other": "%d months ago"
+    },
+    "relativetime.years": {
+        "one": "%d year ago",
+        "other": "%d years ago"
+    },
+    "relativetime.1day": "yesterday",
+    "relativetime.2days": "two days ago",
+    "relativetime.1week": "last week",
+    "relativetime.2weeks": "two weeks ago",
+    "relativetime.1month": "last month",
+    "relativetime.2months": "two months ago",
+    "relativetime.1year": "last year",
+    "relativetime.2years": "two years ago",
+    "repo.pulls.already_merged": "Merge failed: This pull request has already been merged.",
     "repo.pulls.merged_title_desc": {
         "one": "merged %[1]d commit from <code>%[2]s</code> into <code>%[3]s</code> %[4]s",
         "other": "merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s"
@@ -12,12 +53,86 @@
         "one": "wants to merge %[1]d commit from <code>%[2]s</code> into <code id=\"%[4]s\">%[3]s</code>",
         "other": "wants to merge %[1]d commits from <code>%[2]s</code> into <code id=\"%[4]s\">%[3]s</code>"
     },
+    "repo.form.cannot_create": "All spaces in which you can create repositories have reached the limit of repositories.",
+    "repo.issue_indexer.title": "Issue Indexer",
     "search.milestone_kind": "Search milestones…",
+    "repo.settings.push_mirror.branch_filter.label": "Branch filter (optional)",
+    "repo.settings.push_mirror.branch_filter.description": "Branches to be mirrored. Leave blank to mirror all branches. See <a href=\"%[1]s\">%[2]s documentation</a> for syntax. Examples: <code>main, release/*</code>",
     "incorrect_root_url": "This Forgejo instance is configured to be served on \"%s\". You are currently viewing Forgejo through a different URL, which may cause parts of the application to break. The canonical URL is controlled by Forgejo admins via the ROOT_URL setting in the app.ini.",
     "themes.names.forgejo-auto": "Forgejo (follow system theme)",
     "themes.names.forgejo-light": "Forgejo light",
     "themes.names.forgejo-dark": "Forgejo dark",
-    "settings.adopt": "Adopt",
+    "error.not_found.title": "Page not found",
+    "warning.repository.out_of_sync": "The database representation of this repository is out of synchronization. If this warning is still shown after pushing a commit to this repository contact the administrator.",
+    "alert.asset_load_failed": "Failed to load asset files from {path}. Please make sure the asset files can be accessed.",
+    "alert.range_error": " must be a number between %[1]s and %[2]s.",
     "install.invalid_lfs_path": "Unable to create the LFS root at the specified path: %[1]s",
-    "install.lfs_jwt_secret_failed": "Unable to generate a LFS JWT secret: %[1]s"
+    "profile.actions.tooltip": "More actions",
+    "profile.edit.link": "Edit profile",
+    "feed.atom.link": "Atom feed",
+    "keys.ssh.link": "SSH keys",
+    "keys.gpg.link": "GPG keys",
+    "admin.config.moderation_config": "Moderation configuration",
+    "admin.moderation.moderation_reports": "Moderation reports",
+    "admin.moderation.reports": "Reports",
+    "admin.moderation.no_open_reports": "There are currently no open reports.",
+    "admin.moderation.deleted_content_ref": "Reported content with type %[1]v and id %[2]d no longer exists",
+    "moderation.report_abuse": "Report abuse",
+    "moderation.report_content": "Report content",
+    "moderation.report_abuse_form.header": "Report abuse to administrator",
+    "moderation.report_abuse_form.details": "This form should be used to report users who create spam profiles, repositories, issues, comments or behave inappropriately.",
+    "moderation.report_abuse_form.invalid": "Invalid arguments",
+    "moderation.report_abuse_form.already_reported": "You've already reported this content",
+    "moderation.abuse_category": "Category",
+    "moderation.abuse_category.placeholder": "Select a category",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Illegal content",
+    "moderation.abuse_category.other_violations": "Other violations of platform rules",
+    "moderation.report_remarks": "Remarks",
+    "moderation.report_remarks.placeholder": "Please provide some details regarding the abuse you are reporting.",
+    "moderation.submit_report": "Submit report",
+    "moderation.reporting_failed": "Unable to submit the new abuse report: %v",
+    "moderation.reported_thank_you": "Thank you for your report. The administration has been made aware of it.",
+    "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s recovered in repository %[2]s",
+    "mail.actions.not_successful_run_subject": "Workflow %[1]s failed in repository %[2]s",
+    "mail.actions.successful_run_after_failure": "Workflow %[1]s recovered in repository %[2]s",
+    "mail.actions.not_successful_run": "Workflow %[1]s failed in repository %[2]s",
+    "mail.actions.run_info_cur_status": "This Run's Status: %[1]s (just updated from %[2]s)",
+    "mail.actions.run_info_previous_status": "Previous Run's Status: %[1]s",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "mail.actions.run_info_trigger": "Triggered because: %[1]s by: %[2]s",
+    "repo.diff.commit.next-short": "Next",
+    "repo.diff.commit.previous-short": "Prev",
+    "discussion.locked": "This discussion has been locked. Commenting is limited to contributors.",
+    "discussion.sidebar.reference": "Reference",
+    "editor.textarea.tab_hint": "Line already indented. Press <kbd>Tab</kbd> again or <kbd>Escape</kbd> to leave the editor.",
+    "editor.textarea.shift_tab_hint": "No indentation on this line. Press <kbd>Shift</kbd> + <kbd>Tab</kbd> again or <kbd>Escape</kbd> to leave the editor.",
+    "admin.auths.allow_username_change": "Allow username change",
+    "admin.auths.allow_username_change.description": "Allow users to change their username in the profile settings",
+    "admin.dashboard.cleanup_offline_runners": "Cleanup offline runners",
+    "admin.dashboard.remove_resolved_reports": "Remove resolved reports",
+    "admin.config.security": "Security configuration",
+    "admin.config.global_2fa_requirement.title": "Global two-factor requirement",
+    "admin.config.global_2fa_requirement.none": "No",
+    "admin.config.global_2fa_requirement.all": "All users",
+    "admin.config.global_2fa_requirement.admin": "Administrators",
+    "settings.visibility.description": "Profile visibility affects others' ability to access your non-private repositories. <a href=\"%s\" target=\"_blank\">Learn more</a>.",
+    "settings.twofa_unroll_unavailable": "Two-factor authentication is required for your account and cannot be disabled.",
+    "settings.twofa_reenroll": "Re-enroll two-factor authentication",
+    "settings.twofa_reenroll.description": "Re-enroll your two-factor authentication",
+    "settings.must_enable_2fa": "This Forgejo instance requires users to enable two-factor authentication before they can access their accounts.",
+    "error.must_enable_2fa": "This Forgejo instance requires users to enable two-factor authentication before they can access their accounts. Enable it at: %s",
+    "avatar.constraints_hint": "Custom avatar may not exceed %[1]s in size or be larger than %[2]dx%[3]d pixels",
+    "og.repo.summary_card.alt_description": "Summary card of repository %[1]s, described as: %[2]s",
+    "repo.commit.load_tags_failed": "Load tags failed because of internal error",
+    "compare.branches.title": "Compare branches",
+    "migrate.pagure.description": "Migrate data from pagure.io or other Pagure instances.",
+    "migrate.pagure.incorrect_url": "Incorrect source repository URL has been provided",
+    "migrate.pagure.project_url": "Pagure project URL",
+    "migrate.pagure.project_example": "The Pagure project url, e.g. https://pagure.io/pagure",
+    "migrate.pagure.token_label": "Token",
+    "migrate.pagure.token_body_a": "Provide a Pagure API token with access to the private issues to create a repository with just the private issues in it",
+    "migrate.pagure.token_body_b": "Be sure to set the private repo flag above if you want this repo to be private",
+    "meta.last_line": "Thank you for translating Forgejo! This line isn't seen by the users but it serves other purposes in the translation management. You can place a fun fact in the translation instead of translating it."
 }
diff --git a/options/locale_next/locale_es-ES.json b/options/locale_next/locale_es-ES.json
index 57753089ca..82fbcfb4b6 100644
--- a/options/locale_next/locale_es-ES.json
+++ b/options/locale_next/locale_es-ES.json
@@ -1,17 +1,35 @@
 {
     "repo.pulls.merged_title_desc": {
-        "one": "fusionó %[1]d commit de <code>%[2]s</code> en <code>%[3]s</code> %[4]s",
-        "many": "fusionó %[1]d commits de <code>%[2]s</code> en <code>%[3]s</code> %[4]s",
-        "other": ""
+        "one": "fusionó %[1]d confirmación de <code>%[2]s</code> en <code>%[3]s</code> %[4]s",
+        "many": "fusionó %[1]d confirmaciones de <code>%[2]s</code> en <code>%[3]s</code> %[4]s",
+        "other": "fusionó %[1]d confirmaciones de <code>%[2]s</code> en <code>%[3]s</code> %[4]s"
     },
     "repo.pulls.title_desc": {
-        "one": "quiere fusionar %[1]d commit de <code>%[2]s</code> en <code id=\"%[4]s\">%[3]s</code>",
-        "many": "quiere fusionar %[1]d commits de <code>%[2]s</code> en <code id=\"%[4]s\">%[3]s</code>",
-        "other": ""
+        "one": "quiere fusionar %[1]d confirmación de <code>%[2]s</code> en <code id=\"%[4]s\">%[3]s</code>",
+        "many": "quiere fusionar %[1]d confirmaciones de <code>%[2]s</code> en <code id=\"%[4]s\">%[3]s</code>",
+        "other": "quiere fusionar %[1]d confirmaciones de <code>%[2]s</code> en <code id=\"%[4]s\">%[3]s</code>"
     },
     "search.milestone_kind": "Buscar hitos…",
-    "home.welcome.no_activity": "Sin actividad",
+    "error.not_found.title": "Página no encontrada",
     "themes.names.forgejo-auto": "Forgejo (seguir el tema del sistema)",
+    "themes.names.forgejo-dark": "Forgejo oscuro",
     "themes.names.forgejo-light": "Forgejo claro",
-    "themes.names.forgejo-dark": "Forgejo oscuro"
+    "home.welcome.no_activity": "Sin actividad",
+    "meta.last_line": "¡Gracias por traducir Forgejo! Esta línea no es vista por los usuarios pero sirve para otros propósitos en la gestión de la traducción. Puedes colocar un dato curioso en la traducción en lugar de traducirla.",
+    "relativetime.now": "ahora",
+    "relativetime.mins": {
+        "one": "hace %d minuto",
+        "many": "hace %d minutos",
+        "other": "hace %d minutos"
+    },
+    "relativetime.hours": {
+        "one": "hace %d hora",
+        "many": "hace %d horas",
+        "other": "hace %d horas"
+    },
+    "relativetime.future": "en el futuro",
+    "home.explore_repos": "Explorar repositorios",
+    "home.explore_users": "Explorar usuarios",
+    "home.explore_orgs": "Explorar organizaciones",
+    "moderation.abuse_category.malware": "Malware"
 }
diff --git a/options/locale_next/locale_et.json b/options/locale_next/locale_et.json
index a10447fa98..768d6e2eea 100644
--- a/options/locale_next/locale_et.json
+++ b/options/locale_next/locale_et.json
@@ -1,3 +1,58 @@
 {
-    "search.milestone_kind": "Otsi verstapostid..."
+    "search.milestone_kind": "Otsi verstaposte…",
+    "relativetime.2years": "kaks aastat tagasi",
+    "error.not_found.title": "Lehte ei leidu",
+    "themes.names.forgejo-light": "Forgejo hele kujundus",
+    "themes.names.forgejo-dark": "Forgejo tume kujundus",
+    "themes.names.forgejo-auto": "Forgejo (süsteemi kujundus)",
+    "relativetime.2days": "kaks päeva tagasi",
+    "relativetime.1week": "eelmisel nädalal",
+    "relativetime.2weeks": "kaks nädalat tagasi",
+    "relativetime.1month": "eelmisel kuul",
+    "relativetime.2months": "kaks kuud tagasi",
+    "relativetime.months": {
+        "one": "%d kuu tagasi",
+        "other": "%d kuud tagasi"
+    },
+    "relativetime.weeks": {
+        "one": "% nädal tagasi",
+        "other": "% nädalat tagasi"
+    },
+    "relativetime.years": {
+        "one": "%d aasta tagasi",
+        "other": "%d aastat tagasi"
+    },
+    "relativetime.mins": {
+        "one": "%d minut tagasi",
+        "other": "%d minutit tagasi"
+    },
+    "relativetime.hours": {
+        "one": "%d tund tagasi",
+        "other": "%d tundi tagasi"
+    },
+    "relativetime.days": {
+        "one": "% päev tagasi",
+        "other": "% päeva tagasi"
+    },
+    "relativetime.1day": "eile",
+    "relativetime.1year": "eelmisel aastal",
+    "relativetime.now": "praegu",
+    "relativetime.future": "tulevikus",
+    "stars.list.none": "Keegi pole seda koodihoidlat veel tähekeega märgistanud.",
+    "watch.list.none": "Keegi pole seda koodihoidlat veel jälgima asunud.",
+    "followers.incoming.list.self.none": "Mitte keegi ei jälgi sinu kasutajaprofiili.",
+    "followers.incoming.list.none": "Mitte keegi ei jälgi seda kasutajat.",
+    "followers.outgoing.list.self.none": "Sina ei jälgi mitte kedagi.",
+    "followers.outgoing.list.none": "%s ei jälgi mitte kedagi.",
+    "alert.range_error": " peab olema number %[1]s ja %[2]s vahel.",
+    "home.welcome.no_activity": "Hetkel on siin tühjus",
+    "home.explore_repos": "Uuri lähtekoodi hoidlaid",
+    "home.explore_users": "Otsi kasutajaid",
+    "home.explore_orgs": "Tutvu organisatsioonidega",
+    "meta.last_line": "Tänud, et oled Forgejo'd tõlkinud! Work hard and put in the effort, and love will come. (Tee tööd ja näe vaeva, siis tuleb armastus - A. H. Tammsaare)",
+    "keys.ssh.link": "SSH võtmed",
+    "keys.gpg.link": "GPG võtmed",
+    "profile.edit.link": "Muuda profiili",
+    "feed.atom.link": "Atom-uudisvoog",
+    "home.welcome.activity_hint": "Sinu uudisvoos ei leidu veel mitte midagi. Kui toimetad midagi sinu jälgitavates lähtekoodihoidlates, siis sinu tegevused ja aktiivsus on siin näha."
 }
diff --git a/options/locale_next/locale_fi-FI.json b/options/locale_next/locale_fi-FI.json
index 324ca5e6b3..fdc740b978 100644
--- a/options/locale_next/locale_fi-FI.json
+++ b/options/locale_next/locale_fi-FI.json
@@ -1,15 +1,68 @@
 {
-    "repo.pulls.merged_title_desc": "yhdistetty %[1]d committia lähteestä <code>%[2]s</code> kohteeseen <code>%[3]s</code> %[4]s",
-    "repo.pulls.title_desc": "haluaa yhdistää %[1]d committia lähteestä <code>%[2]s</code> kohteeseen <code id=\"%[4]s\">%[3]s</code>",
+    "repo.pulls.merged_title_desc": {
+        "one": "yhdistetty %[1]d sitoumus <code>%[2]s</code>:sta kohteeseen <code>%[3]s</code> %[4]s",
+        "other": "yhdistetty %[1]d sitoumusta <code>%[2]s</code>:sta kohteeseen <code>%[3]s</code> %[4]s"
+    },
+    "repo.pulls.title_desc": {
+        "one": "haluaa yhdistää %[1]d sitoumus <code>%[2]s</code>:sta kohteeseen <code id=\"%[4]s\">%[3]s</code>",
+        "other": "haluaa yhdistää %[1]d sitoumusta <code>%[2]s</code>:sta kohteeseen <code id=\"%[4]s\">%[3]s</code>"
+    },
     "search.milestone_kind": "Etsi merkkipaaluja…",
     "home.welcome.no_activity": "Ei toimintaa",
     "incorrect_root_url": "Tämä Forgejo-instanssi on määritetty toimimaan osoitteessa \"%s\". Tarkastelet tällä hetkellä Forgejoa eri URL-osoitteen kautta, mikä saattaa aiheuttaa sovelluksen osien toimimattomuutta. Virallinen URL-osoite on Forgejo-ylläpitäjien hallinnoima ROOT_URL-asetus app.ini -tiedostossa.",
     "themes.names.forgejo-auto": "Forgejo (käyttöjärjestelmän määrittelemä teema)",
-    "home.welcome.activity_hint": "Syötteelläsi ei ole vielä mitään. Toimintasi ja toiminta repositorioissa joita seuraat ilmaantuu tälle sivulle.",
-    "home.explore_repos": "Tutki repositorioita",
+    "home.welcome.activity_hint": "Syötteelläsi ei ole vielä mitään. Toimenpiteesi ja toimintasi tietovarastoissa, joita seuraat ilmaantuvat tälle sivulle.",
+    "home.explore_repos": "Tutustu tietovarastoihin",
     "home.explore_users": "Tutki käyttäjiä",
     "home.explore_orgs": "Tutki organisaatioita",
+    "error.not_found.title": "Sivua ei löytynyt",
     "themes.names.forgejo-light": "Forgejo, vaalea",
     "themes.names.forgejo-dark": "Forgejo, tumma",
-    "install.invalid_lfs_path": "LFS juurta ei voitu luoda polkuun: %[1]s"
+    "alert.range_error": " täytyy olla numero välillä %[1]s ja %[2]s.",
+    "alert.asset_load_failed": "Staattisen tiedoston lataus kohteesta {path} epäonnistui. Varmista, että staattisiin tiedostoihin pääsee käsiksi.",
+    "install.invalid_lfs_path": "LFS-juurta ei voitu luoda polkuun: %[1]s",
+    "mail.actions.not_successful_run_subject": "Työnkulku %[1]s epäonnistui tietovarastossa %[2]s",
+    "mail.actions.not_successful_run": "Työnkulku %[1]s epäonnistui tietovarastossa %[2]s",
+    "discussion.locked": "Tämä keskustelu on lukittu. Kommentointi on rajoitettu avustajille.",
+    "relativetime.future": "tulevaisuudessa",
+    "relativetime.days": {
+        "one": "%d päivä sitten",
+        "other": "%d päivää sitten"
+    },
+    "relativetime.months": {
+        "one": "%d kuukausi sitten",
+        "other": "%d kuukautta sitten"
+    },
+    "relativetime.years": {
+        "one": "%d vuosi sitten",
+        "other": "%d vuotta sitten"
+    },
+    "relativetime.1day": "eilen",
+    "relativetime.2days": "kaksi päivää sitten",
+    "relativetime.1week": "viime viikolla",
+    "relativetime.2weeks": "kaksi viikkoa sitten",
+    "relativetime.1year": "viime vuonna",
+    "relativetime.2years": "kaksi vuotta sitten",
+    "relativetime.hours": {
+        "one": "%d tunti sitten",
+        "other": "%d tuntia sitten"
+    },
+    "relativetime.mins": {
+        "one": "%d minuutti sitten",
+        "other": "%d minuuttia sitten"
+    },
+    "relativetime.1month": "viime kuussa",
+    "relativetime.now": "nyt",
+    "relativetime.weeks": {
+        "one": "%d viikko sitten",
+        "other": "%d viikkoa sitten"
+    },
+    "meta.last_line": "Thank you for translating Forgejo! Päivitä tämä käännös, jos luet tämän viestin.",
+    "relativetime.2months": "kaksi kuukautta sitten",
+    "mail.actions.successful_run_after_failure_subject": "Työnkulku %[1]s palautettu tietovarastoon %[2]s",
+    "mail.actions.successful_run_after_failure": "Työnkulku %[1]s palautettu tietovarastoon %[2]s",
+    "mail.actions.run_info_cur_status": "Tämän juoksun tila: %[1]s (juuri päivitetty %[2]s:sta)",
+    "mail.actions.run_info_previous_status": "Edellisen ajon tila: %[1]s",
+    "mail.actions.run_info_trigger": "Laukaistui, koska: %[1]s, tekijänä: %[2]s",
+    "moderation.abuse_category.malware": "Haittaohjelma"
 }
diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json
index 578c0f480b..a36c0b48f0 100644
--- a/options/locale_next/locale_fil.json
+++ b/options/locale_next/locale_fil.json
@@ -1,6 +1,6 @@
 {
     "repo.pulls.merged_title_desc": {
-        "one": "isinali ang %[1]d commit mula<code>%[2]s</code> patungong <code>%[3]s</code> %[4]s",
+        "one": "isinali ang %[1]d commit mula <code>%[2]s</code> patungong <code>%[3]s</code> %[4]s",
         "other": "isinali ang %[1]d mga commit mula sa <code>%[2]s</code> patungong <code>%[3]s</code> %[4]s"
     },
     "repo.pulls.title_desc": {
@@ -17,5 +17,112 @@
     "home.explore_repos": "Tuklasin ang mga repositoryo",
     "home.explore_users": "Tuklasin ang mga user",
     "home.explore_orgs": "Tuklasin ang mga organisasyon",
-    "install.invalid_lfs_path": "Nabigong gawin ang LFS root sa tinakdang path: %[1]s"
+    "error.not_found.title": "Hindi nahanap ang pahina",
+    "alert.asset_load_failed": "Nabigong i-load ang mga asset file mula sa {path}. Siguraduhin na maa-access ang mga asset file.",
+    "install.invalid_lfs_path": "Nabigong gawin ang LFS root sa tinakdang path: %[1]s",
+    "alert.range_error": " dapat ay numero sa pagitan ng %[1]s at %[2]s.",
+    "meta.last_line": "Every day, I imagine a future where I can be with you. In my hand is a pen that will write a poem of me and you. The ink flows down into a dark puddle... Just move your hand, write the way into his heart. But in this world of infinite choices, what will it take just to find that special day? Have I found everybody a fun assignment to do today? When you're here, everything that we do is fun for them anyway... When I can't even read my own feelings, what good are words when a smile says it all? And if this world won't write me an ending, what will it take just for me to have it all? Does my pen only write bitter words for those who are dear to me? Is it love if I take you, or is it love if I set you free? The ink flows down into a dark puddle... How can I write love into reality? If I can't hear the sound of your heartbeat, what do you call love in your reality? And in your reality, if I don't know how to love you... I'll leave you be.",
+    "mail.actions.successful_run_after_failure": "Na-recover ang workflow na %[1]s sa repositoryong %[2]s",
+    "mail.actions.not_successful_run": "Nabigo ang workflow na %[1]s sa repositoryong %[2]s",
+    "mail.actions.run_info_previous_status": "Nakaraang Status ng Run: %[1]s",
+    "mail.actions.run_info_trigger": "Na-trigger dahil: %[1]s ni/ng: %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Na-recover ang workflow na %[1]s sa repositoryong %[2]s",
+    "mail.actions.not_successful_run_subject": "Nabigo ang workflow na %[1]s sa repositoryong %[2]s",
+    "mail.actions.run_info_cur_status": "Status ng Run na Ito: %[1]s (na-update lang mula sa %[2]s)",
+    "relativetime.now": "ngayon",
+    "relativetime.mins": {
+        "one": "%d minuto ang nakalipas",
+        "other": "%d (na) minuto ang nakalipas"
+    },
+    "relativetime.days": {
+        "one": "%d araw ang nakalipas",
+        "other": "%d (na) araw ang nakalipas"
+    },
+    "relativetime.weeks": {
+        "one": "%d linggo ang nakalipas",
+        "other": "%d (na) linggo ang nakalipas"
+    },
+    "relativetime.years": {
+        "one": "%d taon ang nakalipas",
+        "other": "%d (na) taon ang nakalipas"
+    },
+    "relativetime.2days": "2 araw ang nakalipas",
+    "relativetime.2weeks": "2 linggo ang nakalipas",
+    "relativetime.2months": "2 buwan ang nakalipas",
+    "relativetime.1week": "nakaraang linggo",
+    "relativetime.future": "sa kinabukasan",
+    "relativetime.2years": "2 taon ang nakalipas",
+    "relativetime.1day": "kahapon",
+    "relativetime.hours": {
+        "one": "%d kras ang nakalipas",
+        "other": "%d (na) oras ang nakalipas"
+    },
+    "relativetime.months": {
+        "one": "%d buwan ang nakalipas",
+        "other": "%d (na) buwan ang nakalipas"
+    },
+    "discussion.locked": "Naka-kandado ang pag-uusap na ito. Nilimitahan ang pagkomento sa mga tagatulong.",
+    "relativetime.1month": "nakaraang buwan",
+    "relativetime.1year": "nakaraang taon",
+    "moderation.report_abuse_form.details": "Dapat gamitin ang form na ito upang mag-ulat ng mga user na gumagawa ng mga spam na profile, repositoryo, isyu, komento, o kumikilos nang hindi naaangkop.",
+    "admin.config.moderation_config": "Pagsasaayos ng Moderation",
+    "moderation.report_abuse": "Mag-ulat ng pang aabuso",
+    "moderation.report_content": "Iulat ng nilalaman",
+    "moderation.report_abuse_form.header": "Mag-ulat ng pang aabuso sa tagapangasiwa",
+    "moderation.report_abuse_form.invalid": "Hindi wasto ang mga argumento",
+    "moderation.report_abuse_form.already_reported": "Inulat mo na ang nilalaman na ito",
+    "moderation.abuse_category": "Kategorya",
+    "moderation.abuse_category.placeholder": "Pumili ng kategorya",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Ilegal na nilalaman",
+    "moderation.abuse_category.other_violations": "Mga ibang paglabag sa mga patakaran ng platform",
+    "moderation.report_remarks": "Mga pahayag",
+    "moderation.report_remarks.placeholder": "Mangyaring magbigay ng mga detalye tungkol sa pang aabuso na inuulat mo.",
+    "moderation.submit_report": "I-submit ang ulat",
+    "moderation.reporting_failed": "Hindi ma-submit ang bagong ulat sa pang aabuso: %v",
+    "moderation.reported_thank_you": "Salamat sa iyong ulat. Naipaalam na ito sa administrasyon.",
+    "repo.form.cannot_create": "Naabot na ng lahat ng mga espasyo kung saan ka makakagawa ng mga repositoryo ang limitasyon ng mga repositoryo.",
+    "stars.list.none": "Wala pang nag-star ng repositoryong ito.",
+    "followers.incoming.list.self.none": "Walang sumusubaybay sa iyong profile.",
+    "repo.issue_indexer.title": "Indexer ng Isyu",
+    "watch.list.none": "Wala pang nanonood sa repositoryong ito.",
+    "followers.incoming.list.none": "Wala pang sumusunod sa user na ito.",
+    "followers.outgoing.list.self.none": "Hindi ka sumusunod ng anumang tao.",
+    "followers.outgoing.list.none": "Hindi sinusundan ni %s ang sinuman.",
+    "editor.textarea.tab_hint": "Naka-indent na ang linya. Pindutin ulit ang <kbd>Tab</kbd> o <kbd>Escape</kbd> para umalis sa editor.",
+    "editor.textarea.shift_tab_hint": "Walang indentation sa linyang ito. Pindutin ang <kbd>Shift</kbd> + <kbd>Tab</kbd> ulit o <kbd>Escape</kbd> para umalis sa editor.",
+    "admin.dashboard.cleanup_offline_runners": "Linisin ang mga offline na runner",
+    "settings.visibility.description": "Maaapektuhan ng visibility ng profile ang kakayahan ng iba na i-access ang iyong mga hindi pribadong repositoryo. <a href=\"%s\" target=\"_blank\">Matuto pa</a>.",
+    "avatar.constraints_hint": "Hindi maaaring lumagpas sa laking %[1]s o mas malaki sa %[2]dx%[3]d pixel ang custom na avatar",
+    "repo.diff.commit.next-short": "Susunod",
+    "repo.diff.commit.previous-short": "Nakaraan",
+    "profile.edit.link": "I-edit ang profile",
+    "feed.atom.link": "Atom feed",
+    "keys.ssh.link": "Mga SSH key",
+    "keys.gpg.link": "Mga GPG key",
+    "profile.actions.tooltip": "Higit pang mga aksyon",
+    "og.repo.summary_card.alt_description": "Card ng pangkalahatang ideya ng repositoryong %[1]s, inilalarawan bilang: %[2]s",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "repo.settings.push_mirror.branch_filter.label": "Filter ng branch (opsyonal)",
+    "repo.settings.push_mirror.branch_filter.description": "Mga branch na imi-mirror. Iwanang walang laman para i-mirror ang lahat ng mga branch. Tignan ang <a href=\"%[1]s\">dokumentasyon ng %[2]s</a> para sa syntax. Halimbawa: <code>main, your-reality, release/*</code>",
+    "discussion.sidebar.reference": "Sangguni",
+    "admin.moderation.moderation_reports": "Mga ulat sa moderation",
+    "admin.moderation.no_open_reports": "Kasalukuyang walang mga nakabukas na ulat.",
+    "admin.moderation.reports": "Mga ulat",
+    "admin.moderation.deleted_content_ref": "Hindi na umiiral ang inulat na nilalaman na may uri na %[1]v at ID %[2]d",
+    "admin.dashboard.remove_resolved_reports": "Tanggalin ang mga naresolbang ulat",
+    "compare.branches.title": "Ikumpara ang mga branch",
+    "repo.commit.load_tags_failed": "Nabigo ang pag-load ng mga tag dahil sa isang panloob na error",
+    "admin.auths.allow_username_change": "Payagan ang pagpalit ng username",
+    "admin.auths.allow_username_change.description": "Payagan ang mga user na palitan ang kanilang username sa mga setting ng profile",
+    "warning.repository.out_of_sync": "Wala sa pag-sync ang database na representasyon ng repositoryong ito. Kung pinapakita pa rin ang babala na ito pagkagapos magtulak ng commit sa repositoryong ito, makipagugnayan sa tagapangasiwa.",
+    "repo.pulls.already_merged": "Nabigo ang pagsasama: Naisama na ang hiling sa paghila na ito.",
+    "migrate.pagure.incorrect_url": "Maling pinagmulang URL ng repositoryo ang ibinigay",
+    "migrate.pagure.project_url": "URL ng Pagure na proyekto",
+    "migrate.pagure.token_label": "Token",
+    "migrate.pagure.token_body_a": "Magbigay ng Pagure API token na may access sa mga pribadong isyu para gumawa ng repositoryo na may mga pribadong isyu lang",
+    "migrate.pagure.project_example": "Ang URL ng Pagure na proyekto, hal. https://pagure.io/pagure",
+    "migrate.pagure.token_body_b": "Siguraduhin na itakda ang pribadong repositoryo na flag sa itaas kung gusto mo na pribado ang repositoryong ito",
+    "migrate.pagure.description": "Mag-migrate ng data mula sa pagure.io o sa ibang mga Pagure na instansya."
 }
diff --git a/options/locale_next/locale_fr-FR.json b/options/locale_next/locale_fr-FR.json
index 8575e6d55f..9c2af655a0 100644
--- a/options/locale_next/locale_fr-FR.json
+++ b/options/locale_next/locale_fr-FR.json
@@ -6,8 +6,113 @@
     },
     "repo.pulls.title_desc": {
         "one": "veut fusionner %[1]d commit depuis <code>%[2]s</code> vers <code id=\"%[4]s\">%[3]s</code>",
-        "many": "souhaite fusionner %[1]d révision(s) depuis <code>%[2]s</code> vers <code id=\"%[4]s\">%[3]s</code>",
+        "many": "veut fusionner %[1]d commits depuis <code>%[2]s</code> vers <code id=\"%[4]s\">%[3]s</code>",
         "other": ""
     },
-    "search.milestone_kind": "Recherche dans les jalons..."
+    "search.milestone_kind": "Recherche dans les jalons…",
+    "discussion.locked": "Cette discussion a été bloqué. Les commentaires sont limités aux contributeurs.",
+    "relativetime.now": "maintenant",
+    "relativetime.future": "dans le future",
+    "relativetime.mins": {
+        "one": "il y a %d minute",
+        "many": "il y a %d minutes",
+        "other": "il y a %d minutes"
+    },
+    "relativetime.hours": {
+        "one": "il y a %d heure",
+        "many": "il y a %d heures",
+        "other": "il y a %d heures"
+    },
+    "relativetime.days": {
+        "one": "il y a %d jour",
+        "many": "il y a %d jours",
+        "other": "il y a %d jours"
+    },
+    "relativetime.months": {
+        "one": "il y a %d mois",
+        "many": "il y a %d mois",
+        "other": "il y a %d mois"
+    },
+    "relativetime.years": {
+        "one": "il y a %d an",
+        "many": "il y a %d ans",
+        "other": "il y a %d ans"
+    },
+    "relativetime.1day": "hier",
+    "relativetime.2days": "il y a 2 jours",
+    "relativetime.1week": "la semaine dernière",
+    "relativetime.2weeks": "il y a 2 semaines",
+    "relativetime.2months": "il y a 2 mois",
+    "relativetime.1year": "l'année dernière",
+    "relativetime.2years": "il y a 2 ans",
+    "themes.names.forgejo-light": "Forgejo clair",
+    "themes.names.forgejo-dark": "Forgejo sombre",
+    "themes.names.forgejo-auto": "Forgejo (suivre le thème du système)",
+    "alert.asset_load_failed": "Échec du chargement des fichiers d'asset de {path}. Faites en sorte que les fichiers d'asset puissent être accessibles.",
+    "install.invalid_lfs_path": "Impossible de créer le root LFS au chemin spécifié : %[1]s",
+    "alert.range_error": " doit être un nombre entre %[1]s et %[2]s.",
+    "home.welcome.no_activity": "Pas d'activité",
+    "home.welcome.activity_hint": "Il n'y a rien dans votre fil d'actualité. Vos actions et activités de vos dépôts que vous suivez s'afficheront ici.",
+    "home.explore_repos": "Explorer les dépôts",
+    "home.explore_users": "Explorer les utilisateurs",
+    "home.explore_orgs": "Explorer les organisations",
+    "relativetime.weeks": {
+        "one": "il y a %d semaine",
+        "many": "il y a %d semaines",
+        "other": "il y a %d semaines"
+    },
+    "error.not_found.title": "Page non trouvée",
+    "relativetime.1month": "le mois dernier",
+    "incorrect_root_url": "Cette instance Forgejo est configuré pour être servi sur \"%s\". Vous êtes actuellement en train de regarder Forgejo avec une URL différente, ce qui pourrait casser certaines parties de cette application. L'URL canonique est controllée par les administrateurs Forgejo grâce au paramètre ROOT_URL dans le app.ini.",
+    "meta.last_line": "Merci de traduire Forgejo ! Cette ligne n'est pas vue par les utilisateurs mais sert à d'autres fins dans la gestion de la traduction. Vous pouvez mettre une fun fact dans la traduction au lieu de la traduire. Miaou.",
+    "mail.actions.successful_run_after_failure": "Workflow %[1]s récupéré dans le dépôt %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s récupéré dans le dépôt %[2]s",
+    "mail.actions.not_successful_run_subject": "Workflow %[1]s a raté dans le dépôt %[2]s",
+    "mail.actions.not_successful_run": "Workflow %[1]s raté dans le dépôt %[2]s",
+    "mail.actions.run_info_cur_status": "Statut de cette exécution : %[1]s (vient de se mettre à jour de %[2]s)",
+    "mail.actions.run_info_previous_status": "Précédent statut de l'éxecution : %[1]s",
+    "moderation.reported_thank_you": "Merci pour votre signalement. L'administration a été mise au courant.",
+    "admin.config.moderation_config": "Configuration de la modération",
+    "moderation.report_content": "Contenu du rapport",
+    "moderation.report_abuse": "Signaler un rapport",
+    "moderation.report_abuse_form.header": "Signaler le rapport à l'administrateur",
+    "moderation.report_abuse_form.details": "Ce formulaire devrait être utilisé pour signaler des utilisateurs qui spam des comptes, des dépôts, des questions, des commentaires ou qui se comportent de façon inappropriée.",
+    "moderation.report_abuse_form.invalid": "Arguments invalides",
+    "moderation.report_abuse_form.already_reported": "Vous avez déjà signalisé ce contenu",
+    "moderation.abuse_category": "Catégorie",
+    "moderation.abuse_category.placeholder": "Sélectionnez une catégorie",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "logiciel malveillant",
+    "moderation.abuse_category.illegal_content": "Contenu illégal",
+    "moderation.abuse_category.other_violations": "Autres infractions des règles de la plateforme",
+    "moderation.report_remarks": "Remarques",
+    "moderation.report_remarks.placeholder": "S'il vous plaît fournissez quelques détails en rapport avec l'abus que vous signalez.",
+    "moderation.submit_report": "Soumettre le signalement",
+    "moderation.reporting_failed": "Impossible de soumettre le nouveau signalement : %v",
+    "followers.incoming.list.self.none": "Personne ne suit votre profile.",
+    "followers.incoming.list.none": "Personne ne suit cet utilisateur.",
+    "followers.outgoing.list.self.none": "Vous ne suivez personne.",
+    "followers.outgoing.list.none": "%s ne vous suit plus.",
+    "repo.issue_indexer.title": "Indexeur de problèmes",
+    "stars.list.none": "Personne n'a mis d'étoiles sur ce dépôt.",
+    "watch.list.none": "Personne ne consulte ce dépôt.",
+    "repo.form.cannot_create": "Tous les espaces dans lesquels vous pouvez créer des dépôts ont atteint la limite de dépôts.",
+    "admin.dashboard.cleanup_offline_runners": "Nettoyer les exécuteurs hors ligne",
+    "mail.actions.run_info_trigger": "Déclenché parce que : %[1]s par : %[2]s",
+    "settings.visibility.description": "La visibilité du profil affecte la capacité des autres à accéder à vos dépôts non-privés. <a href=\"%s\" target=\"_blank\">Voir plus</a>.",
+    "editor.textarea.shift_tab_hint": "Pas d'indentation sur cette ligne. Appuyez sur <kbd>Maj</kbd> + <kbd>Tab</kbd> une nouvelle fois ou sur <kbd>Échap</kbd> pour quitter l'éditeur.",
+    "avatar.constraints_hint": "L'avatar personnalisé ne doit pas dépasser une taille de %[1]s ou être plus grand que %[2]dx%[3]d pixels",
+    "editor.textarea.tab_hint": "Ligne déjà indentée. Appuyez sur <kbd>Tab</kbd> une nouvelle fois ou sur <kbd>Échap</kbd> pour quitter l'éditeur.",
+    "discussion.sidebar.reference": "Référence",
+    "repo.settings.push_mirror.branch_filter.label": "Filtre de branche (optionnel)",
+    "repo.diff.commit.next-short": "Suiv.",
+    "repo.diff.commit.previous-short": "Préc.",
+    "profile.actions.tooltip": "Plus d'actions",
+    "profile.edit.link": "Éditer le profil",
+    "keys.ssh.link": "Clé SSH",
+    "keys.gpg.link": "Clés GPG",
+    "compare.branches.title": "Comparer les branches",
+    "repo.settings.push_mirror.branch_filter.description": "Branches a répliquer. Laisser vide pour répliquer toutes les branches. Voir la documentation <a href=\"%[1]s\">%[2]</a> pour la syntaxe. Exemples: <code>main, release/*</code>",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "admin.moderation.deleted_content_ref": "Le signalement avec le type %[1]v et l'identifiant %[2]d n'existe plus."
 }
diff --git a/options/locale_next/locale_gl.json b/options/locale_next/locale_gl.json
index 0967ef424b..e83a2ecbd9 100644
--- a/options/locale_next/locale_gl.json
+++ b/options/locale_next/locale_gl.json
@@ -1 +1,39 @@
-{}
+{
+    "relativetime.now": "agora",
+    "relativetime.future": "máis adiante",
+    "repo.form.cannot_create": "Todos os espazos onde podes crear repositorios chegaron ao límite de repositorios creados.",
+    "followers.outgoing.list.self.none": "Non esas seguindo a ninguén.",
+    "followers.outgoing.list.none": "%s non está seguindo a ninguén.",
+    "relativetime.1day": "onte",
+    "relativetime.2days": "hai dous días",
+    "relativetime.1week": "a semana pasada",
+    "relativetime.2weeks": "hai dúas semanas",
+    "relativetime.1month": "hai un mes",
+    "relativetime.2months": "hai dous meses",
+    "relativetime.1year": "hai un ano",
+    "relativetime.2years": "hai dous anos",
+    "relativetime.mins": {
+        "one": "hai %d minuto",
+        "other": "hai %d minutos"
+    },
+    "relativetime.hours": {
+        "one": "hai %d hora",
+        "other": "hai %d horas"
+    },
+    "relativetime.days": {
+        "one": "hai %d día",
+        "other": "hai %d días"
+    },
+    "relativetime.weeks": {
+        "one": "hai %d semana",
+        "other": "hai %d semanas"
+    },
+    "relativetime.months": {
+        "one": "hai %d mes",
+        "other": "hai %d meses"
+    },
+    "relativetime.years": {
+        "one": "hai %d ano",
+        "other": "hai %d anos"
+    }
+}
diff --git a/options/locale_next/locale_hi.json b/options/locale_next/locale_hi.json
index 0967ef424b..5eec8ae1e2 100644
--- a/options/locale_next/locale_hi.json
+++ b/options/locale_next/locale_hi.json
@@ -1 +1,81 @@
-{}
+{
+    "relativetime.2days": "दो दिन पहले",
+    "relativetime.1day": "कल",
+    "repo.form.cannot_create": "वो जगह जहाँ पे रिपॉजिटरी रखीं जातीं हैं वहां जगह ख़त्म",
+    "moderation.abuse_category.other_violations": "प्लेटफार्म का कोई रूल तोडा हैं",
+    "moderation.report_remarks": "टिप्पणी",
+    "repo.issue_indexer.title": "इशू ठौर",
+    "themes.names.forgejo-auto": "फॉरगेजो - सिस्टम थीम फॉलो करें",
+    "themes.names.forgejo-light": "फॉरगेजो लाइट",
+    "error.not_found.title": "पृष्ठ नहीं मिला",
+    "incorrect_root_url": "इस फॉरगेजो इंस्टैंस को %d सर्वर पे कॉन्फ़िगर किया गया है। आप फॉरगेजो को किसी अन्य url से देख रहे हैं, जिससे एप्लीकेशन टूटती है। अच्छा यूआरएल फॉरगेजो के एडमिन कण्ट्रोल करते हैं और रुट_यूआरएल जो की app. ini में है",
+    "themes.names.forgejo-dark": "फॉरगेजो डार्क",
+    "stars.list.none": "किसी ने भी चिन्हित/स्टार नहीं किया",
+    "watch.list.none": "कोई भी ये रिपॉजिटरी नहीं देख रहा",
+    "followers.incoming.list.self.none": "कोई भी प्रोफाइल फॉलो नहीं कर रहा",
+    "followers.incoming.list.none": "कोई भी यूजर को फॉलो नहीं कर रहा",
+    "followers.outgoing.list.self.none": "आप किसी को फॉलो ही नहीं कर रहे",
+    "followers.outgoing.list.none": "%s किसी को फॉलो नहीं कर रहे",
+    "relativetime.1week": "पिछले हफ्ते",
+    "relativetime.2weeks": "दो हफ्ते पहले",
+    "relativetime.1month": "पिछले महीने",
+    "relativetime.2months": "दो महीने पहले",
+    "relativetime.1year": "पिछले साल",
+    "relativetime.2years": "दो साल पहले",
+    "alert.asset_load_failed": "एसेट फाइल लोड नहीं हो पायी (path) ये पक्का करें की एसेट फाइल एक्सेस हो सकती है",
+    "alert.range_error": " एक अंक %d और %d के बीच में",
+    "search.milestone_kind": "माइलस्टोन ढूंढें…",
+    "home.welcome.no_activity": "गतिविधि नहीं",
+    "home.explore_repos": "रिपॉजिटरी निहारें",
+    "home.explore_users": "उसेर्स देखें",
+    "home.explore_orgs": "संस्थाएं देखें",
+    "relativetime.days": {
+        "one": "%d दिन पहले",
+        "other": "%d दिनों पहले"
+    },
+    "repo.settings.push_mirror.branch_filter.label": "शाखा फ़िल्टर",
+    "repo.settings.push_mirror.branch_filter.description": "शाखा मिरर होनीं हैं। खली छोड़ने पर सब मिरर होंगी।",
+    "install.invalid_lfs_path": "LFS रुट नहीं बना पाया इस path पर",
+    "relativetime.years": {
+        "one": "%d साल पहले",
+        "other": "%d सालों पहले"
+    },
+    "relativetime.weeks": {
+        "one": "%d हफ्ते पहले",
+        "other": "%d हफ़्तों पहले"
+    },
+    "relativetime.months": {
+        "one": "%d महीने पहले",
+        "other": "%d महीनों पहले"
+    },
+    "meta.last_line": "तीतर के दो पीछे तीतर तीतर के दो आगे तीतर बोलो कितने तीतर ?",
+    "relativetime.now": "अभी",
+    "avatar.constraints_hint": "कस्टम अवतार का फ़ाइल आकार 200 किलोबाइट से अधिक नहीं होना चाहिए और 125x125 पिक्सेल से बड़ा नहीं होना चाहिए",
+    "home.welcome.activity_hint": "आपकी फीड में अभी कुछ भी नहीं है। आपके कार्य और रिपॉजिटरी यहाँ दिखेंगे।",
+    "relativetime.future": "भविष्य में",
+    "moderation.report_abuse_form.details": "इस फॉर्म का प्रयोग वो करें जो बताना चाहते हैं स्पैम प्रोफाइल, रिपॉजिटरी, इशू, कमैंट्स या गलत पेशी",
+    "moderation.report_abuse_form.invalid": "इनवैलिड आर्गुमेंट",
+    "moderation.report_abuse_form.already_reported": "आप पहले शिकायत कर चुके हैं",
+    "moderation.abuse_category": "वर्ग",
+    "moderation.abuse_category.placeholder": "वर्ग चुनें",
+    "moderation.abuse_category.spam": "स्पैम",
+    "moderation.abuse_category.malware": "मैलवेयर",
+    "moderation.abuse_category.illegal_content": "गैर कानूनी कंटेंट",
+    "relativetime.mins": {
+        "one": "%d मिनट पहले",
+        "other": ""
+    },
+    "profile.actions.tooltip": "और एक्शन्स",
+    "profile.edit.link": "प्रोफाइल बनाएं",
+    "feed.atom.link": "एटम फीड",
+    "keys.ssh.link": "SSH कीस",
+    "keys.gpg.link": "GPG कीस",
+    "admin.config.moderation_config": "सत्यापन कॉन्फ़िगरेशन",
+    "moderation.report_abuse": "कंप्लेंट करें",
+    "moderation.report_content": "कंप्लेंट करें",
+    "moderation.report_abuse_form.header": "कंप्लेंट करें एडमिनिस्ट्रेटर से",
+    "moderation.report_remarks.placeholder": "कुछ डिटेल्स बताओ जिस बारे में रिपोर्ट कर रहे हो",
+    "moderation.submit_report": "रिपोर्ट सबमिट करो",
+    "moderation.reporting_failed": "नयी रिपोर्ट सबमिट नहीं हो सकती",
+    "moderation.reported_thank_you": "रिपोर्ट के लिए शुक्रिया। एडमिन को बताया गया है"
+}
diff --git a/options/locale_next/locale_hu-HU.json b/options/locale_next/locale_hu-HU.json
index 9d52509102..1c02002e6e 100644
--- a/options/locale_next/locale_hu-HU.json
+++ b/options/locale_next/locale_hu-HU.json
@@ -1,5 +1,6 @@
 {
     "repo.pulls.merged_title_desc": "egyesítve %[1]d változás(ok) a <code>%[2]s</code>-ból <code>%[3]s</code>-ba %[4]s",
     "repo.pulls.title_desc": "egyesíteni szeretné %[1]d változás(oka)t a(z) <code>%[2]s</code>-ból <code id=\"%[4]s\">%[3]s</code>-ba",
-    "search.milestone_kind": "Mérföldkövek keresése..."
+    "search.milestone_kind": "Mérföldkövek keresése...",
+    "moderation.abuse_category.malware": "Malware"
 }
diff --git a/options/locale_next/locale_id-ID.json b/options/locale_next/locale_id-ID.json
index f2dac8114f..14bf491789 100644
--- a/options/locale_next/locale_id-ID.json
+++ b/options/locale_next/locale_id-ID.json
@@ -1,8 +1,5 @@
 {
-	"repo.pulls.merged_title_desc": {
-		"other": "commit %[1]d telah digabungkan dari <code>%[2]s</code> menjadi <code>%[3]s</code> %[4]s"
-	},
-	"repo.pulls.title_desc": {
-		"other": "ingin menggabungkan komit %[1]d dari <code>%[2]s</code> menuju <code id=\"%[4]s\">%[3]s</code>"
-	}
+    "repo.pulls.merged_title_desc": "commit %[1]d telah digabungkan dari <code>%[2]s</code> menjadi <code>%[3]s</code> %[4]s",
+    "repo.pulls.title_desc": "ingin menggabungkan komit %[1]d dari <code>%[2]s</code> menuju <code id=\"%[4]s\">%[3]s</code>",
+    "moderation.abuse_category.malware": "Perangkat pembahaya"
 }
diff --git a/options/locale_next/locale_it-IT.json b/options/locale_next/locale_it-IT.json
index 50cc736634..f4cc7755f0 100644
--- a/options/locale_next/locale_it-IT.json
+++ b/options/locale_next/locale_it-IT.json
@@ -10,10 +10,87 @@
         "other": ""
     },
     "search.milestone_kind": "Ricerca traguardi…",
+    "themes.names.forgejo-light": "Forgejo chiaro",
+    "themes.names.forgejo-dark": "Forgejo scuro",
     "home.welcome.no_activity": "Nessun'attività",
     "home.explore_repos": "Esplora i repositori",
     "home.explore_users": "Esplora l'utenza",
     "home.explore_orgs": "Esplora le organizzazioni",
-    "themes.names.forgejo-light": "Forgejo chiaro",
-    "themes.names.forgejo-dark": "Forgejo scuro"
+    "mail.actions.successful_run_after_failure_subject": "Il flusso di lavoro %[1] ha ripreso a funzionare nel repositorio %[2]s",
+    "mail.actions.not_successful_run_subject": "Il flusso di lavoro %[1]s è fallito nel repositorio %[2]s",
+    "relativetime.future": "nel futuro",
+    "relativetime.days": {
+        "one": "ieri",
+        "many": "%d giorni fa",
+        "other": "%d giorni fa"
+    },
+    "relativetime.1day": "ieri",
+    "repo.form.cannot_create": "Tutti gli spazi in cui puoi creare repositori hanno raggiunto il limite di repositori.",
+    "discussion.locked": "Questa discussione è stata bloccata. Solo i contributori possono commentare.",
+    "relativetime.hours": {
+        "one": "un'ora fa",
+        "many": "%d ore fa",
+        "other": "%d ore fa"
+    },
+    "relativetime.2years": "due anni fa",
+    "relativetime.now": "adesso",
+    "relativetime.weeks": {
+        "one": "una settimana fa",
+        "many": "%d settimane fa",
+        "other": "%d settimane fa"
+    },
+    "relativetime.months": {
+        "one": "un mese fa",
+        "many": "%d mesi fa",
+        "other": "%d mesi fa"
+    },
+    "relativetime.years": {
+        "one": "un anno fa",
+        "many": "%d anni fa",
+        "other": "%d anni fa"
+    },
+    "repo.issue_indexer.title": "Indicizzatore delle segnalazioni",
+    "admin.config.moderation_config": "Impostazioni di moderazione",
+    "moderation.report_abuse": "Segnala abuso",
+    "moderation.report_content": "Segnala contenuto",
+    "moderation.report_abuse_form.already_reported": "Hai già segnalato questo contenuto",
+    "moderation.abuse_category": "Categoria",
+    "moderation.abuse_category.placeholder": "Seleziona una categoria",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.abuse_category.illegal_content": "Contenuti illegali",
+    "moderation.abuse_category.other_violations": "Altre violazioni delle regole della piattaforma",
+    "moderation.report_remarks": "Note aggiuntive",
+    "moderation.report_remarks.placeholder": "Aggiungi dettagli riguardanti l'abuso che stai segnalando.",
+    "moderation.submit_report": "Invia segnalazione",
+    "error.not_found.title": "Pagina non trovata",
+    "themes.names.forgejo-auto": "Forgejo (segui le impostazioni di sistema)",
+    "stars.list.none": "Nessuno ha messo una stella a questo repo.",
+    "watch.list.none": "Nessuno sta osservando questo repo.",
+    "followers.incoming.list.self.none": "Nessuno sta seguendo il tuo profilo.",
+    "followers.incoming.list.none": "Nessuno sta seguendo questo utente.",
+    "followers.outgoing.list.self.none": "Non segui nessuno.",
+    "followers.outgoing.list.none": "%s non sta seguendo nessuno.",
+    "relativetime.2days": "due giorni fa",
+    "relativetime.2weeks": "due settimane fa",
+    "relativetime.1week": "la settimana scorsa",
+    "relativetime.1month": "il mese scorso",
+    "relativetime.2months": "due mesi fa",
+    "relativetime.1year": "l'anno scorso",
+    "moderation.report_abuse_form.header": "Segnala abuso all'amministratore",
+    "moderation.report_abuse_form.details": "Questo modulo dovrebbe essere utilizzato per segnalare utenti che creano profili, repositori, segnalazioni o commenti spam o che si comportano in modo non adeguato.",
+    "moderation.report_abuse_form.invalid": "Argomenti non validi",
+    "moderation.reporting_failed": "Impossibile inviare segnalazione: %v",
+    "moderation.reported_thank_you": "Grazie per la segnalazione. L'amministratore è stato avvertito.",
+    "alert.asset_load_failed": "Impossibile caricare i file di risorsa da {path}. Controlla che i file di risorsa siano accessibili.",
+    "install.invalid_lfs_path": "Non è possibile creare una root LFS nel percorso specificato: %[1]s",
+    "home.welcome.activity_hint": "Non c'è nulla nel tuo feed. Le tue azioni e le attività dei repositori che segui verranno mostrate qui.",
+    "relativetime.mins": {
+        "one": "un minuto fa",
+        "many": "%d minuti fa",
+        "other": "%d minuti fa"
+    },
+    "editor.textarea.tab_hint": "Linea già indentata. Premi di nuovo <kbd>Tab</kbd> o <kbd>Esc</kbd> per uscire dall'editor.",
+    "repo.diff.commit.previous-short": "Precedente",
+    "meta.last_line": "Ambaraba cicci cocco."
 }
diff --git a/options/locale_next/locale_ja-JP.json b/options/locale_next/locale_ja-JP.json
index 40edf8cb90..c4b3a0a2e0 100644
--- a/options/locale_next/locale_ja-JP.json
+++ b/options/locale_next/locale_ja-JP.json
@@ -1,5 +1,6 @@
 {
     "repo.pulls.merged_title_desc": "が %[1]d 個のコミットを <code>%[2]s</code> から <code>%[3]s</code> へマージ %[4]s",
     "repo.pulls.title_desc": "が <code>%[2]s</code> から <code id=\"%[4]s\">%[3]s</code> への %[1]d コミットのマージを希望しています",
-    "search.milestone_kind": "マイルストーンを検索..."
+    "search.milestone_kind": "マイルストーンを検索...",
+    "moderation.abuse_category.malware": "悪意のコード"
 }
diff --git a/options/locale_next/locale_ko-KR.json b/options/locale_next/locale_ko-KR.json
index ac61066356..2e51144cb7 100644
--- a/options/locale_next/locale_ko-KR.json
+++ b/options/locale_next/locale_ko-KR.json
@@ -1,9 +1,6 @@
 {
-    "repo.pulls.merged_title_desc": {
-        "other": "님이 <code>%[2]s</code> 에서 <code>%[3]s</code> 로 %[1]d 커밋을 %[4]s 병합함"
-    },
-    "repo.pulls.title_desc": {
-        "other": "<code>%[2]s</code> 에서 <code id=\"%[4]s\">%[3]s</code> 로 %[1]d개의 커밋들을 병합하려함"
-    },
-    "home.welcome.no_activity": "활동 없음"
+    "repo.pulls.merged_title_desc": "님이 <code>%[2]s</code> 에서 <code>%[3]s</code> 로 %[1]d 커밋을 %[4]s 병합함",
+    "repo.pulls.title_desc": "<code>%[2]s</code> 에서 <code id=\"%[4]s\">%[3]s</code> 로 %[1]d개의 커밋들을 병합하려함",
+    "home.welcome.no_activity": "활동 없음",
+    "moderation.abuse_category.malware": "악성 소프트웨어"
 }
diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json
index 1287ddbf49..3f8e3a165a 100644
--- a/options/locale_next/locale_lv-LV.json
+++ b/options/locale_next/locale_lv-LV.json
@@ -19,5 +19,118 @@
     "themes.names.forgejo-auto": "Forgejo (ievērot sistēmas izskatu)",
     "themes.names.forgejo-light": "Forgejo gaišais",
     "themes.names.forgejo-dark": "Forgejo tumšais",
-    "install.invalid_lfs_path": "Nav iespējams izveidot LFS pamatmapi norādītajā ceļā: %[1]s"
+    "error.not_found.title": "Lapa nav atrasta",
+    "alert.asset_load_failed": "Neizdevās ielādēt līdzekļu datnes no {path}. Lūgums pārliecināties, ka līdzekļu datnēm var piekļūt.",
+    "install.invalid_lfs_path": "Nav iespējams izveidot LFS pamatmapi norādītajā ceļā: %[1]s",
+    "alert.range_error": " jābūt skaitlin starp %[1]s un %[2]s.",
+    "meta.last_line": "Šis žagaru saišķis nav mans žagaru saišķis.",
+    "mail.actions.successful_run_after_failure_subject": "Darbplūsma %[1]s atkopta glabātavā %[2]s",
+    "mail.actions.not_successful_run_subject": "Darbplūsmas %[1]s atteice glabātavā %[2]s",
+    "mail.actions.successful_run_after_failure": "Darbplūsma %[1]s atkopta glabātavā %[2]s",
+    "mail.actions.not_successful_run": "Darbplūsmas %[1] atteice glabātavā %[2]s",
+    "mail.actions.run_info_cur_status": "Šī izpildījuma stāvoklis: %[1]s (tikko atjaunināts no %[2]s)",
+    "mail.actions.run_info_previous_status": "Iepriekšējā izpildījuma stāvoklis: %[1]s",
+    "mail.actions.run_info_trigger": "Izraisīšanas iemesls: %[2]s no: %[2]s",
+    "discussion.locked": "Šī apspriede tika slēgta. Piebilžu pievienošana ir ļauta tikai līdzdalībniekiem.",
+    "relativetime.future": "nākotnē",
+    "relativetime.hours": {
+        "zero": "pirms %d stundām",
+        "one": "pirms %d stundas",
+        "other": "pirms %d stundām"
+    },
+    "relativetime.days": {
+        "zero": "pirms %d dienām",
+        "one": "pirms %d dienas",
+        "other": "pirms %d dienām"
+    },
+    "relativetime.months": {
+        "zero": "pirms %d mēnešiem",
+        "one": "pirms %d mēneša",
+        "other": "pirms %d mēnešiem"
+    },
+    "relativetime.1day": "vakar",
+    "relativetime.2days": "pirms divām dienām",
+    "relativetime.1week": "iepriekšējā nedēļā",
+    "relativetime.2weeks": "pirms divām nedēļām",
+    "relativetime.2months": "pirms diviem mēnešiem",
+    "relativetime.1year": "iepriekšējā gadā",
+    "relativetime.2years": "pirms diviem gadiem",
+    "relativetime.years": {
+        "zero": "pirms %d gadiem",
+        "one": "pirms %d gada",
+        "other": "pirms %d gadiem"
+    },
+    "relativetime.mins": {
+        "zero": "pirms %d minūtēm",
+        "one": "pirms %d minūtes",
+        "other": "pirms %d minūtēm"
+    },
+    "relativetime.now": "tagad",
+    "relativetime.weeks": {
+        "zero": "pirms %d nedēļām",
+        "one": "pirms %d nedēļas",
+        "other": "pirms %d nedēļām"
+    },
+    "relativetime.1month": "iepriekšējā mēnesī",
+    "moderation.abuse_category.other_violations": "Citi noteikumu pārkāpumi",
+    "moderation.reported_thank_you": "Paldies par ziņojumu! Pārvaldītājiem ir darīts zināms par to.",
+    "admin.config.moderation_config": "Satura pārraudzības konfigurācija",
+    "moderation.report_abuse": "Ziņot par pārkāpumu",
+    "moderation.report_content": "Ziņot par saturu",
+    "moderation.report_abuse_form.header": "Ziņot pārvaldītājam par pārkāpumu",
+    "moderation.report_abuse_form.details": "Šī veidlapa ir izmantojama, lai ziņotu par lietotājiem, kuri izveido mēstuļošanas profilus, glabātavas, pieteikumus un piebildes vai uzvedas nepienācīgi.",
+    "moderation.report_abuse_form.invalid": "Nederīgi argumenti",
+    "moderation.report_abuse_form.already_reported": "Tu jau ziņoji par šo saturu",
+    "moderation.abuse_category": "Kategorija",
+    "moderation.abuse_category.placeholder": "Atlasīt kategoriju",
+    "moderation.abuse_category.spam": "Mēstuļošana",
+    "moderation.abuse_category.malware": "Ļaunatūra",
+    "moderation.abuse_category.illegal_content": "Nelikumīgs saturs",
+    "moderation.report_remarks": "Piezīmes",
+    "moderation.report_remarks.placeholder": "Lūgums sniegt informāciju par pārkāpumu, par ko ziņo.",
+    "moderation.submit_report": "Iesniegt ziņojumu",
+    "moderation.reporting_failed": "Nevar iesniegt jauno ziņojumu par pārkāpumu: %v",
+    "repo.form.cannot_create": "Visas vietas, kurās vari izveidot glabātavas, ir sasniegušas glabātavu skaita ierobežojumu.",
+    "repo.issue_indexer.title": "Pieteikumu indeksētājs",
+    "watch.list.none": "Neviens nevēro šo glabātavu.",
+    "followers.incoming.list.none": "Neviens neseko šim lietotājam.",
+    "followers.outgoing.list.self.none": "Tu nevienam neseko.",
+    "followers.outgoing.list.none": "%s nevienam neseko.",
+    "stars.list.none": "Neviens šo glabātavu nav atzīmējis ar zvaigzni.",
+    "followers.incoming.list.self.none": "Neviens neseko Tavam profilam.",
+    "editor.textarea.tab_hint": "Rinda jau ir ar atkāpi. Spied <kbd>Tab</kbd> vēlreiz vai <kbd>Escape</kbd>, lai izietu no redaktora!",
+    "editor.textarea.shift_tab_hint": "Šajā rindā nav atkāpes. Spied <kbd>Shift</kbd> + <kbd>Tab</kbd> vēlreiz vai <kbd>Escape</kbd>, lai izietu no redaktora!",
+    "admin.dashboard.cleanup_offline_runners": "Notīrīt bezsaistes izpildītājus",
+    "settings.visibility.description": "Profila redzamība ietekmē iespēju citiem piekļūt Tavām glabātavām, kas nav privātas. <a href=\"%s\" target=\"_blank\">Uzzināt vairāk</a>.",
+    "avatar.constraints_hint": "Pielāgots profila attēls nevar pārsniegt %[1]s vai būt lielāks par %[2]dx%[3]d pikseļiem",
+    "repo.diff.commit.next-short": "Nāk.",
+    "repo.diff.commit.previous-short": "Iepr.",
+    "profile.actions.tooltip": "Vairāk darbību",
+    "profile.edit.link": "Labot profilu",
+    "feed.atom.link": "Atom barotne",
+    "keys.ssh.link": "SSH atslēgas",
+    "keys.gpg.link": "GPG atslēgas",
+    "og.repo.summary_card.alt_description": "Glabātavas %[1]s kopsavilkuma kartīte, aprakstīta kā: %[2]s",
+    "mail.actions.run_info_sha": "Iesūtījums: %[1]s",
+    "repo.settings.push_mirror.branch_filter.description": "Zarus, kurus spoguļot. Atstāt tukšu, lai spoguļotu visus zarus. Pierakstu skatīt <a href=\"%[1]s\">%[2]s dokumentācijā</a>. Piemēri: <code>main, release/*</code>",
+    "repo.settings.push_mirror.branch_filter.label": "Zaru atlasītājs (izvēles)",
+    "discussion.sidebar.reference": "Atsauce",
+    "admin.moderation.no_open_reports": "Pašlaik nav atvērtu pārskatu.",
+    "admin.moderation.moderation_reports": "Satura pārraudzības pārskati",
+    "admin.moderation.reports": "Pārskati",
+    "admin.moderation.deleted_content_ref": "Saturs, par kuru ziņots, ar veidu %[1]v un Id %[2]d vairs nepastāv",
+    "admin.dashboard.remove_resolved_reports": "Noņemt atrisinātos ziņojumus",
+    "compare.branches.title": "Salīdzināt zarus",
+    "admin.auths.allow_username_change": "Atļaut lietotājvārda mainīšanu",
+    "repo.commit.load_tags_failed": "Birku ielādēšana neizdevās iekšējas kļūdas dēļ",
+    "admin.auths.allow_username_change.description": "Ļaut lietotājiem profila iestatījumos mainīt savu lietotājvārdu",
+    "warning.repository.out_of_sync": "Šīs glabātavas atspoguļojums datubāzē nav sinhronizēts. Ja šis brīdinājums tiek rādīts pēc iesūtījuma aizgādāšanas šajā glabātavā, jāsazinās ar pārvaldītāju.",
+    "migrate.pagure.description": "Pārcelt datus no pagure.io vai citiem Pagure serveriem.",
+    "migrate.pagure.incorrect_url": "Ir norādīts nepareizs avota glabātavas URL",
+    "migrate.pagure.project_url": "Pagure projekta URL",
+    "migrate.pagure.project_example": "Pagure projekta URL, piem., https://pagure.io/pagure",
+    "migrate.pagure.token_label": "Pilnvara",
+    "migrate.pagure.token_body_a": "Jānorāda Pagura API pilnvara ar piekļuvi privātajiem pieteikumiem, lai izveidotu glabātavu tikai ar privātiem pieteikumiem tajā",
+    "migrate.pagure.token_body_b": "Jāpārliecinās, ka augstāk ir iestatīts privātas glabātavas karogs, ja vēlies, lai šī glabātava būtu privāta",
+    "repo.pulls.already_merged": "Apvienošana neizdevās: šis izmaiņu pieprasījums jau ir iekļauts."
 }
diff --git a/options/locale_next/locale_nb_NO.json b/options/locale_next/locale_nb_NO.json
index 0967ef424b..b6b10cebb5 100644
--- a/options/locale_next/locale_nb_NO.json
+++ b/options/locale_next/locale_nb_NO.json
@@ -1 +1,106 @@
-{}
+{
+    "relativetime.1day": "i går",
+    "moderation.abuse_category.other_violations": "Andre regel overtredelser",
+    "moderation.report_remarks": "Kommentar",
+    "moderation.report_remarks.placeholder": "Skriv noen detaljer rundt missbruket du rapporterer.",
+    "moderation.submit_report": "Send rapport",
+    "moderation.reporting_failed": "Missbruk rapporten kunne ikke sendes inn: %v",
+    "relativetime.hours": {
+        "one": "%d time siden",
+        "other": "%d timer siden"
+    },
+    "repo.form.cannot_create": "Det maksimale antallet repositories er nådd i alle områdene du har tilgang til.",
+    "repo.issue_indexer.title": "Saksindekserer",
+    "moderation.abuse_category.illegal_content": "Ulovlig innhold",
+    "error.not_found.title": "Fant ikke siden",
+    "themes.names.forgejo-light": "Forgejo lyst",
+    "themes.names.forgejo-dark": "Forgejo mørk",
+    "stars.list.none": "Ingen har gitt stjerner til dette repoet.",
+    "watch.list.none": "Ingen følger dette repoet.",
+    "followers.incoming.list.none": "Ingen følger denne brukeren.",
+    "followers.outgoing.list.self.none": "Du følger ikke noen.",
+    "followers.outgoing.list.none": "%s følger ikke noen.",
+    "relativetime.2days": "to dager siden",
+    "relativetime.1week": "forrige uke",
+    "relativetime.2weeks": "to uker siden",
+    "relativetime.1month": "forrige måned",
+    "relativetime.2months": "to måneder siden",
+    "relativetime.1year": "i fjor",
+    "relativetime.2years": "to år siden",
+    "alert.asset_load_failed": "Kunne ikke laste inn ressursfiler fra {path}. Sørg for at ressursfilene er tilgjengelige.",
+    "search.milestone_kind": "Søker i milepæler…",
+    "home.welcome.no_activity": "Ingen aktivitet",
+    "home.explore_repos": "Utforsk repositorier",
+    "home.explore_users": "Utforsk brukere",
+    "home.explore_orgs": "Utforsk organisasjoner",
+    "relativetime.mins": {
+        "one": "%d minutt siden",
+        "other": "%d minutter siden"
+    },
+    "relativetime.months": {
+        "one": "%d måned siden",
+        "other": "%d måneder siden"
+    },
+    "relativetime.years": {
+        "one": "%d år siden",
+        "other": "%d år siden"
+    },
+    "repo.pulls.title_desc": {
+        "one": "ønsker å slå sammen %[1]d commit fra <code>%[2]s</code> inn i <code id=\"%[4]s\">%[3]s</code>",
+        "other": "ønsker å slå sammen %[1]d commits fra <code>%[2]s</code> inn i <code id=\"%[4]s\">%[3]s</code>"
+    },
+    "og.repo.summary_card.alt_description": "Sammendrag for repository %[1]s, beskrevet som: %[2]s",
+    "followers.incoming.list.self.none": "Ingen følger profilen din.",
+    "install.invalid_lfs_path": "Kan ikke opprette LFS-root på: %[1]s",
+    "relativetime.now": "nå",
+    "relativetime.future": "i fremtiden",
+    "repo.pulls.merged_title_desc": {
+        "one": "slo sammen %[1]d commit fra <code>%[2]s</code> inn i <code>%[3]s</code> %[4]s",
+        "other": "slo sammen %[1]d commits fra <code>%[2]s</code> inn i <code>%[3]s</code> %[4]s"
+    },
+    "editor.textarea.tab_hint": "Linjen er allerede innrykket. Trykk <kbd>Tab</kbd> igjen eller trykk <kbd>Escape</kbd> for å gå ut av editoren.",
+    "editor.textarea.shift_tab_hint": "Ingen innrykk på denne linjen. Trykk <kbd>Shift</kbd> + <kbd>Tab</kbd> igjen eller <kbd>Escape</kbd> for å gå ut av editoren.",
+    "alert.range_error": " må være et nummer mellom %[1]s og %[2]s.",
+    "themes.names.forgejo-auto": "Forgejo (følg systemtema)",
+    "home.welcome.activity_hint": "Det er foreløpig ingenting i feeden din. Aktivitetene dine og handlingene dine fra repositorier du følger, vil vises her etter hvert.",
+    "incorrect_root_url": "Denne Forgejo instansen er konfigurert til å bruke \"%s\". Du bruker Forgejo via en annen URL, noe som kan forårsake at deler av applikasjonen ikke fungerer. Den kanoniske URL-en styres av Forgejo-administratorer via innstillingen ROOT_URL i app.ini-filen.",
+    "mail.actions.run_info_trigger": "Startet på grunn av: %[1]s by: %[2]s",
+    "admin.dashboard.cleanup_offline_runners": "Rydd opp offline runners",
+    "settings.visibility.description": "Profilens synlighet påvirker andres mulighet til å få tilgang til dine ikke-private repositorier. <a href=\"%s\" target=\"_blank\">Les mer</a>",
+    "profile.actions.tooltip": "Flere handlinger",
+    "profile.edit.link": "Rediger profil",
+    "relativetime.days": {
+        "one": "%d dag siden",
+        "other": "%d dager siden"
+    },
+    "relativetime.weeks": {
+        "one": "%d uke siden",
+        "other": "%d uker siden"
+    },
+    "feed.atom.link": "Atom feed",
+    "keys.ssh.link": "SSH nøkler",
+    "keys.gpg.link": "GPG nøkler",
+    "admin.config.moderation_config": "Moderasjonskonfigurasjon",
+    "moderation.report_abuse": "Rapporter missbruk",
+    "moderation.report_content": "Rapporter innhold",
+    "moderation.report_abuse_form.header": "Rapporter missbruk til en administrator",
+    "moderation.report_abuse_form.details": "Denne formen skal brukes for å rapporterer brukere som oppretter spam profiler, repositorier, saker, kommentarer eller oppfører seg upassende.",
+    "moderation.report_abuse_form.invalid": "Ugyldige argumenter",
+    "moderation.report_abuse_form.already_reported": "Du har allerede rapportert dette innholdet",
+    "moderation.abuse_category": "Kategori",
+    "moderation.abuse_category.placeholder": "Velg en kategori",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Skadelig programvare",
+    "moderation.reported_thank_you": "Takk for meldingen. Vi har varslet administratorene.",
+    "mail.actions.successful_run_after_failure_subject": "Arbeidsflyten %[1]s er gjenopprettet i repository %[2]s",
+    "mail.actions.not_successful_run_subject": "Arbeidsflyten %[1]s feilet i repository %[2]s",
+    "mail.actions.successful_run_after_failure": "Arbeidsflyten %[1]s er gjenopprettet i repository %[2]s",
+    "mail.actions.not_successful_run": "Arbeidsflyten %[1]s feilet i repository %[2]s",
+    "mail.actions.run_info_cur_status": "Status for denne kjøringen: %[1]s (oppdatert fra %[2]s)",
+    "mail.actions.run_info_previous_status": "Status for forrige kjøring: %[1]s",
+    "repo.diff.commit.next-short": "Neste",
+    "repo.diff.commit.previous-short": "Forrige",
+    "discussion.locked": "Denne diskusjonen er låst. Kommentarer kan kun gjøres av bidragsytere.",
+    "avatar.constraints_hint": "Egendefinert avatar kan ikke overstige %[1]s i størrelse eller være større enn %[2]d × %[3]d piksler",
+    "meta.last_line": "Vi gir oss ikke. Kongen har sagt nei!"
+}
diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json
index 7d3b5bcd82..64ef8db60f 100644
--- a/options/locale_next/locale_nds.json
+++ b/options/locale_next/locale_nds.json
@@ -17,7 +17,112 @@
     "themes.names.forgejo-light": "Forgejo Hell",
     "themes.names.forgejo-dark": "Forgejo Dunker",
     "themes.names.forgejo-auto": "Forgejo (Systeem-Thema nagahn)",
-    "settings.adopt": "Övernehmen",
+    "error.not_found.title": "Sied nich funnen",
+    "alert.asset_load_failed": "Kunn Objekt-Dateien ut {path} nich laden. Bidde wees wiss, dat up de Objekt-Dateien togriepen worden kann.",
     "install.invalid_lfs_path": "Kunn de LFS-Ruut an de angeven Padd nich maken: %[1]s",
-    "install.lfs_jwt_secret_failed": "Kunn dat LFS-JWT-Geheemst nich maken: %[1]s"
+    "alert.range_error": " mutt eene Tahl tüsken %[1]s un %[2]s wesen.",
+    "meta.last_line": "Moin!",
+    "mail.actions.successful_run_after_failure_subject": "Warkwies %[1]s in Repositorium %[2]s verhaalt",
+    "mail.actions.not_successful_run_subject": "Warkwies %[1]s in Repositorium %[2]s fehlslagen",
+    "mail.actions.successful_run_after_failure": "Warkwies %[1]s in Repositorium %[2]s hett sik verhaalt",
+    "mail.actions.not_successful_run": "Warkwies %[1]s in Repositorium %[2]s is fehlslagen",
+    "mail.actions.run_info_cur_status": "Tostand vun deesem Utföhren: %[1]s (jüüst vun %[2]s verneeit)",
+    "mail.actions.run_info_previous_status": "Tostand vun de vörig Utföhren: %[1]s",
+    "mail.actions.run_info_trigger": "Utlööst um: %[1]s vun: %[2]s",
+    "discussion.locked": "Deeser Snack is tosloten worden. Blots Bidragers könen kommenteren.",
+    "relativetime.future": "in Tokunft",
+    "relativetime.mins": {
+        "one": "vör %d Menüüt",
+        "other": "vör %d Menüten"
+    },
+    "relativetime.hours": {
+        "one": "vör %d Stünn",
+        "other": "vör %d Stünnen"
+    },
+    "relativetime.now": "nu",
+    "relativetime.months": {
+        "one": "vör %d Maant",
+        "other": "vör %d Maanten"
+    },
+    "relativetime.weeks": {
+        "one": "vör %d Week",
+        "other": "vör %d Weken"
+    },
+    "relativetime.years": {
+        "one": "vör %d Jahr",
+        "other": "vör %d Jahren"
+    },
+    "relativetime.1day": "güstern",
+    "relativetime.1week": "leste Week",
+    "relativetime.2weeks": "vörleste Week",
+    "relativetime.1month": "lesten Maant",
+    "relativetime.2months": "vörlesten Maant",
+    "relativetime.1year": "lestes Jahr",
+    "relativetime.2years": "vörlestes Jahr",
+    "relativetime.days": {
+        "one": "vör %d Dag",
+        "other": "vör %d Dagen"
+    },
+    "relativetime.2days": "vörgüstern",
+    "moderation.report_abuse": "Missbruuk mellen",
+    "moderation.report_content": "Inholl mellen",
+    "moderation.report_abuse_form.invalid": "Ungültige Argumenten",
+    "moderation.report_abuse_form.already_reported": "Du hest deesen Inholl al mellt",
+    "moderation.abuse_category": "Deel",
+    "moderation.abuse_category.placeholder": "Köör een Deel ut",
+    "moderation.abuse_category.spam": "Oolkert-Tüüg",
+    "moderation.abuse_category.illegal_content": "Verboden Inholl",
+    "moderation.abuse_category.other_violations": "Anner Verstöten tegen de Plattfoorms-Regels",
+    "moderation.report_remarks": "Anmarkens",
+    "moderation.submit_report": "Mellen ofschicken",
+    "moderation.reporting_failed": "Kann dat neje Missbruuk-Mellen nich ofschicken: %v",
+    "moderation.reported_thank_you": "Wees bedankt för dien Mellen. De Sied-Chefs hebben de Naricht daaröver kregen.",
+    "moderation.report_remarks.placeholder": "Bidde giff mehr Informatioonen över de Missbruuk, wat du mellst, an.",
+    "admin.config.moderation_config": "Moderatioons-Instellens",
+    "moderation.report_abuse_form.header": "Missbruuk an de Chef mellen",
+    "moderation.report_abuse_form.details": "Deeses Formular kann bruukt worden, um Brukers to mellen, wenn se Oolkert-Profilen, -Repositoriums, -Gefallens of -Kommentaren maken of sik unanstännig verhollen.",
+    "moderation.abuse_category.malware": "Schaa-Waar",
+    "repo.form.cannot_create": "All Rumen, waar du Repositoriums maken kannst, enthollen al de grootste Tahl vun verlöövt Repositoriums.",
+    "repo.issue_indexer.title": "Gefallen-Indizerer",
+    "followers.outgoing.list.none": "%s gaht nüms na.",
+    "watch.list.none": "Nüms beluurt deeses Repositorium.",
+    "followers.incoming.list.self.none": "Nüms gaht dienem Profil na.",
+    "followers.incoming.list.none": "Nüms gaht deesem Bruker na.",
+    "followers.outgoing.list.self.none": "Du gahst nüms na.",
+    "stars.list.none": "Nüms hett up deesem Repositorium eenen Steern sett.",
+    "editor.textarea.tab_hint": "Rieg al inschuven. Drück weer <kbd>Tab</kbd> of <kbd>Esc</kbd>, um de Bewarker to verlaten.",
+    "editor.textarea.shift_tab_hint": "Keen Inschuuv in deeser Rieg. Drück weer <kbd>Umschalt</kbd>+<kbd>Tab</kbd> of <kbd>Esc</kbd>, um de Bewarker to verlaten.",
+    "admin.dashboard.cleanup_offline_runners": "Nich verbunnen Lopers uprümen",
+    "settings.visibility.description": "De Profil-Sichtbaarkeid maakt daar wat an, of un wo anner Lüü diene nich-privaaten Repositoriums ankieken könen. <a href=\"%s\" target=\"_blank\">Mehr unnerhören</a>.",
+    "avatar.constraints_hint": "Dat eegene Kontobill düür nich groter as %[1]s wesen of groter as %[2]d×%[3]d Billtüttels wesen",
+    "repo.diff.commit.next-short": "Anner",
+    "repo.diff.commit.previous-short": "Vörig",
+    "feed.atom.link": "Atom-Schuuv",
+    "keys.ssh.link": "SSH-Slötels",
+    "keys.gpg.link": "GPG-Slötels",
+    "profile.actions.tooltip": "Mehr Aktioonen",
+    "profile.edit.link": "Profil bewarken",
+    "og.repo.summary_card.alt_description": "Tosamenfatens-Kaart vun de Repositorium %[1]s, beschrieven as: %[2]s",
+    "mail.actions.run_info_sha": "Kommitteren: %[1]s",
+    "repo.settings.push_mirror.branch_filter.description": "Twiegen tum Spegeln. Laat dat leeg, um all Twiegen to spegeln. Lees de <a href=\"%[1]s\">%[2]s-Dokumenteren</a> för de Syntax. Bispölen: <code>main, release/*</code>",
+    "repo.settings.push_mirror.branch_filter.label": "Twieg-Filter (wenn du willst)",
+    "discussion.sidebar.reference": "Nömen",
+    "admin.moderation.moderation_reports": "Moderatioons-Berichten",
+    "admin.moderation.no_open_reports": "Dat gifft jüüst keene open Berichten.",
+    "admin.moderation.reports": "Berichten",
+    "admin.moderation.deleted_content_ref": "Mellt Inholl mit Aard %[1]v un Kennteken %[2]d gifft dat nich mehr",
+    "admin.dashboard.remove_resolved_reports": "Lööst Berichten wegdoon",
+    "compare.branches.title": "Twiegen verglieken",
+    "repo.commit.load_tags_failed": "Kunn de Markens um eenen binnern Fehler nich laden",
+    "admin.auths.allow_username_change.description": "Verlööv Brukers, hör Brukernaam in de Profil-Instellens to ännern",
+    "admin.auths.allow_username_change": "Brukernaam-Ännern verlöven",
+    "warning.repository.out_of_sync": "De Datenbank-Tostand vun deesem Repositorium is verschuven. Wenn deese Wahrschau immer noch wiest word, nadeem een Kommitteren to deesem Repositorium schuven word, kuntakteer de Sied-Chef.",
+    "repo.pulls.already_merged": "Tosamenföhren fehlslagen: Deeser Haalvörslag is al tosamenföhrt worden.",
+    "migrate.pagure.description": "Daten vun pagure.io of anner Pagure-Instanzen umtrecken.",
+    "migrate.pagure.project_url": "Pagure-Projekt-URL",
+    "migrate.pagure.project_example": "De URL vum Projekt up Pagure, to’n Bispööl https://pagure.io/pagure",
+    "migrate.pagure.token_label": "Teken",
+    "migrate.pagure.token_body_b": "Wees wiss, boven the Flagg för een privaates Repo to setten, wenn du willst, dat deeses Repo privaat wesen sall",
+    "migrate.pagure.incorrect_url": "Ungültige Quell-Repositoriums-URL is angeven worden",
+    "migrate.pagure.token_body_a": "Giff een Pagure-API-Teken mit Togang to de privaaten Gefallens an, um een Repositorium mit blots the privaaten Gefallens daarin to maken"
 }
diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json
index 49de90b0eb..14b638f7ec 100644
--- a/options/locale_next/locale_nl-NL.json
+++ b/options/locale_next/locale_nl-NL.json
@@ -1,11 +1,11 @@
 {
     "repo.pulls.merged_title_desc": {
         "one": "heeft %[1]d commit van <code>%[2]s</code> samengevoegd in <code>%[3]s</code> %[4]s",
-        "other": "heeft %[1]d commits samengevoegd van <code>%[2]s</code> naar <code>%[3]s</code> %[4]s"
+        "other": "heeft %[1]d commits van <code>%[2]s</code> samengevoegd in <code>%[3]s</code> %[4]s"
     },
     "repo.pulls.title_desc": {
         "one": "wil %[1]d commit van <code>%[2]s</code> samenvoegen in <code id=\"%[4]s\">%[3]s</code>",
-        "other": "wil %[1]d commits van <code>%[2]s</code> samenvoegen met <code id=\"%[4]s\">%[3]s</code>"
+        "other": "wil %[1]d commits van <code>%[2]s</code> samenvoegen in <code id=\"%[4]s\">%[3]s</code>"
     },
     "search.milestone_kind": "Zoek mijlpalen…",
     "home.welcome.no_activity": "Geen activiteit",
@@ -13,11 +13,116 @@
     "home.explore_repos": "Verken repositories",
     "home.explore_users": "Verken gebruikers",
     "home.explore_orgs": "Verken organisaties",
-    "incorrect_root_url": "Deze Forgejo-instantie is geconfigureerd om geserveerd te worden op \"%s\". U bekijkt Forgejo momenteel via een andere URL, waardoor onderdelen van de applicatie kunnen breken. De canonieke URL kan worden gewijzigd door Forgejo admins via de ROOT_URL instelling in de app.ini.",
+    "incorrect_root_url": "Deze Forgejo-instantie is geconfigureerd om bereikbaar te zijn op \"%s\". U bekijkt Forgejo momenteel via een andere URL, waardoor onderdelen van de applicatie kunnen breken. De canonieke URL kan worden gewijzigd door Forgejo admins via de ROOT_URL instelling in de app.ini.",
     "themes.names.forgejo-auto": "Forgejo (volg het systeemthema)",
     "themes.names.forgejo-light": "Forgejo licht",
     "themes.names.forgejo-dark": "Forgejo donker",
-    "settings.adopt": "Adopteer",
-    "install.invalid_lfs_path": "Kan de LFS-root niet aanmaken op het opgegeven pad: %[1]s",
-    "install.lfs_jwt_secret_failed": "Kan geen LFS JWT-geheim genereren: %[1]s"
+    "error.not_found.title": "Pagina niet gevonden",
+    "alert.asset_load_failed": "Het laden van hulp-bestanden vanuit {path} is mislukt. Controleer of de hulp-bestanden toegankelijk zijn.",
+    "install.invalid_lfs_path": "Kan de LFS-root niet aanmaken op de opgegeven locatie: %[1]s",
+    "alert.range_error": " moet een getal zijn tussen %[1]s en %[2]s.",
+    "meta.last_line": "Wist je dat de paprika, behalve in de bekende kleuren rood, geel, oranje en groen, ook in de kleuren wit, paars, lila, muntgroen en bruin voorkomt.",
+    "mail.actions.successful_run_after_failure_subject": "Werkstroom %[1]s hersteld in repositorie %[2]s",
+    "mail.actions.not_successful_run_subject": "Werkstroom %[1]s mislukt in repositorie %[2]s",
+    "mail.actions.successful_run_after_failure": "Werkstroom %[1]s hersteld in repositorie %[2]s",
+    "mail.actions.not_successful_run": "Werkstroom %[1]s mislukt in repositorie %[2]s",
+    "mail.actions.run_info_cur_status": "De status van deze run: %[1]s (zojuist bijgewerkt van %[2]s)",
+    "mail.actions.run_info_previous_status": "Status vorige run: %[1]s",
+    "mail.actions.run_info_trigger": "Getriggerd omdat: %[1]s door: %[2]s",
+    "discussion.locked": "Deze discussie is afgesloten. Commentaar is alleen mogelijk voor bijdragers.",
+    "relativetime.now": "nu",
+    "relativetime.future": "in de toekomst",
+    "repo.form.cannot_create": "Alle ruimtes waarin u repositories kan maken hebben hun maximum aantal repositories bereikt.",
+    "moderation.report_content": "Meldt content",
+    "moderation.report_abuse_form.header": "Meld misbruik bij de beheerder",
+    "moderation.report_abuse_form.invalid": "Ongeldige argumenten",
+    "moderation.report_abuse_form.already_reported": "U heeft deze content reeds gerapporteerd",
+    "moderation.abuse_category": "Categorie",
+    "moderation.abuse_category.placeholder": "Selecteer een categorie",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Malware",
+    "moderation.report_abuse_form.details": "Dit formulier dient gebruikt te worden om gebruikers te rapporteren die spamprofielen, -issues, -commentaren aanmaken of zich anderszins misdragen.",
+    "moderation.submit_report": "Verzend rapport",
+    "moderation.reporting_failed": "De nieuwe misbruikrapportage kan niet worden ingediend: %v",
+    "moderation.reported_thank_you": "Dank voor uw melding. Het beheer is hierover nu geïnformeerd.",
+    "moderation.report_remarks.placeholder": "Geef a.u.b. wat details betreffende het misbruik dat u meldt.",
+    "followers.outgoing.list.none": "%s volgt niemand.",
+    "relativetime.1day": "gisteren",
+    "relativetime.2days": "twee dagen geleden",
+    "relativetime.1week": "vorige week",
+    "relativetime.2weeks": "twee weken geleden",
+    "relativetime.1month": "vorige maand",
+    "relativetime.2months": "twee maanden geleden",
+    "relativetime.1year": "vorig jaar",
+    "relativetime.2years": "twee jaar geleden",
+    "moderation.abuse_category.illegal_content": "Illegale content",
+    "moderation.abuse_category.other_violations": "Andere overtreding van platformregels",
+    "moderation.report_remarks": "Opmerkingen",
+    "editor.textarea.tab_hint": "Regel springt reeds in. Type <kbd>Tab</kbd> nogmaals of <kbd>Escape</kbd> om de editor te verlaten.",
+    "editor.textarea.shift_tab_hint": "Geen inspringing op deze regel. Type <kbd>Shift</kbd> + <kbd>Tab</kbd> nogmaals of <kbd>Escape</kbd> om de editor te verlaten.",
+    "relativetime.days": {
+        "one": "%d dag geleden",
+        "other": "%d dagen geleden"
+    },
+    "relativetime.weeks": {
+        "one": "%d week geleden",
+        "other": "%d weken geleden"
+    },
+    "relativetime.months": {
+        "one": "%d maand geleden",
+        "other": "%d maanden geleden"
+    },
+    "relativetime.years": {
+        "one": "%d jaar geleden",
+        "other": "%d jaren geleden"
+    },
+    "admin.config.moderation_config": "Moderatie configuratie",
+    "moderation.report_abuse": "Meld misbruik",
+    "relativetime.mins": {
+        "one": "%d minuut geleden",
+        "other": "%d minuten geleden"
+    },
+    "relativetime.hours": {
+        "one": "%d uur geleden",
+        "other": "%d uren geleden"
+    },
+    "repo.issue_indexer.title": "Issue indexer",
+    "stars.list.none": "Niemand heeft deze repo een ster gegeven.",
+    "watch.list.none": "Niemand houdt deze repo in de gaten.",
+    "followers.incoming.list.self.none": "Niemand volgt uw profiel.",
+    "followers.incoming.list.none": "Deze gebruiker wordt door niemand gevolgd.",
+    "followers.outgoing.list.self.none": "U volgt niemand.",
+    "settings.visibility.description": "Profielzichtbaarheid beïnvloedt de mogelijkheid van anderen om toegang te krijgen tot je niet-privé repositories. <a href=\"%s\" target=\"_blank\">Lees meer</a>.",
+    "repo.diff.commit.next-short": "Volgende",
+    "admin.dashboard.cleanup_offline_runners": "Offline runners opruimen",
+    "keys.ssh.link": "SSH sleutels",
+    "keys.gpg.link": "GPG sleutels",
+    "profile.actions.tooltip": "Meer acties",
+    "profile.edit.link": "Profiel bewerken",
+    "feed.atom.link": "Atom-feed",
+    "repo.diff.commit.previous-short": "Vorige",
+    "avatar.constraints_hint": "Eigen avatars mogen niet groter zijn dan %[1]s in grootte of groter zijn dan %[2]dx%[3]d pixels",
+    "og.repo.summary_card.alt_description": "Samenvattingsoverzicht van repositorie %[1]s, omschreven als: %[2]s",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "repo.settings.push_mirror.branch_filter.label": "Branch filter (optioneel)",
+    "repo.settings.push_mirror.branch_filter.description": "Branches die gespiegeld moeten worden. Laat het laag om alle branches te spiegelen. Zie <a href=\"%[1]s\">%[2]s documentatie</a> voor de syntax. Voorbeeld: <code>main, release/*</code>",
+    "admin.dashboard.remove_resolved_reports": "Opgeloste meldingen verwijderen",
+    "compare.branches.title": "Vergelijk branches",
+    "repo.commit.load_tags_failed": "Het laden van tags is mislukt vanwege een interne fout",
+    "admin.auths.allow_username_change": "Gebruikersnaam wijzigen toestaan",
+    "admin.auths.allow_username_change.description": "Gebruikers toestaan hun gebruikersnaam te wijzigen in de profielinstellingen",
+    "discussion.sidebar.reference": "Referentie",
+    "admin.moderation.moderation_reports": "Moderatiemeldingen",
+    "admin.moderation.no_open_reports": "Er zijn momenteel geen openstaande meldingen.",
+    "admin.moderation.reports": "Meldingen",
+    "admin.moderation.deleted_content_ref": "Gemelde inhoud met type %[1]v en id %[2]d bestaat niet meer",
+    "warning.repository.out_of_sync": "De databaserepresentatie van deze repository is niet gesynchroniseerd. Als deze waarschuwing nog steeds wordt weergegeven nadat u een commit naar deze repository hebt gepusht, neem dan contact op met de beheerder.",
+    "repo.pulls.already_merged": "Samenvoegen mislukt: deze pull request is al samengevoegd.",
+    "migrate.pagure.description": "Migreer gegevens van pagure.io of andere Pagure-instanties.",
+    "migrate.pagure.incorrect_url": "Er is een onjuiste URL voor de bronrepository opgegeven",
+    "migrate.pagure.project_url": "Pagure-project URL",
+    "migrate.pagure.project_example": "De url van het Pagure-project, bijvoorbeeld https://pagure.io/pagure",
+    "migrate.pagure.token_label": "Token",
+    "migrate.pagure.token_body_a": "Geef een Pagure API-token met toegang tot de privé-issues om een repository te maken met alleen de privé-issues erin",
+    "migrate.pagure.token_body_b": "Zorg ervoor dat u de vlag voor privé-repository hierboven instelt als u wilt dat deze repository privé is"
 }
diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json
index 85282b101d..e2fabdaf74 100644
--- a/options/locale_next/locale_pt-BR.json
+++ b/options/locale_next/locale_pt-BR.json
@@ -19,5 +19,109 @@
     "themes.names.forgejo-auto": "Forgejo (usar o tema do sistema)",
     "themes.names.forgejo-light": "Forgejo claro",
     "themes.names.forgejo-dark": "Forgejo escuro",
-    "install.invalid_lfs_path": "Não foi possível criar um root LFS no caminho especificado: %[1]s"
+    "error.not_found.title": "Página não encontrada",
+    "alert.asset_load_failed": "Não foi possível carregar arquivos de assets de {path}. Por favor, certifique-se que os arquivos podem ser acessados.",
+    "install.invalid_lfs_path": "Não foi possível criar um root LFS no caminho especificado: %[1]s",
+    "alert.range_error": " deve ser um número entre %[1]s e %[2]s.",
+    "meta.last_line": "real hot girl shit",
+    "mail.actions.run_info_cur_status": "Status desta execução: %[1]s (atualizado recentemente de %[2]s)",
+    "mail.actions.run_info_previous_status": "Status da execução anterior: %[1]s",
+    "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s recuperado no repositório %[2]s",
+    "mail.actions.not_successful_run_subject": "Workflow %[1]s falhou no repositório %[2]s",
+    "mail.actions.successful_run_after_failure": "Workflow %[1]s recuperado no repositório %[2]s",
+    "mail.actions.not_successful_run": "Workflow %[1]s falhou no repositório %[2]s",
+    "mail.actions.run_info_trigger": "Acionado devido a: %[1]s por: %[2]s",
+    "discussion.locked": "Esta discussão foi trancada. Apenas contribuidores podem adicionar comentários.",
+    "relativetime.future": "futuramente",
+    "relativetime.mins": {
+        "one": "%d minuto atrás",
+        "many": "%d minutos atrás",
+        "other": "%d minutos atrás"
+    },
+    "relativetime.days": {
+        "one": "%d dia atrás",
+        "many": "%d dias atrás",
+        "other": "%d dias atrás"
+    },
+    "relativetime.weeks": {
+        "one": "%d semana atrás",
+        "many": "%d semanas atrás",
+        "other": "%d semanas atrás"
+    },
+    "relativetime.months": {
+        "one": "%d mês atrás",
+        "many": "%d meses atrás",
+        "other": "%d meses atrás"
+    },
+    "relativetime.years": {
+        "one": "%d ano atrás",
+        "many": "%d anos atrás",
+        "other": "%d anos atrás"
+    },
+    "relativetime.1day": "ontem",
+    "relativetime.2days": "dois dias atrás",
+    "relativetime.1week": "semana passada",
+    "relativetime.1month": "mês passado",
+    "relativetime.2months": "dois meses atrás",
+    "relativetime.1year": "ano passado",
+    "relativetime.2years": "dois anos atrás",
+    "relativetime.hours": {
+        "one": "%d hora atrás",
+        "many": "%d horas atrás",
+        "other": "%d horas atrás"
+    },
+    "relativetime.2weeks": "duas semanas atrás",
+    "relativetime.now": "agora",
+    "moderation.reported_thank_you": "Agradecemos pela sua denúncia. A administração foi notificada.",
+    "moderation.report_content": "Denunciar conteúdo",
+    "admin.config.moderation_config": "Configuração de moderação",
+    "moderation.report_abuse": "Denunciar abuso",
+    "moderation.report_abuse_form.header": "Denunciar abuso à administração",
+    "moderation.report_abuse_form.invalid": "Argumentos inválidos",
+    "moderation.report_abuse_form.already_reported": "Você já denunciou este conteúdo",
+    "moderation.abuse_category": "Categoria",
+    "moderation.abuse_category.placeholder": "Selecione uma categoria",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Software malicioso",
+    "moderation.abuse_category.illegal_content": "Conteúdo ilegal",
+    "moderation.abuse_category.other_violations": "Outras violações de regras da plataforma",
+    "moderation.report_remarks": "Observações",
+    "moderation.report_remarks.placeholder": "Por favor, forneça detalhes sobre o abuso que você está denunciando.",
+    "moderation.submit_report": "Enviar denúncia",
+    "moderation.reporting_failed": "Não foi possível enviar a denúncia: %v",
+    "moderation.report_abuse_form.details": "Este formulário deve ser utilizado para denunciar contas com perfis, repositórios, issues e comentários com spam ou que se comportam inapropriadamente.",
+    "repo.form.cannot_create": "Todos os espaços onde você pode criar repositórios atingiram o limite de repositórios.",
+    "repo.issue_indexer.title": "Indexador de Issues",
+    "watch.list.none": "Ninguém está observando este repositório.",
+    "followers.incoming.list.self.none": "Ninguém está seguindo seu perfil.",
+    "followers.incoming.list.none": "Ninguém está seguindo este perfil.",
+    "followers.outgoing.list.none": "%s não está seguindo ninguém.",
+    "stars.list.none": "Ninguém favoritou este repositório.",
+    "followers.outgoing.list.self.none": "Você não está seguindo ninguém.",
+    "editor.textarea.tab_hint": "Linha já indentada. Pressione <kbd>Tab</kbd> novamente ou <kbd>Esc</kbd> para sair do editor.",
+    "editor.textarea.shift_tab_hint": "Sem indentação nesta linha. Pressione <kbd>Shift</kbd> + <kbd>Tab</kbd> novamente ou <kbd>Esc</kbd> para sair do editor.",
+    "admin.dashboard.cleanup_offline_runners": "Limpar runners desconectados",
+    "avatar.constraints_hint": "Imagem de perfil personalizada não pode exceder %[1]s em tamanho ou ser maior que %[2]dx%[3]d pixels",
+    "settings.visibility.description": "A visibilidade do perfil afeta a habilidade de acessarem seus repositórios não-privados. <a href=\"%s\" target=\"_blank\">Saiba mais</a>.",
+    "repo.diff.commit.next-short": "Próximo",
+    "repo.diff.commit.previous-short": "Anterior",
+    "profile.edit.link": "Editar perfil",
+    "feed.atom.link": "Feed Atom",
+    "keys.gpg.link": "Chaves GPG",
+    "og.repo.summary_card.alt_description": "Cartão de resumo do repositório %[1]s, descrito como: %[2]s",
+    "profile.actions.tooltip": "Mais Actions",
+    "keys.ssh.link": "Chaves SSH",
+    "mail.actions.run_info_sha": "Commit: %[1]s",
+    "repo.settings.push_mirror.branch_filter.label": "Filtro de branches (opcional)",
+    "repo.settings.push_mirror.branch_filter.description": "Branches para espelhar. Deixe em branco para espelhar todos os branches. Veja <a href=\"%[1]s\">%[2]s documentação</a> sobre a sintaxe. Exemplos: <code>main, release/*</code>",
+    "discussion.sidebar.reference": "Referência",
+    "admin.moderation.deleted_content_ref": "Conteúdo denunciado do tipo %[1]v e ID %[2]d não existe mais",
+    "admin.moderation.moderation_reports": "Denúncias para moderação",
+    "admin.moderation.reports": "Denúncias",
+    "admin.moderation.no_open_reports": "Não há denúncias abertas atualmente.",
+    "admin.dashboard.remove_resolved_reports": "Remover denúncias resolvidas",
+    "compare.branches.title": "Comparar branches",
+    "admin.auths.allow_username_change": "Permitir mudança de nome de usuário",
+    "admin.auths.allow_username_change.description": "Permitir que usuários alterem seus nomes de usuário nas configurações do perfil",
+    "repo.commit.load_tags_failed": "Carregamento de etiquetas falhou devido a um erro interno"
 }
diff --git a/options/locale_next/locale_pt-PT.json b/options/locale_next/locale_pt-PT.json
index 4c24ed5ea6..0bdabfd431 100644
--- a/options/locale_next/locale_pt-PT.json
+++ b/options/locale_next/locale_pt-PT.json
@@ -19,5 +19,105 @@
     "themes.names.forgejo-auto": "Forgejo (segue o tema do sistema)",
     "themes.names.forgejo-light": "Forgejo claro",
     "themes.names.forgejo-dark": "Forgejo escuro",
-    "install.invalid_lfs_path": "Não foi possível criar a raiz LFS no caminho especificado: %[1]s"
+    "error.not_found.title": "Página não encontrada",
+    "alert.asset_load_failed": "Falha ao carregar ficheiros de recurso de {path}. Certifique-se de que os ficheiros de recurso podem ser acedidos.",
+    "install.invalid_lfs_path": "Não foi possível criar a raiz LFS no caminho especificado: %[1]s",
+    "alert.range_error": " deve ser um número entre %[1]s e %[2]s.",
+    "meta.last_line": "Se programarem em Python, por favor usem o uv e Ruff (e estejam atentos ao Red Knot no repositório do Ruff). E vejam também mise-en-place (https://mise.jdx.dev).",
+    "mail.actions.successful_run_after_failure_subject": "Sequência de trabalho %[1]s foi recuperada no repositório %[2]s",
+    "mail.actions.not_successful_run_subject": "Sequência de trabalho %[1]s falhou no repositório %[2]s",
+    "mail.actions.not_successful_run": "Sequência de trabalho %[1]s falhou no repositório %[2]s",
+    "mail.actions.successful_run_after_failure": "Sequência de trabalho %[1]s foi recuperada no repositório %[2]s",
+    "discussion.locked": "Esta discussão foi fechada. Apenas contribuidores podem publicar comentários.",
+    "mail.actions.run_info_cur_status": "Estado desta execução: %[1]s (atualizado recentemente de %[2]s)",
+    "mail.actions.run_info_previous_status": "Estado da execução anterior: %[1]s",
+    "mail.actions.run_info_trigger": "Ativado porque: %[1]s por: %[2]s",
+    "relativetime.now": "agora",
+    "relativetime.future": "no futuro",
+    "relativetime.mins": {
+        "one": "%d minuto atrás",
+        "many": "%d minutos atrás",
+        "other": "%d minutos atrás"
+    },
+    "relativetime.weeks": {
+        "one": "%d semana atrás",
+        "many": "%d semanas atrás",
+        "other": "%d semanas atrás"
+    },
+    "relativetime.months": {
+        "one": "%d mês atrás",
+        "many": "%d meses atrás",
+        "other": "%d meses atrás"
+    },
+    "relativetime.years": {
+        "one": "%d ano atrás",
+        "many": "%d anos atrás",
+        "other": "%d anos atrás"
+    },
+    "relativetime.2days": "dois dias atrás",
+    "relativetime.2weeks": "duas semanas atrás",
+    "relativetime.1month": "mês passado",
+    "relativetime.2months": "dois meses atrás",
+    "relativetime.1year": "ano passado",
+    "relativetime.2years": "dois anos atrás",
+    "relativetime.days": {
+        "one": "%d dia atrás",
+        "many": "%d dias atrás",
+        "other": "%d dias atrás"
+    },
+    "relativetime.hours": {
+        "one": "%d hora atrás",
+        "many": "%d horas atrás",
+        "other": "%d horas atrás"
+    },
+    "relativetime.1week": "semana passada",
+    "relativetime.1day": "ontem",
+    "moderation.report_remarks.placeholder": "Por favor forneça alguns pormenores sobre o abuso que está a denunciar.",
+    "admin.config.moderation_config": "Configuração de moderação",
+    "moderation.report_abuse": "Denunciar abuso",
+    "moderation.report_content": "Denunciar conteúdo",
+    "moderation.report_abuse_form.header": "Denunciar abuso à administração",
+    "moderation.report_abuse_form.details": "Este formulário deve ser utilizado para denunciar utilizadores que criam perfis, repositórios, questões, comentários de spam ou que se comportam de forma inadequada.",
+    "moderation.report_abuse_form.invalid": "Argumentos inválidos",
+    "moderation.report_abuse_form.already_reported": "Já denunciou este conteúdo",
+    "moderation.abuse_category": "Categoria",
+    "moderation.abuse_category.placeholder": "Escolha uma categoria",
+    "moderation.abuse_category.spam": "Spam",
+    "moderation.abuse_category.malware": "Software malicioso",
+    "moderation.abuse_category.illegal_content": "Conteúdo ilegal",
+    "moderation.abuse_category.other_violations": "Outras violações das regras da plataforma",
+    "moderation.report_remarks": "Observações",
+    "moderation.submit_report": "Submeter denúncia",
+    "moderation.reporting_failed": "Não foi possível submeter a nova denúncia de abuso: %v",
+    "moderation.reported_thank_you": "Obrigado pela sua denúncia. A administração foi informada do facto.",
+    "repo.form.cannot_create": "Todos os espaços nos quais pode criar repositórios atingiram o limite de repositórios.",
+    "repo.issue_indexer.title": "Indexador de Questões",
+    "watch.list.none": "Ninguém está a vigiar este repositório.",
+    "followers.incoming.list.self.none": "Ninguém está a seguir o seu perfil.",
+    "followers.incoming.list.none": "Ninguém está a seguir este utilizador.",
+    "followers.outgoing.list.none": "%s não está a seguir ninguém.",
+    "followers.outgoing.list.self.none": "Não está a seguir ninguém.",
+    "editor.textarea.tab_hint": "Linha já indentada. Pressione <kbd>Tab</kbd> novamente ou <kbd>Escape</kbd> para sair do editor.",
+    "editor.textarea.shift_tab_hint": "Sem indentação nesta linha. Pressione <kbd>Shift</kbd> + <kbd>Tab</kbd> novamente ou <kbd>Escape</kbd> para sair do editor.",
+    "stars.list.none": "Ninguém juntou este repositório aos favoritos.",
+    "admin.dashboard.cleanup_offline_runners": "Limpeza de executores offline",
+    "settings.visibility.description": "A visibilidade do perfil afecta a capacidade de outros acederem aos seus repositórios não privados. <a href=\"%s\" target=\"_blank\">Saiba mais</a>.",
+    "avatar.constraints_hint": "O avatar personalizado não pode exceder %[1]s de tamanho ou ser maior do que %[2]dx%[3]d pixéis",
+    "repo.diff.commit.next-short": "Seg.",
+    "profile.actions.tooltip": "Mais Actions",
+    "profile.edit.link": "Editar perfil",
+    "feed.atom.link": "Feed Atom",
+    "keys.ssh.link": "Chaves SSH",
+    "keys.gpg.link": "Chaves GPG",
+    "repo.diff.commit.previous-short": "Ant.",
+    "og.repo.summary_card.alt_description": "Cartão de resumo do repositório %[1]s, descrito como: %[2]s",
+    "repo.settings.push_mirror.branch_filter.label": "Filtro de ramos (opcional)",
+    "repo.settings.push_mirror.branch_filter.description": "Ramos a serem espelhados. Deixe em branco para espelhar todos os ramos. Veja a <a href=\"%[1]s\">%[2]s documentação</a> sobre a sintaxe. Exemplos: <code>main, release/*</code>",
+    "mail.actions.run_info_sha": "Cometimento: %[1]s",
+    "discussion.sidebar.reference": "Referência",
+    "admin.dashboard.remove_resolved_reports": "Remover denúncias resolvidas",
+    "admin.moderation.no_open_reports": "Atualmente não há denúncias em aberto.",
+    "admin.moderation.deleted_content_ref": "O conteúdo denunciado do tipo %[1]v e id %[2]d já não existe",
+    "admin.moderation.moderation_reports": "Denúncias aos moderadores",
+    "admin.moderation.reports": "Denúncias"
 }
diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json
index 88bbe18b09..0838e9063e 100644
--- a/options/locale_next/locale_ru-RU.json
+++ b/options/locale_next/locale_ru-RU.json
@@ -19,5 +19,109 @@
     "themes.names.forgejo-light": "Forgejo – светлая",
     "themes.names.forgejo-auto": "Forgejo – как в системе",
     "themes.names.forgejo-dark": "Forgejo – тёмная",
-    "install.invalid_lfs_path": "Не удалось расположить корень LFS по указанному пути: %[1]s"
+    "error.not_found.title": "Страница не найдена",
+    "alert.asset_load_failed": "Не удалось получить ресурсы из {path}. Убедитесь, что файлы ресурсов доступны.",
+    "install.invalid_lfs_path": "Не удалось расположить корень LFS по указанному пути: %[1]s",
+    "alert.range_error": " - число должно быть в диапазоне от %[1]s-%[2]s.",
+    "meta.last_line": "...ъъ",
+    "mail.actions.not_successful_run_subject": "Провал раб. потока %[1]s в репозитории %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Возобновление раб. потока %[1]s в репозитории %[2]s",
+    "mail.actions.run_info_trigger": "Причина срабатывания: %[1]s by: %[2]s",
+    "mail.actions.successful_run_after_failure": "Рабочий поток %[1]s в репозитории %[2]s был возобновлён после провала",
+    "mail.actions.run_info_cur_status": "Текущее состояние: %[1]s (обновлено после %[2]s)",
+    "mail.actions.run_info_previous_status": "Предыдущее состояние: %[1]s",
+    "discussion.locked": "Обсуждение ограничено. Комментировать могут только соавторы.",
+    "mail.actions.not_successful_run": "Рабочий поток %[1]s в репозитории %[2]s провалился",
+    "relativetime.now": "только что",
+    "relativetime.future": "из будущего",
+    "relativetime.mins": {
+        "one": "%d минуту назад",
+        "few": "%d минуты назад",
+        "many": "%d минут назад"
+    },
+    "relativetime.hours": {
+        "one": "%d час назад",
+        "few": "%d часа назад",
+        "many": "%d часов назад"
+    },
+    "relativetime.days": {
+        "one": "%d день назад",
+        "few": "%d дня назад",
+        "many": "%d дней назад"
+    },
+    "relativetime.weeks": {
+        "one": "%d неделю назад",
+        "few": "%d недели назад",
+        "many": "%d недель назад"
+    },
+    "relativetime.years": {
+        "one": "%d год назад",
+        "few": "%d года назад",
+        "many": "%d лет назад"
+    },
+    "relativetime.1day": "вчера",
+    "relativetime.2weeks": "две недели назад",
+    "relativetime.2months": "два месяца назад",
+    "relativetime.1month": "в прошлом месяце",
+    "relativetime.1week": "на прошлой неделе",
+    "relativetime.2days": "позавчера",
+    "relativetime.2years": "два года назад",
+    "relativetime.months": {
+        "one": "%d месяц назад",
+        "few": "%d месяца назад",
+        "many": "%d месяцев назад"
+    },
+    "relativetime.1year": "в прошлом году",
+    "repo.issue_indexer.title": "Индексатор задач",
+    "followers.incoming.list.self.none": "На вас никто не подписан.",
+    "followers.incoming.list.none": "На этого пользователя никто не подписан.",
+    "followers.outgoing.list.none": "%s ни на кого не подписан.",
+    "stars.list.none": "Никто не добавил этот репозиторий в избранное.",
+    "watch.list.none": "Никто не отслеживает этот репозиторий.",
+    "repo.form.cannot_create": "Во всех пространствах, где вы можете создавать репозитории, достигнуто ограничение количества репозиториев.",
+    "followers.outgoing.list.self.none": "Вы ни на кого не подписаны.",
+    "admin.config.moderation_config": "Настройки модерации",
+    "moderation.abuse_category": "Категория",
+    "moderation.abuse_category.placeholder": "Выберите категорию",
+    "moderation.abuse_category.spam": "Спам",
+    "moderation.abuse_category.malware": "Вредоносное ПО",
+    "moderation.abuse_category.illegal_content": "Незаконное содержимое",
+    "moderation.abuse_category.other_violations": "Прочие нарушения правил",
+    "moderation.report_remarks": "Подробности",
+    "moderation.report_abuse": "Пожаловаться",
+    "moderation.report_remarks.placeholder": "Пожалуйста, предоставьте немного подробностей о содержимом, на которое вы жалуетесь.",
+    "moderation.reporting_failed": "Не удалось отправить жалобу: %v",
+    "moderation.report_content": "Пожаловаться",
+    "moderation.report_abuse_form.already_reported": "Вы уже пожаловались на это содержимое",
+    "moderation.submit_report": "Пожаловаться",
+    "moderation.reported_thank_you": "Спасибо за ваше сообщение. Администрация оповещена.",
+    "moderation.report_abuse_form.details": "Через эту форму можно жаловаться на пользователей, распространяющих спам или ведущих себя неадекватно.",
+    "moderation.report_abuse_form.invalid": "Невалидные аргументы",
+    "moderation.report_abuse_form.header": "Жалоба администрации",
+    "editor.textarea.tab_hint": "Отступ уже добавлен. Нажмите <kbd>Tab</kbd> снова или <kbd>Escape</kbd>, чтобы покинуть редактор.",
+    "editor.textarea.shift_tab_hint": "В строке нет отступов. Нажмите <kbd>Shift</kbd> + <kbd>Tab</kbd> снова или <kbd>Escape</kbd>, чтобы покинуть редактор.",
+    "admin.dashboard.cleanup_offline_runners": "Удалить недоступных исполнителей",
+    "avatar.constraints_hint": "Изображение профиля не может быть более %[1]s и крупнее %[2]dx%[3]d пикселей",
+    "settings.visibility.description": "Видимость профиля влияет на доступ других до ваших не частных репозиториев. <a href=\"%s\" target=\"_blank\">Подробнее</a>.",
+    "repo.diff.commit.previous-short": "Пред.",
+    "repo.diff.commit.next-short": "След.",
+    "profile.actions.tooltip": "Показать действия",
+    "feed.atom.link": "Atom-лента",
+    "keys.ssh.link": "Ключи SSH",
+    "keys.gpg.link": "Ключи GPG",
+    "profile.edit.link": "Изменить профиль",
+    "og.repo.summary_card.alt_description": "Карточка со сводкой о репозитории %s. Описание: %[2]s",
+    "mail.actions.run_info_sha": "Коммит: %[1]s",
+    "repo.settings.push_mirror.branch_filter.description": "Синхронизируемые ветви. Оставьте пустым, чтобы синхронизировать все. Ознакомьтесь с синтаксисом в <a href=\"%[1]s\">документации %[2]s</a>. Примеры: <code>main, release/*</code>",
+    "repo.settings.push_mirror.branch_filter.label": "Выбор ветвей (опционально)",
+    "discussion.sidebar.reference": "Ссылка",
+    "admin.moderation.moderation_reports": "Жалобы модерации",
+    "admin.moderation.deleted_content_ref": "Содержимое типа %[1]v и ид. %[2]d, на которое пожаловались, более не существует",
+    "admin.moderation.reports": "Жалобы",
+    "admin.moderation.no_open_reports": "Нет открытых жалоб.",
+    "admin.dashboard.remove_resolved_reports": "Удалить разрешённые жалобы",
+    "compare.branches.title": "Сравнение ветвей",
+    "repo.commit.load_tags_failed": "Загрузка тегов не удалась из-за внутренней ошибки",
+    "admin.auths.allow_username_change.description": "Пользователи смогут изменять свои имена после регистрации",
+    "admin.auths.allow_username_change": "Разрешить смену имён"
 }
diff --git a/options/locale_next/locale_sk-SK.json b/options/locale_next/locale_sk-SK.json
index 953a7511db..e3195377ad 100644
--- a/options/locale_next/locale_sk-SK.json
+++ b/options/locale_next/locale_sk-SK.json
@@ -1,13 +1,16 @@
 {
+    "error.not_found.title": "Stránka nebola nájedná",
+    "incorrect_root_url": "Táto inštancia Forgejo je nakonfigurovaná tak, aby bola obsluhovaná na „%s“. Momentálne zobrazujete Forgejo prostredníctvom inej adresy URL, čo môže spôsobiť poruchu niektorých častí aplikácie. Kanonickú adresu URL kontrolujú správcovia aplikácie Forgejo prostredníctvom nastavenia ROOT_URL v súbore app.ini.",
+    "themes.names.forgejo-auto": "Forgejo (sleduj systémovú tému)",
+    "themes.names.forgejo-light": "Forgejo svetlé",
+    "themes.names.forgejo-dark": "Forgejo tmavé",
+    "alert.asset_load_failed": "Nepodarilo sa načítať súbory z {path}. Uistite sa, že súbory sú prístupné.",
+    "install.invalid_lfs_path": "Nie je možné vytvoriť koreňový systém LFS na zadanej ceste: %[1]s",
+    "alert.range_error": " musí byť číslo medzi %[1]s a %[2]s.",
     "home.welcome.no_activity": "Žiadna aktivita",
     "home.welcome.activity_hint": "Vo vašom kanáli zatiaľ nič nie je. Tu sa budú zobrazovať vaše akcie a aktivity z repozitárov, ktoré sledujete.",
     "home.explore_repos": "Preskúmajte repozitáre",
     "home.explore_users": "Preskúmajte používateľov",
     "home.explore_orgs": "Preskúmajte organizácie",
-    "search.milestone_kind": "Hľadať v míľnikoch…",
-    "incorrect_root_url": "Táto inštancia Forgejo je nakonfigurovaná tak, aby bola obsluhovaná na „%s“. Momentálne zobrazujete Forgejo prostredníctvom inej adresy URL, čo môže spôsobiť poruchu niektorých častí aplikácie. Kanonickú adresu URL kontrolujú správcovia aplikácie Forgejo prostredníctvom nastavenia ROOT_URL v súbore app.ini.",
-    "themes.names.forgejo-auto": "Forgejo (sleduj systémovú tému)",
-    "themes.names.forgejo-light": "Forgejo svetlé",
-    "themes.names.forgejo-dark": "Forgejo tmavé",
-    "install.invalid_lfs_path": "Nie je možné vytvoriť koreňový systém LFS na zadanej ceste: %[1]s"
+    "search.milestone_kind": "Hľadať v míľnikoch…"
 }
diff --git a/options/locale_next/locale_sr-SP.json b/options/locale_next/locale_sr-SP.json
index 0967ef424b..611f997b3e 100644
--- a/options/locale_next/locale_sr-SP.json
+++ b/options/locale_next/locale_sr-SP.json
@@ -1 +1,3 @@
-{}
+{
+    "moderation.abuse_category.malware": "Малвер"
+}
diff --git a/options/locale_next/locale_sv-SE.json b/options/locale_next/locale_sv-SE.json
index dc41e4d6e1..1195647bf5 100644
--- a/options/locale_next/locale_sv-SE.json
+++ b/options/locale_next/locale_sv-SE.json
@@ -1,5 +1,106 @@
 {
-    "repo.pulls.merged_title_desc": "sammanfogade %[1]d incheckningar från <code>%[2]s</code> in i <code>%[3]s</code> %[4]s",
-    "repo.pulls.title_desc": "vill sammanfoga %[1]d incheckningar från <code>s[2]s</code> in i <code id=\"%[4]s\">%[3]s</code>",
-    "search.milestone_kind": "Sök milstolpar..."
+    "repo.pulls.merged_title_desc": {
+        "one": "sammanfogade %[1]d incheckning från <code>%[2]s</code> in i <code>%[3]s</code> %[4]s",
+        "other": "sammanfogade %[1]d incheckningar från <code>%[2]s</code> in i <code>%[3]s</code> %[4]s"
+    },
+    "repo.pulls.title_desc": {
+        "one": "vill sammanfoga %[1]d incheckning från <code>s[2]s</code> in i <code id=\"%[4]s\">%[3]s</code>",
+        "other": "vill sammanfoga %[1]d incheckningar från <code>s[2]s</code> in i <code id=\"%[4]s\">%[3]s</code>"
+    },
+    "search.milestone_kind": "Sök milstolpar…",
+    "mail.actions.not_successful_run_subject": "Arbetsflödet %[1]s misslyckades i förrådet %[2]s",
+    "discussion.locked": "Denna diskussion har låsts. Kommentarer är begränsade till bidragsgivare.",
+    "relativetime.now": "nu",
+    "relativetime.1day": "igår",
+    "relativetime.2days": "för två dagar sedan",
+    "relativetime.days": {
+        "one": "%d dag sedan",
+        "other": "%d dagar sedan"
+    },
+    "admin.dashboard.cleanup_offline_runners": "Städa upp offline runners",
+    "repo.issue_indexer.title": "Indexerare för utgåvor",
+    "moderation.reported_thank_you": "Tack för din rapport. Administrationen har gjorts uppmärksam på det.",
+    "themes.names.forgejo-light": "Forgejo ljus",
+    "themes.names.forgejo-dark": "Forgejo mörk",
+    "themes.names.forgejo-auto": "Forgejo (följ systemets tema)",
+    "moderation.submit_report": "Skicka in rapport",
+    "moderation.reporting_failed": "Det gick inte att skicka in den nya övergreppsrapporten: %v",
+    "mail.actions.run_info_cur_status": "Status för denna körning: %[1]s (just uppdaterad från %[2]s)",
+    "mail.actions.run_info_previous_status": "Status för föregående körning: %[1]s",
+    "mail.actions.run_info_trigger": "Utlöses på grund av: %[1]s av: %[2]s",
+    "alert.asset_load_failed": "Misslyckades med att läsa in resursfiler från {path}. Kontrollera att resursfilerna är åtkomliga.",
+    "install.invalid_lfs_path": "Det gick inte att skapa LFS-roten på den angivna sökvägen: %[1]s",
+    "alert.range_error": " måste vara ett tal mellan %[1]s och %[2]s.",
+    "stars.list.none": "Ingen har stjärnmarkerat detta förråd.",
+    "watch.list.none": "Ingen tittar på det här förrådet.",
+    "followers.incoming.list.self.none": "Ingen följer din profil.",
+    "followers.incoming.list.none": "Ingen följer den här användaren.",
+    "followers.outgoing.list.self.none": "Du följer inte någon.",
+    "followers.outgoing.list.none": "%s följer inte någon.",
+    "relativetime.future": "i framtiden",
+    "relativetime.1week": "förra veckan",
+    "relativetime.2weeks": "för två veckor sedan",
+    "relativetime.1month": "senaste månaden",
+    "relativetime.2months": "för två månader sedan",
+    "relativetime.1year": "förra året",
+    "relativetime.2years": "för två år sedan",
+    "repo.form.cannot_create": "Alla utrymmen där du kan skapa förråd har nått gränsen för antal förråd.",
+    "incorrect_root_url": "Denna Forgejo-instans är konfigurerad att serveras på \"%s\". Du tittar för närvarande på Forgejo via en annan URL, vilket kan leda till att delar av applikationen bryts. Den kanoniska webbadressen styrs av Forgejo-administratörer via inställningen ROOT_URL i app.ini.",
+    "error.not_found.title": "Sidan hittades inte",
+    "moderation.abuse_category.illegal_content": "Olagligt innehåll",
+    "moderation.abuse_category.other_violations": "Andra överträdelser av plattformsreglerna",
+    "moderation.report_remarks": "Anmärkningar",
+    "moderation.report_remarks.placeholder": "Ge några detaljer om det övergrepp som du rapporterar.",
+    "mail.actions.successful_run_after_failure_subject": "Arbetsflöde %[1]s återställdes i förrådet %[2]s",
+    "mail.actions.successful_run_after_failure": "Arbetsflöde %[1]s återställdes i förrådet %[2]s",
+    "mail.actions.not_successful_run": "Arbetsflödet %[1]s misslyckades i förrådet %[2]s",
+    "editor.textarea.shift_tab_hint": "Ingen indragning på den här raden. Tryck på <kbd>Shift</kbd> + <kbd>Tab</kbd> igen eller <kbd>Escape</kbd> för att lämna redigeringsläget.",
+    "meta.last_line": "Daniel Nylander heter jag och har översatt Forgejo. Mer information om mig på https://www.danielnylander.se",
+    "editor.textarea.tab_hint": "Raden är redan indragen. Tryck på <kbd>Tab</kbd> igen eller <kbd>Escape</kbd> för att lämna redigeringsläget.",
+    "home.welcome.no_activity": "Ingen aktivitet",
+    "home.welcome.activity_hint": "Det finns inget i ditt flöde ännu. Dina åtgärder och aktivitet från förråd som du bevakar kommer att visas här.",
+    "home.explore_repos": "Utforska förråd",
+    "home.explore_users": "Utforska användare",
+    "home.explore_orgs": "Utforska organisationer",
+    "relativetime.mins": {
+        "one": "%d minut sedan",
+        "other": "%d minuter sedan"
+    },
+    "relativetime.hours": {
+        "one": "%d timme sedan",
+        "other": "%d timmar sedan"
+    },
+    "relativetime.weeks": {
+        "one": "%d vecka sedan",
+        "other": "%d veckor sedan"
+    },
+    "relativetime.months": {
+        "one": "%d månad sedan",
+        "other": "%d månader sedan"
+    },
+    "relativetime.years": {
+        "one": "%d år sedan",
+        "other": "%d år sedan"
+    },
+    "admin.config.moderation_config": "Konfiguration av moderering",
+    "moderation.report_abuse": "Rapportera missbruk",
+    "moderation.report_content": "Rapportera innehåll",
+    "moderation.report_abuse_form.header": "Rapportera missbruk till administratör",
+    "moderation.report_abuse_form.details": "Detta formulär ska användas för att rapportera användare som skapar skräpprofiler, förråd, problem, kommentarer eller beter sig olämpligt.",
+    "moderation.report_abuse_form.invalid": "Ogiltiga argument",
+    "moderation.report_abuse_form.already_reported": "Du har redan rapporterat detta innehåll",
+    "moderation.abuse_category": "Kategori",
+    "moderation.abuse_category.placeholder": "Välj en kategori",
+    "moderation.abuse_category.spam": "Skräppost",
+    "moderation.abuse_category.malware": "Skadlig kod",
+    "settings.visibility.description": "Profilens synlighet påverkar andras möjlighet att komma åt dina icke-privata förråd. <a href=\"%s\" target=\"_blank\">Läs mer</a>",
+    "avatar.constraints_hint": "Anpassade avatarer får inte vara större än %[1] eller %[2]dx%[3] bildpunkter",
+    "og.repo.summary_card.alt_description": "Sammanfattningskort för arkivet %[1]s, beskrivet som: %[2]s",
+    "profile.actions.tooltip": "Fler åtgärder",
+    "keys.gpg.link": "GPG-nycklar",
+    "profile.edit.link": "Redigera profil",
+    "keys.ssh.link": "SSH-nycklar",
+    "repo.diff.commit.next-short": "Nästa",
+    "repo.diff.commit.previous-short": "Föreg",
+    "feed.atom.link": "Atom-flöde"
 }
diff --git a/options/locale_next/locale_tr-TR.json b/options/locale_next/locale_tr-TR.json
index b0e34e677f..fa71cb8e7d 100644
--- a/options/locale_next/locale_tr-TR.json
+++ b/options/locale_next/locale_tr-TR.json
@@ -1,5 +1,6 @@
 {
     "repo.pulls.merged_title_desc": "%[4]s <code>%[2]s</code> içindeki %[1]d işlemeyi <code>%[3]s</code> ile birleştirdi",
     "repo.pulls.title_desc": "<code>%[2]s</code> içindeki %[1]d işlemeyi <code id=\"%[4]s\">%[3]s</code> ile birleştirmek istiyor",
-    "search.milestone_kind": "Kilometre taşlarını ara..."
+    "search.milestone_kind": "Kilometre taşlarını ara...",
+    "moderation.abuse_category.malware": "Malware"
 }
diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json
index 8e45bfd5c7..1fbe503003 100644
--- a/options/locale_next/locale_uk-UA.json
+++ b/options/locale_next/locale_uk-UA.json
@@ -19,7 +19,118 @@
     "themes.names.forgejo-light": "Forgejo світла",
     "themes.names.forgejo-dark": "Forgejo темна",
     "themes.names.forgejo-auto": "Forgejo (як у системі)",
-    "settings.adopt": "Прийняти",
+    "error.not_found.title": "Сторінку не знайдено",
+    "alert.asset_load_failed": "Не вдалося завантажити файли ресурсів з {path}. Переконайтеся, що до файлів ресурсів є доступ.",
     "install.invalid_lfs_path": "Не вдалося створити корінь LFS за вказаним шляхом: %[1]s",
-    "install.lfs_jwt_secret_failed": "Не вдалося створити секрет LFS JWT: %[1]s"
+    "alert.range_error": " має бути числом від %[1]s до %[2]s.",
+    "meta.last_line": "Не зливай злий запити на злиття — зіллється зле.",
+    "mail.actions.successful_run_after_failure": "Робочий потік %[1]s відновлено в репозиторії %[2]s",
+    "mail.actions.successful_run_after_failure_subject": "Робочий потік %[1]s відновлено в репозиторії %[2]s",
+    "mail.actions.run_info_previous_status": "Стан попереднього запуску: %[1]s",
+    "mail.actions.run_info_cur_status": "Стан цього запуску: %[1]s (щойно оновлено з %[2]s)",
+    "mail.actions.run_info_trigger": "Причина: %[1]s від: %[2]s",
+    "mail.actions.not_successful_run_subject": "Помилка робочого потоку %[1]s в репозиторії %[2]s",
+    "mail.actions.not_successful_run": "Помилка робочого потоку %[1]s в репозиторії %[2]s",
+    "discussion.locked": "Це обговорення було закрито. Коментувати можуть лише учасники.",
+    "relativetime.mins": {
+        "one": "%d хвилину тому",
+        "few": "%d хвилини тому",
+        "many": "%d хвилин тому"
+    },
+    "relativetime.days": {
+        "one": "%d день тому",
+        "few": "%d дні тому",
+        "many": "%d днів тому"
+    },
+    "relativetime.1day": "учора",
+    "relativetime.1week": "минулого тижня",
+    "relativetime.2weeks": "два тижні тому",
+    "relativetime.1month": "минулого місяця",
+    "relativetime.1year": "минулого року",
+    "relativetime.2years": "два роки тому",
+    "relativetime.2months": "два місяці тому",
+    "relativetime.now": "щойно",
+    "relativetime.2days": "два дні тому",
+    "relativetime.future": "у майбутньому",
+    "relativetime.weeks": {
+        "one": "%d тиждень тому",
+        "few": "%d тижні тому",
+        "many": "%d тижнів тому"
+    },
+    "relativetime.months": {
+        "one": "%d місяць тому",
+        "few": "%d місяці тому",
+        "many": "%d місяців тому"
+    },
+    "relativetime.hours": {
+        "one": "%d годину тому",
+        "few": "%d години тому",
+        "many": "%d годин тому"
+    },
+    "relativetime.years": {
+        "one": "%d рік тому",
+        "few": "%d роки тому",
+        "many": "%d років тому"
+    },
+    "admin.config.moderation_config": "Конфігурація модерування",
+    "moderation.abuse_category.placeholder": "Виберіть категорію",
+    "moderation.report_abuse_form.invalid": "Недійсні аргументи",
+    "moderation.report_abuse_form.already_reported": "Ви вже скаржилися на цей вміст",
+    "moderation.report_abuse": "Повідомити про порушення",
+    "moderation.report_content": "Поскаржитися на вміст",
+    "moderation.abuse_category.spam": "Спам",
+    "moderation.report_remarks.placeholder": "Будь ласка, докладно опишіть порушення, про яке ви повідомляєте.",
+    "moderation.submit_report": "Надіслати скаргу",
+    "moderation.abuse_category.malware": "Шкідливе ПЗ",
+    "moderation.abuse_category.illegal_content": "Нелегальний вміст",
+    "moderation.report_abuse_form.header": "Повідомити адміністраторам про порушення",
+    "moderation.report_abuse_form.details": "Використовуйте цю форму, щоб повідомити про користувачів, які створюють спам-профілі, репозиторії, задачі, коментарі або поводяться неналежним чином.",
+    "moderation.abuse_category": "Категорія",
+    "moderation.abuse_category.other_violations": "Інші порушення правил платформи",
+    "moderation.reporting_failed": "Не вдалося надіслати повідомлення про порушення: %v",
+    "moderation.report_remarks": "Подробиці",
+    "moderation.reported_thank_you": "Дякуємо за ваше повідомлення. Адміністрацію поінформовано про нього.",
+    "repo.form.cannot_create": "У всіх просторах, де ви можете створювати репозиторії, досягнуто обмеження кількості репозиторіїв.",
+    "repo.issue_indexer.title": "Індексатор задач",
+    "followers.incoming.list.self.none": "Ніхто не стежить за вашим профілем.",
+    "followers.incoming.list.none": "Ніхто не стежить за цим користувачем.",
+    "followers.outgoing.list.self.none": "Ви ні за ким не стежите.",
+    "followers.outgoing.list.none": "%s ні за ким не стежить.",
+    "stars.list.none": "Ніхто не додав цей репозиторій в обрані.",
+    "watch.list.none": "Ніхто не спостерігає за цим репозиторієм.",
+    "editor.textarea.tab_hint": "У рядку вже є відступ. Натисніть <kbd>Tab</kbd> ще раз або <kbd>Esc</kbd>, щоб вийти з редактора.",
+    "editor.textarea.shift_tab_hint": "У цьому рядку немає відступів. Натисніть <kbd>Shift</kbd> + <kbd>Tab</kbd> ще раз або <kbd>Esc</kbd>, щоб вийти з редактора.",
+    "admin.dashboard.cleanup_offline_runners": "Очистити неактивні раннери",
+    "settings.visibility.description": "Видимість профілю впливає на можливість інших користувачів отримати доступ до ваших неприватних репозиторіїв. <a href=\"%s\" target=\"_blank\">Дізнатися більше</a>.",
+    "avatar.constraints_hint": "Розмір користувацького аватара не може перевищувати %[1]s або бути більшим за %[2]d×%[3]d пікселів",
+    "repo.diff.commit.next-short": "Наступний",
+    "repo.diff.commit.previous-short": "Попередній",
+    "keys.ssh.link": "Ключі SSH",
+    "keys.gpg.link": "Ключі GPG",
+    "profile.edit.link": "Редагувати профіль",
+    "feed.atom.link": "Стрічка Atom",
+    "profile.actions.tooltip": "Більше дій",
+    "og.repo.summary_card.alt_description": "Підсумкова картка репозиторію %[1]s з описом: %[2]s",
+    "mail.actions.run_info_sha": "Коміт: %[1]s",
+    "repo.settings.push_mirror.branch_filter.description": "Гілки для дзеркалювання. Залиште порожнім, щоб віддзеркалити всі гілки. Дивіться синтаксис у <a href=\"%[1]s\">документації %[2]s</a>. Приклади: <code>main, release/*</code>",
+    "repo.settings.push_mirror.branch_filter.label": "Фільтр гілок (необов'язково)",
+    "discussion.sidebar.reference": "Посилання",
+    "admin.moderation.no_open_reports": "Відкритих скарг наразі немає.",
+    "admin.moderation.reports": "Скарги",
+    "admin.moderation.deleted_content_ref": "Вміст типу %[1]v з ідентифікатором %[2]d, на який подано скаргу, більше не існує",
+    "admin.moderation.moderation_reports": "Скарги модераторам",
+    "admin.dashboard.remove_resolved_reports": "Видалити закриті скарги",
+    "compare.branches.title": "Порівняти гілки",
+    "repo.commit.load_tags_failed": "Завантаження тегів не вдалося через внутрішню помилку",
+    "admin.auths.allow_username_change.description": "Дозволити користувачам змінювати ім'я користувача в налаштуваннях профілю",
+    "admin.auths.allow_username_change": "Дозволити змінювати імена",
+    "warning.repository.out_of_sync": "База даних цього репозиторію не синхронізована. Якщо ви знову бачите це попередження після відправлення коміту в цей репозиторій, зверніться до адміністратора.",
+    "repo.pulls.already_merged": "Не вдалося об'єднати: цей запит на злиття вже об'єднано.",
+    "migrate.pagure.description": "Перенести дані з pagure.io або інших екземплярів Pagure.",
+    "migrate.pagure.token_label": "Токен",
+    "migrate.pagure.project_url": "URL-адреса проєкту Pagure",
+    "migrate.pagure.project_example": "URL-адреса проєкту Pagure, наприклад, https://pagure.io/pagure",
+    "migrate.pagure.token_body_b": "Якщо хочете зробити цей репозиторій приватним, обов'язково встановіть прапорець «Приватний репозиторій» вище",
+    "migrate.pagure.incorrect_url": "Вказано неправильну URL-адресу репозиторію-джерела",
+    "migrate.pagure.token_body_a": "Уведіть токен API Pagure з доступом до приватних задач, щоб створити репозиторій, який міститиме лише приватні задачі"
 }
diff --git a/options/locale_next/locale_vi.json b/options/locale_next/locale_vi.json
index 0967ef424b..7ae64113b6 100644
--- a/options/locale_next/locale_vi.json
+++ b/options/locale_next/locale_vi.json
@@ -1 +1,3 @@
-{}
+{
+    "moderation.abuse_category.malware": "Phần mềm ác ý"
+}
diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json
index fd7a9b357e..d26d95bbf7 100644
--- a/options/locale_next/locale_zh-CN.json
+++ b/options/locale_next/locale_zh-CN.json
@@ -11,6 +11,85 @@
     "themes.names.forgejo-auto": "Forgejo（遵循系统主题）",
     "themes.names.forgejo-light": "Forgejo 浅色",
     "themes.names.forgejo-dark": "Forgejo 深色",
+    "error.not_found.title": "页面不存在",
+    "alert.asset_load_failed": "无法从 {path} 加载资源文件。请确保资源文件可被访问。",
     "install.invalid_lfs_path": "无法在指定路径创建 LFS 根目录：%[1]s",
-    "install.lfs_jwt_secret_failed": "无法生成 LFS JWT 密钥：%[1]s"
+    "alert.range_error": " 必须是一个介于 %[1]s 和 %[2]s 之间的数字。",
+    "meta.last_line": "感谢各位对Forgejo翻译的支持和帮助！不需要翻译这个。",
+    "mail.actions.successful_run_after_failure_subject": "仓库 %[2]s 中的工作流 %[1]s 已恢复",
+    "mail.actions.not_successful_run_subject": "仓库 %[2]s 中的工作流 %[1]s 已失败",
+    "mail.actions.successful_run_after_failure": "仓库 %[2]s 中的工作流 %[1]s 已恢复",
+    "mail.actions.run_info_previous_status": "上次运行的状态：%[1]s",
+    "mail.actions.run_info_cur_status": "此次运行的状态：%[1]s（从 %[2]s 更新）",
+    "mail.actions.run_info_trigger": "由 %[2]s %[1]s 触发",
+    "mail.actions.not_successful_run": "仓库 %[2]s 中的工作流 %[1]s 已失败",
+    "discussion.locked": "讨论已被锁定。仅贡献者能够发表评论。",
+    "relativetime.future": "未来",
+    "relativetime.mins": "%d 分钟前",
+    "relativetime.hours": "%d 小时前",
+    "relativetime.weeks": "%d 周前",
+    "relativetime.months": "%d 个月前",
+    "relativetime.years": "%d 年前",
+    "relativetime.1day": "昨天",
+    "relativetime.2days": "两天前",
+    "relativetime.1week": "上周",
+    "relativetime.1month": "上个月",
+    "relativetime.2months": "两个月前",
+    "relativetime.1year": "去年",
+    "relativetime.2years": "两年前",
+    "relativetime.now": "现在",
+    "relativetime.2weeks": "两周前",
+    "relativetime.days": "%d 天前",
+    "moderation.report_abuse_form.details": "此表单用于举报创建垃圾个人信息、仓库、议题、评论或行为不当的用户。",
+    "admin.config.moderation_config": "审核配置",
+    "moderation.report_abuse": "举报滥用",
+    "moderation.report_content": "举报内容",
+    "moderation.report_abuse_form.header": "向管理员举报滥用",
+    "moderation.report_abuse_form.invalid": "参数无效",
+    "moderation.report_abuse_form.already_reported": "您已举报此内容",
+    "moderation.abuse_category": "类别",
+    "moderation.abuse_category.placeholder": "选择类别",
+    "moderation.abuse_category.spam": "垃圾信息",
+    "moderation.abuse_category.malware": "恶意软件",
+    "moderation.abuse_category.illegal_content": "非法内容",
+    "moderation.abuse_category.other_violations": "其他违反平台规则的行为",
+    "moderation.report_remarks.placeholder": "请提供一些关于您所举报的滥用行为的详细信息。",
+    "moderation.report_remarks": "备注",
+    "moderation.submit_report": "提交举报",
+    "moderation.reporting_failed": "无法提交新的滥用举报：%v",
+    "moderation.reported_thank_you": "感谢您的举报，管理员已收到通知。",
+    "repo.form.cannot_create": "您可以创建仓库的所有空间均已达到仓库限制。",
+    "repo.issue_indexer.title": "议题索引器",
+    "watch.list.none": "没有人关注这个仓库。",
+    "followers.incoming.list.none": "没有人关注这位用户。",
+    "followers.outgoing.list.self.none": "你没有关注任何人。",
+    "followers.outgoing.list.none": "%s 没有关注任何人。",
+    "stars.list.none": "没有人点赞这个仓库。",
+    "followers.incoming.list.self.none": "没有人关注你的个人资料。",
+    "editor.textarea.tab_hint": "此行已缩进。再次按 <kbd>Tab</kbd> 或按 <kbd>Escape</kbd> 退出编辑器。",
+    "editor.textarea.shift_tab_hint": "此行无缩进。再次按 <kbd>Shift</kbd> + <kbd>Tab</kbd> 或按 <kbd>Escape</kbd> 退出编辑器。",
+    "admin.dashboard.cleanup_offline_runners": "清理离线运行器",
+    "settings.visibility.description": "个人资料可见性设置会影响他人对您的非私有仓库的访问。<a href=\"%s\" target=\"_blank\">了解更多</a>。",
+    "avatar.constraints_hint": "自定义头像大小不得超过 %[1]s，且分辨率不得大于 %[2]d×%[3]d 像素",
+    "keys.ssh.link": "SSH 密钥",
+    "keys.gpg.link": "GPG 密钥",
+    "profile.actions.tooltip": "更多操作",
+    "repo.diff.commit.next-short": "下一个",
+    "repo.diff.commit.previous-short": "上一个",
+    "feed.atom.link": "Atom 订阅源",
+    "profile.edit.link": "编辑个人资料",
+    "og.repo.summary_card.alt_description": "仓库 %[1]s 的摘要卡片，描述为：%[2]s",
+    "repo.settings.push_mirror.branch_filter.label": "分支过滤器（可选）",
+    "repo.settings.push_mirror.branch_filter.description": "欲镜像的分支。留空以镜像所有分支。关于语法的更多信息，请参见 <a href=\"%[1]s\">%[2]s 文档</a>。例如：<code>main, release/*</code>",
+    "mail.actions.run_info_sha": "提交：%[1]s",
+    "discussion.sidebar.reference": "引用",
+    "admin.dashboard.remove_resolved_reports": "移除已解决的举报",
+    "compare.branches.title": "比较分支",
+    "admin.auths.allow_username_change.description": "允许用户在个人设置中更改用户名",
+    "admin.moderation.moderation_reports": "举报",
+    "admin.moderation.reports": "举报",
+    "admin.moderation.no_open_reports": "目前没有打开的举报。",
+    "admin.moderation.deleted_content_ref": "类型为 %[1]v、ID为 %[2]d 的举报不存在",
+    "repo.commit.load_tags_failed": "由于内部错误，无法加载标签",
+    "admin.auths.allow_username_change": "允许更改用户名"
 }
diff --git a/options/locale_next/locale_zh-HK.json b/options/locale_next/locale_zh-HK.json
index 6baf89e022..277385cf5f 100644
--- a/options/locale_next/locale_zh-HK.json
+++ b/options/locale_next/locale_zh-HK.json
@@ -1,5 +1,4 @@
 {
-	"repo.pulls.merged_title_desc": {
-		"other": "於 %[4]s 將 %[1]d 次代碼提交從 <code>%[2]s</code>合併至 <code>%[3]s</code>"
-	}
+    "repo.pulls.merged_title_desc": "於 %[4]s 將 %[1]d 次代碼提交從 <code>%[2]s</code>合併至 <code>%[3]s</code>",
+    "moderation.abuse_category.malware": "惡意程式"
 }
diff --git a/options/locale_next/locale_zh-TW.json b/options/locale_next/locale_zh-TW.json
index 222e8bb332..8a5a17a774 100644
--- a/options/locale_next/locale_zh-TW.json
+++ b/options/locale_next/locale_zh-TW.json
@@ -1,5 +1,76 @@
 {
     "repo.pulls.merged_title_desc": "將 %[1]d 次提交從 <code>%[2]s</code> 合併至 <code>%[3]s</code> %[4]s",
     "repo.pulls.title_desc": "請求將 %[1]d 次程式碼提交從 <code>%[2]s</code> 合併至 <code id=\"%[4]s\">%[3]s</code>",
-    "search.milestone_kind": "搜尋里程碑…"
+    "search.milestone_kind": "搜尋里程碑…",
+    "home.welcome.no_activity": "沒有活動",
+    "home.welcome.activity_hint": "您的動態摘要目前沒有任何內容。 您對關注的儲存庫所做的操作與活動將會顯示在這裡。",
+    "stars.list.none": "沒有人標星這個儲存庫。",
+    "watch.list.none": "沒有人關注這個儲存庫。",
+    "home.explore_repos": "探索儲存庫",
+    "home.explore_users": "探索使用者",
+    "home.explore_orgs": "探索組織",
+    "alert.range_error": " 必須是一個介於 %[1]s 和 %[2]s 之間的數字。",
+    "install.invalid_lfs_path": "無法在指定路徑建立 LFS 根目錄：%[1]s",
+    "relativetime.now": "現在",
+    "relativetime.future": "未來",
+    "repo.form.cannot_create": "您可以建立儲存庫的所有空間都已達到儲存庫上限。",
+    "repo.issue_indexer.title": "問題索引器",
+    "moderation.abuse_category": "分類",
+    "moderation.abuse_category.placeholder": "選擇分類",
+    "moderation.abuse_category.spam": "垃圾訊息",
+    "moderation.abuse_category.malware": "惡意軟體",
+    "moderation.abuse_category.illegal_content": "違法內容",
+    "moderation.report_remarks.placeholder": "請提供您所檢舉濫用行為的相關細節。",
+    "moderation.report_remarks": "備註",
+    "moderation.submit_report": "提交檢舉",
+    "moderation.reporting_failed": "無法提交新的濫用回報：%v",
+    "moderation.reported_thank_you": "感謝您的回報，管理團隊已收到相關通知。",
+    "mail.actions.successful_run_after_failure_subject": "儲存庫 %[2]s 中的工作流程 %[1]s 已恢復",
+    "error.not_found.title": "找不到頁面",
+    "incorrect_root_url": "這個 Forgejo 實例設定為在 \"%s\" 上提供服務。您目前是透過不同的 URL 存取 Forgejo，這可能會導致部分功能無法正常運作。正式的 URL 是由 Forgejo 管理員透過 app.ini 中的 ROOT_URL 設定所控制。",
+    "themes.names.forgejo-auto": "Forgejo（遵循系統主題）",
+    "themes.names.forgejo-light": "Forgejo 淺色",
+    "themes.names.forgejo-dark": "Forgejo 深色",
+    "followers.incoming.list.self.none": "沒有人關注您的個人資料。",
+    "followers.incoming.list.none": "沒有人關注這位使用者。",
+    "followers.outgoing.list.none": "%s 沒有追蹤任何人。",
+    "followers.outgoing.list.self.none": "您沒有追蹤任何人。",
+    "relativetime.mins": "%d 分鐘前",
+    "relativetime.hours": "%d 小時前",
+    "relativetime.days": "%d 天前",
+    "relativetime.weeks": "%d 周前",
+    "relativetime.months": "%d 個月前",
+    "relativetime.years": "%d 年前",
+    "relativetime.1day": "昨天",
+    "relativetime.2days": "兩天前",
+    "relativetime.1week": "上週",
+    "relativetime.2weeks": "兩週前",
+    "relativetime.1month": "上個月",
+    "relativetime.2months": "兩個月前",
+    "relativetime.1year": "去年",
+    "relativetime.2years": "兩年前",
+    "moderation.abuse_category.other_violations": "其他違反平台規則的行為",
+    "mail.actions.not_successful_run_subject": "儲存庫 %[2]s 中的工作流程 %[1]s 已失敗",
+    "mail.actions.successful_run_after_failure": "儲存庫 %[2]s 中的工作流程 %[1]s 已恢復",
+    "mail.actions.not_successful_run": "儲存庫 %[2]s 中的工作流程 %[1]s 已失敗",
+    "mail.actions.run_info_cur_status": "本次執行狀態：%[1]s（剛從 %[2]s 更新）",
+    "mail.actions.run_info_previous_status": "前一次執行狀態：%[1]s",
+    "mail.actions.run_info_trigger": "觸發原因：%[1]s，由 %[2]s 執行",
+    "discussion.locked": "此討論已被鎖定。僅限貢獻者留言。",
+    "alert.asset_load_failed": "無法從 {path} 載入資源檔案。請確保這些資源檔案可以被存取。",
+    "editor.textarea.tab_hint": "此行已縮排。再次按下 <kbd>Tab</kbd> 鍵或按下 <kbd>Escape</kbd> 鍵以離開編輯器。",
+    "editor.textarea.shift_tab_hint": "此行未縮排。請再次按下 <kbd>Shift</kbd> + <kbd>Tab</kbd>，或按下 <kbd>Escape</kbd> 鍵以離開編輯器。",
+    "admin.config.moderation_config": "審核設定",
+    "moderation.report_abuse": "回報濫用行為",
+    "moderation.report_content": "檢舉內容",
+    "moderation.report_abuse_form.header": "向管理員回報濫用",
+    "moderation.report_abuse_form.details": "這個表單是用來檢舉用戶建立垃圾帳號、儲存庫、問題、留言，或其他不當行為。",
+    "moderation.report_abuse_form.invalid": "無效參數",
+    "moderation.report_abuse_form.already_reported": "您已檢舉此內容",
+    "meta.last_line": "Rubi-chan? Hai! Nani ga suki? Choko minto yori mo a･na･ta♡ Ayumu-chan? Hai! Nani ga suki? Sutoroberii fureibaa yori mo a･na･ta♡ Shiki-chan! Hai! Nani ga suki? Kukkii and kuriimu yori mo a･na･ta♡ Minna? Hai! Nani ga suki? Mochiron daisuki AiScReam.",
+    "admin.dashboard.cleanup_offline_runners": "清理離線 runners",
+    "settings.visibility.description": "個人資料的可見度會影響他人存取您非私人儲存庫的能力。<a href=\"%s\" target=\"_blank\">了解更多</a>",
+    "avatar.constraints_hint": "自定義大頭貼的大小不得超過 %[1]s，且解析度不得大於 %[2]d×%[3]d 像素",
+    "repo.diff.commit.next-short": "下一個",
+    "repo.diff.commit.previous-short": "上一個"
 }
diff --git a/options/locale_readme.md b/options/locale_readme.md
new file mode 100644
index 0000000000..4adbce2123
--- /dev/null
+++ b/options/locale_readme.md
@@ -0,0 +1,50 @@
+# Forgejo translations
+
+All translations are stored in directories `locale` and `locale_next`.
+
+`locale` is a historical directory that contains translations in INI format. Forgejo inherited it from Gitea, and Gitea inherited it from Gogs.
+
+Because the INI format had many issues and prevented good translatability, in early 2025 Forgejo started switching to a new format - `go-i18n`+`json`.
+
+## Working on base language
+
+Here are some tips:
+* when working on non-i18n changes, only change `en-US` files
+  * non-base files are normally modified through Weblate. We appreciate the intention to provide localization for the change you're working on, however, modifying those files leads to merge conflicts with Weblate that aren't easy to resolve. [Learn about translating Forgejo](#working-on-other-languages).
+* when new strings are added, it's preferred that they're added to `locale_en-US.json`
+* when strings are modified in `locale_en-US.ini`, it's preferred that they stay here because moving them around is complicated
+* make sure to remove strings if your change renders them unused
+* consult https://forgejo.org/docs/next/contributor/localization-english/
+
+### JSON translations
+
+It is preferred that all new strings added to Forgejo UI are added to the JSON translations instead of INI.
+
+Even though Forgejo parser supports nested sections, linters and Weblate do not. Because of this, most strings need to have all sections flattened into their keys like so:
+```json
+"some.nested.section.key": "UI text"
+```
+
+However, plural variations of a string, if it has any, are stored in a nested dictionary:
+```json
+"some.nested.section.key": {
+    "one": "%d comment",
+    "other": "%d comments"
+}
+```
+
+> [!IMPORTANT]
+> Please avoid adding unnecessary sections to the keys. Sections like `repo` are vague and represent a large part of the codebase. Keep the sections scoped to where or how the strings are really used, like `user_settings` or `error`.
+
+> [!TIP]
+> Due to the flat sections, you can easily find both JSON strings and their usages in the codebase by grepping an entire key.
+
+> [!TIP]
+> 3rd party software can determine whether string has plural variations or not from type of it's value in `en-US.json`.
+
+## Working on other languages
+
+Translations are done on Codeberg Translate and not via individual pull requests.
+
+* consult https://forgejo.org/docs/next/contributor/localization/
+* see the project: https://translate.codeberg.org/projects/forgejo/
diff --git a/package-lock.json b/package-lock.json
index dfd359b31b..9f3f1aef12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,16 +11,16 @@
         "@citation-js/plugin-software-formats": "0.6.1",
         "@github/markdown-toolbar-element": "2.2.3",
         "@github/quote-selection": "2.1.0",
-        "@github/relative-time-element": "4.4.5",
         "@github/text-expander-element": "2.8.0",
+        "@google/model-viewer": "4.1.0",
         "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
         "@primer/octicons": "19.14.0",
-        "ansi_up": "6.0.2",
+        "ansi_up": "6.0.5",
         "asciinema-player": "3.8.2",
-        "chart.js": "4.4.5",
+        "chart.js": "4.5.0",
         "chartjs-adapter-dayjs-4": "1.0.4",
         "chartjs-plugin-zoom": "2.2.0",
-        "clippie": "4.1.1",
+        "clippie": "4.1.7",
         "css-loader": "7.0.0",
         "dayjs": "1.11.12",
         "dropzone": "6.0.0-beta.2",
@@ -28,19 +28,19 @@
         "esbuild-loader": "4.3.0",
         "escape-goat": "4.0.0",
         "fast-glob": "3.3.3",
-        "htmx.org": "1.9.12",
+        "htmx.org": "2.0.6",
         "idiomorph": "0.3.0",
         "jquery": "3.7.1",
-        "katex": "0.16.21",
-        "mermaid": "11.5.0",
-        "mini-css-extract-plugin": "2.9.2",
-        "minimatch": "10.0.1",
+        "katex": "0.16.22",
+        "mermaid": "11.8.1",
+        "mini-css-extract-plugin": "2.9.3",
+        "minimatch": "10.0.3",
         "monaco-editor": "0.52.2",
         "monaco-editor-webpack-plugin": "7.1.0",
         "pdfobject": "2.3.0",
-        "postcss": "8.5.2",
+        "postcss": "8.5.5",
         "postcss-loader": "8.1.1",
-        "postcss-nesting": "13.0.1",
+        "postcss-nesting": "13.0.2",
         "pretty-ms": "9.0.0",
         "sortablejs": "1.15.6",
         "swagger-ui-dist": "5.17.14",
@@ -52,55 +52,55 @@
         "tributejs": "5.1.3",
         "uint8-to-base64": "0.2.0",
         "vanilla-colorful": "0.7.2",
-        "vue": "3.5.13",
+        "vue": "3.5.18",
         "vue-chartjs": "5.3.1",
         "vue-loader": "17.4.2",
         "vue3-calendar-heatmap": "2.0.5",
-        "webpack": "5.98.0",
+        "webpack": "5.101.1",
         "webpack-cli": "6.0.1",
         "wrap-ansi": "9.0.0"
       },
       "devDependencies": {
-        "@axe-core/playwright": "4.10.1",
-        "@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
-        "@playwright/test": "1.51.0",
-        "@stoplight/spectral-cli": "6.14.3",
-        "@stylistic/eslint-plugin-js": "4.2.0",
-        "@stylistic/stylelint-plugin": "3.1.2",
-        "@typescript-eslint/parser": "8.26.1",
-        "@vitejs/plugin-vue": "5.2.3",
-        "@vitest/coverage-v8": "3.0.8",
-        "@vitest/eslint-plugin": "1.1.25",
+        "@axe-core/playwright": "4.10.2",
+        "@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
+        "@playwright/test": "1.54.2",
+        "@stoplight/spectral-cli": "6.15.0",
+        "@stylistic/eslint-plugin": "5.2.3",
+        "@stylistic/stylelint-plugin": "4.0.0",
+        "@vitejs/plugin-vue": "6.0.1",
+        "@vitest/coverage-v8": "3.2.4",
+        "@vitest/eslint-plugin": "1.3.4",
         "@vue/test-utils": "2.4.6",
-        "eslint": "9.22.0",
-        "eslint-import-resolver-typescript": "4.1.1",
+        "eslint": "9.33.0",
+        "eslint-import-resolver-typescript": "4.4.4",
         "eslint-plugin-array-func": "5.0.2",
-        "eslint-plugin-import-x": "4.7.0",
+        "eslint-plugin-import-x": "4.16.1",
         "eslint-plugin-no-jquery": "3.1.1",
         "eslint-plugin-no-use-extend-native": "0.7.2",
-        "eslint-plugin-playwright": "2.2.0",
-        "eslint-plugin-regexp": "2.7.0",
-        "eslint-plugin-sonarjs": "3.0.2",
+        "eslint-plugin-playwright": "2.2.2",
+        "eslint-plugin-regexp": "2.10.0",
+        "eslint-plugin-sonarjs": "3.0.4",
         "eslint-plugin-toml": "0.12.0",
-        "eslint-plugin-unicorn": "57.0.0",
+        "eslint-plugin-unicorn": "60.0.0",
         "eslint-plugin-vitest-globals": "1.5.0",
-        "eslint-plugin-vue": "10.0.0",
-        "eslint-plugin-vue-scoped-css": "2.9.0",
-        "eslint-plugin-wc": "2.2.1",
-        "globals": "16.0.0",
-        "happy-dom": "17.4.4",
+        "eslint-plugin-vue": "10.4.0",
+        "eslint-plugin-vue-scoped-css": "2.11.0",
+        "eslint-plugin-wc": "3.0.1",
+        "globals": "16.3.0",
+        "happy-dom": "18.0.1",
         "license-checker-rseidelsohn": "4.4.2",
-        "markdownlint-cli": "0.44.0",
+        "markdownlint-cli": "0.45.0",
         "postcss-html": "1.8.0",
-        "stylelint": "16.16.0",
+        "sharp": "0.34.3",
+        "stylelint": "16.23.1",
         "stylelint-declaration-block-no-ignored-properties": "2.8.0",
         "stylelint-declaration-strict-value": "1.10.11",
         "stylelint-value-no-unknown-custom-properties": "6.0.1",
-        "svgo": "3.2.0",
-        "typescript": "5.7.3",
-        "typescript-eslint": "8.26.1",
-        "vite-string-plugin": "1.3.4",
-        "vitest": "3.0.8"
+        "svgo": "4.0.0",
+        "typescript": "5.8.3",
+        "typescript-eslint": "8.39.0",
+        "vite-string-plugin": "1.4.6",
+        "vitest": "3.2.4"
       },
       "engines": {
         "node": ">= 20.0.0"
@@ -133,13 +133,13 @@
       }
     },
     "node_modules/@antfu/install-pkg": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.0.0.tgz",
-      "integrity": "sha512-xvX6P/lo1B3ej0OsaErAjqgFYzYVcJpamjLAFLYh9vRJngBrMoUG7aVnrGTeqM7yxbyTD5p3F2+0/QUEh8Vzhw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz",
+      "integrity": "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==",
       "license": "MIT",
       "dependencies": {
-        "package-manager-detector": "^0.2.8",
-        "tinyexec": "^0.3.2"
+        "package-manager-detector": "^1.3.0",
+        "tinyexec": "^1.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
@@ -155,9 +155,9 @@
       }
     },
     "node_modules/@asyncapi/specs": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.8.1.tgz",
-      "integrity": "sha512-czHoAk3PeXTLR+X8IUaD+IpT+g+zUvkcgMDJVothBsan+oHN3jfcFcFUNdOPAAFoUCQN1hXF1dWuphWy05THlA==",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.10.0.tgz",
+      "integrity": "sha512-vB5oKLsdrLUORIZ5BXortZTlVyGWWMC1Nud/0LtgxQ3Yn2738HigAD6EVqScvpPsDUI/bcLVsYEXN4dtXQHVng==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -165,27 +165,27 @@
       }
     },
     "node_modules/@axe-core/playwright": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/@axe-core/playwright/-/playwright-4.10.1.tgz",
-      "integrity": "sha512-EV5t39VV68kuAfMKqb/RL+YjYKhfuGim9rgIaQ6Vntb2HgaCaau0h98Y3WEUqW1+PbdzxDtDNjFAipbtZuBmEA==",
+      "version": "4.10.2",
+      "resolved": "https://registry.npmjs.org/@axe-core/playwright/-/playwright-4.10.2.tgz",
+      "integrity": "sha512-6/b5BJjG6hDaRNtgzLIfKr5DfwyiLHO4+ByTLB0cJgWSM8Ll7KqtdblIS6bEkwSF642/Ex91vNqIl3GLXGlceg==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
-        "axe-core": "~4.10.2"
+        "axe-core": "~4.10.3"
       },
       "peerDependencies": {
         "playwright-core": ">= 1.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -198,30 +198,30 @@
       "license": "MIT"
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz",
-      "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+      "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.10"
+        "@babel/types": "^7.28.2"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -231,25 +231,22 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
-      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz",
+      "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==",
       "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
-      "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -441,9 +438,9 @@
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
-      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "dev": true,
       "funding": [
         {
@@ -460,13 +457,13 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
-      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "dev": true,
       "funding": [
         {
@@ -484,9 +481,9 @@
       }
     },
     "node_modules/@csstools/media-query-list-parser": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-3.0.1.tgz",
-      "integrity": "sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
       "dev": true,
       "funding": [
         {
@@ -503,8 +500,52 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.1",
-        "@csstools/css-tokenizer": "^3.0.1"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/selector-resolve-nested": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.1.0.tgz",
+      "integrity": "sha512-mf1LEW0tJLKfWyvn5KdDrhpxHyuxpbNwTIwOYLIvsTffeyOf85j5oIzfG0yosxDgx/sswlqBnESYUcQH0vgZ0g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
+      }
+    },
+    "node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^7.0.0"
       }
     },
     "node_modules/@discoveryjs/json-ext": {
@@ -528,21 +569,21 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz",
-      "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz",
+      "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/wasi-threads": "1.0.1",
+        "@emnapi/wasi-threads": "1.0.4",
         "tslib": "^2.4.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz",
-      "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
+      "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -551,9 +592,9 @@
       }
     },
     "node_modules/@emnapi/wasi-threads": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
-      "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz",
+      "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -562,9 +603,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz",
-      "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
+      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
       "cpu": [
         "ppc64"
       ],
@@ -578,9 +619,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz",
-      "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
+      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
       "cpu": [
         "arm"
       ],
@@ -594,9 +635,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz",
-      "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
+      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
       "cpu": [
         "arm64"
       ],
@@ -610,9 +651,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz",
-      "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
+      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
       "cpu": [
         "x64"
       ],
@@ -626,9 +667,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz",
-      "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
+      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
       "cpu": [
         "arm64"
       ],
@@ -642,9 +683,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz",
-      "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
+      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
       "cpu": [
         "x64"
       ],
@@ -658,9 +699,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
       "cpu": [
         "arm64"
       ],
@@ -674,9 +715,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz",
-      "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
+      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
       "cpu": [
         "x64"
       ],
@@ -690,9 +731,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz",
-      "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
+      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
       "cpu": [
         "arm"
       ],
@@ -706,9 +747,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz",
-      "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
+      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
       "cpu": [
         "arm64"
       ],
@@ -722,9 +763,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz",
-      "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
+      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
       "cpu": [
         "ia32"
       ],
@@ -738,9 +779,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz",
-      "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
+      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
       "cpu": [
         "loong64"
       ],
@@ -754,9 +795,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz",
-      "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
+      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
       "cpu": [
         "mips64el"
       ],
@@ -770,9 +811,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz",
-      "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
+      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
       "cpu": [
         "ppc64"
       ],
@@ -786,9 +827,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz",
-      "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
+      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
       "cpu": [
         "riscv64"
       ],
@@ -802,9 +843,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz",
-      "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
+      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
       "cpu": [
         "s390x"
       ],
@@ -818,9 +859,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
-      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
+      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
       "cpu": [
         "x64"
       ],
@@ -834,9 +875,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
       "cpu": [
         "arm64"
       ],
@@ -850,9 +891,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz",
-      "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
       "cpu": [
         "x64"
       ],
@@ -866,9 +907,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
+      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
       "cpu": [
         "arm64"
       ],
@@ -882,9 +923,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz",
-      "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
+      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
       "cpu": [
         "x64"
       ],
@@ -897,10 +938,26 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
+      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz",
-      "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
+      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
       "cpu": [
         "x64"
       ],
@@ -914,9 +971,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz",
-      "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
+      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
       "cpu": [
         "arm64"
       ],
@@ -930,9 +987,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz",
-      "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
+      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
       "cpu": [
         "ia32"
       ],
@@ -946,9 +1003,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz",
-      "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
+      "integrity": "sha512-PPOl1mi6lpLNQxnGoyAfschAodRFYXJ+9fs6WHXz7CSWKbOqiMZsubC+BQsVKuul+3vKLuwTHsS2c2y9EoKwxQ==",
       "cpu": [
         "x64"
       ],
@@ -962,9 +1019,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-plugin-eslint-comments": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.4.1.tgz",
-      "integrity": "sha512-lb/Z/MzbTf7CaVYM9WCFNQZ4L1yi3ev2fsFPF99h31ljhSEyUoyEsKsNWiU+qD1glbYTDJdqgyaLKtyTkkqtuQ==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.5.0.tgz",
+      "integrity": "sha512-MAhuTKlr4y/CE3WYX26raZjy+I/kS2PLKSzvfmDCGrBLTFHOYwqROZdr4XwPgXwX3K9rjzMr4pSmUWGnzsUyMg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -982,9 +1039,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
-      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1024,9 +1081,9 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
-      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1038,17 +1095,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/@eslint/config-array/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1063,9 +1109,9 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
-      "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1073,9 +1119,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1126,17 +1172,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -1171,13 +1206,16 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
-      "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
+      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
       }
     },
     "node_modules/@eslint/object-schema": {
@@ -1191,13 +1229,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
-      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.12.0",
+        "@eslint/core": "^0.15.2",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -1222,12 +1260,6 @@
       "integrity": "sha512-zyTvG6GpfWuVrRnxa/JpWPlTyj8ItTCMHXNrdXrvNPrSFCsDAiqEaxTW+644lwxXNfzTPQeN11paR9SRRvE2zg==",
       "license": "MIT"
     },
-    "node_modules/@github/relative-time-element": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.4.5.tgz",
-      "integrity": "sha512-9ejPtayBDIJfEU8x1fg/w2o5mahHkkp1SC6uObDtoKs4Gn+2a1vNK8XIiNDD8rMeEfpvDjydgSZZ+uk+7N0VsQ==",
-      "license": "MIT"
-    },
     "node_modules/@github/text-expander-element": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.8.0.tgz",
@@ -1238,6 +1270,22 @@
         "dom-input-range": "^1.2.0"
       }
     },
+    "node_modules/@google/model-viewer": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@google/model-viewer/-/model-viewer-4.1.0.tgz",
+      "integrity": "sha512-7WB/jS6wfBfRl/tWhsUUvDMKFE1KlKME97coDLlZQfvJD0nCwjhES1lJ+k7wnmf7T3zMvCfn9mIjM/mgZapuig==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@monogrid/gainmap-js": "^3.1.0",
+        "lit": "^3.2.1"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "peerDependencies": {
+        "three": "^0.172.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -1291,9 +1339,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1338,6 +1386,467 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@img/sharp-darwin-arm64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.3.tgz",
+      "integrity": "sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-arm64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.3.tgz",
+      "integrity": "sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-arm64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.0.tgz",
+      "integrity": "sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.0.tgz",
+      "integrity": "sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.0.tgz",
+      "integrity": "sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.0.tgz",
+      "integrity": "sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-ppc64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.0.tgz",
+      "integrity": "sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-s390x": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.0.tgz",
+      "integrity": "sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-x64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.0.tgz",
+      "integrity": "sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.0.tgz",
+      "integrity": "sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.0.tgz",
+      "integrity": "sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.3.tgz",
+      "integrity": "sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.3.tgz",
+      "integrity": "sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linux-ppc64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.3.tgz",
+      "integrity": "sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-ppc64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linux-s390x": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.3.tgz",
+      "integrity": "sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-s390x": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linux-x64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.3.tgz",
+      "integrity": "sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-x64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-arm64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.3.tgz",
+      "integrity": "sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-arm64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-x64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.3.tgz",
+      "integrity": "sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-x64": "1.2.0"
+      }
+    },
+    "node_modules/@img/sharp-wasm32": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.3.tgz",
+      "integrity": "sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/runtime": "^1.4.4"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-arm64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.3.tgz",
+      "integrity": "sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-ia32": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.3.tgz",
+      "integrity": "sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-x64": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.3.tgz",
+      "integrity": "sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@isaacs/balanced-match": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz",
+      "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@isaacs/brace-expansion": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
+      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "license": "MIT",
+      "dependencies": {
+        "@isaacs/balanced-match": "^4.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1356,9 +1865,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -1445,17 +1954,13 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -1467,19 +1972,10 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz",
+      "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -1487,15 +1983,15 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
+      "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -1542,39 +2038,11 @@
       }
     },
     "node_modules/@keyv/serialize": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.0.3.tgz",
-      "integrity": "sha512-qnEovoOp5Np2JDGonIDL6Ayihw0RhnRh6vxPuHo4RDn1UOzwEo4AeIfpL6UGIrsceWrCMiVPgwRjbHu4vYFc3g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.0.tgz",
+      "integrity": "sha512-RlDgexML7Z63Q8BSaqhXdCYNBy/JQnqYIwxofUrNLGCblOMHp+xux2Q8nLMLlPpgHQPoU0Do8Z6btCpRBEqZ8g==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer": "^6.0.3"
-      }
-    },
-    "node_modules/@keyv/serialize/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
+      "license": "MIT"
     },
     "node_modules/@kurkle/color": {
       "version": "0.3.4",
@@ -1582,6 +2050,21 @@
       "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==",
       "license": "MIT"
     },
+    "node_modules/@lit-labs/ssr-dom-shim": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.4.0.tgz",
+      "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@lit/reactive-element": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.1.1.tgz",
+      "integrity": "sha512-N+dm5PAYdQ8e6UlywyyrgI2t++wFGXfHx+dSJ1oBrg6FAxUj40jId++EaRm80MKX5JnlH1sBsyZ5h0bcZKemCg==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@lit-labs/ssr-dom-shim": "^1.4.0"
+      }
+    },
     "node_modules/@mcaptcha/core-glue": {
       "version": "0.1.0-alpha-5",
       "resolved": "https://registry.npmjs.org/@mcaptcha/core-glue/-/core-glue-0.1.0-alpha-5.tgz",
@@ -1634,25 +2117,37 @@
       }
     },
     "node_modules/@mermaid-js/parser": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.3.0.tgz",
-      "integrity": "sha512-HsvL6zgE5sUPGgkIDlmAWR1HTNHz2Iy11BAWPTa4Jjabkpguy4Ze2gzfLrg6pdRuBvFwgUYyxiaNqZwrEEXepA==",
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.2.tgz",
+      "integrity": "sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==",
       "license": "MIT",
       "dependencies": {
-        "langium": "3.0.0"
+        "langium": "3.3.1"
+      }
+    },
+    "node_modules/@monogrid/gainmap-js": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@monogrid/gainmap-js/-/gainmap-js-3.1.0.tgz",
+      "integrity": "sha512-Obb0/gEd/HReTlg8ttaYk+0m62gQJmCblMOjHSMHRrBP2zdfKMHLCRbh/6ex9fSUJMKdjjIEiohwkbGD3wj2Nw==",
+      "license": "MIT",
+      "dependencies": {
+        "promise-worker-transferable": "^1.0.4"
+      },
+      "peerDependencies": {
+        "three": ">= 0.159.0"
       }
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.7.tgz",
-      "integrity": "sha512-5yximcFK5FNompXfJFoWanu5l8v1hNGqNHh9du1xETp9HWk/B/PzvchX55WYOPaIeNglG8++68AAiauBAtbnzw==",
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.3.1",
-        "@emnapi/runtime": "^1.3.1",
-        "@tybys/wasm-util": "^0.9.0"
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.10.0"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -1710,163 +2205,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@oxc-resolver/binding-darwin-arm64": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-5.0.1.tgz",
-      "integrity": "sha512-lY5mi+6ztYGM9tiyMhHbzZteE7LFaexu9PjDL2N0stCNuGkSHO1eeeabi2ckxGWBbu9EW01XovbQqir12NbA6A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-darwin-x64": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-5.0.1.tgz",
-      "integrity": "sha512-wHKdPB2Q0dMVQy6b5depG8IGI0Y37CIUTZYrZDYEGMT3X481DAJjp6AIVVHQeolEZzy+lWrpUQdGPy0dQnt7IA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-freebsd-x64": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-5.0.1.tgz",
-      "integrity": "sha512-TchNkHMASh2vZ2/FH71zqgAUNYuAlP8Bm1ocSnt7UVV43jZ9kG8HtQFc3AsYeVGzw06LZoeE3mVdSQVXUZhgzA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-5.0.1.tgz",
-      "integrity": "sha512-JhqYi6uTSYflXSDNG/ZPTvBUcvcPR+vr/09XLdWJpZfEYzpPEEr7YQ2ogiOfZVUmCZOJWVOP8jJdv735j46a5w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm64-gnu": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-5.0.1.tgz",
-      "integrity": "sha512-W2OXq25tYiFVhi0Eioc9b+KWnaK2Hj7x/eW2u6r6u4afd1cQ09U+o5u98jrj1rxowSOTfFyiKqMqQOrS4PAlFg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-arm64-musl": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-5.0.1.tgz",
-      "integrity": "sha512-dYaXmy90L5fTpH0mWmWvsf5PC9me5Lyjcj5vOQYNVedSQUavGMbQ+sKOWOTAFIpS8xzzIhYRdLI7oj4WV9S2bQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-x64-gnu": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-5.0.1.tgz",
-      "integrity": "sha512-lOgcxgtV7nM4TjolWgW9qk05iDQE2GGZTx2Zr+Jj+4GqdIhkkGpbqyGPJx2FRsY6kXhyaA9eOad4Bldfo8vAaw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-linux-x64-musl": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-5.0.1.tgz",
-      "integrity": "sha512-3Pg8eSolVs3hy3xoqkjCgoIC1uHKPAUY0rs4QX+KtsPMOZ7iO5b3JBbJHl+ZDIeuzE8dkSRG7aIuCNVonp5G1Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-wasm32-wasi": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-5.0.1.tgz",
-      "integrity": "sha512-rBEgV5AW5obb6ATeNUSUouW0FzpoADOweTYblprko+Cv6rW1NSQGzGxD6o6jhIk4yV7/CZBwBWAkz9xpL5JSUQ==",
-      "cpu": [
-        "wasm32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.7"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@oxc-resolver/binding-win32-arm64-msvc": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-5.0.1.tgz",
-      "integrity": "sha512-okHg9C+z+2tCGKPszYVJDTZKhPHta7xKvhw0WMWPLTz9wbBMmHTuY9vVpgvFGhTU3N5iQ56LPollnSPtjvObCw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@oxc-resolver/binding-win32-x64-msvc": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-5.0.1.tgz",
-      "integrity": "sha512-ODlCn4Pbd0HEWMixonax1uJtNCG4lEne6Jq98iUsmwSibQYcBzutxPed1qhLKur6KtCsYYa4LtRxys7e/5lZwQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -1878,13 +2216,13 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.0.tgz",
-      "integrity": "sha512-dJ0dMbZeHhI+wb77+ljx/FeC8VBP6j/rj9OAojO08JI80wTZy6vRk9KvHKiDCUh4iMpEiseMgqRBIeW+eKX6RA==",
+      "version": "1.54.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.54.2.tgz",
+      "integrity": "sha512-A+znathYxPf+72riFd1r1ovOLqsIIB0jKIoPjyK2kqEIe30/6jF6BC7QNluHuwUmsD2tv1XZVugN8GqfTMOxsA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.51.0"
+        "playwright": "1.54.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -1912,6 +2250,13 @@
         "object-assign": "^4.1.1"
       }
     },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-beta.29",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz",
+      "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@rollup/plugin-commonjs": {
       "version": "22.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz",
@@ -1960,9 +2305,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.37.0.tgz",
-      "integrity": "sha512-l7StVw6WAa8l3vA1ov80jyetOAEo1FtHvZDbzXDO/02Sq/QVvqlHkYoFwDJPIMj0GKiistsBudfx5tGFnwYWDQ==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
+      "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
       "cpu": [
         "arm"
       ],
@@ -1974,9 +2319,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.37.0.tgz",
-      "integrity": "sha512-6U3SlVyMxezt8Y+/iEBcbp945uZjJwjZimu76xoG7tO1av9VO691z8PkhzQ85ith2I8R2RddEPeSfcbyPfD4hA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
+      "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
       "cpu": [
         "arm64"
       ],
@@ -1988,9 +2333,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.37.0.tgz",
-      "integrity": "sha512-+iTQ5YHuGmPt10NTzEyMPbayiNTcOZDWsbxZYR1ZnmLnZxG17ivrPSWFO9j6GalY0+gV3Jtwrrs12DBscxnlYA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
+      "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
       "cpu": [
         "arm64"
       ],
@@ -2002,9 +2347,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.37.0.tgz",
-      "integrity": "sha512-m8W2UbxLDcmRKVjgl5J/k4B8d7qX2EcJve3Sut7YGrQoPtCIQGPH5AMzuFvYRWZi0FVS0zEY4c8uttPfX6bwYQ==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
+      "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
       "cpu": [
         "x64"
       ],
@@ -2016,9 +2361,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.37.0.tgz",
-      "integrity": "sha512-FOMXGmH15OmtQWEt174v9P1JqqhlgYge/bUjIbiVD1nI1NeJ30HYT9SJlZMqdo1uQFyt9cz748F1BHghWaDnVA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
+      "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
       "cpu": [
         "arm64"
       ],
@@ -2030,9 +2375,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.37.0.tgz",
-      "integrity": "sha512-SZMxNttjPKvV14Hjck5t70xS3l63sbVwl98g3FlVVx2YIDmfUIy29jQrsw06ewEYQ8lQSuY9mpAPlmgRD2iSsA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
+      "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
       "cpu": [
         "x64"
       ],
@@ -2044,9 +2389,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.37.0.tgz",
-      "integrity": "sha512-hhAALKJPidCwZcj+g+iN+38SIOkhK2a9bqtJR+EtyxrKKSt1ynCBeqrQy31z0oWU6thRZzdx53hVgEbRkuI19w==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
+      "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
       "cpu": [
         "arm"
       ],
@@ -2058,9 +2403,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.37.0.tgz",
-      "integrity": "sha512-jUb/kmn/Gd8epbHKEqkRAxq5c2EwRt0DqhSGWjPFxLeFvldFdHQs/n8lQ9x85oAeVb6bHcS8irhTJX2FCOd8Ag==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
+      "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
       "cpu": [
         "arm"
       ],
@@ -2072,9 +2417,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.37.0.tgz",
-      "integrity": "sha512-oNrJxcQT9IcbcmKlkF+Yz2tmOxZgG9D9GRq+1OE6XCQwCVwxixYAa38Z8qqPzQvzt1FCfmrHX03E0pWoXm1DqA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
+      "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
       "cpu": [
         "arm64"
       ],
@@ -2086,9 +2431,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.37.0.tgz",
-      "integrity": "sha512-pfxLBMls+28Ey2enpX3JvjEjaJMBX5XlPCZNGxj4kdJyHduPBXtxYeb8alo0a7bqOoWZW2uKynhHxF/MWoHaGQ==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
+      "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
       "cpu": [
         "arm64"
       ],
@@ -2100,9 +2445,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.37.0.tgz",
-      "integrity": "sha512-yCE0NnutTC/7IGUq/PUHmoeZbIwq3KRh02e9SfFh7Vmc1Z7atuJRYWhRME5fKgT8aS20mwi1RyChA23qSyRGpA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
+      "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
       "cpu": [
         "loong64"
       ],
@@ -2113,10 +2458,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.37.0.tgz",
-      "integrity": "sha512-NxcICptHk06E2Lh3a4Pu+2PEdZ6ahNHuK7o6Np9zcWkrBMuv21j10SQDJW3C9Yf/A/P7cutWoC/DptNLVsZ0VQ==",
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
+      "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
       "cpu": [
         "ppc64"
       ],
@@ -2128,9 +2473,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.37.0.tgz",
-      "integrity": "sha512-PpWwHMPCVpFZLTfLq7EWJWvrmEuLdGn1GMYcm5MV7PaRgwCEYJAwiN94uBuZev0/J/hFIIJCsYw4nLmXA9J7Pw==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
+      "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
       "cpu": [
         "riscv64"
       ],
@@ -2142,9 +2487,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.37.0.tgz",
-      "integrity": "sha512-DTNwl6a3CfhGTAOYZ4KtYbdS8b+275LSLqJVJIrPa5/JuIufWWZ/QFvkxp52gpmguN95eujrM68ZG+zVxa8zHA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
+      "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
       "cpu": [
         "riscv64"
       ],
@@ -2156,9 +2501,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.37.0.tgz",
-      "integrity": "sha512-hZDDU5fgWvDdHFuExN1gBOhCuzo/8TMpidfOR+1cPZJflcEzXdCy1LjnklQdW8/Et9sryOPJAKAQRw8Jq7Tg+A==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
+      "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
       "cpu": [
         "s390x"
       ],
@@ -2170,9 +2515,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.37.0.tgz",
-      "integrity": "sha512-pKivGpgJM5g8dwj0ywBwe/HeVAUSuVVJhUTa/URXjxvoyTT/AxsLTAbkHkDHG7qQxLoW2s3apEIl26uUe08LVQ==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
+      "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
       "cpu": [
         "x64"
       ],
@@ -2184,9 +2529,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.37.0.tgz",
-      "integrity": "sha512-E2lPrLKE8sQbY/2bEkVTGDEk4/49UYRVWgj90MY8yPjpnGBQ+Xi1Qnr7b7UIWw1NOggdFQFOLZ8+5CzCiz143w==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
+      "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
       "cpu": [
         "x64"
       ],
@@ -2198,9 +2543,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.37.0.tgz",
-      "integrity": "sha512-Jm7biMazjNzTU4PrQtr7VS8ibeys9Pn29/1bm4ph7CP2kf21950LgN+BaE2mJ1QujnvOc6p54eWWiVvn05SOBg==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
+      "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
       "cpu": [
         "arm64"
       ],
@@ -2212,9 +2557,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.37.0.tgz",
-      "integrity": "sha512-e3/1SFm1OjefWICB2Ucstg2dxYDkDTZGDYgwufcbsxTHyqQps1UQf33dFEChBNmeSsTOyrjw2JJq0zbG5GF6RA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
+      "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
       "cpu": [
         "ia32"
       ],
@@ -2226,9 +2571,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.37.0.tgz",
-      "integrity": "sha512-LWbXUBwn/bcLx2sSsqy7pK5o+Nr+VCoRoAohfJ5C/aBio9nfJmGQqHAhU6pwxV/RmyTk5AqdySma7uwWGlmeuA==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
+      "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
       "cpu": [
         "x64"
       ],
@@ -2338,9 +2683,9 @@
       }
     },
     "node_modules/@stoplight/spectral-cli": {
-      "version": "6.14.3",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.14.3.tgz",
-      "integrity": "sha512-vKy7d2yqBfOf94uB6KXzujDl6/qjXa8mCQ6cfsQ8xYsoArZN9iBHpS3271hR5IyTm3R1GwMgaSZ1h0sfZjZrZw==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.15.0.tgz",
+      "integrity": "sha512-FVeQIuqQQnnLfa8vy+oatTKUve7uU+3SaaAfdjpX/B+uB1NcfkKRJYhKT9wMEehDRaMPL5AKIRYMCFerdEbIpw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2402,9 +2747,9 @@
       }
     },
     "node_modules/@stoplight/spectral-core": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.19.5.tgz",
-      "integrity": "sha512-i+njdliW7bAHGsHEgDvH0To/9IxiYiBELltkZ7ASVy4i+WXtZ40lQXpeRQRwePrBcSgQl0gcZFuKX10nmSHtbw==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-core/-/spectral-core-1.20.0.tgz",
+      "integrity": "sha512-5hBP81nCC1zn1hJXL/uxPNRKNcB+/pEIHgCjPRpl/w/qy9yC9ver04tw1W0l/PMiv0UeB5dYgozXVQ4j5a6QQQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2448,17 +2793,6 @@
         "node": "^12.20 || >=14.13"
       }
     },
-    "node_modules/@stoplight/spectral-core/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/@stoplight/spectral-core/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2489,9 +2823,9 @@
       }
     },
     "node_modules/@stoplight/spectral-formatters": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.4.3.tgz",
-      "integrity": "sha512-03Nc6nhjMO9aHhJPgBH4zDwMPklKLWEMtvx+PMmzfStCndMjJkf8ki7O/55u3myZ1TwxBzln9z9tXPLSL3KKhw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.5.0.tgz",
+      "integrity": "sha512-lR7s41Z00Mf8TdXBBZQ3oi2uR8wqAtR6NO0KA8Ltk4FSpmAy0i6CKUmJG9hZQjanTnGmwpQkT/WP66p1GY3iXA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2514,9 +2848,9 @@
       }
     },
     "node_modules/@stoplight/spectral-functions": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.9.4.tgz",
-      "integrity": "sha512-+dgu7QQ1JIZFsNLhNbQLPA9tniIT3KjOc9ORv0LYSCLvZjkWT2bN7vgmathbXsbmhnmhvl15H9sRqUIqzi+qoQ==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-functions/-/spectral-functions-1.10.1.tgz",
+      "integrity": "sha512-obu8ZfoHxELOapfGsCJixKZXZcffjg+lSoNuttpmUFuDzVLT3VmH8QkPXfOGOL5Pz80BR35ClNAToDkdnYIURg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2584,9 +2918,9 @@
       }
     },
     "node_modules/@stoplight/spectral-ruleset-bundler": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.6.2.tgz",
-      "integrity": "sha512-Tg7y/0e/6yY4hiebh9YLUGa/fHcgI6RyjfBcRGipYU7QDcJUn2UZYSzeC9hggMwT0UiRzdQlch0aEl7L4VL1GQ==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.6.3.tgz",
+      "integrity": "sha512-AQFRO6OCKg8SZJUupnr3+OzI1LrMieDTEUHsYgmaRpNiDRPvzImE3bzM1KyQg99q58kTQyZ8kpr7sG8Lp94RRA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2661,9 +2995,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@stoplight/spectral-rulesets": {
-      "version": "1.21.4",
-      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.21.4.tgz",
-      "integrity": "sha512-F03Uf+Rb9FnxfjNeIeB0B/dGDJ+NozRkQZtZ/jryoOu+7Qp7rI1e/BkFWEM3y4Fr0zcNEkpS7bjkXnW4frHPcA==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/@stoplight/spectral-rulesets/-/spectral-rulesets-1.22.0.tgz",
+      "integrity": "sha512-l2EY2jiKKLsvnPfGy+pXC0LeGsbJzcQP5G/AojHgf+cwN//VYxW1Wvv4WKFx/CLmLxc42mJYF2juwWofjWYNIQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2757,15 +3091,19 @@
         "node": "^12.20 || >=14.13"
       }
     },
-    "node_modules/@stylistic/eslint-plugin-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz",
-      "integrity": "sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==",
+    "node_modules/@stylistic/eslint-plugin": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.2.3.tgz",
+      "integrity": "sha512-oY7GVkJGVMI5benlBDCaRrSC1qPasafyv5dOBLLv5MTilMGnErKhO6ziEfodDDIZbo5QxPUNW360VudJOFODMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/types": "^8.38.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
+        "estraverse": "^5.3.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2774,27 +3112,68 @@
         "eslint": ">=9.0.0"
       }
     },
+    "node_modules/@stylistic/eslint-plugin/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@stylistic/stylelint-plugin": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-3.1.2.tgz",
-      "integrity": "sha512-tylFJGMQo62alGazK74MNxFjMagYOHmBZiePZFOJK2n13JZta0uVkB3Bh5qodUmOLtRH+uxH297EibK14UKm8g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-4.0.0.tgz",
+      "integrity": "sha512-CFwt3K4Y/7bygNCLCQ8Sy4Hzgbhxq3BsNW0FIuYxl17HD3ywptm54ocyeiLVRrk5jtz1Zwks7Xr9eiZt8SWHAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.1",
-        "@csstools/css-tokenizer": "^3.0.1",
-        "@csstools/media-query-list-parser": "^3.0.1",
-        "is-plain-object": "^5.0.0",
-        "postcss-selector-parser": "^6.1.2",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3",
+        "postcss": "^8.5.6",
+        "postcss-selector-parser": "^7.1.0",
         "postcss-value-parser": "^4.2.0",
-        "style-search": "^0.1.0",
-        "stylelint": "^16.8.2"
+        "style-search": "^0.1.0"
       },
       "engines": {
         "node": "^18.12 || >=20.9"
       },
       "peerDependencies": {
-        "stylelint": "^16.8.0"
+        "stylelint": "^16.22.0"
+      }
+    },
+    "node_modules/@stylistic/stylelint-plugin/node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/@swc/helpers": {
@@ -2803,20 +3182,10 @@
       "integrity": "sha512-wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA==",
       "license": "MIT"
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
-      "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
+      "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -2824,10 +3193,20 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
+      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*"
+      }
+    },
     "node_modules/@types/codemirror": {
-      "version": "5.60.15",
-      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.15.tgz",
-      "integrity": "sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==",
+      "version": "5.60.16",
+      "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.16.tgz",
+      "integrity": "sha512-V/yHdamffSS075jit+fDxaOAmdP2liok8NSNJnAZfDJErzOheuygHZEhAJrfmk5TEyM32MhkZjwo/idX791yxw==",
       "license": "MIT",
       "dependencies": {
         "@types/tern": "*"
@@ -2924,9 +3303,9 @@
       "license": "MIT"
     },
     "node_modules/@types/d3-dispatch": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.6.tgz",
-      "integrity": "sha512-4fvZhzMeeuBJYZXRXrRIQnvUYfyXwYmLsdiN7XXmVNQKKw1cM8a5WdID0g1hVFZDqT9ZqZEY5pD44p24VS7iZQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz",
+      "integrity": "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==",
       "license": "MIT"
     },
     "node_modules/@types/d3-drag": {
@@ -3096,10 +3475,10 @@
         "@types/ms": "*"
       }
     },
-    "node_modules/@types/doctrine": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.9.tgz",
-      "integrity": "sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==",
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
       "dev": true,
       "license": "MIT"
     },
@@ -3185,21 +3564,14 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.13.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz",
-      "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==",
+      "version": "20.19.11",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.11.tgz",
+      "integrity": "sha512-uug3FEEGv0r+jrecvUUpbY8lLisvIjg6AAic6a2bSP5OEOLeJsDSnvhCDov7ipFFMXS3orMpzlmi0ZcuGkBbow==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~6.21.0"
       }
     },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
-      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/sarif": {
       "version": "2.1.7",
       "resolved": "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.7.tgz",
@@ -3220,8 +3592,7 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
       "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/@types/unist": {
       "version": "2.0.11",
@@ -3237,22 +3608,29 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/whatwg-mimetype": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz",
+      "integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.26.1.tgz",
-      "integrity": "sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz",
+      "integrity": "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.26.1",
-        "@typescript-eslint/type-utils": "8.26.1",
-        "@typescript-eslint/utils": "8.26.1",
-        "@typescript-eslint/visitor-keys": "8.26.1",
+        "@typescript-eslint/scope-manager": "8.39.0",
+        "@typescript-eslint/type-utils": "8.39.0",
+        "@typescript-eslint/utils": "8.39.0",
+        "@typescript-eslint/visitor-keys": "8.39.0",
         "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
+        "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3262,22 +3640,32 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "@typescript-eslint/parser": "^8.39.0",
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.26.1.tgz",
-      "integrity": "sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.0.tgz",
+      "integrity": "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.26.1",
-        "@typescript-eslint/types": "8.26.1",
-        "@typescript-eslint/typescript-estree": "8.26.1",
-        "@typescript-eslint/visitor-keys": "8.26.1",
+        "@typescript-eslint/scope-manager": "8.39.0",
+        "@typescript-eslint/types": "8.39.0",
+        "@typescript-eslint/typescript-estree": "8.39.0",
+        "@typescript-eslint/visitor-keys": "8.39.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3289,18 +3677,40 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.26.1.tgz",
-      "integrity": "sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.0.tgz",
+      "integrity": "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.26.1",
-        "@typescript-eslint/visitor-keys": "8.26.1"
+        "@typescript-eslint/tsconfig-utils": "^8.39.0",
+        "@typescript-eslint/types": "^8.39.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz",
+      "integrity": "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.39.0",
+        "@typescript-eslint/visitor-keys": "8.39.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3310,17 +3720,35 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz",
+      "integrity": "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.26.1.tgz",
-      "integrity": "sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz",
+      "integrity": "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.26.1",
-        "@typescript-eslint/utils": "8.26.1",
+        "@typescript-eslint/types": "8.39.0",
+        "@typescript-eslint/typescript-estree": "8.39.0",
+        "@typescript-eslint/utils": "8.39.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3331,13 +3759,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.1.tgz",
-      "integrity": "sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.0.tgz",
+      "integrity": "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3349,20 +3777,22 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.26.1.tgz",
-      "integrity": "sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz",
+      "integrity": "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.26.1",
-        "@typescript-eslint/visitor-keys": "8.26.1",
+        "@typescript-eslint/project-service": "8.39.0",
+        "@typescript-eslint/tsconfig-utils": "8.39.0",
+        "@typescript-eslint/types": "8.39.0",
+        "@typescript-eslint/visitor-keys": "8.39.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3372,7 +3802,24 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
@@ -3392,16 +3839,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.26.1.tgz",
-      "integrity": "sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.0.tgz",
+      "integrity": "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.26.1",
-        "@typescript-eslint/types": "8.26.1",
-        "@typescript-eslint/typescript-estree": "8.26.1"
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.39.0",
+        "@typescript-eslint/types": "8.39.0",
+        "@typescript-eslint/typescript-estree": "8.39.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3412,18 +3859,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.26.1.tgz",
-      "integrity": "sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz",
+      "integrity": "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.26.1",
-        "eslint-visitor-keys": "^4.2.0"
+        "@typescript-eslint/types": "8.39.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3433,10 +3880,38 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@unrs/rspack-resolver-binding-darwin-arm64": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-darwin-arm64/-/rspack-resolver-binding-darwin-arm64-1.2.2.tgz",
-      "integrity": "sha512-i7z0B+C0P8Q63O/5PXJAzeFtA1ttY3OR2VSJgGv18S+PFNwD98xHgAgPOT1H5HIV6jlQP8Avzbp09qxJUdpPNw==",
+    "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+      "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-android-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+      "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-darwin-arm64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+      "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
       "cpu": [
         "arm64"
       ],
@@ -3447,10 +3922,10 @@
         "darwin"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-darwin-x64": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-darwin-x64/-/rspack-resolver-binding-darwin-x64-1.2.2.tgz",
-      "integrity": "sha512-YEdFzPjIbDUCfmehC6eS+AdJYtFWY35YYgWUnqqTM2oe/N58GhNy5yRllxYhxwJ9GcfHoNc6Ubze1yjkNv+9Qg==",
+    "node_modules/@unrs/resolver-binding-darwin-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+      "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
       "cpu": [
         "x64"
       ],
@@ -3461,10 +3936,10 @@
         "darwin"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-freebsd-x64": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-freebsd-x64/-/rspack-resolver-binding-freebsd-x64-1.2.2.tgz",
-      "integrity": "sha512-TU4ntNXDgPN2giQyyzSnGWf/dVCem5lvwxg0XYvsvz35h5H19WrhTmHgbrULMuypCB3aHe1enYUC9rPLDw45mA==",
+    "node_modules/@unrs/resolver-binding-freebsd-x64": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+      "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
       "cpu": [
         "x64"
       ],
@@ -3475,10 +3950,10 @@
         "freebsd"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-linux-arm-gnueabihf": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm-gnueabihf/-/rspack-resolver-binding-linux-arm-gnueabihf-1.2.2.tgz",
-      "integrity": "sha512-ik3w4/rU6RujBvNWiDnKdXi1smBhqxEDhccNi/j2rHaMjm0Fk49KkJ6XKsoUnD2kZ5xaMJf9JjailW/okfUPIw==",
+    "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+      "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
       "cpu": [
         "arm"
       ],
@@ -3489,10 +3964,24 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-linux-arm64-gnu": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm64-gnu/-/rspack-resolver-binding-linux-arm64-gnu-1.2.2.tgz",
-      "integrity": "sha512-fp4Azi8kHz6TX8SFmKfyScZrMLfp++uRm2srpqRjsRZIIBzH74NtSkdEUHImR4G7f7XJ+sVZjCc6KDDK04YEpQ==",
+    "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+      "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+      "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
       "cpu": [
         "arm64"
       ],
@@ -3503,10 +3992,10 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-linux-arm64-musl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-arm64-musl/-/rspack-resolver-binding-linux-arm64-musl-1.2.2.tgz",
-      "integrity": "sha512-gMiG3DCFioJxdGBzhlL86KcFgt9HGz0iDhw0YVYPsShItpN5pqIkNrI+L/Q/0gfDiGrfcE0X3VANSYIPmqEAlQ==",
+    "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+      "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
       "cpu": [
         "arm64"
       ],
@@ -3517,10 +4006,66 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-linux-x64-gnu": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-x64-gnu/-/rspack-resolver-binding-linux-x64-gnu-1.2.2.tgz",
-      "integrity": "sha512-n/4n2CxaUF9tcaJxEaZm+lqvaw2gflfWQ1R9I7WQgYkKEKbRKbpG/R3hopYdUmLSRI4xaW1Cy0Bz40eS2Yi4Sw==",
+    "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+      "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+      "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+      "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+      "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
+      "integrity": "sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==",
       "cpu": [
         "x64"
       ],
@@ -3531,10 +4076,10 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-linux-x64-musl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-linux-x64-musl/-/rspack-resolver-binding-linux-x64-musl-1.2.2.tgz",
-      "integrity": "sha512-cHyhAr6rlYYbon1L2Ag449YCj3p6XMfcYTP0AQX+KkQo025d1y/VFtPWvjMhuEsE2lLvtHm7GdJozj6BOMtzVg==",
+    "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+      "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
       "cpu": [
         "x64"
       ],
@@ -3545,10 +4090,10 @@
         "linux"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-wasm32-wasi": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-wasm32-wasi/-/rspack-resolver-binding-wasm32-wasi-1.2.2.tgz",
-      "integrity": "sha512-eogDKuICghDLGc32FtP+WniG38IB1RcGOGz0G3z8406dUdjJvxfHGuGs/dSlM9YEp/v0lEqhJ4mBu6X2nL9pog==",
+    "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+      "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
       "cpu": [
         "wasm32"
       ],
@@ -3556,16 +4101,16 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^0.2.7"
+        "@napi-rs/wasm-runtime": "^0.2.11"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@unrs/rspack-resolver-binding-win32-arm64-msvc": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-win32-arm64-msvc/-/rspack-resolver-binding-win32-arm64-msvc-1.2.2.tgz",
-      "integrity": "sha512-7sWRJumhpXSi2lccX8aQpfFXHsSVASdWndLv8AmD8nDRA/5PBi8IplQVZNx2mYRx6+Bp91Z00kuVqpXO9NfCTg==",
+    "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+      "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
       "cpu": [
         "arm64"
       ],
@@ -3576,10 +4121,24 @@
         "win32"
       ]
     },
-    "node_modules/@unrs/rspack-resolver-binding-win32-x64-msvc": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@unrs/rspack-resolver-binding-win32-x64-msvc/-/rspack-resolver-binding-win32-x64-msvc-1.2.2.tgz",
-      "integrity": "sha512-hewo/UMGP1a7O6FG/ThcPzSJdm/WwrYDNkdGgWl6M18H6K6MSitklomWpT9MUtT5KGj++QJb06va/14QBC4pvw==",
+    "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+      "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+      "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
       "cpu": [
         "x64"
       ],
@@ -3591,36 +4150,40 @@
       ]
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz",
-      "integrity": "sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz",
+      "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@rolldown/pluginutils": "1.0.0-beta.29"
+      },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.8.tgz",
-      "integrity": "sha512-y7SAKsQirsEJ2F8bulBck4DoluhI2EEgTimHd6EEUgJBGKy9tC25cpywh1MH4FvDGoG2Unt7+asVd1kj4qOSAw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
+      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "debug": "^4.4.0",
+        "ast-v8-to-istanbul": "^0.3.3",
+        "debug": "^4.4.1",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^5.0.6",
         "istanbul-reports": "^3.1.7",
         "magic-string": "^0.30.17",
         "magicast": "^0.3.5",
-        "std-env": "^3.8.0",
+        "std-env": "^3.9.0",
         "test-exclude": "^7.0.1",
         "tinyrainbow": "^2.0.0"
       },
@@ -3628,8 +4191,8 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.0.8",
-        "vitest": "3.0.8"
+        "@vitest/browser": "3.2.4",
+        "vitest": "3.2.4"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -3648,13 +4211,15 @@
       }
     },
     "node_modules/@vitest/eslint-plugin": {
-      "version": "1.1.25",
-      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.1.25.tgz",
-      "integrity": "sha512-u8DpDnMbPcqBmJOB4PeEtn6q7vKmLVTLFMpzoxSAo0hjYdl4iYSHRleqwPQo0ywc7UV0S6RKIahYRQ3BnZdMVw==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.3.4.tgz",
+      "integrity": "sha512-EOg8d0jn3BAiKnR55WkFxmxfWA3nmzrbIIuOXyTe6A72duryNgyU+bdBEauA97Aab3ho9kLmAwgPX63Ckj4QEg==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^8.24.1"
+      },
       "peerDependencies": {
-        "@typescript-eslint/utils": ">= 8.0",
         "eslint": ">= 8.57.0",
         "typescript": ">= 5.0.0",
         "vitest": "*"
@@ -3669,14 +4234,15 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.8.tgz",
-      "integrity": "sha512-Xu6TTIavTvSSS6LZaA3EebWFr6tsoXPetOWNMOlc7LO88QVVBwq2oQWBoDiLCN6YTvNYsGSjqOO8CAdjom5DCQ==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
+      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.0.8",
-        "@vitest/utils": "3.0.8",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
         "tinyrainbow": "^2.0.0"
       },
@@ -3685,13 +4251,13 @@
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.8.tgz",
-      "integrity": "sha512-n3LjS7fcW1BCoF+zWZxG7/5XvuYH+lsFg+BDwwAz0arIwHQJFUEsKBQ0BLU49fCxuM/2HSeBPHQD8WjgrxMfow==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
+      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.0.8",
+        "@vitest/spy": "3.2.4",
         "estree-walker": "^3.0.3",
         "magic-string": "^0.30.17"
       },
@@ -3700,7 +4266,7 @@
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -3712,9 +4278,9 @@
       }
     },
     "node_modules/@vitest/mocker/node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
@@ -3739,9 +4305,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.8.tgz",
-      "integrity": "sha512-BNqwbEyitFhzYMYHUVbIvepOyeQOSFA/NeJMIP9enMntkkxLgOcgABH6fjyXG85ipTgvero6noreavGIqfJcIg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
+      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3752,27 +4318,28 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.8.tgz",
-      "integrity": "sha512-c7UUw6gEcOzI8fih+uaAXS5DwjlBaCJUo7KJ4VvJcjL95+DSR1kova2hFuRt3w41KZEFcOEiq098KkyrjXeM5w==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
+      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.0.8",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.4",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.8.tgz",
-      "integrity": "sha512-x8IlMGSEMugakInj44nUrLSILh/zy1f2/BgH0UeHpNyOocG18M9CWVIFBaXPt8TrqVZWmcPjwfG/ht5tnpba8A==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
+      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.0.8",
+        "@vitest/pretty-format": "3.2.4",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3"
       },
@@ -3791,27 +4358,27 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.8.tgz",
-      "integrity": "sha512-MR+PzJa+22vFKYb934CejhR4BeRpMSoxkvNoDit68GQxRLSf11aT6CTj3XaqUU9rxgWJFnqicN/wxw6yBRkI1Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
+      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyspy": "^3.0.2"
+        "tinyspy": "^4.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.8.tgz",
-      "integrity": "sha512-nkBC3aEhfX2PdtQI/QwAWp8qZWwzASsU4Npbcd5RdMPBSSLCpkZp52P3xku3s3uA0HIEhGvEcF8rNkBsz9dQ4Q==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
+      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.0.8",
-        "loupe": "^3.1.3",
+        "@vitest/pretty-format": "3.2.4",
+        "loupe": "^3.1.4",
         "tinyrainbow": "^2.0.0"
       },
       "funding": {
@@ -3819,43 +4386,43 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.18.tgz",
+      "integrity": "sha512-3slwjQrrV1TO8MoXgy3aynDQ7lslj5UqDxuHnrzHtpON5CBinhWjJETciPngpin/T3OuW3tXUf86tEurusnztw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.0",
+        "@vue/shared": "3.5.18",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.18.tgz",
+      "integrity": "sha512-RMbU6NTU70++B1JyVJbNbeFkK+A+Q7y9XKE2EM4NLGm2WFR8x9MbAtWxPPLdm0wUkuZv9trpwfSlL6tjdIa1+A==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.18.tgz",
+      "integrity": "sha512-5aBjvGqsWs+MoxswZPoTB9nSDb3dhd1x30xrrltKujlCxo48j8HGDNj3QPhF4VIS0VQDUrA1xUfp2hEa+FNyXA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.13",
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.0",
+        "@vue/compiler-core": "3.5.18",
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/compiler-ssr": "3.5.18",
+        "@vue/shared": "3.5.18",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.17",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
@@ -3867,64 +4434,92 @@
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+    "node_modules/@vue/compiler-sfc/node_modules/postcss": {
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "nanoid": "^3.3.11",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.18.tgz",
+      "integrity": "sha512-xM16Ak7rSWHkM3m22NlmcdIM+K4BMyFARAfV9hYFl+SFuRzrZ3uGMNW05kA5pmeMa0X9X963Kgou7ufdbpOP9g==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.18.tgz",
+      "integrity": "sha512-x0vPO5Imw+3sChLM5Y+B6G1zPjwdOri9e8V21NnTnlEvkxatHEH5B5KEAJcjuzQ7BsjGrKtfzuQ5eQwXh8HXBg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.18.tgz",
+      "integrity": "sha512-DUpHa1HpeOQEt6+3nheUfqVXRog2kivkXHUhoqJiKR33SO4x+a5uNOMkV487WPerQkL0vUuRvq/7JhRgLW3S+w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.18",
+        "@vue/shared": "3.5.18"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.18.tgz",
+      "integrity": "sha512-YwDj71iV05j4RnzZnZtGaXwPoUWeRsqinblgVJwR8XTXYZ9D5PbahHQgsbmzUvCWNF6x7siQ89HgnX5eWkr3mw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.18",
+        "@vue/runtime-core": "3.5.18",
+        "@vue/shared": "3.5.18",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.18.tgz",
+      "integrity": "sha512-PvIHLUoWgSbDG7zLHqSqaCoZvHi6NNmfVFOqO+OnwvqMz/tqQr3FuGWS8ufluNddk7ZLBJYMrjcw1c6XzR12mA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.18",
+        "@vue/shared": "3.5.18"
       },
       "peerDependencies": {
-        "vue": "3.5.13"
+        "vue": "3.5.18"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.18.tgz",
+      "integrity": "sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -4164,9 +4759,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -4175,6 +4770,18 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/acorn-import-phases": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz",
+      "integrity": "sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "peerDependencies": {
+        "acorn": "^8.14.0"
+      }
+    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -4256,9 +4863,9 @@
       }
     },
     "node_modules/ansi_up": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ansi_up/-/ansi_up-6.0.2.tgz",
-      "integrity": "sha512-3G3vKvl1ilEp7J1u6BmULpMA0xVoW/f4Ekqhl8RTrJrhEBkonKn5k3bUc5Xt+qDayA6iDX0jyUh3AbZjB/l0tw==",
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/ansi_up/-/ansi_up-6.0.5.tgz",
+      "integrity": "sha512-bo4K8S5usgFivfgvgQozTC2EfusPf76o7w0LUVdAOkpISvVmQqtwCdF5c6okokrgIN13KhFIVB/0BhnNXueQeA==",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -4347,18 +4954,20 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4461,6 +5070,35 @@
         "node": ">=4"
       }
     },
+    "node_modules/ast-v8-to-istanbul": {
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.4.tgz",
+      "integrity": "sha512-cxrAnZNLBnQwBPByK4CeDaw5sWZtMilJE/Q3iDA0aamgaIVNDF9T6K2/8DfYDZEejZ2jNnDrG9m8MY72HFd0KA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.29",
+        "estree-walker": "^3.0.3",
+        "js-tokens": "^9.0.1"
+      }
+    },
+    "node_modules/ast-v8-to-istanbul/node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ast-v8-to-istanbul/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -4531,9 +5169,10 @@
       }
     },
     "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/base64-js": {
@@ -4585,14 +5224,23 @@
       "license": "ISC"
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
+    "node_modules/brace-expansion/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/braces": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
@@ -4606,9 +5254,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
+      "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
       "funding": [
         {
           "type": "opencollective",
@@ -4625,10 +5273,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001733",
+        "electron-to-chromium": "^1.5.199",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4708,24 +5356,24 @@
       }
     },
     "node_modules/cacheable": {
-      "version": "1.8.9",
-      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.8.9.tgz",
-      "integrity": "sha512-FicwAUyWnrtnd4QqYAoRlNs44/a1jTL7XDKqm5gJ90wz1DQPlC7U2Rd1Tydpv+E7WAr4sQHuw8Q8M3nZMAyecQ==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.10.4.tgz",
+      "integrity": "sha512-Gd7ccIUkZ9TE2odLQVS+PDjIvQCdJKUlLdJRVvZu0aipj07Qfx+XIej7hhDrKGGoIxV5m5fT/kOJNJPQhQneRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hookified": "^1.7.1",
-        "keyv": "^5.3.1"
+        "hookified": "^1.11.0",
+        "keyv": "^5.5.0"
       }
     },
     "node_modules/cacheable/node_modules/keyv": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.3.2.tgz",
-      "integrity": "sha512-Lji2XRxqqa5Wg+CHLVfFKBImfJZ4pCSccu9eVWK6w4c2SDFLd8JAn1zqTuSFnsxb7ope6rMsnIHfp+eBbRBRZQ==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.0.tgz",
+      "integrity": "sha512-QG7qR2tijh1ftOvClut4YKKg1iW6cx3GZsKoGyJPxHkGWK9oJhG9P3j5deP0QQOGDowBMVQFaP+Vm4NpGYvmIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@keyv/serialize": "^1.0.3"
+        "@keyv/serialize": "^1.1.0"
       }
     },
     "node_modules/call-bind": {
@@ -4797,9 +5445,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001707",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
-      "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
+      "version": "1.0.30001735",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz",
+      "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==",
       "funding": [
         {
           "type": "opencollective",
@@ -4817,9 +5465,9 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
-      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.1.tgz",
+      "integrity": "sha512-5nFxhUrX0PqtyogoYOA8IPswy5sZFTOsBFl/9bNsmDLgsxYTzSZQJDPppDnZPTQbzSEm0hqGjWPzRemQCYbD6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4830,7 +5478,7 @@
         "pathval": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/chalk": {
@@ -4849,6 +5497,13 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/change-case": {
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
+      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/character-entities": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
@@ -4883,9 +5538,9 @@
       }
     },
     "node_modules/chart.js": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.5.tgz",
-      "integrity": "sha512-CVVjg1RYTJV9OCC8WeJPMx8gsV8K6WIyIEQUE3ui4AR9Hfgls9URri6Ja3hyMVBbTF8Q2KFa19PE815gWcWhng==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.5.0.tgz",
+      "integrity": "sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==",
       "license": "MIT",
       "dependencies": {
         "@kurkle/color": "^0.3.0"
@@ -5002,9 +5657,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz",
-      "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
+      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
       "dev": true,
       "funding": [
         {
@@ -5041,9 +5696,9 @@
       }
     },
     "node_modules/clippie": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/clippie/-/clippie-4.1.1.tgz",
-      "integrity": "sha512-D9OOW77Kkj9YEiDXTQjZJZLvTjJPEmK2IBx8JbGJIZaqVd8RvSvxwIN4KVSEFQfu9Jh0z5FL6Pdc4SIknllFFA==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/clippie/-/clippie-4.1.7.tgz",
+      "integrity": "sha512-l8BmUmWqOt4mpxeSflcfODJJOU+DsE5atWj82k1zsxd2X82haz2+g12PJPMOt6e1Cs4/ZnOWdRAV+nY9n2o1Rg==",
       "license": "BSD-2-Clause"
     },
     "node_modules/cliui": {
@@ -5103,9 +5758,9 @@
       }
     },
     "node_modules/codemirror": {
-      "version": "5.65.19",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.19.tgz",
-      "integrity": "sha512-+aFkvqhaAVr1gferNMuN8vkTSrWIFvzlMV9I2KBLCWS2WpZ2+UAkZjlMZmEuT+gcXTi6RrGQCkWq1/bDtGqhIA==",
+      "version": "5.65.20",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.20.tgz",
+      "integrity": "sha512-i5dLDDxwkFCbhjvL2pNjShsojoL3XHyDwsGv1jqETUoW+lzpBKKqNTUWgQwVAOa0tUm4BwekT455ujafi8payA==",
       "license": "MIT"
     },
     "node_modules/codemirror-spell-checker": {
@@ -5117,6 +5772,20 @@
         "typo-js": "*"
       }
     },
+    "node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=12.5.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -5135,6 +5804,17 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "license": "MIT"
     },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "node_modules/colord": {
       "version": "2.9.3",
       "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
@@ -5183,9 +5863,9 @@
       "license": "MIT"
     },
     "node_modules/confbox": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.1.tgz",
-      "integrity": "sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
+      "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
       "license": "MIT"
     },
     "node_modules/config-chain": {
@@ -5200,13 +5880,13 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.41.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
-      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
+      "version": "3.45.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz",
+      "integrity": "sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.4"
+        "browserslist": "^4.25.1"
       },
       "funding": {
         "type": "opencollective",
@@ -5320,9 +6000,9 @@
       }
     },
     "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz",
+      "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -5351,9 +6031,9 @@
       }
     },
     "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz",
+      "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -5418,9 +6098,9 @@
       "license": "MIT"
     },
     "node_modules/cytoscape": {
-      "version": "3.31.1",
-      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.31.1.tgz",
-      "integrity": "sha512-Hx5Mtb1+hnmAKaZZ/7zL1Y5HTFYOjdDswZy/jD+1WINRU8KVi1B7+vlHdsTwY+VCFucTreoyu1RDzQJ9u0d2Hw==",
+      "version": "3.33.1",
+      "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
+      "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10"
@@ -5987,9 +6667,9 @@
       "license": "MIT"
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -6004,9 +6684,9 @@
       }
     },
     "node_modules/decode-named-character-reference": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.1.0.tgz",
-      "integrity": "sha512-Wy+JTSbFThEOXQIR2L6mxJvEs+veIzpmqD7ynWxMXGpnk3smkHQOp6forLdHsKpAMW9iJpaBBIxz285t1n1C3w==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.2.0.tgz",
+      "integrity": "sha512-c6fcElNV6ShtZXmsgNgFFV5tVX2PaV4g+MOAkb8eXHvn6sryJBrZa9r0zV6+dtTyoCKxtDy5tyQ5ZwQuidtd+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6119,6 +6799,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
+      "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/devlop": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
@@ -6158,19 +6848,6 @@
       "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
       "license": "MIT"
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/dom-input-range": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/dom-input-range/-/dom-input-range-1.2.0.tgz",
@@ -6225,9 +6902,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
-      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
+      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -6311,6 +6988,23 @@
         "node": ">=14"
       }
     },
+    "node_modules/editorconfig/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/editorconfig/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/editorconfig/node_modules/minimatch": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
@@ -6328,9 +7022,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.123",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz",
-      "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==",
+      "version": "1.5.203",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz",
+      "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -6349,9 +7043,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "version": "5.18.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+      "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -6404,9 +7098,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6414,18 +7108,18 @@
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -6437,21 +7131,24 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -6460,7 +7157,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6470,18 +7167,18 @@
       }
     },
     "node_modules/es-aggregate-error": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.13.tgz",
-      "integrity": "sha512-KkzhUUuD2CUMqEc8JEqsXEMDHzDPE8RCjZeUBitsnB1eNcAJWQPiciKsMXe3Yytj4Flw1XLl46Qcf9OxvZha7A==",
+      "version": "1.0.14",
+      "resolved": "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.14.tgz",
+      "integrity": "sha512-3YxX6rVb07B5TV11AV5wsL7nQCHXNwoHPsQC8S4AmBiqYhyNCJ5BRKXkXyDJvs8QzXN20NgRtxe3dEEQD9NLHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
+        "es-abstract": "^1.24.0",
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "globalthis": "^1.0.3",
+        "globalthis": "^1.0.4",
         "has-property-descriptors": "^1.0.2",
         "set-function-name": "^2.0.2"
       },
@@ -6513,9 +7210,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
@@ -6579,9 +7276,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz",
-      "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz",
+      "integrity": "sha512-CRbODhYyQx3qp7ZEwzxOk4JBqmD/seJrzPa/cGjY1VtIn5E09Oi9/dB4JwctnfZ8Q8iT7rioVv5k/FNT/uf54g==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -6591,31 +7288,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.1",
-        "@esbuild/android-arm": "0.25.1",
-        "@esbuild/android-arm64": "0.25.1",
-        "@esbuild/android-x64": "0.25.1",
-        "@esbuild/darwin-arm64": "0.25.1",
-        "@esbuild/darwin-x64": "0.25.1",
-        "@esbuild/freebsd-arm64": "0.25.1",
-        "@esbuild/freebsd-x64": "0.25.1",
-        "@esbuild/linux-arm": "0.25.1",
-        "@esbuild/linux-arm64": "0.25.1",
-        "@esbuild/linux-ia32": "0.25.1",
-        "@esbuild/linux-loong64": "0.25.1",
-        "@esbuild/linux-mips64el": "0.25.1",
-        "@esbuild/linux-ppc64": "0.25.1",
-        "@esbuild/linux-riscv64": "0.25.1",
-        "@esbuild/linux-s390x": "0.25.1",
-        "@esbuild/linux-x64": "0.25.1",
-        "@esbuild/netbsd-arm64": "0.25.1",
-        "@esbuild/netbsd-x64": "0.25.1",
-        "@esbuild/openbsd-arm64": "0.25.1",
-        "@esbuild/openbsd-x64": "0.25.1",
-        "@esbuild/sunos-x64": "0.25.1",
-        "@esbuild/win32-arm64": "0.25.1",
-        "@esbuild/win32-ia32": "0.25.1",
-        "@esbuild/win32-x64": "0.25.1"
+        "@esbuild/aix-ppc64": "0.25.9",
+        "@esbuild/android-arm": "0.25.9",
+        "@esbuild/android-arm64": "0.25.9",
+        "@esbuild/android-x64": "0.25.9",
+        "@esbuild/darwin-arm64": "0.25.9",
+        "@esbuild/darwin-x64": "0.25.9",
+        "@esbuild/freebsd-arm64": "0.25.9",
+        "@esbuild/freebsd-x64": "0.25.9",
+        "@esbuild/linux-arm": "0.25.9",
+        "@esbuild/linux-arm64": "0.25.9",
+        "@esbuild/linux-ia32": "0.25.9",
+        "@esbuild/linux-loong64": "0.25.9",
+        "@esbuild/linux-mips64el": "0.25.9",
+        "@esbuild/linux-ppc64": "0.25.9",
+        "@esbuild/linux-riscv64": "0.25.9",
+        "@esbuild/linux-s390x": "0.25.9",
+        "@esbuild/linux-x64": "0.25.9",
+        "@esbuild/netbsd-arm64": "0.25.9",
+        "@esbuild/netbsd-x64": "0.25.9",
+        "@esbuild/openbsd-arm64": "0.25.9",
+        "@esbuild/openbsd-x64": "0.25.9",
+        "@esbuild/openharmony-arm64": "0.25.9",
+        "@esbuild/sunos-x64": "0.25.9",
+        "@esbuild/win32-arm64": "0.25.9",
+        "@esbuild/win32-ia32": "0.25.9",
+        "@esbuild/win32-x64": "0.25.9"
       }
     },
     "node_modules/esbuild-loader": {
@@ -6671,20 +7369,20 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
-      "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
+      "version": "9.33.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
+      "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.2",
-        "@eslint/config-helpers": "^0.1.0",
-        "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.22.0",
-        "@eslint/plugin-kit": "^0.2.7",
+        "@eslint/config-array": "^0.21.0",
+        "@eslint/config-helpers": "^0.3.1",
+        "@eslint/core": "^0.15.2",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.33.0",
+        "@eslint/plugin-kit": "^0.3.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
@@ -6695,9 +7393,9 @@
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.3.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -6732,9 +7430,9 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
-      "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.5.tgz",
+      "integrity": "sha512-vAUHYzue4YAa2hNACjB8HvUQj5yehAZgiClyFVVom9cP8z5NSFq3PwB/TtJslN2zAMgRX6FCFCjYBbQh71g5RQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6747,47 +7445,51 @@
         "eslint": ">=6.0.0"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+    "node_modules/eslint-import-context": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-context/-/eslint-import-context-0.1.9.tgz",
+      "integrity": "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
+        "get-tsconfig": "^4.10.1",
+        "stable-hash-x": "^0.2.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint-import-context"
+      },
+      "peerDependencies": {
+        "unrs-resolver": "^1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "unrs-resolver": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-import-resolver-typescript": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.1.1.tgz",
-      "integrity": "sha512-91As8PwH6xjPwndAbvhTuZ3DUfdl4HttocWRyaLOd5T4uUo6km8EDO7Sve4jzH50V1wbgql2nOFbE3GGfARJag==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-4.4.4.tgz",
+      "integrity": "sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "debug": "^4.4.0",
-        "get-tsconfig": "^4.10.0",
-        "is-bun-module": "^1.3.0",
-        "rspack-resolver": "^1.1.2",
-        "stable-hash": "^0.0.5",
-        "tinyglobby": "^0.2.12"
+        "debug": "^4.4.1",
+        "eslint-import-context": "^0.1.8",
+        "get-tsconfig": "^4.10.1",
+        "is-bun-module": "^2.0.0",
+        "stable-hash-x": "^0.2.0",
+        "tinyglobby": "^0.2.14",
+        "unrs-resolver": "^1.7.11"
       },
       "engines": {
         "node": "^16.17.0 || >=18.6.0"
       },
       "funding": {
-        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+        "url": "https://opencollective.com/eslint-import-resolver-typescript"
       },
       "peerDependencies": {
         "eslint": "*",
@@ -6817,30 +7519,40 @@
       }
     },
     "node_modules/eslint-plugin-import-x": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.7.0.tgz",
-      "integrity": "sha512-LHxq8V6SJ99hSFYAexxUKk3gVsjb8fuNRGsbMinwlJGvcuREP9SVzCCNKJ3POdDowEHdExy/bPN6YfjraueIXA==",
+      "version": "4.16.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.16.1.tgz",
+      "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/doctrine": "^0.0.9",
-        "@typescript-eslint/utils": "^8.26.1",
-        "debug": "^4.4.0",
-        "doctrine": "^3.0.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "get-tsconfig": "^4.10.0",
+        "@typescript-eslint/types": "^8.35.0",
+        "comment-parser": "^1.4.1",
+        "debug": "^4.4.1",
+        "eslint-import-context": "^0.1.9",
         "is-glob": "^4.0.3",
-        "minimatch": "^10.0.1",
-        "oxc-resolver": "^5.0.0",
-        "semver": "^7.7.1",
-        "stable-hash": "^0.0.5",
-        "tslib": "^2.8.1"
+        "minimatch": "^9.0.3 || ^10.0.1",
+        "semver": "^7.7.2",
+        "stable-hash-x": "^0.2.0",
+        "unrs-resolver": "^1.9.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint-plugin-import-x"
+      },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "@typescript-eslint/utils": "^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "eslint-import-resolver-node": "*"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/utils": {
+          "optional": true
+        },
+        "eslint-import-resolver-node": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-plugin-no-jquery": {
@@ -6873,14 +7585,11 @@
       }
     },
     "node_modules/eslint-plugin-playwright": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-2.2.0.tgz",
-      "integrity": "sha512-qSQpAw7RcSzE3zPp8FMGkthaCWovHZ/BsXtpmnGax9vQLIovlh1bsZHEa2+j2lv9DWhnyeLM/qZmp7ffQZfQvg==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-playwright/-/eslint-plugin-playwright-2.2.2.tgz",
+      "integrity": "sha512-j0jKpndIPOXRRP9uMkwb9l/nSmModOU3452nrFdgFJoEv/435J1onk8+aITzjDW8DfypxgmVaDMdmVIa6F7I0w==",
       "dev": true,
       "license": "MIT",
-      "workspaces": [
-        "examples"
-      ],
       "dependencies": {
         "globals": "^13.23.0"
       },
@@ -6907,23 +7616,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-playwright/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint-plugin-regexp": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-2.7.0.tgz",
-      "integrity": "sha512-U8oZI77SBtH8U3ulZ05iu0qEzIizyEDXd+BWHvyVxTOjGwcDcvy/kEpgFG4DYca2ByRLiVPFZ2GeH7j1pdvZTA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-2.10.0.tgz",
+      "integrity": "sha512-ovzQT8ESVn5oOe5a7gIDPD5v9bCSjIFJu57sVPDqgPRXicQzOnYfFN21WoQBQF18vrhT5o7UMKFwJQVVjyJ0ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6943,9 +7639,9 @@
       }
     },
     "node_modules/eslint-plugin-sonarjs": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-3.0.2.tgz",
-      "integrity": "sha512-LxjbfwI7ypENeTmGyKmDyNux3COSkMi7H/6Cal5StSLQ6edf0naP45SZR43OclaNR7WfhVTZdhOn63q3/Y6puQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-3.0.4.tgz",
+      "integrity": "sha512-ftQcP811kRJNXapqpQXHErEoVOdTPfYPPYd7n3AExIPwv4qWKKHf4slFvXmodiOnfgy1Tl3waPZZLD7lcvJOtw==",
       "dev": true,
       "license": "LGPL-3.0-only",
       "dependencies": {
@@ -6954,15 +7650,33 @@
         "bytes": "3.1.2",
         "functional-red-black-tree": "1.0.1",
         "jsx-ast-utils": "3.3.5",
+        "lodash.merge": "4.6.2",
         "minimatch": "9.0.5",
         "scslre": "0.3.0",
-        "semver": "7.7.1",
-        "typescript": "^5"
+        "semver": "7.7.2",
+        "typescript": ">=5"
       },
       "peerDependencies": {
         "eslint": "^8.0.0 || ^9.0.0"
       }
     },
+    "node_modules/eslint-plugin-sonarjs/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eslint-plugin-sonarjs/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/eslint-plugin-sonarjs/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -7002,50 +7716,39 @@
       }
     },
     "node_modules/eslint-plugin-unicorn": {
-      "version": "57.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-57.0.0.tgz",
-      "integrity": "sha512-zUYYa6zfNdTeG9BISWDlcLmz16c+2Ck2o5ZDHh0UzXJz3DEP7xjmlVDTzbyV0W+XksgZ0q37WEWzN2D2Ze+g9Q==",
+      "version": "60.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-60.0.0.tgz",
+      "integrity": "sha512-QUzTefvP8stfSXsqKQ+vBQSEsXIlAiCduS/V1Em+FKgL9c21U/IIm20/e3MFy1jyCf14tHAhqC1sX8OTy6VUCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "@eslint-community/eslint-utils": "^4.4.1",
-        "ci-info": "^4.1.0",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@eslint/plugin-kit": "^0.3.3",
+        "change-case": "^5.4.4",
+        "ci-info": "^4.3.0",
         "clean-regexp": "^1.0.0",
-        "core-js-compat": "^3.40.0",
+        "core-js-compat": "^3.44.0",
         "esquery": "^1.6.0",
-        "globals": "^15.15.0",
+        "find-up-simple": "^1.0.1",
+        "globals": "^16.3.0",
         "indent-string": "^5.0.0",
-        "is-builtin-module": "^4.0.0",
+        "is-builtin-module": "^5.0.0",
         "jsesc": "^3.1.0",
         "pluralize": "^8.0.0",
-        "read-package-up": "^11.0.0",
         "regexp-tree": "^0.1.27",
         "regjsparser": "^0.12.0",
-        "semver": "^7.7.1",
+        "semver": "^7.7.2",
         "strip-indent": "^4.0.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": "^20.10.0 || >=21.0.0"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
       },
       "peerDependencies": {
-        "eslint": ">=9.20.0"
-      }
-    },
-    "node_modules/eslint-plugin-unicorn/node_modules/globals": {
-      "version": "15.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
-      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "eslint": ">=9.29.0"
       }
     },
     "node_modules/eslint-plugin-vitest-globals": {
@@ -7056,9 +7759,9 @@
       "license": "MIT"
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.0.0.tgz",
-      "integrity": "sha512-XKckedtajqwmaX6u1VnECmZ6xJt+YvlmMzBPZd+/sI3ub2lpYZyFnsyWo7c3nMOQKJQudeyk1lw/JxdgeKT64w==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.4.0.tgz",
+      "integrity": "sha512-K6tP0dW8FJVZLQxa2S7LcE1lLw3X8VvB3t887Q6CLrFVxHYBXGANbXvwNzYIu6Ughx1bSJ5BDT0YB3ybPT39lw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7073,24 +7776,30 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0 || ^8.0.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "vue-eslint-parser": "^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/parser": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-plugin-vue-scoped-css": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-2.9.0.tgz",
-      "integrity": "sha512-zXeKtEUpfk3PlsgKnr9/2U8K2xcsCV1M9hXWRhKbl3wipVowGXfHrhqUzHFVWNAHzEQv0DCDXGFWrmsGFqhGGA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-2.11.0.tgz",
+      "integrity": "sha512-rrJgLY8iroTIUMSyxhyhJzFcRxABbk3gFrOLkl41F9G1VBqNNpDShyf6PmDoBEWDk07/bJlnqYlvnQ3giUrRYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "eslint-compat-utils": "^0.6.0",
+        "eslint-compat-utils": "^0.6.5",
         "lodash": "^4.17.21",
         "postcss": "^8.4.31",
         "postcss-safe-parser": "^6.0.0",
         "postcss-scss": "^4.0.3",
-        "postcss-selector-parser": "^6.0.9",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-styl": "^0.12.0"
       },
       "engines": {
@@ -7104,24 +7813,38 @@
         "vue-eslint-parser": ">=7.1.0"
       }
     },
+    "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/eslint-plugin-wc": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-2.2.1.tgz",
-      "integrity": "sha512-KstLqGmyQz088DvFlDYHg0sHih+w2QeulreCi1D1ftr357klO2zqHdG/bbnNMmuQdVFDuNkopNIyNhmG0XCT/g==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-3.0.1.tgz",
+      "integrity": "sha512-0p1wkSlA2Ue3FA4qW+5LZ+15sy0p1nUyVl1eyBMLq4rtN1LtE9IdI49BXNWMz8N8bM/y7Ulx8SWGAni5f8XO5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-valid-element-name": "^1.0.0",
-        "js-levenshtein-esm": "^1.2.0"
+        "js-levenshtein-esm": "^2.0.0"
       },
       "peerDependencies": {
         "eslint": ">=8.40.0"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -7136,9 +7859,9 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -7149,9 +7872,9 @@
       }
     },
     "node_modules/eslint/node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
@@ -7172,17 +7895,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/eslint/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -7204,15 +7916,15 @@
       }
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7291,9 +8003,9 @@
       }
     },
     "node_modules/expect-type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.0.tgz",
-      "integrity": "sha512-80F22aiJ3GLyVnS/B3HzgR6RelZVumzj9jkL0Rhz4h0xYbNW9PjlQz5h3J/SShErbXBc295vseR4/MIbVmUbeA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz",
+      "integrity": "sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -7301,9 +8013,9 @@
       }
     },
     "node_modules/exsolve": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.4.tgz",
-      "integrity": "sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz",
+      "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
       "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
@@ -7732,9 +8444,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
-      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
+      "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
       "license": "MIT",
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
@@ -7783,17 +8495,6 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "license": "BSD-2-Clause"
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/glob/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -7849,9 +8550,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
-      "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
+      "version": "16.3.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
+      "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7948,17 +8649,18 @@
       }
     },
     "node_modules/happy-dom": {
-      "version": "17.4.4",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-17.4.4.tgz",
-      "integrity": "sha512-/Pb0ctk3HTZ5xEL3BZ0hK1AqDSAUuRQitOmROPHhfUYEWpmTImwfD8vFDGADmMAX0JYgbcgxWoLFKtsWhcpuVA==",
+      "version": "18.0.1",
+      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-18.0.1.tgz",
+      "integrity": "sha512-qn+rKOW7KWpVTtgIUi6RVmTBZJSe2k0Db0vh1f7CWrWclkkc7/Q+FrOfkZIb2eiErLyqu5AXEzE7XthO9JVxRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "webidl-conversions": "^7.0.0",
+        "@types/node": "^20.0.0",
+        "@types/whatwg-mimetype": "^3.0.2",
         "whatwg-mimetype": "^3.0.0"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/has-bigints": {
@@ -8060,9 +8762,9 @@
       }
     },
     "node_modules/hookified": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.8.1.tgz",
-      "integrity": "sha512-GrO2l93P8xCWBSTBX9l2BxI78VU/MAAYag+pG8curS3aBGy0++ZlxrQ7PdUOUVMbn5BwkGb6+eRrnf43ipnFEA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.11.0.tgz",
+      "integrity": "sha512-aDdIN3GyU5I6wextPplYdfmWCo+aLmjjVbntmX6HLD5RCi/xKsivYEBhnRD+d9224zFf008ZpLMPlWF0ZodYZw==",
       "dev": true,
       "license": "MIT"
     },
@@ -8130,9 +8832,9 @@
       }
     },
     "node_modules/htmx.org": {
-      "version": "1.9.12",
-      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.12.tgz",
-      "integrity": "sha512-VZAohXyF7xPGS52IM8d1T1283y+X4D+Owf3qY1NZ9RuBypyu9l8cGsxUMAG5fEAb/DhT7rDoJ9Hpu5/HxFD3cw==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.6.tgz",
+      "integrity": "sha512-7ythjYneGSk3yCHgtCnQeaoF+D+o7U2LF37WU3O0JYv3gTZSicdEFiI/Ai/NJyC5ZpYJWMpUb11OC5Lr6AfAqA==",
       "license": "0BSD"
     },
     "node_modules/iconv-lite": {
@@ -8195,6 +8897,12 @@
         "node": ">= 4"
       }
     },
+    "node_modules/immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+      "license": "MIT"
+    },
     "node_modules/immer": {
       "version": "9.0.21",
       "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz",
@@ -8264,19 +8972,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/index-to-position": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.0.0.tgz",
-      "integrity": "sha512-sCO7uaLVhRJ25vz1o8s9IFM3nVS4DkuQnyjMwiQPKvQuBYBDmb8H7zx8ki7nVh4HJQOdVWebyvLE0qt+clruxA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -8449,13 +9144,13 @@
       }
     },
     "node_modules/is-builtin-module": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-4.0.0.tgz",
-      "integrity": "sha512-rWP3AMAalQSesXO8gleROyL2iKU73SX5Er66losQn9rWOWL4Gef0a/xOEOVqjWGMuR2vHG3FJ8UUmT700O8oFg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz",
+      "integrity": "sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "builtin-modules": "^4.0.0"
+        "builtin-modules": "^5.0.0"
       },
       "engines": {
         "node": ">=18.20"
@@ -8465,9 +9160,9 @@
       }
     },
     "node_modules/is-builtin-module/node_modules/builtin-modules": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-4.0.0.tgz",
-      "integrity": "sha512-p1n8zyCkt1BVrKNFymOHjcDSAl7oq/gUvfgULv2EblgpPVQlQr9yHnWjg9IJ2MhfwPqiYqMMrr01OY7yQoK2yA==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.0.0.tgz",
+      "integrity": "sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8478,13 +9173,13 @@
       }
     },
     "node_modules/is-bun-module": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
-      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-2.0.0.tgz",
+      "integrity": "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "semver": "^7.6.3"
+        "semver": "^7.7.1"
       }
     },
     "node_modules/is-callable": {
@@ -8677,6 +9372,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -8734,6 +9442,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-promise": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
+      "license": "MIT"
+    },
     "node_modules/is-proto-prop": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-proto-prop/-/is-proto-prop-3.0.1.tgz",
@@ -9070,6 +9784,23 @@
         "node": ">=14"
       }
     },
+    "node_modules/js-beautify/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-beautify/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/js-beautify/node_modules/glob": {
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -9118,9 +9849,9 @@
       }
     },
     "node_modules/js-levenshtein-esm": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/js-levenshtein-esm/-/js-levenshtein-esm-1.2.0.tgz",
-      "integrity": "sha512-fzreKVq1eD7eGcQr7MtRpQH94f8gIfhdrc7yeih38xh684TNMK9v5aAu2wxfIRMk/GpAJRrzcirMAPIaSDaByQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/js-levenshtein-esm/-/js-levenshtein-esm-2.0.0.tgz",
+      "integrity": "sha512-1n4LEPOL4wRXY8rOQcuA7Iuaphe5xCMayvufCzlLAi+hRsnBRDbSS6XPuV58CBVJxj5D9ApFLyjQ7KzFToyHBw==",
       "dev": true,
       "license": "MIT"
     },
@@ -9157,9 +9888,9 @@
       }
     },
     "node_modules/jsdoc-type-pratt-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
-      "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.8.0.tgz",
+      "integrity": "sha512-iZ8Bdb84lWRuGHamRXFyML07r21pcwBrLkHEuHgEY5UbCouBwv7ECknDRKzsQIXMiqpPymqtIf8TC/shYKB5rw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9235,9 +9966,9 @@
       "license": "MIT"
     },
     "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9299,9 +10030,9 @@
       "license": "MIT"
     },
     "node_modules/katex": {
-      "version": "0.16.21",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.21.tgz",
-      "integrity": "sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==",
+      "version": "0.16.22",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
+      "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
       "funding": [
         "https://opencollective.com/katex",
         "https://github.com/sponsors/katex"
@@ -9348,9 +10079,9 @@
       }
     },
     "node_modules/known-css-properties": {
-      "version": "0.35.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.35.0.tgz",
-      "integrity": "sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==",
+      "version": "0.37.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.37.0.tgz",
+      "integrity": "sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -9361,9 +10092,9 @@
       "license": "MIT"
     },
     "node_modules/langium": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/langium/-/langium-3.0.0.tgz",
-      "integrity": "sha512-+Ez9EoiByeoTu/2BXmEaZ06iPNXM6thWJp02KfBO/raSMyCJ4jw7AkWWa+zBCTm0+Tw1Fj9FOxdqSskyN5nAwg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/langium/-/langium-3.3.1.tgz",
+      "integrity": "sha512-QJv/h939gDpvT+9SiLVlY7tZC3xB2qK57v0J04Sh9wpMb6MP1q8gB21L3WIo8T5P1MSMg3Ep14L7KkDCFG3y4w==",
       "license": "MIT",
       "dependencies": {
         "chevrotain": "~11.0.3",
@@ -9433,6 +10164,15 @@
         "npm": ">=8"
       }
     },
+    "node_modules/lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
     "node_modules/lilconfig": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
@@ -9461,6 +10201,37 @@
         "uc.micro": "^2.0.0"
       }
     },
+    "node_modules/lit": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.1.tgz",
+      "integrity": "sha512-Ksr/8L3PTapbdXJCk+EJVB78jDodUMaP54gD24W186zGRARvwrsPfS60wae/SSCTCNZVPd1chXqio1qHQmu4NA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@lit/reactive-element": "^2.1.0",
+        "lit-element": "^4.2.0",
+        "lit-html": "^3.3.0"
+      }
+    },
+    "node_modules/lit-element": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.2.1.tgz",
+      "integrity": "sha512-WGAWRGzirAgyphK2urmYOV72tlvnxw7YfyLDgQ+OZnM9vQQBQnumQ7jUJe6unEzwGU3ahFOjuz1iz1jjrpCPuw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@lit-labs/ssr-dom-shim": "^1.4.0",
+        "@lit/reactive-element": "^2.1.0",
+        "lit-html": "^3.3.0"
+      }
+    },
+    "node_modules/lit-html": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.3.1.tgz",
+      "integrity": "sha512-S9hbyDu/vs1qNrithiNyeyv64c9yqiW9l+DBgI18fL+MTvOtWoFR0FWiyq1TxaYef5wNlpEmzlXoBlZEO+WjoA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -9566,9 +10337,9 @@
       "license": "MIT"
     },
     "node_modules/loupe": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
-      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.0.tgz",
+      "integrity": "sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==",
       "dev": true,
       "license": "MIT"
     },
@@ -9659,52 +10430,52 @@
       }
     },
     "node_modules/markdownlint": {
-      "version": "0.37.4",
-      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.37.4.tgz",
-      "integrity": "sha512-u00joA/syf3VhWh6/ybVFkib5Zpj2e5KB/cfCei8fkSRuums6nyisTWGqjTWIOFoFwuXoTBQQiqlB4qFKp8ncQ==",
+      "version": "0.38.0",
+      "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.38.0.tgz",
+      "integrity": "sha512-xaSxkaU7wY/0852zGApM8LdlIfGCW8ETZ0Rr62IQtAnUMlMuifsg09vWJcNYeL4f0anvr8Vo4ZQar8jGpV0btQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "markdown-it": "14.1.0",
-        "micromark": "4.0.1",
-        "micromark-core-commonmark": "2.0.2",
-        "micromark-extension-directive": "3.0.2",
+        "micromark": "4.0.2",
+        "micromark-core-commonmark": "2.0.3",
+        "micromark-extension-directive": "4.0.0",
         "micromark-extension-gfm-autolink-literal": "2.1.0",
         "micromark-extension-gfm-footnote": "2.1.0",
-        "micromark-extension-gfm-table": "2.1.0",
+        "micromark-extension-gfm-table": "2.1.1",
         "micromark-extension-math": "3.1.0",
-        "micromark-util-types": "2.0.1"
+        "micromark-util-types": "2.0.2"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/DavidAnson"
       }
     },
     "node_modules/markdownlint-cli": {
-      "version": "0.44.0",
-      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.44.0.tgz",
-      "integrity": "sha512-ZJTAONlvF9NkrIBltCdW15DxN9UTbPiKMEqAh2EU2gwIFlrCMavyCEPPO121cqfYOrLUJWW8/XKWongstmmTeQ==",
+      "version": "0.45.0",
+      "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.45.0.tgz",
+      "integrity": "sha512-GiWr7GfJLVfcopL3t3pLumXCYs8sgWppjIA1F/Cc3zIMgD3tmkpyZ1xkm1Tej8mw53B93JsDjgA3KOftuYcfOw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "commander": "~13.1.0",
-        "glob": "~10.4.5",
-        "ignore": "~7.0.3",
+        "glob": "~11.0.2",
+        "ignore": "~7.0.4",
         "js-yaml": "~4.1.0",
         "jsonc-parser": "~3.3.1",
         "jsonpointer": "~5.0.1",
-        "markdownlint": "~0.37.4",
-        "minimatch": "~9.0.5",
+        "markdown-it": "~14.1.0",
+        "markdownlint": "~0.38.0",
+        "minimatch": "~10.0.1",
         "run-con": "~1.3.2",
-        "smol-toml": "~1.3.1"
+        "smol-toml": "~1.3.4"
       },
       "bin": {
         "markdownlint": "markdownlint.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/markdownlint-cli/node_modules/commander": {
@@ -9718,36 +10489,55 @@
       }
     },
     "node_modules/markdownlint-cli/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.3.tgz",
+      "integrity": "sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.0.3",
         "minipass": "^7.1.2",
         "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "path-scurry": "^2.0.0"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
+      "engines": {
+        "node": "20 || >=22"
+      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/markdownlint-cli/node_modules/ignore": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz",
-      "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/markdownlint-cli/node_modules/jackspeak": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
+      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/markdownlint-cli/node_modules/jsonc-parser": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
@@ -9755,17 +10545,28 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/markdownlint-cli/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+    "node_modules/markdownlint-cli/node_modules/lru-cache": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
+      "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
       "dev": true,
       "license": "ISC",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/markdownlint-cli/node_modules/path-scurry": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": "20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -9847,14 +10648,14 @@
       }
     },
     "node_modules/mermaid": {
-      "version": "11.5.0",
-      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.5.0.tgz",
-      "integrity": "sha512-IYhyukID3zzDj1EihKiN1lp+PXNImoJ3Iyz73qeDAgnus4BNGsJV1n471P4PyeGxPVONerZxignwGxGTSwZnlg==",
+      "version": "11.8.1",
+      "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.8.1.tgz",
+      "integrity": "sha512-VSXJLqP1Sqw5sGr273mhvpPRhXwE6NlmMSqBZQw+yZJoAJkOIPPn/uT3teeCBx60Fkt5zEI3FrH2eVT0jXRDzw==",
       "license": "MIT",
       "dependencies": {
         "@braintree/sanitize-url": "^7.0.4",
         "@iconify/utils": "^2.1.33",
-        "@mermaid-js/parser": "^0.3.0",
+        "@mermaid-js/parser": "^0.6.1",
         "@types/d3": "^7.4.3",
         "cytoscape": "^3.29.3",
         "cytoscape-cose-bilkent": "^4.1.0",
@@ -9863,7 +10664,7 @@
         "d3-sankey": "^0.12.3",
         "dagre-d3-es": "7.0.11",
         "dayjs": "^1.11.13",
-        "dompurify": "^3.2.4",
+        "dompurify": "^3.2.5",
         "katex": "^0.16.9",
         "khroma": "^2.1.0",
         "lodash-es": "^4.17.21",
@@ -9881,9 +10682,9 @@
       "license": "MIT"
     },
     "node_modules/mermaid/node_modules/marked": {
-      "version": "15.0.7",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.7.tgz",
-      "integrity": "sha512-dgLIeKGLx5FwziAnsk4ONoGwHwGPJzselimvlVskE9XLN4Orv9u2VA3GWw/lYUqjfA0rUT/6fqKwfZJapP9BEg==",
+      "version": "15.0.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",
+      "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",
       "license": "MIT",
       "bin": {
         "marked": "bin/marked.js"
@@ -9893,9 +10694,9 @@
       }
     },
     "node_modules/micromark": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz",
-      "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
+      "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==",
       "dev": true,
       "funding": [
         {
@@ -9929,9 +10730,9 @@
       }
     },
     "node_modules/micromark-core-commonmark": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.2.tgz",
-      "integrity": "sha512-FKjQKbxd1cibWMM1P9N+H8TwlgGgSkWZMmfuVucLCHaYqeSvJ0hFeHsIa65pA2nYbes0f8LDHPMrd9X7Ujxg9w==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz",
+      "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==",
       "dev": true,
       "funding": [
         {
@@ -9964,9 +10765,9 @@
       }
     },
     "node_modules/micromark-extension-directive": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/micromark-extension-directive/-/micromark-extension-directive-3.0.2.tgz",
-      "integrity": "sha512-wjcXHgk+PPdmvR58Le9d7zQYWy+vKEU9Se44p2CrCDPiLr2FMyiT4Fyb5UFKFC66wGB3kPlgD7q3TnoqPS7SZA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-directive/-/micromark-extension-directive-4.0.0.tgz",
+      "integrity": "sha512-/C2nqVmXXmiseSSuCdItCMho7ybwwop6RrrRPk0KbOHW21JKoCldC+8rFOaundDoRBUWBnJJcxeA/Kvi34WQXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10022,9 +10823,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-table": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.0.tgz",
-      "integrity": "sha512-Ub2ncQv+fwD70/l4ou27b4YzfNaCJOvyX4HxXU15m7mpYY+rjuWzsLIPZHJL253Z643RpbcP1oeIJlQ/SKW67g==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
+      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10412,9 +11213,9 @@
       "license": "MIT"
     },
     "node_modules/micromark-util-types": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.1.tgz",
-      "integrity": "sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
       "dev": true,
       "funding": [
         {
@@ -10473,9 +11274,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.3.tgz",
+      "integrity": "sha512-tRA0+PsS4kLVijnN1w9jUu5lkxBwUk9E8SbgEB5dBJqchE6pVYdawROG6uQtpmAri7tdCK9i7b1bULeVWqS6Ag==",
       "license": "MIT",
       "dependencies": {
         "schema-utils": "^4.0.0",
@@ -10493,12 +11294,12 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-      "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.3.tgz",
+      "integrity": "sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==",
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@isaacs/brace-expansion": "^5.0.0"
       },
       "engines": {
         "node": "20 || >=22"
@@ -10628,6 +11429,22 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/napi-postinstall": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.3.tgz",
+      "integrity": "sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "napi-postinstall": "lib/cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/napi-postinstall"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -10902,29 +11719,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/oxc-resolver": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-5.0.1.tgz",
-      "integrity": "sha512-BbclyCSxgnqO5mo05RGcwp8rkVdZL7sf0ugEnFWK67DIBAMq5wR0/GQlQCdPiPkpiv9GESAVX2cbh1DMFux/TQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/Boshen"
-      },
-      "optionalDependencies": {
-        "@oxc-resolver/binding-darwin-arm64": "5.0.1",
-        "@oxc-resolver/binding-darwin-x64": "5.0.1",
-        "@oxc-resolver/binding-freebsd-x64": "5.0.1",
-        "@oxc-resolver/binding-linux-arm-gnueabihf": "5.0.1",
-        "@oxc-resolver/binding-linux-arm64-gnu": "5.0.1",
-        "@oxc-resolver/binding-linux-arm64-musl": "5.0.1",
-        "@oxc-resolver/binding-linux-x64-gnu": "5.0.1",
-        "@oxc-resolver/binding-linux-x64-musl": "5.0.1",
-        "@oxc-resolver/binding-wasm32-wasi": "5.0.1",
-        "@oxc-resolver/binding-win32-arm64-msvc": "5.0.1",
-        "@oxc-resolver/binding-win32-x64-msvc": "5.0.1"
-      }
-    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -10973,13 +11767,10 @@
       "license": "BlueOak-1.0.0"
     },
     "node_modules/package-manager-detector": {
-      "version": "0.2.11",
-      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.11.tgz",
-      "integrity": "sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==",
-      "license": "MIT",
-      "dependencies": {
-        "quansync": "^0.2.7"
-      }
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.3.0.tgz",
+      "integrity": "sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==",
+      "license": "MIT"
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
@@ -11122,9 +11913,9 @@
       "license": "MIT"
     },
     "node_modules/pathval": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
-      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11165,9 +11956,9 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "license": "MIT",
       "engines": {
         "node": ">= 6"
@@ -11238,24 +12029,24 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.0.tgz",
-      "integrity": "sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
+      "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
       "license": "MIT",
       "dependencies": {
-        "confbox": "^0.2.1",
-        "exsolve": "^1.0.1",
+        "confbox": "^0.2.2",
+        "exsolve": "^1.0.7",
         "pathe": "^2.0.3"
       }
     },
     "node_modules/playwright": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.0.tgz",
-      "integrity": "sha512-442pTfGM0xxfCYxuBa/Pu6B2OqxqqaYq39JS8QDMGThUvIOCd6s0ANDog3uwA0cHavVlnTQzGCN7Id2YekDSXA==",
+      "version": "1.54.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.54.2.tgz",
+      "integrity": "sha512-Hu/BMoA1NAdRUuulyvQC0pEqZ4vQbGfn8f7wPXcnqQmM+zct9UliKxsIkLNmz/ku7LElUNqmaiv1TG/aL5ACsw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.51.0"
+        "playwright-core": "1.54.2"
       },
       "bin": {
         "playwright": "cli.js"
@@ -11268,9 +12059,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.0.tgz",
-      "integrity": "sha512-x47yPE3Zwhlil7wlNU/iktF7t2r/URR3VLbH6EknJd/04Qc/PSJ0EY3CMXipmglLG+zyRxW6HNo2EGbKLHPWMg==",
+      "version": "1.54.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.54.2.tgz",
+      "integrity": "sha512-n5r4HFbMmWsB4twG7tJLDN9gmBUeSPcsBZiWSE4DnYz9mJMAFqr2ID7+eGC9kpEnxExJ1epttwR59LEWCk8mtA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -11327,9 +12118,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
-      "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.5.tgz",
+      "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==",
       "funding": [
         {
           "type": "opencollective",
@@ -11346,7 +12137,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -11406,41 +12197,6 @@
         "postcss": "^8.4.21"
       }
     },
-    "node_modules/postcss-load-config": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "lilconfig": "^3.0.0",
-        "yaml": "^2.3.4"
-      },
-      "engines": {
-        "node": ">= 14"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/postcss-loader": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-8.1.1.tgz",
@@ -11501,19 +12257,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss-modules-scope": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
@@ -11529,19 +12272,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -11582,10 +12312,23 @@
         "postcss": "^8.2.14"
       }
     },
+    "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-nesting": {
-      "version": "13.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.1.tgz",
-      "integrity": "sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.2.tgz",
+      "integrity": "sha512-1YCI290TX+VP0U/K/aFxzHzQWHWURL+CtHMSbex1lCdpXD1SoR2sYuxDu5aNI9lPoXpKTCggFZiDJbwylU0LEQ==",
       "funding": [
         {
           "type": "github",
@@ -11598,7 +12341,7 @@
       ],
       "license": "MIT-0",
       "dependencies": {
-        "@csstools/selector-resolve-nested": "^3.0.0",
+        "@csstools/selector-resolve-nested": "^3.1.0",
         "@csstools/selector-specificity": "^5.0.0",
         "postcss-selector-parser": "^7.0.0"
       },
@@ -11609,63 +12352,6 @@
         "postcss": "^8.4"
       }
     },
-    "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz",
-      "integrity": "sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^7.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
-      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^7.0.0"
-      }
-    },
-    "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/postcss-resolve-nested-selector": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz",
@@ -11718,9 +12404,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -11788,6 +12474,16 @@
       "dev": true,
       "license": "Unlicense"
     },
+    "node_modules/promise-worker-transferable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/promise-worker-transferable/-/promise-worker-transferable-1.0.4.tgz",
+      "integrity": "sha512-bN+0ehEnrXfxV2ZQvU2PetO0n4gqBD4ulq3MI1WOPLgr7/Mg9yRQkX5+0v1vagr74ZTsl7XtzlaYDo2EuCeYJw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "is-promise": "^2.1.0",
+        "lie": "^3.0.2"
+      }
+    },
     "node_modules/proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -11829,9 +12525,9 @@
       }
     },
     "node_modules/quansync": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz",
-      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+      "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
       "funding": [
         {
           "type": "individual",
@@ -11919,6 +12615,23 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/read-package-json/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/read-package-json/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/read-package-json/node_modules/glob": {
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -11966,97 +12679,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/read-package-up": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz",
-      "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "find-up-simple": "^1.0.0",
-        "read-pkg": "^9.0.0",
-        "type-fest": "^4.6.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz",
-      "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.3",
-        "normalize-package-data": "^6.0.0",
-        "parse-json": "^8.0.0",
-        "type-fest": "^4.6.0",
-        "unicorn-magic": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz",
-      "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-license": "^3.0.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-pkg/node_modules/parse-json": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.2.0.tgz",
-      "integrity": "sha512-eONBZy4hm2AgxjNFd8a4nyDJnzUAH0g34xSQAwWEVGCjdZ4ZL7dKZBfq267GWP/JaS9zW62Xs2FeAdDvpHHJGQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "index-to-position": "^1.0.0",
-        "type-fest": "^4.37.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -12117,12 +12739,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "license": "MIT"
-    },
     "node_modules/regexp-ast-analysis": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/regexp-ast-analysis/-/regexp-ast-analysis-0.7.1.tgz",
@@ -12325,29 +12941,6 @@
         "points-on-path": "^0.2.1"
       }
     },
-    "node_modules/rspack-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/rspack-resolver/-/rspack-resolver-1.2.2.tgz",
-      "integrity": "sha512-Fwc19jMBA3g+fxDJH2B4WxwZjE0VaaOL7OX/A4Wn5Zv7bOD/vyPZhzXfaO73Xc2GAlfi96g5fGUa378WbIGfFw==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/JounQin"
-      },
-      "optionalDependencies": {
-        "@unrs/rspack-resolver-binding-darwin-arm64": "1.2.2",
-        "@unrs/rspack-resolver-binding-darwin-x64": "1.2.2",
-        "@unrs/rspack-resolver-binding-freebsd-x64": "1.2.2",
-        "@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "1.2.2",
-        "@unrs/rspack-resolver-binding-linux-arm64-gnu": "1.2.2",
-        "@unrs/rspack-resolver-binding-linux-arm64-musl": "1.2.2",
-        "@unrs/rspack-resolver-binding-linux-x64-gnu": "1.2.2",
-        "@unrs/rspack-resolver-binding-linux-x64-musl": "1.2.2",
-        "@unrs/rspack-resolver-binding-wasm32-wasi": "1.2.2",
-        "@unrs/rspack-resolver-binding-win32-arm64-msvc": "1.2.2",
-        "@unrs/rspack-resolver-binding-win32-x64-msvc": "1.2.2"
-      }
-    },
     "node_modules/run-con": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.3.2.tgz",
@@ -12499,9 +13092,9 @@
       "license": "ISC"
     },
     "node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -12533,9 +13126,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -12554,18 +13147,18 @@
       }
     },
     "node_modules/seroval": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.2.1.tgz",
-      "integrity": "sha512-yBxFFs3zmkvKNmR0pFSU//rIsYjuX418TnlDmc2weaq5XFDqDIV/NOMPBoLrbxjLH42p4UzRuXHryXh9dYcKcw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.3.2.tgz",
+      "integrity": "sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/seroval-plugins": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.2.1.tgz",
-      "integrity": "sha512-H5vs53+39+x4Udwp4J5rNZfgFuA+Lt+uU+09w1gYBVWomtAl98B+E9w7yC05Xc81/HgLvJdlyqJbU0fJCKCmdw==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/seroval-plugins/-/seroval-plugins-1.3.2.tgz",
+      "integrity": "sha512-0QvCV2lM3aj/U3YozDiVwx9zpH0q8A60CTWIv4Jszj/givcudPb48B+rkU5D51NJ0pTpweGMttHjboPa9/zoIQ==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -12635,6 +13228,49 @@
         "node": ">=8"
       }
     },
+    "node_modules/sharp": {
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.3.tgz",
+      "integrity": "sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.4",
+        "semver": "^7.7.2"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-darwin-arm64": "0.34.3",
+        "@img/sharp-darwin-x64": "0.34.3",
+        "@img/sharp-libvips-darwin-arm64": "1.2.0",
+        "@img/sharp-libvips-darwin-x64": "1.2.0",
+        "@img/sharp-libvips-linux-arm": "1.2.0",
+        "@img/sharp-libvips-linux-arm64": "1.2.0",
+        "@img/sharp-libvips-linux-ppc64": "1.2.0",
+        "@img/sharp-libvips-linux-s390x": "1.2.0",
+        "@img/sharp-libvips-linux-x64": "1.2.0",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.2.0",
+        "@img/sharp-libvips-linuxmusl-x64": "1.2.0",
+        "@img/sharp-linux-arm": "0.34.3",
+        "@img/sharp-linux-arm64": "0.34.3",
+        "@img/sharp-linux-ppc64": "0.34.3",
+        "@img/sharp-linux-s390x": "0.34.3",
+        "@img/sharp-linux-x64": "0.34.3",
+        "@img/sharp-linuxmusl-arm64": "0.34.3",
+        "@img/sharp-linuxmusl-x64": "0.34.3",
+        "@img/sharp-wasm32": "0.34.3",
+        "@img/sharp-win32-arm64": "0.34.3",
+        "@img/sharp-win32-ia32": "0.34.3",
+        "@img/sharp-win32-x64": "0.34.3"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -12764,6 +13400,23 @@
         "node": ">=12"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -12803,9 +13456,9 @@
       }
     },
     "node_modules/smol-toml": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.1.tgz",
-      "integrity": "sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.3.4.tgz",
+      "integrity": "sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -12816,14 +13469,14 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.5.tgz",
-      "integrity": "sha512-ogI3DaFcyn6UhYhrgcyRAMbu/buBJitYQASZz5WzfQVPP10RD2AbCoRZ517psnezrasyCbWzIxZ6kVqet768xw==",
+      "version": "1.9.9",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.9.9.tgz",
+      "integrity": "sha512-A0ZBPJQldAeGCTW0YRYJmt7RCeh5rbFfPZ2aOttgYnctHE7HgKeHCBB/PVc2P7eOfmNXqMFFFoYYdm3S4dcbkA==",
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.1.0",
-        "seroval": "^1.1.0",
-        "seroval-plugins": "^1.1.0"
+        "seroval": "~1.3.0",
+        "seroval-plugins": "~1.3.0"
       }
     },
     "node_modules/sortablejs": {
@@ -12928,9 +13581,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.21",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -12953,12 +13606,15 @@
         "spdx-ranges": "^2.0.0"
       }
     },
-    "node_modules/stable-hash": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz",
-      "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
+    "node_modules/stable-hash-x": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/stable-hash-x/-/stable-hash-x-0.2.0.tgz",
+      "integrity": "sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      }
     },
     "node_modules/stackback": {
       "version": "0.0.2",
@@ -12979,12 +13635,26 @@
       }
     },
     "node_modules/std-env": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.1.tgz",
-      "integrity": "sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
+      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -13127,6 +13797,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -13135,9 +13818,9 @@
       "license": "ISC"
     },
     "node_modules/stylelint": {
-      "version": "16.16.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.16.0.tgz",
-      "integrity": "sha512-40X5UOb/0CEFnZVEHyN260HlSSUxPES+arrUphOumGWgXERHfwCD0kNBVILgQSij8iliYVwlc0V7M5bcLP9vPg==",
+      "version": "16.23.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.23.1.tgz",
+      "integrity": "sha512-dNvDTsKV1U2YtiUDfe9d2gp902veFeo3ecCWdGlmLm2WFrAV0+L5LoOj/qHSBABQwMsZPJwfC4bf39mQm1S5zw==",
       "dev": true,
       "funding": [
         {
@@ -13151,9 +13834,9 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "@csstools/media-query-list-parser": "^4.0.2",
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3",
         "@csstools/selector-specificity": "^5.0.0",
         "@dual-bundle/import-meta-resolve": "^4.1.0",
         "balanced-match": "^2.0.0",
@@ -13161,24 +13844,24 @@
         "cosmiconfig": "^9.0.0",
         "css-functions-list": "^3.2.3",
         "css-tree": "^3.1.0",
-        "debug": "^4.3.7",
+        "debug": "^4.4.1",
         "fast-glob": "^3.3.3",
         "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^10.0.7",
+        "file-entry-cache": "^10.1.3",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.3.1",
-        "ignore": "^7.0.3",
+        "ignore": "^7.0.5",
         "imurmurhash": "^0.1.4",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.35.0",
+        "known-css-properties": "^0.37.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^13.2.0",
         "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "picocolors": "^1.1.1",
-        "postcss": "^8.5.3",
+        "postcss": "^8.5.6",
         "postcss-resolve-nested-selector": "^0.1.6",
         "postcss-safe-parser": "^7.0.1",
         "postcss-selector-parser": "^7.1.0",
@@ -13240,86 +13923,32 @@
         "stylelint": ">=16"
       }
     },
-    "node_modules/stylelint/node_modules/@csstools/media-query-list-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz",
-      "integrity": "sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
-      }
-    },
-    "node_modules/stylelint/node_modules/@csstools/selector-specificity": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
-      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^7.0.0"
-      }
-    },
-    "node_modules/stylelint/node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/stylelint/node_modules/file-entry-cache": {
-      "version": "10.0.7",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.0.7.tgz",
-      "integrity": "sha512-txsf5fu3anp2ff3+gOJJzRImtrtm/oa9tYLN0iTuINZ++EyVR/nRrg2fKYwvG/pXDofcrvvb0scEbX3NyW/COw==",
+      "version": "10.1.4",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.1.4.tgz",
+      "integrity": "sha512-5XRUFc0WTtUbjfGzEwXc42tiGxQHBmtbUG1h9L2apu4SulCGN3Hqm//9D6FAolf8MYNL7f/YlJl9vy08pj5JuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^6.1.7"
+        "flat-cache": "^6.1.13"
       }
     },
     "node_modules/stylelint/node_modules/flat-cache": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.7.tgz",
-      "integrity": "sha512-qwZ4xf1v1m7Rc9XiORly31YaChvKt6oNVHuqqZcoED/7O+ToyNVGobKsIAopY9ODcWpEDKEBAbrSOCBHtNQvew==",
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.13.tgz",
+      "integrity": "sha512-gmtS2PaUjSPa4zjObEIn4WWliKyZzYljgxODBfxugpK6q6HU9ClXzgCJ+nlcPKY9Bt090ypTOLIFWkV0jbKFjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cacheable": "^1.8.9",
+        "cacheable": "^1.10.4",
         "flatted": "^3.3.3",
-        "hookified": "^1.7.1"
+        "hookified": "^1.11.0"
       }
     },
     "node_modules/stylelint/node_modules/ignore": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz",
-      "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13327,9 +13956,9 @@
       }
     },
     "node_modules/stylelint/node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dev": true,
       "funding": [
         {
@@ -13347,7 +13976,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -13382,20 +14011,6 @@
         "postcss": "^8.4.31"
       }
     },
-    "node_modules/stylelint/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/stylelint/node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -13434,13 +14049,13 @@
       }
     },
     "node_modules/stylus/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 8"
+        "node": ">= 12"
       }
     },
     "node_modules/sucrase": {
@@ -13465,6 +14080,21 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/sucrase/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/sucrase/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/sucrase/node_modules/commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -13557,25 +14187,25 @@
       "dev": true
     },
     "node_modules/svgo": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.2.0.tgz",
-      "integrity": "sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.0.tgz",
+      "integrity": "sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@trysound/sax": "0.2.0",
-        "commander": "^7.2.0",
+        "commander": "^11.1.0",
         "css-select": "^5.1.0",
-        "css-tree": "^2.3.1",
+        "css-tree": "^3.0.1",
         "css-what": "^6.1.0",
         "csso": "^5.0.5",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1",
+        "sax": "^1.4.1"
       },
       "bin": {
-        "svgo": "bin/svgo"
+        "svgo": "bin/svgo.js"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=16"
       },
       "funding": {
         "type": "opencollective",
@@ -13583,35 +14213,21 @@
       }
     },
     "node_modules/svgo/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
+      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 10"
+        "node": ">=16"
       }
     },
-    "node_modules/svgo/node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+    "node_modules/svgo/node_modules/sax": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true,
-      "license": "CC0-1.0"
+      "license": "ISC"
     },
     "node_modules/swagger-ui-dist": {
       "version": "5.17.14",
@@ -13686,23 +14302,71 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/tailwindcss/node_modules/postcss-load-config": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "lilconfig": "^3.0.0",
+        "yaml": "^2.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      },
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/terser": {
-      "version": "5.39.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-      "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+      "version": "5.43.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+      "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
       "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
+        "acorn": "^8.14.0",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -13768,6 +14432,23 @@
         "node": ">=18"
       }
     },
+    "node_modules/test-exclude/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/test-exclude/node_modules/glob": {
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
@@ -13833,6 +14514,13 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/three": {
+      "version": "0.172.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.172.0.tgz",
+      "integrity": "sha512-6HMgMlzU97MsV7D/tY8Va38b83kz8YJX+BefKjspMNAv0Vx6dxMogHOrnRl/sbMIs3BPUKijPqDqJ/+UwJbIow==",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/throttle-debounce": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.0.tgz",
@@ -13856,19 +14544,19 @@
       "license": "MIT"
     },
     "node_modules/tinyexec": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
-      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.1.tgz",
+      "integrity": "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==",
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
-      "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.3",
+        "fdir": "^6.4.4",
         "picomatch": "^4.0.2"
       },
       "engines": {
@@ -13879,11 +14567,14 @@
       }
     },
     "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
-      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -13894,9 +14585,9 @@
       }
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13907,9 +14598,9 @@
       }
     },
     "node_modules/tinypool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
-      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13927,9 +14618,9 @@
       }
     },
     "node_modules/tinyspy": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
-      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
+      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -14063,13 +14754,13 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.37.0.tgz",
-      "integrity": "sha512-S/5/0kFftkq27FPNye0XM1e2NsnoD/3FS+pBmbjmmtLT6I+i344KoOf7pvXreaFsDamWeaJX55nczA1m5PsBDg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=16"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -14154,9 +14845,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
+      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
       "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
@@ -14168,15 +14859,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.26.1",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.26.1.tgz",
-      "integrity": "sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==",
+      "version": "8.39.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.0.tgz",
+      "integrity": "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.26.1",
-        "@typescript-eslint/parser": "8.26.1",
-        "@typescript-eslint/utils": "8.26.1"
+        "@typescript-eslint/eslint-plugin": "8.39.0",
+        "@typescript-eslint/parser": "8.39.0",
+        "@typescript-eslint/typescript-estree": "8.39.0",
+        "@typescript-eslint/utils": "8.39.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -14187,13 +14879,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/typo-js": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.2.5.tgz",
-      "integrity": "sha512-F45vFWdGX8xahIk/sOp79z2NJs8ETMYsmMChm9D5Hlx3+9j7VnCyQyvij5MOCrNY3NNe8noSyokRjQRfq+Bc7A==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.3.1.tgz",
+      "integrity": "sha512-elJkpCL6Z77Ghw0Lv0lGnhBAjSTOQ5FhiVOCfOuxhaoTT2xtLVbqikYItK5HHchzPbHEUFAcjOH669T2ZzeCbg==",
       "license": "BSD-3-Clause"
     },
     "node_modules/uc.micro": {
@@ -14204,9 +14896,9 @@
       "license": "MIT"
     },
     "node_modules/ufo": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz",
-      "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz",
+      "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==",
       "license": "MIT"
     },
     "node_modules/uint8-to-base64": {
@@ -14235,24 +14927,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "license": "MIT"
     },
-    "node_modules/unicorn-magic": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
-      "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
@@ -14263,6 +14942,41 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/unrs-resolver": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz",
+      "integrity": "sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "napi-postinstall": "^0.3.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unrs-resolver"
+      },
+      "optionalDependencies": {
+        "@unrs/resolver-binding-android-arm-eabi": "1.11.1",
+        "@unrs/resolver-binding-android-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-arm64": "1.11.1",
+        "@unrs/resolver-binding-darwin-x64": "1.11.1",
+        "@unrs/resolver-binding-freebsd-x64": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-arm64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-riscv64-musl": "1.11.1",
+        "@unrs/resolver-binding-linux-s390x-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-gnu": "1.11.1",
+        "@unrs/resolver-binding-linux-x64-musl": "1.11.1",
+        "@unrs/resolver-binding-wasm32-wasi": "1.11.1",
+        "@unrs/resolver-binding-win32-arm64-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-ia32-msvc": "1.11.1",
+        "@unrs/resolver-binding-win32-x64-msvc": "1.11.1"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
@@ -14367,21 +15081,24 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.2.tgz",
-      "integrity": "sha512-yW7PeMM+LkDzc7CgJuRLMW2Jz0FxMOsVJ8Lv3gpgW9WLcb9cTW+121UEr1hvmfR7w3SegR5ItvYyzVz1vxNJgQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.2.tgz",
+      "integrity": "sha512-J0SQBPlQiEXAF7tajiH+rUooJPo0l8KQgyg4/aMunNtrOa7bwuZJsJbDWzeljqQpgftxuq5yNJxQ91O9ts29UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "postcss": "^8.5.3",
-        "rollup": "^4.30.1"
+        "fdir": "^6.4.6",
+        "picomatch": "^4.0.3",
+        "postcss": "^8.5.6",
+        "rollup": "^4.43.0",
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -14390,14 +15107,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
         "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
         "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -14439,17 +15156,17 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.8.tgz",
-      "integrity": "sha512-6PhR4H9VGlcwXZ+KWCdMqbtG649xCPZqfI9j2PsK1FcXgEzro5bGHcVKFCTqPLaNKZES8Evqv4LwvZARsq5qlg==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
+      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.4.0",
-        "es-module-lexer": "^1.6.0",
+        "debug": "^4.4.1",
+        "es-module-lexer": "^1.7.0",
         "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0"
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -14462,19 +15179,37 @@
       }
     },
     "node_modules/vite-string-plugin": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/vite-string-plugin/-/vite-string-plugin-1.3.4.tgz",
-      "integrity": "sha512-mHvcooHgZ0nVbHtj9o+c5dzD2/nclr/SOG023EFYF/zRnO8bxB63bV9WUA9X+njlgLpOwCJ3LI2IdihKoi0gZQ==",
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/vite-string-plugin/-/vite-string-plugin-1.4.6.tgz",
+      "integrity": "sha512-Csjtny8/uVIynzlaRRj4RpHrPAakNwlH9jw6kgQ8tQhc2f0zzA6bCbAgWD0y84EgB8aLNrz7pZFUqSt3LOtk+w==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/vite/node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/vite/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vite/node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -14490,10 +15225,23 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/vite/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/vite/node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "dev": true,
       "funding": [
         {
@@ -14511,7 +15259,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -14520,13 +15268,13 @@
       }
     },
     "node_modules/vite/node_modules/rollup": {
-      "version": "4.37.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.37.0.tgz",
-      "integrity": "sha512-iAtQy/L4QFU+rTJ1YUjXqJOJzuwEghqWzCEYD2FEghT7Gsy1VdABntrO4CLopA5IkflTyqNiLNwPcOJ3S7UKLg==",
+      "version": "4.46.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
+      "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -14536,55 +15284,58 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.37.0",
-        "@rollup/rollup-android-arm64": "4.37.0",
-        "@rollup/rollup-darwin-arm64": "4.37.0",
-        "@rollup/rollup-darwin-x64": "4.37.0",
-        "@rollup/rollup-freebsd-arm64": "4.37.0",
-        "@rollup/rollup-freebsd-x64": "4.37.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.37.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.37.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.37.0",
-        "@rollup/rollup-linux-arm64-musl": "4.37.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.37.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.37.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.37.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.37.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.37.0",
-        "@rollup/rollup-linux-x64-gnu": "4.37.0",
-        "@rollup/rollup-linux-x64-musl": "4.37.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.37.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.37.0",
-        "@rollup/rollup-win32-x64-msvc": "4.37.0",
+        "@rollup/rollup-android-arm-eabi": "4.46.2",
+        "@rollup/rollup-android-arm64": "4.46.2",
+        "@rollup/rollup-darwin-arm64": "4.46.2",
+        "@rollup/rollup-darwin-x64": "4.46.2",
+        "@rollup/rollup-freebsd-arm64": "4.46.2",
+        "@rollup/rollup-freebsd-x64": "4.46.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.46.2",
+        "@rollup/rollup-linux-arm64-musl": "4.46.2",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.46.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.46.2",
+        "@rollup/rollup-linux-x64-gnu": "4.46.2",
+        "@rollup/rollup-linux-x64-musl": "4.46.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.46.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.46.2",
+        "@rollup/rollup-win32-x64-msvc": "4.46.2",
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/vitest": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.8.tgz",
-      "integrity": "sha512-dfqAsNqRGUc8hB9OVR2P0w8PZPEckti2+5rdZip0WIz9WW0MnImJ8XiR61QhqLa92EQzKP2uPkzenKOAHyEIbA==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
+      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "3.0.8",
-        "@vitest/mocker": "3.0.8",
-        "@vitest/pretty-format": "^3.0.8",
-        "@vitest/runner": "3.0.8",
-        "@vitest/snapshot": "3.0.8",
-        "@vitest/spy": "3.0.8",
-        "@vitest/utils": "3.0.8",
+        "@types/chai": "^5.2.2",
+        "@vitest/expect": "3.2.4",
+        "@vitest/mocker": "3.2.4",
+        "@vitest/pretty-format": "^3.2.4",
+        "@vitest/runner": "3.2.4",
+        "@vitest/snapshot": "3.2.4",
+        "@vitest/spy": "3.2.4",
+        "@vitest/utils": "3.2.4",
         "chai": "^5.2.0",
-        "debug": "^4.4.0",
-        "expect-type": "^1.1.0",
+        "debug": "^4.4.1",
+        "expect-type": "^1.2.1",
         "magic-string": "^0.30.17",
         "pathe": "^2.0.3",
-        "std-env": "^3.8.0",
+        "picomatch": "^4.0.2",
+        "std-env": "^3.9.0",
         "tinybench": "^2.9.0",
         "tinyexec": "^0.3.2",
-        "tinypool": "^1.0.2",
+        "tinyglobby": "^0.2.14",
+        "tinypool": "^1.1.1",
         "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.0.8",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+        "vite-node": "3.2.4",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -14600,8 +15351,8 @@
         "@edge-runtime/vm": "*",
         "@types/debug": "^4.1.12",
         "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.0.8",
-        "@vitest/ui": "3.0.8",
+        "@vitest/browser": "3.2.4",
+        "@vitest/ui": "3.2.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -14639,6 +15390,26 @@
         "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
+    "node_modules/vitest/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/vitest/node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vscode-jsonrpc": {
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
@@ -14689,16 +15460,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.18.tgz",
+      "integrity": "sha512-7W4Y4ZbMiQ3SEo+m9lnoNpV9xG7QVMLa+/0RFwwiAVkeYoyGXqWE85jabU4pllJNUzqfLShJ5YLptewhCWUgNA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-sfc": "3.5.13",
-        "@vue/runtime-dom": "3.5.13",
-        "@vue/server-renderer": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.18",
+        "@vue/compiler-sfc": "3.5.18",
+        "@vue/runtime-dom": "3.5.18",
+        "@vue/server-renderer": "3.5.18",
+        "@vue/shared": "3.5.18"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -14720,16 +15491,16 @@
       }
     },
     "node_modules/vue-component-type-helpers": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.8.tgz",
-      "integrity": "sha512-4bjIsC284coDO9om4HPA62M7wfsTvcmZyzdfR0aUlFXqq4tXxM1APyXpNVxPC8QazKw9OhmZNHBVDA6ODaZsrA==",
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz",
+      "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/vue-eslint-parser": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.1.tgz",
-      "integrity": "sha512-bh2Z/Au5slro9QJ3neFYLanZtb1jH+W2bKqGHXAoYD4vZgNG3KeotL7JpPv5xzY4UXUXJl7TrIsnzECH63kd3Q==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz",
+      "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -14739,7 +15510,6 @@
         "eslint-visitor-keys": "^4.2.0",
         "espree": "^10.3.0",
         "esquery": "^1.6.0",
-        "lodash": "^4.17.21",
         "semver": "^7.6.3"
       },
       "engines": {
@@ -14788,9 +15558,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
+      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
       "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -14801,30 +15571,28 @@
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "license": "BSD-2-Clause"
     },
     "node_modules/webpack": {
-      "version": "5.98.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
-      "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
+      "version": "5.101.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.1.tgz",
+      "integrity": "sha512-rHY3vHXRbkSfhG6fH8zYQdth/BtDgXXuR2pHF++1f/EBkI8zkgM5XWfsC3BvOoW9pr1CvZ1qQCxhCEsbNgT50g==",
       "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
+        "@types/estree": "^1.0.8",
+        "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
+        "acorn-import-phases": "^1.0.3",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
+        "enhanced-resolve": "^5.17.3",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -14834,11 +15602,11 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.0",
+        "schema-utils": "^4.3.2",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
+        "webpack-sources": "^3.3.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -14932,9 +15700,9 @@
       }
     },
     "node_modules/webpack/node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "license": "MIT"
     },
     "node_modules/webpack/node_modules/eslint-scope": {
@@ -14960,9 +15728,9 @@
       }
     },
     "node_modules/webpack/node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.3.3.tgz",
+      "integrity": "sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
@@ -14988,12 +15756,6 @@
         "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/whatwg-url/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "license": "BSD-2-Clause"
-    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -15167,9 +15929,9 @@
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -15270,15 +16032,15 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
-      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
       }
     },
     "node_modules/yargs": {
diff --git a/package.json b/package.json
index 75739b3be0..b2cd765ed3 100644
--- a/package.json
+++ b/package.json
@@ -10,16 +10,16 @@
     "@citation-js/plugin-software-formats": "0.6.1",
     "@github/markdown-toolbar-element": "2.2.3",
     "@github/quote-selection": "2.1.0",
-    "@github/relative-time-element": "4.4.5",
     "@github/text-expander-element": "2.8.0",
+    "@google/model-viewer": "4.1.0",
     "@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
     "@primer/octicons": "19.14.0",
-    "ansi_up": "6.0.2",
+    "ansi_up": "6.0.5",
     "asciinema-player": "3.8.2",
-    "chart.js": "4.4.5",
+    "chart.js": "4.5.0",
     "chartjs-adapter-dayjs-4": "1.0.4",
     "chartjs-plugin-zoom": "2.2.0",
-    "clippie": "4.1.1",
+    "clippie": "4.1.7",
     "css-loader": "7.0.0",
     "dayjs": "1.11.12",
     "dropzone": "6.0.0-beta.2",
@@ -27,19 +27,19 @@
     "esbuild-loader": "4.3.0",
     "escape-goat": "4.0.0",
     "fast-glob": "3.3.3",
-    "htmx.org": "1.9.12",
+    "htmx.org": "2.0.6",
     "idiomorph": "0.3.0",
     "jquery": "3.7.1",
-    "katex": "0.16.21",
-    "mermaid": "11.5.0",
-    "mini-css-extract-plugin": "2.9.2",
-    "minimatch": "10.0.1",
+    "katex": "0.16.22",
+    "mermaid": "11.8.1",
+    "mini-css-extract-plugin": "2.9.3",
+    "minimatch": "10.0.3",
     "monaco-editor": "0.52.2",
     "monaco-editor-webpack-plugin": "7.1.0",
     "pdfobject": "2.3.0",
-    "postcss": "8.5.2",
+    "postcss": "8.5.5",
     "postcss-loader": "8.1.1",
-    "postcss-nesting": "13.0.1",
+    "postcss-nesting": "13.0.2",
     "pretty-ms": "9.0.0",
     "sortablejs": "1.15.6",
     "swagger-ui-dist": "5.17.14",
@@ -51,55 +51,55 @@
     "tributejs": "5.1.3",
     "uint8-to-base64": "0.2.0",
     "vanilla-colorful": "0.7.2",
-    "vue": "3.5.13",
+    "vue": "3.5.18",
     "vue-chartjs": "5.3.1",
     "vue-loader": "17.4.2",
     "vue3-calendar-heatmap": "2.0.5",
-    "webpack": "5.98.0",
+    "webpack": "5.101.1",
     "webpack-cli": "6.0.1",
     "wrap-ansi": "9.0.0"
   },
   "devDependencies": {
-    "@axe-core/playwright": "4.10.1",
-    "@eslint-community/eslint-plugin-eslint-comments": "4.4.1",
-    "@playwright/test": "1.51.0",
-    "@stoplight/spectral-cli": "6.14.3",
-    "@stylistic/eslint-plugin-js": "4.2.0",
-    "@stylistic/stylelint-plugin": "3.1.2",
-    "@typescript-eslint/parser": "8.26.1",
-    "@vitejs/plugin-vue": "5.2.3",
-    "@vitest/coverage-v8": "3.0.8",
-    "@vitest/eslint-plugin": "1.1.25",
+    "@axe-core/playwright": "4.10.2",
+    "@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
+    "@playwright/test": "1.54.2",
+    "@stoplight/spectral-cli": "6.15.0",
+    "@stylistic/eslint-plugin": "5.2.3",
+    "@stylistic/stylelint-plugin": "4.0.0",
+    "@vitejs/plugin-vue": "6.0.1",
+    "@vitest/coverage-v8": "3.2.4",
+    "@vitest/eslint-plugin": "1.3.4",
     "@vue/test-utils": "2.4.6",
-    "eslint": "9.22.0",
-    "eslint-import-resolver-typescript": "4.1.1",
+    "eslint": "9.33.0",
+    "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-array-func": "5.0.2",
-    "eslint-plugin-import-x": "4.7.0",
+    "eslint-plugin-import-x": "4.16.1",
     "eslint-plugin-no-jquery": "3.1.1",
     "eslint-plugin-no-use-extend-native": "0.7.2",
-    "eslint-plugin-playwright": "2.2.0",
-    "eslint-plugin-regexp": "2.7.0",
-    "eslint-plugin-sonarjs": "3.0.2",
-    "eslint-plugin-unicorn": "57.0.0",
+    "eslint-plugin-playwright": "2.2.2",
+    "eslint-plugin-regexp": "2.10.0",
+    "eslint-plugin-sonarjs": "3.0.4",
     "eslint-plugin-toml": "0.12.0",
+    "eslint-plugin-unicorn": "60.0.0",
     "eslint-plugin-vitest-globals": "1.5.0",
-    "eslint-plugin-vue": "10.0.0",
-    "eslint-plugin-vue-scoped-css": "2.9.0",
-    "eslint-plugin-wc": "2.2.1",
-    "globals": "16.0.0",
-    "happy-dom": "17.4.4",
+    "eslint-plugin-vue": "10.4.0",
+    "eslint-plugin-vue-scoped-css": "2.11.0",
+    "eslint-plugin-wc": "3.0.1",
+    "globals": "16.3.0",
+    "happy-dom": "18.0.1",
     "license-checker-rseidelsohn": "4.4.2",
-    "markdownlint-cli": "0.44.0",
+    "markdownlint-cli": "0.45.0",
     "postcss-html": "1.8.0",
-    "stylelint": "16.16.0",
+    "sharp": "0.34.3",
+    "stylelint": "16.23.1",
     "stylelint-declaration-block-no-ignored-properties": "2.8.0",
     "stylelint-declaration-strict-value": "1.10.11",
     "stylelint-value-no-unknown-custom-properties": "6.0.1",
-    "svgo": "3.2.0",
-    "typescript": "5.7.3",
-    "typescript-eslint": "8.26.1",
-    "vite-string-plugin": "1.3.4",
-    "vitest": "3.0.8"
+    "svgo": "4.0.0",
+    "typescript": "5.8.3",
+    "typescript-eslint": "8.39.0",
+    "vite-string-plugin": "1.4.6",
+    "vitest": "3.2.4"
   },
   "browserslist": [
     "defaults"
diff --git a/poetry.lock b/poetry.lock
deleted file mode 100644
index 5cda33c903..0000000000
--- a/poetry.lock
+++ /dev/null
@@ -1,426 +0,0 @@
-# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand.
-
-[[package]]
-name = "click"
-version = "8.1.8"
-description = "Composable command line interface toolkit"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2"},
-    {file = "click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"},
-]
-
-[package.dependencies]
-colorama = {version = "*", markers = "platform_system == \"Windows\""}
-
-[[package]]
-name = "codespell"
-version = "2.4.1"
-description = "Fix common misspellings in text files"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "codespell-2.4.1-py3-none-any.whl", hash = "sha256:3dadafa67df7e4a3dbf51e0d7315061b80d265f9552ebd699b3dd6834b47e425"},
-    {file = "codespell-2.4.1.tar.gz", hash = "sha256:299fcdcb09d23e81e35a671bbe746d5ad7e8385972e65dbb833a2eaac33c01e5"},
-]
-
-[package.extras]
-dev = ["Pygments", "build", "chardet", "pre-commit", "pytest", "pytest-cov", "pytest-dependency", "ruff", "tomli", "twine"]
-hard-encoding-detection = ["chardet"]
-toml = ["tomli"]
-types = ["chardet (>=5.1.0)", "mypy", "pytest", "pytest-cov", "pytest-dependency"]
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-description = "Cross-platform colored terminal text."
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-files = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-
-[[package]]
-name = "cssbeautifier"
-version = "1.15.4"
-description = "CSS unobfuscator and beautifier."
-optional = false
-python-versions = "*"
-files = [
-    {file = "cssbeautifier-1.15.4-py3-none-any.whl", hash = "sha256:78c84d5e5378df7d08622bbd0477a1abdbd209680e95480bf22f12d5701efc98"},
-    {file = "cssbeautifier-1.15.4.tar.gz", hash = "sha256:9bb08dc3f64c101a01677f128acf01905914cf406baf87434dcde05b74c0acf5"},
-]
-
-[package.dependencies]
-editorconfig = ">=0.12.2"
-jsbeautifier = "*"
-six = ">=1.13.0"
-
-[[package]]
-name = "djlint"
-version = "1.36.4"
-description = "HTML Template Linter and Formatter"
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "djlint-1.36.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a2dfb60883ceb92465201bfd392291a7597c6752baede6fbb6f1980cac8d6c5c"},
-    {file = "djlint-1.36.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4bc6a1320c0030244b530ac200642f883d3daa451a115920ef3d56d08b644292"},
-    {file = "djlint-1.36.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3164a048c7bb0baf042387b1e33f9bbbf99d90d1337bb4c3d66eb0f96f5400a1"},
-    {file = "djlint-1.36.4-cp310-cp310-win_amd64.whl", hash = "sha256:3196d5277da5934962d67ad6c33a948ba77a7b6eadf064648bef6ee5f216b03c"},
-    {file = "djlint-1.36.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d68da0ed10ee9ca1e32e225cbb8e9b98bf7e6f8b48a8e4836117b6605b88cc7"},
-    {file = "djlint-1.36.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c0478d5392247f1e6ee29220bbdbf7fb4e1bc0e7e83d291fda6fb926c1787ba7"},
-    {file = "djlint-1.36.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:962f7b83aee166e499eff916d631c6dde7f1447d7610785a60ed2a75a5763483"},
-    {file = "djlint-1.36.4-cp311-cp311-win_amd64.whl", hash = "sha256:53cbc450aa425c832f09bc453b8a94a039d147b096740df54a3547fada77ed08"},
-    {file = "djlint-1.36.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:ff9faffd7d43ac20467493fa71d5355b5b330a00ade1c4d1e859022f4195223b"},
-    {file = "djlint-1.36.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:79489e262b5ac23a8dfb7ca37f1eea979674cfc2d2644f7061d95bea12c38f7e"},
-    {file = "djlint-1.36.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e58c5fa8c6477144a0be0a87273706a059e6dd0d6efae01146ae8c29cdfca675"},
-    {file = "djlint-1.36.4-cp312-cp312-win_amd64.whl", hash = "sha256:bb6903777bf3124f5efedcddf1f4716aef097a7ec4223fc0fa54b865829a6e08"},
-    {file = "djlint-1.36.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ead475013bcac46095b1bbc8cf97ed2f06e83422335734363f8a76b4ba7e47c2"},
-    {file = "djlint-1.36.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6c601dfa68ea253311deb4a29a7362b7a64933bdfcfb5a06618f3e70ad1fa835"},
-    {file = "djlint-1.36.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bda5014f295002363381969864addeb2db13955f1b26e772657c3b273ed7809f"},
-    {file = "djlint-1.36.4-cp313-cp313-win_amd64.whl", hash = "sha256:16ce37e085afe5a30953b2bd87cbe34c37843d94c701fc68a2dda06c1e428ff4"},
-    {file = "djlint-1.36.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:89678661888c03d7bc6cadd75af69db29962b5ecbf93a81518262f5c48329f04"},
-    {file = "djlint-1.36.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5b01a98df3e1ab89a552793590875bc6e954cad661a9304057db75363d519fa0"},
-    {file = "djlint-1.36.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dabbb4f7b93223d471d09ae34ed515fef98b2233cbca2449ad117416c44b1351"},
-    {file = "djlint-1.36.4-cp39-cp39-win_amd64.whl", hash = "sha256:7a483390d17e44df5bc23dcea29bdf6b63f3ed8b4731d844773a4829af4f5e0b"},
-    {file = "djlint-1.36.4-py3-none-any.whl", hash = "sha256:e9699b8ac3057a6ed04fb90835b89bee954ed1959c01541ce4f8f729c938afdd"},
-    {file = "djlint-1.36.4.tar.gz", hash = "sha256:17254f218b46fe5a714b224c85074c099bcb74e3b2e1f15c2ddc2cf415a408a1"},
-]
-
-[package.dependencies]
-click = ">=8.0.1"
-colorama = ">=0.4.4"
-cssbeautifier = ">=1.14.4"
-jsbeautifier = ">=1.14.4"
-json5 = ">=0.9.11"
-pathspec = ">=0.12"
-pyyaml = ">=6"
-regex = ">=2023"
-tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
-tqdm = ">=4.62.2"
-typing-extensions = {version = ">=3.6.6", markers = "python_version < \"3.11\""}
-
-[[package]]
-name = "editorconfig"
-version = "0.17.0"
-description = "EditorConfig File Locator and Interpreter for Python"
-optional = false
-python-versions = "*"
-files = [
-    {file = "EditorConfig-0.17.0-py3-none-any.whl", hash = "sha256:fe491719c5f65959ec00b167d07740e7ffec9a3f362038c72b289330b9991dfc"},
-    {file = "editorconfig-0.17.0.tar.gz", hash = "sha256:8739052279699840065d3a9f5c125d7d5a98daeefe53b0e5274261d77cb49aa2"},
-]
-
-[[package]]
-name = "jsbeautifier"
-version = "1.15.4"
-description = "JavaScript unobfuscator and beautifier."
-optional = false
-python-versions = "*"
-files = [
-    {file = "jsbeautifier-1.15.4-py3-none-any.whl", hash = "sha256:72f65de312a3f10900d7685557f84cb61a9733c50dcc27271a39f5b0051bf528"},
-    {file = "jsbeautifier-1.15.4.tar.gz", hash = "sha256:5bb18d9efb9331d825735fbc5360ee8f1aac5e52780042803943aa7f854f7592"},
-]
-
-[package.dependencies]
-editorconfig = ">=0.12.2"
-six = ">=1.13.0"
-
-[[package]]
-name = "json5"
-version = "0.10.0"
-description = "A Python implementation of the JSON5 data format."
-optional = false
-python-versions = ">=3.8.0"
-files = [
-    {file = "json5-0.10.0-py3-none-any.whl", hash = "sha256:19b23410220a7271e8377f81ba8aacba2fdd56947fbb137ee5977cbe1f5e8dfa"},
-    {file = "json5-0.10.0.tar.gz", hash = "sha256:e66941c8f0a02026943c52c2eb34ebeb2a6f819a0be05920a6f5243cd30fd559"},
-]
-
-[package.extras]
-dev = ["build (==1.2.2.post1)", "coverage (==7.5.3)", "mypy (==1.13.0)", "pip (==24.3.1)", "pylint (==3.2.3)", "ruff (==0.7.3)", "twine (==5.1.1)", "uv (==0.5.1)"]
-
-[[package]]
-name = "pathspec"
-version = "0.12.1"
-description = "Utility library for gitignore style pattern matching of file paths."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
-    {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
-]
-
-[[package]]
-name = "pyyaml"
-version = "6.0.2"
-description = "YAML parser and emitter for Python"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "PyYAML-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086"},
-    {file = "PyYAML-6.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf"},
-    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237"},
-    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b"},
-    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed"},
-    {file = "PyYAML-6.0.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180"},
-    {file = "PyYAML-6.0.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68"},
-    {file = "PyYAML-6.0.2-cp310-cp310-win32.whl", hash = "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99"},
-    {file = "PyYAML-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e"},
-    {file = "PyYAML-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774"},
-    {file = "PyYAML-6.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee"},
-    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c"},
-    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317"},
-    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85"},
-    {file = "PyYAML-6.0.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"},
-    {file = "PyYAML-6.0.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e"},
-    {file = "PyYAML-6.0.2-cp311-cp311-win32.whl", hash = "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5"},
-    {file = "PyYAML-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44"},
-    {file = "PyYAML-6.0.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab"},
-    {file = "PyYAML-6.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725"},
-    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5"},
-    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425"},
-    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476"},
-    {file = "PyYAML-6.0.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48"},
-    {file = "PyYAML-6.0.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b"},
-    {file = "PyYAML-6.0.2-cp312-cp312-win32.whl", hash = "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4"},
-    {file = "PyYAML-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8"},
-    {file = "PyYAML-6.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba"},
-    {file = "PyYAML-6.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1"},
-    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133"},
-    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484"},
-    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5"},
-    {file = "PyYAML-6.0.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc"},
-    {file = "PyYAML-6.0.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652"},
-    {file = "PyYAML-6.0.2-cp313-cp313-win32.whl", hash = "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183"},
-    {file = "PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563"},
-    {file = "PyYAML-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a"},
-    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5"},
-    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d"},
-    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083"},
-    {file = "PyYAML-6.0.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706"},
-    {file = "PyYAML-6.0.2-cp38-cp38-win32.whl", hash = "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a"},
-    {file = "PyYAML-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff"},
-    {file = "PyYAML-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d"},
-    {file = "PyYAML-6.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f"},
-    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290"},
-    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12"},
-    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19"},
-    {file = "PyYAML-6.0.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e"},
-    {file = "PyYAML-6.0.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725"},
-    {file = "PyYAML-6.0.2-cp39-cp39-win32.whl", hash = "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631"},
-    {file = "PyYAML-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8"},
-    {file = "pyyaml-6.0.2.tar.gz", hash = "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"},
-]
-
-[[package]]
-name = "regex"
-version = "2024.11.6"
-description = "Alternative regular expression module, to replace re."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "regex-2024.11.6-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ff590880083d60acc0433f9c3f713c51f7ac6ebb9adf889c79a261ecf541aa91"},
-    {file = "regex-2024.11.6-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:658f90550f38270639e83ce492f27d2c8d2cd63805c65a13a14d36ca126753f0"},
-    {file = "regex-2024.11.6-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:164d8b7b3b4bcb2068b97428060b2a53be050085ef94eca7f240e7947f1b080e"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3660c82f209655a06b587d55e723f0b813d3a7db2e32e5e7dc64ac2a9e86fde"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d22326fcdef5e08c154280b71163ced384b428343ae16a5ab2b3354aed12436e"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f1ac758ef6aebfc8943560194e9fd0fa18bcb34d89fd8bd2af18183afd8da3a2"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:997d6a487ff00807ba810e0f8332c18b4eb8d29463cfb7c820dc4b6e7562d0cf"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:02a02d2bb04fec86ad61f3ea7f49c015a0681bf76abb9857f945d26159d2968c"},
-    {file = "regex-2024.11.6-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f02f93b92358ee3f78660e43b4b0091229260c5d5c408d17d60bf26b6c900e86"},
-    {file = "regex-2024.11.6-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:06eb1be98df10e81ebaded73fcd51989dcf534e3c753466e4b60c4697a003b67"},
-    {file = "regex-2024.11.6-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:040df6fe1a5504eb0f04f048e6d09cd7c7110fef851d7c567a6b6e09942feb7d"},
-    {file = "regex-2024.11.6-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:fdabbfc59f2c6edba2a6622c647b716e34e8e3867e0ab975412c5c2f79b82da2"},
-    {file = "regex-2024.11.6-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:8447d2d39b5abe381419319f942de20b7ecd60ce86f16a23b0698f22e1b70008"},
-    {file = "regex-2024.11.6-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:da8f5fc57d1933de22a9e23eec290a0d8a5927a5370d24bda9a6abe50683fe62"},
-    {file = "regex-2024.11.6-cp310-cp310-win32.whl", hash = "sha256:b489578720afb782f6ccf2840920f3a32e31ba28a4b162e13900c3e6bd3f930e"},
-    {file = "regex-2024.11.6-cp310-cp310-win_amd64.whl", hash = "sha256:5071b2093e793357c9d8b2929dfc13ac5f0a6c650559503bb81189d0a3814519"},
-    {file = "regex-2024.11.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5478c6962ad548b54a591778e93cd7c456a7a29f8eca9c49e4f9a806dcc5d638"},
-    {file = "regex-2024.11.6-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c89a8cc122b25ce6945f0423dc1352cb9593c68abd19223eebbd4e56612c5b7"},
-    {file = "regex-2024.11.6-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:94d87b689cdd831934fa3ce16cc15cd65748e6d689f5d2b8f4f4df2065c9fa20"},
-    {file = "regex-2024.11.6-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1062b39a0a2b75a9c694f7a08e7183a80c63c0d62b301418ffd9c35f55aaa114"},
-    {file = "regex-2024.11.6-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:167ed4852351d8a750da48712c3930b031f6efdaa0f22fa1933716bfcd6bf4a3"},
-    {file = "regex-2024.11.6-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2d548dafee61f06ebdb584080621f3e0c23fff312f0de1afc776e2a2ba99a74f"},
-    {file = "regex-2024.11.6-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2a19f302cd1ce5dd01a9099aaa19cae6173306d1302a43b627f62e21cf18ac0"},
-    {file = "regex-2024.11.6-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bec9931dfb61ddd8ef2ebc05646293812cb6b16b60cf7c9511a832b6f1854b55"},
-    {file = "regex-2024.11.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9714398225f299aa85267fd222f7142fcb5c769e73d7733344efc46f2ef5cf89"},
-    {file = "regex-2024.11.6-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:202eb32e89f60fc147a41e55cb086db2a3f8cb82f9a9a88440dcfc5d37faae8d"},
-    {file = "regex-2024.11.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:4181b814e56078e9b00427ca358ec44333765f5ca1b45597ec7446d3a1ef6e34"},
-    {file = "regex-2024.11.6-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:068376da5a7e4da51968ce4c122a7cd31afaaec4fccc7856c92f63876e57b51d"},
-    {file = "regex-2024.11.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ac10f2c4184420d881a3475fb2c6f4d95d53a8d50209a2500723d831036f7c45"},
-    {file = "regex-2024.11.6-cp311-cp311-win32.whl", hash = "sha256:c36f9b6f5f8649bb251a5f3f66564438977b7ef8386a52460ae77e6070d309d9"},
-    {file = "regex-2024.11.6-cp311-cp311-win_amd64.whl", hash = "sha256:02e28184be537f0e75c1f9b2f8847dc51e08e6e171c6bde130b2687e0c33cf60"},
-    {file = "regex-2024.11.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:52fb28f528778f184f870b7cf8f225f5eef0a8f6e3778529bdd40c7b3920796a"},
-    {file = "regex-2024.11.6-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:fdd6028445d2460f33136c55eeb1f601ab06d74cb3347132e1c24250187500d9"},
-    {file = "regex-2024.11.6-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:805e6b60c54bf766b251e94526ebad60b7de0c70f70a4e6210ee2891acb70bf2"},
-    {file = "regex-2024.11.6-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b85c2530be953a890eaffde05485238f07029600e8f098cdf1848d414a8b45e4"},
-    {file = "regex-2024.11.6-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bb26437975da7dc36b7efad18aa9dd4ea569d2357ae6b783bf1118dabd9ea577"},
-    {file = "regex-2024.11.6-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:abfa5080c374a76a251ba60683242bc17eeb2c9818d0d30117b4486be10c59d3"},
-    {file = "regex-2024.11.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b7fa6606c2881c1db9479b0eaa11ed5dfa11c8d60a474ff0e095099f39d98e"},
-    {file = "regex-2024.11.6-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c32f75920cf99fe6b6c539c399a4a128452eaf1af27f39bce8909c9a3fd8cbe"},
-    {file = "regex-2024.11.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:982e6d21414e78e1f51cf595d7f321dcd14de1f2881c5dc6a6e23bbbbd68435e"},
-    {file = "regex-2024.11.6-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:a7c2155f790e2fb448faed6dd241386719802296ec588a8b9051c1f5c481bc29"},
-    {file = "regex-2024.11.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:149f5008d286636e48cd0b1dd65018548944e495b0265b45e1bffecce1ef7f39"},
-    {file = "regex-2024.11.6-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:e5364a4502efca094731680e80009632ad6624084aff9a23ce8c8c6820de3e51"},
-    {file = "regex-2024.11.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0a86e7eeca091c09e021db8eb72d54751e527fa47b8d5787caf96d9831bd02ad"},
-    {file = "regex-2024.11.6-cp312-cp312-win32.whl", hash = "sha256:32f9a4c643baad4efa81d549c2aadefaeba12249b2adc5af541759237eee1c54"},
-    {file = "regex-2024.11.6-cp312-cp312-win_amd64.whl", hash = "sha256:a93c194e2df18f7d264092dc8539b8ffb86b45b899ab976aa15d48214138e81b"},
-    {file = "regex-2024.11.6-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a6ba92c0bcdf96cbf43a12c717eae4bc98325ca3730f6b130ffa2e3c3c723d84"},
-    {file = "regex-2024.11.6-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:525eab0b789891ac3be914d36893bdf972d483fe66551f79d3e27146191a37d4"},
-    {file = "regex-2024.11.6-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:086a27a0b4ca227941700e0b31425e7a28ef1ae8e5e05a33826e17e47fbfdba0"},
-    {file = "regex-2024.11.6-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bde01f35767c4a7899b7eb6e823b125a64de314a8ee9791367c9a34d56af18d0"},
-    {file = "regex-2024.11.6-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b583904576650166b3d920d2bcce13971f6f9e9a396c673187f49811b2769dc7"},
-    {file = "regex-2024.11.6-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c4de13f06a0d54fa0d5ab1b7138bfa0d883220965a29616e3ea61b35d5f5fc7"},
-    {file = "regex-2024.11.6-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3cde6e9f2580eb1665965ce9bf17ff4952f34f5b126beb509fee8f4e994f143c"},
-    {file = "regex-2024.11.6-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0d7f453dca13f40a02b79636a339c5b62b670141e63efd511d3f8f73fba162b3"},
-    {file = "regex-2024.11.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:59dfe1ed21aea057a65c6b586afd2a945de04fc7db3de0a6e3ed5397ad491b07"},
-    {file = "regex-2024.11.6-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:b97c1e0bd37c5cd7902e65f410779d39eeda155800b65fc4d04cc432efa9bc6e"},
-    {file = "regex-2024.11.6-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f9d1e379028e0fc2ae3654bac3cbbef81bf3fd571272a42d56c24007979bafb6"},
-    {file = "regex-2024.11.6-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:13291b39131e2d002a7940fb176e120bec5145f3aeb7621be6534e46251912c4"},
-    {file = "regex-2024.11.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4f51f88c126370dcec4908576c5a627220da6c09d0bff31cfa89f2523843316d"},
-    {file = "regex-2024.11.6-cp313-cp313-win32.whl", hash = "sha256:63b13cfd72e9601125027202cad74995ab26921d8cd935c25f09c630436348ff"},
-    {file = "regex-2024.11.6-cp313-cp313-win_amd64.whl", hash = "sha256:2b3361af3198667e99927da8b84c1b010752fa4b1115ee30beaa332cabc3ef1a"},
-    {file = "regex-2024.11.6-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3a51ccc315653ba012774efca4f23d1d2a8a8f278a6072e29c7147eee7da446b"},
-    {file = "regex-2024.11.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ad182d02e40de7459b73155deb8996bbd8e96852267879396fb274e8700190e3"},
-    {file = "regex-2024.11.6-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ba9b72e5643641b7d41fa1f6d5abda2c9a263ae835b917348fc3c928182ad467"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40291b1b89ca6ad8d3f2b82782cc33807f1406cf68c8d440861da6304d8ffbbd"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cdf58d0e516ee426a48f7b2c03a332a4114420716d55769ff7108c37a09951bf"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a36fdf2af13c2b14738f6e973aba563623cb77d753bbbd8d414d18bfaa3105dd"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d1cee317bfc014c2419a76bcc87f071405e3966da434e03e13beb45f8aced1a6"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50153825ee016b91549962f970d6a4442fa106832e14c918acd1c8e479916c4f"},
-    {file = "regex-2024.11.6-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ea1bfda2f7162605f6e8178223576856b3d791109f15ea99a9f95c16a7636fb5"},
-    {file = "regex-2024.11.6-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:df951c5f4a1b1910f1a99ff42c473ff60f8225baa1cdd3539fe2819d9543e9df"},
-    {file = "regex-2024.11.6-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:072623554418a9911446278f16ecb398fb3b540147a7828c06e2011fa531e773"},
-    {file = "regex-2024.11.6-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:f654882311409afb1d780b940234208a252322c24a93b442ca714d119e68086c"},
-    {file = "regex-2024.11.6-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:89d75e7293d2b3e674db7d4d9b1bee7f8f3d1609428e293771d1a962617150cc"},
-    {file = "regex-2024.11.6-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:f65557897fc977a44ab205ea871b690adaef6b9da6afda4790a2484b04293a5f"},
-    {file = "regex-2024.11.6-cp38-cp38-win32.whl", hash = "sha256:6f44ec28b1f858c98d3036ad5d7d0bfc568bdd7a74f9c24e25f41ef1ebfd81a4"},
-    {file = "regex-2024.11.6-cp38-cp38-win_amd64.whl", hash = "sha256:bb8f74f2f10dbf13a0be8de623ba4f9491faf58c24064f32b65679b021ed0001"},
-    {file = "regex-2024.11.6-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5704e174f8ccab2026bd2f1ab6c510345ae8eac818b613d7d73e785f1310f839"},
-    {file = "regex-2024.11.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:220902c3c5cc6af55d4fe19ead504de80eb91f786dc102fbd74894b1551f095e"},
-    {file = "regex-2024.11.6-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5e7e351589da0850c125f1600a4c4ba3c722efefe16b297de54300f08d734fbf"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5056b185ca113c88e18223183aa1a50e66507769c9640a6ff75859619d73957b"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2e34b51b650b23ed3354b5a07aab37034d9f923db2a40519139af34f485f77d0"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5670bce7b200273eee1840ef307bfa07cda90b38ae56e9a6ebcc9f50da9c469b"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:08986dce1339bc932923e7d1232ce9881499a0e02925f7402fb7c982515419ef"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93c0b12d3d3bc25af4ebbf38f9ee780a487e8bf6954c115b9f015822d3bb8e48"},
-    {file = "regex-2024.11.6-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:764e71f22ab3b305e7f4c21f1a97e1526a25ebdd22513e251cf376760213da13"},
-    {file = "regex-2024.11.6-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:f056bf21105c2515c32372bbc057f43eb02aae2fda61052e2f7622c801f0b4e2"},
-    {file = "regex-2024.11.6-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:69ab78f848845569401469da20df3e081e6b5a11cb086de3eed1d48f5ed57c95"},
-    {file = "regex-2024.11.6-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:86fddba590aad9208e2fa8b43b4c098bb0ec74f15718bb6a704e3c63e2cef3e9"},
-    {file = "regex-2024.11.6-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:684d7a212682996d21ca12ef3c17353c021fe9de6049e19ac8481ec35574a70f"},
-    {file = "regex-2024.11.6-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:a03e02f48cd1abbd9f3b7e3586d97c8f7a9721c436f51a5245b3b9483044480b"},
-    {file = "regex-2024.11.6-cp39-cp39-win32.whl", hash = "sha256:41758407fc32d5c3c5de163888068cfee69cb4c2be844e7ac517a52770f9af57"},
-    {file = "regex-2024.11.6-cp39-cp39-win_amd64.whl", hash = "sha256:b2837718570f95dd41675328e111345f9b7095d821bac435aac173ac80b19983"},
-    {file = "regex-2024.11.6.tar.gz", hash = "sha256:7ab159b063c52a0333c884e4679f8d7a85112ee3078fe3d9004b2dd875585519"},
-]
-
-[[package]]
-name = "six"
-version = "1.17.0"
-description = "Python 2 and 3 compatibility utilities"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-files = [
-    {file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"},
-    {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
-]
-
-[[package]]
-name = "tomli"
-version = "2.2.1"
-description = "A lil' TOML parser"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
-    {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8"},
-    {file = "tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff"},
-    {file = "tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b"},
-    {file = "tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea"},
-    {file = "tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e"},
-    {file = "tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98"},
-    {file = "tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4"},
-    {file = "tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7"},
-    {file = "tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744"},
-    {file = "tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec"},
-    {file = "tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69"},
-    {file = "tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc"},
-    {file = "tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff"},
-]
-
-[[package]]
-name = "tqdm"
-version = "4.67.1"
-description = "Fast, Extensible Progress Meter"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2"},
-    {file = "tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2"},
-]
-
-[package.dependencies]
-colorama = {version = "*", markers = "platform_system == \"Windows\""}
-
-[package.extras]
-dev = ["nbval", "pytest (>=6)", "pytest-asyncio (>=0.24)", "pytest-cov", "pytest-timeout"]
-discord = ["requests"]
-notebook = ["ipywidgets (>=6)"]
-slack = ["slack-sdk"]
-telegram = ["requests"]
-
-[[package]]
-name = "typing-extensions"
-version = "4.12.2"
-description = "Backported and Experimental Type Hints for Python 3.8+"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"},
-    {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
-]
-
-[[package]]
-name = "yamllint"
-version = "1.36.2"
-description = "A linter for YAML files."
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "yamllint-1.36.2-py3-none-any.whl", hash = "sha256:6ba19800513d86c987ed3cf48c0aba4e82b3624596e1dab55723b3733e11f35c"},
-    {file = "yamllint-1.36.2.tar.gz", hash = "sha256:c9ccc818659736e7b13f7e2f9c3c9bb9ac77445be13e789e7d843e92cb8428ef"},
-]
-
-[package.dependencies]
-pathspec = ">=0.5.3"
-pyyaml = "*"
-
-[package.extras]
-dev = ["doc8", "flake8", "flake8-import-order", "rstcheck[sphinx]", "sphinx"]
-
-[metadata]
-lock-version = "2.0"
-python-versions = "^3.10"
-content-hash = "6e4e2a74db7e165f0aa8cae9bb8932cbe1e84ea9bef64db42371e6d620d77c93"
diff --git a/poetry.toml b/poetry.toml
deleted file mode 100644
index 0299355b5d..0000000000
--- a/poetry.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[virtualenvs]
-in-project = true
-options.no-pip = true
-options.no-setuptools = true
diff --git a/public/assets/img/apple-touch-icon.png b/public/assets/img/apple-touch-icon.png
index 1f6c1544f8..2b1413bd6c 100644
Binary files a/public/assets/img/apple-touch-icon.png and b/public/assets/img/apple-touch-icon.png differ
diff --git a/public/assets/img/avatar_default.png b/public/assets/img/avatar_default.png
index f335e51dad..09390315f1 100644
Binary files a/public/assets/img/avatar_default.png and b/public/assets/img/avatar_default.png differ
diff --git a/public/assets/img/favicon.png b/public/assets/img/favicon.png
index eda0347eff..209a01fa1f 100644
Binary files a/public/assets/img/favicon.png and b/public/assets/img/favicon.png differ
diff --git a/public/assets/img/gitea.svg b/public/assets/img/gitea.svg
deleted file mode 100644
index 804b05e284..0000000000
--- a/public/assets/img/gitea.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 212 212" width="32" height="32"><style>circle,path{fill:none;stroke:#000;stroke-width:15}path{stroke-width:25}.orange{stroke:#f60}.red{stroke:#d40000}</style><g transform="translate(6 6)"><path d="M58 168V70a50 50 0 0 1 50-50h20" class="orange"/><path d="M58 168v-30a50 50 0 0 1 50-50h20" class="red"/><circle cx="142" cy="20" r="18" class="orange"/><circle cx="142" cy="88" r="18" class="red"/><circle cx="58" cy="180" r="18" class="red"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png
index 1b2d9b4023..30b06350f6 100644
Binary files a/public/assets/img/logo.png and b/public/assets/img/logo.png differ
diff --git a/public/assets/img/svg/gitea-alt.svg b/public/assets/img/svg/gitea-alt.svg
index 53e3f17c13..efe4830a0b 100644
--- a/public/assets/img/svg/gitea-alt.svg
+++ b/public/assets/img/svg/gitea-alt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="gitea-alt__Layer_1" x="0" y="0" version="1.1" viewBox="0 0 64 64" class="svg gitea-alt" width="16" height="16" aria-hidden="true"><style>.gitea-alt__st1{fill:#000}.gitea-alt__st2{fill:#fff}</style><path d="m59.43 53.244 4.157-5.973-.139-1.732c-.29-1.508-1.392-2.143-2.12-2.564l-.019-.01q-.123-.071-.25-.147c-.937-.563-1.377-1.073-1.423-1.183l-.047-.145c-.323-.86-.052-2.231.21-3.558l.005-.027c.118-.598.23-1.163.302-1.732.901-6.116.556-9.436-.558-14.559l-.167-.811-.053-.258c-.494-2.42-.921-4.512-1.737-6.776-.172-.474-.408-.904-.62-1.291a9 9 0 0 1-.355-.697l-.15-.279-.012-.019c-.063-.1-.176-.568-.214-.723l-.013-.056c-.1-.473-.133-.992-.166-1.496-.05-.77-.106-1.643-.39-2.516-.37-1.192-1.202-2.348-2.227-3.092-.515-.374-1.068-.54-1.514-.672l-.066-.02a5 5 0 0 0-.317-.08c-.242-.055-.471-.108-.947-.401l-.54-.337c-.792-.497-1.777-1.114-2.729-1.61-.966-.623-2.386-.761-3.396.33l-1.05 1.135 1.196.98c1.86 1.525 2.535 3.226 2.634 3.497q.022.113.046.22l.034.165c-1.78 1.243-2.605 2.63-2.986 3.59-.132.253-.317.65-.595 1.246l-.008.017c-.308.662-.72 1.549-1.186 2.497-1.157-.394-2.237-.586-3.295-.586a7.75 7.75 0 0 0-3.664.893c-2.277 1.095-4 2.934-5.14 5.427H9.892v10.926c-.595-.116-1.2-.16-1.78-.176-.871-.024-1.902-.032-2.937.085-.735.083-2.972.337-4.045 2.153-.29.496-.515 1.095-.71 1.883L0 36.47l1.205.127a3.9 3.9 0 0 0-.94 1.541c-.144.43-.216.9-.216 1.397 0 1.174.465 2.172 1.43 3.058l.044.039c.974.818 2.155 1.216 3.61 1.216.758 0 1.45-.086 2.09-.26h2.67V64h44.109v-4.68l.913-1.337 1.017 1.795H64z" style="fill:#fdc811"/><path d="M5.637 35.127q-.092.17-.18.377L1.91 35.13c.153-.62.324-1.098.545-1.477.58-.982 1.84-1.284 2.894-1.404.898-.101 1.818-.1 2.722-.075 1.262.032 2.697.19 3.534 1.258.494.633.732 1.537.732 2.33v4.221q-.001.278.005.513c.01.526.172 1.106.438 1.558H9.336a1.8 1.8 0 0 1-.395-1.147q-.265.24-.515.422c-.98.73-2.075.986-3.292.986-1.15 0-1.974-.31-2.625-.857-.6-.55-.927-1.151-.927-1.923 0-.33.046-.637.137-.912.268-.831.972-1.41 1.773-1.706a7 7 0 0 1 1.194-.314q.812-.14 1.616-.313c.63-.136 1.263-.297 1.884-.49.263-.085.498-.166.498-.191q.001-.261-.026-.452c-.097-.623-.83-.803-1.377-.803q-.321 0-.633.077c-.448.113-.777.282-1.01.696m3.047 2.334q-.299.123-.595.226c-.372.13-.768.256-1.162.345-.367.082-.74.153-1.072.343-.318.183-.55.447-.55.853 0 .67.643 1.013 1.235 1.013.72 0 1.566-.346 1.918-1.013.174-.325.226-.721.226-1.167zm5.693-8.732h3.721v13.325h-3.721zm10.339.001v3.604h2.076v2.796h-2.076v3.377c0 .396.05.721.155.878.069.15.295.305.6.305.326 0 .702-.084 1.166-.24l.308 2.555c-.922.157-1.78.31-2.622.31-.925 0-1.63-.153-2.009-.378a2.5 2.5 0 0 1-.993-1.079c-.258-.482-.326-1.252-.326-2.351V35.13h-1.373v-2.796h1.373v-1.748zM14.535 44.961h3.721v13.36h-3.721zm5.758 0h3.704v2.486h-3.704zm0 3.654h3.704v9.707h-3.704zm5.741 0h3.501v1.596q.357-.463.734-.803c.8-.717 1.685-.965 2.745-.965.976 0 1.834.327 2.384.925.6.55.926 1.546.926 2.798v6.156h-3.79v-5.334c0-.366.007-.775-.17-1.103-.302-.563-1.055-.727-1.614-.477-.449.203-.758.671-.877 1.133q-.12.458-.119 1.152v4.629h-3.72zm22.152 9.707h-3.429v-1.527q-.302.332-.593.599c-.587.532-1.222.9-2.004 1.059-.295.06-.616.09-.953.09-1.027 0-1.782-.323-2.4-.923-.547-.619-.857-1.525-.857-2.833v-6.172h3.704v5.401c0 .413.09.913.395 1.217.566.57 1.464.477 2.007-.067.43-.432.445-1.285.445-1.85v-4.7h3.685zm.894-9.707h4.477l1.473 2.676 1.75-2.676h4.097l-3.223 4.63 3.55 5.077h-4.423l-1.75-3.09-2.111 3.09h-4.012l3.551-5.076z" class="gitea-alt__st1"/><path d="M54.878 37.246c-.442-.983-.93-1.561-1.544-2.602-1.154-1.64-.923-4.588-.383-6.514a13.8 13.8 0 0 1 1.455-3.666c.357-.62-.216-.855-.498-.432-.63.946-1.01 1.82-1.355 2.78-.56 1.564-.853 3.389-.773 5.028.037.983.188 2.368.108 2.847s-.401.573-.655.401c-2.08-1.66-2.505-5.032-2.424-7.479 0-2.524.96-5.224 1.303-7.749.195-.792-.17-3.048-.115-4.395.023-.613.016-1.226 0-1.839-.026-1.006.034-1.961.115-2.961.084-.885.735-1.12 1.314-.735.27.196.349.446.714.676 1.08.58 1.91-.385 1.697-1.387-.173-.829-.713-1.85-1.617-1.502-.54.19-.463.983-.908 1.328-.618.368-1.274.096-1.83-.29-.398-.275-.586-.562-1.103-.324-.653.3-1.285.936-1.735 1.486-.432.527-.754 1.136-1.002 1.769-.71 1.717-1.541 3.199-2.348 4.878 1.116.693 2.08 1.484 3.064 2.37 1.617 1.447 2.505 3.74 2.003 5.898-.173.945-.79 1.735-1.136 2.583-.091.544-.136 1.287-.345 2.132-.136.55-.348 1.118-.676 1.4-.187.16-.66.237-.536-.131.124-.369.254-1.476.01-2.556-.245-1.08-.902-2.148-1.733-3.371-.57-.838-.588-1.393-.588-1.393s.35-.096.419-.535c.038-.249.29-.786.884-.828.538 0 .537.472 1.12.659.677.216.923-.08 1.042-.407.288-.714-.177-2.158-.716-2.582-.325-.305-.875-.462-1.294-.343-.326.093-.638.428-.572.843s.084.632-.207.459c-.16-.095-.308-.307-.414-.459a3.6 3.6 0 0 0-1.024-1.026c-.576-.397-1.07-.573-1.748-.632s-1.206.016-1.796.25c-1.503.597-2.466 1.889-2.872 3.317-.616 2.08.206 4.3 0 7.11-.192 2.61-.433 3.016-.809 4.237-.343 1.114-.583 1.541-.92 1.955-.27.328-.527.358-.748.056-.216-.296-.192-2.025-.192-2.574 0-.996-.066-1.706-.15-2.185-.085-.48-.522-.451-.595-.003a11.4 11.4 0 0 0-.141 1.746c0 1.59.264 3.536.74 5.117.696 2.2 1.313 3.814 1.313 5.185-.04 1.293-1.447 1.985-1.16 2.025 1.371.02 3.009.075 4.494.02.423 0 .366-.076.792-.504.42-.5.153-1.041.078-1.482-.37-2.7.96-5.86 1.75-8.31.755-2.255 1.467-4.606 1.967-7.383a.176.176 0 0 1 .234-.137c.072.024.113.12.133.197.329 1.275.751 3.18 1.176 4.837.308 1.197.636 2.562 1.501 3.49.85-.08 1.563.713 1.677 1.56.118.83-.114 1.677.33 2.526.463.788.984 1.486 1.293 2.158.423.847.792 1.83.52 3.087 1.484 0 2.505-.155 3.64-.81 2.142-1.274 3.182-3.836 1.776-6.884" class="gitea-alt__st2"/><path d="M47.42 43.048c-.583-.96-1.043-2.68-1.043-3.758 0-.616-.443-.406-.772-.406-.347 0-.695.02-.965-.093-.211-.098-.19-.234.04-.272.693-.174 1.1.272 1.58-.675.153-.31.194-.656.098-.965-.114-.364-.5-.557-.943-.578-.31 0-.869.076-.909.462-.022.214.096.504.404.542 0 .134.04.307-.112.366-.235.077-.714-.116-.64 0 .326.462.173 1.003.04 1.485-.151.366.042.925.308 1.462.25.525.56 1.023.656 1.349.173.582.036 1.196.154 1.68.038.25.29.346.346.636.078.193.368.153.444.153.348-.073.424-.443.68-.443.44-.057 1.037-.057 1.326.29.155 0 .25 0 .25-.095 0-.214-.597-.56-.943-1.14" class="gitea-alt__st2"/><path d="M46.106 19.803c-.325-.305-.875-.462-1.294-.343-.326.093-.638.428-.572.843s.084.632-.207.459c-.16-.095-.308-.307-.414-.459a3.6 3.6 0 0 0-1.024-1.026c-.576-.397-1.07-.573-1.748-.632l-.06-.005c1.272.352 1.83 1.13 2.166 2.157.28.704.166 1.572.328 2.511q.027.15.083.26l-.007-.072s.35-.096.419-.535c.038-.249.29-.786.884-.828.538 0 .537.472 1.12.658.677.217.923-.079 1.042-.406.288-.714-.177-2.158-.716-2.582m7.731-10.584c-.173-.829-.713-1.85-1.617-1.502-.54.19-.463.983-.908 1.328-.618.368-1.274.096-1.83-.29-.398-.275-.586-.562-1.103-.324a3.4 3.4 0 0 0-.633.392.1.1 0 0 0 .04.045c.42.364 1.126.243 1.567 1.129.388.767.587 1.753.647 2.52v-.008c.019-.613.061-1.22.112-1.844.084-.885.735-1.12 1.314-.735.27.196.349.446.714.676 1.08.58 1.91-.385 1.697-1.387M49.849 5.3c-1.05-1.597-2.819-2.917-3.918-3.438a16.1 16.1 0 0 1 3.294 3.692c.37.504.797.077.624-.254m-4.152 21.107c.293 1.343.798 2.52.293 4.324.627-.987.68-2.65.255-4.383-.078-.548-.684-.372-.548.059" style="fill:#ffc629"/><path d="M60.308 44.067c-.762-.459-1.871-1.281-2.075-2.042l-.007-.022c-.47-1.247-.158-2.826.144-4.353.116-.587.225-1.14.294-1.678.87-5.899.535-9.106-.542-14.063q-.114-.546-.22-1.07c-.484-2.368-.902-4.413-1.68-6.574-.134-.367-.332-.73-.524-1.08a9 9 0 0 1-.424-.839l-.023-.042c-.21-.308-.325-.782-.426-1.2l-.02-.082c-.123-.58-.161-1.16-.197-1.72-.047-.72-.095-1.462-.327-2.178a4.76 4.76 0 0 0-1.693-2.346c-.333-.241-.747-.356-1.142-.475-.329-.098-.749-.105-1.61-.637-.863-.532-2.1-1.339-3.247-1.93 0 0-.926-.65-1.585.063 2.45 2.008 3.121 4.246 3.121 4.246l.061.297c.184.873.235 1.238-.354 1.524l-.083.053c-1.604 1.083-2.307 2.274-2.614 3.088-.11.196-.32.648-.607 1.266-.44.945-1.095 2.35-1.805 3.726-1.46-.653-2.77-.971-3.998-.971a6.35 6.35 0 0 0-3.016.74c-4.637 2.22-5.79 7.617-5.939 11.754-.08 2.157.313 4.534.694 6.832.435 2.624.885 5.337.6 7.634-.26 1.71-1.21 2.694-2.99 3.096q-.383.008-.52.217a.38.38 0 0 0-.018.37l.063.144h10.623c.473 0 .685-.223.93-.48a4 4 0 0 1 .381-.365l.015-.013c.471-.457.363-1.01.237-1.652-.077-.395-.164-.843-.164-1.393 0-1.893.655-3.765 1.288-5.576l.24-.688c.757-2.189 1.293-3.991 1.687-5.69l.058.269c.159.738.34 1.574.551 2.377.236.89.61 2.135 1.2 3.04q-.074.037-.144.076c-.105.055-.204.108-.292.145-.259.097-.52.205-.774.31a28 28 0 0 1-.577.233.363.363 0 0 0-.222.47l.006.017a.45.45 0 0 0 .266.246c.089.045.225.116.253.153l.024.033c.35.404.483.596.483 1.018 0 .243-.053.41-.11.585-.075.234-.153.476-.078.83.08.426.288.846.508 1.29.267.54.543 1.1.549 1.634-.064.438-.289.585-.598.788-.187.123-.4.262-.581.482l-.026.038a1.37 1.37 0 0 0-.205.733q-.001.073-.01.158c-.018.217-.038.463.115.629.05.055.14.12.283.128a1 1 0 0 0 .085.008c.275 0 .433-.228.548-.395.028-.04.066-.094.095-.128.071.046.127.133.2.255.111.183.262.435.583.435h16.992c-.189-.98-.947-1.29-1.71-1.748M45.931 1.862c1.1.521 2.869 1.841 3.918 3.438.173.331-.255.758-.624.254a16.1 16.1 0 0 0-3.294-3.692m2.18 42.421c-.288-.347-.886-.347-1.326-.29-.255 0-.331.37-.68.443-.075 0-.365.04-.443-.153-.057-.29-.308-.387-.346-.636-.118-.484.02-1.098-.154-1.68-.097-.326-.407-.824-.656-1.349-.266-.537-.46-1.096-.307-1.462.132-.482.285-1.023-.041-1.485-.074-.116.405.077.64 0 .152-.059.112-.232.112-.366-.308-.038-.426-.328-.404-.542.04-.386.598-.462.91-.462.442.021.828.214.942.578.096.309.055.655-.097.965-.48.947-.888.501-1.58.675-.232.038-.252.174-.04.272.269.113.617.093.964.093.33 0 .772-.21.772.406 0 1.078.46 2.798 1.042 3.758.346.58.942.926.942 1.14 0 .095-.094.095-.25.095m4.99-.153c-1.134.655-2.155.81-3.639.81.272-1.258-.097-2.24-.52-3.087-.31-.672-.83-1.37-1.294-2.158-.443-.85-.21-1.697-.329-2.525-.114-.848-.827-1.64-1.677-1.562-.865-.927-1.193-2.292-1.501-3.489-.425-1.658-.847-3.562-1.176-4.837-.02-.077-.06-.173-.133-.197a.176.176 0 0 0-.234.137c-.5 2.777-1.212 5.128-1.968 7.383-.788 2.45-2.12 5.61-1.75 8.31.076.44.342.981-.077 1.482-.426.428-.37.504-.792.504-1.485.055-3.123 0-4.494-.02-.287-.04 1.12-.732 1.16-2.025 0-1.37-.617-2.986-1.312-5.185-.477-1.581-.741-3.527-.741-5.117 0-.66.068-1.298.141-1.746s.51-.476.594.003c.085.48.15 1.189.15 2.185 0 .55-.023 2.278.193 2.574.221.302.478.272.747-.056.338-.414.578-.841.921-1.955.376-1.221.617-1.626.809-4.236.206-2.81-.616-5.03 0-7.111.406-1.428 1.369-2.72 2.872-3.316.59-.235 1.12-.31 1.796-.251.677.06 1.172.235 1.748.632a3.6 3.6 0 0 1 1.024 1.026c.106.152.254.364.414.459.291.173.273-.044.207-.459s.246-.75.572-.843c.419-.12.969.038 1.294.343.54.424 1.004 1.868.716 2.582-.12.327-.365.623-1.041.406-.584-.186-.583-.658-1.121-.658-.594.042-.846.58-.884.828-.069.439-.42.535-.42.535s.02.555.589 1.393c.83 1.223 1.488 2.29 1.732 3.37.245 1.081.115 2.188-.01 2.557-.123.368.35.291.537.131.328-.282.54-.85.676-1.4.209-.845.254-1.588.345-2.132.347-.848.963-1.638 1.136-2.583.502-2.158-.386-4.451-2.003-5.899-.985-.885-1.948-1.676-3.064-2.369.807-1.679 1.638-3.161 2.348-4.878.248-.633.57-1.242 1.002-1.77.45-.55 1.082-1.185 1.735-1.485.517-.238.705.049 1.102.324.557.386 1.213.658 1.831.29.445-.345.368-1.138.908-1.328.904-.348 1.444.673 1.617 1.502.214 1.002-.617 1.966-1.697 1.387-.365-.23-.444-.48-.714-.676-.58-.385-1.23-.15-1.314.735-.081 1-.141 1.955-.115 2.961.016.613.023 1.226 0 1.84-.055 1.346.31 3.602.115 4.394-.342 2.525-1.303 5.225-1.303 7.749-.081 2.447.344 5.82 2.424 7.479.254.172.575.078.655-.401s-.07-1.864-.108-2.847c-.08-1.64.214-3.464.773-5.028.345-.96.725-1.834 1.355-2.78.282-.423.855-.188.498.432a13.8 13.8 0 0 0-1.455 3.666c-.54 1.926-.771 4.875.383 6.514.615 1.04 1.102 1.62 1.544 2.602 1.406 3.048.366 5.61-1.776 6.884m-7.404-17.723c-.136-.431.47-.607.548-.06.425 1.733.372 3.397-.255 4.384.505-1.804 0-2.981-.293-4.324" class="gitea-alt__st1"/><path d="M45.344 36.94c.254 0 .312.178.39.12.12-.12-.136-.37-.295-.37-.252 0-.426.115-.426.25 0 .12.174 0 .331 0" class="gitea-alt__st1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="gitea-alt__Layer_1" x="0" y="0" viewBox="0 0 64 64" class="svg gitea-alt" width="16" height="16" aria-hidden="true"><style>.gitea-alt__st1{fill:#000}.gitea-alt__st2{fill:#fff}</style><path d="m59.43 53.244 4.157-5.973-.139-1.732c-.29-1.508-1.392-2.143-2.12-2.564l-.019-.01q-.123-.071-.25-.147c-.937-.563-1.377-1.073-1.423-1.183l-.047-.145c-.323-.86-.052-2.231.21-3.558l.005-.027c.118-.598.23-1.163.302-1.732.901-6.116.556-9.436-.558-14.559l-.167-.811-.053-.258c-.494-2.42-.921-4.512-1.737-6.776-.172-.474-.408-.904-.62-1.291a9 9 0 0 1-.355-.697l-.15-.279-.012-.019c-.063-.1-.176-.568-.214-.723l-.013-.056c-.1-.473-.133-.992-.166-1.496-.05-.77-.106-1.643-.39-2.516-.37-1.192-1.202-2.348-2.227-3.092-.515-.374-1.068-.54-1.514-.672l-.066-.02a5 5 0 0 0-.317-.08c-.242-.055-.471-.108-.947-.401l-.54-.337c-.792-.497-1.777-1.114-2.729-1.61-.966-.623-2.386-.761-3.396.33l-1.05 1.135 1.196.98c1.86 1.525 2.535 3.226 2.634 3.497q.022.113.046.22l.034.165c-1.78 1.243-2.605 2.63-2.986 3.59-.132.253-.317.65-.595 1.246l-.008.017c-.308.662-.72 1.549-1.186 2.497-1.157-.394-2.237-.586-3.295-.586a7.75 7.75 0 0 0-3.664.893c-2.277 1.095-4 2.934-5.14 5.427H9.892v10.926c-.595-.116-1.2-.16-1.78-.176-.871-.024-1.902-.032-2.937.085-.735.083-2.972.337-4.045 2.153-.29.496-.515 1.095-.71 1.883L0 36.47l1.205.127a3.9 3.9 0 0 0-.94 1.541c-.144.43-.216.9-.216 1.397 0 1.174.465 2.172 1.43 3.058l.044.039c.974.818 2.155 1.216 3.61 1.216.758 0 1.45-.086 2.09-.26h2.67V64h44.109v-4.68l.913-1.337 1.017 1.795H64z" style="fill:#fdc811"/><path d="M5.637 35.127q-.092.17-.18.377L1.91 35.13c.153-.62.324-1.098.545-1.477.58-.982 1.84-1.284 2.894-1.404.898-.101 1.818-.1 2.722-.075 1.262.032 2.697.19 3.534 1.258.494.633.732 1.537.732 2.33v4.221q-.001.278.005.513c.01.526.172 1.106.438 1.558H9.336a1.8 1.8 0 0 1-.395-1.147q-.265.24-.515.422c-.98.73-2.075.986-3.292.986-1.15 0-1.974-.31-2.625-.857-.6-.55-.927-1.151-.927-1.923 0-.33.046-.637.137-.912.268-.831.972-1.41 1.773-1.706a7 7 0 0 1 1.194-.314q.812-.14 1.616-.313c.63-.136 1.263-.297 1.884-.49.263-.085.498-.166.498-.191q.001-.261-.026-.452c-.097-.623-.83-.803-1.377-.803q-.321 0-.633.077c-.448.113-.777.282-1.01.696m3.047 2.334q-.299.123-.595.226c-.372.13-.768.256-1.162.345-.367.082-.74.153-1.072.343-.318.183-.55.447-.55.853 0 .67.643 1.013 1.235 1.013.72 0 1.566-.346 1.918-1.013.174-.325.226-.721.226-1.167zm5.693-8.732h3.721v13.325h-3.721zm10.339.001v3.604h2.076v2.796h-2.076v3.377c0 .396.05.721.155.878.069.15.295.305.6.305.326 0 .702-.084 1.166-.24l.308 2.555c-.922.157-1.78.31-2.622.31-.925 0-1.63-.153-2.009-.378a2.5 2.5 0 0 1-.993-1.079c-.258-.482-.326-1.252-.326-2.351V35.13h-1.373v-2.796h1.373v-1.748zM14.535 44.961h3.721v13.36h-3.721zm5.758 0h3.704v2.486h-3.704zm0 3.654h3.704v9.707h-3.704zm5.741 0h3.501v1.596q.357-.463.734-.803c.8-.717 1.685-.965 2.745-.965.976 0 1.834.327 2.384.925.6.55.926 1.546.926 2.798v6.156h-3.79v-5.334c0-.366.007-.775-.17-1.103-.302-.563-1.055-.727-1.614-.477-.449.203-.758.671-.877 1.133q-.12.458-.119 1.152v4.629h-3.72zm22.152 9.707h-3.429v-1.527q-.302.332-.593.599c-.587.532-1.222.9-2.004 1.059-.295.06-.616.09-.953.09-1.027 0-1.782-.323-2.4-.923-.547-.619-.857-1.525-.857-2.833v-6.172h3.704v5.401c0 .413.09.913.395 1.217.566.57 1.464.477 2.007-.067.43-.432.445-1.285.445-1.85v-4.7h3.685zm.894-9.707h4.477l1.473 2.676 1.75-2.676h4.097l-3.223 4.63 3.55 5.077h-4.423l-1.75-3.09-2.111 3.09h-4.012l3.551-5.076z" class="gitea-alt__st1"/><path d="M54.878 37.246c-.442-.983-.93-1.561-1.544-2.602-1.154-1.64-.923-4.588-.383-6.514a13.8 13.8 0 0 1 1.455-3.666c.357-.62-.216-.855-.498-.432-.63.946-1.01 1.82-1.355 2.78-.56 1.564-.853 3.389-.773 5.028.037.983.188 2.368.108 2.847s-.401.573-.655.401c-2.08-1.66-2.505-5.032-2.424-7.479 0-2.524.96-5.224 1.303-7.749.195-.792-.17-3.048-.115-4.395.023-.613.016-1.226 0-1.839-.026-1.006.034-1.961.115-2.961.084-.885.735-1.12 1.314-.735.27.196.349.446.714.676 1.08.58 1.91-.385 1.697-1.387-.173-.829-.713-1.85-1.617-1.502-.54.19-.463.983-.908 1.328-.618.368-1.274.096-1.83-.29-.398-.275-.586-.562-1.103-.324-.653.3-1.285.936-1.735 1.486-.432.527-.754 1.136-1.002 1.769-.71 1.717-1.541 3.199-2.348 4.878 1.116.693 2.08 1.484 3.064 2.37 1.617 1.447 2.505 3.74 2.003 5.898-.173.945-.79 1.735-1.136 2.583-.091.544-.136 1.287-.345 2.132-.136.55-.348 1.118-.676 1.4-.187.16-.66.237-.536-.131.124-.369.254-1.476.01-2.556-.245-1.08-.902-2.148-1.733-3.371-.57-.838-.588-1.393-.588-1.393s.35-.096.419-.535c.038-.249.29-.786.884-.828.538 0 .537.472 1.12.659.677.216.923-.08 1.042-.407.288-.714-.177-2.158-.716-2.582-.325-.305-.875-.462-1.294-.343-.326.093-.638.428-.572.843s.084.632-.207.459c-.16-.095-.308-.307-.414-.459a3.6 3.6 0 0 0-1.024-1.026c-.576-.397-1.07-.573-1.748-.632s-1.206.016-1.796.25c-1.503.597-2.466 1.889-2.872 3.317-.616 2.08.206 4.3 0 7.11-.192 2.61-.433 3.016-.809 4.237-.343 1.114-.583 1.541-.92 1.955-.27.328-.527.358-.748.056-.216-.296-.192-2.025-.192-2.574 0-.996-.066-1.706-.15-2.185-.085-.48-.522-.451-.595-.003a11.4 11.4 0 0 0-.141 1.746c0 1.59.264 3.536.74 5.117.696 2.2 1.313 3.814 1.313 5.185-.04 1.293-1.447 1.985-1.16 2.025 1.371.02 3.009.075 4.494.02.423 0 .366-.076.792-.504.42-.5.153-1.041.078-1.482-.37-2.7.96-5.86 1.75-8.31.755-2.255 1.467-4.606 1.967-7.383a.176.176 0 0 1 .234-.137c.072.024.113.12.133.197.329 1.275.751 3.18 1.176 4.837.308 1.197.636 2.562 1.501 3.49.85-.08 1.563.713 1.677 1.56.118.83-.114 1.677.33 2.526.463.788.984 1.486 1.293 2.158.423.847.792 1.83.52 3.087 1.484 0 2.505-.155 3.64-.81 2.142-1.274 3.182-3.836 1.776-6.884" class="gitea-alt__st2"/><path d="M47.42 43.048c-.583-.96-1.043-2.68-1.043-3.758 0-.616-.443-.406-.772-.406-.347 0-.695.02-.965-.093-.211-.098-.19-.234.04-.272.693-.174 1.1.272 1.58-.675.153-.31.194-.656.098-.965-.114-.364-.5-.557-.943-.578-.31 0-.869.076-.909.462-.022.214.096.504.404.542 0 .134.04.307-.112.366-.235.077-.714-.116-.64 0 .326.462.173 1.003.04 1.485-.151.366.042.925.308 1.462.25.525.56 1.023.656 1.349.173.582.036 1.196.154 1.68.038.25.29.346.346.636.078.193.368.153.444.153.348-.073.424-.443.68-.443.44-.057 1.037-.057 1.326.29.155 0 .25 0 .25-.095 0-.214-.597-.56-.943-1.14" class="gitea-alt__st2"/><path d="M46.106 19.803c-.325-.305-.875-.462-1.294-.343-.326.093-.638.428-.572.843s.084.632-.207.459c-.16-.095-.308-.307-.414-.459a3.6 3.6 0 0 0-1.024-1.026c-.576-.397-1.07-.573-1.748-.632l-.06-.005c1.272.352 1.83 1.13 2.166 2.157.28.704.166 1.572.328 2.511q.027.15.083.26l-.007-.072s.35-.096.419-.535c.038-.249.29-.786.884-.828.538 0 .537.472 1.12.658.677.217.923-.079 1.042-.406.288-.714-.177-2.158-.716-2.582m7.731-10.584c-.173-.829-.713-1.85-1.617-1.502-.54.19-.463.983-.908 1.328-.618.368-1.274.096-1.83-.29-.398-.275-.586-.562-1.103-.324a3.4 3.4 0 0 0-.633.392.1.1 0 0 0 .04.045c.42.364 1.126.243 1.567 1.129.388.767.587 1.753.647 2.52v-.008c.019-.613.061-1.22.112-1.844.084-.885.735-1.12 1.314-.735.27.196.349.446.714.676 1.08.58 1.91-.385 1.697-1.387M49.849 5.3c-1.05-1.597-2.819-2.917-3.918-3.438a16.1 16.1 0 0 1 3.294 3.692c.37.504.797.077.624-.254m-4.152 21.107c.293 1.343.798 2.52.293 4.324.627-.987.68-2.65.255-4.383-.078-.548-.684-.372-.548.059" style="fill:#ffc629"/><path d="M60.308 44.067c-.762-.459-1.871-1.281-2.075-2.042l-.007-.022c-.47-1.247-.158-2.826.144-4.353.116-.587.225-1.14.294-1.678.87-5.899.535-9.106-.542-14.063q-.114-.546-.22-1.07c-.484-2.368-.902-4.413-1.68-6.574-.134-.367-.332-.73-.524-1.08a9 9 0 0 1-.424-.839l-.023-.042c-.21-.308-.325-.782-.426-1.2l-.02-.082c-.123-.58-.161-1.16-.197-1.72-.047-.72-.095-1.462-.327-2.178a4.76 4.76 0 0 0-1.693-2.346c-.333-.241-.747-.356-1.142-.475-.329-.098-.749-.105-1.61-.637-.863-.532-2.1-1.339-3.247-1.93 0 0-.926-.65-1.585.063 2.45 2.008 3.121 4.246 3.121 4.246l.061.297c.184.873.235 1.238-.354 1.524l-.083.053c-1.604 1.083-2.307 2.274-2.614 3.088-.11.196-.32.648-.607 1.266-.44.945-1.095 2.35-1.805 3.726-1.46-.653-2.77-.971-3.998-.971a6.35 6.35 0 0 0-3.016.74c-4.637 2.22-5.79 7.617-5.939 11.754-.08 2.157.313 4.534.694 6.832.435 2.624.885 5.337.6 7.634-.26 1.71-1.21 2.694-2.99 3.096q-.383.008-.52.217a.38.38 0 0 0-.018.37l.063.144h10.623c.473 0 .685-.223.93-.48a4 4 0 0 1 .381-.365l.015-.013c.471-.457.363-1.01.237-1.652-.077-.395-.164-.843-.164-1.393 0-1.893.655-3.765 1.288-5.576l.24-.688c.757-2.189 1.293-3.991 1.687-5.69l.058.269c.159.738.34 1.574.551 2.377.236.89.61 2.135 1.2 3.04q-.074.037-.144.076c-.105.055-.204.108-.292.145-.259.097-.52.205-.774.31a28 28 0 0 1-.577.233.363.363 0 0 0-.222.47l.006.017a.45.45 0 0 0 .266.246c.089.045.225.116.253.153l.024.033c.35.404.483.596.483 1.018 0 .243-.053.41-.11.585-.075.234-.153.476-.078.83.08.426.288.846.508 1.29.267.54.543 1.1.549 1.634-.064.438-.289.585-.598.788-.187.123-.4.262-.581.482l-.026.038a1.37 1.37 0 0 0-.205.733q-.001.073-.01.158c-.018.217-.038.463.115.629.05.055.14.12.283.128a1 1 0 0 0 .085.008c.275 0 .433-.228.548-.395.028-.04.066-.094.095-.128.071.046.127.133.2.255.111.183.262.435.583.435h16.992c-.189-.98-.947-1.29-1.71-1.748M45.931 1.862c1.1.521 2.869 1.841 3.918 3.438.173.331-.255.758-.624.254a16.1 16.1 0 0 0-3.294-3.692m2.18 42.421c-.288-.347-.886-.347-1.326-.29-.255 0-.331.37-.68.443-.075 0-.365.04-.443-.153-.057-.29-.308-.387-.346-.636-.118-.484.02-1.098-.154-1.68-.097-.326-.407-.824-.656-1.349-.266-.537-.46-1.096-.307-1.462.132-.482.285-1.023-.041-1.485-.074-.116.405.077.64 0 .152-.059.112-.232.112-.366-.308-.038-.426-.328-.404-.542.04-.386.598-.462.91-.462.442.021.828.214.942.578.096.309.055.655-.097.965-.48.947-.888.501-1.58.675-.232.038-.252.174-.04.272.269.113.617.093.964.093.33 0 .772-.21.772.406 0 1.078.46 2.798 1.042 3.758.346.58.942.926.942 1.14 0 .095-.094.095-.25.095m4.99-.153c-1.134.655-2.155.81-3.639.81.272-1.258-.097-2.24-.52-3.087-.31-.672-.83-1.37-1.294-2.158-.443-.85-.21-1.697-.329-2.525-.114-.848-.827-1.64-1.677-1.562-.865-.927-1.193-2.292-1.501-3.489-.425-1.658-.847-3.562-1.176-4.837-.02-.077-.06-.173-.133-.197a.176.176 0 0 0-.234.137c-.5 2.777-1.212 5.128-1.968 7.383-.788 2.45-2.12 5.61-1.75 8.31.076.44.342.981-.077 1.482-.426.428-.37.504-.792.504-1.485.055-3.123 0-4.494-.02-.287-.04 1.12-.732 1.16-2.025 0-1.37-.617-2.986-1.312-5.185-.477-1.581-.741-3.527-.741-5.117 0-.66.068-1.298.141-1.746s.51-.476.594.003c.085.48.15 1.189.15 2.185 0 .55-.023 2.278.193 2.574.221.302.478.272.747-.056.338-.414.578-.841.921-1.955.376-1.221.617-1.626.809-4.236.206-2.81-.616-5.03 0-7.111.406-1.428 1.369-2.72 2.872-3.316.59-.235 1.12-.31 1.796-.251.677.06 1.172.235 1.748.632a3.6 3.6 0 0 1 1.024 1.026c.106.152.254.364.414.459.291.173.273-.044.207-.459s.246-.75.572-.843c.419-.12.969.038 1.294.343.54.424 1.004 1.868.716 2.582-.12.327-.365.623-1.041.406-.584-.186-.583-.658-1.121-.658-.594.042-.846.58-.884.828-.069.439-.42.535-.42.535s.02.555.589 1.393c.83 1.223 1.488 2.29 1.732 3.37.245 1.081.115 2.188-.01 2.557-.123.368.35.291.537.131.328-.282.54-.85.676-1.4.209-.845.254-1.588.345-2.132.347-.848.963-1.638 1.136-2.583.502-2.158-.386-4.451-2.003-5.899-.985-.885-1.948-1.676-3.064-2.369.807-1.679 1.638-3.161 2.348-4.878.248-.633.57-1.242 1.002-1.77.45-.55 1.082-1.185 1.735-1.485.517-.238.705.049 1.102.324.557.386 1.213.658 1.831.29.445-.345.368-1.138.908-1.328.904-.348 1.444.673 1.617 1.502.214 1.002-.617 1.966-1.697 1.387-.365-.23-.444-.48-.714-.676-.58-.385-1.23-.15-1.314.735-.081 1-.141 1.955-.115 2.961.016.613.023 1.226 0 1.84-.055 1.346.31 3.602.115 4.394-.342 2.525-1.303 5.225-1.303 7.749-.081 2.447.344 5.82 2.424 7.479.254.172.575.078.655-.401s-.07-1.864-.108-2.847c-.08-1.64.214-3.464.773-5.028.345-.96.725-1.834 1.355-2.78.282-.423.855-.188.498.432a13.8 13.8 0 0 0-1.455 3.666c-.54 1.926-.771 4.875.383 6.514.615 1.04 1.102 1.62 1.544 2.602 1.406 3.048.366 5.61-1.776 6.884m-7.404-17.723c-.136-.431.47-.607.548-.06.425 1.733.372 3.397-.255 4.384.505-1.804 0-2.981-.293-4.324" class="gitea-alt__st1"/><path d="M45.344 36.94c.254 0 .312.178.39.12.12-.12-.136-.37-.295-.37-.252 0-.426.115-.426.25 0 .12.174 0 .331 0" class="gitea-alt__st1"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-chef.svg b/public/assets/img/svg/gitea-chef.svg
index c5e8a721cc..8fd8ed325d 100644
--- a/public/assets/img/svg/gitea-chef.svg
+++ b/public/assets/img/svg/gitea-chef.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="svg gitea-chef" width="16" height="16" aria-hidden="true"><g fill="none" fill-rule="evenodd"><path fill="#435363" d="M18 25.8c-4.3 0-7.7-3.6-7.7-8s3.4-7.9 7.7-7.9c3.5 0 6.4 2.4 7.3 5.7h3c-1-5-5.2-8.7-10.3-8.7-5.9 0-10.6 4.9-10.6 10.9 0 6.1 4.7 11 10.6 11 5.1 0 9.3-3.7 10.3-8.7h-3c-.9 3.3-3.8 5.7-7.3 5.7"/><path fill="#435363" d="M12.8 23.2c1.3 1.4 3.1 2.3 5.2 2.3v-3.2c-1.2 0-2.3-.5-3.1-1.3z"/><path fill="#F38B00" d="M10.6 17.8c0 1.1.3 2.2.6 3.1l2.9-1.3c-.3-.5-.4-1.1-.4-1.8 0-2.4 1.9-4.4 4.3-4.4v-3.2c-4.1 0-7.4 3.4-7.4 7.6"/><path fill="#435363" d="m20.6 10.7-1.1 3c.9.4 1.7 1.1 2.2 1.9H25c-.7-2.2-2.3-4-4.4-4.9"/><path fill="#F38B00" d="m19.5 22 1.1 2.9c2.1-.8 3.7-2.6 4.4-4.8h-3.3c-.5.8-1.3 1.5-2.2 1.9"/><path fill="#435363" d="M4.4 22.1c-.1-.2-.1-.3-.1-.5-.1-.2-.1-.3-.2-.5V21c0-.1 0-.3-.1-.4v-.5c-.1-.1-.1-.2-.1-.3-.1-.6-.1-1.3-.1-2H.9c0 .8 0 1.5.1 2.2 0 .2.1.4.1.6v.1c0 .2.1.4.1.5s0 .2.1.3v.3c.1.1.1.2.1.4 0 0 .1.1.1.2 0 .2 0 .3.1.4v.2c.2.7.5 1.3.7 2L5 23.8c-.2-.6-.4-1.1-.6-1.7"/><path fill="#F38B00" d="M18 32.6c-3.9 0-7.5-1.7-10.1-4.4l-2 2.2c3.1 3.2 7.3 5.2 12.1 5.2 8.7 0 15.8-6.8 16.9-15.5H32c-1.1 7-7 12.5-14 12.5M18 3.1c3.1 0 6.1 1.1 8.4 2.9l1.8-2.4C25.3 1.4 21.8.1 18 .1 10.7.1 4.5 4.8 2.1 11.4l2.7 1.1C6.8 7 12 3.1 18 3.1"/><path fill="#435363" d="M32 15.6h2.9c-.3-2.6-1.2-5-2.5-7.2L30 10c1 1.7 1.7 3.6 2 5.6"/><path fill="#F38B00" d="M28.7 15.6h2.9c-.8-5.1-4.1-9.3-8.6-11.1l-1.1 2.8c3.5 1.3 6 4.5 6.8 8.3"/><path fill="#435363" d="M18 6.5v-3c-5.9 0-10.9 3.8-12.9 9.1l2.7 1.1C9.4 9.5 13.3 6.5 18 6.5"/><path fill="#F38B00" d="M7 17.8H4.1c0 6.1 3.6 11.2 8.7 13.4l1.1-2.8C9.9 26.7 7 22.6 7 17.8"/><path fill="#435363" d="M18 29.2v3c6.9 0 12.6-5.3 13.6-12.1h-2.9c-1 5.2-5.4 9.1-10.7 9.1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="svg gitea-chef" width="16" height="16" aria-hidden="true"><g fill="none" fill-rule="evenodd"><path fill="#435363" d="M18 25.8c-4.3 0-7.7-3.6-7.7-8s3.4-7.9 7.7-7.9c3.5 0 6.4 2.4 7.3 5.7h3c-1-5-5.2-8.7-10.3-8.7-5.9 0-10.6 4.9-10.6 10.9 0 6.1 4.7 11 10.6 11 5.1 0 9.3-3.7 10.3-8.7h-3c-.9 3.3-3.8 5.7-7.3 5.7"/><path fill="#435363" d="M12.8 23.2c1.3 1.4 3.1 2.3 5.2 2.3v-3.2c-1.2 0-2.3-.5-3.1-1.3z"/><path fill="#f38b00" d="M10.6 17.8c0 1.1.3 2.2.6 3.1l2.9-1.3c-.3-.5-.4-1.1-.4-1.8 0-2.4 1.9-4.4 4.3-4.4v-3.2c-4.1 0-7.4 3.4-7.4 7.6"/><path fill="#435363" d="m20.6 10.7-1.1 3c.9.4 1.7 1.1 2.2 1.9H25c-.7-2.2-2.3-4-4.4-4.9"/><path fill="#f38b00" d="m19.5 22 1.1 2.9c2.1-.8 3.7-2.6 4.4-4.8h-3.3c-.5.8-1.3 1.5-2.2 1.9"/><path fill="#435363" d="M4.4 22.1c-.1-.2-.1-.3-.1-.5-.1-.2-.1-.3-.2-.5V21c0-.1 0-.3-.1-.4v-.5c-.1-.1-.1-.2-.1-.3-.1-.6-.1-1.3-.1-2H.9c0 .8 0 1.5.1 2.2 0 .2.1.4.1.6v.1c0 .2.1.4.1.5s0 .2.1.3v.3c.1.1.1.2.1.4 0 0 .1.1.1.2 0 .2 0 .3.1.4v.2c.2.7.5 1.3.7 2L5 23.8c-.2-.6-.4-1.1-.6-1.7"/><path fill="#f38b00" d="M18 32.6c-3.9 0-7.5-1.7-10.1-4.4l-2 2.2c3.1 3.2 7.3 5.2 12.1 5.2 8.7 0 15.8-6.8 16.9-15.5H32c-1.1 7-7 12.5-14 12.5M18 3.1c3.1 0 6.1 1.1 8.4 2.9l1.8-2.4C25.3 1.4 21.8.1 18 .1 10.7.1 4.5 4.8 2.1 11.4l2.7 1.1C6.8 7 12 3.1 18 3.1"/><path fill="#435363" d="M32 15.6h2.9c-.3-2.6-1.2-5-2.5-7.2L30 10c1 1.7 1.7 3.6 2 5.6"/><path fill="#f38b00" d="M28.7 15.6h2.9c-.8-5.1-4.1-9.3-8.6-11.1l-1.1 2.8c3.5 1.3 6 4.5 6.8 8.3"/><path fill="#435363" d="M18 6.5v-3c-5.9 0-10.9 3.8-12.9 9.1l2.7 1.1C9.4 9.5 13.3 6.5 18 6.5"/><path fill="#f38b00" d="M7 17.8H4.1c0 6.1 3.6 11.2 8.7 13.4l1.1-2.8C9.9 26.7 7 22.6 7 17.8"/><path fill="#435363" d="M18 29.2v3c6.9 0 12.6-5.3 13.6-12.1h-2.9c-1 5.2-5.4 9.1-10.7 9.1"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-debian.svg b/public/assets/img/svg/gitea-debian.svg
index fa2f2f49dc..e92d0b6937 100644
--- a/public/assets/img/svg/gitea-debian.svg
+++ b/public/assets/img/svg/gitea-debian.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 260" class="svg gitea-debian" width="16" height="16" aria-hidden="true"><g fill="#D70751"><path d="M124.525 137.053c-4.125.058.78 2.125 6.165 2.954a55 55 0 0 0 4.04-3.479c-3.354.821-6.765.838-10.205.525m22.14-5.52c2.457-3.389 4.246-7.102 4.878-10.939-.551 2.736-2.035 5.099-3.435 7.592-7.711 4.854-.726-2.883-.004-5.824-8.29 10.436-1.138 6.257-1.439 9.171m8.174-21.265c.497-7.428-1.462-5.08-2.121-2.245.766.4 1.377 5.237 2.121 2.245M108.883 8.736c2.201.395 4.757.698 4.398 1.224 2.407-.528 2.954-1.015-4.398-1.224M113.281 9.96l-1.556.32 1.448-.127z"/><path d="M181.93 113.085c.247 6.671-1.95 9.907-3.932 15.637l-3.564 1.781c-2.919 5.666.282 3.598-1.807 8.105-4.556 4.049-13.823 12.67-16.789 13.457-2.163-.047 1.469-2.554 1.943-3.537-6.097 4.188-4.894 6.285-14.217 8.83l-.273-.607c-23.001 10.818-54.947-10.622-54.526-39.876-.246 1.857-.698 1.393-1.208 2.144-1.186-15.052 6.952-30.17 20.675-36.343 13.427-6.646 29.163-3.918 38.78 5.044-5.282-6.92-15.795-14.254-28.255-13.568-12.208.193-23.625 7.95-27.436 16.369-6.253 3.938-6.979 15.177-9.704 17.233-3.665 26.943 6.896 38.583 24.762 52.275 2.812 1.896.792 2.184 1.173 3.627-5.936-2.779-11.372-6.976-15.841-12.114 2.372 3.473 4.931 6.847 8.239 9.499-5.596-1.897-13.074-13.563-15.256-14.038 9.647 17.274 39.142 30.295 54.587 23.836-7.146.263-16.226.146-24.256-2.822-3.371-1.734-7.958-5.331-7.14-6.003 21.079 7.875 42.854 5.965 61.09-8.655 4.641-3.614 9.709-9.761 11.173-9.846-2.206 3.317.377 1.596-1.318 4.523 4.625-7.456-2.008-3.035 4.779-12.877l2.507 3.453c-.931-6.188 7.687-13.704 6.813-23.492 1.975-2.994 2.206 3.22.107 10.107 2.912-7.64.767-8.867 1.516-15.171.81 2.118 1.867 4.37 2.412 6.606-1.895-7.382 1.948-12.433 2.898-16.724-.937-.415-2.928 3.264-3.383-5.457.065-3.788 1.054-1.985 1.435-2.917-.744-.427-2.694-3.33-3.88-8.9.86-1.308 2.3 3.393 3.47 3.586-.753-4.429-2.049-7.805-2.103-11.202-3.421-7.149-1.211.953-3.985-3.069-3.641-11.357 3.021-2.637 3.47-7.796 5.52 7.995 8.667 20.387 10.11 25.519-1.103-6.258-2.883-12.32-5.058-18.185 1.677.705-2.699-12.875 2.18-3.882-5.21-19.172-22.302-37.087-38.025-45.493 1.924 1.76 4.354 3.971 3.481 4.317-7.819-4.656-6.444-5.018-7.565-6.985-6.369-2.591-6.788.208-11.007.004-12.005-6.368-14.318-5.69-25.368-9.681l.502 2.349c-7.953-2.649-9.265 1.005-17.862.009-.523-.409 2.753-1.479 5.452-1.871-7.69 1.015-7.329-1.515-14.854.279 1.855-1.301 3.815-2.162 5.793-3.269-6.271.381-14.971 3.649-12.286.677-10.235 4.569-28.403 10.976-38.597 20.535l-.321-2.142c-4.672 5.608-20.371 16.748-21.622 24.011l-1.249.291c-2.431 4.116-4.004 8.781-5.932 13.016-3.18 5.417-4.661 2.085-4.208 2.934-6.253 12.679-9.359 23.332-12.043 32.069 1.912 2.858.046 17.206.769 28.688-3.141 56.709 39.8 111.77 86.737 124.48 6.88 2.459 17.11 2.364 25.813 2.618-10.268-2.937-11.595-1.556-21.595-5.044-7.215-3.398-8.797-7.277-13.907-11.711l2.022 3.573c-10.021-3.547-5.829-4.39-13.982-6.972l2.16-2.82c-3.249-.246-8.604-5.475-10.069-8.371l-3.553.14c-4.27-5.269-6.545-9.063-6.379-12.005l-1.148 2.047c-1.301-2.235-15.709-19.759-8.234-15.679-1.389-1.271-3.235-2.067-5.237-5.703l1.522-1.739c-3.597-4.627-6.621-10.562-6.391-12.536 1.919 2.592 3.25 3.075 4.568 3.52-9.083-22.539-9.593-1.242-16.474-22.942l1.456-.116c-1.116-1.682-1.793-3.506-2.69-5.298l.633-6.313c-6.541-7.562-1.829-32.151-.887-45.637.655-5.485 5.459-11.322 9.114-20.477l-2.227-.384c4.256-7.423 24.301-29.814 33.583-28.662 4.499-5.649-.892-.02-1.772-1.443 9.878-10.223 12.984-7.222 19.65-9.061 7.19-4.268-6.17 1.664-2.761-1.628 12.427-3.174 8.808-7.216 25.021-8.828 1.71.973-3.969 1.503-5.395 2.766 10.354-5.066 32.769-3.914 47.326 2.811 16.895 7.896 35.873 31.232 36.622 53.189l.852.229c-.431 8.729 1.336 18.822-1.727 28.094l2.1-4.385"/><path d="m79.5 142.715-.578 2.893c2.71 3.683 4.861 7.673 8.323 10.552-2.49-4.863-4.341-6.872-7.745-13.445m6.409-.251c-1.435-1.587-2.284-3.497-3.235-5.4.909 3.345 2.771 6.219 4.504 9.143zm113.411-24.65-.605 1.52c-1.111 7.892-3.511 15.701-7.189 22.941a72.1 72.1 0 0 0 7.79-24.461M109.698 6.757c2.789-1.022 6.855-.56 9.814-1.233-3.855.324-7.693.517-11.484 1.005zM11.781 58.824c.642 5.951-4.477 8.26 1.134 4.337 3.007-6.773-1.175-1.87-1.134-4.337M5.188 86.362c1.292-3.967 1.526-6.349 2.02-8.645-3.571 4.566-1.643 5.539-2.02 8.645"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 260" class="svg gitea-debian" width="16" height="16" aria-hidden="true"><g fill="#d70751"><path d="M124.525 137.053c-4.125.058.78 2.125 6.165 2.954a55 55 0 0 0 4.04-3.479c-3.354.821-6.765.838-10.205.525m22.14-5.52c2.457-3.389 4.246-7.102 4.878-10.939-.551 2.736-2.035 5.099-3.435 7.592-7.711 4.854-.726-2.883-.004-5.824-8.29 10.436-1.138 6.257-1.439 9.171m8.174-21.265c.497-7.428-1.462-5.08-2.121-2.245.766.4 1.377 5.237 2.121 2.245M108.883 8.736c2.201.395 4.757.698 4.398 1.224 2.407-.528 2.954-1.015-4.398-1.224M113.281 9.96l-1.556.32 1.448-.127z"/><path d="M181.93 113.085c.247 6.671-1.95 9.907-3.932 15.637l-3.564 1.781c-2.919 5.666.282 3.598-1.807 8.105-4.556 4.049-13.823 12.67-16.789 13.457-2.163-.047 1.469-2.554 1.943-3.537-6.097 4.188-4.894 6.285-14.217 8.83l-.273-.607c-23.001 10.818-54.947-10.622-54.526-39.876-.246 1.857-.698 1.393-1.208 2.144-1.186-15.052 6.952-30.17 20.675-36.343 13.427-6.646 29.163-3.918 38.78 5.044-5.282-6.92-15.795-14.254-28.255-13.568-12.208.193-23.625 7.95-27.436 16.369-6.253 3.938-6.979 15.177-9.704 17.233-3.665 26.943 6.896 38.583 24.762 52.275 2.812 1.896.792 2.184 1.173 3.627-5.936-2.779-11.372-6.976-15.841-12.114 2.372 3.473 4.931 6.847 8.239 9.499-5.596-1.897-13.074-13.563-15.256-14.038 9.647 17.274 39.142 30.295 54.587 23.836-7.146.263-16.226.146-24.256-2.822-3.371-1.734-7.958-5.331-7.14-6.003 21.079 7.875 42.854 5.965 61.09-8.655 4.641-3.614 9.709-9.761 11.173-9.846-2.206 3.317.377 1.596-1.318 4.523 4.625-7.456-2.008-3.035 4.779-12.877l2.507 3.453c-.931-6.188 7.687-13.704 6.813-23.492 1.975-2.994 2.206 3.22.107 10.107 2.912-7.64.767-8.867 1.516-15.171.81 2.118 1.867 4.37 2.412 6.606-1.895-7.382 1.948-12.433 2.898-16.724-.937-.415-2.928 3.264-3.383-5.457.065-3.788 1.054-1.985 1.435-2.917-.744-.427-2.694-3.33-3.88-8.9.86-1.308 2.3 3.393 3.47 3.586-.753-4.429-2.049-7.805-2.103-11.202-3.421-7.149-1.211.953-3.985-3.069-3.641-11.357 3.021-2.637 3.47-7.796 5.52 7.995 8.667 20.387 10.11 25.519-1.103-6.258-2.883-12.32-5.058-18.185 1.677.705-2.699-12.875 2.18-3.882-5.21-19.172-22.302-37.087-38.025-45.493 1.924 1.76 4.354 3.971 3.481 4.317-7.819-4.656-6.444-5.018-7.565-6.985-6.369-2.591-6.788.208-11.007.004-12.005-6.368-14.318-5.69-25.368-9.681l.502 2.349c-7.953-2.649-9.265 1.005-17.862.009-.523-.409 2.753-1.479 5.452-1.871-7.69 1.015-7.329-1.515-14.854.279 1.855-1.301 3.815-2.162 5.793-3.269-6.271.381-14.971 3.649-12.286.677-10.235 4.569-28.403 10.976-38.597 20.535l-.321-2.142c-4.672 5.608-20.371 16.748-21.622 24.011l-1.249.291c-2.431 4.116-4.004 8.781-5.932 13.016-3.18 5.417-4.661 2.085-4.208 2.934-6.253 12.679-9.359 23.332-12.043 32.069 1.912 2.858.046 17.206.769 28.688-3.141 56.709 39.8 111.77 86.737 124.48 6.88 2.459 17.11 2.364 25.813 2.618-10.268-2.937-11.595-1.556-21.595-5.044-7.215-3.398-8.797-7.277-13.907-11.711l2.022 3.573c-10.021-3.547-5.829-4.39-13.982-6.972l2.16-2.82c-3.249-.246-8.604-5.475-10.069-8.371l-3.553.14c-4.27-5.269-6.545-9.063-6.379-12.005l-1.148 2.047c-1.301-2.235-15.709-19.759-8.234-15.679-1.389-1.271-3.235-2.067-5.237-5.703l1.522-1.739c-3.597-4.627-6.621-10.562-6.391-12.536 1.919 2.592 3.25 3.075 4.568 3.52-9.083-22.539-9.593-1.242-16.474-22.942l1.456-.116c-1.116-1.682-1.793-3.506-2.69-5.298l.633-6.313c-6.541-7.562-1.829-32.151-.887-45.637.655-5.485 5.459-11.322 9.114-20.477l-2.227-.384c4.256-7.423 24.301-29.814 33.583-28.662 4.499-5.649-.892-.02-1.772-1.443 9.878-10.223 12.984-7.222 19.65-9.061 7.19-4.268-6.17 1.664-2.761-1.628 12.427-3.174 8.808-7.216 25.021-8.828 1.71.973-3.969 1.503-5.395 2.766 10.354-5.066 32.769-3.914 47.326 2.811 16.895 7.896 35.873 31.232 36.622 53.189l.852.229c-.431 8.729 1.336 18.822-1.727 28.094l2.1-4.385"/><path d="m79.5 142.715-.578 2.893c2.71 3.683 4.861 7.673 8.323 10.552-2.49-4.863-4.341-6.872-7.745-13.445m6.409-.251c-1.435-1.587-2.284-3.497-3.235-5.4.909 3.345 2.771 6.219 4.504 9.143zm113.411-24.65-.605 1.52c-1.111 7.892-3.511 15.701-7.189 22.941a72.1 72.1 0 0 0 7.79-24.461M109.698 6.757c2.789-1.022 6.855-.56 9.814-1.233-3.855.324-7.693.517-11.484 1.005zM11.781 58.824c.642 5.951-4.477 8.26 1.134 4.337 3.007-6.773-1.175-1.87-1.134-4.337M5.188 86.362c1.292-3.967 1.526-6.349 2.02-8.645-3.571 4.566-1.643 5.539-2.02 8.645"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-forgejo.svg b/public/assets/img/svg/gitea-forgejo.svg
index 22ae790357..6bc09fc93b 100644
--- a/public/assets/img/svg/gitea-forgejo.svg
+++ b/public/assets/img/svg/gitea-forgejo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="gitea-forgejo__forgejo-logo svg gitea-forgejo" viewBox="0 0 256 256" width="16" height="16"><g fill="none" transform="translate(28 28)"><path stroke="#f60" stroke-width="25" d="M58 168V70a50 50 0 0 1 50-50h20"/><path stroke="#d40000" stroke-width="25" d="M58 168v-30a50 50 0 0 1 50-50h20"/><circle cx="142" cy="20" r="18" stroke="#f60" stroke-width="15"/><circle cx="142" cy="88" r="18" stroke="#d40000" stroke-width="15"/><circle cx="58" cy="180" r="18" stroke="#d40000" stroke-width="15"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="gitea-forgejo__forgejo-logo svg gitea-forgejo" viewBox="0 0 212 212" width="16" height="16"><g fill="none" transform="translate(6 6)"><path stroke="#f60" stroke-width="25" d="M58 168V70a50 50 0 0 1 50-50h20"/><path stroke="#d40000" stroke-width="25" d="M58 168v-30a50 50 0 0 1 50-50h20"/><circle cx="142" cy="20" r="18" stroke="#f60" stroke-width="15"/><circle cx="142" cy="88" r="18" stroke="#d40000" stroke-width="15"/><circle cx="58" cy="180" r="18" stroke="#d40000" stroke-width="15"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-git.svg b/public/assets/img/svg/gitea-git.svg
index 33a98deb16..9629c969b7 100644
--- a/public/assets/img/svg/gitea-git.svg
+++ b/public/assets/img/svg/gitea-git.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" class="svg gitea-git" width="16" height="16" aria-hidden="true"><path d="M42.2 22.1 25.9 5.8c-.5-.5-1.2-.8-1.9-.8s-1.4.3-1.9.8l-3.5 3.5 4.1 4.1c.4-.2.8-.3 1.3-.3 1.7 0 3 1.3 3 3 0 .5-.1.9-.3 1.3l4 4c.4-.2.8-.3 1.3-.3 1.7 0 3 1.3 3 3s-1.3 3-3 3-3-1.3-3-3c0-.5.1-.9.3-1.3l-4-4c-.1 0-.2.1-.3.1v10.4c1.2.4 2 1.5 2 2.8 0 1.7-1.3 3-3 3s-3-1.3-3-3c0-1.3.8-2.4 2-2.8V18.8c-1.2-.4-2-1.5-2-2.8 0-.5.1-.9.3-1.3l-4.1-4.1L5.8 22.1c-.5.5-.8 1.2-.8 1.9s.3 1.4.8 1.9l16.3 16.3c.5.5 1.2.8 1.9.8s1.4-.3 1.9-.8l16.3-16.3c.5-.5.8-1.2.8-1.9s-.3-1.4-.8-1.9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" class="svg gitea-git" width="16" height="16" aria-hidden="true"><path d="M46.99 21.6 26.4 1.01A3.45 3.45 0 0 0 24 0c-.884 0-1.768.379-2.4 1.01l-4.421 4.422 5.179 5.179A3.5 3.5 0 0 1 24 10.23c2.147 0 3.79 1.643 3.79 3.79 0 .632-.127 1.137-.38 1.642l5.053 5.053a3.5 3.5 0 0 1 1.642-.38c2.148 0 3.79 1.643 3.79 3.79s-1.642 3.79-3.79 3.79c-2.147 0-3.79-1.642-3.79-3.79 0-.631.127-1.137.38-1.642l-5.053-5.052c-.126 0-.253.126-.379.126v13.137c1.516.505 2.526 1.894 2.526 3.537 0 2.147-1.642 3.79-3.789 3.79s-3.79-1.643-3.79-3.79c0-1.643 1.011-3.032 2.527-3.537V17.432c-1.516-.506-2.526-1.895-2.526-3.537 0-.632.126-1.137.378-1.642l-5.178-5.18L1.01 21.6A3.45 3.45 0 0 0 0 24c0 .884.379 1.768 1.01 2.4L21.6 46.99A3.45 3.45 0 0 0 24 48c.884 0 1.768-.379 2.4-1.01L46.99 26.4A3.45 3.45 0 0 0 48 24c0-.884-.379-1.768-1.01-2.4"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-gitbucket.svg b/public/assets/img/svg/gitea-gitbucket.svg
index 62f603484e..b9e99724b2 100644
--- a/public/assets/img/svg/gitea-gitbucket.svg
+++ b/public/assets/img/svg/gitea-gitbucket.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 316 329" class="svg gitea-gitbucket" width="16" height="16" aria-hidden="true"><path d="M123 21.1c-44.8 2.8-84 12.8-97.1 24.6-5 4.5-5 7.1 0 11.6C41.7 71.5 96.6 82.9 150 83h10.6l5.4-5.6c11.8-12.1 21.3-12.4 32.6-1.2l5.2 5 13.3-1.7c33.8-4.2 61.5-12.7 71.8-22 5.3-4.8 5.3-7.2 0-12-10.1-9.1-39.1-18.1-70.4-21.9-28.3-3.4-65.6-4.4-95.5-2.5M23.2 80.6c.4 1.6 7 42.9 14.8 91.9 7.9 49 14.7 89.5 15.2 90.2 1.7 2.1 25.8 11.4 41.6 15.9 13 3.7 35.1 8.4 40 8.4.6 0 1.2-.6 1.2-1.3 0-.6-17.4-18.5-38.6-39.7C57.9 206.6 55 203.2 55 196s3-10.7 38.3-45.9c30.1-30 34.8-34.3 36.6-33.5 1.1.5 8.7 7.4 17 15.2l15.1 14.4v5.9c0 7.3 2.4 12.4 7.7 16.7l3.8 3v61.8l-3.8 3.4c-10.2 8.9-10.2 22.9-.1 30.7 3.1 2.3 4.9 2.8 10.8 3.1 8.2.4 11.5-1.1 16.2-7.3 2.2-3 2.9-5.1 3.2-10 .4-6.5-.2-8.3-5.3-15.4l-2.5-3.4v-26.6c0-26.7.3-31.1 2.3-31.1.5 0 5.4 4.4 10.9 9.7 9.6 9.5 9.9 10 10.8 15.7 1.7 10.3 8.9 16.6 19 16.6 7.6 0 13.5-3.9 17.4-11.7 3.2-6.4 1.6-14.3-4.3-20.6-4.1-4.4-7.3-5.7-14.9-5.7h-6.8l-12.7-12.1c-10.7-10.1-12.7-12.6-13.2-15.7-1.2-7.2-1.6-8.2-4.7-11.7-3.9-4.5-7.7-6.5-12.2-6.5-1.9 0-4.5-.4-5.8-.9s-9.9-8.2-19.3-17l-17-16-7.1-.1c-10.6 0-36-2.7-52.4-5.5-22.8-4-38.5-8.6-57.9-17.2-1.1-.5-1.3 0-.9 2.3M278.5 83.6c-8.6 3.6-28 8.8-42.5 11.4-6.9 1.2-12.9 2.6-13.5 3.1-.6.6 9.3 11.2 27.5 29.4 15.6 15.6 28.5 28.3 28.7 28.1s1.9-15.8 3.8-34.7 3.7-35.6 4-37.2c.6-3.4-.2-3.4-8-.1M255.2 259.3c-7.8 7.8-14.2 14.6-14.2 15s.7.7 1.6.7c2.2 0 23-8.9 24.2-10.3.9-1.1 3.5-18.7 2.9-19.3-.2-.2-6.7 6.1-14.5 13.9M56 283.5c0 3.4 4 9.5 8.4 12.9 6.1 4.6 19.7 10.4 31.7 13.5 16.9 4.3 32.1 6.2 53.4 6.8l19 .5-7-7.1c-6.8-6.9-7.1-7.1-12-7.1-18.9 0-55.1-7.9-80.6-17.6C62.5 283 57 281 56.6 281c-.3 0-.6 1.1-.6 2.5M262 283.4c-5.3 2.8-25 9.7-36 12.6l-11.4 2.9-7.8 7.8c-4.2 4.2-7.6 7.9-7.4 8.1.9.8 24.4-4.1 33.4-6.9 16.4-5.3 26.7-11.4 30.8-18.5 2.4-4 3.1-7.4 1.7-7.4-.5.1-1.9.7-3.3 1.4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 316 329" class="svg gitea-gitbucket" width="16" height="16" aria-hidden="true"><path d="M123 21.1c-44.8 2.8-84 12.8-97.1 24.6-5 4.5-5 7.1 0 11.6C41.7 71.5 96.6 82.9 150 83h10.6l5.4-5.6c11.8-12.1 21.3-12.4 32.6-1.2l5.2 5 13.3-1.7c33.8-4.2 61.5-12.7 71.8-22 5.3-4.8 5.3-7.2 0-12-10.1-9.1-39.1-18.1-70.4-21.9-28.3-3.4-65.6-4.4-95.5-2.5M23.2 80.6c.4 1.6 7 42.9 14.8 91.9 7.9 49 14.7 89.5 15.2 90.2 1.7 2.1 25.8 11.4 41.6 15.9 13 3.7 35.1 8.4 40 8.4.6 0 1.2-.6 1.2-1.3 0-.6-17.4-18.5-38.6-39.7C57.9 206.6 55 203.2 55 196s3-10.7 38.3-45.9c30.1-30 34.8-34.3 36.6-33.5 1.1.5 8.7 7.4 17 15.2l15.1 14.4v5.9c0 7.3 2.4 12.4 7.7 16.7l3.8 3v61.8l-3.8 3.4c-10.2 8.9-10.2 22.9-.1 30.7 3.1 2.3 4.9 2.8 10.8 3.1 8.2.4 11.5-1.1 16.2-7.3 2.2-3 2.9-5.1 3.2-10 .4-6.5-.2-8.3-5.3-15.4l-2.5-3.4v-26.6c0-26.7.3-31.1 2.3-31.1.5 0 5.4 4.4 10.9 9.7 9.6 9.5 9.9 10 10.8 15.7 1.7 10.3 8.9 16.6 19 16.6 7.6 0 13.5-3.9 17.4-11.7 3.2-6.4 1.6-14.3-4.3-20.6-4.1-4.4-7.3-5.7-14.9-5.7h-6.8l-12.7-12.1c-10.7-10.1-12.7-12.6-13.2-15.7-1.2-7.2-1.6-8.2-4.7-11.7-3.9-4.5-7.7-6.5-12.2-6.5-1.9 0-4.5-.4-5.8-.9s-9.9-8.2-19.3-17l-17-16-7.1-.1c-10.6 0-36-2.7-52.4-5.5-22.8-4-38.5-8.6-57.9-17.2-1.1-.5-1.3 0-.9 2.3M278.5 83.6c-8.6 3.6-28 8.8-42.5 11.4-6.9 1.2-12.9 2.6-13.5 3.1-.6.6 9.3 11.2 27.5 29.4 15.6 15.6 28.5 28.3 28.7 28.1s1.9-15.8 3.8-34.7 3.7-35.6 4-37.2c.6-3.4-.2-3.4-8-.1M255.2 259.3c-7.8 7.8-14.2 14.6-14.2 15s.7.7 1.6.7c2.2 0 23-8.9 24.2-10.3.9-1.1 3.5-18.7 2.9-19.3-.2-.2-6.7 6.1-14.5 13.9M56 283.5c0 3.4 4 9.5 8.4 12.9 6.1 4.6 19.7 10.4 31.7 13.5 16.9 4.3 32.1 6.2 53.4 6.8l19 .5-7-7.1c-6.8-6.9-7.1-7.1-12-7.1-18.9 0-55.1-7.9-80.6-17.6C62.5 283 57 281 56.6 281c-.3 0-.6 1.1-.6 2.5M262 283.4c-5.3 2.8-25 9.7-36 12.6l-11.4 2.9-7.8 7.8c-4.2 4.2-7.6 7.9-7.4 8.1.9.8 24.4-4.1 33.4-6.9 16.4-5.3 26.7-11.4 30.8-18.5 2.4-4 3.1-7.4 1.7-7.4-.5.1-1.9.7-3.3 1.4"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-gitlab.svg b/public/assets/img/svg/gitea-gitlab.svg
index 03fcb0b87e..e2d708e7be 100644
--- a/public/assets/img/svg/gitea-gitlab.svg
+++ b/public/assets/img/svg/gitea-gitlab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="svg gitea-gitlab" width="16" height="16" aria-hidden="true"><path fill="#E24329" d="m31.462 12.779-.045-.115-4.35-11.35a1.14 1.14 0 0 0-.447-.541 1.16 1.16 0 0 0-1.343.071c-.187.15-.322.356-.386.587l-2.94 9.001h-11.9l-2.941-9a1.14 1.14 0 0 0-1.045-.84 1.15 1.15 0 0 0-1.13.72L.579 12.68l-.045.113a8.09 8.09 0 0 0 2.68 9.34l.016.012.038.03 6.635 4.967 3.28 2.484 1.994 1.51a1.35 1.35 0 0 0 1.627 0l1.994-1.51 3.282-2.484 6.673-4.997.018-.013a8.09 8.09 0 0 0 2.69-9.352Z"/><path fill="#FC6D26" d="m31.462 12.779-.045-.115a14.75 14.75 0 0 0-5.856 2.634l-9.553 7.24L22.1 27.14l6.673-4.997.019-.013a8.09 8.09 0 0 0 2.67-9.352Z"/><path fill="#FCA326" d="m9.908 27.14 3.275 2.485 1.994 1.51a1.35 1.35 0 0 0 1.627 0l1.994-1.51 3.282-2.484s-2.835-2.14-6.092-4.603z"/><path fill="#FC6D26" d="M6.435 15.305A14.7 14.7 0 0 0 .58 12.672l-.045.113a8.09 8.09 0 0 0 2.68 9.347l.016.012.038.03 6.635 4.967 6.105-4.603-9.573-7.233Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="svg gitea-gitlab" width="16" height="16" aria-hidden="true"><path fill="#e24329" d="m31.462 12.779-.045-.115-4.35-11.35a1.14 1.14 0 0 0-.447-.541 1.16 1.16 0 0 0-1.343.071c-.187.15-.322.356-.386.587l-2.94 9.001h-11.9l-2.941-9a1.14 1.14 0 0 0-1.045-.84 1.15 1.15 0 0 0-1.13.72L.579 12.68l-.045.113a8.09 8.09 0 0 0 2.68 9.34l.016.012.038.03 6.635 4.967 3.28 2.484 1.994 1.51a1.35 1.35 0 0 0 1.627 0l1.994-1.51 3.282-2.484 6.673-4.997.018-.013a8.09 8.09 0 0 0 2.69-9.352Z"/><path fill="#fc6d26" d="m31.462 12.779-.045-.115a14.75 14.75 0 0 0-5.856 2.634l-9.553 7.24L22.1 27.14l6.673-4.997.019-.013a8.09 8.09 0 0 0 2.67-9.352Z"/><path fill="#fca326" d="m9.908 27.14 3.275 2.485 1.994 1.51a1.35 1.35 0 0 0 1.627 0l1.994-1.51 3.282-2.484s-2.835-2.14-6.092-4.603z"/><path fill="#fc6d26" d="M6.435 15.305A14.7 14.7 0 0 0 .58 12.672l-.045.113a8.09 8.09 0 0 0 2.68 9.347l.016.012.038.03 6.635 4.967 6.105-4.603-9.573-7.233Z"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-gogs.svg b/public/assets/img/svg/gitea-gogs.svg
index 7727542b6f..c89b539a0a 100644
--- a/public/assets/img/svg/gitea-gogs.svg
+++ b/public/assets/img/svg/gitea-gogs.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67.733 67.733" class="svg gitea-gogs" width="16" height="16" aria-hidden="true"><g style="display:inline"><path d="M28.764 62.186c-.212-.03-.436-.106-.498-.17-.143-.149-.325-.78-.89-3.087-.248-1.01-.506-1.976-.574-2.146-.149-.372-.48-.586-2.138-1.376-1.849-.882-3.864-2.103-5.63-3.413l-.753-.56-2.322.68c-1.278.372-2.658.75-3.069.839l-.745.161-.352-.536c-.952-1.453-3.563-5.958-4.626-7.978l-.557-1.06.483-.591c.266-.326 1.293-1.418 2.282-2.427l1.8-1.835-.181-1.039c-.161-.925-.18-1.32-.183-3.624-.002-2.082.026-2.778.143-3.58l.146-.994-2.063-2.035c-1.532-1.51-2.104-2.127-2.22-2.393-.154-.353-.154-.361.003-.767.476-1.232 4.42-7.981 5.186-8.876l.257-.3.484.125c.267.07 1.586.437 2.93.818l2.445.691.43-.26c.236-.144.845-.565 1.352-.936 1.305-.955 2.69-1.762 4.708-2.743 1.875-.912 1.839-.883 2.124-1.683.066-.184.337-1.17.602-2.193.265-1.022.573-2.136.685-2.476.176-.534.233-.623.422-.665.484-.106 3.97-.15 7.292-.093l3.52.061.43 1.748c.51 2.069.91 3.48 1.128 3.991.174.407.008.309 2.594 1.536 1.355.643 2.654 1.424 4.307 2.59.702.497 1.338.945 1.413.996.11.075.503-.016 1.995-.464a91 91 0 0 1 3.022-.85l1.163-.295.145.192c.933 1.235 5.325 8.9 5.325 9.293 0 .334-.488.915-2.54 3.027l-1.894 1.948.158.96c.228 1.383.275 3.127.159 5.922l-.102 2.451 1.51 1.495c1.55 1.535 2.471 2.55 2.683 2.959.116.223.104.265-.329 1.131-1.29 2.583-4.51 8.106-4.924 8.445-.23.187-.907.06-3.362-.636-1.264-.358-2.428-.67-2.585-.693-.255-.038-.378.02-1.095.52-2.75 1.915-3.396 2.301-5.615 3.357-.864.41-1.587.808-1.713.941-.28.295-.5 1.01-1.142 3.71l-.508 2.141-1.894.05c-2.516.066-8.338.064-8.822-.004zm7.858-12.12c2.091-.389 5.175-1.724 6.867-2.974 1.797-1.327 4.758-4.883 4.977-5.976.047-.236.02-.268-.545-.647-.9-.603-2.188-1.377-5.078-3.05-4.184-2.421-4.523-2.676-4.524-3.398-.001-1.34-1.22-3.278-2.424-3.858-1.79-.861-3.842-.522-5.214.864-.315.318-.68.79-.821 1.058-1.356 2.595.091 5.559 3.005 6.155.886.181 1.73.074 2.913-.372l.88-.332 2.022 1.158c2.672 1.531 3.619 2.123 4.1 2.561.34.31.392.395.347.573-.077.304-.674 1.002-1.394 1.63-1.608 1.404-3.353 2.267-5.547 2.743-1.178.256-3.523.256-4.7 0-1.21-.262-1.987-.533-3.065-1.07a12.46 12.46 0 0 1-6.83-9.635c-.156-1.255-.067-3.198.201-4.38 1.025-4.512 4.41-7.971 8.972-9.169 1.369-.359 1.99-.43 3.327-.382 1.261.046 1.954.168 3.54.625.566.162 1.095.26 1.455.268.495.012.62-.018 1.01-.236 1.08-.605 1.36-1.855.603-2.693-1.318-1.458-6.683-2.214-10.374-1.462-2.483.506-5.054 1.805-6.994 3.535-2.575 2.295-4.26 4.712-5.127 7.353-.924 2.816-1.025 6.141-.275 9.11.774 3.063 2.55 5.963 4.958 8.095 2.442 2.162 5.767 3.672 8.928 4.055 1.089.132 3.735.05 4.807-.15z" style="display:inline;fill:#d75547;fill-opacity:1;fill-rule:evenodd;stroke:#428f29;stroke-width:.0190672;paint-order:markers fill stroke"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 67.725 67.725" class="svg gitea-gogs" width="16" height="16" aria-hidden="true"><g style="display:inline"><path d="M27.943 67.653c-.253-.035-.52-.127-.595-.205-.17-.176-.389-.932-1.065-3.691-.296-1.21-.605-2.364-.686-2.567-.178-.445-.575-.7-2.558-1.646-2.212-1.055-4.622-2.517-6.734-4.083l-.902-.67-2.778.812c-1.528.447-3.18.899-3.67 1.005l-.892.193-.42-.642c-1.14-1.738-4.263-7.126-5.535-9.544l-.666-1.266.578-.708c.318-.39 1.547-1.696 2.73-2.903l2.152-2.195-.216-1.243c-.192-1.107-.216-1.578-.219-4.335-.002-2.491.031-3.324.172-4.283l.175-1.19-2.47-2.434c-1.831-1.806-2.516-2.544-2.655-2.862-.184-.423-.184-.432.004-.918.57-1.473 5.287-9.547 6.203-10.617l.308-.36.58.15c.319.084 1.896.524 3.505.979l2.924.827.514-.312c.283-.171 1.011-.675 1.618-1.12 1.56-1.142 3.218-2.107 5.631-3.28 2.243-1.091 2.2-1.057 2.542-2.014.079-.22.402-1.4.72-2.623.316-1.222.685-2.555.82-2.961.21-.64.278-.747.504-.796.579-.127 4.75-.18 8.723-.111l4.21.073.515 2.09c.61 2.475 1.087 4.164 1.349 4.774.209.488.01.37 3.103 1.837 1.621.77 3.175 1.704 5.152 3.1.84.593 1.601 1.13 1.691 1.19.132.09.601-.019 2.387-.554 1.222-.367 2.849-.825 3.614-1.018l1.392-.352.173.23c1.116 1.476 6.37 10.647 6.37 11.116 0 .4-.584 1.095-3.04 3.621l-2.264 2.33.19 1.15c.272 1.654.327 3.74.188 7.083l-.121 2.932L63 41.431c1.854 1.836 2.956 3.05 3.21 3.539.139.266.124.317-.393 1.353-1.543 3.09-5.396 9.697-5.891 10.102-.274.224-1.084.07-4.022-.761-1.512-.429-2.904-.802-3.093-.83-.304-.044-.451.026-1.309.623-3.29 2.291-4.062 2.753-6.717 4.015-1.034.492-1.898.967-2.05 1.127-.334.353-.598 1.209-1.365 4.438l-.608 2.561-2.265.06c-3.01.079-9.974.076-10.554-.005zm9.4-14.499c2.502-.465 6.191-2.062 8.215-3.557 2.15-1.588 5.692-5.842 5.953-7.15.057-.28.024-.32-.651-.773-1.076-.722-2.617-1.647-6.075-3.648-5.005-2.897-5.411-3.202-5.412-4.065-.001-1.603-1.458-3.921-2.9-4.615-2.141-1.03-4.595-.624-6.236 1.034-.377.38-.815.944-.983 1.266-1.621 3.103.11 6.649 3.595 7.362 1.06.217 2.07.088 3.485-.445l1.053-.397 2.418 1.386c3.197 1.831 4.33 2.538 4.906 3.063.407.37.468.472.414.685-.092.364-.806 1.199-1.668 1.95-1.924 1.68-4.01 2.711-6.635 3.281-1.41.306-4.215.306-5.622.001-1.449-.315-2.378-.639-3.666-1.28a14.9 14.9 0 0 1-8.17-11.527c-.188-1.501-.081-3.825.24-5.24 1.225-5.397 5.274-9.535 10.732-10.967 1.637-.43 2.38-.515 3.98-.457 1.509.055 2.338.2 4.235.747.677.194 1.31.311 1.74.321.593.014.743-.021 1.208-.282 1.292-.725 1.626-2.22.721-3.221-1.576-1.745-7.993-2.65-12.41-1.75-2.97.606-6.045 2.16-8.365 4.229-3.08 2.746-5.096 5.636-6.133 8.796-1.107 3.368-1.227 7.346-.33 10.896.926 3.665 3.05 7.134 5.931 9.685 2.92 2.586 6.899 4.393 10.68 4.851 1.303.158 4.467.06 5.75-.179z" style="display:inline;fill:#d75547;fill-opacity:1;fill-rule:evenodd;stroke:#428f29;stroke-width:.0190659;paint-order:markers fill stroke"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-google.svg b/public/assets/img/svg/gitea-google.svg
index 7dd2622df6..26ee04cb64 100644
--- a/public/assets/img/svg/gitea-google.svg
+++ b/public/assets/img/svg/gitea-google.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="gitea-google__svg gitea-google__gitea-google svg gitea-google" viewBox="0 0 24 24" width="16" height="16"><path fill="#4285F4" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09"/><path fill="#34A853" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23"/><path fill="#FBBC05" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22z"/><path fill="#EA4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53"/><path fill="none" d="M1 1h22v22H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" class="gitea-google__svg gitea-google__gitea-google svg gitea-google" viewBox="0 0 24 24" width="16" height="16"><path fill="#4285f4" d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09"/><path fill="#34a853" d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23"/><path fill="#fbbc05" d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22z"/><path fill="#ea4335" d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53"/><path fill="none" d="M1 1h22v22H1z"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-maven.svg b/public/assets/img/svg/gitea-maven.svg
index 320d01a234..f6ece7dc28 100644
--- a/public/assets/img/svg/gitea-maven.svg
+++ b/public/assets/img/svg/gitea-maven.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2392.5 4226.6" class="svg gitea-maven" width="16" height="16" aria-hidden="true"><linearGradient id="gitea-maven__a" x1="-5167.1" x2="-4570.1" y1="697.55" y2="1395.6" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#F69923"/><stop offset=".312" stop-color="#F79A23"/><stop offset=".838" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__a)" d="M1798.9 20.1C1732.6 59.2 1622.5 170 1491 330.5l120.8 228c84.8-121.3 170.9-230.4 257.8-323.6 6.7-7.4 10.2-10.9 10.2-10.9-3.4 3.6-6.8 7.3-10.2 10.9-28.1 31-113.4 130.5-242.1 328.1 123.9-6.2 314.3-31.5 469.6-58.1 46.2-258.8-45.3-377.3-45.3-377.3S1935.5-60.6 1798.9 20.1"/><path fill="none" d="M1594.4 1320.7c.9-.2 1.8-.3 2.7-.5l-17.4 1.9c-1.1.5-2 1-3.1 1.4 6-.9 11.9-1.9 17.8-2.8m-123.3 408.4c-9.9 2.2-20 3.9-30.2 5.4 10.2-1.5 20.3-3.3 30.2-5.4m-838 916.1c1.3-3.4 2.6-6.8 3.8-10.2 26.6-70.2 52.9-138.4 79-204.9 29.3-74.6 58.2-146.8 86.8-216.8 30.1-73.8 59.8-145.1 89.1-214 30.7-72.3 61-141.9 90.7-208.9 24.2-54.5 48-107.3 71.5-158.4 7.8-17 15.6-33.9 23.4-50.6 15.4-33.1 30.7-65.6 45.7-97.3 13.9-29.3 27.7-57.9 41.4-86 4.5-9.4 9.1-18.6 13.6-27.9.7-1.5 1.5-3 2.2-4.5l-14.8 1.6-11.8-23.2c-1.1 2.3-2.3 4.5-3.5 6.8q-31.8 63.15-63 127.5c-12 24.8-24 49.7-35.9 74.7-33 69.3-65.5 139.2-97.4 209.6-32.3 71.1-63.9 142.6-94.9 214.2-30.5 70.3-60.3 140.7-89.6 210.9-29.2 70.1-57.7 140-85.6 209.4-29.1 72.5-57.4 144.3-84.8 215.3-6.2 16-12.4 32-18.5 48-22 57.3-43.4 113.8-64.3 169.6l18.6 36.7 16.6-1.8c.6-1.7 1.2-3.4 1.8-5 26.9-73.5 53.5-145.1 79.9-214.8m800.1-909.5c.1 0 .1-.1.2-.1 0 0-.1 0-.2.1"/><path fill="#BE202E" d="M1393.2 1934.8c-15.4 2.8-31.3 5.5-47.6 8.3-.1 0-.2.1-.3.1 8.2-1.2 16.3-2.4 24.3-3.8s15.8-2.9 23.6-4.6"/><path fill="#BE202E" d="M1393.2 1934.8c-15.4 2.8-31.3 5.5-47.6 8.3-.1 0-.2.1-.3.1 8.2-1.2 16.3-2.4 24.3-3.8s15.8-2.9 23.6-4.6" opacity=".35"/><path fill="#BE202E" d="M1433.6 1735.5s-.1 0-.1.1c-.1 0-.1.1-.2.1 2.6-.3 5.1-.8 7.6-1.1 10.3-1.5 20.4-3.3 30.2-5.4-12.3 2-24.8 4.2-37.5 6.3"/><path fill="#BE202E" d="M1433.6 1735.5s-.1 0-.1.1c-.1 0-.1.1-.2.1 2.6-.3 5.1-.8 7.6-1.1 10.3-1.5 20.4-3.3 30.2-5.4-12.3 2-24.8 4.2-37.5 6.3" opacity=".35"/><linearGradient id="gitea-maven__b" x1="-9585.3" x2="-5326.2" y1="620.5" y2="620.5" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__b)" d="M1255.7 1147.6c36.7-68.6 73.9-135.7 111.5-201 39-67.8 78.5-133.6 118.4-197 2.3-3.7 4.7-7.5 7-11.3 39.4-62.4 79.2-122.4 119.3-179.8l-120.8-228c-9.1 11.1-18.2 22.4-27.5 33.9-34.8 43.4-71 90.1-108.1 139.6-41.8 55.8-84.8 115.4-128.5 177.9-40.3 57.8-81.2 118.3-122.1 180.9-34.8 53.3-69.8 108.2-104.5 164.5l-3.9 6.3 157.2 310.5c33.6-66.5 67.6-132.1 102-196.5"/><linearGradient id="gitea-maven__c" x1="-9071.2" x2="-6533.2" y1="1047.7" y2="1047.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282662"/><stop offset=".095" stop-color="#662E8D"/><stop offset=".788" stop-color="#9F2064"/><stop offset=".949" stop-color="#CD2032"/></linearGradient><path fill="url(#gitea-maven__c)" d="M539.7 2897.1c-20.8 57.2-41.7 115.4-62.7 174.9-.3.9-.6 1.7-.9 2.6-3 8.4-5.9 16.8-8.9 25.2-14.1 40.1-26.4 76.2-54.5 158.3 46.3 21.1 83.5 76.7 118.7 139.8-3.7-65.3-30.8-126.7-82.1-174.2 228.3 10.3 425-47.4 526.7-214.3 9.1-14.9 17.4-30.5 24.9-47.2-46.2 58.6-103.5 83.5-211.4 77.4-.2.1-.5.2-.7.3.2-.1.5-.2.7-.3 158.8-71.1 238.5-139.3 308.9-252.4 16.7-26.8 32.9-56.1 49.5-88.6-138.9 142.6-299.8 183.2-469.3 152.4l-127.1 13.9c-4 10.7-7.9 21.4-11.8 32.2"/><linearGradient id="gitea-maven__d" x1="-9346.1" x2="-5087" y1="580.82" y2="580.82" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__d)" d="M599 2612.4c27.5-71 55.8-142.8 84.8-215.3 27.8-69.4 56.4-139.2 85.6-209.4s59.1-140.5 89.6-210.9c31-71.6 62.7-143.1 94.9-214.2 31.9-70.3 64.4-140.3 97.4-209.6 11.9-25 23.9-49.9 35.9-74.7q31.2-64.35 63-127.5c1.1-2.3 2.3-4.5 3.5-6.8l-157.2-310.5c-2.6 4.2-5.1 8.4-7.7 12.6-36.6 59.8-73.1 121-108.9 183.5-36.2 63.1-71.7 127.4-106.4 192.6-29.3 55-57.9 110.5-85.7 166.5-5.6 11.4-11.1 22.6-16.6 33.9-34.3 70.5-65.2 138.6-93.2 204.1-31.7 74.2-59.6 145.1-84 212.3-16.1 44.2-30.7 86.9-44.1 127.9-11 35-21.5 70.1-31.4 105-23.5 82.3-43.7 164.4-60.3 246.2l158 311.9c20.9-55.8 42.3-112.3 64.3-169.6 6.1-15.9 12.3-32 18.5-48"/><linearGradient id="gitea-maven__e" x1="-9035.5" x2="-6797.2" y1="638.44" y2="638.44" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282662"/><stop offset=".095" stop-color="#662E8D"/><stop offset=".788" stop-color="#9F2064"/><stop offset=".949" stop-color="#CD2032"/></linearGradient><path fill="url(#gitea-maven__e)" d="M356.1 2529.2c-19.8 99.8-33.9 199.2-41 298-.2 3.5-.6 6.9-.8 10.4-49.3-79-181.3-156.1-181-155.4 94.5 137 166.2 273 176.9 406.5-50.6 10.4-119.9-4.6-200-34.1 83.5 76.7 146.2 97.9 170.6 103.6-76.7 4.8-156.6 57.5-237.1 118.2 117.7-48 212.8-67 280.9-51.6-108 305.8-216.3 643.4-324.6 1001.8 33.2-9.8 53-32.1 64.1-62.3 19.3-64.9 147.4-490.7 348.1-1050.4 5.7-15.9 11.5-31.9 17.3-48 1.6-4.5 3.3-9 4.9-13.4 21.2-58.7 43.2-118.6 65.9-179.7 5.2-13.9 10.4-27.8 15.6-41.8.1-.3.2-.6.3-.8l-157.8-311.8c-.7 3.5-1.6 7.1-2.3 10.8"/><linearGradient id="gitea-maven__f" x1="-9346.1" x2="-5087" y1="1021.6" y2="1021.6" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__f)" d="M1178.1 1370.3c-4.5 9.2-9 18.5-13.6 27.9-13.6 28.1-27.4 56.7-41.4 86-15.1 31.7-30.3 64.1-45.7 97.3-7.8 16.7-15.5 33.5-23.4 50.6-23.5 51.1-47.3 103.9-71.5 158.4-29.7 67-60 136.6-90.7 208.9-29.3 68.9-59 140.2-89.1 214-28.6 70-57.5 142.3-86.8 216.8-26.1 66.5-52.4 134.7-79 204.9-1.3 3.4-2.6 6.8-3.8 10.2-26.4 69.7-53 141.3-79.8 214.7-.6 1.7-1.2 3.4-1.8 5l127.1-13.9c-2.5-.5-5.1-.8-7.6-1.3 152-18.9 354-132.5 484.6-272.7 60.2-64.6 114.8-140.8 165.3-230 37.6-66.4 72.9-140 106.5-221.5 29.4-71.2 57.6-148.3 84.8-231.9-34.9 18.4-74.9 31.9-119 41.3-7.7 1.6-15.6 3.2-23.6 4.6s-16.1 2.7-24.3 3.8c.1 0 .2-.1.3-.1 141.7-54.5 231.1-159.8 296.1-288.7-37.3 25.4-97.9 58.7-170.5 74.7-9.9 2.2-20 3.9-30.2 5.4-2.6.4-5.1.8-7.6 1.1.1 0 .1-.1.2-.1 0 0 .1 0 .1-.1 49.2-20.6 90.7-43.6 126.7-70.8 7.7-5.8 15.2-11.8 22.4-18.1 11-9.5 21.4-19.5 31.4-30 6.4-6.7 12.6-13.6 18.6-20.8 14.1-16.8 27.3-34.9 39.7-54.6 3.8-6 7.5-12.1 11.2-18.4 4.7-9.1 9.2-18 13.6-26.8 19.8-39.8 35.6-75.3 48.2-106.5 6.3-15.6 11.8-30 16.5-43.4 1.9-5.3 3.7-10.5 5.4-15.5 5-15 9.1-28.3 12.3-40 4.8-17.5 7.7-31.4 9.3-41.5-4.8 3.8-10.3 7.6-16.5 11.3-42.8 25.6-116.2 48.8-175.4 59.7l116.7-12.8-116.7 12.8c-.9.2-1.8.3-2.7.5-5.9 1-11.9 1.9-17.9 2.9 1.1-.5 2-1 3.1-1.4l-399.3 43.8c-.7 1.4-1.4 2.8-2.2 4.3"/><linearGradient id="gitea-maven__g" x1="-9610.3" x2="-5351.2" y1="999.73" y2="999.73" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__g)" d="M1627.6 563.1c-35.5 54.5-74.3 116.4-116 186.5-2.2 3.6-4.4 7.4-6.6 11.1-36 60.7-74.3 127.3-114.5 200.3-34.8 63-71 130.6-108.6 203.3-32.8 63.3-66.7 130.5-101.5 201.6l399.3-43.8c116.3-53.5 168.3-101.9 218.8-171.9 13.4-19.3 26.9-39.5 40.3-60.4 41-64 81.2-134.5 117.2-204.6 34.7-67.7 65.3-134.8 88.8-195.3 14.9-38.5 26.9-74.3 35.2-105.7 7.3-27.7 13-54 17.4-79.1-155.5 26.5-345.9 51.9-469.8 58"/><path fill="#BE202E" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8"/><path fill="#BE202E" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8" opacity=".35"/><linearGradient id="gitea-maven__h" x1="-9346.1" x2="-5087" y1="1152.7" y2="1152.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__h)" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8"/><path fill="#BE202E" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1"/><path fill="#BE202E" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1" opacity=".35"/><linearGradient id="gitea-maven__i" x1="-9346.1" x2="-5087" y1="1137.7" y2="1137.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__i)" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1"/><path fill="#BE202E" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1"/><path fill="#BE202E" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1" opacity=".35"/><linearGradient id="gitea-maven__j" x1="-6953.4" x2="-6012" y1="1134.7" y2="1134.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9E2064"/><stop offset=".63" stop-color="#C92037"/><stop offset=".751" stop-color="#CD2335"/><stop offset="1" stop-color="#E97826"/></linearGradient><path fill="url(#gitea-maven__j)" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2392.5 4226.6" class="svg gitea-maven" width="16" height="16" aria-hidden="true"><linearGradient id="gitea-maven__a" x1="-5167.1" x2="-4570.1" y1="697.55" y2="1395.6" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f69923"/><stop offset=".312" stop-color="#f79a23"/><stop offset=".838" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__a)" d="M1798.9 20.1C1732.6 59.2 1622.5 170 1491 330.5l120.8 228c84.8-121.3 170.9-230.4 257.8-323.6 6.7-7.4 10.2-10.9 10.2-10.9-3.4 3.6-6.8 7.3-10.2 10.9-28.1 31-113.4 130.5-242.1 328.1 123.9-6.2 314.3-31.5 469.6-58.1 46.2-258.8-45.3-377.3-45.3-377.3S1935.5-60.6 1798.9 20.1"/><path fill="none" d="M1594.4 1320.7c.9-.2 1.8-.3 2.7-.5l-17.4 1.9c-1.1.5-2 1-3.1 1.4 6-.9 11.9-1.9 17.8-2.8m-123.3 408.4c-9.9 2.2-20 3.9-30.2 5.4 10.2-1.5 20.3-3.3 30.2-5.4m-838 916.1c1.3-3.4 2.6-6.8 3.8-10.2 26.6-70.2 52.9-138.4 79-204.9 29.3-74.6 58.2-146.8 86.8-216.8 30.1-73.8 59.8-145.1 89.1-214 30.7-72.3 61-141.9 90.7-208.9 24.2-54.5 48-107.3 71.5-158.4 7.8-17 15.6-33.9 23.4-50.6 15.4-33.1 30.7-65.6 45.7-97.3 13.9-29.3 27.7-57.9 41.4-86 4.5-9.4 9.1-18.6 13.6-27.9.7-1.5 1.5-3 2.2-4.5l-14.8 1.6-11.8-23.2c-1.1 2.3-2.3 4.5-3.5 6.8q-31.8 63.15-63 127.5c-12 24.8-24 49.7-35.9 74.7-33 69.3-65.5 139.2-97.4 209.6-32.3 71.1-63.9 142.6-94.9 214.2-30.5 70.3-60.3 140.7-89.6 210.9-29.2 70.1-57.7 140-85.6 209.4-29.1 72.5-57.4 144.3-84.8 215.3-6.2 16-12.4 32-18.5 48-22 57.3-43.4 113.8-64.3 169.6l18.6 36.7 16.6-1.8c.6-1.7 1.2-3.4 1.8-5 26.9-73.5 53.5-145.1 79.9-214.8m800.1-909.5c.1 0 .1-.1.2-.1 0 0-.1 0-.2.1"/><path fill="#be202e" d="M1393.2 1934.8c-15.4 2.8-31.3 5.5-47.6 8.3-.1 0-.2.1-.3.1 8.2-1.2 16.3-2.4 24.3-3.8s15.8-2.9 23.6-4.6"/><path fill="#be202e" d="M1393.2 1934.8c-15.4 2.8-31.3 5.5-47.6 8.3-.1 0-.2.1-.3.1 8.2-1.2 16.3-2.4 24.3-3.8s15.8-2.9 23.6-4.6" opacity=".35"/><path fill="#be202e" d="M1433.6 1735.5s-.1 0-.1.1c-.1 0-.1.1-.2.1 2.6-.3 5.1-.8 7.6-1.1 10.3-1.5 20.4-3.3 30.2-5.4-12.3 2-24.8 4.2-37.5 6.3"/><path fill="#be202e" d="M1433.6 1735.5s-.1 0-.1.1c-.1 0-.1.1-.2.1 2.6-.3 5.1-.8 7.6-1.1 10.3-1.5 20.4-3.3 30.2-5.4-12.3 2-24.8 4.2-37.5 6.3" opacity=".35"/><linearGradient id="gitea-maven__b" x1="-9585.3" x2="-5326.2" y1="620.5" y2="620.5" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__b)" d="M1255.7 1147.6c36.7-68.6 73.9-135.7 111.5-201 39-67.8 78.5-133.6 118.4-197 2.3-3.7 4.7-7.5 7-11.3 39.4-62.4 79.2-122.4 119.3-179.8l-120.8-228c-9.1 11.1-18.2 22.4-27.5 33.9-34.8 43.4-71 90.1-108.1 139.6-41.8 55.8-84.8 115.4-128.5 177.9-40.3 57.8-81.2 118.3-122.1 180.9-34.8 53.3-69.8 108.2-104.5 164.5l-3.9 6.3 157.2 310.5c33.6-66.5 67.6-132.1 102-196.5"/><linearGradient id="gitea-maven__c" x1="-9071.2" x2="-6533.2" y1="1047.7" y2="1047.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282662"/><stop offset=".095" stop-color="#662e8d"/><stop offset=".788" stop-color="#9f2064"/><stop offset=".949" stop-color="#cd2032"/></linearGradient><path fill="url(#gitea-maven__c)" d="M539.7 2897.1c-20.8 57.2-41.7 115.4-62.7 174.9-.3.9-.6 1.7-.9 2.6-3 8.4-5.9 16.8-8.9 25.2-14.1 40.1-26.4 76.2-54.5 158.3 46.3 21.1 83.5 76.7 118.7 139.8-3.7-65.3-30.8-126.7-82.1-174.2 228.3 10.3 425-47.4 526.7-214.3 9.1-14.9 17.4-30.5 24.9-47.2-46.2 58.6-103.5 83.5-211.4 77.4-.2.1-.5.2-.7.3.2-.1.5-.2.7-.3 158.8-71.1 238.5-139.3 308.9-252.4 16.7-26.8 32.9-56.1 49.5-88.6-138.9 142.6-299.8 183.2-469.3 152.4l-127.1 13.9c-4 10.7-7.9 21.4-11.8 32.2"/><linearGradient id="gitea-maven__d" x1="-9346.1" x2="-5087" y1="580.82" y2="580.82" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__d)" d="M599 2612.4c27.5-71 55.8-142.8 84.8-215.3 27.8-69.4 56.4-139.2 85.6-209.4s59.1-140.5 89.6-210.9c31-71.6 62.7-143.1 94.9-214.2 31.9-70.3 64.4-140.3 97.4-209.6 11.9-25 23.9-49.9 35.9-74.7q31.2-64.35 63-127.5c1.1-2.3 2.3-4.5 3.5-6.8l-157.2-310.5c-2.6 4.2-5.1 8.4-7.7 12.6-36.6 59.8-73.1 121-108.9 183.5-36.2 63.1-71.7 127.4-106.4 192.6-29.3 55-57.9 110.5-85.7 166.5-5.6 11.4-11.1 22.6-16.6 33.9-34.3 70.5-65.2 138.6-93.2 204.1-31.7 74.2-59.6 145.1-84 212.3-16.1 44.2-30.7 86.9-44.1 127.9-11 35-21.5 70.1-31.4 105-23.5 82.3-43.7 164.4-60.3 246.2l158 311.9c20.9-55.8 42.3-112.3 64.3-169.6 6.1-15.9 12.3-32 18.5-48"/><linearGradient id="gitea-maven__e" x1="-9035.5" x2="-6797.2" y1="638.44" y2="638.44" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#282662"/><stop offset=".095" stop-color="#662e8d"/><stop offset=".788" stop-color="#9f2064"/><stop offset=".949" stop-color="#cd2032"/></linearGradient><path fill="url(#gitea-maven__e)" d="M356.1 2529.2c-19.8 99.8-33.9 199.2-41 298-.2 3.5-.6 6.9-.8 10.4-49.3-79-181.3-156.1-181-155.4 94.5 137 166.2 273 176.9 406.5-50.6 10.4-119.9-4.6-200-34.1 83.5 76.7 146.2 97.9 170.6 103.6-76.7 4.8-156.6 57.5-237.1 118.2 117.7-48 212.8-67 280.9-51.6-108 305.8-216.3 643.4-324.6 1001.8 33.2-9.8 53-32.1 64.1-62.3 19.3-64.9 147.4-490.7 348.1-1050.4 5.7-15.9 11.5-31.9 17.3-48 1.6-4.5 3.3-9 4.9-13.4 21.2-58.7 43.2-118.6 65.9-179.7 5.2-13.9 10.4-27.8 15.6-41.8.1-.3.2-.6.3-.8l-157.8-311.8c-.7 3.5-1.6 7.1-2.3 10.8"/><linearGradient id="gitea-maven__f" x1="-9346.1" x2="-5087" y1="1021.6" y2="1021.6" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__f)" d="M1178.1 1370.3c-4.5 9.2-9 18.5-13.6 27.9-13.6 28.1-27.4 56.7-41.4 86-15.1 31.7-30.3 64.1-45.7 97.3-7.8 16.7-15.5 33.5-23.4 50.6-23.5 51.1-47.3 103.9-71.5 158.4-29.7 67-60 136.6-90.7 208.9-29.3 68.9-59 140.2-89.1 214-28.6 70-57.5 142.3-86.8 216.8-26.1 66.5-52.4 134.7-79 204.9-1.3 3.4-2.6 6.8-3.8 10.2-26.4 69.7-53 141.3-79.8 214.7-.6 1.7-1.2 3.4-1.8 5l127.1-13.9c-2.5-.5-5.1-.8-7.6-1.3 152-18.9 354-132.5 484.6-272.7 60.2-64.6 114.8-140.8 165.3-230 37.6-66.4 72.9-140 106.5-221.5 29.4-71.2 57.6-148.3 84.8-231.9-34.9 18.4-74.9 31.9-119 41.3-7.7 1.6-15.6 3.2-23.6 4.6s-16.1 2.7-24.3 3.8c.1 0 .2-.1.3-.1 141.7-54.5 231.1-159.8 296.1-288.7-37.3 25.4-97.9 58.7-170.5 74.7-9.9 2.2-20 3.9-30.2 5.4-2.6.4-5.1.8-7.6 1.1.1 0 .1-.1.2-.1 0 0 .1 0 .1-.1 49.2-20.6 90.7-43.6 126.7-70.8 7.7-5.8 15.2-11.8 22.4-18.1 11-9.5 21.4-19.5 31.4-30 6.4-6.7 12.6-13.6 18.6-20.8 14.1-16.8 27.3-34.9 39.7-54.6 3.8-6 7.5-12.1 11.2-18.4 4.7-9.1 9.2-18 13.6-26.8 19.8-39.8 35.6-75.3 48.2-106.5 6.3-15.6 11.8-30 16.5-43.4 1.9-5.3 3.7-10.5 5.4-15.5 5-15 9.1-28.3 12.3-40 4.8-17.5 7.7-31.4 9.3-41.5-4.8 3.8-10.3 7.6-16.5 11.3-42.8 25.6-116.2 48.8-175.4 59.7l116.7-12.8-116.7 12.8c-.9.2-1.8.3-2.7.5-5.9 1-11.9 1.9-17.9 2.9 1.1-.5 2-1 3.1-1.4l-399.3 43.8c-.7 1.4-1.4 2.8-2.2 4.3"/><linearGradient id="gitea-maven__g" x1="-9610.3" x2="-5351.2" y1="999.73" y2="999.73" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__g)" d="M1627.6 563.1c-35.5 54.5-74.3 116.4-116 186.5-2.2 3.6-4.4 7.4-6.6 11.1-36 60.7-74.3 127.3-114.5 200.3-34.8 63-71 130.6-108.6 203.3-32.8 63.3-66.7 130.5-101.5 201.6l399.3-43.8c116.3-53.5 168.3-101.9 218.8-171.9 13.4-19.3 26.9-39.5 40.3-60.4 41-64 81.2-134.5 117.2-204.6 34.7-67.7 65.3-134.8 88.8-195.3 14.9-38.5 26.9-74.3 35.2-105.7 7.3-27.7 13-54 17.4-79.1-155.5 26.5-345.9 51.9-469.8 58"/><path fill="#be202e" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8"/><path fill="#be202e" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8" opacity=".35"/><linearGradient id="gitea-maven__h" x1="-9346.1" x2="-5087" y1="1152.7" y2="1152.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__h)" d="M1369.6 1939.4c-8 1.4-16.1 2.7-24.3 3.8 8.2-1.1 16.3-2.4 24.3-3.8"/><path fill="#be202e" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1"/><path fill="#be202e" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1" opacity=".35"/><linearGradient id="gitea-maven__i" x1="-9346.1" x2="-5087" y1="1137.7" y2="1137.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__i)" d="M1433.2 1735.7c2.6-.3 5.1-.8 7.6-1.1-2.5.3-5 .7-7.6 1.1"/><path fill="#be202e" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1"/><path fill="#be202e" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1" opacity=".35"/><linearGradient id="gitea-maven__j" x1="-6953.4" x2="-6012" y1="1134.7" y2="1134.7" gradientTransform="rotate(-65.001 -2052.931 -4777.847)" gradientUnits="userSpaceOnUse"><stop offset=".323" stop-color="#9e2064"/><stop offset=".63" stop-color="#c92037"/><stop offset=".751" stop-color="#cd2335"/><stop offset="1" stop-color="#e97826"/></linearGradient><path fill="url(#gitea-maven__j)" d="M1433.5 1735.6s.1 0 .1-.1c0 0-.1 0-.1.1"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-microsoftonline.svg b/public/assets/img/svg/gitea-microsoftonline.svg
index f2ce13ac22..c143eccbb6 100644
--- a/public/assets/img/svg/gitea-microsoftonline.svg
+++ b/public/assets/img/svg/gitea-microsoftonline.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" class="svg gitea-microsoftonline" width="16" height="16" aria-hidden="true"><path fill="url(#gitea-microsoftonline__a)" d="m20.084 3.026-.224.136a8 8 0 0 0-1.009.722l.648-.456H25L26 11l-5 5-5 3.475v4.008a8 8 0 0 0 3.857 6.844l5.264 3.186L14 40h-2.145l-3.998-2.42A8 8 0 0 1 4 30.737V17.26a8 8 0 0 1 3.86-6.846l12-7.258q.111-.068.224-.131Z"/><path fill="url(#gitea-microsoftonline__b)" d="m20.084 3.026-.224.136a8 8 0 0 0-1.009.722l.648-.456H25L26 11l-5 5-5 3.475v4.008a8 8 0 0 0 3.857 6.844l5.264 3.186L14 40h-2.145l-3.998-2.42A8 8 0 0 1 4 30.737V17.26a8 8 0 0 1 3.86-6.846l12-7.258q.111-.068.224-.131Z"/><path fill="url(#gitea-microsoftonline__c)" d="M32 19v4.48a8 8 0 0 1-3.857 6.844l-12 7.264a8 8 0 0 1-8.008.16l11.722 7.096a8 8 0 0 0 8.286 0l12-7.264A8 8 0 0 0 44 30.736V27.5L43 26z"/><path fill="url(#gitea-microsoftonline__d)" d="M32 19v4.48a8 8 0 0 1-3.857 6.844l-12 7.264a8 8 0 0 1-8.008.16l11.722 7.096a8 8 0 0 0 8.286 0l12-7.264A8 8 0 0 0 44 30.736V27.5L43 26z"/><path fill="url(#gitea-microsoftonline__e)" d="m40.14 10.415-12-7.258a8 8 0 0 0-8.042-.139l-.238.144A8 8 0 0 0 16 10.008v9.483l3.86-2.334a8 8 0 0 1 8.28 0l12 7.258A8 8 0 0 1 43.997 31q.004-.132.004-.263V17.26a8 8 0 0 0-3.86-6.845Z"/><path fill="url(#gitea-microsoftonline__f)" d="m40.14 10.415-12-7.258a8 8 0 0 0-8.042-.139l-.238.144A8 8 0 0 0 16 10.008v9.483l3.86-2.334a8 8 0 0 1 8.28 0l12 7.258A8 8 0 0 1 43.997 31q.004-.132.004-.263V17.26a8 8 0 0 0-3.86-6.845Z"/><path fill="url(#gitea-microsoftonline__g)" d="M4.004 30.998"/><path fill="url(#gitea-microsoftonline__h)" d="M4.004 30.998"/><defs><radialGradient id="gitea-microsoftonline__a" cx="0" cy="0" r="1" gradientTransform="rotate(110.528 5.021 11.358)scale(33.3657 58.1966)" gradientUnits="userSpaceOnUse"><stop offset=".064" stop-color="#AE7FE2"/><stop offset="1" stop-color="#0078D4"/></radialGradient><radialGradient id="gitea-microsoftonline__c" cx="0" cy="0" r="1" gradientTransform="matrix(30.7198 -4.51832 2.98465 20.29248 10.43 36.351)" gradientUnits="userSpaceOnUse"><stop offset=".134" stop-color="#D59DFF"/><stop offset="1" stop-color="#5E438F"/></radialGradient><radialGradient id="gitea-microsoftonline__e" cx="0" cy="0" r="1" gradientTransform="matrix(-24.1583 -6.12555 10.3118 -40.66824 41.055 26.504)" gradientUnits="userSpaceOnUse"><stop offset=".058" stop-color="#50E6FF"/><stop offset="1" stop-color="#436DCD"/></radialGradient><radialGradient id="gitea-microsoftonline__g" cx="0" cy="0" r="1" gradientTransform="matrix(-24.1583 -6.12555 10.3118 -40.66824 41.055 26.504)" gradientUnits="userSpaceOnUse"><stop offset=".058" stop-color="#50E6FF"/><stop offset="1" stop-color="#436DCD"/></radialGradient><linearGradient id="gitea-microsoftonline__b" x1="17.512" x2="12.751" y1="37.868" y2="29.635" gradientUnits="userSpaceOnUse"><stop stop-color="#114A8B"/><stop offset="1" stop-color="#0078D4" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__d" x1="40.357" x2="35.255" y1="25.377" y2="32.692" gradientUnits="userSpaceOnUse"><stop stop-color="#493474"/><stop offset="1" stop-color="#8C66BA" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__f" x1="16.976" x2="24.487" y1="3.057" y2="3.057" gradientUnits="userSpaceOnUse"><stop stop-color="#2D3F80"/><stop offset="1" stop-color="#436DCD" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__h" x1="16.976" x2="24.487" y1="3.057" y2="3.057" gradientUnits="userSpaceOnUse"><stop stop-color="#2D3F80"/><stop offset="1" stop-color="#436DCD" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" class="svg gitea-microsoftonline" width="16" height="16" aria-hidden="true"><path fill="url(#gitea-microsoftonline__a)" d="m20.084 3.026-.224.136a8 8 0 0 0-1.009.722l.648-.456H25L26 11l-5 5-5 3.475v4.008a8 8 0 0 0 3.857 6.844l5.264 3.186L14 40h-2.145l-3.998-2.42A8 8 0 0 1 4 30.737V17.26a8 8 0 0 1 3.86-6.846l12-7.258q.111-.068.224-.131Z"/><path fill="url(#gitea-microsoftonline__b)" d="m20.084 3.026-.224.136a8 8 0 0 0-1.009.722l.648-.456H25L26 11l-5 5-5 3.475v4.008a8 8 0 0 0 3.857 6.844l5.264 3.186L14 40h-2.145l-3.998-2.42A8 8 0 0 1 4 30.737V17.26a8 8 0 0 1 3.86-6.846l12-7.258q.111-.068.224-.131Z"/><path fill="url(#gitea-microsoftonline__c)" d="M32 19v4.48a8 8 0 0 1-3.857 6.844l-12 7.264a8 8 0 0 1-8.008.16l11.722 7.096a8 8 0 0 0 8.286 0l12-7.264A8 8 0 0 0 44 30.736V27.5L43 26z"/><path fill="url(#gitea-microsoftonline__d)" d="M32 19v4.48a8 8 0 0 1-3.857 6.844l-12 7.264a8 8 0 0 1-8.008.16l11.722 7.096a8 8 0 0 0 8.286 0l12-7.264A8 8 0 0 0 44 30.736V27.5L43 26z"/><path fill="url(#gitea-microsoftonline__e)" d="m40.14 10.415-12-7.258a8 8 0 0 0-8.042-.139l-.238.144A8 8 0 0 0 16 10.008v9.483l3.86-2.334a8 8 0 0 1 8.28 0l12 7.258A8 8 0 0 1 43.997 31q.004-.132.004-.263V17.26a8 8 0 0 0-3.86-6.845Z"/><path fill="url(#gitea-microsoftonline__f)" d="m40.14 10.415-12-7.258a8 8 0 0 0-8.042-.139l-.238.144A8 8 0 0 0 16 10.008v9.483l3.86-2.334a8 8 0 0 1 8.28 0l12 7.258A8 8 0 0 1 43.997 31q.004-.132.004-.263V17.26a8 8 0 0 0-3.86-6.845Z"/><path fill="url(#gitea-microsoftonline__g)" d="M4.004 30.998"/><path fill="url(#gitea-microsoftonline__h)" d="M4.004 30.998"/><defs><radialGradient id="gitea-microsoftonline__a" cx="0" cy="0" r="1" gradientTransform="rotate(110.528 5.021 11.358)scale(33.3657 58.1966)" gradientUnits="userSpaceOnUse"><stop offset=".064" stop-color="#ae7fe2"/><stop offset="1" stop-color="#0078d4"/></radialGradient><radialGradient id="gitea-microsoftonline__c" cx="0" cy="0" r="1" gradientTransform="rotate(-8.367 253.693 -53.118)scale(31.0503 20.5108)" gradientUnits="userSpaceOnUse"><stop offset=".134" stop-color="#d59dff"/><stop offset="1" stop-color="#5e438f"/></radialGradient><radialGradient id="gitea-microsoftonline__e" cx="0" cy="0" r="1" gradientTransform="rotate(194.228 22.182 10.69)scale(24.9228 41.9552)" gradientUnits="userSpaceOnUse"><stop offset=".058" stop-color="#50e6ff"/><stop offset="1" stop-color="#436dcd"/></radialGradient><radialGradient id="gitea-microsoftonline__g" cx="0" cy="0" r="1" gradientTransform="rotate(194.228 22.182 10.69)scale(24.9228 41.9552)" gradientUnits="userSpaceOnUse"><stop offset=".058" stop-color="#50e6ff"/><stop offset="1" stop-color="#436dcd"/></radialGradient><linearGradient id="gitea-microsoftonline__b" x1="17.512" x2="12.751" y1="37.868" y2="29.635" gradientUnits="userSpaceOnUse"><stop stop-color="#114a8b"/><stop offset="1" stop-color="#0078d4" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__d" x1="40.357" x2="35.255" y1="25.377" y2="32.692" gradientUnits="userSpaceOnUse"><stop stop-color="#493474"/><stop offset="1" stop-color="#8c66ba" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__f" x1="16.976" x2="24.487" y1="3.057" y2="3.057" gradientUnits="userSpaceOnUse"><stop stop-color="#2d3f80"/><stop offset="1" stop-color="#436dcd" stop-opacity="0"/></linearGradient><linearGradient id="gitea-microsoftonline__h" x1="16.976" x2="24.487" y1="3.057" y2="3.057" gradientUnits="userSpaceOnUse"><stop stop-color="#2d3f80"/><stop offset="1" stop-color="#436dcd" stop-opacity="0"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-npm.svg b/public/assets/img/svg/gitea-npm.svg
index 7ef74e72bd..2b05c79353 100644
--- a/public/assets/img/svg/gitea-npm.svg
+++ b/public/assets/img/svg/gitea-npm.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 7" class="svg gitea-npm" width="16" height="16" aria-hidden="true"><path fill="#CB3837" d="M0 0h18v6H9v1H5V6H0zm1 5h2V2h1v3h1V1H1zm5-4v5h2V5h2V1zm2 1h1v2H8zm3-1v4h2V2h1v3h1V2h1v3h1V1z"/><path fill="#fff" d="M1 5h2V2h1v3h1V1H1zM6 1v5h2V5h2V1zm3 3H8V2h1zM11 1v4h2V2h1v3h1V2h1v3h1V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 7" class="svg gitea-npm" width="16" height="16" aria-hidden="true"><path fill="#cb3837" d="M0 0h18v6H9v1H5V6H0zm1 5h2V2h1v3h1V1H1zm5-4v5h2V5h2V1zm2 1h1v2H8zm3-1v4h2V2h1v3h1V2h1v3h1V1z"/><path fill="#fff" d="M1 5h2V2h1v3h1V1H1zM6 1v5h2V5h2V1zm3 3H8V2h1zM11 1v4h2V2h1v3h1V2h1v3h1V1z"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-onedev.svg b/public/assets/img/svg/gitea-onedev.svg
index 94ad1bab31..7ecd18895d 100644
--- a/public/assets/img/svg/gitea-onedev.svg
+++ b/public/assets/img/svg/gitea-onedev.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 700 700" class="svg gitea-onedev" width="16" height="16" aria-hidden="true"><path d="M315.5 99.6c-29.5 4-55.8 12-81.2 24.8L223 130l-5.2-4c-14.9-11.3-37.6-14.9-55.8-9-19.1 6.3-35.1 22.2-41.1 41-2.7 8.3-3.6 22.9-1.9 31.2 1.5 8 5 16.5 9.1 22.5 3.1 4.7 3.1 4.8 1.4 7.8C106 260 95.1 294.4 92 337.7c-1.1 15.7-.1 40.2 2.1 53l1.1 6.5-4.9 4.4c-2.8 2.3-7.5 7.6-10.6 11.6-19.4 25.5-24.7 57.9-14.4 88.3 9.2 26.9 31.2 48.8 58.4 58.1 20.6 6.9 40.6 7 61.1.1l6.7-2.2 10.5 7.1c45.6 31 92 45.5 146 45.5 33 0 61.6-5.2 91-16.4 67.6-25.8 122.9-81.1 148.4-148.4l2.7-7.2 7.7-3.8c9.1-4.5 21.1-15.7 25.9-24.3 21.1-37.5-1-84.3-43.2-91.7-19.9-3.5-39.3 2.7-53.9 17.2-7.1 7.1-11.7 14.5-15.3 24.7-3.4 9.4-3.8 25.8-.9 35.3 2.8 9.5 8.5 19.3 15.3 26.4 7.2 7.6 7.2 6 0 20.5-8.9 18.1-20.3 34.1-35.2 49.5-34.6 35.7-78.2 56.3-128.3 60.3-42.8 3.4-89.3-8.9-125-33-1.1-.8-1-1.7.8-5.2 12.1-23.6 13.5-53.7 3.9-78-8.7-21.8-27.5-41.6-48.6-51.2-9-4.1-22.7-7.4-34-8.3l-9.1-.7-.8-9.6c-3.5-46.9 13.5-99.8 45.5-141.7 6.5-8.6 24.3-26.7 33.6-34.2 43.8-35.6 101.3-52.8 158.1-47.2 39.9 3.9 79 19.1 110.6 43 16.9 12.8 37.5 34.9 48.6 52l4.3 6.7-3.3 5.2c-2.9 4.7-3.3 6.3-3.6 13.4-.3 7.3-.1 8.6 2.5 13.6 3.2 6.1 10.2 12 16.3 13.9 22.8 6.8 43-16.9 32.6-38.2-3.1-6.4-9.3-12.2-14.7-13.8-2.5-.8-4.1-2.1-5.2-4.3-.9-1.7-3.2-5.8-5.1-9.2l-3.5-6 3.6-5c17.7-24.4 15.8-57.5-4.4-79.4-8-8.6-15.5-13.6-25.9-17.2-19.8-6.8-38.9-4.2-56.5 7.8l-7.8 5.3-15.3-7.4c-27.9-13.4-55-21.3-84-24.4-13.3-1.5-48.1-1.2-60.3.5"/><path d="M271.8 271.1c-13.9 2.1-30.5 17.3-40.5 37.4-18.3 36.4-13.4 81.5 9.8 91.5 15.2 6.5 34.5-2.7 48.6-23.2 5.5-8 9.7-15.7 9-16.5-.3-.2-2 .3-3.8 1.2-2.4 1.3-5.1 1.6-10.5 1.3-6.1-.3-7.9-.8-11.6-3.4-8.9-6.2-12.4-19.1-7.9-29 2.4-5.2 9-10.8 14.7-12.4 9.1-2.6 20 1.4 25.2 9.2l2.7 4.2.3-12.4c.4-18.9-3.4-31.6-12.4-40.5-6.3-6.3-14.2-8.8-23.6-7.4M420.5 271c-11.6 1.9-20.2 11.3-24.9 27-2.1 6.9-3.1 20-2.2 27.4l.8 5.7 2.1-3.2c10.2-15 31.6-14 39.9 2 6 11.5 1.5 25.1-10.4 31.2-5 2.5-15 2.6-20 .1l-3.6-1.9 1.4 3.3c6.1 14.5 20 30.1 32.3 36.1 5.7 2.8 14.4 4 20.4 2.9 5.2-1 12.1-6.1 16.1-11.9 18.1-26.4 8.1-79-20-105.8-10.8-10.2-21.6-14.6-31.9-12.9M322.5 431.9c-16.1 1.6-23.5 6.1-23.5 14.3 0 11.4 13 21.1 34 25.4 10.2 2 31.2 1.5 40.5-1 13.5-3.7 23.8-10.3 27.6-17.7 4.9-9.7-.2-17.1-13.8-20-6.1-1.2-54.2-2-64.8-1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 700" class="svg gitea-onedev" width="16" height="16" aria-hidden="true"><path d="M315.5 99.6c-29.5 4-55.8 12-81.2 24.8L223 130l-5.2-4c-14.9-11.3-37.6-14.9-55.8-9-19.1 6.3-35.1 22.2-41.1 41-2.7 8.3-3.6 22.9-1.9 31.2 1.5 8 5 16.5 9.1 22.5 3.1 4.7 3.1 4.8 1.4 7.8C106 260 95.1 294.4 92 337.7c-1.1 15.7-.1 40.2 2.1 53l1.1 6.5-4.9 4.4c-2.8 2.3-7.5 7.6-10.6 11.6-19.4 25.5-24.7 57.9-14.4 88.3 9.2 26.9 31.2 48.8 58.4 58.1 20.6 6.9 40.6 7 61.1.1l6.7-2.2 10.5 7.1c45.6 31 92 45.5 146 45.5 33 0 61.6-5.2 91-16.4 67.6-25.8 122.9-81.1 148.4-148.4l2.7-7.2 7.7-3.8c9.1-4.5 21.1-15.7 25.9-24.3 21.1-37.5-1-84.3-43.2-91.7-19.9-3.5-39.3 2.7-53.9 17.2-7.1 7.1-11.7 14.5-15.3 24.7-3.4 9.4-3.8 25.8-.9 35.3 2.8 9.5 8.5 19.3 15.3 26.4 7.2 7.6 7.2 6 0 20.5-8.9 18.1-20.3 34.1-35.2 49.5-34.6 35.7-78.2 56.3-128.3 60.3-42.8 3.4-89.3-8.9-125-33-1.1-.8-1-1.7.8-5.2 12.1-23.6 13.5-53.7 3.9-78-8.7-21.8-27.5-41.6-48.6-51.2-9-4.1-22.7-7.4-34-8.3l-9.1-.7-.8-9.6c-3.5-46.9 13.5-99.8 45.5-141.7 6.5-8.6 24.3-26.7 33.6-34.2 43.8-35.6 101.3-52.8 158.1-47.2 39.9 3.9 79 19.1 110.6 43 16.9 12.8 37.5 34.9 48.6 52l4.3 6.7-3.3 5.2c-2.9 4.7-3.3 6.3-3.6 13.4-.3 7.3-.1 8.6 2.5 13.6 3.2 6.1 10.2 12 16.3 13.9 22.8 6.8 43-16.9 32.6-38.2-3.1-6.4-9.3-12.2-14.7-13.8-2.5-.8-4.1-2.1-5.2-4.3-.9-1.7-3.2-5.8-5.1-9.2l-3.5-6 3.6-5c17.7-24.4 15.8-57.5-4.4-79.4-8-8.6-15.5-13.6-25.9-17.2-19.8-6.8-38.9-4.2-56.5 7.8l-7.8 5.3-15.3-7.4c-27.9-13.4-55-21.3-84-24.4-13.3-1.5-48.1-1.2-60.3.5"/><path d="M271.8 271.1c-13.9 2.1-30.5 17.3-40.5 37.4-18.3 36.4-13.4 81.5 9.8 91.5 15.2 6.5 34.5-2.7 48.6-23.2 5.5-8 9.7-15.7 9-16.5-.3-.2-2 .3-3.8 1.2-2.4 1.3-5.1 1.6-10.5 1.3-6.1-.3-7.9-.8-11.6-3.4-8.9-6.2-12.4-19.1-7.9-29 2.4-5.2 9-10.8 14.7-12.4 9.1-2.6 20 1.4 25.2 9.2l2.7 4.2.3-12.4c.4-18.9-3.4-31.6-12.4-40.5-6.3-6.3-14.2-8.8-23.6-7.4M420.5 271c-11.6 1.9-20.2 11.3-24.9 27-2.1 6.9-3.1 20-2.2 27.4l.8 5.7 2.1-3.2c10.2-15 31.6-14 39.9 2 6 11.5 1.5 25.1-10.4 31.2-5 2.5-15 2.6-20 .1l-3.6-1.9 1.4 3.3c6.1 14.5 20 30.1 32.3 36.1 5.7 2.8 14.4 4 20.4 2.9 5.2-1 12.1-6.1 16.1-11.9 18.1-26.4 8.1-79-20-105.8-10.8-10.2-21.6-14.6-31.9-12.9M322.5 431.9c-16.1 1.6-23.5 6.1-23.5 14.3 0 11.4 13 21.1 34 25.4 10.2 2 31.2 1.5 40.5-1 13.5-3.7 23.8-10.3 27.6-17.7 4.9-9.7-.2-17.1-13.8-20-6.1-1.2-54.2-2-64.8-1"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-openid.svg b/public/assets/img/svg/gitea-openid.svg
index f4702d2cdf..10c37145a3 100644
--- a/public/assets/img/svg/gitea-openid.svg
+++ b/public/assets/img/svg/gitea-openid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 2400 2400" class="svg gitea-openid" width="16" height="16" aria-hidden="true"><path fill="#ff7c00" d="m1270 218.3-173.1 84.3-.7 981.8c-.3 540 .2 981.4 1.1 981l174.5-81.8 172.3-80.8v-984.4c0-541.7-.2-984.7-.4-984.4z"/><path fill="#aaa" d="M981.9 785.5c-425.3 63.2-766.5 264.1-889 523a491.5 491.5 0 0 0-43.6 146c-4.2 29.2-4.7 95-1.2 124 19 152.6 115.2 299.9 273.2 418.8 147.7 111 350.5 196.5 568.6 239.7 59 11.6 179 29 200.5 29 2.3 0 3-23.2 3-109.1v-109.2l-5.1-1-37.9-6a1182 1182 0 0 1-305.4-90.6c-122.2-55.7-225.1-137.7-284.6-226.4-107.5-160.5-81.3-344.3 70-491.3 57-55.5 115.4-95.2 199.5-136.1a1112.6 1112.6 0 0 1 269.4-89.2l29.7-6c3.7-1.2 4-8.6 4-111.5V779.5l-6.3.2a823 823 0 0 0-44.8 5.8m525 104c0 103 .2 110.4 4.1 111.6l29.5 6a1221.6 1221.6 0 0 1 207.7 61.3A1088 1088 0 0 1 1862 1123c4.6 3.7 1.4 5.8-88 56-51.1 28.5-93 52.7-93 53.4 0 1.9 671.6 146.8 673.2 145.2 1.2-1.2-45.5-496-47-497.6-.2-.2-38.5 21-85 47.2l-89.6 50.2c-4.2 2-8.8.2-27.9-10.7-130.8-75-289.6-132.2-460.8-166.1a1871 1871 0 0 0-132.9-21.1c-4 0-4.2 6.7-4.2 110z"/><path fill="#cbaa7c" d="M1094.5 2156.9c0 60.6.3 85.5.5 55 .5-30.2.5-79.9 0-110.3-.2-30.2-.5-5.3-.5 55.3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2400 2400" class="svg gitea-openid" width="16" height="16" aria-hidden="true"><path fill="#ff7c00" d="m1270 218.3-173.1 84.3-.7 981.8c-.3 540 .2 981.4 1.1 981l174.5-81.8 172.3-80.8v-984.4c0-541.7-.2-984.7-.4-984.4z"/><path fill="#aaa" d="M981.9 785.5c-425.3 63.2-766.5 264.1-889 523a491.5 491.5 0 0 0-43.6 146c-4.2 29.2-4.7 95-1.2 124 19 152.6 115.2 299.9 273.2 418.8 147.7 111 350.5 196.5 568.6 239.7 59 11.6 179 29 200.5 29 2.3 0 3-23.2 3-109.1v-109.2l-5.1-1-37.9-6a1182 1182 0 0 1-305.4-90.6c-122.2-55.7-225.1-137.7-284.6-226.4-107.5-160.5-81.3-344.3 70-491.3 57-55.5 115.4-95.2 199.5-136.1a1112.6 1112.6 0 0 1 269.4-89.2l29.7-6c3.7-1.2 4-8.6 4-111.5V779.5l-6.3.2a823 823 0 0 0-44.8 5.8m525 104c0 103 .2 110.4 4.1 111.6l29.5 6a1221.6 1221.6 0 0 1 207.7 61.3A1088 1088 0 0 1 1862 1123c4.6 3.7 1.4 5.8-88 56-51.1 28.5-93 52.7-93 53.4 0 1.9 671.6 146.8 673.2 145.2 1.2-1.2-45.5-496-47-497.6-.2-.2-38.5 21-85 47.2l-89.6 50.2c-4.2 2-8.8.2-27.9-10.7-130.8-75-289.6-132.2-460.8-166.1a1871 1871 0 0 0-132.9-21.1c-4 0-4.2 6.7-4.2 110z"/><path fill="#cbaa7c" d="M1094.5 2156.9c0 60.6.3 85.5.5 55 .5-30.2.5-79.9 0-110.3-.2-30.2-.5-5.3-.5 55.3"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-pagure.svg b/public/assets/img/svg/gitea-pagure.svg
new file mode 100644
index 0000000000..d9dbd31f88
--- /dev/null
+++ b/public/assets/img/svg/gitea-pagure.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10.454 10.454" class="svg gitea-pagure" width="16" height="16" aria-hidden="true"><path d="M34.52 21.538c0-2.344-2.093-4.22-3.636-4.22-3.133 0-4.015 3.04-2.52 4.376 1.582-1.547 2.761-1.597 2.427.418-7.564 3.42-5.837-8.935 1.82-6.078 3.41 1.962 4.365 7.588 4.996 7.078l5.704-3.831c0-4-5.082-11.868-13.662-11.874-7.499.13-11.12 5.144-11.257 10.347-.133 4.999 2.958 9.58 8.533 9.646 4.066.054 7.569-1.985 7.594-5.862" style="clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;stroke:none;stroke-width:.778374;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" transform="translate(-3.865 .402)scale(.27334)"/><path d="M72.294 106.289c-1.478.388-3.872.34-5.183.273-.529 1.02-.5 2.38.332 3.642.78 1.183 2.686 1.698 4.035 2.313-1.212-1.59-1.619-2.49-1.634-4.312 2.022.763 2.809 2.59 4.213 3.885.17-1.482-.335-3.525-1.192-4.985a6 6 0 0 0-.57-.816" style="clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.24726;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" transform="rotate(-32.11 -49.738 65.485)scale(.4336)"/><path d="M63.15 101.3c.174-.195.373.206.375.325.008.615-.783.793-1.259.625-1.067-.375-1.3-1.769-.872-2.724.736-1.642 2.759-1.976 4.153-1.215 2.097 1.144 2.461 3.957 1.297 5.825-1.614 2.591-5.257 2.846-7.816 1.048-3.362-2.363-3.971-7.111-1.837-10.349 2.697-4.092 8.4-4.655 12.287-1.865 3.668 2.63 5.12 7.488 3.749 11.762-1.479 1.072-7.031.596-7.031.596" style="fill:none;fill-rule:evenodd;stroke:currentColor;stroke-width:1.30185;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="rotate(-32.11 -49.738 65.485)scale(.4336)"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-rubygems.svg b/public/assets/img/svg/gitea-rubygems.svg
index 4e43bdf2f4..7cd9d34e6a 100644
--- a/public/assets/img/svg/gitea-rubygems.svg
+++ b/public/assets/img/svg/gitea-rubygems.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.13 197.58" class="svg gitea-rubygems" width="16" height="16" aria-hidden="true"><defs><linearGradient id="gitea-rubygems__b" x1="194.9" x2="141.03" y1="153.56" y2="117.41" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#871101"/><stop offset=".99" stop-color="#911209"/><stop offset="1" stop-color="#911209"/></linearGradient><linearGradient id="gitea-rubygems__c" x1="151.8" x2="97.93" y1="217.79" y2="181.64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#871101"/><stop offset=".99" stop-color="#911209"/><stop offset="1" stop-color="#911209"/></linearGradient><linearGradient id="gitea-rubygems__d" x1="38.696" x2="47.047" y1="127.39" y2="181.66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".23" stop-color="#E57252"/><stop offset=".46" stop-color="#DE3B20"/><stop offset=".99" stop-color="#A60003"/><stop offset="1" stop-color="#A60003"/></linearGradient><linearGradient id="gitea-rubygems__e" x1="96.133" x2="99.21" y1="76.715" y2="132.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".23" stop-color="#E4714E"/><stop offset=".56" stop-color="#BE1A0D"/><stop offset=".99" stop-color="#A80D00"/><stop offset="1" stop-color="#A80D00"/></linearGradient><linearGradient id="gitea-rubygems__f" x1="147.1" x2="156.31" y1="25.521" y2="65.216" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".18" stop-color="#E46342"/><stop offset=".4" stop-color="#C82410"/><stop offset=".99" stop-color="#A80D00"/><stop offset="1" stop-color="#A80D00"/></linearGradient><linearGradient id="gitea-rubygems__g" x1="118.98" x2="158.67" y1="11.542" y2="-8.305" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".54" stop-color="#C81F11"/><stop offset=".99" stop-color="#BF0905"/><stop offset="1" stop-color="#BF0905"/></linearGradient><linearGradient id="gitea-rubygems__h" x1="3.903" x2="7.17" y1="113.55" y2="146.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".31" stop-color="#DE4024"/><stop offset=".99" stop-color="#BF190B"/><stop offset="1" stop-color="#BF190B"/></linearGradient><linearGradient id="gitea-rubygems__i" x1="-18.556" x2="135.02" y1="155.1" y2="-2.809" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#BD0012"/><stop offset=".07" stop-color="#fff"/><stop offset=".17" stop-color="#fff"/><stop offset=".27" stop-color="#C82F1C"/><stop offset=".33" stop-color="#820C01"/><stop offset=".46" stop-color="#A31601"/><stop offset=".72" stop-color="#B31301"/><stop offset=".99" stop-color="#E82609"/><stop offset="1" stop-color="#E82609"/></linearGradient><linearGradient id="gitea-rubygems__q" x1="99.075" x2="52.818" y1="171.03" y2="159.62" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8C0C01"/><stop offset=".54" stop-color="#990C00"/><stop offset=".99" stop-color="#A80D0E"/><stop offset="1" stop-color="#A80D0E"/></linearGradient><linearGradient id="gitea-rubygems__r" x1="178.53" x2="137.43" y1="115.51" y2="78.684" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7E110B"/><stop offset=".99" stop-color="#9E0C00"/><stop offset="1" stop-color="#9E0C00"/></linearGradient><linearGradient id="gitea-rubygems__s" x1="193.62" x2="173.15" y1="47.937" y2="26.054" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#79130D"/><stop offset=".99" stop-color="#9E120B"/><stop offset="1" stop-color="#9E120B"/></linearGradient><linearGradient id="gitea-rubygems__v" x1="26.67" x2="9.989" y1="197.34" y2="140.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8B2114"/><stop offset=".43" stop-color="#9E100A"/><stop offset=".99" stop-color="#B3100C"/><stop offset="1" stop-color="#B3100C"/></linearGradient><linearGradient id="gitea-rubygems__w" x1="154.64" x2="192.04" y1="9.798" y2="26.306" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#B31000"/><stop offset=".44" stop-color="#910F08"/><stop offset=".99" stop-color="#791C12"/><stop offset="1" stop-color="#791C12"/></linearGradient><linearGradient id="gitea-rubygems__a" x1="174.07" x2="132.28" y1="215.55" y2="141.75" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FB7655"/><stop offset=".41" stop-color="#E42B1E"/><stop offset=".99" stop-color="#900"/><stop offset="1" stop-color="#900"/></linearGradient><radialGradient id="gitea-rubygems__t" cx="143.83" cy="79.388" r="50.358" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#A80D00"/><stop offset=".99" stop-color="#7E0E08"/><stop offset="1" stop-color="#7E0E08"/></radialGradient><radialGradient id="gitea-rubygems__u" cx="74.092" cy="145.75" r="66.944" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#A30C00"/><stop offset=".99" stop-color="#800E08"/><stop offset="1" stop-color="#800E08"/></radialGradient></defs><path fill="url(#gitea-rubygems__a)" fill-rule="evenodd" d="M153.5 130.41 40.38 197.58l146.47-9.94 11.28-147.69z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__b)" fill-rule="evenodd" d="m187.09 187.54-12.59-86.89-34.29 45.28z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__c)" fill-rule="evenodd" d="m187.26 187.54-92.23-7.24-54.16 17.09z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__d)" fill-rule="evenodd" d="m41 197.41 23.04-75.48-50.7 10.84z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__e)" fill-rule="evenodd" d="M140.2 146.18 119 63.14l-60.67 56.87z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__f)" fill-rule="evenodd" d="m193.32 64.31-57.35-46.84L120 69.1z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__g)" fill-rule="evenodd" d="m166.5.77-33.73 18.64L111.49.52z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__h)" fill-rule="evenodd" d="m0 158.09 14.13-25.77-11.43-30.7z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="m1.94 100.65 11.5 32.62 49.97-11.211 57.05-53.02 16.1-51.139L111.209 0l-43.1 16.13C54.53 28.76 28.18 53.75 27.23 54.22c-.94.48-17.4 31.59-25.29 46.43" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__i)" fill-rule="evenodd" d="M42.32 42.05c29.43-29.18 67.37-46.42 81.93-31.73 14.551 14.69-.88 50.39-30.31 79.56s-66.9 47.36-81.45 32.67c-14.56-14.68.4-51.33 29.83-80.5" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__q)" fill-rule="evenodd" d="m41 197.38 22.86-75.72 75.92 24.39c-27.45 25.74-57.98 47.5-98.78 51.33" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__r)" fill-rule="evenodd" d="m120.56 68.89 19.49 77.2c22.93-24.11 43.51-50.03 53.589-82.09z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__s)" fill-rule="evenodd" d="M193.44 64.39c7.8-23.54 9.6-57.31-27.181-63.58l-30.18 16.67z" clip-rule="evenodd"/><path fill="#9e1209" fill-rule="evenodd" d="M0 157.75c1.08 38.851 29.11 39.43 41.05 39.771L13.47 133.11z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__t)" fill-rule="evenodd" d="M120.67 69.01c17.62 10.83 53.131 32.58 53.851 32.98 1.119.63 15.31-23.93 18.53-37.81z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__u)" fill-rule="evenodd" d="m63.83 121.66 30.56 58.96c18.07-9.8 32.22-21.74 45.18-34.53z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__v)" fill-rule="evenodd" d="m13.35 133.19-4.33 51.56c8.17 11.16 19.41 12.13 31.2 11.26-8.53-21.23-25.57-63.68-26.87-62.82" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__w)" fill-rule="evenodd" d="m135.9 17.61 60.71 8.52C193.37 12.4 183.42 3.54 166.46.77z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.13 197.58" class="svg gitea-rubygems" width="16" height="16" aria-hidden="true"><defs><linearGradient id="gitea-rubygems__b" x1="194.9" x2="141.03" y1="153.56" y2="117.41" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#871101"/><stop offset=".99" stop-color="#911209"/><stop offset="1" stop-color="#911209"/></linearGradient><linearGradient id="gitea-rubygems__c" x1="151.8" x2="97.93" y1="217.79" y2="181.64" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#871101"/><stop offset=".99" stop-color="#911209"/><stop offset="1" stop-color="#911209"/></linearGradient><linearGradient id="gitea-rubygems__d" x1="38.696" x2="47.047" y1="127.39" y2="181.66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".23" stop-color="#e57252"/><stop offset=".46" stop-color="#de3b20"/><stop offset=".99" stop-color="#a60003"/><stop offset="1" stop-color="#a60003"/></linearGradient><linearGradient id="gitea-rubygems__e" x1="96.133" x2="99.21" y1="76.715" y2="132.1" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".23" stop-color="#e4714e"/><stop offset=".56" stop-color="#be1a0d"/><stop offset=".99" stop-color="#a80d00"/><stop offset="1" stop-color="#a80d00"/></linearGradient><linearGradient id="gitea-rubygems__f" x1="147.1" x2="156.31" y1="25.521" y2="65.216" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".18" stop-color="#e46342"/><stop offset=".4" stop-color="#c82410"/><stop offset=".99" stop-color="#a80d00"/><stop offset="1" stop-color="#a80d00"/></linearGradient><linearGradient id="gitea-rubygems__g" x1="118.98" x2="158.67" y1="11.542" y2="-8.305" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".54" stop-color="#c81f11"/><stop offset=".99" stop-color="#bf0905"/><stop offset="1" stop-color="#bf0905"/></linearGradient><linearGradient id="gitea-rubygems__h" x1="3.903" x2="7.17" y1="113.55" y2="146.26" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset=".31" stop-color="#de4024"/><stop offset=".99" stop-color="#bf190b"/><stop offset="1" stop-color="#bf190b"/></linearGradient><linearGradient id="gitea-rubygems__i" x1="-18.556" x2="135.02" y1="155.1" y2="-2.809" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#bd0012"/><stop offset=".07" stop-color="#fff"/><stop offset=".17" stop-color="#fff"/><stop offset=".27" stop-color="#c82f1c"/><stop offset=".33" stop-color="#820c01"/><stop offset=".46" stop-color="#a31601"/><stop offset=".72" stop-color="#b31301"/><stop offset=".99" stop-color="#e82609"/><stop offset="1" stop-color="#e82609"/></linearGradient><linearGradient id="gitea-rubygems__q" x1="99.075" x2="52.818" y1="171.03" y2="159.62" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8c0c01"/><stop offset=".54" stop-color="#990c00"/><stop offset=".99" stop-color="#a80d0e"/><stop offset="1" stop-color="#a80d0e"/></linearGradient><linearGradient id="gitea-rubygems__r" x1="178.53" x2="137.43" y1="115.51" y2="78.684" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7e110b"/><stop offset=".99" stop-color="#9e0c00"/><stop offset="1" stop-color="#9e0c00"/></linearGradient><linearGradient id="gitea-rubygems__s" x1="193.62" x2="173.15" y1="47.937" y2="26.054" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#79130d"/><stop offset=".99" stop-color="#9e120b"/><stop offset="1" stop-color="#9e120b"/></linearGradient><linearGradient id="gitea-rubygems__v" x1="26.67" x2="9.989" y1="197.34" y2="140.74" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#8b2114"/><stop offset=".43" stop-color="#9e100a"/><stop offset=".99" stop-color="#b3100c"/><stop offset="1" stop-color="#b3100c"/></linearGradient><linearGradient id="gitea-rubygems__w" x1="154.64" x2="192.04" y1="9.798" y2="26.306" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b31000"/><stop offset=".44" stop-color="#910f08"/><stop offset=".99" stop-color="#791c12"/><stop offset="1" stop-color="#791c12"/></linearGradient><linearGradient id="gitea-rubygems__a" x1="174.07" x2="132.28" y1="215.55" y2="141.75" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fb7655"/><stop offset=".41" stop-color="#e42b1e"/><stop offset=".99" stop-color="#900"/><stop offset="1" stop-color="#900"/></linearGradient><radialGradient id="gitea-rubygems__t" cx="143.83" cy="79.388" r="50.358" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a80d00"/><stop offset=".99" stop-color="#7e0e08"/><stop offset="1" stop-color="#7e0e08"/></radialGradient><radialGradient id="gitea-rubygems__u" cx="74.092" cy="145.75" r="66.944" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a30c00"/><stop offset=".99" stop-color="#800e08"/><stop offset="1" stop-color="#800e08"/></radialGradient></defs><path fill="url(#gitea-rubygems__a)" fill-rule="evenodd" d="M153.5 130.41 40.38 197.58l146.47-9.94 11.28-147.69z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__b)" fill-rule="evenodd" d="m187.09 187.54-12.59-86.89-34.29 45.28z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__c)" fill-rule="evenodd" d="m187.26 187.54-92.23-7.24-54.16 17.09z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__d)" fill-rule="evenodd" d="m41 197.41 23.04-75.48-50.7 10.84z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__e)" fill-rule="evenodd" d="M140.2 146.18 119 63.14l-60.67 56.87z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__f)" fill-rule="evenodd" d="m193.32 64.31-57.35-46.84L120 69.1z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__g)" fill-rule="evenodd" d="m166.5.77-33.73 18.64L111.49.52z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__h)" fill-rule="evenodd" d="m0 158.09 14.13-25.77-11.43-30.7z" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="m1.94 100.65 11.5 32.62 49.97-11.211 57.05-53.02 16.1-51.139L111.209 0l-43.1 16.13C54.53 28.76 28.18 53.75 27.23 54.22c-.94.48-17.4 31.59-25.29 46.43" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__i)" fill-rule="evenodd" d="M42.32 42.05c29.43-29.18 67.37-46.42 81.93-31.73 14.551 14.69-.88 50.39-30.31 79.56s-66.9 47.36-81.45 32.67c-14.56-14.68.4-51.33 29.83-80.5" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__q)" fill-rule="evenodd" d="m41 197.38 22.86-75.72 75.92 24.39c-27.45 25.74-57.98 47.5-98.78 51.33" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__r)" fill-rule="evenodd" d="m120.56 68.89 19.49 77.2c22.93-24.11 43.51-50.03 53.589-82.09z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__s)" fill-rule="evenodd" d="M193.44 64.39c7.8-23.54 9.6-57.31-27.181-63.58l-30.18 16.67z" clip-rule="evenodd"/><path fill="#9e1209" fill-rule="evenodd" d="M0 157.75c1.08 38.851 29.11 39.43 41.05 39.771L13.47 133.11z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__t)" fill-rule="evenodd" d="M120.67 69.01c17.62 10.83 53.131 32.58 53.851 32.98 1.119.63 15.31-23.93 18.53-37.81z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__u)" fill-rule="evenodd" d="m63.83 121.66 30.56 58.96c18.07-9.8 32.22-21.74 45.18-34.53z" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__v)" fill-rule="evenodd" d="m13.35 133.19-4.33 51.56c8.17 11.16 19.41 12.13 31.2 11.26-8.53-21.23-25.57-63.68-26.87-62.82" clip-rule="evenodd"/><path fill="url(#gitea-rubygems__w)" fill-rule="evenodd" d="m135.9 17.61 60.71 8.52C193.37 12.4 183.42 3.54 166.46.77z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-swift.svg b/public/assets/img/svg/gitea-swift.svg
index 4182100185..891ac12b56 100644
--- a/public/assets/img/svg/gitea-swift.svg
+++ b/public/assets/img/svg/gitea-swift.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 59.5 59.5" class="svg gitea-swift" width="16" height="16" aria-hidden="true"><path fill="#F05138" d="M59.387 16.45a83 83 0 0 0-.027-1.792c-.034-1.301-.111-2.614-.343-3.9-.234-1.308-.618-2.523-1.222-3.71a12.46 12.46 0 0 0-5.452-5.452C51.156.992 49.94.609 48.635.374c-1.287-.232-2.6-.308-3.902-.343a86 86 0 0 0-1.792-.027Q41.876-.001 40.813 0H18.578q-1.064-.001-2.127.004c-.598.004-1.196.01-1.793.027q-.488.012-.978.036c-.978.047-1.959.133-2.924.307-.98.176-1.908.436-2.811.81A12.5 12.5 0 0 0 3.89 3.89a12.5 12.5 0 0 0-2.294 3.158C.992 8.235.61 9.45.374 10.758c-.231 1.286-.308 2.599-.343 3.9a86 86 0 0 0-.027 1.792Q-.002 17.515 0 18.578v22.234q-.001 1.064.004 2.129c.004.597.01 1.194.027 1.79.035 1.302.112 2.615.343 3.902.235 1.306.618 2.522 1.222 3.71a12.457 12.457 0 0 0 5.453 5.453c1.186.603 2.401.986 3.707 1.22 1.287.232 2.6.309 3.902.344q.896.023 1.793.026 1.063.006 2.127.004h22.235q1.065.002 2.128-.004.897-.003 1.792-.026c1.302-.035 2.615-.112 3.902-.344 1.306-.234 2.521-.617 3.708-1.221a12.46 12.46 0 0 0 5.452-5.453c.604-1.187.988-2.403 1.223-3.71.23-1.286.308-2.599.342-3.9.017-.597.023-1.194.027-1.791q.006-1.065.004-2.129V18.578q.001-1.065-.004-2.128"/><path fill="#fff" d="m47.061 36.661-.004-.005c.066-.223.133-.446.19-.675 2.466-9.82-3.55-21.432-13.731-27.545 4.461 6.048 6.434 13.373 4.681 19.78-.156.572-.344 1.12-.552 1.653-.225-.148-.51-.316-.89-.526 0 0-10.128-6.253-21.104-17.312-.288-.29 5.853 8.776 12.822 16.14-3.283-1.843-12.434-8.5-18.227-13.802.712 1.186 1.559 2.33 2.49 3.43 4.837 6.135 11.145 13.704 18.703 19.517-5.31 3.25-12.814 3.502-20.285.003a30.7 30.7 0 0 1-5.193-3.098c3.162 5.058 8.033 9.423 13.96 11.97 7.07 3.039 14.1 2.833 19.337.05l-.004.007.079-.047q.323-.172.637-.358c2.516-1.306 7.485-2.63 10.152 2.559.653 1.27 2.041-5.46-3.062-11.739z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 59.5 59.5" class="svg gitea-swift" width="16" height="16" aria-hidden="true"><path fill="#f05138" d="M59.387 16.45a83 83 0 0 0-.027-1.792c-.034-1.301-.111-2.614-.343-3.9-.234-1.308-.618-2.523-1.222-3.71a12.46 12.46 0 0 0-5.452-5.452C51.156.992 49.94.609 48.635.374c-1.287-.232-2.6-.308-3.902-.343a86 86 0 0 0-1.792-.027Q41.876-.001 40.813 0H18.578q-1.064-.001-2.127.004c-.598.004-1.196.01-1.793.027q-.488.012-.978.036c-.978.047-1.959.133-2.924.307-.98.176-1.908.436-2.811.81A12.5 12.5 0 0 0 3.89 3.89a12.5 12.5 0 0 0-2.294 3.158C.992 8.235.61 9.45.374 10.758c-.231 1.286-.308 2.599-.343 3.9a86 86 0 0 0-.027 1.792Q-.002 17.515 0 18.578v22.234q-.001 1.064.004 2.129c.004.597.01 1.194.027 1.79.035 1.302.112 2.615.343 3.902.235 1.306.618 2.522 1.222 3.71a12.457 12.457 0 0 0 5.453 5.453c1.186.603 2.401.986 3.707 1.22 1.287.232 2.6.309 3.902.344q.896.023 1.793.026 1.063.006 2.127.004h22.235q1.065.002 2.128-.004.897-.003 1.792-.026c1.302-.035 2.615-.112 3.902-.344 1.306-.234 2.521-.617 3.708-1.221a12.46 12.46 0 0 0 5.452-5.453c.604-1.187.988-2.403 1.223-3.71.23-1.286.308-2.599.342-3.9.017-.597.023-1.194.027-1.791q.006-1.065.004-2.129V18.578q.001-1.065-.004-2.128"/><path fill="#fff" d="m47.061 36.661-.004-.005c.066-.223.133-.446.19-.675 2.466-9.82-3.55-21.432-13.731-27.545 4.461 6.048 6.434 13.373 4.681 19.78-.156.572-.344 1.12-.552 1.653-.225-.148-.51-.316-.89-.526 0 0-10.128-6.253-21.104-17.312-.288-.29 5.853 8.776 12.822 16.14-3.283-1.843-12.434-8.5-18.227-13.802.712 1.186 1.559 2.33 2.49 3.43 4.837 6.135 11.145 13.704 18.703 19.517-5.31 3.25-12.814 3.502-20.285.003a30.7 30.7 0 0 1-5.193-3.098c3.162 5.058 8.033 9.423 13.96 11.97 7.07 3.039 14.1 2.833 19.337.05l-.004.007.079-.047q.323-.172.637-.358c2.516-1.306 7.485-2.63 10.152 2.559.653 1.27 2.041-5.46-3.062-11.739z"/></svg>
\ No newline at end of file
diff --git a/public/assets/img/svg/gitea-vagrant.svg b/public/assets/img/svg/gitea-vagrant.svg
index ba50101d52..18b05e900d 100644
--- a/public/assets/img/svg/gitea-vagrant.svg
+++ b/public/assets/img/svg/gitea-vagrant.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="0 0 255 263" class="svg gitea-vagrant" width="16" height="16" aria-hidden="true"><path fill="#1159CC" d="M254.22 20.234 196.03 53.47l-1.64 20.618-44.19 99.772-26.27 17.34 3.18 71.6 49.53-28.55 77.58-189.946zM92.45 56.933V34.051l-.238-.136-38.483 19.102 1.642 23.034L103.4 180.6l26.02-14.71-2.31-28.09z"/><path fill="#127EFF" d="m219.56 0-57.75 33.814h-.04v23.119L127.11 137.8v27.02l-23.12 13.41L57.788 74.146V53.81L92.45 33.848 34.668 0 .006 20.234v24.783L78.022 234.49l49.088 28.31v-71.16l23.09-13.41-.27-.17 46.51-103.914V53.81l57.78-33.576z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" viewBox="0 0 255 263" class="svg gitea-vagrant" width="16" height="16" aria-hidden="true"><path fill="#1159cc" d="M254.22 20.234 196.03 53.47l-1.64 20.618-44.19 99.772-26.27 17.34 3.18 71.6 49.53-28.55 77.58-189.946zM92.45 56.933V34.051l-.238-.136-38.483 19.102 1.642 23.034L103.4 180.6l26.02-14.71-2.31-28.09z"/><path fill="#127eff" d="m219.56 0-57.75 33.814h-.04v23.119L127.11 137.8v27.02l-23.12 13.41L57.788 74.146V53.81L92.45 33.848 34.668 0 .006 20.234v24.783L78.022 234.49l49.088 28.31v-71.16l23.09-13.41-.27-.17 46.51-103.914V53.81l57.78-33.576z"/></svg>
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index eb3b338794..0000000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[tool.poetry]
-package-mode = false
-
-[tool.poetry.dependencies]
-python = "^3.10"
-
-[tool.poetry.group.dev.dependencies]
-djlint = "1.36.4"
-yamllint = "1.36.2"
-codespell = "2.4.1"
-
-[tool.djlint]
-profile="golang"
-ignore="H005,H006,H013,H016,H020,H021,H030,H031"
-
-[tool.codespell]
-skip = '.git,*.pdf,*.svg,package-lock.json,go.mod,locale,locale_next,license,*.git,objects,*.fr-fr.*,*.de-de.*,*.css,go.sum,*.key,gitignore,pyproject.toml,diff_test.go,go-licenses.json,pyproject.toml,*.lock,venvs,node_modules,plural_rules.go,testdata,disposable_email_domain_data.go'
-# precise hits for CamelCased words,various other curious cases which require regex to ignore
-# entire line or some portion of it
-# TODO: Resolve Treshold typo in API and remove from here
-ignore-regex = '(\b(Treshold|mx claus|commitT|ReadBy|#afile|respOne|commitI|[cC]rossReference|SMove|reVer|CheckIn|NotIn)\b|shouldbe\.|women’s.*womens|"emoji":.*|,bu,|assert\.Equal.*"fo\b|github\.com/unknwon|Copyright 2014 Unknwon|allowed\.noone|[hH]eadErr|atLeast|{"\\U.*)|Iif|FilterIn|ZiSe'
-# te - TreeEntry variable
-# commiter - wrong spelling but seems used in API
-# ALLWAYS - is a config var
-# infact - other variable(s)
-ignore-words-list = 'bleve,crate,te,commiter,befores,allways,infact,startd,unknow'
diff --git a/release-notes-assistant.sh b/release-notes-assistant.sh
index 89fd0833f5..4963edf286 100755
--- a/release-notes-assistant.sh
+++ b/release-notes-assistant.sh
@@ -64,7 +64,7 @@ function test_main() {
   test "$(categorize)" = 'ZE Other changes without a feature or bug label'
 
   test_payload_labels
-  test "$(categorize)" = 'ZF Included for completeness but not worth a release note'
+  test "$(categorize)" = 'ZF Included for completeness but not user-facing (chores, etc.)'
 
   test_payload_draft "fix(security)!: breaking security bug fix"
   test "$(categorize)" = 'AA Breaking security bug fixes'
@@ -117,11 +117,12 @@ function categorize() {
 
   #
   # If there was no release-notes/N.md file and it is not
-  # worth a release note, just forget about it.
+  # directly user-facing, we include it in a separate section
+  # for completeness.
   #
   if test -z "$(jq --raw-output .Draft <$payload)"; then
     if ! $worth; then
-      echo -n ZF Included for completeness but not worth a release note
+      echo -n ZF Included for completeness but not user-facing \(chores, etc.\)
       exit 0
     fi
   fi
diff --git a/release-notes-published/11.0.0.md b/release-notes-published/11.0.0.md
new file mode 100644
index 0000000000..4037daf265
--- /dev/null
+++ b/release-notes-published/11.0.0.md
@@ -0,0 +1,424 @@
+A [companion blog post](https://forgejo.org/2025-04-release-v11-0/) provides additional context on this major release.
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Security features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6963): <!--number 6963 --><!--line 0 --><!--description ZmVhdChhdXRoKTogYWRkIGFiaWxpdHkgdG8gcmVnZW5lcmF0ZSBhY2Nlc3MgdG9rZW5z-->add ability to regenerate access tokens<!--description-->
+- Breaking bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7148): <!--number 7148 --><!--line 0 --><!--description RHJvcCBTU1BJIGF1dGggc3VwcG9ydCBhbmQgbW9yZSBXaW5kb3dzIGZpbGVz-->drop SSPI auth support and more Windows files<!--description-->
+- User Interface features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7168): <!--number 7168 --><!--line 0 --><!--description ZmVhdCh1aSk6IGxvY2FsaXplIHRoZW1lIG5hbWVz-->localize theme names<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7103): <!--number 7103 --><!--line 0 --><!--description ZmVhdCh1aSk6IGltcHJvdmUgaW5jb3JyZWN0IGBST09UX1VSTGAgd2FybmluZw==-->improve incorrect `ROOT_URL` warning<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7062): <!--number 7062 --><!--line 0 --><!--description ZW5oOiBhZG1pbiB1c2VyIHZpZXc=-->admin user view<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7030): <!--number 7030 --><!--line 0 --><!--description ZmVhdCh1aSk6IHdlbGNvbWUgc2NyZWVuIGZvciB1c2VyIGRhc2hib2FyZA==-->welcome screen for user dashboard<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7006): <!--number 7006 --><!--line 0 --><!--description SW1wcm92ZSAiVVJMIiBoYW5kbGluZyBpbiBtYXJrZG93biBlZGl0b3I=-->improve "URL" handling in markdown editor<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6863): <!--number 6863 --><!--line 0 --><!--description ZmVhdCh1aSk6IERpc3BsYXkgdG8gbWFpbnRhaW5lcnMgaW4gUFIgd2hlbiBpdCBpcyBlZGl0YWJsZQ==-->display to maintainers in pull request when it is editable<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6835): <!--number 6835 --><!--line 0 --><!--description U2ltcGxpZnkgcHJvbm91bnMgaW4gdXNlciBzZXR0aW5ncw==-->simplify pronouns in user settings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6675): <!--number 6675 --><!--line 0 --><!--description U3BsaXQgRm9yZ2VqbyBsYW5kaW5nIHBhZ2UgdGVtcGxhdGUgdG8gYWxsb3cgcGF0Y2hpbmcgb3IgcmVtb3ZpbmcgRm9yZ2VqbyBpbnRyb2R1Y3Rpb24gc2VjdGlvbg==-->split Forgejo landing page template to allow patching or removing Forgejo introduction section<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6645): <!--number 6645 --><!--line 0 --><!--description ZmVhdCh1aSk6IHNldCBkZWZhdWx0IHJlbGVhc2UgdGl0bGUgdG8gdGFnIG5hbWU=-->set default release title to tag name<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6602): <!--number 6602 --><!--line 0 --><!--description ZmVhdCh1aSk6IGFkZCBxdW90YSBvdmVydmlldw==-->add quota overview<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6599): <!--number 6599 --><!--line 0 --><!--description QWxsb3cgb3BlbmluZyBhIHNpbmdsZS1maWxlIGRpZmYgZnJvbSBmaWxlIGhpc3Rvcnkgdmlldw==-->allow opening a single-file diff from file history view<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6523): <!--number 6523 --><!--line 0 --><!--description UmVkdWNlIG5vaXNlIGluIHRoZSB0aW1lbGluZSBvZiBpc3N1ZXMgYW5kIHB1bGwgcmVxdWVzdHMuIElmIGNlcnRhaW4gdGltZWxpbmUgZXZlbnRzIGFyZSBwZXJmb3JtZWQgd2l0aGluIGEgY2VydGFpbiB0aW1lZnJhbWUgb2YgZWFjaCBvdGhlciB3aXRoIG5vIG90aGVyIGV2ZW50cyBpbiBiZXR3ZWVuLCB0aGV5IHdpbGwgYmUgY29tYmluZWQgaW50byBhIHNpbmdsZSB0aW1lbGluZSBldmVudCwgYW5kIGFueSBjb250cmFkaWN0b3J5IGFjdGlvbnMgd2lsbCBiZSBjYW5jZWxlZCBhbmQgbm90IGRpc3BsYXllZC4gVGhlIG9sZGVyIHRoZSBldmVudHMsIHRoZSB3aWRlciB0aGUgdGltZWZyYW1lIHdpbGwgYmVjb21lLg==-->reduce noise in the timeline of issues and pull requests. If certain timeline events are performed within a certain timeframe of each other with no other events in between, they will be combined into a single timeline event, and any contradictory actions will be canceled and not displayed. The older the events, the wider the timeframe will become.<!--description-->
+- Localization
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7287): <!--number 7287 --><!--line 0 --><!--description aTE4bjogbWFrZSBEYW5pc2ggYXZhaWxhYmxlIGluIFVJ-->i18n: make Danish available in UI<!--description-->
+  - Updates from Codeberg Translate: [[1]](https://codeberg.org/forgejo/forgejo/pulls/6331), [[2]](https://codeberg.org/forgejo/forgejo/pulls/6378), [[3]](https://codeberg.org/forgejo/forgejo/pulls/6451), [[4]](https://codeberg.org/forgejo/forgejo/pulls/6515), [[5]](https://codeberg.org/forgejo/forgejo/pulls/6565), [[6]](https://codeberg.org/forgejo/forgejo/pulls/6665), [[7]](https://codeberg.org/forgejo/forgejo/pulls/6745), [[8]](https://codeberg.org/forgejo/forgejo/pulls/6814), [[9]](https://codeberg.org/forgejo/forgejo/pulls/6936), [[10]](https://codeberg.org/forgejo/forgejo/pulls/7028), [[11]](https://codeberg.org/forgejo/forgejo/pulls/7066), [[12]](https://codeberg.org/forgejo/forgejo/pulls/7157), [[13]](https://codeberg.org/forgejo/forgejo/pulls/7240), [[14]](https://codeberg.org/forgejo/forgejo/pulls/7529) (Backport of [[1]](https://codeberg.org/forgejo/forgejo/pulls/7275), [[2]](https://codeberg.org/forgejo/forgejo/pulls/7363), [[3]](https://codeberg.org/forgejo/forgejo/pulls/7438))
+- Features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7286): <!--number 7286 --><!--line 0 --><!--description cmV0dXJuIGBydW5fbnVtYmVyYCBpbiB3b3JrZmxvdyBkaXNwYXRjaA==-->return `run_number` in workflow dispatch<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7256): <!--number 7256 --><!--line 0 --><!--description ZmVhdChhcGkpOiBhZGQgbW9yZSBzb3J0aW5nIHRvIG93biByZXBvc2l0b3J5IGxpc3Q=-->add more sorting to own repository list<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7211): <!--number 7211 --><!--line 0 --><!--description ZmVhdChhcGkpOiBhZGQgc29ydCBwYXJhbWV0ZXIgdG8gbGlzdCBpc3N1ZXMgQVBJ-->add sort parameter to list issues API<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7193): <!--number 7193 --><!--line 0 --><!--description TWFrZSBpdCBwb3NzaWJsZSB0byB0cmFjayB0aGUgcHJvZ3Jlc3Mgb2YgbWFudWFsbHkgdHJpZ2dlcmVkIHdvcmtmbG93cw==-->make it possible to track the progress of manually triggered workflows<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7137): <!--number 7137 --><!--line 0 --><!--description aW50ZXJwcmV0IFByZWNlZGVuY2U6IGF1dG9fcmVwbHkgYXMgYW4gYXV0byByZXBseQ==-->interpret Precedence: auto_reply as an auto reply<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7136): <!--number 7136 --><!--line 0 --><!--description cGFyc2UgbXVsdGlwYXJ0L3JlbGF0ZWQgcGFydHMgYXMgYXR0YWNobWVudHMgJiBndWVzcyBmaWxlbmFtZQ==-->parse multipart/related parts as attachments & guess filename<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7102): <!--number 7102 --><!--line 0 --><!--description QWRkZWQgbWlzc2luZyBudWdldCBWMiBwcm9wZXJ0aWVzIHRvIEFQSQ==-->added missing nuget V2 properties to API<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6970): <!--number 6970 --><!--line 0 --><!--description T3JkZXIgdGhlIHVzZXIncyBvcmdhbml6YXRpb24gbGlzdCBhbHBoYWJldGljYWxseQ==-->order the user's organization list alphabetically<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6952): <!--number 6952 --><!--line 0 --><!--description ZmVhdChpc3N1ZSBzZWFyY2gpOiBxdWVyeSBzdHJpbmcgZm9yIGJvb2xlYW4gb3BlcmF0b3JzIGFuZCBwaHJhc2Ugc2VhcmNo-->in code search, add query string for boolean operators and phrase search<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6947): <!--number 6947 --><!--line 0 --><!--description ZmVhdChjb2RlIHNlYXJjaCk6IHJlcGxhY2UgZnV6enkgc2VhcmNoIHdpdGggdW5pb24gc2VhcmNoIGZvciBpbmRleGVy-->in code search, replace fuzzy search with union search for indexer<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6820): <!--number 6820 --><!--line 0 --><!--description Y2hvcmUoY29uZmlnKTogc2V0IGRlZmF1bHQgdmFsdWUgb2YgVXNlQ29tcGF0U1NIVVJJIHRvIHRydWU=-->set default value of UseCompatSSHURI to true<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6773): <!--number 6773 --><!--line 0 --><!--description QWRkIHByb25vdW4gcHJpdmFjeSBvcHRpb24=-->add pronoun privacy option<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6763): <!--number 6763 --><!--line 0 --><!--description W2NvbW1pdF0oaHR0cHM6Ly9jb2RlYmVyZy5vcmcvZm9yZ2Vqby9mb3JnZWpvL2NvbW1pdC82ODlmYjgyYTcwNDNmZGIyZmVlMDIxOTU3MDFiMGJjNzI4ZTk5NzA5KSBBUEkgZW5kcG9pbnQgdG8gcmVuYW1lIGFuIG9yZ2FuaXphdGlvbg==-->[commit](https://codeberg.org/forgejo/forgejo/commit/689fb82a7043fdb2fee02195701b0bc728e99709) API endpoint to rename an organization<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6474): <!--number 6474 --><!--line 0 --><!--description RmlsbCB3ZWJzaXRlIGZpZWxkIHdoZW4gbWlncmF0aW5nIGZyb20gZXh0ZXJuYWw=-->fill website field when migrating from external<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6471): <!--number 6471 --><!--line 0 --><!--description W2NvbW1pdF0oaHR0cHM6Ly9jb2RlYmVyZy5vcmcvZm9yZ2Vqby9mb3JnZWpvL2NvbW1pdC83NmE4NWQyNmM4NTc2ZmM0MTBkYzY0OTRmMjkwN2ZmYzJiMzUzYzM5KSBVc2UgYFByb2plY3QtVVJMYCBtZXRhZGF0YSBmaWVsZCB0byBnZXQgYSBQeVBJIHBhY2thZ2UncyBob21lcGFnZSBVUkw=-->[commit](https://codeberg.org/forgejo/forgejo/commit/76a85d26c8576fc410dc6494f2907ffc2b353c39) use `Project-URL` metadata field to get a PyPI package's homepage URL<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6470): <!--number 6470 --><!--line 0 --><!--description aW1wcm92ZSBGb3JnZWpvIGRpYWdub3N0aWNz-->improve Forgejo diagnostics<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6445): <!--number 6445 --><!--line 0 --><!--description d2ViaG9vazogc291cmNlaHV0OiBzdWJtaXQgU1NIIFVSTCBmb3IgcHJpdmF0ZSByZXBvc2l0b3J5IG9yIHdoZW4gcHJlLWZpbGxlZA==-->sourcehut webhook: submit SSH URL for private repository or when pre-filled<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6422): <!--number 6422 --><!--line 0 --><!--description YWRkIGNvbmZpZ3VyYWJsZSBjb29sZG93biB0byBjbGFpbSB1c2VybmFtZXM=-->add configurable cooldown to claim usernames<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6411): <!--number 6411 --><!--line 0 --><!--description ZG9uJ3QgYWxsb3cgYmxvY2tpbmcgdGhlIGRvZXI=-->don't allow blocking the doer<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6351): <!--number 6351 --><!--line 0 --><!--description W0FsdCBMaW51eCBBcHQtUnBtXShodHRwczovL2VuLmFsdGxpbnV4Lm9yZy9SUE0pIHJlcG9zaXRvcnkgW3N1cHBvcnQgZm9yIEZvcmdlam8gcGFja2FnZXNdKGh0dHBzOi8vZm9yZ2Vqby5vcmcvZG9jcy9uZXh0L3VzZXIvcGFja2FnZXMvYWx0Lyku-->[Alt Linux Apt-Rpm](https://en.altlinux.org/RPM) repository [support for Forgejo packages](https://forgejo.org/docs/next/user/packages/alt/)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6300): <!--number 6300 --><!--line 0 --><!--description QWRkIHNlYXJjaCBhY3Rpb24gam9icyBmb3IgQVBJIHJvdXRlcywgcmVwbywgb3JnIGFuZCBnbG9iYWwgbGV2ZWw=-->add search action jobs for API routes, repo, org and global level<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6269): <!--number 6269 --><!--line 0 --><!--description QWRkIHN1bW1hcnkgY2FyZCBmb3IgcmVwb3MgYW5kIHJlbGVhc2Vz-->add summary card for repos and releases<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6232): <!--number 6232 --><!--line 0 --><!--description YWRkIHN5bmNocm9uaXphdGlvbiBmb3IgU1NIIGtleXMgZm9yIE9wZW5JRCBDb25uZWN0-->add synchronization for SSH keys for OpenID Connect<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6203): <!--number 6203 --><!--line 0 --><!--description SW5pdGlhbCBzdXBwb3J0IGZvciBsb2NhbGl6YXRpb24gYW5kIHBsdXJhbGl6YXRpb24gd2l0aCBnby1pMThuLUpTT04tdjIgZm9ybWF0-->initial support for localization and pluralization with go-i18n-JSON-v2 format<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5385): <!--number 5385 --><!--line 0 --><!--description UGVybWl0IHRvIGRvd25sb2FkIHBhdGNoIGFuZCBkaWZmICBmaWxlIGJldHdlZW4gdGFncyBhbmQgYnJhbmNoZXM=-->permit to download patch and diff  file between tags and branches<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5303): <!--number 5303 --><!--line 0 --><!--description UmVtb3ZlIFNIQTEgZm9yIHN1cHBvcnQgZm9yIHNzaCByc2Egc2lnbmluZw==-->remove SHA1 for support for ssh rsa signing<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/4736): <!--number 4736 --><!--line 0 --><!--description U2hvdyBsaW5rIHRvIGRvd25sb2FkIGRpcmVjdG9yeQ==-->show link to download directory<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7395) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7401)): <!--number 7401 --><!--line 0 --><!--description Zml4OiB2YWxpZGF0ZSBpbnB1dCBmb3IgZGVmYXVsdF97bWVyZ2UsdXBkYXRlfV9zdHlsZQ==-->validate input for default_{merge,update}_style<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7257): <!--number 7257 --><!--line 0 --><!--description SW5jbHVkZSBwbGF0Zm9ybSBpbmZvcm1hdGlvbiBvbiBydWJ5Z2VtcyBjb21wYWN0IGluZGV4IEFQSSAjNjUwNw==-->include platform information on rubygems compact index API<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7020): <!--number 7020 --><!--line 0 --><!--description TGlzdGVuaW5nIG9uIGFic3RyYWN0IGRvbWFpbiBzb2NrZXRz-->listening on abstract domain sockets<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7010): <!--number 7010 --><!--line 0 --><!--description Zml4KHdlYik6IEZvcmJpZCBibG9ja2VkIHVzZXJzIGZyb20gcmVvcGVuaW5nIGlzc3Vlcw==-->forbid blocked users from reopening issues<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6856): <!--number 6856 --><!--line 0 --><!--description Zml4KGFwaSk6IGFsbG93IGNvbGxhYm9yYXRvcnMgdG8gcmVhZCB0aGVpciBvd24gcGVybWlzc2lvbnM=-->allow collaborators to read their own permissions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6784): <!--number 6784 --><!--line 0 --><!--description bW9yZSBwZXJtaXNzaXZlIG1hcmt1cCBjb21taXQgaGFzaCBkZXRlY3Rpb24=-->more permissive markup commit hash detection<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6766): <!--number 6766 --><!--line 0 --><!--description Zml4KGNvbW1lbnRlciByb2xlcyk6IGRvbid0IGdpdmUgc3lzdGVtIHVzZXJzIHJvbGVz-->don't give system users roles on comments<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7558) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7559)): <!--number 7559 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSB0YWcgZHJvcGRvd24gY2xpY2thYmxlIGFnYWlu-->fix(ui): make tag dropdown clickable again<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7543) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7544)): <!--number 7544 --><!--line 0 --><!--description Zml4OiBtYXRjaCBQYWNrYWdlQmxvYi5IYXNoQmxha2UyYiBkZWZpbml0aW9uIGFuZCBtaWdyYXRpb24=-->fix: match PackageBlob.HashBlake2b definition and migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7539) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7542)): <!--number 7542 --><!--line 0 --><!--description Zml4KFVJKTogaTE4bjogaW1wcm92ZSBuYW1pbmc=-->fix(UI): i18n: improve naming<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7520) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7521)): <!--number 7521 --><!--line 0 --><!--description Zml4OiBwYWNrYWdlX2Jsb2IuaGFzX2JsYWtlMmIgbWF5IGJlIG51bGw=-->fix: package_blob.has_blake2b may be null<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7261) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7450)): <!--number 7450 --><!--line 0 --><!--description Zml4OiByZWRpcmVjdCB0byBzdWJtb2R1bGUgaW5zdGVhZCBvZiB0aHJvd2luZyA1MDAgZXJyb3Igd2hlbiB2aWV3aW5nIHN1Ym1vZHVsZSBlbnRyeQ==-->fix: redirect to submodule instead of throwing 500 error when viewing submodule entry<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7421) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7437)): <!--number 7437 --><!--line 0 --><!--description Zml4KG1pZ3JhdGlvbnMpOiB0cmFuc2ZlciBQUiBmbG93IGluZm9ybWF0aW9u-->fix(migrations): transfer PR flow information<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7422) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7430)): <!--number 7430 --><!--line 0 --><!--description OiBmaXgoaTE4bik6IGZpeCBzZXZlcmFsIHVzYWdlcyBvZiBpMThu-->: fix(i18n): fix several usages of i18n<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7370): <!--number 7370 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM4LjAgKHYxMS4wL2Zvcmdlam8p-->Update module golang.org/x/net to v0.38.0 (v11.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7355) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7365)): <!--number 7365 --><!--line 0 --><!--description NDEwOC1lbXB0eS1zbGljZS1lbmNvZGVkLXRvLW51bGw=-->4108-empty-slice-encoded-to-null<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7337) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7354)): <!--number 7354 --><!--line 0 --><!--description Y2hvcmU6IGJyYW5kaW5nIGltcG9ydCBwYXRo-->chore: branding import path<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7344) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7345)): <!--number 7345 --><!--line 0 --><!--description Zml4KHVpKTogRG8gbm90IGNoZWNrIGZvciBgdmVydGljYWwtYWxpZ25g-->fix(ui): Do not check for `vertical-align`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7340): <!--number 7340 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2Zvcmdlam8vYWN0IHRvIHYxLjI1LjEgKGZvcmdlam8p-->Update module code.forgejo.org/forgejo/act to v1.25.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7338): <!--number 7338 --><!--line 0 --><!--description Zml4IGNpIGRhc2hib2FyZCBlMmUgdGVzdA==-->fix ci dashboard e2e test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7333): <!--number 7333 --><!--line 0 --><!--description YnVpbGQ6IHJlcXVpcmUgbm9kZSB2MjA=-->build: require node v20<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7332): <!--number 7332 --><!--line 0 --><!--description VXBkYXRlIE5vZGUuanMgdG8gdjIyIChmb3JnZWpvKQ==-->Update Node.js to v22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7329): <!--number 7329 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiB1cGRhdGUgc2V0dGluZ3MgZm9yIGxhdGVzdCB2ZXJzaW9u-->chore(renovate): update settings for latest version<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7326): <!--number 7326 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2J1aWxka2l0ZS90ZXJtaW5hbC10by1odG1sL3YzIHRvIHYzLjE2LjggKGZvcmdlam8p-->Update module github.com/buildkite/terminal-to-html/v3 to v3.16.8 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7323): <!--number 7323 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2NhZGR5c2VydmVyL2NlcnRtYWdpYyB0byB2MC4yMi4yIChmb3JnZWpvKQ==-->Update module github.com/caddyserver/certmagic to v0.22.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7317): <!--number 7317 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7316): <!--number 7316 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yMTIuMCAoZm9yZ2Vqbyk=-->Update renovate to v39.212.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7313): <!--number 7313 --><!--line 0 --><!--description cmVtb3ZlIGFuIGV4dHJhbmVvdXMgfSBpbiBpc3N1ZSBkZXBlbmRlbmNpZXMgdGVtcGxhdGU=-->remove an extraneous } in issue dependencies template<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7311): <!--number 7311 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjEwLjAuMw==-->chore(release-notes): Forgejo v10.0.3<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7296): <!--number 7296 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZy1qd3Qvand0L3Y1IHRvIHY1LjIuMiBbU0VDVVJJVFldIChmb3JnZWpvKQ==-->Update module github.com/golang-jwt/jwt/v5 to v5.2.2 [SECURITY] (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7293): <!--number 7293 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLXNxbC1kcml2ZXIvbXlzcWwgdG8gdjEuOS4xIChmb3JnZWpvKQ==-->Update module github.com/go-sql-driver/mysql to v1.9.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7281): <!--number 7281 --><!--line 0 --><!--description VXBkYXRlIG1jci5taWNyb3NvZnQuY29tL2RldmNvbnRhaW5lcnMvZ28gRG9ja2VyIHRhZyB0byB2MS4yNCAoZm9yZ2Vqbyk=-->Update mcr.microsoft.com/devcontainers/go Docker tag to v1.24 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7280): <!--number 7280 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjEwLjAuMg==-->chore(release-notes): Forgejo v10.0.2<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7279): <!--number 7279 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3JlZGlzL2dvLXJlZGlzL3Y5IHRvIHY5LjcuMyAoZm9yZ2Vqbyk=-->Update module github.com/redis/go-redis/v9 to v9.7.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7270): <!--number 7270 --><!--line 0 --><!--description Y29uc2lkZXIgaXNzdWVzIGluIHJlcG9zaXRvcnkgYWNjZXNzaWJsZSB2aWEgYGFjY2Vzc2AgdGFibGU=-->consider issues in repository accessible via `access` table<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7266): <!--number 7266 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjcuMC4xNA==-->chore(release-notes): Forgejo v7.0.14<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7262): <!--number 7262 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBhZGQgYHlhbWxsaW50YCB0byBhdXRvbWVyZ2U=-->chore(renovate): add `yamllint` to automerge<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7260): <!--number 7260 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRsYWIuY29tL2dpdGxhYi1vcmcvYXBpL2NsaWVudC1nbyB0byB2MC4xMjYuMCAoZm9yZ2Vqbyk=-->Update module gitlab.com/gitlab-org/api/client-go to v0.126.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7259): <!--number 7259 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgeWFtbGxpbnQgdG8gdjEuMzYuMiAoZm9yZ2Vqbyk=-->Update dependency yamllint to v1.36.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7258): <!--number 7258 --><!--line 0 --><!--description Y2hvcmUoZGVwZW5kZW5jeSk6IHVwZ3JhZGUgZ29mMyB2My4xMC42-->chore(dependency): upgrade gof3 v3.10.6<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7253): <!--number 7253 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LWltcG9ydC1yZXNvbHZlci10eXBlc2NyaXB0IHRvIHY0IChmb3JnZWpvKQ==-->Update dependency eslint-import-resolver-typescript to v4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7252): <!--number 7252 --><!--line 0 --><!--description Y2hvcmU6IGFkZCBgQHZpdGVqcy9wbHVnaW4tdnVlYCB0byByZW5vdmF0ZSBhdXRvbWVyZ2U=-->chore: add `@vitejs/plugin-vue` to renovate automerge<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7248): <!--number 7248 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVqcy9wbHVnaW4tdnVlIHRvIHY1LjIuMyAoZm9yZ2Vqbyk=-->Update dependency @vitejs/plugin-vue to v5.2.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7247): <!--number 7247 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7246): <!--number 7246 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yMDUuMCAoZm9yZ2Vqbyk=-->Update renovate to v39.205.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7244): <!--number 7244 --><!--line 0 --><!--description YnJhbmRpbmc6IHVwZGF0ZSBBUEkgZGVzY3JpcHRpb25z-->branding: update API descriptions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7237): <!--number 7237 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2VkaXRvcmNvbmZpZy1jaGVja2VyL2VkaXRvcmNvbmZpZy1jaGVja2VyL3YzL2NtZC9lZGl0b3Jjb25maWctY2hlY2tlciB0byB2My4yLjEgKGZvcmdlam8p-->Update module github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker to v3.2.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7236): <!--number 7236 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgeWFtbGxpbnQgdG8gdjEuMzYuMSAoZm9yZ2Vqbyk=-->Update dependency yamllint to v1.36.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7230): <!--number 7230 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvb2NpL2JpdG5hbWkvcG9zdGdyZXNxbCBEb2NrZXIgdGFnIHRvIHYxNiAoZm9yZ2Vqbyk=-->Update data.forgejo.org/oci/bitnami/postgresql Docker tag to v16 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7229): <!--number 7229 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHBsYXl3cmlnaHQvdGVzdCB0byB2MS41MS4wIChmb3JnZWpvKQ==-->Update dependency @playwright/test to v1.51.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7228): <!--number 7228 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4wLjggKGZvcmdlam8p-->Update vitest monorepo to v3.0.8 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7226): <!--number 7226 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7225): <!--number 7225 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy40LjQgKGZvcmdlam8p-->Update dependency happy-dom to v17.4.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7224): <!--number 7224 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHN0b3BsaWdodC9zcGVjdHJhbC1jbGkgdG8gdjYuMTQuMyAoZm9yZ2Vqbyk=-->Update dependency @stoplight/spectral-cli to v6.14.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7223): <!--number 7223 --><!--line 0 --><!--description cGVyZjogYXZvaWQgc29ydGluZyB0ZWFtIG5hbWVzIGZvciBgQ29tcG9zZU1ldGFzYA==-->perf: avoid sorting team names for `ComposeMetas`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7222): <!--number 7222 --><!--line 0 --><!--description Y2hvcmUocnVubmVyKTogcmV0dXJuIGVycm9ycyBjcmVhdGVkIGJ5IGBjb25uZWN0YA==-->chore(runner): return errors created by `connect`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7221): <!--number 7221 --><!--line 0 --><!--description cGVyZjogb3B0aW1pemUgY29udmVydGluZyByZWxlYXNlcyB0byBmZWVkIGl0ZW1z-->perf: optimize converting releases to feed items<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7220): <!--number 7220 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTIgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-12 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7219): <!--number 7219 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWVybWFpZCB0byB2MTEuNS4wIChmb3JnZWpvKQ==-->Update dependency mermaid to v11.5.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7214): <!--number 7214 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2VkaXRvcmNvbmZpZy9lZGl0b3Jjb25maWctY29yZS1nby92MiB0byB2Mi42LjMgKGZvcmdlam8p-->Update module github.com/editorconfig/editorconfig-core-go/v2 to v2.6.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7213): <!--number 7213 --><!--line 0 --><!--description Y2hvcmUodWkpOiByZW1vdmUgdW51c2VkIHRlbXBsYXRlICJzaGFyZWQvdXNlci9ibG9ja2VkX3VzZXJzIg==-->chore(ui): remove unused template "shared/user/blocked_users"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7210): <!--number 7210 --><!--line 0 --><!--description aGFuZGxlIGRlbGV0ZWQgdXNlciBtb2RpZnlpbmcgZXZlbnQgc3RhdGUgaW4gZ2l0bGFiIG1pZ3JhdGlvbg==-->handle deleted user modifying event state in gitlab migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7208): <!--number 7208 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgeWFtbGxpbnQgdG8gdjEuMzYuMCAoZm9yZ2Vqbyk=-->Update dependency yamllint to v1.36.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7205): <!--number 7205 --><!--line 0 --><!--description aTE4bjogZW5zdXJlIGNvbnNpc3RlbnQgaW5kZW50IHN0eWxlIGZvciBuZXh0IGxvY2FsZXM=-->i18n: ensure consistent indent style for next locales<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7199): <!--number 7199 --><!--line 0 --><!--description Zml4KGFwaSk6IG1pc3Mtc3BlbGxlZCBkZXNjcmlwdGlvbiwgY29ycmVjdGVkIHRvIGBwdWJsaWNg-->fix(api): miss-spelled description, corrected to `public`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7198): <!--number 7198 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLXdlYmF1dGhuL3dlYmF1dGhuIHRvIHYwLjEyLjIgKGZvcmdlam8p-->Update module github.com/go-webauthn/webauthn to v0.12.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7196): <!--number 7196 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuODggKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.88 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7189): <!--number 7189 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7188): <!--number 7188 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xOTUuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.195.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7187): <!--number 7187 --><!--line 0 --><!--description dWk6IGltcHJvdmUgYnJhbmNoL3RhZyBkcm9wZG93biBzZWxlY3RvciBjb25zaXN0ZW5jeQ==-->ui: improve branch/tag dropdown selector consistency<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7186): <!--number 7186 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21zdGVpbmVydC9wYW0gdG8gdjIgKGZvcmdlam8p-->Update module github.com/msteinert/pam to v2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7185): <!--number 7185 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7184): <!--number 7184 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy40LjMgKGZvcmdlam8p-->Update dependency happy-dom to v17.4.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7183): <!--number 7183 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ2xvYmFscyB0byB2MTYgKGZvcmdlam8p-->Update dependency globals to v16 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7182): <!--number 7182 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi12dWUgdG8gdjEwIChmb3JnZWpvKQ==-->Update dependency eslint-plugin-vue to v10 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7181): <!--number 7181 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi11bmljb3JuIHRvIHY1NyAoZm9yZ2Vqbyk=-->Update dependency eslint-plugin-unicorn to v57 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7180): <!--number 7180 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHN0eWxpc3RpYy9lc2xpbnQtcGx1Z2luLWpzIHRvIHY0IChmb3JnZWpvKQ==-->Update dependency @stylistic/eslint-plugin-js to v4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7179): <!--number 7179 --><!--line 0 --><!--description VXBkYXRlIE5vZGUuanMgdG8gdjIyIChmb3JnZWpvKQ==-->Update Node.js to v22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7176): <!--number 7176 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTEgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-11 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7175): <!--number 7175 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIHVzdWFsIGFuZCBjb25zaXN0ZW50IHNpemUgZm9yIHByb2plY3QgaWNvbnMgb2YgMTY=-->fix(ui): use usual and consistent size for project icons of 16<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7174): <!--number 7174 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZSBtaWxlc3RvbmUvcHJvamVjdCBoZWFkZXIgY29uc2lzdGVuY3k=-->fix(ui): improve milestone/project header consistency<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7172): <!--number 7172 --><!--line 0 --><!--description Y2hvcmUodWkpOiBpbXByb3ZlIHN2ZyBpY29uIG1hcmdpbiBjb25zaXN0ZW5jeQ==-->chore(ui): improve svg icon margin consistency<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7171): <!--number 7171 --><!--line 0 --><!--description cmV2ZXJ0IGlzc3VlIHJlbmRlcmluZyBmb3IgYDxhPmAgZWxlbWVudA==-->revert issue rendering for `<a>` element<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7170): <!--number 7170 --><!--line 0 --><!--description Y2hvcmU6IG1vZGVybml6ZSBpbXBvcnQ=-->chore: modernize import<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7166): <!--number 7166 --><!--line 0 --><!--description Zml4KGkxOG4pOiBtYWtlIEhhc0tleSBhd2FyZSBvZiBuZXdTdHlsZU1lc3NhZ2Vz-->fix(i18n): make HasKey aware of newStyleMessages<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7163): <!--number 7163 --><!--line 0 --><!--description ZmVhdCh1aSB0aGVtZXMpOiBiZXR0ZXIgcGxhY2UgZm9yIHRoZW1lIGxpc3QgY3R4LCB0ZXN0aW5n-->feat(ui themes): better place for theme list ctx, testing<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7161): <!--number 7161 --><!--line 0 --><!--description Y2hvcmUodWkpOiBhbHdheXMgdXNlIHByaW1hcnkgYnV0dG9uIGNvbG9yIGluc2lkZSBtb2RhbHM=-->chore(ui): always use primary button color inside modals<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7159): <!--number 7159 --><!--line 0 --><!--description Zml4KHVpKTogMmZhIHZlcmlmeSBhbGlnbm1lbnQ=-->fix(ui): 2fa verify alignment<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7158): <!--number 7158 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb29nbGUuZ29sYW5nLm9yZy9ncnBjIHRvIHYxLjcxLjAgKGZvcmdlam8p-->Update module google.golang.org/grpc to v1.71.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7154): <!--number 7154 --><!--line 0 --><!--description aTE4bjogdXNlIGVsbGlwc2lzIGNoYXJhY3Rlcg==-->i18n: use ellipsis character<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7150): <!--number 7150 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvdG9vbHMvY21kL2RlYWRjb2RlIHRvIHYwLjMxLjAgKGZvcmdlam8p-->Update module golang.org/x/tools/cmd/deadcode to v0.31.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7149): <!--number 7149 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvb2F1dGgyIHRvIHYwLjI4LjAgKGZvcmdlam8p-->Update module golang.org/x/oauth2 to v0.28.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7146): <!--number 7146 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2NhZGR5c2VydmVyL2NlcnRtYWdpYyB0byB2MC4yMi4wIChmb3JnZWpvKQ==-->Update module github.com/caddyserver/certmagic to v0.22.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7135): <!--number 7135 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvaW1hZ2UgdG8gdjAuMjUuMCAoZm9yZ2Vqbyk=-->Update module golang.org/x/image to v0.25.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7134): <!--number 7134 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjM2LjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.36.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7132): <!--number 7132 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3VyZmF2ZS9jbGkvdjIgdG8gdjIuMjcuNiAoZm9yZ2Vqbyk=-->Update module github.com/urfave/cli/v2 to v2.27.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7130): <!--number 7130 --><!--line 0 --><!--description aW1wcm92ZSBlcnJvciBoYW5kbGluZyBvZiBjb21taXQgcmVuZGVyaW5n-->improve error handling of commit rendering<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7126): <!--number 7126 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM2LjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.36.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7122): <!--number 7122 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3Byb21ldGhldXMvY2xpZW50X2dvbGFuZyB0byB2MS4yMS4xIChmb3JnZWpvKQ==-->Update module github.com/prometheus/client_golang to v1.21.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7121): <!--number 7121 --><!--line 0 --><!--description Y29ycmVjdCBsb2dnaW5nIGlmIGNhbGxlciBoYXMgZ2VuZXJpY3M=-->correct logging if caller has generics<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7118): <!--number 7118 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjEuNjQuNiAoZm9yZ2Vqbyk=-->Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v1.64.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7117): <!--number 7117 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjQuMSAoZm9yZ2Vqbyk=-->Update dependency go to v1.24.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7115): <!--number 7115 --><!--line 0 --><!--description aW50cm9kdWNlIGRpc3RhbnQgZmVkZXJhdGlvbiBzZXJ2ZXIgbW9jaw==-->introduce distant federation server mock<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7114): <!--number 7114 --><!--line 0 --><!--description Zml4IHRoZSBtb2R1bGFyaXR5IGZvciBtaWdyYXRpb24gdjE4-->fix the modularity for migration v18<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7112): <!--number 7112 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL29wZW5jb250YWluZXJzL2ltYWdlLXNwZWMgdG8gdjEuMS4xIChmb3JnZWpvKQ==-->Update module github.com/opencontainers/image-spec to v1.1.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7111): <!--number 7111 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTAgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-10 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7109): <!--number 7109 --><!--line 0 --><!--description ZmVhdChidWlsZCk6IGxpbnRlciBmb3IgbWlzc2luZyBtc2dpZCBkZWZpbml0aW9ucw==-->feat(build): linter for missing msgid definitions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7108): <!--number 7108 --><!--line 0 --><!--description Rml4OiBGb3JjZSBhbGwgcmVwbyB0YWIgYnV0dG9ucyB0byBiZSB0aGUgc2FtZSBoZWlnaHQ=-->Fix: Force all repo tab buttons to be the same height<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7106): <!--number 7106 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7105): <!--number 7105 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xODUuMCAoZm9yZ2Vqbyk=-->Update renovate to v39.185.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7101): <!--number 7101 --><!--line 0 --><!--description Zml4KHVpKTogYWRkIGhlYWRlciB0byBvcmcgc2V0dGluZ3MgL2Jsb2NrZWQgdXNlcnMgcGFnZQ==-->fix(ui): add header to org settings /blocked users page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7099): <!--number 7099 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIGRpc2N1c3Npb25zIGljb24gaW4gaXNzdWUgbGlzdCBlbnRyaWVz-->fix(ui): use discussions icon in issue list entries<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7096): <!--number 7096 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2poaWxseWVyZC9lbm1pbWUvdjIgdG8gdjIuMS4wIChmb3JnZWpvKQ==-->Update module github.com/jhillyerd/enmime/v2 to v2.1.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7089): <!--number 7089 --><!--line 0 --><!--description aTE4bihlbik6IGEgZmV3IHNvdXJjZSBmaXhlcw==-->i18n(en): a few source fixes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7086): <!--number 7086 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1B1ZXJraXRvQmlvL2dvcXVlcnkgdG8gdjEuMTAuMiAoZm9yZ2Vqbyk=-->Update module github.com/PuerkitoBio/goquery to v1.10.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7085): <!--number 7085 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy4xLjggKGZvcmdlam8p-->Update dependency happy-dom to v17.1.8 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7083): <!--number 7083 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHN0eWxpc3RpYy9zdHlsZWxpbnQtcGx1Z2luIHRvIHYzLjEuMiAoZm9yZ2Vqbyk=-->Update dependency @stylistic/stylelint-plugin to v3.1.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7080): <!--number 7080 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2YzL2dvZjMvdjMgdG8gdjMuMTAuNCAoZm9yZ2Vqbyk=-->Update module code.forgejo.org/f3/gof3/v3 to v3.10.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7078): <!--number 7078 --><!--line 0 --><!--description Y2hvcmUoY2kpOiBlbnN1cmUgdGhlIG1hbnVhbGx5IGNhY2hlZCBHbyBjYW4gYmUgcnVu-->chore(ci): ensure the manually cached Go can be run<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7074): <!--number 7074 --><!--line 0 --><!--description Y2hvcmUodXBncmFkZSk6IHN3aXRjaCB0byBjb2RlLmZvcmdlam8ub3JnL2Zvcmdlam8vbGV2ZWxxdWV1ZQ==-->chore(upgrade): switch to code.forgejo.org/forgejo/levelqueue<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7068): <!--number 7068 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1Byb3Rvbk1haWwvZ28tY3J5cHRvIHRvIHYxLjEuNiAoZm9yZ2Vqbyk=-->Update module github.com/ProtonMail/go-crypto to v1.1.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7063): <!--number 7063 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvb2F1dGgyIHRvIHYwLjI3LjAgKGZvcmdlam8p-->Update module golang.org/x/oauth2 to v0.27.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7058): <!--number 7058 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjM1LjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.35.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7056): <!--number 7056 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvdG9vbHMvZ29wbHMgdG8gdjAuMTguMSAoZm9yZ2Vqbyk=-->Update module golang.org/x/tools/gopls to v0.18.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7050): <!--number 7050 --><!--line 0 --><!--description am9iIGxpc3QgcmVzcG9uc2UgdG8gYXZvaWQgd3JhcHBlZCBib2R5Lg==-->job list response to avoid wrapped body.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7048): <!--number 7048 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy9mb3JnZWpvL2Zvcmdlam8tYnVpbGQtcHVibGlzaCBhY3Rpb24gdG8gdjUuMy40IChmb3JnZWpvKQ==-->Update https://data.forgejo.org/forgejo/forgejo-build-publish action to v5.3.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7043): <!--number 7043 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy9mb3JnZWpvL2Zvcmdlam8tYnVpbGQtcHVibGlzaCBhY3Rpb24gdG8gdjUuMy4zIChmb3JnZWpvKQ==-->Update https://data.forgejo.org/forgejo/forgejo-build-publish action to v5.3.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7042): <!--number 7042 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xNzguMSAoZm9yZ2Vqbyk=-->Update renovate to v39.178.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7041): <!--number 7041 --><!--line 0 --><!--description Y2hvcmU6IGFkZCBlbXB0eSBgc2VjcmV0YCB0YWJsZSBmaXh0dXJlcw==-->chore: add empty `secret` table fixtures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7039): <!--number 7039 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvb2NpL2dvbGFuZyBEb2NrZXIgdGFnIHRvIHYxLjI0IChmb3JnZWpvKQ==-->Update data.forgejo.org/oci/golang Docker tag to v1.24 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7037): <!--number 7037 --><!--line 0 --><!--description ZmVhdCh1aSk6IGluY2x1ZGUgTUlNRSB0eXBlIGZvciBhcmNoaXZlIGxpbmtzIGluIGZvbGRlciBkb3dubG9hZA==-->feat(ui): include MIME type for archive links in folder download<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7036): <!--number 7036 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZW1lbnRzIGFyb3VuZCBmb2xkZXIgZG93bmxvYWQ=-->fix(ui): improvements around folder download<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7032): <!--number 7032 --><!--line 0 --><!--description aTE4bihlbik6IHNob3J0ZW4gYmFubmVyIHRleHQgZm9yIGFyY2hpdmVkIHJlcG9z-->i18n(en): shorten banner text for archived repos<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7031): <!--number 7031 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMDkgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-09 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7029): <!--number 7029 --><!--line 0 --><!--description Zml4KHJlcG8pOiByZXR1cm4gY29kZSA0MDAgaW5zdGVhZCBvZiA1MDAgZm9yIGludmFsaWQgYXJjaGl2ZSB0eXBl-->fix(repo): return code 400 instead of 500 for invalid archive type<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7023): <!--number 7023 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjM0LjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.34.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7019): <!--number 7019 --><!--line 0 --><!--description Rml4IGludmFsaWQgc3dhZ2dlciBzeW50YXggb2YgJHJlZiB3aXRoIHNpYmxpbmc=-->Fix invalid swagger syntax of $ref with sibling<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7017): <!--number 7017 --><!--line 0 --><!--description VXBkYXRlIHgvdG9vbHMgKGZvcmdlam8p-->Update x/tools (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7016): <!--number 7016 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3Byb21ldGhldXMvY2xpZW50X2dvbGFuZyB0byB2MS4yMS4wIChmb3JnZWpvKQ==-->Update module github.com/prometheus/client_golang to v1.21.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7015): <!--number 7015 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21laWxpc2VhcmNoL21laWxpc2VhcmNoLWdvIHRvIHYwLjMxLjAgKGZvcmdlam8p-->Update module github.com/meilisearch/meilisearch-go to v0.31.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7008): <!--number 7008 --><!--line 0 --><!--description Zml4KGV4YW1wbGUgY29uZik6IGFkZCAud2VicCB0byBBTExPV0VEX1RZUEVT-->fix(example conf): add .webp to ALLOWED_TYPES<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7007): <!--number 7007 --><!--line 0 --><!--description bGludGluZzogZml4IHR5cG9zLCBhZGQgdG9tbCB2YWxpZGF0aW9u-->linting: fix typos, add toml validation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7005): <!--number 7005 --><!--line 0 --><!--description VXBkYXRlIFppZyBnaXRpZ25vcmU=-->Update Zig gitignore<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7003): <!--number 7003 --><!--line 0 --><!--description cmV0dXJuIDQwNCBmb3IgZW1wdHkgcmVwb3NpdG9yaWVz-->return 404 for empty repositories<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6985): <!--number 6985 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2J1aWxka2l0ZS90ZXJtaW5hbC10by1odG1sL3YzIHRvIHYzLjE2LjYgKGZvcmdlam8p-->Update module github.com/buildkite/terminal-to-html/v3 to v3.16.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6969): <!--number 6969 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6967): <!--number 6967 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xNzEuMiAoZm9yZ2Vqbyk=-->Update renovate to v39.171.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6965): <!--number 6965 --><!--line 0 --><!--description Y2hvcmU6IGFkZCBhIG1ha2Ugb3B0aW9uIHRvIGRpc2FibGUgc3RyaXBwaW5nIGJpbmFyaWVzIGZvciBkZWJ1ZyBidWlsZHM=-->chore: add a make option to disable stripping binaries for debug builds<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6961): <!--number 6961 --><!--line 0 --><!--description UmV2ZXJ0ICJVcGRhdGUgbW9kdWxlIGdpdGh1Yi5jb20vbWluaW8vbWluaW8tZ28vdjcgdG8gdjcuMC44NiAoZm9yZ2VqbykgKCM2OTQ1KSI=-->Revert "Update module github.com/minio/minio-go/v7 to v7.0.86 (forgejo) (#6945)"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6959): <!--number 6959 --><!--line 0 --><!--description ZmVhdCh1aSk6IGFkZCBNSU1FIHR5cGVzIGZvciBnZW5lcmF0ZWQgYXJjaGl2ZXM=-->feat(ui): add MIME types for generated archives<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6958): <!--number 6958 --><!--line 0 --><!--description aTE4bjogdHJhbnNsYXRpb24gdXBkYXRlcyBmcm9tIEdpdGVh-->i18n: translation updates from Gitea<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6957): <!--number 6957 --><!--line 0 --><!--description Zm9yZ2VqbyBtaWdyYXRpb25zIG51bWJlcmluZyBpbiBjb21tZW50cyBhbmQgcmVuYW1lIGxhdGVzdCBtaWdyYXRpb24gZmlsZQ==-->forgejo migrations numbering in comments and rename latest migration file<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6953): <!--number 6953 --><!--line 0 --><!--description bmF0aXZlIHBhcnNpbmcgb2Ygc3NoIGNlcnRpZmljYXRlIGtleQ==-->native parsing of ssh certificate key<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6950): <!--number 6950 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNyAoZm9yZ2Vqbyk=-->Update dependency happy-dom to v17 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6949): <!--number 6949 --><!--line 0 --><!--description VXBkYXRlIGdvbGFuZyBwYWNrYWdlcyB0byB2MS4yNCAoZm9yZ2VqbykgKG1pbm9yKQ==-->Update golang packages to v1.24 (forgejo) (minor)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6945): <!--number 6945 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuODYgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.86 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6942): <!--number 6942 --><!--line 0 --><!--description QWxzbyBzdWJzdGl0dXRlIGBDT1BZUklHSFQgSE9MREVSYCBhbmQgYHRoZSBvcmdhbml6YXRpb25gIGluIEJTRCA0LUNsYXVzZSBsaWNlbnNl-->Also substitute `COPYRIGHT HOLDER` and `the organization` in BSD 4-Clause license<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6937): <!--number 6937 --><!--line 0 --><!--description ZGVsYXkgZGVsZXRpbmcgYXV0aG9yaXphdGlvbiB0b2tlbg==-->delay deleting authorization token<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6928): <!--number 6928 --><!--line 0 --><!--description aTE4bjogcmV3b3JkIGFyY2hpdmUudGl0bGUgYW5kIGFyY2hpdmUudGl0bGUuZGF0ZSBpbiBlbmdsaXNoIGxvY2FsZQ==-->i18n: reword archive.title and archive.title.date in english locale<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6927): <!--number 6927 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OC4wIChmb3JnZWpvKQ==-->Update dependency webpack to v5.98.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6923): <!--number 6923 --><!--line 0 --><!--description ZmVhdCh1aSk6IGFsd2F5cyBzaG93IHJlc3RhcnQgYnV0dG9uIGZvciBBY3Rpb25zIGpvYnM=-->feat(ui): always show restart button for Actions jobs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6917): <!--number 6917 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ2xvYmFscyB0byB2MTUuMTUuMCAoZm9yZ2Vqbyk=-->Update dependency globals to v15.15.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6916): <!--number 6916 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2J1aWxka2l0ZS90ZXJtaW5hbC10by1odG1sL3YzIHRvIHYzLjE2LjUgKGZvcmdlam8p-->Update module github.com/buildkite/terminal-to-html/v3 to v3.16.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6913): <!--number 6913 --><!--line 0 --><!--description QWRkIHBvc3NpYmlsaXR5IG9mIHJlbW92ZWQgY29udGVudCB0byA0MDQgcGFnZQ==-->Add possibility of removed content to 404 page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6908): <!--number 6908 --><!--line 0 --><!--description UmVkdWNlIGxpbmtzIGluIGNoYXQgbm90aWZpY2F0aW9ucyB0byBhdm9pZCBtdWx0aXBsZSBwcmV2aWV3cw==-->Reduce links in chat notifications to avoid multiple previews<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6903): <!--number 6903 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNidWlsZC1sb2FkZXIgdG8gdjQuMy4wIChmb3JnZWpvKQ==-->Update dependency esbuild-loader to v4.3.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6898): <!--number 6898 --><!--line 0 --><!--description Zml4KHVpKTogaGlkZSBleHRyYSBQUiBwcm9wZXJ0eSBsYWJlbHMgb24gdGl0bGUgZWRpdA==-->fix(ui): hide extra PR property labels on title edit<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6891): <!--number 6891 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM1LjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.35.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6890): <!--number 6890 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgcG9zdGNzcyB0byB2OC41LjIgKGZvcmdlam8p-->Update dependency postcss to v8.5.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6885): <!--number 6885 --><!--line 0 --><!--description Rml4IGFwaSByZXR1cm5zIGludGVybmFsIHNlcnZlciBlcnJvciB3aGVuIG5vdCBmb3VuZCBzaG91bGQgYmUgcmV0dXJuZWQ=-->Fix api returns internal server error when not found should be returned<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6883): <!--number 6883 --><!--line 0 --><!--description Zml4KHVpKTogcmVsZWFzZTogc2V0IGRlZmF1bHQgcmVsZWFzZSB0aXRsZSB0byB0YWcgbmFtZQ==-->fix(ui): release: set default release title to tag name<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6882): <!--number 6882 --><!--line 0 --><!--description Zml4KHVpKTogdXNlICJvcmdhbml6YXRpb24gbmFtZSIgaW4gY29sZG93biBtZXNzYWdlcyBmb3Igb3Jncw==-->fix(ui): use "organization name" in coldown messages for orgs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6877): <!--number 6877 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6875): <!--number 6875 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuODUgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.85 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6874): <!--number 6874 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xNjQuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.164.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6866): <!--number 6866 --><!--line 0 --><!--description YWx3YXlzIHNldCBzdHJpcHBlZCBzbGFzaGVzIG9uIGh0dHAgcmVxdWVzdA==-->always set stripped slashes on http request<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6865): <!--number 6865 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMDcgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-07 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6858): <!--number 6858 --><!--line 0 --><!--description Y2hvcmUoYXBpKTogSW1wcm92ZSBkZXNjcmlwdGlvbiBmb3IgYHJlcG9DaGVja0NvbGxhYm9yYXRvcmA=-->chore(api): Improve description for `repoCheckCollaborator`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6857): <!--number 6857 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IGZpeCBGb3JnZWpvIHYxMC4wLjEgJiB2Ny4wLjEzIGJsb2cgcG9zdCBVUkwgKGFnYWluKSBbc2tpcCBjaV0=-->chore(release-notes): fix Forgejo v10.0.1 & v7.0.13 blog post URL (again) [skip ci]<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6852): <!--number 6852 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IGZpeCBGb3JnZWpvIHYxMC4wLjEgJiB2Ny4wLjEzIGJsb2cgcG9zdCBVUkw=-->chore(release-notes): fix Forgejo v10.0.1 & v7.0.13 blog post URL<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6851): <!--number 6851 --><!--line 0 --><!--description Zml4KHVpKTogaGlkZSAnTmV3IG1pZ3JhdGlvbicgYnV0dG9uIG9uIG9yZyBwYWdlcyB3aXRoIG1pZ3JhdGlvbnMgZGlzYWJsZWQgKCM2ODUwKQ==-->fix(ui): hide 'New migration' button on org pages with migrations disabled (#6850)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6849): <!--number 6849 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjcuMC4xMw==-->chore(release-notes): Forgejo v7.0.13<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6848): <!--number 6848 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjEwLjAuMQ==-->chore(release-notes): Forgejo v10.0.1<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6844): <!--number 6844 --><!--line 0 --><!--description Zml4KHNlYyk6IEZvcmdlam8gQWN0aW9ucyB3ZWIgcm91dGVz-->fix(sec): Forgejo Actions web routes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6843): <!--number 6843 --><!--line 0 --><!--description Zml4KHNlYyk6IHBlcm1pc3Npb24gY2hlY2sgZm9yIHByb2plY3QgaXNzdWU=-->fix(sec): permission check for project issue<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6836): <!--number 6836 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjMzLjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.33.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6827): <!--number 6827 --><!--line 0 --><!--description W3NraXAgY2ldIEZpeCBmbGFreSBjbGlwYm9hcmQgdGVzdA==-->[skip ci] Fix flaky clipboard test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6825): <!--number 6825 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLWVucnkvZ28tZW5yeS92MiB0byB2Mi45LjIgKGZvcmdlam8p-->Update module github.com/go-enry/go-enry/v2 to v2.9.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6818): <!--number 6818 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSBGaW5pc2ggcmV2aWV3IGJ1dHRvbiB3b3JrIGFnYWlu-->fix(ui): make Finish review button work again<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6817): <!--number 6817 --><!--line 0 --><!--description YXZvaWQgeS1heGlzIGNsaXBwaW5nIGZvciBicmFuY2ggbmFtZQ==-->avoid y-axis clipping for branch name<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6816): <!--number 6816 --><!--line 0 --><!--description dWk6IHVwZGF0ZSBzdHlsaW5nIG9mIGNvbW1lbnQgaGVhZGVycyBhbmQgcm9sZSBsYWJlbHM=-->ui: update styling of comment headers and role labels<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6815): <!--number 6815 --><!--line 0 --><!--description Rml4IGNvbW1lbnQgZm9ybSBlMmUgdGVzdA==-->Fix comment form e2e test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6808): <!--number 6808 --><!--line 0 --><!--description Y2hvcmUoaTE4bik6IGxpbnQgZXJyb3Jz-->chore(i18n): lint errors<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6807): <!--number 6807 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvc3lzIHRvIHYwLjMwLjAgKGZvcmdlam8p-->Update module golang.org/x/sys to v0.30.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6800): <!--number 6800 --><!--line 0 --><!--description Y2hvcmU6IHRlYWNoIGxpbnQtbG9jYWxlIGFib3V0IGxvY2FsZV9uZXh0-->chore: teach lint-locale about locale_next<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6797): <!--number 6797 --><!--line 0 --><!--description YWRkIGNvbW1pdCBsaW1pdCBmb3Igd2ViaG9vayBwYXlsb2Fk-->add commit limit for webhook payload<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6796): <!--number 6796 --><!--line 0 --><!--description dWk6IHJlbW92ZSBkaXZpZGVyIGluIGNvZGUgc2VhcmNo-->ui: remove divider in code search<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6794): <!--number 6794 --><!--line 0 --><!--description Zml4KHVpKTogcmVtb3ZlIGNvZGUgc2VhcmNoIGdpdCBncmVwIHdhcm5pbmc=-->fix(ui): remove code search git grep warning<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6785): <!--number 6785 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjMuNiAoZm9yZ2Vqbyk=-->Update dependency go to v1.23.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6782): <!--number 6782 --><!--line 0 --><!--description bWFrZSBhdXRob3Igc2VhcmNoIGNhc2UgaW5zZW5zdGl2ZQ==-->make author search case insenstive<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6779): <!--number 6779 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBvdmVycmlkZSBwbGF0Zm9ybSB2ZXJzaW9u-->chore(renovate): override platform version<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6778): <!--number 6778 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xNTguMiAoZm9yZ2Vqbyk=-->Update renovate to v39.158.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6777): <!--number 6777 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2MyAoZm9yZ2VqbykgKG1ham9yKQ==-->Update vitest monorepo to v3 (forgejo) (major)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6776): <!--number 6776 --><!--line 0 --><!--description UGluIGRlcGVuZGVuY3kgY29kZXNwZWxsIHRvIDIuNC4xIChmb3JnZWpvKQ==-->Pin dependency codespell to 2.4.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6769): <!--number 6769 --><!--line 0 --><!--description RnJvbUFzQ2FzdGluZyB3YXJuaW5nIGZyb20gRG9ja2VyZmlsZQ==-->FromAsCasting warning from Dockerfile<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6768): <!--number 6768 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6767): <!--number 6767 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xNTYuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.156.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6758): <!--number 6758 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWFya2Rvd25saW50LWNsaSB0byB2MC40NC4wIChmb3JnZWpvKQ==-->Update dependency markdownlint-cli to v0.44.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6757): <!--number 6757 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNi44LjEgKGZvcmdlam8p-->Update dependency happy-dom to v16.8.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6756): <!--number 6756 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHBsYXl3cmlnaHQvdGVzdCB0byB2MS41MC4xIChmb3JnZWpvKQ==-->Update dependency @playwright/test to v1.50.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6755): <!--number 6755 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVzdC9lc2xpbnQtcGx1Z2luIHRvIHYxLjEuMjUgKGZvcmdlam8p-->Update dependency @vitest/eslint-plugin to v1.1.25 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6754): <!--number 6754 --><!--line 0 --><!--description dXNlIGNvcnJlY3QgZGVmYXVsdCBicmFuY2ggZm9yIG1pZ3JhdGVkIHdpa2k=-->use correct default branch for migrated wiki<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6750): <!--number 6750 --><!--line 0 --><!--description Y29uc2lkZXIgSEVBRCByZXF1ZXN0cyB0byBiZSBwdWxscw==-->consider HEAD requests to be pulls<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6743): <!--number 6743 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSBkZWFkY29kZQ==-->chore: remove deadcode<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6741): <!--number 6741 --><!--line 0 --><!--description Y2hvcmU6IFJlbW92ZSBgQ2hhbmdlTWlsZXN0b25lU3RhdHVzYA==-->chore: Remove `ChangeMilestoneStatus`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6740): <!--number 6740 --><!--line 0 --><!--description VHJhbnNpZW50IG1vZGVsIGZvciBmZWRlcmF0ZWQgdW5zdGFy-->Transient model for federated unstar<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6738): <!--number 6738 --><!--line 0 --><!--description Y2hvcmU6IGZpeCBjaSBmYWlsdXJl-->chore: fix ci failure<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6734): <!--number 6734 --><!--line 0 --><!--description RGlzYWJsZSBhdXRvZm9jdXMgb24gdGhlIGRhc2hib2FyZCByZXBvc2l0b3J5IHNlYXJjaCBib3g=-->Disable autofocus on the dashboard repository search box<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6729): <!--number 6729 --><!--line 0 --><!--description Zml4KHVpKTogZGlzYWJsZSBQUiByZXZpZXcgYnV0dG9uIGluIGFyY2hpdmVkIHJlcG9z-->fix(ui): disable PR review button in archived repos<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6728): <!--number 6728 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSBkZWFkY29kZSBpbiBgbW9kZWxzL3VzZXJg-->chore: remove deadcode in `models/user`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6727): <!--number 6727 --><!--line 0 --><!--description Y2hvcmU6IGxvYWQgMmZhIHN0YXR1cyBmb3IgdXNlciBzZWFyY2ggd2hlbiBuZWVkZWQ=-->chore: load 2fa status for user search when needed<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6726): <!--number 6726 --><!--line 0 --><!--description Y2hlY2sgZm9yIHdlYmF1dGhuIGluIDJmYSB1c2VyIHNlYXJjaA==-->check for webauthn in 2fa user search<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6716): <!--number 6716 --><!--line 0 --><!--description ZGlzYWxsb3cgYmxhbWUgb24gZGlyZWN0b3JpZXM=-->disallow blame on directories<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6715): <!--number 6715 --><!--line 0 --><!--description cmVuZGVyIGlzc3VlIHRpdGxlcyBjb25zaXN0ZW50bHk=-->render issue titles consistently<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6708): <!--number 6708 --><!--line 0 --><!--description U2V0IGV4cGxvcmUgcGFnZXMgdG8gY29uZmlndXJhYmxlIGRlZmF1bHQgc29ydA==-->Set explore pages to configurable default sort<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6703): <!--number 6703 --><!--line 0 --><!--description Y2hvcmU6IGNvbnNpc3RlbnQgZG9ja2VyIGltYWdlIGFuZCBhY3Rpb24gcmVmZXJlbmNlcw==-->chore: consistent docker image and action references<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6702): <!--number 6702 --><!--line 0 --><!--description Zml4KGkxOG4pOiB1c2UgdHJhbnNsYXRlIGtleSBhcyBmYWxsYmFjaw==-->fix(i18n): use translate key as fallback<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6701): <!--number 6701 --><!--line 0 --><!--description Zml4KGkxOG4pOiBhZGQgZm9yZ290dGVuIHRyYW5zbGF0YWJsZSBzdHJpbmc=-->fix(i18n): add forgotten translatable string<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6700): <!--number 6700 --><!--line 0 --><!--description dWk6IHVwZGF0ZSBsYW5ndWFnZSBzdGF0cyBsYXlvdXQgYW5kIGNsaWNrIGJlaGF2aW9y-->ui: update language stats layout and click behavior<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6699): <!--number 6699 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2VkaXRvcmNvbmZpZy1jaGVja2VyL2VkaXRvcmNvbmZpZy1jaGVja2VyL3YzL2NtZC9lZGl0b3Jjb25maWctY2hlY2tlciB0byB2My4yLjAgKGZvcmdlam8p-->Update module github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker to v3.2.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6695): <!--number 6695 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4xMzYuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.136.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6692): <!--number 6692 --><!--line 0 --><!--description Y2hvcmU6IFVwZGF0ZSByZW5vdmF0ZSB0byB2MzkuMTM2LjA=-->chore: Update renovate to v39.136.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6689): <!--number 6689 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSB1c2FnZXMgb2YgYHNvcnQuU29ydGA=-->chore: remove usages of `sort.Sort`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6688): <!--number 6688 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMDUgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-05 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6686): <!--number 6686 --><!--line 0 --><!--description bml0KGkxOG4pOiB1cGRhdGUgcGFzc3dvcmQgdXBkYXRlIGluc3RydWN0aW9u-->nit(i18n): update password update instruction<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6677): <!--number 6677 --><!--line 0 --><!--description YWRkIG5vbiBhbGxvd2VkIGRvbWFpbiB0cmFuc2xhdGlvbg==-->add non allowed domain translation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6676): <!--number 6676 --><!--line 0 --><!--description Y2hvcmU6IHRlYWNoIGBzZXRgIG1vZHVsZSBhYm91dCBgaXRlci5TZXFg-->chore: teach `set` module about `iter.Seq`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6667): <!--number 6667 --><!--line 0 --><!--description W3NraXAgY2ldIGNob3JlOiBhZGp1c3QgaTE4biBlbnRyaWVzIGluIENPREVPV05FUlM=-->[skip ci] chore: adjust i18n entries in CODEOWNERS<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6666): <!--number 6666 --><!--line 0 --><!--description Y2hvcmU6IGZpeCB0eXBvcywgZGVjYXAgYSBmZXcgaTE4biBzdHJpbmdz-->chore: fix typos, decap a few i18n strings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6663): <!--number 6663 --><!--line 0 --><!--description Y29kZSByZXZpZXcgYWx0IHJlcG9zaXRvcnk=-->code review alt repository<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6659): <!--number 6659 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLWdpdC9nby1naXQvdjUgdG8gdjUuMTMuMiAoZm9yZ2Vqbyk=-->Update module github.com/go-git/go-git/v5 to v5.13.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6656): <!--number 6656 --><!--line 0 --><!--description UmVsZWFzZS1ub3RlIGFuZCBmaWxlIHJlbmFtZSBmb3IgQWx0IExpbnV4IEFwdC1SUE0gc3VwcG9ydA==-->Release-note and file rename for Alt Linux Apt-RPM support<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6655): <!--number 6655 --><!--line 0 --><!--description Y2hvcmUoc2VjdXJpdHkpOiB1cGRhdGUgc2VjdXJpdHkudHh0IHdpdGggbmV3IGV4cGlyYXRpb24gZGF0ZQ==-->chore(security): update security.txt with new expiration date<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6652): <!--number 6652 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgY29kZXNwZWxsIHRvIHYyLjQuMCAoZm9yZ2Vqbyk=-->Update dependency codespell to v2.4.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6649): <!--number 6649 --><!--line 0 --><!--description Zml4KHRlc3RzKTogcHJldmVudCBmcm9udGVuZCB0ZXN0IGRlcGVuZGVuY3kgb24gc3lzdGVtIGxvY2FsZQ==-->fix(tests): prevent frontend test dependency on system locale<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6646): <!--number 6646 --><!--line 0 --><!--description Y2k6IGZpeCBnbyB2ZXJzaW9uIGNoZWNr-->ci: fix go version check<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6630): <!--number 6630 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6629): <!--number 6629 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuODQgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.84 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6623): <!--number 6623 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMDQgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-04 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6620): <!--number 6620 --><!--line 0 --><!--description Zml4KHVpKTogYWRkIHRyaWFuZ2xlIGRvd24gb2N0aWNvbiB0byBjb2RlIHNlYXJjaCBvcHRpb25zIGRyb3Bkb3du-->fix(ui): add triangle down octicon to code search options dropdown<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6619): <!--number 6619 --><!--line 0 --><!--description ZW5oKHVpKTogUmVtb3ZlIERpZmZGaWxlTGlzdCBjb21wb25lbnQ=-->enh(ui): Remove DiffFileList component<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6617): <!--number 6617 --><!--line 0 --><!--description Zml4KHVpKTogcHJldmVudCBvdmVyZmxvdyBvZiBicmFuY2ggc2VsZWN0b3IgaW4gY29tbWl0IGdyYXBo-->fix(ui): prevent overflow of branch selector in commit graph<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6613): <!--number 6613 --><!--line 0 --><!--description SGlkZSBnaXQgbm90ZSBhZGQgYnV0dG9uIGZvciBjb21taXQsIGlmIGNvbW1pdCBhbHJlYWR5IGhhcyBhIG5vdGU=-->Hide git note add button for commit, if commit already has a note<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6610): <!--number 6610 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBmaXggc2VsZi11cGRhdGUgY29uZmlnIFtza2lwIGNpXQ==-->chore(renovate): fix self-update config [skip ci]<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6607): <!--number 6607 --><!--line 0 --><!--description Zml4KGkxOG4pOiBmbGF0dGVuIG5leHQgbG9jYWxlcw==-->fix(i18n): flatten next locales<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6606): <!--number 6606 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIERvY2tlciB0YWcgdG8gdjM5LjExNS40IChmb3JnZWpvKQ==-->Update renovate Docker tag to v39.115.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6603): <!--number 6603 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kga2F0ZXggdG8gdjAuMTYuMjEgKGZvcmdlam8p-->Update dependency katex to v0.16.21 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6597): <!--number 6597 --><!--line 0 --><!--description Rml4IG1lbnRpb24gYW5kIGVtb2ppIGV4cGFuc2lvbiAmIEltcHJvdmUgbGVhdmluZyBsaXN0IGNvbXBsZXRpb24=-->Fix mention and emoji expansion & Improve leaving list completion<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6595): <!--number 6595 --><!--line 0 --><!--description UmVzZXQgY29udGVudCBvZiBjb21tZW50IGVkaXQgZmllbGQgb24gY2FuY2Vs-->Reset content of comment edit field on cancel<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6591): <!--number 6591 --><!--line 0 --><!--description cmVkdWNlIG5vaXNlIGZvciB0aGUgdjMwMyBtaWdyYXRpb24=-->reduce noise for the v303 migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6590): <!--number 6590 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjMuNSAoZm9yZ2Vqbyk=-->Update dependency go to v1.23.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6581): <!--number 6581 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb29nbGUuZ29sYW5nLm9yZy9wcm90b2J1ZiB0byB2MS4zNi4zIChmb3JnZWpvKQ==-->Update module google.golang.org/protobuf to v1.36.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6577): <!--number 6577 --><!--line 0 --><!--description YXZvaWQgR2l0ZWEgbWlncmF0aW9uIHdhcm5pbmdzICh0YWtlIDIp-->avoid Gitea migration warnings (take 2)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6576): <!--number 6576 --><!--line 0 --><!--description Zml4KHVpKTogY29ycmVjdCBzd2l0Y2ggb3JkZXJpbmc=-->fix(ui): correct switch ordering<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6573): <!--number 6573 --><!--line 0 --><!--description Y2hvcmUoY2kpOiB1cGdyYWRlIGZvcmdlam8tYnVpbGQtcHVibGlzaC9idWlsZEB2NS4zLjE=-->chore(ci): upgrade forgejo-build-publish/build@v5.3.1<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6572): <!--number 6572 --><!--line 0 --><!--description Rml4IGlubGluZSBmaWxlIHByZXZpZXcgZm9yIHJlbmRlcmVkIGZpbGVz-->Fix inline file preview for rendered files<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6570): <!--number 6570 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIERvY2tlciB0YWcgdG8gdjM5LjExMS4wIChmb3JnZWpvKQ==-->Update renovate Docker tag to v39.111.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6569): <!--number 6569 --><!--line 0 --><!--description dGVzdHMoZTJlKTogVmFyaW91cyBmaXhlcyB0byB2aXN1YWwgdGVzdGluZw==-->tests(e2e): Various fixes to visual testing<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6563): <!--number 6563 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy9pbmZyYXN0cnVjdHVyZS9pc3N1ZS1hY3Rpb24gYWN0aW9uIHRvIHYxLjMuMCAoZm9yZ2Vqbyk=-->Update https://data.forgejo.org/infrastructure/issue-action action to v1.3.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6562): <!--number 6562 --><!--line 0 --><!--description VXBkYXRlIHBvc3Rjc3MgKGZvcmdlam8p-->Update postcss (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6560): <!--number 6560 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb29nbGUuZ29sYW5nLm9yZy9ncnBjIHRvIHYxLjcwLjAgKGZvcmdlam8p-->Update module google.golang.org/grpc to v1.70.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6559): <!--number 6559 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQGdpdGh1Yi9yZWxhdGl2ZS10aW1lLWVsZW1lbnQgdG8gdjQuNC41IChmb3JnZWpvKQ==-->Update dependency @github/relative-time-element to v4.4.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6551): <!--number 6551 --><!--line 0 --><!--description YWRkIGEgYnVmZmVyIHdyaXRlciB0byB0aGUgbG9nZ2VyLCBmb3IgaW50ZXJuYWwgdXNl-->add a buffer writer to the logger, for internal use<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6550): <!--number 6550 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIERvY2tlciB0YWcgdG8gdjM5LjEwNi4wIChmb3JnZWpvKQ==-->Update renovate Docker tag to v39.106.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6548): <!--number 6548 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kga2F0ZXggdG8gdjAuMTYuMjAgKGZvcmdlam8p-->Update dependency katex to v0.16.20 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6547): <!--number 6547 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvcmVub3ZhdGUvcmVub3ZhdGUgRG9ja2VyIHRhZyB0byB2MzkuMTA2LjAgKGZvcmdlam8p-->Update data.forgejo.org/renovate/renovate Docker tag to v39.106.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6546): <!--number 6546 --><!--line 0 --><!--description TWFrZSBzd2l0Y2ggbGFyZ2VyIG9uIHRvdWNoc2NyZWVuIGRldmljZXM=-->Make switch larger on touchscreen devices<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6545): <!--number 6545 --><!--line 0 --><!--description VXNlIHJlZGVzaWduZWQgc3dpdGNoIG9uIGNvbW1pdCBncmFwaCBwYWdl-->Use redesigned switch on commit graph page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6544): <!--number 6544 --><!--line 0 --><!--description VXNlIGZsZXggZm9yIHN3aXRjaCBpdGVtcw==-->Use flex for switch items<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6543): <!--number 6543 --><!--line 0 --><!--description UHJldmVudCB2ZXJ0aWNhbCBzdHJldGNoaW5nIG9mIHRoZSBzd2l0Y2g=-->Prevent vertical stretching of the switch<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6542): <!--number 6542 --><!--line 0 --><!--description QXBwbHkgc3dpdGNoIHJlZGVzaWduIHRvIG1vcmUgYXJlYXM=-->Apply switch redesign to more areas<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6541): <!--number 6541 --><!--line 0 --><!--description Rml4IG1pbm9yIG1pc2FsaWdubWVudA==-->Fix minor misalignment<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6540): <!--number 6540 --><!--line 0 --><!--description RG8gbm90IHJlcG9ydCB3YXJuaW5nIHdoZW4gZ2l0IHNob3dzIG5ldyByZWZlcmVuY2U=-->Do not report warning when git shows new reference<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6539): <!--number 6539 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMDMgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-03 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6537): <!--number 6537 --><!--line 0 --><!--description VXBkYXRlIHgvdG9vbHMgKGZvcmdlam8p-->Update x/tools (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6535): <!--number 6535 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2Zvcmdlam8vYWN0IHRvIHYxLjIzLjEgKGZvcmdlam8p-->Update module code.forgejo.org/forgejo/act to v1.23.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6529): <!--number 6529 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIERvY2tlciB0YWcgdG8gdjM5LjEwMy4wIChmb3JnZWpvKQ==-->Update renovate Docker tag to v39.103.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6528): <!--number 6528 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmdpdGVhLmlvL3Nkay9naXRlYSB0byB2MC4yMC4wIChmb3JnZWpvKQ==-->Update module code.gitea.io/sdk/gitea to v0.20.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6525): <!--number 6525 --><!--line 0 --><!--description Zml4IGlubGluZSBmaWxlIHByZXZpZXcgZm9yIGZpbGVzIHdpdGggZW5jb2RlZCBVUkwsIGZpeCAjNTA2OQ==-->fix inline file preview for files with encoded URL, fix #5069<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6522): <!--number 6522 --><!--line 0 --><!--description UmVtb3ZlIHNvdXJjZSBicmFuY2ggZnJvbSBwciBsaXN0LCBmaXggIzUwMDksICM2MDgw-->Remove source branch from pr list, fix #5009, #6080<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6521): <!--number 6521 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRsYWIuY29tL2dpdGxhYi1vcmcvYXBpL2NsaWVudC1nbyB0byB2MC4xMTkuMCAoZm9yZ2Vqbyk=-->Update module gitlab.com/gitlab-org/api/client-go to v0.119.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6520): <!--number 6520 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2VkaXRvcmNvbmZpZy1jaGVja2VyL2VkaXRvcmNvbmZpZy1jaGVja2VyL3YzL2NtZC9lZGl0b3Jjb25maWctY2hlY2tlciB0byB2My4xLjEgKGZvcmdlam8p-->Update module github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker to v3.1.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6518): <!--number 6518 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgYXNjaWluZW1hLXBsYXllciB0byB2My44LjIgKGZvcmdlam8p-->Update dependency asciinema-player to v3.8.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6513): <!--number 6513 --><!--line 0 --><!--description cG9ydChnaXRlYSMzMTk1NCk6IEFkZCBsb2NrIGZvciBwYXJhbGxlbCBtYXZlbiB1cGxvYWQ=-->port(gitea#31954): Add lock for parallel maven upload<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6511): <!--number 6511 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbW9uYWNvLWVkaXRvciB0byB2MC41Mi4yIChmb3JnZWpvKQ==-->Update dependency monaco-editor to v0.52.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6510): <!--number 6510 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2NhZGR5c2VydmVyL2NlcnRtYWdpYyB0byB2MC4yMS42IChmb3JnZWpvKQ==-->Update module github.com/caddyserver/certmagic to v0.21.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6509): <!--number 6509 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgdHlwZXNjcmlwdCB0byB2NS43LjMgKGZvcmdlam8p-->Update dependency typescript to v5.7.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6506): <!--number 6506 --><!--line 0 --><!--description QWRkZWQgYGFsdGAncyB0byBgPGltZz5g-->Added `alt`'s to `<img>`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6504): <!--number 6504 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBtYW51YWwgbmFtZSByZXBsYWNlbWVudA==-->chore(renovate): manual name replacement<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6503): <!--number 6503 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvcmVub3ZhdGUvcmVub3ZhdGUgRG9ja2VyIHRhZyB0byB2MzkuOTMuMCAoZm9yZ2Vqbyk=-->Update data.forgejo.org/renovate/renovate Docker tag to v39.93.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6502): <!--number 6502 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvb2NpL2FscGluZSBEb2NrZXIgdGFnIHRvIHYzLjIxIChmb3JnZWpvKQ==-->Update data.forgejo.org/oci/alpine Docker tag to v3.21 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6500): <!--number 6500 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb29nbGUuZ29sYW5nLm9yZy9wcm90b2J1ZiB0byB2MS4zNi4yIChmb3JnZWpvKQ==-->Update module google.golang.org/protobuf to v1.36.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6499): <!--number 6499 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1Byb3Rvbk1haWwvZ28tY3J5cHRvIHRvIHYxLjEuNCAoZm9yZ2Vqbyk=-->Update module github.com/ProtonMail/go-crypto to v1.1.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6495): <!--number 6495 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLWdpdC9nby1naXQvdjUgdG8gdjUuMTMuMSAoZm9yZ2Vqbyk=-->Update module github.com/go-git/go-git/v5 to v5.13.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6491): <!--number 6491 --><!--line 0 --><!--description dXBncmFkZSBnb2YzIHBhY2thZ2UgYW5kIGRyaXZlcg==-->upgrade gof3 package and driver<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6490): <!--number 6490 --><!--line 0 --><!--description UmVwbGFjZSBkYXRhLmZvcmdlam8ub3JnL2Zvcmdlam8tY29udHJpYi9yZW5vdmF0ZSBEb2NrZXIgdGFnIHdpdGggZGF0YS5mb3JnZWpvLm9yZy9yZW5vdmF0ZS9yZW5vdmF0ZSAoZm9yZ2Vqbyk=-->Replace data.forgejo.org/forgejo-contrib/renovate Docker tag with data.forgejo.org/renovate/renovate (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6488): <!--number 6488 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSBpbGxlZ2FsIGdpdCB1c2FnZQ==-->chore: remove illegal git usage<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6487): <!--number 6487 --><!--line 0 --><!--description Y2hvcmUoZGVwcyk6IFVwZGF0ZSBnaXRsYWIgYXBpIHRvIHVwZGF0ZWQgbGlicmFyeQ==-->chore(deps): Update gitlab api to updated library<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6482): <!--number 6482 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM0LjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.34.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6480): <!--number 6480 --><!--line 0 --><!--description VXBkYXRlIGZvcmdlam8vZm9yZ2Vqby1idWlsZC1wdWJsaXNoIGFjdGlvbiB0byB2NS4zLjAgKGZvcmdlam8p-->Update forgejo/forgejo-build-publish action to v5.3.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6479): <!--number 6479 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuODMgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.83 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6478): <!--number 6478 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6477): <!--number 6477 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2FsZWN0aG9tYXMvY2hyb21hL3YyIHRvIHYyLjE1LjAgKGZvcmdlam8p-->Update module github.com/alecthomas/chroma/v2 to v2.15.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6476): <!--number 6476 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZmFzdC1nbG9iIHRvIHYzLjMuMyAoZm9yZ2Vqbyk=-->Update dependency fast-glob to v3.3.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6475): <!--number 6475 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS45MS4wIChmb3JnZWpvKQ==-->Update renovate to v39.91.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6463): <!--number 6463 --><!--line 0 --><!--description Zml4KHVpKTogc2hvdyBvYXV0aCBkaXZpZGVyIG9uIHNpZ251cCBwYWdl-->fix(ui): show oauth divider on signup page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6462): <!--number 6462 --><!--line 0 --><!--description Y2hvcmU6IHVwZGF0ZSBpZ25vcmVz-->chore: update ignores<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6461): <!--number 6461 --><!--line 0 --><!--description YWRkIGZpbGVzIHRvIGNvbXBhcmU=-->add files to compare<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6459): <!--number 6459 --><!--line 0 --><!--description VUkgc3dpdGNoIHJlZGVzaWdu-->UI switch redesign<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6458): <!--number 6458 --><!--line 0 --><!--description Y2hvcmUoY2kpOiB1c2UgbWlycm9yIGZvciBvYnRhaW5pbmcgZ28teHNkLWR1cmF0aW9u-->chore(ci): use mirror for obtaining go-xsd-duration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6454): <!--number 6454 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNiAoZm9yZ2Vqbyk=-->Update dependency happy-dom to v16 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6453): <!--number 6453 --><!--line 0 --><!--description Y2hvcmU6IGJ1bXAgcmVub3ZhdGUgdG8gdjM5LjkwLjA=-->chore: bump renovate to v39.90.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6447): <!--number 6447 --><!--line 0 --><!--description UmV3cml0ZSBPcGVuR3JhcGggSGVhZGVy-->Rewrite OpenGraph Header<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6441): <!--number 6441 --><!--line 0 --><!--description Zml4KGNvZGUgc2VhcmNoKTogZW1wdHkgbW9kZSBkcm9wZG93biB3aGVuIGtleXdvcmQgaXMgZW1wdHk=-->fix(code search): empty mode dropdown when keyword is empty<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6439): <!--number 6439 --><!--line 0 --><!--description aTE4bihlbik6IGNvbnNpc3RlbmN5IGltcHJvdmVtZW50cw==-->i18n(en): consistency improvements<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6437): <!--number 6437 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1B1ZXJraXRvQmlvL2dvcXVlcnkgdG8gdjEuMTAuMSAoZm9yZ2Vqbyk=-->Update module github.com/PuerkitoBio/goquery to v1.10.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6436): <!--number 6436 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVzdC9lc2xpbnQtcGx1Z2luIHRvIHYxLjEuMjIgKGZvcmdlam8p-->Update dependency @vitest/eslint-plugin to v1.1.22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6432): <!--number 6432 --><!--line 0 --><!--description Rml4IGVkaXRpbmcgcHIgcmV2aWV3-->Fix editing pr review<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6431): <!--number 6431 --><!--line 0 --><!--description TWFrZSBuZXcgdGFibGUgbW9kYWwgd29yayB3aGVuIGVkaXRpbmcgYSBpc3N1ZQ==-->Make new table modal work when editing a issue<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6427): <!--number 6427 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIHByaW1hcnkgY29sb3IgZm9yIGJ1dHRvbiBpbiB0YWJsZSBtb2RhbA==-->fix(ui): use primary color for button in table modal<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6425): <!--number 6425 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2NhZGR5c2VydmVyL2NlcnRtYWdpYyB0byB2MC4yMS41IChmb3JnZWpvKQ==-->Update module github.com/caddyserver/certmagic to v0.21.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6421): <!--number 6421 --><!--line 0 --><!--description Rml4IGVkaXQgY2FuY2VsIGJ1dHRvbg==-->Fix edit cancel button<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6419): <!--number 6419 --><!--line 0 --><!--description Rml4IGlzc3VlL2NvbW1lbnQgbWVudXM=-->Fix issue/comment menus<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6412): <!--number 6412 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIERvY2tlciB0YWcgdG8gdjM5Ljg2LjAgKGZvcmdlam8p-->Update renovate Docker tag to v39.86.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6410): <!--number 6410 --><!--line 0 --><!--description dXNlIERhdGVVdGlscyBmb3IgYmxvY2tlZCB1c2VycyBsaXN0-->use DateUtils for blocked users list<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6408): <!--number 6408 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjEwLjAuMA==-->chore(release-notes): Forgejo v10.0.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6407): <!--number 6407 --><!--line 0 --><!--description UmV3b3JrIHVzZXIgcHJvZmlsZSBzZXR0aW5ncw==-->Rework user profile settings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6405): <!--number 6405 --><!--line 0 --><!--description eG9ybSBuZWVkcyB0byBiZSBsb3dlcmNhc2Ugb3RoZXJ3aXNlIGl0IGlzIGlnbm9yZWQ=-->xorm needs to be lowercase otherwise it is ignored<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6404): <!--number 6404 --><!--line 0 --><!--description VXBkYXRlIGNvZGUuZm9yZ2Vqby5vcmcvb2NpL2FscGluZSBEb2NrZXIgdGFnIHRvIHYzLjIxIChmb3JnZWpvKQ==-->Update code.forgejo.org/oci/alpine Docker tag to v3.21 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6403): <!--number 6403 --><!--line 0 --><!--description Y2hvcmUoYnJhbmRpbmcpOiBzdHJpcCBtZXRhZGF0YSBpbmZvcm1hdGlvbiBmcm9tIHRoZSBmb290ZXI=-->chore(branding): strip metadata information from the footer<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6401): <!--number 6401 --><!--line 0 --><!--description Q29zbWV0aWMgY2hhbmdlcyBhbmQgZml4ZXMgYXJvdW5kIHJlcG8gaG9tZXBhZ2U=-->Cosmetic changes and fixes around repo homepage<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6400): <!--number 6400 --><!--line 0 --><!--description UmVmYWN0b3IgZTJlIHRlc3RzIHRvIHNpbXBsaWZ5IGF1dGhlbnRpY2F0aW9uIHNldHVw-->Refactor e2e tests to simplify authentication setup<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6391): <!--number 6391 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjQtNTMgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2024-53 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6390): <!--number 6390 --><!--line 0 --><!--description Rml4IG92ZXJmbG93IGluIGdpdCBub3Rlcw==-->Fix overflow in git notes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6387): <!--number 6387 --><!--line 0 --><!--description Y21kL2R1bXA6IGFkZCBvcHRpb24gZmxhZyB0byBza2lwIHJlcG9zaXRvcnkgYXJjaGl2ZXM=-->cmd/dump: add option flag to skip repository archives<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6386): <!--number 6386 --><!--line 0 --><!--description UmV3b3JrIG5ldyByZXBvIGRpYWxvZw==-->Rework new repo dialog<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6375): <!--number 6375 --><!--line 0 --><!--description Y2hvcmUoaTE4bik6IHVzZXIvbGFiZWwgdHJhbnNsYXRpb25zIGluIGRhbmlzaC9sYXR2aWFu-->chore(i18n): user/label translations in danish/latvian<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6372): <!--number 6372 --><!--line 0 --><!--description UmV2ZXJ0ICJVcGRhdGUgZGVwZW5kZW5jeSBpZGlvbW9ycGggdG8gdjAuNC4wIg==-->Revert "Update dependency idiomorph to v0.4.0"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6370): <!--number 6370 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZSk6IHYxMC4wIGlzIGN1dCwgdjkuMCBpcyBzb29uIHRvIGJlIEVPTA==-->chore(release): v10.0 is cut, v9.0 is soon to be EOL<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6286): <!--number 6286 --><!--line 0 --><!--description V2hlbiBjb21wYXJpbmcgaW4gcmVwb3MsIG1lbnRpb24gdGhhdCBwdWxsIHJlcXVlc3QgY3JlYXRpb24gcmVxdWlyZXMgc2lnbi1pbg==-->When comparing in repos, mention that pull request creation requires sign-in<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6051): <!--number 6051 --><!--line 0 --><!--description ZW5hYmxlIHJlbGVhc2VzIGFuZC9vciB3aWtpIGlmIHVzZXIgc2V0IHRoZSBvcHRpb25zIGluIHJlcG8gbWlncmF0aW9u-->enable releases and/or wiki if user set the options in repo migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/5393): <!--number 5393 --><!--line 0 --><!--description ZmVkZXJhdGlvbiB3aXRoIGFsbG93IGxpc3Rz-->federation with allow lists<!--description-->
+- Already announced in the release notes of an older stable release
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7295): <!--number 7295 --><!--line 0 --><!--description dXNlIGNvcnJlY3QgaW5wdXQgZm9yIHN0cmlwIHNsYXNoZXMgbWlkZGxld2FyZQ==-->use correct input for strip slashes middleware<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7251): <!--number 7251 --><!--line 0 --><!--description V2hlbiBtaWdyYXRpbmcgZnJvbSBhIEZvcmdlam8gdmVyc2lvbiBsb3dlciB0aGFuIHYxMCwgdGhlIFRPVFAgc2VjcmV0cyBmb3VuZCB0byBiZSBjb3JydXB0ZWQgYXJlIG5vdyB0cmFuc3BhcmVudGx5IHJlbW92ZWQgZnJvbSB0aGUgZGF0YWJhc2UgaW5zdGVhZCBvZiBmYWlsaW5nIHRoZSBtaWdyYXRpb24uIFRPVFAgaXMgbm8gbG9uZ2VyIHJlcXVpcmVkIHRvIGxvZ2luIHdpdGggdGhlIGFzc29jaWF0ZWQgdXNlcnMuIFRoZXkgc2hvdWxkIGJlIGluZm9ybWVkIGJlY2F1c2UgdGhleSB3aWxsIG5lZWQgdG8gdmlzaXQgdGhlaXIgc2VjdXJpdHkgc2V0dGluZ3MgYW5kIGNvbmZpZ3VyZSBUT1RQIGFnYWluLiBObyBvdGhlciBhY3Rpb24gaXMgcmVxdWlyZWQu-->When migrating from a Forgejo version lower than v10, the TOTP secrets found to be corrupted are now transparently removed from the database instead of failing the migration. TOTP is no longer required to login with the associated users. They should be informed because they will need to visit their security settings and configure TOTP again. No other action is required.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7167): <!--number 7167 --><!--line 0 --><!--description bm8gbm90aWZpY2F0aW9uIGZvciByZXBsaWVzIHRvIHBlbmRpbmcgY29tbWVudHM=-->no notification for replies to pending comments<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7143): <!--number 7143 --><!--line 0 --><!--description Y29uc2lkZXIgcHVibGljIGlzc3VlcyBmb3IgcHJvamVjdCBib2FyZHM=-->consider public issues for project boards<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7038): <!--number 7038 --><!--line 0 --><!--description Zml4KHJlbGVhc2UpOiB0aGUgcm9vdGxlc3MgaW1hZ2UgdmVyc2lvbiBsYWJlbCBpcyBub3Qgc2V0-->fix(release): the rootless image version label is not set<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7004): <!--number 7004 --><!--line 0 --><!--description ZG8gbm90IGFsbG93IFNTSCB1cmwgZm9yIG1pZ3JhdGlvbg==-->do not allow SSH url for migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6920): <!--number 6920 --><!--line 0 --><!--description c2hvdyBpbnRlcm5hbCBsb2dpbiBwcm9tcHQgZm9yIGFjY291bnQgbGlua2luZw==-->show internal login prompt for account linking<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6896): <!--number 6896 --><!--line 0 --><!--description ZW5hYmxlIHNzaCBtaXJyb3JzIGluIHJvb3RsZXNzIGltYWdlcw==-->enable ssh mirrors in rootless images<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6853): <!--number 6853 --><!--line 0 --><!--description cmVuZGVyIGxpbmsgaW4gaGVhZGluZyBjb3JyZWN0bHkgaW4gVE9D-->render link in heading correctly in TOC<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6803): <!--number 6803 --><!--line 0 --><!--description Zml4KHVpKTogZGlzcGxheSB2ZXJpZmllZCBpY29uIGZvciBkZWZhdWx0IGdwZyBrZXk=-->fix(ui): display verified icon for default gpg key<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6680): <!--number 6680 --><!--line 0 --><!--description c2V0dGluZy5TZXJ2aWNlLkVuYWJsZUludGVybmFsU2lnbkluID0gZmFsc2UgaXMgZGlzYWJsaW5nIGZvcmdvdHRlbiBwYXNzd29yZA==-->setting.Service.EnableInternalSignIn = false is disabling forgotten password<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6674): <!--number 6674 --><!--line 0 --><!--description bG9hZCBzZXR0aW5ncyBmb3IgdmFsaWQgdXNlciBhbmQgZW1haWwgY2hlY2s=-->load settings for valid user and email check<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6639): <!--number 6639 --><!--line 0 --><!--description VGVhY2ggdGhlIGRvY3RvciB0byByZW1vdmUgb3JwaGFuZWQgdHdvX2ZhY3RvciB3aXRoIGBmb3JnZWpvIGRvY3RvciBjaGVjayAtLXJ1biBjaGVjay1kYi1jb25zaXN0ZW5jeSAtLWZpeGAuIFN1Y2ggcm93cyBtYXkgY29udGFpbiBpbnZhbGlkIGRhdGEgYW5kIFtibG9jayB0aGUgbWlncmF0aW9uIHRvIHYxMF0oaHR0cHM6Ly9jb2RlYmVyZy5vcmcvZm9yZ2Vqby9mb3JnZWpvL2lzc3Vlcy82NjM3KSB3aXRoIGEgbWVzc2FnZSBzdWNoIGFzIGBmYWlsZWQ6IEFlc0RlY3J5cHQgaW52YWxpZCBkZWNyeXB0ZWQgYmFzZTY0IHN0cmluZzogaWxsZWdhbCBiYXNlNjQgZGF0YSBhdCBpbnB1dCBieXRlIDBgLg==-->Teach the doctor to remove orphaned two_factor with `forgejo doctor check --run check-db-consistency --fix`. Such rows may contain invalid data and [block the migration to v10](https://codeberg.org/forgejo/forgejo/issues/6637) with a message such as `failed: AesDecrypt invalid decrypted base64 string: illegal base64 data at input byte 0`.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6633): <!--number 6633 --><!--line 0 --><!--description bGlzdGluZyB0b2tlbnMgbXVzdCBub3QgcmVxdWlyZSBiYXNpYyBhdXRo-->listing tokens must not require basic auth<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/11.0.1.md b/release-notes-published/11.0.1.md
new file mode 100644
index 0000000000..79b838fc81
--- /dev/null
+++ b/release-notes-published/11.0.1.md
@@ -0,0 +1,31 @@
+
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Security bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7752) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7753)): <!--number 7753 --><!--line 0 --><!--description Zml4KHNlYyk6IG9ubHkgZGVncmFkZSBwZXJtaXNzaW9uIGNoZWNrIGZvciBnaXQgcHVzaA==-->If [LFS](https://git-lfs.com/) is enabled on a Forgejo instance with `[server].LFS_START_SERVER = true` (this is not the default), it was possible for a registered user to upload LFS files to a repository to which they only had read access. It was not possible for an anonymous user to do the same, even if they had read access to a public repository. The permissions are now correctly enforced and uploading LFS files is only allowed for registered users with write permission to the associated repository. Files that were uploaded to LFS in this way will not be obtained when someone does a `git clone` or `git fetch` on the associated repository. It was also not possible to exploit the incorrect permission check to delete or override an existing LFS file. These are orphaned LFS files that can be removed from the `/settings/lfs` panel of the associated repository.<!--description-->
+- Security features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7693) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7756)): <!--number 7756 --><!--line 0 --><!--description Zml4KHNlYyk6IGNvbnNpZGVyIHdlYmF1dGhuIGZvciBleHRlcm5hbCBsb2dpbg==-->A user account with 2fa (two factor authentication) enrolled with a security key was not enforced when using an external account (e.g. Codeberg or GitHub). The security key is now required even when login in from an external account or linking a new external account to an existing local account, just as it is required when login in with a user and password. This problem did not exist with 2fa enrolled with [TOTP](https://en.wikipedia.org/wiki/Time-based_one-time_password).<!--description-->
+- User Interface bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7650) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7652)): <!--number 7652 --><!--line 0 --><!--description Zml4OiBkaXNwbGF5IHRoZSBsaXN0IG9mIHRhc2tzIGluIHRoZSBydW5uZXIgZWRpdCBwYWdl-->fix: display the list of tasks in the runner edit page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7581) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7589)): <!--number 7589 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIGdhcCBpbiBzd2l0Y2ggaXRlbXM=-->fix(ui): use gap in switch items<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7584) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7585)): <!--number 7585 --><!--line 0 --><!--description Zml4KHVpL3ByKTogdXNlIGV5ZSBpY29uIGZvciByZXZpZXdz-->fix(ui/pr): use eye icon for reviews<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7583): <!--number 7583 --><!--line 0 --><!--description Zml4KHVpKTogcmVzY29wZSBtZW51IGhlaWdodCBwYXRjaCB0byBvdmVyZmxvdyBtZW51-->fix(ui): rescope menu height patch to overflow menu<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7576): <!--number 7576 --><!--line 0 --><!--description Zml4KHVpKTogc2hvdyBjb21taXQgaWNvbiBpbiBicmFuY2ggZHJvcGRvd24gYnV0dG9uIHdoZW4gdmlld2luZyBhIGNvbW1pdA==-->fix(ui): show commit icon in branch dropdown button when viewing a commit<!--description-->
+- Localization
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7743): <!--number 7743 --><!--line 0 --><!--description aTE4bjogYmFja3BvcnQgb2YgdHJhbnNsYXRpb24gdXBkYXRlcw==-->i18n: backport of translation updates<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7594) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7599)): <!--number 7599 --><!--line 0 --><!--description Zml4KGkxOG4pOiBwcmV2ZW50IGluY29ycmVjdCBsb2dnaW5nIG9uIHN0cmluZ3MgbWlzc2luZyBpbiBKU09OIGxvY2FsZXM=-->fix(i18n): prevent incorrect logging on strings missing in JSON locales<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7715) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7729)): <!--number 7729 --><!--line 0 --><!--description Y2hvcmU6IHJlcGxhY2UgYGdpdGh1Yi5jb20vZ28tdGVzdGZpeHR1cmVzL3Rlc3RmaXh0dXJlc2A=-->chore: replace `github.com/go-testfixtures/testfixtures`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7720) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7723)): <!--number 7723 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZSk6IG5leHQtZGlnZXN0IG1vdmVkIHRvIGludmlzaWJsZS5mb3JnZWpvLm9yZw==-->chore(release): next-digest moved to invisible.forgejo.org<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7685) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7694)): <!--number 7694 --><!--line 0 --><!--description Zml4OiB1c2UgYGxpbmd1aXN0LWdlbmVyYXRlZGAgZm9yIGxhbmd1YWdlIHN0YXRz-->fix: use `linguist-generated` for language stats<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7687) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7691)): <!--number 7691 --><!--line 0 --><!--description Y2hvcmU6IHR1bmUgZG93biByZW1vdGUgdXNlciBwcm9tb3Rpb24gZGVidWcgbWVzc2FnZSBzaG93biBhcyBlcnJvcg==-->chore: tune down remote user promotion debug message shown as error<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7683) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7688)): <!--number 7688 --><!--line 0 --><!--description Zml4OiBzZXQgZGVmYXVsdCByZXN0cmljdGVkIGZvciBPQXV0aDIgdXNlcg==-->fix: set default restricted for OAuth2 user<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7648) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7649)): <!--number 7649 --><!--line 0 --><!--description Y2hvcmU6IG1lcmdlIHRlc3RzLkFkZEZpeHR1cmVzIGFuZCB1bml0dGVzdC5PdmVycmlkZUZpeHR1cmVz-->chore: merge tests.AddFixtures and unittest.OverrideFixtures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7616) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7642)): <!--number 7642 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSBwYWdpbmF0aW9uIGxhYmVscyBhbHdheXMgdmlzaWJsZSB0byBzY3JlZW5yZWFkZXI=-->fix(ui): make pagination labels always visible to screenreader<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7597) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7601)): <!--number 7601 --><!--line 0 --><!--description Zml4OiBkZWxheS13cml0ZSB0cmFjZS5kYXQgZm9yIGZvcmdlam8gZGlhZ25vc2lz-->fix: delay-write trace.dat for forgejo diagnosis<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7563): <!--number 7563 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21hdHRuL2dvLXNxbGl0ZTMgdG8gdjEuMTQuMjggKHYxMS4wL2Zvcmdlam8p-->Update module github.com/mattn/go-sqlite3 to v1.14.28 (v11.0/forgejo)<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/11.0.2.md b/release-notes-published/11.0.2.md
new file mode 100644
index 0000000000..a1a8549984
--- /dev/null
+++ b/release-notes-published/11.0.2.md
@@ -0,0 +1,33 @@
+
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7986) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7991)): <!--number 7991 --><!--line 0 --><!--description ZmVhdDogbWFrZSBGb3JnZWpvIEFjdGlvbnMgc2VydmVyIGxvZ3MgbGVzcyBub2lzeQ==-->feat: make Forgejo Actions server logs less noisy<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8155) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8167)): <!--number 8167 --><!--line 0 --><!--description Zml4OiBkbyBub3QgZmFpbCB3aGVuIHJlbGVhc2Ugb3Igd2lraSBpcyBzZXQgaW4gYC9yZXBvcy9taWdyYXRlYCBBUEk=-->fix: do not fail when release or wiki is set in `/repos/migrate` API<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7976) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7985)): <!--number 7985 --><!--line 0 --><!--description Zml4OiBpZ25vcmUgZXhwaXJlZCBhcnRpZmFjdHMgZm9yIHF1b3RhIGNhbGN1bGF0aW9u-->fix: ignore expired artifacts for quota calculation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7979) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7983)): <!--number 7983 --><!--line 0 --><!--description Zml4OiBwdWxsIHJlcXVlc3QgY3Jvc3MgcmVmZXJlbmNlcw==-->fix: pull request cross references<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7883) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7886)): <!--number 7886 --><!--line 0 --><!--description Zml4OiBxdW90ZSByZXBseSBpbiBDaHJvbWl1bQ==-->fix: quote reply in Chromium<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7775) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7779)): <!--number 7779 --><!--line 0 --><!--description Zml4OiBtYWtlIGhhc2ggcGF0dGVybiBtb3JlIHN0cmljdA==-->fix: make hash pattern more strict<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8112) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8120)): <!--number 8120 --><!--line 0 --><!--description Zml4OiByZW1vdmUgZG93bmxvYWQgYXR0cmlidXRlIGZyb20gZXh0ZXJuYWwgYXNzZXRz-->fix: remove download attribute from external assets<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8110): <!--number 8110 --><!--line 0 --><!--description VXBkYXRlIGJsZXZlIHRvIHYyLjUuMiB3aXRoIGNoYW5nZXMgbWFkZSBpbiBiYWNrcG9ydCBvZiAyLjUuMA==-->Update bleve to v2.5.2 with changes made in backport of 2.5.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8094) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8095)): <!--number 8095 --><!--line 0 --><!--description Zml4OiBzaG93IG1lbWJlcnNoaXAgb2YgbGltaXRlZCBvcmdz-->fix: show membership of limited orgs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8059): <!--number 8059 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjQuMyAodjExLjAvZm9yZ2Vqbyk=-->Update dependency go to v1.24.3 (v11.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8057): <!--number 8057 --><!--line 0 --><!--description Y2hvcmU6IGRyb3AgdW51c2VkIGBAdHlwZXNjcmlwdC1lc2xpbnQvcGFyc2VyYCBwYWNrYWdl-->chore: drop unused `@typescript-eslint/parser` package<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8021) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8022)): <!--number 8022 --><!--line 0 --><!--description Y2hvcmUoY2xlYW51cCk6IHN1cHByZXNzIG5vbiBhY3Rpb25hYmxlIFhPUk0gd2FybmluZ3M=-->chore(cleanup): suppress non actionable XORM warnings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7987) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8000)): <!--number 8000 --><!--line 0 --><!--description Zml4OiBhZ2dyZWdhdGUgZGVsZXRlZCB0ZWFtIGFzIGdob3N0IHRlYW0=-->fix: aggregate deleted team as ghost team<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7925) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7937)): <!--number 7937 --><!--line 0 --><!--description Zml4KHVpKTogY2VudGVyIGZvb3RlciBsaW5rcw==-->fix(ui): center footer links<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7894) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7903)): <!--number 7903 --><!--line 0 --><!--description Zml4KHVpKTogZml4IGZvcmNlLXB1c2ggY29tcGFyZSBsaW5lIGxheW91dA==-->fix(ui): fix force-push compare line layout<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7884) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7887)): <!--number 7887 --><!--line 0 --><!--description Zml4OiBwYXJzZSBgY2hhbmdlLWlkYCBpbiB0aGUgZ2l0IGNvbW1pdCBoZWFkZXI=-->fix: parse `change-id` in the git commit header<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7885): <!--number 7885 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2JsZXZlc2VhcmNoL2JsZXZlL3YyIHRvIHYyLjUuMSAodjExLjAvZm9yZ2VqbykgLSBhYmFuZG9uZWQ=-->Update module github.com/blevesearch/bleve/v2 to v2.5.1 (v11.0/forgejo) - abandoned<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7746) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7871)): <!--number 7871 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZSBmb3JjZS1wdXNoIGNvbXBhcmUgbGluZSBsYXlvdXQ=-->fix(ui): improve force-push compare line layout<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7640) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7869)): <!--number 7869 --><!--line 0 --><!--description Zml4OiBSZW1vdmUgImNyZWF0ZSBicmFuY2giIGJ1dHRvbiBvbiBtaXJyb3JlZCByZXBvcw==-->fix: Remove "create branch" button on mirrored repos<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7858): <!--number 7858 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21zdGVpbmVydC9wYW0vdjIgdG8gdjIuMS4wICh2MTEuMC9mb3JnZWpvKQ==-->Update module github.com/msteinert/pam/v2 to v2.1.0 (v11.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7817) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7821)): <!--number 7821 --><!--line 0 --><!--description Zml4OiByZXBsYWNlIMOfIHdpdGggc3MgaW4gbm9ybWFsaXplVXNlck5hbWU=-->fix: replace ß with ss in normalizeUserName<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7784) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7786)): <!--number 7786 --><!--line 0 --><!--description Zml4KGFwaSk6IGRvY3VtZW50IGBpc19zeXN0ZW1fd2ViaG9va2AgZmllbGQ=-->fix(api): document `is_system_webhook` field<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7773) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7774)): <!--number 7774 --><!--line 0 --><!--description Zml4OiByZW1vdmUgYXJ0aWZpY2lhbCBkZWxheSBmb3IgUFIgdXBkYXRl-->fix: remove artificial delay for PR update<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/11.0.3.md b/release-notes-published/11.0.3.md
new file mode 100644
index 0000000000..ed6f150af9
--- /dev/null
+++ b/release-notes-published/11.0.3.md
@@ -0,0 +1,34 @@
+## Git update fixing CVE-2025-48385
+
+Git vulnerabilities were [disclosed 8 July 2025](https://groups.google.com/g/git-packagers/c/cYJ6peBtyxk/m/xVukiATcBQAJ) and require an update of the Git version used by Forgejo to Git [v2.43.7, v2.44.4, v2.45.4, v2.46.4, v2.47.3, v2.48.2, v2.49.1, or v2.50.1](https://nvd.nist.gov/vuln/detail/CVE-2025-48385). The [containers of this release](https://codeberg.org/forgejo/-/packages/container/forgejo/11.0.3) include a Git binary that is not vulnerable. If Forgejo was installed using a container, it is enough to upgrade  the container to get the latest Git binary.
+
+Security bug fixes are only for Git, there are no security fixes for Forgejo itself in this release.
+
+## Wiki permissions manual steps
+
+If collaborators with write access can't edit the wiki, an administrator can now go to the Units settings (`<user>/<repo>/settings/units#wiki`) and Save the wiki settings (no change is needed) to fix the problem. This is a manual step that will trigger a database update that is currently not possible to automate for Forgejo stable releases.
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- User Interface bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8246) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8283)): <!--number 8283 --><!--line 0 --><!--description Zml4KHVpKTogYWRkIG1pc3NpbmcgbGF6eSBsb2FkIGF0dHJpYnV0ZSB0byBpbWFnZXMgKCM4MjQ2KQ==-->fix(ui): add missing lazy load attribute to images (#8246)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8170) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8262)): <!--number 8262 --><!--line 0 --><!--description Zml4KHVpKTogZXJyb25lb3VzIGxpc3QgY29udGludWF0aW9uIG9uIENtZCtFbnRlciBvbiBtYWNPUw==-->fix(ui): erroneous list continuation on Cmd+Enter on macOS<!--description-->
+- Localization
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8300): <!--number 8300 --><!--line 0 --><!--description aTE4bjogYmFja3BvcnQgb2YgdHJhbnNsYXRpb24gdXBkYXRlcw==-->i18n: backport of translation updates<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8189) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8456)): <!--number 8456 --><!--line 0 --><!--description Zml4OiBkbyBub3QgaWdub3JlIGF1dG9tZXJnZSB3aGlsZSBhIFBSIGlzIGNoZWNraW5nIGZvciBjb25mbGljdHM=-->fix: do not ignore automerge while a PR is checking for conflicts<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8367) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8385)): <!--number 8385 --><!--line 0 --><!--description Zml4OiB1c2VyIGFjdGl2YXRpb24gd2l0aCB1cHBlcmNhc2UgZW1haWwgYWRkcmVzcw==-->fix: user activation with uppercase email address<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8234) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8237)): <!--number 8237 --><!--line 0 --><!--description Zml4OiBjb2xsYWJvcmF0b3IgY2FuIGVkaXQgd2lraSB3aXRoIHdyaXRlIGFjY2Vzcw==-->fix: collaborator can edit wiki with write access<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8460) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8465)): <!--number 8465 --><!--line 0 --><!--description Y2hvcmU6IGRpc2FibGUgbWlzbWF0Y2hlZCByb290IFVSTCBlMmUgdGVzdCBmb3Igc2FmYXJp-->chore: disable mismatched root URL e2e test for safari<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8461) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8462)): <!--number 8462 --><!--line 0 --><!--description Y2hvcmU6IGRvIG5vdCBuYXZpZ2F0ZSB0byBzYW1lIFVSTCBpbiBFMkUgdGVzdA==-->chore: do not navigate to same URL in E2E test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8258) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8445)): <!--number 8445 --><!--line 0 --><!--description Zml4OiBjb3JydXB0ZWQgd2lraSB1bml0IGRlZmF1bHQgcGVybWlzc2lvbiAoIzgyMzQgZm9sbG93LXVwKSAoIzgyNTgp-->fix: corrupted wiki unit default permission (#8234 follow-up) (#8258)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8261) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8412)): <!--number 8412 --><!--line 0 --><!--description Zml4OiBza2lwIGVtcHR5IHRva2VucyBpbiBTZWFyY2hPcHRpb25zLlRva2Vucygp-->fix: skip empty tokens in SearchOptions.Tokens()<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8400) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8401)): <!--number 8401 --><!--line 0 --><!--description Y2hvcmU6IGltcHJvdmUgcmVsaWFiaWxpdHkgb2Ygd2ViYXV0aG4gZTJlIHRlc3Q=-->chore: improve reliability of webauthn e2e test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8326) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8333)): <!--number 8333 --><!--line 0 --><!--description Zml4OiBtYWtlIEFQSSAvcmVwb3Mve293bmVyfS97cmVwb30vY29tcGFyZS97YmFzZWhlYWR9IHdvcmsgd2l0aCBmb3Jrcw==-->fix: make API /repos/{owner}/{repo}/compare/{basehead} work with forks<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8226) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8292)): <!--number 8292 --><!--line 0 --><!--description Y2hvcmU6IHNvcnQgbWFpbGVyIG1lc3NhZ2VzIGluIHRlc3QgYXNzZXJ0aW9u-->chore: sort mailer messages in test assertion<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8002) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8289)): <!--number 8289 --><!--line 0 --><!--description Zml4KHVpKTogcmVsZWFzZTogbmFtZSBpcyBvdmVycmlkZGVuIHdpdGggdGFnIG5hbWUgb24gZWRpdA==-->fix(ui): release: name is overridden with tag name on edit<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8286) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8287)): <!--number 8287 --><!--line 0 --><!--description UmV2ZXJ0ICJmaXgoYXBpKTogZG9jdW1lbnQgYGlzX3N5c3RlbV93ZWJob29rYCBmaWVsZCAoIzc3ODQpIg==-->Revert "fix(api): document `is_system_webhook` field (#7784)"<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/12.0.0.md b/release-notes-published/12.0.0.md
new file mode 100644
index 0000000000..f52480cc88
--- /dev/null
+++ b/release-notes-published/12.0.0.md
@@ -0,0 +1,464 @@
+
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Breaking security features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7924): <!--number 7924 --><!--line 0 --><!--description cmVtb3ZlIEFQSSBhdXRoZW50aWNhdGlvbiBtZXRob2RzIHRoYXQgdXNlcyB0aGUgVVJMIHF1ZXJ5-->remove API authentication methods that uses the URL query. They are disabled by default and this only has an impact if `[security].DISABLE_QUERY_AUTH_TOKEN=false` is explicitly set. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#removing-deprecated-api-authentication-methods).<!--description-->
+- Security features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7829): <!--number 7829 --><!--line 0 --><!--description cmVsYXggZW1haWwgcmVxdWlyZW1lbnRz-->relax email requirements. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#relaxing-the-requirements-on-email-addresses).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7693): <!--number 7693 --><!--line 0 --><!--description Y29uc2lkZXIgV2ViQXV0aG4gJiBTU0ggZm9yIGluc3RhbmNlIHNpZ25pbmc=-->consider WebAuthn & SSH for instance signing.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6897): <!--number 6897 --><!--line 0 --><!--description ZmVhdChzZWMpOiBBZGQgU1NIIHNpZ25pbmcgc3VwcG9ydCBmb3IgaW5zdGFuY2Vz-->add SSH signing support for instances. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#instance-signing-with-ssh).<!--description-->
+- Breaking features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8035): <!--number 8035 --><!--line 0 --><!--description VGhlIGBmb3JnZWpvIGRvY3NgIGNvbW1hbmQgaXMgZGVwcmVjYXRlZCBhbmQgQ0xJIGVycm9ycyBhcmUgbm93IGRpc3BsYXllZCBvbiBzdGRlcnIgaW5zdGVhZCBvZiBzdGRvdXQuIFRoZXNlIGJyZWFraW5nIGNoYW5nZXMgaGFwcGVuZWQgYmVjYXVzZSB0aGUgcGFja2FnZSB1c2VkIHRvIHBhcnNlIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzIHdhcyBbdXBncmFkZWQgZnJvbSB2MiB0byB2M10oaHR0cHM6Ly9jbGkudXJmYXZlLm9yZy9taWdyYXRlLXYyLXRvLXYzLykuIEEgW3NlcGFyYXRlIHByb2plY3Qgd2FzIGluaXRpYXRlZF0oaHR0cHM6Ly9naXRodWIuY29tL3VyZmF2ZS9jbGktZG9jcykgdG8gcmUtaW1wbGVtZW50IHRoZSBgZG9jc2AgY29tbWFuZCwgYnV0IGl0IGlzIG5vdCB5ZXQgcHJvZHVjdGlvbiByZWFkeS4=-->The `forgejo docs` command is deprecated and CLI errors are now displayed on stderr instead of stdout. These breaking changes happened because the package used to parse the command line arguments was [upgraded from v2 to v3](https://cli.urfave.org/migrate-v2-to-v3/). A [separate project was initiated](https://github.com/urfave/cli-docs) to re-implement the `docs` command, but it is not yet production ready.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7745): <!--number 7745 --><!--line 0 --><!--description cmVtb3ZlIHRoZSBsZWdhY3kgYFRFU1RfQ09ORkxJQ1RJTkdfUEFUQ0hFU19XSVRIX0dJVF9BUFBMWWAgc2V0dGluZw==-->remove the legacy `TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY` setting<!--description-->
+- Breaking bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8139): <!--number 8139 --><!--line 0 --><!--description QVBJOiBlbmZvcmNlIHNoYSByZXF1aXJlbWVudCBvbiBgUE9TVCAvcmVwb3Mve293bmVyfS97cmVwb30vY29udGVudHNg-->fail if `sha` is not provided to the `POST /repos/{owner}/{repo}/contents` API endpoint. Although it was documented to be required, it was not enforced and clients that do not set the `sha` will no longer succeed.<!--description-->
+- User Interface features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8185): <!--number 8185 --><!--line 0 --><!--description ZmVhdCh1aSk6IGZlZGl2ZXJzZSBoYW5kbGUgbWFya3VwIHZpYSByZWRpcmVjdCBzZXJ2ZXI=-->transform fediverse handles (ex. @forgejo@floss.social and !forgejo@programming.dev) into links to https://fedirect.toolforge.org. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#redirecting-fediverse-handles).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8121): <!--number 8121 --><!--line 0 --><!--description YWRkIHVzZXIgdmlzaWJpbGl0eSBkZXNjcmlwdGlvbiBpbiBzZXR0aW5ncyBwYWdl-->add user visibility description in the settings page.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8111): <!--number 8111 --><!--line 0 --><!--description YWRkIG1vZGVsIHZpZXdlciBmb3IgYC5nbGJgIChHTFRGKSBtb2RlbCBpbiBmaWxlIHZpZXc=-->add model viewer for `.glb` (GLTF) model in file view. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#gltf-viewer).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7998): <!--number 7998 --><!--line 0 --><!--description ZmVhdCh1aSk6IHNob3cgc2l6ZSBjb25zdHJhaW50cyBvZiBjdXN0b20gYXZhdGFy-->show size constraints of custom avatar.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7992): <!--number 7992 --><!--line 0 --><!--description ZmVhdCh1aSk6IGFkZCBsaW5rcyB0byBtaWxlc3RvbmVzIGFuZCBwcm9qZWN0cyBpbiBpc3N1ZSBjb21tZW50cw==-->add links to milestones and projects in issue comments.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7958): <!--number 7958 --><!--line 0 --><!--description ZmVhdCh1aSk6IGdsb2JhbCBzdHlsaW5nIGZvciBrYmQgdGFn-->global styling for the kbd tag.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7947): <!--number 7947 --><!--line 0 --><!--description ZmVhdCh1aSk6IGhpbnRzIGluIGVtcHR5IHVzZXJjYXJkcyBsaXN0cw==-->hints in empty usercards lists.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7906): <!--number 7906 --><!--line 0 --><!--description ZmVhdCh1aSk6IHJlZGVzaWduIHVzZXIgcHJvZmlsZSBhY3Rpb25zIGxheW91dA==-->the user profile has been redesigned. The most notable change is that actions have been moved to a dropdown and several new actions were added.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7531): <!--number 7531 --><!--line 0 --><!--description ZmVhdCh1aSk6IGltcHJvdmUgZGVzYyBpbiBQYWNrYWdlcyBzZXR0aW5ncw==-->improve the description in the packages settings.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7516): <!--number 7516 --><!--line 0 --><!--description aW5saW5lIHB1YmxpYyBzc2gga2V5IGluIHZlcmlmaWNhdGlvbiBjb21tYW5k-->inline public ssh key in verification command.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7481): <!--number 7481 --><!--line 0 --><!--description ZmVhdCh1aSk6IHVzZSBzd2l0Y2ggZWxlbWVudCBmb3IgbWFya2Rvd24gZWRpdG9yIG1vZGVz-->use switch element for markdown editor modes.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7388): <!--number 7388 --><!--line 0 --><!--description ZmVhdCh1aSk6IG1ha2UgSlMgYXNzZXQgbG9hZCBlcnJvciBtZXNzYWdlIHRyYW5zbGF0YWJsZQ==-->make JS asset load error message translatable.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7385): <!--number 7385 --><!--line 0 --><!--description VXNlIGBnaXQgc3dpdGNoIC1jYCBpbnN0ZWFkIG9mIGBnaXQgY2hlY2tvdXQgLWJg-->improve performances by using `git switch -c` instead of `git checkout -b`.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7377): <!--number 7377 --><!--line 0 --><!--description ZmVhdCh1aS9taWdyYXRpb25zKTogY2xhcmlmeSBkZXNpcmVkIGF1dG9jb21wbGV0aW9uIHR5cGUgZm9yIGNsb25lX2FkZHI=-->clarify the desired autocompletion type for the clone address in migrations.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7373): <!--number 7373 --><!--line 0 --><!--description TWlncmF0aW9ucyBVSTogSW1wcm92ZSBDbGFyaXR5IGZvciBNaWdyYXRpb24gRGVzY3JpcHRpb24gVGV4dGFyZWE=-->improve the clarity of the migration description textarea.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7361): <!--number 7361 --><!--line 0 --><!--description ZmVhdCh1aSk6IEF1dG9tYXRpY2FsbHkgcmVmcmVzaCB3b3JrZmxvd3MgaW4gdGhlICJBY3Rpb25zIiBsaXN0-->automatically refresh workflows in the "Actions" list. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#automatically-refreshing-workflows).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7274): <!--number 7274 --><!--line 0 --><!--description dWk6IGltcHJvdmUgZXJyb3IgcGFnZXM=-->improve error pages.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7155): <!--number 7155 --><!--line 0 --><!--description ZmVhdCh1aSk6IGltcHJvdmUgdGhlIHVzZXIgZXhwZXJpZW5jZSB0byByZXZpZXcgaW5kaXZpZHVhbCBjb21taXRzIGluIGEgcHVsbCByZXF1ZXN0-->improve the user experience to review individual commits in a pull request. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#improved-ux-for-per-commit-reviews).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7128): <!--number 7128 --><!--line 0 --><!--description VXNlIGF2YWlsYWJsZSBzY3JlZW4gd2lkdGggZm9yIEFjdGlvbnMgbG9ncw==-->use the available screen width when displaying Forgejo Actions logs.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6933): <!--number 6933 --><!--line 0 --><!--description U2hvdyBpZiBjb21taXQgaXMgdmVyaWZpZWQgaW4gYWN0aXZpdHkgZmVlZCBvZiBhbiB1c2VyIG9yIGFuIG9yZ2FuaXphdGlvbiBmb3IgbmV3IGFjdGl2aXR5-->show if a commit is verified in the activity feed of a user or an organization.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6813): <!--number 6813 --><!--line 0 --><!--description UmVpbXBsZW1lbnRlZCBlZGl0b3IgVGFiIGtleSBoYW5kbGluZyB3aXRoIGFjY2Vzc2liaWxpdHkgc2FmZWd1YXJkcy4gQmFsYW5jZSBoYXZpbmcgdGhlIGVkaXRvciB3b3JrIGFzIGV4cGVjdGVkIGJ5IGRldmVsb3BlcnMgKHdpdGggVGFiIGtleSBhZmZlY3RpbmcgaW5kZW50YXRpb24pIHdoaWxlIGFsc28gbm90IGltcGVkaW5nIGtleWJvYXJkIG5hdmlnYXRpb24u-->reimplemented editor Tab key handling with accessibility safeguards. Balance having the editor work as expected by developers (with Tab key affecting indentation) while also not impeding keyboard navigation. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#tabs-indentations-in-the-comment-editor)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6795): <!--number 6795 --><!--line 0 --><!--description ZmVhdCh1aSk6IHJlZGVzaWduIG1pZ3JhdGlvbiBzZWxlY3Rpb24gc2NyZWVu-->redesign the migration selection page.<!--description-->
+- User Interface bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8417) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8514)): <!--number 8514 --><!--line 0 --><!--description Zml4KHVpKTogbXVsdGlwbGUgQ29tYm9NYXJrZG93bkVkaXRvcnMgb24gb25lIHBhZ2UgaW50ZXJmZXJl-->multiple ComboMarkdownEditors on one page interfere with each other.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7749) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8362)): <!--number 8362 --><!--line 0 --><!--description Zml4KHVpKTogQWRkIHBhc3RlZCBpbWFnZXMgdG8gZHJvcHpvbmU=-->pasting images into the comment editor will now show that image in the ‘dropzone’.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8296) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8317)): <!--number 8317 --><!--line 0 --><!--description Zml4OiBhZGQgbWlzc2luZyB0cnVzdCBzdGF0dXMgdG8gcHVsbCByZXZpZXcgY29tbWl0cw==-->add missing trust status to pull review commits.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8246) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8282)): <!--number 8282 --><!--line 0 --><!--description Zml4KHVpKTogYWRkIG1pc3NpbmcgbGF6eSBsb2FkIGF0dHJpYnV0ZSB0byBpbWFnZXM=-->add missing lazy load attribute to images.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8067): <!--number 8067 --><!--line 0 --><!--description cG9ydChnaXRlYSk6IFJldGFpbiBpc3N1ZS9wdWxsIHNvcnQgdHlwZQ==-->retain sort type when viewing issue or pull requests.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7893): <!--number 7893 --><!--line 0 --><!--description Zml4KHVpKTogaW5jbHVkZSBlbm91Z2ggYWN0aXZpdHkgZm9yIHRoZSBlbnRpcmUgaGVhdG1hcA==-->include enough activity for the entire heatmap.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7726): <!--number 7726 --><!--line 0 --><!--description U2hvdyB3YXJuaW5nIGluIGxvY2tlZCBpc3N1ZSBkaXNjdXNzaW9u-->show warning in locked issue discussion.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7492): <!--number 7492 --><!--line 0 --><!--description Zml4KHVpKTogZW5zdXJlIGNvbnNpc3RlbnQgc3dpdGNoIHBvc2l0aW9uIGluIG1hcmtkb3duIGVkaXRvcg==-->ensure consistent switch position in the markdown editor.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7420): <!--number 7420 --><!--line 0 --><!--description Zml4KHVpKTogZGlzcGxheSB1c2VyLWZyaWVuZGx5IG1lc3NhZ2UgZm9yIHJhbmdlIGVycm9y-->display user-friendly message for range error.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7402): <!--number 7402 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSBsaW1pdHMgY2xlYXJlciBpbiBjcmVhdGUgcmVwbyBmb3Jt-->make limits clearer in the create repository form.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7307): <!--number 7307 --><!--line 0 --><!--description RG9uJ3QgcHV0IHRyYWlsaW5nIHNsYXNoIGluIGF1dG9nZW5lcmF0ZWQgbmFtZSBkdXJpbmcgaW1wb3J0-->don't put trailing slash in autogenerated name in the migration form.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7245): <!--number 7245 --><!--line 0 --><!--description YWxsb3cgdXNlciB3aXRoIGFjdGlvbnMgd3JpdGUgcGVybWlzc2lvbiB0byBydW4gYSB3b3JrZmxvdyBmcm9tIHRoZSB3ZWIgVUk=-->allow user with actions write permission to run a workflow from the web UI.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6799): <!--number 6799 --><!--line 0 --><!--description Zml4KHVpKTogZW5zdXJlIHNhbWUgd2lkdGggb2YgdXNlcmNhcmRzIGluIGdyaWQ=-->ensure usercards in grid have the same width.<!--description-->
+- Localization
+  - Updates from Codeberg Translate: [#7275](https://codeberg.org/forgejo/forgejo/pulls/7275), [#7363](https://codeberg.org/forgejo/forgejo/pulls/7363), [#7438](https://codeberg.org/forgejo/forgejo/pulls/7438), [#7507](https://codeberg.org/forgejo/forgejo/pulls/7507), [#7572](https://codeberg.org/forgejo/forgejo/pulls/7572), [#7637](https://codeberg.org/forgejo/forgejo/pulls/7637), [#7742](https://codeberg.org/forgejo/forgejo/pulls/7742), [#7819](https://codeberg.org/forgejo/forgejo/pulls/7819), [#7895](https://codeberg.org/forgejo/forgejo/pulls/7895), [#7969](https://codeberg.org/forgejo/forgejo/pulls/7969), [#8077](https://codeberg.org/forgejo/forgejo/pulls/8077), [#8178](https://codeberg.org/forgejo/forgejo/pulls/8178), [#8294](https://codeberg.org/forgejo/forgejo/pulls/8294) (backport of [#8238](https://codeberg.org/forgejo/forgejo/pulls/8238)), [#8534](https://codeberg.org/forgejo/forgejo/pulls/8534) (backport of [#8295](https://codeberg.org/forgejo/forgejo/issues/8295), [#8410](https://codeberg.org/forgejo/forgejo/issues/8410), [#8490](https://codeberg.org/forgejo/forgejo/issues/8490))
+- Features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8179): <!--number 8179 --><!--line 0 --><!--description QVBJOiBuZXcgYEdFVCAvcmVwb3Mve293bmVyfS97cmVwb30vZ2l0L2Jsb2JzYCBlbmRwb2ludCB0byByZXRyaWV2ZSBtdWx0aXBsZSBibG9icyBhdCBvbmNl-->new `GET /repos/{owner}/{repo}/git/blobs` API endpoint to retrieve multiple blobs at once.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8177): <!--number 8177 --><!--line 0 --><!--description YWx3YXlzIHB1Ymxpc2ggdGhlIGxpbmsgdG8gdGhlIGNvbW1pdCBzdGF0dXM=-->always publish the link to the commit status.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8143): <!--number 8143 --><!--line 0 --><!--description aW1wcm92ZSBnZW5lcmF0aW9uIG9mIGJ1bmRsZWQgYXNzZXRz-->improve the performances of the generation of bundled assets.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8115): <!--number 8115 --><!--line 0 --><!--description ZW5hYmxlIGBtbGtlbTc2OHgyNTUxOS1zaGEyNTZgIGJ5IGRlZmF1bHQgZm9yIGJ1aWx0aW4gc3No-->enable `mlkem768x25519-sha256` by default for builtin ssh.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8070): <!--number 8070 --><!--line 0 --><!--description c3VwcG9ydCBhcnRpZmFjdCB1cGxvYWRzIGZvciBPQ0kgY29udGFpbmVyIHBhY2thZ2Vz-->support artifact uploads for OCI container packages.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8047): <!--number 8047 --><!--line 0 --><!--description YWRkIGBhZG1pbiB1c2VyIHJlc2V0LW1mYWAgQ0xJIGNvbW1hbmQ=-->add `admin user reset-mfa` CLI command.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7988): <!--number 7988 --><!--line 0 --><!--description dXBkYXRlIGFtYmlnaW91cyBjaGFyYWN0ZXJz-->update the list of ambigious characters.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7986): <!--number 7986 --><!--line 0 --><!--description bWFrZSBGb3JnZWpvIEFjdGlvbnMgc2VydmVyIGxvZ3MgbGVzcyBub2lzeQ==-->make Forgejo Actions server logs less noisy.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7968): <!--number 7968 --><!--line 0 --><!--description QWxsb3cgc2VhcmNoaW5nIGlzc3VlcyBieSBudW1iZXIsIHByaW9yaXRpemUgdGl0bGUgbWF0Y2hlcyB3aGVuIHNvcnRlZCBieSByZWxldmFuY2U=-->allow searching issues by number, prioritize title matches when sorted by relevance.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7953): <!--number 7953 --><!--line 0 --><!--description cmVwbGFjZSBnby1ycG11dGlscyBsaWJyYXJ5IHdpdGggb3VyIG93bg==-->replace go-rpmutils library with our own. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#forgejo-build-time-optimization).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7902): <!--number 7902 --><!--line 0 --><!--description Y29uZmlndXJhYmxlIGRlZmF1bHQgdW5pdHMgZm9yIG1pcnJvcnM=-->configurable default units for mirrors.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7896): <!--number 7896 --><!--line 0 --><!--description ZW5oOiBhbGxvdyBwZXIgcmVwbyBpc3N1ZSByZWluZGV4aW5nIGZvciBhZG1pbnM=-->a repository administrator has control over reindexing the issues.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7803): <!--number 7803 --><!--line 0 --><!--description YXV0byBjbGVhbnVwIG9mIG9mZmxpbmUgcnVubmVycw==-->auto cleanup of offline runners.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7727): <!--number 7727 --><!--line 0 --><!--description aW1wcm92ZWQgcGVyZm9ybWFuY2VzIHdoZW4gY2hlY2tpbmcgZm9yIGNvbmZsaWN0cyBvbiBwdWxsIHJlcXVlc3Rz-->improved performances when checking for conflicts on pull requests. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#faster-conflict-checking).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7716): <!--number 7716 --><!--line 0 --><!--description YWxsb3cgYWNjZXNzIHRvIGAvYXBpL3YxL3BhY2thZ2VzL3t1c2VybmFtZX1gIHdpdGhvdXQgdG9rZW4=-->allow access to publicly available `/api/v1/packages/{username}` without a token.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7699): <!--number 7699 --><!--line 0 --><!--description aW1wbGVtZW50IGBHRVQgL3JlcG9zL3tvd25lcn0ve3JlcG99L2FjdGlvbnMvcnVuc2AgYW5kIGBHRVQgL3JlcG9zL3tvd25lcn0ve3JlcG99L2FjdGlvbnMvcnVucy97cnVuX2lkfWA=-->implement the `GET /repos/{owner}/{repo}/actions/runs` and `GET /repos/{owner}/{repo}/actions/runs/{run_id}` API endpoints.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7527): <!--number 7527 --><!--line 0 --><!--description dXNlIGdpdC1yZXBsYXkgZm9yIHJlYmFzaW5n-->use git-replay for rebasing for better performances.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7509): <!--number 7509 --><!--line 0 --><!--description c2VuZCBtYWlsIG9uIGZhaWxlZCBvciByZWNvdmVyZWQgRm9yZ2VqbyBBY3Rpb25zIHJ1bg==-->send mail on failed or recovered Forgejo Actions run. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#forgejo-actions-email-notifications-on-failure).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7508): <!--number 7508 --><!--line 0 --><!--description QWN0aW9ucyBGYWlsdXJlLCBTdWNjZXNzLCBSZWNvdmVyIFdlYmhvb2tz-->Forgejo Actions failure, success, recover webhooks.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7418): <!--number 7418 --><!--line 0 --><!--description YWRkIGBsYXN0X2NvbW1pdF93aGVuYCB0byBjb250ZW50cyByZXNwb25zZQ==-->add `last_commit_when` to API contents responses.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7387): <!--number 7387 --><!--line 0 --><!--description aW5jbHVkZSBhIGRlZmF1bHQgcm9ib3RzLnR4dCB0byByZWR1Y2UgdGhlIGltcGFjdCBvZiBjcmF3bGVycw==-->include a default robots.txt to reduce the impact of crawlers. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#default-robotstxt).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7212): <!--number 7212 --><!--line 0 --><!--description dXNlIFhPUk0gRW5naW5lR3JvdXAgaW5zdGVhZCBvZiBzaW5nbGUgRW5naW5lIGNvbm5lY3Rpb24=-->use XORM EngineGroup instead of single Engine connection. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#xorm-enginegroup-connections-for-optimized-database-query-routing-and-load-balancing).<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/2364): <!--number 2364 --><!--line 0 --><!--description c3luYyBmb3Jrcw==-->sync forks. [Read more in the v12.0 companion blog post](https://forgejo.org/2025-07-release-v12-0/#keeping-forks-in-sync).<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8511) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8516)): <!--number 8516 --><!--line 0 --><!--description Zml4OiBQUiBub3QgYmxvY2tlZCBieSByZXZpZXcgcmVxdWVzdCBmb3IgYSB3aGl0ZWxpc3RlZCB0ZWFt-->pull requests were not blocked by review request for a whitelisted team.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8475) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8480)): <!--number 8480 --><!--line 0 --><!--description c2V2ZXJhbCBmaXhlcyBvZiBBTFQgUGFja2FnZSByZWdpc3RyeQ==-->several fixes of the ALT RPM package registry.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8391) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8459)): <!--number 8459 --><!--line 0 --><!--description QXV0aCBIZWFkZXI6IEFsbG93IGxvd2VyY2FzZSBhcyB3ZWxsIGFzIHVwcGVyY2FzZSB0b2tlbg==-->allow lowercase as well as uppercase token keyword in the auth header.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8450) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8454)): <!--number 8454 --><!--line 0 --><!--description Zml4OiBjb3JyZWN0bHkgbWFyayByZXZpZXdzIGFzIHN0YWxlIGZvciBBR2l0IFBScw==-->correctly mark reviews as stale for AGit pull requests.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8367) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8386)): <!--number 8386 --><!--line 0 --><!--description Zml4OiB1c2VyIGFjdGl2YXRpb24gd2l0aCB1cHBlcmNhc2UgZW1haWwgYWRkcmVzcw==-->user activation failed when an email address contained uppercase letters.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8330) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8349)): <!--number 8349 --><!--line 0 --><!--description Zml4OiBsb2FkIE9sZE1pbGVzdG9uZSBiYXNlZCBvbiBPbGRNaWxlc3RvbmVJRCwgbm90IE1pbGVzdG9uZUlE-->fix: load OldMilestone based on OldMilestoneID, not MilestoneID<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8037): <!--number 8037 --><!--line 0 --><!--description b21pdCBDb250ZW50LUxlbmd0aCBvbiAzMDcgcmVkaXJlY3RzIHdoZW4gc2VydmluZyBkaXJlY3QgbWFuaWZlc3QgZm9yIGNvbnRhaW5lcnM=-->omit Content-Length on 307 redirects when serving direct manifest for containers.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8034): <!--number 8034 --><!--line 0 --><!--description Y2FtZWwgYW5kIHBhc2NhbCBjYXNlIHRyYW5zZm9ybWVy-->fix a bug causing the PASCAL-modifier to return camel-case.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8028): <!--number 8028 --><!--line 0 --><!--description QWRkcyBjb2RlIHRvIHJlbW92ZSB0aGUgdHJhaWxpbmcgc2xhc2ggZnJvbSB0aGUgaXNzdWVyIGluIG9hdXRoIGNsYWltcw==-->remove the trailing slash from the issuer in OAuth claims.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8025): <!--number 8025 --><!--line 0 --><!--description cmV0dXJuIHRoZSBjb3JyZWN0IGFnaXQgdHlwZSBpbiBzc2hfaW5mbw==-->return the correct AGit type in ssh_info.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7932): <!--number 7932 --><!--line 0 --><!--description W2dpdGVhXSBGaXggdXJsIHZhbGlkYXRpb24gaW4gd2ViaG9vayBhZGQvZWRpdCBBUEk=-->fix url validation in the webhook add/edit API.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7930): <!--number 7930 --><!--line 0 --><!--description QWRkIGVycm9yIHJlcG9ydGluZyB0byBQUnMgd2l0aCBpbnZhbGlkIHdvcmtmbG93cw==-->add error reporting to pull requests with invalid Forgejo Actions workflow files.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7644): <!--number 7644 --><!--line 0 --><!--description YWxsb3cgaW5zdGFuY2UgQVBJIFVSTHMgaW4gcmVsZWFzZSBhc3NldHM=-->allow instance API URLs in release assets.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7604): <!--number 7604 --><!--line 0 --><!--description aW1wcm92ZSBkYXNoYm9hcmQgbG9hZGluZyBwZXJmb3JtYW5jZXM=-->improve the dashboard loading performances.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7454): <!--number 7454 --><!--line 0 --><!--description Q2FuY2VsIGEgcmV2aWV3-->fix a border case where it was not possible to cancel a pull request review.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7409): <!--number 7409 --><!--line 0 --><!--description Zml4IGFjbWUgcmVuZXdhbA==-->fix acme renewal.<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6352): <!--number 6352 --><!--line 0 --><!--description bWlncmF0ZSBNYXZlbiBwYWNrYWdlcyB0byAiZ3JvdXBJZDphcnRpZmFjdElkIiBuYW1lIGNvbmNhdGVuYXRpb24sIHJlZ2VuZXJhdGUgbWV0YWRhdGEgYW5kIGZpeCBtaXNzaW5nIGdyb3VwSWQ=-->migrate Maven packages to "groupId:artifactId" name concatenation, regenerate metadata and fix missing groupId.<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8534): <!--number 8534 --><!--line 0 --><!--description aTE4bjogdXBkYXRlIG9mIHRyYW5zbGF0aW9ucyBmcm9tIENvZGViZXJnIFRyYW5zbGF0ZQ==-->i18n: update of translations from Codeberg Translate<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8530) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8532)): <!--number 8532 --><!--line 0 --><!--description Zml4KHBhY2thZ2VzKTogc2tpcCBhbm90aGVyIHN0YWNrIGZyYW1lIGZyb20gbG9nZ2luZw==-->fix(packages): skip another stack frame from logging<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8527) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8528)): <!--number 8528 --><!--line 0 --><!--description Zml4OiBpZ25vcmUgIkNsb3NlIiBlcnJvciB3aGVuIHVwbG9hZGluZyBjb250YWluZXIgYmxvYg==-->fix: ignore "Close" error when uploading container blob<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8524) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8526)): <!--number 8526 --><!--line 0 --><!--description Y2hvcmU6IGZhaWxlZCBhdXRoZW50aWNhdGlvbiBhdHRlbXB0cyBhcmUgbm90IGVycm9ycyBhbmQgYXJlIGRpc3BsYXllZCBhdCB0aGUgbG9nIGluZm8gbGV2ZWw=-->chore: failed authentication attempts are not errors and are displayed at the log info level<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8519) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8523)): <!--number 8523 --><!--line 0 --><!--description Zml4OiBleHBhbmRpbmcgZXhhY3RseSAyMCBsaW5lcyBiZXR3ZWVuIGRpZmYgc2VjdGlvbnMgbGVhdmVzIHZpc3VhbCBhcnRpZmFjdA==-->fix: expanding exactly 20 lines between diff sections leaves visual artifact<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8301) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8518)): <!--number 8518 --><!--line 0 --><!--description Y2hvcmU6IHVzZSBldmVudHVhbGx5IGZvciBteXNxbCBjb2xsYXRpb24gdGVzdA==-->chore: use eventually for mysql collation test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8492) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8498)): <!--number 8498 --><!--line 0 --><!--description Zml4KGNvZGUtc2VhcmNoKTogSGlnaGxpZ2h0U2VhcmNoUmVzdWx0Q29kZSBzaG91bGQgY291bnQgdGhlIG51bWJlciBvZiBieXRlcyBhbmQgbm90IHRoZSBudW1iZXIgb2YgcnVuZXM=-->fix(code-search): HighlightSearchResultCode should count the number of bytes and not the number of runes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8464) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8474)): <!--number 8474 --><!--line 0 --><!--description Zml4OiB1c2UgcGFyZW50IGNvbnRleHQgZm9yIG5ldyB0cmFuc2FjdGlvbnM=-->fix: use parent context for new transactions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8460) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8466)): <!--number 8466 --><!--line 0 --><!--description Y2hvcmU6IGRpc2FibGUgbWlzbWF0Y2hlZCByb290IFVSTCBlMmUgdGVzdCBmb3Igc2FmYXJp-->chore: disable mismatched root URL e2e test for safari<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8461) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8463)): <!--number 8463 --><!--line 0 --><!--description Y2hvcmU6IGRvIG5vdCBuYXZpZ2F0ZSB0byBzYW1lIFVSTCBpbiBFMkUgdGVzdA==-->chore: do not navigate to same URL in E2E test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8448) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8455)): <!--number 8455 --><!--line 0 --><!--description Zml4KGVtYWlsKTogYWN0aW9ucyBub3RpZmljYXRpb24gdGVtcGxhdGUgY29uZnVzZXMgYnJhbmNoIHdpdGggUFI=-->fix(email): actions notification template confuses branch with PR<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8258) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8439)): <!--number 8439 --><!--line 0 --><!--description Zml4OiBjb3JydXB0ZWQgd2lraSB1bml0IGRlZmF1bHQgcGVybWlzc2lvbiAoIzgyMzQgZm9sbG93LXVwKQ==-->fix: corrupted wiki unit default permission (#8234 follow-up)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8366) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8404)): <!--number 8404 --><!--line 0 --><!--description Zml4OiBjYW5jZWxsZWQgb3Igc2tpcHBlZCBydW5zIGFyZSBub3QgZmFpbHVyZXMgZm9yIG5vdGlmaWNhdGlvbnM=-->fix: cancelled or skipped runs are not failures for notifications<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8400) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8402)): <!--number 8402 --><!--line 0 --><!--description Y2hvcmU6IGltcHJvdmUgcmVsaWFiaWxpdHkgb2Ygd2ViYXV0aG4gZTJlIHRlc3Q=-->chore: improve reliability of webauthn e2e test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8261) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8398)): <!--number 8398 --><!--line 0 --><!--description Zml4OiBza2lwIGVtcHR5IHRva2VucyBpbiBTZWFyY2hPcHRpb25zLlRva2Vucygp-->fix: skip empty tokens in SearchOptions.Tokens()<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8374) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8390)): <!--number 8390 --><!--line 0 --><!--description Zml4OiBkaXNhYmxlIEZvcmdlam8gQWN0aW9ucyBlbWFpbCBub3RpZmljYXRpb25zIG9uIHJlY292ZXJ5-->fix: disable Forgejo Actions email notifications on recovery<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8326) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8331)): <!--number 8331 --><!--line 0 --><!--description Zml4OiBtYWtlIEFQSSAvcmVwb3Mve293bmVyfS97cmVwb30vY29tcGFyZS97YmFzZWhlYWR9IHdvcmsgd2l0aCBmb3Jrcw==-->fix: make API /repos/{owner}/{repo}/compare/{basehead} work with forks<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8320) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8321)): <!--number 8321 --><!--line 0 --><!--description Y2hvcmU6IHNvcnQgYmxvY2tlZCB1c2VycyBsaXN0IGZvciBkZXRlcm1pc3RpYyByZXN1bHRz-->chore: sort blocked users list for determistic results<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8267) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8319)): <!--number 8319 --><!--line 0 --><!--description Zml4OiBhYnVzZSByZXBvcnRzIHN0cmluZyBkYXRhIHR5cGVz-->fix: abuse reports string data types<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8304) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8318)): <!--number 8318 --><!--line 0 --><!--description Zml4OiBwYXNzIGRvZXIncyBJRCBmb3IgQ1JVRCBpbnN0YW5jZSBzaWduaW5n-->fix: pass doer's ID for CRUD instance signing<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8002) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8290)): <!--number 8290 --><!--line 0 --><!--description Zml4KHVpKTogcmVsZWFzZTogbmFtZSBpcyBvdmVycmlkZGVuIHdpdGggdGFnIG5hbWUgb24gZWRpdA==-->fix(ui): release: name is overridden with tag name on edit<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8286) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8288)): <!--number 8288 --><!--line 0 --><!--description UmV2ZXJ0ICJmaXgoYXBpKTogZG9jdW1lbnQgYGlzX3N5c3RlbV93ZWJob29rYCBmaWVsZCAoIzc3ODQpIg==-->Revert "fix(api): document `is_system_webhook` field (#7784)"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8271) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8277)): <!--number 8277 --><!--line 0 --><!--description Q0kgZGVidWc6IHRlc3RTbGVlcDogc2hvdyBhY3R1YWwgdGltZXMgb24gZmFpbHVyZXM=-->CI debug: testSleep: show actual times on failures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8268): <!--number 8268 --><!--line 0 --><!--description Y2hvcmU6IHVwZGF0ZSBzZWN1cml0eSBvcHRpb24gaW4gaXNzdWUgdGVtcGxhdGVz-->chore: update security option in issue templates<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8260): <!--number 8260 --><!--line 0 --><!--description VG9rZW4uUGFyc2VJc3N1ZVJlZmVyZW5jZSBjcmFzaGluZyBvbiBlbXB0eSBzdHJpbmc=-->Token.ParseIssueReference crashing on empty string<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8256): <!--number 8256 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MS4xLjQgKGZvcmdlam8p-->Update renovate to v41.1.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8253): <!--number 8253 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MSAoZm9yZ2VqbykgKG1ham9yKQ==-->Update renovate to v41 (forgejo) (major)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8252): <!--number 8252 --><!--line 0 --><!--description YWRkIGFuIGluZGV4IHRvIHRoZSBBY3Rpb25SdW4uc3RvcHBlZCBjb2x1bW4=-->add an index to the ActionRun.stopped column<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8250): <!--number 8250 --><!--line 0 --><!--description YnVnOiB1bmlmeSBSZXBvQWN0aW9uUnVuIGFuZCBBY3Rpb25SdW4gc3RydWN0cw==-->bug: unify RepoActionRun and ActionRun structs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8248): <!--number 8248 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLWNoaS9jaGkvdjUgdG8gdjUuMi4yIChmb3JnZWpvKQ==-->Update module github.com/go-chi/chi/v5 to v5.2.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8245): <!--number 8245 --><!--line 0 --><!--description RG93bmdyYWRlIHBsYXl3cmlnaHQgdGVtcG9yYXJpbHkgYW5kIGFsbG93IHJ1bm5pbmcgYWxsIGUyZSB0ZXN0cw==-->Downgrade playwright temporarily and allow running all e2e tests<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8243): <!--number 8243 --><!--line 0 --><!--description Z2l0L2Jsb2IgdXNlIE5ld1RydW5jYXRlZFJlYWRlciBmb3IgcHJvZmlsZSBhbmQgY29kZW93bmVycw==-->git/blob use NewTruncatedReader for profile and codeowners<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8242): <!--number 8242 --><!--line 0 --><!--description YnVnOiBGb3JnZWpvIEFjdGlvbnMgZW1haWwgbm90aWZpY2F0aW9ucyBhcmUgb3B0LWlu-->bug: Forgejo Actions email notifications are opt-in<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8236): <!--number 8236 --><!--line 0 --><!--description cHJldmVudCA1MDAgbWVzc2FnZSBvbiBpbnZhbGlkIHVzZXJuYW1l-->prevent 500 message on invalid username<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8227): <!--number 8227 --><!--line 0 --><!--description b25seSBzZW5kIEZvcmdlam8gQWN0aW9ucyBub3RpZmljYXRpb25zIHRvIG9uZSB1c2Vy-->only send Forgejo Actions notifications to one user<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8226): <!--number 8226 --><!--line 0 --><!--description Y2hvcmU6IHNvcnQgbWFpbGVyIG1lc3NhZ2VzIGluIHRlc3QgYXNzZXJ0aW9u-->chore: sort mailer messages in test assertion<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8224): <!--number 8224 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjExLjAuMg==-->chore(release-notes): Forgejo v11.0.2<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8223): <!--number 8223 --><!--line 0 --><!--description YmxvYjogR2V0QmxvYkNvbnRlbnQ6IHJlZHVjZSBhbGxvY2F0aW9ucw==-->blob: GetBlobContent: reduce allocations<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8220): <!--number 8220 --><!--line 0 --><!--description Zml4KHRlc3RzKTogVGVzdEluaXRJbnN0cnVjdGlvbnMgbXVzdCB1c2UgZm9yRWFjaE9iamVjdEZvcm1hdA==-->fix(tests): TestInitInstructions must use forEachObjectFormat<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8219): <!--number 8219 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2Zvcmdlam8vYWN0IHRvIHYxLjI4LjAgKGZvcmdlam8p-->Update module code.forgejo.org/forgejo/act to v1.28.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8218): <!--number 8218 --><!--line 0 --><!--description VXBkYXRlIGRhdGEuZm9yZ2Vqby5vcmcvb2NpL2FscGluZSBEb2NrZXIgdGFnIHRvIHYzLjIyIChmb3JnZWpvKQ==-->Update data.forgejo.org/oci/alpine Docker tag to v3.22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8217): <!--number 8217 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuOTQgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.94 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8216): <!--number 8216 --><!--line 0 --><!--description Y2hvcmU6IG1pZ3JhdGUgdG8gYEBzdHlsaXN0aWMvZXNsaW50LXBsdWdpbmA=-->chore: migrate to `@stylistic/eslint-plugin`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8215): <!--number 8215 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi13YyB0byB2MyAoZm9yZ2Vqbyk=-->Update dependency eslint-plugin-wc to v3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8214): <!--number 8214 --><!--line 0 --><!--description Zml4KHVpKTogaXNzdWUgY29tbWVudCBhbmNob3Igb24gdGltZSBzdGFtcA==-->fix(ui): issue comment anchor on time stamp<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8209): <!--number 8209 --><!--line 0 --><!--description Z2l0X21vZGVsLkNvbW1pdFN0YXR1c2VzSGlkZUFjdGlvbnNVUkwgaXMgb2Jzb2xldGU=-->git_model.CommitStatusesHideActionsURL is obsolete<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8207): <!--number 8207 --><!--line 0 --><!--description UmVtb3ZlIDFtcyBkZWxheSBiZWZvcmUgaW5zZXJ0aW5nIGxpc3QgcHJlZml4LCBmaXggcmFjZSBjb25kaXRpb24gaW4gdGVzdHM=-->Remove 1ms delay before inserting list prefix, fix race condition in tests<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8205): <!--number 8205 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSBnb3BscyBpbiBNYWtlZmlsZQ==-->chore: remove gopls in Makefile<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8202): <!--number 8202 --><!--line 0 --><!--description ZG8gbm90IGNoZWNrIGZvciBgb2JqZWN0X2Zvcm1hdF9uYW1lYCBmaWVsZA==-->do not check for `object_format_name` field<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8199): <!--number 8199 --><!--line 0 --><!--description ZmVhdCh1aSk6IHVzZSBrYmQgaW4gbGFiZWwgc2VsZWN0b3IgaGludCwgcmVtb3ZlIGVudGVy-->feat(ui): use kbd in label selector hint, remove enter<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8198): <!--number 8198 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMjIgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-22 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8197): <!--number 8197 --><!--line 0 --><!--description Rml4IHNlbnRlbmNlIHN0cnVjdHVyZSBtZW50aW9uaW5nIGNvb2xkb3duIHBlcmlvZA==-->Fix sentence structure mentioning cooldown period<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8195): <!--number 8195 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8194): <!--number 8194 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MC41Ny4xIChmb3JnZWpvKQ==-->Update renovate to v40.57.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8190): <!--number 8190 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgY2hhcnQuanMgdG8gdjQuNS4wIChmb3JnZWpvKQ==-->Update dependency chart.js to v4.5.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8188): <!--number 8188 --><!--line 0 --><!--description bWFrZSB0ZXN0IHN1aXRlIHJ1biBvbiBvbGRlciBnaXQgdmVyc2lvbg==-->make test suite run on older git version<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8186): <!--number 8186 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLXNxbC1kcml2ZXIvbXlzcWwgdG8gdjEuOS4zIChmb3JnZWpvKQ==-->Update module github.com/go-sql-driver/mysql to v1.9.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8183): <!--number 8183 --><!--line 0 --><!--description VXBkYXRlIGVudmlyb25tZW50LXRvLWluaSBSRUFETUU=-->Update environment-to-ini README<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8181): <!--number 8181 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy9mb3JnZWpvL2Zvcmdlam8tYnVpbGQtcHVibGlzaCBhY3Rpb24gdG8gdjUuMy41IChmb3JnZWpvKQ==-->Update https://data.forgejo.org/forgejo/forgejo-build-publish action to v5.3.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8176): <!--number 8176 --><!--line 0 --><!--description RG9ja2VyZmlsZSBzaG91bGQgcmUtdXNlIGJpbmRhdGEgZmlsZXMgd2hlbiBwb3NzaWJsZQ==-->Dockerfile should re-use bindata files when possible<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8174): <!--number 8174 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWluaW1hdGNoIHRvIHYxMC4wLjMgKGZvcmdlam8p-->Update dependency minimatch to v10.0.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8172): <!--number 8172 --><!--line 0 --><!--description dXNlIHpzdGQuV2l0aExvd2VyRW5jb2Rlck1lbSBmb3IgZ2VuZXJhdGUtYmluZGF0YQ==-->use zstd.WithLowerEncoderMem for generate-bindata<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8168): <!--number 8168 --><!--line 0 --><!--description ZG8gbm90IG1peCB1cmZhdmUgdjIgd2l0aCB1cmZhdmUgdjM=-->do not mix urfave v2 with urfave v3<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8166): <!--number 8166 --><!--line 0 --><!--description Y2hvcmUoY2kpOiBza2lwIHRlc3RzIGlmIFRFU1Rfe01JTklPX0VORFBPSU5ULEVMQVNUSUNTRUFSQ0hfVVJMfSBpcyBub3Qgc2V0-->chore(ci): skip tests if TEST_{MINIO_ENDPOINT,ELASTICSEARCH_URL} is not set<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8163): <!--number 8163 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRsYWIuY29tL2dpdGxhYi1vcmcvYXBpL2NsaWVudC1nbyB0byB2MC4xMzAuMSAoZm9yZ2Vqbyk=-->Update module gitlab.com/gitlab-org/api/client-go to v0.130.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8162): <!--number 8162 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuOTMgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.93 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8160): <!--number 8160 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgcG9zdGNzcyB0byB2OC41LjUgKGZvcmdlam8p-->Update dependency postcss to v8.5.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8159): <!--number 8159 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWluaW1hdGNoIHRvIHYxMC4wLjIgKGZvcmdlam8p-->Update dependency minimatch to v10.0.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8157): <!--number 8157 --><!--line 0 --><!--description Y2hvcmUoY2kpOiB1c2UgY29kZS5mb3JnZWpvLm9yZy9mb3JnZWpvL21pZ3JhdGlvbi10ZXN0IGZvciBtaWdyYXRpb24gdGVzdHM=-->chore(ci): use code.forgejo.org/forgejo/migration-test for migration tests<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8150): <!--number 8150 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxOCAoZm9yZ2Vqbyk=-->Update dependency happy-dom to v18 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8149): <!--number 8149 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgdHlwZXNjcmlwdC1lc2xpbnQgdG8gdjguMzQuMCAoZm9yZ2Vqbyk=-->Update dependency typescript-eslint to v8.34.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8148): <!--number 8148 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHBsYXl3cmlnaHQvdGVzdCB0byB2MS41My4wIChmb3JnZWpvKQ==-->Update dependency @playwright/test to v1.53.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8147): <!--number 8147 --><!--line 0 --><!--description VXBkYXRlIGdoY3IuaW8vZGV2Y29udGFpbmVycy9mZWF0dXJlcy9naXQtbGZzIERvY2tlciB0YWcgdG8gdjEuMi40IChmb3JnZWpvKQ==-->Update ghcr.io/devcontainers/features/git-lfs Docker tag to v1.2.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8146): <!--number 8146 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgcG9zdGNzcy1uZXN0aW5nIHRvIHYxMy4wLjIgKGZvcmdlam8p-->Update dependency postcss-nesting to v13.0.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8145): <!--number 8145 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVzdC9lc2xpbnQtcGx1Z2luIHRvIHYxLjIuMiAoZm9yZ2Vqbyk=-->Update dependency @vitest/eslint-plugin to v1.2.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8144): <!--number 8144 --><!--line 0 --><!--description Y2hvcmU6IGZpeCB0ZXN0cyBmb3Igb2xkIGdpdCB2ZXJzaW9ucw==-->chore: fix tests for old git versions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8140): <!--number 8140 --><!--line 0 --><!--description Y2hvcmUoY2kpOiBydW4gYWRkaXRpb25hbCB0ZXN0cyBpbiBpbnRlZ3JhdGlvbg==-->chore(ci): run additional tests in integration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8137): <!--number 8137 --><!--line 0 --><!--description UmVtb3ZlIHNoZWJhbmcgZnJvbSBiYXNoIGF1dG9jb21wbGV0aW9u-->Remove shebang from bash autocompletion<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8134): <!--number 8134 --><!--line 0 --><!--description TWFrZSByZWxhdGl2ZS10aW1lIGEgc2VsZi1tYWludGFpbmluZyBjdXN0b20gZWxlbWVudA==-->Make relative-time a self-maintaining custom element<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8129): <!--number 8129 --><!--line 0 --><!--description Y3JlYXRlIHNoZWxsLm5peDsgdXBkYXRlIGZsYWtlLio=-->create shell.nix; update flake.*<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8128): <!--number 8128 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb25uZWN0cnBjLmNvbS9jb25uZWN0IHRvIHYxLjE4LjEgKGZvcmdlam8p-->Update module connectrpc.com/connect to v1.18.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8127): <!--number 8127 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWFya2Rvd25saW50LWNsaSB0byB2MC40NS4wIChmb3JnZWpvKQ==-->Update dependency markdownlint-cli to v0.45.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8126): <!--number 8126 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi1yZWdleHAgdG8gdjIuOS4wIChmb3JnZWpvKQ==-->Update dependency eslint-plugin-regexp to v2.9.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8125): <!--number 8125 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4yLjMgKGZvcmdlam8p-->Update vitest monorepo to v3.2.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8118): <!--number 8118 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8117): <!--number 8117 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MC40OC40IChmb3JnZWpvKQ==-->Update renovate to v40.48.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8112): <!--number 8112 --><!--line 0 --><!--description cmVtb3ZlIGRvd25sb2FkIGF0dHJpYnV0ZSBmcm9tIGV4dGVybmFsIGFzc2V0cw==-->remove download attribute from external assets<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8108): <!--number 8108 --><!--line 0 --><!--description YWx3YXlzIHJlbmRlciBkZXRhaWxlZCB0ZWFtIHBlcm1pc3Npb25zIHRhYmxlIGluIHNpZGViYXI=-->always render detailed team permissions table in sidebar<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8103): <!--number 8103 --><!--line 0 --><!--description VXBkYXRlIHgvdG9vbHMgdG8gdjAuMzQuMCAoZm9yZ2Vqbyk=-->Update x/tools to v0.34.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8102): <!--number 8102 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4yLjIgKGZvcmdlam8p-->Update vitest monorepo to v3.2.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8101): <!--number 8101 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2VkaXRvcmNvbmZpZy1jaGVja2VyL2VkaXRvcmNvbmZpZy1jaGVja2VyL3YzL2NtZC9lZGl0b3Jjb25maWctY2hlY2tlciB0byB2My4zLjAgKGZvcmdlam8p-->Update module github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker to v3.3.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8099): <!--number 8099 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8098): <!--number 8098 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy42LjMgKGZvcmdlam8p-->Update dependency happy-dom to v17.6.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8097): <!--number 8097 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVqcy9wbHVnaW4tdnVlIHRvIHY1LjIuNCAoZm9yZ2Vqbyk=-->Update dependency @vitejs/plugin-vue to v5.2.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8096): <!--number 8096 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQGF4ZS1jb3JlL3BsYXl3cmlnaHQgdG8gdjQuMTAuMiAoZm9yZ2Vqbyk=-->Update dependency @axe-core/playwright to v4.10.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8094): <!--number 8094 --><!--line 0 --><!--description c2hvdyBtZW1iZXJzaGlwIG9mIGxpbWl0ZWQgb3Jncw==-->show membership of limited orgs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8091): <!--number 8091 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjM5LjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.39.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8090): <!--number 8090 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3NlcmdpL2dvLWRpZmYgdG8gdjEuNC4wIChmb3JnZWpvKQ==-->Update module github.com/sergi/go-diff to v1.4.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8086): <!--number 8086 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjQuNCAoZm9yZ2Vqbyk=-->Update dependency go to v1.24.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8078): <!--number 8078 --><!--line 0 --><!--description RmVkZXJhdGVkIHVzZXIgYWN0aXZpdHkgZm9sbG93aW5nOiBJc29sYXRlZCBtb2RlbCBjaGFuZ2Vz-->Federated user activity following: Isolated model changes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8066): <!--number 8066 --><!--line 0 --><!--description cmVuYW1lIGFwaS57TGlzdCx9QWN0aW9uUnVuIHRvIGFwaS57TGlzdCx9UmVwb0FjdGlvblJ1bg==-->rename api.{List,}ActionRun to api.{List,}RepoActionRun<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8065): <!--number 8065 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnby51YmVyLm9yZy9tb2NrL21vY2tnZW4gdG8gdjAuNS4yIChmb3JnZWpvKQ==-->Update module go.uber.org/mock/mockgen to v0.5.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8064): <!--number 8064 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2JsZXZlc2VhcmNoL2JsZXZlL3YyIHRvIHYyLjUuMiAoZm9yZ2Vqbyk=-->Update module github.com/blevesearch/bleve/v2 to v2.5.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8063): <!--number 8063 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgdnVlIHRvIHYzLjUuMTYgKGZvcmdlam8p-->Update dependency vue to v3.5.16 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8062): <!--number 8062 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgcG9zdGNzcyB0byB2OC41LjQgKGZvcmdlam8p-->Update dependency postcss to v8.5.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8061): <!--number 8061 --><!--line 0 --><!--description Y2hvcmU6IGV4dHJhY3QgY29tbWl0IGhlYWRlciB0ZW1wbGF0ZQ==-->chore: extract commit header template<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8058): <!--number 8058 --><!--line 0 --><!--description Y2hvcmU6IGRyb3AgdW51c2VkIGBtaXNzcGVsbGA=-->chore: drop unused `misspell`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8056): <!--number 8056 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2YzL2dvZjMvdjMgdG8gdjMuMTEuMCAoZm9yZ2Vqbyk=-->Update module code.forgejo.org/f3/gof3/v3 to v3.11.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8055): <!--number 8055 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBkaXNhYmxlIGluZGlyZWN0IGRpZ2VzdCB1cGRhdGVzIGZvciBzdGFibGU=-->chore(renovate): disable indirect digest updates for stable<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8054): <!--number 8054 --><!--line 0 --><!--description Y2hvcmU6IGRyb3AgdW51c2VkIGBAdHlwZXNjcmlwdC1lc2xpbnQvcGFyc2VyYCBwYWNrYWdl-->chore: drop unused `@typescript-eslint/parser` package<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8052): <!--number 8052 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8051): <!--number 8051 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy42LjEgKGZvcmdlam8p-->Update dependency happy-dom to v17.6.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8050): <!--number 8050 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBidW1wIHRvIHY0MC40MC4wIGFuZCBkaXNhYmxlIHY3-->chore(renovate): bump to v40.40.0 and disable v7<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8049): <!--number 8049 --><!--line 0 --><!--description Q0xJIGlzIGZvcmdlam8gbm90IEZvcmdlam8=-->CLI is forgejo not Forgejo<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8044): <!--number 8044 --><!--line 0 --><!--description YWRkIG1pc3NpbmcgYm90dG9tIG1hcmdpbiBmb3IgdmVyaWZpY2F0aW9uLWJ1dHRvbiBpbiByZWxlYXNlIHZpZXc=-->add missing bottom margin for verification-button in release view<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8041): <!--number 8041 --><!--line 0 --><!--description W2dpdGVhXSBBbHdheXMgdXNlIGFuIGVtcHR5IGxpbmUgdG8gc2VwYXJhdGUgdGhlIGNvbW1pdCBtZXNzYWdlIGFuZCB0cmFpbGVy-->[gitea] Always use an empty line to separate the commit message and trailer<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8040): <!--number 8040 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMjEgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-21 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8038): <!--number 8038 --><!--line 0 --><!--description QWRkIGEgR05VIEd1aXggbWFuaWZlc3Q=-->Add a GNU Guix manifest<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8021): <!--number 8021 --><!--line 0 --><!--description Y2hvcmUoY2xlYW51cCk6IHN1cHByZXNzIG5vbiBhY3Rpb25hYmxlIFhPUk0gd2FybmluZ3M=-->chore(cleanup): suppress non actionable XORM warnings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8019): <!--number 8019 --><!--line 0 --><!--description bWlncmF0ZSByZXBvc2l0b3J5LnRvcGljcyBjb2x1bW4gZm9yIFNRTGl0ZQ==-->migrate repository.topics column for SQLite<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7994): <!--number 7994 --><!--line 0 --><!--description Y2hvcmUoY2xlYW51cCk6IHJlcGxhY2VzIHVubmVjZXNzYXJ5IGNhbGxzIHRvIGZvcm1hdHRpbmcgZnVuY3Rpb25zIGJ5IG5vbi1mb3JtYXR0aW5nIGVxdWl2YWxlbnRz-->chore(cleanup): replaces unnecessary calls to formatting functions by non-formatting equivalents<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7987): <!--number 7987 --><!--line 0 --><!--description YWdncmVnYXRlIGRlbGV0ZWQgdGVhbSBhcyBnaG9zdCB0ZWFt-->aggregate deleted team as ghost team<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7981): <!--number 7981 --><!--line 0 --><!--description YWRkIHZhbGlkYXRpbmcgdXNlciBwYXNzd29yZCBhcyB0cmFjZSByZWdpb24=-->add validating user password as trace region<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7978): <!--number 7978 --><!--line 0 --><!--description Y2hvcmUoY2xlYW51cCk6IGZpeCBhbmQgc2ltcGxpZnkgQVBJIGNvbXBhcmlzb24gaGVscGVy-->chore(cleanup): fix and simplify API comparison helper<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7975): <!--number 7975 --><!--line 0 --><!--description Zml4KGkxOG4pOiB1c2UgY29ycmVjdCBiYXNlIGNhcGl0YWxpemF0aW9uIHN0eWxl-->fix(i18n): use correct base capitalization style<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7961): <!--number 7961 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7959): <!--number 7959 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MC4zMS4wIChmb3JnZWpvKQ==-->Update renovate to v40.31.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7954): <!--number 7954 --><!--line 0 --><!--description VXBkYXRlIGZvcmdlam8gZ28tY2hpIHBhY2thZ2VzIChmb3JnZWpvKQ==-->Update forgejo go-chi packages (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7952): <!--number 7952 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1Byb3Rvbk1haWwvZ28tY3J5cHRvIHRvIHYxLjMuMCAoZm9yZ2Vqbyk=-->Update module github.com/ProtonMail/go-crypto to v1.3.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7950): <!--number 7950 --><!--line 0 --><!--description Zml4KHVpKTogcmVsYXRpdmUgdGltZSBlbGVtZW50cyB3ZXJlIHJlc2V0IG9uIGh0bXggc3dhcA==-->fix(ui): relative time elements were reset on htmx swap<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7945): <!--number 7945 --><!--line 0 --><!--description YG92ZXJmbG93LXdyYXBgIHN0cmF0ZWd5IGluIGAubWFya3VwYCBDU1MgY2xhc3M=-->`overflow-wrap` strategy in `.markup` CSS class<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7944): <!--number 7944 --><!--line 0 --><!--description Zml4KHVpKTogY2hhbmdlIGVzY2FwaW5nIGJ1dHRvbiBiZyBvbiBzZWxlY3RlZCBsaW5lcw==-->fix(ui): change escaping button bg on selected lines<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7933): <!--number 7933 --><!--line 0 --><!--description ZG8gbm90IHVuY29uZGl0aW9uYWxseSBhcHBlbmQgJChHSVRFQV9DT01QQVRJQklMSVRZKSBpbiB2ZXJzaW9u-->do not unconditionally append $(GITEA_COMPATIBILITY) in version<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7925): <!--number 7925 --><!--line 0 --><!--description Zml4KHVpKTogY2VudGVyIGZvb3RlciBsaW5rcw==-->fix(ui): center footer links<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7922): <!--number 7922 --><!--line 0 --><!--description VXBkYXRlIGdvLW9wZW5hcGkgcGFja2FnZXMgKGZvcmdlam8p-->Update go-openapi packages (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7920): <!--number 7920 --><!--line 0 --><!--description dW5pZnkgcmVwb3NpdG9yeSB0b3BpY3MgZmllbGQgYnkgcmVwbGFjaW5nIEpTT04gbnVsbCB3aXRoIGVtcHR5IGFycmF5-->unify repository topics field by replacing JSON null with empty array<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7919): <!--number 7919 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OS45IChmb3JnZWpvKQ==-->Update dependency webpack to v5.99.9 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7918): <!--number 7918 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgc2hhcnAgdG8gdjAuMzQuMiAoZm9yZ2Vqbyk=-->Update dependency sharp to v0.34.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7917): <!--number 7917 --><!--line 0 --><!--description Y2hvcmU6IFFvTCBpbXByb3ZlbWVudHMgdG8gdGVzdHM=-->chore: QoL improvements to tests<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7914): <!--number 7914 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBkaXNhYmxlIGluZGlyZWN0IG1ham9yIHVwZGF0ZXMgZm9yIHN0YWJsZSBicmFuY2hlcw==-->chore(renovate): disable indirect major updates for stable branches<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7910): <!--number 7910 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgY2xpcHBpZSB0byB2NC4xLjcgKGZvcmdlam8p-->Update dependency clippie to v4.1.7 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7908): <!--number 7908 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7907): <!--number 7907 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MC4yNi4wIChmb3JnZWpvKQ==-->Update renovate to v40.26.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7901): <!--number 7901 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3l1aW4vZ29sZG1hcmsgdG8gdjEuNy4xMiAoZm9yZ2Vqbyk=-->Update module github.com/yuin/goldmark to v1.7.12 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7898): <!--number 7898 --><!--line 0 --><!--description Y2hvcmUodWkpOiBjbGVhbnVwIHVudXNlZCBjb2xvciBDU1M=-->chore(ui): cleanup unused color CSS<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7894): <!--number 7894 --><!--line 0 --><!--description Zml4KHVpKTogZml4IGZvcmNlLXB1c2ggY29tcGFyZSBsaW5lIGxheW91dA==-->fix(ui): fix force-push compare line layout<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7890): <!--number 7890 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2FsZWN0aG9tYXMvY2hyb21hL3YyIHRvIHYyLjE4LjAgKGZvcmdlam8p-->Update module github.com/alecthomas/chroma/v2 to v2.18.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7884): <!--number 7884 --><!--line 0 --><!--description cGFyc2UgYGNoYW5nZS1pZGAgaW4gdGhlIGdpdCBjb21taXQgaGVhZGVy-->parse `change-id` in the git commit header<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7881): <!--number 7881 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2JsZXZlc2VhcmNoL2JsZXZlL3YyIHRvIHYyLjUuMSAoZm9yZ2Vqbyk=-->Update module github.com/blevesearch/bleve/v2 to v2.5.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7879): <!--number 7879 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgdnVlIHRvIHYzLjUuMTQgKGZvcmdlam8p-->Update dependency vue to v3.5.14 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7877): <!--number 7877 --><!--line 0 --><!--description TWlncmF0ZSByZW5vdmF0ZSBjb25maWc=-->Migrate renovate config<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7872): <!--number 7872 --><!--line 0 --><!--description Zml4KHVpKTogZGlzYWJsZSBhdXRvY2FwaXRhbGl6YXRpb24vYXV0b2NvcnJlY3QgZm9yIHVzZXJuYW1lIGlucHV0cw==-->fix(ui): disable autocapitalization/autocorrect for username inputs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7868): <!--number 7868 --><!--line 0 --><!--description Zml4KHVpKTogZGlzYWJsZSBzcGVsbGNoZWNrIG9uIFRPVFAgZm9ybSBmaWVsZHM=-->fix(ui): disable spellcheck on TOTP form fields<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7866): <!--number 7866 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSB1bnVzZWQgdXBkYXRlLWxvY2FsZXMuc2g=-->chore: remove unused update-locales.sh<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7857): <!--number 7857 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21zdGVpbmVydC9wYW0vdjIgdG8gdjIuMS4wIChmb3JnZWpvKQ==-->Update module github.com/msteinert/pam/v2 to v2.1.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7856): <!--number 7856 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmZvcmdlam8ub3JnL2Zvcmdlam8vYWN0IHRvIHYxLjI2LjAgKGZvcmdlam8p-->Update module code.forgejo.org/forgejo/act to v1.26.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7852): <!--number 7852 --><!--line 0 --><!--description Rml4IFRlc3RTU0hQdXNoTWlycm9yL05vcm1hbC9DaGVja19taXJyb3JlZF9jb250ZW50IHRlc3Q=-->Fix TestSSHPushMirror/Normal/Check_mirrored_content test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7849): <!--number 7849 --><!--line 0 --><!--description VXBkYXRlIGdpdGh1Yi5jb20vZ29sYW5nLWp3dC9qd3QvdjQgKGluZGlyZWN0KSB0byB2NC41LjIgW1NFQ1VSSVRZXSAoZm9yZ2Vqbyk=-->Update github.com/golang-jwt/jwt/v4 (indirect) to v4.5.2 [SECURITY] (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7848): <!--number 7848 --><!--line 0 --><!--description Y2kocmVub3ZhdGUpOiBvbmx5IGZhaWwgb24gZXJyb3I=-->ci(renovate): only fail on error<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7847): <!--number 7847 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL25pa2xhc2Zhc2NoaW5nL2dvLW9yZyB0byB2MS44LjAgKGZvcmdlam8p-->Update module github.com/niklasfasching/go-org to v1.8.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7840): <!--number 7840 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7835): <!--number 7835 --><!--line 0 --><!--description cmVtb3ZlIHJlZHVuZGFudCBwZXJtaXNzaW9uIGNoZWNrIGluIFJlbW92ZUxhYmVs-->remove redundant permission check in RemoveLabel<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7833): <!--number 7833 --><!--line 0 --><!--description dGVzdCh1aS1lMmUpOiBmaXggZmxha3kgcmVwbyB3aWtpIHRlc3Q=-->test(ui-e2e): fix flaky repo wiki test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7830): <!--number 7830 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLXdlYmF1dGhuL3dlYmF1dGhuIHRvIHYwLjEzLjAgKGZvcmdlam8p-->Update module github.com/go-webauthn/webauthn to v0.13.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7822): <!--number 7822 --><!--line 0 --><!--description Y2hvcmUodWkpOiBjbGVhbiB1cCBoYXNoYm94IENTUywgc21hbGwgZGVzaWduIGNoYW5nZXM=-->chore(ui): clean up hashbox CSS, small design changes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7817): <!--number 7817 --><!--line 0 --><!--description cmVwbGFjZSDDnyB3aXRoIHNzIGluIG5vcm1hbGl6ZVVzZXJOYW1l-->replace ß with ss in normalizeUserName<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7814): <!--number 7814 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ2xvYmFscyB0byB2MTYuMS4wIChmb3JnZWpvKQ==-->Update dependency globals to v16.1.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7809): <!--number 7809 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvb2F1dGgyIHRvIHYwLjMwLjAgKGZvcmdlam8p-->Update module golang.org/x/oauth2 to v0.30.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7807): <!--number 7807 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjQuMyAoZm9yZ2Vqbyk=-->Update dependency go to v1.24.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7799): <!--number 7799 --><!--line 0 --><!--description YWRkIG1pc3NpbmcgbG9hZGJhbGFuY2luZyBwb2xpY2llcyBmb3IgRW5naW5lR3JvdXAgY29ubmVjdGlvbnM=-->add missing loadbalancing policies for EngineGroup connections<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7798): <!--number 7798 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjQwLjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.40.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7797): <!--number 7797 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvaW1hZ2UgdG8gdjAuMjcuMCAoZm9yZ2Vqbyk=-->Update module golang.org/x/image to v0.27.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7792): <!--number 7792 --><!--line 0 --><!--description W3NraXAgY2ldIGNob3JlOiByZW1vdmUgYmFja3BvcnQgc2NyaXB0-->[skip ci] chore: remove backport script<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7789): <!--number 7789 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvdjIvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjIuMS42IChmb3JnZWpvKQ==-->Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.1.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7785): <!--number 7785 --><!--line 0 --><!--description W1NLSVAgQ0ldIGNob3JlOiB1cGRhdGUgQ09ERU9XTkVSUw==-->[SKIP CI] chore: update CODEOWNERS<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7784): <!--number 7784 --><!--line 0 --><!--description Zml4KGFwaSk6IGRvY3VtZW50IGBpc19zeXN0ZW1fd2ViaG9va2AgZmllbGQ=-->fix(api): document `is_system_webhook` field<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7778): <!--number 7778 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7777): <!--number 7777 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHY0MCAoZm9yZ2VqbykgKG1ham9yKQ==-->Update renovate to v40 (forgejo) (major)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7776): <!--number 7776 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yNjQuMCAoZm9yZ2Vqbyk=-->Update renovate to v39.264.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7773): <!--number 7773 --><!--line 0 --><!--description cmVtb3ZlIGFydGlmaWNpYWwgZGVsYXkgZm9yIFBSIHVwZGF0ZQ==-->remove artificial delay for PR update<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7772): <!--number 7772 --><!--line 0 --><!--description Y2hvcmU6IEZpeCBvdXRkYXRlZCB1c2FnZSBvZiB1bml0dGVzdC5PdmVycmlkZUZpeHR1cmVz-->chore: Fix outdated usage of unittest.OverrideFixtures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7770): <!--number 7770 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tLzQyd2ltL2h0dHBzaWcgdG8gdjEuMi4zIChmb3JnZWpvKQ==-->Update module github.com/42wim/httpsig to v1.2.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7769): <!--number 7769 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQGdpdGh1Yi9yZWxhdGl2ZS10aW1lLWVsZW1lbnQgdG8gdjQuNC42IChmb3JnZWpvKQ==-->Update dependency @github/relative-time-element to v4.4.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7768): <!--number 7768 --><!--line 0 --><!--description VXBkYXRlIGdpdGh1Yi5jb20vNDJ3aW0vc3Noc2lnIGRpZ2VzdCB0byA1MTAwNjMyIChmb3JnZWpvKQ==-->Update github.com/42wim/sshsig digest to 5100632 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7765): <!--number 7765 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjcuMC4xNQ==-->chore(release-notes): Forgejo v7.0.15<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7764): <!--number 7764 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjExLjAuMQ==-->chore(release-notes): Forgejo v11.0.1<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7762): <!--number 7762 --><!--line 0 --><!--description ZG9jdW1lbnQgdGhhdCAvcmVwb3Mve293bmVyfS97cmVwb30vcHVsbHMgbWF5IGNvbnRhaW4gbnVsbHM=-->document that /repos/{owner}/{repo}/pulls may contain nulls<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7760): <!--number 7760 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZm9yZ2Vqby9yZWxlYXNlLW5vdGVzLWFzc2lzdGFudCB0byB2MS4yLjUgKGZvcmdlam8p-->Update dependency forgejo/release-notes-assistant to v1.2.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7759): <!--number 7759 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiB1c2UgYGdpdGVhLXJlbGVhc2VzYCBkYXRhc291cmNlIGZvciBybmE=-->chore(renovate): use `gitea-releases` datasource for rna<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7758): <!--number 7758 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBhbGxvdyB1cGRhdGluZyByZWxlYXNlIG5vdGVzIGFzc2lzdGFudA==-->chore(renovate): allow updating release notes assistant<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7746): <!--number 7746 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZSBmb3JjZS1wdXNoIGNvbXBhcmUgbGluZSBsYXlvdXQ=-->fix(ui): improve force-push compare line layout<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7744): <!--number 7744 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi11bmljb3JuIHRvIHY1OSAoZm9yZ2Vqbyk=-->Update dependency eslint-plugin-unicorn to v59 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7740): <!--number 7740 --><!--line 0 --><!--description Zml4KHVpKTogbXVsdGlwbGUgZml4ZXMgb2Ygc3luYyBmb3JrIFVJ-->fix(ui): multiple fixes of sync fork UI<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7739): <!--number 7739 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3JlZGlzL2dvLXJlZGlzL3Y5IHRvIHY5LjguMCAoZm9yZ2Vqbyk=-->Update module github.com/redis/go-redis/v9 to v9.8.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7738): <!--number 7738 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2FsZWN0aG9tYXMvY2hyb21hL3YyIHRvIHYyLjE3LjIgKGZvcmdlam8p-->Update module github.com/alecthomas/chroma/v2 to v2.17.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7736): <!--number 7736 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7735): <!--number 7735 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgaGFwcHktZG9tIHRvIHYxNy40LjYgKGZvcmdlam8p-->Update dependency happy-dom to v17.4.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7732): <!--number 7732 --><!--line 0 --><!--description Y2k6IGFkZCBjbGFyaWZpY2F0aW9uIHJlZ2FyZGluZyB0ZXN0IGxhYmVs-->ci: add clarification regarding test label<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7731): <!--number 7731 --><!--line 0 --><!--description Y2hvcmU6IGZpeCB0ZXN0IHRvIGF2b2lkIGRhdGEgcmFjZQ==-->chore: fix test to avoid data race<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7728): <!--number 7728 --><!--line 0 --><!--description cmVmYWN0b3IgJiBlbmhhbmNlIEFQIGVsZW1lbnRzIHVzZWQ=-->refactor & enhance AP elements used<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7720): <!--number 7720 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZSk6IG5leHQtZGlnZXN0IG1vdmVkIHRvIGludmlzaWJsZS5mb3JnZWpvLm9yZw==-->chore(release): next-digest moved to invisible.forgejo.org<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7715): <!--number 7715 --><!--line 0 --><!--description Y2hvcmU6IHJlcGxhY2UgYGdpdGh1Yi5jb20vZ28tdGVzdGZpeHR1cmVzL3Rlc3RmaXh0dXJlc2A=-->chore: replace `github.com/go-testfixtures/testfixtures`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7714): <!--number 7714 --><!--line 0 --><!--description ZW5oYW5jZSB2YWxpZGF0ZWFibGUgaW50ZXJmYWNl-->enhance validateable interface<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7713): <!--number 7713 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTcgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-17 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7707): <!--number 7707 --><!--line 0 --><!--description ZG8gbm90IHNldCBHT1BST1hZPWRpcmVjdCBpbiBEb2NrZXJmaWxlKg==-->do not set GOPROXY=direct in Dockerfile*<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7705): <!--number 7705 --><!--line 0 --><!--description Y2hvcmUodWkpOiByZW1vdmUgdW51c2VkIGZvbWFudGljIGZvbnQgc2l6ZSBjbGFzc2Vz-->chore(ui): remove unused fomantic font size classes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7697): <!--number 7697 --><!--line 0 --><!--description YmV0dGVyIGNvbW1lbnRzIGFuZCB2YXJpYWJsZSBuYW1lcyBmb3IgQWN0aW9uUnVuTm93RG9uZQ==-->better comments and variable names for ActionRunNowDone<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7696): <!--number 7696 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7695): <!--number 7695 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yNjEuNCAoZm9yZ2Vqbyk=-->Update renovate to v39.261.4 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7690): <!--number 7690 --><!--line 0 --><!--description Zml4IHZhcmlvdXMgdHlwb3M=-->fix various typos<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7689): <!--number 7689 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3l1aW4vZ29sZG1hcmsgdG8gdjEuNy4xMSAoZm9yZ2Vqbyk=-->Update module github.com/yuin/goldmark to v1.7.11 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7687): <!--number 7687 --><!--line 0 --><!--description Y2hvcmU6IHR1bmUgZG93biByZW1vdGUgdXNlciBwcm9tb3Rpb24gZGVidWcgbWVzc2FnZSBzaG93biBhcyBlcnJvcg==-->chore: tune down remote user promotion debug message shown as error<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7685): <!--number 7685 --><!--line 0 --><!--description dXNlIGBsaW5ndWlzdC1nZW5lcmF0ZWRgIGZvciBsYW5ndWFnZSBzdGF0cw==-->use `linguist-generated` for language stats<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7683): <!--number 7683 --><!--line 0 --><!--description c2V0IGRlZmF1bHQgcmVzdHJpY3RlZCBmb3IgT0F1dGgyIHVzZXI=-->set default restricted for OAuth2 user<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7682): <!--number 7682 --><!--line 0 --><!--description Y2hvcmU6IHNpbXBsaWZ5IGBHZXREaWZmYA==-->chore: simplify `GetDiff`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7680): <!--number 7680 --><!--line 0 --><!--description Y2hvcmU6IHJlbW92ZSB1bnVzZWQgbGludGVycw==-->chore: remove unused linters<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7678): <!--number 7678 --><!--line 0 --><!--description YWRkIGxhYmVsIGZvciBhdmF0YXIgc2V0dGluZ3M=-->add label for avatar settings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7667): <!--number 7667 --><!--line 0 --><!--description aTE4bihlbik6IGZpeCB0eXBvIGluIGFyY2hpdmUgbm90aWNl-->i18n(en): fix typo in archive notice<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7665): <!--number 7665 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7663): <!--number 7663 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHBsYXl3cmlnaHQvdGVzdCB0byB2MS41Mi4wIChmb3JnZWpvKQ==-->Update dependency @playwright/test to v1.52.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7662): <!--number 7662 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL1B1ZXJraXRvQmlvL2dvcXVlcnkgdG8gdjEuMTAuMyAoZm9yZ2Vqbyk=-->Update module github.com/PuerkitoBio/goquery to v1.10.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7661): <!--number 7661 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvdjIvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjIuMS41IChmb3JnZWpvKQ==-->Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.1.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7659): <!--number 7659 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OS43IChmb3JnZWpvKQ==-->Update dependency webpack to v5.99.7 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7648): <!--number 7648 --><!--line 0 --><!--description Y2hvcmU6IG1lcmdlIHRlc3RzLkFkZEZpeHR1cmVzIGFuZCB1bml0dGVzdC5PdmVycmlkZUZpeHR1cmVz-->chore: merge tests.AddFixtures and unittest.OverrideFixtures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7640): <!--number 7640 --><!--line 0 --><!--description UmVtb3ZlICJjcmVhdGUgYnJhbmNoIiBidXR0b24gb24gbWlycm9yZWQgcmVwb3M=-->Remove "create branch" button on mirrored repos<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7616): <!--number 7616 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSBwYWdpbmF0aW9uIGxhYmVscyBhbHdheXMgdmlzaWJsZSB0byBzY3JlZW5yZWFkZXI=-->fix(ui): make pagination labels always visible to screenreader<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7613): <!--number 7613 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBtdmRhbi5jYy9nb2Z1bXB0IHRvIHYwLjguMCAoZm9yZ2Vqbyk=-->Update module mvdan.cc/gofumpt to v0.8.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7612): <!--number 7612 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7611): <!--number 7611 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4xLjIgKGZvcmdlam8p-->Update vitest monorepo to v3.1.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7610): <!--number 7610 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVzdC9lc2xpbnQtcGx1Z2luIHRvIHYxLjEuNDMgKGZvcmdlam8p-->Update dependency @vitest/eslint-plugin to v1.1.43 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7607): <!--number 7607 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2FsZWN0aG9tYXMvY2hyb21hL3YyIHRvIHYyLjE3LjAgKGZvcmdlam8p-->Update module github.com/alecthomas/chroma/v2 to v2.17.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7606): <!--number 7606 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuOTEgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.91 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7602): <!--number 7602 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTYgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-16 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7597): <!--number 7597 --><!--line 0 --><!--description ZGVsYXktd3JpdGUgdHJhY2UuZGF0IGZvciBmb3JnZWpvIGRpYWdub3Npcw==-->delay-write trace.dat for forgejo diagnosis<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7588): <!--number 7588 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7587): <!--number 7587 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yNTIuMCAoZm9yZ2Vqbyk=-->Update renovate to v39.252.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7580): <!--number 7580 --><!--line 0 --><!--description ZmVhdCh1aSk6IGVubGFyZ2UgbWV0YWRhdGEgbGluZSBnYXBzIGluIGlzc3VlIGxpc3QgYW5kIHJlZmFjdG9y-->feat(ui): enlarge metadata line gaps in issue list and refactor<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7579): <!--number 7579 --><!--line 0 --><!--description aTE4bihlbik6IGFkZCBwb3NpdGlvbmFsIGhpbnRzIHRvIHN5bmNfZm9yayBwbGFjZWhvbGRlcnM=-->i18n(en): add positional hints to sync_fork placeholders<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7578): <!--number 7578 --><!--line 0 --><!--description Zml4KHVpKTogb3ZlcmZsb3cgdGFidWxhciBtZW51IENTUyBmaXhlcw==-->fix(ui): overflow tabular menu CSS fixes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7577): <!--number 7577 --><!--line 0 --><!--description ZmVhdCh1aSk6IG1ha2UgZm9yayByZWxhdGVkIGJhbm5lcnMgbW9yZSBjb25zaXN0ZW50-->feat(ui): make fork related banners more consistent<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7575): <!--number 7575 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIGNvcnJlY3QgYnJhbmNoIG5hbWUgaW4gYnJhbmNoIHRhZyBzZWxlY3Rvcg==-->fix(ui): use correct branch name in branch tag selector<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7573): <!--number 7573 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OS42IChmb3JnZWpvKQ==-->Update dependency webpack to v5.99.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7571): <!--number 7571 --><!--line 0 --><!--description Zml4KHVpKTogc2hvdyBjb21taXQgaWNvbiBpbiBicmFuY2ggZHJvcGRvd24gYnV0dG9uIHdoZW4gdmlld2luZyBhIGNvbW1pdA==-->fix(ui): show commit icon in branch dropdown button when viewing a commit<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7565): <!--number 7565 --><!--line 0 --><!--description Z3JhbW1hciBpbiBhIHJlbGVhc2UgQVBJIGVycm9yIG1lc3NhZ2U=-->grammar in a release API error message<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7561): <!--number 7561 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2NhZGR5c2VydmVyL2NlcnRtYWdpYyB0byB2MC4yMy4wIChmb3JnZWpvKQ==-->Update module github.com/caddyserver/certmagic to v0.23.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7560): <!--number 7560 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21hdHRuL2dvLXNxbGl0ZTMgdG8gdjEuMTQuMjggKGZvcmdlam8p-->Update module github.com/mattn/go-sqlite3 to v1.14.28 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7558): <!--number 7558 --><!--line 0 --><!--description Zml4KHVpKTogbWFrZSB0YWcgZHJvcGRvd24gY2xpY2thYmxlIGFnYWlu-->fix(ui): make tag dropdown clickable again<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7557): <!--number 7557 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgcHl0aG9uIHRvIHYzLjEzLjMgKGZvcmdlam8p-->Update dependency python to v3.13.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7555): <!--number 7555 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZSk6IHYxMC4wIGlzIEVPTCBbc2tpcCBjaV0=-->chore(release): v10.0 is EOL [skip ci]<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7554): <!--number 7554 --><!--line 0 --><!--description Y2hvcmUocmVub3ZhdGUpOiBmaXggcGFja2FnZSBuYW1lIG1hdGNoaW5nIGZvciBnbyBtYWpvcnMgW3NraXAgY2ld-->chore(renovate): fix package name matching for go majors [skip ci]<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7552): <!--number 7552 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvdjIvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjIuMS4yIChmb3JnZWpvKQ==-->Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.1.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7551): <!--number 7551 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy9hY3Rpb25zL2dpdC1iYWNrcG9ydGluZyBhY3Rpb24gdG8gdjQuOC41IChmb3JnZWpvKQ==-->Update https://data.forgejo.org/actions/git-backporting action to v4.8.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7550): <!--number 7550 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgY2hhcnQuanMgdG8gdjQuNC45IChmb3JnZWpvKQ==-->Update dependency chart.js to v4.4.9 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7545): <!--number 7545 --><!--line 0 --><!--description VXBkYXRlIE5vZGUuanMgdG8gdjIyIChmb3JnZWpvKQ==-->Update Node.js to v22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7543): <!--number 7543 --><!--line 0 --><!--description bWF0Y2ggUGFja2FnZUJsb2IuSGFzaEJsYWtlMmIgZGVmaW5pdGlvbiBhbmQgbWlncmF0aW9u-->match PackageBlob.HashBlake2b definition and migration<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7539): <!--number 7539 --><!--line 0 --><!--description Zml4KFVJKTogaTE4bjogaW1wcm92ZSBuYW1pbmc=-->fix(UI): i18n: improve naming<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7538): <!--number 7538 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTUgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-15 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7534): <!--number 7534 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7532): <!--number 7532 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yNDAuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.240.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7528): <!--number 7528 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvdjIvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjIuMS4xIChmb3JnZWpvKQ==-->Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.1.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7520): <!--number 7520 --><!--line 0 --><!--description cGFja2FnZV9ibG9iLmhhc19ibGFrZTJiIG1heSBiZSBudWxs-->package_blob.has_blake2b may be null<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7512): <!--number 7512 --><!--line 0 --><!--description Y2hvcmU6IHVzZSBgc2hhcnBgIHRvIGdlbmVyYXRlIGltYWdlcw==-->chore: use `sharp` to generate images<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7510): <!--number 7510 --><!--line 0 --><!--description Y2hvcmU6IHJlZmFjdG9yIGZvciBBY3Rpb25zIERvbmUgTm90aWZpY2F0aW9u-->chore: refactor for Actions Done Notification<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7505): <!--number 7505 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvdG9vbHMvY21kL2RlYWRjb2RlIHRvIHYwLjMyLjAgKGZvcmdlam8p-->Update module golang.org/x/tools/cmd/deadcode to v0.32.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7504): <!--number 7504 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM5LjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.39.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7503): <!--number 7503 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kga2F0ZXggdG8gdjAuMTYuMjIgKGZvcmdlam8p-->Update dependency katex to v0.16.22 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7499): <!--number 7499 --><!--line 0 --><!--description Y2hvcmUoaTE4bik6IHVwZGF0ZSBjb250cmlidXRpbmcgZG9jdW1lbnRhdGlvbiB3aXRoIEpTT04gZm9ybWF0-->chore(i18n): update contributing documentation with JSON format<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7497): <!--number 7497 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvaW1hZ2UgdG8gdjAuMjYuMCAoZm9yZ2Vqbyk=-->Update module golang.org/x/image to v0.26.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7495): <!--number 7495 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21pbmlvL21pbmlvLWdvL3Y3IHRvIHY3LjAuOTAgKGZvcmdlam8p-->Update module github.com/minio/minio-go/v7 to v7.0.90 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7494): <!--number 7494 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OS41IChmb3JnZWpvKQ==-->Update dependency webpack to v5.99.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7491): <!--number 7491 --><!--line 0 --><!--description QWN0aW9ucyBEb25lIE5vdGlmaWNhdGlvbg==-->Actions Done Notification<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7490): <!--number 7490 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgd2VicGFjayB0byB2NS45OS4xIChmb3JnZWpvKQ==-->Update dependency webpack to v5.99.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7488): <!--number 7488 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnby51YmVyLm9yZy9tb2NrIHRvIHYwLjUuMSAoZm9yZ2Vqbyk=-->Update module go.uber.org/mock to v0.5.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7486): <!--number 7486 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTQgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-14 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7485): <!--number 7485 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvY3J5cHRvIHRvIHYwLjM3LjAgKGZvcmdlam8p-->Update module golang.org/x/crypto to v0.37.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7484): <!--number 7484 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yMzMuNSAoZm9yZ2Vqbyk=-->Update renovate to v39.233.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7479): <!--number 7479 --><!--line 0 --><!--description TWlub3IgZ3JhbW1hdGljYWwgZml4IHRvIHJ1bm5lciBkZWxldGlvbiBtZXNzYWdl-->Minor grammatical fix to runner deletion message<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7475): <!--number 7475 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvb2F1dGgyIHRvIHYwLjI5LjAgKGZvcmdlam8p-->Update module golang.org/x/oauth2 to v0.29.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7473): <!--number 7473 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2Zzbm90aWZ5L2Zzbm90aWZ5IHRvIHYxLjkuMCAoZm9yZ2Vqbyk=-->Update module github.com/fsnotify/fsnotify to v1.9.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7472): <!--number 7472 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgY2xpcHBpZSB0byB2NC4xLjYgKGZvcmdlam8p-->Update dependency clippie to v4.1.6 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7471): <!--number 7471 --><!--line 0 --><!--description Zml4KHVpKTogZW5zdXJlIGRpbW1lciBhbHdheXMgY292ZXJzIHdob2xlIHBhZ2U=-->fix(ui): ensure dimmer always covers whole page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7470): <!--number 7470 --><!--line 0 --><!--description Zml4KHVpKTogb25seSBydW4gYXV0aF9uYW1lIGNvZGUgb24gbmV3IGFuZCBlZGl0IHBhZ2U=-->fix(ui): only run auth_name code on new and edit page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7469): <!--number 7469 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZS1ub3Rlcyk6IEZvcmdlam8gdjExLjAuMA==-->chore(release-notes): Forgejo v11.0.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7468): <!--number 7468 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2JsZXZlc2VhcmNoL2JsZXZlL3YyIHRvIHYyLjUuMCAoZm9yZ2Vqbyk=-->Update module github.com/blevesearch/bleve/v2 to v2.5.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7467): <!--number 7467 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgdHlwZXNjcmlwdCB0byB2NS44LjMgKGZvcmdlam8p-->Update dependency typescript to v5.8.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7465): <!--number 7465 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgYW5zaV91cCB0byB2Ni4wLjUgKGZvcmdlam8p-->Update dependency ansi_up to v6.0.5 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7463): <!--number 7463 --><!--line 0 --><!--description Y2hvcmU6IGFsd2F5cyBlbmFibGUgd2VicGFjayBwcm9ncmVzcw==-->chore: always enable webpack progress<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7462): <!--number 7462 --><!--line 0 --><!--description Y2hvcmUoaTE4bik6IGFkZCBhIG1ldGEgbGluZSB0byB0aGUgYmFzZSBqc29uIHRyYW5zbGF0aW9u-->chore(i18n): add a meta line to the base json translation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7459): <!--number 7459 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2FsZWN0aG9tYXMvY2hyb21hL3YyIHRvIHYyLjE2LjAgKGZvcmdlam8p-->Update module github.com/alecthomas/chroma/v2 to v2.16.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7458): <!--number 7458 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBjb2RlLmdpdGVhLmlvL3Nkay9naXRlYSB0byB2MC4yMS4wIChmb3JnZWpvKQ==-->Update module code.gitea.io/sdk/gitea to v0.21.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7456): <!--number 7456 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgYW5zaV91cCB0byB2Ni4wLjMgKGZvcmdlam8p-->Update dependency ansi_up to v6.0.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7455): <!--number 7455 --><!--line 0 --><!--description TWFrZWZpbGUgJiBCU0RtYWtlZmlsZSBjaGFuZ2Vz-->Makefile & BSDmakefile changes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7453): <!--number 7453 --><!--line 0 --><!--description Y2hvcmUoc2VjKTogdW5pZnkgdXNhZ2Ugb2YgYGNyeXB0by9yYW5kLlJlYWRg-->chore(sec): unify usage of `crypto/rand.Read`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7452): <!--number 7452 --><!--line 0 --><!--description bWFrZSBpbnN0YWxsaW5nIEZvcmdlam8gd29yayBhZ2Fpbg==-->make installing Forgejo work again<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7451): <!--number 7451 --><!--line 0 --><!--description Y2hvcmUoaTE4bik6IGNsZWFudXAgYHNldHRpbmdzLmFkb3B0YCBzdHJpbmc=-->chore(i18n): cleanup `settings.adopt` string<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7434): <!--number 7434 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21hdHRuL2dvLXNxbGl0ZTMgdG8gdjEuMTQuMjcgKGZvcmdlam8p-->Update module github.com/mattn/go-sqlite3 to v1.14.27 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7433): <!--number 7433 --><!--line 0 --><!--description ZmVhdChidWlsZCk6IHJ1biBsaW50LWxvY2FsZS11c2FnZSB3L28gLS1hbGxvdy1taXNzaW5nLW1zZ2lkcw==-->feat(build): run lint-locale-usage w/o --allow-missing-msgids<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7431): <!--number 7431 --><!--line 0 --><!--description bWFrZSByZXBvIGNsb25lIGh0dHBzL3NzaCBsaXN0ZW5lciBjb25kaXRpb25hbA==-->make repo clone https/ssh listener conditional<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7429): <!--number 7429 --><!--line 0 --><!--description ZmVhdChidWlsZCk6IHVuaWZvcm0gaW5pIHBhcnNpbmc=-->feat(build): uniform ini parsing<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7425): <!--number 7425 --><!--line 0 --><!--description ZmVhdChsb2NhbGUgSXRlcik6IHByb3Blcmx5IHN1cHBvcnQgdHJQbHVyYWxTdHJpbmc=-->feat(locale Iter): properly support trPluralString<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7424): <!--number 7424 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL21hdHRuL2dvLXNxbGl0ZTMgdG8gdjEuMTQuMjUgKGZvcmdlam8p-->Update module github.com/mattn/go-sqlite3 to v1.14.25 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7423): <!--number 7423 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvLXdlYmF1dGhuL3dlYmF1dGhuIHRvIHYwLjEyLjMgKGZvcmdlam8p-->Update module github.com/go-webauthn/webauthn to v0.12.3 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7422): <!--number 7422 --><!--line 0 --><!--description Zml4KGkxOG4pOiBmaXggc2V2ZXJhbCB1c2FnZXMgb2YgaTE4bg==-->fix(i18n): fix several usages of i18n<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7421): <!--number 7421 --><!--line 0 --><!--description Zml4KG1pZ3JhdGlvbnMpOiB0cmFuc2ZlciBQUiBmbG93IGluZm9ybWF0aW9u-->fix(migrations): transfer PR flow information<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7419): <!--number 7419 --><!--line 0 --><!--description Y2hvcmU6IGFkZCBlbXB0eSBgYWN0aW9uX3ZhcmlhYmxlYCBmaXh0dXJl-->chore: add empty `action_variable` fixture<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7417): <!--number 7417 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZ28gdG8gdjEuMjQuMiAoZm9yZ2Vqbyk=-->Update dependency go to v1.24.2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7416): <!--number 7416 --><!--line 0 --><!--description Y2hvcmUodWkpOiByZW1vdmUgZm9tYW50aWMncyBkaW1tZXIgbW9kdWxl-->chore(ui): remove fomantic's dimmer module<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7414): <!--number 7414 --><!--line 0 --><!--description Y2hvcmUodWkpOiByZW1vdmUgaW5lZmZlY3RpdmUgY2xhc3Mgc21hbGwgaW4gaW5saW5lIGNvZGUgcHJldmlldw==-->chore(ui): remove ineffective class small in inline code preview<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7408): <!--number 7408 --><!--line 0 --><!--description Y2hvcmU6IGVuYWJsZSBzZXZlcmFsIG5vLWpxdWVyeSBydWxlcw==-->chore: enable several no-jquery rules<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7407): <!--number 7407 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4xLjEgKGZvcmdlam8p-->Update vitest monorepo to v3.1.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7406): <!--number 7406 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgdG8gdjguMjkuMCAoZm9yZ2Vqbyk=-->Update linters to v8.29.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7400): <!--number 7400 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7399): <!--number 7399 --><!--line 0 --><!--description VXBkYXRlIHJlbm92YXRlIHRvIHYzOS4yMjIuMSAoZm9yZ2Vqbyk=-->Update renovate to v39.222.1 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7397): <!--number 7397 --><!--line 0 --><!--description W2dpdGVhXSB3ZWVrIDIwMjUtMTMgY2hlcnJ5IHBpY2sgKGdpdGVhL21haW4gLT4gZm9yZ2Vqbyk=-->[gitea] week 2025-13 cherry pick (gitea/main -> forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7396): <!--number 7396 --><!--line 0 --><!--description Y2hvcmU6IHVzZSBkeW5hbWljIGlk-->chore: use dynamic id<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7394): <!--number 7394 --><!--line 0 --><!--description dXNlIGNvcnJlY3QgaW5pdCBpbnN0cnVjdGlvbiBmb3Igc2hhMjU2-->use correct init instruction for sha256<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7392): <!--number 7392 --><!--line 0 --><!--description TG9jayBmaWxlIG1haW50ZW5hbmNlIChmb3JnZWpvKQ==-->Lock file maintenance (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7391): <!--number 7391 --><!--line 0 --><!--description VXBkYXRlIGdpdGh1Yi5jb20vZ29vZ2xlL3Bwcm9mIGRpZ2VzdCB0byBhNGIwM2VjIChmb3JnZWpvKQ==-->Update github.com/google/pprof digest to a4b03ec (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7390): <!--number 7390 --><!--line 0 --><!--description QWNjZXNzaWJpbGl0eTogZml4IHVucmVhZGFibGUgY2FwdGNoYSB3aXRoIGRhcmsgdGhlbWVz-->Accessibility: fix unreadable captcha with dark themes<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7384): <!--number 7384 --><!--line 0 --><!--description VXBkYXRlIGxpbnRlcnMgKGZvcmdlam8p-->Update linters (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7383): <!--number 7383 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgeWFtbGxpbnQgdG8gdjEuMzcuMCAoZm9yZ2Vqbyk=-->Update dependency yamllint to v1.37.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7382): <!--number 7382 --><!--line 0 --><!--description VXBkYXRlIHZpdGVzdCBtb25vcmVwbyB0byB2My4wLjkgKGZvcmdlam8p-->Update vitest monorepo to v3.0.9 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7381): <!--number 7381 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgQHZpdGVzdC9lc2xpbnQtcGx1Z2luIHRvIHYxLjEuMzggKGZvcmdlam8p-->Update dependency @vitest/eslint-plugin to v1.1.38 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7379): <!--number 7379 --><!--line 0 --><!--description cHJlcGVuZCBBcHBTdWJVUkwgdG8gdmlzaWJpbGl0eSBoaW50IFVSTHM=-->prepend AppSubURL to visibility hint URLs<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7378): <!--number 7378 --><!--line 0 --><!--description Y2hvcmU6IGltcHJvdmUgcmVwbyBtaWdyYXRlIGUyZSB0ZXN0-->chore: improve repo migrate e2e test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7376): <!--number 7376 --><!--line 0 --><!--description Y2hvcmUodGVzdHMpOiBmaXggdGVzdGluZyBmYWlsdXJlIGNhdXNlZCBieSBkZXAgdXBkYXRl-->chore(tests): fix testing failure caused by dep update<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7374): <!--number 7374 --><!--line 0 --><!--description Y2hvcmUodGVzdHMpOiByZWZhY3RvciBtaWdyYXRpb24gZm9ybSB0ZXN0-->chore(tests): refactor migration form test<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7372): <!--number 7372 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgZXNsaW50LXBsdWdpbi11bmljb3JuIHRvIHY1OCAoZm9yZ2Vqbyk=-->Update dependency eslint-plugin-unicorn to v58 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7371): <!--number 7371 --><!--line 0 --><!--description Y2hvcmU6IHVzZSBjb3JyZWN0IGltcG9ydA==-->chore: use correct import<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7367): <!--number 7367 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZ2NpL2dvbGFuZ2NpLWxpbnQvY21kL2dvbGFuZ2NpLWxpbnQgdG8gdjIgKGZvcmdlam8p-->Update module github.com/golangci/golangci-lint/cmd/golangci-lint to v2 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7366): <!--number 7366 --><!--line 0 --><!--description VXBkYXRlIGh0dHBzOi8vZGF0YS5mb3JnZWpvLm9yZy90ai1hY3Rpb25zL2NoYW5nZWQtZmlsZXMgYWN0aW9uIHRvIHY0NiAoZm9yZ2Vqbyk=-->Update https://data.forgejo.org/tj-actions/changed-files action to v46 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7362): <!--number 7362 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM4LjAgKGZvcmdlam8p-->Update module golang.org/x/net to v0.38.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7356): <!--number 7356 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZSB2ZXJ0aWNhbCBhbGlnbm1lbnQgb2YgaWNvbnMgd2l0aCB0ZXh0IGluIHRoZSBvdmVyZmxvdyBtZW51ICgjNzMxNCk=-->fix(ui): improve vertical alignment of icons with text in the overflow menu (#7314)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7355): <!--number 7355 --><!--line 0 --><!--description NDEwOC1lbXB0eS1zbGljZS1lbmNvZGVkLXRvLW51bGw=-->4108-empty-slice-encoded-to-null<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7350): <!--number 7350 --><!--line 0 --><!--description cmVmYWN0b3IoY2xpKTogaW1wcm92ZSBkdW1wJ3MgdGVtcG9yYXJ5IGZpbGUgaGFuZGxpbmc=-->refactor(cli): improve dump's temporary file handling<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7348): <!--number 7348 --><!--line 0 --><!--description aW50cm9kdWNlIGdpdE5lZWRlZCBib29sIGluIHNldHVw-->introduce gitNeeded bool in setup<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7344): <!--number 7344 --><!--line 0 --><!--description Zml4KHVpKTogRG8gbm90IGNoZWNrIGZvciBgdmVydGljYWwtYWxpZ25g-->fix(ui): Do not check for `vertical-align`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7339): <!--number 7339 --><!--line 0 --><!--description VXBkYXRlIGRlcGVuZGVuY3kgbWVybWFpZCB0byB2MTEuNi4wIChmb3JnZWpvKQ==-->Update dependency mermaid to v11.6.0 (forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7337): <!--number 7337 --><!--line 0 --><!--description Y2hvcmU6IGJyYW5kaW5nIGltcG9ydCBwYXRo-->chore: branding import path<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7314): <!--number 7314 --><!--line 0 --><!--description Zml4KHVpKTogaW1wcm92ZSB2ZXJ0aWNhbCBhbGlnbm1lbnQgb2YgaWNvbnMgd2l0aCB0ZXh0IGluIHRoZSBvdmVyZmxvdyBtZW51-->fix(ui): improve vertical alignment of icons with text in the overflow menu<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7278): <!--number 7278 --><!--line 0 --><!--description ZmVhdChidWlsZCk6IGxpbnQtbG9jYWxlLXVzYWdlIHNob3VsZCBkZXRlY3QgbW9yZSBUciBmdW5jdGlvbnM=-->feat(build): lint-locale-usage should detect more Tr functions<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7271): <!--number 7271 --><!--line 0 --><!--description ZmVhdCh1aSk6IGltcHJvdmUgYnV0dG9uIGdhcCBjb25zaXN0ZW5jeSwgbWFrZSBpdCB2YXJpYWJsZSwgbGFyZ2VyIG9uIHRvdWNoc2NyZWVucw==-->feat(ui): improve button gap consistency, make it variable, larger on touchscreens<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7261): <!--number 7261 --><!--line 0 --><!--description cmVkaXJlY3QgdG8gc3VibW9kdWxlIGluc3RlYWQgb2YgdGhyb3dpbmcgNTAwIGVycm9yIHdoZW4gdmlld2luZyBzdWJtb2R1bGUgZW50cnk=-->redirect to submodule instead of throwing 500 error when viewing submodule entry<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7203): <!--number 7203 --><!--line 0 --><!--description YWRkIHBvcnQgYW5kIHNjaGVtYSB0byBmZWRlcmF0aW9uIGhvc3Q=-->add port and schema to federation host<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7092): <!--number 7092 --><!--line 0 --><!--description ZmVhdChyZXBvLGxvY2FsZSk6IG1lcmdlIFBSL2lzc3VlcyBjYXNlcyBmb3Igc29tZSByZXBvL2lzc3VlIHN0cmluZ3M=-->feat(repo,locale): merge PR/issues cases for some repo/issue strings<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7035): <!--number 7035 --><!--line 0 --><!--description ZW5hYmxlIEhUVFAgc2lnbmF0dXJlcyBvbiBhbGwgQWN0aXZpdHlQdWIgZW5kcG9pbnRz-->enable HTTP signatures on all ActivityPub endpoints<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6977): <!--number 6977 --><!--line 0 --><!--description ZmVhdCE6IEFidXNpdmUgY29udGVudCByZXBvcnRpbmc=-->feat!: Abusive content reporting<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6154): <!--number 6154 --><!--line 0 --><!--description UmVwbGFjZSB0aGUgJ3JlbGF0aXZlLXRpbWUnIGVsZW1lbnQgc2NyaXB0aW5nIHdpdGggY3VzdG9tLCB0cmFuc2xhdGFibGUgcmV3cml0ZQ==-->Replace the 'relative-time' element scripting with custom, translatable rewrite<!--description-->
+- Already announced in the release notes of an older stable release
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8234): <!--number 8234 --><!--line 0 --><!--description Y29sbGFib3JhdG9yIGNhbiBlZGl0IHdpa2kgd2l0aCB3cml0ZSBhY2Nlc3M=-->collaborator can edit wiki with write access<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8189): <!--number 8189 --><!--line 0 --><!--description ZG8gbm90IGlnbm9yZSBhdXRvbWVyZ2Ugd2hpbGUgYSBQUiBpcyBjaGVja2luZyBmb3IgY29uZmxpY3Rz-->do not ignore automerge while a PR is checking for conflicts<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8170): <!--number 8170 --><!--line 0 --><!--description ZXJyb25lb3VzIGxpc3QgY29udGludWF0aW9uIG9uIENtZCtFbnRlciAoIzgxNTMp-->erroneous list continuation on Cmd+Enter (#8153)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8155): <!--number 8155 --><!--line 0 --><!--description ZG8gbm90IGZhaWwgd2hlbiByZWxlYXNlIG9yIHdpa2kgaXMgc2V0IGluIGAvcmVwb3MvbWlncmF0ZWAgQVBJ-->do not fail when release or wiki is set in `/repos/migrate` API<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7979): <!--number 7979 --><!--line 0 --><!--description cHVsbCByZXF1ZXN0IGNyb3NzIHJlZmVyZW5jZXM=-->pull request cross references<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7976): <!--number 7976 --><!--line 0 --><!--description aWdub3JlIGV4cGlyZWQgYXJ0aWZhY3RzIGZvciBxdW90YSBjYWxjdWxhdGlvbg==-->ignore expired artifacts for quota calculation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7883): <!--number 7883 --><!--line 0 --><!--description cXVvdGUgcmVwbHkgaW4gQ2hyb21pdW0=-->quote reply in Chromium<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7775): <!--number 7775 --><!--line 0 --><!--description bWFrZSBoYXNoIHBhdHRlcm4gbW9yZSBzdHJpY3Q=-->make hash pattern more strict<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7755): <!--number 7755 --><!--line 0 --><!--description Zml4KHNlYyk6IGFkZCB0ZXN0cyBmb3IgT0F1dGgyIHNpZ251cA==-->fix(sec): add tests for OAuth2 signup<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7752): <!--number 7752 --><!--line 0 --><!--description Zml4KHNlYyk6IG9ubHkgZGVncmFkZSBwZXJtaXNzaW9uIGNoZWNrIGZvciBnaXQgcHVzaA==-->fix(sec): only degrade permission check for git push<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7650): <!--number 7650 --><!--line 0 --><!--description ZGlzcGxheSB0aGUgbGlzdCBvZiB0YXNrcyBpbiB0aGUgcnVubmVyIGVkaXQgcGFnZQ==-->display the list of tasks in the runner edit page<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7594): <!--number 7594 --><!--line 0 --><!--description Zml4KGkxOG4pOiBwcmV2ZW50IGluY29ycmVjdCBsb2dnaW5nIG9uIHN0cmluZ3MgbWlzc2luZyBpbiBKU09OIGxvY2FsZXM=-->fix(i18n): prevent incorrect logging on strings missing in JSON locales<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7584): <!--number 7584 --><!--line 0 --><!--description Zml4KHVpL3ByKTogdXNlIGV5ZSBpY29uIGZvciByZXZpZXdz-->fix(ui/pr): use eye icon for reviews<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7581): <!--number 7581 --><!--line 0 --><!--description Zml4KHVpKTogdXNlIGdhcCBpbiBzd2l0Y2ggaXRlbXM=-->fix(ui): use gap in switch items<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7395): <!--number 7395 --><!--line 0 --><!--description dmFsaWRhdGUgaW5wdXQgZm9yIGRlZmF1bHRfe21lcmdlLHVwZGF0ZX1fc3R5bGU=-->validate input for default_{merge,update}_style<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/12.0.1.md b/release-notes-published/12.0.1.md
new file mode 100644
index 0000000000..e3de6cae3a
--- /dev/null
+++ b/release-notes-published/12.0.1.md
@@ -0,0 +1,24 @@
+Insecure authentication methods have been deprecated since 2023. They were [removed in v12.0.0](https://codeberg.org/forgejo/forgejo/pulls/7924) but they were  [restored in v12.0.1](https://codeberg.org/forgejo/forgejo/pulls/8653). Certain OAuth2 clients and packages in the Forgejo ecosystem still rely on these methods and it was premature to remove them.
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- User Interface bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8575) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8576)): <!--number 8576 --><!--line 0 --><!--description Zml4OiBhbGxvdyBmb3IgdHJhY2tlZCB0aW1lIHRvIGJlIHJlbW92ZWQgYWdhaW4=-->allow for tracked time to be removed again<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8565) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8574)): <!--number 8574 --><!--line 0 --><!--description Zml4OiBjb3JyZWN0IGltYWdlIHNvdXJjZSBmb3IgcXVvdGVkIHJlcGx5-->correct image source for quoted reply<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8553) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8555)): <!--number 8555 --><!--line 0 --><!--description Zml4KHVpKTogcHJldmVudCByZW5kZXIgZmFpbHVyZSBvbiBmYXVsdHkgb3JnIHNldHRpbmdzIHBvc3Q=-->prevent render failure on faulty org settings post<!--description-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8633) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8653)): <!--number 8653 --><!--line 0 --><!--description UmV2ZXJ0ICJmZWF0OiByZW1vdmUgQVBJIGF1dGhlbnRpY2F0aW9uIG1ldGhvZHMgdGhhdCB1c2VzIHRoZSBVUkwgcXVlcnkgKCM3OTI0KSI=-->Revert "feat: remove API authentication methods that uses the URL query (#7924)"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8644) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8646)): <!--number 8646 --><!--line 0 --><!--description Zml4KHVpKTogdXBkYXRlIGkxOG4gdXNhZ2UgaW4gY29tbWVudHM=-->update i18n usage in comments<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8609) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8613)): <!--number 8613 --><!--line 0 --><!--description Zml4OiB1cGdyYWRlIGZhaWxzIG9yIGhhbmcgYXQgbWlncmF0aW9uWzMxXTogTWlncmF0ZSBtYXZlbiBwYWNrYWdlIG5hbWUgY29uY2F0ZW5hdGlvbg==-->upgrade fails or hang at migration[31]: Migrate maven package name concatenation<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8622) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8624)): <!--number 8624 --><!--line 0 --><!--description Zml4OiByZWJhc2UgYW5kIGZhc3QgZm9yd2FyZCBtZXJnZSBicmVha3MgY29tbWl0IHNpZ25hdHVyZXM=-->rebase and fast forward merge breaks commit signatures<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8617) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8618)): <!--number 8618 --><!--line 0 --><!--description Zml4OiBtYWtlIHRoZSBhY3Rpb24gZmVlZCByZXNpbGllbnQgdG8gZGF0YWJhc2UgaW5jb25zaXN0ZW5jaWVz-->make the action feed resilient to database inconsistencies<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8533) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8584)): <!--number 8584 --><!--line 0 --><!--description Zml4OiBtYWtlIHN1cmUgdG8gdXNlIHVuYWx0ZXJlZCBmaWVsZHMgd2hlbiBzYXZpbmcgYSBzaGFkb3cgY29weSBmb3IgdXBkYXRlZCBwcm9maWxlcyBvciBjb21tZW50cw==-->make sure to use unaltered fields when saving a shadow copy for updated profiles or comments<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8596) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8610)): <!--number 8610 --><!--line 0 --><!--description Zml4OiBmb2xsb3cgc3ltbGlua3MgZm9yIGxvY2FsIGFzc2V0cw==-->follow symlinks for local assets<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8550) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8552)): <!--number 8552 --><!--line 0 --><!--description Zml4OiB1c2UgY29ycmVjdCBBQ01FIGRlZmF1bHQ=-->use correct ACME default<!--description-->
+- Included for completeness but not user-facing (chores, etc.)
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8638) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8641)): <!--number 8641 --><!--line 0 --><!--description UmV2ZXJ0ICJmaXgoY2kpOiBwdWxsIHN0eWx1cyBmcm9tIGdpdGh1YjpzdHlsdXMvc3R5bHVzIzAuNTcuMCAoIzg2MjUpIg==-->Revert "fix(ci): pull stylus from github:stylus/stylus#0.57.0 (#8625)"<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8625) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8627)): <!--number 8627 --><!--line 0 --><!--description Zml4KGNpKTogcHVsbCBzdHlsdXMgZnJvbSBnaXRodWI6c3R5bHVzL3N0eWx1cyMwLjU3LjA=-->fix(ci): pull stylus from github:stylus/stylus#0.57.0<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/8611) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8616)): <!--number 8616 --><!--line 0 --><!--description Y2hvcmU6IGRpc2FibGUgRTJFIHRlc3QgZm9yIHdlYmtpdA==-->chore: disable E2E test for webkit<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/7.0.15.md b/release-notes-published/7.0.15.md
new file mode 100644
index 0000000000..f14d30a9b4
--- /dev/null
+++ b/release-notes-published/7.0.15.md
@@ -0,0 +1,21 @@
+
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Security bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7752) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7754)): <!--number 7754 --><!--line 0 --><!--description Zml4KHNlYyk6IG9ubHkgZGVncmFkZSBwZXJtaXNzaW9uIGNoZWNrIGZvciBnaXQgcHVzaA==-->If [LFS](https://git-lfs.com/) is enabled on a Forgejo instance with `[server].LFS_START_SERVER = true` (this is not the default), it was possible for a registered user to upload LFS files to a repository to which they only had read access. It was not possible for an anonymous user to do the same, even if they had read access to a public repository. The permissions are now correctly enforced and uploading LFS files is only allowed for registered users with write permission to the associated repository. Files that were uploaded to LFS in this way will not be obtained when someone does a `git clone` or `git fetch` on the associated repository. It was also not possible to exploit the incorrect permission check to delete or override an existing LFS file. These are orphaned LFS files that can be removed from the `/settings/lfs` panel of the associated repository.<!--description-->
+- Security features
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7693) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7757)): <!--number 7757 --><!--line 0 --><!--description Zml4KHNlYyk6IGNvbnNpZGVyIHdlYmF1dGhuIGZvciBleHRlcm5hbCBsb2dpbg==-->A user account with 2fa (two factor authentication) enrolled with a security key was not enforced when using an external account (e.g. Codeberg or GitHub). The security key is now required even when login in from an external account or linking a new external account to an existing local account, just as it is required when login in with a user and password. This problem did not exist with 2fa enrolled with [TOTP](https://en.wikipedia.org/wiki/Time-based_one-time_password).<!--description-->
+- Included for completeness but not worth a release note
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7730): <!--number 7730 --><!--line 0 --><!--description Y2hvcmU6IHJlcGxhY2UgYGdpdGh1Yi5jb20vZ28tdGVzdGZpeHR1cmVzL3Rlc3RmaXh0dXJlc2A=-->chore: replace `github.com/go-testfixtures/testfixtures`<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7720) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7724)): <!--number 7724 --><!--line 0 --><!--description Y2hvcmUocmVsZWFzZSk6IG5leHQtZGlnZXN0IG1vdmVkIHRvIGludmlzaWJsZS5mb3JnZWpvLm9yZw==-->chore(release): next-digest moved to invisible.forgejo.org<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/6458) ([backported](https://codeberg.org/forgejo/forgejo/pulls/7710)): <!--number 7710 --><!--line 0 --><!--description Zml4OiBkbyBub3Qgc2V0IEdPUFJPWFk9ZGlyZWN0IGluIERvY2tlcmZpbGUq-->fix: do not set GOPROXY=direct in Dockerfile*<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7676): <!--number 7676 --><!--line 0 --><!--description Y2hvcmU6IHJlbHkgb24gcmVub3ZhdGUgZm9yIHNlY3VyaXR5IGNoZWNrcw==-->chore: rely on renovate for security checks<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7368): <!--number 7368 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM4LjAgKHY3LjAvZm9yZ2Vqbyk=-->Update module golang.org/x/net to v0.38.0 (v7.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7300): <!--number 7300 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvb2F1dGgyIHRvIHYwLjI3LjAgW1NFQ1VSSVRZXSAodjcuMC9mb3JnZWpvKQ==-->Update module golang.org/x/oauth2 to v0.27.0 [SECURITY] (v7.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7299): <!--number 7299 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnb2xhbmcub3JnL3gvbmV0IHRvIHYwLjM2LjAgW1NFQ1VSSVRZXSAodjcuMC9mb3JnZWpvKQ==-->Update module golang.org/x/net to v0.36.0 [SECURITY] (v7.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7297): <!--number 7297 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL2dvbGFuZy1qd3Qvand0L3Y1IHRvIHY1LjIuMiBbU0VDVVJJVFldICh2Ny4wL2Zvcmdlam8p-->Update module github.com/golang-jwt/jwt/v5 to v5.2.2 [SECURITY] (v7.0/forgejo)<!--description-->
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/7283): <!--number 7283 --><!--line 0 --><!--description VXBkYXRlIG1vZHVsZSBnaXRodWIuY29tL3JlZGlzL2dvLXJlZGlzL3Y5IHRvIHY5LjcuMyAodjcuMC9mb3JnZWpvKQ==-->Update module github.com/redis/go-redis/v9 to v9.7.3 (v7.0/forgejo)<!--description-->
+<!--end release-notes-assistant-->
diff --git a/release-notes-published/7.0.16.md b/release-notes-published/7.0.16.md
new file mode 100644
index 0000000000..5d09ddc245
--- /dev/null
+++ b/release-notes-published/7.0.16.md
@@ -0,0 +1,11 @@
+## Git update fixing CVE-2025-48385
+
+Git vulnerabilities were [disclosed 8 July 2025](https://groups.google.com/g/git-packagers/c/cYJ6peBtyxk/m/xVukiATcBQAJ) and require an update of the Git version used by Forgejo to Git [v2.43.7, v2.44.4, v2.45.4, v2.46.4, v2.47.3, v2.48.2, v2.49.1, or v2.50.1](https://nvd.nist.gov/vuln/detail/CVE-2025-48385). The [containers of this release](https://codeberg.org/forgejo/-/packages/container/forgejo/7.0.16) include a Git binary that is not vulnerable. If Forgejo was installed using a container, it is enough to upgrade  the container to get the latest Git binary.
+
+Security bug fixes are only for Git, there are no security fixes for Forgejo itself in this release.
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+<!--end release-notes-assistant-->
diff --git a/release-notes/6813.md b/release-notes/6813.md
new file mode 100644
index 0000000000..bd9da8dc39
--- /dev/null
+++ b/release-notes/6813.md
@@ -0,0 +1 @@
+Reimplemented editor Tab key handling with accessibility safeguards. Balance having the editor work as expected by developers (with Tab key affecting indentation) while also not impeding keyboard navigation.
diff --git a/release-notes/6933.md b/release-notes/6933.md
new file mode 100644
index 0000000000..8ca32a8c37
--- /dev/null
+++ b/release-notes/6933.md
@@ -0,0 +1 @@
+feat: Show if commit is verified in activity feed of an user or an organization for new activity
diff --git a/release-notes/8035.md b/release-notes/8035.md
new file mode 100644
index 0000000000..541fe35277
--- /dev/null
+++ b/release-notes/8035.md
@@ -0,0 +1 @@
+The `forgejo docs` command is deprecated and CLI errors are now displayed on stderr instead of stdout. These breaking changes happened because the package used to parse the command line arguments was [upgraded from v2 to v3](https://cli.urfave.org/migrate-v2-to-v3/). A [separate project was initiated](https://github.com/urfave/cli-docs) to re-implement the `docs` command, but it is not yet production ready.
diff --git a/release-notes/8502.md b/release-notes/8502.md
new file mode 100644
index 0000000000..b7fa0fd892
--- /dev/null
+++ b/release-notes/8502.md
@@ -0,0 +1 @@
+Forgejo Actions workflows are verified with a YAML schema and common errors such as using an incorrect context (e.g. `${{ badcontext.FORGEJO_REPOSITORY }}`) or a typo in a required keyword (e.g. `ruins-on:` instead of `runs-on:`) will be reported in the action page and the web page that displays the file in the repository. It is recommended to verify existing workflows are successfully verified prior to upgrading, [as explained in the Forgejo runner release notes](https://code.forgejo.org/forgejo/runner/src/branch/main/RELEASE-NOTES.md#8-0-0).
diff --git a/renovate.json b/renovate.json
index 7ea5e9d6b9..d76b6c7d23 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,17 +6,16 @@
     "docker:pinDigests",
     "helpers:pinGitHubActionDigests"
   ],
-  "baseBranches": [
+  "baseBranchPatterns": [
     "$default",
-    "/^v7\\.\\d+/forgejo$/",
-    "/^v10\\.\\d+/forgejo$/",
-    "/^v11\\.\\d+/forgejo$/"
+    "/^v11\\.\\d+/forgejo$/",
+    "/^v12\\.\\d+/forgejo$/"
   ],
   "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths", "npmDedupe"],
   "prConcurrentLimit": 10,
   "osvVulnerabilityAlerts": true,
   "automergeStrategy": "squash",
-  "labels": ["dependency-upgrade","test/not-needed"],
+  "labels": ["dependency-upgrade", "test/not-needed"],
   "packageRules": [
     {
       "description": "Require approval for python minor version",
@@ -29,17 +28,14 @@
       "matchPackageNames": [
         "docker.io/bitnami/minio",
         "github.com/go-ap/activitypub",
-        "github.com/nektos/act",
-        "gitea.com/gitea/act"
       ],
       "dependencyDashboardApproval": true
     },
     {
       "description": "Schedule some deps less frequently",
       "matchPackageNames": [
-        "code.forgejo.org/f3/gof3/v3",
-        "github.com/google/pprof",
-        "github.com/golangci/misspell/cmd/misspell"
+        "code.forgejo.org/f3/gof3/**",
+        "github.com/google/pprof"
       ],
       "extends": ["schedule:quarterly"]
     },
@@ -81,7 +77,7 @@
       "description": "Split minor and patch updates",
       "matchPackageNames": [
         "containerbase/python-prebuild",
-        "github.com/urfave/cli/v2",
+        "github.com/urfave/cli/**",
         "python",
         "swagger-ui-dist",
         "vue"
@@ -92,7 +88,7 @@
       "description": "Automerge patch updates",
       "matchPackageNames": [
         "vue",
-        "github.com/urfave/cli/v2",
+        "github.com/urfave/cli/**",
         "swagger-ui-dist"
       ],
       "matchUpdateTypes": ["patch"],
@@ -127,8 +123,8 @@
         "@vitejs/plugin-vue",
         "@vue/test-utils",
         "djlint",
-        "github.com/editorconfig-checker/editorconfig-checker/v2/cmd/editorconfig-checker",
-        "github.com/golangci/golangci-lint/cmd/golangci-lint",
+        "github.com/editorconfig-checker/editorconfig-checker/**",
+        "github.com/golangci/golangci-lint/**",
         "github.com/go-testfixtures/testfixtures",
         "github.com/PuerkitoBio/goquery",
         "happy-dom",
@@ -146,21 +142,19 @@
       "matchPackageNames": ["monaco-editor"],
       "minimumReleaseAge": "30 days"
     },
+    {
+      "description": "Disable indirect updates for stable branches",
+      "matchBaseBranches": ["/^v\\d+\\.\\d+\\/forgejo$/"],
+      "matchManagers": ["gomod"],
+      "matchUpdateTypes": ["major", "minor", "patch", "digest"],
+      "matchDepTypes": ["indirect"],
+      "enabled": false
+    },
     {
       "description": "Require approval for stable branches (must be last rule to override all others)",
       "matchBaseBranches": ["/^v\\d+\\.\\d+\\/forgejo$/"],
       "dependencyDashboardApproval": true,
       "schedule": ["at any time"]
     }
-  ],
-  "customManagers": [
-    {
-      "description": "Update deps inside Makefile",
-      "customType": "regex",
-      "fileMatch": ["^Makefile$"],
-      "matchStrings": [
-        " \\?= (?<depName>.+?)@(?<currentValue>.+?) # renovate: datasource=(?<datasource>.+?)(?: packageName=(?<packageName>.+?))?( versioning=(?<versioning>.+?))?\\s"
-      ]
-    }
   ]
 }
diff --git a/routers/api/actions/artifacts_chunks.go b/routers/api/actions/artifacts_chunks.go
index a15fa4fd1e..c0af750d7b 100644
--- a/routers/api/actions/artifacts_chunks.go
+++ b/routers/api/actions/artifacts_chunks.go
@@ -51,11 +51,11 @@ func saveUploadChunkBase(st storage.ObjectStorage, ctx *ArtifactContext,
 		log.Info("[artifact] check chunk md5, sum: %s, header: %s", chunkMd5String, reqMd5String)
 		// if md5 not match, delete the chunk
 		if reqMd5String != chunkMd5String {
-			checkErr = fmt.Errorf("md5 not match")
+			checkErr = errors.New("md5 not match")
 		}
 	}
 	if writtenSize != contentSize {
-		checkErr = errors.Join(checkErr, fmt.Errorf("contentSize not match body size"))
+		checkErr = errors.Join(checkErr, errors.New("contentSize not match body size"))
 	}
 	if checkErr != nil {
 		if err := st.Delete(storagePath); err != nil {
@@ -261,7 +261,7 @@ func mergeChunksForArtifact(ctx *ArtifactContext, chunks []*chunkFileItem, st st
 		return fmt.Errorf("save merged file error: %v", err)
 	}
 	if written != artifact.FileCompressedSize {
-		return fmt.Errorf("merged file size is not equal to chunk length")
+		return errors.New("merged file size is not equal to chunk length")
 	}
 
 	defer func() {
diff --git a/routers/api/actions/artifactsv4.go b/routers/api/actions/artifactsv4.go
index c6bc39e7d2..dee5f1b2f3 100644
--- a/routers/api/actions/artifactsv4.go
+++ b/routers/api/actions/artifactsv4.go
@@ -166,8 +166,8 @@ func (r artifactV4Routes) buildSignature(endp, expires, artifactName string, tas
 	mac.Write([]byte(endp))
 	mac.Write([]byte(expires))
 	mac.Write([]byte(artifactName))
-	mac.Write([]byte(fmt.Sprint(taskID)))
-	mac.Write([]byte(fmt.Sprint(artifactID)))
+	fmt.Fprint(mac, taskID)
+	fmt.Fprint(mac, artifactID)
 	return mac.Sum(nil)
 }
 
diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go
index 8aae69f463..a971cd3fbf 100644
--- a/routers/api/actions/runner/runner.go
+++ b/routers/api/actions/runner/runner.go
@@ -178,7 +178,7 @@ func (s *Service) UpdateTask(
 ) (*connect.Response[runnerv1.UpdateTaskResponse], error) {
 	runner := GetRunner(ctx)
 
-	task, err := actions_model.UpdateTaskByState(ctx, runner.ID, req.Msg.State)
+	task, err := actions_service.UpdateTaskByState(ctx, runner.ID, req.Msg.State)
 	if err != nil {
 		return nil, connect.NewError(connect.CodeInternal, fmt.Errorf("update task: %w", err))
 	}
diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go
index ebd081ae77..721f96b768 100644
--- a/routers/api/packages/api.go
+++ b/routers/api/packages/api.go
@@ -48,13 +48,14 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) {
 			if ok { // it's a personal access token but not oauth2 token
 				scopeMatched := false
 				var err error
-				if accessMode == perm.AccessModeRead {
+				switch accessMode {
+				case perm.AccessModeRead:
 					scopeMatched, err = scope.HasScope(auth_model.AccessTokenScopeReadPackage)
 					if err != nil {
 						ctx.Error(http.StatusInternalServerError, "HasScope", err.Error())
 						return
 					}
-				} else if accessMode == perm.AccessModeWrite {
+				case perm.AccessModeWrite:
 					scopeMatched, err = scope.HasScope(auth_model.AccessTokenScopeWritePackage)
 					if err != nil {
 						ctx.Error(http.StatusInternalServerError, "HasScope", err.Error())
@@ -116,7 +117,7 @@ func verifyAuth(r *web.Route, authMethods []auth.Method) {
 		var err error
 		ctx.Doer, err = authGroup.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session)
 		if err != nil {
-			log.Error("Failed to verify user: %v", err)
+			log.Info("Failed to verify user: %v", err)
 			ctx.Error(http.StatusUnauthorized, "authGroup.Verify")
 			return
 		}
@@ -630,7 +631,7 @@ func CommonRoutes() *web.Route {
 				baseURLPattern  = regexp.MustCompile(`\A(.*?)\.repo\z`)
 				uploadPattern   = regexp.MustCompile(`\A(.*?)/upload\z`)
 				baseRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\/base/(\S+)`)
-				rpmsRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\.(\S+)\/([a-zA-Z0-9_-]+)-([\d.]+-[a-zA-Z0-9_-]+)\.(\S+)\.rpm`)
+				rpmsRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\.(\S+)\/([a-zA-Z0-9_-]+)-([\d.]+-[a-zA-Z0-9_.-]+)\.(\S+)\.rpm`)
 			)
 
 			r.Methods("HEAD,GET,PUT,DELETE", "*", func(ctx *context.Context) {
diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go
index fc552c1f1b..7263cf13bb 100644
--- a/routers/api/packages/chef/auth.go
+++ b/routers/api/packages/chef/auth.go
@@ -12,6 +12,7 @@ import (
 	"crypto/x509"
 	"encoding/base64"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"hash"
 	"math/big"
@@ -121,7 +122,7 @@ func verifyTimestamp(req *http.Request) error {
 	}
 
 	if diff > maxTimeDifference {
-		return fmt.Errorf("time difference")
+		return errors.New("time difference")
 	}
 
 	return nil
@@ -147,7 +148,7 @@ func getSignVersion(req *http.Request) (string, error) {
 	version := m[1]
 
 	m = algorithmPattern.FindStringSubmatch(hdr)
-	if len(m) == 2 && m[1] != "sha1" && !(m[1] == "sha256" && version == "1.3") {
+	if len(m) == 2 && m[1] != "sha1" && (m[1] != "sha256" || version != "1.3") {
 		return "", util.NewInvalidArgumentErrorf("unsupported algorithm")
 	}
 
@@ -190,7 +191,7 @@ func getAuthorizationData(req *http.Request) ([]byte, error) {
 	tmp := make([]string, len(valueList))
 	for k, v := range valueList {
 		if k > len(tmp) {
-			return nil, fmt.Errorf("invalid X-Ops-Authorization headers")
+			return nil, errors.New("invalid X-Ops-Authorization headers")
 		}
 		tmp[k-1] = v
 	}
@@ -267,7 +268,7 @@ func verifyDataOld(signature, data []byte, pub *rsa.PublicKey) error {
 	}
 
 	if !slices.Equal(out[skip:], data) {
-		return fmt.Errorf("could not verify signature")
+		return errors.New("could not verify signature")
 	}
 
 	return nil
diff --git a/routers/api/packages/chef/chef.go b/routers/api/packages/chef/chef.go
index 909817861e..13419b9a95 100644
--- a/routers/api/packages/chef/chef.go
+++ b/routers/api/packages/chef/chef.go
@@ -139,7 +139,7 @@ func EnumeratePackages(ctx *context.Context) {
 		})
 	}
 
-	skip, _ := opts.Paginator.GetSkipTake()
+	skip, _ := opts.GetSkipTake()
 
 	ctx.JSON(http.StatusOK, &Result{
 		Start: skip,
diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go
index 5276dd5706..873ce5c23a 100644
--- a/routers/api/packages/container/container.go
+++ b/routers/api/packages/container/container.go
@@ -4,6 +4,7 @@
 package container
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 	"io"
@@ -62,9 +63,6 @@ func setResponseHeaders(resp http.ResponseWriter, h *containerHeaders) {
 	if h.ContentType != "" {
 		resp.Header().Set("Content-Type", h.ContentType)
 	}
-	if h.ContentLength != 0 {
-		resp.Header().Set("Content-Length", strconv.FormatInt(h.ContentLength, 10))
-	}
 	if h.UploadUUID != "" {
 		resp.Header().Set("Docker-Upload-Uuid", h.UploadUUID)
 	}
@@ -72,17 +70,29 @@ func setResponseHeaders(resp http.ResponseWriter, h *containerHeaders) {
 		resp.Header().Set("Docker-Content-Digest", h.ContentDigest)
 		resp.Header().Set("ETag", fmt.Sprintf(`"%s"`, h.ContentDigest))
 	}
+	if h.ContentLength >= 0 {
+		resp.Header().Set("Content-Length", strconv.FormatInt(h.ContentLength, 10))
+	}
 	resp.Header().Set("Docker-Distribution-Api-Version", "registry/2.0")
 	resp.WriteHeader(h.Status)
 }
 
 func jsonResponse(ctx *context.Context, status int, obj any) {
-	setResponseHeaders(ctx.Resp, &containerHeaders{
-		Status:      status,
-		ContentType: "application/json",
-	})
-	if err := json.NewEncoder(ctx.Resp).Encode(obj); err != nil {
+	// Buffer the JSON content first to calculate correct Content-Length
+	var buf bytes.Buffer
+	if err := json.NewEncoder(&buf).Encode(obj); err != nil {
 		log.Error("JSON encode: %v", err)
+		return
+	}
+
+	setResponseHeaders(ctx.Resp, &containerHeaders{
+		Status:        status,
+		ContentType:   "application/json",
+		ContentLength: int64(buf.Len()),
+	})
+
+	if _, err := buf.WriteTo(ctx.Resp); err != nil {
+		log.Error("JSON write: %v", err)
 	}
 }
 
@@ -389,12 +399,7 @@ func EndUploadBlob(ctx *context.Context) {
 		}
 		return
 	}
-	doClose := true
-	defer func() {
-		if doClose {
-			uploader.Close()
-		}
-	}()
+	defer uploader.Close()
 
 	if ctx.Req.Body != nil {
 		if err := uploader.Append(ctx, ctx.Req.Body); err != nil {
@@ -427,12 +432,6 @@ func EndUploadBlob(ctx *context.Context) {
 		return
 	}
 
-	if err := uploader.Close(); err != nil {
-		apiError(ctx, http.StatusInternalServerError, err)
-		return
-	}
-	doClose = false
-
 	if err := container_service.RemoveBlobUploadByID(ctx, uploader.ID); err != nil {
 		apiError(ctx, http.StatusInternalServerError, err)
 		return
@@ -691,33 +690,30 @@ func DeleteManifest(ctx *context.Context) {
 func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor) {
 	serveDirectReqParams := make(url.Values)
 	serveDirectReqParams.Set("response-content-type", pfd.Properties.GetByName(container_module.PropertyMediaType))
-	s, u, _, err := packages_service.GetPackageBlobStream(ctx, pfd.File, pfd.Blob, serveDirectReqParams)
+	s, u, pf, err := packages_service.GetPackageBlobStream(ctx, pfd.File, pfd.Blob, serveDirectReqParams)
 	if err != nil {
+		if errors.Is(err, packages_model.ErrPackageFileNotExist) {
+			apiError(ctx, http.StatusNotFound, err)
+			return
+		}
 		apiError(ctx, http.StatusInternalServerError, err)
 		return
 	}
 
-	headers := &containerHeaders{
-		ContentDigest: pfd.Properties.GetByName(container_module.PropertyDigest),
-		ContentType:   pfd.Properties.GetByName(container_module.PropertyMediaType),
-		ContentLength: pfd.Blob.Size,
-		Status:        http.StatusOK,
+	opts := &context.ServeHeaderOptions{
+		ContentType:        pfd.Properties.GetByName(container_module.PropertyMediaType),
+		RedirectStatusCode: http.StatusTemporaryRedirect,
+		AdditionalHeaders: map[string][]string{
+			"Docker-Distribution-Api-Version": {"registry/2.0"},
+		},
 	}
 
-	if u != nil {
-		headers.Status = http.StatusTemporaryRedirect
-		headers.Location = u.String()
-
-		setResponseHeaders(ctx.Resp, headers)
-		return
+	if d := pfd.Properties.GetByName(container_module.PropertyDigest); d != "" {
+		opts.AdditionalHeaders["Docker-Content-Digest"] = []string{d}
+		opts.AdditionalHeaders["ETag"] = []string{fmt.Sprintf(`"%s"`, d)}
 	}
 
-	defer s.Close()
-
-	setResponseHeaders(ctx.Resp, headers)
-	if _, err := io.Copy(ctx.Resp, s); err != nil {
-		log.Error("Error whilst copying content to response: %v", err)
-	}
+	helper.ServePackageFile(ctx, s, u, pf, opts)
 }
 
 // https://github.com/opencontainers/distribution-spec/blob/main/spec.md#content-discovery
@@ -725,7 +721,7 @@ func GetTagList(ctx *context.Context) {
 	image := ctx.Params("image")
 
 	if _, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.TypeContainer, image); err != nil {
-		if err == packages_model.ErrPackageNotExist {
+		if errors.Is(err, packages_model.ErrPackageNotExist) {
 			apiErrorDefined(ctx, errNameUnknown)
 		} else {
 			apiError(ctx, http.StatusInternalServerError, err)
diff --git a/routers/api/packages/container/container_test.go b/routers/api/packages/container/container_test.go
new file mode 100644
index 0000000000..2ed38d846d
--- /dev/null
+++ b/routers/api/packages/container/container_test.go
@@ -0,0 +1,124 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package container
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSetResponseHeaders(t *testing.T) {
+	t.Run("Content-Length for empty content", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusOK,
+			ContentLength: 0, // Empty blob
+			ContentDigest: "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+		})
+
+		assert.Equal(t, "0", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", recorder.Header().Get("Docker-Content-Digest"))
+		assert.Equal(t, "registry/2.0", recorder.Header().Get("Docker-Distribution-Api-Version"))
+		assert.Equal(t, http.StatusOK, recorder.Code)
+	})
+
+	t.Run("Content-Length for non-empty content", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusOK,
+			ContentLength: 1024,
+			ContentDigest: "sha256:abcd1234",
+		})
+
+		assert.Equal(t, "1024", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:abcd1234", recorder.Header().Get("Docker-Content-Digest"))
+	})
+
+	t.Run("All headers set correctly", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusAccepted,
+			ContentLength: 512,
+			ContentDigest: "sha256:test123",
+			ContentType:   "application/vnd.oci.image.manifest.v1+json",
+			Location:      "/v2/test/repo/blobs/uploads/uuid123",
+			Range:         "0-511",
+			UploadUUID:    "uuid123",
+		})
+
+		assert.Equal(t, "512", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:test123", recorder.Header().Get("Docker-Content-Digest"))
+		assert.Equal(t, "application/vnd.oci.image.manifest.v1+json", recorder.Header().Get("Content-Type"))
+		assert.Equal(t, "/v2/test/repo/blobs/uploads/uuid123", recorder.Header().Get("Location"))
+		assert.Equal(t, "0-511", recorder.Header().Get("Range"))
+		assert.Equal(t, "uuid123", recorder.Header().Get("Docker-Upload-Uuid"))
+		assert.Equal(t, "registry/2.0", recorder.Header().Get("Docker-Distribution-Api-Version"))
+		assert.Equal(t, `"sha256:test123"`, recorder.Header().Get("ETag"))
+		assert.Equal(t, http.StatusAccepted, recorder.Code)
+	})
+}
+
+// TestResponseHeadersForEmptyBlobs tests the core fix for ORAS empty blob support
+func TestResponseHeadersForEmptyBlobs(t *testing.T) {
+	t.Run("Content-Length set for empty blob", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		// This tests the main fix: empty blobs should have Content-Length: 0
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusOK,
+			ContentLength: 0, // Empty blob (like empty config in ORAS artifacts)
+			ContentDigest: "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+		})
+
+		// The key fix: Content-Length should be set even for 0-byte blobs
+		assert.Equal(t, "0", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", recorder.Header().Get("Docker-Content-Digest"))
+		assert.Equal(t, "registry/2.0", recorder.Header().Get("Docker-Distribution-Api-Version"))
+		assert.Equal(t, `"sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"`, recorder.Header().Get("ETag"))
+		assert.Equal(t, http.StatusOK, recorder.Code)
+	})
+
+	t.Run("Content-Length set for regular blob", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusOK,
+			ContentLength: 1024,
+			ContentDigest: "sha256:abcd1234",
+		})
+
+		assert.Equal(t, "1024", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:abcd1234", recorder.Header().Get("Docker-Content-Digest"))
+	})
+
+	t.Run("All headers set correctly", func(t *testing.T) {
+		recorder := httptest.NewRecorder()
+
+		setResponseHeaders(recorder, &containerHeaders{
+			Status:        http.StatusAccepted,
+			ContentLength: 512,
+			ContentDigest: "sha256:test123",
+			ContentType:   "application/vnd.oci.image.manifest.v1+json",
+			Location:      "/v2/test/repo/blobs/uploads/uuid123",
+			Range:         "0-511",
+			UploadUUID:    "uuid123",
+		})
+
+		assert.Equal(t, "512", recorder.Header().Get("Content-Length"))
+		assert.Equal(t, "sha256:test123", recorder.Header().Get("Docker-Content-Digest"))
+		assert.Equal(t, "application/vnd.oci.image.manifest.v1+json", recorder.Header().Get("Content-Type"))
+		assert.Equal(t, "/v2/test/repo/blobs/uploads/uuid123", recorder.Header().Get("Location"))
+		assert.Equal(t, "0-511", recorder.Header().Get("Range"))
+		assert.Equal(t, "uuid123", recorder.Header().Get("Docker-Upload-Uuid"))
+		assert.Equal(t, "registry/2.0", recorder.Header().Get("Docker-Distribution-Api-Version"))
+		assert.Equal(t, `"sha256:test123"`, recorder.Header().Get("ETag"))
+		assert.Equal(t, http.StatusAccepted, recorder.Code)
+	})
+}
diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go
index 6e116e050d..b84b902d2b 100644
--- a/routers/api/packages/generic/generic.go
+++ b/routers/api/packages/generic/generic.go
@@ -155,7 +155,7 @@ func DeletePackage(ctx *context.Context) {
 		},
 	)
 	if err != nil {
-		if err == packages_model.ErrPackageNotExist {
+		if errors.Is(err, packages_model.ErrPackageNotExist) {
 			apiError(ctx, http.StatusNotFound, err)
 			return
 		}
@@ -182,7 +182,7 @@ func DeletePackageFile(ctx *context.Context) {
 		return pv, pf, nil
 	}()
 	if err != nil {
-		if err == packages_model.ErrPackageNotExist || err == packages_model.ErrPackageFileNotExist {
+		if errors.Is(err, packages_model.ErrPackageNotExist) || errors.Is(err, packages_model.ErrPackageFileNotExist) {
 			apiError(ctx, http.StatusNotFound, err)
 			return
 		}
diff --git a/routers/api/packages/helper/helper.go b/routers/api/packages/helper/helper.go
index 99c0867bbb..47d1f18623 100644
--- a/routers/api/packages/helper/helper.go
+++ b/routers/api/packages/helper/helper.go
@@ -25,7 +25,8 @@ func LogAndProcessError(ctx *context.Context, status int, obj any, cb func(strin
 		message = fmt.Sprintf("%s", obj)
 	}
 	if status == http.StatusInternalServerError {
-		log.ErrorWithSkip(1, message)
+		// LogAndProcessError is always wrapped in a `apiError` call, so we need to skip two frames
+		log.ErrorWithSkip(2, message)
 
 		if setting.IsProd && (ctx.Doer == nil || !ctx.Doer.IsAdmin) {
 			message = ""
@@ -39,16 +40,9 @@ func LogAndProcessError(ctx *context.Context, status int, obj any, cb func(strin
 	}
 }
 
-// Serves the content of the package file
+// ServePackageFile Serves the content of the package file
 // If the url is set it will redirect the request, otherwise the content is copied to the response.
 func ServePackageFile(ctx *context.Context, s io.ReadSeekCloser, u *url.URL, pf *packages_model.PackageFile, forceOpts ...*context.ServeHeaderOptions) {
-	if u != nil {
-		ctx.Redirect(u.String())
-		return
-	}
-
-	defer s.Close()
-
 	var opts *context.ServeHeaderOptions
 	if len(forceOpts) > 0 {
 		opts = forceOpts[0]
@@ -59,5 +53,12 @@ func ServePackageFile(ctx *context.Context, s io.ReadSeekCloser, u *url.URL, pf
 		}
 	}
 
+	if u != nil {
+		ctx.Redirect(u.String(), opts.RedirectStatusCode)
+		return
+	}
+
+	defer s.Close()
+
 	ctx.ServeContent(s, opts)
 }
diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go
index ea04a7b42e..30737f91dd 100644
--- a/routers/api/packages/maven/maven.go
+++ b/routers/api/packages/maven/maven.go
@@ -11,6 +11,7 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"errors"
+	"fmt"
 	"io"
 	"net/http"
 	"path/filepath"
@@ -61,6 +62,12 @@ func apiError(ctx *context.Context, status int, obj any) {
 	})
 }
 
+// buildPackageID creates a package ID from group and artifact ID
+// Refer to https://maven.apache.org/pom.html#Maven_Coordinates
+func buildPackageID(groupID, artifactID string) string {
+	return fmt.Sprintf("%s:%s", groupID, artifactID)
+}
+
 // DownloadPackageFile serves the content of a package
 func DownloadPackageFile(ctx *context.Context) {
 	handlePackageFile(ctx, true)
@@ -88,7 +95,7 @@ func handlePackageFile(ctx *context.Context, serveContent bool) {
 func serveMavenMetadata(ctx *context.Context, params parameters) {
 	// /com/foo/project/maven-metadata.xml[.md5/.sha1/.sha256/.sha512]
 
-	packageName := params.GroupID + "-" + params.ArtifactID
+	packageName := buildPackageID(params.GroupID, params.ArtifactID)
 	pvs, err := packages_model.GetVersionsByPackageName(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, packageName)
 	if err != nil {
 		apiError(ctx, http.StatusInternalServerError, err)
@@ -119,8 +126,8 @@ func serveMavenMetadata(ctx *context.Context, params parameters) {
 
 	latest := pds[len(pds)-1]
 	// http.TimeFormat required a UTC time, refer to https://pkg.go.dev/net/http#TimeFormat
-	lastModifed := latest.Version.CreatedUnix.AsTime().UTC().Format(http.TimeFormat)
-	ctx.Resp.Header().Set("Last-Modified", lastModifed)
+	lastModified := latest.Version.CreatedUnix.AsTime().UTC().Format(http.TimeFormat)
+	ctx.Resp.Header().Set("Last-Modified", lastModified)
 
 	ext := strings.ToLower(filepath.Ext(params.Filename))
 	if isChecksumExtension(ext) {
@@ -150,7 +157,7 @@ func serveMavenMetadata(ctx *context.Context, params parameters) {
 }
 
 func servePackageFile(ctx *context.Context, params parameters, serveContent bool) {
-	packageName := params.GroupID + "-" + params.ArtifactID
+	packageName := buildPackageID(params.GroupID, params.ArtifactID)
 
 	pv, err := packages_model.GetVersionByNameAndVersion(ctx, ctx.Package.Owner.ID, packages_model.TypeMaven, packageName, params.Version)
 	if err != nil {
@@ -169,9 +176,9 @@ func servePackageFile(ctx *context.Context, params parameters, serveContent bool
 		filename = filename[:len(filename)-len(ext)]
 	}
 
-	pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, filename, packages_model.EmptyFileKey)
+	pf, err := packages_model.GetFileForVersionByNameMatchCase(ctx, pv.ID, filename, packages_model.EmptyFileKey)
 	if err != nil {
-		if err == packages_model.ErrPackageFileNotExist {
+		if errors.Is(err, packages_model.ErrPackageFileNotExist) {
 			apiError(ctx, http.StatusNotFound, err)
 		} else {
 			apiError(ctx, http.StatusInternalServerError, err)
@@ -247,7 +254,7 @@ func UploadPackageFile(ctx *context.Context) {
 		return
 	}
 
-	packageName := params.GroupID + "-" + params.ArtifactID
+	packageName := buildPackageID(params.GroupID, params.ArtifactID)
 
 	mavenUploadLock.CheckIn(packageName)
 	defer mavenUploadLock.CheckOut(packageName)
@@ -283,9 +290,9 @@ func UploadPackageFile(ctx *context.Context) {
 			apiError(ctx, http.StatusInternalServerError, err)
 			return
 		}
-		pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, params.Filename[:len(params.Filename)-len(ext)], packages_model.EmptyFileKey)
+		pf, err := packages_model.GetFileForVersionByNameMatchCase(ctx, pv.ID, params.Filename[:len(params.Filename)-len(ext)], packages_model.EmptyFileKey)
 		if err != nil {
-			if err == packages_model.ErrPackageFileNotExist {
+			if errors.Is(err, packages_model.ErrPackageFileNotExist) {
 				apiError(ctx, http.StatusNotFound, err)
 				return
 			}
@@ -339,7 +346,7 @@ func UploadPackageFile(ctx *context.Context) {
 
 		if pvci.Metadata != nil {
 			pv, err := packages_model.GetVersionByNameAndVersion(ctx, pvci.Owner.ID, pvci.PackageType, pvci.Name, pvci.Version)
-			if err != nil && err != packages_model.ErrPackageNotExist {
+			if err != nil && !errors.Is(err, packages_model.ErrPackageNotExist) {
 				apiError(ctx, http.StatusInternalServerError, err)
 				return
 			}
diff --git a/routers/api/packages/nuget/auth.go b/routers/api/packages/nuget/auth.go
index bab08bb1b8..92868bdef5 100644
--- a/routers/api/packages/nuget/auth.go
+++ b/routers/api/packages/nuget/auth.go
@@ -25,7 +25,7 @@ func (a *Auth) Name() string {
 func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataStore, sess auth.SessionStore) (*user_model.User, error) {
 	token, err := auth_model.GetAccessTokenBySHA(req.Context(), req.Header.Get("X-NuGet-ApiKey"))
 	if err != nil {
-		if !(auth_model.IsErrAccessTokenNotExist(err) || auth_model.IsErrAccessTokenEmpty(err)) {
+		if !auth_model.IsErrAccessTokenNotExist(err) && !auth_model.IsErrAccessTokenEmpty(err) {
 			log.Error("GetAccessTokenBySHA: %v", err)
 			return nil, err
 		}
diff --git a/routers/api/packages/swift/swift.go b/routers/api/packages/swift/swift.go
index 304230a85e..a65bd31cd9 100644
--- a/routers/api/packages/swift/swift.go
+++ b/routers/api/packages/swift/swift.go
@@ -290,7 +290,24 @@ func DownloadManifest(ctx *context.Context) {
 	})
 }
 
-// https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#endpoint-6
+// formFileOptionalReadCloser returns (nil, nil) if the formKey is not present.
+func formFileOptionalReadCloser(ctx *context.Context, formKey string) (io.ReadCloser, error) {
+	multipartFile, _, err := ctx.Req.FormFile(formKey)
+	if err != nil && !errors.Is(err, http.ErrMissingFile) {
+		return nil, err
+	}
+	if multipartFile != nil {
+		return multipartFile, nil
+	}
+
+	content := ctx.Req.FormValue(formKey)
+	if content == "" {
+		return nil, nil
+	}
+	return io.NopCloser(strings.NewReader(content)), nil
+}
+
+// UploadPackageFile refers to https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/PackageRegistry/Registry.md#endpoint-6
 func UploadPackageFile(ctx *context.Context) {
 	packageScope := ctx.Params("scope")
 	packageName := ctx.Params("name")
@@ -304,9 +321,9 @@ func UploadPackageFile(ctx *context.Context) {
 
 	packageVersion := v.Core().String()
 
-	file, _, err := ctx.Req.FormFile("source-archive")
-	if err != nil {
-		apiError(ctx, http.StatusBadRequest, err)
+	file, err := formFileOptionalReadCloser(ctx, "source-archive")
+	if file == nil || err != nil {
+		apiError(ctx, http.StatusBadRequest, "unable to read source-archive file")
 		return
 	}
 	defer file.Close()
@@ -318,10 +335,13 @@ func UploadPackageFile(ctx *context.Context) {
 	}
 	defer buf.Close()
 
-	var mr io.Reader
-	metadata := ctx.Req.FormValue("metadata")
-	if metadata != "" {
-		mr = strings.NewReader(metadata)
+	mr, err := formFileOptionalReadCloser(ctx, "metadata")
+	if err != nil {
+		apiError(ctx, http.StatusBadRequest, "unable to read metadata file")
+		return
+	}
+	if mr != nil {
+		defer mr.Close()
 	}
 
 	pck, err := swift_module.ParsePackage(buf, buf.Size(), mr)
diff --git a/routers/api/shared/middleware.go b/routers/api/shared/middleware.go
index f56acbe1bf..59d9f28d60 100644
--- a/routers/api/shared/middleware.go
+++ b/routers/api/shared/middleware.go
@@ -4,8 +4,10 @@
 package shared
 
 import (
+	"fmt"
 	"net/http"
 
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 	"forgejo.org/routers/common"
@@ -92,6 +94,25 @@ func verifyAuthWithOptions(options *common.VerifyOptions) func(ctx *context.APIC
 				})
 				return
 			}
+
+			if ctx.Doer.MustHaveTwoFactor() {
+				hasTwoFactor, err := auth_model.HasTwoFactorByUID(ctx, ctx.Doer.ID)
+				if err != nil {
+					ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
+					log.Error("Error getting 2fa: %s", err)
+					ctx.JSON(http.StatusInternalServerError, map[string]string{
+						"message": fmt.Sprintf("Error getting 2fa: %s", err),
+					})
+					return
+				}
+				if !hasTwoFactor {
+					ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
+					ctx.JSON(http.StatusForbidden, map[string]string{
+						"message": ctx.Locale.TrString("error.must_enable_2fa", fmt.Sprintf("%suser/settings/security", setting.AppURL)),
+					})
+					return
+				}
+			}
 		}
 
 		// Redirect to dashboard if user tries to visit any non-login page.
@@ -130,7 +151,7 @@ func verifyAuthWithOptions(options *common.VerifyOptions) func(ctx *context.APIC
 // check for and warn against deprecated authentication options
 func checkDeprecatedAuthMethods(ctx *context.APIContext) {
 	if ctx.FormString("token") != "" || ctx.FormString("access_token") != "" {
-		ctx.Resp.Header().Set("Warning", "token and access_token API authentication is deprecated and will be removed in gitea 1.23. Please use AuthorizationHeaderToken instead. Existing queries will continue to work but without authorization.")
+		ctx.Resp.Header().Set("Warning", "token and access_token API authentication is deprecated and will be removed in Forgejo v13.0.0. Please use AuthorizationHeaderToken instead. Existing queries will continue to work but without authorization.")
 	}
 }
 
diff --git a/routers/api/v1/activitypub/actor.go b/routers/api/v1/activitypub/actor.go
index 7568a2a7c8..0ff822c7f4 100644
--- a/routers/api/v1/activitypub/actor.go
+++ b/routers/api/v1/activitypub/actor.go
@@ -28,11 +28,11 @@ func Actor(ctx *context.APIContext) {
 	//   "200":
 	//     "$ref": "#/responses/ActivityPub"
 
-	link := user_model.APActorUserAPActorID()
+	link := user_model.APServerActorID()
 	actor := ap.ActorNew(ap.IRI(link), ap.ApplicationType)
 
 	actor.PreferredUsername = ap.NaturalLanguageValuesNew()
-	err := actor.PreferredUsername.Set("en", ap.Content(setting.Domain))
+	err := actor.PreferredUsername.Set("en", ap.Content("ghost"))
 	if err != nil {
 		ctx.ServerError("PreferredUsername.Set", err)
 		return
@@ -41,12 +41,10 @@ func Actor(ctx *context.APIContext) {
 	actor.URL = ap.IRI(setting.AppURL)
 
 	actor.Inbox = ap.IRI(link + "/inbox")
-	actor.Outbox = ap.IRI(link + "/outbox")
-
 	actor.PublicKey.ID = ap.IRI(link + "#main-key")
 	actor.PublicKey.Owner = ap.IRI(link)
 
-	publicKeyPem, err := activitypub.GetPublicKey(ctx, user_model.NewAPActorUser())
+	publicKeyPem, err := activitypub.GetPublicKey(ctx, user_model.NewAPServerActor())
 	if err != nil {
 		ctx.ServerError("GetPublicKey", err)
 		return
diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go
index 1da7933418..72f9680b9b 100644
--- a/routers/api/v1/activitypub/person.go
+++ b/routers/api/v1/activitypub/person.go
@@ -4,14 +4,17 @@
 package activitypub
 
 import (
-	"fmt"
 	"net/http"
-	"strings"
 
+	"forgejo.org/models/activities"
 	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/forgefed"
 	"forgejo.org/modules/log"
-	"forgejo.org/modules/setting"
+	"forgejo.org/modules/web"
+	"forgejo.org/routers/api/v1/utils"
 	"forgejo.org/services/context"
+	"forgejo.org/services/convert"
+	"forgejo.org/services/federation"
 
 	ap "github.com/go-ap/activitypub"
 	"github.com/go-ap/jsonld"
@@ -34,45 +37,12 @@ func Person(ctx *context.APIContext) {
 	//   "200":
 	//     "$ref": "#/responses/ActivityPub"
 
-	// TODO: the setting.AppURL during the test doesn't follow the definition: "It always has a '/' suffix"
-	link := fmt.Sprintf("%s/api/v1/activitypub/user-id/%d", strings.TrimSuffix(setting.AppURL, "/"), ctx.ContextUser.ID)
-	person := ap.PersonNew(ap.IRI(link))
-
-	person.Name = ap.NaturalLanguageValuesNew()
-	err := person.Name.Set("en", ap.Content(ctx.ContextUser.FullName))
+	person, err := convert.ToActivityPubPerson(ctx, ctx.ContextUser)
 	if err != nil {
-		ctx.ServerError("Set Name", err)
+		ctx.ServerError("convert.ToActivityPubPerson", err)
 		return
 	}
 
-	person.PreferredUsername = ap.NaturalLanguageValuesNew()
-	err = person.PreferredUsername.Set("en", ap.Content(ctx.ContextUser.Name))
-	if err != nil {
-		ctx.ServerError("Set PreferredUsername", err)
-		return
-	}
-
-	person.URL = ap.IRI(ctx.ContextUser.HTMLURL())
-
-	person.Icon = ap.Image{
-		Type:      ap.ImageType,
-		MediaType: "image/png",
-		URL:       ap.IRI(ctx.ContextUser.AvatarLink(ctx)),
-	}
-
-	person.Inbox = ap.IRI(link + "/inbox")
-	person.Outbox = ap.IRI(link + "/outbox")
-
-	person.PublicKey.ID = ap.IRI(link + "#main-key")
-	person.PublicKey.Owner = ap.IRI(link)
-
-	publicKeyPem, err := activitypub.GetPublicKey(ctx, ctx.ContextUser)
-	if err != nil {
-		ctx.ServerError("GetPublicKey", err)
-		return
-	}
-	person.PublicKey.PublicKeyPem = publicKeyPem
-
 	binary, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI), jsonld.IRI(ap.SecurityContextURI)).Marshal(person)
 	if err != nil {
 		ctx.ServerError("MarshalJSON", err)
@@ -99,8 +69,174 @@ func PersonInbox(ctx *context.APIContext) {
 	//   type: integer
 	//   required: true
 	// responses:
-	//   "204":
+	//   "202":
 	//     "$ref": "#/responses/empty"
 
-	ctx.Status(http.StatusNoContent)
+	form := web.GetForm(ctx)
+	activity := form.(*ap.Activity)
+	result, err := federation.ProcessPersonInbox(ctx, ctx.ContextUser, activity)
+	if err != nil {
+		ctx.Error(federation.HTTPStatus(err), "PersonInbox", err)
+		return
+	}
+	responseServiceResult(ctx, result)
+}
+
+// PersonFeed returns the recorded activities in the user's feed
+func PersonFeed(ctx *context.APIContext) {
+	// swagger:operation GET /activitypub/user-id/{user-id}/outbox activitypub activitypubPersonFeed
+	// ---
+	// summary: List the user's recorded activity
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: user-id
+	//   in: path
+	//   description: user ID of the user
+	//   type: integer
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/PersonFeed"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+
+	listOptions := utils.GetListOptions(ctx)
+	opts := activities.GetFollowingFeedsOptions{
+		ListOptions: listOptions,
+	}
+	items, count, err := activities.GetFollowingFeeds(ctx, ctx.ContextUser.ID, opts)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "GetFollowingFeeds", err)
+		return
+	}
+	ctx.SetTotalCountHeader(count)
+
+	feed := ap.OrderedCollectionNew(ap.IRI(ctx.ContextUser.APActorID() + "/outbox"))
+	feed.AttributedTo = ap.IRI(ctx.ContextUser.APActorID())
+	for _, item := range items {
+		if err := feed.OrderedItems.Append(convert.ToActivityPubPersonFeedItem(item)); err != nil {
+			ctx.Error(http.StatusInternalServerError, "OrderedItems.Append", err)
+			return
+		}
+	}
+
+	binary, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI), jsonld.IRI(ap.SecurityContextURI)).Marshal(feed)
+	if err != nil {
+		ctx.ServerError("MarshalJSON", err)
+		return
+	}
+
+	ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
+	ctx.Resp.WriteHeader(http.StatusOK)
+	if _, err = ctx.Resp.Write(binary); err != nil {
+		log.Error("write to resp err: %v", err)
+	}
+}
+
+func getActivity(ctx *context.APIContext, id int64) (*forgefed.ForgeUserActivity, error) {
+	action, err := activities.GetActivityByID(ctx, id)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "GetActivityByID", err.Error())
+		return nil, err
+	}
+
+	if action.UserID != action.ActUserID || action.ActUserID != ctx.ContextUser.ID {
+		ctx.NotFound()
+		return nil, err
+	}
+
+	actions := activities.ActionList{action}
+	if err := actions.LoadAttributes(ctx); err != nil {
+		ctx.Error(http.StatusInternalServerError, "action.LoadAttributes", err.Error())
+		return nil, err
+	}
+
+	activity, err := convert.ActionToForgeUserActivity(ctx, actions[0])
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "ActionToForgeUserActivity", err.Error())
+		return nil, err
+	}
+
+	return &activity, nil
+}
+
+// PersonActivity returns a user's given activity
+func PersonActivity(ctx *context.APIContext) {
+	// swagger:operation GET /activitypub/user-id/{user-id}/activities/{activity-id}/activity activitypub activitypubPersonActivity
+	// ---
+	// summary: Get a specific activity of the user
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: user-id
+	//   in: path
+	//   description: user ID of the user
+	//   type: integer
+	//   required: true
+	// - name: activity-id
+	//   in: path
+	//   description: activity ID of the sought activity
+	//   type: integer
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/ActivityPub"
+
+	id := ctx.ParamsInt64("activity-id")
+	activity, err := getActivity(ctx, id)
+	if err != nil {
+		return
+	}
+
+	binary, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI), jsonld.IRI(ap.SecurityContextURI)).Marshal(activity)
+	if err != nil {
+		ctx.ServerError("MarshalJSON", err)
+		return
+	}
+	ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
+	ctx.Resp.WriteHeader(http.StatusOK)
+	if _, err = ctx.Resp.Write(binary); err != nil {
+		log.Error("write to resp err: %v", err)
+	}
+}
+
+// PersonActivity returns the Object part of a user's given activity
+func PersonActivityNote(ctx *context.APIContext) {
+	// swagger:operation GET /activitypub/user-id/{user-id}/activities/{activity-id} activitypub activitypubPersonActivityNote
+	// ---
+	// summary: Get a specific activity object of the user
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: user-id
+	//   in: path
+	//   description: user ID of the user
+	//   type: integer
+	//   required: true
+	// - name: activity-id
+	//   in: path
+	//   description: activity ID of the sought activity
+	//   type: integer
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/ActivityPub"
+
+	id := ctx.ParamsInt64("activity-id")
+	activity, err := getActivity(ctx, id)
+	if err != nil {
+		return
+	}
+
+	binary, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI), jsonld.IRI(ap.SecurityContextURI)).Marshal(activity.Object)
+	if err != nil {
+		ctx.ServerError("MarshalJSON", err)
+		return
+	}
+	ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
+	ctx.Resp.WriteHeader(http.StatusOK)
+	if _, err = ctx.Resp.Write(binary); err != nil {
+		log.Error("write to resp err: %v", err)
+	}
 }
diff --git a/routers/api/v1/activitypub/repository.go b/routers/api/v1/activitypub/repository.go
index c506840f1c..3eaa6b82c5 100644
--- a/routers/api/v1/activitypub/repository.go
+++ b/routers/api/v1/activitypub/repository.go
@@ -71,10 +71,11 @@ func RepositoryInbox(ctx *context.APIContext) {
 	repository := ctx.Repo.Repository
 	log.Info("RepositoryInbox: repo: %v", repository)
 	form := web.GetForm(ctx)
-	// TODO: Decide between like/undo{like} activity
-	httpStatus, title, err := federation.ProcessLikeActivity(ctx, form, repository.ID)
+	activity := form.(*ap.Activity)
+	result, err := federation.ProcessRepositoryInbox(ctx, activity, repository.ID)
 	if err != nil {
-		ctx.Error(httpStatus, title, err)
+		ctx.Error(federation.HTTPStatus(err), "Processing Repository Inbox failed", result)
+		return
 	}
-	ctx.Status(http.StatusNoContent)
+	responseServiceResult(ctx, result)
 }
diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go
index a9bb4bd868..38cb067b89 100644
--- a/routers/api/v1/activitypub/reqsignature.go
+++ b/routers/api/v1/activitypub/reqsignature.go
@@ -4,61 +4,21 @@
 package activitypub
 
 import (
-	"crypto"
-	"crypto/x509"
-	"encoding/pem"
-	"fmt"
-	"io"
 	"net/http"
-	"net/url"
 
-	"forgejo.org/modules/activitypub"
-	"forgejo.org/modules/httplib"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
-	gitea_context "forgejo.org/services/context"
+	services_context "forgejo.org/services/context"
+	"forgejo.org/services/federation"
 
 	"github.com/42wim/httpsig"
-	ap "github.com/go-ap/activitypub"
 )
 
-func getPublicKeyFromResponse(b []byte, keyID *url.URL) (p crypto.PublicKey, err error) {
-	person := ap.PersonNew(ap.IRI(keyID.String()))
-	err = person.UnmarshalJSON(b)
-	if err != nil {
-		return nil, fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %w", err)
+func verifyHTTPUserOrInstanceSignature(ctx services_context.APIContext) (authenticated bool, err error) {
+	if !setting.Federation.SignatureEnforced {
+		return true, nil
 	}
-	pubKey := person.PublicKey
-	if pubKey.ID.String() != keyID.String() {
-		return nil, fmt.Errorf("cannot find publicKey with id: %s in %s", keyID, string(b))
-	}
-	pubKeyPem := pubKey.PublicKeyPem
-	block, _ := pem.Decode([]byte(pubKeyPem))
-	if block == nil || block.Type != "PUBLIC KEY" {
-		return nil, fmt.Errorf("could not decode publicKeyPem to PUBLIC KEY pem block type")
-	}
-	p, err = x509.ParsePKIXPublicKey(block.Bytes)
-	return p, err
-}
 
-func fetch(iri *url.URL) (b []byte, err error) {
-	req := httplib.NewRequest(iri.String(), http.MethodGet)
-	req.Header("Accept", activitypub.ActivityStreamsContentType)
-	req.Header("User-Agent", "Gitea/"+setting.AppVer)
-	resp, err := req.Response()
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("url IRI fetch [%s] failed with status (%d): %s", iri, resp.StatusCode, resp.Status)
-	}
-	b, err = io.ReadAll(io.LimitReader(resp.Body, setting.Federation.MaxSize))
-	return b, err
-}
-
-func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, err error) {
 	r := ctx.Req
 
 	// 1. Figure out what key we need to verify
@@ -66,30 +26,65 @@ func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, er
 	if err != nil {
 		return false, err
 	}
-	ID := v.KeyId()
-	idIRI, err := url.Parse(ID)
+
+	signatureAlgorithm := httpsig.Algorithm(setting.Federation.SignatureAlgorithms[0])
+	pubKey, err := federation.FindOrCreateFederatedUserKey(ctx, v.KeyId())
+	if err != nil || pubKey == nil {
+		pubKey, err = federation.FindOrCreateFederationHostKey(ctx, v.KeyId())
+		if err != nil {
+			return false, err
+		}
+	}
+
+	err = v.Verify(pubKey, signatureAlgorithm)
 	if err != nil {
 		return false, err
 	}
-	// 2. Fetch the public key of the other actor
-	b, err := fetch(idIRI)
+	return true, nil
+}
+
+func verifyHTTPUserSignature(ctx services_context.APIContext) (authenticated bool, err error) {
+	if !setting.Federation.SignatureEnforced {
+		return true, nil
+	}
+
+	r := ctx.Req
+
+	// 1. Figure out what key we need to verify
+	v, err := httpsig.NewVerifier(r)
 	if err != nil {
 		return false, err
 	}
-	pubKey, err := getPublicKeyFromResponse(b, idIRI)
+
+	signatureAlgorithm := httpsig.Algorithm(setting.Federation.SignatureAlgorithms[0])
+	pubKey, err := federation.FindOrCreateFederatedUserKey(ctx, v.KeyId())
 	if err != nil {
 		return false, err
 	}
-	// 3. Verify the other actor's key
-	algo := httpsig.Algorithm(setting.Federation.Algorithms[0])
-	authenticated = v.Verify(pubKey, algo) == nil
-	return authenticated, err
+
+	err = v.Verify(pubKey, signatureAlgorithm)
+	if err != nil {
+		return false, err
+	}
+	return true, nil
 }
 
 // ReqHTTPSignature function
-func ReqHTTPSignature() func(ctx *gitea_context.APIContext) {
-	return func(ctx *gitea_context.APIContext) {
-		if authenticated, err := verifyHTTPSignatures(ctx); err != nil {
+func ReqHTTPUserOrInstanceSignature() func(ctx *services_context.APIContext) {
+	return func(ctx *services_context.APIContext) {
+		if authenticated, err := verifyHTTPUserOrInstanceSignature(*ctx); err != nil {
+			log.Warn("verifyHttpSignatures failed: %v", err)
+			ctx.Error(http.StatusBadRequest, "reqSignature", "request signature verification failed")
+		} else if !authenticated {
+			ctx.Error(http.StatusForbidden, "reqSignature", "request signature verification failed")
+		}
+	}
+}
+
+// ReqHTTPUserSignature function
+func ReqHTTPUserSignature() func(ctx *services_context.APIContext) {
+	return func(ctx *services_context.APIContext) {
+		if authenticated, err := verifyHTTPUserSignature(*ctx); err != nil {
 			log.Warn("verifyHttpSignatures failed: %v", err)
 			ctx.Error(http.StatusBadRequest, "reqSignature", "request signature verification failed")
 		} else if !authenticated {
diff --git a/routers/api/v1/activitypub/response.go b/routers/api/v1/activitypub/response.go
index a97f363cc2..64413cebb1 100644
--- a/routers/api/v1/activitypub/response.go
+++ b/routers/api/v1/activitypub/response.go
@@ -10,12 +10,46 @@ import (
 	"forgejo.org/modules/forgefed"
 	"forgejo.org/modules/log"
 	"forgejo.org/services/context"
+	"forgejo.org/services/federation"
 
 	ap "github.com/go-ap/activitypub"
 	"github.com/go-ap/jsonld"
 )
 
 // Respond with an ActivityStreams object
+func responseServiceResult(ctx *context.APIContext, result federation.ServiceResult) {
+	ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
+
+	switch {
+	case result.StatusOnly():
+		ctx.Resp.WriteHeader(result.HTTPStatus)
+		return
+	case result.WithBytes():
+		ctx.Resp.WriteHeader(result.HTTPStatus)
+		if _, err := ctx.Resp.Write(result.Bytes); err != nil {
+			log.Error("Error writing a response: %v", err)
+			ctx.Error(http.StatusInternalServerError, "Error writing a response", err)
+			return
+		}
+	case result.WithActivity():
+		binary, err := jsonld.WithContext(
+			jsonld.IRI(ap.ActivityBaseURI),
+			jsonld.IRI(ap.SecurityContextURI),
+			jsonld.IRI(forgefed.ForgeFedNamespaceURI),
+		).Marshal(result.Activity)
+		if err != nil {
+			ctx.ServerError("Marshal", err)
+			return
+		}
+		ctx.Resp.WriteHeader(result.HTTPStatus)
+		if _, err = ctx.Resp.Write(binary); err != nil {
+			log.Error("write to resp err: %v", err)
+		}
+	}
+}
+
+// Respond with an ActivityStreams object
+// Deprecated
 func response(ctx *context.APIContext, v any) {
 	binary, err := jsonld.WithContext(
 		jsonld.IRI(ap.ActivityBaseURI),
diff --git a/routers/api/v1/admin/email.go b/routers/api/v1/admin/email.go
index 906780a44b..9f6ef0fedf 100644
--- a/routers/api/v1/admin/email.go
+++ b/routers/api/v1/admin/email.go
@@ -17,7 +17,7 @@ import (
 func GetAllEmails(ctx *context.APIContext) {
 	// swagger:operation GET /admin/emails admin adminGetAllEmails
 	// ---
-	// summary: List all emails
+	// summary: List all users' email addresses
 	// produces:
 	// - application/json
 	// parameters:
@@ -60,7 +60,7 @@ func GetAllEmails(ctx *context.APIContext) {
 func SearchEmail(ctx *context.APIContext) {
 	// swagger:operation GET /admin/emails/search admin adminSearchEmails
 	// ---
-	// summary: Search all emails
+	// summary: Search users' email addresses
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/admin/hooks.go b/routers/api/v1/admin/hooks.go
index b3db2eb5e3..36ca6831e6 100644
--- a/routers/api/v1/admin/hooks.go
+++ b/routers/api/v1/admin/hooks.go
@@ -17,11 +17,11 @@ import (
 	webhook_service "forgejo.org/services/webhook"
 )
 
-// ListHooks list system's webhooks
+// ListHooks list system webhooks
 func ListHooks(ctx *context.APIContext) {
 	// swagger:operation GET /admin/hooks admin adminListHooks
 	// ---
-	// summary: List system's webhooks
+	// summary: List global (system) webhooks
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/admin/quota_rule.go b/routers/api/v1/admin/quota_rule.go
index ea188107fa..c2bc6843e4 100644
--- a/routers/api/v1/admin/quota_rule.go
+++ b/routers/api/v1/admin/quota_rule.go
@@ -4,7 +4,7 @@
 package admin
 
 import (
-	"fmt"
+	"errors"
 	"net/http"
 
 	quota_model "forgejo.org/models/quota"
@@ -83,7 +83,7 @@ func CreateQuotaRule(ctx *context.APIContext) {
 	form := web.GetForm(ctx).(*api.CreateQuotaRuleOptions)
 
 	if form.Limit == nil {
-		ctx.Error(http.StatusUnprocessableEntity, "quota_model.ParseLimitSubject", fmt.Errorf("[Limit]: Required"))
+		ctx.Error(http.StatusUnprocessableEntity, "quota_model.ParseLimitSubject", errors.New("[Limit]: Required"))
 		return
 	}
 
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index 32e1dd414d..f3e321a047 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -51,11 +51,11 @@ func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64
 	u.LoginSource = source.ID
 }
 
-// CreateUser create a user
+// CreateUser create a user account
 func CreateUser(ctx *context.APIContext) {
 	// swagger:operation POST /admin/users admin adminCreateUser
 	// ---
-	// summary: Create a user
+	// summary: Create a user account
 	// consumes:
 	// - application/json
 	// produces:
@@ -140,7 +140,6 @@ func CreateUser(ctx *context.APIContext) {
 			user_model.IsErrEmailAlreadyUsed(err) ||
 			db.IsErrNameReserved(err) ||
 			db.IsErrNameCharsNotAllowed(err) ||
-			validation.IsErrEmailCharIsNotSupported(err) ||
 			validation.IsErrEmailInvalid(err) ||
 			db.IsErrNamePatternNotAllowed(err) {
 			ctx.Error(http.StatusUnprocessableEntity, "", err)
@@ -197,7 +196,7 @@ func EditUser(ctx *context.APIContext) {
 	// If either LoginSource or LoginName is given, the other must be present too.
 	if form.SourceID != nil || form.LoginName != nil {
 		if form.SourceID == nil || form.LoginName == nil {
-			ctx.Error(http.StatusUnprocessableEntity, "LoginSourceAndLoginName", fmt.Errorf("source_id and login_name must be specified together"))
+			ctx.Error(http.StatusUnprocessableEntity, "LoginSourceAndLoginName", errors.New("source_id and login_name must be specified together"))
 			return
 		}
 	}
@@ -226,7 +225,7 @@ func EditUser(ctx *context.APIContext) {
 	if form.Email != nil {
 		if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil {
 			switch {
-			case validation.IsErrEmailCharIsNotSupported(err), validation.IsErrEmailInvalid(err):
+			case validation.IsErrEmailInvalid(err):
 				ctx.Error(http.StatusBadRequest, "EmailInvalid", err)
 			case user_model.IsErrEmailAlreadyUsed(err):
 				ctx.Error(http.StatusBadRequest, "EmailUsed", err)
@@ -275,7 +274,7 @@ func EditUser(ctx *context.APIContext) {
 func DeleteUser(ctx *context.APIContext) {
 	// swagger:operation DELETE /admin/users/{username} admin adminDeleteUser
 	// ---
-	// summary: Delete a user
+	// summary: Delete user account
 	// produces:
 	// - application/json
 	// parameters:
@@ -305,7 +304,7 @@ func DeleteUser(ctx *context.APIContext) {
 
 	// admin should not delete themself
 	if ctx.ContextUser.ID == ctx.Doer.ID {
-		ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("you cannot delete yourself"))
+		ctx.Error(http.StatusUnprocessableEntity, "", errors.New("you cannot delete yourself"))
 		return
 	}
 
@@ -325,11 +324,11 @@ func DeleteUser(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// CreatePublicKey api for creating a public key to a user
+// CreatePublicKey adds an SSH public key to user's account
 func CreatePublicKey(ctx *context.APIContext) {
 	// swagger:operation POST /admin/users/{username}/keys admin adminCreatePublicKey
 	// ---
-	// summary: Add a public key on behalf of a user
+	// summary: Add an SSH public key to user's account
 	// consumes:
 	// - application/json
 	// produces:
@@ -357,11 +356,11 @@ func CreatePublicKey(ctx *context.APIContext) {
 	user.CreateUserPublicKey(ctx, *form, ctx.ContextUser.ID)
 }
 
-// DeleteUserPublicKey api for deleting a user's public key
+// DeleteUserPublicKey removes an SSH public key from user's account
 func DeleteUserPublicKey(ctx *context.APIContext) {
 	// swagger:operation DELETE /admin/users/{username}/keys/{id} admin adminDeleteUserPublicKey
 	// ---
-	// summary: Delete a user's public key
+	// summary: Remove a public key from user's account
 	// produces:
 	// - application/json
 	// parameters:
@@ -437,26 +436,6 @@ func SearchUsers(ctx *context.APIContext) {
 
 	listOptions := utils.GetListOptions(ctx)
 
-	sort := ctx.FormString("sort")
-	var orderBy db.SearchOrderBy
-
-	switch sort {
-	case "oldest":
-		orderBy = db.SearchOrderByOldest
-	case "newest":
-		orderBy = db.SearchOrderByNewest
-	case "alphabetically":
-		orderBy = db.SearchOrderByAlphabetically
-	case "reversealphabetically":
-		orderBy = db.SearchOrderByAlphabeticallyReverse
-	case "recentupdate":
-		orderBy = db.SearchOrderByRecentUpdated
-	case "leastupdate":
-		orderBy = db.SearchOrderByLeastUpdated
-	default:
-		orderBy = db.SearchOrderByAlphabetically
-	}
-
 	intSource, err := strconv.ParseInt(ctx.FormString("source_id"), 10, 64)
 	var sourceID optional.Option[int64]
 	if ctx.FormString("source_id") == "" || err != nil {
@@ -470,7 +449,7 @@ func SearchUsers(ctx *context.APIContext) {
 		Type:        user_model.UserTypeIndividual,
 		LoginName:   ctx.FormTrim("login_name"),
 		SourceID:    sourceID,
-		OrderBy:     orderBy,
+		OrderBy:     utils.GetDbSearchOrder(ctx),
 		ListOptions: listOptions,
 	})
 	if err != nil {
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 2eb1ee4229..26a2c0ffe3 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -36,12 +36,12 @@
 //	     type: apiKey
 //	     name: token
 //	     in: query
-//	     description: This authentication option is deprecated for removal in Gitea 1.23. Please use AuthorizationHeaderToken instead.
+//	     description: This authentication option is deprecated for removal in Forgejo v13.0.0. Please use AuthorizationHeaderToken instead.
 //	AccessToken:
 //	     type: apiKey
 //	     name: access_token
 //	     in: query
-//	     description: This authentication option is deprecated for removal in Gitea 1.23. Please use AuthorizationHeaderToken instead.
+//	     description: This authentication option is deprecated for removal in Forgejo v13.0.0. Please use AuthorizationHeaderToken instead.
 //	AuthorizationHeaderToken:
 //	     type: apiKey
 //	     name: Authorization
@@ -81,7 +81,6 @@ import (
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unit"
 	user_model "forgejo.org/models/user"
-	"forgejo.org/modules/forgefed"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
@@ -104,6 +103,7 @@ import (
 	_ "forgejo.org/routers/api/v1/swagger" // for swagger generation
 
 	"code.forgejo.org/go-chi/binding"
+	ap "github.com/go-ap/activitypub"
 )
 
 func sudo() func(ctx *context.APIContext) {
@@ -203,19 +203,19 @@ func repoAssignment() func(ctx *context.APIContext) {
 			}
 
 			if task.IsForkPullRequest {
-				ctx.Repo.Permission.AccessMode = perm.AccessModeRead
+				ctx.Repo.AccessMode = perm.AccessModeRead
 			} else {
-				ctx.Repo.Permission.AccessMode = perm.AccessModeWrite
+				ctx.Repo.AccessMode = perm.AccessModeWrite
 			}
 
 			if err := ctx.Repo.Repository.LoadUnits(ctx); err != nil {
 				ctx.Error(http.StatusInternalServerError, "LoadUnits", err)
 				return
 			}
-			ctx.Repo.Permission.Units = ctx.Repo.Repository.Units
-			ctx.Repo.Permission.UnitsMode = make(map[unit.Type]perm.AccessMode)
+			ctx.Repo.Units = ctx.Repo.Repository.Units
+			ctx.Repo.UnitsMode = make(map[unit.Type]perm.AccessMode)
 			for _, u := range ctx.Repo.Repository.Units {
-				ctx.Repo.Permission.UnitsMode[u.Type] = ctx.Repo.Permission.AccessMode
+				ctx.Repo.UnitsMode[u.Type] = ctx.Repo.AccessMode
 			}
 		} else {
 			ctx.Repo.Permission, err = access_model.GetUserRepoPermission(ctx, repo, ctx.Doer)
@@ -692,7 +692,7 @@ func mustEnableIssues(ctx *context.APIContext) {
 }
 
 func mustAllowPulls(ctx *context.APIContext) {
-	if !(ctx.Repo.Repository.CanEnablePulls() && ctx.Repo.CanRead(unit.TypePullRequests)) {
+	if !ctx.Repo.Repository.CanEnablePulls() || !ctx.Repo.CanRead(unit.TypePullRequests) {
 		if ctx.Repo.Repository.CanEnablePulls() && log.IsTrace() {
 			if ctx.IsSigned {
 				log.Trace("Permission Denied: User %-v cannot read %-v in Repo %-v\n"+
@@ -716,7 +716,7 @@ func mustAllowPulls(ctx *context.APIContext) {
 
 func mustEnableIssuesOrPulls(ctx *context.APIContext) {
 	if !ctx.Repo.CanRead(unit.TypeIssues) &&
-		!(ctx.Repo.Repository.CanEnablePulls() && ctx.Repo.CanRead(unit.TypePullRequests)) {
+		(!ctx.Repo.Repository.CanEnablePulls() || !ctx.Repo.CanRead(unit.TypePullRequests)) {
 		if ctx.Repo.Repository.CanEnablePulls() && log.IsTrace() {
 			if ctx.IsSigned {
 				log.Trace("Permission Denied: User %-v cannot read %-v and %-v in Repo %-v\n"+
@@ -777,13 +777,13 @@ func bind[T any](_ T) any {
 func individualPermsChecker(ctx *context.APIContext) {
 	// org permissions have been checked in context.OrgAssignment(), but individual permissions haven't been checked.
 	if ctx.ContextUser.IsIndividual() {
-		switch {
-		case ctx.ContextUser.Visibility == api.VisibleTypePrivate:
+		switch ctx.ContextUser.Visibility {
+		case api.VisibleTypePrivate:
 			if ctx.Doer == nil || (ctx.ContextUser.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin) {
 				ctx.NotFound("Visit Project", nil)
 				return
 			}
-		case ctx.ContextUser.Visibility == api.VisibleTypeLimited:
+		case api.VisibleTypeLimited:
 			if ctx.Doer == nil {
 				ctx.NotFound("Visit Project", nil)
 				return
@@ -838,24 +838,27 @@ func Routes() *web.Route {
 		if setting.Federation.Enabled {
 			m.Get("/nodeinfo", misc.NodeInfo)
 			m.Group("/activitypub", func() {
-				// deprecated, remove in 1.20, use /user-id/{user-id} instead
-				m.Group("/user/{username}", func() {
-					m.Get("", activitypub.Person)
-					m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox)
-				}, context.UserAssignmentAPI(), checkTokenPublicOnly())
 				m.Group("/user-id/{user-id}", func() {
-					m.Get("", activitypub.Person)
-					m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox)
+					m.Get("", activitypub.ReqHTTPUserOrInstanceSignature(), activitypub.Person)
+					m.Post("/inbox",
+						activitypub.ReqHTTPUserSignature(),
+						bind(ap.Activity{}),
+						activitypub.PersonInbox)
+					m.Group("/activities/{activity-id}", func() {
+						m.Get("", activitypub.PersonActivityNote)
+						m.Get("/activity", activitypub.PersonActivity)
+					})
+					m.Get("/outbox", activitypub.ReqHTTPUserSignature(), activitypub.PersonFeed)
 				}, context.UserIDAssignmentAPI(), checkTokenPublicOnly())
 				m.Group("/actor", func() {
 					m.Get("", activitypub.Actor)
-					m.Post("/inbox", activitypub.ActorInbox)
+					m.Post("/inbox", activitypub.ReqHTTPUserOrInstanceSignature(), activitypub.ActorInbox)
 				})
 				m.Group("/repository-id/{repository-id}", func() {
-					m.Get("", activitypub.Repository)
+					m.Get("", activitypub.ReqHTTPUserSignature(), activitypub.Repository)
 					m.Post("/inbox",
-						bind(forgefed.ForgeLike{}),
-						// TODO: activitypub.ReqHTTPSignature(),
+						bind(ap.Activity{}),
+						activitypub.ReqHTTPUserSignature(),
 						activitypub.RepositoryInbox)
 				}, context.RepositoryIDAssignmentAPI())
 			}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryActivityPub))
@@ -865,6 +868,7 @@ func Routes() *web.Route {
 		m.Group("", func() {
 			m.Get("/version", misc.Version)
 			m.Get("/signing-key.gpg", misc.SigningKey)
+			m.Get("/signing-key.ssh", misc.SSHSigningKey)
 			m.Post("/markup", reqToken(), bind(api.MarkupOption{}), misc.Markup)
 			m.Post("/markdown", reqToken(), bind(api.MarkdownOption{}), misc.Markdown)
 			m.Post("/markdown/raw", reqToken(), misc.MarkdownRaw)
@@ -1183,9 +1187,13 @@ func Routes() *web.Route {
 				}, reqToken(), reqAdmin())
 				m.Group("/actions", func() {
 					m.Get("/tasks", repo.ListActionTasks)
+					m.Group("/runs", func() {
+						m.Get("", repo.ListActionRuns)
+						m.Get("/{run_id}", repo.GetActionRun)
+					})
 
 					m.Group("/workflows", func() {
-						m.Group("/{workflowname}", func() {
+						m.Group("/{workflowfilename}", func() {
 							m.Post("/dispatches", reqToken(), reqRepoWriter(unit.TypeActions), mustNotBeArchived, bind(api.DispatchWorkflowOption{}), repo.DispatchWorkflow)
 						})
 					})
@@ -1317,6 +1325,7 @@ func Routes() *web.Route {
 					m.Get("/refs", repo.GetGitAllRefs)
 					m.Get("/refs/*", repo.GetGitRefs)
 					m.Get("/trees/{sha}", repo.GetTree)
+					m.Get("/blobs", repo.GetBlobs)
 					m.Get("/blobs/{sha}", repo.GetBlob)
 					m.Get("/tags/{sha}", repo.GetAnnotatedTag)
 					m.Group("/notes/{sha}", func() {
@@ -1355,6 +1364,12 @@ func Routes() *web.Route {
 					m.Post("", bind(api.UpdateRepoAvatarOption{}), repo.UpdateAvatar)
 					m.Delete("", repo.DeleteAvatar)
 				}, reqAdmin(), reqToken())
+				m.Group("/sync_fork", func() {
+					m.Get("", reqRepoReader(unit.TypeCode), repo.SyncForkDefaultInfo)
+					m.Post("", mustNotBeArchived, reqRepoWriter(unit.TypeCode), repo.SyncForkDefault)
+					m.Get("/{branch}", reqRepoReader(unit.TypeCode), repo.SyncForkBranchInfo)
+					m.Post("/{branch}", mustNotBeArchived, reqRepoWriter(unit.TypeCode), repo.SyncForkBranch)
+				})
 
 				m.Get("/{ball_type:tarball|zipball|bundle}/*", reqRepoReader(unit.TypeCode), repo.DownloadArchive)
 			}, repoAssignment(), checkTokenPublicOnly())
@@ -1488,16 +1503,16 @@ func Routes() *web.Route {
 			m.Group("/{type}/{name}", func() {
 				m.Group("/{version}", func() {
 					m.Get("", packages.GetPackage)
-					m.Delete("", reqPackageAccess(perm.AccessModeWrite), packages.DeletePackage)
+					m.Delete("", reqToken(), reqPackageAccess(perm.AccessModeWrite), packages.DeletePackage)
 					m.Get("/files", packages.ListPackageFiles)
 				})
 
-				m.Post("/-/link/{repo_name}", reqPackageAccess(perm.AccessModeWrite), packages.LinkPackage)
-				m.Post("/-/unlink", reqPackageAccess(perm.AccessModeWrite), packages.UnlinkPackage)
+				m.Post("/-/link/{repo_name}", reqToken(), reqPackageAccess(perm.AccessModeWrite), packages.LinkPackage)
+				m.Post("/-/unlink", reqToken(), reqPackageAccess(perm.AccessModeWrite), packages.UnlinkPackage)
 			})
 
 			m.Get("/", packages.ListPackages)
-		}, reqToken(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryPackage), context.UserAssignmentAPI(), context.PackageAssignmentAPI(), reqPackageAccess(perm.AccessModeRead), checkTokenPublicOnly())
+		}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryPackage), context.UserAssignmentAPI(), context.PackageAssignmentAPI(), reqPackageAccess(perm.AccessModeRead), checkTokenPublicOnly())
 
 		// Organizations
 		m.Get("/user/orgs", reqToken(), tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser, auth_model.AccessTokenScopeCategoryOrganization), org.ListMyOrgs)
diff --git a/routers/api/v1/misc/signing.go b/routers/api/v1/misc/signing.go
index 945df6068f..9f829b8443 100644
--- a/routers/api/v1/misc/signing.go
+++ b/routers/api/v1/misc/signing.go
@@ -7,8 +7,11 @@ import (
 	"fmt"
 	"net/http"
 
+	"forgejo.org/modules/setting"
 	asymkey_service "forgejo.org/services/asymkey"
 	"forgejo.org/services/context"
+
+	"golang.org/x/crypto/ssh"
 )
 
 // SigningKey returns the public key of the default signing key if it exists
@@ -61,3 +64,29 @@ func SigningKey(ctx *context.APIContext) {
 		ctx.Error(http.StatusInternalServerError, "gpg export", fmt.Errorf("Error writing key content %w", err))
 	}
 }
+
+// SSHSigningKey returns the public SSH key of the default signing key if it exists
+func SSHSigningKey(ctx *context.APIContext) {
+	// swagger:operation GET /signing-key.ssh miscellaneous getSSHSigningKey
+	// ---
+	// summary: Get default signing-key.ssh
+	// produces:
+	//     - text/plain
+	// responses:
+	//   "200":
+	//     description: "SSH public key in OpenSSH authorized key format"
+	//     schema:
+	//       type: string
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+
+	if setting.SSHInstanceKey == nil {
+		ctx.NotFound()
+		return
+	}
+
+	_, err := ctx.Write(ssh.MarshalAuthorizedKey(setting.SSHInstanceKey))
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "ssh export", err)
+	}
+}
diff --git a/routers/api/v1/org/action.go b/routers/api/v1/org/action.go
index 0d8550a019..8b330aa752 100644
--- a/routers/api/v1/org/action.go
+++ b/routers/api/v1/org/action.go
@@ -20,11 +20,11 @@ import (
 	secret_service "forgejo.org/services/secrets"
 )
 
-// ListActionsSecrets list an organization's actions secrets
+// ListActionsSecrets lists actions secrets of an organization
 func (Action) ListActionsSecrets(ctx *context.APIContext) {
 	// swagger:operation GET /orgs/{org}/actions/secrets organization orgListActionsSecrets
 	// ---
-	// summary: List an organization's actions secrets
+	// summary: List actions secrets of an organization
 	// produces:
 	// - application/json
 	// parameters:
@@ -218,7 +218,7 @@ func (Action) SearchActionRunJobs(ctx *context.APIContext) {
 func (Action) ListVariables(ctx *context.APIContext) {
 	// swagger:operation GET /orgs/{org}/actions/variables organization getOrgVariablesList
 	// ---
-	// summary: Get an org-level variables list
+	// summary: List variables of an organization
 	// produces:
 	// - application/json
 	// parameters:
@@ -266,11 +266,11 @@ func (Action) ListVariables(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, variables)
 }
 
-// GetVariable get an org-level variable
+// GetVariable gives organization's variable
 func (Action) GetVariable(ctx *context.APIContext) {
 	// swagger:operation GET /orgs/{org}/actions/variables/{variablename} organization getOrgVariable
 	// ---
-	// summary: Get an org-level variable
+	// summary: Get organization's variable by name
 	// produces:
 	// - application/json
 	// parameters:
@@ -315,11 +315,11 @@ func (Action) GetVariable(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, variable)
 }
 
-// DeleteVariable delete an org-level variable
+// DeleteVariable deletes an organization's variable
 func (Action) DeleteVariable(ctx *context.APIContext) {
 	// swagger:operation DELETE /orgs/{org}/actions/variables/{variablename} organization deleteOrgVariable
 	// ---
-	// summary: Delete an org-level variable
+	// summary: Delete organization's variable by name
 	// produces:
 	// - application/json
 	// parameters:
@@ -359,11 +359,11 @@ func (Action) DeleteVariable(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// CreateVariable create an org-level variable
+// CreateVariable creates a new variable in organization
 func (Action) CreateVariable(ctx *context.APIContext) {
 	// swagger:operation POST /orgs/{org}/actions/variables/{variablename} organization createOrgVariable
 	// ---
-	// summary: Create an org-level variable
+	// summary: Create a new variable in organization
 	// consumes:
 	// - application/json
 	// produces:
@@ -423,11 +423,11 @@ func (Action) CreateVariable(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// UpdateVariable update an org-level variable
+// UpdateVariable updates variable in organization
 func (Action) UpdateVariable(ctx *context.APIContext) {
 	// swagger:operation PUT /orgs/{org}/actions/variables/{variablename} organization updateOrgVariable
 	// ---
-	// summary: Update an org-level variable
+	// summary: Update variable in organization
 	// consumes:
 	// - application/json
 	// produces:
diff --git a/routers/api/v1/org/avatar.go b/routers/api/v1/org/avatar.go
index 824a9f3495..043da3186f 100644
--- a/routers/api/v1/org/avatar.go
+++ b/routers/api/v1/org/avatar.go
@@ -13,11 +13,11 @@ import (
 	user_service "forgejo.org/services/user"
 )
 
-// UpdateAvatarupdates the Avatar of an Organisation
+// UpdateAvatar updates an organization's avatar
 func UpdateAvatar(ctx *context.APIContext) {
 	// swagger:operation POST /orgs/{org}/avatar organization orgUpdateAvatar
 	// ---
-	// summary: Update Avatar
+	// summary: Update an organization's avatar
 	// produces:
 	// - application/json
 	// parameters:
@@ -52,11 +52,11 @@ func UpdateAvatar(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// DeleteAvatar deletes the Avatar of an Organisation
+// DeleteAvatar deletes an organization's avatar
 func DeleteAvatar(ctx *context.APIContext) {
 	// swagger:operation DELETE /orgs/{org}/avatar organization orgDeleteAvatar
 	// ---
-	// summary: Delete Avatar
+	// summary: Delete an organization's avatar. It will be replaced by a default one
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index fcf2c6b412..a4ea924979 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -180,7 +180,7 @@ func GetUserOrgsPermissions(ctx *context.APIContext) {
 func GetAll(ctx *context.APIContext) {
 	// swagger:operation Get /orgs organization orgGetAll
 	// ---
-	// summary: Get list of organizations
+	// summary: List all organizations
 	// produces:
 	// - application/json
 	// parameters:
@@ -398,7 +398,7 @@ func Edit(ctx *context.APIContext) {
 			ctx.Org.Organization.Email = ""
 		} else {
 			if err := user_service.ReplacePrimaryEmailAddress(ctx, ctx.Org.Organization.AsUser(), *form.Email); err != nil {
-				if validation.IsErrEmailInvalid(err) || validation.IsErrEmailCharIsNotSupported(err) {
+				if validation.IsErrEmailInvalid(err) {
 					ctx.Error(http.StatusUnprocessableEntity, "ReplacePrimaryEmailAddress", err)
 				} else {
 					ctx.Error(http.StatusInternalServerError, "ReplacePrimaryEmailAddress", err)
diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go
index a39d4836e1..fe29d534ff 100644
--- a/routers/api/v1/repo/action.go
+++ b/routers/api/v1/repo/action.go
@@ -5,6 +5,7 @@ package repo
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 
 	actions_model "forgejo.org/models/actions"
@@ -614,7 +615,7 @@ func ListActionTasks(ctx *context.APIContext) {
 
 // DispatchWorkflow dispatches a workflow
 func DispatchWorkflow(ctx *context.APIContext) {
-	// swagger:operation POST /repos/{owner}/{repo}/actions/workflows/{workflowname}/dispatches repository DispatchWorkflow
+	// swagger:operation POST /repos/{owner}/{repo}/actions/workflows/{workflowfilename}/dispatches repository DispatchWorkflow
 	// ---
 	// summary: Dispatches a workflow
 	// consumes:
@@ -630,7 +631,7 @@ func DispatchWorkflow(ctx *context.APIContext) {
 	//   description: name of the repo
 	//   type: string
 	//   required: true
-	// - name: workflowname
+	// - name: workflowfilename
 	//   in: path
 	//   description: name of the workflow
 	//   type: string
@@ -648,13 +649,13 @@ func DispatchWorkflow(ctx *context.APIContext) {
 	//     "$ref": "#/responses/notFound"
 
 	opt := web.GetForm(ctx).(*api.DispatchWorkflowOption)
-	name := ctx.Params("workflowname")
+	name := ctx.Params("workflowfilename")
 
 	if len(opt.Ref) == 0 {
 		ctx.Error(http.StatusBadRequest, "ref", "ref is empty")
 		return
 	} else if len(name) == 0 {
-		ctx.Error(http.StatusBadRequest, "workflowname", "workflow name is empty")
+		ctx.Error(http.StatusBadRequest, "workflowfilename", "workflow file name is empty")
 		return
 	}
 
@@ -694,3 +695,161 @@ func DispatchWorkflow(ctx *context.APIContext) {
 		ctx.JSON(http.StatusNoContent, nil)
 	}
 }
+
+// ListActionRuns return a filtered list of ActionRun
+func ListActionRuns(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/actions/runs repository ListActionRuns
+	// ---
+	// summary: List a repository's action runs
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: page
+	//   in: query
+	//   description: page number of results to return (1-based)
+	//   type: integer
+	// - name: limit
+	//   in: query
+	//   description: page size of results, default maximum page size is 50
+	//   type: integer
+	// - name: event
+	//   in: query
+	//   description: Returns workflow run triggered by the specified events. For example, `push`, `pull_request` or `workflow_dispatch`.
+	//   type: array
+	//   items:
+	//     type: string
+	// - name: status
+	//   in: query
+	//   description: |
+	//     Returns workflow runs with the check run status or conclusion that is specified. For example, a conclusion can be success or a status can be in_progress. Only Forgejo Actions can set a status of waiting, pending, or requested.
+	//   type: array
+	//   items:
+	//     type: string
+	//     enum: [unknown, waiting, running, success, failure, cancelled, skipped, blocked]
+	// - name: run_number
+	//   in: query
+	//   description: |
+	//     Returns the workflow run associated with the run number.
+	//   type: integer
+	//   format: int64
+	// - name: head_sha
+	//   in: query
+	//   description: Only returns workflow runs that are associated with the specified head_sha.
+	//   type: string
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/ActionRunList"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+
+	statusStrs := ctx.FormStrings("status")
+	statuses := make([]actions_model.Status, len(statusStrs))
+	for i, s := range statusStrs {
+		if status, exists := actions_model.StatusFromString(s); exists {
+			statuses[i] = status
+		} else {
+			ctx.Error(http.StatusBadRequest, "StatusFromString", fmt.Sprintf("unknown status: %s", s))
+			return
+		}
+	}
+
+	runs, total, err := db.FindAndCount[actions_model.ActionRun](ctx, &actions_model.FindRunJobOptions{
+		ListOptions: utils.GetListOptions(ctx),
+		OwnerID:     ctx.Repo.Owner.ID,
+		RepoID:      ctx.Repo.Repository.ID,
+		Events:      ctx.FormStrings("event"),
+		Statuses:    statuses,
+		RunNumber:   ctx.FormInt64("run_number"),
+		CommitSHA:   ctx.FormString("head_sha"),
+	})
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "ListActionRuns", err)
+		return
+	}
+
+	res := new(api.ListActionRunResponse)
+	res.TotalCount = total
+
+	res.Entries = make([]*api.ActionRun, len(runs))
+	for i, r := range runs {
+		if err := r.LoadAttributes(ctx); err != nil {
+			ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
+			return
+		}
+		cr := convert.ToActionRun(ctx, r, ctx.Doer)
+		res.Entries[i] = cr
+	}
+
+	ctx.JSON(http.StatusOK, &res)
+}
+
+// GetActionRun get one action instance
+func GetActionRun(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/actions/runs/{run_id} repository ActionRun
+	// ---
+	// summary: Get an action run
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: run_id
+	//   in: path
+	//   description: id of the action run
+	//   type: integer
+	//   format: int64
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/ActionRun"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+
+	run, err := actions_model.GetRunByID(ctx, ctx.ParamsInt64(":run_id"))
+	if err != nil {
+		if errors.Is(err, util.ErrNotExist) {
+			ctx.Error(http.StatusNotFound, "GetRunById", err)
+		} else {
+			ctx.Error(http.StatusInternalServerError, "GetRunByID", err)
+		}
+		return
+	}
+
+	// Action runs lives in its own table, therefore we check that the
+	// run with the requested ID is owned by the repository
+	if ctx.Repo.Repository.ID != run.RepoID {
+		ctx.Error(http.StatusNotFound, "GetRunById", util.ErrNotExist)
+		return
+	}
+
+	if err := run.LoadAttributes(ctx); err != nil {
+		ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, convert.ToActionRun(ctx, run, ctx.Doer))
+}
diff --git a/routers/api/v1/repo/avatar.go b/routers/api/v1/repo/avatar.go
index 84aafe764d..12308ce2df 100644
--- a/routers/api/v1/repo/avatar.go
+++ b/routers/api/v1/repo/avatar.go
@@ -13,11 +13,11 @@ import (
 	repo_service "forgejo.org/services/repository"
 )
 
-// UpdateVatar updates the Avatar of an Repo
+// UpdateVatar updates repo avatar
 func UpdateAvatar(ctx *context.APIContext) {
 	// swagger:operation POST /repos/{owner}/{repo}/avatar repository repoUpdateAvatar
 	// ---
-	// summary: Update avatar
+	// summary: Update a repository's avatar
 	// produces:
 	// - application/json
 	// parameters:
@@ -56,11 +56,11 @@ func UpdateAvatar(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// UpdateAvatar deletes the Avatar of an Repo
+// DeleteAvatar deletes repo avatar
 func DeleteAvatar(ctx *context.APIContext) {
 	// swagger:operation DELETE /repos/{owner}/{repo}/avatar repository repoDeleteAvatar
 	// ---
-	// summary: Delete avatar
+	// summary: Delete a repository's avatar
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/repo/blob.go b/routers/api/v1/repo/blob.go
index 8ed57d4787..63baec2025 100644
--- a/routers/api/v1/repo/blob.go
+++ b/routers/api/v1/repo/blob.go
@@ -5,11 +5,54 @@ package repo
 
 import (
 	"net/http"
+	"strings"
 
 	"forgejo.org/services/context"
 	files_service "forgejo.org/services/repository/files"
 )
 
+// GetBlobs gets multiple blobs of a repository.
+func GetBlobs(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/git/blobs repository GetBlobs
+	// ---
+	// summary: Gets multiplbe blobs of a repository.
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: shas
+	//   in: query
+	//   description: a comma separated list of blob-sha (mind the overall URL-length limit of ~2,083 chars)
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/GitBlobList"
+	//   "400":
+	//     "$ref": "#/responses/error"
+
+	shas := ctx.FormString("shas")
+	if len(shas) == 0 {
+		ctx.Error(http.StatusBadRequest, "", "shas not provided")
+		return
+	}
+
+	if blobs, err := files_service.GetBlobsBySHA(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, strings.Split(shas, ",")); err != nil {
+		ctx.Error(http.StatusBadRequest, "", err)
+	} else {
+		ctx.JSON(http.StatusOK, blobs)
+	}
+}
+
 // GetBlob get the blob of a repository file.
 func GetBlob(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/git/blobs/{sha} repository GetBlob
@@ -30,12 +73,12 @@ func GetBlob(ctx *context.APIContext) {
 	//   required: true
 	// - name: sha
 	//   in: path
-	//   description: sha of the commit
+	//   description: sha of the blob to retrieve
 	//   type: string
 	//   required: true
 	// responses:
 	//   "200":
-	//     "$ref": "#/responses/GitBlobResponse"
+	//     "$ref": "#/responses/GitBlob"
 	//   "400":
 	//     "$ref": "#/responses/error"
 	//   "404":
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index 6263360a8e..e043448590 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -6,7 +6,6 @@ package repo
 
 import (
 	"errors"
-	"fmt"
 	"net/http"
 
 	"forgejo.org/models"
@@ -151,7 +150,7 @@ func DeleteBranch(ctx *context.APIContext) {
 	}
 
 	if ctx.Repo.Repository.IsMirror {
-		ctx.Error(http.StatusForbidden, "IsMirrored", fmt.Errorf("can not delete branch of an mirror repository"))
+		ctx.Error(http.StatusForbidden, "IsMirrored", errors.New("can not delete branch of an mirror repository"))
 		return
 	}
 
@@ -160,9 +159,9 @@ func DeleteBranch(ctx *context.APIContext) {
 		case git.IsErrBranchNotExist(err):
 			ctx.NotFound(err)
 		case errors.Is(err, repo_service.ErrBranchIsDefault):
-			ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("can not delete default branch"))
+			ctx.Error(http.StatusForbidden, "DefaultBranch", errors.New("can not delete default branch"))
 		case errors.Is(err, git_model.ErrBranchIsProtected):
-			ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("branch protected"))
+			ctx.Error(http.StatusForbidden, "IsProtectedBranch", errors.New("branch protected"))
 		default:
 			ctx.Error(http.StatusInternalServerError, "DeleteBranch", err)
 		}
@@ -231,9 +230,9 @@ func CreateBranch(ctx *context.APIContext) {
 			ctx.Error(http.StatusInternalServerError, "GetCommit", err)
 			return
 		}
-	} else if len(opt.OldBranchName) > 0 { //nolint
-		if ctx.Repo.GitRepo.IsBranchExist(opt.OldBranchName) { //nolint
-			oldCommit, err = ctx.Repo.GitRepo.GetBranchCommit(opt.OldBranchName) //nolint
+	} else if len(opt.OldBranchName) > 0 { //nolint:staticcheck
+		if ctx.Repo.GitRepo.IsBranchExist(opt.OldBranchName) { //nolint:staticcheck
+			oldCommit, err = ctx.Repo.GitRepo.GetBranchCommit(opt.OldBranchName) //nolint:staticcheck
 			if err != nil {
 				ctx.Error(http.StatusInternalServerError, "GetBranchCommit", err)
 				return
@@ -595,7 +594,7 @@ func CreateBranchProtection(ctx *context.APIContext) {
 	isPlainRule := !git_model.IsRuleNameSpecial(ruleName)
 	var isBranchExist bool
 	if isPlainRule {
-		isBranchExist = git.IsBranchExist(ctx.Req.Context(), ctx.Repo.Repository.RepoPath(), ruleName)
+		isBranchExist = ctx.Repo.GitRepo.IsBranchExist(ruleName)
 	}
 
 	protectBranch, err := git_model.GetProtectedBranchRuleByName(ctx, repo.ID, ruleName)
@@ -983,7 +982,7 @@ func EditBranchProtection(ctx *context.APIContext) {
 	isPlainRule := !git_model.IsRuleNameSpecial(bpName)
 	var isBranchExist bool
 	if isPlainRule {
-		isBranchExist = git.IsBranchExist(ctx.Req.Context(), ctx.Repo.Repository.RepoPath(), bpName)
+		isBranchExist = ctx.Repo.GitRepo.IsBranchExist(bpName)
 	}
 
 	if isBranchExist {
diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go
index 9c941ea07f..7fc59ea171 100644
--- a/routers/api/v1/repo/compare.go
+++ b/routers/api/v1/repo/compare.go
@@ -64,7 +64,7 @@ func CompareDiff(ctx *context.APIContext) {
 		}
 	}
 
-	_, headGitRepo, ci, _, _ := parseCompareInfo(ctx, api.CreatePullRequestOption{
+	headRepository, headGitRepo, ci, _, _ := parseCompareInfo(ctx, api.CreatePullRequestOption{
 		Base: infos[0],
 		Head: infos[1],
 	})
@@ -80,7 +80,7 @@ func CompareDiff(ctx *context.APIContext) {
 	apiFiles := []*api.CommitAffectedFiles{}
 	userCache := make(map[string]*user_model.User)
 	for i := 0; i < len(ci.Commits); i++ {
-		apiCommit, err := convert.ToCommit(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ci.Commits[i], userCache,
+		apiCommit, err := convert.ToCommit(ctx, headRepository, headGitRepo, ci.Commits[i], userCache,
 			convert.ToCommitOptions{
 				Stat:         true,
 				Verification: verification,
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index fb71d76388..6c1671d21c 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -241,7 +241,7 @@ func getBlobForEntry(ctx *context.APIContext) (blob *git.Blob, entry *git.TreeEn
 		return nil, nil, nil
 	}
 
-	if entry.IsDir() || entry.IsSubModule() {
+	if entry.IsDir() || entry.IsSubmodule() {
 		ctx.NotFound("getBlobForEntry", nil)
 		return nil, nil, nil
 	}
@@ -437,7 +437,7 @@ func canWriteFiles(ctx *context.APIContext, branch string) bool {
 
 // canReadFiles returns true if repository is readable and user has proper access level.
 func canReadFiles(r *context.Repository) bool {
-	return r.Permission.CanRead(unit.TypeCode)
+	return r.CanRead(unit.TypeCode)
 }
 
 func base64Reader(s string) (io.ReadSeeker, error) {
@@ -480,6 +480,8 @@ func ChangeFiles(ctx *context.APIContext) {
 	//     "$ref": "#/responses/error"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
+	//   "409":
+	//     "$ref": "#/responses/conflict"
 	//   "413":
 	//     "$ref": "#/responses/quotaExceeded"
 	//   "422":
@@ -584,6 +586,8 @@ func CreateFile(ctx *context.APIContext) {
 	//     "$ref": "#/responses/error"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
+	//   "409":
+	//     "$ref": "#/responses/conflict"
 	//   "413":
 	//     "$ref": "#/responses/quotaExceeded"
 	//   "422":
@@ -684,6 +688,8 @@ func UpdateFile(ctx *context.APIContext) {
 	//     "$ref": "#/responses/error"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
+	//   "409":
+	//     "$ref": "#/responses/conflict"
 	//   "413":
 	//     "$ref": "#/responses/quotaExceeded"
 	//   "422":
@@ -692,7 +698,7 @@ func UpdateFile(ctx *context.APIContext) {
 	//     "$ref": "#/responses/repoArchivedError"
 	apiOpts := web.GetForm(ctx).(*api.UpdateFileOptions)
 	if ctx.Repo.Repository.IsEmpty {
-		ctx.Error(http.StatusUnprocessableEntity, "RepoIsEmpty", fmt.Errorf("repo is empty"))
+		ctx.Error(http.StatusUnprocessableEntity, "RepoIsEmpty", errors.New("repo is empty"))
 		return
 	}
 
@@ -757,11 +763,19 @@ func handleCreateOrUpdateFileError(ctx *context.APIContext, err error) {
 		ctx.Error(http.StatusForbidden, "Access", err)
 		return
 	}
-	if git_model.IsErrBranchAlreadyExists(err) || models.IsErrFilenameInvalid(err) || models.IsErrSHADoesNotMatch(err) ||
-		models.IsErrFilePathInvalid(err) || models.IsErrRepoFileAlreadyExists(err) {
+	if git_model.IsErrBranchAlreadyExists(err) ||
+		models.IsErrFilenameInvalid(err) ||
+		models.IsErrSHAOrCommitIDNotProvided(err) ||
+		models.IsErrFilePathInvalid(err) ||
+		models.IsErrRepoFileAlreadyExists(err) {
 		ctx.Error(http.StatusUnprocessableEntity, "Invalid", err)
 		return
 	}
+	if models.IsErrCommitIDDoesNotMatch(err) ||
+		models.IsErrSHADoesNotMatch(err) {
+		ctx.Error(http.StatusConflict, "Conflict", err)
+		return
+	}
 	if git_model.IsErrBranchNotExist(err) || git.IsErrBranchNotExist(err) {
 		ctx.Error(http.StatusNotFound, "BranchDoesNotExist", err)
 		return
diff --git a/routers/api/v1/repo/hook_test.go b/routers/api/v1/repo/hook_test.go
index 77c86388f5..52d2245f03 100644
--- a/routers/api/v1/repo/hook_test.go
+++ b/routers/api/v1/repo/hook_test.go
@@ -25,7 +25,7 @@ func TestTestHook(t *testing.T) {
 	defer ctx.Repo.GitRepo.Close()
 	contexttest.LoadRepoCommit(t, ctx)
 	TestHook(ctx)
-	assert.EqualValues(t, http.StatusNoContent, ctx.Resp.Status())
+	assert.Equal(t, http.StatusNoContent, ctx.Resp.Status())
 
 	unittest.AssertExistsAndLoadBean(t, &webhook.HookTask{
 		HookID: 1,
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 5495c4a6ba..442e109843 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -121,6 +121,12 @@ func SearchIssues(ctx *context.APIContext) {
 	//   description: Number of items per page
 	//   type: integer
 	//   minimum: 0
+	// - name: sort
+	//   in: query
+	//   description: Type of sort
+	//   type: string
+	//   enum: [relevance, latest, oldest, recentupdate, leastupdate, mostcomment, leastcomment, nearduedate, farduedate]
+	//   default: latest
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/IssueList"
@@ -276,7 +282,7 @@ func SearchIssues(ctx *context.APIContext) {
 		IsClosed:            isClosed,
 		IncludedAnyLabelIDs: includedAnyLabels,
 		MilestoneIDs:        includedMilestones,
-		SortBy:              issue_indexer.SortByCreatedDesc,
+		SortBy:              issue_indexer.ParseSortBy(ctx.FormString("sort"), issue_indexer.SortByCreatedDesc),
 	}
 
 	if since != 0 {
@@ -305,9 +311,10 @@ func SearchIssues(ctx *context.APIContext) {
 		}
 	}
 
-	// FIXME: It's unsupported to sort by priority repo when searching by indexer,
-	//        it's indeed an regression, but I think it is worth to support filtering by indexer first.
-	_ = ctx.FormInt64("priority_repo_id")
+	priorityRepoID := ctx.FormInt64("priority_repo_id")
+	if priorityRepoID > 0 {
+		searchOpt.PriorityRepoID = optional.Some(priorityRepoID)
+	}
 
 	ids, total, err := issue_indexer.SearchIssues(ctx, searchOpt)
 	if err != nil {
diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go
index bed1e7ecf9..7bf1d3c67c 100644
--- a/routers/api/v1/repo/issue_dependency.go
+++ b/routers/api/v1/repo/issue_dependency.go
@@ -72,7 +72,7 @@ func GetIssueDependencies(ctx *context.APIContext) {
 	}
 
 	// 1. We must be able to read this issue
-	if !ctx.Repo.Permission.CanReadIssuesOrPulls(issue.IsPull) {
+	if !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull) {
 		ctx.NotFound()
 		return
 	}
@@ -88,7 +88,7 @@ func GetIssueDependencies(ctx *context.APIContext) {
 		limit = setting.API.MaxResponseItems
 	}
 
-	canWrite := ctx.Repo.Permission.CanWriteIssuesOrPulls(issue.IsPull)
+	canWrite := ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
 
 	blockerIssues := make([]*issues_model.Issue, 0, limit)
 
@@ -123,7 +123,7 @@ func GetIssueDependencies(ctx *context.APIContext) {
 		}
 
 		// check permission
-		if !perm.CanReadIssuesOrPulls(blocker.Issue.IsPull) {
+		if !perm.CanReadIssuesOrPulls(blocker.IsPull) {
 			if !canWrite {
 				hiddenBlocker := &issues_model.DependencyInfo{
 					Issue: issues_model.Issue{
@@ -134,19 +134,19 @@ func GetIssueDependencies(ctx *context.APIContext) {
 			} else {
 				confidentialBlocker := &issues_model.DependencyInfo{
 					Issue: issues_model.Issue{
-						RepoID:   blocker.Issue.RepoID,
+						RepoID:   blocker.RepoID,
 						Index:    blocker.Index,
 						Title:    blocker.Title,
 						IsClosed: blocker.IsClosed,
 						IsPull:   blocker.IsPull,
 					},
 					Repository: repo_model.Repository{
-						ID:        blocker.Issue.Repo.ID,
-						Name:      blocker.Issue.Repo.Name,
-						OwnerName: blocker.Issue.Repo.OwnerName,
+						ID:        blocker.Repo.ID,
+						Name:      blocker.Repo.Name,
+						OwnerName: blocker.Repo.OwnerName,
 					},
 				}
-				confidentialBlocker.Issue.Repo = &confidentialBlocker.Repository
+				confidentialBlocker.Repo = &confidentialBlocker.Repository
 				blocker = confidentialBlocker
 			}
 		}
@@ -323,7 +323,7 @@ func GetIssueBlocks(ctx *context.APIContext) {
 		return
 	}
 
-	if !ctx.Repo.Permission.CanReadIssuesOrPulls(issue.IsPull) {
+	if !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull) {
 		ctx.NotFound()
 		return
 	}
@@ -373,11 +373,11 @@ func GetIssueBlocks(ctx *context.APIContext) {
 			repoPerms[depMeta.RepoID] = perm
 		}
 
-		if !perm.CanReadIssuesOrPulls(depMeta.Issue.IsPull) {
+		if !perm.CanReadIssuesOrPulls(depMeta.IsPull) {
 			continue
 		}
 
-		depMeta.Issue.Repo = &depMeta.Repository
+		depMeta.Repo = &depMeta.Repository
 		issues = append(issues, &depMeta.Issue)
 	}
 
diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go
index 85af1149ff..f2e79ea417 100644
--- a/routers/api/v1/repo/issue_label.go
+++ b/routers/api/v1/repo/issue_label.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	"fmt"
+	"errors"
 	"net/http"
 	"reflect"
 
@@ -352,12 +352,12 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
 			labelNames = append(labelNames, rv.String())
 		default:
 			ctx.Error(http.StatusBadRequest, "InvalidLabel", "a label must be an integer or a string")
-			return nil, nil, fmt.Errorf("invalid label")
+			return nil, nil, errors.New("invalid label")
 		}
 	}
 	if len(labelIDs) > 0 && len(labelNames) > 0 {
 		ctx.Error(http.StatusBadRequest, "InvalidLabels", "labels should be an array of strings or integers")
-		return nil, nil, fmt.Errorf("invalid labels")
+		return nil, nil, errors.New("invalid labels")
 	}
 	if len(labelNames) > 0 {
 		repoLabelIDs, err := issues_model.GetLabelIDsInRepoByNames(ctx, ctx.Repo.Repository.ID, labelNames)
@@ -384,7 +384,7 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
 
 	if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
 		ctx.Status(http.StatusForbidden)
-		return nil, nil, nil
+		return nil, nil, errors.New("not issue/pull writer")
 	}
 
 	err = issue_service.SetIssueUpdateDate(ctx, issue, form.Updated, ctx.Doer)
diff --git a/routers/api/v1/repo/issue_tracked_time.go b/routers/api/v1/repo/issue_tracked_time.go
index 7d88b1b2cd..61875b577c 100644
--- a/routers/api/v1/repo/issue_tracked_time.go
+++ b/routers/api/v1/repo/issue_tracked_time.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -116,7 +117,7 @@ func ListTrackedTimes(ctx *context.APIContext) {
 		if opts.UserID == 0 {
 			opts.UserID = ctx.Doer.ID
 		} else {
-			ctx.Error(http.StatusForbidden, "", fmt.Errorf("query by user not allowed; not enough rights"))
+			ctx.Error(http.StatusForbidden, "", errors.New("query by user not allowed; not enough rights"))
 			return
 		}
 	}
@@ -437,7 +438,7 @@ func ListTrackedTimesByUser(ctx *context.APIContext) {
 	}
 
 	if !ctx.IsUserRepoAdmin() && !ctx.Doer.IsAdmin && ctx.Doer.ID != user.ID {
-		ctx.Error(http.StatusForbidden, "", fmt.Errorf("query by user not allowed; not enough rights"))
+		ctx.Error(http.StatusForbidden, "", errors.New("query by user not allowed; not enough rights"))
 		return
 	}
 
@@ -545,7 +546,7 @@ func ListTrackedTimesByRepository(ctx *context.APIContext) {
 		if opts.UserID == 0 {
 			opts.UserID = ctx.Doer.ID
 		} else {
-			ctx.Error(http.StatusForbidden, "", fmt.Errorf("query by user not allowed; not enough rights"))
+			ctx.Error(http.StatusForbidden, "", errors.New("query by user not allowed; not enough rights"))
 			return
 		}
 	}
diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go
index d0ab5e270e..a848a950db 100644
--- a/routers/api/v1/repo/migrate.go
+++ b/routers/api/v1/repo/migrate.go
@@ -123,12 +123,12 @@ func Migrate(ctx *context.APIContext) {
 	gitServiceType := convert.ToGitServiceType(form.Service)
 
 	if form.Mirror && setting.Mirror.DisableNewPull {
-		ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", fmt.Errorf("the site administrator has disabled the creation of new pull mirrors"))
+		ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", errors.New("the site administrator has disabled the creation of new pull mirrors"))
 		return
 	}
 
 	if setting.Repository.DisableMigrations {
-		ctx.Error(http.StatusForbidden, "MigrationsGlobalDisabled", fmt.Errorf("the site administrator has disabled migrations"))
+		ctx.Error(http.StatusForbidden, "MigrationsGlobalDisabled", errors.New("the site administrator has disabled migrations"))
 		return
 	}
 
@@ -224,9 +224,8 @@ func Migrate(ctx *context.APIContext) {
 			HasWiki:     &opts.Wiki,
 		}
 
-		// only enabling wiki could return an error
-		if err = updateRepoUnits(ctx, repoOpt); err != nil {
-			log.Error("Failed to enable wiki on %s/%s repo. %w", repoOwner.Name, form.RepoName, err)
+		if err = updateRepoUnits(ctx, repoOwner.Name, repo, repoOpt); err != nil {
+			log.Error("Failed to update units on %s/%s repo. %w", repoOwner.Name, form.RepoName, err)
 		}
 	}
 
diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go
index bc48c6acb7..08ef68cbfc 100644
--- a/routers/api/v1/repo/mirror.go
+++ b/routers/api/v1/repo/mirror.go
@@ -251,11 +251,11 @@ func GetPushMirrorByName(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, m)
 }
 
-// AddPushMirror adds a push mirror to a repository
+// AddPushMirror sets up a new push mirror in a repository
 func AddPushMirror(ctx *context.APIContext) {
 	// swagger:operation POST /repos/{owner}/{repo}/push_mirrors repository repoAddPushMirror
 	// ---
-	// summary: add a push mirror to the repository
+	// summary: Set up a new push mirror in a repository
 	// consumes:
 	// - application/json
 	// produces:
@@ -296,11 +296,11 @@ func AddPushMirror(ctx *context.APIContext) {
 	CreatePushMirror(ctx, pushMirror)
 }
 
-// DeletePushMirrorByRemoteName deletes a push mirror from a repository by remoteName
+// DeletePushMirrorByRemoteName removes a push mirror from a repository by remoteName
 func DeletePushMirrorByRemoteName(ctx *context.APIContext) {
 	// swagger:operation DELETE /repos/{owner}/{repo}/push_mirrors/{name} repository repoDeletePushMirror
 	// ---
-	// summary: deletes a push mirror from a repository by remoteName
+	// summary: Remove a push mirror from a repository by remoteName
 	// produces:
 	// - application/json
 	// parameters:
@@ -389,6 +389,7 @@ func CreatePushMirror(ctx *context.APIContext, mirrorOption *api.CreatePushMirro
 		Interval:      interval,
 		SyncOnCommit:  mirrorOption.SyncOnCommit,
 		RemoteAddress: remoteAddress,
+		BranchFilter:  mirrorOption.BranchFilter,
 	}
 
 	var plainPrivateKey []byte
diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go
index 87903d9f36..f3ceeaeacf 100644
--- a/routers/api/v1/repo/notes.go
+++ b/routers/api/v1/repo/notes.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -63,7 +64,7 @@ func GetNote(ctx *context.APIContext) {
 
 func getNote(ctx *context.APIContext, identifier string) {
 	if ctx.Repo.GitRepo == nil {
-		ctx.InternalServerError(fmt.Errorf("no open git repo"))
+		ctx.InternalServerError(errors.New("no open git repo"))
 		return
 	}
 
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 25c85e7531..812468f6b4 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -47,7 +47,7 @@ import (
 func ListPullRequests(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/pulls repository repoListPullRequests
 	// ---
-	// summary: List a repo's pull requests
+	// summary: List a repo's pull requests. If a pull request is selected but fails to be retrieved for any reason, it will be a null value in the list of results.
 	// produces:
 	// - application/json
 	// parameters:
@@ -71,7 +71,7 @@ func ListPullRequests(ctx *context.APIContext) {
 	//   in: query
 	//   description: Type of sort
 	//   type: string
-	//   enum: [oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority]
+	//   enum: [oldest, recentupdate, recentclose, leastupdate, mostcomment, leastcomment, priority]
 	// - name: milestone
 	//   in: query
 	//   description: ID of the milestone
@@ -1016,6 +1016,9 @@ func MergePullRequest(ctx *context.APIContext) {
 		} else if models.IsErrMergeUnrelatedHistories(err) {
 			conflictError := err.(models.ErrMergeUnrelatedHistories)
 			ctx.JSON(http.StatusConflict, conflictError)
+		} else if models.IsErrPullRequestHasMerged(err) {
+			conflictError := err.(models.ErrPullRequestHasMerged)
+			ctx.JSON(http.StatusConflict, conflictError)
 		} else if git.IsErrPushOutOfDate(err) {
 			ctx.Error(http.StatusConflict, "Merge", "merge push out of date")
 		} else if models.IsErrSHADoesNotMatch(err) {
@@ -1050,11 +1053,11 @@ func MergePullRequest(ctx *context.APIContext) {
 		if err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, pr, headRepo); err != nil {
 			switch {
 			case errors.Is(err, repo_service.ErrBranchIsDefault):
-				ctx.Error(http.StatusForbidden, "DefaultBranch", fmt.Errorf("the head branch is the default branch"))
+				ctx.Error(http.StatusForbidden, "DefaultBranch", errors.New("the head branch is the default branch"))
 			case errors.Is(err, git_model.ErrBranchIsProtected):
-				ctx.Error(http.StatusForbidden, "IsProtectedBranch", fmt.Errorf("the head branch is protected"))
+				ctx.Error(http.StatusForbidden, "IsProtectedBranch", errors.New("the head branch is protected"))
 			case errors.Is(err, util.ErrPermissionDenied):
-				ctx.Error(http.StatusForbidden, "HeadBranch", fmt.Errorf("insufficient permission to delete head branch"))
+				ctx.Error(http.StatusForbidden, "HeadBranch", errors.New("insufficient permission to delete head branch"))
 			default:
 				ctx.Error(http.StatusInternalServerError, "DeleteBranchAfterMerge", err)
 			}
@@ -1084,7 +1087,6 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 		err        error
 	)
 
-	// If there is no head repository, it means pull request between same repository.
 	headInfos := strings.Split(form.Head, ":")
 	if len(headInfos) == 1 {
 		isSameRepo = true
@@ -1094,7 +1096,7 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 		headUser, err = user_model.GetUserByName(ctx, headInfos[0])
 		if err != nil {
 			if user_model.IsErrUserNotExist(err) {
-				ctx.NotFound("GetUserByName")
+				ctx.NotFound(fmt.Errorf("the owner %s does not exist", headInfos[0]))
 			} else {
 				ctx.Error(http.StatusInternalServerError, "GetUserByName", err)
 			}
@@ -1104,7 +1106,7 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 		// The head repository can also point to the same repo
 		isSameRepo = ctx.Repo.Owner.ID == headUser.ID
 	} else {
-		ctx.NotFound()
+		ctx.NotFound(fmt.Errorf("the head part of {basehead} %s must contain zero or one colon (:) but contains %d", form.Head, len(headInfos)-1))
 		return nil, nil, nil, "", ""
 	}
 
@@ -1116,16 +1118,10 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 	baseIsBranch := ctx.Repo.GitRepo.IsBranchExist(baseBranch)
 	baseIsTag := ctx.Repo.GitRepo.IsTagExist(baseBranch)
 	if !baseIsCommit && !baseIsBranch && !baseIsTag {
-		// Check for short SHA usage
-		if baseCommit, _ := ctx.Repo.GitRepo.GetCommit(baseBranch); baseCommit != nil {
-			baseBranch = baseCommit.ID.String()
-		} else {
-			ctx.NotFound("BaseNotExist")
-			return nil, nil, nil, "", ""
-		}
+		ctx.NotFound(fmt.Errorf("could not find '%s' to be a commit, branch or tag in the base repository %s/%s", baseBranch, baseRepo.Owner.Name, baseRepo.Name))
+		return nil, nil, nil, "", ""
 	}
 
-	// Check if current user has fork of repository or in the same repository.
 	headRepo := repo_model.GetForkedRepo(ctx, headUser.ID, baseRepo.ID)
 	if headRepo == nil && !isSameRepo {
 		err := baseRepo.GetBaseRepo(ctx)
@@ -1134,13 +1130,11 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 			return nil, nil, nil, "", ""
 		}
 
-		// Check if baseRepo's base repository is the same as headUser's repository.
 		if baseRepo.BaseRepo == nil || baseRepo.BaseRepo.OwnerID != headUser.ID {
 			log.Trace("parseCompareInfo[%d]: does not have fork or in same repository", baseRepo.ID)
-			ctx.NotFound("GetBaseRepo")
+			ctx.NotFound(fmt.Errorf("%[1]s does not have a fork of %[2]s/%[3]s and %[2]s/%[3]s is not a fork of a repository from %[1]s", headUser.Name, baseRepo.Owner.Name, baseRepo.Name))
 			return nil, nil, nil, "", ""
 		}
-		// Assign headRepo so it can be used below.
 		headRepo = baseRepo.BaseRepo
 	}
 
@@ -1194,32 +1188,27 @@ func parseCompareInfo(ctx *context.APIContext, form api.CreatePullRequestOption)
 		return nil, nil, nil, "", ""
 	}
 
-	// Check if head branch is valid.
-	headIsCommit := headGitRepo.IsBranchExist(headBranch)
-	headIsBranch := headGitRepo.IsTagExist(headBranch)
-	headIsTag := headGitRepo.IsCommitExist(baseBranch)
-	if !headIsCommit && !headIsBranch && !headIsTag {
-		// Check if headBranch is short sha commit hash
-		if headCommit, _ := headGitRepo.GetCommit(headBranch); headCommit != nil {
-			headBranch = headCommit.ID.String()
-		} else {
-			headGitRepo.Close()
-			ctx.NotFound("IsRefExist", nil)
-			return nil, nil, nil, "", ""
-		}
-	}
-
 	baseBranchRef := baseBranch
 	if baseIsBranch {
 		baseBranchRef = git.BranchPrefix + baseBranch
 	} else if baseIsTag {
 		baseBranchRef = git.TagPrefix + baseBranch
 	}
+
+	// Check if head branch is valid.
+	headIsCommit := headGitRepo.IsCommitExist(headBranch)
+	headIsBranch := headGitRepo.IsBranchExist(headBranch)
+	headIsTag := headGitRepo.IsTagExist(headBranch)
+	if !headIsCommit && !headIsBranch && !headIsTag {
+		ctx.NotFound(fmt.Errorf("could not find '%s' to be a commit, branch or tag in the head repository %s/%s", headBranch, headRepo.Owner.Name, headRepo.Name))
+		return nil, nil, nil, "", ""
+	}
+
 	headBranchRef := headBranch
 	if headIsBranch {
-		headBranchRef = headBranch
+		headBranchRef = git.BranchPrefix + headBranch
 	} else if headIsTag {
-		headBranchRef = headBranch
+		headBranchRef = git.TagPrefix + headBranch
 	}
 
 	compareInfo, err := headGitRepo.GetCompareInfo(repo_model.RepoPath(baseRepo.Owner.Name, baseRepo.Name), baseBranchRef, headBranchRef, false, false)
@@ -1628,7 +1617,7 @@ func GetPullRequestFiles(ctx *context.APIContext) {
 	maxLines := setting.Git.MaxGitDiffLines
 
 	// FIXME: If there are too many files in the repo, may cause some unpredictable issues.
-	diff, err := gitdiff.GetDiff(ctx, baseGitRepo,
+	diff, _, err := gitdiff.GetDiffSimple(ctx, baseGitRepo,
 		&gitdiff.DiffOptions{
 			BeforeCommitID:     startCommitID,
 			AfterCommitID:      endCommitID,
diff --git a/routers/api/v1/repo/pull_review.go b/routers/api/v1/repo/pull_review.go
index aa4c7318a2..06b47fef70 100644
--- a/routers/api/v1/repo/pull_review.go
+++ b/routers/api/v1/repo/pull_review.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -581,7 +582,7 @@ func SubmitPullReview(ctx *context.APIContext) {
 	}
 
 	if review.Type != issues_model.ReviewTypePending {
-		ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("only a pending review can be submitted"))
+		ctx.Error(http.StatusUnprocessableEntity, "", errors.New("only a pending review can be submitted"))
 		return
 	}
 
@@ -593,7 +594,7 @@ func SubmitPullReview(ctx *context.APIContext) {
 
 	// if review stay pending return
 	if reviewType == issues_model.ReviewTypePending {
-		ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("review stay pending"))
+		ctx.Error(http.StatusUnprocessableEntity, "", errors.New("review stay pending"))
 		return
 	}
 
@@ -634,7 +635,7 @@ func preparePullReviewType(ctx *context.APIContext, pr *issues_model.PullRequest
 	case api.ReviewStateApproved:
 		// can not approve your own PR
 		if pr.Issue.IsPoster(ctx.Doer.ID) {
-			ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("approve your own pull is not allowed"))
+			ctx.Error(http.StatusUnprocessableEntity, "", errors.New("approve your own pull is not allowed"))
 			return -1, true
 		}
 		reviewType = issues_model.ReviewTypeApprove
@@ -643,7 +644,7 @@ func preparePullReviewType(ctx *context.APIContext, pr *issues_model.PullRequest
 	case api.ReviewStateRequestChanges:
 		// can not reject your own PR
 		if pr.Issue.IsPoster(ctx.Doer.ID) {
-			ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("reject your own pull is not allowed"))
+			ctx.Error(http.StatusUnprocessableEntity, "", errors.New("reject your own pull is not allowed"))
 			return -1, true
 		}
 		reviewType = issues_model.ReviewTypeReject
@@ -715,7 +716,7 @@ func prepareSingleReview(ctx *context.APIContext) (*issues_model.Review, *issues
 func CreateReviewRequests(ctx *context.APIContext) {
 	// swagger:operation POST /repos/{owner}/{repo}/pulls/{index}/requested_reviewers repository repoCreatePullReviewRequests
 	// ---
-	// summary: create review requests for a pull request
+	// summary: Create review requests for a pull request
 	// produces:
 	// - application/json
 	// parameters:
@@ -756,7 +757,7 @@ func CreateReviewRequests(ctx *context.APIContext) {
 func DeleteReviewRequests(ctx *context.APIContext) {
 	// swagger:operation DELETE /repos/{owner}/{repo}/pulls/{index}/requested_reviewers repository repoDeletePullReviewRequests
 	// ---
-	// summary: cancel review requests for a pull request
+	// summary: Cancel review requests for a pull request
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go
index 68254a530a..0bf958b523 100644
--- a/routers/api/v1/repo/release.go
+++ b/routers/api/v1/repo/release.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -226,7 +227,7 @@ func CreateRelease(ctx *context.APIContext) {
 
 	form := web.GetForm(ctx).(*api.CreateReleaseOption)
 	if ctx.Repo.Repository.IsEmpty {
-		ctx.Error(http.StatusUnprocessableEntity, "RepoIsEmpty", fmt.Errorf("repo is empty"))
+		ctx.Error(http.StatusUnprocessableEntity, "RepoIsEmpty", errors.New("repo is empty"))
 		return
 	}
 	rel, err := repo_model.GetRelease(ctx, ctx.Repo.Repository.ID, form.TagName)
@@ -267,7 +268,7 @@ func CreateRelease(ctx *context.APIContext) {
 		}
 	} else {
 		if !rel.IsTag {
-			ctx.Error(http.StatusConflict, "GetRelease", "Release is has no Tag")
+			ctx.Error(http.StatusConflict, "GetRelease", "Release has no Tag")
 			return
 		}
 
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 59b32eb667..42385d54a6 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -5,13 +5,13 @@
 package repo
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"slices"
 	"strings"
 	"time"
 
-	actions_model "forgejo.org/models/actions"
 	activities_model "forgejo.org/models/activities"
 	"forgejo.org/models/db"
 	"forgejo.org/models/organization"
@@ -647,7 +647,7 @@ func Edit(ctx *context.APIContext) {
 		return
 	}
 
-	if err := updateRepoUnits(ctx, opts); err != nil {
+	if err := updateRepoUnits(ctx, ctx.Repo.Owner.Name, ctx.Repo.Repository, opts); err != nil {
 		return
 	}
 
@@ -724,7 +724,7 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
 		visibilityChanged = repo.IsPrivate != *opts.Private
 		// when ForcePrivate enabled, you could change public repo to private, but only admin users can change private to public
 		if visibilityChanged && setting.Repository.ForcePrivate && !*opts.Private && !ctx.Doer.IsAdmin {
-			err := fmt.Errorf("cannot change private repository to public")
+			err := errors.New("cannot change private repository to public")
 			ctx.Error(http.StatusUnprocessableEntity, "Force Private enabled", err)
 			return err
 		}
@@ -779,10 +779,7 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
 }
 
 // updateRepoUnits updates repo units: Issue settings, Wiki settings, PR settings
-func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
-	owner := ctx.Repo.Owner
-	repo := ctx.Repo.Repository
-
+func updateRepoUnits(ctx *context.APIContext, owner string, repo *repo_model.Repository, opts api.EditRepoOption) error {
 	var units []repo_model.RepoUnit
 	var deleteUnitTypes []unit_model.Type
 
@@ -795,12 +792,12 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 		if newHasIssues && opts.ExternalTracker != nil && !unit_model.TypeExternalTracker.UnitGlobalDisabled() {
 			// Check that values are valid
 			if !validation.IsValidExternalURL(opts.ExternalTracker.ExternalTrackerURL) {
-				err := fmt.Errorf("External tracker URL not valid")
+				err := errors.New("External tracker URL not valid")
 				ctx.Error(http.StatusUnprocessableEntity, "Invalid external tracker URL", err)
 				return err
 			}
 			if len(opts.ExternalTracker.ExternalTrackerFormat) != 0 && !validation.IsValidExternalTrackerURLFormat(opts.ExternalTracker.ExternalTrackerFormat) {
-				err := fmt.Errorf("External tracker URL format not valid")
+				err := errors.New("External tracker URL format not valid")
 				ctx.Error(http.StatusUnprocessableEntity, "Invalid external tracker URL format", err)
 				return err
 			}
@@ -864,14 +861,14 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 			if *opts.GloballyEditableWiki {
 				wikiPermissions = repo_model.UnitAccessModeWrite
 			} else {
-				wikiPermissions = repo_model.UnitAccessModeRead
+				wikiPermissions = repo_model.UnitAccessModeUnset
 			}
 		}
 
 		if newHasWiki && opts.ExternalWiki != nil && !unit_model.TypeExternalWiki.UnitGlobalDisabled() {
 			// Check that values are valid
 			if !validation.IsValidExternalURL(opts.ExternalWiki.ExternalWikiURL) {
-				err := fmt.Errorf("External wiki URL not valid")
+				err := errors.New("External wiki URL not valid")
 				ctx.Error(http.StatusUnprocessableEntity, "", "Invalid external wiki URL")
 				return err
 			}
@@ -1045,7 +1042,7 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 		}
 	}
 
-	log.Trace("Repository advanced settings updated: %s/%s", owner.Name, repo.Name)
+	log.Trace("Repository advanced settings updated: %s/%s", owner, repo.Name)
 	return nil
 }
 
@@ -1055,7 +1052,7 @@ func updateRepoArchivedState(ctx *context.APIContext, opts api.EditRepoOption) e
 	// archive / un-archive
 	if opts.Archived != nil {
 		if repo.IsMirror {
-			err := fmt.Errorf("repo is a mirror, cannot archive/un-archive")
+			err := errors.New("repo is a mirror, cannot archive/un-archive")
 			ctx.Error(http.StatusUnprocessableEntity, err.Error(), err)
 			return err
 		}
@@ -1065,7 +1062,7 @@ func updateRepoArchivedState(ctx *context.APIContext, opts api.EditRepoOption) e
 				ctx.Error(http.StatusInternalServerError, "ArchiveRepoState", err)
 				return err
 			}
-			if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
+			if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
 				log.Error("CleanRepoScheduleTasks for archived repo %s/%s: %v", ctx.Repo.Owner.Name, repo.Name, err)
 			}
 			log.Trace("Repository was archived: %s/%s", ctx.Repo.Owner.Name, repo.Name)
diff --git a/routers/api/v1/repo/repo_test.go b/routers/api/v1/repo/repo_test.go
index 69eeb1cfdf..024376c146 100644
--- a/routers/api/v1/repo/repo_test.go
+++ b/routers/api/v1/repo/repo_test.go
@@ -58,7 +58,7 @@ func TestRepoEdit(t *testing.T) {
 	web.SetForm(ctx, &opts)
 	Edit(ctx)
 
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
 		ID: 1,
 	}, unittest.Cond("name = ? AND is_archived = 1", *opts.Name))
@@ -78,7 +78,7 @@ func TestRepoEditNameChange(t *testing.T) {
 
 	web.SetForm(ctx, &opts)
 	Edit(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 
 	unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
 		ID: 1,
diff --git a/routers/api/v1/repo/sync_fork.go b/routers/api/v1/repo/sync_fork.go
new file mode 100644
index 0000000000..c3a9bd26ba
--- /dev/null
+++ b/routers/api/v1/repo/sync_fork.go
@@ -0,0 +1,185 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"net/http"
+
+	git_model "forgejo.org/models/git"
+	"forgejo.org/services/context"
+	repo_service "forgejo.org/services/repository"
+)
+
+func getSyncForkInfo(ctx *context.APIContext, branch string) {
+	if !ctx.Repo.Repository.IsFork {
+		ctx.Error(http.StatusBadRequest, "NoFork", "The Repo must be a fork")
+		return
+	}
+
+	syncForkInfo, err := repo_service.GetSyncForkInfo(ctx, ctx.Repo.Repository, branch)
+	if err != nil {
+		if git_model.IsErrBranchNotExist(err) {
+			ctx.NotFound(err, branch)
+			return
+		}
+
+		ctx.Error(http.StatusInternalServerError, "GetSyncForkInfo", err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, syncForkInfo)
+}
+
+// SyncForkBranchInfo returns information about syncing the default fork branch with the base branch
+func SyncForkDefaultInfo(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/sync_fork repository repoSyncForkDefaultInfo
+	// ---
+	// summary: Gets information about syncing the fork default branch with the base branch
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/SyncForkInfo"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	getSyncForkInfo(ctx, ctx.Repo.Repository.DefaultBranch)
+}
+
+// SyncForkBranchInfo returns information about syncing a fork branch with the base branch
+func SyncForkBranchInfo(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/sync_fork/{branch} repository repoSyncForkBranchInfo
+	// ---
+	// summary: Gets information about syncing a fork branch with the base branch
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: branch
+	//   in: path
+	//   description: The branch
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/SyncForkInfo"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	getSyncForkInfo(ctx, ctx.Params("branch"))
+}
+
+func syncForkBranch(ctx *context.APIContext, branch string) {
+	if !ctx.Repo.Repository.IsFork {
+		ctx.Error(http.StatusBadRequest, "NoFork", "The Repo must be a fork")
+		return
+	}
+
+	syncForkInfo, err := repo_service.GetSyncForkInfo(ctx, ctx.Repo.Repository, branch)
+	if err != nil {
+		if git_model.IsErrBranchNotExist(err) {
+			ctx.NotFound(err, branch)
+			return
+		}
+
+		ctx.Error(http.StatusInternalServerError, "GetSyncForkInfo", err)
+		return
+	}
+
+	if !syncForkInfo.Allowed {
+		ctx.Error(http.StatusBadRequest, "NotAllowed", "You can't sync this branch")
+		return
+	}
+
+	err = repo_service.SyncFork(ctx, ctx.Doer, ctx.Repo.Repository, branch)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "SyncFork", err)
+		return
+	}
+
+	ctx.Status(http.StatusNoContent)
+}
+
+// SyncForkBranch syncs the default of a fork with the base branch
+func SyncForkDefault(ctx *context.APIContext) {
+	// swagger:operation POST /repos/{owner}/{repo}/sync_fork repository repoSyncForkDefault
+	// ---
+	// summary: Syncs the default branch of a fork with the base branch
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// responses:
+	//   "204":
+	//     "$ref": "#/responses/empty"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	syncForkBranch(ctx, ctx.Repo.Repository.DefaultBranch)
+}
+
+// SyncForkBranch syncs a fork branch with the base branch
+func SyncForkBranch(ctx *context.APIContext) {
+	// swagger:operation POST /repos/{owner}/{repo}/sync_fork/{branch} repository repoSyncForkBranch
+	// ---
+	// summary: Syncs a fork branch with the base branch
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: branch
+	//   in: path
+	//   description: The branch
+	//   type: string
+	//   required: true
+	// responses:
+	//   "204":
+	//     "$ref": "#/responses/empty"
+	//   "400":
+	//     "$ref": "#/responses/error"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	syncForkBranch(ctx, ctx.Params("branch"))
+}
diff --git a/routers/api/v1/repo/topic.go b/routers/api/v1/repo/topic.go
index daa637936e..8829e37bc3 100644
--- a/routers/api/v1/repo/topic.go
+++ b/routers/api/v1/repo/topic.go
@@ -253,17 +253,17 @@ func DeleteTopic(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// TopicSearch search for creating topic
+// TopicSearch searches known topics, i.e. when adding a topic to a repository
 func TopicSearch(ctx *context.APIContext) {
 	// swagger:operation GET /topics/search repository topicSearch
 	// ---
-	// summary: search topics via keyword
+	// summary: Search for topics by keyword
 	// produces:
 	//   - application/json
 	// parameters:
 	//   - name: q
 	//     in: query
-	//     description: keywords to search
+	//     description: keyword to search for
 	//     required: true
 	//     type: string
 	//   - name: page
diff --git a/routers/api/v1/repo/transfer.go b/routers/api/v1/repo/transfer.go
index 3b6cb4d3f2..72cfeaf902 100644
--- a/routers/api/v1/repo/transfer.go
+++ b/routers/api/v1/repo/transfer.go
@@ -238,7 +238,7 @@ func acceptOrRejectRepoTransfer(ctx *context.APIContext, accept bool) error {
 
 	if !repoTransfer.CanUserAcceptTransfer(ctx, ctx.Doer) {
 		ctx.Error(http.StatusForbidden, "CanUserAcceptTransfer", nil)
-		return fmt.Errorf("user does not have permissions to do this")
+		return errors.New("user does not have permissions to do this")
 	}
 
 	if accept {
diff --git a/routers/api/v1/repo/wiki.go b/routers/api/v1/repo/wiki.go
index bb4cf0f211..7b6a00408a 100644
--- a/routers/api/v1/repo/wiki.go
+++ b/routers/api/v1/repo/wiki.go
@@ -5,6 +5,7 @@ package repo
 
 import (
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -506,11 +507,8 @@ func findWikiRepoCommit(ctx *context.APIContext) (*git.Repository, *git.Commit)
 // given tree entry, encoded with base64. Writes to ctx if an error occurs.
 func wikiContentsByEntry(ctx *context.APIContext, entry *git.TreeEntry) string {
 	blob := entry.Blob()
-	if blob.Size() > setting.API.DefaultMaxBlobSize {
-		return ""
-	}
-	content, err := blob.GetBlobContentBase64()
-	if err != nil {
+	content, err := blob.GetContentBase64(setting.API.DefaultMaxBlobSize)
+	if err != nil && !errors.As(err, &git.BlobTooLargeError{}) {
 		ctx.Error(http.StatusInternalServerError, "GetBlobContentBase64", err)
 		return ""
 	}
diff --git a/routers/api/v1/swagger/activitypub.go b/routers/api/v1/swagger/activitypub.go
index 6235009572..a11fc4098c 100644
--- a/routers/api/v1/swagger/activitypub.go
+++ b/routers/api/v1/swagger/activitypub.go
@@ -13,3 +13,10 @@ type swaggerResponseActivityPub struct {
 	// in:body
 	Body api.ActivityPub `json:"body"`
 }
+
+// Personfeed
+// swagger:response PersonFeed
+type swaggerResponsePersonFeed struct {
+	// in:body
+	Body []api.APPersonFollowItem `json:"body"`
+}
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index 445e3417fb..cd4832e15f 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -231,11 +231,18 @@ type swaggerGitTreeResponse struct {
 	Body api.GitTreeResponse `json:"body"`
 }
 
-// GitBlobResponse
-// swagger:response GitBlobResponse
-type swaggerGitBlobResponse struct {
+// GitBlob
+// swagger:response GitBlob
+type swaggerGitBlob struct {
 	// in: body
-	Body api.GitBlobResponse `json:"body"`
+	Body api.GitBlob `json:"body"`
+}
+
+// GitBlobList
+// swagger:response GitBlobList
+type swaggerGitBlobList struct {
+	// in: body
+	Body []api.GitBlob `json:"body"`
 }
 
 // Commit
@@ -448,3 +455,24 @@ type swaggerCompare struct {
 	// in:body
 	Body api.Compare `json:"body"`
 }
+
+// SyncForkInfo
+// swagger:response SyncForkInfo
+type swaggerSyncForkInfo struct {
+	// in:body
+	Body []api.SyncForkInfo `json:"body"`
+}
+
+// ActionRunList
+// swagger:response ActionRunList
+type swaggerActionRunList struct {
+	// in:body
+	Body api.ListActionRunResponse `json:"body"`
+}
+
+// ActionRun
+// swagger:response ActionRun
+type swaggerActionRun struct {
+	// in:body
+	Body api.ActionRun `json:"body"`
+}
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index 138ad5a1d2..65955913fd 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -71,11 +71,11 @@ func ListAccessTokens(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiTokens)
 }
 
-// CreateAccessToken create access tokens
+// CreateAccessToken creates an access token for doer
 func CreateAccessToken(ctx *context.APIContext) {
 	// swagger:operation POST /users/{username}/tokens user userCreateToken
 	// ---
-	// summary: Create an access token
+	// summary: Generate an access token for the current user
 	// consumes:
 	// - application/json
 	// produces:
@@ -141,11 +141,11 @@ func CreateAccessToken(ctx *context.APIContext) {
 	})
 }
 
-// DeleteAccessToken delete access tokens
+// DeleteAccessToken deletes an access token from doer's account
 func DeleteAccessToken(ctx *context.APIContext) {
 	// swagger:operation DELETE /users/{username}/tokens/{token} user userDeleteAccessToken
 	// ---
-	// summary: delete an access token
+	// summary: Delete an access token from current user's account
 	// produces:
 	// - application/json
 	// parameters:
@@ -214,7 +214,7 @@ func DeleteAccessToken(ctx *context.APIContext) {
 func CreateOauth2Application(ctx *context.APIContext) {
 	// swagger:operation POST /user/applications/oauth2 user userCreateOAuth2Application
 	// ---
-	// summary: creates a new OAuth2 application
+	// summary: Creates a new OAuth2 application
 	// produces:
 	// - application/json
 	// parameters:
@@ -298,11 +298,11 @@ func ListOauth2Applications(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiApps)
 }
 
-// DeleteOauth2Application delete OAuth2 Application
+// DeleteOauth2Application delete OAuth2 application
 func DeleteOauth2Application(ctx *context.APIContext) {
 	// swagger:operation DELETE /user/applications/oauth2/{id} user userDeleteOAuth2Application
 	// ---
-	// summary: delete an OAuth2 Application
+	// summary: Delete an OAuth2 application
 	// produces:
 	// - application/json
 	// parameters:
@@ -334,11 +334,11 @@ func DeleteOauth2Application(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// GetOauth2Application get OAuth2 Application
+// GetOauth2Application returns an OAuth2 application
 func GetOauth2Application(ctx *context.APIContext) {
 	// swagger:operation GET /user/applications/oauth2/{id} user userGetOAuth2Application
 	// ---
-	// summary: get an OAuth2 Application
+	// summary: Get an OAuth2 application
 	// produces:
 	// - application/json
 	// parameters:
@@ -377,11 +377,11 @@ func GetOauth2Application(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, convert.ToOAuth2Application(app))
 }
 
-// UpdateOauth2Application update OAuth2 Application
+// UpdateOauth2Application updates an OAuth2 application
 func UpdateOauth2Application(ctx *context.APIContext) {
 	// swagger:operation PATCH /user/applications/oauth2/{id} user userUpdateOAuth2Application
 	// ---
-	// summary: update an OAuth2 Application, this includes regenerating the client secret
+	// summary: Update an OAuth2 application, this includes regenerating the client secret
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/user/avatar.go b/routers/api/v1/user/avatar.go
index 453682a37b..2b0659c251 100644
--- a/routers/api/v1/user/avatar.go
+++ b/routers/api/v1/user/avatar.go
@@ -13,11 +13,11 @@ import (
 	user_service "forgejo.org/services/user"
 )
 
-// UpdateAvatar updates the Avatar of an User
+// UpdateAvatar updates doer's avatar
 func UpdateAvatar(ctx *context.APIContext) {
 	// swagger:operation POST /user/avatar user userUpdateAvatar
 	// ---
-	// summary: Update Avatar
+	// summary: Update avatar of the current user
 	// produces:
 	// - application/json
 	// parameters:
@@ -49,11 +49,11 @@ func UpdateAvatar(ctx *context.APIContext) {
 	ctx.Status(http.StatusNoContent)
 }
 
-// DeleteAvatar deletes the Avatar of an User
+// DeleteAvatar deletes doer's avatar
 func DeleteAvatar(ctx *context.APIContext) {
 	// swagger:operation DELETE /user/avatar user userDeleteAvatar
 	// ---
-	// summary: Delete Avatar
+	// summary: Delete avatar of the current user. It will be replaced by a default one
 	// produces:
 	// - application/json
 	// responses:
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
index 7b18ea97b0..38da23442d 100644
--- a/routers/api/v1/user/email.go
+++ b/routers/api/v1/user/email.go
@@ -16,12 +16,12 @@ import (
 	user_service "forgejo.org/services/user"
 )
 
-// ListEmails list all of the authenticated user's email addresses
+// ListEmails lists doer's all email addresses
 // see https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user
 func ListEmails(ctx *context.APIContext) {
 	// swagger:operation GET /user/emails user userListEmails
 	// ---
-	// summary: List the authenticated user's email addresses
+	// summary: List all email addresses of the current user
 	// produces:
 	// - application/json
 	// responses:
@@ -44,11 +44,11 @@ func ListEmails(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiEmails)
 }
 
-// AddEmail add an email address
+// AddEmail adds an email address to doer's account
 func AddEmail(ctx *context.APIContext) {
 	// swagger:operation POST /user/emails user userAddEmail
 	// ---
-	// summary: Add email addresses
+	// summary: Add an email addresses to the current user's account
 	// produces:
 	// - application/json
 	// parameters:
@@ -75,14 +75,11 @@ func AddEmail(ctx *context.APIContext) {
 	if err := user_service.AddEmailAddresses(ctx, ctx.Doer, form.Emails); err != nil {
 		if user_model.IsErrEmailAlreadyUsed(err) {
 			ctx.Error(http.StatusUnprocessableEntity, "", "Email address has been used: "+err.(user_model.ErrEmailAlreadyUsed).Email)
-		} else if validation.IsErrEmailCharIsNotSupported(err) || validation.IsErrEmailInvalid(err) {
+		} else if validation.IsErrEmailInvalid(err) {
 			email := ""
 			if typedError, ok := err.(validation.ErrEmailInvalid); ok {
 				email = typedError.Email
 			}
-			if typedError, ok := err.(validation.ErrEmailCharIsNotSupported); ok {
-				email = typedError.Email
-			}
 
 			errMsg := fmt.Sprintf("Email address %q invalid", email)
 			ctx.Error(http.StatusUnprocessableEntity, "", errMsg)
@@ -105,11 +102,11 @@ func AddEmail(ctx *context.APIContext) {
 	ctx.JSON(http.StatusCreated, apiEmails)
 }
 
-// DeleteEmail delete email
+// DeleteEmail deletes an email address from doer's account
 func DeleteEmail(ctx *context.APIContext) {
 	// swagger:operation DELETE /user/emails user userDeleteEmail
 	// ---
-	// summary: Delete email addresses
+	// summary: Delete email addresses from the current user's account
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go
index 1581358b66..bb7f3d3522 100644
--- a/routers/api/v1/user/gpg_key.go
+++ b/routers/api/v1/user/gpg_key.go
@@ -4,6 +4,7 @@
 package user
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -143,7 +144,7 @@ func GetGPGKey(ctx *context.APIContext) {
 // CreateUserGPGKey creates new GPG key to given user by ID.
 func CreateUserGPGKey(ctx *context.APIContext, form api.CreateGPGKeyOption, uid int64) {
 	if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageGPGKeys) {
-		ctx.NotFound("Not Found", fmt.Errorf("gpg keys setting is not allowed to be visited"))
+		ctx.NotFound("Not Found", errors.New("gpg keys setting is not allowed to be visited"))
 		return
 	}
 
@@ -248,11 +249,11 @@ type swaggerUserCurrentPostGPGKey struct {
 	Form api.CreateGPGKeyOption
 }
 
-// CreateGPGKey create a GPG key belonging to the authenticated user
+// CreateGPGKey adds a GPG public key doer's account
 func CreateGPGKey(ctx *context.APIContext) {
 	// swagger:operation POST /user/gpg_keys user userCurrentPostGPGKey
 	// ---
-	// summary: Create a GPG key
+	// summary: Add a GPG public key to current user's account
 	// consumes:
 	// - application/json
 	// produces:
@@ -273,11 +274,11 @@ func CreateGPGKey(ctx *context.APIContext) {
 	CreateUserGPGKey(ctx, *form, ctx.Doer.ID)
 }
 
-// DeleteGPGKey remove a GPG key belonging to the authenticated user
+// DeleteGPGKey removes a GPG public key from doer's account
 func DeleteGPGKey(ctx *context.APIContext) {
 	// swagger:operation DELETE /user/gpg_keys/{id} user userCurrentDeleteGPGKey
 	// ---
-	// summary: Remove a GPG key
+	// summary: Remove a GPG public key from current user's account
 	// produces:
 	// - application/json
 	// parameters:
@@ -298,7 +299,7 @@ func DeleteGPGKey(ctx *context.APIContext) {
 	//     "$ref": "#/responses/notFound"
 
 	if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageGPGKeys) {
-		ctx.NotFound("Not Found", fmt.Errorf("gpg keys setting is not allowed to be visited"))
+		ctx.NotFound("Not Found", errors.New("gpg keys setting is not allowed to be visited"))
 		return
 	}
 
diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go
index 3aecf5fc3a..d8b5dfdfe9 100644
--- a/routers/api/v1/user/key.go
+++ b/routers/api/v1/user/key.go
@@ -5,7 +5,7 @@ package user
 
 import (
 	std_ctx "context"
-	"fmt"
+	"errors"
 	"net/http"
 
 	asymkey_model "forgejo.org/models/asymkey"
@@ -24,9 +24,10 @@ import (
 
 // appendPrivateInformation appends the owner and key type information to api.PublicKey
 func appendPrivateInformation(ctx std_ctx.Context, apiKey *api.PublicKey, key *asymkey_model.PublicKey, defaultUser *user_model.User) (*api.PublicKey, error) {
-	if key.Type == asymkey_model.KeyTypeDeploy {
+	switch key.Type {
+	case asymkey_model.KeyTypeDeploy:
 		apiKey.KeyType = "deploy"
-	} else if key.Type == asymkey_model.KeyTypeUser {
+	case asymkey_model.KeyTypeUser:
 		apiKey.KeyType = "user"
 
 		if defaultUser.ID == key.OwnerID {
@@ -38,7 +39,7 @@ func appendPrivateInformation(ctx std_ctx.Context, apiKey *api.PublicKey, key *a
 			}
 			apiKey.Owner = convert.ToUser(ctx, user, user)
 		}
-	} else {
+	default:
 		apiKey.KeyType = "unknown"
 	}
 	apiKey.ReadOnly = key.Mode == perm.AccessModeRead
@@ -208,7 +209,7 @@ func GetPublicKey(ctx *context.APIContext) {
 // CreateUserPublicKey creates new public key to given user by ID.
 func CreateUserPublicKey(ctx *context.APIContext, form api.CreateKeyOption, uid int64) {
 	if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) {
-		ctx.NotFound("Not Found", fmt.Errorf("ssh keys setting is not allowed to be visited"))
+		ctx.NotFound("Not Found", errors.New("ssh keys setting is not allowed to be visited"))
 		return
 	}
 
@@ -284,7 +285,7 @@ func DeletePublicKey(ctx *context.APIContext) {
 	//     "$ref": "#/responses/notFound"
 
 	if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) {
-		ctx.NotFound("Not Found", fmt.Errorf("ssh keys setting is not allowed to be visited"))
+		ctx.NotFound("Not Found", errors.New("ssh keys setting is not allowed to be visited"))
 		return
 	}
 
diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go
index 7b326812a7..94dd3931e4 100644
--- a/routers/api/v1/user/repo.go
+++ b/routers/api/v1/user/repo.go
@@ -155,7 +155,7 @@ func ListMyRepos(ctx *context.APIContext) {
 		results[i] = convert.ToRepo(ctx, repo, permission)
 	}
 
-	ctx.SetLinkHeader(int(count), opts.ListOptions.PageSize)
+	ctx.SetLinkHeader(int(count), opts.PageSize)
 	ctx.SetTotalCountHeader(count)
 	ctx.JSON(http.StatusOK, &results)
 }
diff --git a/routers/api/v1/user/settings.go b/routers/api/v1/user/settings.go
index 134b448718..53455bcd75 100644
--- a/routers/api/v1/user/settings.go
+++ b/routers/api/v1/user/settings.go
@@ -14,11 +14,11 @@ import (
 	user_service "forgejo.org/services/user"
 )
 
-// GetUserSettings returns user settings
+// GetUserSettings returns doer's account settings
 func GetUserSettings(ctx *context.APIContext) {
 	// swagger:operation GET /user/settings user getUserSettings
 	// ---
-	// summary: Get user settings
+	// summary: Get current user's account settings
 	// produces:
 	// - application/json
 	// responses:
@@ -31,11 +31,11 @@ func GetUserSettings(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
 }
 
-// UpdateUserSettings returns user settings
+// UpdateUserSettings updates settings in doer's account
 func UpdateUserSettings(ctx *context.APIContext) {
 	// swagger:operation PATCH /user/settings user updateUserSettings
 	// ---
-	// summary: Update user settings
+	// summary: Update settings in current user's account
 	// parameters:
 	// - name: body
 	//   in: body
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 5bdd56c892..2bd2829d09 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -33,6 +33,11 @@ func Search(ctx *context.APIContext) {
 	//   description: ID of the user to search for
 	//   type: integer
 	//   format: int64
+	// - name: sort
+	//   in: query
+	//   description: sort order of results
+	//   type: string
+	//   enum: [oldest, newest, alphabetically, reversealphabetically, recentupdate, leastupdate]
 	// - name: page
 	//   in: query
 	//   description: page number of results to return (1-based)
@@ -81,6 +86,7 @@ func Search(ctx *context.APIContext) {
 			SearchByEmail: true,
 			Visible:       visible,
 			ListOptions:   listOptions,
+			OrderBy:       utils.GetDbSearchOrder(ctx),
 		})
 		if err != nil {
 			ctx.JSON(http.StatusInternalServerError, map[string]any{
@@ -260,7 +266,7 @@ func ListBlockedUsers(ctx *context.APIContext) {
 func BlockUser(ctx *context.APIContext) {
 	// swagger:operation PUT /user/block/{username} user userBlockUser
 	// ---
-	// summary: Blocks a user from the doer.
+	// summary: Blocks a user from the doer
 	// produces:
 	// - application/json
 	// parameters:
@@ -293,7 +299,7 @@ func BlockUser(ctx *context.APIContext) {
 func UnblockUser(ctx *context.APIContext) {
 	// swagger:operation PUT /user/unblock/{username} user userUnblockUser
 	// ---
-	// summary: Unblocks a user from the doer.
+	// summary: Unblocks a user from the doer
 	// produces:
 	// - application/json
 	// parameters:
diff --git a/routers/api/v1/utils/db_search_order.go b/routers/api/v1/utils/db_search_order.go
new file mode 100644
index 0000000000..f089ba5f16
--- /dev/null
+++ b/routers/api/v1/utils/db_search_order.go
@@ -0,0 +1,28 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package utils
+
+import (
+	"forgejo.org/models/db"
+	"forgejo.org/services/context"
+)
+
+func GetDbSearchOrder(ctx *context.APIContext) db.SearchOrderBy {
+	switch ctx.FormString("sort") {
+	case "oldest":
+		return db.SearchOrderByOldest
+	case "newest":
+		return db.SearchOrderByNewest
+	case "alphabetically":
+		return db.SearchOrderByAlphabetically
+	case "reversealphabetically":
+		return db.SearchOrderByAlphabeticallyReverse
+	case "recentupdate":
+		return db.SearchOrderByRecentUpdated
+	case "leastupdate":
+		return db.SearchOrderByLeastUpdated
+	default:
+		return db.SearchOrderByAlphabetically
+	}
+}
diff --git a/routers/api/v1/utils/git.go b/routers/api/v1/utils/git.go
index 5359a54899..65a8994405 100644
--- a/routers/api/v1/utils/git.go
+++ b/routers/api/v1/utils/git.go
@@ -5,6 +5,7 @@ package utils
 
 import (
 	gocontext "context"
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -50,7 +51,7 @@ func ResolveRefOrSha(ctx *context.APIContext, ref string) string {
 // GetGitRefs return git references based on filter
 func GetGitRefs(ctx *context.APIContext, filter string) ([]*git.Reference, string, error) {
 	if ctx.Repo.GitRepo == nil {
-		return nil, "", fmt.Errorf("no open git repo found in context")
+		return nil, "", errors.New("no open git repo found in context")
 	}
 	if len(filter) > 0 {
 		filter = "refs/" + filter
diff --git a/routers/api/v1/utils/hook.go b/routers/api/v1/utils/hook.go
index d882845008..fc4b3293ac 100644
--- a/routers/api/v1/utils/hook.go
+++ b/routers/api/v1/utils/hook.go
@@ -16,6 +16,7 @@ import (
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/util"
+	"forgejo.org/modules/validation"
 	webhook_module "forgejo.org/modules/webhook"
 	"forgejo.org/services/context"
 	webhook_service "forgejo.org/services/webhook"
@@ -93,6 +94,10 @@ func checkCreateHookOption(ctx *context.APIContext, form *api.CreateHookOption)
 		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid content type")
 		return false
 	}
+	if !validation.IsValidURL(form.Config["url"]) {
+		ctx.Error(http.StatusUnprocessableEntity, "", "Invalid url")
+		return false
+	}
 	return true
 }
 
@@ -322,6 +327,10 @@ func EditRepoHook(ctx *context.APIContext, form *api.EditHookOption, hookID int6
 func editHook(ctx *context.APIContext, form *api.EditHookOption, w *webhook.Webhook) bool {
 	if form.Config != nil {
 		if url, ok := form.Config["url"]; ok {
+			if !validation.IsValidURL(url) {
+				ctx.Error(http.StatusUnprocessableEntity, "", "Invalid url")
+				return false
+			}
 			w.URL = url
 		}
 		if ct, ok := form.Config["content_type"]; ok {
diff --git a/routers/api/v1/utils/hook_test.go b/routers/api/v1/utils/hook_test.go
new file mode 100644
index 0000000000..3d0e6db079
--- /dev/null
+++ b/routers/api/v1/utils/hook_test.go
@@ -0,0 +1,86 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package utils
+
+import (
+	"net/http"
+	"testing"
+
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/structs"
+	"forgejo.org/services/contexttest"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTestHookValidation(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+
+	t.Run("Test Validation", func(t *testing.T) {
+		ctx, _ := contexttest.MockAPIContext(t, "user2/repo1/hooks")
+		contexttest.LoadRepo(t, ctx, 1)
+		contexttest.LoadGitRepo(t, ctx)
+		contexttest.LoadRepoCommit(t, ctx)
+		contexttest.LoadUser(t, ctx, 2)
+
+		checkCreateHookOption(ctx, &structs.CreateHookOption{
+			Type: "gitea",
+			Config: map[string]string{
+				"content_type": "json",
+				"url":          "https://example.com/webhook",
+			},
+		})
+		assert.Equal(t, 0, ctx.Resp.WrittenStatus()) // not written yet
+	})
+
+	t.Run("Test Validation with invalid URL", func(t *testing.T) {
+		ctx, _ := contexttest.MockAPIContext(t, "user2/repo1/hooks")
+		contexttest.LoadRepo(t, ctx, 1)
+		contexttest.LoadGitRepo(t, ctx)
+		contexttest.LoadRepoCommit(t, ctx)
+		contexttest.LoadUser(t, ctx, 2)
+
+		checkCreateHookOption(ctx, &structs.CreateHookOption{
+			Type: "gitea",
+			Config: map[string]string{
+				"content_type": "json",
+				"url":          "example.com/webhook",
+			},
+		})
+		assert.Equal(t, http.StatusUnprocessableEntity, ctx.Resp.WrittenStatus())
+	})
+
+	t.Run("Test Validation with invalid webhook type", func(t *testing.T) {
+		ctx, _ := contexttest.MockAPIContext(t, "user2/repo1/hooks")
+		contexttest.LoadRepo(t, ctx, 1)
+		contexttest.LoadGitRepo(t, ctx)
+		contexttest.LoadRepoCommit(t, ctx)
+		contexttest.LoadUser(t, ctx, 2)
+
+		checkCreateHookOption(ctx, &structs.CreateHookOption{
+			Type: "unknown",
+			Config: map[string]string{
+				"content_type": "json",
+				"url":          "example.com/webhook",
+			},
+		})
+		assert.Equal(t, http.StatusUnprocessableEntity, ctx.Resp.WrittenStatus())
+	})
+
+	t.Run("Test Validation with empty content type", func(t *testing.T) {
+		ctx, _ := contexttest.MockAPIContext(t, "user2/repo1/hooks")
+		contexttest.LoadRepo(t, ctx, 1)
+		contexttest.LoadGitRepo(t, ctx)
+		contexttest.LoadRepoCommit(t, ctx)
+		contexttest.LoadUser(t, ctx, 2)
+
+		checkCreateHookOption(ctx, &structs.CreateHookOption{
+			Type: "unknown",
+			Config: map[string]string{
+				"url": "https://example.com/webhook",
+			},
+		})
+		assert.Equal(t, http.StatusUnprocessableEntity, ctx.Resp.WrittenStatus())
+	})
+}
diff --git a/routers/api/v1/utils/main_test.go b/routers/api/v1/utils/main_test.go
new file mode 100644
index 0000000000..f243572436
--- /dev/null
+++ b/routers/api/v1/utils/main_test.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package utils
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/setting"
+	webhook_service "forgejo.org/services/webhook"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m, &unittest.TestOptions{
+		SetUp: func() error {
+			setting.LoadQueueSettings()
+			return webhook_service.Init()
+		},
+	})
+}
diff --git a/routers/common/db.go b/routers/common/db.go
index 0646071264..ec31ced1bf 100644
--- a/routers/common/db.go
+++ b/routers/common/db.go
@@ -5,7 +5,7 @@ package common
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"time"
 
 	"forgejo.org/models/db"
@@ -24,11 +24,11 @@ func InitDBEngine(ctx context.Context) (err error) {
 	for i := 0; i < setting.Database.DBConnectRetries; i++ {
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("Aborted due to shutdown:\nin retry ORM engine initialization")
+			return errors.New("Aborted due to shutdown:\nin retry ORM engine initialization")
 		default:
 		}
 		log.Info("ORM engine initialization attempt #%d/%d...", i+1, setting.Database.DBConnectRetries)
-		if err = db.InitEngineWithMigration(ctx, migrateWithSetting); err == nil {
+		if err = db.InitEngineWithMigration(ctx, func(eng db.Engine) error { return migrateWithSetting(eng.(*xorm.Engine)) }); err == nil {
 			break
 		} else if i == setting.Database.DBConnectRetries-1 {
 			return err
diff --git a/routers/common/errpage.go b/routers/common/errpage.go
index 907c278ab1..4dc5a58858 100644
--- a/routers/common/errpage.go
+++ b/routers/common/errpage.go
@@ -15,7 +15,6 @@ import (
 	"forgejo.org/modules/templates"
 	"forgejo.org/modules/web/middleware"
 	"forgejo.org/modules/web/routing"
-	"forgejo.org/services/context"
 )
 
 const tplStatus500 base.TplName = "status/500"
@@ -36,8 +35,8 @@ func RenderPanicErrorPage(w http.ResponseWriter, req *http.Request, err any) {
 	httpcache.SetCacheControlInHeader(w.Header(), 0, "no-transform")
 	w.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions)
 
-	tmplCtx := context.TemplateContext{}
-	tmplCtx["Locale"] = middleware.Locale(w, req)
+	tmplCtx := templates.NewContext(req.Context())
+	tmplCtx.Locale = middleware.Locale(w, req)
 	ctxData := middleware.GetContextData(req.Context())
 
 	// This recovery handler could be called without Gitea's web context, so we shouldn't touch that context too much.
diff --git a/routers/common/middleware.go b/routers/common/middleware.go
index d44f046a1e..7bc4890a43 100644
--- a/routers/common/middleware.go
+++ b/routers/common/middleware.go
@@ -46,7 +46,11 @@ func ProtocolMiddlewares() (handlers []any) {
 			defer finished()
 			trace.Log(ctx, "method", req.Method)
 			trace.Log(ctx, "url", req.RequestURI)
-			next.ServeHTTP(context.WrapResponseWriter(resp), req.WithContext(cache.WithCacheContext(ctx)))
+
+			respWriter := context.WrapResponseWriter(resp)
+			next.ServeHTTP(respWriter, req.WithContext(cache.WithCacheContext(ctx)))
+
+			trace.Logf(ctx, "status", "%d", respWriter.WrittenStatus())
 		})
 	})
 
diff --git a/routers/init.go b/routers/init.go
index 90a1cb1e89..9a304527fa 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -38,6 +38,7 @@ import (
 	"forgejo.org/services/auth/source/oauth2"
 	"forgejo.org/services/automerge"
 	"forgejo.org/services/cron"
+	federation_service "forgejo.org/services/federation"
 	feed_service "forgejo.org/services/feed"
 	indexer_service "forgejo.org/services/indexer"
 	"forgejo.org/services/mailer"
@@ -122,6 +123,7 @@ func InitWebInstalled(ctx context.Context) {
 	mailer.NewContext(ctx)
 	mustInit(cache.Init)
 	mustInit(feed_service.Init)
+	mustInit(federation_service.Init)
 	mustInit(uinotification.Init)
 	mustInitCtx(ctx, archiver.Init)
 
diff --git a/routers/install/install.go b/routers/install/install.go
index b9333a9e16..f64f395a7f 100644
--- a/routers/install/install.go
+++ b/routers/install/install.go
@@ -361,7 +361,8 @@ func SubmitInstall(ctx *context.Context) {
 	}
 
 	// Init the engine with migration
-	if err = db.InitEngineWithMigration(ctx, migrations.Migrate); err != nil {
+	// Wrap migrations.Migrate into a function of type func(db.Engine) error to fix diagnostics.
+	if err = db.InitEngineWithMigration(ctx, migrations.WrapperMigrate); err != nil {
 		db.UnsetDefaultEngine()
 		ctx.Data["Err_DbSetting"] = true
 		ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form)
@@ -407,11 +408,7 @@ func SubmitInstall(ctx *context.Context) {
 	if form.LFSRootPath != "" {
 		cfg.Section("server").Key("LFS_START_SERVER").SetValue("true")
 		cfg.Section("lfs").Key("PATH").SetValue(form.LFSRootPath)
-		var lfsJwtSecret string
-		if _, lfsJwtSecret, err = generate.NewJwtSecret(); err != nil {
-			ctx.RenderWithErr(ctx.Tr("install.lfs_jwt_secret_failed", err), tplInstall, &form)
-			return
-		}
+		_, lfsJwtSecret := generate.NewJwtSecret()
 		cfg.Section("server").Key("LFS_JWT_SECRET").SetValue(lfsJwtSecret)
 	} else {
 		cfg.Section("server").Key("LFS_START_SERVER").SetValue("false")
@@ -482,11 +479,7 @@ func SubmitInstall(ctx *context.Context) {
 	// FIXME: at the moment, no matter oauth2 is enabled or not, it must generate a "oauth2 JWT_SECRET"
 	// see the "loadOAuth2From" in "setting/oauth2.go"
 	if !cfg.Section("oauth2").HasKey("JWT_SECRET") && !cfg.Section("oauth2").HasKey("JWT_SECRET_URI") {
-		_, jwtSecretBase64, err := generate.NewJwtSecret()
-		if err != nil {
-			ctx.RenderWithErr(ctx.Tr("install.secret_key_failed", err), tplInstall, &form)
-			return
-		}
+		_, jwtSecretBase64 := generate.NewJwtSecret()
 		cfg.Section("oauth2").Key("JWT_SECRET").SetValue(jwtSecretBase64)
 	}
 
@@ -587,7 +580,7 @@ func SubmitInstall(ctx *context.Context) {
 
 	go func() {
 		// Sleep for a while to make sure the user's browser has loaded the post-install page and its assets (images, css, js)
-		// What if this duration is not long enough? That's impossible -- if the user can't load the simple page in time, how could they install or use Gitea in the future ....
+		// What if this duration is not long enough? That's impossible -- if the user can't load the simple page in time, how could they install or use Forgejo in the future ....
 		time.Sleep(3 * time.Second)
 
 		// Now get the http.Server from this request and shut it down
diff --git a/routers/install/routes_test.go b/routers/install/routes_test.go
index a504cf1baa..9b10f05b3b 100644
--- a/routers/install/routes_test.go
+++ b/routers/install/routes_test.go
@@ -19,18 +19,18 @@ func TestRoutes(t *testing.T) {
 	w := httptest.NewRecorder()
 	req := httptest.NewRequest("GET", "/", nil)
 	r.ServeHTTP(w, req)
-	assert.EqualValues(t, 200, w.Code)
+	assert.Equal(t, 200, w.Code)
 	assert.Contains(t, w.Body.String(), `class="page-content install"`)
 
 	w = httptest.NewRecorder()
 	req = httptest.NewRequest("GET", "/no-such", nil)
 	r.ServeHTTP(w, req)
-	assert.EqualValues(t, 404, w.Code)
+	assert.Equal(t, 404, w.Code)
 
 	w = httptest.NewRecorder()
-	req = httptest.NewRequest("GET", "/assets/img/gitea.svg", nil)
+	req = httptest.NewRequest("GET", "/assets/img/forgejo.svg", nil)
 	r.ServeHTTP(w, req)
-	assert.EqualValues(t, 200, w.Code)
+	assert.Equal(t, 200, w.Code)
 }
 
 func TestMain(m *testing.M) {
diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go
index c7748b01c8..a856a7a00a 100644
--- a/routers/private/hook_post_receive.go
+++ b/routers/private/hook_post_receive.go
@@ -205,7 +205,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) {
 
 		// post update for agit pull request
 		// FIXME: use pr.Flow to test whether it's an Agit PR or a GH PR
-		if git.SupportProcReceive && refFullName.IsPull() {
+		if refFullName.IsPull() {
 			if repo == nil {
 				repo = loadRepository(ctx, ownerName, repoName)
 				if ctx.Written() {
diff --git a/routers/private/hook_post_receive_test.go b/routers/private/hook_post_receive_test.go
index bbd0c45769..dde4ec08f4 100644
--- a/routers/private/hook_post_receive_test.go
+++ b/routers/private/hook_post_receive_test.go
@@ -44,7 +44,7 @@ func TestHandlePullRequestMerging(t *testing.T) {
 	pr, err = issues_model.GetPullRequestByID(db.DefaultContext, pr.ID)
 	require.NoError(t, err)
 	assert.True(t, pr.HasMerged)
-	assert.EqualValues(t, "01234567", pr.MergedCommitID)
+	assert.Equal(t, "01234567", pr.MergedCommitID)
 
 	unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{ID: autoMerge.ID})
 }
diff --git a/routers/private/hook_pre_receive.go b/routers/private/hook_pre_receive.go
index 191273209e..45992e8522 100644
--- a/routers/private/hook_pre_receive.go
+++ b/routers/private/hook_pre_receive.go
@@ -155,7 +155,7 @@ func (ctx *preReceiveContext) checkQuota() error {
 		return nil
 	}
 
-	ok, err := quota_model.EvaluateForUser(ctx, ctx.PrivateContext.Repo.Repository.OwnerID, quota_model.LimitSubjectSizeReposAll)
+	ok, err := quota_model.EvaluateForUser(ctx, ctx.Repo.Repository.OwnerID, quota_model.LimitSubjectSizeReposAll)
 	if err != nil {
 		log.Error("quota_model.EvaluateForUser: %v", err)
 		ctx.JSON(http.StatusInternalServerError, private.Response{
@@ -205,7 +205,7 @@ func HookPreReceive(ctx *gitea_context.PrivateContext) {
 			preReceiveBranch(ourCtx, oldCommitID, newCommitID, refFullName)
 		case refFullName.IsTag():
 			preReceiveTag(ourCtx, oldCommitID, newCommitID, refFullName)
-		case git.SupportProcReceive && refFullName.IsFor():
+		case refFullName.IsFor():
 			preReceiveFor(ourCtx, oldCommitID, newCommitID, refFullName)
 		default:
 			if ourCtx.isOverQuota {
@@ -531,10 +531,7 @@ func preReceiveFor(ctx *preReceiveContext, oldCommitID, newCommitID string, refF
 
 	baseBranchName := refFullName.ForBranchName()
 
-	baseBranchExist := false
-	if ctx.Repo.GitRepo.IsBranchExist(baseBranchName) {
-		baseBranchExist = true
-	}
+	baseBranchExist := ctx.Repo.GitRepo.IsBranchExist(baseBranchName)
 
 	if !baseBranchExist {
 		for p, v := range baseBranchName {
diff --git a/routers/private/hook_proc_receive.go b/routers/private/hook_proc_receive.go
index cd45794261..9f6e23f158 100644
--- a/routers/private/hook_proc_receive.go
+++ b/routers/private/hook_proc_receive.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 
 	repo_model "forgejo.org/models/repo"
-	"forgejo.org/modules/git"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/web"
@@ -18,10 +17,6 @@ import (
 // HookProcReceive proc-receive hook - only handles agit Proc-Receive requests at present
 func HookProcReceive(ctx *gitea_context.PrivateContext) {
 	opts := web.GetForm(ctx).(*private.HookOptions)
-	if !git.SupportProcReceive {
-		ctx.Status(http.StatusNotFound)
-		return
-	}
 
 	results, err := agit.ProcReceive(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, opts)
 	if err != nil {
diff --git a/routers/private/manager.go b/routers/private/manager.go
index 7ab198f71b..90b48256df 100644
--- a/routers/private/manager.go
+++ b/routers/private/manager.go
@@ -145,6 +145,7 @@ func AddLogger(ctx *context.PrivateContext) {
 
 	writerMode.Prefix, _ = opts.Config["prefix"].(string)
 	writerMode.Expression, _ = opts.Config["expression"].(string)
+	writerMode.Exclusion, _ = opts.Config["exclusion"].(string)
 
 	switch writerType {
 	case "console":
diff --git a/routers/private/manager_process.go b/routers/private/manager_process.go
index 87447da2be..e60ed04879 100644
--- a/routers/private/manager_process.go
+++ b/routers/private/manager_process.go
@@ -122,7 +122,7 @@ func writeProcess(out io.Writer, process *process_module.Process, indent string,
 			if stack.Count > 1 {
 				_, _ = fmt.Fprintf(sb, "* %d", stack.Count)
 			}
-			_, _ = fmt.Fprintf(sb, "\n")
+			_, _ = fmt.Fprintln(sb)
 			indent += "| "
 			if len(stack.Labels) > 0 {
 				_, _ = fmt.Fprintf(sb, "%sLabels:      %q:%q", indent, stack.Labels[0].Name, stack.Labels[0].Value)
@@ -132,7 +132,7 @@ func writeProcess(out io.Writer, process *process_module.Process, indent string,
 						_, _ = fmt.Fprintf(sb, ", %q:%q", label.Name, label.Value)
 					}
 				}
-				_, _ = fmt.Fprintf(sb, "\n")
+				_, _ = fmt.Fprintln(sb)
 			}
 			_, _ = fmt.Fprintf(sb, "%sStack:\n", indent)
 			indent += "  "
diff --git a/routers/private/serv.go b/routers/private/serv.go
index 4c5b7bbccb..7f08d4ca34 100644
--- a/routers/private/serv.go
+++ b/routers/private/serv.go
@@ -9,12 +9,12 @@ import (
 	"strings"
 
 	asymkey_model "forgejo.org/models/asymkey"
+	"forgejo.org/models/auth"
 	"forgejo.org/models/perm"
 	access_model "forgejo.org/models/perm/access"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unit"
 	user_model "forgejo.org/models/user"
-	"forgejo.org/modules/git"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/private"
 	"forgejo.org/modules/setting"
@@ -23,6 +23,27 @@ import (
 	wiki_service "forgejo.org/services/wiki"
 )
 
+func checkTwoFactor(ctx *context.PrivateContext, user *user_model.User) {
+	if !user.MustHaveTwoFactor() {
+		return
+	}
+
+	hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, user.ID)
+	if err != nil {
+		log.Error("Error getting 2fa: %s", err)
+		ctx.JSON(http.StatusInternalServerError, private.Response{
+			Err: fmt.Sprintf("Error getting 2fa: %s", err),
+		})
+		return
+	}
+	if !hasTwoFactor {
+		ctx.JSON(http.StatusForbidden, private.Response{
+			UserMsg: ctx.Locale.TrString("error.must_enable_2fa", fmt.Sprintf("%suser/settings/security", setting.AppURL)),
+		})
+		return
+	}
+}
+
 // ServNoCommand returns information about the provided keyid
 func ServNoCommand(ctx *context.PrivateContext) {
 	keyID := ctx.ParamsInt64(":keyid")
@@ -70,6 +91,12 @@ func ServNoCommand(ctx *context.PrivateContext) {
 			})
 			return
 		}
+
+		checkTwoFactor(ctx, user)
+		if ctx.Written() {
+			return
+		}
+
 		results.Owner = user
 	}
 	ctx.JSON(http.StatusOK, &results)
@@ -267,6 +294,11 @@ func ServCommand(ctx *context.PrivateContext) {
 			return
 		}
 
+		checkTwoFactor(ctx, user)
+		if ctx.Written() {
+			return
+		}
+
 		results.UserName = user.Name
 		if !user.KeepEmailPrivate {
 			results.UserEmail = user.Email
@@ -303,7 +335,7 @@ func ServCommand(ctx *context.PrivateContext) {
 			// the permission check to read. The pre-receive hook will do another
 			// permission check which ensure for non AGit flow references the write
 			// permission is checked.
-			if git.SupportProcReceive && unitType == unit.TypeCode && ctx.FormString("verb") == "git-receive-pack" {
+			if unitType == unit.TypeCode && ctx.FormString("verb") == "git-receive-pack" {
 				mode = perm.AccessModeRead
 			}
 
diff --git a/routers/web/admin/admin_test.go b/routers/web/admin/admin_test.go
index d0c3c2b56f..0bad4402aa 100644
--- a/routers/web/admin/admin_test.go
+++ b/routers/web/admin/admin_test.go
@@ -69,7 +69,7 @@ func TestShadowPassword(t *testing.T) {
 	}
 
 	for _, k := range kases {
-		assert.EqualValues(t, k.Result, shadowPassword(k.Provider, k.CfgItem))
+		assert.Equal(t, k.Result, shadowPassword(k.Provider, k.CfgItem))
 	}
 }
 
diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go
index 2c6dc76305..c352b6ad1a 100644
--- a/routers/web/admin/auths.go
+++ b/routers/web/admin/auths.go
@@ -190,6 +190,7 @@ func parseOAuth2Config(form forms.AuthenticationForm) *oauth2.Source {
 		AdminGroup:                    form.Oauth2AdminGroup,
 		GroupTeamMap:                  form.Oauth2GroupTeamMap,
 		GroupTeamMapRemoval:           form.Oauth2GroupTeamMapRemoval,
+		AllowUsernameChange:           form.AllowUsernameChange,
 	}
 }
 
diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go
index f99a193960..e1c3a5f9ee 100644
--- a/routers/web/admin/config.go
+++ b/routers/web/admin/config.go
@@ -1,5 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package admin
@@ -127,6 +128,7 @@ func Config(ctx *context.Context) {
 	ctx.Data["AppBuiltWith"] = setting.AppBuiltWith
 	ctx.Data["Domain"] = setting.Domain
 	ctx.Data["OfflineMode"] = setting.OfflineMode
+	ctx.Data["GlobalTwoFactorRequirement"] = setting.GlobalTwoFactorRequirement
 	ctx.Data["RunUser"] = setting.RunUser
 	ctx.Data["RunMode"] = util.ToTitleCase(setting.RunMode)
 	ctx.Data["GitVersion"] = git.VersionInfo()
@@ -145,6 +147,7 @@ func Config(ctx *context.Context) {
 	ctx.Data["Service"] = setting.Service
 	ctx.Data["DbCfg"] = setting.Database
 	ctx.Data["Webhook"] = setting.Webhook
+	ctx.Data["Moderation"] = setting.Moderation
 
 	ctx.Data["MailerEnabled"] = false
 	if setting.MailService != nil {
diff --git a/routers/web/admin/reports.go b/routers/web/admin/reports.go
new file mode 100644
index 0000000000..ac43d1296f
--- /dev/null
+++ b/routers/web/admin/reports.go
@@ -0,0 +1,157 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package admin
+
+import (
+	"fmt"
+	"net/http"
+
+	"forgejo.org/models/issues"
+	"forgejo.org/models/moderation"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/base"
+	"forgejo.org/services/context"
+	moderation_service "forgejo.org/services/moderation"
+)
+
+const (
+	tplModerationReports       base.TplName = "admin/moderation/reports"
+	tplModerationReportDetails base.TplName = "admin/moderation/report_details"
+)
+
+// AbuseReports renders the reports overview page from admin moderation section.
+func AbuseReports(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("admin.moderation.reports")
+	ctx.Data["PageIsAdminModerationReports"] = true
+
+	reports, err := moderation.GetOpenReports(ctx)
+	if err != nil {
+		ctx.ServerError("Failed to load abuse reports", err)
+		return
+	}
+
+	ctx.Data["Reports"] = reports
+	ctx.Data["AbuseCategories"] = moderation.AbuseCategoriesTranslationKeys
+	ctx.Data["GhostUserName"] = user.GhostUserName
+
+	ctx.HTML(http.StatusOK, tplModerationReports)
+}
+
+// AbuseReportDetails renders a report details page opened from the reports overview from admin moderation section.
+func AbuseReportDetails(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("admin.moderation.reports")
+	ctx.Data["PageIsAdminModerationReports"] = true
+
+	ctx.Data["Type"] = ctx.ParamsInt64(":type")
+	ctx.Data["ID"] = ctx.ParamsInt64(":id")
+
+	contentType := moderation.ReportedContentType(ctx.ParamsInt64(":type"))
+
+	if !contentType.IsValid() {
+		ctx.Flash.Error("Invalid content type")
+		return
+	}
+
+	reports, err := moderation.GetOpenReportsByTypeAndContentID(ctx, contentType, ctx.ParamsInt64(":id"))
+	if err != nil {
+		ctx.ServerError("Failed to load reports", err)
+		return
+	}
+	if len(reports) == 0 {
+		// something is wrong
+		ctx.HTML(http.StatusOK, tplModerationReportDetails)
+		return
+	}
+
+	ctx.Data["Reports"] = reports
+	ctx.Data["AbuseCategories"] = moderation.AbuseCategoriesTranslationKeys
+	ctx.Data["GhostUserName"] = user.GhostUserName
+
+	ctx.Data["GetShadowCopyMap"] = moderation_service.GetShadowCopyMap
+
+	if err = setReportedContentDetails(ctx, reports[0]); err != nil {
+		if user.IsErrUserNotExist(err) || issues.IsErrCommentNotExist(err) || issues.IsErrIssueNotExist(err) || repo_model.IsErrRepoNotExist(err) {
+			ctx.Data["ContentReference"] = ctx.Tr("admin.moderation.deleted_content_ref", reports[0].ContentType, reports[0].ContentID)
+		} else {
+			ctx.ServerError("Failed to load reported content details", err)
+			return
+		}
+	}
+
+	ctx.HTML(http.StatusOK, tplModerationReportDetails)
+}
+
+// setReportedContentDetails adds some values into context data for the given report
+// (icon name, a reference, the URL and in case of issues and comments also the poster name).
+func setReportedContentDetails(ctx *context.Context, report *moderation.AbuseReportDetailed) error {
+	contentReference := ""
+	var contentURL string
+	var poster string
+	contentType := report.ContentType
+	contentID := report.ContentID
+
+	ctx.Data["ContentTypeIconName"] = report.ContentTypeIconName()
+
+	switch contentType {
+	case moderation.ReportedContentTypeUser:
+		reportedUser, err := user.GetUserByID(ctx, contentID)
+		if err != nil {
+			return err
+		}
+
+		contentReference = reportedUser.Name
+		contentURL = reportedUser.HomeLink()
+	case moderation.ReportedContentTypeRepository:
+		repo, err := repo_model.GetRepositoryByID(ctx, contentID)
+		if err != nil {
+			return err
+		}
+
+		contentReference = repo.FullName()
+		contentURL = repo.Link()
+	case moderation.ReportedContentTypeIssue:
+		issue, err := issues.GetIssueByID(ctx, contentID)
+		if err != nil {
+			return err
+		}
+		if err = issue.LoadRepo(ctx); err != nil {
+			return err
+		}
+		if err = issue.LoadPoster(ctx); err != nil {
+			return err
+		}
+		if issue.Poster != nil {
+			poster = issue.Poster.Name
+		}
+
+		contentReference = fmt.Sprintf("%s#%d", issue.Repo.FullName(), issue.Index)
+		contentURL = issue.Link()
+	case moderation.ReportedContentTypeComment:
+		comment, err := issues.GetCommentByID(ctx, contentID)
+		if err != nil {
+			return err
+		}
+		if err = comment.LoadIssue(ctx); err != nil {
+			return err
+		}
+		if err = comment.Issue.LoadRepo(ctx); err != nil {
+			return err
+		}
+		if err = comment.LoadPoster(ctx); err != nil {
+			return err
+		}
+		if comment.Poster != nil {
+			poster = comment.Poster.Name
+		}
+
+		contentURL = comment.Link(ctx)
+		contentReference = contentURL
+	}
+
+	ctx.Data["ContentReference"] = contentReference
+	ctx.Data["ContentURL"] = contentURL
+	ctx.Data["Poster"] = poster
+	return nil
+}
diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index f6d214d24c..964326291e 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -22,7 +22,6 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
-	"forgejo.org/modules/util"
 	"forgejo.org/modules/validation"
 	"forgejo.org/modules/web"
 	"forgejo.org/routers/web/explore"
@@ -77,11 +76,11 @@ func Users(ctx *context.Context) {
 			PageSize: setting.UI.Admin.UserPagingNum,
 		},
 		SearchByEmail:      true,
-		IsActive:           util.OptionalBoolParse(statusFilterMap["is_active"]),
-		IsAdmin:            util.OptionalBoolParse(statusFilterMap["is_admin"]),
-		IsRestricted:       util.OptionalBoolParse(statusFilterMap["is_restricted"]),
-		IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]),
-		IsProhibitLogin:    util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
+		IsActive:           optional.ParseBool(statusFilterMap["is_active"]),
+		IsAdmin:            optional.ParseBool(statusFilterMap["is_admin"]),
+		IsRestricted:       optional.ParseBool(statusFilterMap["is_restricted"]),
+		IsTwoFactorEnabled: optional.ParseBool(statusFilterMap["is_2fa_enabled"]),
+		IsProhibitLogin:    optional.ParseBool(statusFilterMap["is_prohibit_login"]),
 		IncludeReserved:    true, // administrator needs to list all accounts include reserved, bot, remote ones
 		Load2FAStatus:      true,
 		ExtraParamStrings:  extraParamStrings,
@@ -187,7 +186,7 @@ func NewUserPost(ctx *context.Context) {
 		case user_model.IsErrEmailAlreadyUsed(err):
 			ctx.Data["Err_Email"] = true
 			ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplUserNew, &form)
-		case validation.IsErrEmailInvalid(err), validation.IsErrEmailCharIsNotSupported(err):
+		case validation.IsErrEmailInvalid(err):
 			ctx.Data["Err_Email"] = true
 			ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserNew, &form)
 		case db.IsErrNameReserved(err):
@@ -196,9 +195,6 @@ func NewUserPost(ctx *context.Context) {
 		case db.IsErrNamePatternNotAllowed(err):
 			ctx.Data["Err_UserName"] = true
 			ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(db.ErrNamePatternNotAllowed).Pattern), tplUserNew, &form)
-		case db.IsErrNameCharsNotAllowed(err):
-			ctx.Data["Err_UserName"] = true
-			ctx.RenderWithErr(ctx.Tr("user.form.name_chars_not_allowed", err.(db.ErrNameCharsNotAllowed).Name), tplUserNew, &form)
 		default:
 			ctx.ServerError("CreateUser", err)
 		}
@@ -249,17 +245,12 @@ func prepareUserInfo(ctx *context.Context) *user_model.User {
 	}
 	ctx.Data["Sources"] = sources
 
-	hasTOTP, err := auth.HasTOTPByUID(ctx, u.ID)
+	hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
 	if err != nil {
-		ctx.ServerError("auth.HasTwoFactorByUID", err)
+		ctx.ServerError("HasTwoFactorByUID", err)
 		return nil
 	}
-	hasWebAuthn, err := auth.HasWebAuthnRegistrationsByUID(ctx, u.ID)
-	if err != nil {
-		ctx.ServerError("auth.HasWebAuthnRegistrationsByUID", err)
-		return nil
-	}
-	ctx.Data["TwoFactorEnabled"] = hasTOTP || hasWebAuthn
+	ctx.Data["TwoFactorEnabled"] = hasTwoFactor
 
 	return u
 }
@@ -322,6 +313,9 @@ func editUserCommon(ctx *context.Context) {
 	ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations
 	ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice()
 	ctx.Data["DisableGravatar"] = setting.Config().Picture.DisableGravatar.Value(ctx)
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 }
 
 // EditUser show editing user page
@@ -416,7 +410,7 @@ func EditUserPost(ctx *context.Context) {
 	if form.Email != "" {
 		if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, u, form.Email); err != nil {
 			switch {
-			case validation.IsErrEmailCharIsNotSupported(err), validation.IsErrEmailInvalid(err):
+			case validation.IsErrEmailInvalid(err):
 				ctx.Data["Err_Email"] = true
 				ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplUserEdit, &form)
 			case user_model.IsErrEmailAlreadyUsed(err):
diff --git a/routers/web/auth/2fa.go b/routers/web/auth/2fa.go
index 7acf9a87d3..ff769ffd5d 100644
--- a/routers/web/auth/2fa.go
+++ b/routers/web/auth/2fa.go
@@ -133,11 +133,7 @@ func TwoFactorScratchPost(ctx *context.Context) {
 	// Validate the passcode with the stored TOTP secret.
 	if twofa.VerifyScratchToken(form.Token) {
 		// Invalidate the scratch token.
-		_, err = twofa.GenerateScratchToken()
-		if err != nil {
-			ctx.ServerError("UserSignIn", err)
-			return
-		}
+		twofa.GenerateScratchToken()
 		if err = auth.UpdateTwoFactor(ctx, twofa); err != nil {
 			ctx.ServerError("UserSignIn", err)
 			return
diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index 64006eeae8..dbb6665398 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -512,7 +512,8 @@ func createAndHandleCreatedUser(ctx *context.Context, tpl base.TplName, form any
 func createUserInContext(ctx *context.Context, tpl base.TplName, form any, u *user_model.User, overwrites *user_model.CreateUserOverwriteOptions, gothUser *goth.User, allowLink bool) (ok bool) {
 	if err := user_model.CreateUser(ctx, u, overwrites); err != nil {
 		if allowLink && (user_model.IsErrUserAlreadyExist(err) || user_model.IsErrEmailAlreadyUsed(err)) {
-			if setting.OAuth2Client.AccountLinking == setting.OAuth2AccountLinkingAuto {
+			switch setting.OAuth2Client.AccountLinking {
+			case setting.OAuth2AccountLinkingAuto:
 				var user *user_model.User
 				user = &user_model.User{Name: u.Name}
 				hasUser, err := user_model.GetUser(ctx, user)
@@ -528,7 +529,7 @@ func createUserInContext(ctx *context.Context, tpl base.TplName, form any, u *us
 				// TODO: probably we should respect 'remember' user's choice...
 				linkAccount(ctx, user, *gothUser, true)
 				return false // user is already created here, all redirects are handled
-			} else if setting.OAuth2Client.AccountLinking == setting.OAuth2AccountLinkingLogin {
+			case setting.OAuth2AccountLinkingLogin:
 				showLinkingLogin(ctx, *gothUser)
 				return false // user will be created only after linking login
 			}
@@ -551,9 +552,6 @@ func createUserInContext(ctx *context.Context, tpl base.TplName, form any, u *us
 		case user_model.IsErrCooldownPeriod(err):
 			ctx.Data["Err_UserName"] = true
 			ctx.RenderWithErr(ctx.Locale.Tr("form.username_claiming_cooldown", err.(user_model.ErrCooldownPeriod).ExpireTime.Format(time.RFC1123Z)), tpl, form)
-		case validation.IsErrEmailCharIsNotSupported(err):
-			ctx.Data["Err_Email"] = true
-			ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form)
 		case validation.IsErrEmailInvalid(err):
 			ctx.Data["Err_Email"] = true
 			ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tpl, form)
@@ -766,7 +764,7 @@ func ActivatePost(ctx *context.Context) {
 			ctx.HTML(http.StatusOK, TplActivate)
 			return
 		}
-		if !user.ValidatePassword(password) {
+		if !user.ValidatePassword(ctx, password) {
 			ctx.Data["IsPasswordInvalid"] = true
 			ctx.HTML(http.StatusOK, TplActivate)
 			return
@@ -783,11 +781,7 @@ func ActivatePost(ctx *context.Context) {
 
 func handleAccountActivation(ctx *context.Context, user *user_model.User) {
 	user.IsActive = true
-	var err error
-	if user.Rands, err = user_model.GetUserSalt(); err != nil {
-		ctx.ServerError("UpdateUser", err)
-		return
-	}
+	user.Rands = user_model.GetUserSalt()
 	if err := user_model.UpdateUserCols(ctx, user, "is_active", "rands"); err != nil {
 		if user_model.IsErrUserNotExist(err) {
 			ctx.NotFound("UpdateUserCols", err)
diff --git a/routers/web/auth/linkaccount.go b/routers/web/auth/linkaccount.go
index fbf03ca475..2bba614d8c 100644
--- a/routers/web/auth/linkaccount.go
+++ b/routers/web/auth/linkaccount.go
@@ -157,7 +157,7 @@ func linkAccount(ctx *context.Context, u *user_model.User, gothUser goth.User, r
 	// We deliberately ignore the skip local 2fa setting here because we are linking to a previous user here
 	hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
 	if err != nil {
-		ctx.ServerError("UserLinkAccount", err)
+		ctx.ServerError("HasTwoFactorByUID", err)
 		return
 	}
 
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index aa599bd252..1119e1947b 100644
--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@@ -225,7 +225,7 @@ func newAccessTokenResponse(ctx go_context.Context, grant *auth.OAuth2Grant, ser
 		idToken := &oauth2.OIDCToken{
 			RegisteredClaims: jwt.RegisteredClaims{
 				ExpiresAt: jwt.NewNumericDate(expirationDate.AsTime()),
-				Issuer:    setting.AppURL,
+				Issuer:    strings.TrimSuffix(setting.AppURL, "/"),
 				Audience:  []string{app.ClientID},
 				Subject:   fmt.Sprint(grant.UserID),
 			},
@@ -409,7 +409,7 @@ func IntrospectOAuth(ctx *context.Context) {
 			if err == nil && app != nil {
 				response.Active = true
 				response.Scope = grant.Scope
-				response.Issuer = setting.AppURL
+				response.Issuer = strings.TrimSuffix(setting.AppURL, "/")
 				response.Audience = []string{app.ClientID}
 				response.Subject = fmt.Sprint(grant.UserID)
 			}
@@ -489,7 +489,7 @@ func AuthorizeOAuth(ctx *context.Context) {
 			}, form.RedirectURI)
 			return
 		}
-		if err := ctx.Session.Set("CodeChallengeMethod", form.CodeChallenge); err != nil {
+		if err := ctx.Session.Set("CodeChallenge", form.CodeChallenge); err != nil {
 			handleAuthorizeError(ctx, AuthorizeError{
 				ErrorCode:        ErrorCodeServerError,
 				ErrorDescription: "cannot set code challenge",
@@ -668,7 +668,13 @@ func GrantApplicationOAuth(ctx *context.Context) {
 
 // OIDCWellKnown generates JSON so OIDC clients know Gitea's capabilities
 func OIDCWellKnown(ctx *context.Context) {
+	if !setting.OAuth2.Enabled {
+		ctx.Status(http.StatusNotFound)
+		return
+	}
+
 	ctx.Data["SigningKey"] = oauth2.DefaultSigningKey
+	ctx.Data["Issuer"] = strings.TrimSuffix(setting.AppURL, "/")
 	ctx.JSONTemplate("user/auth/oidc_wellknown")
 }
 
diff --git a/routers/web/auth/oauth_test.go b/routers/web/auth/oauth_test.go
index 6275d63382..9782711dd0 100644
--- a/routers/web/auth/oauth_test.go
+++ b/routers/web/auth/oauth_test.go
@@ -51,6 +51,7 @@ func TestNewAccessTokenResponse_OIDCToken(t *testing.T) {
 
 	// Scopes: openid
 	oidcToken := createAndParseToken(t, grants[0])
+	assert.Equal(t, "https://try.gitea.io", oidcToken.RegisteredClaims.Issuer)
 	assert.Empty(t, oidcToken.Name)
 	assert.Empty(t, oidcToken.PreferredUsername)
 	assert.Empty(t, oidcToken.Profile)
@@ -67,11 +68,12 @@ func TestNewAccessTokenResponse_OIDCToken(t *testing.T) {
 
 	// Scopes: openid profile email
 	oidcToken = createAndParseToken(t, grants[0])
+	assert.Equal(t, "https://try.gitea.io", oidcToken.RegisteredClaims.Issuer)
 	assert.Equal(t, "User Five", oidcToken.Name)
 	assert.Equal(t, "user5", oidcToken.PreferredUsername)
 	assert.Equal(t, "https://try.gitea.io/user5", oidcToken.Profile)
 	assert.Equal(t, "https://try.gitea.io/assets/img/avatar_default.png", oidcToken.Picture)
-	assert.Equal(t, "", oidcToken.Website)
+	assert.Empty(t, oidcToken.Website)
 	assert.Equal(t, timeutil.TimeStamp(0), oidcToken.UpdatedAt)
 	assert.Equal(t, "user5@example.com", oidcToken.Email)
 	assert.True(t, oidcToken.EmailVerified)
diff --git a/routers/web/auth/openid.go b/routers/web/auth/openid.go
index b12dea84ea..fcb2155953 100644
--- a/routers/web/auth/openid.go
+++ b/routers/web/auth/openid.go
@@ -4,6 +4,7 @@
 package auth
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -55,13 +56,13 @@ func allowedOpenIDURI(uri string) (err error) {
 			}
 		}
 		// must match one of this or be refused
-		return fmt.Errorf("URI not allowed by whitelist")
+		return errors.New("URI not allowed by whitelist")
 	}
 
 	// A blacklist match expliclty forbids
 	for _, pat := range setting.Service.OpenIDBlacklist {
 		if pat.MatchString(uri) {
-			return fmt.Errorf("URI forbidden by blacklist")
+			return errors.New("URI forbidden by blacklist")
 		}
 	}
 
diff --git a/routers/web/auth/password.go b/routers/web/auth/password.go
index 82c2d4e9d3..c645bbdede 100644
--- a/routers/web/auth/password.go
+++ b/routers/web/auth/password.go
@@ -242,12 +242,8 @@ func ResetPasswdPost(ctx *context.Context) {
 
 	if regenerateScratchToken {
 		// Invalidate the scratch token.
-		_, err := twofa.GenerateScratchToken()
-		if err != nil {
-			ctx.ServerError("UserSignIn", err)
-			return
-		}
-		if err = auth.UpdateTwoFactor(ctx, twofa); err != nil {
+		twofa.GenerateScratchToken()
+		if err := auth.UpdateTwoFactor(ctx, twofa); err != nil {
 			ctx.ServerError("UserSignIn", err)
 			return
 		}
@@ -268,7 +264,7 @@ func ResetPasswdPost(ctx *context.Context) {
 func MustChangePassword(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("auth.must_change_password")
 	ctx.Data["ChangePasscodeLink"] = setting.AppSubURL + "/user/settings/change_password"
-	ctx.Data["MustChangePassword"] = true
+	ctx.Data["HideNavbarLinks"] = true
 	ctx.HTML(http.StatusOK, tplMustChangePassword)
 }
 
diff --git a/routers/web/devtest/devtest.go b/routers/web/devtest/devtest.go
index 37496ca117..9b5804b976 100644
--- a/routers/web/devtest/devtest.go
+++ b/routers/web/devtest/devtest.go
@@ -1,14 +1,18 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package devtest
 
 import (
+	"errors"
 	"net/http"
 	"path"
 	"strings"
 	"time"
 
+	"forgejo.org/models/asymkey"
+	"forgejo.org/models/user"
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/templates"
 	"forgejo.org/services/context"
@@ -42,6 +46,17 @@ func FetchActionTest(ctx *context.Context) {
 	ctx.JSONRedirect("")
 }
 
+func ErrorPage(ctx *context.Context) {
+	if ctx.Params("errcode") == "404" {
+		ctx.NotFound("Example error", errors.New("Example error"))
+		return
+	} else if ctx.Params("errcode") == "413" {
+		ctx.HTML(http.StatusRequestEntityTooLarge, base.TplName("status/413"))
+		return
+	}
+	ctx.ServerError("Example error", errors.New("Example error"))
+}
+
 func Tmpl(ctx *context.Context) {
 	now := time.Now()
 	ctx.Data["TimeNow"] = now
@@ -52,6 +67,19 @@ func Tmpl(ctx *context.Context) {
 	ctx.Data["TimePast1y"] = now.Add(-1 * 366 * 86400 * time.Second)
 	ctx.Data["TimeFuture1y"] = now.Add(1 * 366 * 86400 * time.Second)
 
+	userNonZero := &user.User{ID: 1}
+	ctx.Data["TrustedVerif"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userNonZero, TrustStatus: "trusted"}
+	ctx.Data["UntrustedVerif"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userNonZero, TrustStatus: "untrusted"}
+	ctx.Data["UnmatchedVerif"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userNonZero, TrustStatus: ""}
+	ctx.Data["WarnVerif"] = &asymkey.ObjectVerification{Verified: false, Warning: true, Reason: asymkey.NotSigned, SigningUser: userNonZero}
+	ctx.Data["UnknownVerif"] = &asymkey.ObjectVerification{Verified: false, Warning: false, Reason: asymkey.NotSigned, SigningUser: userNonZero}
+	userUnknown := &user.User{ID: 0}
+	ctx.Data["TrustedVerifUnk"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userUnknown, TrustStatus: "trusted"}
+	ctx.Data["UntrustedVerifUnk"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userUnknown, TrustStatus: "untrusted"}
+	ctx.Data["UnmatchedVerifUnk"] = &asymkey.ObjectVerification{Verified: true, Reason: asymkey.NotSigned, SigningUser: userUnknown, TrustStatus: ""}
+	ctx.Data["WarnVerifUnk"] = &asymkey.ObjectVerification{Verified: false, Warning: true, Reason: asymkey.NotSigned, SigningUser: userUnknown}
+	ctx.Data["UnknownVerifUnk"] = &asymkey.ObjectVerification{Verified: false, Warning: false, Reason: asymkey.NotSigned, SigningUser: userUnknown}
+
 	if ctx.Req.Method == "POST" {
 		_ = ctx.Req.ParseForm()
 		ctx.Flash.Info("form: "+ctx.Req.Method+" "+ctx.Req.RequestURI+"<br>"+
diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
index e349bb1e92..3d4dbcd104 100644
--- a/routers/web/explore/user.go
+++ b/routers/web/explore/user.go
@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	// tplExploreUsers explore users page template
+	// `tplExploreUsers` explore users page template.
 	tplExploreUsers base.TplName = "explore/users"
 )
 
@@ -30,9 +30,9 @@ func isKeywordValid(keyword string) bool {
 	return !bytes.Contains([]byte(keyword), nullByte)
 }
 
-// RenderUserSearch render user search page
+// `RenderUserSearch` render user search page.
 func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions, tplName base.TplName) {
-	// Sitemap index for sitemap paths
+	// Sitemap index for sitemap paths.
 	opts.Page = int(ctx.ParamsInt64("idx"))
 	isSitemap := ctx.Params("idx") != ""
 	if opts.Page <= 1 {
@@ -47,42 +47,24 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 	}
 
 	var (
-		users   []*user_model.User
-		count   int64
-		err     error
-		orderBy db.SearchOrderBy
+		users []*user_model.User
+		count int64
+		err   error
 	)
 
-	// we can not set orderBy to `models.SearchOrderByXxx`, because there may be a JOIN in the statement, different tables may have the same name columns
-
 	sortOrder := ctx.FormString("sort")
 	if sortOrder == "" {
 		sortOrder = setting.UI.ExploreDefaultSort
 	}
 	ctx.Data["SortType"] = sortOrder
 
-	switch sortOrder {
-	case "newest":
-		orderBy = "`user`.id DESC"
-	case "oldest":
-		orderBy = "`user`.id ASC"
-	case "leastupdate":
-		orderBy = "`user`.updated_unix ASC"
-	case "reversealphabetically":
-		orderBy = "`user`.name DESC"
-	case "lastlogin":
-		orderBy = "`user`.last_login_unix ASC"
-	case "reverselastlogin":
-		orderBy = "`user`.last_login_unix DESC"
-	case "alphabetically":
-		orderBy = "`user`.name ASC"
-	case "recentupdate":
-		fallthrough
-	default:
-		// in case the sortType is not valid, we set it to recentupdate
+	orderBy := MapSortOrder(sortOrder)
+
+	if orderBy == "" {
+		// In case the `sortType` is not valid, we set it to `recentupdate`.
 		sortOrder = "recentupdate"
 		ctx.Data["SortType"] = "recentupdate"
-		orderBy = "`user`.updated_unix DESC"
+		orderBy = MapSortOrder(sortOrder)
 	}
 
 	if opts.SupportedSortOrders != nil && !opts.SupportedSortOrders.Contains(sortOrder) {
@@ -130,7 +112,7 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 	ctx.HTML(http.StatusOK, tplName)
 }
 
-// Users render explore users page
+// Users render explore users page.
 func Users(ctx *context.Context) {
 	if setting.Service.Explore.DisableUsersPage {
 		ctx.Redirect(setting.AppSubURL + "/explore")
@@ -169,3 +151,37 @@ func Users(ctx *context.Context) {
 		SupportedSortOrders: supportedSortOrders,
 	}, tplExploreUsers)
 }
+
+// Maps a sort query to a database search order.
+//
+// We cannot use `models.SearchOrderByXxx`, because there may be a JOIN in the statement, different tables may have the same name columns.
+func MapSortOrder(sortOrder string) db.SearchOrderBy {
+	switch sortOrder {
+	case "newest":
+		return "`user`.created_unix DESC"
+
+	case "oldest":
+		return "`user`.created_unix ASC"
+
+	case "leastupdate":
+		return "`user`.updated_unix ASC"
+
+	case "reversealphabetically":
+		return "`user`.name DESC"
+
+	case "lastlogin":
+		return "`user`.last_login_unix ASC"
+
+	case "reverselastlogin":
+		return "`user`.last_login_unix DESC"
+
+	case "alphabetically":
+		return "`user`.name ASC"
+
+	case "recentupdate":
+		return "`user`.updated_unix DESC"
+
+	default:
+		return ""
+	}
+}
diff --git a/routers/web/explore/user_test.go b/routers/web/explore/user_test.go
new file mode 100644
index 0000000000..04573a149f
--- /dev/null
+++ b/routers/web/explore/user_test.go
@@ -0,0 +1,23 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package explore
+
+import (
+	"testing"
+
+	"forgejo.org/models/db"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestMapSortOrder(t *testing.T) {
+	assert.Equal(t, MapSortOrder("newest"), db.SearchOrderBy("`user`.created_unix DESC"))
+	assert.Equal(t, MapSortOrder("oldest"), db.SearchOrderBy("`user`.created_unix ASC"))
+	assert.Equal(t, MapSortOrder("leastupdate"), db.SearchOrderBy("`user`.updated_unix ASC"))
+	assert.Equal(t, MapSortOrder("reversealphabetically"), db.SearchOrderBy("`user`.name DESC"))
+	assert.Equal(t, MapSortOrder("lastlogin"), db.SearchOrderBy("`user`.last_login_unix ASC"))
+	assert.Equal(t, MapSortOrder("reverselastlogin"), db.SearchOrderBy("`user`.last_login_unix DESC"))
+	assert.Equal(t, MapSortOrder("alphabetically"), db.SearchOrderBy("`user`.name ASC"))
+	assert.Equal(t, MapSortOrder("recentupdate"), db.SearchOrderBy("`user`.updated_unix DESC"))
+}
diff --git a/routers/web/feed/convert.go b/routers/web/feed/convert.go
index 24532334ea..7b09c92ee5 100644
--- a/routers/web/feed/convert.go
+++ b/routers/web/feed/convert.go
@@ -1,4 +1,5 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package feed
@@ -24,7 +25,7 @@ import (
 	"forgejo.org/services/context"
 
 	"github.com/gorilla/feeds"
-	"github.com/jaytaylor/html2text"
+	"github.com/inbucket/html2text"
 )
 
 func toBranchLink(ctx *context.Context, act *activities_model.Action) string {
@@ -209,7 +210,7 @@ func feedActionsToFeedItems(ctx *context.Context, actions activities_model.Actio
 		{
 			switch act.OpType {
 			case activities_model.ActionCommitRepo, activities_model.ActionMirrorSyncPush:
-				push := templates.ActionContent2Commits(act)
+				push := templates.ActionContent2Commits(ctx, act)
 
 				for _, commit := range push.Commits {
 					if len(desc) != 0 {
diff --git a/routers/web/feed/release.go b/routers/web/feed/release.go
index 646241c021..d24fa6ecc7 100644
--- a/routers/web/feed/release.go
+++ b/routers/web/feed/release.go
@@ -29,7 +29,7 @@ func ShowReleaseFeed(ctx *context.Context, repo *repo_model.Repository, isReleas
 
 	if isReleasesOnly {
 		title = ctx.Locale.TrString("repo.release.releases_for", repo.FullName())
-		link = &feeds.Link{Href: repo.HTMLURL() + "/release"}
+		link = &feeds.Link{Href: repo.HTMLURL() + "/releases"}
 	} else {
 		title = ctx.Locale.TrString("repo.release.tags_for", repo.FullName())
 		link = &feeds.Link{Href: repo.HTMLURL() + "/tags"}
diff --git a/routers/web/home.go b/routers/web/home.go
index e0a466a81c..55dfe2538e 100644
--- a/routers/web/home.go
+++ b/routers/web/home.go
@@ -1,5 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package web
@@ -8,6 +9,7 @@ import (
 	"net/http"
 	"strconv"
 
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
@@ -34,18 +36,37 @@ func Home(ctx *context.Context) {
 		if !ctx.Doer.IsActive && setting.Service.RegisterEmailConfirm {
 			ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
 			ctx.HTML(http.StatusOK, auth.TplActivate)
-		} else if !ctx.Doer.IsActive || ctx.Doer.ProhibitLogin {
+			return
+		}
+		if !ctx.Doer.IsActive || ctx.Doer.ProhibitLogin {
 			log.Info("Failed authentication attempt for %s from %s", ctx.Doer.Name, ctx.RemoteAddr())
 			ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
 			ctx.HTML(http.StatusOK, "user/auth/prohibit_login")
-		} else if ctx.Doer.MustChangePassword {
+			return
+		}
+		if ctx.Doer.MustChangePassword {
 			ctx.Data["Title"] = ctx.Tr("auth.must_change_password")
 			ctx.Data["ChangePasscodeLink"] = setting.AppSubURL + "/user/change_password"
 			middleware.SetRedirectToCookie(ctx.Resp, setting.AppSubURL+ctx.Req.URL.RequestURI())
 			ctx.Redirect(setting.AppSubURL + "/user/settings/change_password")
-		} else {
-			user.Dashboard(ctx)
+			return
 		}
+		if ctx.Doer.MustHaveTwoFactor() {
+			hasTwoFactor, err := auth_model.HasTwoFactorByUID(ctx, ctx.Doer.ID)
+			if err != nil {
+				ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
+				log.Error("Error getting 2fa: %s", err)
+				ctx.Error(http.StatusInternalServerError, "HasTwoFactorByUID", err.Error())
+				return
+			}
+			if !hasTwoFactor {
+				ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
+				ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+				return
+			}
+		}
+
+		user.Dashboard(ctx)
 		return
 		// Check non-logged users landing page.
 	} else if setting.LandingPageURL != setting.LandingPageHome {
@@ -112,9 +133,3 @@ func HomeSitemap(ctx *context.Context) {
 		log.Error("Failed writing sitemap: %v", err)
 	}
 }
-
-// NotFound render 404 page
-func NotFound(ctx *context.Context) {
-	ctx.Data["Title"] = "Page Not Found"
-	ctx.NotFound("home.NotFound", nil)
-}
diff --git a/routers/web/misc/misc.go b/routers/web/misc/misc.go
index 306b15e3d5..22fdccf79f 100644
--- a/routers/web/misc/misc.go
+++ b/routers/web/misc/misc.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"path"
 
-	"forgejo.org/modules/git"
 	"forgejo.org/modules/httpcache"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
@@ -15,12 +14,8 @@ import (
 )
 
 func SSHInfo(rw http.ResponseWriter, req *http.Request) {
-	if !git.SupportProcReceive {
-		rw.WriteHeader(http.StatusNotFound)
-		return
-	}
 	rw.Header().Set("content-type", "text/json;charset=UTF-8")
-	_, err := rw.Write([]byte(`{"type":"gitea","version":1}`))
+	_, err := rw.Write([]byte(`{"type":"agit","version":1}`))
 	if err != nil {
 		log.Error("fail to write result: err: %v", err)
 		rw.WriteHeader(http.StatusInternalServerError)
@@ -33,17 +28,96 @@ func DummyOK(w http.ResponseWriter, req *http.Request) {
 	w.WriteHeader(http.StatusOK)
 }
 
-func RobotsTxt(w http.ResponseWriter, req *http.Request) {
-	robotsTxt := util.FilePathJoinAbs(setting.CustomPath, "public/robots.txt")
-	if ok, _ := util.IsExist(robotsTxt); !ok {
-		robotsTxt = util.FilePathJoinAbs(setting.CustomPath, "robots.txt") // the legacy "robots.txt"
-	}
-	httpcache.SetCacheControlInHeader(w.Header(), setting.StaticCacheTime)
-	http.ServeFile(w, req, robotsTxt)
-}
-
 func StaticRedirect(target string) func(w http.ResponseWriter, req *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
 		http.Redirect(w, req, path.Join(setting.StaticURLPrefix, target), http.StatusMovedPermanently)
 	}
 }
+
+var defaultRobotsTxt = []byte(`# The default Forgejo robots.txt
+# For more information: https://forgejo.org/docs/latest/admin/search-engines-indexation/
+
+User-agent: *
+Disallow: /api/
+Disallow: /avatars/
+Disallow: /user/
+Disallow: /swagger.*.json
+Disallow: /explore/*?*
+
+Disallow: /repo/create
+Disallow: /repo/migrate
+Disallow: /org/create
+Disallow: /*/*/fork
+
+Disallow: /*/*/watchers
+Disallow: /*/*/stargazers
+Disallow: /*/*/forks
+
+Disallow: /*/*/src/
+Disallow: /*/*/blame/
+Disallow: /*/*/commit/
+Disallow: /*/*/commits/
+Disallow: /*/*/raw/
+Disallow: /*/*/media/
+Disallow: /*/*/tags
+Disallow: /*/*/graph
+Disallow: /*/*/branches
+Disallow: /*/*/compare
+Disallow: /*/*/lastcommit/
+Disallow: /*/*/rss/branch/
+Disallow: /*/*/atom/branch/
+
+Disallow: /*/*/activity
+Disallow: /*/*/activity_author_data
+
+Disallow: /*/*/actions
+Disallow: /*/*/projects
+Disallow: /*/*/labels
+Disallow: /*/*/milestones
+
+Disallow: /*/*/find/
+Disallow: /*/*/tree-list/
+Disallow: /*/*/search/
+Disallow: /*/-/code
+
+Disallow: /*/*/issues/new
+Disallow: /*/*/pulls/*/files
+Disallow: /*/*/pulls/*/commits
+
+Disallow: /attachments/
+Disallow: /*/*/attachments/
+Disallow: /*/*/issues/*/attachments/
+Disallow: /*/*/pulls/*/attachments/
+Disallow: /*/*/releases/attachments
+Disallow: /*/*/releases/download
+
+Disallow: /*/*/archive/
+Disallow: /*.bundle$
+Disallow: /*.patch$
+Disallow: /*.diff$
+Disallow: /*.atom$
+Disallow: /*.rss$
+
+Disallow: /*lang=*
+Disallow: /*redirect_to=*
+Disallow: /*tab=*
+Disallow: /*q=*
+Disallow: /*sort=*
+Disallow: /*repo-search-archived=*
+`)
+
+func RobotsTxt(w http.ResponseWriter, req *http.Request) {
+	httpcache.SetCacheControlInHeader(w.Header(), setting.StaticCacheTime)
+	w.Header().Set("Content-Type", "text/plain")
+
+	robotsTxt := util.FilePathJoinAbs(setting.CustomPath, "public/robots.txt")
+	if ok, _ := util.IsExist(robotsTxt); ok {
+		http.ServeFile(w, req, robotsTxt)
+		return
+	}
+
+	_, err := w.Write(defaultRobotsTxt)
+	if err != nil {
+		log.Error("failed to write robots.txt: %v", err)
+	}
+}
diff --git a/routers/web/moderation/report.go b/routers/web/moderation/report.go
new file mode 100644
index 0000000000..39ca9e8824
--- /dev/null
+++ b/routers/web/moderation/report.go
@@ -0,0 +1,125 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"errors"
+	"net/http"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/base"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/web"
+	"forgejo.org/services/context"
+	"forgejo.org/services/forms"
+	moderation_service "forgejo.org/services/moderation"
+)
+
+const (
+	tplSubmitAbuseReport base.TplName = "moderation/new_abuse_report"
+)
+
+// NewReport renders the page for new abuse reports.
+func NewReport(ctx *context.Context) {
+	contentID := ctx.FormInt64("id")
+	if contentID <= 0 {
+		setMinimalContextData(ctx)
+		ctx.RenderWithErr(ctx.Tr("moderation.report_abuse_form.invalid"), tplSubmitAbuseReport, nil)
+		log.Warn("The content ID is expected to be an integer greater that 0; the provided value is %s.", ctx.FormString("id"))
+		return
+	}
+
+	contentTypeString := ctx.FormString("type")
+	var contentType moderation.ReportedContentType
+	switch contentTypeString {
+	case "user", "org":
+		contentType = moderation.ReportedContentTypeUser
+	case "repo":
+		contentType = moderation.ReportedContentTypeRepository
+	case "issue", "pull":
+		contentType = moderation.ReportedContentTypeIssue
+	case "comment":
+		contentType = moderation.ReportedContentTypeComment
+	default:
+		setMinimalContextData(ctx)
+		ctx.RenderWithErr(ctx.Tr("moderation.report_abuse_form.invalid"), tplSubmitAbuseReport, nil)
+		log.Warn("The provided content type `%s` is not among the expected values.", contentTypeString)
+		return
+	}
+
+	if moderation.AlreadyReportedByAndOpen(ctx, ctx.Doer.ID, contentType, contentID) {
+		setMinimalContextData(ctx)
+		ctx.RenderWithErr(ctx.Tr("moderation.report_abuse_form.already_reported"), tplSubmitAbuseReport, nil)
+		return
+	}
+
+	setContextDataAndRender(ctx, contentType, contentID)
+}
+
+// setMinimalContextData adds minimal values (Title and CancelLink) into context data.
+func setMinimalContextData(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("moderation.report_abuse")
+	ctx.Data["CancelLink"] = ctx.Doer.DashboardLink()
+}
+
+// setContextDataAndRender adds some values into context data and renders the new abuse report page.
+func setContextDataAndRender(ctx *context.Context, contentType moderation.ReportedContentType, contentID int64) {
+	setMinimalContextData(ctx)
+	ctx.Data["ContentID"] = contentID
+	ctx.Data["ContentType"] = contentType
+	ctx.Data["AbuseCategories"] = moderation.GetAbuseCategoriesList()
+	ctx.HTML(http.StatusOK, tplSubmitAbuseReport)
+}
+
+// CreatePost handles the POST for creating a new abuse report.
+func CreatePost(ctx *context.Context) {
+	form := *web.GetForm(ctx).(*forms.ReportAbuseForm)
+
+	if form.ContentID <= 0 || !form.ContentType.IsValid() {
+		setMinimalContextData(ctx)
+		ctx.RenderWithErr(ctx.Tr("moderation.report_abuse_form.invalid"), tplSubmitAbuseReport, nil)
+		return
+	}
+
+	if ctx.HasError() {
+		setContextDataAndRender(ctx, form.ContentType, form.ContentID)
+		return
+	}
+
+	can, err := moderation_service.CanReport(*ctx, ctx.Doer, form.ContentType, form.ContentID)
+	if err != nil {
+		if errors.Is(err, moderation_service.ErrContentDoesNotExist) || errors.Is(err, moderation_service.ErrDoerNotAllowed) {
+			ctx.Flash.Error(ctx.Tr("moderation.report_abuse_form.invalid"))
+			ctx.Redirect(ctx.Doer.DashboardLink())
+		} else {
+			ctx.ServerError("Failed to check if user can report content", err)
+		}
+		return
+	} else if !can {
+		ctx.Flash.Error(ctx.Tr("moderation.report_abuse_form.invalid"))
+		ctx.Redirect(ctx.Doer.DashboardLink())
+		return
+	}
+
+	report := moderation.AbuseReport{
+		ReporterID:  ctx.Doer.ID,
+		ContentType: form.ContentType,
+		ContentID:   form.ContentID,
+		Category:    form.AbuseCategory,
+		Remarks:     form.Remarks,
+	}
+
+	if err := moderation.ReportAbuse(ctx, &report); err != nil {
+		if errors.Is(err, moderation.ErrSelfReporting) {
+			ctx.Flash.Error(ctx.Tr("moderation.reporting_failed", err))
+			ctx.Redirect(ctx.Doer.DashboardLink())
+		} else {
+			ctx.ServerError("Failed to save new abuse report", err)
+		}
+		return
+	}
+
+	ctx.Flash.Success(ctx.Tr("moderation.reported_thank_you"))
+	ctx.Redirect(ctx.Doer.DashboardLink())
+}
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index a3823565ed..8f14f8899c 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -175,10 +175,12 @@ func prepareOrgProfileReadme(ctx *context.Context, profileGitRepo *git.Repositor
 		return
 	}
 
-	if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil {
-		log.Error("failed to GetBlobContent: %v", err)
+	if rc, _, err := profileReadme.NewTruncatedReader(setting.UI.MaxDisplayFileSize); err != nil {
+		log.Error("failed to NewTruncatedReader: %v", err)
 	} else {
-		if profileContent, err := markdown.RenderString(&markup.RenderContext{
+		defer rc.Close()
+
+		if profileContent, err := markdown.RenderReader(&markup.RenderContext{
 			Ctx:     ctx,
 			GitRepo: profileGitRepo,
 			Links: markup.Links{
@@ -188,7 +190,7 @@ func prepareOrgProfileReadme(ctx *context.Context, profileGitRepo *git.Repositor
 				BranchPath: path.Join("branch", util.PathEscapeSegments(profileDbRepo.DefaultBranch)),
 			},
 			Metas: map[string]string{"mode": "document"},
-		}, bytes); err != nil {
+		}, rc); err != nil {
 			log.Error("failed to RenderString: %v", err)
 		} else {
 			ctx.Data["ProfileReadme"] = profileContent
diff --git a/routers/web/org/members.go b/routers/web/org/members.go
index 51ac566e1a..65e2b032e8 100644
--- a/routers/web/org/members.go
+++ b/routers/web/org/members.go
@@ -60,8 +60,8 @@ func Members(ctx *context.Context) {
 	}
 
 	pager := context.NewPagination(int(total), setting.UI.MembersPagingNum, page, 5)
-	opts.ListOptions.Page = page
-	opts.ListOptions.PageSize = setting.UI.MembersPagingNum
+	opts.Page = page
+	opts.PageSize = setting.UI.MembersPagingNum
 	members, membersIsPublic, err := organization.FindOrgMembers(ctx, opts)
 	if err != nil {
 		ctx.ServerError("GetMembers", err)
diff --git a/routers/web/org/org.go b/routers/web/org/org.go
index e9907c04af..f3d23df6a5 100644
--- a/routers/web/org/org.go
+++ b/routers/web/org/org.go
@@ -27,11 +27,14 @@ const (
 // Create render the page for create organization
 func Create(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_org.title")
-	ctx.Data["DefaultOrgVisibilityMode"] = setting.Service.DefaultOrgVisibilityMode
 	if !ctx.Doer.CanCreateOrganization() {
 		ctx.ServerError("Not allowed", errors.New(ctx.Locale.TrString("org.form.create_org_not_allowed")))
 		return
 	}
+
+	ctx.Data["visibility"] = setting.Service.DefaultOrgVisibilityMode
+	ctx.Data["repo_admin_change_team_access"] = true
+
 	ctx.HTML(http.StatusOK, tplCreateOrg)
 }
 
diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index 284f406413..9b4e01597b 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -50,6 +50,9 @@ func Settings(ctx *context.Context) {
 	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
 	ctx.Data["ContextUser"] = ctx.ContextUser
 	ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	err := shared_user.LoadHeaderCount(ctx)
 	if err != nil {
@@ -68,6 +71,9 @@ func SettingsPost(ctx *context.Context) {
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 	ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplSettingsOptions)
diff --git a/routers/web/repo/action_aggregator_test.go b/routers/web/repo/action_aggregator_test.go
index 7da14f1912..94e6d506c5 100644
--- a/routers/web/repo/action_aggregator_test.go
+++ b/routers/web/repo/action_aggregator_test.go
@@ -94,6 +94,14 @@ func reqReview(t int64, name string, delReq bool) *issue_model.Comment {
 	return c
 }
 
+func ghostReqReview(t, id int64) *issue_model.Comment {
+	c := testComment(t)
+	c.Type = issue_model.CommentTypeReviewRequest
+	c.AssigneeTeam = organization.NewGhostTeam()
+	c.AssigneeTeamID = id
+	return c
+}
+
 func reqReviewList(t int64, del bool, names ...string) *issue_model.Comment {
 	req := []issue_model.RequestReviewTarget{}
 	for _, name := range names {
@@ -179,12 +187,12 @@ func (kase *testCase) doTest(t *testing.T) {
 
 	if len(after) != len(issue.Comments) {
 		t.Logf("Expected %v comments, got %v", len(after), len(issue.Comments))
-		t.Logf("Comments got after combination:")
+		t.Log("Comments got after combination:")
 		for c := 0; c < len(issue.Comments); c++ {
 			cmt := issue.Comments[c]
 			t.Logf("%v %v %v\n", cmt.Type, cmt.CreatedUnix, cmt.Content)
 		}
-		assert.EqualValues(t, len(after), len(issue.Comments))
+		assert.Len(t, issue.Comments, len(after))
 		t.Fail()
 		return
 	}
@@ -214,7 +222,7 @@ func (kase *testCase) doTest(t *testing.T) {
 			l.AssigneeTeamID = 0
 		}
 
-		assert.EqualValues(t, (after)[c], issue.Comments[c],
+		assert.Equal(t, (after)[c], issue.Comments[c],
 			"Comment %v is not equal", c,
 		)
 	}
@@ -588,6 +596,27 @@ func TestCombineReviewRequests(t *testing.T) {
 				reqReviewList(121, true, "titi", "toto-team"),
 			},
 		},
+
+		// Ghost.
+		{
+			name: "ghost reviews",
+			beforeCombined: []*issue_model.Comment{
+				reqReview(1, "titi", false),
+				ghostReqReview(2, 50),
+				ghostReqReview(3, 51),
+				ghostReqReview(4, 50),
+			},
+			afterCombined: []*issue_model.Comment{
+				{
+					PosterID:    1,
+					Type:        issue_model.CommentTypeReviewRequest,
+					CreatedUnix: timeutil.TimeStamp(1),
+					AddedRequestReview: []issue_model.RequestReviewTarget{
+						createReqReviewTarget("titi"), {Team: organization.NewGhostTeam()},
+					},
+				},
+			},
+		},
 	}
 
 	for _, kase := range kases {
diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index 0a63f566e0..0c07e1968e 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -27,12 +27,13 @@ import (
 	"forgejo.org/services/context"
 	"forgejo.org/services/convert"
 
-	"github.com/nektos/act/pkg/model"
+	"code.forgejo.org/forgejo/runner/v9/act/model"
 )
 
 const (
-	tplListActions base.TplName = "repo/actions/list"
-	tplViewActions base.TplName = "repo/actions/view"
+	tplListActions      base.TplName = "repo/actions/list"
+	tplListActionsInner base.TplName = "repo/actions/list_inner"
+	tplViewActions      base.TplName = "repo/actions/view"
 )
 
 type Workflow struct {
@@ -67,6 +68,8 @@ func List(ctx *context.Context) {
 	curWorkflow := ctx.FormString("workflow")
 	ctx.Data["CurWorkflow"] = curWorkflow
 
+	listInner := ctx.FormBool("list_inner")
+
 	var workflows []Workflow
 	if empty, err := ctx.Repo.GitRepo.IsEmpty(); err != nil {
 		ctx.ServerError("IsEmpty", err)
@@ -108,7 +111,7 @@ func List(ctx *context.Context) {
 				ctx.ServerError("GetContentFromEntry", err)
 				return
 			}
-			wf, err := model.ReadWorkflow(bytes.NewReader(content))
+			wf, err := model.ReadWorkflow(bytes.NewReader(content), true)
 			if err != nil {
 				workflow.ErrMsg = ctx.Locale.TrString("actions.runs.invalid_workflow_helper", err.Error())
 				workflows = append(workflows, workflow)
@@ -250,7 +253,11 @@ func List(ctx *context.Context) {
 	ctx.Data["Page"] = pager
 	ctx.Data["HasWorkflowsOrRuns"] = len(workflows) > 0 || len(runs) > 0
 
-	ctx.HTML(http.StatusOK, tplListActions)
+	if listInner {
+		ctx.HTML(http.StatusOK, tplListActionsInner)
+	} else {
+		ctx.HTML(http.StatusOK, tplListActions)
+	}
 }
 
 // loadIsRefDeleted loads the IsRefDeleted field for each run in the list.
diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index 2d009c5720..260468f207 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -383,7 +383,7 @@ func Rerun(ctx *context_module.Context) {
 		run.PreviousDuration = run.Duration()
 		run.Started = 0
 		run.Stopped = 0
-		if err := actions_model.UpdateRun(ctx, run, "started", "stopped", "previous_duration"); err != nil {
+		if err := actions_service.UpdateRun(ctx, run, "started", "stopped", "previous_duration"); err != nil {
 			ctx.Error(http.StatusInternalServerError, err.Error())
 			return
 		}
@@ -436,7 +436,7 @@ func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shou
 	job.Stopped = 0
 
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
-		_, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped")
+		_, err := actions_service.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped")
 		return err
 	}); err != nil {
 		return err
@@ -512,16 +512,16 @@ func Cancel(ctx *context_module.Context) {
 			if job.TaskID == 0 {
 				job.Status = actions_model.StatusCancelled
 				job.Stopped = timeutil.TimeStampNow()
-				n, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped")
+				n, err := actions_service.UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped")
 				if err != nil {
 					return err
 				}
 				if n == 0 {
-					return fmt.Errorf("job has changed, try again")
+					return errors.New("job has changed, try again")
 				}
 				continue
 			}
-			if err := actions_model.StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil {
+			if err := actions_service.StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil {
 				return err
 			}
 		}
@@ -549,13 +549,13 @@ func Approve(ctx *context_module.Context) {
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
 		run.NeedApproval = false
 		run.ApprovedBy = doer.ID
-		if err := actions_model.UpdateRun(ctx, run, "need_approval", "approved_by"); err != nil {
+		if err := actions_service.UpdateRun(ctx, run, "need_approval", "approved_by"); err != nil {
 			return err
 		}
 		for _, job := range jobs {
 			if len(job.Needs) == 0 && job.Status.IsBlocked() {
 				job.Status = actions_model.StatusWaiting
-				_, err := actions_model.UpdateRunJob(ctx, job, nil, "status")
+				_, err := actions_service.UpdateRunJob(ctx, job, nil, "status")
 				if err != nil {
 					return err
 				}
diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go
index e46c08fef8..5b2eaef889 100644
--- a/routers/web/repo/attachment.go
+++ b/routers/web/repo/attachment.go
@@ -106,7 +106,7 @@ func ServeAttachment(ctx *context.Context, uuid string) {
 	}
 
 	if repository == nil { // If not linked
-		if !(ctx.IsSigned && attach.UploaderID == ctx.Doer.ID) { // We block if not the uploader
+		if !ctx.IsSigned || attach.UploaderID != ctx.Doer.ID { // We block if not the uploader
 			ctx.Error(http.StatusNotFound)
 			return
 		}
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index ccdd59f2dd..f4cc2a2cea 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -82,19 +82,19 @@ func RefBlame(ctx *context.Context) {
 		return
 	}
 
-	ctx.Data["NumLinesSet"] = true
-	ctx.Data["NumLines"], err = blob.GetBlobLineCount()
-	if err != nil {
-		ctx.ServerError("GetBlobLineCount", err)
-		return
-	}
-
 	result, err := performBlame(ctx, ctx.Repo.Commit, ctx.Repo.TreePath, ctx.FormBool("bypass-blame-ignore"))
 	if err != nil {
 		ctx.ServerError("performBlame", err)
 		return
 	}
 
+	ctx.Data["NumLinesSet"] = true
+	numLines := 0
+	for _, p := range result.Parts {
+		numLines += len(p.Lines)
+	}
+	ctx.Data["NumLines"] = numLines
+
 	ctx.Data["UsesIgnoreRevs"] = result.UsesIgnoreRevs
 	ctx.Data["FaultyIgnoreRevsFile"] = result.FaultyIgnoreRevsFile
 
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
index af8a838fc9..0fe52bfb48 100644
--- a/routers/web/repo/branch.go
+++ b/routers/web/repo/branch.go
@@ -70,11 +70,6 @@ func Branches(ctx *context.Context) {
 		ctx.ServerError("LoadBranches", err)
 		return
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		for key := range commitStatuses {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
-		}
-	}
 
 	commitStatus := make(map[string]*git_model.CommitStatus)
 	for commitID, cs := range commitStatuses {
diff --git a/routers/web/repo/code_frequency.go b/routers/web/repo/code_frequency.go
index 04009b4afa..44c07e617e 100644
--- a/routers/web/repo/code_frequency.go
+++ b/routers/web/repo/code_frequency.go
@@ -34,7 +34,7 @@ func CodeFrequencyData(ctx *context.Context) {
 			ctx.Status(http.StatusAccepted)
 			return
 		}
-		ctx.ServerError("GetCodeFrequencyData", err)
+		ctx.ServerError("GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, contributorStats["total"].Weeks)
 	}
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
index 3cd80a6777..408a2844de 100644
--- a/routers/web/repo/commit.go
+++ b/routers/web/repo/commit.go
@@ -16,7 +16,6 @@ import (
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
 	repo_model "forgejo.org/models/repo"
-	unit_model "forgejo.org/models/unit"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/charset"
@@ -84,8 +83,19 @@ func Commits(ctx *context.Context) {
 		ctx.ServerError("CommitsByRange", err)
 		return
 	}
-	ctx.Data["Commits"] = processGitCommits(ctx, commits)
+	ctx.Data["Commits"] = git_model.ParseCommitsWithStatus(ctx, commits, ctx.Repo.Repository)
 
+	commitIDs := make([]string, 0, len(commits))
+	for _, c := range commits {
+		commitIDs = append(commitIDs, c.ID.String())
+	}
+	commitTagsMap, err := repo_model.FindTagsByCommitIDs(ctx, ctx.Repo.Repository.ID, commitIDs...)
+	if err != nil {
+		log.Error("FindTagsByCommitIDs: %v", err)
+		ctx.Flash.Error(ctx.Tr("repo.commit.load_tags_failed"))
+	} else {
+		ctx.Data["CommitTagsMap"] = commitTagsMap
+	}
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
 	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
 	ctx.Data["CommitCount"] = commitsCount
@@ -202,7 +212,7 @@ func SearchCommits(ctx *context.Context) {
 		return
 	}
 	ctx.Data["CommitCount"] = len(commits)
-	ctx.Data["Commits"] = processGitCommits(ctx, commits)
+	ctx.Data["Commits"] = git_model.ParseCommitsWithStatus(ctx, commits, ctx.Repo.Repository)
 
 	ctx.Data["Keyword"] = query
 	if all {
@@ -267,7 +277,7 @@ func FileHistory(ctx *context.Context) {
 		}
 	}
 
-	ctx.Data["Commits"] = processGitCommits(ctx, commits)
+	ctx.Data["Commits"] = git_model.ParseCommitsWithStatus(ctx, commits, ctx.Repo.Repository)
 
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
 	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
@@ -329,7 +339,7 @@ func Diff(ctx *context.Context) {
 		maxLines, maxFiles = -1, -1
 	}
 
-	diff, err := gitdiff.GetDiff(ctx, gitRepo, &gitdiff.DiffOptions{
+	diff, err := gitdiff.GetDiffFull(ctx, gitRepo, &gitdiff.DiffOptions{
 		AfterCommitID:      commitID,
 		SkipTo:             ctx.FormString("skip-to"),
 		MaxLines:           maxLines,
@@ -375,9 +385,6 @@ func Diff(ctx *context.Context) {
 	if err != nil {
 		log.Error("GetLatestCommitStatus: %v", err)
 	}
-	if !ctx.Repo.CanRead(unit_model.TypeActions) {
-		git_model.CommitStatusesHideActionsURL(ctx, statuses)
-	}
 
 	ctx.Data["CommitStatus"] = git_model.CalcCommitStatus(statuses)
 	ctx.Data["CommitStatuses"] = statuses
@@ -456,20 +463,6 @@ func RawDiff(ctx *context.Context) {
 	}
 }
 
-func processGitCommits(ctx *context.Context, gitCommits []*git.Commit) []*git_model.SignCommitWithStatuses {
-	commits := git_model.ConvertFromGitCommit(ctx, gitCommits, ctx.Repo.Repository)
-	if !ctx.Repo.CanRead(unit_model.TypeActions) {
-		for _, commit := range commits {
-			if commit.Status == nil {
-				continue
-			}
-			commit.Status.HideActionsURL(ctx)
-			git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses)
-		}
-	}
-	return commits
-}
-
 func SetCommitNotes(ctx *context.Context) {
 	form := web.GetForm(ctx).(*forms.CommitNotesForm)
 
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index db65e889e0..feedeef945 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -312,22 +312,16 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 	baseIsTag := ctx.Repo.GitRepo.IsTagExist(ci.BaseBranch)
 
 	if !baseIsCommit && !baseIsBranch && !baseIsTag {
-		// Check if baseBranch is short sha commit hash
-		if baseCommit, _ := ctx.Repo.GitRepo.GetCommit(ci.BaseBranch); baseCommit != nil {
-			ci.BaseBranch = baseCommit.ID.String()
-			ctx.Data["BaseBranch"] = ci.BaseBranch
-			baseIsCommit = true
-		} else if ci.BaseBranch == ctx.Repo.GetObjectFormat().EmptyObjectID().String() {
+		if ci.BaseBranch == ctx.Repo.GetObjectFormat().EmptyObjectID().String() {
 			if isSameRepo {
 				ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ci.HeadBranch))
 			} else {
 				ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ci.HeadRepo.FullName()) + ":" + util.PathEscapeSegments(ci.HeadBranch))
 			}
-			return nil
 		} else {
 			ctx.NotFound("IsRefExist", nil)
-			return nil
 		}
+		return nil
 	}
 	ctx.Data["BaseIsCommit"] = baseIsCommit
 	ctx.Data["BaseIsBranch"] = baseIsBranch
@@ -514,15 +508,8 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 	headIsBranch := ci.HeadGitRepo.IsBranchExist(ci.HeadBranch)
 	headIsTag := ci.HeadGitRepo.IsTagExist(ci.HeadBranch)
 	if !headIsCommit && !headIsBranch && !headIsTag {
-		// Check if headBranch is short sha commit hash
-		if headCommit, _ := ci.HeadGitRepo.GetCommit(ci.HeadBranch); headCommit != nil {
-			ci.HeadBranch = headCommit.ID.String()
-			ctx.Data["HeadBranch"] = ci.HeadBranch
-			headIsCommit = true
-		} else {
-			ctx.NotFound("IsRefExist", nil)
-			return nil
-		}
+		ctx.NotFound("IsRefExist", nil)
+		return nil
 	}
 	ctx.Data["HeadIsCommit"] = headIsCommit
 	ctx.Data["HeadIsBranch"] = headIsBranch
@@ -533,17 +520,6 @@ func ParseCompareInfo(ctx *context.Context) *common.CompareInfo {
 		ctx.Data["PageIsComparePull"] = headIsBranch && baseIsBranch
 	}
 
-	if ctx.Data["PageIsComparePull"] == true && !permBase.CanReadIssuesOrPulls(true) {
-		if log.IsTrace() {
-			log.Trace("Permission Denied: User: %-v cannot create/read pull requests in Repo: %-v\nUser in baseRepo has Permissions: %-+v",
-				ctx.Doer,
-				baseRepo,
-				permBase)
-		}
-		ctx.NotFound("ParseCompareInfo", nil)
-		return nil
-	}
-
 	baseBranchRef := ci.BaseBranch
 	if baseIsBranch {
 		baseBranchRef = git.BranchPrefix + ci.BaseBranch
@@ -597,7 +573,7 @@ func PrepareCompareDiff(
 			config := unit.PullRequestsConfig()
 
 			if !config.AutodetectManualMerge {
-				allowEmptyPr := !(ci.BaseBranch == ci.HeadBranch && ctx.Repo.Repository.Name == ci.HeadRepo.Name)
+				allowEmptyPr := ci.BaseBranch != ci.HeadBranch || ctx.Repo.Repository.Name != ci.HeadRepo.Name
 				ctx.Data["AllowEmptyPr"] = allowEmptyPr
 
 				return !allowEmptyPr
@@ -621,7 +597,7 @@ func PrepareCompareDiff(
 
 	fileOnly := ctx.FormBool("file-only")
 
-	diff, err := gitdiff.GetDiff(ctx, ci.HeadGitRepo,
+	diff, err := gitdiff.GetDiffFull(ctx, ci.HeadGitRepo,
 		&gitdiff.DiffOptions{
 			BeforeCommitID:     beforeCommitID,
 			AfterCommitID:      headCommitID,
@@ -654,15 +630,15 @@ func PrepareCompareDiff(
 		return false
 	}
 
-	commits := processGitCommits(ctx, ci.CompareInfo.Commits)
+	commits := git_model.ParseCommitsWithStatus(ctx, ci.CompareInfo.Commits, ctx.Repo.Repository)
 	ctx.Data["Commits"] = commits
 	ctx.Data["CommitCount"] = len(commits)
 
 	if len(commits) == 1 {
 		c := commits[0]
-		title = strings.TrimSpace(c.UserCommit.Summary())
+		title = strings.TrimSpace(c.Summary())
 
-		body := strings.Split(strings.TrimSpace(c.UserCommit.Message()), "\n")
+		body := strings.Split(strings.TrimSpace(c.Message()), "\n")
 		if len(body) > 1 {
 			ctx.Data["content"] = strings.Join(body[1:], "\n")
 		}
@@ -933,28 +909,33 @@ func ExcerptBlob(ctx *context.Context) {
 		ctx.Error(http.StatusInternalServerError, "getExcerptLines")
 		return
 	}
-	if idxRight > lastRight {
+
+	// After the "up" or "down" expansion, check if there's any remaining content in the diff and add a line that will
+	// be rendered into a new expander at either the top, or bottom.
+	lineSection := &gitdiff.DiffLine{
+		Type: gitdiff.DiffLineSection,
+		SectionInfo: &gitdiff.DiffLineSectionInfo{
+			Path:          filePath,
+			LastLeftIdx:   lastLeft,
+			LastRightIdx:  lastRight,
+			LeftIdx:       idxLeft,
+			RightIdx:      idxRight,
+			LeftHunkSize:  leftHunkSize,
+			RightHunkSize: rightHunkSize,
+		},
+	}
+	if lineSection.GetExpandDirection() != gitdiff.DiffLineExpandNone {
 		lineText := " "
 		if rightHunkSize > 0 || leftHunkSize > 0 {
 			lineText = fmt.Sprintf("@@ -%d,%d +%d,%d @@\n", idxLeft, leftHunkSize, idxRight, rightHunkSize)
 		}
 		lineText = html.EscapeString(lineText)
-		lineSection := &gitdiff.DiffLine{
-			Type:    gitdiff.DiffLineSection,
-			Content: lineText,
-			SectionInfo: &gitdiff.DiffLineSectionInfo{
-				Path:          filePath,
-				LastLeftIdx:   lastLeft,
-				LastRightIdx:  lastRight,
-				LeftIdx:       idxLeft,
-				RightIdx:      idxRight,
-				LeftHunkSize:  leftHunkSize,
-				RightHunkSize: rightHunkSize,
-			},
-		}
-		if direction == "up" {
+		lineSection.Content = lineText
+
+		switch direction {
+		case "up":
 			section.Lines = append([]*gitdiff.DiffLine{lineSection}, section.Lines...)
-		} else if direction == "down" {
+		case "down":
 			section.Lines = append(section.Lines, lineSection)
 		}
 	}
@@ -966,7 +947,7 @@ func ExcerptBlob(ctx *context.Context) {
 }
 
 func getExcerptLines(commit *git.Commit, filePath string, idxLeft, idxRight, chunkSize int) ([]*gitdiff.DiffLine, error) {
-	blob, err := commit.Tree.GetBlobByPath(filePath)
+	blob, err := commit.GetBlobByPath(filePath)
 	if err != nil {
 		return nil, err
 	}
diff --git a/routers/web/repo/download.go b/routers/web/repo/download.go
index fc82ece4cb..9fb4d78fe3 100644
--- a/routers/web/repo/download.go
+++ b/routers/web/repo/download.go
@@ -92,7 +92,7 @@ func getBlobForEntry(ctx *context.Context) (*git.Blob, *time.Time) {
 		return nil, nil
 	}
 
-	if entry.IsDir() || entry.IsSubModule() {
+	if entry.IsDir() || entry.IsSubmodule() {
 		ctx.NotFound("getBlobForEntry", nil)
 		return nil, nil
 	}
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 5114cc9c05..3e3cb0016d 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -189,7 +189,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 		buf = buf[:n]
 
 		// Only some file types are editable online as text.
-		if !typesniffer.DetectContentType(buf).IsRepresentableAsText() {
+		if !typesniffer.DetectContentType(buf, blob.Name()).IsRepresentableAsText() {
 			ctx.NotFound("typesniffer.IsRepresentableAsText", nil)
 			return
 		}
diff --git a/routers/web/repo/editor_test.go b/routers/web/repo/editor_test.go
index 5b893cf258..b5d40abdab 100644
--- a/routers/web/repo/editor_test.go
+++ b/routers/web/repo/editor_test.go
@@ -37,7 +37,7 @@ func TestCleanUploadName(t *testing.T) {
 		"..a.dotty../.folder../.name...": "..a.dotty../.folder../.name...",
 	}
 	for k, v := range kases {
-		assert.EqualValues(t, cleanUploadFileName(k), v)
+		assert.Equal(t, cleanUploadFileName(k), v)
 	}
 }
 
diff --git a/routers/web/repo/githttp.go b/routers/web/repo/githttp.go
index 650b1d88f4..a60c213113 100644
--- a/routers/web/repo/githttp.go
+++ b/routers/web/repo/githttp.go
@@ -183,9 +183,7 @@ func httpBase(ctx *context.Context) *serviceHandler {
 
 		if repoExist {
 			// Because of special ref "refs/for" .. , need delay write permission check
-			if git.SupportProcReceive {
-				accessMode = perm.AccessModeRead
-			}
+			accessMode = perm.AccessModeRead
 
 			if ctx.Data["IsActionsToken"] == true {
 				taskID := ctx.Data["ActionsTaskID"].(int64)
@@ -194,24 +192,19 @@ func httpBase(ctx *context.Context) *serviceHandler {
 					ctx.ServerError("GetTaskByID", err)
 					return nil
 				}
-				if task.RepoID != repo.ID {
+
+				p, err := access_model.GetActionRepoPermission(ctx, repo, task)
+				if err != nil {
+					ctx.ServerError("GetActionRepoPermission", err)
+					return nil
+				}
+
+				if !p.CanAccess(accessMode, unitType) {
 					ctx.PlainText(http.StatusForbidden, "User permission denied")
 					return nil
 				}
 
-				if task.IsForkPullRequest {
-					if accessMode > perm.AccessModeRead {
-						ctx.PlainText(http.StatusForbidden, "User permission denied")
-						return nil
-					}
-					environ = append(environ, fmt.Sprintf("%s=%d", repo_module.EnvActionPerm, perm.AccessModeRead))
-				} else {
-					if accessMode > perm.AccessModeWrite {
-						ctx.PlainText(http.StatusForbidden, "User permission denied")
-						return nil
-					}
-					environ = append(environ, fmt.Sprintf("%s=%d", repo_module.EnvActionPerm, perm.AccessModeWrite))
-				}
+				environ = append(environ, fmt.Sprintf("%s=%d", repo_module.EnvActionPerm, p.AccessMode))
 			} else {
 				p, err := access_model.GetUserRepoPermission(ctx, repo, ctx.Doer)
 				if err != nil {
diff --git a/routers/web/repo/githttp_test.go b/routers/web/repo/githttp_test.go
index 5ba8de3d63..0164b11f66 100644
--- a/routers/web/repo/githttp_test.go
+++ b/routers/web/repo/githttp_test.go
@@ -37,6 +37,6 @@ func TestContainsParentDirectorySeparator(t *testing.T) {
 	}
 
 	for i := range tests {
-		assert.EqualValues(t, tests[i].b, containsParentDirectorySeparator(tests[i].v))
+		assert.Equal(t, tests[i].b, containsParentDirectorySeparator(tests[i].v))
 	}
 }
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index ff3a903aed..0373d06ea0 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -187,9 +187,10 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 	// 0 means issues with no label
 	// blank means labels will not be filtered for issues
 	selectLabels := ctx.FormString("labels")
-	if selectLabels == "" {
+	switch selectLabels {
+	case "":
 		ctx.Data["AllLabels"] = true
-	} else if selectLabels == "0" {
+	case "0":
 		ctx.Data["NoLabel"] = true
 	}
 	if len(selectLabels) > 0 {
@@ -347,11 +348,6 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 		ctx.ServerError("GetIssuesAllCommitStatus", err)
 		return
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		for key := range commitStatuses {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
-		}
-	}
 
 	if err := issues.LoadAttributes(ctx); err != nil {
 		ctx.ServerError("issues.LoadAttributes", err)
@@ -426,9 +422,10 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
 			return 0
 		}
 		reviewTyp := issues_model.ReviewTypeApprove
-		if typ == "reject" {
+		switch typ {
+		case "reject":
 			reviewTyp = issues_model.ReviewTypeReject
-		} else if typ == "waiting" {
+		case "waiting":
 			reviewTyp = issues_model.ReviewTypeRequest
 		}
 		for _, count := range counts {
@@ -1311,7 +1308,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
 	}
 
 	// Special user that can't have associated contributions and permissions in the repo.
-	if poster.IsGhost() || poster.IsActions() || poster.IsAPActor() {
+	if poster.IsSystem() || poster.IsAPServerActor() {
 		return roleDescriptor, nil
 	}
 
@@ -1475,6 +1472,7 @@ func ViewIssue(ctx *context.Context) {
 		ctx.Data["IssueType"] = "all"
 	}
 
+	ctx.Data["IsModerationEnabled"] = setting.Moderation.Enabled
 	ctx.Data["IsProjectsEnabled"] = ctx.Repo.CanRead(unit.TypeProjects)
 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
 	upload.AddUploadContext(ctx, "comment")
@@ -1695,7 +1693,7 @@ func ViewIssue(ctx *context.Context) {
 				return
 			}
 			ghostMilestone := &issues_model.Milestone{
-				ID:   -1,
+				ID:   issues_model.GhostMilestoneID,
 				Name: ctx.Locale.TrString("repo.issues.deleted_milestone"),
 			}
 			if comment.OldMilestoneID > 0 && comment.OldMilestone == nil {
@@ -1796,15 +1794,6 @@ func ViewIssue(ctx *context.Context) {
 				ctx.ServerError("LoadPushCommits", err)
 				return
 			}
-			if !ctx.Repo.CanRead(unit.TypeActions) {
-				for _, commit := range comment.Commits {
-					if commit.Status == nil {
-						continue
-					}
-					commit.Status.HideActionsURL(ctx)
-					git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses)
-				}
-			}
 		} else if comment.Type == issues_model.CommentTypeAddTimeManual ||
 			comment.Type == issues_model.CommentTypeStopTracking ||
 			comment.Type == issues_model.CommentTypeDeleteTimeManual {
@@ -2128,7 +2117,7 @@ func checkBlockedByIssues(ctx *context.Context, blockers []*issues_model.Depende
 			}
 			repoPerms[blocker.RepoID] = perm
 		}
-		if perm.CanReadIssuesOrPulls(blocker.Issue.IsPull) {
+		if perm.CanReadIssuesOrPulls(blocker.IsPull) {
 			canRead = append(canRead, blocker)
 		} else {
 			notPermitted = append(notPermitted, blocker)
@@ -2412,10 +2401,6 @@ func UpdateIssueMilestone(ctx *context.Context) {
 	}
 
 	if ctx.FormBool("htmx") {
-		renderMilestones(ctx)
-		if ctx.Written() {
-			return
-		}
 		prepareHiddenCommentType(ctx)
 		if ctx.Written() {
 			return
@@ -2429,6 +2414,7 @@ func UpdateIssueMilestone(ctx *context.Context) {
 				ctx.ServerError("GetMilestoneByRepoID", err)
 				return
 			}
+			ctx.Data["OpenMilestones"] = true
 		} else {
 			issue.Milestone = nil
 		}
@@ -2786,7 +2772,7 @@ func SearchIssues(ctx *context.Context) {
 		IncludedAnyLabelIDs: includedAnyLabels,
 		MilestoneIDs:        includedMilestones,
 		ProjectID:           projectID,
-		SortBy:              issue_indexer.SortByCreatedDesc,
+		SortBy:              issue_indexer.ParseSortBy(ctx.FormString("sort"), issue_indexer.SortByCreatedDesc),
 	}
 
 	if since != 0 {
@@ -2815,9 +2801,10 @@ func SearchIssues(ctx *context.Context) {
 		}
 	}
 
-	// FIXME: It's unsupported to sort by priority repo when searching by indexer,
-	//        it's indeed an regression, but I think it is worth to support filtering by indexer first.
-	_ = ctx.FormInt64("priority_repo_id")
+	priorityRepoID := ctx.FormInt64("priority_repo_id")
+	if priorityRepoID > 0 {
+		searchOpt.PriorityRepoID = optional.Some(priorityRepoID)
+	}
 
 	ids, total, err := issue_indexer.SearchIssues(ctx, searchOpt)
 	if err != nil {
@@ -2955,7 +2942,7 @@ func ListIssues(ctx *context.Context) {
 		IsPull:    isPull,
 		IsClosed:  isClosed,
 		ProjectID: projectID,
-		SortBy:    issue_indexer.SortByCreatedDesc,
+		SortBy:    issue_indexer.ParseSortBy(ctx.FormString("sort"), issue_indexer.SortByCreatedDesc),
 	}
 	if since != 0 {
 		searchOpt.UpdatedAfterUnix = optional.Some(since)
@@ -3117,7 +3104,7 @@ func NewComment(ctx *context.Context) {
 		// Check if issue admin/poster changes the status of issue.
 		if (ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.Doer.ID))) &&
 			(form.Status == "reopen" || form.Status == "close") &&
-			!(issue.IsPull && issue.PullRequest.HasMerged) {
+			(!issue.IsPull || !issue.PullRequest.HasMerged) {
 			// Duplication and conflict check should apply to reopen pull request.
 			var pr *issues_model.PullRequest
 
@@ -3253,11 +3240,7 @@ func NewComment(ctx *context.Context) {
 	comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments)
 	if err != nil {
 		if errors.Is(err, user_model.ErrBlockedByUser) {
-			if issue.IsPull {
-				ctx.JSONError(ctx.Tr("repo.pulls.comment.blocked_by_user"))
-			} else {
-				ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_by_user"))
-			}
+			ctx.JSONError(ctx.Tr("repo.comment.blocked_by_user"))
 		} else {
 			ctx.ServerError("CreateIssueComment", err)
 		}
@@ -3607,9 +3590,9 @@ func GetIssueAttachments(ctx *context.Context) {
 	if ctx.Written() {
 		return
 	}
-	attachments := make([]*api.Attachment, len(issue.Attachments))
+	attachments := make([]*api.WebAttachment, len(issue.Attachments))
 	for i := 0; i < len(issue.Attachments); i++ {
-		attachments[i] = convert.ToAttachment(ctx.Repo.Repository, issue.Attachments[i])
+		attachments[i] = convert.ToWebAttachment(ctx.Repo.Repository, issue.Attachments[i])
 	}
 	ctx.JSON(http.StatusOK, attachments)
 }
@@ -3632,7 +3615,7 @@ func GetCommentAttachments(ctx *context.Context) {
 		return
 	}
 
-	if !ctx.Repo.Permission.CanReadIssuesOrPulls(comment.Issue.IsPull) {
+	if !ctx.Repo.CanReadIssuesOrPulls(comment.Issue.IsPull) {
 		ctx.NotFound("CanReadIssuesOrPulls", issues_model.ErrCommentNotExist{})
 		return
 	}
@@ -3642,13 +3625,13 @@ func GetCommentAttachments(ctx *context.Context) {
 		return
 	}
 
-	attachments := make([]*api.Attachment, 0)
 	if err := comment.LoadAttachments(ctx); err != nil {
 		ctx.ServerError("LoadAttachments", err)
 		return
 	}
+	attachments := make([]*api.WebAttachment, len(comment.Attachments))
 	for i := 0; i < len(comment.Attachments); i++ {
-		attachments = append(attachments, convert.ToAttachment(ctx.Repo.Repository, comment.Attachments[i]))
+		attachments[i] = convert.ToWebAttachment(ctx.Repo.Repository, comment.Attachments[i])
 	}
 	ctx.JSON(http.StatusOK, attachments)
 }
diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go
index 5c71d75f80..11d0de90de 100644
--- a/routers/web/repo/issue_content_history.go
+++ b/routers/web/repo/issue_content_history.go
@@ -160,15 +160,16 @@ func GetContentHistoryDetail(ctx *context.Context) {
 	diffHTMLBuf := bytes.Buffer{}
 	diffHTMLBuf.WriteString("<pre class='chroma'>")
 	for _, it := range diff {
-		if it.Type == diffmatchpatch.DiffInsert {
+		switch it.Type {
+		case diffmatchpatch.DiffInsert:
 			diffHTMLBuf.WriteString("<span class='gi'>")
 			diffHTMLBuf.WriteString(html.EscapeString(it.Text))
 			diffHTMLBuf.WriteString("</span>")
-		} else if it.Type == diffmatchpatch.DiffDelete {
+		case diffmatchpatch.DiffDelete:
 			diffHTMLBuf.WriteString("<span class='gd'>")
 			diffHTMLBuf.WriteString(html.EscapeString(it.Text))
 			diffHTMLBuf.WriteString("</span>")
-		} else {
+		default:
 			diffHTMLBuf.WriteString(html.EscapeString(it.Text))
 		}
 	}
diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go
index 406ab4918c..0adcc39499 100644
--- a/routers/web/repo/issue_label_test.go
+++ b/routers/web/repo/issue_label_test.go
@@ -39,7 +39,7 @@ func TestInitializeLabels(t *testing.T) {
 	contexttest.LoadRepo(t, ctx, 2)
 	web.SetForm(ctx, &forms.InitializeLabelsForm{TemplateName: "Default"})
 	InitializeLabels(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
 		RepoID: 2,
 		Name:   "enhancement",
@@ -69,7 +69,7 @@ func TestRetrieveLabels(t *testing.T) {
 		assert.True(t, ok)
 		if assert.Len(t, labels, len(testCase.ExpectedLabelIDs)) {
 			for i, label := range labels {
-				assert.EqualValues(t, testCase.ExpectedLabelIDs[i], label.ID)
+				assert.Equal(t, testCase.ExpectedLabelIDs[i], label.ID)
 			}
 		}
 	}
@@ -85,7 +85,7 @@ func TestNewLabel(t *testing.T) {
 		Color: "#abcdef",
 	})
 	NewLabel(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
 		Name:  "newlabel",
 		Color: "#abcdef",
@@ -105,7 +105,7 @@ func TestUpdateLabel(t *testing.T) {
 		IsArchived: true,
 	})
 	UpdateLabel(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
 		ID:    2,
 		Name:  "newnameforlabel",
@@ -121,7 +121,7 @@ func TestDeleteLabel(t *testing.T) {
 	contexttest.LoadRepo(t, ctx, 1)
 	ctx.Req.Form.Set("id", "2")
 	DeleteLabel(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	unittest.AssertNotExistsBean(t, &issues_model.Label{ID: 2})
 	unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{LabelID: 2})
 	assert.EqualValues(t, ctx.Tr("repo.issues.label_deletion_success"), ctx.Flash.SuccessMsg)
@@ -135,7 +135,7 @@ func TestUpdateIssueLabel_Clear(t *testing.T) {
 	ctx.Req.Form.Set("issue_ids", "1,3")
 	ctx.Req.Form.Set("action", "clear")
 	UpdateIssueLabel(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: 1})
 	unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: 3})
 	unittest.CheckConsistencyFor(t, &issues_model.Label{})
@@ -161,7 +161,7 @@ func TestUpdateIssueLabel_Toggle(t *testing.T) {
 		ctx.Req.Form.Set("action", testCase.Action)
 		ctx.Req.Form.Set("id", strconv.Itoa(int(testCase.LabelID)))
 		UpdateIssueLabel(ctx)
-		assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+		assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 		for _, issueID := range testCase.IssueIDs {
 			unittest.AssertExistsIf(t, testCase.ExpectedAdd, &issues_model.IssueLabel{
 				IssueID: issueID,
diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go
index 80f699787c..e5bd06e987 100644
--- a/routers/web/repo/projects.go
+++ b/routers/web/repo/projects.go
@@ -120,7 +120,7 @@ func Projects(ctx *context.Context) {
 	pager.AddParam(ctx, "state", "State")
 	ctx.Data["Page"] = pager
 
-	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
+	ctx.Data["CanWriteProjects"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["IsShowClosed"] = isShowClosed
 	ctx.Data["IsProjectsPage"] = true
 	ctx.Data["SortType"] = sortType
@@ -146,7 +146,7 @@ func RenderNewProject(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.projects.new")
 	ctx.Data["TemplateConfigs"] = project_model.GetTemplateConfigs()
 	ctx.Data["CardTypes"] = project_model.GetCardConfig()
-	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
+	ctx.Data["CanWriteProjects"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["CancelLink"] = ctx.Repo.Repository.Link() + "/projects"
 	ctx.HTML(http.StatusOK, tplProjectsNew)
 }
@@ -228,7 +228,7 @@ func DeleteProject(ctx *context.Context) {
 func RenderEditProject(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.projects.edit")
 	ctx.Data["PageIsEditProjects"] = true
-	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
+	ctx.Data["CanWriteProjects"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["CardTypes"] = project_model.GetCardConfig()
 
 	p, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id"))
@@ -262,7 +262,7 @@ func EditProjectPost(ctx *context.Context) {
 
 	ctx.Data["Title"] = ctx.Tr("repo.projects.edit")
 	ctx.Data["PageIsEditProjects"] = true
-	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
+	ctx.Data["CanWriteProjects"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["CardTypes"] = project_model.GetCardConfig()
 	ctx.Data["CancelLink"] = project_model.ProjectLinkForRepo(ctx.Repo.Repository, projectID)
 
@@ -378,7 +378,7 @@ func ViewProject(ctx *context.Context) {
 
 	ctx.Data["Title"] = project.Title
 	ctx.Data["IsProjectsPage"] = true
-	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
+	ctx.Data["CanWriteProjects"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["Project"] = project
 	ctx.Data["IssuesMap"] = issuesMap
 	ctx.Data["Columns"] = columns
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index a54a31ac36..18ba2b2a9f 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -10,14 +10,16 @@ import (
 	"errors"
 	"fmt"
 	"html"
+	"html/template"
 	"net/http"
 	"net/url"
+	"path"
 	"strconv"
 	"strings"
-	"time"
 
 	"forgejo.org/models"
 	activities_model "forgejo.org/models/activities"
+	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
@@ -29,11 +31,13 @@ import (
 	"forgejo.org/models/unit"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/base"
+	"forgejo.org/modules/charset"
 	"forgejo.org/modules/emoji"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/gitrepo"
 	issue_template "forgejo.org/modules/issue/template"
 	"forgejo.org/modules/log"
+	"forgejo.org/modules/markup"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/structs"
@@ -356,7 +360,7 @@ func getPullInfo(ctx *context.Context) (issue *issues_model.Issue, ok bool) {
 	ctx.Data["Issue"] = issue
 
 	if !issue.IsPull {
-		ctx.NotFound("ViewPullCommits", nil)
+		ctx.Redirect(issue.Link())
 		return nil, false
 	}
 
@@ -401,6 +405,7 @@ func setMergeTarget(ctx *context.Context, pull *issues_model.PullRequest) {
 
 // GetPullDiffStats get Pull Requests diff stats
 func GetPullDiffStats(ctx *context.Context) {
+	// FIXME: this getPullInfo seems to be a duplicate call with other route handlers
 	issue, ok := getPullInfo(ctx)
 	if !ok {
 		return
@@ -408,15 +413,15 @@ func GetPullDiffStats(ctx *context.Context) {
 	pull := issue.PullRequest
 
 	mergeBaseCommitID := GetMergedBaseCommitID(ctx, issue)
-
 	if mergeBaseCommitID == "" {
 		ctx.NotFound("PullFiles", nil)
 		return
 	}
 
+	// do not report 500 server error to end users if error occurs, otherwise a PR missing ref won't be able to view.
 	headCommitID, err := ctx.Repo.GitRepo.GetRefCommitID(pull.GetGitRefName())
 	if err != nil {
-		ctx.ServerError("GetRefCommitID", err)
+		log.Error("Failed to GetRefCommitID: %v, repo: %v", err, ctx.Repo.Repository.FullName())
 		return
 	}
 
@@ -498,6 +503,7 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
 			ctx.Data["IsPullRequestBroken"] = true
 			ctx.Data["BaseTarget"] = pull.BaseBranch
 			ctx.Data["NumCommits"] = 0
+			ctx.Data["CommitIDs"] = map[string]bool{}
 			ctx.Data["NumFiles"] = 0
 			return nil
 		}
@@ -508,6 +514,12 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
 	ctx.Data["NumCommits"] = len(compareInfo.Commits)
 	ctx.Data["NumFiles"] = compareInfo.NumFiles
 
+	commitIDs := map[string]bool{}
+	for _, commit := range compareInfo.Commits {
+		commitIDs[commit.ID.String()] = true
+	}
+	ctx.Data["CommitIDs"] = commitIDs
+
 	if len(compareInfo.Commits) != 0 {
 		sha := compareInfo.Commits[0].ID.String()
 		commitStatuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, sha, db.ListOptionsAll)
@@ -515,9 +527,6 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
 			ctx.ServerError("GetLatestCommitStatus", err)
 			return nil
 		}
-		if !ctx.Repo.CanRead(unit.TypeActions) {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses)
-		}
 
 		if len(commitStatuses) != 0 {
 			ctx.Data["LatestCommitStatuses"] = commitStatuses
@@ -581,9 +590,6 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 			ctx.ServerError("GetLatestCommitStatus", err)
 			return nil
 		}
-		if !ctx.Repo.CanRead(unit.TypeActions) {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses)
-		}
 
 		if len(commitStatuses) > 0 {
 			ctx.Data["LatestCommitStatuses"] = commitStatuses
@@ -597,6 +603,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 				ctx.Data["IsPullRequestBroken"] = true
 				ctx.Data["BaseTarget"] = pull.BaseBranch
 				ctx.Data["NumCommits"] = 0
+				ctx.Data["CommitIDs"] = map[string]bool{}
 				ctx.Data["NumFiles"] = 0
 				return nil
 			}
@@ -607,6 +614,13 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 
 		ctx.Data["NumCommits"] = len(compareInfo.Commits)
 		ctx.Data["NumFiles"] = compareInfo.NumFiles
+
+		commitIDs := map[string]bool{}
+		for _, commit := range compareInfo.Commits {
+			commitIDs[commit.ID.String()] = true
+		}
+		ctx.Data["CommitIDs"] = commitIDs
+
 		return compareInfo
 	}
 
@@ -624,7 +638,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 		if pull.Flow == issues_model.PullRequestFlowGithub {
 			headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch)
 		} else {
-			headBranchExist = git.IsReferenceExist(ctx, baseGitRepo.Path, pull.GetGitRefName())
+			headBranchExist = baseGitRepo.IsReferenceExist(pull.GetGitRefName())
 		}
 
 		if headBranchExist {
@@ -665,6 +679,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 			}
 			ctx.Data["BaseTarget"] = pull.BaseBranch
 			ctx.Data["NumCommits"] = 0
+			ctx.Data["CommitIDs"] = map[string]bool{}
 			ctx.Data["NumFiles"] = 0
 			return nil
 		}
@@ -677,9 +692,6 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 		ctx.ServerError("GetLatestCommitStatus", err)
 		return nil
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		git_model.CommitStatusesHideActionsURL(ctx, commitStatuses)
-	}
 
 	if len(commitStatuses) > 0 {
 		ctx.Data["LatestCommitStatuses"] = commitStatuses
@@ -727,7 +739,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 	ctx.Data["HeadBranchCommitID"] = headBranchSha
 	ctx.Data["PullHeadCommitID"] = sha
 
-	if pull.HeadRepo == nil || !headBranchExist || (!pull.Issue.IsClosed && (headBranchSha != sha)) {
+	if pull.HeadRepo == nil || !headBranchExist || (!pull.Issue.IsClosed && !pull.IsChecking() && (headBranchSha != sha)) {
 		ctx.Data["IsPullRequestBroken"] = true
 		if pull.IsSameRepo() {
 			ctx.Data["HeadTarget"] = pull.HeadBranch
@@ -745,6 +757,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 			ctx.Data["IsPullRequestBroken"] = true
 			ctx.Data["BaseTarget"] = pull.BaseBranch
 			ctx.Data["NumCommits"] = 0
+			ctx.Data["CommitIDs"] = map[string]bool{}
 			ctx.Data["NumFiles"] = 0
 			return nil
 		}
@@ -769,6 +782,13 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C
 
 	ctx.Data["NumCommits"] = len(compareInfo.Commits)
 	ctx.Data["NumFiles"] = compareInfo.NumFiles
+
+	commitIDs := map[string]bool{}
+	for _, commit := range compareInfo.Commits {
+		commitIDs[commit.ID.String()] = true
+	}
+	ctx.Data["CommitIDs"] = commitIDs
+
 	return compareInfo
 }
 
@@ -847,7 +867,7 @@ func ViewPullCommits(ctx *context.Context) {
 	ctx.Data["Username"] = ctx.Repo.Owner.Name
 	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
 
-	commits := processGitCommits(ctx, prInfo.Commits)
+	commits := git_model.ParseCommitsWithStatus(ctx, prInfo.Commits, ctx.Repo.Repository)
 	ctx.Data["Commits"] = commits
 	ctx.Data["CommitCount"] = len(commits)
 
@@ -892,7 +912,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		foundStartCommit := len(specifiedStartCommit) == 0
 		foundEndCommit := len(specifiedEndCommit) == 0
 
-		if !(foundStartCommit && foundEndCommit) {
+		if !foundStartCommit || !foundEndCommit {
 			for _, commit := range prInfo.Commits {
 				if commit.ID.String() == specifiedStartCommit {
 					foundStartCommit = true
@@ -907,7 +927,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			}
 		}
 
-		if !(foundStartCommit && foundEndCommit) {
+		if !foundStartCommit || !foundEndCommit {
 			ctx.NotFound("Given SHA1 not found for this PR", nil)
 			return
 		}
@@ -928,7 +948,85 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 
 	ctx.Data["IsShowingOnlySingleCommit"] = willShowSpecifiedCommit
 
-	if willShowSpecifiedCommit || willShowSpecifiedCommitRange {
+	if willShowSpecifiedCommit {
+		commitID := specifiedEndCommit
+
+		ctx.Data["CommitID"] = commitID
+
+		var prevCommit, curCommit, nextCommit *git.Commit
+
+		// Iterate in reverse to properly map "previous" and "next" buttons
+		for i := len(prInfo.Commits) - 1; i >= 0; i-- {
+			commit := prInfo.Commits[i]
+
+			if curCommit != nil {
+				nextCommit = commit
+				break
+			}
+
+			if commit.ID.String() == commitID {
+				curCommit = commit
+			} else {
+				prevCommit = commit
+			}
+		}
+
+		if curCommit == nil {
+			ctx.ServerError("Repo.GitRepo.viewPullFiles", git.ErrNotExist{ID: commitID})
+			return
+		}
+
+		ctx.Data["Commit"] = curCommit
+		if prevCommit != nil {
+			ctx.Data["PrevCommitLink"] = path.Join(ctx.Repo.RepoLink, "pulls", strconv.FormatInt(issue.Index, 10), "commits", prevCommit.ID.String())
+		}
+		if nextCommit != nil {
+			ctx.Data["NextCommitLink"] = path.Join(ctx.Repo.RepoLink, "pulls", strconv.FormatInt(issue.Index, 10), "commits", nextCommit.ID.String())
+		}
+
+		statuses, _, err := git_model.GetLatestCommitStatus(ctx, ctx.Repo.Repository.ID, commitID, db.ListOptionsAll)
+		if err != nil {
+			log.Error("GetLatestCommitStatus: %v", err)
+		}
+
+		ctx.Data["CommitStatus"] = git_model.CalcCommitStatus(statuses)
+		ctx.Data["CommitStatuses"] = statuses
+
+		verification := asymkey_model.ParseCommitWithSignature(ctx, curCommit)
+		ctx.Data["Verification"] = verification
+		ctx.Data["Author"] = user_model.ValidateCommitWithEmail(ctx, curCommit)
+
+		if err := asymkey_model.CalculateTrustStatus(verification, ctx.Repo.Repository.GetTrustModel(), func(user *user_model.User) (bool, error) {
+			return repo_model.IsOwnerMemberCollaborator(ctx, ctx.Repo.Repository, user.ID)
+		}, nil); err != nil {
+			ctx.ServerError("CalculateTrustStatus", err)
+			return
+		}
+
+		note := &git.Note{}
+		err = git.GetNote(ctx, ctx.Repo.GitRepo, specifiedEndCommit, note)
+		if err == nil {
+			ctx.Data["NoteCommit"] = note.Commit
+			ctx.Data["NoteAuthor"] = user_model.ValidateCommitWithEmail(ctx, note.Commit)
+			ctx.Data["NoteRendered"], err = markup.RenderCommitMessage(&markup.RenderContext{
+				Links: markup.Links{
+					Base:       ctx.Repo.RepoLink,
+					BranchPath: path.Join("commit", util.PathEscapeSegments(commitID)),
+				},
+				Metas:   ctx.Repo.Repository.ComposeMetas(ctx),
+				GitRepo: ctx.Repo.GitRepo,
+				Ctx:     ctx,
+			}, template.HTMLEscapeString(string(charset.ToUTF8WithFallback(note.Message, charset.ConvertOpts{}))))
+			if err != nil {
+				ctx.ServerError("RenderCommitMessage", err)
+				return
+			}
+		}
+
+		endCommitID = commitID
+		startCommitID = prInfo.MergeBase
+		ctx.Data["IsShowingAllCommits"] = false
+	} else if willShowSpecifiedCommitRange {
 		if len(specifiedEndCommit) > 0 {
 			endCommitID = specifiedEndCommit
 		} else {
@@ -939,6 +1037,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		} else {
 			startCommitID = prInfo.MergeBase
 		}
+
 		ctx.Data["IsShowingAllCommits"] = false
 	} else {
 		endCommitID = headCommitID
@@ -946,10 +1045,10 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 		ctx.Data["IsShowingAllCommits"] = true
 	}
 
-	ctx.Data["Username"] = ctx.Repo.Owner.Name
-	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
 	ctx.Data["AfterCommitID"] = endCommitID
 	ctx.Data["BeforeCommitID"] = startCommitID
+	ctx.Data["Username"] = ctx.Repo.Owner.Name
+	ctx.Data["Reponame"] = ctx.Repo.Repository.Name
 
 	fileOnly := ctx.FormBool("file-only")
 
@@ -981,7 +1080,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 	// as the viewed information is designed to be loaded only on latest PR
 	// diff and if you're signed in.
 	if !ctx.IsSigned || willShowSpecifiedCommit || willShowSpecifiedCommitRange {
-		diff, err = gitdiff.GetDiff(ctx, gitRepo, diffOptions, files...)
+		diff, err = gitdiff.GetDiffFull(ctx, gitRepo, diffOptions, files...)
 		methodWithError = "GetDiff"
 	} else {
 		diff, err = gitdiff.SyncAndGetUserSpecificDiff(ctx, ctx.Doer.ID, pull, gitRepo, diffOptions, files...)
@@ -1053,7 +1152,7 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
 			ctx.ServerError("GetUserRepoPermission", err)
 			return
 		}
-		ctx.Data["HeadBranchIsEditable"] = pull.HeadRepo.CanEnableEditor() && issues_model.CanMaintainerWriteToBranch(ctx, headRepoPerm, pull.HeadBranch, ctx.Doer)
+		ctx.Data["HeadBranchIsEditable"] = pull.HeadRepo.CanEnableEditor() && issues_model.CanMaintainerWriteToBranch(ctx, headRepoPerm, pull.HeadBranch, ctx.Doer) && pull.Flow != issues_model.PullRequestFlowAGit
 		ctx.Data["SourceRepoLink"] = pull.HeadRepo.Link()
 		ctx.Data["HeadBranch"] = pull.HeadBranch
 	}
@@ -1207,8 +1306,6 @@ func UpdatePullRequest(ctx *context.Context) {
 		return
 	}
 
-	time.Sleep(1 * time.Second)
-
 	ctx.Flash.Success(ctx.Tr("repo.pulls.update_branch_success"))
 	ctx.Redirect(issue.Link())
 }
@@ -1321,8 +1418,8 @@ func MergePullRequest(ctx *context.Context) {
 		} else if models.IsErrMergeConflicts(err) {
 			conflictError := err.(models.ErrMergeConflicts)
 			flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
-				"Message": ctx.Tr("repo.editor.merge_conflict"),
-				"Summary": ctx.Tr("repo.editor.merge_conflict_summary"),
+				"Message": ctx.Tr("repo.pulls.merge_conflict"),
+				"Summary": ctx.Tr("repo.pulls.merge_conflict_summary"),
 				"Details": utils.SanitizeFlashErrorString(conflictError.StdErr) + "<br>" + utils.SanitizeFlashErrorString(conflictError.StdOut),
 			})
 			if err != nil {
@@ -1348,6 +1445,10 @@ func MergePullRequest(ctx *context.Context) {
 			log.Debug("MergeUnrelatedHistories error: %v", err)
 			ctx.Flash.Error(ctx.Tr("repo.pulls.unrelated_histories"))
 			ctx.JSONRedirect(issue.Link())
+		} else if models.IsErrPullRequestHasMerged(err) {
+			log.Debug("MergePullRequestHasMerged error: %v", err)
+			ctx.Flash.Error(ctx.Tr("repo.pulls.already_merged"))
+			ctx.JSONRedirect(issue.Link())
 		} else if git.IsErrPushOutOfDate(err) {
 			log.Debug("MergePushOutOfDate error: %v", err)
 			ctx.Flash.Error(ctx.Tr("repo.pulls.merge_out_of_date"))
diff --git a/routers/web/repo/pull_review.go b/routers/web/repo/pull_review.go
index 18a5b872f1..941e428039 100644
--- a/routers/web/repo/pull_review.go
+++ b/routers/web/repo/pull_review.go
@@ -211,9 +211,10 @@ func renderConversation(ctx *context.Context, comment *issues_model.Comment, ori
 		return
 	}
 	ctx.Data["AfterCommitID"] = pullHeadCommitID
-	if origin == "diff" {
+	switch origin {
+	case "diff":
 		ctx.HTML(http.StatusOK, tplDiffConversation)
-	} else if origin == "timeline" {
+	case "timeline":
 		ctx.HTML(http.StatusOK, tplTimelineConversation)
 	}
 }
diff --git a/routers/web/repo/recent_commits.go b/routers/web/repo/recent_commits.go
index 6154de7377..211b1b2b12 100644
--- a/routers/web/repo/recent_commits.go
+++ b/routers/web/repo/recent_commits.go
@@ -4,12 +4,10 @@
 package repo
 
 import (
-	"errors"
 	"net/http"
 
 	"forgejo.org/modules/base"
 	"forgejo.org/services/context"
-	contributors_service "forgejo.org/services/repository"
 )
 
 const (
@@ -26,16 +24,3 @@ func RecentCommits(ctx *context.Context) {
 
 	ctx.HTML(http.StatusOK, tplRecentCommits)
 }
-
-// RecentCommitsData returns JSON of recent commits data
-func RecentCommitsData(ctx *context.Context) {
-	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
-		if errors.Is(err, contributors_service.ErrAwaitGeneration) {
-			ctx.Status(http.StatusAccepted)
-			return
-		}
-		ctx.ServerError("RecentCommitsData", err)
-	} else {
-		ctx.JSON(http.StatusOK, contributorStats["total"].Weeks)
-	}
-}
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 024dd7b62d..a6de337192 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -1,5 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Copyright 2018 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repo
@@ -249,7 +250,7 @@ func addVerifyTagToContext(ctx *context.Context) {
 		if verification == nil {
 			return false
 		}
-		return verification.Reason != "gpg.error.not_signed_commit"
+		return verification.Reason != asymkey.NotSigned
 	}
 }
 
diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go
index b31e2e203a..05eeadc519 100644
--- a/routers/web/repo/render.go
+++ b/routers/web/repo/render.go
@@ -41,7 +41,7 @@ func RenderFile(ctx *context.Context) {
 	n, _ := util.ReadAtMost(dataRc, buf)
 	buf = buf[:n]
 
-	st := typesniffer.DetectContentType(buf)
+	st := typesniffer.DetectContentType(buf, blob.Name())
 	isTextFile := st.IsText()
 
 	rd := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc), charset.ConvertOpts{})
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 53b3f34347..493787ad8b 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -693,9 +693,6 @@ func SearchRepo(ctx *context.Context) {
 		ctx.JSON(http.StatusInternalServerError, nil)
 		return
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		git_model.CommitStatusesHideActionsURL(ctx, latestCommitStatuses)
-	}
 
 	results := make([]*repo_service.WebSearchRepository, len(repos))
 	for i, repo := range repos {
@@ -782,3 +779,27 @@ func PrepareBranchList(ctx *context.Context) {
 	}
 	ctx.Data["Branches"] = brs
 }
+
+func SyncFork(ctx *context.Context) {
+	redirectURL := fmt.Sprintf("%s/src/branch/%s", ctx.Repo.RepoLink, util.PathEscapeSegments(ctx.Repo.BranchName))
+	branch := ctx.FormString("branch")
+
+	syncForkInfo, err := repo_service.GetSyncForkInfo(ctx, ctx.Repo.Repository, branch)
+	if err != nil {
+		ctx.ServerError("GetSyncForkInfo", err)
+		return
+	}
+
+	if !syncForkInfo.Allowed {
+		ctx.Redirect(redirectURL)
+		return
+	}
+
+	err = repo_service.SyncFork(ctx, ctx.Doer, ctx.Repo.Repository, branch)
+	if err != nil {
+		ctx.ServerError("SyncFork", err)
+		return
+	}
+
+	ctx.Redirect(redirectURL)
+}
diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go
index abbb12cacb..20e211316d 100644
--- a/routers/web/repo/setting/avatar.go
+++ b/routers/web/repo/setting/avatar.go
@@ -45,8 +45,8 @@ func UpdateAvatarSetting(ctx *context.Context, form forms.AvatarForm) error {
 	if err != nil {
 		return fmt.Errorf("io.ReadAll: %w", err)
 	}
-	st := typesniffer.DetectContentType(data)
-	if !(st.IsImage() && !st.IsSvgImage()) {
+	st := typesniffer.DetectContentType(data, "")
+	if !st.IsImage() || st.IsSvgImage() {
 		return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_not_a_image"))
 	}
 	if err = repo_service.UploadAvatar(ctx, ctxRepo, data); err != nil {
diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go
index 2e9c34e8a7..9930d03e8e 100644
--- a/routers/web/repo/setting/lfs.go
+++ b/routers/web/repo/setting/lfs.go
@@ -291,7 +291,7 @@ func LFSFileGet(ctx *context.Context) {
 	}
 	buf = buf[:n]
 
-	st := typesniffer.DetectContentType(buf)
+	st := typesniffer.DetectContentType(buf, "")
 	ctx.Data["IsTextFile"] = st.IsText()
 	isRepresentableAsText := st.IsRepresentableAsText()
 
@@ -342,6 +342,20 @@ func LFSFileGet(ctx *context.Context) {
 		ctx.Data["IsVideoFile"] = true
 	case st.IsAudio():
 		ctx.Data["IsAudioFile"] = true
+	case st.Is3DModel():
+		ctx.Data["Is3DModelFile"] = true
+		switch {
+		case st.IsGLB():
+			ctx.Data["IsGLBFile"] = true
+		case st.IsSTL():
+			ctx.Data["IsSTLFile"] = true
+		case st.IsGLTF():
+			ctx.Data["IsGLTFFile"] = true
+		case st.IsOBJ():
+			ctx.Data["IsOBJFile"] = true
+		case st.Is3MF():
+			ctx.Data["Is3MFFile"] = true
+		}
 	case st.IsImage() && (setting.UI.SVG.Enabled || !st.IsSvgImage()):
 		ctx.Data["IsImageFile"] = true
 	}
diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go
index 083cc4ae82..595fdace83 100644
--- a/routers/web/repo/setting/setting.go
+++ b/routers/web/repo/setting/setting.go
@@ -6,6 +6,7 @@
 package setting
 
 import (
+	go_context "context"
 	"errors"
 	"fmt"
 	"net/http"
@@ -14,7 +15,6 @@ import (
 	"time"
 
 	"forgejo.org/models"
-	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	"forgejo.org/models/organization"
 	quota_model "forgejo.org/models/quota"
@@ -24,6 +24,7 @@ import (
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/indexer/code"
+	"forgejo.org/modules/indexer/issues"
 	"forgejo.org/modules/indexer/stats"
 	"forgejo.org/modules/lfs"
 	"forgejo.org/modules/log"
@@ -64,6 +65,9 @@ func SettingsCtxData(ctx *context.Context) {
 	ctx.Data["DisableNewPushMirrors"] = setting.Mirror.DisableNewPush
 	ctx.Data["DefaultMirrorInterval"] = setting.Mirror.DefaultInterval
 	ctx.Data["MinimumMirrorInterval"] = setting.Mirror.MinInterval
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	signing, _ := asymkey_service.SigningKey(ctx, ctx.Repo.Repository.RepoPath())
 	ctx.Data["SigningKeyAvailable"] = len(signing) > 0
@@ -150,11 +154,9 @@ func UnitsPost(ctx *context.Context) {
 		})
 		deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeWiki)
 	} else if form.EnableWiki && !form.EnableExternalWiki && !unit_model.TypeWiki.UnitGlobalDisabled() {
-		var wikiPermissions repo_model.UnitAccessMode
+		wikiPermissions := repo_model.UnitAccessModeUnset
 		if form.GloballyWriteableWiki {
 			wikiPermissions = repo_model.UnitAccessModeWrite
-		} else {
-			wikiPermissions = repo_model.UnitAccessModeRead
 		}
 		units = append(units, repo_model.RepoUnit{
 			RepoID:             repo.ID,
@@ -588,6 +590,23 @@ func SettingsPost(ctx *context.Context) {
 			ctx.ServerError("UpdatePushMirrorInterval", err)
 			return
 		}
+
+		if m.BranchFilter != form.PushMirrorBranchFilter {
+			// replace `remote.<remote>.push` in config and db
+			m.BranchFilter = form.PushMirrorBranchFilter
+			if err := db.WithTx(ctx, func(ctx go_context.Context) error {
+				// Update the DB
+				if err = repo_model.UpdatePushMirrorBranchFilter(ctx, m); err != nil {
+					return err
+				}
+				// Update the repo config
+				return mirror_service.UpdatePushMirrorBranchFilter(ctx, m)
+			}); err != nil {
+				ctx.ServerError("UpdatePushMirrorBranchFilter", err)
+				return
+			}
+		}
+
 		// Background why we are adding it to Queue
 		// If we observed its implementation in the context of `push-mirror-sync` where it
 		// is evident that pushing to the queue is necessary for updates.
@@ -683,6 +702,7 @@ func SettingsPost(ctx *context.Context) {
 			SyncOnCommit:  form.PushMirrorSyncOnCommit,
 			Interval:      interval,
 			RemoteAddress: remoteAddress,
+			BranchFilter:  form.PushMirrorBranchFilter,
 		}
 
 		var plainPrivateKey []byte
@@ -776,6 +796,8 @@ func SettingsPost(ctx *context.Context) {
 				return
 			}
 			code.UpdateRepoIndexer(ctx.Repo.Repository)
+		case "issues":
+			issues.UpdateRepoIndexer(ctx, ctx.Repo.Repository.ID)
 		default:
 			ctx.NotFound("", nil)
 			return
@@ -1034,7 +1056,7 @@ func SettingsPost(ctx *context.Context) {
 			return
 		}
 
-		if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
+		if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
 			log.Error("CleanRepoScheduleTasks for archived repo %s/%s: %v", ctx.Repo.Owner.Name, repo.Name, err)
 		}
 
diff --git a/routers/web/repo/setting/settings_test.go b/routers/web/repo/setting/settings_test.go
index 6f05953bfb..3a81b85e4c 100644
--- a/routers/web/repo/setting/settings_test.go
+++ b/routers/web/repo/setting/settings_test.go
@@ -15,6 +15,7 @@ import (
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/modules/web"
 	"forgejo.org/services/context"
 	"forgejo.org/services/contexttest"
@@ -25,23 +26,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func createSSHAuthorizedKeysTmpPath(t *testing.T) func() {
-	tmpDir := t.TempDir()
-
-	oldPath := setting.SSH.RootPath
-	setting.SSH.RootPath = tmpDir
-
-	return func() {
-		setting.SSH.RootPath = oldPath
-	}
-}
-
 func TestAddReadOnlyDeployKey(t *testing.T) {
-	if deferable := createSSHAuthorizedKeysTmpPath(t); deferable != nil {
-		defer deferable()
-	} else {
-		return
-	}
+	defer test.MockVariableValue(&setting.SSH.RootPath, t.TempDir())()
 	unittest.PrepareTestEnv(t)
 
 	ctx, _ := contexttest.MockContext(t, "user2/repo1/settings/keys")
@@ -55,7 +41,7 @@ func TestAddReadOnlyDeployKey(t *testing.T) {
 	}
 	web.SetForm(ctx, &addKeyForm)
 	DeployKeysPost(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 
 	unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
 		Name:    addKeyForm.Title,
@@ -65,11 +51,7 @@ func TestAddReadOnlyDeployKey(t *testing.T) {
 }
 
 func TestAddReadWriteOnlyDeployKey(t *testing.T) {
-	if deferable := createSSHAuthorizedKeysTmpPath(t); deferable != nil {
-		defer deferable()
-	} else {
-		return
-	}
+	defer test.MockVariableValue(&setting.SSH.RootPath, t.TempDir())()
 
 	unittest.PrepareTestEnv(t)
 
@@ -85,7 +67,7 @@ func TestAddReadWriteOnlyDeployKey(t *testing.T) {
 	}
 	web.SetForm(ctx, &addKeyForm)
 	DeployKeysPost(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 
 	unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
 		Name:    addKeyForm.Title,
@@ -124,7 +106,7 @@ func TestCollaborationPost(t *testing.T) {
 
 	CollaborationPost(ctx)
 
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 
 	exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
 	require.NoError(t, err)
@@ -150,7 +132,7 @@ func TestCollaborationPost_InactiveUser(t *testing.T) {
 
 	CollaborationPost(ctx)
 
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -184,7 +166,7 @@ func TestCollaborationPost_AddCollaboratorTwice(t *testing.T) {
 
 	CollaborationPost(ctx)
 
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 
 	exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
 	require.NoError(t, err)
@@ -193,7 +175,7 @@ func TestCollaborationPost_AddCollaboratorTwice(t *testing.T) {
 	// Try adding the same collaborator again
 	CollaborationPost(ctx)
 
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -215,7 +197,7 @@ func TestCollaborationPost_NonExistentUser(t *testing.T) {
 
 	CollaborationPost(ctx)
 
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -255,7 +237,7 @@ func TestAddTeamPost(t *testing.T) {
 	AddTeamPost(ctx)
 
 	assert.True(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.Empty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -295,7 +277,7 @@ func TestAddTeamPost_NotAllowed(t *testing.T) {
 	AddTeamPost(ctx)
 
 	assert.False(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -336,7 +318,7 @@ func TestAddTeamPost_AddTeamTwice(t *testing.T) {
 
 	AddTeamPost(ctx)
 	assert.True(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
@@ -369,7 +351,7 @@ func TestAddTeamPost_NonExistentTeam(t *testing.T) {
 	ctx.Repo = repo
 
 	AddTeamPost(ctx)
-	assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+	assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 	assert.NotEmpty(t, ctx.Flash.ErrorMsg)
 }
 
diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go
index 6d4d9e47e2..0caa196e25 100644
--- a/routers/web/repo/setting/webhook.go
+++ b/routers/web/repo/setting/webhook.go
@@ -175,6 +175,9 @@ func ParseHookEvent(form forms.WebhookCoreForm) *webhook_module.HookEvent {
 			Wiki:                     form.Wiki,
 			Repository:               form.Repository,
 			Package:                  form.Package,
+			ActionRunFailure:         form.ActionFailure,
+			ActionRunRecover:         form.ActionRecover,
+			ActionRunSuccess:         form.ActionSuccess,
 		},
 		BranchFilter: form.BranchFilter,
 	}
diff --git a/routers/web/repo/treelist.go b/routers/web/repo/treelist.go
index 5c37f2ebca..20ea9babbe 100644
--- a/routers/web/repo/treelist.go
+++ b/routers/web/repo/treelist.go
@@ -42,7 +42,7 @@ func isExcludedEntry(entry *git.TreeEntry) bool {
 		return true
 	}
 
-	if entry.IsSubModule() {
+	if entry.IsSubmodule() {
 		return true
 	}
 
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index bea002f690..cd0af75b8f 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -1,5 +1,6 @@
-// Copyright 2017 The Gitea Authors. All rights reserved.
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repo
@@ -52,9 +53,10 @@ import (
 	"forgejo.org/routers/web/feed"
 	"forgejo.org/services/context"
 	issue_service "forgejo.org/services/issue"
+	repo_service "forgejo.org/services/repository"
 	files_service "forgejo.org/services/repository/files"
 
-	"github.com/nektos/act/pkg/model"
+	"code.forgejo.org/forgejo/runner/v9/act/model"
 
 	_ "golang.org/x/image/bmp"  // for processing bmp images
 	_ "golang.org/x/image/webp" // for processing webp images
@@ -226,7 +228,7 @@ func getFileReader(ctx gocontext.Context, repoID int64, blob *git.Blob) ([]byte,
 	n, _ := util.ReadAtMost(dataRc, buf)
 	buf = buf[:n]
 
-	st := typesniffer.DetectContentType(buf)
+	st := typesniffer.DetectContentType(buf, blob.Name())
 	isTextFile := st.IsText()
 
 	// FIXME: what happens when README file is an image?
@@ -260,7 +262,7 @@ func getFileReader(ctx gocontext.Context, repoID int64, blob *git.Blob) ([]byte,
 	}
 	buf = buf[:n]
 
-	st = typesniffer.DetectContentType(buf)
+	st = typesniffer.DetectContentType(buf, blob.Name())
 
 	return buf, dataRc, &fileInfo{st.IsText(), true, meta.Size, &meta.Pointer, st}, nil
 }
@@ -367,9 +369,6 @@ func loadLatestCommitData(ctx *context.Context, latestCommit *git.Commit) bool {
 		if err != nil {
 			log.Error("GetLatestCommitStatus: %v", err)
 		}
-		if !ctx.Repo.CanRead(unit_model.TypeActions) {
-			git_model.CommitStatusesHideActionsURL(ctx, statuses)
-		}
 
 		ctx.Data["LatestCommitStatus"] = git_model.CalcCommitStatus(statuses)
 		ctx.Data["LatestCommitStatuses"] = statuses
@@ -435,13 +434,13 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry) {
 		if err != nil {
 			log.Error("actions.GetContentFromEntry: %v", err)
 		}
-		_, workFlowErr := model.ReadWorkflow(bytes.NewReader(content))
+		_, workFlowErr := model.ReadWorkflow(bytes.NewReader(content), true)
 		if workFlowErr != nil {
 			ctx.Data["FileError"] = ctx.Locale.Tr("actions.runs.invalid_workflow_helper", workFlowErr.Error())
 		}
-	} else if slices.Contains([]string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS"}, ctx.Repo.TreePath) {
-		if data, err := blob.GetBlobContent(setting.UI.MaxDisplayFileSize); err == nil {
-			_, warnings := issue_model.GetCodeOwnersFromContent(ctx, data)
+	} else if slices.Contains([]string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS", ".forgejo/CODEOWNERS"}, ctx.Repo.TreePath) {
+		if rc, size, err := blob.NewTruncatedReader(setting.UI.MaxDisplayFileSize); err == nil {
+			_, warnings := issue_model.GetCodeOwnersFromReader(ctx, rc, size > setting.UI.MaxDisplayFileSize)
 			if len(warnings) > 0 {
 				ctx.Data["FileWarning"] = strings.Join(warnings, "\n")
 			}
@@ -625,6 +624,20 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry) {
 		ctx.Data["IsVideoFile"] = true
 	case fInfo.st.IsAudio():
 		ctx.Data["IsAudioFile"] = true
+	case fInfo.st.Is3DModel():
+		ctx.Data["Is3DModelFile"] = true
+		switch {
+		case fInfo.st.IsGLB():
+			ctx.Data["IsGLBFile"] = true
+		case fInfo.st.IsSTL():
+			ctx.Data["IsSTLFile"] = true
+		case fInfo.st.IsGLTF():
+			ctx.Data["IsGLTFFile"] = true
+		case fInfo.st.IsOBJ():
+			ctx.Data["IsOBJFile"] = true
+		case fInfo.st.Is3MF():
+			ctx.Data["Is3MFFile"] = true
+		}
 	case fInfo.st.IsImage() && (setting.UI.SVG.Enabled || !fInfo.st.IsSvgImage()):
 		ctx.Data["IsImageFile"] = true
 		ctx.Data["CanCopyContent"] = true
@@ -1044,14 +1057,13 @@ func renderHomeCode(ctx *context.Context) {
 		return
 	}
 
-	if entry.IsSubModule() {
-		subModuleURL, err := ctx.Repo.Commit.GetSubModule(entry.Name())
+	if entry.IsSubmodule() {
+		submodule, err := ctx.Repo.Commit.GetSubmodule(ctx.Repo.TreePath, entry)
 		if err != nil {
-			HandleGitError(ctx, "Repo.Commit.GetSubModule", err)
+			HandleGitError(ctx, "Repo.Commit.GetSubmodule", err)
 			return
 		}
-		subModuleFile := git.NewSubModuleFile(ctx.Repo.Commit, subModuleURL, entry.ID.String())
-		ctx.Redirect(subModuleFile.RefURL(setting.AppURL, ctx.Repo.Repository.FullName(), setting.SSH.Domain))
+		ctx.Redirect(submodule.ResolveUpstreamURL(ctx.Repo.Repository.HTMLURL()))
 	} else if entry.IsDir() {
 		renderDirectory(ctx)
 	} else {
@@ -1154,6 +1166,20 @@ PostRecentBranchCheck:
 		}
 	}
 
+	if ctx.Repo.Repository.IsFork && ctx.Repo.IsViewBranch && len(ctx.Repo.TreePath) == 0 && ctx.Repo.CanWriteToBranch(ctx, ctx.Doer, ctx.Repo.BranchName) {
+		syncForkInfo, err := repo_service.GetSyncForkInfo(ctx, ctx.Repo.Repository, ctx.Repo.BranchName)
+		if err != nil {
+			ctx.ServerError("CanSync", err)
+			return
+		}
+
+		if syncForkInfo.Allowed {
+			ctx.Data["CanSyncFork"] = true
+			ctx.Data["ForkCommitsBehind"] = syncForkInfo.CommitsBehind
+			ctx.Data["BaseBranchLink"] = fmt.Sprintf("%s/src/branch/%s", ctx.Repo.Repository.BaseRepo.HTMLURL(), util.PathEscapeSegments(ctx.Repo.BranchName))
+		}
+	}
+
 	ctx.Data["Paths"] = paths
 
 	branchLink := ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
@@ -1195,7 +1221,7 @@ func checkOutdatedBranch(ctx *context.Context) {
 	}
 
 	if dbBranch.CommitID != commit.ID.String() {
-		ctx.Flash.Warning(ctx.Tr("repo.error.broken_git_hook", "https://docs.gitea.com/help/faq#push-hook--webhook--actions-arent-running"), true)
+		ctx.Flash.Warning(ctx.Tr("warning.repository.out_of_sync"), true)
 	}
 }
 
@@ -1225,6 +1251,7 @@ func RenderUserCards(ctx *context.Context, total int, getter func(opts db.ListOp
 func Watchers(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.watchers")
 	ctx.Data["CardsTitle"] = ctx.Tr("repo.watchers")
+	ctx.Data["CardsNoneMsg"] = ctx.Tr("watch.list.none")
 	ctx.Data["PageIsWatchers"] = true
 
 	RenderUserCards(ctx, ctx.Repo.Repository.NumWatches, func(opts db.ListOptions) ([]*user_model.User, error) {
@@ -1236,6 +1263,7 @@ func Watchers(ctx *context.Context) {
 func Stars(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.stargazers")
 	ctx.Data["CardsTitle"] = ctx.Tr("repo.stargazers")
+	ctx.Data["CardsNoneMsg"] = ctx.Tr("stars.list.none")
 	ctx.Data["PageIsStargazers"] = true
 	RenderUserCards(ctx, ctx.Repo.Repository.NumStars, func(opts db.ListOptions) ([]*user_model.User, error) {
 		return repo_model.GetStargazers(ctx, ctx.Repo.Repository, opts)
diff --git a/routers/web/repo/wiki.go b/routers/web/repo/wiki.go
index 9a21ac21a3..1b5265978a 100644
--- a/routers/web/repo/wiki.go
+++ b/routers/web/repo/wiki.go
@@ -393,7 +393,7 @@ func renderRevisionPage(ctx *context.Context) (*git.Repository, *git.TreeEntry)
 		ctx.ServerError("CommitsByFileAndRange", err)
 		return nil, nil
 	}
-	ctx.Data["Commits"] = git_model.ConvertFromGitCommit(ctx, commitsHistory, ctx.Repo.Repository)
+	ctx.Data["Commits"] = git_model.ParseCommitsWithStatus(ctx, commitsHistory, ctx.Repo.Repository)
 
 	pager := context.NewPagination(int(commitsCount), setting.Git.CommitsRangeSize, page, 5)
 	pager.SetDefaultParams(ctx)
diff --git a/routers/web/repo/wiki_test.go b/routers/web/repo/wiki_test.go
index cba416fc92..5709b32257 100644
--- a/routers/web/repo/wiki_test.go
+++ b/routers/web/repo/wiki_test.go
@@ -73,7 +73,7 @@ func assertPagesMetas(t *testing.T, expectedNames []string, metas any) {
 		return
 	}
 	for i, pageMeta := range pageMetas {
-		assert.EqualValues(t, expectedNames[i], pageMeta.Name)
+		assert.Equal(t, expectedNames[i], pageMeta.Name)
 	}
 }
 
@@ -84,7 +84,7 @@ func TestWiki(t *testing.T) {
 	ctx.SetParams("*", "Home")
 	contexttest.LoadRepo(t, ctx, 1)
 	Wiki(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, "Home", ctx.Data["Title"])
 	assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File", "XSS"}, ctx.Data["Pages"])
 }
@@ -95,7 +95,7 @@ func TestWikiPages(t *testing.T) {
 	ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_pages")
 	contexttest.LoadRepo(t, ctx, 1)
 	WikiPages(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assertPagesMetas(t, []string{"Home", "Long Page", "Page With Image", "Page With Spaced Name", "Unescaped File", "XSS"}, ctx.Data["Pages"])
 }
 
@@ -106,7 +106,7 @@ func TestNewWiki(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadRepo(t, ctx, 1)
 	NewWiki(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, ctx.Tr("repo.wiki.new_page"), ctx.Data["Title"])
 }
 
@@ -126,7 +126,7 @@ func TestNewWikiPost(t *testing.T) {
 			Message: message,
 		})
 		NewWikiPost(ctx)
-		assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+		assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 		assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
 		assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
 	}
@@ -144,7 +144,7 @@ func TestNewWikiPost_ReservedName(t *testing.T) {
 		Message: message,
 	})
 	NewWikiPost(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, ctx.Tr("repo.wiki.reserved_page"), ctx.Flash.ErrorMsg)
 	assertWikiNotExists(t, ctx.Repo.Repository, "_edit")
 }
@@ -157,7 +157,7 @@ func TestEditWiki(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadRepo(t, ctx, 1)
 	EditWiki(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, "Home", ctx.Data["Title"])
 	assert.Equal(t, wikiContent(t, ctx.Repo.Repository, "Home"), ctx.Data["content"])
 }
@@ -178,7 +178,7 @@ func TestEditWikiPost(t *testing.T) {
 			Message: message,
 		})
 		EditWikiPost(ctx)
-		assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+		assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 		assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
 		assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
 		if title != "Home" {
@@ -194,7 +194,7 @@ func TestDeleteWikiPagePost(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadRepo(t, ctx, 1)
 	DeleteWikiPagePost(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assertWikiNotExists(t, ctx.Repo.Repository, "Home")
 }
 
@@ -215,10 +215,10 @@ func TestWikiRaw(t *testing.T) {
 		contexttest.LoadRepo(t, ctx, 1)
 		WikiRaw(ctx)
 		if filetype == "" {
-			assert.EqualValues(t, http.StatusNotFound, ctx.Resp.Status(), "filepath: %s", filepath)
+			assert.Equal(t, http.StatusNotFound, ctx.Resp.Status(), "filepath: %s", filepath)
 		} else {
-			assert.EqualValues(t, http.StatusOK, ctx.Resp.Status(), "filepath: %s", filepath)
-			assert.EqualValues(t, filetype, ctx.Resp.Header().Get("Content-Type"), "filepath: %s", filepath)
+			assert.Equal(t, http.StatusOK, ctx.Resp.Status(), "filepath: %s", filepath)
+			assert.Equal(t, filetype, ctx.Resp.Header().Get("Content-Type"), "filepath: %s", filepath)
 		}
 	}
 }
diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go
index c26ff19165..379e23cce4 100644
--- a/routers/web/shared/user/header.go
+++ b/routers/web/shared/user/header.go
@@ -38,6 +38,7 @@ func prepareContextForCommonProfile(ctx *context.Context) {
 func PrepareContextForProfileBigAvatar(ctx *context.Context) {
 	prepareContextForCommonProfile(ctx)
 
+	ctx.Data["IsModerationEnabled"] = setting.Moderation.Enabled
 	ctx.Data["IsBlocked"] = ctx.Doer != nil && user_model.IsBlocked(ctx, ctx.Doer.ID, ctx.ContextUser.ID)
 	ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID)
 	ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate
@@ -66,6 +67,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) {
 	showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
 	orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{
 		UserID:         ctx.ContextUser.ID,
+		IncludeLimited: ctx.IsSigned,
 		IncludePrivate: showPrivate,
 	})
 	if err != nil {
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index 9f22cebaba..d980fa393a 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -16,7 +16,6 @@ import (
 	activities_model "forgejo.org/models/activities"
 	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/models/db"
-	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
 	"forgejo.org/models/organization"
 	repo_model "forgejo.org/models/repo"
@@ -611,11 +610,6 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 		ctx.ServerError("GetIssuesLastCommitStatus", err)
 		return
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		for key := range commitStatuses {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
-		}
-	}
 
 	// -------------------------------
 	// Fill stats to post to ctx.Data.
@@ -655,9 +649,10 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
 			return 0
 		}
 		reviewTyp := issues_model.ReviewTypeApprove
-		if typ == "reject" {
+		switch typ {
+		case "reject":
 			reviewTyp = issues_model.ReviewTypeReject
-		} else if typ == "waiting" {
+		case "waiting":
 			reviewTyp = issues_model.ReviewTypeRequest
 		}
 		for _, count := range counts {
diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go
index af9d50538d..f3a2f12ae6 100644
--- a/routers/web/user/home_test.go
+++ b/routers/web/user/home_test.go
@@ -40,15 +40,15 @@ func TestArchivedIssues(t *testing.T) {
 		NumIssues[repo.ID] = repo.NumIssues
 	}
 	assert.False(t, IsArchived[50])
-	assert.EqualValues(t, 1, NumIssues[50])
+	assert.Equal(t, 1, NumIssues[50])
 	assert.True(t, IsArchived[51])
-	assert.EqualValues(t, 1, NumIssues[51])
+	assert.Equal(t, 1, NumIssues[51])
 
 	// Act
 	Issues(ctx)
 
 	// Assert: One Issue (ID 30) from one Repo (ID 50) is retrieved, while nothing from archived Repo 51 is retrieved
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 
 	assert.Len(t, ctx.Data["Issues"], 1)
 }
@@ -61,7 +61,7 @@ func TestIssues(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	ctx.Req.Form.Set("state", "closed")
 	Issues(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 
 	assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
 	assert.Len(t, ctx.Data["Issues"], 1)
@@ -76,7 +76,7 @@ func TestPulls(t *testing.T) {
 	ctx.Req.Form.Set("state", "open")
 	ctx.Req.Form.Set("type", "your_repositories")
 	Pulls(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 
 	assert.Len(t, ctx.Data["Issues"], 5)
 }
@@ -91,15 +91,15 @@ func TestMilestones(t *testing.T) {
 	ctx.Req.Form.Set("state", "closed")
 	ctx.Req.Form.Set("sort", "furthestduedate")
 	Milestones(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"])
 	assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
 	assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])
 	assert.EqualValues(t, 1, ctx.Data["Total"])
 	assert.Len(t, ctx.Data["Milestones"], 1)
 	assert.Len(t, ctx.Data["Repos"], 2) // both repo 42 and 1 have milestones and both are owned by user 2
-	assert.EqualValues(t, "user2/glob", ctx.Data["Repos"].(repo_model.RepositoryList)[0].FullName())
-	assert.EqualValues(t, "user2/repo1", ctx.Data["Repos"].(repo_model.RepositoryList)[1].FullName())
+	assert.Equal(t, "user2/glob", ctx.Data["Repos"].(repo_model.RepositoryList)[0].FullName())
+	assert.Equal(t, "user2/repo1", ctx.Data["Repos"].(repo_model.RepositoryList)[1].FullName())
 }
 
 func TestMilestonesForSpecificRepo(t *testing.T) {
@@ -113,7 +113,7 @@ func TestMilestonesForSpecificRepo(t *testing.T) {
 	ctx.Req.Form.Set("state", "closed")
 	ctx.Req.Form.Set("sort", "furthestduedate")
 	Milestones(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 	assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"])
 	assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
 	assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])
@@ -144,7 +144,7 @@ func TestOrgLabels(t *testing.T) {
 	contexttest.LoadUser(t, ctx, 2)
 	contexttest.LoadOrganization(t, ctx, 3)
 	Issues(ctx)
-	assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
+	assert.Equal(t, http.StatusOK, ctx.Resp.Status())
 
 	assert.True(t, ctx.Data["PageIsOrgIssues"].(bool))
 
@@ -163,9 +163,9 @@ func TestOrgLabels(t *testing.T) {
 
 	if assert.Len(t, labels, len(orgLabels)) {
 		for i, label := range labels {
-			assert.EqualValues(t, orgLabels[i].OrgID, label.OrgID)
-			assert.EqualValues(t, orgLabels[i].ID, label.ID)
-			assert.EqualValues(t, orgLabels[i].Name, label.Name)
+			assert.Equal(t, orgLabels[i].OrgID, label.OrgID)
+			assert.Equal(t, orgLabels[i].ID, label.ID)
+			assert.Equal(t, orgLabels[i].Name, label.Name)
 		}
 	}
 }
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index 296951b2ff..fdca1a2fdd 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -13,10 +13,8 @@ import (
 
 	activities_model "forgejo.org/models/activities"
 	"forgejo.org/models/db"
-	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
 	repo_model "forgejo.org/models/repo"
-	"forgejo.org/models/unit"
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
@@ -311,11 +309,6 @@ func NotificationSubscriptions(ctx *context.Context) {
 		ctx.ServerError("GetIssuesAllCommitStatus", err)
 		return
 	}
-	if !ctx.Repo.CanRead(unit.TypeActions) {
-		for key := range commitStatuses {
-			git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
-		}
-	}
 	ctx.Data["CommitLastStatus"] = lastStatus
 	ctx.Data["CommitStatuses"] = commitStatuses
 	ctx.Data["Issues"] = issues
@@ -340,9 +333,10 @@ func NotificationSubscriptions(ctx *context.Context) {
 			return 0
 		}
 		reviewTyp := issues_model.ReviewTypeApprove
-		if typ == "reject" {
+		switch typ {
+		case "reject":
 			reviewTyp = issues_model.ReviewTypeReject
-		} else if typ == "waiting" {
+		case "waiting":
 			reviewTyp = issues_model.ReviewTypeRequest
 		}
 		for _, count := range counts {
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 5132b1da5c..78dd6c5e7c 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -1,5 +1,6 @@
 // Copyright 2015 The Gogs Authors. All rights reserved.
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
@@ -69,17 +70,6 @@ func userProfile(ctx *context.Context) {
 	ctx.Data["OpenGraphURL"] = ctx.ContextUser.HTMLURL()
 	ctx.Data["OpenGraphDescription"] = ctx.ContextUser.Description
 
-	// prepare heatmap data
-	if setting.Service.EnableUserHeatmap {
-		data, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
-		if err != nil {
-			ctx.ServerError("GetUserHeatmapDataByUser", err)
-			return
-		}
-		ctx.Data["HeatmapData"] = data
-		ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data)
-	}
-
 	profileDbRepo, profileGitRepo, profileReadmeBlob, profileClose := shared_user.FindUserProfileReadme(ctx, ctx.Doer)
 	defer profileClose()
 
@@ -170,11 +160,32 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 		ctx.Data["Cards"] = followers
 		total = int(numFollowers)
 		ctx.Data["CardsTitle"] = ctx.TrN(total, "user.followers.title.one", "user.followers.title.few")
+		if ctx.IsSigned && ctx.ContextUser.ID == ctx.Doer.ID {
+			ctx.Data["CardsNoneMsg"] = ctx.Tr("followers.incoming.list.self.none")
+		} else {
+			ctx.Data["CardsNoneMsg"] = ctx.Tr("followers.incoming.list.none")
+		}
 	case "following":
 		ctx.Data["Cards"] = following
 		total = int(numFollowing)
 		ctx.Data["CardsTitle"] = ctx.TrN(total, "user.following.title.one", "user.following.title.few")
+		if ctx.IsSigned && ctx.ContextUser.ID == ctx.Doer.ID {
+			ctx.Data["CardsNoneMsg"] = ctx.Tr("followers.outgoing.list.self.none")
+		} else {
+			ctx.Data["CardsNoneMsg"] = ctx.Tr("followers.outgoing.list.none", ctx.ContextUser.Name)
+		}
 	case "activity":
+		// prepare heatmap data
+		if setting.Service.EnableUserHeatmap {
+			data, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
+			if err != nil {
+				ctx.ServerError("GetUserHeatmapDataByUser", err)
+				return
+			}
+			ctx.Data["HeatmapData"] = data
+			ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data)
+		}
+
 		date := ctx.FormString("date")
 		pagingNum = setting.UI.FeedPagingNum
 		items, count, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
@@ -253,10 +264,12 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 
 		total = int(count)
 	case "overview":
-		if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil {
-			log.Error("failed to GetBlobContent: %v", err)
+		if rc, _, err := profileReadme.NewTruncatedReader(setting.UI.MaxDisplayFileSize); err != nil {
+			log.Error("failed to NewTruncatedReader: %v", err)
 		} else {
-			if profileContent, err := markdown.RenderString(&markup.RenderContext{
+			defer rc.Close()
+
+			if profileContent, err := markdown.RenderReader(&markup.RenderContext{
 				Ctx:     ctx,
 				GitRepo: profileGitRepo,
 				Links: markup.Links{
@@ -269,7 +282,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 					BranchPath: path.Join("branch", util.PathEscapeSegments(profileDbRepo.DefaultBranch)),
 				},
 				Metas: map[string]string{"mode": "document"},
-			}, bytes); err != nil {
+			}, rc); err != nil {
 				log.Error("failed to RenderString: %v", err)
 			} else {
 				ctx.Data["ProfileReadme"] = profileContent
diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index a0cdb25f44..1dfcc90e35 100644
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -57,7 +57,7 @@ func AccountPost(ctx *context.Context) {
 		return
 	}
 
-	if ctx.Doer.IsPasswordSet() && !ctx.Doer.ValidatePassword(form.OldPassword) {
+	if ctx.Doer.IsPasswordSet() && !ctx.Doer.ValidatePassword(ctx, form.OldPassword) {
 		ctx.Flash.Error(ctx.Tr("settings.password_incorrect"))
 	} else if form.Password != form.Retype {
 		ctx.Flash.Error(ctx.Tr("form.password_not_match"))
@@ -178,10 +178,10 @@ func EmailPost(ctx *context.Context) {
 	// Set Email Notification Preference
 	if ctx.FormString("_method") == "NOTIFICATION" {
 		preference := ctx.FormString("preference")
-		if !(preference == user_model.EmailNotificationsEnabled ||
-			preference == user_model.EmailNotificationsOnMention ||
-			preference == user_model.EmailNotificationsDisabled ||
-			preference == user_model.EmailNotificationsAndYourOwn) {
+		if preference != user_model.EmailNotificationsEnabled &&
+			preference != user_model.EmailNotificationsOnMention &&
+			preference != user_model.EmailNotificationsDisabled &&
+			preference != user_model.EmailNotificationsAndYourOwn {
 			log.Error("Email notifications preference change returned unrecognized option %s: %s", preference, ctx.Doer.Name)
 			ctx.ServerError("SetEmailPreference", errors.New("option unrecognized"))
 			return
@@ -212,7 +212,7 @@ func EmailPost(ctx *context.Context) {
 			loadAccountData(ctx)
 
 			ctx.RenderWithErr(ctx.Tr("form.email_been_used"), tplSettingsAccount, &form)
-		} else if validation.IsErrEmailCharIsNotSupported(err) || validation.IsErrEmailInvalid(err) {
+		} else if validation.IsErrEmailInvalid(err) {
 			loadAccountData(ctx)
 
 			ctx.RenderWithErr(ctx.Tr("form.email_invalid"), tplSettingsAccount, &form)
diff --git a/routers/web/user/setting/account_test.go b/routers/web/user/setting/account_test.go
index 82e00bbf7c..3f7e1c13bc 100644
--- a/routers/web/user/setting/account_test.go
+++ b/routers/web/user/setting/account_test.go
@@ -95,7 +95,7 @@ func TestChangePassword(t *testing.T) {
 			AccountPost(ctx)
 
 			assert.Contains(t, ctx.Flash.ErrorMsg, req.Message)
-			assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
+			assert.Equal(t, http.StatusSeeOther, ctx.Resp.Status())
 		})
 	}
 }
diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go
index f7fd1c3803..59ff31162b 100644
--- a/routers/web/user/setting/adopt.go
+++ b/routers/web/user/setting/adopt.go
@@ -16,12 +16,8 @@ import (
 
 // AdoptOrDeleteRepository adopts or deletes a repository
 func AdoptOrDeleteRepository(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("settings.adopt")
-	ctx.Data["PageIsSettingsRepos"] = true
 	allowAdopt := ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories
-	ctx.Data["allowAdopt"] = allowAdopt
 	allowDelete := ctx.IsUserSiteAdmin() || setting.Repository.AllowDeleteOfUnadoptedRepositories
-	ctx.Data["allowDelete"] = allowDelete
 
 	dir := ctx.FormString("id")
 	action := ctx.FormString("action")
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index 631d5958ea..e73239b79b 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -49,6 +49,9 @@ func ApplicationsPost(ctx *context.Context) {
 		ctx.ServerError("GetScope", err)
 		return
 	}
+	if !scope.HasPermissionScope() {
+		ctx.Flash.Error(ctx.Tr("settings.at_least_one_permission"), true)
+	}
 	t := &auth_model.AccessToken{
 		UID:   ctx.Doer.ID,
 		Name:  form.Name,
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
index 94d32b730f..935efd7ba7 100644
--- a/routers/web/user/setting/keys.go
+++ b/routers/web/user/setting/keys.go
@@ -5,7 +5,7 @@
 package setting
 
 import (
-	"fmt"
+	"errors"
 	"net/http"
 
 	asymkey_model "forgejo.org/models/asymkey"
@@ -80,7 +80,7 @@ func KeysPost(ctx *context.Context) {
 		ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
 	case "gpg":
 		if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageGPGKeys) {
-			ctx.NotFound("Not Found", fmt.Errorf("gpg keys setting is not allowed to be visited"))
+			ctx.NotFound("Not Found", errors.New("gpg keys setting is not allowed to be visited"))
 			return
 		}
 
@@ -161,7 +161,7 @@ func KeysPost(ctx *context.Context) {
 		ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
 	case "ssh":
 		if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) {
-			ctx.NotFound("Not Found", fmt.Errorf("ssh keys setting is not allowed to be visited"))
+			ctx.NotFound("Not Found", errors.New("ssh keys setting is not allowed to be visited"))
 			return
 		}
 
@@ -205,7 +205,7 @@ func KeysPost(ctx *context.Context) {
 		ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
 	case "verify_ssh":
 		if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) {
-			ctx.NotFound("Not Found", fmt.Errorf("ssh keys setting is not allowed to be visited"))
+			ctx.NotFound("Not Found", errors.New("ssh keys setting is not allowed to be visited"))
 			return
 		}
 
@@ -242,7 +242,7 @@ func DeleteKey(ctx *context.Context) {
 	switch ctx.FormString("type") {
 	case "gpg":
 		if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageGPGKeys) {
-			ctx.NotFound("Not Found", fmt.Errorf("gpg keys setting is not allowed to be visited"))
+			ctx.NotFound("Not Found", errors.New("gpg keys setting is not allowed to be visited"))
 			return
 		}
 		if err := asymkey_model.DeleteGPGKey(ctx, ctx.Doer, ctx.FormInt64("id")); err != nil {
@@ -252,7 +252,7 @@ func DeleteKey(ctx *context.Context) {
 		}
 	case "ssh":
 		if user_model.IsFeatureDisabledWithLoginType(ctx.Doer, setting.UserFeatureManageSSHKeys) {
-			ctx.NotFound("Not Found", fmt.Errorf("ssh keys setting is not allowed to be visited"))
+			ctx.NotFound("Not Found", errors.New("ssh keys setting is not allowed to be visited"))
 			return
 		}
 
diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go
index 173550ad19..e0ce88b582 100644
--- a/routers/web/user/setting/profile.go
+++ b/routers/web/user/setting/profile.go
@@ -51,6 +51,9 @@ func Profile(ctx *context.Context) {
 	ctx.Data["DisableGravatar"] = setting.Config().Picture.DisableGravatar.Value(ctx)
 	ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod
 	ctx.Data["CommonPronouns"] = commonPronouns
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	ctx.HTML(http.StatusOK, tplSettingsProfile)
 }
@@ -63,6 +66,9 @@ func ProfilePost(ctx *context.Context) {
 	ctx.Data["DisableGravatar"] = setting.Config().Picture.DisableGravatar.Value(ctx)
 	ctx.Data["CooldownPeriod"] = setting.Service.UsernameCooldownPeriod
 	ctx.Data["CommonPronouns"] = commonPronouns
+	ctx.Data["MaxAvatarFileSize"] = setting.Avatar.MaxFileSize
+	ctx.Data["MaxAvatarWidth"] = setting.Avatar.MaxWidth
+	ctx.Data["MaxAvatarHeight"] = setting.Avatar.MaxHeight
 
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplSettingsProfile)
@@ -145,8 +151,8 @@ func UpdateAvatarSetting(ctx *context.Context, form *forms.AvatarForm, ctxUser *
 			return fmt.Errorf("io.ReadAll: %w", err)
 		}
 
-		st := typesniffer.DetectContentType(data)
-		if !(st.IsImage() && !st.IsSvgImage()) {
+		st := typesniffer.DetectContentType(data, "")
+		if !st.IsImage() || st.IsSvgImage() {
 			return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_not_a_image"))
 		}
 		if err = user_service.UploadAvatar(ctx, ctxUser, data); err != nil {
diff --git a/routers/web/user/setting/security/2fa.go b/routers/web/user/setting/security/2fa.go
index f1271c8370..d23917f8b2 100644
--- a/routers/web/user/setting/security/2fa.go
+++ b/routers/web/user/setting/security/2fa.go
@@ -40,11 +40,7 @@ func RegenerateScratchTwoFactor(ctx *context.Context) {
 		return
 	}
 
-	token, err := t.GenerateScratchToken()
-	if err != nil {
-		ctx.ServerError("SettingsTwoFactor: Failed to GenerateScratchToken", err)
-		return
-	}
+	token := t.GenerateScratchToken()
 
 	if err = auth.UpdateTwoFactor(ctx, t); err != nil {
 		ctx.ServerError("SettingsTwoFactor: Failed to UpdateTwoFactor", err)
@@ -60,6 +56,21 @@ func DisableTwoFactor(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsSecurity"] = true
 
+	if ctx.Doer.MustHaveTwoFactor() {
+		ctx.NotFound("DisableTwoFactor", nil)
+		return
+	}
+
+	disableTwoFactor(ctx)
+	if ctx.Written() {
+		return
+	}
+
+	ctx.Flash.Success(ctx.Tr("settings.twofa_disabled"))
+	ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+}
+
+func disableTwoFactor(ctx *context.Context) {
 	t, err := auth.GetTwoFactorByUID(ctx, ctx.Doer.ID)
 	if err != nil {
 		if auth.IsErrTwoFactorNotEnrolled(err) {
@@ -86,9 +97,6 @@ func DisableTwoFactor(ctx *context.Context) {
 		ctx.ServerError("SendDisabledTOTP", err)
 		return
 	}
-
-	ctx.Flash.Success(ctx.Tr("settings.twofa_disabled"))
-	ctx.Redirect(setting.AppSubURL + "/user/settings/security")
 }
 
 func twofaGenerateSecretAndQr(ctx *context.Context) bool {
@@ -176,7 +184,6 @@ func EnrollTwoFactor(ctx *context.Context) {
 
 // EnrollTwoFactorPost handles enrolling the user into 2FA.
 func EnrollTwoFactorPost(ctx *context.Context) {
-	form := web.GetForm(ctx).(*forms.TwoFactorAuthForm)
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsSecurity"] = true
 
@@ -192,6 +199,12 @@ func EnrollTwoFactorPost(ctx *context.Context) {
 		return
 	}
 
+	enrollTwoFactor(ctx)
+}
+
+func enrollTwoFactor(ctx *context.Context) {
+	form := web.GetForm(ctx).(*forms.TwoFactorAuthForm)
+
 	if ctx.HasError() {
 		if !twofaGenerateSecretAndQr(ctx) {
 			return
@@ -217,14 +230,10 @@ func EnrollTwoFactorPost(ctx *context.Context) {
 		return
 	}
 
-	t = &auth.TwoFactor{
+	twoFactor := &auth.TwoFactor{
 		UID: ctx.Doer.ID,
 	}
-	token, err := t.GenerateScratchToken()
-	if err != nil {
-		ctx.ServerError("SettingsTwoFactor: Failed to generate scratch token", err)
-		return
-	}
+	token := twoFactor.GenerateScratchToken()
 
 	// Now we have to delete the secrets - because if we fail to insert then it's highly likely that they have already been used
 	// If we can detect the unique constraint failure below we can move this to after the NewTwoFactor
@@ -246,7 +255,7 @@ func EnrollTwoFactorPost(ctx *context.Context) {
 		return
 	}
 
-	if err = auth.NewTwoFactor(ctx, t, secret); err != nil {
+	if err := auth.NewTwoFactor(ctx, twoFactor, secret); err != nil {
 		// FIXME: We need to handle a unique constraint fail here it's entirely possible that another request has beaten us.
 		// If there is a unique constraint fail we should just tolerate the error
 		ctx.ServerError("SettingsTwoFactor: Failed to save two factor", err)
@@ -256,3 +265,41 @@ func EnrollTwoFactorPost(ctx *context.Context) {
 	ctx.Flash.Success(ctx.Tr("settings.twofa_enrolled", token))
 	ctx.Redirect(setting.AppSubURL + "/user/settings/security")
 }
+
+// ReenrollTwoFactor shows the page where the user can reenroll 2FA.
+func ReenrollTwoFactor(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["PageIsSettingsSecurity"] = true
+	ctx.Data["ReenrollTwofa"] = true
+
+	_, err := auth.GetTwoFactorByUID(ctx, ctx.Doer.ID)
+	if auth.IsErrTwoFactorNotEnrolled(err) {
+		ctx.Flash.Error(ctx.Tr("settings.twofa_not_enrolled"))
+		ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+		return
+	}
+	if err != nil {
+		ctx.ServerError("SettingsTwoFactor: GetTwoFactorByUID", err)
+		return
+	}
+
+	if !twofaGenerateSecretAndQr(ctx) {
+		return
+	}
+
+	ctx.HTML(http.StatusOK, tplSettingsTwofaEnroll)
+}
+
+// ReenrollTwoFactorPost handles reenrolling the user 2FA.
+func ReenrollTwoFactorPost(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["PageIsSettingsSecurity"] = true
+	ctx.Data["ReenrollTwofa"] = true
+
+	disableTwoFactor(ctx)
+	if ctx.Written() {
+		return
+	}
+
+	enrollTwoFactor(ctx)
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index 303167a6b9..f1cbc6b7ad 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1,13 +1,16 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package web
 
 import (
 	gocontext "context"
+	"fmt"
 	"net/http"
 	"strings"
 
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/perm"
 	quota_model "forgejo.org/models/quota"
 	"forgejo.org/models/unit"
@@ -31,6 +34,7 @@ import (
 	"forgejo.org/routers/web/feed"
 	"forgejo.org/routers/web/healthcheck"
 	"forgejo.org/routers/web/misc"
+	"forgejo.org/routers/web/moderation"
 	"forgejo.org/routers/web/org"
 	org_setting "forgejo.org/routers/web/org/setting"
 	"forgejo.org/routers/web/repo"
@@ -115,7 +119,7 @@ func webAuth(authMethod auth_service.Method) func(*context.Context) {
 	return func(ctx *context.Context) {
 		ar, err := common.AuthShared(ctx.Base, ctx.Session, authMethod)
 		if err != nil {
-			log.Error("Failed to verify user: %v", err)
+			log.Info("Failed to verify user: %v", err)
 			ctx.Error(http.StatusUnauthorized, ctx.Locale.TrString("auth.unauthorized_credentials", "https://codeberg.org/forgejo/forgejo/issues/2809"))
 			return
 		}
@@ -167,6 +171,19 @@ func verifyAuthWithOptions(options *common.VerifyOptions) func(ctx *context.Cont
 				ctx.Redirect(setting.AppSubURL + "/")
 				return
 			}
+
+			if ctx.Doer.MustHaveTwoFactor() && !strings.HasPrefix(ctx.Req.URL.Path, "/user/settings/security") {
+				hasTwoFactor, err := auth_model.HasTwoFactorByUID(ctx, ctx.Doer.ID)
+				if err != nil {
+					log.Error("Error getting 2fa: %s", err)
+					ctx.Error(http.StatusInternalServerError, "HasTwoFactorByUID", err.Error())
+					return
+				}
+				if !hasTwoFactor {
+					ctx.Redirect(setting.AppSubURL + "/user/settings/security")
+					return
+				}
+			}
 		}
 
 		// Redirect to dashboard (or alternate location) if user tries to visit any non-login page.
@@ -307,6 +324,20 @@ func registerRoutes(m *web.Route) {
 		}
 	}
 
+	requiredTwoFactor := func(ctx *context.Context) {
+		if !ctx.Doer.MustHaveTwoFactor() {
+			return
+		}
+
+		hasTwoFactor, err := auth_model.HasTwoFactorByUID(ctx, ctx.Doer.ID)
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, fmt.Sprintf("Error getting 2fa: %s", err))
+			return
+		}
+		ctx.Data["MustEnableTwoFactor"] = !hasTwoFactor
+		ctx.Data["HideNavbarLinks"] = !hasTwoFactor
+	}
+
 	openIDSignInEnabled := func(ctx *context.Context) {
 		if !setting.Service.EnableOpenIDSignIn {
 			ctx.Error(http.StatusForbidden)
@@ -473,6 +504,11 @@ func registerRoutes(m *web.Route) {
 		m.Get("/search", repo.SearchIssues)
 	}, reqSignIn)
 
+	if setting.Moderation.Enabled {
+		m.Get("/report_abuse", reqSignIn, moderation.NewReport)
+		m.Post("/report_abuse", reqSignIn, web.Bind(forms.ReportAbuseForm{}), moderation.CreatePost)
+	}
+
 	m.Get("/pulls", reqSignIn, user.Pulls)
 	m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones)
 
@@ -557,6 +593,8 @@ func registerRoutes(m *web.Route) {
 				m.Post("/disable", security.DisableTwoFactor)
 				m.Get("/enroll", security.EnrollTwoFactor)
 				m.Post("/enroll", web.Bind(forms.TwoFactorAuthForm{}), security.EnrollTwoFactorPost)
+				m.Get("/reenroll", security.ReenrollTwoFactor)
+				m.Post("/reenroll", web.Bind(forms.TwoFactorAuthForm{}), security.ReenrollTwoFactorPost)
 			})
 			m.Group("/webauthn", func() {
 				m.Post("/request_register", web.Bind(forms.WebauthnRegistrationForm{}), security.WebAuthnRegister)
@@ -569,7 +607,7 @@ func registerRoutes(m *web.Route) {
 				m.Post("/toggle_visibility", security.ToggleOpenIDVisibility)
 			}, openIDSignInEnabled)
 			m.Post("/account_link", linkAccountEnabled, security.DeleteAccountLink)
-		})
+		}, requiredTwoFactor)
 
 		m.Group("/applications", func() {
 			// oauth2 applications
@@ -774,7 +812,14 @@ func registerRoutes(m *web.Route) {
 			addSettingsRunnersRoutes()
 			addSettingsVariablesRoutes()
 		})
-	}, adminReq, ctxDataSet("EnableOAuth2", setting.OAuth2.Enabled, "EnablePackages", setting.Packages.Enabled))
+
+		if setting.Moderation.Enabled {
+			m.Group("/moderation/reports", func() {
+				m.Get("", admin.AbuseReports)
+				m.Get("/type/{type:1|2|3|4}/id/{id}", admin.AbuseReportDetails)
+			})
+		}
+	}, adminReq, ctxDataSet("EnableOAuth2", setting.OAuth2.Enabled, "EnablePackages", setting.Packages.Enabled, "EnableModeration", setting.Moderation.Enabled))
 	// ***** END: Admin *****
 
 	m.Group("", func() {
@@ -811,13 +856,13 @@ func registerRoutes(m *web.Route) {
 	individualPermsChecker := func(ctx *context.Context) {
 		// org permissions have been checked in context.OrgAssignment(), but individual permissions haven't been checked.
 		if ctx.ContextUser.IsIndividual() {
-			switch {
-			case ctx.ContextUser.Visibility == structs.VisibleTypePrivate:
+			switch ctx.ContextUser.Visibility {
+			case structs.VisibleTypePrivate:
 				if ctx.Doer == nil || (ctx.ContextUser.ID != ctx.Doer.ID && !ctx.Doer.IsAdmin) {
 					ctx.NotFound("Visit Project", nil)
 					return
 				}
-			case ctx.ContextUser.Visibility == structs.VisibleTypeLimited:
+			case structs.VisibleTypeLimited:
 				if ctx.Doer == nil {
 					ctx.NotFound("Visit Project", nil)
 					return
@@ -1392,7 +1437,7 @@ func registerRoutes(m *web.Route) {
 			m.Get("", actions.List)
 			m.Post("/disable", reqRepoAdmin, actions.DisableWorkflowFile)
 			m.Post("/enable", reqRepoAdmin, actions.EnableWorkflowFile)
-			m.Post("/manual", reqRepoAdmin, actions.ManualRunWorkflow)
+			m.Post("/manual", reqRepoActionsWriter, actions.ManualRunWorkflow)
 
 			m.Group("/runs", func() {
 				m.Get("/latest", actions.ViewLatest)
@@ -1454,7 +1499,7 @@ func registerRoutes(m *web.Route) {
 			}, repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode))
 			m.Group("/recent-commits", func() {
 				m.Get("", repo.RecentCommits)
-				m.Get("/data", repo.RecentCommitsData)
+				m.Get("/data", repo.CodeFrequencyData)
 			}, repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode))
 		}, context.RepoRef(), context.RequireRepoReaderOr(unit.TypeCode, unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
 
@@ -1503,7 +1548,10 @@ func registerRoutes(m *web.Route) {
 			m.Group("/commits", func() {
 				m.Get("", context.RepoRef(), repo.SetWhitespaceBehavior, repo.GetPullDiffStats, repo.ViewPullCommits)
 				m.Get("/list", context.RepoRef(), repo.GetPullCommits)
-				m.Get("/{sha:[a-f0-9]{4,40}}", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.SetShowOutdatedComments, repo.ViewPullFilesForSingleCommit)
+				m.Group("/{sha:[a-f0-9]{4,40}}", func() {
+					m.Get("", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.SetShowOutdatedComments, repo.ViewPullFilesForSingleCommit)
+					m.Post("/reviews/submit", context.RepoMustNotBeArchived(), web.Bind(forms.SubmitReviewForm{}), repo.SubmitReview)
+				})
 			})
 			m.Post("/merge", context.RepoMustNotBeArchived(), web.Bind(forms.MergePullRequestForm{}), context.EnforceQuotaWeb(quota_model.LimitSubjectSizeGitAll, context.QuotaTargetRepo), repo.MergePullRequest)
 			m.Post("/cancel_auto_merge", context.RepoMustNotBeArchived(), repo.CancelAutoMergePullRequest)
@@ -1591,6 +1639,8 @@ func registerRoutes(m *web.Route) {
 			}, context.RepoRef(), reqRepoCodeReader)
 		}
 		m.Get("/commit/{sha:([a-f0-9]{4,64})}.{ext:patch|diff}", repo.MustBeNotEmpty, reqRepoCodeReader, repo.RawDiff)
+
+		m.Post("/sync_fork", context.RepoMustNotBeArchived(), repo.MustBeNotEmpty, reqRepoCodeWriter, repo.SyncFork)
 	}, ignSignIn, context.RepoAssignment, context.UnitTypes())
 
 	m.Post("/{username}/{reponame}/lastcommit/*", ignSignInAndCsrf, context.RepoAssignment, context.UnitTypes(), context.RepoRefByType(context.RepoRefCommit), reqRepoCodeReader, repo.LastCommit)
@@ -1661,6 +1711,7 @@ func registerRoutes(m *web.Route) {
 		m.Any("/devtest", devtest.List)
 		m.Any("/devtest/fetch-action-test", devtest.FetchActionTest)
 		m.Any("/devtest/{sub}", devtest.Tmpl)
+		m.Get("/devtest/error/{errcode}", devtest.ErrorPage)
 	}
 
 	m.NotFound(func(w http.ResponseWriter, req *http.Request) {
diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go
index be3c2925fe..5f67e436bf 100644
--- a/routers/web/webfinger.go
+++ b/routers/web/webfinger.go
@@ -58,7 +58,33 @@ func WebfingerQuery(ctx *context.Context) {
 			return
 		}
 
+		// Instance actor
+		if parts[0] == "ghost" {
+			aliases := []string{
+				appURL.String() + "api/v1/activitypub/actor",
+			}
+
+			links := []*webfingerLink{
+				{
+					Rel:  "self",
+					Type: "application/activity+json",
+					Href: appURL.String() + "api/v1/activitypub/actor",
+				},
+			}
+
+			ctx.Resp.Header().Add("Access-Control-Allow-Origin", "*")
+			ctx.JSON(http.StatusOK, &webfingerJRD{
+				Subject: fmt.Sprintf("acct:%s@%s", "ghost", appURL.Host),
+				Aliases: aliases,
+				Links:   links,
+			})
+			ctx.Resp.Header().Set("Content-Type", "application/jrd+json")
+
+			return
+		}
+
 		u, err = user_model.GetUserByName(ctx, parts[0])
+
 	case "mailto":
 		u, err = user_model.GetUserByEmail(ctx, resource.Opaque)
 		if u != nil && u.KeepEmailPrivate {
@@ -153,7 +179,7 @@ func WebfingerQuery(ctx *context.Context) {
 		},
 		{
 			Rel:  "http://openid.net/specs/connect/1.0/issuer",
-			Href: appURL.String(),
+			Href: strings.TrimSuffix(appURL.String(), "/"),
 		},
 	}
 
diff --git a/services/actions/TestServiceActions_startTask/action_schedule.yml b/services/actions/TestServiceActions_startTask/action_schedule.yml
new file mode 100644
index 0000000000..d0e7234475
--- /dev/null
+++ b/services/actions/TestServiceActions_startTask/action_schedule.yml
@@ -0,0 +1,41 @@
+# A corrupted cron spec with a valid schedule workflow
+-
+  id: 1
+  title: schedule_title1
+  specs:
+    - '* * * * *'
+  repo_id: 4
+  owner_id: 2
+  workflow_id: 'workflow1.yml'
+  trigger_user_id: 2
+  ref: main
+  commit_sha: shashasha
+  event: "schedule"
+  event_payload: "fakepayload"
+  content: |
+    jobs:
+      job2:
+        runs-on: ubuntu-latest
+        steps:
+          - run: true
+
+# A valid cron spec with a corrupted schedule workflow
+-
+  id: 2
+  title: schedule_title2
+  specs:
+    - '* * * * *'
+  repo_id: 4
+  owner_id: 2
+  workflow_id: 'workflow2.yml'
+  trigger_user_id: 2
+  ref: main
+  commit_sha: shashasha
+  event: "schedule"
+  event_payload: "fakepayload"
+  content: |
+    jobs:
+      job2: { invalid yaml
+        runs-on: ubuntu-latest
+        steps:
+          - run: true
diff --git a/services/actions/TestServiceActions_startTask/action_schedule_spec.yml b/services/actions/TestServiceActions_startTask/action_schedule_spec.yml
new file mode 100644
index 0000000000..7bcc78f010
--- /dev/null
+++ b/services/actions/TestServiceActions_startTask/action_schedule_spec.yml
@@ -0,0 +1,15 @@
+# A corrupted cron spec with a valid schedule workflow
+-
+  id: 1
+  repo_id: 4
+  schedule_id: 1
+  next: 1
+  spec: 'corrupted * *'
+
+# A valid cron spec with a corrupted schedule workflow
+-
+  id: 2
+  repo_id: 4
+  schedule_id: 2
+  next: 1
+  spec: '* * * * *'
diff --git a/services/actions/auth.go b/services/actions/auth.go
index 4dc86a35f3..98b618aeba 100644
--- a/services/actions/auth.go
+++ b/services/actions/auth.go
@@ -4,6 +4,7 @@
 package actions
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -80,7 +81,7 @@ func ParseAuthorizationToken(req *http.Request) (int64, error) {
 	parts := strings.SplitN(h, " ", 2)
 	if len(parts) != 2 {
 		log.Error("split token failed: %s", h)
-		return 0, fmt.Errorf("split token failed")
+		return 0, errors.New("split token failed")
 	}
 
 	return TokenToTaskID(parts[1])
@@ -100,7 +101,7 @@ func TokenToTaskID(token string) (int64, error) {
 
 	c, ok := parsedToken.Claims.(*actionsClaims)
 	if !parsedToken.Valid || !ok {
-		return 0, fmt.Errorf("invalid token claim")
+		return 0, errors.New("invalid token claim")
 	}
 
 	return c.TaskID, nil
diff --git a/services/actions/auth_test.go b/services/actions/auth_test.go
index 93a5980bc5..d9f0437e1b 100644
--- a/services/actions/auth_test.go
+++ b/services/actions/auth_test.go
@@ -19,7 +19,7 @@ func TestCreateAuthorizationToken(t *testing.T) {
 	var taskID int64 = 23
 	token, err := CreateAuthorizationToken(taskID, 1, 2)
 	require.NoError(t, err)
-	assert.NotEqual(t, "", token)
+	assert.NotEmpty(t, token)
 	claims := jwt.MapClaims{}
 	_, err = jwt.ParseWithClaims(token, claims, func(t *jwt.Token) (any, error) {
 		return setting.GetGeneralTokenSigningSecret(), nil
@@ -45,7 +45,7 @@ func TestParseAuthorizationToken(t *testing.T) {
 	var taskID int64 = 23
 	token, err := CreateAuthorizationToken(taskID, 1, 2)
 	require.NoError(t, err)
-	assert.NotEqual(t, "", token)
+	assert.NotEmpty(t, token)
 	headers := http.Header{}
 	headers.Set("Authorization", "Bearer "+token)
 	rTaskID, err := ParseAuthorizationToken(&http.Request{
diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go
index fde5286e60..918be0f185 100644
--- a/services/actions/cleanup.go
+++ b/services/actions/cleanup.go
@@ -126,3 +126,9 @@ func CleanupLogs(ctx context.Context) error {
 	log.Info("Removed %d logs", count)
 	return nil
 }
+
+// CleanupOfflineRunners removes offline runners
+func CleanupOfflineRunners(ctx context.Context, duration time.Duration, globalOnly bool) error {
+	olderThan := timeutil.TimeStampNow().AddDuration(-duration)
+	return actions_model.DeleteOfflineRunners(ctx, olderThan, globalOnly)
+}
diff --git a/services/actions/cleanup_test.go b/services/actions/cleanup_test.go
index 67f68d4de9..4a847ced23 100644
--- a/services/actions/cleanup_test.go
+++ b/services/actions/cleanup_test.go
@@ -24,7 +24,7 @@ func TestCleanup(t *testing.T) {
 		require.NoError(t, CleanupLogs(db.DefaultContext))
 
 		task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 1001})
-		assert.EqualValues(t, "does-not-exist", task.LogFilename)
+		assert.Equal(t, "does-not-exist", task.LogFilename)
 		assert.True(t, task.LogExpired)
 		assert.Nil(t, task.LogIndexes)
 	})
diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go
index 31e15ec927..c36dda55b2 100644
--- a/services/actions/clear_tasks.go
+++ b/services/actions/clear_tasks.go
@@ -41,7 +41,7 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error {
 	jobs := make([]*actions_model.ActionRunJob, 0, len(tasks))
 	for _, task := range tasks {
 		if err := db.WithTx(ctx, func(ctx context.Context) error {
-			if err := actions_model.StopTask(ctx, task.ID, actions_model.StatusFailure); err != nil {
+			if err := StopTask(ctx, task.ID, actions_model.StatusFailure); err != nil {
 				return err
 			}
 			if err := task.LoadJob(ctx); err != nil {
@@ -88,7 +88,7 @@ func CancelAbandonedJobs(ctx context.Context) error {
 		job.Status = actions_model.StatusCancelled
 		job.Stopped = now
 		if err := db.WithTx(ctx, func(ctx context.Context) error {
-			_, err := actions_model.UpdateRunJob(ctx, job, nil, "status", "stopped")
+			_, err := UpdateRunJob(ctx, job, nil, "status", "stopped")
 			return err
 		}); err != nil {
 			log.Warn("cancel abandoned job %v: %v", job.ID, err)
diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go
index 1fffa6852f..d588c0f178 100644
--- a/services/actions/commit_status.go
+++ b/services/actions/commit_status.go
@@ -5,6 +5,7 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"path"
 
@@ -18,7 +19,7 @@ import (
 	webhook_module "forgejo.org/modules/webhook"
 	commitstatus_service "forgejo.org/services/repository/commitstatus"
 
-	"github.com/nektos/act/pkg/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
 )
 
 // CreateCommitStatus creates a commit status for the given job.
@@ -50,7 +51,7 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
 			return fmt.Errorf("GetPushEventPayload: %w", err)
 		}
 		if payload.HeadCommit == nil {
-			return fmt.Errorf("head commit is missing in event payload")
+			return errors.New("head commit is missing in event payload")
 		}
 		sha = payload.HeadCommit.ID
 	case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync, webhook_module.HookEventPullRequestLabel, webhook_module.HookEventPullRequestAssign, webhook_module.HookEventPullRequestMilestone:
@@ -64,9 +65,9 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
 			return fmt.Errorf("GetPullRequestEventPayload: %w", err)
 		}
 		if payload.PullRequest == nil {
-			return fmt.Errorf("pull request is missing in event payload")
+			return errors.New("pull request is missing in event payload")
 		} else if payload.PullRequest.Head == nil {
-			return fmt.Errorf("head of pull request is missing in event payload")
+			return errors.New("head of pull request is missing in event payload")
 		}
 		sha = payload.PullRequest.Head.Sha
 	case webhook_module.HookEventRelease:
@@ -79,7 +80,7 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
 	repo := run.Repo
 	// TODO: store workflow name as a field in ActionRun to avoid parsing
 	runName := path.Base(run.WorkflowID)
-	if wfs, err := jobparser.Parse(job.WorkflowPayload); err == nil && len(wfs) > 0 {
+	if wfs, err := jobparser.Parse(job.WorkflowPayload, false); err == nil && len(wfs) > 0 {
 		runName = wfs[0].Name
 	}
 	ctxname := fmt.Sprintf("%s / %s (%s)", runName, job.Name, event)
diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go
index d4ca029d46..03428736b8 100644
--- a/services/actions/job_emitter.go
+++ b/services/actions/job_emitter.go
@@ -13,7 +13,7 @@ import (
 	"forgejo.org/modules/graceful"
 	"forgejo.org/modules/queue"
 
-	"github.com/nektos/act/pkg/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
 	"xorm.io/builder"
 )
 
@@ -59,7 +59,7 @@ func checkJobsOfRun(ctx context.Context, runID int64) error {
 		for _, job := range jobs {
 			if status, ok := updates[job.ID]; ok {
 				job.Status = status
-				if n, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"status": actions_model.StatusBlocked}, "status"); err != nil {
+				if n, err := UpdateRunJob(ctx, job, builder.Eq{"status": actions_model.StatusBlocked}, "status"); err != nil {
 					return err
 				} else if n != 1 {
 					return fmt.Errorf("no affected for updating blocked job %v", job.ID)
@@ -142,7 +142,7 @@ func (r *jobStatusResolver) resolve() map[int64]actions_model.Status {
 			} else {
 				// Check if the job has an "if" condition
 				hasIf := false
-				if wfJobs, _ := jobparser.Parse(r.jobMap[id].WorkflowPayload); len(wfJobs) == 1 {
+				if wfJobs, _ := jobparser.Parse(r.jobMap[id].WorkflowPayload, false); len(wfJobs) == 1 {
 					_, wfJob := wfJobs[0].Job()
 					hasIf = len(wfJob.If.Value) > 0
 				}
diff --git a/services/actions/job_parser.go b/services/actions/job_parser.go
new file mode 100644
index 0000000000..294f1c4a0e
--- /dev/null
+++ b/services/actions/job_parser.go
@@ -0,0 +1,31 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package actions
+
+import (
+	"fmt"
+
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
+)
+
+func jobParser(workflow []byte, options ...jobparser.ParseOption) ([]*jobparser.SingleWorkflow, error) {
+	singleWorkflows, err := jobparser.Parse(workflow, false, options...)
+	if err != nil {
+		return nil, err
+	}
+	nameToSingleWorkflows := make(map[string][]*jobparser.SingleWorkflow, len(singleWorkflows))
+	duplicates := make(map[string]int, len(singleWorkflows))
+	for _, singleWorkflow := range singleWorkflows {
+		id, job := singleWorkflow.Job()
+		nameToSingleWorkflows[job.Name] = append(nameToSingleWorkflows[job.Name], singleWorkflow)
+		if len(nameToSingleWorkflows[job.Name]) > 1 {
+			duplicates[job.Name]++
+			job.Name = fmt.Sprintf("%s-%d", job.Name, duplicates[job.Name])
+			if err := singleWorkflow.SetJob(id, job); err != nil {
+				return nil, err
+			}
+		}
+	}
+	return singleWorkflows, nil
+}
diff --git a/services/actions/job_parser_test.go b/services/actions/job_parser_test.go
new file mode 100644
index 0000000000..9c1361d74e
--- /dev/null
+++ b/services/actions/job_parser_test.go
@@ -0,0 +1,212 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package actions
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestServiceActions_jobParser(t *testing.T) {
+	for _, testCase := range []struct {
+		name            string
+		workflow        string
+		singleWorkflows []string
+	}{
+		{
+			name: "OneJobNoDuplicate",
+			workflow: `
+jobs:
+  job1:
+    runs-on: docker
+    steps:
+      - run: echo OK
+`,
+			singleWorkflows: []string{
+				`jobs:
+    job1:
+        name: job1
+        runs-on: docker
+        steps:
+            - run: echo OK
+`,
+			},
+		},
+		{
+			name: "MatrixTwoJobsWithSameJobName",
+			workflow: `
+name: test
+jobs:
+  job1:
+    name: shadowdefaultmatrixgeneratednames
+    strategy:
+      matrix:
+        version: [1.17, 1.19]
+    runs-on: docker
+    steps:
+      - run: echo OK
+`,
+			singleWorkflows: []string{
+				`name: test
+jobs:
+    job1:
+        name: shadowdefaultmatrixgeneratednames
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.17
+`,
+				`name: test
+jobs:
+    job1:
+        name: shadowdefaultmatrixgeneratednames-1
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.19
+`,
+			},
+		},
+		{
+			name: "MatrixTwoJobsWithMatrixGeneratedNames",
+			workflow: `
+name: test
+jobs:
+  job1:
+    strategy:
+      matrix:
+        version: [1.17, 1.19]
+    runs-on: docker
+    steps:
+      - run: echo OK
+`,
+			singleWorkflows: []string{
+				`name: test
+jobs:
+    job1:
+        name: job1 (1.17)
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.17
+`,
+				`name: test
+jobs:
+    job1:
+        name: job1 (1.19)
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.19
+`,
+			},
+		},
+		{
+			name: "MatrixTwoJobsWithDistinctInterpolatedNames",
+			workflow: `
+name: test
+jobs:
+  job1:
+    name: myname-${{ matrix.version }}
+    strategy:
+      matrix:
+        version: [1.17, 1.19]
+    runs-on: docker
+    steps:
+      - run: echo OK
+`,
+			singleWorkflows: []string{
+				`name: test
+jobs:
+    job1:
+        name: myname-1.17
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.17
+`,
+				`name: test
+jobs:
+    job1:
+        name: myname-1.19
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.19
+`,
+			},
+		},
+		{
+			name: "MatrixTwoJobsWithIdenticalInterpolatedNames",
+			workflow: `
+name: test
+jobs:
+  job1:
+    name: myname-${{ matrix.typo }}
+    strategy:
+      matrix:
+        version: [1.17, 1.19]
+    runs-on: docker
+    steps:
+      - run: echo OK
+`,
+			singleWorkflows: []string{
+				`name: test
+jobs:
+    job1:
+        name: myname-
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.17
+`,
+				`name: test
+jobs:
+    job1:
+        name: myname--1
+        runs-on: docker
+        steps:
+            - run: echo OK
+        strategy:
+            matrix:
+                version:
+                    - 1.19
+`,
+			},
+		},
+	} {
+		t.Run(testCase.name, func(t *testing.T) {
+			sw, err := jobParser([]byte(testCase.workflow))
+			require.NoError(t, err)
+			for i, sw := range sw {
+				actual, err := sw.Marshal()
+				require.NoError(t, err)
+				assert.Equal(t, testCase.singleWorkflows[i], string(actual))
+			}
+		})
+	}
+}
diff --git a/services/actions/notifier.go b/services/actions/notifier.go
index 2d3a1d2107..a5bac730be 100644
--- a/services/actions/notifier.go
+++ b/services/actions/notifier.go
@@ -5,7 +5,9 @@ package actions
 
 import (
 	"context"
+	"errors"
 
+	actions_model "forgejo.org/models/actions"
 	issues_model "forgejo.org/models/issues"
 	packages_model "forgejo.org/models/packages"
 	perm_model "forgejo.org/models/perm"
@@ -17,9 +19,12 @@ import (
 	"forgejo.org/modules/repository"
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
+	"forgejo.org/modules/util"
 	webhook_module "forgejo.org/modules/webhook"
 	"forgejo.org/services/convert"
 	notify_service "forgejo.org/services/notify"
+
+	"xorm.io/builder"
 )
 
 type actionsNotifier struct {
@@ -775,3 +780,76 @@ func (n *actionsNotifier) MigrateRepository(ctx context.Context, doer, u *user_m
 		Sender:       convert.ToUser(ctx, doer, nil),
 	}).Notify(ctx)
 }
+
+// Call this sendActionRunNowDoneNotificationIfNeeded when there has been an update for an ActionRun.
+// priorRun and updatedRun represent the very same ActionRun, just at different times:
+// priorRun before the update and updatedRun after.
+// The parameter lastRun in the ActionRunNowDone notification represents an entirely different ActionRun:
+// the ActionRun of the same workflow that finished before priorRun/updatedRun.
+func sendActionRunNowDoneNotificationIfNeeded(ctx context.Context, priorRun, updatedRun *actions_model.ActionRun) error {
+	if !priorRun.Status.IsDone() && updatedRun.Status.IsDone() {
+		lastRun, err := actions_model.GetRunBefore(ctx, updatedRun)
+		if err != nil && !errors.Is(err, util.ErrNotExist) {
+			return err
+		}
+		// when no last run was found lastRun is nil
+		if lastRun != nil {
+			if err = lastRun.LoadAttributes(ctx); err != nil {
+				return err
+			}
+		}
+		if err = updatedRun.LoadAttributes(ctx); err != nil {
+			return err
+		}
+		notify_service.ActionRunNowDone(ctx, updatedRun, priorRun.Status, lastRun)
+	}
+	return nil
+}
+
+// wrapper of UpdateRunWithoutNotification with a call to the ActionRunNowDone notification channel
+func UpdateRun(ctx context.Context, run *actions_model.ActionRun, cols ...string) error {
+	// run.ID is the only thing that must be given
+	priorRun, err := actions_model.GetRunByID(ctx, run.ID)
+	if err != nil {
+		return err
+	}
+
+	if err = actions_model.UpdateRunWithoutNotification(ctx, run, cols...); err != nil {
+		return err
+	}
+
+	updatedRun, err := actions_model.GetRunByID(ctx, run.ID)
+	if err != nil {
+		return err
+	}
+	return sendActionRunNowDoneNotificationIfNeeded(ctx, priorRun, updatedRun)
+}
+
+// wrapper of UpdateRunJobWithoutNotification with a call to the ActionRunNowDone notification channel
+func UpdateRunJob(ctx context.Context, job *actions_model.ActionRunJob, cond builder.Cond, cols ...string) (int64, error) {
+	runID := job.RunID
+	if runID == 0 {
+		// job.ID is the only thing that must be given
+		// Don't overwrite job here, we'd loose the change we need to make.
+		oldJob, err := actions_model.GetRunJobByID(ctx, job.ID)
+		if err != nil {
+			return 0, err
+		}
+		runID = oldJob.RunID
+	}
+	priorRun, err := actions_model.GetRunByID(ctx, runID)
+	if err != nil {
+		return 0, err
+	}
+
+	affected, err := actions_model.UpdateRunJobWithoutNotification(ctx, job, cond, cols...)
+	if err != nil {
+		return affected, err
+	}
+
+	updatedRun, err := actions_model.GetRunByID(ctx, runID)
+	if err != nil {
+		return affected, err
+	}
+	return affected, sendActionRunNowDoneNotificationIfNeeded(ctx, priorRun, updatedRun)
+}
diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go
index 9de0b75ac7..e1df5776fb 100644
--- a/services/actions/notifier_helper.go
+++ b/services/actions/notifier_helper.go
@@ -30,8 +30,8 @@ import (
 	webhook_module "forgejo.org/modules/webhook"
 	"forgejo.org/services/convert"
 
-	"github.com/nektos/act/pkg/jobparser"
-	"github.com/nektos/act/pkg/model"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/model"
 )
 
 type methodCtx struct{}
@@ -139,7 +139,7 @@ func notify(ctx context.Context, input *notifyInput) error {
 		return nil
 	}
 	if unit_model.TypeActions.UnitGlobalDisabled() {
-		if err := actions_model.CleanRepoScheduleTasks(ctx, input.Repo, true); err != nil {
+		if err := CleanRepoScheduleTasks(ctx, input.Repo, true); err != nil {
 			log.Error("CleanRepoScheduleTasks: %v", err)
 		}
 		return nil
@@ -345,6 +345,14 @@ func handleWorkflows(
 			Status:            actions_model.StatusWaiting,
 		}
 
+		if workflow, err := model.ReadWorkflow(bytes.NewReader(dwf.Content), false); err == nil {
+			notifications, err := workflow.Notifications()
+			if err != nil {
+				log.Error("Notifications: %w", err)
+			}
+			run.NotifyEmail = notifications
+		}
+
 		need, err := ifNeedApproval(ctx, run, input.Repo, input.Doer)
 		if err != nil {
 			log.Error("check if need approval for repo %d with user %d: %v", input.Repo.ID, input.Doer.ID, err)
@@ -364,16 +372,19 @@ func handleWorkflows(
 			continue
 		}
 
-		jobs, err := jobparser.Parse(dwf.Content, jobparser.WithVars(vars))
+		jobs, err := jobParser(dwf.Content, jobparser.WithVars(vars))
 		if err != nil {
-			log.Error("jobparser.Parse: %v", err)
-			continue
+			run.Status = actions_model.StatusFailure
+			log.Info("jobparser.Parse: invalid workflow, setting job status to failed: %v", err)
+			jobs = []*jobparser.SingleWorkflow{{
+				Name: dwf.EntryName,
+			}}
 		}
 
 		// cancel running jobs if the event is push or pull_request_sync
 		if run.Event == webhook_module.HookEventPush ||
 			run.Event == webhook_module.HookEventPullRequestSync {
-			if err := actions_model.CancelPreviousJobs(
+			if err := CancelPreviousJobs(
 				ctx,
 				run.RepoID,
 				run.Ref,
@@ -504,7 +515,7 @@ func handleSchedules(
 		log.Error("CountSchedules: %v", err)
 		return err
 	} else if count > 0 {
-		if err := actions_model.CleanRepoScheduleTasks(ctx, input.Repo, false); err != nil {
+		if err := CleanRepoScheduleTasks(ctx, input.Repo, false); err != nil {
 			log.Error("CleanRepoScheduleTasks: %v", err)
 		}
 	}
@@ -526,7 +537,7 @@ func handleSchedules(
 	crons := make([]*actions_model.ActionSchedule, 0, len(detectedWorkflows))
 	for _, dwf := range detectedWorkflows {
 		// Check cron job condition. Only working in default branch
-		workflow, err := model.ReadWorkflow(bytes.NewReader(dwf.Content))
+		workflow, err := model.ReadWorkflow(bytes.NewReader(dwf.Content), false)
 		if err != nil {
 			log.Error("ReadWorkflow: %v", err)
 			continue
diff --git a/services/actions/schedule_tasks.go b/services/actions/schedule_tasks.go
index f66a6ca092..1e90ad4b3f 100644
--- a/services/actions/schedule_tasks.go
+++ b/services/actions/schedule_tasks.go
@@ -4,7 +4,9 @@
 package actions
 
 import (
+	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -16,7 +18,10 @@ import (
 	"forgejo.org/modules/timeutil"
 	webhook_module "forgejo.org/modules/webhook"
 
-	"github.com/nektos/act/pkg/jobparser"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
+	act_model "code.forgejo.org/forgejo/runner/v9/act/model"
+	"github.com/robfig/cron/v3"
+	"xorm.io/builder"
 )
 
 // StartScheduleTasks start the task
@@ -55,7 +60,7 @@ func startTasks(ctx context.Context) error {
 			// cancel running jobs if the event is push
 			if row.Schedule.Event == webhook_module.HookEventPush {
 				// cancel running jobs of the same workflow
-				if err := actions_model.CancelPreviousJobs(
+				if err := CancelPreviousJobs(
 					ctx,
 					row.RepoID,
 					row.Schedule.Ref,
@@ -79,20 +84,33 @@ func startTasks(ctx context.Context) error {
 				}
 				return fmt.Errorf("GetUnit: %w", err)
 			}
-			if cfg.ActionsConfig().IsWorkflowDisabled(row.Schedule.WorkflowID) {
+			actionConfig := cfg.ActionsConfig()
+			if actionConfig.IsWorkflowDisabled(row.Schedule.WorkflowID) {
 				continue
 			}
 
-			if err := CreateScheduleTask(ctx, row.Schedule); err != nil {
-				log.Error("CreateScheduleTask: %v", err)
-				return err
+			createAndSchedule := func(row *actions_model.ActionScheduleSpec) (cron.Schedule, error) {
+				if err := CreateScheduleTask(ctx, row.Schedule); err != nil {
+					return nil, fmt.Errorf("CreateScheduleTask: %v", err)
+				}
+
+				// Parse the spec
+				schedule, err := row.Parse()
+				if err != nil {
+					return nil, fmt.Errorf("Parse(Spec=%v): %v", row.Spec, err)
+				}
+				return schedule, nil
 			}
 
-			// Parse the spec
-			schedule, err := row.Parse()
+			schedule, err := createAndSchedule(row)
 			if err != nil {
-				log.Error("Parse: %v", err)
-				return err
+				log.Error("RepoID=%v WorkflowID=%v: %v", row.Schedule.RepoID, row.Schedule.WorkflowID, err)
+				actionConfig.DisableWorkflow(row.Schedule.WorkflowID)
+				if err := repo_model.UpdateRepoUnit(ctx, cfg); err != nil {
+					log.Error("RepoID=%v WorkflowID=%v: CreateScheduleTask: %v", row.Schedule.RepoID, row.Schedule.WorkflowID, err)
+					return err
+				}
+				continue
 			}
 
 			// Update the spec's next run time and previous run time
@@ -138,8 +156,18 @@ func CreateScheduleTask(ctx context.Context, cron *actions_model.ActionSchedule)
 		return err
 	}
 
+	workflow, err := act_model.ReadWorkflow(bytes.NewReader(cron.Content), false)
+	if err != nil {
+		return err
+	}
+	notifications, err := workflow.Notifications()
+	if err != nil {
+		return err
+	}
+	run.NotifyEmail = notifications
+
 	// Parse the workflow specification from the cron schedule
-	workflows, err := jobparser.Parse(cron.Content, jobparser.WithVars(vars))
+	workflows, err := jobParser(cron.Content, jobparser.WithVars(vars))
 	if err != nil {
 		return err
 	}
@@ -152,3 +180,93 @@ func CreateScheduleTask(ctx context.Context, cron *actions_model.ActionSchedule)
 	// Return nil if no errors occurred
 	return nil
 }
+
+// CancelPreviousJobs cancels all previous jobs of the same repository, reference, workflow, and event.
+// It's useful when a new run is triggered, and all previous runs needn't be continued anymore.
+func CancelPreviousJobs(ctx context.Context, repoID int64, ref, workflowID string, event webhook_module.HookEventType) error {
+	// Find all runs in the specified repository, reference, and workflow with non-final status
+	runs, total, err := db.FindAndCount[actions_model.ActionRun](ctx, actions_model.FindRunOptions{
+		RepoID:       repoID,
+		Ref:          ref,
+		WorkflowID:   workflowID,
+		TriggerEvent: event,
+		Status:       []actions_model.Status{actions_model.StatusRunning, actions_model.StatusWaiting, actions_model.StatusBlocked},
+	})
+	if err != nil {
+		return err
+	}
+
+	// If there are no runs found, there's no need to proceed with cancellation, so return nil.
+	if total == 0 {
+		return nil
+	}
+
+	// Iterate over each found run and cancel its associated jobs.
+	for _, run := range runs {
+		// Find all jobs associated with the current run.
+		jobs, err := db.Find[actions_model.ActionRunJob](ctx, actions_model.FindRunJobOptions{
+			RunID: run.ID,
+		})
+		if err != nil {
+			return err
+		}
+
+		// Iterate over each job and attempt to cancel it.
+		for _, job := range jobs {
+			// Skip jobs that are already in a terminal state (completed, cancelled, etc.).
+			status := job.Status
+			if status.IsDone() {
+				continue
+			}
+
+			// If the job has no associated task (probably an error), set its status to 'Cancelled' and stop it.
+			if job.TaskID == 0 {
+				job.Status = actions_model.StatusCancelled
+				job.Stopped = timeutil.TimeStampNow()
+
+				// Update the job's status and stopped time in the database.
+				n, err := UpdateRunJob(ctx, job, builder.Eq{"task_id": 0}, "status", "stopped")
+				if err != nil {
+					return err
+				}
+
+				// If the update affected 0 rows, it means the job has changed in the meantime, so we need to try again.
+				if n == 0 {
+					return errors.New("job has changed, try again")
+				}
+
+				// Continue with the next job.
+				continue
+			}
+
+			// If the job has an associated task, try to stop the task, effectively cancelling the job.
+			if err := StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil {
+				return err
+			}
+		}
+	}
+
+	// Return nil to indicate successful cancellation of all running and waiting jobs.
+	return nil
+}
+
+func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, cancelPreviousJobs bool) error {
+	// If actions disabled when there is schedule task, this will remove the outdated schedule tasks
+	// There is no other place we can do this because the app.ini will be changed manually
+	if err := actions_model.DeleteScheduleTaskByRepo(ctx, repo.ID); err != nil {
+		return fmt.Errorf("DeleteCronTaskByRepo: %v", err)
+	}
+	if cancelPreviousJobs {
+		// cancel running cron jobs of this repository and delete old schedules
+		if err := CancelPreviousJobs(
+			ctx,
+			repo.ID,
+			repo.DefaultBranch,
+			"",
+			webhook_module.HookEventSchedule,
+		); err != nil {
+			return fmt.Errorf("CancelPreviousJobs: %v", err)
+		}
+	}
+	return nil
+}
diff --git a/services/actions/schedule_tasks_test.go b/services/actions/schedule_tasks_test.go
new file mode 100644
index 0000000000..31ed5ec813
--- /dev/null
+++ b/services/actions/schedule_tasks_test.go
@@ -0,0 +1,175 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package actions
+
+import (
+	"testing"
+
+	actions_model "forgejo.org/models/actions"
+	"forgejo.org/models/db"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unit"
+	"forgejo.org/models/unittest"
+	webhook_module "forgejo.org/modules/webhook"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestServiceActions_startTask(t *testing.T) {
+	defer unittest.OverrideFixtures("services/actions/TestServiceActions_startTask")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	// Load fixtures that are corrupted and create one valid scheduled workflow
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
+
+	workflowID := "some.yml"
+	schedules := []*actions_model.ActionSchedule{
+		{
+			Title:         "scheduletitle1",
+			RepoID:        repo.ID,
+			OwnerID:       repo.OwnerID,
+			WorkflowID:    workflowID,
+			TriggerUserID: repo.OwnerID,
+			Ref:           "branch",
+			CommitSHA:     "fakeSHA",
+			Event:         webhook_module.HookEventSchedule,
+			EventPayload:  "fakepayload",
+			Specs:         []string{"* * * * *"},
+			Content: []byte(
+				`
+jobs:
+  job2:
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+`),
+		},
+	}
+
+	require.Equal(t, 2, unittest.GetCount(t, actions_model.ActionScheduleSpec{}))
+	require.NoError(t, actions_model.CreateScheduleTask(t.Context(), schedules))
+	require.Equal(t, 3, unittest.GetCount(t, actions_model.ActionScheduleSpec{}))
+	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE `action_schedule_spec` SET next = 1")
+	require.NoError(t, err)
+
+	// After running startTasks an ActionRun row is created for the valid scheduled workflow
+	require.Empty(t, unittest.GetCount(t, actions_model.ActionRun{WorkflowID: workflowID}))
+	require.NoError(t, startTasks(t.Context()))
+	require.NotEmpty(t, unittest.GetCount(t, actions_model.ActionRun{WorkflowID: workflowID}))
+
+	// The invalid workflows loaded from the fixtures are disabled
+	repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
+	actionUnit, err := repo.GetUnit(t.Context(), unit.TypeActions)
+	require.NoError(t, err)
+	actionConfig := actionUnit.ActionsConfig()
+	assert.True(t, actionConfig.IsWorkflowDisabled("workflow2.yml"))
+	assert.True(t, actionConfig.IsWorkflowDisabled("workflow1.yml"))
+	assert.False(t, actionConfig.IsWorkflowDisabled("some.yml"))
+}
+
+func TestCreateScheduleTask(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2, OwnerID: 2})
+
+	assertConstant := func(t *testing.T, cron *actions_model.ActionSchedule, run *actions_model.ActionRun) {
+		t.Helper()
+		assert.Equal(t, cron.Title, run.Title)
+		assert.Equal(t, cron.RepoID, run.RepoID)
+		assert.Equal(t, cron.OwnerID, run.OwnerID)
+		assert.Equal(t, cron.WorkflowID, run.WorkflowID)
+		assert.Equal(t, cron.TriggerUserID, run.TriggerUserID)
+		assert.Equal(t, cron.Ref, run.Ref)
+		assert.Equal(t, cron.CommitSHA, run.CommitSHA)
+		assert.Equal(t, cron.Event, run.Event)
+		assert.Equal(t, cron.EventPayload, run.EventPayload)
+		assert.Equal(t, cron.ID, run.ScheduleID)
+		assert.Equal(t, actions_model.StatusWaiting, run.Status)
+	}
+
+	assertMutable := func(t *testing.T, expected, run *actions_model.ActionRun) {
+		t.Helper()
+		assert.Equal(t, expected.NotifyEmail, run.NotifyEmail)
+	}
+
+	testCases := []struct {
+		name string
+		cron actions_model.ActionSchedule
+		want []actions_model.ActionRun
+	}{
+		{
+			name: "simple",
+			cron: actions_model.ActionSchedule{
+				Title:         "scheduletitle1",
+				RepoID:        repo.ID,
+				OwnerID:       repo.OwnerID,
+				WorkflowID:    "some.yml",
+				TriggerUserID: repo.OwnerID,
+				Ref:           "branch",
+				CommitSHA:     "fakeSHA",
+				Event:         webhook_module.HookEventSchedule,
+				EventPayload:  "fakepayload",
+				Content: []byte(
+					`
+name: test
+on: push
+jobs:
+  job2:
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+`),
+			},
+			want: []actions_model.ActionRun{
+				{
+					Title:       "scheduletitle1",
+					NotifyEmail: false,
+				},
+			},
+		},
+		{
+			name: "enable-email-notifications is true",
+			cron: actions_model.ActionSchedule{
+				Title:         "scheduletitle2",
+				RepoID:        repo.ID,
+				OwnerID:       repo.OwnerID,
+				WorkflowID:    "some.yml",
+				TriggerUserID: repo.OwnerID,
+				Ref:           "branch",
+				CommitSHA:     "fakeSHA",
+				Event:         webhook_module.HookEventSchedule,
+				EventPayload:  "fakepayload",
+				Content: []byte(
+					`
+name: test
+enable-email-notifications: true
+on: push
+jobs:
+  job2:
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+`),
+			},
+			want: []actions_model.ActionRun{
+				{
+					Title:       "scheduletitle2",
+					NotifyEmail: true,
+				},
+			},
+		},
+	}
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			require.NoError(t, CreateScheduleTask(t.Context(), &testCase.cron))
+			require.Equal(t, len(testCase.want), unittest.GetCount(t, actions_model.ActionRun{RepoID: repo.ID}))
+			for _, expected := range testCase.want {
+				run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{Title: expected.Title})
+				assertConstant(t, &testCase.cron, run)
+				assertMutable(t, &expected, run)
+			}
+			unittest.AssertSuccessfulDelete(t, actions_model.ActionRun{RepoID: repo.ID})
+		})
+	}
+}
diff --git a/services/actions/task.go b/services/actions/task.go
index 43c8deaa5f..bb319c7d05 100644
--- a/services/actions/task.go
+++ b/services/actions/task.go
@@ -5,14 +5,18 @@ package actions
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	secret_model "forgejo.org/models/secret"
+	"forgejo.org/modules/timeutil"
+	"forgejo.org/modules/util"
 
 	runnerv1 "code.gitea.io/actions-proto-go/runner/v1"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func PickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv1.Task, bool, error) {
@@ -105,3 +109,144 @@ func findTaskNeeds(ctx context.Context, taskJob *actions_model.ActionRunJob) (ma
 	}
 	return ret, nil
 }
+
+func StopTask(ctx context.Context, taskID int64, status actions_model.Status) error {
+	if !status.IsDone() {
+		return fmt.Errorf("cannot stop task with status %v", status)
+	}
+	e := db.GetEngine(ctx)
+
+	task := &actions_model.ActionTask{}
+	if has, err := e.ID(taskID).Get(task); err != nil {
+		return err
+	} else if !has {
+		return util.ErrNotExist
+	}
+	if task.Status.IsDone() {
+		return nil
+	}
+
+	now := timeutil.TimeStampNow()
+	task.Status = status
+	task.Stopped = now
+	if _, err := UpdateRunJob(ctx, &actions_model.ActionRunJob{
+		ID:      task.JobID,
+		Status:  task.Status,
+		Stopped: task.Stopped,
+	}, nil); err != nil {
+		return err
+	}
+
+	if err := actions_model.UpdateTask(ctx, task, "status", "stopped"); err != nil {
+		return err
+	}
+
+	if err := task.LoadAttributes(ctx); err != nil {
+		return err
+	}
+
+	for _, step := range task.Steps {
+		if !step.Status.IsDone() {
+			step.Status = status
+			if step.Started == 0 {
+				step.Started = now
+			}
+			step.Stopped = now
+		}
+		if _, err := e.ID(step.ID).Update(step); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// UpdateTaskByState updates the task by the state.
+// It will always update the task if the state is not final, even there is no change.
+// So it will update ActionTask.Updated to avoid the task being judged as a zombie task.
+func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.TaskState) (*actions_model.ActionTask, error) {
+	stepStates := map[int64]*runnerv1.StepState{}
+	for _, v := range state.Steps {
+		stepStates[v.Id] = v
+	}
+
+	ctx, commiter, err := db.TxContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer commiter.Close()
+
+	e := db.GetEngine(ctx)
+
+	task := &actions_model.ActionTask{}
+	if has, err := e.ID(state.Id).Get(task); err != nil {
+		return nil, err
+	} else if !has {
+		return nil, util.ErrNotExist
+	} else if runnerID != task.RunnerID {
+		return nil, errors.New("invalid runner for task")
+	}
+
+	if task.Status.IsDone() {
+		// the state is final, do nothing
+		return task, nil
+	}
+
+	// state.Result is not unspecified means the task is finished
+	if state.Result != runnerv1.Result_RESULT_UNSPECIFIED {
+		task.Status = actions_model.Status(state.Result)
+		task.Stopped = timeutil.TimeStamp(state.StoppedAt.AsTime().Unix())
+		if err := actions_model.UpdateTask(ctx, task, "status", "stopped"); err != nil {
+			return nil, err
+		}
+		if _, err := UpdateRunJob(ctx, &actions_model.ActionRunJob{
+			ID:      task.JobID,
+			Status:  task.Status,
+			Stopped: task.Stopped,
+		}, nil); err != nil {
+			return nil, err
+		}
+	} else {
+		// Force update ActionTask.Updated to avoid the task being judged as a zombie task
+		task.Updated = timeutil.TimeStampNow()
+		if err := actions_model.UpdateTask(ctx, task, "updated"); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := task.LoadAttributes(ctx); err != nil {
+		return nil, err
+	}
+
+	for _, step := range task.Steps {
+		var result runnerv1.Result
+		if v, ok := stepStates[step.Index]; ok {
+			result = v.Result
+			step.LogIndex = v.LogIndex
+			step.LogLength = v.LogLength
+			step.Started = convertTimestamp(v.StartedAt)
+			step.Stopped = convertTimestamp(v.StoppedAt)
+		}
+		if result != runnerv1.Result_RESULT_UNSPECIFIED {
+			step.Status = actions_model.Status(result)
+		} else if step.Started != 0 {
+			step.Status = actions_model.StatusRunning
+		}
+		if _, err := e.ID(step.ID).Update(step); err != nil {
+			return nil, err
+		}
+	}
+
+	if err := commiter.Commit(); err != nil {
+		return nil, err
+	}
+
+	return task, nil
+}
+
+func convertTimestamp(timestamp *timestamppb.Timestamp) timeutil.TimeStamp {
+	if timestamp.GetSeconds() == 0 && timestamp.GetNanos() == 0 {
+		return timeutil.TimeStamp(0)
+	}
+	return timeutil.TimeStamp(timestamp.AsTime().Unix())
+}
diff --git a/services/actions/variables.go b/services/actions/variables.go
index fed1fd0890..a9f42105a3 100644
--- a/services/actions/variables.go
+++ b/services/actions/variables.go
@@ -87,7 +87,7 @@ func GetVariable(ctx context.Context, opts actions_model.FindVariablesOpts) (*ac
 // https://docs.github.com/en/actions/learn-github-actions/variables#naming-conventions-for-configuration-variables
 // https://docs.github.com/en/actions/security-guides/encrypted-secrets#naming-your-secrets
 var (
-	forbiddenEnvNameCIRx = regexp.MustCompile("(?i)^CI")
+	forbiddenEnvNameCIRx = regexp.MustCompile("(?i)^CI$")
 )
 
 func envNameCIRegexMatch(name string) error {
diff --git a/services/actions/variables_test.go b/services/actions/variables_test.go
new file mode 100644
index 0000000000..f69bc674e1
--- /dev/null
+++ b/services/actions/variables_test.go
@@ -0,0 +1,17 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package actions
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestServicesAction_envNameCIRegexMatch(t *testing.T) {
+	require.ErrorContains(t, envNameCIRegexMatch("ci"), "cannot be ci")
+	require.ErrorContains(t, envNameCIRegexMatch("CI"), "cannot be ci")
+	assert.NoError(t, envNameCIRegexMatch("CI_SOMETHING"))
+}
diff --git a/services/actions/workflows.go b/services/actions/workflows.go
index 7ec7c3abed..1bc46bfadc 100644
--- a/services/actions/workflows.go
+++ b/services/actions/workflows.go
@@ -24,8 +24,8 @@ import (
 	"forgejo.org/modules/webhook"
 	"forgejo.org/services/convert"
 
-	"github.com/nektos/act/pkg/jobparser"
-	act_model "github.com/nektos/act/pkg/model"
+	"code.forgejo.org/forgejo/runner/v9/act/jobparser"
+	act_model "code.forgejo.org/forgejo/runner/v9/act/model"
 )
 
 type InputRequiredErr struct {
@@ -56,7 +56,7 @@ func (entry *Workflow) Dispatch(ctx context.Context, inputGetter InputValueGette
 		return nil, nil, err
 	}
 
-	wf, err := act_model.ReadWorkflow(bytes.NewReader(content))
+	wf, err := act_model.ReadWorkflow(bytes.NewReader(content), false)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -111,6 +111,11 @@ func (entry *Workflow) Dispatch(ctx context.Context, inputGetter InputValueGette
 		return nil, nil, err
 	}
 
+	notifications, err := wf.Notifications()
+	if err != nil {
+		return nil, nil, err
+	}
+
 	run := &actions_model.ActionRun{
 		Title:         title,
 		RepoID:        repo.ID,
@@ -125,6 +130,7 @@ func (entry *Workflow) Dispatch(ctx context.Context, inputGetter InputValueGette
 		EventPayload:  string(p),
 		TriggerEvent:  string(webhook.HookEventWorkflowDispatch),
 		Status:        actions_model.StatusWaiting,
+		NotifyEmail:   notifications,
 	}
 
 	vars, err := actions_model.GetVariablesOfRun(ctx, run)
@@ -132,7 +138,7 @@ func (entry *Workflow) Dispatch(ctx context.Context, inputGetter InputValueGette
 		return nil, nil, err
 	}
 
-	jobs, err := jobparser.Parse(content, jobparser.WithVars(vars))
+	jobs, err := jobParser(content, jobparser.WithVars(vars))
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/services/agit/agit.go b/services/agit/agit.go
index 20e87642c3..8ef641629a 100644
--- a/services/agit/agit.go
+++ b/services/agit/agit.go
@@ -221,7 +221,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
 		}
 
 		// Validate pull request.
-		pull_service.ValidatePullRequest(ctx, pr, oldCommitID, opts.NewCommitIDs[i], pusher)
+		pull_service.ValidatePullRequest(ctx, pr, opts.NewCommitIDs[i], oldCommitID, pusher)
 
 		// TODO: call `InvalidateCodeComments`
 
diff --git a/services/asymkey/sign.go b/services/asymkey/sign.go
index 0030523b22..527f6edd92 100644
--- a/services/asymkey/sign.go
+++ b/services/asymkey/sign.go
@@ -10,7 +10,6 @@ import (
 
 	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/models/auth"
-	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
 	repo_model "forgejo.org/models/repo"
@@ -90,6 +89,13 @@ func SigningKey(ctx context.Context, repoPath string) (string, *git.Signature) {
 		return "", nil
 	}
 
+	if setting.Repository.Signing.Format == "ssh" {
+		return setting.Repository.Signing.SigningKey, &git.Signature{
+			Name:  setting.Repository.Signing.SigningName,
+			Email: setting.Repository.Signing.SigningEmail,
+		}
+	}
+
 	if setting.Repository.Signing.SigningKey == "default" || setting.Repository.Signing.SigningKey == "" {
 		// Can ignore the error here as it means that commit.gpgsign is not set
 		value, _, _ := git.NewCommand(ctx, "config", "--get", "commit.gpgsign").RunStdString(&git.RunOpts{Dir: repoPath})
@@ -145,22 +151,19 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
-				OwnerID:        u.ID,
-				IncludeSubKeys: true,
-			})
+			hasPubKey, err := asymkey_model.HasAsymKeyByUID(ctx, u.ID)
 			if err != nil {
 				return false, "", nil, err
 			}
-			if len(keys) == 0 {
+			if !hasPubKey {
 				return false, "", nil, &ErrWontSign{pubkey}
 			}
 		case twofa:
-			twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
-			if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
+			hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
+			if err != nil {
 				return false, "", nil, err
 			}
-			if twofaModel == nil {
+			if !hasTwoFactor {
 				return false, "", nil, &ErrWontSign{twofa}
 			}
 		}
@@ -185,22 +188,19 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
-				OwnerID:        u.ID,
-				IncludeSubKeys: true,
-			})
+			hasPubKey, err := asymkey_model.HasAsymKeyByUID(ctx, u.ID)
 			if err != nil {
 				return false, "", nil, err
 			}
-			if len(keys) == 0 {
+			if !hasPubKey {
 				return false, "", nil, &ErrWontSign{pubkey}
 			}
 		case twofa:
-			twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
-			if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
+			hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
+			if err != nil {
 				return false, "", nil, err
 			}
-			if twofaModel == nil {
+			if !hasTwoFactor {
 				return false, "", nil, &ErrWontSign{twofa}
 			}
 		case parentSigned:
@@ -241,22 +241,19 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
-				OwnerID:        u.ID,
-				IncludeSubKeys: true,
-			})
+			hasPubKey, err := asymkey_model.HasAsymKeyByUID(ctx, u.ID)
 			if err != nil {
 				return false, "", nil, err
 			}
-			if len(keys) == 0 {
+			if !hasPubKey {
 				return false, "", nil, &ErrWontSign{pubkey}
 			}
 		case twofa:
-			twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
-			if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
+			hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
+			if err != nil {
 				return false, "", nil, err
 			}
-			if twofaModel == nil {
+			if !hasTwoFactor {
 				return false, "", nil, &ErrWontSign{twofa}
 			}
 		case parentSigned:
@@ -306,22 +303,19 @@ Loop:
 		case always:
 			break Loop
 		case pubkey:
-			keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
-				OwnerID:        u.ID,
-				IncludeSubKeys: true,
-			})
+			hasPubKey, err := asymkey_model.HasAsymKeyByUID(ctx, u.ID)
 			if err != nil {
 				return false, "", nil, err
 			}
-			if len(keys) == 0 {
+			if !hasPubKey {
 				return false, "", nil, &ErrWontSign{pubkey}
 			}
 		case twofa:
-			twofaModel, err := auth.GetTwoFactorByUID(ctx, u.ID)
-			if err != nil && !auth.IsErrTwoFactorNotEnrolled(err) {
+			hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, u.ID)
+			if err != nil {
 				return false, "", nil, err
 			}
-			if twofaModel == nil {
+			if !hasTwoFactor {
 				return false, "", nil, &ErrWontSign{twofa}
 			}
 		case approved:
diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go
index 365bd7faf6..b6f763842b 100644
--- a/services/attachment/attachment.go
+++ b/services/attachment/attachment.go
@@ -51,7 +51,7 @@ func NewExternalAttachment(ctx context.Context, attach *repo_model.Attachment) (
 	if attach.ExternalURL == "" {
 		return nil, fmt.Errorf("attachment %s should have a external url", attach.Name)
 	}
-	if !validation.IsValidExternalURL(attach.ExternalURL) {
+	if !validation.IsValidReleaseAssetURL(attach.ExternalURL) {
 		return nil, repo_model.ErrInvalidExternalURL{ExternalURL: attach.ExternalURL}
 	}
 
diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go
index 70b1e80d6a..ef002bf16c 100644
--- a/services/attachment/attachment_test.go
+++ b/services/attachment/attachment_test.go
@@ -43,6 +43,6 @@ func TestUploadAttachment(t *testing.T) {
 
 	attachment, err := repo_model.GetAttachmentByUUID(db.DefaultContext, attach.UUID)
 	require.NoError(t, err)
-	assert.EqualValues(t, user.ID, attachment.UploaderID)
+	assert.Equal(t, user.ID, attachment.UploaderID)
 	assert.Equal(t, int64(0), attachment.DownloadCount)
 }
diff --git a/services/auth/httpsign.go b/services/auth/httpsign.go
index d3cbb8aa60..e776ccbbed 100644
--- a/services/auth/httpsign.go
+++ b/services/auth/httpsign.go
@@ -134,7 +134,7 @@ func VerifyCert(r *http.Request) (*asymkey_model.PublicKey, error) {
 	// Check if it's really a ssh certificate
 	cert, ok := pk.(*ssh.Certificate)
 	if !ok {
-		return nil, fmt.Errorf("no certificate found")
+		return nil, errors.New("no certificate found")
 	}
 
 	c := &ssh.CertChecker{
@@ -153,7 +153,7 @@ func VerifyCert(r *http.Request) (*asymkey_model.PublicKey, error) {
 
 	// check the CA of the cert
 	if !c.IsUserAuthority(cert.SignatureKey) {
-		return nil, fmt.Errorf("CA check failed")
+		return nil, errors.New("CA check failed")
 	}
 
 	// Create a verifier
@@ -191,7 +191,7 @@ func VerifyCert(r *http.Request) (*asymkey_model.PublicKey, error) {
 	}
 
 	// No public key matching a principal in the certificate is registered in gitea
-	return nil, fmt.Errorf("no valid principal found")
+	return nil, errors.New("no valid principal found")
 }
 
 // doVerify iterates across the provided public keys attempting the verify the current request against each key in turn
diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go
index e6d556d10b..fa13c20a7f 100644
--- a/services/auth/oauth2.go
+++ b/services/auth/oauth2.go
@@ -17,6 +17,7 @@ import (
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/timeutil"
+	"forgejo.org/modules/util"
 	"forgejo.org/modules/web/middleware"
 	"forgejo.org/services/actions"
 	"forgejo.org/services/auth/source/oauth2"
@@ -137,7 +138,7 @@ func parseToken(req *http.Request) (string, bool) {
 	// check header token
 	if auHead := req.Header.Get("Authorization"); auHead != "" {
 		auths := strings.Fields(auHead)
-		if len(auths) == 2 && (auths[0] == "token" || strings.ToLower(auths[0]) == "bearer") {
+		if len(auths) == 2 && (util.ASCIIEqualFold(auths[0], "token") || util.ASCIIEqualFold(auths[0], "bearer")) {
 			return auths[1], true
 		}
 	}
diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go
index d6455b33ad..3fce7df50b 100644
--- a/services/auth/oauth2_test.go
+++ b/services/auth/oauth2_test.go
@@ -4,6 +4,7 @@
 package auth
 
 import (
+	"net/http"
 	"testing"
 
 	"forgejo.org/models/unittest"
@@ -52,3 +53,30 @@ func TestCheckTaskIsRunning(t *testing.T) {
 		})
 	}
 }
+
+func TestParseToken(t *testing.T) {
+	cases := map[string]struct {
+		Header        string
+		ExpectedToken string
+		Expected      bool
+	}{
+		"Token Uppercase":  {Header: "Token 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true},
+		"Token Lowercase":  {Header: "token 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true},
+		"Token Unicode":    {Header: "to\u212Aen 1234567890123456789012345687901325467890", ExpectedToken: "", Expected: false},
+		"Bearer Uppercase": {Header: "Bearer 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true},
+		"Bearer Lowercase": {Header: "bearer 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true},
+		"Missing type":     {Header: "1234567890123456789012345687901325467890", ExpectedToken: "", Expected: false},
+		"Three Parts":      {Header: "abc 1234567890 test", ExpectedToken: "", Expected: false},
+	}
+
+	for name := range cases {
+		c := cases[name]
+		t.Run(name, func(t *testing.T) {
+			req, _ := http.NewRequest("GET", "/", nil)
+			req.Header.Add("Authorization", c.Header)
+			ActualToken, ActualSuccess := parseToken(req)
+			assert.Equal(t, c.ExpectedToken, ActualToken)
+			assert.Equal(t, c.Expected, ActualSuccess)
+		})
+	}
+}
diff --git a/services/auth/reverseproxy_test.go b/services/auth/reverseproxy_test.go
index 70ce1f8b0b..cdcd845148 100644
--- a/services/auth/reverseproxy_test.go
+++ b/services/auth/reverseproxy_test.go
@@ -38,10 +38,10 @@ func TestReverseProxyAuth(t *testing.T) {
 
 		require.EqualValues(t, 1, user_model.CountUsers(db.DefaultContext, nil))
 		unittest.AssertExistsAndLoadBean(t, &user_model.User{Email: "edgar@example.org", Name: "Edgar", LowerName: "edgar", FullName: "Edgar Allan Poe", IsAdmin: true})
-		require.EqualValues(t, "edgar@example.org", user.Email)
-		require.EqualValues(t, "Edgar", user.Name)
-		require.EqualValues(t, "edgar", user.LowerName)
-		require.EqualValues(t, "Edgar Allan Poe", user.FullName)
+		require.Equal(t, "edgar@example.org", user.Email)
+		require.Equal(t, "Edgar", user.Name)
+		require.Equal(t, "edgar", user.LowerName)
+		require.Equal(t, "Edgar Allan Poe", user.FullName)
 		require.True(t, user.IsAdmin)
 	})
 
@@ -58,10 +58,10 @@ func TestReverseProxyAuth(t *testing.T) {
 
 		require.EqualValues(t, 2, user_model.CountUsers(db.DefaultContext, nil))
 		unittest.AssertExistsAndLoadBean(t, &user_model.User{Email: "gusted@example.org", Name: "Gusted", LowerName: "gusted", FullName: "❤‿❤"}, "is_admin = false")
-		require.EqualValues(t, "gusted@example.org", user.Email)
-		require.EqualValues(t, "Gusted", user.Name)
-		require.EqualValues(t, "gusted", user.LowerName)
-		require.EqualValues(t, "❤‿❤", user.FullName)
+		require.Equal(t, "gusted@example.org", user.Email)
+		require.Equal(t, "Gusted", user.Name)
+		require.Equal(t, "gusted", user.LowerName)
+		require.Equal(t, "❤‿❤", user.FullName)
 		require.False(t, user.IsAdmin)
 	})
 }
diff --git a/services/auth/source/db/authenticate.go b/services/auth/source/db/authenticate.go
index 7c18540a10..b1d8eae6ae 100644
--- a/services/auth/source/db/authenticate.go
+++ b/services/auth/source/db/authenticate.go
@@ -50,7 +50,7 @@ func Authenticate(ctx context.Context, user *user_model.User, login, password st
 
 	if !user.IsPasswordSet() {
 		return nil, ErrUserPasswordNotSet{UID: user.ID, Name: user.Name}
-	} else if !user.ValidatePassword(password) {
+	} else if !user.ValidatePassword(ctx, password) {
 		return nil, ErrUserPasswordInvalid{UID: user.ID, Name: user.Name}
 	}
 
diff --git a/services/auth/source/oauth2/jwtsigningkey_test.go b/services/auth/source/oauth2/jwtsigningkey_test.go
index 7cf2833696..9b07b022df 100644
--- a/services/auth/source/oauth2/jwtsigningkey_test.go
+++ b/services/auth/source/oauth2/jwtsigningkey_test.go
@@ -30,7 +30,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 
 		block, _ := pem.Decode(fileContent)
 		assert.NotNil(t, block)
-		assert.EqualValues(t, "PRIVATE KEY", block.Type)
+		assert.Equal(t, "PRIVATE KEY", block.Type)
 
 		parsedKey, err := x509.ParsePKCS8PrivateKey(block.Bytes)
 		require.NoError(t, err)
@@ -44,14 +44,14 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		rsaPrivateKey := parsedKey.(*rsa.PrivateKey)
-		assert.EqualValues(t, 2048, rsaPrivateKey.N.BitLen())
+		assert.Equal(t, 2048, rsaPrivateKey.N.BitLen())
 
 		t.Run("Load key with differ specified algorithm", func(t *testing.T) {
 			defer test.MockVariableValue(&setting.OAuth2.JWTSigningAlgorithm, "EdDSA")()
 
 			parsedKey := loadKey(t)
 			rsaPrivateKey := parsedKey.(*rsa.PrivateKey)
-			assert.EqualValues(t, 2048, rsaPrivateKey.N.BitLen())
+			assert.Equal(t, 2048, rsaPrivateKey.N.BitLen())
 		})
 	})
 
@@ -62,7 +62,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		rsaPrivateKey := parsedKey.(*rsa.PrivateKey)
-		assert.EqualValues(t, 3072, rsaPrivateKey.N.BitLen())
+		assert.Equal(t, 3072, rsaPrivateKey.N.BitLen())
 	})
 
 	t.Run("RSA-4096", func(t *testing.T) {
@@ -72,7 +72,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		rsaPrivateKey := parsedKey.(*rsa.PrivateKey)
-		assert.EqualValues(t, 4096, rsaPrivateKey.N.BitLen())
+		assert.Equal(t, 4096, rsaPrivateKey.N.BitLen())
 	})
 
 	t.Run("ECDSA-256", func(t *testing.T) {
@@ -82,7 +82,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		ecdsaPrivateKey := parsedKey.(*ecdsa.PrivateKey)
-		assert.EqualValues(t, 256, ecdsaPrivateKey.Params().BitSize)
+		assert.Equal(t, 256, ecdsaPrivateKey.Params().BitSize)
 	})
 
 	t.Run("ECDSA-384", func(t *testing.T) {
@@ -92,7 +92,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		ecdsaPrivateKey := parsedKey.(*ecdsa.PrivateKey)
-		assert.EqualValues(t, 384, ecdsaPrivateKey.Params().BitSize)
+		assert.Equal(t, 384, ecdsaPrivateKey.Params().BitSize)
 	})
 
 	t.Run("ECDSA-512", func(t *testing.T) {
@@ -102,7 +102,7 @@ func TestLoadOrCreateAsymmetricKey(t *testing.T) {
 		parsedKey := loadKey(t)
 
 		ecdsaPrivateKey := parsedKey.(*ecdsa.PrivateKey)
-		assert.EqualValues(t, 521, ecdsaPrivateKey.Params().BitSize)
+		assert.Equal(t, 521, ecdsaPrivateKey.Params().BitSize)
 	})
 
 	t.Run("EdDSA", func(t *testing.T) {
diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go
index 5245f88270..a3126cf353 100644
--- a/services/auth/source/oauth2/source.go
+++ b/services/auth/source/oauth2/source.go
@@ -29,6 +29,7 @@ type Source struct {
 	GroupTeamMapRemoval   bool
 	RestrictedGroup       string
 	SkipLocalTwoFA        bool `json:",omitempty"`
+	AllowUsernameChange   bool
 
 	// reference to the authSource
 	authSource *auth.Source
diff --git a/services/auth/source/oauth2/token.go b/services/auth/source/oauth2/token.go
index fba1fd8a01..b060b6b746 100644
--- a/services/auth/source/oauth2/token.go
+++ b/services/auth/source/oauth2/token.go
@@ -4,6 +4,7 @@
 package oauth2
 
 import (
+	"errors"
 	"fmt"
 	"time"
 
@@ -51,12 +52,12 @@ func ParseToken(jwtToken string, signingKey JWTSigningKey) (*Token, error) {
 		return nil, err
 	}
 	if !parsedToken.Valid {
-		return nil, fmt.Errorf("invalid token")
+		return nil, errors.New("invalid token")
 	}
 	var token *Token
 	var ok bool
 	if token, ok = parsedToken.Claims.(*Token); !ok || !parsedToken.Valid {
-		return nil, fmt.Errorf("invalid token")
+		return nil, errors.New("invalid token")
 	}
 	return token, nil
 }
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
index 51a14edd9a..0cdc113379 100644
--- a/services/automerge/automerge.go
+++ b/services/automerge/automerge.go
@@ -32,7 +32,7 @@ func Init() error {
 
 	shared_automerge.PRAutoMergeQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "pr_auto_merge", handler)
 	if shared_automerge.PRAutoMergeQueue == nil {
-		return fmt.Errorf("unable to create pr_auto_merge queue")
+		return errors.New("unable to create pr_auto_merge queue")
 	}
 	go graceful.GetManager().RunWithCancel(shared_automerge.PRAutoMergeQueue)
 	return nil
@@ -107,6 +107,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 		return
 	}
 	if !exists {
+		log.Trace("GetScheduledMergeByPullID found nothing for PR %d", pullID)
 		return
 	}
 
@@ -161,7 +162,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 			return
 		}
 	case issues_model.PullRequestFlowAGit:
-		headBranchExist := git.IsReferenceExist(ctx, baseGitRepo.Path, pr.GetGitRefName())
+		headBranchExist := baseGitRepo.IsReferenceExist(pr.GetGitRefName())
 		if !headBranchExist {
 			log.Warn("Head branch of auto merge %-v does not exist [HeadRepoID: %d, Branch(Agit): %s]", pr, pr.HeadRepoID, pr.HeadBranch)
 			return
@@ -204,6 +205,10 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 		return
 	}
 
+	if err := pull_model.DeleteScheduledAutoMerge(ctx, pr.ID); err != nil && !db.IsErrNotExist(err) {
+		log.Error("DeleteScheduledAutoMerge[%d]: %v", pr.ID, err)
+	}
+
 	if err := pull_service.Merge(ctx, pr, doer, baseGitRepo, scheduledPRM.MergeStyle, "", scheduledPRM.Message, true); err != nil {
 		log.Error("pull_service.Merge: %v", err)
 		// FIXME: if merge failed, we should display some error message to the pull request page.
diff --git a/services/context/api.go b/services/context/api.go
index 37f0e0f559..e9f67c720d 100644
--- a/services/context/api.go
+++ b/services/context/api.go
@@ -6,6 +6,7 @@ package context
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -186,7 +187,7 @@ func (ctx *APIContext) Error(status int, title string, obj any) {
 	if status == http.StatusInternalServerError {
 		log.ErrorWithSkip(1, "%s: %s", title, message)
 
-		if setting.IsProd && !(ctx.Doer != nil && ctx.Doer.IsAdmin) {
+		if setting.IsProd && (ctx.Doer == nil || !ctx.Doer.IsAdmin) {
 			message = ""
 		}
 	}
@@ -285,8 +286,8 @@ func APIContexter() func(http.Handler) http.Handler {
 			}
 			defer baseCleanUp()
 
-			ctx.Base.AppendContextValue(apiContextKey, ctx)
-			ctx.Base.AppendContextValueFunc(gitrepo.RepositoryContextKey, func() any { return ctx.Repo.GitRepo })
+			ctx.AppendContextValue(apiContextKey, ctx)
+			ctx.AppendContextValueFunc(gitrepo.RepositoryContextKey, func() any { return ctx.Repo.GitRepo })
 
 			// If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid.
 			if ctx.Req.Method == "POST" && strings.Contains(ctx.Req.Header.Get("Content-Type"), "multipart/form-data") {
@@ -334,7 +335,7 @@ func (ctx *APIContext) NotFound(objs ...any) {
 func ReferencesGitRepo(allowEmpty ...bool) func(ctx *APIContext) (cancel context.CancelFunc) {
 	return func(ctx *APIContext) (cancel context.CancelFunc) {
 		// Empty repository does not have reference information.
-		if ctx.Repo.Repository.IsEmpty && !(len(allowEmpty) != 0 && allowEmpty[0]) {
+		if ctx.Repo.Repository.IsEmpty && (len(allowEmpty) == 0 || !allowEmpty[0]) {
 			return nil
 		}
 
@@ -365,12 +366,12 @@ func RepoRefForAPI(next http.Handler) http.Handler {
 		ctx := GetAPIContext(req)
 
 		if ctx.Repo.Repository.IsEmpty {
-			ctx.NotFound(fmt.Errorf("repository is empty"))
+			ctx.NotFound(errors.New("repository is empty"))
 			return
 		}
 
 		if ctx.Repo.GitRepo == nil {
-			ctx.InternalServerError(fmt.Errorf("no open git repo"))
+			ctx.InternalServerError(errors.New("no open git repo"))
 			return
 		}
 
diff --git a/services/context/api_test.go b/services/context/api_test.go
index 90e4d5ec65..4bc89939ca 100644
--- a/services/context/api_test.go
+++ b/services/context/api_test.go
@@ -9,13 +9,14 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestGenAPILinks(t *testing.T) {
-	setting.AppURL = "http://localhost:3000/"
+	defer test.MockVariableValue(&setting.AppURL, "http://localhost:3000/")()
 	kases := map[string][]string{
 		"api/v1/repos/jerrykan/example-repo/issues?state=all": {
 			`<http://localhost:3000/api/v1/repos/jerrykan/example-repo/issues?page=2&state=all>; rel="next"`,
@@ -46,6 +47,6 @@ func TestGenAPILinks(t *testing.T) {
 
 		links := genAPILinks(u, 100, 20, curPage)
 
-		assert.EqualValues(t, links, response)
+		assert.Equal(t, links, response)
 	}
 }
diff --git a/services/context/base.go b/services/context/base.go
index 0275ea8a99..dc3d226bb0 100644
--- a/services/context/base.go
+++ b/services/context/base.go
@@ -250,7 +250,7 @@ func (b *Base) PlainText(status int, text string) {
 // Redirect redirects the request
 func (b *Base) Redirect(location string, status ...int) {
 	code := http.StatusSeeOther
-	if len(status) == 1 {
+	if len(status) == 1 && status[0] > 0 {
 		code = status[0]
 	}
 
diff --git a/services/context/base_test.go b/services/context/base_test.go
index 868ac00f8b..9e058d8f24 100644
--- a/services/context/base_test.go
+++ b/services/context/base_test.go
@@ -9,11 +9,13 @@ import (
 	"testing"
 
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRedirect(t *testing.T) {
+	defer test.MockVariableValue(&setting.AppURL, "http://localhost:3000/")()
 	req, _ := http.NewRequest("GET", "/", nil)
 
 	cases := []struct {
@@ -34,6 +36,7 @@ func TestRedirect(t *testing.T) {
 		cleanup()
 		has := resp.Header().Get("Set-Cookie") == "i_like_gitea=dummy"
 		assert.Equal(t, c.keep, has, "url = %q", c.url)
+		assert.Equal(t, http.StatusSeeOther, resp.Code)
 	}
 
 	req, _ = http.NewRequest("GET", "/", nil)
@@ -45,3 +48,24 @@ func TestRedirect(t *testing.T) {
 	assert.Equal(t, "/other", resp.Header().Get("HX-Redirect"))
 	assert.Equal(t, http.StatusNoContent, resp.Code)
 }
+
+func TestRedirectOptionalStatus(t *testing.T) {
+	defer test.MockVariableValue(&setting.AppURL, "http://localhost:3000/")()
+	req, _ := http.NewRequest("GET", "/", nil)
+
+	cases := []struct {
+		expected int
+		actual   int
+	}{
+		{expected: 303},
+		{http.StatusTemporaryRedirect, 307},
+		{http.StatusPermanentRedirect, 308},
+	}
+	for _, c := range cases {
+		resp := httptest.NewRecorder()
+		b, cleanup := NewBaseContext(resp, req)
+		b.Redirect("/", c.actual)
+		cleanup()
+		assert.Equal(t, c.expected, resp.Code)
+	}
+}
diff --git a/services/context/context.go b/services/context/context.go
index 91484c5ba3..68074964c8 100644
--- a/services/context/context.go
+++ b/services/context/context.go
@@ -41,7 +41,7 @@ type Render interface {
 type Context struct {
 	*Base
 
-	TemplateContext TemplateContext
+	TemplateContext *templates.Context
 
 	Render   Render
 	PageData map[string]any // data used by JavaScript modules in one page, it's `window.config.pageData`
@@ -64,8 +64,6 @@ type Context struct {
 	Package *Package
 }
 
-type TemplateContext map[string]any
-
 func init() {
 	web.RegisterResponseStatusProvider[*Context](func(req *http.Request) web_types.ResponseStatusProvider {
 		return req.Context().Value(WebContextKey).(*Context)
@@ -98,10 +96,11 @@ func GetValidateContext(req *http.Request) (ctx *ValidateContext) {
 	return ctx
 }
 
-func NewTemplateContextForWeb(ctx *Context) TemplateContext {
-	tmplCtx := NewTemplateContext(ctx)
-	tmplCtx["Locale"] = ctx.Base.Locale
-	tmplCtx["AvatarUtils"] = templates.NewAvatarUtils(ctx)
+func NewTemplateContextForWeb(ctx *Context) *templates.Context {
+	tmplCtx := templates.NewContext(ctx)
+	tmplCtx.Locale = ctx.Locale
+	tmplCtx.AvatarUtils = templates.NewAvatarUtils(ctx)
+	tmplCtx.Data = ctx.Data
 	return tmplCtx
 }
 
@@ -121,6 +120,18 @@ func NewWebContext(base *Base, render Render, session session.Store) *Context {
 	return ctx
 }
 
+func (ctx *Context) AddPluralStringsToPageData(keys []string) {
+	for _, key := range keys {
+		array, fallback := ctx.Locale.TrPluralStringAllForms(key)
+
+		ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)[key] = array
+
+		if fallback != nil {
+			ctx.PageData["PLURALSTRINGS_FALLBACK"].(map[string][]string)[key] = fallback
+		}
+	}
+}
+
 // Contexter initializes a classic context for a request.
 func Contexter() func(next http.Handler) http.Handler {
 	rnd := templates.HTMLRenderer()
@@ -151,8 +162,8 @@ func Contexter() func(next http.Handler) http.Handler {
 			ctx.PageData = map[string]any{}
 			ctx.Data["PageData"] = ctx.PageData
 
-			ctx.Base.AppendContextValue(WebContextKey, ctx)
-			ctx.Base.AppendContextValueFunc(gitrepo.RepositoryContextKey, func() any { return ctx.Repo.GitRepo })
+			ctx.AppendContextValue(WebContextKey, ctx)
+			ctx.AppendContextValueFunc(gitrepo.RepositoryContextKey, func() any { return ctx.Repo.GitRepo })
 
 			ctx.Csrf = NewCSRFProtector(csrfOpts)
 
@@ -208,6 +219,25 @@ func Contexter() func(next http.Handler) http.Handler {
 
 			ctx.Data["AllLangs"] = translation.AllLangs()
 
+			ctx.PageData["PLURAL_RULE_LANG"] = translation.GetPluralRule(ctx.Locale)
+			ctx.PageData["PLURAL_RULE_FALLBACK"] = translation.GetDefaultPluralRule()
+			ctx.PageData["PLURALSTRINGS_LANG"] = map[string][]string{}
+			ctx.PageData["PLURALSTRINGS_FALLBACK"] = map[string][]string{}
+
+			ctx.AddPluralStringsToPageData([]string{"relativetime.mins", "relativetime.hours", "relativetime.days", "relativetime.weeks", "relativetime.months", "relativetime.years"})
+
+			ctx.PageData["DATETIMESTRINGS"] = map[string]string{
+				"FUTURE": ctx.Locale.TrString("relativetime.future"),
+				"NOW":    ctx.Locale.TrString("relativetime.now"),
+			}
+			for _, key := range []string{"relativetime.1day", "relativetime.1week", "relativetime.1month", "relativetime.1year", "relativetime.2days", "relativetime.2weeks", "relativetime.2months", "relativetime.2years"} {
+				// These keys are used for special-casing some time words. We only add keys that are actually translated, so that we
+				// can fall back to the generic pluralized time word in the correct language if the special case is untranslated.
+				if ctx.Locale.HasKey(key) {
+					ctx.PageData["DATETIMESTRINGS"].(map[string]string)[key] = ctx.Locale.TrString(key)
+				}
+			}
+
 			next.ServeHTTP(ctx.Resp, ctx.Req)
 		})
 	}
diff --git a/services/context/context_response.go b/services/context/context_response.go
index e20e7dd852..386bdd2652 100644
--- a/services/context/context_response.go
+++ b/services/context/context_response.go
@@ -1,4 +1,5 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package context
@@ -16,6 +17,7 @@ import (
 	"syscall"
 	"time"
 
+	"forgejo.org/models/auth"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/httplib"
@@ -66,7 +68,10 @@ func (ctx *Context) RedirectToFirst(location ...string) string {
 	return setting.AppSubURL + "/"
 }
 
-const tplStatus500 base.TplName = "status/500"
+const (
+	tplStatus404 base.TplName = "status/404"
+	tplStatus500 base.TplName = "status/500"
+)
 
 // HTML calls Context.HTML and renders the template to HTTP response
 func (ctx *Context) HTML(status int, name base.TplName) {
@@ -125,6 +130,21 @@ func (ctx *Context) RenderWithErr(msg any, tpl base.TplName, form any) {
 	ctx.HTML(http.StatusOK, tpl)
 }
 
+// validateTwoFactorRequirement sets ctx-data to hide/show ui-elements depending on the GlobalTwoFactorRequirement
+func (ctx *Context) validateTwoFactorRequirement() {
+	if ctx.Doer == nil || !ctx.Doer.MustHaveTwoFactor() {
+		return
+	}
+
+	hasTwoFactor, err := auth.HasTwoFactorByUID(ctx, ctx.Doer.ID)
+	if err != nil {
+		log.ErrorWithSkip(2, "Error getting 2fa: %s", err)
+		// fallthrough to set the variables
+	}
+	ctx.Data["MustEnableTwoFactor"] = !hasTwoFactor
+	ctx.Data["HideNavbarLinks"] = !hasTwoFactor
+}
+
 // NotFound displays a 404 (Not Found) page and prints the given error, if any.
 func (ctx *Context) NotFound(logMsg string, logErr error) {
 	ctx.notFoundInternal(logMsg, logErr)
@@ -152,9 +172,10 @@ func (ctx *Context) notFoundInternal(logMsg string, logErr error) {
 		return
 	}
 
+	ctx.validateTwoFactorRequirement()
 	ctx.Data["IsRepo"] = ctx.Repo.Repository != nil
-	ctx.Data["Title"] = "Page Not Found"
-	ctx.HTML(http.StatusNotFound, base.TplName("status/404"))
+	ctx.Data["Title"] = ctx.Locale.TrString("error.not_found.title")
+	ctx.HTML(http.StatusNotFound, tplStatus404)
 }
 
 // ServerError displays a 500 (Internal Server Error) page and prints the given error, if any.
@@ -177,7 +198,7 @@ func (ctx *Context) serverErrorInternal(logMsg string, logErr error) {
 		}
 	}
 
-	ctx.Data["Title"] = "Internal Server Error"
+	ctx.validateTwoFactorRequirement()
 	ctx.HTML(http.StatusInternalServerError, tplStatus500)
 }
 
diff --git a/services/context/context_template.go b/services/context/context_template.go
deleted file mode 100644
index 7878d409ca..0000000000
--- a/services/context/context_template.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package context
-
-import (
-	"context"
-	"time"
-)
-
-var _ context.Context = TemplateContext(nil)
-
-func NewTemplateContext(ctx context.Context) TemplateContext {
-	return TemplateContext{"_ctx": ctx}
-}
-
-func (c TemplateContext) parentContext() context.Context {
-	return c["_ctx"].(context.Context)
-}
-
-func (c TemplateContext) Deadline() (deadline time.Time, ok bool) {
-	return c.parentContext().Deadline()
-}
-
-func (c TemplateContext) Done() <-chan struct{} {
-	return c.parentContext().Done()
-}
-
-func (c TemplateContext) Err() error {
-	return c.parentContext().Err()
-}
-
-func (c TemplateContext) Value(key any) any {
-	return c.parentContext().Value(key)
-}
diff --git a/services/context/org.go b/services/context/org.go
index 31ad60704f..3ddc40b6b3 100644
--- a/services/context/org.go
+++ b/services/context/org.go
@@ -1,5 +1,6 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
-// Copyright 2020 The Gitea Authors.
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package context
@@ -165,6 +166,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
 	ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+	ctx.Data["IsModerationEnabled"] = setting.Moderation.Enabled
 	ctx.Data["IsPublicMember"] = func(uid int64) bool {
 		is, _ := organization.IsPublicMembership(ctx, ctx.Org.Organization.ID, uid)
 		return is
diff --git a/services/context/package.go b/services/context/package.go
index e597249e2a..50ffa8eb7c 100644
--- a/services/context/package.go
+++ b/services/context/package.go
@@ -97,7 +97,7 @@ func determineAccessMode(ctx *Base, pkg *Package, doer *user_model.User) (perm.A
 		return perm.AccessModeNone, nil
 	}
 
-	if doer != nil && !doer.IsGhost() && (!doer.IsActive || doer.ProhibitLogin) {
+	if doer != nil && !doer.IsGhost() && !doer.IsAccessAllowed(ctx) {
 		return perm.AccessModeNone, nil
 	}
 
@@ -158,7 +158,7 @@ func PackageContexter() func(next http.Handler) http.Handler {
 
 			// it is still needed when rendering 500 page in a package handler
 			ctx := NewWebContext(base, renderer, nil)
-			ctx.Base.AppendContextValue(WebContextKey, ctx)
+			ctx.AppendContextValue(WebContextKey, ctx)
 			next.ServeHTTP(ctx.Resp, ctx.Req)
 		})
 	}
diff --git a/services/context/private.go b/services/context/private.go
index 3d7ed694f1..94ee31876a 100644
--- a/services/context/private.go
+++ b/services/context/private.go
@@ -67,7 +67,7 @@ func PrivateContexter() func(http.Handler) http.Handler {
 			base, baseCleanUp := NewBaseContext(w, req)
 			ctx := &PrivateContext{Base: base}
 			defer baseCleanUp()
-			ctx.Base.AppendContextValue(privateContextKey, ctx)
+			ctx.AppendContextValue(privateContextKey, ctx)
 
 			next.ServeHTTP(ctx.Resp, ctx.Req)
 		})
diff --git a/services/context/quota.go b/services/context/quota.go
index f6e79e1ebe..502a316107 100644
--- a/services/context/quota.go
+++ b/services/context/quota.go
@@ -64,7 +64,7 @@ func QuotaRuleAssignmentAPI() func(ctx *APIContext) {
 
 // ctx.CheckQuota checks whether the user in question is within quota limits (web context)
 func (ctx *Context) CheckQuota(subject quota_model.LimitSubject, userID int64, username string) bool {
-	ok, err := checkQuota(ctx.Base.originCtx, subject, userID, username, func(userID int64, username string) {
+	ok, err := checkQuota(ctx.originCtx, subject, userID, username, func(userID int64, username string) {
 		showHTML := false
 		for _, part := range ctx.Req.Header["Accept"] {
 			if strings.Contains(part, "text/html") {
@@ -91,7 +91,7 @@ func (ctx *Context) CheckQuota(subject quota_model.LimitSubject, userID int64, u
 
 // ctx.CheckQuota checks whether the user in question is within quota limits (API context)
 func (ctx *APIContext) CheckQuota(subject quota_model.LimitSubject, userID int64, username string) bool {
-	ok, err := checkQuota(ctx.Base.originCtx, subject, userID, username, func(userID int64, username string) {
+	ok, err := checkQuota(ctx.originCtx, subject, userID, username, func(userID int64, username string) {
 		ctx.JSON(http.StatusRequestEntityTooLarge, APIQuotaExceeded{
 			Message:  "quota exceeded",
 			UserID:   userID,
diff --git a/services/context/repo.go b/services/context/repo.go
index a1e1cadf6c..c8876d7166 100644
--- a/services/context/repo.go
+++ b/services/context/repo.go
@@ -83,7 +83,7 @@ func (r *Repository) CanEnableEditor(ctx context.Context, user *user_model.User)
 
 // CanCreateBranch returns true if repository is editable and user has proper access level.
 func (r *Repository) CanCreateBranch() bool {
-	return r.Permission.CanWrite(unit_model.TypeCode) && r.Repository.CanCreateBranch()
+	return r.CanWrite(unit_model.TypeCode) && r.Repository.CanCreateBranch()
 }
 
 func (r *Repository) GetObjectFormat() git.ObjectFormat {
@@ -160,12 +160,12 @@ func (r *Repository) CanUseTimetracker(ctx context.Context, issue *issues_model.
 	// 2. Is the user a contributor, admin, poster or assignee and do the repository policies require this?
 	isAssigned, _ := issues_model.IsUserAssignedToIssue(ctx, issue, user)
 	return r.Repository.IsTimetrackerEnabled(ctx) && (!r.Repository.AllowOnlyContributorsToTrackTime(ctx) ||
-		r.Permission.CanWriteIssuesOrPulls(issue.IsPull) || issue.IsPoster(user.ID) || isAssigned)
+		r.CanWriteIssuesOrPulls(issue.IsPull) || issue.IsPoster(user.ID) || isAssigned)
 }
 
 // CanCreateIssueDependencies returns whether or not a user can create dependencies.
 func (r *Repository) CanCreateIssueDependencies(ctx context.Context, user *user_model.User, isPull bool) bool {
-	return r.Repository.IsDependenciesEnabled(ctx) && r.Permission.CanWriteIssuesOrPulls(isPull)
+	return r.Repository.IsDependenciesEnabled(ctx) && r.CanWriteIssuesOrPulls(isPull)
 }
 
 // GetCommitsCount returns cached commit count for current view
@@ -361,7 +361,9 @@ func RedirectToRepo(ctx *Base, redirectRepoID int64) {
 	if ctx.Req.URL.RawQuery != "" {
 		redirectPath += "?" + ctx.Req.URL.RawQuery
 	}
-	ctx.Redirect(path.Join(setting.AppSubURL, redirectPath), http.StatusTemporaryRedirect)
+	// Git client needs a 301 redirect by default to follow the new location
+	// It's not documentated in git documentation, but it's the behavior of git client
+	ctx.Redirect(path.Join(setting.AppSubURL, redirectPath), http.StatusMovedPermanently)
 }
 
 func repoAssignment(ctx *Context, repo *repo_model.Repository) {
@@ -378,7 +380,7 @@ func repoAssignment(ctx *Context, repo *repo_model.Repository) {
 	}
 
 	// Check access.
-	if !ctx.Repo.Permission.HasAccess() {
+	if !ctx.Repo.HasAccess() {
 		if ctx.FormString("go-get") == "1" {
 			EarlyResponseForGoGetMeta(ctx)
 			return
@@ -591,6 +593,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	ctx.Data["CanWriteIssues"] = ctx.Repo.CanWrite(unit_model.TypeIssues)
 	ctx.Data["CanWritePulls"] = ctx.Repo.CanWrite(unit_model.TypePullRequests)
 	ctx.Data["CanWriteActions"] = ctx.Repo.CanWrite(unit_model.TypeActions)
+	ctx.Data["IsModerationEnabled"] = setting.Moderation.Enabled
 
 	canSignedUserFork, err := repo_module.CanUserForkRepo(ctx, ctx.Doer, ctx.Repo.Repository)
 	if err != nil {
@@ -641,7 +644,11 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	ctx.Data["OpenGraphImageURL"] = repo.SummaryCardURL()
 	ctx.Data["OpenGraphImageWidth"] = cardWidth
 	ctx.Data["OpenGraphImageHeight"] = cardHeight
-	ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.summary_card_alt", repo.FullName())
+	if util.IsEmptyString(repo.Description) {
+		ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.summary_card_alt", repo.FullName())
+	} else {
+		ctx.Data["OpenGraphImageAltText"] = ctx.Tr("og.repo.summary_card.alt_description", repo.FullName(), repo.Description)
+	}
 
 	if repo.IsFork {
 		RetrieveBaseRepo(ctx, repo)
diff --git a/services/context/upload/upload.go b/services/context/upload/upload.go
index 2fa177e604..e71fc50c1f 100644
--- a/services/context/upload/upload.go
+++ b/services/context/upload/upload.go
@@ -76,14 +76,15 @@ func Verify(buf []byte, fileName, allowedTypesStr string) error {
 
 // AddUploadContext renders template values for dropzone
 func AddUploadContext(ctx *context.Context, uploadType string) {
-	if uploadType == "release" {
+	switch uploadType {
+	case "release":
 		ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/releases/attachments"
 		ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/releases/attachments/remove"
 		ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/releases/attachments"
 		ctx.Data["UploadAccepts"] = strings.ReplaceAll(setting.Repository.Release.AllowedTypes, "|", ",")
 		ctx.Data["UploadMaxFiles"] = setting.Attachment.MaxFiles
 		ctx.Data["UploadMaxSize"] = setting.Attachment.MaxSize
-	} else if uploadType == "comment" {
+	case "comment":
 		ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/issues/attachments"
 		ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/issues/attachments/remove"
 		if len(ctx.Params(":index")) > 0 {
@@ -94,7 +95,7 @@ func AddUploadContext(ctx *context.Context, uploadType string) {
 		ctx.Data["UploadAccepts"] = strings.ReplaceAll(setting.Attachment.AllowedTypes, "|", ",")
 		ctx.Data["UploadMaxFiles"] = setting.Attachment.MaxFiles
 		ctx.Data["UploadMaxSize"] = setting.Attachment.MaxSize
-	} else if uploadType == "repo" {
+	case "repo":
 		ctx.Data["UploadUrl"] = ctx.Repo.RepoLink + "/upload-file"
 		ctx.Data["UploadRemoveUrl"] = ctx.Repo.RepoLink + "/upload-remove"
 		ctx.Data["UploadLinkUrl"] = ctx.Repo.RepoLink + "/upload-file"
diff --git a/services/contexttest/context_tests.go b/services/contexttest/context_tests.go
index ebab04f620..a4e674a896 100644
--- a/services/contexttest/context_tests.go
+++ b/services/contexttest/context_tests.go
@@ -68,7 +68,7 @@ func MockContext(t *testing.T, reqPath string, opts ...MockContextOption) (*cont
 	ctx.PageData = map[string]any{}
 	ctx.Data["PageStartTime"] = time.Now()
 	chiCtx := chi.NewRouteContext()
-	ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
+	ctx.AppendContextValue(chi.RouteCtxKey, chiCtx)
 	return ctx, resp
 }
 
@@ -83,7 +83,7 @@ func MockAPIContext(t *testing.T, reqPath string) (*context.APIContext, *httptes
 	_ = baseCleanUp // during test, it doesn't need to do clean up. TODO: this can be improved later
 
 	chiCtx := chi.NewRouteContext()
-	ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
+	ctx.AppendContextValue(chi.RouteCtxKey, chiCtx)
 	return ctx, resp
 }
 
@@ -96,7 +96,7 @@ func MockPrivateContext(t *testing.T, reqPath string) (*context.PrivateContext,
 	ctx := &context.PrivateContext{Base: base}
 	_ = baseCleanUp // during test, it doesn't need to do clean up. TODO: this can be improved later
 	chiCtx := chi.NewRouteContext()
-	ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
+	ctx.AppendContextValue(chi.RouteCtxKey, chiCtx)
 	return ctx, resp
 }
 
diff --git a/services/contexttest/pagedata_test.go b/services/contexttest/pagedata_test.go
new file mode 100644
index 0000000000..0c9319b6db
--- /dev/null
+++ b/services/contexttest/pagedata_test.go
@@ -0,0 +1,63 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package contexttest
+
+import (
+	"testing"
+
+	"forgejo.org/modules/translation"
+	"forgejo.org/modules/translation/i18n"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPluralStringsForClient(t *testing.T) {
+	mockLocale := translation.MockLocale{}
+	mockLocale.MockTranslations = map[string]string{
+		"relativetime.mins" + i18n.PluralFormSeparator + "one":     "%d minute ago",
+		"relativetime.hours" + i18n.PluralFormSeparator + "one":    "%d hour ago",
+		"relativetime.days" + i18n.PluralFormSeparator + "one":     "%d day ago",
+		"relativetime.weeks" + i18n.PluralFormSeparator + "one":    "%d week ago",
+		"relativetime.months" + i18n.PluralFormSeparator + "one":   "%d month ago",
+		"relativetime.years" + i18n.PluralFormSeparator + "one":    "%d year ago",
+		"relativetime.mins" + i18n.PluralFormSeparator + "other":   "%d minutes ago",
+		"relativetime.hours" + i18n.PluralFormSeparator + "other":  "%d hours ago",
+		"relativetime.days" + i18n.PluralFormSeparator + "other":   "%d days ago",
+		"relativetime.weeks" + i18n.PluralFormSeparator + "other":  "%d weeks ago",
+		"relativetime.months" + i18n.PluralFormSeparator + "other": "%d months ago",
+		"relativetime.years" + i18n.PluralFormSeparator + "other":  "%d years ago",
+	}
+
+	ctx, _ := MockContext(t, "/")
+	ctx.Locale = mockLocale
+	assert.True(t, ctx.Locale.HasKey("relativetime.mins"))
+	assert.True(t, ctx.Locale.HasKey("relativetime.weeks"))
+	assert.Equal(t, "%d minutes ago", ctx.Locale.TrString("relativetime.mins"+i18n.PluralFormSeparator+"other"))
+	assert.Equal(t, "%d week ago", ctx.Locale.TrString("relativetime.weeks"+i18n.PluralFormSeparator+"one"))
+
+	assert.Empty(t, ctx.PageData)
+	ctx.PageData["PLURALSTRINGS_LANG"] = map[string][]string{}
+	assert.Empty(t, ctx.PageData["PLURALSTRINGS_LANG"])
+
+	ctx.AddPluralStringsToPageData([]string{"relativetime.mins", "relativetime.hours"})
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"], 2)
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"], 2)
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.hours"], 2)
+	assert.Equal(t, "%d minute ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"][0])
+	assert.Equal(t, "%d minutes ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"][1])
+	assert.Equal(t, "%d hour ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.hours"][0])
+	assert.Equal(t, "%d hours ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.hours"][1])
+
+	ctx.AddPluralStringsToPageData([]string{"relativetime.years", "relativetime.days"})
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"], 4)
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"], 2)
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.days"], 2)
+	assert.Len(t, ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.years"], 2)
+	assert.Equal(t, "%d minute ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"][0])
+	assert.Equal(t, "%d minutes ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.mins"][1])
+	assert.Equal(t, "%d day ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.days"][0])
+	assert.Equal(t, "%d days ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.days"][1])
+	assert.Equal(t, "%d year ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.years"][0])
+	assert.Equal(t, "%d years ago", ctx.PageData["PLURALSTRINGS_LANG"].(map[string][]string)["relativetime.years"][1])
+}
diff --git a/services/convert/action.go b/services/convert/action.go
new file mode 100644
index 0000000000..703c1f1261
--- /dev/null
+++ b/services/convert/action.go
@@ -0,0 +1,49 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package convert
+
+import (
+	"context"
+
+	actions_model "forgejo.org/models/actions"
+	access_model "forgejo.org/models/perm/access"
+	user_model "forgejo.org/models/user"
+	api "forgejo.org/modules/structs"
+)
+
+// ToActionRun convert actions_model.User to api.ActionRun
+// the run needs all attributes loaded
+func ToActionRun(ctx context.Context, run *actions_model.ActionRun, doer *user_model.User) *api.ActionRun {
+	if run == nil {
+		return nil
+	}
+
+	permissionInRepo, _ := access_model.GetUserRepoPermission(ctx, run.Repo, doer)
+
+	return &api.ActionRun{
+		ID:                run.ID,
+		Title:             run.Title,
+		Repo:              ToRepo(ctx, run.Repo, permissionInRepo),
+		WorkflowID:        run.WorkflowID,
+		Index:             run.Index,
+		TriggerUser:       ToUser(ctx, run.TriggerUser, doer),
+		ScheduleID:        run.ScheduleID,
+		PrettyRef:         run.PrettyRef(),
+		IsRefDeleted:      run.IsRefDeleted,
+		CommitSHA:         run.CommitSHA,
+		IsForkPullRequest: run.IsForkPullRequest,
+		NeedApproval:      run.NeedApproval,
+		ApprovedBy:        run.ApprovedBy,
+		Event:             run.Event.Event(),
+		EventPayload:      run.EventPayload,
+		TriggerEvent:      run.TriggerEvent,
+		Status:            run.Status.String(),
+		Started:           run.Started.AsTime(),
+		Stopped:           run.Stopped.AsTime(),
+		Created:           run.Created.AsTime(),
+		Updated:           run.Updated.AsTime(),
+		Duration:          run.Duration(),
+		HTMLURL:           run.HTMLURL(),
+	}
+}
diff --git a/services/convert/activitypub_person.go b/services/convert/activitypub_person.go
new file mode 100644
index 0000000000..2c05f8c1c0
--- /dev/null
+++ b/services/convert/activitypub_person.go
@@ -0,0 +1,62 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+	"context"
+
+	"forgejo.org/models/activities"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+func ToActivityPubPersonFeedItem(item *activities.FederatedUserActivity) ap.Note {
+	return ap.Note{
+		AttributedTo: ap.IRI(item.ActorURI),
+		Content:      ap.NaturalLanguageValues{{Value: ap.Content(item.NoteContent), Ref: ap.NilLangRef}},
+		ID:           ap.IRI(item.NoteURL),
+		URL:          ap.IRI(item.OriginalNote),
+	}
+}
+
+func ToActivityPubPerson(ctx context.Context, user *user_model.User) (*ap.Person, error) {
+	link := user.APActorID()
+	person := ap.PersonNew(ap.IRI(link))
+
+	person.Name = ap.NaturalLanguageValuesNew()
+	err := person.Name.Set("en", ap.Content(user.FullName))
+	if err != nil {
+		return nil, err
+	}
+
+	person.PreferredUsername = ap.NaturalLanguageValuesNew()
+	err = person.PreferredUsername.Set("en", ap.Content(user.Name))
+	if err != nil {
+		return nil, err
+	}
+
+	person.URL = ap.IRI(user.HTMLURL())
+
+	person.Icon = ap.Image{
+		Type:      ap.ImageType,
+		MediaType: "image/png",
+		URL:       ap.IRI(user.AvatarLink(ctx)),
+	}
+
+	person.Inbox = ap.IRI(link + "/inbox")
+	person.Outbox = ap.IRI(link + "/outbox")
+
+	person.PublicKey.ID = ap.IRI(link + "#main-key")
+	person.PublicKey.Owner = ap.IRI(link)
+
+	publicKeyPem, err := activitypub.GetPublicKey(ctx, user)
+	if err != nil {
+		return nil, err
+	}
+	person.PublicKey.PublicKeyPem = publicKeyPem
+
+	return person, nil
+}
diff --git a/services/convert/activitypub_user_action.go b/services/convert/activitypub_user_action.go
new file mode 100644
index 0000000000..9c62e6f25c
--- /dev/null
+++ b/services/convert/activitypub_user_action.go
@@ -0,0 +1,177 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+	"context"
+	"fmt"
+	"html"
+	"net/url"
+	"time"
+
+	activities_model "forgejo.org/models/activities"
+	issues_model "forgejo.org/models/issues"
+	fm "forgejo.org/modules/forgefed"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/markup"
+	"forgejo.org/modules/markup/markdown"
+)
+
+func ActionToForgeUserActivity(ctx context.Context, action *activities_model.Action) (fm.ForgeUserActivity, error) {
+	render := func(format string, args ...any) string {
+		return fmt.Sprintf(`<a href="%s" rel="nofollow">%s</a> %s`, action.ActUser.HTMLURL(), action.GetActDisplayName(ctx), fmt.Sprintf(format, args...))
+	}
+	renderIssue := func(issue *issues_model.Issue) string {
+		return fmt.Sprintf(`<a href="%s" rel="nofollow">%s#%d</a>`,
+			issue.HTMLURL(),
+			action.GetRepoPath(ctx),
+			issue.Index,
+		)
+	}
+	renderRepo := func() string {
+		return fmt.Sprintf(`<a href="%s" rel="nofollow">%s</a>`, action.Repo.HTMLURL(), action.GetRepoPath(ctx))
+	}
+	renderBranch := func() string {
+		return fmt.Sprintf(`<a href="%s" rel="nofollow">%s</a>`, action.GetRefLink(ctx), action.GetBranch())
+	}
+	renderTag := func() string {
+		return fmt.Sprintf(`<a href="%s" rel="nofollow">%s</a>`, action.GetRefLink(ctx), action.GetTag())
+	}
+
+	makeUserActivity := func(format string, args ...any) (fm.ForgeUserActivity, error) {
+		return fm.NewForgeUserActivity(action.ActUser, action.ID, render(format, args...))
+	}
+
+	switch action.OpType {
+	case activities_model.ActionCreateRepo:
+		return makeUserActivity("created a new repository: %s", renderRepo())
+	case activities_model.ActionRenameRepo:
+		return makeUserActivity("renamed a repository: %s", renderRepo())
+	case activities_model.ActionStarRepo:
+		return makeUserActivity("starred a repository: %s", renderRepo())
+	case activities_model.ActionWatchRepo:
+		return makeUserActivity("started watching a repository: %s", renderRepo())
+	case activities_model.ActionCommitRepo:
+		type PushCommit struct {
+			Sha1           string
+			Message        string
+			AuthorEmail    string
+			AuthorName     string
+			CommitterEmail string
+			CommitterName  string
+			Timestamp      time.Time
+		}
+		type PushCommits struct {
+			Commits    []*PushCommit
+			HeadCommit *PushCommit
+			CompareURL string
+			Len        int
+		}
+
+		commits := &PushCommits{}
+		if err := json.Unmarshal([]byte(action.GetContent()), commits); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		commitsHTML := ""
+		renderCommit := func(commit *PushCommit) string {
+			return fmt.Sprintf(`<li><a href="%s" rel="nofollow">%s</a> <pre>%s</pre></li>`,
+				fmt.Sprintf("%s/commit/%s", action.GetRepoAbsoluteLink(ctx), url.PathEscape(commit.Sha1)),
+				commit.Sha1,
+				html.EscapeString(commit.Message),
+			)
+		}
+		for _, commit := range commits.Commits {
+			commitsHTML += renderCommit(commit)
+		}
+		return makeUserActivity("pushed to %s at %s: <ul>%s</ul>", renderBranch(), renderRepo(), commitsHTML)
+	case activities_model.ActionCreateIssue:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("opened issue %s", renderIssue(action.Issue))
+	case activities_model.ActionCreatePullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("opened pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionTransferRepo:
+		return makeUserActivity("transferred %s", renderRepo())
+	case activities_model.ActionPushTag:
+		return makeUserActivity("pushed %s at %s", renderTag(), renderRepo())
+	case activities_model.ActionCommentIssue:
+		renderedComment, err := markdown.RenderString(&markup.RenderContext{
+			Ctx: ctx,
+		}, action.Comment.Content)
+		if err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+
+		return makeUserActivity(`<a href="%s" rel="nofollow">commented</a> on %s: <blockquote>%s</blockquote>`,
+			action.GetCommentHTMLURL(ctx),
+			renderIssue(action.Comment.Issue),
+			renderedComment,
+		)
+	case activities_model.ActionMergePullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("merged pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionCloseIssue:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("closed issue %s", renderIssue(action.Issue))
+	case activities_model.ActionReopenIssue:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("reopened issue %s", renderIssue(action.Issue))
+	case activities_model.ActionClosePullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("closed pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionReopenPullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("reopened pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionDeleteTag:
+		return makeUserActivity("deleted tag %s at %s", action.GetTag(), renderRepo())
+	case activities_model.ActionDeleteBranch:
+		return makeUserActivity("deleted branch %s at %s", action.GetBranch(), renderRepo())
+	case activities_model.ActionApprovePullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("approved pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionRejectPullRequest:
+		if err := action.LoadIssue(ctx); err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+		return makeUserActivity("rejected pull request %s", renderIssue(action.Issue))
+	case activities_model.ActionCommentPull:
+		renderedComment, err := markdown.RenderString(&markup.RenderContext{
+			Ctx: ctx,
+		}, action.Comment.Content)
+		if err != nil {
+			return fm.ForgeUserActivity{}, err
+		}
+
+		return makeUserActivity(`<a href="%s" rel="nofollow">commented</a> on %s: <blockquote>%s</blockquote>`,
+			action.GetCommentHTMLURL(ctx),
+			renderIssue(action.Comment.Issue),
+			renderedComment,
+		)
+	case activities_model.ActionMirrorSyncPush:
+	case activities_model.ActionMirrorSyncCreate:
+	case activities_model.ActionMirrorSyncDelete:
+	case activities_model.ActionPublishRelease:
+	case activities_model.ActionPullReviewDismissed:
+	case activities_model.ActionPullRequestReadyForReview:
+	case activities_model.ActionAutoMergePullRequest:
+	}
+
+	return makeUserActivity("performed an unrecognised action: %s", action.OpType.String())
+}
diff --git a/services/convert/attachment.go b/services/convert/attachment.go
index 6617aac906..74ae7c509c 100644
--- a/services/convert/attachment.go
+++ b/services/convert/attachment.go
@@ -4,6 +4,9 @@
 package convert
 
 import (
+	"mime"
+	"path/filepath"
+
 	repo_model "forgejo.org/models/repo"
 	api "forgejo.org/modules/structs"
 )
@@ -20,9 +23,13 @@ func APIAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachm
 	return attach.DownloadURL()
 }
 
-// ToAttachment converts models.Attachment to api.Attachment for API usage
-func ToAttachment(repo *repo_model.Repository, a *repo_model.Attachment) *api.Attachment {
-	return toAttachment(repo, a, WebAssetDownloadURL)
+// ToWebAttachment converts models.Attachment to api.WebAttachment for API usage
+func ToWebAttachment(repo *repo_model.Repository, a *repo_model.Attachment) *api.WebAttachment {
+	attachment := toAttachment(repo, a, WebAssetDownloadURL)
+	return &api.WebAttachment{
+		Attachment: attachment,
+		MimeType:   mime.TypeByExtension(filepath.Ext(attachment.Name)),
+	}
 }
 
 // ToAPIAttachment converts models.Attachment to api.Attachment for API usage
diff --git a/services/convert/attachment_test.go b/services/convert/attachment_test.go
new file mode 100644
index 0000000000..d7bf0c1ee7
--- /dev/null
+++ b/services/convert/attachment_test.go
@@ -0,0 +1,56 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package convert
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/setting"
+	api "forgejo.org/modules/structs"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestToWebAttachment(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	headRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	attachment := &repo_model.Attachment{
+		ID:                10,
+		UUID:              "uuidxxx",
+		RepoID:            1,
+		IssueID:           1,
+		ReleaseID:         0,
+		UploaderID:        0,
+		CommentID:         0,
+		Name:              "test.png",
+		DownloadCount:     90,
+		Size:              30,
+		NoAutoTime:        false,
+		CreatedUnix:       9342,
+		CustomDownloadURL: "",
+		ExternalURL:       "",
+	}
+
+	webAttachment := ToWebAttachment(headRepo, attachment)
+
+	assert.NotNil(t, webAttachment)
+	assert.Equal(t, &api.WebAttachment{
+		Attachment: &api.Attachment{
+			ID:            10,
+			Name:          "test.png",
+			Created:       time.Unix(9342, 0),
+			DownloadCount: 90,
+			Size:          30,
+			UUID:          "uuidxxx",
+			DownloadURL:   fmt.Sprintf("%sattachments/uuidxxx", setting.AppURL),
+			Type:          "attachment",
+		},
+		MimeType: "image/png",
+	}, webAttachment)
+}
diff --git a/services/convert/git_commit.go b/services/convert/git_commit.go
index e041361737..6a691966b8 100644
--- a/services/convert/git_commit.go
+++ b/services/convert/git_commit.go
@@ -15,7 +15,6 @@ import (
 	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/util"
 	ctx "forgejo.org/services/context"
-	"forgejo.org/services/gitdiff"
 )
 
 // ToCommitUser convert a git.Signature to an api.CommitUser
@@ -210,17 +209,15 @@ func ToCommit(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Rep
 
 	// Get diff stats for commit
 	if opts.Stat {
-		diff, err := gitdiff.GetDiff(ctx, gitRepo, &gitdiff.DiffOptions{
-			AfterCommitID: commit.ID.String(),
-		})
+		_, totalAdditions, totalDeletions, err := gitRepo.GetCommitShortStat(commit.ID.String())
 		if err != nil {
 			return nil, err
 		}
 
 		res.Stats = &api.CommitStats{
-			Total:     diff.TotalAddition + diff.TotalDeletion,
-			Additions: diff.TotalAddition,
-			Deletions: diff.TotalDeletion,
+			Total:     totalAdditions + totalDeletions,
+			Additions: totalAdditions,
+			Deletions: totalDeletions,
 		}
 	}
 
diff --git a/services/convert/git_commit_test.go b/services/convert/git_commit_test.go
index 463b93aac3..97dff365e6 100644
--- a/services/convert/git_commit_test.go
+++ b/services/convert/git_commit_test.go
@@ -34,7 +34,7 @@ func TestToCommitMeta(t *testing.T) {
 	commitMeta := ToCommitMeta(headRepo, tag)
 
 	assert.NotNil(t, commitMeta)
-	assert.EqualValues(t, &api.CommitMeta{
+	assert.Equal(t, &api.CommitMeta{
 		SHA:     sha1.EmptyObjectID().String(),
 		URL:     util.URLJoin(headRepo.APIURL(), "git/commits", sha1.EmptyObjectID().String()),
 		Created: time.Unix(0, 0),
diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go
index 97bacfb229..ea8ad9b7ef 100644
--- a/services/convert/issue_test.go
+++ b/services/convert/issue_test.go
@@ -24,10 +24,11 @@ func TestLabel_ToLabel(t *testing.T) {
 	label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: label.RepoID})
 	assert.Equal(t, &api.Label{
-		ID:    label.ID,
-		Name:  label.Name,
-		Color: "abcdef",
-		URL:   fmt.Sprintf("%sapi/v1/repos/user2/repo1/labels/%d", setting.AppURL, label.ID),
+		ID:          label.ID,
+		Name:        label.Name,
+		Color:       "abcdef",
+		Description: label.Description,
+		URL:         fmt.Sprintf("%sapi/v1/repos/user2/repo1/labels/%d", setting.AppURL, label.ID),
 	}, ToLabel(label, repo, nil))
 }
 
diff --git a/services/convert/mirror.go b/services/convert/mirror.go
index 9e7d2659ab..5a815f3a5c 100644
--- a/services/convert/mirror.go
+++ b/services/convert/mirror.go
@@ -23,5 +23,6 @@ func ToPushMirror(ctx context.Context, pm *repo_model.PushMirror) (*api.PushMirr
 		Interval:       pm.Interval.String(),
 		SyncOnCommit:   pm.SyncOnCommit,
 		PublicKey:      pm.GetPublicKey(),
+		BranchFilter:   pm.BranchFilter,
 	}, nil
 }
diff --git a/services/convert/notification.go b/services/convert/notification.go
index 3a4239e0fe..2a69b62e4b 100644
--- a/services/convert/notification.go
+++ b/services/convert/notification.go
@@ -17,7 +17,7 @@ import (
 func ToNotificationThread(ctx context.Context, n *activities_model.Notification) *api.NotificationThread {
 	result := &api.NotificationThread{
 		ID:        n.ID,
-		Unread:    !(n.Status == activities_model.NotificationStatusRead || n.Status == activities_model.NotificationStatusPinned),
+		Unread:    n.Status != activities_model.NotificationStatusRead && n.Status != activities_model.NotificationStatusPinned,
 		Pinned:    n.Status == activities_model.NotificationStatusPinned,
 		UpdatedAt: n.UpdatedUnix.AsTime(),
 		URL:       n.APIURL(),
diff --git a/services/convert/pull_review.go b/services/convert/pull_review.go
index 08ccc0e1fc..97be118a83 100644
--- a/services/convert/pull_review.go
+++ b/services/convert/pull_review.go
@@ -66,7 +66,7 @@ func ToPullReviewList(ctx context.Context, rl []*issues_model.Review, doer *user
 	result := make([]*api.PullReview, 0, len(rl))
 	for i := range rl {
 		// show pending reviews only for the user who created them
-		if rl[i].Type == issues_model.ReviewTypePending && (doer == nil || !(doer.IsAdmin || doer.ID == rl[i].ReviewerID)) {
+		if rl[i].Type == issues_model.ReviewTypePending && (doer == nil || (!doer.IsAdmin && doer.ID != rl[i].ReviewerID)) {
 			continue
 		}
 		r, err := ToPullReview(ctx, rl[i], doer)
diff --git a/services/convert/pull_test.go b/services/convert/pull_test.go
index 3e4875fc60..c0c69fd9ad 100644
--- a/services/convert/pull_test.go
+++ b/services/convert/pull_test.go
@@ -29,7 +29,7 @@ func TestPullRequest_APIFormat(t *testing.T) {
 	require.NoError(t, pr.LoadIssue(db.DefaultContext))
 	apiPullRequest := ToAPIPullRequest(git.DefaultContext, pr, nil)
 	assert.NotNil(t, apiPullRequest)
-	assert.EqualValues(t, &structs.PRBranchInfo{
+	assert.Equal(t, &structs.PRBranchInfo{
 		Name:       "branch1",
 		Ref:        "refs/pull/2/head",
 		Sha:        "4a357436d925b5c974181ff12a994538ddc5a269",
diff --git a/services/convert/release_test.go b/services/convert/release_test.go
index 3abd2ff3ef..1d214f0222 100644
--- a/services/convert/release_test.go
+++ b/services/convert/release_test.go
@@ -24,6 +24,6 @@ func TestRelease_ToRelease(t *testing.T) {
 	apiRelease := ToAPIRelease(db.DefaultContext, repo1, release1)
 	assert.NotNil(t, apiRelease)
 	assert.EqualValues(t, 1, apiRelease.ID)
-	assert.EqualValues(t, "https://try.gitea.io/api/v1/repos/user2/repo1/releases/1", apiRelease.URL)
-	assert.EqualValues(t, "https://try.gitea.io/api/v1/repos/user2/repo1/releases/1/assets", apiRelease.UploadURL)
+	assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/releases/1", apiRelease.URL)
+	assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/releases/1/assets", apiRelease.UploadURL)
 }
diff --git a/services/convert/user_test.go b/services/convert/user_test.go
index 01ce8101da..8a42a9d97d 100644
--- a/services/convert/user_test.go
+++ b/services/convert/user_test.go
@@ -31,11 +31,11 @@ func TestUser_ToUser(t *testing.T) {
 
 	apiUser = toUser(db.DefaultContext, user1, false, false)
 	assert.False(t, apiUser.IsAdmin)
-	assert.EqualValues(t, api.VisibleTypePublic.String(), apiUser.Visibility)
+	assert.Equal(t, api.VisibleTypePublic.String(), apiUser.Visibility)
 
 	user31 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 31, IsAdmin: false, Visibility: api.VisibleTypePrivate})
 
 	apiUser = toUser(db.DefaultContext, user31, true, true)
 	assert.False(t, apiUser.IsAdmin)
-	assert.EqualValues(t, api.VisibleTypePrivate.String(), apiUser.Visibility)
+	assert.Equal(t, api.VisibleTypePrivate.String(), apiUser.Visibility)
 }
diff --git a/services/convert/utils.go b/services/convert/utils.go
index 3bbd4e39bd..70c5f5cc18 100644
--- a/services/convert/utils.go
+++ b/services/convert/utils.go
@@ -38,6 +38,8 @@ func ToGitServiceType(value string) structs.GitServiceType {
 		return structs.GitBucketService
 	case "forgejo":
 		return structs.ForgejoService
+	case "pagure":
+		return structs.PagureService
 	default:
 		return structs.PlainGitService
 	}
diff --git a/services/convert/utils_test.go b/services/convert/utils_test.go
index b464d8bb68..6c3bf7d938 100644
--- a/services/convert/utils_test.go
+++ b/services/convert/utils_test.go
@@ -10,10 +10,10 @@ import (
 )
 
 func TestToCorrectPageSize(t *testing.T) {
-	assert.EqualValues(t, 30, ToCorrectPageSize(0))
-	assert.EqualValues(t, 30, ToCorrectPageSize(-10))
-	assert.EqualValues(t, 20, ToCorrectPageSize(20))
-	assert.EqualValues(t, 50, ToCorrectPageSize(100))
+	assert.Equal(t, 30, ToCorrectPageSize(0))
+	assert.Equal(t, 30, ToCorrectPageSize(-10))
+	assert.Equal(t, 20, ToCorrectPageSize(20))
+	assert.Equal(t, 50, ToCorrectPageSize(100))
 }
 
 func TestToGitServiceType(t *testing.T) {
diff --git a/services/cron/setting.go b/services/cron/setting.go
index 7fd4c4e1d8..2db6c15370 100644
--- a/services/cron/setting.go
+++ b/services/cron/setting.go
@@ -46,6 +46,13 @@ type CleanupHookTaskConfig struct {
 	NumberToKeep int
 }
 
+// CleanupOfflineRunnersConfig represents a cron task with settings to clean up offline-runner
+type CleanupOfflineRunnersConfig struct {
+	BaseConfig
+	OlderThan       time.Duration
+	GlobalScopeOnly bool
+}
+
 // GetSchedule returns the schedule for the base config
 func (b *BaseConfig) GetSchedule() string {
 	return b.Schedule
diff --git a/services/cron/tasks_actions.go b/services/cron/tasks_actions.go
index a7fd3cd0bc..2cd484fa69 100644
--- a/services/cron/tasks_actions.go
+++ b/services/cron/tasks_actions.go
@@ -5,6 +5,7 @@ package cron
 
 import (
 	"context"
+	"time"
 
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
@@ -20,6 +21,7 @@ func initActionsTasks() {
 	registerCancelAbandonedJobs()
 	registerScheduleTasks()
 	registerActionsCleanup()
+	registerOfflineRunnersCleanup()
 }
 
 func registerStopZombieTasks() {
@@ -74,3 +76,22 @@ func registerActionsCleanup() {
 		return actions_service.Cleanup(ctx)
 	})
 }
+
+func registerOfflineRunnersCleanup() {
+	RegisterTaskFatal("cleanup_offline_runners", &CleanupOfflineRunnersConfig{
+		BaseConfig: BaseConfig{
+			Enabled:    false,
+			RunAtStart: false,
+			Schedule:   "@midnight",
+		},
+		GlobalScopeOnly: true,
+		OlderThan:       time.Hour * 24,
+	}, func(ctx context.Context, _ *user_model.User, cfg Config) error {
+		c := cfg.(*CleanupOfflineRunnersConfig)
+		return actions_service.CleanupOfflineRunners(
+			ctx,
+			c.OlderThan,
+			c.GlobalScopeOnly,
+		)
+	})
+}
diff --git a/services/cron/tasks_extended.go b/services/cron/tasks_extended.go
index 322fe27ca0..3006601366 100644
--- a/services/cron/tasks_extended.go
+++ b/services/cron/tasks_extended.go
@@ -15,6 +15,7 @@ import (
 	issue_indexer "forgejo.org/modules/indexer/issues"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/updatechecker"
+	moderation_service "forgejo.org/services/moderation"
 	repo_service "forgejo.org/services/repository"
 	archiver_service "forgejo.org/services/repository/archiver"
 	user_service "forgejo.org/services/user"
@@ -225,6 +226,24 @@ func registerRebuildIssueIndexer() {
 	})
 }
 
+func registerRemoveResolvedReports() {
+	type ReportConfig struct {
+		BaseConfig
+		ConfigKeepResolvedReportsFor time.Duration
+	}
+	RegisterTaskFatal("remove_resolved_reports", &ReportConfig{
+		BaseConfig: BaseConfig{
+			Enabled:    false,
+			RunAtStart: false,
+			Schedule:   "@every 24h",
+		},
+		ConfigKeepResolvedReportsFor: setting.Moderation.KeepResolvedReportsFor,
+	}, func(ctx context.Context, _ *user_model.User, config Config) error {
+		reportConfig := config.(*ReportConfig)
+		return moderation_service.RemoveResolvedReports(ctx, reportConfig.ConfigKeepResolvedReportsFor)
+	})
+}
+
 func initExtendedTasks() {
 	registerDeleteInactiveUsers()
 	registerDeleteRepositoryArchives()
@@ -240,4 +259,7 @@ func initExtendedTasks() {
 	registerDeleteOldSystemNotices()
 	registerGCLFS()
 	registerRebuildIssueIndexer()
+	if setting.Moderation.Enabled {
+		registerRemoveResolvedReports()
+	}
 }
diff --git a/services/doctor/authorizedkeys.go b/services/doctor/authorizedkeys.go
index 04a3680ff5..465a3fc7c0 100644
--- a/services/doctor/authorizedkeys.go
+++ b/services/doctor/authorizedkeys.go
@@ -7,6 +7,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -77,7 +78,7 @@ func checkAuthorizedKeys(ctx context.Context, logger log.Logger, autofix bool) e
 				fPath,
 				"forgejo admin regenerate keys",
 				"forgejo doctor check --run authorized-keys --fix")
-			return fmt.Errorf(`authorized_keys is out of date and should be regenerated with "forgejo admin regenerate keys" or "forgejo doctor check --run authorized-keys --fix"`)
+			return errors.New(`authorized_keys is out of date and should be regenerated with "forgejo admin regenerate keys" or "forgejo doctor check --run authorized-keys --fix"`)
 		}
 		logger.Warn("authorized_keys is out of date. Attempting rewrite...")
 		err = asymkey_model.RewriteAllPublicKeys(ctx)
diff --git a/services/doctor/dbconsistency.go b/services/doctor/dbconsistency.go
index 6fcbd90940..6fe4c9c5e6 100644
--- a/services/doctor/dbconsistency.go
+++ b/services/doctor/dbconsistency.go
@@ -78,7 +78,14 @@ func genericOrphanCheck(name, subject, refobject, joincond string) consistencyCh
 
 func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) error {
 	// make sure DB version is up-to-date
-	if err := db.InitEngineWithMigration(ctx, migrations.EnsureUpToDate); err != nil {
+	ensureUpToDateWrapper := func(e db.Engine) error {
+		engine, err := db.GetMasterEngine(e)
+		if err != nil {
+			return err
+		}
+		return migrations.EnsureUpToDate(engine)
+	}
+	if err := db.InitEngineWithMigration(ctx, ensureUpToDateWrapper); err != nil {
 		logger.Critical("Model version on the database does not match the current Gitea version. Model consistency will not be checked until the database is upgraded")
 		return err
 	}
diff --git a/services/doctor/dbversion.go b/services/doctor/dbversion.go
index 9c02c732e5..c0ff22915d 100644
--- a/services/doctor/dbversion.go
+++ b/services/doctor/dbversion.go
@@ -9,11 +9,15 @@ import (
 	"forgejo.org/models/db"
 	"forgejo.org/models/migrations"
 	"forgejo.org/modules/log"
+
+	"xorm.io/xorm"
 )
 
 func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error {
 	logger.Info("Expected database version: %d", migrations.ExpectedDBVersion())
-	if err := db.InitEngineWithMigration(ctx, migrations.EnsureUpToDate); err != nil {
+	if err := db.InitEngineWithMigration(ctx, func(eng db.Engine) error {
+		return migrations.EnsureUpToDate(eng.(*xorm.Engine))
+	}); err != nil {
 		if !autofix {
 			logger.Critical("Error: %v during ensure up to date", err)
 			return err
@@ -21,7 +25,9 @@ func checkDBVersion(ctx context.Context, logger log.Logger, autofix bool) error
 		logger.Warn("Got Error: %v during ensure up to date", err)
 		logger.Warn("Attempting to migrate to the latest DB version to fix this.")
 
-		err = db.InitEngineWithMigration(ctx, migrations.Migrate)
+		err = db.InitEngineWithMigration(ctx, func(eng db.Engine) error {
+			return migrations.Migrate(eng.(*xorm.Engine))
+		})
 		if err != nil {
 			logger.Critical("Error: %v during migration", err)
 		}
diff --git a/services/doctor/fix16961_test.go b/services/doctor/fix16961_test.go
index 7a83c808c3..75f9f206ab 100644
--- a/services/doctor/fix16961_test.go
+++ b/services/doctor/fix16961_test.go
@@ -221,7 +221,7 @@ func Test_fixPullRequestsConfig_16961(t *testing.T) {
 			if gotFixed != tt.wantFixed {
 				t.Errorf("fixPullRequestsConfig_16961() = %v, want %v", gotFixed, tt.wantFixed)
 			}
-			assert.EqualValues(t, &tt.expected, cfg)
+			assert.Equal(t, &tt.expected, cfg)
 		})
 	}
 }
@@ -265,7 +265,7 @@ func Test_fixIssuesConfig_16961(t *testing.T) {
 			if gotFixed != tt.wantFixed {
 				t.Errorf("fixIssuesConfig_16961() = %v, want %v", gotFixed, tt.wantFixed)
 			}
-			assert.EqualValues(t, &tt.expected, cfg)
+			assert.Equal(t, &tt.expected, cfg)
 		})
 	}
 }
diff --git a/services/doctor/lfs.go b/services/doctor/lfs.go
index fed127de5d..fe858605f4 100644
--- a/services/doctor/lfs.go
+++ b/services/doctor/lfs.go
@@ -5,7 +5,7 @@ package doctor
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"time"
 
 	"forgejo.org/modules/log"
@@ -27,7 +27,7 @@ func init() {
 
 func garbageCollectLFSCheck(ctx context.Context, logger log.Logger, autofix bool) error {
 	if !setting.LFS.StartServer {
-		return fmt.Errorf("LFS support is disabled")
+		return errors.New("LFS support is disabled")
 	}
 
 	if err := repository.GarbageCollectLFSMetaObjects(ctx, repository.GarbageCollectLFSMetaObjectsOptions{
diff --git a/services/externalaccount/link.go b/services/externalaccount/link.go
index f5d29b5ce5..5672313181 100644
--- a/services/externalaccount/link.go
+++ b/services/externalaccount/link.go
@@ -5,7 +5,7 @@ package externalaccount
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	user_model "forgejo.org/models/user"
 
@@ -23,7 +23,7 @@ type Store interface {
 func LinkAccountFromStore(ctx context.Context, store Store, user *user_model.User) error {
 	gothUser := store.Get("linkAccountGothUser")
 	if gothUser == nil {
-		return fmt.Errorf("not in LinkAccount session")
+		return errors.New("not in LinkAccount session")
 	}
 
 	return LinkAccountToUser(ctx, user, gothUser.(goth.User))
diff --git a/services/f3/driver/asset.go b/services/f3/driver/asset.go
deleted file mode 100644
index c9d2ecdf2f..0000000000
--- a/services/f3/driver/asset.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright Earl Warren <contact@earl-warren.org>
-// Copyright Loïc Dachary <loic@dachary.org>
-// SPDX-License-Identifier: MIT
-
-package driver
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"os"
-
-	"forgejo.org/models/db"
-	repo_model "forgejo.org/models/repo"
-	user_model "forgejo.org/models/user"
-	"forgejo.org/modules/storage"
-	"forgejo.org/modules/timeutil"
-	"forgejo.org/services/attachment"
-
-	"code.forgejo.org/f3/gof3/v3/f3"
-	f3_id "code.forgejo.org/f3/gof3/v3/id"
-	f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
-	"code.forgejo.org/f3/gof3/v3/tree/generic"
-	f3_util "code.forgejo.org/f3/gof3/v3/util"
-	"github.com/google/uuid"
-)
-
-var _ f3_tree.ForgeDriverInterface = &issue{}
-
-type asset struct {
-	common
-
-	forgejoAsset *repo_model.Attachment
-	sha          string
-	contentType  string
-	downloadFunc f3.DownloadFuncType
-}
-
-func (o *asset) SetNative(asset any) {
-	o.forgejoAsset = asset.(*repo_model.Attachment)
-}
-
-func (o *asset) GetNativeID() string {
-	return fmt.Sprintf("%d", o.forgejoAsset.ID)
-}
-
-func (o *asset) NewFormat() f3.Interface {
-	node := o.GetNode()
-	return node.GetTree().(f3_tree.TreeInterface).NewFormat(node.GetKind())
-}
-
-func (o *asset) ToFormat() f3.Interface {
-	if o.forgejoAsset == nil {
-		return o.NewFormat()
-	}
-
-	return &f3.ReleaseAsset{
-		Common:        f3.NewCommon(o.GetNativeID()),
-		Name:          o.forgejoAsset.Name,
-		ContentType:   o.contentType,
-		Size:          o.forgejoAsset.Size,
-		DownloadCount: o.forgejoAsset.DownloadCount,
-		Created:       o.forgejoAsset.CreatedUnix.AsTime(),
-		SHA256:        o.sha,
-		DownloadURL:   o.forgejoAsset.DownloadURL(),
-		DownloadFunc:  o.downloadFunc,
-	}
-}
-
-func (o *asset) FromFormat(content f3.Interface) {
-	asset := content.(*f3.ReleaseAsset)
-	o.forgejoAsset = &repo_model.Attachment{
-		ID:                f3_util.ParseInt(asset.GetID()),
-		Name:              asset.Name,
-		Size:              asset.Size,
-		DownloadCount:     asset.DownloadCount,
-		CreatedUnix:       timeutil.TimeStamp(asset.Created.Unix()),
-		CustomDownloadURL: asset.DownloadURL,
-	}
-	o.contentType = asset.ContentType
-	o.sha = asset.SHA256
-	o.downloadFunc = asset.DownloadFunc
-}
-
-func (o *asset) Get(ctx context.Context) bool {
-	node := o.GetNode()
-	o.Trace("%s", node.GetID())
-
-	id := node.GetID().Int64()
-
-	asset, err := repo_model.GetAttachmentByID(ctx, id)
-	if repo_model.IsErrAttachmentNotExist(err) {
-		return false
-	}
-	if err != nil {
-		panic(fmt.Errorf("asset %v %w", id, err))
-	}
-
-	o.forgejoAsset = asset
-
-	path := o.forgejoAsset.RelativePath()
-
-	{
-		f, err := storage.Attachments.Open(path)
-		if err != nil {
-			panic(err)
-		}
-		hasher := sha256.New()
-		if _, err := io.Copy(hasher, f); err != nil {
-			panic(fmt.Errorf("io.Copy to hasher: %v", err))
-		}
-		o.sha = hex.EncodeToString(hasher.Sum(nil))
-	}
-
-	o.downloadFunc = func() io.ReadCloser {
-		o.Trace("download %s from copy stored in temporary file %s", o.forgejoAsset.DownloadURL, path)
-		f, err := os.Open(path)
-		if err != nil {
-			panic(err)
-		}
-		return f
-	}
-	return true
-}
-
-func (o *asset) Patch(ctx context.Context) {
-	o.Trace("%d", o.forgejoAsset.ID)
-	if _, err := db.GetEngine(ctx).ID(o.forgejoAsset.ID).Cols("name").Update(o.forgejoAsset); err != nil {
-		panic(fmt.Errorf("UpdateAssetCols: %v %v", o.forgejoAsset, err))
-	}
-}
-
-func (o *asset) Put(ctx context.Context) f3_id.NodeID {
-	node := o.GetNode()
-	o.Trace("%s", node.GetID())
-
-	uploader, err := user_model.GetAdminUser(ctx)
-	if err != nil {
-		panic(fmt.Errorf("GetAdminUser %w", err))
-	}
-
-	o.forgejoAsset.UploaderID = uploader.ID
-	o.forgejoAsset.RepoID = f3_tree.GetProjectID(o.GetNode())
-	o.forgejoAsset.ReleaseID = f3_tree.GetReleaseID(o.GetNode())
-	o.forgejoAsset.UUID = uuid.New().String()
-
-	download := o.downloadFunc()
-	defer download.Close()
-
-	_, err = attachment.NewAttachment(ctx, o.forgejoAsset, download, o.forgejoAsset.Size)
-	if err != nil {
-		panic(err)
-	}
-
-	o.Trace("asset created %d", o.forgejoAsset.ID)
-	return f3_id.NewNodeID(o.forgejoAsset.ID)
-}
-
-func (o *asset) Delete(ctx context.Context) {
-	node := o.GetNode()
-	o.Trace("%s", node.GetID())
-
-	if err := repo_model.DeleteAttachment(ctx, o.forgejoAsset, true); err != nil {
-		panic(err)
-	}
-}
-
-func newAsset() generic.NodeDriverInterface {
-	return &asset{}
-}
diff --git a/services/f3/driver/assets.go b/services/f3/driver/assets.go
deleted file mode 100644
index 106d5029f3..0000000000
--- a/services/f3/driver/assets.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright Earl Warren <contact@earl-warren.org>
-// Copyright Loïc Dachary <loic@dachary.org>
-// SPDX-License-Identifier: MIT
-
-package driver
-
-import (
-	"context"
-	"fmt"
-
-	repo_model "forgejo.org/models/repo"
-
-	f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
-	"code.forgejo.org/f3/gof3/v3/tree/generic"
-)
-
-type assets struct {
-	container
-}
-
-func (o *assets) ListPage(ctx context.Context, page int) generic.ChildrenSlice {
-	if page > 1 {
-		return generic.NewChildrenSlice(0)
-	}
-
-	releaseID := f3_tree.GetReleaseID(o.GetNode())
-
-	release, err := repo_model.GetReleaseByID(ctx, releaseID)
-	if err != nil {
-		panic(fmt.Errorf("GetReleaseByID %v %w", releaseID, err))
-	}
-
-	if err := release.LoadAttributes(ctx); err != nil {
-		panic(fmt.Errorf("error while listing assets: %v", err))
-	}
-
-	return f3_tree.ConvertListed(ctx, o.GetNode(), f3_tree.ConvertToAny(release.Attachments...)...)
-}
-
-func newAssets() generic.NodeDriverInterface {
-	return &assets{}
-}
diff --git a/services/f3/driver/attachment.go b/services/f3/driver/attachment.go
new file mode 100644
index 0000000000..64c188d6e0
--- /dev/null
+++ b/services/f3/driver/attachment.go
@@ -0,0 +1,185 @@
+// Copyright Earl Warren <contact@earl-warren.org>
+// Copyright Loïc Dachary <loic@dachary.org>
+// SPDX-License-Identifier: MIT
+
+package driver
+
+import (
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"os"
+
+	"forgejo.org/models/db"
+	repo_model "forgejo.org/models/repo"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/storage"
+	"forgejo.org/modules/timeutil"
+	forgejo_attachment "forgejo.org/services/attachment"
+
+	"code.forgejo.org/f3/gof3/v3/f3"
+	f3_id "code.forgejo.org/f3/gof3/v3/id"
+	f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
+	"code.forgejo.org/f3/gof3/v3/tree/generic"
+	f3_util "code.forgejo.org/f3/gof3/v3/util"
+	"github.com/google/uuid"
+)
+
+var _ f3_tree.ForgeDriverInterface = &issue{}
+
+type attachment struct {
+	common
+
+	forgejoAttachment *repo_model.Attachment
+	sha               string
+	contentType       string
+	downloadFunc      f3.DownloadFuncType
+}
+
+func (o *attachment) SetNative(attachment any) {
+	o.forgejoAttachment = attachment.(*repo_model.Attachment)
+}
+
+func (o *attachment) GetNativeID() string {
+	return fmt.Sprintf("%d", o.forgejoAttachment.ID)
+}
+
+func (o *attachment) NewFormat() f3.Interface {
+	node := o.GetNode()
+	return node.GetTree().(f3_tree.TreeInterface).NewFormat(node.GetKind())
+}
+
+func (o *attachment) ToFormat() f3.Interface {
+	if o.forgejoAttachment == nil {
+		return o.NewFormat()
+	}
+
+	return &f3.Attachment{
+		Common:        f3.NewCommon(o.GetNativeID()),
+		Name:          o.forgejoAttachment.Name,
+		ContentType:   o.contentType,
+		Size:          o.forgejoAttachment.Size,
+		DownloadCount: o.forgejoAttachment.DownloadCount,
+		Created:       o.forgejoAttachment.CreatedUnix.AsTime(),
+		SHA256:        o.sha,
+		DownloadURL:   o.forgejoAttachment.DownloadURL(),
+		DownloadFunc:  o.downloadFunc,
+	}
+}
+
+func (o *attachment) FromFormat(content f3.Interface) {
+	attachment := content.(*f3.Attachment)
+	o.forgejoAttachment = &repo_model.Attachment{
+		ID:                f3_util.ParseInt(attachment.GetID()),
+		Name:              attachment.Name,
+		Size:              attachment.Size,
+		DownloadCount:     attachment.DownloadCount,
+		CreatedUnix:       timeutil.TimeStamp(attachment.Created.Unix()),
+		CustomDownloadURL: attachment.DownloadURL,
+	}
+	o.contentType = attachment.ContentType
+	o.sha = attachment.SHA256
+	o.downloadFunc = attachment.DownloadFunc
+}
+
+func (o *attachment) Get(ctx context.Context) bool {
+	node := o.GetNode()
+	o.Trace("%s", node.GetID())
+
+	id := node.GetID().Int64()
+
+	attachment, err := repo_model.GetAttachmentByID(ctx, id)
+	if repo_model.IsErrAttachmentNotExist(err) {
+		return false
+	}
+	if err != nil {
+		panic(fmt.Errorf("attachment %v %w", id, err))
+	}
+
+	o.forgejoAttachment = attachment
+
+	path := o.forgejoAttachment.RelativePath()
+
+	{
+		f, err := storage.Attachments.Open(path)
+		if err != nil {
+			panic(err)
+		}
+		hasher := sha256.New()
+		if _, err := io.Copy(hasher, f); err != nil {
+			panic(fmt.Errorf("io.Copy to hasher: %v", err))
+		}
+		o.sha = hex.EncodeToString(hasher.Sum(nil))
+	}
+
+	o.downloadFunc = func() io.ReadCloser {
+		o.Trace("download %s from copy stored in temporary file %s", o.forgejoAttachment.DownloadURL, path)
+		f, err := os.Open(path)
+		if err != nil {
+			panic(err)
+		}
+		return f
+	}
+	return true
+}
+
+func (o *attachment) Patch(ctx context.Context) {
+	o.Trace("%d", o.forgejoAttachment.ID)
+	if _, err := db.GetEngine(ctx).ID(o.forgejoAttachment.ID).Cols("name").Update(o.forgejoAttachment); err != nil {
+		panic(fmt.Errorf("UpdateAttachmentCols: %v %v", o.forgejoAttachment, err))
+	}
+}
+
+func (o *attachment) Put(ctx context.Context) f3_id.NodeID {
+	node := o.GetNode()
+	o.Trace("%s", node.GetID())
+
+	uploader, err := user_model.GetAdminUser(ctx)
+	if err != nil {
+		panic(fmt.Errorf("GetAdminUser %w", err))
+	}
+
+	attachable := f3_tree.GetAttachable(o.GetNode())
+	attachableID := f3_tree.GetAttachableID(o.GetNode())
+
+	switch attachable.GetKind() {
+	case f3_tree.KindRelease:
+		o.forgejoAttachment.ReleaseID = attachableID
+	case f3_tree.KindComment:
+		o.forgejoAttachment.CommentID = attachableID
+	case f3_tree.KindIssue, f3_tree.KindPullRequest:
+		o.forgejoAttachment.IssueID = attachableID
+	default:
+		panic(fmt.Errorf("unexpected type %s", attachable.GetKind()))
+	}
+
+	o.forgejoAttachment.UploaderID = uploader.ID
+	o.forgejoAttachment.RepoID = f3_tree.GetProjectID(o.GetNode())
+	o.forgejoAttachment.UUID = uuid.New().String()
+
+	download := o.downloadFunc()
+	defer download.Close()
+
+	_, err = forgejo_attachment.NewAttachment(ctx, o.forgejoAttachment, download, o.forgejoAttachment.Size)
+	if err != nil {
+		panic(err)
+	}
+
+	o.Trace("attachment created %d", o.forgejoAttachment.ID)
+	return f3_id.NewNodeID(o.forgejoAttachment.ID)
+}
+
+func (o *attachment) Delete(ctx context.Context) {
+	node := o.GetNode()
+	o.Trace("%s", node.GetID())
+
+	if err := repo_model.DeleteAttachment(ctx, o.forgejoAttachment, true); err != nil {
+		panic(err)
+	}
+}
+
+func newAttachment() generic.NodeDriverInterface {
+	return &attachment{}
+}
diff --git a/services/f3/driver/attachments.go b/services/f3/driver/attachments.go
new file mode 100644
index 0000000000..392afda52c
--- /dev/null
+++ b/services/f3/driver/attachments.go
@@ -0,0 +1,79 @@
+// Copyright Earl Warren <contact@earl-warren.org>
+// Copyright Loïc Dachary <loic@dachary.org>
+// SPDX-License-Identifier: MIT
+
+package driver
+
+import (
+	"context"
+	"fmt"
+
+	issues_model "forgejo.org/models/issues"
+	repo_model "forgejo.org/models/repo"
+
+	f3_tree "code.forgejo.org/f3/gof3/v3/tree/f3"
+	"code.forgejo.org/f3/gof3/v3/tree/generic"
+)
+
+type attachments struct {
+	container
+}
+
+func (o *attachments) ListPage(ctx context.Context, page int) generic.ChildrenSlice {
+	if page > 1 {
+		return generic.NewChildrenSlice(0)
+	}
+
+	attachable := f3_tree.GetAttachable(o.GetNode())
+	attachableID := f3_tree.GetAttachableID(o.GetNode())
+
+	var attachments []*repo_model.Attachment
+
+	switch attachable.GetKind() {
+	case f3_tree.KindRelease:
+		release, err := repo_model.GetReleaseByID(ctx, attachableID)
+		if err != nil {
+			panic(fmt.Errorf("GetReleaseByID %v %w", attachableID, err))
+		}
+
+		if err := release.LoadAttributes(ctx); err != nil {
+			panic(fmt.Errorf("error while listing attachments: %v", err))
+		}
+
+		attachments = release.Attachments
+
+	case f3_tree.KindComment:
+		comment, err := issues_model.GetCommentByID(ctx, attachableID)
+		if err != nil {
+			panic(fmt.Errorf("GetCommentByID %v %w", attachableID, err))
+		}
+
+		if err := comment.LoadAttachments(ctx); err != nil {
+			panic(fmt.Errorf("error while listing attachments: %v", err))
+		}
+
+		attachments = comment.Attachments
+
+	case f3_tree.KindIssue, f3_tree.KindPullRequest:
+		repoID := f3_tree.GetProjectID(o.GetNode())
+		issue, err := issues_model.GetIssueByIndex(ctx, repoID, attachableID)
+		if err != nil {
+			panic(fmt.Errorf("GetIssueByID %v %w", attachableID, err))
+		}
+
+		if err := issue.LoadAttachments(ctx); err != nil {
+			panic(fmt.Errorf("error while listing attachments: %v", err))
+		}
+
+		attachments = issue.Attachments
+
+	default:
+		panic(fmt.Errorf("unexpected type %s", attachable.GetKind()))
+	}
+
+	return f3_tree.ConvertListed(ctx, o.GetNode(), f3_tree.ConvertToAny(attachments...)...)
+}
+
+func newAttachments() generic.NodeDriverInterface {
+	return &attachments{}
+}
diff --git a/services/f3/driver/reaction.go b/services/f3/driver/reaction.go
index 74c50b9d13..b959206074 100644
--- a/services/f3/driver/reaction.go
+++ b/services/f3/driver/reaction.go
@@ -89,7 +89,7 @@ func (o *reaction) Patch(ctx context.Context) {
 }
 
 func (o *reaction) Put(ctx context.Context) f3_id.NodeID {
-	o.Error("%v", o.forgejoReaction.User)
+	o.Trace("%v", o.forgejoReaction.User)
 
 	sess := db.GetEngine(ctx)
 
@@ -110,7 +110,7 @@ func (o *reaction) Put(ctx context.Context) f3_id.NodeID {
 		panic(fmt.Errorf("unexpected type %v", reactionable.GetKind()))
 	}
 
-	o.Error("%v", o.forgejoReaction)
+	o.Trace("%v", o.forgejoReaction)
 
 	if _, err := sess.Insert(o.forgejoReaction); err != nil {
 		panic(err)
diff --git a/services/f3/driver/repository.go b/services/f3/driver/repository.go
index e7f4e43723..3cd9aa7f2e 100644
--- a/services/f3/driver/repository.go
+++ b/services/f3/driver/repository.go
@@ -72,7 +72,7 @@ func (o *repository) upsert(ctx context.Context) f3_id.NodeID {
 	return f3_id.NewNodeID(o.f.Name)
 }
 
-func (o *repository) SetFetchFunc(fetchFunc func(ctx context.Context, destination string, internalRefs []string)) {
+func (o *repository) SetFetchFunc(fetchFunc func(ctx context.Context, destination, internalRef string)) {
 	o.f.FetchFunc = fetchFunc
 }
 
@@ -93,10 +93,16 @@ func (o *repository) GetRepositoryPushURL() string {
 	return o.getURL()
 }
 
-func (o *repository) GetRepositoryInternalRefs() []string {
-	return []string{}
+func (o *repository) GetRepositoryInternalRef() string {
+	return ""
 }
 
+func (o *repository) GetPullRequestBranch(pr *f3.PullRequestBranch) *f3.PullRequestBranch {
+	panic("")
+}
+func (o *repository) CreatePullRequestBranch(pr *f3.PullRequestBranch) {}
+func (o *repository) DeletePullRequestBranch(pr *f3.PullRequestBranch) {}
+
 func newRepository(_ context.Context) generic.NodeDriverInterface {
 	r := &repository{
 		f: &f3.Repository{},
diff --git a/services/f3/driver/tree.go b/services/f3/driver/tree.go
index ff927df9d4..fe11b15f6e 100644
--- a/services/f3/driver/tree.go
+++ b/services/f3/driver/tree.go
@@ -49,10 +49,10 @@ func (o *treeDriver) Factory(ctx context.Context, kind f3_kind.Kind) generic.Nod
 		return newComments()
 	case f3_tree.KindComment:
 		return newComment()
-	case f3_tree.KindAssets:
-		return newAssets()
-	case f3_tree.KindAsset:
-		return newAsset()
+	case f3_tree.KindAttachments:
+		return newAttachments()
+	case f3_tree.KindAttachment:
+		return newAttachment()
 	case f3_tree.KindLabels:
 		return newLabels()
 	case f3_tree.KindLabel:
diff --git a/services/f3/util/logger_test.go b/services/f3/util/logger_test.go
index 4afd5dd57f..f62d9e2e82 100644
--- a/services/f3/util/logger_test.go
+++ b/services/f3/util/logger_test.go
@@ -23,7 +23,7 @@ func TestF3UtilMessage(t *testing.T) {
 		actual = fmt.Sprintf(message, args...)
 	}, nil)
 	logger.Message("EXPECTED %s", "MESSAGE")
-	assert.EqualValues(t, expected, actual)
+	assert.Equal(t, expected, actual)
 }
 
 func TestF3UtilLogger(t *testing.T) {
diff --git a/services/federation/delivery_queue.go b/services/federation/delivery_queue.go
new file mode 100644
index 0000000000..f71467e9f0
--- /dev/null
+++ b/services/federation/delivery_queue.go
@@ -0,0 +1,76 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"fmt"
+	"io"
+
+	"forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/graceful"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/process"
+	"forgejo.org/modules/queue"
+)
+
+type deliveryQueueItem struct {
+	Doer          *user.User
+	InboxURL      string
+	Payload       []byte
+	DeliveryCount int
+}
+
+var deliveryQueue *queue.WorkerPoolQueue[deliveryQueueItem]
+
+func initDeliveryQueue() error {
+	deliveryQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "activitypub_inbox_delivery", deliveryQueueHandler)
+	if deliveryQueue == nil {
+		return fmt.Errorf("unable to create activitypub_inbox_delivery queue")
+	}
+	go graceful.GetManager().RunWithCancel(deliveryQueue)
+
+	return nil
+}
+
+func deliveryQueueHandler(items ...deliveryQueueItem) (unhandled []deliveryQueueItem) {
+	for _, item := range items {
+		item.DeliveryCount++
+		err := deliverToInbox(item)
+		if err != nil && item.DeliveryCount < 10 {
+			unhandled = append(unhandled, item)
+		}
+	}
+	return unhandled
+}
+
+func deliverToInbox(item deliveryQueueItem) error {
+	ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(),
+		fmt.Sprintf("Delivering an Activity via user[%d] (%s), to %s", item.Doer.ID, item.Doer.Name, item.InboxURL))
+	defer finished()
+
+	clientFactory, err := activitypub.GetClientFactory(ctx)
+	if err != nil {
+		return err
+	}
+	apclient, err := clientFactory.WithKeys(ctx, item.Doer, item.Doer.APActorID()+"#main-key")
+	if err != nil {
+		return err
+	}
+
+	log.Debug("Delivering %s to %s", item.Payload, item.InboxURL)
+	res, err := apclient.Post(item.Payload, item.InboxURL)
+	if err != nil {
+		return err
+	}
+	if res.StatusCode >= 400 {
+		defer res.Body.Close()
+		body, _ := io.ReadAll(io.LimitReader(res.Body, 16*1024))
+
+		log.Warn("Delivering to %s failed: %d %s, %v times", item.InboxURL, res.StatusCode, string(body), item.DeliveryCount)
+		return fmt.Errorf("delivery failed")
+	}
+
+	return nil
+}
diff --git a/services/federation/error.go b/services/federation/error.go
new file mode 100644
index 0000000000..425035d0d5
--- /dev/null
+++ b/services/federation/error.go
@@ -0,0 +1,44 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"fmt"
+	"net/http"
+)
+
+type ErrNotAcceptable struct {
+	Message string
+}
+
+func NewErrNotAcceptablef(format string, a ...any) ErrNotAcceptable {
+	message := fmt.Sprintf(format, a...)
+	return ErrNotAcceptable{Message: message}
+}
+
+func (err ErrNotAcceptable) Error() string {
+	return fmt.Sprintf("NotAcceptable: %v", err.Message)
+}
+
+type ErrInternal struct {
+	Message string
+}
+
+func NewErrInternalf(format string, a ...any) ErrInternal {
+	message := fmt.Sprintf(format, a...)
+	return ErrInternal{Message: message}
+}
+
+func (err ErrInternal) Error() string {
+	return fmt.Sprintf("InternalServerError: %v", err.Message)
+}
+
+func HTTPStatus(err error) int {
+	switch err.(type) {
+	case ErrNotAcceptable:
+		return http.StatusNotAcceptable
+	default:
+		return http.StatusInternalServerError
+	}
+}
diff --git a/services/federation/federation_service.go b/services/federation/federation_service.go
index 21c7be855b..ccdb9bbab0 100644
--- a/services/federation/federation_service.go
+++ b/services/federation/federation_service.go
@@ -1,18 +1,16 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package federation
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
-	"net/http"
 	"net/url"
 	"strings"
-	"time"
 
 	"forgejo.org/models/forgefed"
-	"forgejo.org/models/repo"
 	"forgejo.org/models/user"
 	"forgejo.org/modules/activitypub"
 	"forgejo.org/modules/auth/password"
@@ -24,128 +22,24 @@ import (
 	"github.com/google/uuid"
 )
 
-// ProcessLikeActivity receives a ForgeLike activity and does the following:
-// Validation of the activity
-// Creation of a (remote) federationHost if not existing
-// Creation of a forgefed Person if not existing
-// Validation of incoming RepositoryID against Local RepositoryID
-// Star the repo if it wasn't already stared
-// Do some mitigation against out of order attacks
-func ProcessLikeActivity(ctx context.Context, form any, repositoryID int64) (int, string, error) {
-	activity := form.(*fm.ForgeLike)
-	if res, err := validation.IsValid(activity); !res {
-		return http.StatusNotAcceptable, "Invalid activity", err
+func Init() error {
+	if !setting.Federation.Enabled {
+		return nil
 	}
-	log.Info("Activity validated:%v", activity)
-
-	// parse actorID (person)
-	actorURI := activity.Actor.GetID().String()
-	log.Info("actorURI was: %v", actorURI)
-	federationHost, err := GetFederationHostForURI(ctx, actorURI)
-	if err != nil {
-		return http.StatusInternalServerError, "Wrong FederationHost", err
-	}
-	if !activity.IsNewer(federationHost.LatestActivity) {
-		return http.StatusNotAcceptable, "Activity out of order.", fmt.Errorf("Activity already processed")
-	}
-	actorID, err := fm.NewPersonID(actorURI, string(federationHost.NodeInfo.SoftwareName))
-	if err != nil {
-		return http.StatusNotAcceptable, "Invalid PersonID", err
-	}
-	log.Info("Actor accepted:%v", actorID)
-
-	// parse objectID (repository)
-	objectID, err := fm.NewRepositoryID(activity.Object.GetID().String(), string(forgefed.ForgejoSourceType))
-	if err != nil {
-		return http.StatusNotAcceptable, "Invalid objectId", err
-	}
-	if objectID.ID != fmt.Sprint(repositoryID) {
-		return http.StatusNotAcceptable, "Invalid objectId", err
-	}
-	log.Info("Object accepted:%v", objectID)
-
-	// Check if user already exists
-	user, _, err := user.FindFederatedUser(ctx, actorID.ID, federationHost.ID)
-	if err != nil {
-		return http.StatusInternalServerError, "Searching for user failed", err
-	}
-	if user != nil {
-		log.Info("Found local federatedUser: %v", user)
-	} else {
-		user, _, err = CreateUserFromAP(ctx, actorID, federationHost.ID)
-		if err != nil {
-			return http.StatusInternalServerError, "Error creating federatedUser", err
-		}
-		log.Info("Created federatedUser from ap: %v", user)
-	}
-	log.Info("Got user:%v", user.Name)
-
-	// execute the activity if the repo was not stared already
-	alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID)
-	if !alreadyStared {
-		err = repo.StarRepo(ctx, user.ID, repositoryID, true)
-		if err != nil {
-			return http.StatusNotAcceptable, "Error staring", err
-		}
-	}
-	federationHost.LatestActivity = activity.StartTime
-	err = forgefed.UpdateFederationHost(ctx, federationHost)
-	if err != nil {
-		return http.StatusNotAcceptable, "Error updating federatedHost", err
-	}
-
-	return 0, "", nil
+	return initDeliveryQueue()
 }
 
-func CreateFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forgefed.FederationHost, error) {
-	actionsUser := user.NewActionsUser()
-	clientFactory, err := activitypub.GetClientFactory(ctx)
-	if err != nil {
-		return nil, err
-	}
-	client, err := clientFactory.WithKeys(ctx, actionsUser, "no idea where to get key material.")
-	if err != nil {
-		return nil, err
-	}
-	body, err := client.GetBody(actorID.AsWellKnownNodeInfoURI())
-	if err != nil {
-		return nil, err
-	}
-	nodeInfoWellKnown, err := forgefed.NewNodeInfoWellKnown(body)
-	if err != nil {
-		return nil, err
-	}
-	body, err = client.GetBody(nodeInfoWellKnown.Href)
-	if err != nil {
-		return nil, err
-	}
-	nodeInfo, err := forgefed.NewNodeInfo(body)
-	if err != nil {
-		return nil, err
-	}
-	result, err := forgefed.NewFederationHost(nodeInfo, actorID.Host)
-	if err != nil {
-		return nil, err
-	}
-	err = forgefed.CreateFederationHost(ctx, &result)
-	if err != nil {
-		return nil, err
-	}
-	return &result, nil
-}
-
-func GetFederationHostForURI(ctx context.Context, actorURI string) (*forgefed.FederationHost, error) {
-	log.Info("Input was: %v", actorURI)
+func FindOrCreateFederationHost(ctx context.Context, actorURI string) (*forgefed.FederationHost, error) {
 	rawActorID, err := fm.NewActorID(actorURI)
 	if err != nil {
 		return nil, err
 	}
-	federationHost, err := forgefed.FindFederationHostByFqdn(ctx, rawActorID.Host)
+	federationHost, err := forgefed.FindFederationHostByFqdnAndPort(ctx, rawActorID.Host, rawActorID.HostPort)
 	if err != nil {
 		return nil, err
 	}
 	if federationHost == nil {
-		result, err := CreateFederationHostFromAP(ctx, rawActorID)
+		result, err := createFederationHostFromAP(ctx, rawActorID)
 		if err != nil {
 			return nil, err
 		}
@@ -154,19 +48,109 @@ func GetFederationHostForURI(ctx context.Context, actorURI string) (*forgefed.Fe
 	return federationHost, nil
 }
 
-func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) {
-	// ToDo: Do we get a publicKeyId from server, repo or owner or repo?
-	actionsUser := user.NewActionsUser()
+func FindOrCreateFederatedUser(ctx context.Context, actorURI string) (*user.User, *user.FederatedUser, *forgefed.FederationHost, error) {
+	user, federatedUser, federationHost, err := findFederatedUser(ctx, actorURI)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	personID, err := fm.NewPersonID(actorURI, string(federationHost.NodeInfo.SoftwareName))
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	if user != nil {
+		log.Trace("Local ActivityPub user found (actorURI: %#v, user: %#v)", actorURI, user)
+	} else {
+		log.Trace("Attempting to create new user and federatedUser for actorURI: %#v", actorURI)
+		user, federatedUser, err = createUserFromAP(ctx, personID, federationHost.ID)
+		if err != nil {
+			return nil, nil, nil, err
+		}
+		log.Trace("Created user %#v with federatedUser %#v from distant server", user, federatedUser)
+	}
+	log.Trace("Got user: %v", user.Name)
+
+	return user, federatedUser, federationHost, nil
+}
+
+func findFederatedUser(ctx context.Context, actorURI string) (*user.User, *user.FederatedUser, *forgefed.FederationHost, error) {
+	federationHost, err := FindOrCreateFederationHost(ctx, actorURI)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	actorID, err := fm.NewPersonID(actorURI, string(federationHost.NodeInfo.SoftwareName))
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	user, federatedUser, err := user.FindFederatedUser(ctx, actorID.ID, federationHost.ID)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	return user, federatedUser, federationHost, nil
+}
+
+func createFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forgefed.FederationHost, error) {
+	actionsUser := user.NewAPServerActor()
+
+	clientFactory, err := activitypub.GetClientFactory(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	client, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID())
+	if err != nil {
+		return nil, err
+	}
+
+	body, err := client.GetBody(actorID.AsWellKnownNodeInfoURI())
+	if err != nil {
+		return nil, err
+	}
+
+	nodeInfoWellKnown, err := forgefed.NewNodeInfoWellKnown(body)
+	if err != nil {
+		return nil, err
+	}
+
+	body, err = client.GetBody(nodeInfoWellKnown.Href)
+	if err != nil {
+		return nil, err
+	}
+
+	nodeInfo, err := forgefed.NewNodeInfo(body)
+	if err != nil {
+		return nil, err
+	}
+
+	// TODO: we should get key material here also to have it immediately
+	result, err := forgefed.NewFederationHost(actorID.Host, nodeInfo, actorID.HostPort, actorID.HostSchema)
+	if err != nil {
+		return nil, err
+	}
+
+	err = forgefed.CreateFederationHost(ctx, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func fetchUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) {
+	actionsUser := user.NewAPServerActor()
 	clientFactory, err := activitypub.GetClientFactory(ctx)
 	if err != nil {
 		return nil, nil, err
 	}
-	client, err := clientFactory.WithKeys(ctx, actionsUser, "no idea where to get key material.")
+
+	apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID())
 	if err != nil {
 		return nil, nil, err
 	}
 
-	body, err := client.GetBody(personID.AsURI())
+	body, err := apClient.GetBody(personID.AsURI())
 	if err != nil {
 		return nil, nil, err
 	}
@@ -176,26 +160,42 @@ func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostI
 	if err != nil {
 		return nil, nil, err
 	}
+
 	if res, err := validation.IsValid(person); !res {
 		return nil, nil, err
 	}
-	log.Info("Fetched valid person:%q", person)
+
+	log.Info("Fetched valid person from distant server: %q", person)
 
 	localFqdn, err := url.ParseRequestURI(setting.AppURL)
 	if err != nil {
 		return nil, nil, err
 	}
+
 	email := fmt.Sprintf("f%v@%v", uuid.New().String(), localFqdn.Hostname())
 	loginName := personID.AsLoginName()
 	name := fmt.Sprintf("%v%v", person.PreferredUsername.String(), personID.HostSuffix())
 	fullName := person.Name.String()
+
 	if len(person.Name) == 0 {
 		fullName = name
 	}
+
 	password, err := password.Generate(32)
 	if err != nil {
 		return nil, nil, err
 	}
+
+	inbox, err := url.ParseRequestURI(person.Inbox.GetLink().String())
+	if err != nil {
+		return nil, nil, err
+	}
+
+	pubKeyBytes, err := decodePublicKeyPem(person.PublicKey.PublicKeyPem)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	newUser := user.User{
 		LowerName:                    strings.ToLower(name),
 		Name:                         name,
@@ -207,89 +207,37 @@ func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostI
 		LoginName:                    loginName,
 		Type:                         user.UserTypeRemoteUser,
 		IsAdmin:                      false,
-		NormalizedFederatedURI:       personID.AsURI(),
 	}
-	federatedUser := user.FederatedUser{
-		ExternalID:       personID.ID,
-		FederationHostID: federationHostID,
-	}
-	err = user.CreateFederatedUser(ctx, &newUser, &federatedUser)
-	if err != nil {
-		return nil, nil, err
-	}
-	log.Info("Created federatedUser:%q", federatedUser)
 
+	federatedUser := user.FederatedUser{
+		ExternalID:            personID.ID,
+		FederationHostID:      federationHostID,
+		InboxPath:             inbox.Path,
+		NormalizedOriginalURL: personID.AsURI(),
+		KeyID: sql.NullString{
+			String: person.PublicKey.ID.String(),
+			Valid:  true,
+		},
+		PublicKey: sql.Null[sql.RawBytes]{
+			V:     pubKeyBytes,
+			Valid: true,
+		},
+	}
+
+	log.Info("Fetched person's %q federatedUser from distant server: %q", person, federatedUser)
 	return &newUser, &federatedUser, nil
 }
 
-// Create or update a list of FollowingRepo structs
-func StoreFollowingRepoList(ctx context.Context, localRepoID int64, followingRepoList []string) (int, string, error) {
-	followingRepos := make([]*repo.FollowingRepo, 0, len(followingRepoList))
-	for _, uri := range followingRepoList {
-		federationHost, err := GetFederationHostForURI(ctx, uri)
-		if err != nil {
-			return http.StatusInternalServerError, "Wrong FederationHost", err
-		}
-		followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName))
-		if err != nil {
-			return http.StatusNotAcceptable, "Invalid federated repo", err
-		}
-		followingRepo, err := repo.NewFollowingRepo(localRepoID, followingRepoID.ID, federationHost.ID, uri)
-		if err != nil {
-			return http.StatusNotAcceptable, "Invalid federated repo", err
-		}
-		followingRepos = append(followingRepos, &followingRepo)
-	}
-
-	if err := repo.StoreFollowingRepos(ctx, localRepoID, followingRepos); err != nil {
-		return 0, "", err
-	}
-
-	return 0, "", nil
-}
-
-func DeleteFollowingRepos(ctx context.Context, localRepoID int64) error {
-	return repo.StoreFollowingRepos(ctx, localRepoID, []*repo.FollowingRepo{})
-}
-
-func SendLikeActivities(ctx context.Context, doer user.User, repoID int64) error {
-	followingRepos, err := repo.FindFollowingReposByRepoID(ctx, repoID)
-	log.Info("Federated Repos is: %v", followingRepos)
+func createUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) {
+	newUser, federatedUser, err := fetchUserFromAP(ctx, personID, federationHostID)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
-
-	likeActivityList := make([]fm.ForgeLike, 0)
-	for _, followingRepo := range followingRepos {
-		log.Info("Found following repo: %v", followingRepo)
-		target := followingRepo.URI
-		likeActivity, err := fm.NewForgeLike(doer.APActorID(), target, time.Now())
-		if err != nil {
-			return err
-		}
-		likeActivityList = append(likeActivityList, likeActivity)
-	}
-
-	apclientFactory, err := activitypub.GetClientFactory(ctx)
+	err = user.CreateFederatedUser(ctx, newUser, federatedUser)
 	if err != nil {
-		return err
-	}
-	apclient, err := apclientFactory.WithKeys(ctx, &doer, doer.APActorID())
-	if err != nil {
-		return err
-	}
-	for i, activity := range likeActivityList {
-		activity.StartTime = activity.StartTime.Add(time.Duration(i) * time.Second)
-		json, err := activity.MarshalJSON()
-		if err != nil {
-			return err
-		}
-
-		_, err = apclient.Post(json, fmt.Sprintf("%v/inbox/", activity.Object))
-		if err != nil {
-			log.Error("error %v while sending activity: %q", err, activity)
-		}
+		return nil, nil, err
 	}
 
-	return nil
+	log.Info("Created federatedUser: %q", federatedUser)
+	return newUser, federatedUser, nil
 }
diff --git a/services/federation/person_inbox_accept.go b/services/federation/person_inbox_accept.go
new file mode 100644
index 0000000000..d0a840bd2d
--- /dev/null
+++ b/services/federation/person_inbox_accept.go
@@ -0,0 +1,22 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"net/http"
+
+	"forgejo.org/modules/log"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+func processPersonInboxAccept(activity *ap.Activity) (ServiceResult, error) {
+	if activity.Object.GetType() != ap.FollowType {
+		log.Error("Invalid object type for Accept activity: %v", activity.Object.GetType())
+		return ServiceResult{}, NewErrNotAcceptablef("invalid object type for Accept activity: %v", activity.Object.GetType())
+	}
+
+	// We currently do not do anything here, we just drop it.
+	return NewServiceResultStatusOnly(http.StatusNoContent), nil
+}
diff --git a/services/federation/person_inbox_create.go b/services/federation/person_inbox_create.go
new file mode 100644
index 0000000000..2132c7ede1
--- /dev/null
+++ b/services/federation/person_inbox_create.go
@@ -0,0 +1,55 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"net/http"
+
+	"forgejo.org/models/activities"
+	"forgejo.org/models/user"
+	fm "forgejo.org/modules/forgefed"
+	"forgejo.org/modules/log"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+func processPersonInboxCreate(ctx context.Context, user *user.User, activity *ap.Activity) (ServiceResult, error) {
+	createAct, err := fm.NewForgeUserActivityFromAp(*activity)
+	if err != nil {
+		log.Error("Invalid user activity: %v, %v", activity, err)
+		return ServiceResult{}, NewErrNotAcceptablef("Invalid user activity: %v", err)
+	}
+
+	actorURI := createAct.Actor.GetLink().String()
+	federatedBaseUser, _, _, err := findFederatedUser(ctx, actorURI)
+	if err != nil {
+		log.Error("Federated user not found (%s): %v", actorURI, err)
+		return ServiceResult{}, NewErrNotAcceptablef("federated user not found (%s): %v", actorURI, err)
+	}
+	if federatedBaseUser == nil {
+		log.Error("Federated user not found (%s): %v", actorURI, err)
+		return ServiceResult{}, NewErrNotAcceptablef("federated user not found (%s): %v", actorURI, err)
+	}
+
+	federatedUserActivity, err := activities.NewFederatedUserActivity(
+		user.ID,
+		federatedBaseUser.ID,
+		createAct.Actor.GetLink().String(),
+		createAct.Note.Content.String(),
+		createAct.Note.URL.GetID().String(),
+		*activity,
+	)
+	if err != nil {
+		log.Error("Error creating federatedUserActivity (%s): %v", actorURI, err)
+		return ServiceResult{}, NewErrNotAcceptablef("Error creating federatedUserActivity: %v", err)
+	}
+
+	if err := activities.CreateUserActivity(ctx, &federatedUserActivity); err != nil {
+		log.Error("Unable to record activity: %v", err)
+		return ServiceResult{}, NewErrNotAcceptablef("Unable to record activity: %v", err)
+	}
+
+	return NewServiceResultStatusOnly(http.StatusNoContent), nil
+}
diff --git a/services/federation/person_inbox_follow.go b/services/federation/person_inbox_follow.go
new file mode 100644
index 0000000000..baa7934ad5
--- /dev/null
+++ b/services/federation/person_inbox_follow.go
@@ -0,0 +1,73 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"forgejo.org/models/user"
+	"forgejo.org/modules/forgefed"
+	"forgejo.org/modules/log"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/go-ap/jsonld"
+)
+
+func processPersonFollow(ctx context.Context, ctxUser *user.User, activity *ap.Activity) (ServiceResult, error) {
+	follow, err := forgefed.NewForgeFollowFromAp(*activity)
+	if err != nil {
+		log.Error("Invalid follow activity: %s", err)
+		return ServiceResult{}, NewErrNotAcceptablef("Invalid follow activity: %v", err)
+	}
+
+	actorURI := follow.Actor.GetLink().String()
+	_, federatedUser, federationHost, err := FindOrCreateFederatedUser(ctx, actorURI)
+	if err != nil {
+		log.Error("Error finding or creating federated user (%s): %v", actorURI, err)
+		return ServiceResult{}, NewErrNotAcceptablef("Federated user not found: %v", err)
+	}
+
+	following, err := user.IsFollowingAp(ctx, ctxUser, federatedUser)
+	if err != nil {
+		log.Error("forgefed.IsFollowing: %v", err)
+		return ServiceResult{}, NewErrNotAcceptablef("forgefed.IsFollowing: %v", err)
+	}
+	if following {
+		// If the user is already following, we're good, nothing to do.
+		log.Trace("Local user[%d] is already following federated user[%d]", ctxUser.ID, federatedUser.ID)
+		return NewServiceResultStatusOnly(http.StatusNoContent), nil
+	}
+
+	follower, err := user.AddFollower(ctx, ctxUser, federatedUser)
+	if err != nil {
+		log.Error("Unable to add follower: %v", err)
+		return ServiceResult{}, NewErrNotAcceptablef("Unable to add follower: %v", err)
+	}
+
+	accept := ap.AcceptNew(ap.IRI(fmt.Sprintf(
+		"%s#accepts/follow/%d", ctxUser.APActorID(), follower.ID,
+	)), follow)
+	accept.Actor = ap.IRI(ctxUser.APActorID())
+	payload, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI)).Marshal(accept)
+	if err != nil {
+		log.Error("Unable to Marshal JSON: %v", err)
+		return ServiceResult{}, NewErrInternalf("MarshalJSON: %v", err)
+	}
+
+	hostURL := federationHost.AsURL()
+	if err := deliveryQueue.Push(deliveryQueueItem{
+		InboxURL: hostURL.JoinPath(federatedUser.InboxPath).String(),
+		Doer:     ctxUser,
+		Payload:  payload,
+	}); err != nil {
+		log.Error("Unable to push to pending queue: %v", err)
+		return ServiceResult{}, NewErrInternalf("Unable to push to pending queue: %v", err)
+	}
+
+	// Respond back with an accept
+	result := NewServiceResultWithBytes(http.StatusAccepted, []byte(`{"status":"Accepted"}`))
+	return result, nil
+}
diff --git a/services/federation/person_inbox_undo.go b/services/federation/person_inbox_undo.go
new file mode 100644
index 0000000000..4379cf242a
--- /dev/null
+++ b/services/federation/person_inbox_undo.go
@@ -0,0 +1,47 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"net/http"
+
+	"forgejo.org/models/user"
+	"forgejo.org/modules/log"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+func processPersonInboxUndo(ctx context.Context, ctxUser *user.User, activity *ap.Activity) (ServiceResult, error) {
+	if activity.Object.GetType() != ap.FollowType {
+		log.Error("Invalid object type for Undo activity: %v", activity.Object.GetType())
+		return ServiceResult{}, NewErrNotAcceptablef("Invalid object type for Undo activity: %v", activity.Object.GetType())
+	}
+
+	actorURI := activity.Actor.GetLink().String()
+	_, federatedUser, _, err := findFederatedUser(ctx, actorURI)
+	if err != nil {
+		log.Error("User not found: %v", err)
+		return ServiceResult{}, NewErrInternalf("User not found: %v", err)
+	}
+
+	if federatedUser != nil {
+		following, err := user.IsFollowingAp(ctx, ctxUser, federatedUser)
+		if err != nil {
+			log.Error("forgefed.IsFollowing: %v", err)
+			return ServiceResult{}, NewErrInternalf("forgefed.IsFollowing: %v", err)
+		}
+		if !following {
+			// The local user is not following the federated one, nothing to do.
+			log.Trace("Local user[%d] is not following federated user[%d]", ctxUser.ID, federatedUser.ID)
+			return NewServiceResultStatusOnly(http.StatusNoContent), nil
+		}
+		if err := user.RemoveFollower(ctx, ctxUser, federatedUser); err != nil {
+			log.Error("Unable to remove follower", err)
+			return ServiceResult{}, NewErrInternalf("Unable to remove follower: %v", err)
+		}
+	}
+
+	return NewServiceResultStatusOnly(http.StatusNoContent), nil
+}
diff --git a/services/federation/person_service.go b/services/federation/person_service.go
new file mode 100644
index 0000000000..d6482d013c
--- /dev/null
+++ b/services/federation/person_service.go
@@ -0,0 +1,60 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"net/http"
+
+	"forgejo.org/models/user"
+	"forgejo.org/modules/forgefed"
+	"forgejo.org/modules/log"
+	context_service "forgejo.org/services/context"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/go-ap/jsonld"
+)
+
+func ProcessPersonInbox(ctx context.Context, user *user.User, activity *ap.Activity) (ServiceResult, error) {
+	switch activity.Type {
+	case ap.CreateType:
+		return processPersonInboxCreate(ctx, user, activity)
+	case ap.FollowType:
+		return processPersonFollow(ctx, user, activity)
+	case ap.UndoType:
+		return processPersonInboxUndo(ctx, user, activity)
+	case ap.AcceptType:
+		return processPersonInboxAccept(activity)
+	}
+
+	log.Error("Unsupported PersonInbox activity: %v", activity.Type)
+	return ServiceResult{}, NewErrNotAcceptablef("unsupported activity: %v", activity.Type)
+}
+
+func FollowRemoteActor(ctx *context_service.APIContext, localUser *user.User, actorURI string) error {
+	_, federatedUser, federationHost, err := FindOrCreateFederatedUser(ctx.Base, actorURI)
+	if err != nil {
+		log.Error("Federated user not found (%s): %v", actorURI, err)
+		ctx.Error(http.StatusNotAcceptable, "Federated user not found", err)
+		return err
+	}
+
+	followReq, err := forgefed.NewForgeFollow(localUser.APActorID(), actorURI)
+	if err != nil {
+		return err
+	}
+
+	payload, err := jsonld.WithContext(jsonld.IRI(ap.ActivityBaseURI)).
+		Marshal(followReq)
+	if err != nil {
+		return err
+	}
+
+	hostURL := federationHost.AsURL()
+	return deliveryQueue.Push(deliveryQueueItem{
+		InboxURL: hostURL.JoinPath(federatedUser.InboxPath).String(),
+		Doer:     localUser,
+		Payload:  payload,
+	})
+}
diff --git a/services/federation/repository_inbox_like.go b/services/federation/repository_inbox_like.go
new file mode 100644
index 0000000000..478a12d92c
--- /dev/null
+++ b/services/federation/repository_inbox_like.go
@@ -0,0 +1,147 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	"forgejo.org/models/forgefed"
+	"forgejo.org/models/repo"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	fm "forgejo.org/modules/forgefed"
+	"forgejo.org/modules/log"
+	"forgejo.org/modules/validation"
+	context_service "forgejo.org/services/context"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+// ProcessLikeActivity receives a ForgeLike activity and does the following:
+// Validation of the activity
+// Creation of a (remote) federationHost if not existing
+// Creation of a forgefed Person if not existing
+// Validation of incoming RepositoryID against Local RepositoryID
+// Star the repo if it wasn't already stared
+// Do some mitigation against out of order attacks
+func ProcessLikeActivity(ctx context.Context, activity *ap.Activity, repositoryID int64) (ServiceResult, error) {
+	constructorLikeActivity, _ := fm.NewForgeLike(activity.Actor.GetLink().String(), activity.Object.GetLink().String(), activity.StartTime)
+	if res, err := validation.IsValid(constructorLikeActivity); !res {
+		return ServiceResult{}, NewErrNotAcceptablef("Invalid activity: %v", err)
+	}
+	log.Trace("Activity validated: %#v", activity)
+
+	// parse actorID (person)
+	actorURI := activity.Actor.GetID().String()
+	user, _, federationHost, err := FindOrCreateFederatedUser(ctx, actorURI)
+	if err != nil {
+		log.Error("Federated user not found (%s): %v", actorURI, err)
+		return ServiceResult{}, NewErrNotAcceptablef("FindOrCreateFederatedUser failed: %v", err)
+	}
+
+	if !constructorLikeActivity.IsNewer(federationHost.LatestActivity) {
+		return ServiceResult{}, NewErrNotAcceptablef("LatestActivity: activity already processed: %v", err)
+	}
+
+	// parse objectID (repository)
+	objectID, err := fm.NewRepositoryID(constructorLikeActivity.Object.GetID().String(), string(forgefed.ForgejoSourceType))
+	if err != nil {
+		return ServiceResult{}, NewErrNotAcceptablef("Parsing repo objectID failed: %v", err)
+	}
+	if objectID.ID != fmt.Sprint(repositoryID) {
+		return ServiceResult{}, NewErrNotAcceptablef("Invalid repoId: %v", err)
+	}
+	log.Trace("Object accepted: %#v", objectID)
+
+	// execute the activity if the repo was not stared already
+	alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID)
+	if !alreadyStared {
+		err = repo.StarRepo(ctx, user.ID, repositoryID, true)
+		if err != nil {
+			return ServiceResult{}, NewErrNotAcceptablef("Staring failed: %v", err)
+		}
+	}
+	federationHost.LatestActivity = activity.StartTime
+	err = forgefed.UpdateFederationHost(ctx, federationHost)
+	if err != nil {
+		return ServiceResult{}, NewErrNotAcceptablef("Updating federatedHost failed: %v", err)
+	}
+
+	return NewServiceResultStatusOnly(http.StatusNoContent), nil
+}
+
+// Create or update a list of FollowingRepo structs
+func StoreFollowingRepoList(ctx *context_service.Context, localRepoID int64, followingRepoList []string) (int, string, error) {
+	followingRepos := make([]*repo.FollowingRepo, 0, len(followingRepoList))
+	for _, uri := range followingRepoList {
+		federationHost, err := FindOrCreateFederationHost(ctx.Base, uri)
+		if err != nil {
+			return http.StatusInternalServerError, "Wrong FederationHost", err
+		}
+		followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName))
+		if err != nil {
+			return http.StatusNotAcceptable, "Invalid federated repo", err
+		}
+		followingRepo, err := repo.NewFollowingRepo(localRepoID, followingRepoID.ID, federationHost.ID, uri)
+		if err != nil {
+			return http.StatusNotAcceptable, "Invalid federated repo", err
+		}
+		followingRepos = append(followingRepos, &followingRepo)
+	}
+
+	if err := repo.StoreFollowingRepos(ctx, localRepoID, followingRepos); err != nil {
+		return 0, "", err
+	}
+
+	return 0, "", nil
+}
+
+func DeleteFollowingRepos(ctx context.Context, localRepoID int64) error {
+	return repo.StoreFollowingRepos(ctx, localRepoID, []*repo.FollowingRepo{})
+}
+
+func SendLikeActivities(ctx context.Context, doer user.User, repoID int64) error {
+	followingRepos, err := repo.FindFollowingReposByRepoID(ctx, repoID)
+	log.Trace("Federated Repos is: %#v", followingRepos)
+	if err != nil {
+		return err
+	}
+
+	likeActivityList := make([]fm.ForgeLike, 0)
+	for _, followingRepo := range followingRepos {
+		log.Trace("Found following repo: %#v", followingRepo)
+		target := followingRepo.URI
+		likeActivity, err := fm.NewForgeLike(doer.APActorID(), target, time.Now())
+		if err != nil {
+			return err
+		}
+		likeActivityList = append(likeActivityList, likeActivity)
+	}
+
+	apclientFactory, err := activitypub.GetClientFactory(ctx)
+	if err != nil {
+		return err
+	}
+	apclient, err := apclientFactory.WithKeys(ctx, &doer, doer.APActorID()+"#main-key")
+	if err != nil {
+		return err
+	}
+	for i, activity := range likeActivityList {
+		activity.StartTime = activity.StartTime.Add(time.Duration(i) * time.Second)
+		json, err := activity.MarshalJSON()
+		if err != nil {
+			return err
+		}
+
+		_, err = apclient.Post(json, fmt.Sprintf("%v/inbox", activity.Object))
+		if err != nil {
+			log.Error("error %v while sending activity: %#v", err, activity)
+		}
+	}
+
+	return nil
+}
diff --git a/services/federation/repository_service.go b/services/federation/repository_service.go
new file mode 100644
index 0000000000..7891d786e2
--- /dev/null
+++ b/services/federation/repository_service.go
@@ -0,0 +1,19 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+func ProcessRepositoryInbox(ctx context.Context, activity *ap.Activity, repositoryID int64) (ServiceResult, error) {
+	switch activity.Type {
+	case ap.LikeType:
+		return ProcessLikeActivity(ctx, activity, repositoryID)
+	default:
+		return ServiceResult{}, NewErrNotAcceptablef("Not a like activity: %v", activity.Type)
+	}
+}
diff --git a/services/federation/result.go b/services/federation/result.go
new file mode 100644
index 0000000000..47afb2bdf6
--- /dev/null
+++ b/services/federation/result.go
@@ -0,0 +1,35 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import "github.com/go-ap/activitypub"
+
+type ServiceResult struct {
+	HTTPStatus   int
+	Bytes        []byte
+	Activity     activitypub.Activity
+	withBytes    bool
+	withActivity bool
+	statusOnly   bool
+}
+
+func NewServiceResultStatusOnly(status int) ServiceResult {
+	return ServiceResult{HTTPStatus: status, statusOnly: true}
+}
+
+func NewServiceResultWithBytes(status int, bytes []byte) ServiceResult {
+	return ServiceResult{HTTPStatus: status, Bytes: bytes, withBytes: true}
+}
+
+func (serviceResult ServiceResult) WithBytes() bool {
+	return serviceResult.withBytes
+}
+
+func (serviceResult ServiceResult) WithActivity() bool {
+	return serviceResult.withActivity
+}
+
+func (serviceResult ServiceResult) StatusOnly() bool {
+	return serviceResult.statusOnly
+}
diff --git a/services/federation/signature_service.go b/services/federation/signature_service.go
new file mode 100644
index 0000000000..fd8cbb39cd
--- /dev/null
+++ b/services/federation/signature_service.go
@@ -0,0 +1,235 @@
+// Copyright 2024, 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+	"crypto/x509"
+	"database/sql"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"net/url"
+
+	"forgejo.org/models/forgefed"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	fm "forgejo.org/modules/forgefed"
+
+	ap "github.com/go-ap/activitypub"
+)
+
+// Factory function for ActorID. Created struct is asserted to be valid
+func NewActorIDFromKeyID(ctx context.Context, uri string) (fm.ActorID, error) {
+	parsedURI, err := url.Parse(uri)
+	parsedURI.Fragment = ""
+	if err != nil {
+		return fm.ActorID{}, err
+	}
+
+	actionsUser := user.NewAPServerActor()
+	clientFactory, err := activitypub.GetClientFactory(ctx)
+	if err != nil {
+		return fm.ActorID{}, err
+	}
+
+	apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID())
+	if err != nil {
+		return fm.ActorID{}, err
+	}
+
+	userResponse, err := apClient.GetBody(parsedURI.String())
+	if err != nil {
+		return fm.ActorID{}, err
+	}
+
+	var actor ap.Actor
+	err = actor.UnmarshalJSON(userResponse)
+	if err != nil {
+		return fm.ActorID{}, err
+	}
+
+	result, err := fm.NewActorID(actor.PublicKey.Owner.String())
+	return result, err
+}
+
+func FindOrCreateFederatedUserKey(ctx context.Context, keyID string) (pubKey any, err error) {
+	var federatedUser *user.FederatedUser
+	var keyURL *url.URL
+
+	keyURL, err = url.Parse(keyID)
+	if err != nil {
+		return nil, err
+	}
+
+	// Try if the signing actor is an already known federated user
+	_, federatedUser, err = user.FindFederatedUserByKeyID(ctx, keyURL.String())
+	if err != nil {
+		return nil, err
+	}
+
+	if federatedUser == nil {
+		rawActorID, err := NewActorIDFromKeyID(ctx, keyID)
+		if err != nil {
+			return nil, err
+		}
+
+		_, federatedUser, _, err = FindOrCreateFederatedUser(ctx, rawActorID.AsURI())
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		_, err = forgefed.GetFederationHost(ctx, federatedUser.FederationHostID)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if federatedUser.PublicKey.Valid {
+		pubKey, err := x509.ParsePKIXPublicKey(federatedUser.PublicKey.V)
+		if err != nil {
+			return nil, err
+		}
+		return pubKey, nil
+	}
+
+	// Fetch missing public key
+	pubKey, pubKeyBytes, apPerson, err := fetchKeyFromAp(ctx, *keyURL)
+	if err != nil {
+		return nil, err
+	}
+	if apPerson.Type == ap.ActivityVocabularyType("Person") {
+		// Check federatedUser.id = person.id
+		if federatedUser.ExternalID != apPerson.ID.String() {
+			return nil, fmt.Errorf("federated user fetched (%v) does not match the stored one %v", apPerson, federatedUser)
+		}
+		// update federated user
+		federatedUser.KeyID = sql.NullString{
+			String: apPerson.PublicKey.ID.String(),
+			Valid:  true,
+		}
+		federatedUser.PublicKey = sql.Null[sql.RawBytes]{
+			V:     pubKeyBytes,
+			Valid: true,
+		}
+		err = user.UpdateFederatedUser(ctx, federatedUser)
+		if err != nil {
+			return nil, err
+		}
+		return pubKey, nil
+	}
+	return nil, nil
+}
+
+func FindOrCreateFederationHostKey(ctx context.Context, keyID string) (pubKey any, err error) {
+	keyURL, err := url.Parse(keyID)
+	if err != nil {
+		return nil, err
+	}
+	rawActorID, err := NewActorIDFromKeyID(ctx, keyID)
+	if err != nil {
+		return nil, err
+	}
+
+	// Is there an already known federation host?
+	federationHost, err := forgefed.FindFederationHostByKeyID(ctx, keyURL.String())
+	if err != nil {
+		return nil, err
+	}
+
+	if federationHost == nil {
+		federationHost, err = FindOrCreateFederationHost(ctx, rawActorID.AsURI())
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Is there an already an key?
+	if federationHost.PublicKey.Valid {
+		pubKey, err := x509.ParsePKIXPublicKey(federationHost.PublicKey.V)
+		if err != nil {
+			return nil, err
+		}
+		return pubKey, nil
+	}
+
+	// If not, fetch missing public key
+	pubKey, pubKeyBytes, apPerson, err := fetchKeyFromAp(ctx, *keyURL)
+	if err != nil {
+		return nil, err
+	}
+	if apPerson.Type == ap.ActivityVocabularyType("Application") {
+		// Check federationhost.id = person.id
+		if federationHost.HostPort != rawActorID.HostPort || federationHost.HostFqdn != rawActorID.Host ||
+			federationHost.HostSchema != rawActorID.HostSchema {
+			return nil, fmt.Errorf("federation host fetched (%v) does not match the stored one %v", apPerson, federationHost)
+		}
+		// update federation host
+		federationHost.KeyID = sql.NullString{
+			String: apPerson.PublicKey.ID.String(),
+			Valid:  true,
+		}
+		federationHost.PublicKey = sql.Null[sql.RawBytes]{
+			V:     pubKeyBytes,
+			Valid: true,
+		}
+		err = forgefed.UpdateFederationHost(ctx, federationHost)
+		if err != nil {
+			return nil, err
+		}
+		return pubKey, nil
+	}
+	return nil, nil
+}
+
+func fetchKeyFromAp(ctx context.Context, keyURL url.URL) (pubKey any, pubKeyBytes []byte, apPerson *ap.Person, err error) {
+	actionsUser := user.NewAPServerActor()
+
+	clientFactory, err := activitypub.GetClientFactory(ctx)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID())
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	b, err := apClient.GetBody(keyURL.String())
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	person := ap.PersonNew(ap.IRI(keyURL.String()))
+	err = person.UnmarshalJSON(b)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %w", err)
+	}
+
+	pubKeyFromAp := person.PublicKey
+	if pubKeyFromAp.ID.String() != keyURL.String() {
+		return nil, nil, nil, fmt.Errorf("cannot find publicKey with id: %v in %v", keyURL, string(b))
+	}
+
+	pubKeyBytes, err = decodePublicKeyPem(pubKeyFromAp.PublicKeyPem)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	pubKey, err = x509.ParsePKIXPublicKey(pubKeyBytes)
+	if err != nil {
+		return nil, nil, nil, err
+	}
+
+	return pubKey, pubKeyBytes, person, err
+}
+
+func decodePublicKeyPem(pubKeyPem string) ([]byte, error) {
+	block, _ := pem.Decode([]byte(pubKeyPem))
+	if block == nil || block.Type != "PUBLIC KEY" {
+		return nil, errors.New("could not decode publicKeyPem to PUBLIC KEY pem block type")
+	}
+
+	return block.Bytes, nil
+}
diff --git a/services/federation/user_activity.go b/services/federation/user_activity.go
new file mode 100644
index 0000000000..0db2aee4ec
--- /dev/null
+++ b/services/federation/user_activity.go
@@ -0,0 +1,83 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package federation
+
+import (
+	"context"
+
+	activities_model "forgejo.org/models/activities"
+	"forgejo.org/models/forgefed"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/structs"
+	"forgejo.org/services/convert"
+
+	ap "github.com/go-ap/activitypub"
+	"github.com/go-ap/jsonld"
+)
+
+func SendUserActivity(ctx context.Context, doer *user.User, activity *activities_model.Action) error {
+	followers, err := user.GetFollowersForUser(ctx, doer)
+	if err != nil {
+		return err
+	}
+
+	userActivity, err := convert.ActionToForgeUserActivity(ctx, activity)
+	if err != nil {
+		return err
+	}
+
+	payload, err := jsonld.WithContext(
+		jsonld.IRI(ap.ActivityBaseURI),
+	).Marshal(userActivity)
+	if err != nil {
+		return err
+	}
+
+	for _, follower := range followers {
+		_, federatedUserFollower, err := user.GetFederatedUserByUserID(ctx, follower.FollowingUserID)
+		if err != nil {
+			return err
+		}
+
+		federationHost, err := forgefed.GetFederationHost(ctx, federatedUserFollower.FederationHostID)
+		if err != nil {
+			return err
+		}
+
+		hostURL := federationHost.AsURL()
+		if err := deliveryQueue.Push(deliveryQueueItem{
+			InboxURL: hostURL.JoinPath(federatedUserFollower.InboxPath).String(),
+			Doer:     doer,
+			Payload:  payload,
+		}); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func NotifyActivityPubFollowers(ctx context.Context, actions []activities_model.Action) error {
+	if !setting.Federation.Enabled {
+		return nil
+	}
+	for _, act := range actions {
+		if act.Repo != nil {
+			if act.Repo.IsPrivate {
+				continue
+			}
+			if act.Repo.Owner.KeepActivityPrivate || act.Repo.Owner.Visibility != structs.VisibleTypePublic {
+				continue
+			}
+		}
+		if act.ActUser.KeepActivityPrivate || act.ActUser.Visibility != structs.VisibleTypePublic {
+			continue
+		}
+		if err := SendUserActivity(ctx, act.ActUser, &act); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/services/feed/action.go b/services/feed/action.go
index a2cd0551a3..2d07f39284 100644
--- a/services/feed/action.go
+++ b/services/feed/action.go
@@ -19,6 +19,7 @@ import (
 	"forgejo.org/modules/repository"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/util"
+	federation_service "forgejo.org/services/federation"
 	notify_service "forgejo.org/services/notify"
 )
 
@@ -39,6 +40,22 @@ func NewNotifier() notify_service.Notifier {
 	return &actionNotifier{}
 }
 
+func notifyAll(ctx context.Context, action *activities_model.Action) error {
+	out, err := activities_model.NotifyWatchers(ctx, action)
+	if err != nil {
+		return err
+	}
+	return federation_service.NotifyActivityPubFollowers(ctx, out)
+}
+
+func notifyAllActions(ctx context.Context, acts []*activities_model.Action) error {
+	out, err := activities_model.NotifyWatchersActions(ctx, acts)
+	if err != nil {
+		return err
+	}
+	return federation_service.NotifyActivityPubFollowers(ctx, out)
+}
+
 func (a *actionNotifier) NewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
 	if err := issue.LoadPoster(ctx); err != nil {
 		log.Error("issue.LoadPoster: %v", err)
@@ -50,11 +67,11 @@ func (a *actionNotifier) NewIssue(ctx context.Context, issue *issues_model.Issue
 	}
 	repo := issue.Repo
 
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: issue.Poster.ID,
 		ActUser:   issue.Poster,
 		OpType:    activities_model.ActionCreateIssue,
-		Content:   fmt.Sprintf("%d|%s", issue.Index, issue.Title),
+		Content:   encodeContent(fmt.Sprintf("%d", issue.Index), issue.Title),
 		RepoID:    repo.ID,
 		Repo:      repo,
 		IsPrivate: repo.IsPrivate,
@@ -70,7 +87,7 @@ func (a *actionNotifier) IssueChangeStatus(ctx context.Context, doer *user_model
 	act := &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
-		Content:   fmt.Sprintf("%d|%s", issue.Index, ""),
+		Content:   encodeContent(fmt.Sprintf("%d", issue.Index), ""),
 		RepoID:    issue.Repo.ID,
 		Repo:      issue.Repo,
 		Comment:   actionComment,
@@ -91,7 +108,7 @@ func (a *actionNotifier) IssueChangeStatus(ctx context.Context, doer *user_model
 	}
 
 	// Notify watchers for whatever action comes in, ignore if no action type.
-	if err := activities_model.NotifyWatchers(ctx, act); err != nil {
+	if err := notifyAll(ctx, act); err != nil {
 		log.Error("NotifyWatchers: %v", err)
 	}
 }
@@ -108,18 +125,9 @@ func (a *actionNotifier) CreateIssueComment(ctx context.Context, doer *user_mode
 		Comment:   comment,
 		CommentID: comment.ID,
 		IsPrivate: issue.Repo.IsPrivate,
+		Content:   encodeContent(fmt.Sprintf("%d", issue.Index), abbreviatedComment(comment.Content)),
 	}
 
-	truncatedContent, truncatedRight := util.SplitStringAtByteN(comment.Content, 200)
-	if truncatedRight != "" {
-		// in case the content is in a Latin family language, we remove the last broken word.
-		lastSpaceIdx := strings.LastIndex(truncatedContent, " ")
-		if lastSpaceIdx != -1 && (len(truncatedContent)-lastSpaceIdx < 15) {
-			truncatedContent = truncatedContent[:lastSpaceIdx] + "…"
-		}
-	}
-	act.Content = fmt.Sprintf("%d|%s", issue.Index, truncatedContent)
-
 	if issue.IsPull {
 		act.OpType = activities_model.ActionCommentPull
 	} else {
@@ -127,7 +135,7 @@ func (a *actionNotifier) CreateIssueComment(ctx context.Context, doer *user_mode
 	}
 
 	// Notify watchers for whatever action comes in, ignore if no action type.
-	if err := activities_model.NotifyWatchers(ctx, act); err != nil {
+	if err := notifyAll(ctx, act); err != nil {
 		log.Error("NotifyWatchers: %v", err)
 	}
 }
@@ -146,11 +154,11 @@ func (a *actionNotifier) NewPullRequest(ctx context.Context, pull *issues_model.
 		return
 	}
 
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: pull.Issue.Poster.ID,
 		ActUser:   pull.Issue.Poster,
 		OpType:    activities_model.ActionCreatePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pull.Issue.Index, pull.Issue.Title),
+		Content:   encodeContent(fmt.Sprintf("%d", pull.Issue.Index), pull.Issue.Title),
 		RepoID:    pull.Issue.Repo.ID,
 		Repo:      pull.Issue.Repo,
 		IsPrivate: pull.Issue.Repo.IsPrivate,
@@ -160,7 +168,7 @@ func (a *actionNotifier) NewPullRequest(ctx context.Context, pull *issues_model.
 }
 
 func (a *actionNotifier) RenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldRepoName string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionRenameRepo,
@@ -174,7 +182,7 @@ func (a *actionNotifier) RenameRepository(ctx context.Context, doer *user_model.
 }
 
 func (a *actionNotifier) TransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldOwnerName string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionTransferRepo,
@@ -188,7 +196,7 @@ func (a *actionNotifier) TransferRepository(ctx context.Context, doer *user_mode
 }
 
 func (a *actionNotifier) CreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionCreateRepo,
@@ -201,7 +209,7 @@ func (a *actionNotifier) CreateRepository(ctx context.Context, doer, u *user_mod
 }
 
 func (a *actionNotifier) ForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionCreateRepo,
@@ -230,7 +238,7 @@ func (a *actionNotifier) PullRequestReview(ctx context.Context, pr *issues_model
 				actions = append(actions, &activities_model.Action{
 					ActUserID: review.Reviewer.ID,
 					ActUser:   review.Reviewer,
-					Content:   fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(comm.Content, "\n")[0]),
+					Content:   encodeContent(fmt.Sprintf("%d", review.Issue.Index), abbreviatedComment(comm.Content)),
 					OpType:    activities_model.ActionCommentPull,
 					RepoID:    review.Issue.RepoID,
 					Repo:      review.Issue.Repo,
@@ -246,7 +254,7 @@ func (a *actionNotifier) PullRequestReview(ctx context.Context, pr *issues_model
 		action := &activities_model.Action{
 			ActUserID: review.Reviewer.ID,
 			ActUser:   review.Reviewer,
-			Content:   fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(comment.Content, "\n")[0]),
+			Content:   encodeContent(fmt.Sprintf("%d", review.Issue.Index), abbreviatedComment(comment.Content)),
 			RepoID:    review.Issue.RepoID,
 			Repo:      review.Issue.Repo,
 			IsPrivate: review.Issue.Repo.IsPrivate,
@@ -266,17 +274,17 @@ func (a *actionNotifier) PullRequestReview(ctx context.Context, pr *issues_model
 		actions = append(actions, action)
 	}
 
-	if err := activities_model.NotifyWatchersActions(ctx, actions); err != nil {
+	if err := notifyAllActions(ctx, actions); err != nil {
 		log.Error("notify watchers '%d/%d': %v", review.Reviewer.ID, review.Issue.RepoID, err)
 	}
 }
 
 func (*actionNotifier) MergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionMergePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title),
+		Content:   encodeContent(fmt.Sprintf("%d", pr.Issue.Index), pr.Issue.Title),
 		RepoID:    pr.Issue.Repo.ID,
 		Repo:      pr.Issue.Repo,
 		IsPrivate: pr.Issue.Repo.IsPrivate,
@@ -286,11 +294,11 @@ func (*actionNotifier) MergePullRequest(ctx context.Context, doer *user_model.Us
 }
 
 func (*actionNotifier) AutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionAutoMergePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title),
+		Content:   encodeContent(fmt.Sprintf("%d", pr.Issue.Index), pr.Issue.Title),
 		RepoID:    pr.Issue.Repo.ID,
 		Repo:      pr.Issue.Repo,
 		IsPrivate: pr.Issue.Repo.IsPrivate,
@@ -299,16 +307,16 @@ func (*actionNotifier) AutoMergePullRequest(ctx context.Context, doer *user_mode
 	}
 }
 
-func (*actionNotifier) NotifyPullRevieweDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
+func (*actionNotifier) PullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
 	reviewerName := review.Reviewer.Name
 	if len(review.OriginalAuthor) > 0 {
 		reviewerName = review.OriginalAuthor
 	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    activities_model.ActionPullReviewDismissed,
-		Content:   fmt.Sprintf("%d|%s|%s", review.Issue.Index, reviewerName, comment.Content),
+		Content:   encodeContent(fmt.Sprintf("%d", review.Issue.Index), reviewerName, abbreviatedComment(comment.Content)),
 		RepoID:    review.Issue.Repo.ID,
 		Repo:      review.Issue.Repo,
 		IsPrivate: review.Issue.Repo.IsPrivate,
@@ -342,7 +350,7 @@ func (a *actionNotifier) PushCommits(ctx context.Context, pusher *user_model.Use
 		opType = activities_model.ActionDeleteBranch
 	}
 
-	if err = activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err = notifyAll(ctx, &activities_model.Action{
 		ActUserID: pusher.ID,
 		ActUser:   pusher,
 		OpType:    opType,
@@ -362,7 +370,7 @@ func (a *actionNotifier) CreateRef(ctx context.Context, doer *user_model.User, r
 		// has sent same action in `PushCommits`, so skip it.
 		return
 	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    opType,
@@ -381,7 +389,7 @@ func (a *actionNotifier) DeleteRef(ctx context.Context, doer *user_model.User, r
 		// has sent same action in `PushCommits`, so skip it.
 		return
 	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: doer.ID,
 		ActUser:   doer,
 		OpType:    opType,
@@ -405,7 +413,7 @@ func (a *actionNotifier) SyncPushCommits(ctx context.Context, pusher *user_model
 		return
 	}
 
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: repo.OwnerID,
 		ActUser:   repo.MustOwner(ctx),
 		OpType:    activities_model.ActionMirrorSyncPush,
@@ -420,7 +428,7 @@ func (a *actionNotifier) SyncPushCommits(ctx context.Context, pusher *user_model
 }
 
 func (a *actionNotifier) SyncCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: repo.OwnerID,
 		ActUser:   repo.MustOwner(ctx),
 		OpType:    activities_model.ActionMirrorSyncCreate,
@@ -434,7 +442,7 @@ func (a *actionNotifier) SyncCreateRef(ctx context.Context, doer *user_model.Use
 }
 
 func (a *actionNotifier) SyncDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: repo.OwnerID,
 		ActUser:   repo.MustOwner(ctx),
 		OpType:    activities_model.ActionMirrorSyncDelete,
@@ -452,7 +460,7 @@ func (a *actionNotifier) NewRelease(ctx context.Context, rel *repo_model.Release
 		log.Error("LoadAttributes: %v", err)
 		return
 	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
+	if err := notifyAll(ctx, &activities_model.Action{
 		ActUserID: rel.PublisherID,
 		ActUser:   rel.Publisher,
 		OpType:    activities_model.ActionPublishRelease,
@@ -465,3 +473,35 @@ func (a *actionNotifier) NewRelease(ctx context.Context, rel *repo_model.Release
 		log.Error("NotifyWatchers: %v", err)
 	}
 }
+
+// ... later decoded in models/activities/action.go:GetIssueInfos
+func encodeContent(params ...string) string {
+	contentEncoded, err := json.Marshal(params)
+	if err != nil {
+		log.Error("encodeContent: Unexpected json encoding error: %v", err)
+	}
+	return string(contentEncoded)
+}
+
+// Given a comment of arbitrary-length Markdown text, create an abbreviated Markdown text appropriate for the
+// activity feed.
+func abbreviatedComment(comment string) string {
+	firstLine := strings.Split(comment, "\n")[0]
+
+	if strings.HasPrefix(firstLine, "```") {
+		// First line is is a fenced code block... with no special abbreviate we would display a blank block, or in the
+		// worst-case a ```mermaid would display an error. Better to omit the comment.
+		return ""
+	}
+
+	truncatedContent, truncatedRight := util.SplitStringAtByteN(firstLine, 200)
+	if truncatedRight != "" {
+		// in case the content is in a Latin family language, we remove the last broken word.
+		lastSpaceIdx := strings.LastIndex(truncatedContent, " ")
+		if lastSpaceIdx != -1 && (len(truncatedContent)-lastSpaceIdx < 15) {
+			truncatedContent = truncatedContent[:lastSpaceIdx] + "…"
+		}
+	}
+
+	return truncatedContent
+}
diff --git a/services/feed/action_test.go b/services/feed/action_test.go
index b0bbcdc3b6..48de7995bf 100644
--- a/services/feed/action_test.go
+++ b/services/feed/action_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package feed
@@ -102,7 +103,7 @@ func TestSyncPushCommits(t *testing.T) {
 		NewNotifier().SyncPushCommits(db.DefaultContext, user, repo, &repository.PushUpdateOptions{RefFullName: git.RefNameFromBranch("master")}, pushCommits())
 
 		newNotification := unittest.AssertExistsAndLoadBean(t, &activities_model.Action{ActUserID: user.ID, RefName: "refs/heads/master"}, unittest.Cond("id > ?", maxID))
-		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"27566bd","Message":"good signed commit (with not yet validated email)","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"5099b81","Message":"good signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
+		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"27566bd","Message":"good signed commit (with not yet validated email)","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"5099b81","Message":"good signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
 	})
 
 	t.Run("Only one commit", func(t *testing.T) {
@@ -112,7 +113,7 @@ func TestSyncPushCommits(t *testing.T) {
 		NewNotifier().SyncPushCommits(db.DefaultContext, user, repo, &repository.PushUpdateOptions{RefFullName: git.RefNameFromBranch("main")}, pushCommits())
 
 		newNotification := unittest.AssertExistsAndLoadBean(t, &activities_model.Action{ActUserID: user.ID, RefName: "refs/heads/main"}, unittest.Cond("id > ?", maxID))
-		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
+		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
 	})
 }
 
@@ -129,7 +130,7 @@ func TestPushCommits(t *testing.T) {
 		NewNotifier().PushCommits(db.DefaultContext, user, repo, &repository.PushUpdateOptions{RefFullName: git.RefNameFromBranch("master")}, pushCommits())
 
 		newNotification := unittest.AssertExistsAndLoadBean(t, &activities_model.Action{ActUserID: user.ID, RefName: "refs/heads/master"}, unittest.Cond("id > ?", maxID))
-		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"27566bd","Message":"good signed commit (with not yet validated email)","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"5099b81","Message":"good signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
+		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"27566bd","Message":"good signed commit (with not yet validated email)","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},{"Sha1":"5099b81","Message":"good signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
 	})
 
 	t.Run("Only one commit", func(t *testing.T) {
@@ -139,6 +140,67 @@ func TestPushCommits(t *testing.T) {
 		NewNotifier().PushCommits(db.DefaultContext, user, repo, &repository.PushUpdateOptions{RefFullName: git.RefNameFromBranch("main")}, pushCommits())
 
 		newNotification := unittest.AssertExistsAndLoadBean(t, &activities_model.Action{ActUserID: user.ID, RefName: "refs/heads/main"}, unittest.Cond("id > ?", maxID))
-		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
+		assert.JSONEq(t, `{"Commits":[{"Sha1":"69554a6","Message":"not signed commit","AuthorEmail":"user2@example.com","AuthorName":"User2","CommitterEmail":"user2@example.com","CommitterName":"User2","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"}],"HeadCommit":{"Sha1":"69554a6","Message":"","AuthorEmail":"","AuthorName":"","CommitterEmail":"","CommitterName":"","Signature":null,"Verification":null,"Timestamp":"0001-01-01T00:00:00Z"},"CompareURL":"","Len":0}`, newNotification.Content)
 	})
 }
+
+func TestAbbreviatedComment(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "short single line comment",
+			input:    "This is a short comment",
+			expected: "This is a short comment",
+		},
+		{
+			name:     "empty comment",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "multiline comment - only first line",
+			input:    "First line of comment\nSecond line\nThird line",
+			expected: "First line of comment",
+		},
+		{
+			name:     "before clip boundry",
+			input:    strings.Repeat("abc ", 50),
+			expected: strings.Repeat("abc ", 50),
+		},
+		{
+			name:     "after clip boundry",
+			input:    strings.Repeat("abc ", 51),
+			expected: "abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc…",
+		},
+		{
+			name:     "byte-split would land in middle of a rune",
+			input:    strings.Repeat("🎉", 200),
+			expected: "🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉🎉…",
+		},
+		{
+			name:     "mermaid block",
+			input:    "Interesting point, here's a digram with my thoughts:\n```mermaid\ngraph LR\n   a -->|some text| b\n```",
+			expected: "Interesting point, here's a digram with my thoughts:",
+		},
+		{
+			name:     "block start",
+			input:    "```\n# This file describes the expected reviewers for a PR based on the changed\n# files.\n```\n\nI think this comment is wrong...",
+			expected: "",
+		},
+		{
+			name:     "labeled block start",
+			input:    "```mermaid\ngraph LR\n   a -->|some text| b\n```",
+			expected: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := abbreviatedComment(tt.input)
+			assert.Equal(t, tt.expected, result, "abbreviatedComment(%q)", tt.input)
+		})
+	}
+}
diff --git a/services/forms/auth_form.go b/services/forms/auth_form.go
index e665ca0d19..b89e87f749 100644
--- a/services/forms/auth_form.go
+++ b/services/forms/auth_form.go
@@ -79,6 +79,7 @@ type AuthenticationForm struct {
 	SkipLocalTwoFA                bool
 	GroupTeamMap                  string `binding:"ValidGroupTeamMap"`
 	GroupTeamMapRemoval           bool
+	AllowUsernameChange           bool
 }
 
 // Validate validates fields
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index c39c6a7b36..d040b41395 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -141,6 +141,7 @@ type RepoSettingForm struct {
 	PushMirrorSyncOnCommit bool
 	PushMirrorInterval     string
 	PushMirrorUseSSH       bool
+	PushMirrorBranchFilter string `binding:"MaxSize(2048)" preprocess:"TrimSpace"`
 	Private                bool
 	Template               bool
 	EnablePrune            bool
@@ -277,6 +278,9 @@ type WebhookCoreForm struct {
 	Wiki                     bool
 	Repository               bool
 	Package                  bool
+	ActionFailure            bool
+	ActionRecover            bool
+	ActionSuccess            bool
 	Active                   bool
 	BranchFilter             string `binding:"GlobPattern"`
 	AuthorizationHeader      string
@@ -725,8 +729,8 @@ func (f *DeleteRepoFileForm) Validate(req *http.Request, errs binding.Errors) bi
 
 // AddTimeManuallyForm form that adds spent time manually.
 type AddTimeManuallyForm struct {
-	Hours   int `binding:"Range(0,1000)"`
-	Minutes int `binding:"Range(0,1000)"`
+	Hours   int `binding:"Range(0,1000)" locale:"repo.issues.add_time_hours"`
+	Minutes int `binding:"Range(0,1000)" locale:"repo.issues.add_time_minutes"`
 }
 
 // Validate validates the fields
diff --git a/services/forms/report_abuse.go b/services/forms/report_abuse.go
new file mode 100644
index 0000000000..5e9d7dc45f
--- /dev/null
+++ b/services/forms/report_abuse.go
@@ -0,0 +1,28 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package forms
+
+import (
+	"net/http"
+
+	"forgejo.org/models/moderation"
+	"forgejo.org/modules/web/middleware"
+	"forgejo.org/services/context"
+
+	"code.forgejo.org/go-chi/binding"
+)
+
+// ReportAbuseForm is used to interact with the UI of the form that submits new abuse reports.
+type ReportAbuseForm struct {
+	ContentID     int64
+	ContentType   moderation.ReportedContentType
+	AbuseCategory moderation.AbuseCategoryType `binding:"Required" locale:"moderation.abuse_category"`
+	Remarks       string                       `binding:"Required;MinSize(20);MaxSize(500)" preprocess:"TrimSpace" locale:"moderation.report_remarks"`
+}
+
+// Validate validates the fields of ReportAbuseForm.
+func (f *ReportAbuseForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
+	ctx := context.GetValidateContext(req)
+	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
+}
diff --git a/services/forms/user_form_test.go b/services/forms/user_form_test.go
index 67fb64cabf..ae08f65f23 100644
--- a/services/forms/user_form_test.go
+++ b/services/forms/user_form_test.go
@@ -9,18 +9,14 @@ import (
 
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/gobwas/glob"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestRegisterForm_IsDomainAllowed_Empty(t *testing.T) {
-	oldService := setting.Service
-	defer func() {
-		setting.Service = oldService
-	}()
-
-	setting.Service.EmailDomainAllowList = nil
+	defer test.MockVariableValue(&setting.Service.EmailDomainAllowList, nil)()
 
 	form := RegisterForm{}
 
@@ -28,12 +24,7 @@ func TestRegisterForm_IsDomainAllowed_Empty(t *testing.T) {
 }
 
 func TestRegisterForm_IsDomainAllowed_InvalidEmail(t *testing.T) {
-	oldService := setting.Service
-	defer func() {
-		setting.Service = oldService
-	}()
-
-	setting.Service.EmailDomainAllowList = []glob.Glob{glob.MustCompile("gitea.io")}
+	defer test.MockVariableValue(&setting.Service.EmailDomainAllowList, []glob.Glob{glob.MustCompile("gitea.io")})()
 
 	tt := []struct {
 		email string
@@ -50,12 +41,7 @@ func TestRegisterForm_IsDomainAllowed_InvalidEmail(t *testing.T) {
 }
 
 func TestRegisterForm_IsDomainAllowed_AllowedEmail(t *testing.T) {
-	oldService := setting.Service
-	defer func() {
-		setting.Service = oldService
-	}()
-
-	setting.Service.EmailDomainAllowList = []glob.Glob{glob.MustCompile("gitea.io"), glob.MustCompile("*.allow")}
+	defer test.MockVariableValue(&setting.Service.EmailDomainAllowList, []glob.Glob{glob.MustCompile("gitea.io"), glob.MustCompile("*.allow")})()
 
 	tt := []struct {
 		email string
@@ -78,13 +64,7 @@ func TestRegisterForm_IsDomainAllowed_AllowedEmail(t *testing.T) {
 }
 
 func TestRegisterForm_IsDomainAllowed_BlockedEmail(t *testing.T) {
-	oldService := setting.Service
-	defer func() {
-		setting.Service = oldService
-	}()
-
-	setting.Service.EmailDomainAllowList = nil
-	setting.Service.EmailDomainBlockList = []glob.Glob{glob.MustCompile("gitea.io"), glob.MustCompile("*.block")}
+	defer test.MockVariableValue(&setting.Service.EmailDomainBlockList, []glob.Glob{glob.MustCompile("gitea.io"), glob.MustCompile("*.block")})()
 
 	tt := []struct {
 		email string
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 2e1fecda2a..1f2a7f232f 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -85,11 +85,20 @@ type DiffLine struct {
 
 // DiffLineSectionInfo represents diff line section meta data
 type DiffLineSectionInfo struct {
-	Path          string
-	LastLeftIdx   int
-	LastRightIdx  int
-	LeftIdx       int
-	RightIdx      int
+	Path string
+
+	// Last(Left/Right)Idx do not directly relate to this diff section, but indicate the last line number in the
+	// previous diff section. Set to 0 for the first diff section of a file, and 1 for the first line of code in the
+	// file.
+	LastLeftIdx  int
+	LastRightIdx int
+
+	// (Left/Right)Idx are the first line number in this diff section
+	LeftIdx  int
+	RightIdx int
+
+	// Number of lines contained within each diff section.  In the UI, these fields are set to 0 in cases where a
+	// section is being used as a placeholder at the end of a diff to allow expansion into the remainder of the file.
 	LeftHunkSize  int
 	RightHunkSize int
 }
@@ -157,7 +166,7 @@ func (d *DiffLine) GetExpandDirection() DiffLineExpandDirection {
 	}
 	if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 {
 		return DiffLineExpandUp
-	} else if d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx > BlobExcerptChunkSize && d.SectionInfo.RightHunkSize > 0 {
+	} else if d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx-1 > BlobExcerptChunkSize && d.SectionInfo.RightHunkSize > 0 {
 		return DiffLineExpandUpDown
 	} else if d.SectionInfo.LeftHunkSize <= 0 && d.SectionInfo.RightHunkSize <= 0 {
 		return DiffLineExpandDown
@@ -440,11 +449,29 @@ func getCommitFileLineCount(commit *git.Commit, filePath string) int {
 	if err != nil {
 		return 0
 	}
-	lineCount, err := blob.GetBlobLineCount()
+	reader, err := blob.DataAsync()
 	if err != nil {
 		return 0
 	}
-	return lineCount
+	defer reader.Close()
+	buf := make([]byte, 32*1024)
+	count := 1
+	lineSep := []byte{'\n'}
+
+	c, err := reader.Read(buf)
+	if c == 0 && err == io.EOF {
+		return 0
+	}
+	for {
+		count += bytes.Count(buf[:c], lineSep)
+		switch {
+		case err == io.EOF:
+			return count
+		case err != nil:
+			return count
+		}
+		c, err = reader.Read(buf)
+	}
 }
 
 // Diff represents a difference between two git trees.
@@ -1060,7 +1087,7 @@ func readFileName(rd *strings.Reader) (string, bool) {
 		_, _ = fmt.Fscanf(rd, "%s ", &name)
 		char, _ := rd.ReadByte()
 		_ = rd.UnreadByte()
-		for !(char == 0 || char == '"' || char == 'b') {
+		for char != 0 && char != '"' && char != 'b' {
 			var suffix string
 			_, _ = fmt.Fscanf(rd, "%s ", &suffix)
 			name += " " + suffix
@@ -1088,62 +1115,63 @@ type DiffOptions struct {
 	FileOnly           bool
 }
 
-// GetDiff builds a Diff between two commits of a repository.
+// GetDiffSimple builds a Diff between two commits of a repository.
 // Passing the empty string as beforeCommitID returns a diff from the parent commit.
-// The whitespaceBehavior is either an empty string or a git flag
-func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff, error) {
-	repoPath := gitRepo.Path
-
-	var beforeCommit *git.Commit
-	commit, err := gitRepo.GetCommit(opts.AfterCommitID)
+// The whitespaceBehavior is either an empty string or a git flag.
+func GetDiffSimple(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, files ...string) (diff *Diff, afterCommit *git.Commit, err error) {
+	afterCommit, err = gitRepo.GetCommit(opts.AfterCommitID)
 	if err != nil {
-		return nil, err
+		return nil, nil, fmt.Errorf("unable to get the after commit %q: %w", opts.AfterCommitID, err)
 	}
 
 	cmdCtx, cmdCancel := context.WithCancel(ctx)
 	defer cmdCancel()
 
-	cmdDiff := git.NewCommand(cmdCtx)
+	cmdDiff := git.NewCommand(cmdCtx).
+		AddArguments("diff", "--src-prefix=\\a/", "--dst-prefix=\\b/", "-M").
+		AddArguments(opts.WhitespaceBehavior...)
+
 	objectFormat, err := gitRepo.GetObjectFormat()
 	if err != nil {
-		return nil, err
+		return nil, nil, fmt.Errorf("not able to determine the object format: %w", err)
 	}
 
-	if (len(opts.BeforeCommitID) == 0 || opts.BeforeCommitID == objectFormat.EmptyObjectID().String()) && commit.ParentCount() == 0 {
-		cmdDiff.AddArguments("diff", "--src-prefix=\\a/", "--dst-prefix=\\b/", "-M").
-			AddArguments(opts.WhitespaceBehavior...).
-			AddDynamicArguments(objectFormat.EmptyTree().String()).
-			AddDynamicArguments(opts.AfterCommitID)
+	// If before commit is empty or the empty object and the after commit has no
+	// parents, then use the empty tree as before commit.
+	//
+	// This is the case for a 'initial commit' of a Git tree, which obviously has
+	// no parents.
+	if (len(opts.BeforeCommitID) == 0 || opts.BeforeCommitID == objectFormat.EmptyObjectID().String()) && afterCommit.ParentCount() == 0 {
+		// Reset before commit ID to indicate empty tree was used.
+		opts.BeforeCommitID = ""
+		// Add enpty tree as before commit.
+		cmdDiff.AddDynamicArguments(objectFormat.EmptyTree().String())
 	} else {
-		actualBeforeCommitID := opts.BeforeCommitID
-		if len(actualBeforeCommitID) == 0 {
-			parentCommit, err := commit.Parent(0)
+		// If before commit ID is empty, use the first parent of the after commit.
+		if len(opts.BeforeCommitID) == 0 {
+			parentCommit, err := afterCommit.Parent(0)
 			if err != nil {
-				return nil, err
+				return nil, nil, fmt.Errorf("not able to get first parent of %q: %w", afterCommit.ID.String(), err)
 			}
-			actualBeforeCommitID = parentCommit.ID.String()
+			opts.BeforeCommitID = parentCommit.ID.String()
 		}
 
-		cmdDiff.AddArguments("diff", "--src-prefix=\\a/", "--dst-prefix=\\b/", "-M").
-			AddArguments(opts.WhitespaceBehavior...).
-			AddDynamicArguments(actualBeforeCommitID, opts.AfterCommitID)
-		opts.BeforeCommitID = actualBeforeCommitID
-
-		beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID)
-		if err != nil {
-			return nil, err
-		}
+		cmdDiff.AddDynamicArguments(opts.BeforeCommitID)
 	}
 
+	// Add the after commit to the diff command.
+	cmdDiff.AddDynamicArguments(opts.AfterCommitID)
+
 	// In git 2.31, git diff learned --skip-to which we can use to shortcut skip to file
 	// so if we are using at least this version of git we don't have to tell ParsePatch to do
 	// the skipping for us
 	parsePatchSkipToFile := opts.SkipTo
-	if opts.SkipTo != "" && git.CheckGitVersionAtLeast("2.31") == nil {
+	if opts.SkipTo != "" {
 		cmdDiff.AddOptionFormat("--skip-to=%s", opts.SkipTo)
 		parsePatchSkipToFile = ""
 	}
 
+	// If we only want to diff for some files, add that as well.
 	cmdDiff.AddDashesAndList(files...)
 
 	reader, writer := io.Pipe()
@@ -1153,6 +1181,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 	}()
 
 	go func() {
+		repoPath := gitRepo.Path
 		stderr := &bytes.Buffer{}
 		cmdDiff.SetDescription(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath))
 		if err := cmdDiff.Run(&git.RunOpts{
@@ -1167,14 +1196,33 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 		_ = writer.Close()
 	}()
 
-	diff, err := ParsePatch(cmdCtx, opts.MaxLines, opts.MaxLineCharacters, opts.MaxFiles, reader, parsePatchSkipToFile)
+	diff, err = ParsePatch(cmdCtx, opts.MaxLines, opts.MaxLineCharacters, opts.MaxFiles, reader, parsePatchSkipToFile)
 	// Ensure the git process is killed if it didn't exit already
 	cmdCancel()
 	if err != nil {
-		return nil, fmt.Errorf("unable to ParsePatch: %w", err)
+		return nil, nil, fmt.Errorf("unable to parse a git diff: %w", err)
 	}
 	diff.Start = opts.SkipTo
 
+	return diff, afterCommit, nil
+}
+
+func GetDiffFull(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff, error) {
+	diff, afterCommit, err := GetDiffSimple(ctx, gitRepo, opts, files...)
+	if err != nil {
+		return nil, err
+	}
+
+	// If there's a before commit, then GetDiffSimple will set it, otherwise it
+	// is empty.
+	var beforeCommit *git.Commit
+	if len(opts.BeforeCommitID) != 0 {
+		beforeCommit, err = gitRepo.GetCommit(opts.BeforeCommitID)
+		if err != nil {
+			return nil, fmt.Errorf("unable to get before commit %q: %w", opts.BeforeCommitID, err)
+		}
+	}
+
 	checker, err := gitRepo.GitAttributeChecker(opts.AfterCommitID, git.LinguistAttributes...)
 	if err != nil {
 		return nil, fmt.Errorf("unable to GitAttributeChecker: %w", err)
@@ -1210,7 +1258,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi
 			diffFile.IsGenerated = analyze.IsGenerated(diffFile.Name)
 		}
 
-		tailSection := diffFile.GetTailSection(gitRepo, beforeCommit, commit)
+		tailSection := diffFile.GetTailSection(gitRepo, beforeCommit, afterCommit)
 		if tailSection != nil {
 			diffFile.Sections = append(diffFile.Sections, tailSection)
 		}
@@ -1272,7 +1320,7 @@ func GetPullDiffStats(gitRepo *git.Repository, opts *DiffOptions) (*PullDiffStat
 // SyncAndGetUserSpecificDiff is like GetDiff, except that user specific data such as which files the given user has already viewed on the given PR will also be set
 // Additionally, the database asynchronously is updated if files have changed since the last review
 func SyncAndGetUserSpecificDiff(ctx context.Context, userID int64, pull *issues_model.PullRequest, gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff, error) {
-	diff, err := GetDiff(ctx, gitRepo, opts, files...)
+	diff, err := GetDiffFull(ctx, gitRepo, opts, files...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go
index 532255fe84..d4d1cd4460 100644
--- a/services/gitdiff/gitdiff_test.go
+++ b/services/gitdiff/gitdiff_test.go
@@ -635,7 +635,7 @@ func TestGetDiffRangeWithWhitespaceBehavior(t *testing.T) {
 
 	defer gitRepo.Close()
 	for _, behavior := range []git.TrustedCmdArgs{{"-w"}, {"--ignore-space-at-eol"}, {"-b"}, nil} {
-		diffs, err := GetDiff(db.DefaultContext, gitRepo,
+		diffs, _, err := GetDiffSimple(db.DefaultContext, gitRepo,
 			&DiffOptions{
 				AfterCommitID:      "bd7063cc7c04689c4d082183d32a604ed27a24f9",
 				BeforeCommitID:     "559c156f8e0178b71cb44355428f24001b08fc68",
@@ -651,6 +651,229 @@ func TestGetDiffRangeWithWhitespaceBehavior(t *testing.T) {
 	}
 }
 
+func TestGetDiffFull(t *testing.T) {
+	gitRepo, err := git.OpenRepository(git.DefaultContext, "./../../modules/git/tests/repos/language_stats_repo")
+	require.NoError(t, err)
+
+	defer gitRepo.Close()
+
+	t.Run("Initial commit", func(t *testing.T) {
+		diff, err := GetDiffFull(db.DefaultContext, gitRepo,
+			&DiffOptions{
+				AfterCommitID:     "8fee858da5796dfb37704761701bb8e800ad9ef3",
+				MaxLines:          setting.Git.MaxGitDiffLines,
+				MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
+				MaxFiles:          setting.Git.MaxGitDiffFiles,
+			})
+		require.NoError(t, err)
+
+		assert.Empty(t, diff.Start)
+		assert.Empty(t, diff.End)
+		assert.False(t, diff.IsIncomplete)
+		assert.Equal(t, 5, diff.NumFiles)
+		assert.Equal(t, 23, diff.TotalAddition)
+		assert.Len(t, diff.Files, 5)
+
+		assert.True(t, diff.Files[0].IsVendored)
+		assert.Equal(t, ".gitattributes", diff.Files[0].Name)
+		assert.Equal(t, "24139dae656713ba861751fb2c2ac38839349a7a", diff.Files[0].NameHash)
+
+		assert.Equal(t, "Python", diff.Files[1].Language)
+		assert.Equal(t, "i-am-a-python.p", diff.Files[1].Name)
+		assert.Equal(t, "32154957b043de62cbcdbe254a53ec4c3e00c5a0", diff.Files[1].NameHash)
+
+		assert.Equal(t, "java-hello/main.java", diff.Files[2].Name)
+		assert.Equal(t, "ef9f6a406a4cde7bb5480ba7b027bdc8cd6fa11d", diff.Files[2].NameHash)
+
+		assert.Equal(t, "main.vendor.java", diff.Files[3].Name)
+		assert.Equal(t, "c94fd7272f109d4d21d6df2b637c864a5ab63f46", diff.Files[3].NameHash)
+
+		assert.Equal(t, "python-hello/hello.py", diff.Files[4].Name)
+		assert.Equal(t, "021705ba8b98778dc4e277d3a6ea1b8c6122a7f9", diff.Files[4].NameHash)
+	})
+
+	t.Run("Normal diff", func(t *testing.T) {
+		diff, err := GetDiffFull(db.DefaultContext, gitRepo,
+			&DiffOptions{
+				AfterCommitID:     "341fca5b5ea3de596dc483e54c2db28633cd2f97",
+				BeforeCommitID:    "8fee858da5796dfb37704761701bb8e800ad9ef3",
+				MaxLines:          setting.Git.MaxGitDiffLines,
+				MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
+				MaxFiles:          setting.Git.MaxGitDiffFiles,
+			})
+		require.NoError(t, err)
+
+		assert.Empty(t, diff.Start)
+		assert.Empty(t, diff.End)
+		assert.False(t, diff.IsIncomplete)
+		assert.Equal(t, 1, diff.NumFiles)
+		assert.Equal(t, 1, diff.TotalAddition)
+		assert.Len(t, diff.Files, 1)
+
+		assert.Equal(t, ".gitattributes", diff.Files[0].Name)
+		assert.Equal(t, "24139dae656713ba861751fb2c2ac38839349a7a", diff.Files[0].NameHash)
+		assert.Len(t, diff.Files[0].Sections, 2)
+		assert.Equal(t, 4, diff.Files[0].Sections[1].Lines[0].SectionInfo.LeftIdx)
+	})
+}
+
+func TestDiffLine_GetExpandDirection(t *testing.T) {
+	tests := []struct {
+		name           string
+		diffLine       *DiffLine
+		expectedResult DiffLineExpandDirection
+	}{
+		{
+			name: "non-section line - no expansion",
+			diffLine: &DiffLine{
+				Type:        DiffLineAdd,
+				SectionInfo: &DiffLineSectionInfo{},
+			},
+			expectedResult: DiffLineExpandNone,
+		},
+		{
+			name: "nil section info - no expansion",
+			diffLine: &DiffLine{
+				Type:        DiffLineSection,
+				SectionInfo: nil,
+			},
+			expectedResult: DiffLineExpandNone,
+		},
+		{
+			name: "no lines between",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Previous section of the diff displayed up to line 530...
+					LastRightIdx: 530,
+					LastLeftIdx:  530,
+					// This section of the diff starts at line 531...
+					RightIdx: 531,
+					LeftIdx:  531,
+				},
+			},
+			// There are zero lines between 530 and 531, so we should have nothing to expand.
+			expectedResult: DiffLineExpandNone,
+		},
+		{
+			name: "first diff section is the start of the file",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Last[...]Idx is set to zero when it's the first section in the file (and not 1, which would be
+					// the first section -is- the first line of the file).
+					LastRightIdx: 0,
+					LastLeftIdx:  0,
+					// The diff section is showing line 1, the top of th efile.
+					RightIdx: 1,
+					LeftIdx:  1,
+				},
+			},
+			// We're at the top of the file; no expansion.
+			expectedResult: DiffLineExpandNone,
+		},
+		{
+			name: "first diff section doesn't start at the top of the file",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Last[...]Idx is set to zero when it's the first section in the file (and not 1, which would be
+					// the first section -is- the first line of the file).
+					LastRightIdx: 0,
+					LastLeftIdx:  0,
+					RightIdx:     531,
+					LeftIdx:      531,
+				},
+			},
+			// We're at the top of the diff but there's content above, so can only expand up.
+			expectedResult: DiffLineExpandUp,
+		},
+		{
+			name: "middle of the file with single expansion",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Previous section ended at ~500...
+					LastRightIdx: 500,
+					LastLeftIdx:  500,
+					// Next section starts one line away...
+					RightIdx: 502,
+					LeftIdx:  502,
+					// The next block has content (> 0)
+					RightHunkSize: 50,
+					LeftHunkSize:  50,
+				},
+			},
+			// Can be expanded in a single direction, displaying the missing line (501).
+			expectedResult: DiffLineExpandSingle,
+		},
+		{
+			name: "middle of the file with multi line expansion",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Previous section ended at ~500...
+					LastRightIdx: 500,
+					LastLeftIdx:  500,
+					// Lines 501-520 are hidden, exactly 20 lines, matching BlobExcerptChunkSize (20)...
+					RightIdx: 521,
+					LeftIdx:  521,
+					// The next block has content (> 0)
+					RightHunkSize: 50,
+					LeftHunkSize:  50,
+				},
+			},
+			// Can be expanded in a single direction, displaying all the hidden 20 lines.
+			expectedResult: DiffLineExpandSingle,
+		},
+		{
+			name: "middle of the file with multi direction expansion",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// Previous section ended at ~500...
+					LastRightIdx: 500,
+					LastLeftIdx:  500,
+					// Lines 501-521 are hidden, exactly 21 lines, exceeding BlobExcerptChunkSize (20)...
+					RightIdx: 522,
+					LeftIdx:  522,
+					// The next block has content (> 0)
+					RightHunkSize: 50,
+					LeftHunkSize:  50,
+				},
+			},
+			// Now can be expanded down to display from 501-520 (521 remains hidden), or up to display 502-521 (501
+			// remains hidden).
+			expectedResult: DiffLineExpandUpDown,
+		},
+		{
+			name: "end of the diff but still file content to display",
+			diffLine: &DiffLine{
+				Type: DiffLineSection,
+				SectionInfo: &DiffLineSectionInfo{
+					// We had a previous diff section, of any size/location...
+					LastRightIdx: 200,
+					LastLeftIdx:  200,
+					RightIdx:     531,
+					LeftIdx:      531,
+					// Hunk size size 0 is a placeholder value for the end or beginning of a file...
+					RightHunkSize: 0,
+					LeftHunkSize:  0,
+				},
+			},
+			// Combination of conditions says we're at the end of the last diff section, can only expand down.
+			expectedResult: DiffLineExpandDown,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := tt.diffLine.GetExpandDirection()
+			assert.Equal(t, tt.expectedResult, result)
+		})
+	}
+}
+
 func TestNoCrashes(t *testing.T) {
 	type testcase struct {
 		gitdiff string
diff --git a/services/gitdiff/highlightdiff.go b/services/gitdiff/highlightdiff.go
index 08681b8617..61d52d91e6 100644
--- a/services/gitdiff/highlightdiff.go
+++ b/services/gitdiff/highlightdiff.go
@@ -14,13 +14,14 @@ import (
 // token is a html tag or entity, eg: "<span ...>", "</span>", "&lt;"
 func extractHTMLToken(s string) (before, token, after string, valid bool) {
 	for pos1 := 0; pos1 < len(s); pos1++ {
-		if s[pos1] == '<' {
+		switch s[pos1] {
+		case '<':
 			pos2 := strings.IndexByte(s[pos1:], '>')
 			if pos2 == -1 {
 				return "", "", s, false
 			}
 			return s[:pos1], s[pos1 : pos1+pos2+1], s[pos1+pos2+1:], true
-		} else if s[pos1] == '&' {
+		case '&':
 			pos2 := strings.IndexByte(s[pos1:], ';')
 			if pos2 == -1 {
 				return "", "", s, false
diff --git a/services/gitdiff/highlightdiff_test.go b/services/gitdiff/highlightdiff_test.go
index 2ff4472bcc..0070173b9f 100644
--- a/services/gitdiff/highlightdiff_test.go
+++ b/services/gitdiff/highlightdiff_test.go
@@ -43,7 +43,7 @@ func TestDiffWithHighlight(t *testing.T) {
 
 	diff.Text = "C"
 	hcd.recoverOneDiff(&diff)
-	assert.Equal(t, "", diff.Text)
+	assert.Empty(t, diff.Text)
 }
 
 func TestDiffWithHighlightPlaceholder(t *testing.T) {
@@ -53,8 +53,8 @@ func TestDiffWithHighlightPlaceholder(t *testing.T) {
 		"a='\U00100000'",
 		"a='\U0010FFFD''",
 	)
-	assert.Equal(t, "", hcd.PlaceholderTokenMap[0x00100000])
-	assert.Equal(t, "", hcd.PlaceholderTokenMap[0x0010FFFD])
+	assert.Empty(t, hcd.PlaceholderTokenMap[0x00100000])
+	assert.Empty(t, hcd.PlaceholderTokenMap[0x0010FFFD])
 
 	expected := fmt.Sprintf(`<span class="nx">a</span><span class="o">=</span><span class="s1">&#39;</span><span class="removed-code">%s</span>&#39;`, "\U00100000")
 	output := diffToHTML(hcd.lineWrapperTags, diffs, DiffLineDel)
diff --git a/services/issue/comments.go b/services/issue/comments.go
index dedef6cc87..2cac900d41 100644
--- a/services/issue/comments.go
+++ b/services/issue/comments.go
@@ -5,6 +5,7 @@ package issue
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"forgejo.org/models/db"
@@ -18,7 +19,7 @@ import (
 // CreateRefComment creates a commit reference comment to issue.
 func CreateRefComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, issue *issues_model.Issue, content, commitSHA string) error {
 	if len(commitSHA) == 0 {
-		return fmt.Errorf("cannot create reference with empty commit SHA")
+		return errors.New("cannot create reference with empty commit SHA")
 	}
 
 	// Check if same reference from same commit has already existed.
@@ -119,7 +120,28 @@ func UpdateComment(ctx context.Context, c *issues_model.Comment, contentVersion
 // DeleteComment deletes the comment
 func DeleteComment(ctx context.Context, doer *user_model.User, comment *issues_model.Comment) error {
 	err := db.WithTx(ctx, func(ctx context.Context) error {
-		return issues_model.DeleteComment(ctx, comment)
+		reviewID := comment.ReviewID
+
+		err := issues_model.DeleteComment(ctx, comment)
+		if err != nil {
+			return err
+		}
+
+		if comment.Review != nil {
+			reviewType := comment.Review.Type
+			if reviewType == issues_model.ReviewTypePending {
+				found, err := db.GetEngine(ctx).Table("comment").Where("review_id = ?", reviewID).Exist()
+				if err != nil {
+					return err
+				} else if !found {
+					_, err := db.GetEngine(ctx).Table("review").Where("id = ?", reviewID).Delete()
+					if err != nil {
+						return err
+					}
+				}
+			}
+		}
+		return nil
 	})
 	if err != nil {
 		return err
diff --git a/services/issue/comments_test.go b/services/issue/comments_test.go
index 728af15529..fcf06d9ec8 100644
--- a/services/issue/comments_test.go
+++ b/services/issue/comments_test.go
@@ -8,9 +8,11 @@ import (
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
+	"forgejo.org/models/moderation"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	webhook_model "forgejo.org/models/webhook"
+	"forgejo.org/modules/json"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	issue_service "forgejo.org/services/issue"
@@ -48,9 +50,9 @@ func TestDeleteComment(t *testing.T) {
 		// Reactions don't exist anymore for this comment.
 		unittest.AssertNotExistsBean(t, &issues_model.Reaction{CommentID: comment.ID})
 		// Number of comments was decreased.
-		assert.EqualValues(t, issue.NumComments-1, unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).NumComments)
+		assert.Equal(t, issue.NumComments-1, unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).NumComments)
 		// A notification was fired for the deletion of this comment.
-		assert.EqualValues(t, hookTaskCount+1, unittest.GetCount(t, &webhook_model.HookTask{}))
+		assert.Equal(t, hookTaskCount+1, unittest.GetCount(t, &webhook_model.HookTask{}))
 	})
 
 	t.Run("Comment of pending review", func(t *testing.T) {
@@ -59,7 +61,7 @@ func TestDeleteComment(t *testing.T) {
 		// We have to ensure that this comment's linked review is pending.
 		comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 4}, "review_id != 0")
 		review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: comment.ReviewID})
-		assert.EqualValues(t, issues_model.ReviewTypePending, review.Type)
+		assert.Equal(t, issues_model.ReviewTypePending, review.Type)
 		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
 
 		require.NoError(t, webhook_model.CreateWebhook(db.DefaultContext, &webhook_model.Webhook{
@@ -69,14 +71,17 @@ func TestDeleteComment(t *testing.T) {
 		}))
 		hookTaskCount := unittest.GetCount(t, &webhook_model.HookTask{})
 
+		require.NoError(t, comment.LoadReview(t.Context()))
 		require.NoError(t, issue_service.DeleteComment(db.DefaultContext, nil, comment))
 
 		// The comment doesn't exist anymore.
 		unittest.AssertNotExistsBean(t, &issues_model.Comment{ID: comment.ID})
 		// Ensure that the number of comments wasn't decreased.
-		assert.EqualValues(t, issue.NumComments, unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).NumComments)
+		assert.Equal(t, issue.NumComments, unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID}).NumComments)
 		// No notification was fired for the deletion of this comment.
-		assert.EqualValues(t, hookTaskCount, unittest.GetCount(t, &webhook_model.HookTask{}))
+		assert.Equal(t, hookTaskCount, unittest.GetCount(t, &webhook_model.HookTask{}))
+		// The review doesn't exist anymore.
+		unittest.AssertNotExistsBean(t, &issues_model.Review{ID: comment.ReviewID})
 	})
 }
 
@@ -105,11 +110,11 @@ func TestUpdateComment(t *testing.T) {
 
 		newComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2})
 		// Content was updated.
-		assert.EqualValues(t, comment.Content, newComment.Content)
+		assert.Equal(t, comment.Content, newComment.Content)
 		// Content version was updated.
-		assert.EqualValues(t, 2, newComment.ContentVersion)
+		assert.Equal(t, 2, newComment.ContentVersion)
 		// A notification was fired for the update of this comment.
-		assert.EqualValues(t, hookTaskCount+1, unittest.GetCount(t, &webhook_model.HookTask{}))
+		assert.Equal(t, hookTaskCount+1, unittest.GetCount(t, &webhook_model.HookTask{}))
 		// Issue history was saved for this comment.
 		unittest.AssertExistsAndLoadBean(t, &issues_model.ContentHistory{CommentID: comment.ID, IsFirstCreated: true, ContentText: oldContent})
 		unittest.AssertExistsAndLoadBean(t, &issues_model.ContentHistory{CommentID: comment.ID, ContentText: comment.Content}, "is_first_created = false")
@@ -120,7 +125,7 @@ func TestUpdateComment(t *testing.T) {
 
 		comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 4}, "review_id != 0")
 		review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: comment.ReviewID})
-		assert.EqualValues(t, issues_model.ReviewTypePending, review.Type)
+		assert.Equal(t, issues_model.ReviewTypePending, review.Type)
 		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: comment.IssueID})
 		unittest.AssertNotExistsBean(t, &issues_model.ContentHistory{CommentID: comment.ID})
 		require.NoError(t, webhook_model.CreateWebhook(db.DefaultContext, &webhook_model.Webhook{
@@ -136,12 +141,49 @@ func TestUpdateComment(t *testing.T) {
 
 		newComment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2})
 		// Content was updated.
-		assert.EqualValues(t, comment.Content, newComment.Content)
+		assert.Equal(t, comment.Content, newComment.Content)
 		// Content version was updated.
-		assert.EqualValues(t, 2, newComment.ContentVersion)
+		assert.Equal(t, 2, newComment.ContentVersion)
 		// No notification was fired for the update of this comment.
-		assert.EqualValues(t, hookTaskCount, unittest.GetCount(t, &webhook_model.HookTask{}))
+		assert.Equal(t, hookTaskCount, unittest.GetCount(t, &webhook_model.HookTask{}))
 		// Issue history was not saved for this comment.
 		unittest.AssertNotExistsBean(t, &issues_model.ContentHistory{CommentID: comment.ID})
 	})
 }
+
+func TestCreateShadowCopyOnCommentUpdate(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/ModerationFeatures")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	userAlexSmithID := int64(1002)
+	spamCommentID := int64(18) // posted by @alexsmith
+	abuseReportID := int64(1)  // submitted for above comment
+	newCommentContent := "If anyone needs help, just contact me."
+
+	// Retrieve the abusive user (@alexsmith), their SPAM comment and the abuse report already created for this comment.
+	poster := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userAlexSmithID})
+	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: spamCommentID, PosterID: poster.ID})
+	report := unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReport{
+		ID:          abuseReportID,
+		ContentType: moderation.ReportedContentTypeComment,
+		ContentID:   comment.ID,
+	})
+	// The report should not already have a shadow copy linked.
+	assert.False(t, report.ShadowCopyID.Valid)
+
+	// The abusive user is updating their comment.
+	oldContent := comment.Content
+	comment.Content = newCommentContent
+	require.NoError(t, issue_service.UpdateComment(t.Context(), comment, 0, poster, oldContent))
+
+	// Reload the report.
+	report = unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReport{ID: report.ID})
+	// A shadow copy should have been created and linked to our report.
+	assert.True(t, report.ShadowCopyID.Valid)
+	// Retrieve the newly created shadow copy and unmarshal the stored JSON so that we can check the values.
+	shadowCopy := unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReportShadowCopy{ID: report.ShadowCopyID.Int64})
+	shadowCopyCommentData := new(issues_model.CommentData)
+	require.NoError(t, json.Unmarshal([]byte(shadowCopy.RawValue), &shadowCopyCommentData))
+	// Check to see if the initial content of the comment was stored within the shadow copy.
+	assert.Equal(t, oldContent, shadowCopyCommentData.Content)
+}
diff --git a/services/issue/issue.go b/services/issue/issue.go
index f6a3e90b10..7071a912b0 100644
--- a/services/issue/issue.go
+++ b/services/issue/issue.go
@@ -1,10 +1,12 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package issue
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
@@ -59,7 +61,6 @@ func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *issues_mo
 // ChangeTitle changes the title of this issue, as the given user.
 func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_model.User, title string) error {
 	oldTitle := issue.Title
-	issue.Title = title
 
 	if oldTitle == title {
 		return nil
@@ -73,6 +74,12 @@ func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_mode
 		return user_model.ErrBlockedByUser
 	}
 
+	// If the issue was reported as abusive, a shadow copy should be created before first update.
+	if err := issues_model.IfNeededCreateShadowCopyForIssue(ctx, issue); err != nil {
+		return err
+	}
+
+	issue.Title = title
 	if err := issues_model.ChangeIssueTitle(ctx, issue, doer, oldTitle); err != nil {
 		return err
 	}
@@ -252,6 +259,12 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) error {
 	defer committer.Close()
 
 	e := db.GetEngine(ctx)
+
+	// If the issue was reported as abusive, a shadow copy should be created before deletion.
+	if err := issues_model.IfNeededCreateShadowCopyForIssue(ctx, issue); err != nil {
+		return err
+	}
+
 	if _, err := e.ID(issue.ID).NoAutoCondition().Delete(issue); err != nil {
 		return err
 	}
@@ -333,13 +346,13 @@ func SetIssueUpdateDate(ctx context.Context, issue *issues_model.Issue, updated
 		return err
 	}
 	if !perm.IsAdmin() && !perm.IsOwner() {
-		return fmt.Errorf("user needs to have admin or owner right")
+		return errors.New("user needs to have admin or owner right")
 	}
 
 	// A simple guard against potential inconsistent calls
 	updatedUnix := timeutil.TimeStamp(updated.Unix())
 	if updatedUnix < issue.CreatedUnix || updatedUnix > timeutil.TimeStampNow() {
-		return fmt.Errorf("unallowed update date")
+		return errors.New("unallowed update date")
 	}
 
 	issue.UpdatedUnix = updatedUnix
diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go
index e15a0118ad..fb2b2870bd 100644
--- a/services/issue/issue_test.go
+++ b/services/issue/issue_test.go
@@ -25,8 +25,8 @@ func TestGetRefEndNamesAndURLs(t *testing.T) {
 	repoLink := "/foo/bar"
 
 	endNames, urls := GetRefEndNamesAndURLs(issues, repoLink)
-	assert.EqualValues(t, map[int64]string{1: "branch1", 2: "tag1", 3: "c0ffee"}, endNames)
-	assert.EqualValues(t, map[int64]string{
+	assert.Equal(t, map[int64]string{1: "branch1", 2: "tag1", 3: "c0ffee"}, endNames)
+	assert.Equal(t, map[int64]string{
 		1: repoLink + "/src/branch/branch1",
 		2: repoLink + "/src/tag/tag1",
 		3: repoLink + "/src/commit/c0ffee",
diff --git a/services/issue/label.go b/services/issue/label.go
index bcac54272a..f18dd67a19 100644
--- a/services/issue/label.go
+++ b/services/issue/label.go
@@ -8,7 +8,6 @@ import (
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
-	access_model "forgejo.org/models/perm/access"
 	user_model "forgejo.org/models/user"
 	notify_service "forgejo.org/services/notify"
 )
@@ -56,17 +55,6 @@ func RemoveLabel(ctx context.Context, issue *issues_model.Issue, doer *user_mode
 		return err
 	}
 
-	perm, err := access_model.GetUserRepoPermission(dbCtx, issue.Repo, doer)
-	if err != nil {
-		return err
-	}
-	if !perm.CanWriteIssuesOrPulls(issue.IsPull) {
-		if label.OrgID > 0 {
-			return issues_model.ErrOrgLabelNotExist{}
-		}
-		return issues_model.ErrRepoLabelNotExist{}
-	}
-
 	if err := issues_model.DeleteIssueLabel(dbCtx, issue, label, doer); err != nil {
 		return err
 	}
diff --git a/services/issue/milestone.go b/services/issue/milestone.go
index 3fa7083812..a561bf8eee 100644
--- a/services/issue/milestone.go
+++ b/services/issue/milestone.go
@@ -5,6 +5,7 @@ package issue
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"forgejo.org/models/db"
@@ -47,7 +48,7 @@ func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *is
 			return fmt.Errorf("HasMilestoneByRepoID: %w", err)
 		}
 		if !has {
-			return fmt.Errorf("HasMilestoneByRepoID: issue doesn't exist")
+			return errors.New("HasMilestoneByRepoID: issue doesn't exist")
 		}
 	}
 
diff --git a/services/issue/pull.go b/services/issue/pull.go
index b0a0c47d88..6245344ccb 100644
--- a/services/issue/pull.go
+++ b/services/issue/pull.go
@@ -43,8 +43,6 @@ type ReviewRequestNotifier struct {
 }
 
 func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue, pr *issues_model.PullRequest) ([]*ReviewRequestNotifier, error) {
-	files := []string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS"}
-
 	if pr.IsWorkInProgress(ctx) {
 		return nil, nil
 	}
@@ -72,18 +70,17 @@ func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue,
 		return nil, err
 	}
 
-	var data string
-	for _, file := range files {
+	var rules []*issues_model.CodeOwnerRule
+	for _, file := range []string{"CODEOWNERS", "docs/CODEOWNERS", ".gitea/CODEOWNERS", ".forgejo/CODEOWNERS"} {
 		if blob, err := commit.GetBlobByPath(file); err == nil {
-			data, err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize)
+			rc, size, err := blob.NewTruncatedReader(setting.UI.MaxDisplayFileSize)
 			if err == nil {
+				rules, _ = issues_model.GetCodeOwnersFromReader(ctx, rc, size > setting.UI.MaxDisplayFileSize)
 				break
 			}
 		}
 	}
 
-	rules, _ := issues_model.GetCodeOwnersFromContent(ctx, data)
-
 	// get the mergebase
 	mergeBase, err := getMergeBase(repo, pr, git.BranchPrefix+pr.BaseBranch, pr.GetGitRefName())
 	if err != nil {
diff --git a/services/lfs/server.go b/services/lfs/server.go
index 8eef62eabe..17e6d0eec7 100644
--- a/services/lfs/server.go
+++ b/services/lfs/server.go
@@ -163,11 +163,12 @@ func BatchHandler(ctx *context.Context) {
 	}
 
 	var isUpload bool
-	if br.Operation == "upload" {
+	switch br.Operation {
+	case "upload":
 		isUpload = true
-	} else if br.Operation == "download" {
+	case "download":
 		isUpload = false
-	} else {
+	default:
 		log.Trace("Attempt to BATCH with invalid operation: %s", br.Operation)
 		writeStatus(ctx, http.StatusBadRequest)
 		return
@@ -594,15 +595,15 @@ func handleLFSToken(ctx stdCtx.Context, tokenSHA string, target *repo_model.Repo
 
 	claims, claimsOk := token.Claims.(*Claims)
 	if !token.Valid || !claimsOk {
-		return nil, fmt.Errorf("invalid token claim")
+		return nil, errors.New("invalid token claim")
 	}
 
 	if claims.RepoID != target.ID {
-		return nil, fmt.Errorf("invalid token claim")
+		return nil, errors.New("invalid token claim")
 	}
 
 	if mode == perm.AccessModeWrite && claims.Op != "upload" {
-		return nil, fmt.Errorf("invalid token claim")
+		return nil, errors.New("invalid token claim")
 	}
 
 	u, err := user_model.GetUserByID(ctx, claims.UserID)
@@ -615,12 +616,12 @@ func handleLFSToken(ctx stdCtx.Context, tokenSHA string, target *repo_model.Repo
 
 func parseToken(ctx stdCtx.Context, authorization string, target *repo_model.Repository, mode perm.AccessMode) (*user_model.User, error) {
 	if authorization == "" {
-		return nil, fmt.Errorf("no token")
+		return nil, errors.New("no token")
 	}
 
 	parts := strings.SplitN(authorization, " ", 2)
 	if len(parts) != 2 {
-		return nil, fmt.Errorf("no token")
+		return nil, errors.New("no token")
 	}
 	tokenSHA := parts[1]
 	switch strings.ToLower(parts[0]) {
@@ -629,7 +630,7 @@ func parseToken(ctx stdCtx.Context, authorization string, target *repo_model.Rep
 	case "token":
 		return handleLFSToken(ctx, tokenSHA, target, mode)
 	}
-	return nil, fmt.Errorf("token not found")
+	return nil, errors.New("token not found")
 }
 
 func requireAuth(ctx *context.Context) {
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index 4269686f2d..410fdf6894 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -685,19 +685,14 @@ func SendRemovedSecurityKey(ctx context.Context, u *user_model.User, securityKey
 	}
 	locale := translation.NewLocale(u.Language)
 
-	hasWebAuthn, err := auth_model.HasWebAuthnRegistrationsByUID(ctx, u.ID)
-	if err != nil {
-		return err
-	}
-	hasTOTP, err := auth_model.HasTOTPByUID(ctx, u.ID)
+	hasTwoFactor, err := auth_model.HasTwoFactorByUID(ctx, u.ID)
 	if err != nil {
 		return err
 	}
 
 	data := map[string]any{
 		"locale":          locale,
-		"HasWebAuthn":     hasWebAuthn,
-		"HasTOTP":         hasTOTP,
+		"HasTwoFactor":    hasTwoFactor,
 		"SecurityKeyName": securityKeyName,
 		"DisplayName":     u.DisplayName(),
 		"Username":        u.Name,
diff --git a/services/mailer/mail_actions.go b/services/mailer/mail_actions.go
new file mode 100644
index 0000000000..a99af823b3
--- /dev/null
+++ b/services/mailer/mail_actions.go
@@ -0,0 +1,87 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+package mailer
+
+import (
+	"bytes"
+
+	actions_model "forgejo.org/models/actions"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/base"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/translation"
+)
+
+const (
+	tplActionNowDone base.TplName = "actions/now_done"
+)
+
+var MailActionRun = mailActionRun // make it mockable
+func mailActionRun(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error {
+	if setting.MailService == nil {
+		// No mail service configured
+		return nil
+	}
+
+	if !run.NotifyEmail {
+		return nil
+	}
+
+	user := run.TriggerUser
+	// this happens e.g. when this is a scheduled run
+	if user.IsSystem() {
+		user = run.Repo.Owner
+	}
+	if user.IsSystem() || user.Email == "" {
+		return nil
+	}
+
+	if user.EmailNotificationsPreference == user_model.EmailNotificationsDisabled {
+		return nil
+	}
+
+	return sendMailActionRun(user, run, priorStatus, lastRun)
+}
+
+func sendMailActionRun(to *user_model.User, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error {
+	var (
+		locale  = translation.NewLocale(to.Language)
+		content bytes.Buffer
+	)
+
+	var subject string
+	if run.Status.IsSuccess() {
+		subject = locale.TrString("mail.actions.successful_run_after_failure_subject", run.Title, run.Repo.FullName())
+	} else {
+		subject = locale.TrString("mail.actions.not_successful_run", run.Title, run.Repo.FullName())
+	}
+
+	commitSHA := run.CommitSHA
+	if len(commitSHA) > 7 {
+		commitSHA = commitSHA[:7]
+	}
+
+	data := map[string]any{
+		"locale":          locale,
+		"Link":            run.HTMLURL(),
+		"Subject":         subject,
+		"Language":        locale.Language(),
+		"RepoFullName":    run.Repo.FullName(),
+		"Run":             run,
+		"TriggerUserLink": run.TriggerUser.HTMLURL(),
+		"LastRun":         lastRun,
+		"PriorStatus":     priorStatus,
+		"CommitSHA":       commitSHA,
+		"IsSuccess":       run.Status.IsSuccess(),
+	}
+
+	if err := bodyTemplates.ExecuteTemplate(&content, string(tplActionNowDone), data); err != nil {
+		return err
+	}
+
+	msg := NewMessage(to.EmailTo(), subject, content.String())
+	msg.Info = subject
+	SendAsync(msg)
+
+	return nil
+}
diff --git a/services/mailer/mail_actions_now_done_test.go b/services/mailer/mail_actions_now_done_test.go
new file mode 100644
index 0000000000..e84441f460
--- /dev/null
+++ b/services/mailer/mail_actions_now_done_test.go
@@ -0,0 +1,325 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package mailer
+
+import (
+	"slices"
+	"testing"
+
+	actions_model "forgejo.org/models/actions"
+	"forgejo.org/models/db"
+	organization_model "forgejo.org/models/organization"
+	repo_model "forgejo.org/models/repo"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/optional"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	notify_service "forgejo.org/services/notify"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func getActionsNowDoneTestUser(t *testing.T, name, email, notifications string) *user_model.User {
+	t.Helper()
+	user := new(user_model.User)
+	user.Name = name
+	user.Language = "en_US"
+	user.IsAdmin = false
+	user.Email = email
+	user.LastLoginUnix = 1693648327
+	user.CreatedUnix = 1693648027
+	opts := user_model.CreateUserOverwriteOptions{
+		AllowCreateOrganization:      optional.Some(true),
+		EmailNotificationsPreference: &notifications,
+	}
+	require.NoError(t, user_model.AdminCreateUser(db.DefaultContext, user, &opts))
+	return user
+}
+
+func getActionsNowDoneTestOrg(t *testing.T, name, email string, owner *user_model.User) *user_model.User {
+	t.Helper()
+	org := new(organization_model.Organization)
+	org.Name = name
+	org.Language = "en_US"
+	org.IsAdmin = false
+	// contact email for the organization, for display purposes but otherwise not used as of v12
+	org.Email = email
+	org.LastLoginUnix = 1693648327
+	org.CreatedUnix = 1693648027
+	org.Email = email
+	require.NoError(t, organization_model.CreateOrganization(db.DefaultContext, org, owner))
+	return (*user_model.User)(org)
+}
+
+func assertTranslatedLocaleMailActionsNowDone(t *testing.T, msgBody string) {
+	AssertTranslatedLocale(t, msgBody, "mail.actions.successful_run_after_failure", "mail.actions.not_successful_run", "mail.actions.run_info_cur_status", "mail.actions.run_info_sha", "mail.actions.run_info_previous_status", "mail.actions.run_info_trigger", "mail.view_it_on")
+}
+
+func TestActionRunNowDoneStatusMatrix(t *testing.T) {
+	successStatuses := []actions_model.Status{
+		actions_model.StatusSuccess,
+		actions_model.StatusSkipped,
+		actions_model.StatusCancelled,
+	}
+	failureStatuses := []actions_model.Status{
+		actions_model.StatusFailure,
+	}
+
+	for _, testCase := range []struct {
+		name         string
+		statuses     []actions_model.Status
+		hasLastRun   bool
+		lastStatuses []actions_model.Status
+		run          bool
+	}{
+		{
+			name:     "FailureNoLastRun",
+			statuses: failureStatuses,
+			run:      true,
+		},
+		{
+			name:     "SuccessNoLastRun",
+			statuses: successStatuses,
+			run:      false,
+		},
+		{
+			name:         "FailureLastRunSuccess",
+			statuses:     failureStatuses,
+			hasLastRun:   true,
+			lastStatuses: successStatuses,
+			run:          true,
+		},
+		{
+			name:         "FailureLastRunFailure",
+			statuses:     failureStatuses,
+			hasLastRun:   true,
+			lastStatuses: failureStatuses,
+			run:          true,
+		},
+		{
+			name:         "SuccessLastRunFailure",
+			statuses:     successStatuses,
+			hasLastRun:   true,
+			lastStatuses: failureStatuses,
+			run:          true,
+		},
+		{
+			name:         "SuccessLastRunSuccess",
+			statuses:     successStatuses,
+			hasLastRun:   true,
+			lastStatuses: successStatuses,
+			run:          false,
+		},
+	} {
+		t.Run(testCase.name, func(t *testing.T) {
+			var called bool
+			defer test.MockVariableValue(&MailActionRun, func(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error {
+				called = true
+				return nil
+			})()
+			for _, status := range testCase.statuses {
+				for _, lastStatus := range testCase.lastStatuses {
+					called = false
+					n := NewNotifier()
+					var lastRun *actions_model.ActionRun
+					if testCase.hasLastRun {
+						lastRun = &actions_model.ActionRun{
+							Status: lastStatus,
+						}
+					}
+					n.ActionRunNowDone(t.Context(),
+						&actions_model.ActionRun{
+							Status: status,
+						},
+						actions_model.StatusUnknown,
+						lastRun)
+					assert.Equal(t, testCase.run, called, "status = %s, lastStatus = %s", status, lastStatus)
+				}
+			}
+		})
+	}
+}
+
+func TestActionRunNowDoneNotificationMail(t *testing.T) {
+	ctx := t.Context()
+
+	defer test.MockVariableValue(&setting.Admin.DisableRegularOrgCreation, false)()
+
+	actionsUser := user_model.NewActionsUser()
+	require.NotEmpty(t, actionsUser.Email)
+
+	repo := repo_model.Repository{
+		Name:        "some repo",
+		Description: "rockets are cool",
+	}
+
+	// Do some funky stuff with the action run's ids:
+	// The run with the larger ID finished first.
+	// This is odd but something that must work.
+	run1 := &actions_model.ActionRun{ID: 2, Repo: &repo, RepoID: repo.ID, Title: "some workflow", Status: actions_model.StatusFailure, Stopped: 1745821796, TriggerEvent: "workflow_dispatch"}
+	run2 := &actions_model.ActionRun{ID: 1, Repo: &repo, RepoID: repo.ID, Title: "some workflow", Status: actions_model.StatusSuccess, Stopped: 1745822796, TriggerEvent: "push"}
+
+	assignUsers := func(triggerUser, owner *user_model.User) {
+		for _, run := range []*actions_model.ActionRun{run1, run2} {
+			run.TriggerUser = triggerUser
+			run.TriggerUserID = triggerUser.ID
+			run.NotifyEmail = true
+		}
+		repo.Owner = owner
+		repo.OwnerID = owner.ID
+	}
+
+	notify_service.RegisterNotifier(NewNotifier())
+
+	orgOwner := getActionsNowDoneTestUser(t, "org_owner", "org_owner@example.com", "disabled")
+	defer CleanUpUsers(ctx, []*user_model.User{orgOwner})
+
+	t.Run("DontSendNotificationEmailOnFirstActionSuccess", func(t *testing.T) {
+		user := getActionsNowDoneTestUser(t, "new_user", "new_user@example.com", "enabled")
+		defer CleanUpUsers(ctx, []*user_model.User{user})
+		assignUsers(user, user)
+		defer MockMailSettings(func(msgs ...*Message) {
+			assert.Fail(t, "no mail should be sent")
+		})()
+		notify_service.ActionRunNowDone(ctx, run2, actions_model.StatusRunning, nil)
+	})
+
+	t.Run("WorkflowEnableEmailNotificationIsFalse", func(t *testing.T) {
+		user := getActionsNowDoneTestUser(t, "new_user1", "new_user1@example.com", "enabled")
+		defer CleanUpUsers(ctx, []*user_model.User{user})
+		assignUsers(user, user)
+		defer MockMailSettings(func(msgs ...*Message) {
+			assert.Fail(t, "no mail should be sent")
+		})()
+		run2.NotifyEmail = false
+		notify_service.ActionRunNowDone(ctx, run2, actions_model.StatusRunning, nil)
+	})
+
+	for _, testCase := range []struct {
+		name        string
+		triggerUser *user_model.User
+		owner       *user_model.User
+		expected    string
+		expectMail  bool
+	}{
+		{
+			// if the action is assigned a trigger user in a repository
+			// owned by a regular user, the mail is sent to the trigger user
+			name:        "RegularTriggerUser",
+			triggerUser: getActionsNowDoneTestUser(t, "new_trigger_user0", "new_trigger_user0@example.com", user_model.EmailNotificationsEnabled),
+			owner:       getActionsNowDoneTestUser(t, "new_owner0", "new_owner0@example.com", user_model.EmailNotificationsEnabled),
+			expected:    "trigger",
+			expectMail:  true,
+		},
+		{
+			// if the action is assigned to a system user (e.g. ActionsUser)
+			// in a repository owned by a regular user, the mail is sent to
+			// the user that owns the repository
+			name:        "SystemTriggerUserAndRegularOwner",
+			triggerUser: actionsUser,
+			owner:       getActionsNowDoneTestUser(t, "new_owner1", "new_owner1@example.com", user_model.EmailNotificationsEnabled),
+			expected:    "owner",
+			expectMail:  true,
+		},
+		{
+			// if the action is assigned a trigger user with disabled notifications in a repository
+			// owned by a regular user, no mail is sent
+			name:        "RegularTriggerUserNotificationsDisabled",
+			triggerUser: getActionsNowDoneTestUser(t, "new_trigger_user2", "new_trigger_user2@example.com", user_model.EmailNotificationsDisabled),
+			owner:       getActionsNowDoneTestUser(t, "new_owner2", "new_owner2@example.com", user_model.EmailNotificationsEnabled),
+			expectMail:  false,
+		},
+		{
+			// if the action is assigned to a system user (e.g. ActionsUser)
+			// owned by a regular user with disabled notifications, no mail is sent
+			name:        "SystemTriggerUserAndRegularOwnerNotificationsDisabled",
+			triggerUser: actionsUser,
+			owner:       getActionsNowDoneTestUser(t, "new_owner3", "new_owner3@example.com", user_model.EmailNotificationsDisabled),
+			expectMail:  false,
+		},
+		{
+			// if the action is assigned to a system user (e.g. ActionsUser)
+			// in a repository owned by an organization with an email contact, the mail is sent to
+			// this email contact
+			name:        "SystemTriggerUserAndOrgOwner",
+			triggerUser: actionsUser,
+			owner:       getActionsNowDoneTestOrg(t, "new_org1", "new_org_owner0@example.com", orgOwner),
+			expected:    "owner",
+			expectMail:  true,
+		},
+		{
+			// if the action is assigned to a system user (e.g. ActionsUser)
+			// in a repository owned by an organization without an email contact, no mail is sent
+			name:        "SystemTriggerUserAndNoMailOrgOwner",
+			triggerUser: actionsUser,
+			owner:       getActionsNowDoneTestOrg(t, "new_org2", "", orgOwner),
+			expectMail:  false,
+		},
+	} {
+		t.Run(testCase.name, func(t *testing.T) {
+			assignUsers(testCase.triggerUser, testCase.owner)
+			defer CleanUpUsers(ctx, slices.DeleteFunc([]*user_model.User{testCase.triggerUser, testCase.owner}, func(user *user_model.User) bool {
+				return user.IsSystem()
+			}))
+
+			t.Run("SendNotificationEmailOnActionRunFailed", func(t *testing.T) {
+				mailSent := false
+				defer MockMailSettings(func(msgs ...*Message) {
+					assert.Len(t, msgs, 1)
+					msg := msgs[0]
+					assert.False(t, mailSent, "sent mail twice")
+					expectedEmail := testCase.triggerUser.Email
+					if testCase.expected == "owner" { // otherwise "trigger"
+						expectedEmail = testCase.owner.Email
+					}
+					require.Contains(t, msg.To, expectedEmail, "sent mail to unknown sender")
+					mailSent = true
+					assert.Contains(t, msg.Body, testCase.triggerUser.HTMLURL())
+					assert.Contains(t, msg.Body, testCase.triggerUser.Name)
+					// what happened
+					assert.Contains(t, msg.Body, "failed")
+					// new status of run
+					assert.Contains(t, msg.Body, "failure")
+					// prior status of this run
+					assert.Contains(t, msg.Body, "waiting")
+					assertTranslatedLocaleMailActionsNowDone(t, msg.Body)
+				})()
+				require.NotNil(t, setting.MailService)
+
+				notify_service.ActionRunNowDone(ctx, run1, actions_model.StatusWaiting, nil)
+				assert.Equal(t, testCase.expectMail, mailSent)
+			})
+
+			t.Run("SendNotificationEmailOnActionRunRecovered", func(t *testing.T) {
+				mailSent := false
+				defer MockMailSettings(func(msgs ...*Message) {
+					assert.Len(t, msgs, 1)
+					msg := msgs[0]
+					assert.False(t, mailSent, "sent mail twice")
+					expectedEmail := testCase.triggerUser.Email
+					if testCase.expected == "owner" { // otherwise "trigger"
+						expectedEmail = testCase.owner.Email
+					}
+					require.Contains(t, msg.To, expectedEmail, "sent mail to unknown sender")
+					mailSent = true
+					assert.Contains(t, msg.Body, testCase.triggerUser.HTMLURL())
+					assert.Contains(t, msg.Body, testCase.triggerUser.Name)
+					// what happened
+					assert.Contains(t, msg.Body, "recovered")
+					// old status of run
+					assert.Contains(t, msg.Body, "failure")
+					// new status of run
+					assert.Contains(t, msg.Body, "success")
+					// prior status of this run
+					assert.Contains(t, msg.Body, "running")
+				})()
+				require.NotNil(t, setting.MailService)
+
+				notify_service.ActionRunNowDone(ctx, run2, actions_model.StatusRunning, run1)
+				assert.Equal(t, testCase.expectMail, mailSent)
+			})
+		})
+	}
+}
diff --git a/services/mailer/mail_admin_new_user_test.go b/services/mailer/mail_admin_new_user_test.go
index 9273691792..58afcfcda6 100644
--- a/services/mailer/mail_admin_new_user_test.go
+++ b/services/mailer/mail_admin_new_user_test.go
@@ -4,7 +4,6 @@
 package mailer
 
 import (
-	"context"
 	"strconv"
 	"testing"
 
@@ -17,7 +16,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func getTestUsers(t *testing.T) []*user_model.User {
+func getAdminNewUserTestUsers(t *testing.T) []*user_model.User {
 	t.Helper()
 	admin := new(user_model.User)
 	admin.Name = "testadmin"
@@ -38,16 +37,10 @@ func getTestUsers(t *testing.T) []*user_model.User {
 	return []*user_model.User{admin, newUser}
 }
 
-func cleanUpUsers(ctx context.Context, users []*user_model.User) {
-	for _, u := range users {
-		db.DeleteByID[user_model.User](ctx, u.ID)
-	}
-}
-
 func TestAdminNotificationMail_test(t *testing.T) {
 	ctx := t.Context()
 
-	users := getTestUsers(t)
+	users := getAdminNewUserTestUsers(t)
 
 	t.Run("SendNotificationEmailOnNewUser_true", func(t *testing.T) {
 		defer test.MockVariableValue(&setting.Admin.SendNotificationEmailOnNewUser, true)()
@@ -75,5 +68,5 @@ func TestAdminNotificationMail_test(t *testing.T) {
 		MailNewUser(ctx, users[1])
 	})
 
-	cleanUpUsers(ctx, users)
+	CleanUpUsers(ctx, users)
 }
diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go
index b0329caa0b..0d8e054041 100644
--- a/services/mailer/mail_issue.go
+++ b/services/mailer/mail_issue.go
@@ -85,7 +85,7 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*user_mo
 
 	// =========== Repo watchers ===========
 	// Make repo watchers last, since it's likely the list with the most users
-	if !(ctx.Issue.IsPull && ctx.Issue.PullRequest.IsWorkInProgress(ctx) && ctx.ActionType != activities_model.ActionCreatePullRequest) {
+	if !ctx.Issue.IsPull || !ctx.Issue.PullRequest.IsWorkInProgress(ctx) || ctx.ActionType == activities_model.ActionCreatePullRequest {
 		ids, err = repo_model.GetRepoWatchersIDs(ctx, ctx.Issue.RepoID)
 		if err != nil {
 			return fmt.Errorf("GetRepoWatchersIDs(%d): %w", ctx.Issue.RepoID, err)
@@ -137,9 +137,8 @@ func mailIssueCommentBatch(ctx *mailCommentContext, users []*user_model.User, vi
 		}
 		// At this point we exclude:
 		// user that don't have all mails enabled or users only get mail on mention and this is one ...
-		if !(user.EmailNotificationsPreference == user_model.EmailNotificationsEnabled ||
-			user.EmailNotificationsPreference == user_model.EmailNotificationsAndYourOwn ||
-			fromMention && user.EmailNotificationsPreference == user_model.EmailNotificationsOnMention) {
+		if user.EmailNotificationsPreference != user_model.EmailNotificationsEnabled &&
+			user.EmailNotificationsPreference != user_model.EmailNotificationsAndYourOwn && (!fromMention || user.EmailNotificationsPreference != user_model.EmailNotificationsOnMention) {
 			continue
 		}
 
diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go
index a2a871d3c3..5375133415 100644
--- a/services/mailer/mail_team_invite.go
+++ b/services/mailer/mail_team_invite.go
@@ -6,6 +6,7 @@ package mailer
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 
@@ -39,7 +40,7 @@ func MailTeamInvite(ctx context.Context, inviter *user_model.User, team *org_mod
 	if err != nil && !user_model.IsErrUserNotExist(err) {
 		return err
 	} else if user != nil && user.ProhibitLogin {
-		return fmt.Errorf("login is prohibited for the invited user")
+		return errors.New("login is prohibited for the invited user")
 	}
 
 	inviteRedirect := url.QueryEscape(fmt.Sprintf("/org/invite/%s", invite.Token))
diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go
index 616eea2d85..afbcb8064e 100644
--- a/services/mailer/mail_test.go
+++ b/services/mailer/mail_test.go
@@ -494,8 +494,7 @@ func Test_createReference(t *testing.T) {
 func TestFromDisplayName(t *testing.T) {
 	template, err := texttmpl.New("mailFrom").Parse("{{ .DisplayName }}")
 	require.NoError(t, err)
-	setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
-	defer func() { setting.MailService = nil }()
+	defer test.MockVariableValue(&setting.MailService, &setting.Mailer{FromDisplayNameFormatTemplate: template})()
 
 	tests := []struct {
 		userDisplayName string
@@ -518,24 +517,18 @@ func TestFromDisplayName(t *testing.T) {
 		t.Run(tc.userDisplayName, func(t *testing.T) {
 			user := &user_model.User{FullName: tc.userDisplayName, Name: "tmp"}
 			got := fromDisplayName(user)
-			assert.EqualValues(t, tc.fromDisplayName, got)
+			assert.Equal(t, tc.fromDisplayName, got)
 		})
 	}
 
 	t.Run("template with all available vars", func(t *testing.T) {
 		template, err = texttmpl.New("mailFrom").Parse("{{ .DisplayName }} (by {{ .AppName }} on [{{ .Domain }}])")
 		require.NoError(t, err)
-		setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
-		oldAppName := setting.AppName
-		setting.AppName = "Code IT"
-		oldDomain := setting.Domain
-		setting.Domain = "code.it"
-		defer func() {
-			setting.AppName = oldAppName
-			setting.Domain = oldDomain
-		}()
+		defer test.MockVariableValue(&setting.MailService, &setting.Mailer{FromDisplayNameFormatTemplate: template})()
+		defer test.MockVariableValue(&setting.AppName, "Code IT")()
+		defer test.MockVariableValue(&setting.Domain, "code.it")()
 
-		assert.EqualValues(t, "Mister X (by Code IT on [code.it])", fromDisplayName(&user_model.User{FullName: "Mister X", Name: "tmp"}))
+		assert.Equal(t, "Mister X (by Code IT on [code.it])", fromDisplayName(&user_model.User{FullName: "Mister X", Name: "tmp"}))
 	})
 }
 
diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go
index 4561240df5..d8646d9ddd 100644
--- a/services/mailer/mailer.go
+++ b/services/mailer/mailer.go
@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"hash/fnv"
 	"io"
@@ -28,7 +29,7 @@ import (
 	notify_service "forgejo.org/services/notify"
 
 	ntlmssp "github.com/Azure/go-ntlmssp"
-	"github.com/jaytaylor/html2text"
+	"github.com/inbucket/html2text"
 	"gopkg.in/gomail.v2"
 )
 
@@ -176,7 +177,7 @@ func (a *ntlmAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
 func (a *ntlmAuth) Next(fromServer []byte, more bool) ([]byte, error) {
 	if more {
 		if len(fromServer) == 0 {
-			return nil, fmt.Errorf("ntlm ChallengeMessage is empty")
+			return nil, errors.New("ntlm ChallengeMessage is empty")
 		}
 		authenticateMessage, err := ntlmssp.ProcessChallenge(fromServer, a.username, a.password, a.domainNeeded)
 		return authenticateMessage, err
@@ -264,7 +265,7 @@ func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error {
 	canAuth, options := client.Extension("AUTH")
 	if len(opts.User) > 0 {
 		if !canAuth {
-			return fmt.Errorf("SMTP server does not support AUTH, but credentials provided")
+			return errors.New("SMTP server does not support AUTH, but credentials provided")
 		}
 
 		var auth smtp.Auth
diff --git a/services/mailer/mailer_test.go b/services/mailer/mailer_test.go
index aef242d908..34fd847c05 100644
--- a/services/mailer/mailer_test.go
+++ b/services/mailer/mailer_test.go
@@ -72,7 +72,7 @@ func TestToMessage(t *testing.T) {
 	_, err := m1.ToMessage().WriteTo(buf)
 	require.NoError(t, err)
 	header, _ := extractMailHeaderAndContent(t, buf.String())
-	assert.EqualValues(t, map[string]string{
+	assert.Equal(t, map[string]string{
 		"Content-Type":             "multipart/alternative;",
 		"Date":                     "Mon, 01 Jan 0001 00:00:00 +0000",
 		"From":                     "\"Test Gitea\" <test@gitea.com>",
@@ -92,7 +92,7 @@ func TestToMessage(t *testing.T) {
 	_, err = m1.ToMessage().WriteTo(buf)
 	require.NoError(t, err)
 	header, _ = extractMailHeaderAndContent(t, buf.String())
-	assert.EqualValues(t, map[string]string{
+	assert.Equal(t, map[string]string{
 		"Content-Type":             "multipart/alternative;",
 		"Date":                     "Mon, 01 Jan 0001 00:00:00 +0000",
 		"From":                     "\"Test Gitea\" <test@gitea.com>",
diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go
index 9ef71dbdb3..5e9cbe3e99 100644
--- a/services/mailer/main_test.go
+++ b/services/mailer/main_test.go
@@ -7,7 +7,10 @@ import (
 	"context"
 	"testing"
 
+	"forgejo.org/models/db"
+	organization_model "forgejo.org/models/organization"
 	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/templates"
 	"forgejo.org/modules/test"
@@ -46,3 +49,14 @@ func MockMailSettings(send func(msgs ...*Message)) func() {
 		}
 	}
 }
+
+func CleanUpUsers(ctx context.Context, users []*user_model.User) {
+	for _, u := range users {
+		if u.IsOrganization() {
+			organization_model.DeleteOrganization(ctx, (*organization_model.Organization)(u))
+		} else {
+			db.DeleteByID[user_model.User](ctx, u.ID)
+			db.DeleteByBean(ctx, &user_model.EmailAddress{UID: u.ID})
+		}
+	}
+}
diff --git a/services/mailer/notify.go b/services/mailer/notify.go
index e61ecd0511..640de31fcc 100644
--- a/services/mailer/notify.go
+++ b/services/mailer/notify.go
@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 
+	actions_model "forgejo.org/models/actions"
 	activities_model "forgejo.org/models/activities"
 	issues_model "forgejo.org/models/issues"
 	repo_model "forgejo.org/models/repo"
@@ -30,15 +31,16 @@ func (m *mailNotifier) CreateIssueComment(ctx context.Context, doer *user_model.
 	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
 ) {
 	var act activities_model.ActionType
-	if comment.Type == issues_model.CommentTypeClose {
+	switch comment.Type {
+	case issues_model.CommentTypeClose:
 		act = activities_model.ActionCloseIssue
-	} else if comment.Type == issues_model.CommentTypeReopen {
+	case issues_model.CommentTypeReopen:
 		act = activities_model.ActionReopenIssue
-	} else if comment.Type == issues_model.CommentTypeComment {
+	case issues_model.CommentTypeComment:
 		act = activities_model.ActionCommentIssue
-	} else if comment.Type == issues_model.CommentTypeCode {
+	case issues_model.CommentTypeCode:
 		act = activities_model.ActionCommentIssue
-	} else if comment.Type == issues_model.CommentTypePullRequestPush {
+	case issues_model.CommentTypePullRequestPush:
 		act = 0
 	}
 
@@ -94,11 +96,12 @@ func (m *mailNotifier) NewPullRequest(ctx context.Context, pr *issues_model.Pull
 
 func (m *mailNotifier) PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, r *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
 	var act activities_model.ActionType
-	if comment.Type == issues_model.CommentTypeClose {
+	switch comment.Type {
+	case issues_model.CommentTypeClose:
 		act = activities_model.ActionCloseIssue
-	} else if comment.Type == issues_model.CommentTypeReopen {
+	case issues_model.CommentTypeReopen:
 		act = activities_model.ActionReopenIssue
-	} else if comment.Type == issues_model.CommentTypeComment {
+	case issues_model.CommentTypeComment:
 		act = activities_model.ActionCommentPull
 	}
 	if err := MailParticipantsComment(ctx, comment, act, pr.Issue, mentions); err != nil {
@@ -206,3 +209,13 @@ func (m *mailNotifier) RepoPendingTransfer(ctx context.Context, doer, newOwner *
 func (m *mailNotifier) NewUserSignUp(ctx context.Context, newUser *user_model.User) {
 	MailNewUser(ctx, newUser)
 }
+
+func (m *mailNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
+	// Only send a mail on a successful run when the workflow recovered (i.e., the run before failed).
+	if !run.Status.IsFailure() && (lastRun == nil || !lastRun.Status.IsFailure()) {
+		return
+	}
+	if err := MailActionRun(run, priorStatus, lastRun); err != nil {
+		log.Error("MailActionRunNowDone: %v", err)
+	}
+}
diff --git a/services/markup/processorhelper.go b/services/markup/processorhelper.go
index b5fcd78cb7..2f1b1e738c 100644
--- a/services/markup/processorhelper.go
+++ b/services/markup/processorhelper.go
@@ -5,7 +5,7 @@ package markup
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"forgejo.org/models/perm/access"
 	"forgejo.org/models/repo"
@@ -55,7 +55,7 @@ func ProcessorHelper() *markup.ProcessorHelper {
 				return nil, err
 			}
 			if !perms.CanRead(unit.TypeCode) {
-				return nil, fmt.Errorf("cannot access repository code")
+				return nil, errors.New("cannot access repository code")
 			}
 
 			gitRepo, err := gitrepo.OpenRepository(ctx, repo)
diff --git a/services/migrations/gitea_downloader_test.go b/services/migrations/gitea_downloader_test.go
index 24c53af023..5acc3b86a9 100644
--- a/services/migrations/gitea_downloader_test.go
+++ b/services/migrations/gitea_downloader_test.go
@@ -45,7 +45,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 	topics, err := downloader.GetTopics()
 	require.NoError(t, err)
 	sort.Strings(topics)
-	assert.EqualValues(t, []string{"ci", "gitea", "migration", "test"}, topics)
+	assert.Equal(t, []string{"ci", "gitea", "migration", "test"}, topics)
 
 	labels, err := downloader.GetLabels()
 	require.NoError(t, err)
@@ -132,7 +132,7 @@ func TestGiteaDownloadRepo(t *testing.T) {
 	require.NoError(t, err)
 	assert.True(t, isEnd)
 	assert.Len(t, issues, 7)
-	assert.EqualValues(t, "open", issues[0].State)
+	assert.Equal(t, "open", issues[0].State)
 
 	issues, isEnd, err = downloader.GetIssues(3, 2)
 	require.NoError(t, err)
diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go
index 55adad9685..7887dacdb1 100644
--- a/services/migrations/gitea_uploader.go
+++ b/services/migrations/gitea_uploader.go
@@ -766,7 +766,7 @@ func (g *GiteaLocalUploader) newPullRequest(pr *base.PullRequest) (*issues_model
 	issue := issues_model.Issue{
 		RepoID:      g.repo.ID,
 		Repo:        g.repo,
-		Title:       prTitle,
+		Title:       util.TruncateRunes(prTitle, 255),
 		Index:       pr.Number,
 		Content:     pr.Content,
 		MilestoneID: milestoneID,
diff --git a/services/migrations/gitea_uploader_test.go b/services/migrations/gitea_uploader_test.go
index e07c621acc..85e733cc51 100644
--- a/services/migrations/gitea_uploader_test.go
+++ b/services/migrations/gitea_uploader_test.go
@@ -64,7 +64,7 @@ func TestGiteaUploadRepo(t *testing.T) {
 
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user.ID, Name: repoName})
 	assert.True(t, repo.HasWiki())
-	assert.EqualValues(t, repo_model.RepositoryReady, repo.Status)
+	assert.Equal(t, repo_model.RepositoryReady, repo.Status)
 
 	milestones, err := db.Find[issues_model.Milestone](db.DefaultContext, issues_model.FindMilestoneOptions{
 		RepoID:   repo.ID,
@@ -173,7 +173,7 @@ func TestGiteaUploadRemapLocalUser(t *testing.T) {
 	uploader.userMap = make(map[int64]int64)
 	err = uploader.remapUser(&source, &target)
 	require.NoError(t, err)
-	assert.EqualValues(t, user.ID, target.GetUserID())
+	assert.Equal(t, user.ID, target.GetUserID())
 }
 
 func TestGiteaUploadRemapExternalUser(t *testing.T) {
@@ -224,7 +224,7 @@ func TestGiteaUploadRemapExternalUser(t *testing.T) {
 	target = repo_model.Release{}
 	err = uploader.remapUser(&source, &target)
 	require.NoError(t, err)
-	assert.EqualValues(t, linkedUser.ID, target.GetUserID())
+	assert.Equal(t, linkedUser.ID, target.GetUserID())
 }
 
 func TestGiteaUploadUpdateGitForPullRequest(t *testing.T) {
@@ -504,14 +504,14 @@ func TestGiteaUploadUpdateGitForPullRequest(t *testing.T) {
 
 			head, err := uploader.updateGitForPullRequest(&testCase.pr)
 			require.NoError(t, err)
-			assert.EqualValues(t, testCase.head, head)
+			assert.Equal(t, testCase.head, head)
 
 			log.Info(stopMark)
 
 			logFiltered, logStopped := logChecker.Check(5 * time.Second)
 			assert.True(t, logStopped)
 			if len(testCase.logFilter) > 0 {
-				assert.EqualValues(t, testCase.logFiltered, logFiltered, "for log message filters: %v", testCase.logFilter)
+				assert.Equal(t, testCase.logFiltered, logFiltered, "for log message filters: %v", testCase.logFilter)
 			}
 		})
 	}
diff --git a/services/migrations/github.go b/services/migrations/github.go
index 5052a68114..317eb568b5 100644
--- a/services/migrations/github.go
+++ b/services/migrations/github.go
@@ -140,7 +140,7 @@ func (g *GithubDownloaderV3) LogString() string {
 func (g *GithubDownloaderV3) addClient(client *http.Client, baseURL string) {
 	githubClient := github.NewClient(client)
 	if baseURL != "https://github.com" {
-		githubClient, _ = github.NewClient(client).WithEnterpriseURLs(baseURL, baseURL)
+		githubClient, _ = githubClient.WithEnterpriseURLs(baseURL, baseURL)
 	}
 	g.clients = append(g.clients, githubClient)
 	g.rates = append(g.rates, nil)
@@ -364,7 +364,8 @@ func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease)
 
 				// Prevent open redirect
 				if !hasBaseURL(redirectURL, g.baseURL) &&
-					!hasBaseURL(redirectURL, "https://objects.githubusercontent.com/") {
+					!hasBaseURL(redirectURL, "https://objects.githubusercontent.com/") &&
+					!hasBaseURL(redirectURL, "https://release-assets.githubusercontent.com/") {
 					WarnAndNotice("Unexpected AssetURL for assetID[%d] in %s: %s", asset.GetID(), g, redirectURL)
 
 					return io.NopCloser(strings.NewReader(redirectURL)), nil
@@ -885,3 +886,18 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev
 	}
 	return allReviews, nil
 }
+
+// FormatCloneURL add authentication into remote URLs
+func (g *GithubDownloaderV3) FormatCloneURL(opts MigrateOptions, remoteAddr string) (string, error) {
+	u, err := url.Parse(remoteAddr)
+	if err != nil {
+		return "", err
+	}
+	if len(opts.AuthToken) > 0 {
+		// "multiple tokens" are used to benefit more "API rate limit quota"
+		// git clone doesn't count for rate limits, so only use the first token.
+		// source: https://github.com/orgs/community/discussions/44515
+		u.User = url.UserPassword("oauth2", strings.Split(opts.AuthToken, ",")[0])
+	}
+	return u.String(), nil
+}
diff --git a/services/migrations/github_test.go b/services/migrations/github_test.go
index b1f20c4716..c5e24ebbcd 100644
--- a/services/migrations/github_test.go
+++ b/services/migrations/github_test.go
@@ -433,3 +433,36 @@ func TestGitHubDownloadRepo(t *testing.T) {
 		},
 	}, reviews)
 }
+
+func TestGithubMultiToken(t *testing.T) {
+	testCases := []struct {
+		desc             string
+		token            string
+		expectedCloneURL string
+	}{
+		{
+			desc:             "Single Token",
+			token:            "single_token",
+			expectedCloneURL: "https://oauth2:single_token@github.com",
+		},
+		{
+			desc:             "Multi Token",
+			token:            "token1,token2",
+			expectedCloneURL: "https://oauth2:token1@github.com",
+		},
+	}
+	factory := GithubDownloaderV3Factory{}
+
+	for _, tC := range testCases {
+		t.Run(tC.desc, func(t *testing.T) {
+			opts := base.MigrateOptions{CloneAddr: "https://github.com/go-gitea/gitea", AuthToken: tC.token}
+			client, err := factory.New(t.Context(), opts)
+			require.NoError(t, err)
+
+			cloneURL, err := client.FormatCloneURL(opts, "https://github.com")
+			require.NoError(t, err)
+
+			assert.Equal(t, tC.expectedCloneURL, cloneURL)
+		})
+	}
+}
diff --git a/services/migrations/gitlab.go b/services/migrations/gitlab.go
index ac0d3bcf7a..f54f682c47 100644
--- a/services/migrations/gitlab.go
+++ b/services/migrations/gitlab.go
@@ -99,6 +99,7 @@ func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, passw
 	// Only use basic auth if token is blank and password is NOT
 	// Basic auth will fail with empty strings, but empty token will allow anonymous public API usage
 	if token == "" && password != "" {
+		//nolint // SA1019 gitlab.NewBasicAuthClient is deprecated: GitLab recommends against using this authentication method
 		gitlabClient, err = gitlab.NewBasicAuthClient(username, password, gitlab.WithBaseURL(baseURL), gitlab.WithHTTPClient(NewMigrationHTTPClient()))
 	}
 
@@ -213,7 +214,7 @@ func (g *GitlabDownloader) GetTopics() ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
-	return gr.TagList, err
+	return gr.Topics, err
 }
 
 // GetMilestones returns milestones
diff --git a/services/migrations/gitlab_test.go b/services/migrations/gitlab_test.go
index 924dab5144..30b24f09e8 100644
--- a/services/migrations/gitlab_test.go
+++ b/services/migrations/gitlab_test.go
@@ -49,7 +49,7 @@ func TestGitlabDownloadRepo(t *testing.T) {
 	topics, err := downloader.GetTopics()
 	require.NoError(t, err)
 	assert.Len(t, topics, 2)
-	assert.EqualValues(t, []string{"migration", "test"}, topics)
+	assert.Equal(t, []string{"migration", "test"}, topics)
 
 	milestones, err := downloader.GetMilestones()
 	require.NoError(t, err)
@@ -352,7 +352,7 @@ func TestGitlabSkippedIssueNumber(t *testing.T) {
 	// the only issue in this repository has number 2
 	assert.Len(t, issues, 1)
 	assert.EqualValues(t, 2, issues[0].Number)
-	assert.EqualValues(t, "vpn unlimited errors", issues[0].Title)
+	assert.Equal(t, "vpn unlimited errors", issues[0].Title)
 
 	prs, _, err := downloader.GetPullRequests(1, 10)
 	require.NoError(t, err)
@@ -361,7 +361,7 @@ func TestGitlabSkippedIssueNumber(t *testing.T) {
 	// pull request 3 in Forgejo
 	assert.Len(t, prs, 1)
 	assert.EqualValues(t, 3, prs[0].Number)
-	assert.EqualValues(t, "Review", prs[0].Title)
+	assert.Equal(t, "Review", prs[0].Title)
 }
 
 func gitlabClientMockSetup(t *testing.T) (*http.ServeMux, *httptest.Server, *gitlab.Client) {
@@ -531,7 +531,7 @@ func TestAwardsToReactions(t *testing.T) {
 	require.NoError(t, json.Unmarshal([]byte(testResponse), &awards))
 
 	reactions := downloader.awardsToReactions(awards)
-	assert.EqualValues(t, []*base.Reaction{
+	assert.Equal(t, []*base.Reaction{
 		{
 			UserName: "lafriks",
 			UserID:   1241334,
@@ -623,7 +623,7 @@ func TestNoteToComment(t *testing.T) {
 
 	for i, note := range notes {
 		actualComment := *downloader.convertNoteToComment(17, &note)
-		assert.EqualValues(t, actualComment, comments[i])
+		assert.Equal(t, actualComment, comments[i])
 	}
 }
 
diff --git a/services/migrations/gogs_test.go b/services/migrations/gogs_test.go
index 7d7f10c2b9..bf0d063ca4 100644
--- a/services/migrations/gogs_test.go
+++ b/services/migrations/gogs_test.go
@@ -25,7 +25,7 @@ func TestGogsDownloadRepo(t *testing.T) {
 	resp, err := http.Get("https://try.gogs.io/lunnytest/TESTREPO")
 	if err != nil || resp.StatusCode/100 != 2 {
 		// skip and don't run test
-		t.Skipf("visit test repo failed, ignored")
+		t.Skip("visit test repo failed, ignored")
 		return
 	}
 
@@ -215,9 +215,9 @@ func TestGogsDownloaderFactory_New(t *testing.T) {
 			}
 
 			assert.IsType(t, &GogsDownloader{}, got)
-			assert.EqualValues(t, tt.baseURL, got.(*GogsDownloader).baseURL)
-			assert.EqualValues(t, tt.repoOwner, got.(*GogsDownloader).repoOwner)
-			assert.EqualValues(t, tt.repoName, got.(*GogsDownloader).repoName)
+			assert.Equal(t, tt.baseURL, got.(*GogsDownloader).baseURL)
+			assert.Equal(t, tt.repoOwner, got.(*GogsDownloader).repoOwner)
+			assert.Equal(t, tt.repoName, got.(*GogsDownloader).repoName)
 		})
 	}
 }
diff --git a/services/migrations/migrate.go b/services/migrations/migrate.go
index 81d1c203fe..61630d9c6d 100644
--- a/services/migrations/migrate.go
+++ b/services/migrations/migrate.go
@@ -6,6 +6,7 @@ package migrations
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"net/url"
@@ -227,7 +228,7 @@ func migrateRepository(_ context.Context, doer *user_model.User, downloader base
 
 		if cloneURL.Scheme == "file" || cloneURL.Scheme == "" {
 			if cloneAddrURL.Scheme != "file" && cloneAddrURL.Scheme != "" {
-				return fmt.Errorf("repo info has changed from external to local filesystem")
+				return errors.New("repo info has changed from external to local filesystem")
 			}
 		}
 
diff --git a/services/migrations/pagure.go b/services/migrations/pagure.go
new file mode 100644
index 0000000000..f9433671c0
--- /dev/null
+++ b/services/migrations/pagure.go
@@ -0,0 +1,600 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package migrations
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/log"
+	base "forgejo.org/modules/migration"
+	"forgejo.org/modules/proxy"
+	"forgejo.org/modules/structs"
+	"forgejo.org/modules/util"
+)
+
+var (
+	_ base.Downloader        = &PagureDownloader{}
+	_ base.DownloaderFactory = &PagureDownloaderFactory{}
+)
+
+func init() {
+	RegisterDownloaderFactory(&PagureDownloaderFactory{})
+}
+
+// PagureDownloaderFactory defines a downloader factory
+type PagureDownloaderFactory struct{}
+
+// PagureUser defines a user on Pagure to be migrated over to Forgejo
+type PagureUser struct {
+	FullURL  string `json:"full_url"`
+	Fullname string `json:"fullname"`
+	Name     string `json:"name"`
+	URLPath  string `json:"url_path"`
+}
+
+// PagureRepoInfo describes the repository with preliminary information
+type PagureRepoInfo struct {
+	ID            int64             `json:"id"`
+	Name          string            `json:"name"`
+	FullName      string            `json:"fullname"`
+	Description   string            `json:"description"`
+	Topics        []string          `json:"tags"`
+	CloseStatuses []string          `json:"close_status"`
+	Priorities    map[string]string `json:"priorities"`
+	Milestones    map[string]struct {
+		Active bool    `json:"active"`
+		Date   *string `json:"date"`
+	} `json:"milestones"`
+}
+
+// PagureDownloader implements a Downloader interface to get repository information from Pagure
+type PagureDownloader struct {
+	base.NullDownloader
+	ctx                   context.Context
+	client                *http.Client
+	baseURL               *url.URL
+	meta                  PagureRepoInfo
+	repoName              string
+	token                 string
+	privateIssuesOnlyRepo bool
+	repoID                int64
+	maxIssueIndex         int64
+	userMap               map[string]*PagureUser
+	milestoneMap          map[int64]string
+	priorities            map[string]string
+}
+
+// PagureLabelsList defines a list of labels under an issue tracker
+type PagureLabelsList struct {
+	Labels []string `json:"tags"`
+}
+
+// PagureLabel defines a label under the issue tracker labels list
+type PagureLabel struct {
+	Label            string `json:"tag"`
+	LabelColor       string `json:"tag_color"`
+	LabelDescription string `json:"tag_description"`
+}
+
+// PagureIssueContext confirms if a said unit is an issue ticket or a pull request
+type PagureIssueContext struct {
+	IsPullRequest bool
+}
+
+// PagureIssuesResponse describes a list of issue tickets under an issue tracker
+type PagureIssuesResponse struct {
+	Issues []struct {
+		Assignee     any        `json:"assignee"`
+		Blocks       []string   `json:"blocks"`
+		CloseStatus  string     `json:"close_status"`
+		ClosedAt     string     `json:"closed_at"`
+		ClosedBy     any        `json:"closed_by"`
+		Comments     []any      `json:"comments"`
+		Content      string     `json:"content"`
+		CustomFields []any      `json:"custom_fields"`
+		DateCreated  string     `json:"date_created"`
+		Depends      []any      `json:"depends"`
+		ID           int64      `json:"id"`
+		LastUpdated  string     `json:"last_updated"`
+		Milestone    string     `json:"milestone"`
+		Priority     int64      `json:"priority"`
+		Private      bool       `json:"private"`
+		Status       string     `json:"status"`
+		Tags         []string   `json:"tags"`
+		Title        string     `json:"title"`
+		User         PagureUser `json:"user"`
+	} `json:"issues"`
+	Pagination struct {
+		First   string  `json:"first"`
+		Last    string  `json:"last"`
+		Next    *string `json:"next"`
+		Page    int     `json:"page"`
+		Pages   int     `json:"pages"`
+		PerPage int     `json:"per_page"`
+		Prev    string  `json:"prev"`
+	}
+}
+
+// PagureIssueDetail describes a list of issue comments under an issue ticket
+type PagureIssueDetail struct {
+	Comment      string     `json:"comment"`
+	DateCreated  string     `json:"date_created"`
+	ID           int64      `json:"id"`
+	Notification bool       `json:"notification"`
+	User         PagureUser `json:"user"`
+}
+
+// PagureCommitInfo describes a commit
+type PagureCommitInfo struct {
+	Author           string   `json:"author"`
+	CommitTime       int64    `json:"commit_time"`
+	CommitTimeOffset int      `json:"commit_time_offset"`
+	Committer        string   `json:"committer"`
+	Hash             string   `json:"hash"`
+	Message          string   `json:"message"`
+	ParentIDs        []string `json:"parent_ids"`
+	TreeID           string   `json:"tree_id"`
+}
+
+// PagurePRRresponse describes a list of pull requests under an issue tracker
+type PagurePRResponse struct {
+	Pagination struct {
+		Next *string `json:"next"`
+	} `json:"pagination"`
+	Requests []struct {
+		Branch         string     `json:"branch"`
+		BranchFrom     string     `json:"branch_from"`
+		CommitStop     string     `json:"commit_stop"`
+		DateCreated    string     `json:"date_created"`
+		FullURL        string     `json:"full_url"`
+		ID             int        `json:"id"`
+		InitialComment string     `json:"initial_comment"`
+		LastUpdated    string     `json:"last_updated"`
+		Status         string     `json:"status"`
+		Tags           []string   `json:"tags"`
+		Title          string     `json:"title"`
+		User           PagureUser `json:"user"`
+		ClosedAt       string     `json:"closed_at"`
+		ClosedBy       PagureUser `json:"closed_by"`
+		RepoFrom       struct {
+			FullURL string `json:"full_url"`
+		} `json:"repo_from"`
+	} `json:"requests"`
+}
+
+// processDate converts epoch time string to Go formatted time
+func processDate(dateStr *string) time.Time {
+	date := time.Time{}
+	if dateStr == nil || *dateStr == "" {
+		return date
+	}
+
+	unix, err := strconv.Atoi(*dateStr)
+	if err != nil {
+		log.Error("Error:", err)
+		return date
+	}
+
+	date = time.Unix(int64(unix), 0)
+	return date
+}
+
+// New returns a downloader related to this factory according MigrateOptions
+func (f *PagureDownloaderFactory) New(ctx context.Context, opts base.MigrateOptions) (base.Downloader, error) {
+	u, err := url.Parse(opts.CloneAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	var repoName string
+
+	fields := strings.Split(strings.Trim(u.Path, "/"), "/")
+	if len(fields) == 2 {
+		repoName = fields[0] + "/" + strings.TrimSuffix(fields[1], ".git")
+	} else if len(fields) == 1 {
+		repoName = strings.TrimSuffix(fields[0], ".git")
+	} else {
+		return nil, fmt.Errorf("invalid path: %s", u.Path)
+	}
+
+	u.Path, u.Fragment = "", ""
+	log.Info("Create Pagure downloader. BaseURL: %v RepoName: %s", u, repoName)
+
+	return NewPagureDownloader(ctx, u, opts.AuthToken, repoName), nil
+}
+
+// GitServiceType returns the type of Git service
+func (f *PagureDownloaderFactory) GitServiceType() structs.GitServiceType {
+	return structs.PagureService
+}
+
+// SetContext sets context
+func (d *PagureDownloader) SetContext(ctx context.Context) {
+	d.ctx = ctx
+}
+
+// NewPagureDownloader creates a new downloader object
+func NewPagureDownloader(ctx context.Context, baseURL *url.URL, token, repoName string) *PagureDownloader {
+	var privateIssuesOnlyRepo bool
+	if token != "" {
+		privateIssuesOnlyRepo = true
+	}
+
+	downloader := &PagureDownloader{
+		ctx:      ctx,
+		baseURL:  baseURL,
+		repoName: repoName,
+		client: &http.Client{
+			Transport: &http.Transport{
+				Proxy: proxy.Proxy(),
+			},
+		},
+		token:                 token,
+		privateIssuesOnlyRepo: privateIssuesOnlyRepo,
+		userMap:               make(map[string]*PagureUser),
+		milestoneMap:          make(map[int64]string),
+		priorities:            make(map[string]string),
+	}
+
+	return downloader
+}
+
+// String sets the default text for information purposes
+func (d *PagureDownloader) String() string {
+	return fmt.Sprintf("migration from Pagure server %s [%d]/%s", d.baseURL, d.repoID, d.repoName)
+}
+
+// LogString sets the default text for logging purposes
+func (d *PagureDownloader) LogString() string {
+	if d == nil {
+		return "<PagureDownloader nil>"
+	}
+	return fmt.Sprintf("<PagureDownloader %s [%d]/%s>", d.baseURL, d.repoID, d.repoName)
+}
+
+// callAPI handles all the requests made against Pagure
+func (d *PagureDownloader) callAPI(endpoint string, parameter map[string]string, result any) error {
+	u, err := d.baseURL.Parse(endpoint)
+	if err != nil {
+		return err
+	}
+
+	if parameter != nil {
+		query := u.Query()
+		for k, v := range parameter {
+			query.Set(k, v)
+		}
+		u.RawQuery = query.Encode()
+	}
+
+	req, err := http.NewRequestWithContext(d.ctx, "GET", u.String(), nil)
+	if err != nil {
+		return err
+	}
+	if d.privateIssuesOnlyRepo {
+		req.Header.Set("Authorization", "token "+d.token)
+	}
+
+	resp, err := d.client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	decoder := json.NewDecoder(resp.Body)
+	return decoder.Decode(&result)
+}
+
+// GetRepoInfo returns repository information from Pagure
+func (d *PagureDownloader) GetRepoInfo() (*base.Repository, error) {
+	err := d.callAPI("/api/0/"+d.repoName, nil, &d.meta)
+	if err != nil {
+		return nil, err
+	}
+
+	d.repoID, d.priorities = d.meta.ID, d.meta.Priorities
+
+	cloneURL, err := d.baseURL.Parse(d.meta.FullName)
+	if err != nil {
+		return nil, err
+	}
+	originalURL, err := d.baseURL.Parse(d.meta.FullName)
+	if err != nil {
+		return nil, err
+	}
+
+	return &base.Repository{
+		Name:        d.meta.Name,
+		Description: d.meta.Description,
+		CloneURL:    cloneURL.String() + ".git",
+		OriginalURL: originalURL.String(),
+	}, nil
+}
+
+// GetMilestones returns milestones information from Pagure
+func (d *PagureDownloader) GetMilestones() ([]*base.Milestone, error) {
+	milestones := make([]*base.Milestone, 0, len(d.meta.Milestones))
+	for name, details := range d.meta.Milestones {
+		state := "closed"
+		if details.Active {
+			state = "open"
+		}
+
+		deadline := processDate(details.Date)
+		milestones = append(milestones, &base.Milestone{
+			Title:       name,
+			Description: "",
+			Deadline:    &deadline,
+			State:       state,
+		})
+	}
+
+	return milestones, nil
+}
+
+// GetLabels returns labels information from Pagure
+func (d *PagureDownloader) GetLabels() ([]*base.Label, error) {
+	rawLabels := PagureLabelsList{}
+
+	err := d.callAPI("/api/0/"+d.repoName+"/tags", nil, &rawLabels)
+	if err != nil {
+		return nil, err
+	}
+
+	labels := make([]*base.Label, 0, len(rawLabels.Labels)+len(d.meta.CloseStatuses))
+
+	for _, label := range rawLabels.Labels {
+		rawLabel := PagureLabel{}
+		err = d.callAPI("/api/0/"+d.repoName+"/tag/"+label, nil, &rawLabel)
+		if err != nil {
+			return nil, err
+		}
+		labels = append(labels, &base.Label{
+			Name:        label,
+			Description: rawLabel.LabelDescription,
+			Color:       strings.TrimPrefix(rawLabel.LabelColor, "#"),
+		})
+	}
+
+	for _, closeStatus := range d.meta.CloseStatuses {
+		labels = append(labels, &base.Label{
+			Name:        "Closed As/" + closeStatus,
+			Description: "Closed with the reason of " + closeStatus,
+			Color:       "FF0000",
+			Exclusive:   true,
+		})
+	}
+
+	for _, value := range d.priorities {
+		if value != "" {
+			labels = append(labels, &base.Label{
+				Name:        "Priority/" + value,
+				Description: "Priority of " + value,
+				Color:       "FF00FF",
+				Exclusive:   true,
+			})
+		}
+	}
+
+	return labels, nil
+}
+
+// GetIssues returns issue tickets from Pagure
+func (d *PagureDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, error) {
+	rawIssues := PagureIssuesResponse{}
+
+	err := d.callAPI(
+		"/api/0/"+d.repoName+"/issues",
+		map[string]string{
+			"page":     strconv.Itoa(page),
+			"per_page": strconv.Itoa(perPage),
+			"status":   "all",
+		},
+		&rawIssues,
+	)
+	if err != nil {
+		return nil, false, err
+	}
+
+	issues := make([]*base.Issue, 0, len(rawIssues.Issues))
+	for _, issue := range rawIssues.Issues {
+		log.Debug("Processing issue %d", issue.ID)
+		if d.privateIssuesOnlyRepo && !issue.Private {
+			log.Info("Skipping issue %d because it is not private and we are only downloading private issues", issue.ID)
+			continue
+		}
+		labels := []*base.Label{}
+		for _, tag := range issue.Tags {
+			labels = append(labels, &base.Label{Name: tag})
+		}
+
+		if issue.CloseStatus != "" {
+			labels = append(labels, &base.Label{Name: "Closed As/" + issue.CloseStatus})
+		}
+
+		priorityStr := ""
+		if issue.Priority != 0 {
+			priorityStr = strconv.FormatInt(issue.Priority, 10)
+		}
+
+		if priorityStr != "" {
+			priorityValue, ok := d.priorities[priorityStr]
+			if ok {
+				labels = append(labels, &base.Label{Name: "Priority/" + priorityValue})
+			}
+		}
+		log.Trace("Adding issue: %d", issue.ID)
+
+		closedat := processDate(&issue.ClosedAt)
+
+		issues = append(issues, &base.Issue{
+			Title:        issue.Title,
+			Number:       issue.ID,
+			PosterName:   issue.User.Name,
+			PosterID:     -1,
+			Content:      issue.Content,
+			Milestone:    issue.Milestone,
+			State:        strings.ToLower(issue.Status),
+			Created:      processDate(&issue.DateCreated),
+			Updated:      processDate(&issue.LastUpdated),
+			Closed:       &closedat,
+			Labels:       labels,
+			ForeignIndex: issue.ID,
+			Context:      PagureIssueContext{IsPullRequest: false},
+		})
+
+		if d.maxIssueIndex < issue.ID {
+			d.maxIssueIndex = issue.ID
+		}
+	}
+	hasNext := rawIssues.Pagination.Next == nil
+
+	return issues, hasNext, nil
+}
+
+// GetComments returns issue comments from Pagure
+func (d *PagureDownloader) GetComments(commentable base.Commentable) ([]*base.Comment, bool, error) {
+	context, ok := commentable.GetContext().(PagureIssueContext)
+	if !ok {
+		return nil, false, fmt.Errorf("unexpected context: %+v", commentable.GetContext())
+	}
+
+	list := struct {
+		Comments []PagureIssueDetail `json:"comments"`
+	}{}
+	var endpoint string
+
+	if context.IsPullRequest {
+		endpoint = fmt.Sprintf("/api/0/%s/pull-request/%d", d.repoName, commentable.GetForeignIndex())
+	} else {
+		endpoint = fmt.Sprintf("/api/0/%s/issue/%d", d.repoName, commentable.GetForeignIndex())
+	}
+
+	err := d.callAPI(endpoint, nil, &list)
+	if err != nil {
+		log.Error("Error calling API: %v", err)
+		return nil, false, err
+	}
+
+	comments := make([]*base.Comment, 0, len(list.Comments))
+	for _, unit := range list.Comments {
+		if len(unit.Comment) == 0 {
+			log.Error("Empty comment")
+			continue
+		}
+
+		log.Trace("Adding comment: %d", unit.ID)
+		c := &base.Comment{
+			IssueIndex: commentable.GetLocalIndex(),
+			Index:      unit.ID,
+			PosterName: unit.User.Name,
+			PosterID:   -1,
+			Content:    unit.Comment,
+			Created:    processDate(&unit.DateCreated),
+		}
+		comments = append(comments, c)
+	}
+
+	return comments, true, nil
+}
+
+// GetPullRequests returns pull requests from Pagure
+func (d *PagureDownloader) GetPullRequests(page, perPage int) ([]*base.PullRequest, bool, error) {
+	// Could not figure out how to disable this in opts, so if a private issues only repo,
+	// We just return an empty list
+	if d.privateIssuesOnlyRepo {
+		pullRequests := make([]*base.PullRequest, 0)
+		return pullRequests, true, nil
+	}
+
+	rawPullRequests := PagurePRResponse{}
+	commit := PagureCommitInfo{}
+
+	err := d.callAPI(
+		"/api/0/"+d.repoName+"/pull-requests",
+		map[string]string{
+			"page":     strconv.Itoa(page),
+			"per_page": strconv.Itoa(perPage),
+			"status":   "all",
+		},
+		&rawPullRequests,
+	)
+	if err != nil {
+		return nil, false, err
+	}
+
+	pullRequests := make([]*base.PullRequest, 0, len(rawPullRequests.Requests))
+
+	for _, pr := range rawPullRequests.Requests {
+		var state, baseSHA string
+		var merged bool
+		labels := []*base.Label{}
+
+		for _, tag := range pr.Tags {
+			labels = append(labels, &base.Label{Name: tag})
+		}
+		mergedtime := processDate(&pr.ClosedAt)
+
+		err = d.callAPI("/api/0/"+d.repoName+"/c/"+pr.CommitStop+"/info", nil, &commit)
+		if err != nil {
+			return nil, false, err
+		}
+
+		if util.ASCIIEqualFold(pr.Status, "merged") {
+			state, merged, baseSHA = "closed", true, commit.ParentIDs[0]
+		} else if util.ASCIIEqualFold(pr.Status, "open") {
+			state, merged, baseSHA = "open", false, commit.ParentIDs[0]
+		} else {
+			state, merged, baseSHA = "closed", false, commit.ParentIDs[0]
+		}
+
+		pullRequests = append(pullRequests, &base.PullRequest{
+			Title:      pr.Title,
+			Number:     int64(pr.ID),
+			PosterName: pr.User.Name,
+			PosterID:   -1,
+			Content:    pr.InitialComment,
+			State:      state,
+			Created:    processDate(&pr.DateCreated),
+			Updated:    processDate(&pr.LastUpdated),
+			MergedTime: &mergedtime,
+			Closed:     &mergedtime,
+			Merged:     merged,
+			Labels:     labels,
+			Head: base.PullRequestBranch{
+				Ref:      pr.BranchFrom,
+				SHA:      pr.CommitStop,
+				RepoName: d.repoName,
+				CloneURL: pr.RepoFrom.FullURL + ".git",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      pr.Branch,
+				SHA:      baseSHA,
+				RepoName: d.repoName,
+			},
+			ForeignIndex: int64(pr.ID),
+			PatchURL:     pr.FullURL + ".patch",
+			Context:      PagureIssueContext{IsPullRequest: true},
+		})
+
+		// SECURITY: Ensure that the PR is safe
+		_ = CheckAndEnsureSafePR(pullRequests[len(pullRequests)-1], d.baseURL.String(), d)
+	}
+
+	hasNext := rawPullRequests.Pagination.Next == nil
+
+	return pullRequests, hasNext, nil
+}
+
+// GetTopics return repository topics from Pagure
+func (d *PagureDownloader) GetTopics() ([]string, error) {
+	return d.meta.Topics, nil
+}
diff --git a/services/migrations/pagure_test.go b/services/migrations/pagure_test.go
new file mode 100644
index 0000000000..c81bd28904
--- /dev/null
+++ b/services/migrations/pagure_test.go
@@ -0,0 +1,616 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package migrations
+
+import (
+	"fmt"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"forgejo.org/models/unittest"
+	base "forgejo.org/modules/migration"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPagureDownloadRepoWithPublicIssues(t *testing.T) {
+	// Skip tests if Pagure token is not found
+	cloneUser := os.Getenv("PAGURE_CLONE_USER")
+	clonePassword := os.Getenv("PAGURE_CLONE_PASSWORD")
+	apiUser := os.Getenv("PAGURE_API_USER")
+	apiPassword := os.Getenv("PAGURE_API_TOKEN")
+
+	cloneAddr := fmt.Sprintf("https://%s:%s@pagure.io/protop2g-test-srce.git", cloneUser, clonePassword)
+	u, _ := url.Parse(cloneAddr)
+
+	fixtPath := "./testdata/pagure/full_download/unauthorized"
+	server := unittest.NewMockWebServer(t, "https://pagure.io", fixtPath, false)
+	defer server.Close()
+
+	factory := &PagureDownloaderFactory{}
+	downloader, err := factory.New(t.Context(), base.MigrateOptions{
+		CloneAddr:    u.String(),
+		AuthUsername: apiUser,
+		AuthPassword: apiPassword,
+	})
+	require.NoError(t, err)
+
+	repo, err := downloader.GetRepoInfo()
+	require.NoError(t, err)
+
+	// Testing repository contents migration
+	assertRepositoryEqual(t, &base.Repository{
+		Name:        "protop2g-test-srce",
+		Owner:       "",
+		Description: "The source namespace for the Pagure Exporter project to run tests against",
+		CloneURL:    cloneAddr,
+		OriginalURL: strings.ReplaceAll(cloneAddr, ".git", ""),
+	}, repo)
+
+	topics, err := downloader.GetTopics()
+	require.NoError(t, err)
+
+	// Testing repository topics migration
+	assert.Equal(t, []string{"srce", "test", "gridhead", "protop2g"}, topics)
+
+	// Testing labels migration
+	labels, err := downloader.GetLabels()
+	require.NoError(t, err)
+	assert.Len(t, labels, 15)
+
+	// Testing issue tickets probing
+	issues, isEnd, err := downloader.GetIssues(1, 20)
+	require.NoError(t, err)
+	assert.True(t, isEnd)
+
+	// Testing issue tickets migration
+	assertIssuesEqual(t, []*base.Issue{
+		{
+			Number:     2,
+			Title:      "This is the title of the second test issue",
+			Content:    "This is the body of the second test issue",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Milestone:  "Milestone BBBB",
+			Created:    time.Date(2023, time.October, 13, 4, 1, 16, 0, time.UTC),
+			Updated:    time.Date(2025, time.June, 25, 6, 25, 57, 0, time.UTC),
+			Closed:     timePtr(time.Date(2025, time.June, 25, 6, 22, 59, 0, time.UTC)),
+			Labels: []*base.Label{
+				{
+					Name: "cccc",
+				},
+				{
+					Name: "dddd",
+				},
+				{
+					Name: "Closed As/Complete",
+				},
+				{
+					Name: "Priority/Rare",
+				},
+			},
+		},
+		{
+			Number:     1,
+			Title:      "This is the title of the first test issue",
+			Content:    "This is the body of the first test issue",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "open",
+			Milestone:  "Milestone AAAA",
+			Created:    time.Date(2023, time.October, 13, 3, 57, 42, 0, time.UTC),
+			Updated:    time.Date(2025, time.June, 25, 6, 25, 45, 0, time.UTC),
+			Closed:     timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			Labels: []*base.Label{
+				{
+					Name: "aaaa",
+				},
+				{
+					Name: "bbbb",
+				},
+				{
+					Name: "Priority/Epic",
+				},
+			},
+		},
+	}, issues)
+
+	// Testing comments under issue tickets
+	comments, _, err := downloader.GetComments(issues[0])
+	require.NoError(t, err)
+	assertCommentsEqual(t, []*base.Comment{
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.October, 13, 4, 3, 30, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue tagged with: cccc, dddd",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.October, 13, 4, 6, 4, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "The is the first comment under the second test issue",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.October, 13, 4, 6, 16, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "The is the second comment under the second test issue",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.October, 13, 4, 7, 12, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue status updated to: Closed (was: Open)",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.May, 8, 4, 50, 21, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone BBBB",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 22, 52, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: None (was: Milestone BBBB)\n- Issue status updated to: Open (was: Closed)",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 23, 0o2, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue close_status updated to: Complete\n- Issue status updated to: Closed (was: Open)",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 24, 34, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone BBBB",
+		},
+		{
+			IssueIndex: 2,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 25, 57, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Rare",
+		},
+	}, comments)
+
+	prs, isEnd, err := downloader.GetPullRequests(1, 20)
+	require.NoError(t, err)
+	assert.True(t, isEnd)
+
+	// Testing pull requests migrated
+	assertPullRequestsEqual(t, []*base.PullRequest{
+		{
+			Number:     10,
+			Title:      "Change the branch identity to `test-ffff` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Created:    time.Date(2025, time.May, 19, 6, 12, 45, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 19, 6, 17, 11, 0, time.UTC),
+			Closed:     timePtr(time.Date(2025, time.May, 19, 6, 17, 11, 0, time.UTC)),
+			MergedTime: timePtr(time.Date(2025, time.May, 19, 6, 17, 11, 0, time.UTC)),
+			Merged:     true,
+			Labels: []*base.Label{
+				{
+					Name: "ffff",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-ffff",
+				SHA:      "1a6ccc212aa958a0fe76155c2907c889969a7224",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "01b420e2964928a15f790f9b7c1a0053e7b5f0a5",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+		{
+			Number:     9,
+			Title:      "Change the branch identity to `test-eeee` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Created:    time.Date(2025, time.May, 19, 6, 12, 41, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 19, 6, 14, 3, 0, time.UTC),
+			Closed:     timePtr(time.Date(2025, time.May, 19, 6, 14, 3, 0, time.UTC)),
+			MergedTime: timePtr(time.Date(2025, time.May, 19, 6, 14, 3, 0, time.UTC)),
+			Merged:     true,
+			Labels: []*base.Label{
+				{
+					Name: "eeee",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-eeee",
+				SHA:      "01b420e2964928a15f790f9b7c1a0053e7b5f0a5",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+		{
+			Number:     8,
+			Title:      "Change the branch identity to `test-dddd` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Created:    time.Date(2025, time.May, 5, 6, 45, 32, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 5, 6, 54, 13, 0, time.UTC),
+			Closed:     timePtr(time.Date(2025, time.May, 5, 6, 54, 13, 0, time.UTC)),
+			MergedTime: timePtr(time.Date(2025, time.May, 5, 6, 54, 13, 0, time.UTC)), // THIS IS WRONG
+			Merged:     false,
+			Labels: []*base.Label{
+				{
+					Name: "dddd",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-dddd",
+				SHA:      "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+		{
+			Number:     7,
+			Title:      "Change the branch identity to `test-cccc` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Created:    time.Date(2025, time.May, 5, 6, 45, 6, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 5, 6, 54, 3, 0, time.UTC),          // IT SHOULD BE NIL
+			Closed:     timePtr(time.Date(2025, time.May, 5, 6, 54, 3, 0, time.UTC)), // IT is CLOSED, Not MERGED so SHOULD NOT BE NIL
+			MergedTime: timePtr(time.Date(2025, time.May, 5, 6, 54, 3, 0, time.UTC)), // THIS IS WRONG
+			Merged:     false,
+			Labels: []*base.Label{
+				{
+					Name: "cccc",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-cccc",
+				SHA:      "f1246e331cade9341b9e4f311b7a134f99893d21",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+		{
+			Number:     6,
+			Title:      "Change the branch identity to `test-bbbb` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "open",
+			Created:    time.Date(2025, time.May, 5, 6, 44, 30, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 19, 8, 30, 50, 0, time.UTC),
+			Closed:     timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			MergedTime: timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			Merged:     false,
+			Labels: []*base.Label{
+				{
+					Name: "bbbb",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-bbbb",
+				SHA:      "2d40761dc53e6fa060ac49d88e1452c6751d4b1c",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+		{
+			Number:     5,
+			Title:      "Change the branch identity to `test-aaaa` in the README.md file",
+			Content:    "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "open",
+			Created:    time.Date(2025, time.May, 5, 6, 43, 57, 0, time.UTC),
+			Updated:    time.Date(2025, time.May, 19, 6, 29, 45, 0, time.UTC),
+			Closed:     timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			MergedTime: timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			Merged:     false,
+			Labels: []*base.Label{
+				{
+					Name: "aaaa",
+				},
+			},
+			Head: base.PullRequestBranch{
+				Ref:      "test-aaaa",
+				SHA:      "b55e5c91d2572d60a8d7e71b3d3003e523127bd4",
+				RepoName: "protop2g-test-srce",
+			},
+			Base: base.PullRequestBranch{
+				Ref:      "main",
+				SHA:      "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7",
+				RepoName: "protop2g-test-srce",
+			},
+		},
+	}, prs)
+
+	// Testing comments under pull requests
+	comments, _, err = downloader.GetComments(prs[5])
+	require.NoError(t, err)
+	assertCommentsEqual(t, []*base.Comment{
+		{
+			IssueIndex: 5,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.May, 5, 6, 44, 13, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: aaaa",
+		},
+		{
+			IssueIndex: 5,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.May, 7, 5, 25, 21, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "This is the first comment under this pull request.",
+		},
+		{
+			IssueIndex: 5,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.May, 7, 5, 25, 29, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "This is the second comment under this pull request.",
+		},
+	}, comments)
+
+	// Testing milestones migration
+	milestones, err := downloader.GetMilestones()
+	require.NoError(t, err)
+	dict := map[string]*base.Milestone{
+		"Milestone AAAA": {
+			Title:    "Milestone AAAA",
+			Deadline: timePtr(time.Date(2025, time.December, 12, 0, 0, 0, 0, time.UTC)),
+			State:    "open",
+		},
+		"Milestone BBBB": {
+			Title:    "Milestone BBBB",
+			Deadline: timePtr(time.Date(2025, time.December, 12, 0, 0, 0, 0, time.UTC)),
+			State:    "closed",
+		},
+		"Milestone CCCC": {
+			Title:    "Milestone CCCC",
+			Deadline: timePtr(time.Date(2025, time.December, 12, 0, 0, 0, 0, time.UTC)),
+			State:    "open",
+		},
+		"Milestone DDDD": {
+			Title:    "Milestone DDDD",
+			Deadline: timePtr(time.Date(2025, time.December, 12, 0, 0, 0, 0, time.UTC)),
+			State:    "closed",
+		},
+	}
+
+	// We do not like when tests fail just because of dissimilar ordering
+	for _, item := range milestones {
+		assertMilestoneEqual(t, item, dict[item.Title])
+	}
+}
+
+func TestPagureDownloadRepoWithPrivateIssues(t *testing.T) {
+	// Skip tests if Pagure token is not found
+	cloneUser := os.Getenv("PAGURE_CLONE_USER")
+	clonePassword := os.Getenv("PAGURE_CLONE_PASSWORD")
+	apiUser := os.Getenv("PAGURE_API_USER")
+	apiPassword := os.Getenv("PAGURE_API_TOKEN")
+	if apiUser == "" || apiPassword == "" {
+		t.Skip("skipped test because a PAGURE_ variable was not in the environment")
+	}
+
+	cloneAddr := fmt.Sprintf("https://%s:%s@pagure.io/protop2g-test-srce.git", cloneUser, clonePassword)
+	u, _ := url.Parse(cloneAddr)
+
+	fixtPath := "./testdata/pagure/full_download/authorized"
+	server := unittest.NewMockWebServer(t, "https://pagure.io", fixtPath, false)
+	defer server.Close()
+
+	factory := &PagureDownloaderFactory{}
+	downloader, err := factory.New(t.Context(), base.MigrateOptions{
+		CloneAddr:    u.String(),
+		AuthUsername: apiUser,
+		AuthPassword: apiPassword,
+		AuthToken:    apiPassword,
+	})
+	require.NoError(t, err)
+
+	repo, err := downloader.GetRepoInfo()
+	require.NoError(t, err)
+
+	// Testing repository contents migration
+	assertRepositoryEqual(t, &base.Repository{
+		Name:        "protop2g-test-srce",
+		Owner:       "",
+		Description: "The source namespace for the Pagure Exporter project to run tests against",
+		CloneURL:    cloneAddr,
+		OriginalURL: strings.ReplaceAll(cloneAddr, ".git", ""),
+	}, repo)
+
+	topics, err := downloader.GetTopics()
+	require.NoError(t, err)
+
+	// Testing repository topics migration
+	assert.Equal(t, []string{"srce", "test", "gridhead", "protop2g"}, topics)
+
+	// Testing labels migration
+	labels, err := downloader.GetLabels()
+	require.NoError(t, err)
+	assert.Len(t, labels, 15)
+
+	// Testing issue tickets probing
+	issues, isEnd, err := downloader.GetIssues(1, 20)
+	require.NoError(t, err)
+	assert.True(t, isEnd)
+
+	// Testing issue tickets migration
+	assertIssuesEqual(t, []*base.Issue{
+		{
+			Number:     4,
+			Title:      "This is the title of the fourth test issue",
+			Content:    "This is the body of the fourth test issue",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "closed",
+			Milestone:  "Milestone DDDD",
+			Created:    time.Date(2023, time.November, 21, 8, 6, 56, 0, time.UTC),
+			Updated:    time.Date(2025, time.June, 25, 6, 26, 26, 0, time.UTC),
+			Closed:     timePtr(time.Date(2025, time.June, 25, 6, 23, 51, 0, time.UTC)),
+			Labels: []*base.Label{
+				{
+					Name: "gggg",
+				},
+				{
+					Name: "hhhh",
+				},
+				{
+					Name: "Closed As/Baseless",
+				},
+				{
+					Name: "Priority/Common",
+				},
+			},
+		},
+		{
+			Number:     3,
+			Title:      "This is the title of the third test issue",
+			Content:    "This is the body of the third test issue",
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			State:      "open",
+			Milestone:  "Milestone CCCC",
+			Created:    time.Date(2023, time.November, 21, 8, 3, 57, 0, time.UTC),
+			Updated:    time.Date(2025, time.June, 25, 6, 26, 7, 0, time.UTC),
+			Closed:     timePtr(time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC)),
+			Labels: []*base.Label{
+				{
+					Name: "eeee",
+				},
+				{
+					Name: "ffff",
+				},
+				{
+					Name: "Priority/Uncommon",
+				},
+			},
+		},
+	}, issues)
+
+	// Testing comments under issue tickets
+	comments, _, err := downloader.GetComments(issues[0])
+	require.NoError(t, err)
+	assertCommentsEqual(t, []*base.Comment{
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.November, 21, 8, 7, 25, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "This is the first comment under the fourth test issue",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.November, 21, 8, 7, 34, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "This is the second comment under the fourth test issue",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2023, time.November, 21, 8, 8, 1, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue status updated to: Closed (was: Open)",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.May, 8, 4, 50, 46, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone DDDD",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 23, 46, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: None (was: Milestone DDDD)\n- Issue status updated to: Open (was: Closed)",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 23, 52, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue close_status updated to: Baseless\n- Issue status updated to: Closed (was: Open)",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 24, 55, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone DDDD",
+		},
+		{
+			IssueIndex: 4,
+			PosterName: "t0xic0der",
+			PosterID:   -1,
+			Created:    time.Date(2025, time.June, 25, 6, 26, 26, 0, time.UTC),
+			Updated:    time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC),
+			Content:    "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Common",
+		},
+	}, comments)
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce
new file mode 100644
index 0000000000..5f569b145c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce
@@ -0,0 +1,85 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:51:21 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 1464
+content-security-policy: default-src 'self';script-src 'self' 'nonce-Tr8ktNGt3XoBWQBIXrrPTeA1v'; style-src 'self' 'nonce-Tr8ktNGt3XoBWQBIXrrPTeA1v'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmI4NGRmYWMyY2Q2MzVlOWRkOTQwMGYwNzk2NzdlOGQxN2UxYTJlMCJ9.G2IX6Q.ETAG_sYgE1V9xYQNy_CD4HOP32Q; Expires=Sat, 23-Aug-2025 06:51:21 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "access_groups": {
+    "admin": [], 
+    "collaborator": [], 
+    "commit": [], 
+    "ticket": []
+  }, 
+  "access_users": {
+    "admin": [
+      "ryanlerch"
+    ], 
+    "collaborator": [], 
+    "commit": [], 
+    "owner": [
+      "t0xic0der"
+    ], 
+    "ticket": []
+  }, 
+  "close_status": [
+    "Complete", 
+    "Baseless"
+  ], 
+  "custom_keys": [], 
+  "date_created": "1697168063", 
+  "date_modified": "1744795940", 
+  "description": "The source namespace for the Pagure Exporter project to run tests against", 
+  "full_url": "https://pagure.io/protop2g-test-srce", 
+  "fullname": "protop2g-test-srce", 
+  "id": 17042, 
+  "milestones": {
+    "Milestone AAAA": {
+      "active": true, 
+      "date": "1765497600"
+    }, 
+    "Milestone BBBB": {
+      "active": false, 
+      "date": "1765497600"
+    }, 
+    "Milestone CCCC": {
+      "active": true, 
+      "date": "1765497600"
+    }, 
+    "Milestone DDDD": {
+      "active": false, 
+      "date": "1765497600"
+    }
+  }, 
+  "name": "protop2g-test-srce", 
+  "namespace": null, 
+  "parent": null, 
+  "priorities": {
+    "": "", 
+    "1": "Common", 
+    "2": "Uncommon", 
+    "3": "Rare", 
+    "4": "Epic", 
+    "5": "Mythic"
+  }, 
+  "tags": [
+    "srce", 
+    "test", 
+    "gridhead", 
+    "protop2g"
+  ], 
+  "url_path": "protop2g-test-srce", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo
new file mode 100644
index 0000000000..e31c4193e0
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:44:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 452
+content-security-policy: default-src 'self';script-src 'self' 'nonce-jtS0HiLSSKCUK3FUuLv7XD9KG'; style-src 'self' 'nonce-jtS0HiLSSKCUK3FUuLv7XD9KG'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiY2EzN2Y5MTI1ZjkxNTkzMDViMWQ5ZGVhYjkyNzVlZTkwNmVjYzgzYiJ9.G2IWRw.1ZmhWySKFk3Lw_bA-EwmcNCgcz0; Expires=Sat, 23-Aug-2025 06:44:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1747635011, 
+  "commit_time_offset": 0, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "message": "Change the branch identity to `test-eeee` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "1e8fa9a17b4b4ddde50f334626b0a5497070cff7"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo
new file mode 100644
index 0000000000..722b59a6dd
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:44:57 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-6gKus9S40eu36HFYePUnyxB36'; style-src 'self' 'nonce-6gKus9S40eu36HFYePUnyxB36'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZjM5ZTYyYWM5NDViYTYwMjg1MjFlMTAzNjU4OWQ3Zjc1NjA5ZmUzMSJ9.G2IWaQ._b9edyW_4DSX-umHlyVib496s00; Expires=Sat, 23-Aug-2025 06:44:57 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169509, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "message": "Change the branch identity to `test-dddd` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "586a1e8a79e572691dc086ef7bf4e2f6d34c5254"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo
new file mode 100644
index 0000000000..8d3fb6f5f2
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:43:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 452
+content-security-policy: default-src 'self';script-src 'self' 'nonce-bDXeQlGZOYsS26Mr1BJPgodzY'; style-src 'self' 'nonce-bDXeQlGZOYsS26Mr1BJPgodzY'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiNDRkYmIwMjQwODI1ODc4MGUzYWM4ZDZhZTkxYWQ2NTkyMDFhNTg0ZSJ9.G2IWIw.U2Rb6xUm4Wk9ODweB3hH1cggWkM; Expires=Sat, 23-Aug-2025 06:43:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1747635352, 
+  "commit_time_offset": 0, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "message": "Change the branch identity to `test-ffff` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "01b420e2964928a15f790f9b7c1a0053e7b5f0a5"
+  ], 
+  "tree_id": "0c5e64a6b912cb0c3d66e66896fa98a98da69fe4"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo
new file mode 100644
index 0000000000..852a4b724d
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:46:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-JLGc3LbKkMMzOnQTvUIIZbAwF'; style-src 'self' 'nonce-JLGc3LbKkMMzOnQTvUIIZbAwF'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYTE0Y2EzMTZiMWRkZGZjOTJjMjkwZTkyNjM5OWEzYWZiNjA0OTZiMCJ9.G2IWvw.SNBn8NelY5GBQ-8SmLY-Uwy-uq0; Expires=Sat, 23-Aug-2025 06:46:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169040, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "message": "Change the branch identity to `test-bbbb` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "7a23fc15f5a1463f2c425f0146def7c19ecf6c88"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo
new file mode 100644
index 0000000000..a35fb1f416
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:46:59 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-ORfdixyFztBA0Sx54SlhQuMio'; style-src 'self' 'nonce-ORfdixyFztBA0Sx54SlhQuMio'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmY2MjEyYzNmMDkzMmZkZDMxYjYwYzVmMDdjYzEzY2JhZTJkMjVmZCJ9.G2IW4w.JCI6ih36NlW5IPwNX1LaCbb6v5U; Expires=Sat, 23-Aug-2025 06:46:59 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169185, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "message": "Change the branch identity to `test-aaaa` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "e7911825d29e73f260de95d5070898ccbe6340a6"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo
new file mode 100644
index 0000000000..8e161ce97c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:45:31 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-chsmQCN0V1J9MIqK5NU6MqBJv'; style-src 'self' 'nonce-chsmQCN0V1J9MIqK5NU6MqBJv'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZDNmYWUzNTBlOWZkNDY0MTJlOWNkMjQ0M2FjZmYyY2VkZjBlY2ZiYSJ9.G2IWjA.co1poP1T_e07frtYRBAkxcp2RTM; Expires=Sat, 23-Aug-2025 06:45:32 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169354, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "message": "Change the branch identity to `test-cccc` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "f1e37736d409bb136451dfc8e3a2017d3af2ce7d"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F3 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F3
new file mode 100644
index 0000000000..d9b5d17073
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F3
@@ -0,0 +1,17 @@
+HTTP/2 404 
+date: Wed, 23 Jul 2025 06:17:46 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 233
+content-security-policy: default-src 'self';script-src 'self' 'nonce-AyzMgRLEDXIM7Oiv1cbBRx6WC'; style-src 'self' 'nonce-AyzMgRLEDXIM7Oiv1cbBRx6WC'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiMGMxMmJkYmFmNWY1ODBiNzQxY2Q2Y2RiODk1OTRmOWMwOGY1OWM2ZSJ9.G2IQCg.BSeYpRe9-FITZnjNS1EKHjwOFmM; Expires=Sat, 23-Aug-2025 06:17:46 GMT; Secure; HttpOnly; Path=/
+content-type: text/html; charset=UTF-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<title>404 Not Found</title>
+<h1>Not Found</h1>
+<p>The requested URL was not found on the server.  If you entered the URL manually please check your spelling and try again.</p>
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F4 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F4
new file mode 100644
index 0000000000..6aa95bba6a
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F4
@@ -0,0 +1,17 @@
+HTTP/2 404 
+date: Wed, 23 Jul 2025 06:17:58 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 233
+content-security-policy: default-src 'self';script-src 'self' 'nonce-F7TmwHL5oVhCcN5Mddi8OGms7'; style-src 'self' 'nonce-F7TmwHL5oVhCcN5Mddi8OGms7'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOTYwOWIyN2EzYjA4NmE5OTZhNjk3NWU5ZWM4OTI1MWNkN2U5OWYyMiJ9.G2IQFg.qReOtqa1f6EAhBqYOj_aQRCvgac; Expires=Sat, 23-Aug-2025 06:17:58 GMT; Secure; HttpOnly; Path=/
+content-type: text/html; charset=UTF-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<title>404 Not Found</title>
+<h1>Not Found</h1>
+<p>The requested URL was not found on the server.  If you entered the URL manually please check your spelling and try again.</p>
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues
new file mode 100644
index 0000000000..84a9e44c35
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues
@@ -0,0 +1,299 @@
+HTTP/2 200
+date: Wed, 30 Jul 2025 05:15:59 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 18702
+content-security-policy: default-src 'self';script-src 'self' 'nonce-SA5GWMgMPH5tNiDy97SIr6jxM'; style-src 'self' 'nonce-SA5GWMgMPH5tNiDy97SIr6jxM'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOTA1NjdkYzFjN2QyMjFhMGU3NTVmN2ZlMDYzZTgyMTQ0ZTM3NzFkNiJ9.G2s8Dw.36fFhcCc63_kPkxcJp8tz-ufC8Y; Expires=Sat, 30-Aug-2025 05:15:59 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "args": {
+    "assignee": null,
+    "author": null,
+    "milestones": [],
+    "no_stones": null,
+    "order": null,
+    "priority": null,
+    "since": null,
+    "status": "all",
+    "tags": []
+  },
+  "issues": [
+    {
+      "assignee": null,
+      "blocks": [],
+      "close_status": "Baseless",
+      "closed_at": "1750832631",
+      "closed_by": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      },
+      "comments": [
+        {
+          "comment": "This is the first comment under the fourth test issue",
+          "date_created": "1700554045",
+          "edited_on": null,
+          "editor": null,
+          "id": 885231,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "This is the second comment under the fourth test issue",
+          "date_created": "1700554054",
+          "edited_on": null,
+          "editor": null,
+          "id": 885232,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue status updated to: Closed (was: Open)",
+          "date_created": "1700554081",
+          "edited_on": null,
+          "editor": null,
+          "id": 885233,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone DDDD",
+          "date_created": "1746679846",
+          "edited_on": null,
+          "editor": null,
+          "id": 971680,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: None (was: Milestone DDDD)\n- Issue status updated to: Open (was: Closed)",
+          "date_created": "1750832626",
+          "edited_on": null,
+          "editor": null,
+          "id": 976715,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue close_status updated to: Baseless\n- Issue status updated to: Closed (was: Open)",
+          "date_created": "1750832632",
+          "edited_on": null,
+          "editor": null,
+          "id": 976716,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone DDDD",
+          "date_created": "1750832695",
+          "edited_on": null,
+          "editor": null,
+          "id": 976718,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Common",
+          "date_created": "1750832786",
+          "edited_on": null,
+          "editor": null,
+          "id": 976722,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ],
+      "content": "This is the body of the fourth test issue",
+      "custom_fields": [],
+      "date_created": "1700554016",
+      "depends": [],
+      "full_url": "https://pagure.io/protop2g-test-srce/issue/4",
+      "id": 4,
+      "last_updated": "1750832786",
+      "milestone": "Milestone DDDD",
+      "priority": 1,
+      "private": true,
+      "related_prs": [],
+      "status": "Closed",
+      "tags": [
+        "gggg",
+        "hhhh"
+      ],
+      "title": "This is the title of the fourth test issue",
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      }
+    },
+    {
+      "assignee": null,
+      "blocks": [],
+      "close_status": null,
+      "closed_at": null,
+      "closed_by": null,
+      "comments": [
+        {
+          "comment": "This is the first comment under the third test issue",
+          "date_created": "1700553880",
+          "edited_on": null,
+          "editor": null,
+          "id": 885229,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "This is the second comment under the third test issue",
+          "date_created": "1700553892",
+          "edited_on": null,
+          "editor": null,
+          "id": 885230,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone CCCC",
+          "date_created": "1746679833",
+          "edited_on": null,
+          "editor": null,
+          "id": 971679,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Uncommon",
+          "date_created": "1750832767",
+          "edited_on": null,
+          "editor": null,
+          "id": 976721,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ],
+      "content": "This is the body of the third test issue",
+      "custom_fields": [],
+      "date_created": "1700553837",
+      "depends": [],
+      "full_url": "https://pagure.io/protop2g-test-srce/issue/3",
+      "id": 3,
+      "last_updated": "1750832767",
+      "milestone": "Milestone CCCC",
+      "priority": 2,
+      "private": true,
+      "related_prs": [],
+      "status": "Open",
+      "tags": [
+        "eeee",
+        "ffff"
+      ],
+      "title": "This is the title of the third test issue",
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      }
+    },
+  ],
+  "pagination": {
+    "first": "https://pagure.io/api/0/protop2g-test-srce/issues?per_page=20&status=all&page=1",
+    "last": "https://pagure.io/api/0/protop2g-test-srce/issues?per_page=20&status=all&page=1",
+    "next": null,
+    "page": 1,
+    "pages": 1,
+    "per_page": 20,
+    "prev": null
+  },
+  "total_issues": 2
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10
new file mode 100644
index 0000000000..e43f97a590
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10
@@ -0,0 +1,259 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:21:04 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 6179
+content-security-policy: default-src 'self';script-src 'self' 'nonce-BK18r6rq2MUNhc0CXTZKJQyJY'; style-src 'self' 'nonce-BK18r6rq2MUNhc0CXTZKJQyJY'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOTQ3NGFiNjdkNjdlZjNiNWNmOWYwZGFmODg1MDMxMTYzNTc5OTkxMyJ9.G2IQ0A.97bsQ3k_CAN3UOID130UESba38M; Expires=Sat, 23-Aug-2025 06:21:04 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "branch": "main", 
+  "branch_from": "test-ffff", 
+  "cached_merge_status": "unknown", 
+  "closed_at": "1747635431", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: ffff\n- Request assigned", 
+      "commit": null, 
+      "date_created": "1747635211", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219623, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "rebased onto 01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+      "commit": null, 
+      "date_created": "1747635389", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219625, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been merged by t0xic0der", 
+      "commit": null, 
+      "date_created": "1747635431", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219626, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "commit_stop": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "date_created": "1747635165", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/10", 
+  "id": 10, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>", 
+  "last_updated": "1747635431", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Merged", 
+  "tags": [
+    "ffff"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-ffff` in the README.md file", 
+  "uid": "d3b7100abf8b4b02aa220d899e063295", 
+  "updated_on": "1747635431", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5
new file mode 100644
index 0000000000..be1c0e3a25
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5
@@ -0,0 +1,249 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:19:26 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5859
+content-security-policy: default-src 'self';script-src 'self' 'nonce-x3rXi7f95hPSGE2mV9PPJv0Db'; style-src 'self' 'nonce-x3rXi7f95hPSGE2mV9PPJv0Db'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiODFiMTQzZWQwZGEzMWIxNmE3NTk1ODYyNWE0MGZjNjcwNThmMDc3ZSJ9.G2IQbg.9qdYqcrGIqnCKtjsWYjcfMCTzok; Expires=Sat, 23-Aug-2025 06:19:26 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-aaaa", 
+  "cached_merge_status": "CONFLICTS", 
+  "closed_at": null, 
+  "closed_by": null, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: aaaa", 
+      "commit": null, 
+      "date_created": "1746427453", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219086, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the first comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595521", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219190, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the second comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595529", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219191, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "commit_stop": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "date_created": "1746427437", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/5", 
+  "id": 5, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1747636185", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Open", 
+  "tags": [
+    "aaaa"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-aaaa` in the README.md file", 
+  "uid": "f9e737c5ccc1434e9798cfd49d192538", 
+  "updated_on": "1746595529", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6
new file mode 100644
index 0000000000..878989a6cd
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6
@@ -0,0 +1,249 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:19:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5859
+content-security-policy: default-src 'self';script-src 'self' 'nonce-3mH3rM1hwmaCorIQiTfUsFwdZ'; style-src 'self' 'nonce-3mH3rM1hwmaCorIQiTfUsFwdZ'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiNWY5OWMwYjViOTkzZjM0YTY3OTJiYTZmNDk4YzY3MzUwMzY3MzY2OCJ9.G2IQgw.dxyk0aB89uDJGN15BTWrZEvCFWg; Expires=Sat, 23-Aug-2025 06:19:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-bbbb", 
+  "cached_merge_status": "CONFLICTS", 
+  "closed_at": null, 
+  "closed_by": null, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: bbbb", 
+      "commit": null, 
+      "date_created": "1746427480", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219087, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the first comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595539", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219192, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the second comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595552", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219193, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "commit_stop": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "date_created": "1746427470", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/6", 
+  "id": 6, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1747643450", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Open", 
+  "tags": [
+    "bbbb"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-bbbb` in the README.md file", 
+  "uid": "9cab89d6bb8c499e8fcb47926f1f5806", 
+  "updated_on": "1746595552", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7
new file mode 100644
index 0000000000..51c269273c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7
@@ -0,0 +1,234 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:00 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5458
+content-security-policy: default-src 'self';script-src 'self' 'nonce-Bq1C3s4EngIGuBgtUcYdmK2M8'; style-src 'self' 'nonce-Bq1C3s4EngIGuBgtUcYdmK2M8'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZjUwNDcwNWQ4Y2UxZTRjODRlNjQxYTA0NzVlNDA5NGQwNzI4YTY1NyJ9.G2IQkA.KtxZfzau2wOwMTyfG_xNBHTMHSI; Expires=Sat, 23-Aug-2025 06:20:00 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-cccc", 
+  "cached_merge_status": "FFORWARD", 
+  "closed_at": "1746428043", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: cccc", 
+      "commit": null, 
+      "date_created": "1746427513", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219088, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been closed by t0xic0der", 
+      "commit": null, 
+      "date_created": "1746428043", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219090, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "commit_stop": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "date_created": "1746427506", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/7", 
+  "id": 7, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1746428043", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Closed", 
+  "tags": [
+    "cccc"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-cccc` in the README.md file", 
+  "uid": "f696feab56b84557b4d4a8a4462420ee", 
+  "updated_on": "1746428043", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8
new file mode 100644
index 0000000000..45ae72d6e8
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8
@@ -0,0 +1,234 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:17 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5458
+content-security-policy: default-src 'self';script-src 'self' 'nonce-OxOLryXyFpTZ0hyi7t17U5IG0'; style-src 'self' 'nonce-OxOLryXyFpTZ0hyi7t17U5IG0'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiM2I3NWQwYzBhY2YxMjhmYTU0YmU5NzEzYzcyNjNjZTQ4NjFlNDE5ZCJ9.G2IQoQ.Ds29JFMXbO3q2kBPxmfx2kQ7YjA; Expires=Sat, 23-Aug-2025 06:20:17 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-dddd", 
+  "cached_merge_status": "FFORWARD", 
+  "closed_at": "1746428053", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: dddd", 
+      "commit": null, 
+      "date_created": "1746427540", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219089, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been closed by t0xic0der", 
+      "commit": null, 
+      "date_created": "1746428053", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219091, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "commit_stop": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "date_created": "1746427532", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/8", 
+  "id": 8, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1746428053", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Closed", 
+  "tags": [
+    "dddd"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-dddd` in the README.md file", 
+  "uid": "493b294044fd48e18f424210c919d8de", 
+  "updated_on": "1746428053", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9 b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9
new file mode 100644
index 0000000000..2e19157948
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9
@@ -0,0 +1,239 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:51 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5628
+content-security-policy: default-src 'self';script-src 'self' 'nonce-RVreTe5AdtWf0rvyk7mxX40mb'; style-src 'self' 'nonce-RVreTe5AdtWf0rvyk7mxX40mb'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiM2MyYzdlY2E0MDYzNWRmZjRhMDc2MGE0OTg2MjNhMTU4MWNhZDg4OSJ9.G2IQww.VZpiXbZftgigHkiS15g8DF6iQSY; Expires=Sat, 23-Aug-2025 06:20:51 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "branch": "main", 
+  "branch_from": "test-eeee", 
+  "cached_merge_status": "unknown", 
+  "closed_at": "1747635243", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: eeee\n- Request assigned", 
+      "commit": null, 
+      "date_created": "1747635200", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219622, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been merged by t0xic0der", 
+      "commit": null, 
+      "date_created": "1747635243", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219624, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "commit_stop": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "date_created": "1747635161", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/9", 
+  "id": 9, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>", 
+  "last_updated": "1747635243", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Merged", 
+  "tags": [
+    "eeee"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-eeee` in the README.md file", 
+  "uid": "f2ad806e430a40bd8ee5894484338df4", 
+  "updated_on": "1747635243", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests
new file mode 100644
index 0000000000..15b69e8f03
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests
@@ -0,0 +1,507 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:18:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 14090
+content-security-policy: default-src 'self';script-src 'self' 'nonce-t1H8BCX7kXOBmXS0wHPpBrAhK'; style-src 'self' 'nonce-t1H8BCX7kXOBmXS0wHPpBrAhK'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiODAwYWYyZGI3MjZlMzA2ZTdmNTdlMmIwNGVkNmU3YTBmNDYwZDUyMyJ9.G2IQRw.EDXBH36zsKcHKDETH_g7miO_r_w; Expires=Sat, 23-Aug-2025 06:18:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "args": {
+    "assignee": null, 
+    "author": null, 
+    "page": 1, 
+    "per_page": 20, 
+    "status": true, 
+    "tags": []
+  }, 
+  "pagination": {
+    "first": "https://pagure.io/api/0/protop2g-test-srce/pull-requests?per_page=20&page=1", 
+    "last": "https://pagure.io/api/0/protop2g-test-srce/pull-requests?per_page=20&page=1", 
+    "next": null, 
+    "page": 1, 
+    "pages": 1, 
+    "per_page": 20, 
+    "prev": null
+  }, 
+  "requests": [
+    {
+      "assignee": null, 
+      "branch": "main", 
+      "branch_from": "test-bbbb", 
+      "cached_merge_status": "CONFLICTS", 
+      "closed_at": null, 
+      "closed_by": null, 
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: bbbb", 
+          "commit": null, 
+          "date_created": "1746427480", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219087, 
+          "line": null, 
+          "notification": true, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the first comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595539", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219192, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the second comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595552", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219193, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ], 
+      "commit_start": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+      "commit_stop": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+      "date_created": "1746427470", 
+      "full_url": "https://pagure.io/protop2g-test-srce/pull-request/6", 
+      "id": 6, 
+      "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+      "last_updated": "1747643450", 
+      "project": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "remote_git": null, 
+      "repo_from": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "status": "Open", 
+      "tags": [
+        "bbbb"
+      ], 
+      "threshold_reached": null, 
+      "title": "Change the branch identity to `test-bbbb` in the README.md file", 
+      "uid": "9cab89d6bb8c499e8fcb47926f1f5806", 
+      "updated_on": "1746595552", 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "assignee": null, 
+      "branch": "main", 
+      "branch_from": "test-aaaa", 
+      "cached_merge_status": "CONFLICTS", 
+      "closed_at": null, 
+      "closed_by": null, 
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: aaaa", 
+          "commit": null, 
+          "date_created": "1746427453", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219086, 
+          "line": null, 
+          "notification": true, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the first comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595521", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219190, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the second comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595529", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219191, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ], 
+      "commit_start": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+      "commit_stop": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+      "date_created": "1746427437", 
+      "full_url": "https://pagure.io/protop2g-test-srce/pull-request/5", 
+      "id": 5, 
+      "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+      "last_updated": "1747636185", 
+      "project": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "remote_git": null, 
+      "repo_from": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "status": "Open", 
+      "tags": [
+        "aaaa"
+      ], 
+      "threshold_reached": null, 
+      "title": "Change the branch identity to `test-aaaa` in the README.md file", 
+      "uid": "f9e737c5ccc1434e9798cfd49d192538", 
+      "updated_on": "1746595529", 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "total_requests": 2
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa
new file mode 100644
index 0000000000..d0f24e646e
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:34:39 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-gI8Srx27RgY20Zqw5vVkWVORV'; style-src 'self' 'nonce-gI8Srx27RgY20Zqw5vVkWVORV'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZmJhYTlmMTAzYzYxMWE5NmZiZDNkZjE1ZmRiZGQzYTA5YTQ1YTM2YyJ9.G2IF7w.CLP1edDfZSoJcXjoUNt40swcBV8; Expires=Sat, 23-Aug-2025 05:34:39 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "aaaa", 
+  "tag_color": "#ff0000", 
+  "tag_description": "aaaa"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb
new file mode 100644
index 0000000000..a859096f25
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:34:50 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-wgQpgRvwBbyoY9WWTv55wb8Dd'; style-src 'self' 'nonce-wgQpgRvwBbyoY9WWTv55wb8Dd'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZWU4ZDUxYzY4NmUzMzM4ODg4YmRmMjQwYmU3ODVhOTA4MzQ4N2Q2NiJ9.G2IF-g.nG1k1zU4b9Eo9WFGCas8R9a5-Vg; Expires=Sat, 23-Aug-2025 05:34:50 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "bbbb", 
+  "tag_color": "#ff0000", 
+  "tag_description": "bbbb"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc
new file mode 100644
index 0000000000..c4fdc9aa46
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:35:02 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-kAxTKES1vWlzLCIScejGQ5JpX'; style-src 'self' 'nonce-kAxTKES1vWlzLCIScejGQ5JpX'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYjhhM2YxNjJhZDYwYWU5NzE4NmQ4NDBkMzJlOWNkYmYxN2Y2NjBmMyJ9.G2IGBg.oA7d9DJHW4_ilpbiVkbveF5dM3Q; Expires=Sat, 23-Aug-2025 05:35:02 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "cccc", 
+  "tag_color": "#ffff00", 
+  "tag_description": "cccc"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd
new file mode 100644
index 0000000000..db9ad09a74
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-rzXQsxeaBjeye4rVcEn3aSWKa'; style-src 'self' 'nonce-rzXQsxeaBjeye4rVcEn3aSWKa'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiY2VhZjRhOTlkZWUxZDcxODg2NWIyN2JhZGY4ZjUyMjcxZTdkZGU0MyJ9.G2IGVw.JCK3tXfD0aOgDdIAMv5MlFkl-SY; Expires=Sat, 23-Aug-2025 05:36:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "dddd", 
+  "tag_color": "#ffff00", 
+  "tag_description": "dddd"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee
new file mode 100644
index 0000000000..eac0faf464
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:34 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-gs07ooad3wPkkzZKAQDHDTrMl'; style-src 'self' 'nonce-gs07ooad3wPkkzZKAQDHDTrMl'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOGEyNDUwYzk5MDY2ZjJhZGQyNDhlZmZmM2QxN2UxZTM0ODI2NWFhZiJ9.G2IGYg.hM6ZKEPDXtOvTWlSPeQBLiZjCO4; Expires=Sat, 23-Aug-2025 05:36:34 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "eeee", 
+  "tag_color": "#00ff00", 
+  "tag_description": "eeee"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff
new file mode 100644
index 0000000000..af5935aa46
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:48 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-hiIOP1ZdLfgxJERlzriEOATjs'; style-src 'self' 'nonce-hiIOP1ZdLfgxJERlzriEOATjs'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYWMyNjBhNjE5MjI0OTQ0YTU2Yzc5YjNmNzU3ZTU2MTYzZGQwMGMwNSJ9.G2IGcQ.22KbaZBjPxJkpIoTBIn1UtVzEjI; Expires=Sat, 23-Aug-2025 05:36:49 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "ffff", 
+  "tag_color": "#00ff00", 
+  "tag_description": "ffff"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg
new file mode 100644
index 0000000000..28fd0ef15d
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:37:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-FYnaELqaJomAM4RnLtKUr7gbE'; style-src 'self' 'nonce-FYnaELqaJomAM4RnLtKUr7gbE'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOGExMmI2MGZhYTQyYTY5MmQ0MzNkNWFlZTU0YjE4M2NjY2NmYjI3MCJ9.G2IGkw.9-wL70lPAOlpIv8cusGLLA0Np_U; Expires=Sat, 23-Aug-2025 05:37:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "gggg", 
+  "tag_color": "#0000ff", 
+  "tag_description": "gggg"
+}
diff --git a/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags
new file mode 100644
index 0000000000..1176b532a4
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/authorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags
@@ -0,0 +1,26 @@
+HTTP/2 200
+date: Wed, 23 Jul 2025 05:16:48 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 142
+content-security-policy: default-src 'self';script-src 'self' 'nonce-T8LPhGGs1acv00t58vtBtVmwC'; style-src 'self' 'nonce-T8LPhGGs1acv00t58vtBtVmwC'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmQ2NTQ1MmFhZWJjZjA0OWIxNTI5MjBjODQyYzUzOGRkYmYyYTkwOSJ9.G2IBwA.pKqOBVDJrtKfyrbJPyuaRfFjnR4; Expires=Sat, 23-Aug-2025 05:16:48 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tags": [
+    "aaaa",
+    "bbbb",
+    "cccc",
+    "dddd",
+    "eeee",
+    "ffff",
+    "gggg",
+    "hhhh"
+  ],
+  "total_tags": 8
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce
new file mode 100644
index 0000000000..5f569b145c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce
@@ -0,0 +1,85 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:51:21 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 1464
+content-security-policy: default-src 'self';script-src 'self' 'nonce-Tr8ktNGt3XoBWQBIXrrPTeA1v'; style-src 'self' 'nonce-Tr8ktNGt3XoBWQBIXrrPTeA1v'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmI4NGRmYWMyY2Q2MzVlOWRkOTQwMGYwNzk2NzdlOGQxN2UxYTJlMCJ9.G2IX6Q.ETAG_sYgE1V9xYQNy_CD4HOP32Q; Expires=Sat, 23-Aug-2025 06:51:21 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "access_groups": {
+    "admin": [], 
+    "collaborator": [], 
+    "commit": [], 
+    "ticket": []
+  }, 
+  "access_users": {
+    "admin": [
+      "ryanlerch"
+    ], 
+    "collaborator": [], 
+    "commit": [], 
+    "owner": [
+      "t0xic0der"
+    ], 
+    "ticket": []
+  }, 
+  "close_status": [
+    "Complete", 
+    "Baseless"
+  ], 
+  "custom_keys": [], 
+  "date_created": "1697168063", 
+  "date_modified": "1744795940", 
+  "description": "The source namespace for the Pagure Exporter project to run tests against", 
+  "full_url": "https://pagure.io/protop2g-test-srce", 
+  "fullname": "protop2g-test-srce", 
+  "id": 17042, 
+  "milestones": {
+    "Milestone AAAA": {
+      "active": true, 
+      "date": "1765497600"
+    }, 
+    "Milestone BBBB": {
+      "active": false, 
+      "date": "1765497600"
+    }, 
+    "Milestone CCCC": {
+      "active": true, 
+      "date": "1765497600"
+    }, 
+    "Milestone DDDD": {
+      "active": false, 
+      "date": "1765497600"
+    }
+  }, 
+  "name": "protop2g-test-srce", 
+  "namespace": null, 
+  "parent": null, 
+  "priorities": {
+    "": "", 
+    "1": "Common", 
+    "2": "Uncommon", 
+    "3": "Rare", 
+    "4": "Epic", 
+    "5": "Mythic"
+  }, 
+  "tags": [
+    "srce", 
+    "test", 
+    "gridhead", 
+    "protop2g"
+  ], 
+  "url_path": "protop2g-test-srce", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo
new file mode 100644
index 0000000000..e31c4193e0
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F01b420e2964928a15f790f9b7c1a0053e7b5f0a5%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:44:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 452
+content-security-policy: default-src 'self';script-src 'self' 'nonce-jtS0HiLSSKCUK3FUuLv7XD9KG'; style-src 'self' 'nonce-jtS0HiLSSKCUK3FUuLv7XD9KG'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiY2EzN2Y5MTI1ZjkxNTkzMDViMWQ5ZGVhYjkyNzVlZTkwNmVjYzgzYiJ9.G2IWRw.1ZmhWySKFk3Lw_bA-EwmcNCgcz0; Expires=Sat, 23-Aug-2025 06:44:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1747635011, 
+  "commit_time_offset": 0, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "message": "Change the branch identity to `test-eeee` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "1e8fa9a17b4b4ddde50f334626b0a5497070cff7"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo
new file mode 100644
index 0000000000..722b59a6dd
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:44:57 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-6gKus9S40eu36HFYePUnyxB36'; style-src 'self' 'nonce-6gKus9S40eu36HFYePUnyxB36'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZjM5ZTYyYWM5NDViYTYwMjg1MjFlMTAzNjU4OWQ3Zjc1NjA5ZmUzMSJ9.G2IWaQ._b9edyW_4DSX-umHlyVib496s00; Expires=Sat, 23-Aug-2025 06:44:57 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169509, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "message": "Change the branch identity to `test-dddd` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "586a1e8a79e572691dc086ef7bf4e2f6d34c5254"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo
new file mode 100644
index 0000000000..8d3fb6f5f2
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F1a6ccc212aa958a0fe76155c2907c889969a7224%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:43:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 452
+content-security-policy: default-src 'self';script-src 'self' 'nonce-bDXeQlGZOYsS26Mr1BJPgodzY'; style-src 'self' 'nonce-bDXeQlGZOYsS26Mr1BJPgodzY'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiNDRkYmIwMjQwODI1ODc4MGUzYWM4ZDZhZTkxYWQ2NTkyMDFhNTg0ZSJ9.G2IWIw.U2Rb6xUm4Wk9ODweB3hH1cggWkM; Expires=Sat, 23-Aug-2025 06:43:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1747635352, 
+  "commit_time_offset": 0, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "message": "Change the branch identity to `test-ffff` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "01b420e2964928a15f790f9b7c1a0053e7b5f0a5"
+  ], 
+  "tree_id": "0c5e64a6b912cb0c3d66e66896fa98a98da69fe4"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo
new file mode 100644
index 0000000000..852a4b724d
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2F2d40761dc53e6fa060ac49d88e1452c6751d4b1c%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:46:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-JLGc3LbKkMMzOnQTvUIIZbAwF'; style-src 'self' 'nonce-JLGc3LbKkMMzOnQTvUIIZbAwF'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYTE0Y2EzMTZiMWRkZGZjOTJjMjkwZTkyNjM5OWEzYWZiNjA0OTZiMCJ9.G2IWvw.SNBn8NelY5GBQ-8SmLY-Uwy-uq0; Expires=Sat, 23-Aug-2025 06:46:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169040, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "message": "Change the branch identity to `test-bbbb` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "7a23fc15f5a1463f2c425f0146def7c19ecf6c88"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo
new file mode 100644
index 0000000000..a35fb1f416
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Fb55e5c91d2572d60a8d7e71b3d3003e523127bd4%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:46:59 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-ORfdixyFztBA0Sx54SlhQuMio'; style-src 'self' 'nonce-ORfdixyFztBA0Sx54SlhQuMio'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmY2MjEyYzNmMDkzMmZkZDMxYjYwYzVmMDdjYzEzY2JhZTJkMjVmZCJ9.G2IW4w.JCI6ih36NlW5IPwNX1LaCbb6v5U; Expires=Sat, 23-Aug-2025 06:46:59 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169185, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "message": "Change the branch identity to `test-aaaa` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "e7911825d29e73f260de95d5070898ccbe6340a6"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo
new file mode 100644
index 0000000000..8e161ce97c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fc%2Ff1246e331cade9341b9e4f311b7a134f99893d21%2Finfo
@@ -0,0 +1,25 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:45:31 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 454
+content-security-policy: default-src 'self';script-src 'self' 'nonce-chsmQCN0V1J9MIqK5NU6MqBJv'; style-src 'self' 'nonce-chsmQCN0V1J9MIqK5NU6MqBJv'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZDNmYWUzNTBlOWZkNDY0MTJlOWNkMjQ0M2FjZmYyY2VkZjBlY2ZiYSJ9.G2IWjA.co1poP1T_e07frtYRBAkxcp2RTM; Expires=Sat, 23-Aug-2025 06:45:32 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "author": "Akashdeep Dhar", 
+  "commit_time": 1697169354, 
+  "commit_time_offset": 330, 
+  "committer": "Akashdeep Dhar", 
+  "hash": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "message": "Change the branch identity to `test-cccc` in the README.md file\n\nSigned-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>\n", 
+  "parent_ids": [
+    "3f12d300f62f1c5b8a1d3265bd85d61cf6d924d7"
+  ], 
+  "tree_id": "f1e37736d409bb136451dfc8e3a2017d3af2ce7d"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F1 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F1
new file mode 100644
index 0000000000..ab96eec4a3
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F1
@@ -0,0 +1,125 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:17:07 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 3105
+content-security-policy: default-src 'self';script-src 'self' 'nonce-yBIiXAYKuVAlrSnvYuxYU2MVh'; style-src 'self' 'nonce-yBIiXAYKuVAlrSnvYuxYU2MVh'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZDQ4YWUxNzRmZGRjNDE3MGE3Zjg4YTY2OWJmMzI4MTA3OGQ0NDJmNyJ9.G2IP4w.fBfDUgO0_qt8TTh1QGvCxyEoNw8; Expires=Sat, 23-Aug-2025 06:17:07 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "blocks": [], 
+  "close_status": null, 
+  "closed_at": null, 
+  "closed_by": null, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Issue tagged with: aaaa, bbbb", 
+      "date_created": "1697169699", 
+      "edited_on": null, 
+      "editor": null, 
+      "id": 878471, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the first comment under the first test issue", 
+      "date_created": "1697169880", 
+      "edited_on": null, 
+      "editor": null, 
+      "id": 878473, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the second comment under the first test issue", 
+      "date_created": "1697169924", 
+      "edited_on": null, 
+      "editor": null, 
+      "id": 878474, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone AAAA", 
+      "date_created": "1746679806", 
+      "edited_on": null, 
+      "editor": null, 
+      "id": 971677, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Epic", 
+      "date_created": "1750832745", 
+      "edited_on": null, 
+      "editor": null, 
+      "id": 976719, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "content": "This is the body of the first test issue", 
+  "custom_fields": [], 
+  "date_created": "1697169462", 
+  "depends": [], 
+  "full_url": "https://pagure.io/protop2g-test-srce/issue/1", 
+  "id": 1, 
+  "last_updated": "1750832745", 
+  "milestone": "Milestone AAAA", 
+  "priority": 4, 
+  "private": false, 
+  "related_prs": [], 
+  "status": "Open", 
+  "tags": [
+    "aaaa", 
+    "bbbb"
+  ], 
+  "title": "This is the title of the first test issue", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F2 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F2
new file mode 100644
index 0000000000..7488423491
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissue%2F2
@@ -0,0 +1,17 @@
+HTTP/2 404 
+date: Wed, 23 Jul 2025 06:17:34 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 233
+content-security-policy: default-src 'self';script-src 'self' 'nonce-sIVvSKRvcU00FQYaXHjgZGoqv'; style-src 'self' 'nonce-sIVvSKRvcU00FQYaXHjgZGoqv'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOTE1NmEzNWM2ZWU4ZGI1M2U5MTFlOGIzN2UzYzRkNzcxNDZlMjk1MCJ9.G2IP_g.YZx_ll-7EyLvtel9UcO0uQAoujM; Expires=Sat, 23-Aug-2025 06:17:34 GMT; Secure; HttpOnly; Path=/
+content-type: text/html; charset=UTF-8
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<title>404 Not Found</title>
+<h1>Not Found</h1>
+<p>The requested URL was not found on the server.  If you entered the URL manually please check your spelling and try again.</p>
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues
new file mode 100644
index 0000000000..4f14350af2
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fissues
@@ -0,0 +1,331 @@
+HTTP/2 200
+date: Wed, 30 Jul 2025 05:17:03 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 10166
+content-security-policy: default-src 'self';script-src 'self' 'nonce-rxZTVpKgLDOgYu1TX1ab1qR2p'; style-src 'self' 'nonce-rxZTVpKgLDOgYu1TX1ab1qR2p'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOGRkN2YyNjZiMGQ5YmM4Mjc3YjllYjkzMjUyNjZlMmQ5OTExMWI2NCJ9.G2s8UA.oQa5peejoMGwTzJF3vWHgcS8naQ; Expires=Sat, 30-Aug-2025 05:17:04 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "args": {
+    "assignee": null,
+    "author": null,
+    "milestones": [],
+    "no_stones": null,
+    "order": null,
+    "priority": null,
+    "since": null,
+    "status": "all",
+    "tags": []
+  },
+  "issues": [
+    {
+      "assignee": null,
+      "blocks": [],
+      "close_status": "Complete",
+      "closed_at": "1750832579",
+      "closed_by": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      },
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue tagged with: cccc, dddd",
+          "date_created": "1697169810",
+          "edited_on": null,
+          "editor": null,
+          "id": 878472,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "The is the first comment under the second test issue",
+          "date_created": "1697169964",
+          "edited_on": null,
+          "editor": null,
+          "id": 878475,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "The is the second comment under the second test issue",
+          "date_created": "1697169976",
+          "edited_on": null,
+          "editor": null,
+          "id": 878476,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue status updated to: Closed (was: Open)",
+          "date_created": "1697170032",
+          "edited_on": null,
+          "editor": null,
+          "id": 878477,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone BBBB",
+          "date_created": "1746679821",
+          "edited_on": null,
+          "editor": null,
+          "id": 971678,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: None (was: Milestone BBBB)\n- Issue status updated to: Open (was: Closed)",
+          "date_created": "1750832572",
+          "edited_on": null,
+          "editor": null,
+          "id": 976713,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue close_status updated to: Complete\n- Issue status updated to: Closed (was: Open)",
+          "date_created": "1750832582",
+          "edited_on": null,
+          "editor": null,
+          "id": 976714,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone BBBB",
+          "date_created": "1750832674",
+          "edited_on": null,
+          "editor": null,
+          "id": 976717,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Rare",
+          "date_created": "1750832757",
+          "edited_on": null,
+          "editor": null,
+          "id": 976720,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ],
+      "content": "This is the body of the second test issue",
+      "custom_fields": [],
+      "date_created": "1697169676",
+      "depends": [],
+      "full_url": "https://pagure.io/protop2g-test-srce/issue/2",
+      "id": 2,
+      "last_updated": "1750832757",
+      "milestone": "Milestone BBBB",
+      "priority": 3,
+      "private": false,
+      "related_prs": [],
+      "status": "Closed",
+      "tags": [
+        "cccc",
+        "dddd"
+      ],
+      "title": "This is the title of the second test issue",
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      }
+    },
+    {
+      "assignee": null,
+      "blocks": [],
+      "close_status": null,
+      "closed_at": null,
+      "closed_by": null,
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue tagged with: aaaa, bbbb",
+          "date_created": "1697169699",
+          "edited_on": null,
+          "editor": null,
+          "id": 878471,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "This is the first comment under the first test issue",
+          "date_created": "1697169880",
+          "edited_on": null,
+          "editor": null,
+          "id": 878473,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "This is the second comment under the first test issue",
+          "date_created": "1697169924",
+          "edited_on": null,
+          "editor": null,
+          "id": 878474,
+          "notification": false,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue set to the milestone: Milestone AAAA",
+          "date_created": "1746679806",
+          "edited_on": null,
+          "editor": null,
+          "id": 971677,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        },
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Issue priority set to: Epic",
+          "date_created": "1750832745",
+          "edited_on": null,
+          "editor": null,
+          "id": 976719,
+          "notification": true,
+          "parent": null,
+          "reactions": {},
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der",
+            "fullname": "Akashdeep Dhar",
+            "name": "t0xic0der",
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ],
+      "content": "This is the body of the first test issue",
+      "custom_fields": [],
+      "date_created": "1697169462",
+      "depends": [],
+      "full_url": "https://pagure.io/protop2g-test-srce/issue/1",
+      "id": 1,
+      "last_updated": "1750832745",
+      "milestone": "Milestone AAAA",
+      "priority": 4,
+      "private": false,
+      "related_prs": [],
+      "status": "Open",
+      "tags": [
+        "aaaa",
+        "bbbb"
+      ],
+      "title": "This is the title of the first test issue",
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der",
+        "fullname": "Akashdeep Dhar",
+        "name": "t0xic0der",
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ],
+  "pagination": {
+    "first": "https://pagure.io/api/0/protop2g-test-srce/issues?per_page=20&status=all&page=1",
+    "last": "https://pagure.io/api/0/protop2g-test-srce/issues?per_page=20&status=all&page=1",
+    "next": null,
+    "page": 1,
+    "pages": 1,
+    "per_page": 20,
+    "prev": null
+  },
+  "total_issues": 2
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10
new file mode 100644
index 0000000000..e43f97a590
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F10
@@ -0,0 +1,259 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:21:04 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 6179
+content-security-policy: default-src 'self';script-src 'self' 'nonce-BK18r6rq2MUNhc0CXTZKJQyJY'; style-src 'self' 'nonce-BK18r6rq2MUNhc0CXTZKJQyJY'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOTQ3NGFiNjdkNjdlZjNiNWNmOWYwZGFmODg1MDMxMTYzNTc5OTkxMyJ9.G2IQ0A.97bsQ3k_CAN3UOID130UESba38M; Expires=Sat, 23-Aug-2025 06:21:04 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "branch": "main", 
+  "branch_from": "test-ffff", 
+  "cached_merge_status": "unknown", 
+  "closed_at": "1747635431", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: ffff\n- Request assigned", 
+      "commit": null, 
+      "date_created": "1747635211", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219623, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "rebased onto 01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+      "commit": null, 
+      "date_created": "1747635389", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219625, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been merged by t0xic0der", 
+      "commit": null, 
+      "date_created": "1747635431", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219626, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "commit_stop": "1a6ccc212aa958a0fe76155c2907c889969a7224", 
+  "date_created": "1747635165", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/10", 
+  "id": 10, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>", 
+  "last_updated": "1747635431", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Merged", 
+  "tags": [
+    "ffff"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-ffff` in the README.md file", 
+  "uid": "d3b7100abf8b4b02aa220d899e063295", 
+  "updated_on": "1747635431", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5
new file mode 100644
index 0000000000..be1c0e3a25
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F5
@@ -0,0 +1,249 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:19:26 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5859
+content-security-policy: default-src 'self';script-src 'self' 'nonce-x3rXi7f95hPSGE2mV9PPJv0Db'; style-src 'self' 'nonce-x3rXi7f95hPSGE2mV9PPJv0Db'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiODFiMTQzZWQwZGEzMWIxNmE3NTk1ODYyNWE0MGZjNjcwNThmMDc3ZSJ9.G2IQbg.9qdYqcrGIqnCKtjsWYjcfMCTzok; Expires=Sat, 23-Aug-2025 06:19:26 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-aaaa", 
+  "cached_merge_status": "CONFLICTS", 
+  "closed_at": null, 
+  "closed_by": null, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: aaaa", 
+      "commit": null, 
+      "date_created": "1746427453", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219086, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the first comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595521", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219190, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the second comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595529", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219191, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "commit_stop": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+  "date_created": "1746427437", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/5", 
+  "id": 5, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1747636185", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Open", 
+  "tags": [
+    "aaaa"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-aaaa` in the README.md file", 
+  "uid": "f9e737c5ccc1434e9798cfd49d192538", 
+  "updated_on": "1746595529", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6
new file mode 100644
index 0000000000..878989a6cd
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F6
@@ -0,0 +1,249 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:19:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5859
+content-security-policy: default-src 'self';script-src 'self' 'nonce-3mH3rM1hwmaCorIQiTfUsFwdZ'; style-src 'self' 'nonce-3mH3rM1hwmaCorIQiTfUsFwdZ'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiNWY5OWMwYjViOTkzZjM0YTY3OTJiYTZmNDk4YzY3MzUwMzY3MzY2OCJ9.G2IQgw.dxyk0aB89uDJGN15BTWrZEvCFWg; Expires=Sat, 23-Aug-2025 06:19:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-bbbb", 
+  "cached_merge_status": "CONFLICTS", 
+  "closed_at": null, 
+  "closed_by": null, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: bbbb", 
+      "commit": null, 
+      "date_created": "1746427480", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219087, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the first comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595539", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219192, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "This is the second comment under this pull request.", 
+      "commit": null, 
+      "date_created": "1746595552", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219193, 
+      "line": null, 
+      "notification": false, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "commit_stop": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+  "date_created": "1746427470", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/6", 
+  "id": 6, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1747643450", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Open", 
+  "tags": [
+    "bbbb"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-bbbb` in the README.md file", 
+  "uid": "9cab89d6bb8c499e8fcb47926f1f5806", 
+  "updated_on": "1746595552", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7
new file mode 100644
index 0000000000..51c269273c
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F7
@@ -0,0 +1,234 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:00 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5458
+content-security-policy: default-src 'self';script-src 'self' 'nonce-Bq1C3s4EngIGuBgtUcYdmK2M8'; style-src 'self' 'nonce-Bq1C3s4EngIGuBgtUcYdmK2M8'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZjUwNDcwNWQ4Y2UxZTRjODRlNjQxYTA0NzVlNDA5NGQwNzI4YTY1NyJ9.G2IQkA.KtxZfzau2wOwMTyfG_xNBHTMHSI; Expires=Sat, 23-Aug-2025 06:20:00 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-cccc", 
+  "cached_merge_status": "FFORWARD", 
+  "closed_at": "1746428043", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: cccc", 
+      "commit": null, 
+      "date_created": "1746427513", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219088, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been closed by t0xic0der", 
+      "commit": null, 
+      "date_created": "1746428043", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219090, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "commit_stop": "f1246e331cade9341b9e4f311b7a134f99893d21", 
+  "date_created": "1746427506", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/7", 
+  "id": 7, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1746428043", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Closed", 
+  "tags": [
+    "cccc"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-cccc` in the README.md file", 
+  "uid": "f696feab56b84557b4d4a8a4462420ee", 
+  "updated_on": "1746428043", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8
new file mode 100644
index 0000000000..45ae72d6e8
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F8
@@ -0,0 +1,234 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:17 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5458
+content-security-policy: default-src 'self';script-src 'self' 'nonce-OxOLryXyFpTZ0hyi7t17U5IG0'; style-src 'self' 'nonce-OxOLryXyFpTZ0hyi7t17U5IG0'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiM2I3NWQwYzBhY2YxMjhmYTU0YmU5NzEzYzcyNjNjZTQ4NjFlNDE5ZCJ9.G2IQoQ.Ds29JFMXbO3q2kBPxmfx2kQ7YjA; Expires=Sat, 23-Aug-2025 06:20:17 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": null, 
+  "branch": "main", 
+  "branch_from": "test-dddd", 
+  "cached_merge_status": "FFORWARD", 
+  "closed_at": "1746428053", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: dddd", 
+      "commit": null, 
+      "date_created": "1746427540", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219089, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been closed by t0xic0der", 
+      "commit": null, 
+      "date_created": "1746428053", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219091, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "commit_stop": "0bc8b0c38e0790e9ef5c8d512a00b9c4dd048160", 
+  "date_created": "1746427532", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/8", 
+  "id": 8, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+  "last_updated": "1746428053", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Closed", 
+  "tags": [
+    "dddd"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-dddd` in the README.md file", 
+  "uid": "493b294044fd48e18f424210c919d8de", 
+  "updated_on": "1746428053", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9 b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9
new file mode 100644
index 0000000000..2e19157948
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-request%2F9
@@ -0,0 +1,239 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:20:51 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 5628
+content-security-policy: default-src 'self';script-src 'self' 'nonce-RVreTe5AdtWf0rvyk7mxX40mb'; style-src 'self' 'nonce-RVreTe5AdtWf0rvyk7mxX40mb'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiM2MyYzdlY2E0MDYzNWRmZjRhMDc2MGE0OTg2MjNhMTU4MWNhZDg4OSJ9.G2IQww.VZpiXbZftgigHkiS15g8DF6iQSY; Expires=Sat, 23-Aug-2025 06:20:51 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "assignee": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "branch": "main", 
+  "branch_from": "test-eeee", 
+  "cached_merge_status": "unknown", 
+  "closed_at": "1747635243", 
+  "closed_by": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }, 
+  "comments": [
+    {
+      "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: eeee\n- Request assigned", 
+      "commit": null, 
+      "date_created": "1747635200", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219622, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "comment": "Pull-Request has been merged by t0xic0der", 
+      "commit": null, 
+      "date_created": "1747635243", 
+      "edited_on": null, 
+      "editor": null, 
+      "filename": null, 
+      "id": 219624, 
+      "line": null, 
+      "notification": true, 
+      "parent": null, 
+      "reactions": {}, 
+      "tree": null, 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "commit_start": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "commit_stop": "01b420e2964928a15f790f9b7c1a0053e7b5f0a5", 
+  "date_created": "1747635161", 
+  "full_url": "https://pagure.io/protop2g-test-srce/pull-request/9", 
+  "id": 9, 
+  "initial_comment": "Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>", 
+  "last_updated": "1747635243", 
+  "project": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "remote_git": null, 
+  "repo_from": {
+    "access_groups": {
+      "admin": [], 
+      "collaborator": [], 
+      "commit": [], 
+      "ticket": []
+    }, 
+    "access_users": {
+      "admin": [
+        "ryanlerch"
+      ], 
+      "collaborator": [], 
+      "commit": [], 
+      "owner": [
+        "t0xic0der"
+      ], 
+      "ticket": []
+    }, 
+    "close_status": [
+      "Complete", 
+      "Baseless"
+    ], 
+    "custom_keys": [], 
+    "date_created": "1697168063", 
+    "date_modified": "1744795940", 
+    "description": "The source namespace for the Pagure Exporter project to run tests against", 
+    "full_url": "https://pagure.io/protop2g-test-srce", 
+    "fullname": "protop2g-test-srce", 
+    "id": 17042, 
+    "milestones": {
+      "Milestone AAAA": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone BBBB": {
+        "active": false, 
+        "date": "1765497600"
+      }, 
+      "Milestone CCCC": {
+        "active": true, 
+        "date": "1765497600"
+      }, 
+      "Milestone DDDD": {
+        "active": false, 
+        "date": "1765497600"
+      }
+    }, 
+    "name": "protop2g-test-srce", 
+    "namespace": null, 
+    "parent": null, 
+    "priorities": {
+      "": "", 
+      "1": "Common", 
+      "2": "Uncommon", 
+      "3": "Rare", 
+      "4": "Epic", 
+      "5": "Mythic"
+    }, 
+    "tags": [
+      "srce", 
+      "test", 
+      "gridhead", 
+      "protop2g"
+    ], 
+    "url_path": "protop2g-test-srce", 
+    "user": {
+      "full_url": "https://pagure.io/user/t0xic0der", 
+      "fullname": "Akashdeep Dhar", 
+      "name": "t0xic0der", 
+      "url_path": "user/t0xic0der"
+    }
+  }, 
+  "status": "Merged", 
+  "tags": [
+    "eeee"
+  ], 
+  "threshold_reached": null, 
+  "title": "Change the branch identity to `test-eeee` in the README.md file", 
+  "uid": "f2ad806e430a40bd8ee5894484338df4", 
+  "updated_on": "1747635243", 
+  "user": {
+    "full_url": "https://pagure.io/user/t0xic0der", 
+    "fullname": "Akashdeep Dhar", 
+    "name": "t0xic0der", 
+    "url_path": "user/t0xic0der"
+  }
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests
new file mode 100644
index 0000000000..15b69e8f03
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Fpull-requests
@@ -0,0 +1,507 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 06:18:47 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 14090
+content-security-policy: default-src 'self';script-src 'self' 'nonce-t1H8BCX7kXOBmXS0wHPpBrAhK'; style-src 'self' 'nonce-t1H8BCX7kXOBmXS0wHPpBrAhK'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiODAwYWYyZGI3MjZlMzA2ZTdmNTdlMmIwNGVkNmU3YTBmNDYwZDUyMyJ9.G2IQRw.EDXBH36zsKcHKDETH_g7miO_r_w; Expires=Sat, 23-Aug-2025 06:18:47 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "args": {
+    "assignee": null, 
+    "author": null, 
+    "page": 1, 
+    "per_page": 20, 
+    "status": true, 
+    "tags": []
+  }, 
+  "pagination": {
+    "first": "https://pagure.io/api/0/protop2g-test-srce/pull-requests?per_page=20&page=1", 
+    "last": "https://pagure.io/api/0/protop2g-test-srce/pull-requests?per_page=20&page=1", 
+    "next": null, 
+    "page": 1, 
+    "pages": 1, 
+    "per_page": 20, 
+    "prev": null
+  }, 
+  "requests": [
+    {
+      "assignee": null, 
+      "branch": "main", 
+      "branch_from": "test-bbbb", 
+      "cached_merge_status": "CONFLICTS", 
+      "closed_at": null, 
+      "closed_by": null, 
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: bbbb", 
+          "commit": null, 
+          "date_created": "1746427480", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219087, 
+          "line": null, 
+          "notification": true, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the first comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595539", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219192, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the second comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595552", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219193, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ], 
+      "commit_start": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+      "commit_stop": "2d40761dc53e6fa060ac49d88e1452c6751d4b1c", 
+      "date_created": "1746427470", 
+      "full_url": "https://pagure.io/protop2g-test-srce/pull-request/6", 
+      "id": 6, 
+      "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+      "last_updated": "1747643450", 
+      "project": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "remote_git": null, 
+      "repo_from": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "status": "Open", 
+      "tags": [
+        "bbbb"
+      ], 
+      "threshold_reached": null, 
+      "title": "Change the branch identity to `test-bbbb` in the README.md file", 
+      "uid": "9cab89d6bb8c499e8fcb47926f1f5806", 
+      "updated_on": "1746595552", 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }, 
+    {
+      "assignee": null, 
+      "branch": "main", 
+      "branch_from": "test-aaaa", 
+      "cached_merge_status": "CONFLICTS", 
+      "closed_at": null, 
+      "closed_by": null, 
+      "comments": [
+        {
+          "comment": "**Metadata Update from @t0xic0der**:\n- Pull-request tagged with: aaaa", 
+          "commit": null, 
+          "date_created": "1746427453", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219086, 
+          "line": null, 
+          "notification": true, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the first comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595521", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219190, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }, 
+        {
+          "comment": "This is the second comment under this pull request.", 
+          "commit": null, 
+          "date_created": "1746595529", 
+          "edited_on": null, 
+          "editor": null, 
+          "filename": null, 
+          "id": 219191, 
+          "line": null, 
+          "notification": false, 
+          "parent": null, 
+          "reactions": {}, 
+          "tree": null, 
+          "user": {
+            "full_url": "https://pagure.io/user/t0xic0der", 
+            "fullname": "Akashdeep Dhar", 
+            "name": "t0xic0der", 
+            "url_path": "user/t0xic0der"
+          }
+        }
+      ], 
+      "commit_start": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+      "commit_stop": "b55e5c91d2572d60a8d7e71b3d3003e523127bd4", 
+      "date_created": "1746427437", 
+      "full_url": "https://pagure.io/protop2g-test-srce/pull-request/5", 
+      "id": 5, 
+      "initial_comment": "Signed-off-by: Akashdeep Dhar <testaddr@testaddr.com>", 
+      "last_updated": "1747636185", 
+      "project": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "remote_git": null, 
+      "repo_from": {
+        "access_groups": {
+          "admin": [], 
+          "collaborator": [], 
+          "commit": [], 
+          "ticket": []
+        }, 
+        "access_users": {
+          "admin": [
+            "ryanlerch"
+          ], 
+          "collaborator": [], 
+          "commit": [], 
+          "owner": [
+            "t0xic0der"
+          ], 
+          "ticket": []
+        }, 
+        "close_status": [
+          "Complete", 
+          "Baseless"
+        ], 
+        "custom_keys": [], 
+        "date_created": "1697168063", 
+        "date_modified": "1744795940", 
+        "description": "The source namespace for the Pagure Exporter project to run tests against", 
+        "full_url": "https://pagure.io/protop2g-test-srce", 
+        "fullname": "protop2g-test-srce", 
+        "id": 17042, 
+        "milestones": {
+          "Milestone AAAA": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone BBBB": {
+            "active": false, 
+            "date": "1765497600"
+          }, 
+          "Milestone CCCC": {
+            "active": true, 
+            "date": "1765497600"
+          }, 
+          "Milestone DDDD": {
+            "active": false, 
+            "date": "1765497600"
+          }
+        }, 
+        "name": "protop2g-test-srce", 
+        "namespace": null, 
+        "parent": null, 
+        "priorities": {
+          "": "", 
+          "1": "Common", 
+          "2": "Uncommon", 
+          "3": "Rare", 
+          "4": "Epic", 
+          "5": "Mythic"
+        }, 
+        "tags": [
+          "srce", 
+          "test", 
+          "gridhead", 
+          "protop2g"
+        ], 
+        "url_path": "protop2g-test-srce", 
+        "user": {
+          "full_url": "https://pagure.io/user/t0xic0der", 
+          "fullname": "Akashdeep Dhar", 
+          "name": "t0xic0der", 
+          "url_path": "user/t0xic0der"
+        }
+      }, 
+      "status": "Open", 
+      "tags": [
+        "aaaa"
+      ], 
+      "threshold_reached": null, 
+      "title": "Change the branch identity to `test-aaaa` in the README.md file", 
+      "uid": "f9e737c5ccc1434e9798cfd49d192538", 
+      "updated_on": "1746595529", 
+      "user": {
+        "full_url": "https://pagure.io/user/t0xic0der", 
+        "fullname": "Akashdeep Dhar", 
+        "name": "t0xic0der", 
+        "url_path": "user/t0xic0der"
+      }
+    }
+  ], 
+  "total_requests": 2
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa
new file mode 100644
index 0000000000..d0f24e646e
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Faaaa
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:34:39 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-gI8Srx27RgY20Zqw5vVkWVORV'; style-src 'self' 'nonce-gI8Srx27RgY20Zqw5vVkWVORV'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZmJhYTlmMTAzYzYxMWE5NmZiZDNkZjE1ZmRiZGQzYTA5YTQ1YTM2YyJ9.G2IF7w.CLP1edDfZSoJcXjoUNt40swcBV8; Expires=Sat, 23-Aug-2025 05:34:39 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "aaaa", 
+  "tag_color": "#ff0000", 
+  "tag_description": "aaaa"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb
new file mode 100644
index 0000000000..a859096f25
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fbbbb
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:34:50 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-wgQpgRvwBbyoY9WWTv55wb8Dd'; style-src 'self' 'nonce-wgQpgRvwBbyoY9WWTv55wb8Dd'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiZWU4ZDUxYzY4NmUzMzM4ODg4YmRmMjQwYmU3ODVhOTA4MzQ4N2Q2NiJ9.G2IF-g.nG1k1zU4b9Eo9WFGCas8R9a5-Vg; Expires=Sat, 23-Aug-2025 05:34:50 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "bbbb", 
+  "tag_color": "#ff0000", 
+  "tag_description": "bbbb"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc
new file mode 100644
index 0000000000..c4fdc9aa46
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fcccc
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:35:02 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-kAxTKES1vWlzLCIScejGQ5JpX'; style-src 'self' 'nonce-kAxTKES1vWlzLCIScejGQ5JpX'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYjhhM2YxNjJhZDYwYWU5NzE4NmQ4NDBkMzJlOWNkYmYxN2Y2NjBmMyJ9.G2IGBg.oA7d9DJHW4_ilpbiVkbveF5dM3Q; Expires=Sat, 23-Aug-2025 05:35:02 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "cccc", 
+  "tag_color": "#ffff00", 
+  "tag_description": "cccc"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd
new file mode 100644
index 0000000000..db9ad09a74
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fdddd
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-rzXQsxeaBjeye4rVcEn3aSWKa'; style-src 'self' 'nonce-rzXQsxeaBjeye4rVcEn3aSWKa'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiY2VhZjRhOTlkZWUxZDcxODg2NWIyN2JhZGY4ZjUyMjcxZTdkZGU0MyJ9.G2IGVw.JCK3tXfD0aOgDdIAMv5MlFkl-SY; Expires=Sat, 23-Aug-2025 05:36:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "dddd", 
+  "tag_color": "#ffff00", 
+  "tag_description": "dddd"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee
new file mode 100644
index 0000000000..eac0faf464
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Feeee
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:34 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-gs07ooad3wPkkzZKAQDHDTrMl'; style-src 'self' 'nonce-gs07ooad3wPkkzZKAQDHDTrMl'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOGEyNDUwYzk5MDY2ZjJhZGQyNDhlZmZmM2QxN2UxZTM0ODI2NWFhZiJ9.G2IGYg.hM6ZKEPDXtOvTWlSPeQBLiZjCO4; Expires=Sat, 23-Aug-2025 05:36:34 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "eeee", 
+  "tag_color": "#00ff00", 
+  "tag_description": "eeee"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff
new file mode 100644
index 0000000000..af5935aa46
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fffff
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:36:48 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-hiIOP1ZdLfgxJERlzriEOATjs'; style-src 'self' 'nonce-hiIOP1ZdLfgxJERlzriEOATjs'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYWMyNjBhNjE5MjI0OTQ0YTU2Yzc5YjNmNzU3ZTU2MTYzZGQwMGMwNSJ9.G2IGcQ.22KbaZBjPxJkpIoTBIn1UtVzEjI; Expires=Sat, 23-Aug-2025 05:36:49 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "ffff", 
+  "tag_color": "#00ff00", 
+  "tag_description": "ffff"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg
new file mode 100644
index 0000000000..28fd0ef15d
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftag%2Fgggg
@@ -0,0 +1,18 @@
+HTTP/2 200 
+date: Wed, 23 Jul 2025 05:37:23 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 77
+content-security-policy: default-src 'self';script-src 'self' 'nonce-FYnaELqaJomAM4RnLtKUr7gbE'; style-src 'self' 'nonce-FYnaELqaJomAM4RnLtKUr7gbE'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiOGExMmI2MGZhYTQyYTY5MmQ0MzNkNWFlZTU0YjE4M2NjY2NmYjI3MCJ9.G2IGkw.9-wL70lPAOlpIv8cusGLLA0Np_U; Expires=Sat, 23-Aug-2025 05:37:23 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tag": "gggg", 
+  "tag_color": "#0000ff", 
+  "tag_description": "gggg"
+}
diff --git a/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags
new file mode 100644
index 0000000000..1176b532a4
--- /dev/null
+++ b/services/migrations/testdata/pagure/full_download/unauthorized/GET_%2Fapi%2F0%2Fprotop2g-test-srce%2Ftags
@@ -0,0 +1,26 @@
+HTTP/2 200
+date: Wed, 23 Jul 2025 05:16:48 GMT
+server: Apache/2.4.37 (Red Hat Enterprise Linux) OpenSSL/1.1.1k mod_wsgi/4.6.4 Python/3.6
+x-xss-protection: 1; mode=block
+x-content-type-options: nosniff
+referrer-policy: same-origin
+x-frame-options: ALLOW-FROM https://pagure.io/
+strict-transport-security: max-age=31536000; includeSubDomains; preload
+content-length: 142
+content-security-policy: default-src 'self';script-src 'self' 'nonce-T8LPhGGs1acv00t58vtBtVmwC'; style-src 'self' 'nonce-T8LPhGGs1acv00t58vtBtVmwC'; object-src 'none';base-uri 'self';img-src 'self' https:;connect-src 'self' https://pagure.io:8088;frame-src https://docs.pagure.org;frame-ancestors https://pagure.io;
+set-cookie: pagure=eyJfcGVybWFuZW50Ijp0cnVlLCJjc3JmX3Rva2VuIjoiYmQ2NTQ1MmFhZWJjZjA0OWIxNTI5MjBjODQyYzUzOGRkYmYyYTkwOSJ9.G2IBwA.pKqOBVDJrtKfyrbJPyuaRfFjnR4; Expires=Sat, 23-Aug-2025 05:16:48 GMT; Secure; HttpOnly; Path=/
+content-type: application/json
+
+{
+  "tags": [
+    "aaaa",
+    "bbbb",
+    "cccc",
+    "dddd",
+    "eeee",
+    "ffff",
+    "gggg",
+    "hhhh"
+  ],
+  "total_tags": 8
+}
diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go
index 6d871ad5ff..514b7c3969 100644
--- a/services/mirror/mirror.go
+++ b/services/mirror/mirror.go
@@ -5,7 +5,7 @@ package mirror
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	quota_model "forgejo.org/models/quota"
 	repo_model "forgejo.org/models/repo"
@@ -31,7 +31,7 @@ func doMirrorSync(ctx context.Context, req *SyncRequest) {
 	}
 }
 
-var errLimit = fmt.Errorf("reached limit")
+var errLimit = errors.New("reached limit")
 
 // Update checks and updates mirror repositories.
 func Update(ctx context.Context, pullLimit, pushLimit int) error {
@@ -70,7 +70,7 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
 		// Check we've not been cancelled
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("aborted")
+			return errors.New("aborted")
 		default:
 		}
 
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
index a63cbcf40c..c46323f283 100644
--- a/services/mirror/mirror_pull.go
+++ b/services/mirror/mirror_pull.go
@@ -244,6 +244,24 @@ func pruneBrokenReferences(ctx context.Context,
 	return pruneErr
 }
 
+// checkRecoverableSyncError takes an error message from a git fetch command and returns false if it should be a fatal/blocking error
+func checkRecoverableSyncError(stderrMessage string) bool {
+	switch {
+	case strings.Contains(stderrMessage, "unable to resolve reference") && strings.Contains(stderrMessage, "reference broken"):
+		return true
+	case strings.Contains(stderrMessage, "remote error") && strings.Contains(stderrMessage, "not our ref"):
+		return true
+	case strings.Contains(stderrMessage, "cannot lock ref") && strings.Contains(stderrMessage, "but expected"):
+		return true
+	case strings.Contains(stderrMessage, "cannot lock ref") && strings.Contains(stderrMessage, "unable to resolve reference"):
+		return true
+	case strings.Contains(stderrMessage, "Unable to create") && strings.Contains(stderrMessage, ".lock"):
+		return true
+	default:
+		return false
+	}
+}
+
 // runSync returns true if sync finished without error.
 func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bool) {
 	repoPath := m.Repo.RepoPath()
@@ -286,7 +304,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 		stdoutMessage := util.SanitizeCredentialURLs(stdout)
 
 		// Now check if the error is a resolve reference due to broken reference
-		if strings.Contains(stderr, "unable to resolve reference") && strings.Contains(stderr, "reference broken") {
+		if checkRecoverableSyncError(stderr) {
 			log.Warn("SyncMirrors [repo: %-v]: failed to update mirror repository due to broken references:\nStdout: %s\nStderr: %s\nErr: %v\nAttempting Prune", m.Repo, stdoutMessage, stderrMessage, err)
 			err = nil
 
@@ -337,6 +355,15 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 		return nil, false
 	}
 
+	if m.LFS && setting.LFS.StartServer {
+		log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo)
+		endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint)
+		lfsClient := lfs.NewClient(endpoint, nil)
+		if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil {
+			log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo, err)
+		}
+	}
+
 	log.Trace("SyncMirrors [repo: %-v]: syncing branches...", m.Repo)
 	if _, err = repo_module.SyncRepoBranchesWithRepo(ctx, m.Repo, gitRepo, 0); err != nil {
 		log.Error("SyncMirrors [repo: %-v]: failed to synchronize branches: %v", m.Repo, err)
@@ -346,15 +373,6 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 	if err = repo_module.SyncReleasesWithTags(ctx, m.Repo, gitRepo); err != nil {
 		log.Error("SyncMirrors [repo: %-v]: failed to synchronize tags to releases: %v", m.Repo, err)
 	}
-
-	if m.LFS && setting.LFS.StartServer {
-		log.Trace("SyncMirrors [repo: %-v]: syncing LFS objects...", m.Repo)
-		endpoint := lfs.DetermineEndpoint(remoteURL.String(), m.LFSEndpoint)
-		lfsClient := lfs.NewClient(endpoint, nil)
-		if err = repo_module.StoreMissingLfsObjectsInRepository(ctx, m.Repo, gitRepo, lfsClient); err != nil {
-			log.Error("SyncMirrors [repo: %-v]: failed to synchronize LFS objects for repository: %v", m.Repo, err)
-		}
-	}
 	gitRepo.Close()
 
 	log.Trace("SyncMirrors [repo: %-v]: updating size of repository", m.Repo)
@@ -382,7 +400,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
 			stdoutMessage := util.SanitizeCredentialURLs(stdout)
 
 			// Now check if the error is a resolve reference due to broken reference
-			if strings.Contains(stderrMessage, "unable to resolve reference") && strings.Contains(stderrMessage, "reference broken") {
+			if checkRecoverableSyncError(stderrMessage) {
 				log.Warn("SyncMirrors [repo: %-v Wiki]: failed to update mirror wiki repository due to broken references:\nStdout: %s\nStderr: %s\nErr: %v\nAttempting Prune", m.Repo, stdoutMessage, stderrMessage, err)
 				err = nil
 
diff --git a/services/mirror/mirror_pull_test.go b/services/mirror/mirror_pull_test.go
new file mode 100644
index 0000000000..97859be5b0
--- /dev/null
+++ b/services/mirror/mirror_pull_test.go
@@ -0,0 +1,94 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package mirror
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_parseRemoteUpdateOutput(t *testing.T) {
+	output := `
+ * [new tag]         v0.1.8     -> v0.1.8
+ * [new branch]      master     -> origin/master
+ - [deleted]         (none)     -> origin/test1
+ - [deleted]         (none)     -> tag1
+ + f895a1e...957a993 test2      -> origin/test2  (forced update)
+   957a993..a87ba5f  test3      -> origin/test3
+ * [new ref]               refs/pull/26595/head  -> refs/pull/26595/head
+ * [new ref]               refs/pull/26595/merge -> refs/pull/26595/merge
+   e0639e38fb..6db2410489  refs/pull/25873/head  -> refs/pull/25873/head
+ + 1c97ebc746...976d27d52f refs/pull/25873/merge -> refs/pull/25873/merge  (forced update)
+`
+	results := parseRemoteUpdateOutput(output, "origin")
+	assert.Len(t, results, 10)
+	assert.Equal(t, "refs/tags/v0.1.8", results[0].refName.String())
+	assert.Equal(t, gitShortEmptySha, results[0].oldCommitID)
+	assert.Empty(t, results[0].newCommitID)
+
+	assert.Equal(t, "refs/heads/master", results[1].refName.String())
+	assert.Equal(t, gitShortEmptySha, results[1].oldCommitID)
+	assert.Empty(t, results[1].newCommitID)
+
+	assert.Equal(t, "refs/heads/test1", results[2].refName.String())
+	assert.Empty(t, results[2].oldCommitID)
+	assert.Equal(t, gitShortEmptySha, results[2].newCommitID)
+
+	assert.Equal(t, "refs/tags/tag1", results[3].refName.String())
+	assert.Empty(t, results[3].oldCommitID)
+	assert.Equal(t, gitShortEmptySha, results[3].newCommitID)
+
+	assert.Equal(t, "refs/heads/test2", results[4].refName.String())
+	assert.Equal(t, "f895a1e", results[4].oldCommitID)
+	assert.Equal(t, "957a993", results[4].newCommitID)
+
+	assert.Equal(t, "refs/heads/test3", results[5].refName.String())
+	assert.Equal(t, "957a993", results[5].oldCommitID)
+	assert.Equal(t, "a87ba5f", results[5].newCommitID)
+
+	assert.Equal(t, "refs/pull/26595/head", results[6].refName.String())
+	assert.Equal(t, gitShortEmptySha, results[6].oldCommitID)
+	assert.Empty(t, results[6].newCommitID)
+
+	assert.Equal(t, "refs/pull/26595/merge", results[7].refName.String())
+	assert.Equal(t, gitShortEmptySha, results[7].oldCommitID)
+	assert.Empty(t, results[7].newCommitID)
+
+	assert.Equal(t, "refs/pull/25873/head", results[8].refName.String())
+	assert.Equal(t, "e0639e38fb", results[8].oldCommitID)
+	assert.Equal(t, "6db2410489", results[8].newCommitID)
+
+	assert.Equal(t, "refs/pull/25873/merge", results[9].refName.String())
+	assert.Equal(t, "1c97ebc746", results[9].oldCommitID)
+	assert.Equal(t, "976d27d52f", results[9].newCommitID)
+}
+
+func Test_checkRecoverableSyncError(t *testing.T) {
+	cases := []struct {
+		recoverable bool
+		message     string
+	}{
+		// A race condition in http git-fetch where certain refs were listed on the remote and are no longer there, would exit status 128
+		{true, "fatal: remote error: upload-pack: not our ref 988881adc9fc3655077dc2d4d757d480b5ea0e11"},
+		// A race condition where a local gc/prune removes a named ref during a git-fetch  would exit status 1
+		{true, "cannot lock ref 'refs/pull/123456/merge': unable to resolve reference 'refs/pull/134153/merge'"},
+		// A race condition in http git-fetch where named refs were listed on the remote and are no longer there
+		{true, "error: cannot lock ref 'refs/remotes/origin/foo': unable to resolve reference 'refs/remotes/origin/foo': reference broken"},
+		// A race condition in http git-fetch where named refs were force-pushed during the update, would exit status 128
+		{true, "error: cannot lock ref 'refs/pull/123456/merge': is at 988881adc9fc3655077dc2d4d757d480b5ea0e11 but expected 7f894307ffc9553edbd0b671cab829786866f7b2"},
+		// A race condition with other local git operations, such as git-maintenance, would exit status 128 (well, "Unable" the "U" is uppercase)
+		{true, "fatal: Unable to create '/data/gitea-repositories/foo-org/bar-repo.git/./objects/info/commit-graphs/commit-graph-chain.lock': File exists."},
+		// Missing or unauthorized credentials, would exit status 128
+		{false, "fatal: Authentication failed for 'https://example.com/foo-does-not-exist/bar.git/'"},
+		// A non-existent remote repository, would exit status 128
+		{false, "fatal: Could not read from remote repository."},
+		// A non-functioning proxy, would exit status 128
+		{false, "fatal: unable to access 'https://example.com/foo-does-not-exist/bar.git/': Failed to connect to configured-https-proxy port 1080 after 0 ms: Couldn't connect to server"},
+	}
+
+	for _, c := range cases {
+		assert.Equal(t, c.recoverable, checkRecoverableSyncError(c.message), "test case: %s", c.message)
+	}
+}
diff --git a/services/mirror/mirror_push.go b/services/mirror/mirror_push.go
index 11b8ad459a..fdd02dedea 100644
--- a/services/mirror/mirror_push.go
+++ b/services/mirror/mirror_push.go
@@ -33,19 +33,22 @@ var AddPushMirrorRemote = addPushMirrorRemote
 
 func addPushMirrorRemote(ctx context.Context, m *repo_model.PushMirror, addr string) error {
 	addRemoteAndConfig := func(addr, path string) error {
-		cmd := git.NewCommand(ctx, "remote", "add", "--mirror=push").AddDynamicArguments(m.RemoteName, addr)
-		if strings.Contains(addr, "://") && strings.Contains(addr, "@") {
-			cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=push %s [repo_path: %s]", m.RemoteName, util.SanitizeCredentialURLs(addr), path))
+		var cmd *git.Command
+		if m.BranchFilter == "" {
+			cmd = git.NewCommand(ctx, "remote", "add", "--mirror").AddDynamicArguments(m.RemoteName, addr)
 		} else {
-			cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=push %s [repo_path: %s]", m.RemoteName, addr, path))
+			cmd = git.NewCommand(ctx, "remote", "add").AddDynamicArguments(m.RemoteName, addr)
+		}
+		if strings.Contains(addr, "://") && strings.Contains(addr, "@") {
+			cmd.SetDescription(fmt.Sprintf("remote add %s %s [repo_path: %s]", m.RemoteName, util.SanitizeCredentialURLs(addr), path))
+		} else {
+			cmd.SetDescription(fmt.Sprintf("remote add %s %s [repo_path: %s]", m.RemoteName, addr, path))
 		}
 		if _, _, err := cmd.RunStdString(&git.RunOpts{Dir: path}); err != nil {
 			return err
 		}
-		if _, _, err := git.NewCommand(ctx, "config", "--add").AddDynamicArguments("remote."+m.RemoteName+".push", "+refs/heads/*:refs/heads/*").RunStdString(&git.RunOpts{Dir: path}); err != nil {
-			return err
-		}
-		if _, _, err := git.NewCommand(ctx, "config", "--add").AddDynamicArguments("remote."+m.RemoteName+".push", "+refs/tags/*:refs/tags/*").RunStdString(&git.RunOpts{Dir: path}); err != nil {
+		err := addRemotePushRefSpecs(ctx, path, m)
+		if err != nil {
 			return err
 		}
 		return nil
@@ -67,6 +70,49 @@ func addPushMirrorRemote(ctx context.Context, m *repo_model.PushMirror, addr str
 	return nil
 }
 
+func addRemotePushRefSpecs(ctx context.Context, path string, m *repo_model.PushMirror) error {
+	if m.BranchFilter == "" {
+		// If there is no branch filter, set the push refspecs to mirror all branches and tags.
+		if _, _, err := git.NewCommand(ctx, "config", "--add").AddDynamicArguments("remote."+m.RemoteName+".push", "+refs/heads/*:refs/heads/*").RunStdString(&git.RunOpts{Dir: path}); err != nil {
+			return err
+		}
+	} else {
+		branches := strings.SplitSeq(m.BranchFilter, ",")
+		for branch := range branches {
+			branch = strings.TrimSpace(branch)
+			if branch == "" {
+				continue
+			}
+			refspec := fmt.Sprintf("+refs/heads/%s:refs/heads/%s", branch, branch)
+			if _, _, err := git.NewCommand(ctx, "config", "--add").AddDynamicArguments("remote."+m.RemoteName+".push", refspec).RunStdString(&git.RunOpts{Dir: path}); err != nil {
+				return err
+			}
+		}
+	}
+	if _, _, err := git.NewCommand(ctx, "config", "--add").AddDynamicArguments("remote."+m.RemoteName+".push", "+refs/tags/*:refs/tags/*").RunStdString(&git.RunOpts{Dir: path}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func UpdatePushMirrorBranchFilter(ctx context.Context, m *repo_model.PushMirror) error {
+	path := m.Repo.RepoPath()
+
+	// First, remove all existing push refspecs for this remote
+	cmd := git.NewCommand(ctx, "config", "--unset-all").AddDynamicArguments("remote." + m.RemoteName + ".push")
+	if _, _, err := cmd.RunStdString(&git.RunOpts{Dir: path}); err != nil {
+		// Ignore error if the key doesn't exist
+		if !strings.Contains(err.Error(), "does not exist") {
+			return err
+		}
+	}
+	err := addRemotePushRefSpecs(ctx, path, m)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // RemovePushMirrorRemote removes the push mirror remote.
 func RemovePushMirrorRemote(ctx context.Context, m *repo_model.PushMirror) error {
 	cmd := git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(m.RemoteName)
@@ -212,7 +258,6 @@ func runPushSync(ctx context.Context, m *repo_model.PushMirror) error {
 
 			return util.SanitizeErrorCredentialURLs(err)
 		}
-
 		return nil
 	}
 
diff --git a/services/mirror/mirror_test.go b/services/mirror/mirror_test.go
deleted file mode 100644
index 76632b6872..0000000000
--- a/services/mirror/mirror_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package mirror
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_parseRemoteUpdateOutput(t *testing.T) {
-	output := `
- * [new tag]         v0.1.8     -> v0.1.8
- * [new branch]      master     -> origin/master
- - [deleted]         (none)     -> origin/test1
- - [deleted]         (none)     -> tag1
- + f895a1e...957a993 test2      -> origin/test2  (forced update)
-   957a993..a87ba5f  test3      -> origin/test3
- * [new ref]               refs/pull/26595/head  -> refs/pull/26595/head
- * [new ref]               refs/pull/26595/merge -> refs/pull/26595/merge
-   e0639e38fb..6db2410489  refs/pull/25873/head  -> refs/pull/25873/head
- + 1c97ebc746...976d27d52f refs/pull/25873/merge -> refs/pull/25873/merge  (forced update)
-`
-	results := parseRemoteUpdateOutput(output, "origin")
-	assert.Len(t, results, 10)
-	assert.EqualValues(t, "refs/tags/v0.1.8", results[0].refName.String())
-	assert.EqualValues(t, gitShortEmptySha, results[0].oldCommitID)
-	assert.EqualValues(t, "", results[0].newCommitID)
-
-	assert.EqualValues(t, "refs/heads/master", results[1].refName.String())
-	assert.EqualValues(t, gitShortEmptySha, results[1].oldCommitID)
-	assert.EqualValues(t, "", results[1].newCommitID)
-
-	assert.EqualValues(t, "refs/heads/test1", results[2].refName.String())
-	assert.EqualValues(t, "", results[2].oldCommitID)
-	assert.EqualValues(t, gitShortEmptySha, results[2].newCommitID)
-
-	assert.EqualValues(t, "refs/tags/tag1", results[3].refName.String())
-	assert.EqualValues(t, "", results[3].oldCommitID)
-	assert.EqualValues(t, gitShortEmptySha, results[3].newCommitID)
-
-	assert.EqualValues(t, "refs/heads/test2", results[4].refName.String())
-	assert.EqualValues(t, "f895a1e", results[4].oldCommitID)
-	assert.EqualValues(t, "957a993", results[4].newCommitID)
-
-	assert.EqualValues(t, "refs/heads/test3", results[5].refName.String())
-	assert.EqualValues(t, "957a993", results[5].oldCommitID)
-	assert.EqualValues(t, "a87ba5f", results[5].newCommitID)
-
-	assert.EqualValues(t, "refs/pull/26595/head", results[6].refName.String())
-	assert.EqualValues(t, gitShortEmptySha, results[6].oldCommitID)
-	assert.EqualValues(t, "", results[6].newCommitID)
-
-	assert.EqualValues(t, "refs/pull/26595/merge", results[7].refName.String())
-	assert.EqualValues(t, gitShortEmptySha, results[7].oldCommitID)
-	assert.EqualValues(t, "", results[7].newCommitID)
-
-	assert.EqualValues(t, "refs/pull/25873/head", results[8].refName.String())
-	assert.EqualValues(t, "e0639e38fb", results[8].oldCommitID)
-	assert.EqualValues(t, "6db2410489", results[8].newCommitID)
-
-	assert.EqualValues(t, "refs/pull/25873/merge", results[9].refName.String())
-	assert.EqualValues(t, "1c97ebc746", results[9].oldCommitID)
-	assert.EqualValues(t, "976d27d52f", results[9].newCommitID)
-}
diff --git a/services/moderation/main_test.go b/services/moderation/main_test.go
new file mode 100644
index 0000000000..3a268260d2
--- /dev/null
+++ b/services/moderation/main_test.go
@@ -0,0 +1,17 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"testing"
+
+	"forgejo.org/models/unittest"
+
+	_ "forgejo.org/models/forgefed"
+	_ "forgejo.org/models/moderation"
+)
+
+func TestMain(m *testing.M) {
+	unittest.MainTest(m)
+}
diff --git a/services/moderation/moderating.go b/services/moderation/moderating.go
new file mode 100644
index 0000000000..f329070963
--- /dev/null
+++ b/services/moderation/moderating.go
@@ -0,0 +1,41 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"forgejo.org/models/issues"
+	"forgejo.org/models/moderation"
+	"forgejo.org/models/repo"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/log"
+	"forgejo.org/services/context"
+)
+
+// GetShadowCopyMap unmarshals the shadow copy raw value of the given abuse report and returns a list of <key, value> pairs
+// (to be rendered when the report is reviewed by an admin).
+// If the report does not have a shadow copy ID or the raw value is empty, returns nil.
+// If the unmarshal fails a warning is added in the logs and returns nil.
+func GetShadowCopyMap(ctx *context.Context, ard *moderation.AbuseReportDetailed) []moderation.ShadowCopyField {
+	if ard.ShadowCopyID.Valid && len(ard.ShadowCopyRawValue) > 0 {
+		var data moderation.ShadowCopyData
+
+		switch ard.ContentType {
+		case moderation.ReportedContentTypeUser:
+			data = new(user.UserData)
+		case moderation.ReportedContentTypeRepository:
+			data = new(repo.RepositoryData)
+		case moderation.ReportedContentTypeIssue:
+			data = new(issues.IssueData)
+		case moderation.ReportedContentTypeComment:
+			data = new(issues.CommentData)
+		}
+		if err := json.Unmarshal([]byte(ard.ShadowCopyRawValue), &data); err != nil {
+			log.Warn("Unmarshal failed for shadow copy #%d. %v", ard.ShadowCopyID.Int64, err)
+			return nil
+		}
+		return data.GetFieldsMap()
+	}
+	return nil
+}
diff --git a/services/moderation/reporting.go b/services/moderation/reporting.go
new file mode 100644
index 0000000000..3d1bb5b32c
--- /dev/null
+++ b/services/moderation/reporting.go
@@ -0,0 +1,170 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	stdCtx "context"
+	"errors"
+	"time"
+
+	"forgejo.org/models/db"
+	"forgejo.org/models/issues"
+	"forgejo.org/models/moderation"
+	"forgejo.org/models/perm"
+	access_model "forgejo.org/models/perm/access"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unit"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/log"
+	"forgejo.org/services/context"
+)
+
+var (
+	ErrContentDoesNotExist = errors.New("the content to be reported does not exist")
+	ErrDoerNotAllowed      = errors.New("doer not allowed to access the content to be reported")
+)
+
+// CanReport checks if doer has access to the content they are reporting
+// (user, organization, repository, issue, pull request or comment).
+// When reporting repositories the user should have at least read access to any repo unit type.
+// When reporting issues, pull requests or comments the user should have at least read access
+// to 'TypeIssues', respectively 'TypePullRequests' unit for the repository where the content belongs.
+// When reporting users or organizations doer should be able to view the reported entity.
+func CanReport(ctx context.Context, doer *user.User, contentType moderation.ReportedContentType, contentID int64) (bool, error) {
+	hasAccess := false
+	var issueID int64
+	var repoID int64
+	unitType := unit.TypeInvalid // used when checking access for issues, pull requests or comments
+
+	if contentType == moderation.ReportedContentTypeUser {
+		reportedUser, err := user.GetUserByID(ctx, contentID)
+		if err != nil {
+			if user.IsErrUserNotExist(err) {
+				log.Warn("User #%d wanted to report user #%d but it does not exist.", doer.ID, contentID)
+				return false, ErrContentDoesNotExist
+			}
+			return false, err
+		}
+
+		hasAccess = user.IsUserVisibleToViewer(ctx, reportedUser, ctx.Doer)
+		if !hasAccess {
+			log.Warn("User #%d wanted to report user/org #%d but they are not able to see that profile.", doer.ID, contentID)
+			return false, ErrDoerNotAllowed
+		}
+	} else {
+		// for comments and issues/pulls we need to get the parent repository
+		switch contentType {
+		case moderation.ReportedContentTypeComment:
+			comment, err := issues.GetCommentByID(ctx, contentID)
+			if err != nil {
+				if issues.IsErrCommentNotExist(err) {
+					log.Warn("User #%d wanted to report comment #%d but it does not exist.", doer.ID, contentID)
+					return false, ErrContentDoesNotExist
+				}
+				return false, err
+			}
+			if !comment.Type.HasContentSupport() {
+				// this is not a comment with text and/or attachments
+				log.Warn("User #%d wanted to report comment #%d but it is not a comment with content.", doer.ID, contentID)
+				return false, nil
+			}
+			issueID = comment.IssueID
+		case moderation.ReportedContentTypeIssue:
+			issueID = contentID
+		case moderation.ReportedContentTypeRepository:
+			repoID = contentID
+		}
+
+		if issueID > 0 {
+			issue, err := issues.GetIssueByID(ctx, issueID)
+			if err != nil {
+				if issues.IsErrIssueNotExist(err) {
+					log.Warn("User #%d wanted to report issue #%d (or one of its comments) but it does not exist.", doer.ID, issueID)
+					return false, ErrContentDoesNotExist
+				}
+				return false, err
+			}
+
+			repoID = issue.RepoID
+			if issue.IsPull {
+				unitType = unit.TypePullRequests
+			} else {
+				unitType = unit.TypeIssues
+			}
+		}
+
+		if repoID > 0 {
+			repo, err := repo_model.GetRepositoryByID(ctx, repoID)
+			if err != nil {
+				if repo_model.IsErrRepoNotExist(err) {
+					log.Warn("User #%d wanted to report repository #%d (or one of its issues / comments) but it does not exist.", doer.ID, repoID)
+					return false, ErrContentDoesNotExist
+				}
+				return false, err
+			}
+
+			if issueID > 0 {
+				// for comments and issues/pulls doer should have at least read access to the corresponding repo unit (issues, respectively pull requests)
+				hasAccess, err = access_model.HasAccessUnit(ctx, doer, repo, unitType, perm.AccessModeRead)
+				if err != nil {
+					return false, err
+				} else if !hasAccess {
+					log.Warn("User #%d wanted to report issue #%d or one of its comments from repository #%d but they don't have access to it.", doer.ID, issueID, repoID)
+					return false, ErrDoerNotAllowed
+				}
+			} else {
+				// for repositories doer should have at least read access to at least one repo unit
+				perm, err := access_model.GetUserRepoPermission(ctx, repo, doer)
+				if err != nil {
+					return false, err
+				}
+				hasAccess = perm.CanReadAny(unit.AllRepoUnitTypes...)
+				if !hasAccess {
+					log.Warn("User #%d wanted to report repository #%d but they don't have access to it.", doer.ID, repoID)
+					return false, ErrDoerNotAllowed
+				}
+			}
+		}
+	}
+
+	return hasAccess, nil
+}
+
+// RemoveResolvedReports removes resolved reports
+func RemoveResolvedReports(ctx stdCtx.Context, keepReportsFor time.Duration) error {
+	log.Trace("Doing: RemoveResolvedReports")
+
+	if keepReportsFor <= 0 {
+		return nil
+	}
+
+	err := db.WithTx(ctx, func(ctx stdCtx.Context) error {
+		resolvedReports, err := moderation.GetResolvedReports(ctx, keepReportsFor)
+		if err != nil {
+			return err
+		}
+
+		for _, report := range resolvedReports {
+			_, err := db.GetEngine(ctx).ID(report.ID).Delete(&moderation.AbuseReport{})
+			if err != nil {
+				return err
+			}
+
+			if report.ShadowCopyID.Valid {
+				_, err := db.GetEngine(ctx).ID(report.ShadowCopyID).Delete(&moderation.AbuseReportShadowCopy{})
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	log.Trace("Finished: RemoveResolvedReports")
+	return nil
+}
diff --git a/services/moderation/reporting_test.go b/services/moderation/reporting_test.go
new file mode 100644
index 0000000000..70925bf184
--- /dev/null
+++ b/services/moderation/reporting_test.go
@@ -0,0 +1,97 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package moderation
+
+import (
+	"testing"
+	"time"
+
+	"forgejo.org/models/db"
+	report_model "forgejo.org/models/moderation"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/timeutil"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRemoveResolvedReportsWhenNoTimeSet(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	// reportAge needs to be an int64 to match what timeutil.Day expects so we cast the value
+	reportAge := int64(20)
+	resolvedReport := &report_model.AbuseReport{
+		Status:     report_model.ReportStatusTypeHandled,
+		ReporterID: 1, ContentType: report_model.ReportedContentTypeRepository,
+		ContentID: 2, Category: report_model.AbuseCategoryTypeOther,
+		CreatedUnix:  timeutil.TimeStampNow(),
+		ResolvedUnix: timeutil.TimeStamp(time.Now().Unix() - timeutil.Day*reportAge),
+	}
+	_, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(resolvedReport)
+	require.NoError(t, err)
+
+	// No reports should be deleted when the default time to keep is 0
+	err = RemoveResolvedReports(db.DefaultContext, time.Second*0)
+	require.NoError(t, err)
+	unittest.AssertExistsIf(t, true, resolvedReport)
+}
+
+func TestRemoveResolvedReportsWhenMatchTimeSet(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	// keepReportsFor needs to an int64 to match what timeutil.Day expects so we cast the value
+	keepReportsFor := int64(4)
+	resolvedReport := &report_model.AbuseReport{
+		Status:     report_model.ReportStatusTypeHandled,
+		ReporterID: 1, ContentType: report_model.ReportedContentTypeRepository,
+		ContentID: 2, Category: report_model.AbuseCategoryTypeOther,
+		CreatedUnix:  timeutil.TimeStampNow(),
+		ResolvedUnix: timeutil.TimeStamp(time.Now().Unix() - timeutil.Day*keepReportsFor),
+	}
+
+	_, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(resolvedReport)
+	require.NoError(t, err)
+
+	// Report should be deleted when older than the default time to keep
+	err = RemoveResolvedReports(db.DefaultContext, time.Second*4)
+	require.NoError(t, err)
+	unittest.AssertExistsIf(t, false, resolvedReport)
+}
+
+func TestRemoveResolvedReportsWhenTimeSetButReportNew(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	resolvedReport := &report_model.AbuseReport{
+		Status:     report_model.ReportStatusTypeHandled,
+		ReporterID: 1, ContentType: report_model.ReportedContentTypeRepository,
+		ContentID: 2, Category: report_model.AbuseCategoryTypeOther,
+		CreatedUnix:  timeutil.TimeStampNow(),
+		ResolvedUnix: timeutil.TimeStampNow(),
+	}
+	_, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(resolvedReport)
+	require.NoError(t, err)
+
+	// Report should not be deleted when newer than the default time to keep
+	err = RemoveResolvedReports(db.DefaultContext, time.Second*4)
+	require.NoError(t, err)
+	unittest.AssertExistsIf(t, true, resolvedReport)
+}
+
+func TestDoesNotRemoveOpenReports(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	// keepReportsFor needs to an int64 to match what timeutil.Day expects so we cast the value
+	keepReportsFor := int64(4)
+	resolvedReport := &report_model.AbuseReport{
+		Status:     report_model.ReportStatusTypeOpen,
+		ReporterID: 1, ContentType: report_model.ReportedContentTypeRepository,
+		ContentID: 2, Category: report_model.AbuseCategoryTypeOther,
+		CreatedUnix:  timeutil.TimeStampNow(),
+		ResolvedUnix: timeutil.TimeStamp(time.Now().Unix() - timeutil.Day*keepReportsFor),
+	}
+
+	_, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(resolvedReport)
+	require.NoError(t, err)
+
+	// Report should not be deleted when open
+	// and older than the default time to keep
+	err = RemoveResolvedReports(db.DefaultContext, time.Second*4)
+	require.NoError(t, err)
+	unittest.AssertExistsIf(t, true, resolvedReport)
+}
diff --git a/services/notify/notifier.go b/services/notify/notifier.go
index 00f98942d9..4d88a7ab95 100644
--- a/services/notify/notifier.go
+++ b/services/notify/notifier.go
@@ -6,6 +6,7 @@ package notify
 import (
 	"context"
 
+	actions_model "forgejo.org/models/actions"
 	issues_model "forgejo.org/models/issues"
 	packages_model "forgejo.org/models/packages"
 	repo_model "forgejo.org/models/repo"
@@ -76,4 +77,6 @@ type Notifier interface {
 	PackageDelete(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor)
 
 	ChangeDefaultBranch(ctx context.Context, repo *repo_model.Repository)
+
+	ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun)
 }
diff --git a/services/notify/notify.go b/services/notify/notify.go
index fb30dfb609..02c18272cb 100644
--- a/services/notify/notify.go
+++ b/services/notify/notify.go
@@ -6,6 +6,7 @@ package notify
 import (
 	"context"
 
+	actions_model "forgejo.org/models/actions"
 	issues_model "forgejo.org/models/issues"
 	packages_model "forgejo.org/models/packages"
 	repo_model "forgejo.org/models/repo"
@@ -374,3 +375,15 @@ func ChangeDefaultBranch(ctx context.Context, repo *repo_model.Repository) {
 		notifier.ChangeDefaultBranch(ctx, repo)
 	}
 }
+
+// ActionRunNowDone notifies that the old status priorStatus with (priorStatus.isDone() == false) of an ActionRun changed to run.Status with (run.Status.isDone() == true)
+// run represents the new state of the ActionRun.
+// lastRun represents the ActionRun of the same workflow that finished before run.
+// lastRun might be nil (e.g. when the run is the first for this workflow). It is the last run of the same workflow for the same repo.
+// It can be used to figure out if a successful run follows a failed one.
+// Both run and lastRun need their attributes loaded.
+func ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
+	for _, notifier := range notifiers {
+		notifier.ActionRunNowDone(ctx, run, priorStatus, lastRun)
+	}
+}
diff --git a/services/notify/null.go b/services/notify/null.go
index 7182e69abb..9c76e5cbd3 100644
--- a/services/notify/null.go
+++ b/services/notify/null.go
@@ -6,6 +6,7 @@ package notify
 import (
 	"context"
 
+	actions_model "forgejo.org/models/actions"
 	issues_model "forgejo.org/models/issues"
 	packages_model "forgejo.org/models/packages"
 	repo_model "forgejo.org/models/repo"
@@ -211,3 +212,7 @@ func (*NullNotifier) PackageDelete(ctx context.Context, doer *user_model.User, p
 // ChangeDefaultBranch places a place holder function
 func (*NullNotifier) ChangeDefaultBranch(ctx context.Context, repo *repo_model.Repository) {
 }
+
+// ActionRunNowDone places a place holder function
+func (*NullNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
+}
diff --git a/services/packages/alpine/repository.go b/services/packages/alpine/repository.go
index 9435887a46..dd66c7d74e 100644
--- a/services/packages/alpine/repository.go
+++ b/services/packages/alpine/repository.go
@@ -258,7 +258,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
 
 	privPem, _ := pem.Decode([]byte(priv))
 	if privPem == nil {
-		return fmt.Errorf("failed to decode private key pem")
+		return errors.New("failed to decode private key pem")
 	}
 
 	privKey, err := x509.ParsePKCS1PrivateKey(privPem.Bytes)
diff --git a/services/packages/alt/repository.go b/services/packages/alt/repository.go
index 317862da9d..9693f4322e 100644
--- a/services/packages/alt/repository.go
+++ b/services/packages/alt/repository.go
@@ -714,21 +714,23 @@ func buildRelease(ctx context.Context, pv *packages_model.PackageVersion, pfs []
 	for architecture := range architectures.Seq() {
 		version := time.Now().Unix()
 		label := setting.AppName
-		data := fmt.Sprintf(`Archive: Alt Linux Team
+		origin := setting.AppName
+		archive := setting.AppName
+
+		data := fmt.Sprintf(`Archive: %s
 Component: classic
 Version: %d
-Origin: Alt Linux Team
+Origin: %s
 Label: %s
 Architecture: %s
 NotAutomatic: false
 `,
-			version, label, architecture)
+			archive, version, origin, label, architecture)
 		fileInfo, err := addReleaseAsFileToRepo(ctx, pv, "release.classic", data, group, architecture)
 		if err != nil {
 			return err
 		}
 
-		origin := setting.AppName
 		codename := time.Now().Unix()
 		date := time.Now().UTC().Format(time.RFC1123)
 
@@ -744,7 +746,7 @@ NotAutomatic: false
 
 		data = fmt.Sprintf(`Origin: %s
 Label: %s
-Suite: Sisyphus
+Suite: Unknown
 Codename: %d
 Date: %s
 Architectures: %s
diff --git a/services/packages/auth.go b/services/packages/auth.go
index ab2c347bc9..205125cf8b 100644
--- a/services/packages/auth.go
+++ b/services/packages/auth.go
@@ -4,6 +4,7 @@
 package packages
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -53,7 +54,7 @@ func ParseAuthorizationToken(req *http.Request) (int64, auth_model.AccessTokenSc
 	parts := strings.SplitN(h, " ", 2)
 	if len(parts) != 2 {
 		log.Error("split token failed: %s", h)
-		return 0, "", fmt.Errorf("split token failed")
+		return 0, "", errors.New("split token failed")
 	}
 
 	token, err := jwt.ParseWithClaims(parts[1], &packageClaims{}, func(t *jwt.Token) (any, error) {
@@ -68,7 +69,7 @@ func ParseAuthorizationToken(req *http.Request) (int64, auth_model.AccessTokenSc
 
 	c, ok := token.Claims.(*packageClaims)
 	if !token.Valid || !ok {
-		return 0, "", fmt.Errorf("invalid token claim")
+		return 0, "", errors.New("invalid token claim")
 	}
 
 	return c.UserID, c.Scope, nil
diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go
index 7e821e2630..f8b08a0b59 100644
--- a/services/packages/cleanup/cleanup.go
+++ b/services/packages/cleanup/cleanup.go
@@ -122,23 +122,24 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
 		}
 
 		if anyVersionDeleted {
-			if pcr.Type == packages_model.TypeDebian {
+			switch pcr.Type {
+			case packages_model.TypeDebian:
 				if err := debian_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil {
 					return fmt.Errorf("CleanupRule [%d]: debian.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
 				}
-			} else if pcr.Type == packages_model.TypeAlpine {
+			case packages_model.TypeAlpine:
 				if err := alpine_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil {
 					return fmt.Errorf("CleanupRule [%d]: alpine.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
 				}
-			} else if pcr.Type == packages_model.TypeRpm {
+			case packages_model.TypeRpm:
 				if err := rpm_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil {
 					return fmt.Errorf("CleanupRule [%d]: rpm.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
 				}
-			} else if pcr.Type == packages_model.TypeArch {
+			case packages_model.TypeArch:
 				if err := arch_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil {
 					return fmt.Errorf("CleanupRule [%d]: arch.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
 				}
-			} else if pcr.Type == packages_model.TypeAlt {
+			case packages_model.TypeAlt:
 				if err := alt_service.BuildAllRepositoryFiles(ctx, pcr.OwnerID); err != nil {
 					return fmt.Errorf("CleanupRule [%d]: alt.BuildAllRepositoryFiles failed: %w", pcr.ID, err)
 				}
diff --git a/services/packages/cleanup/cleanup_sha256_test.go b/services/packages/cleanup/cleanup_sha256_test.go
index f26b98b4b0..efa254fc68 100644
--- a/services/packages/cleanup/cleanup_sha256_test.go
+++ b/services/packages/cleanup/cleanup_sha256_test.go
@@ -78,7 +78,7 @@ func TestCleanupSHA256(t *testing.T) {
 		for range expected {
 			filtered = append(filtered, true)
 		}
-		assert.EqualValues(t, filtered, logFiltered, expected)
+		assert.Equal(t, filtered, logFiltered, expected)
 	}
 
 	ancient := 1 * time.Hour
diff --git a/services/packages/container/blob_uploader.go b/services/packages/container/blob_uploader.go
index cc009d1f5c..ffc47f3853 100644
--- a/services/packages/container/blob_uploader.go
+++ b/services/packages/container/blob_uploader.go
@@ -92,7 +92,7 @@ func (u *BlobUploader) Append(ctx context.Context, r io.Reader) error {
 
 	u.BytesReceived += n
 
-	u.HashStateBytes, err = u.MultiHasher.MarshalBinary()
+	u.HashStateBytes, err = u.MarshalBinary()
 	if err != nil {
 		return err
 	}
diff --git a/services/packages/packages.go b/services/packages/packages.go
index 1232e5914f..418ceab798 100644
--- a/services/packages/packages.go
+++ b/services/packages/packages.go
@@ -127,12 +127,12 @@ func createPackageAndVersion(ctx context.Context, pvci *PackageCreationInfo, all
 		OwnerID:          pvci.Owner.ID,
 		Type:             pvci.PackageType,
 		Name:             pvci.Name,
-		LowerName:        strings.ToLower(pvci.Name),
+		LowerName:        packages_model.ResolvePackageName(pvci.Name, pvci.PackageType),
 		SemverCompatible: pvci.SemverCompatible,
 	}
 	var err error
 	if p, err = packages_model.TryInsertPackage(ctx, p); err != nil {
-		if err == packages_model.ErrDuplicatePackage {
+		if errors.Is(err, packages_model.ErrDuplicatePackage) {
 			packageCreated = false
 		} else {
 			log.Error("Error inserting package: %v", err)
@@ -208,7 +208,7 @@ func AddFileToExistingPackage(ctx context.Context, pvi *PackageInfo, pfci *Packa
 // This method skips quota checks and should only be used for system-managed packages.
 func AddFileToPackageVersionInternal(ctx context.Context, pv *packages_model.PackageVersion, pfci *PackageFileCreationInfo) (*packages_model.PackageFile, error) {
 	return addFileToPackageWrapper(ctx, func(ctx context.Context) (*packages_model.PackageFile, *packages_model.PackageBlob, bool, error) {
-		return addFileToPackageVersionUnchecked(ctx, pv, pfci)
+		return addFileToPackageVersionUnchecked(ctx, pv, pfci, "")
 	})
 }
 
@@ -261,10 +261,10 @@ func addFileToPackageVersion(ctx context.Context, pv *packages_model.PackageVers
 		return nil, nil, false, err
 	}
 
-	return addFileToPackageVersionUnchecked(ctx, pv, pfci)
+	return addFileToPackageVersionUnchecked(ctx, pv, pfci, pvi.PackageType)
 }
 
-func addFileToPackageVersionUnchecked(ctx context.Context, pv *packages_model.PackageVersion, pfci *PackageFileCreationInfo) (*packages_model.PackageFile, *packages_model.PackageBlob, bool, error) {
+func addFileToPackageVersionUnchecked(ctx context.Context, pv *packages_model.PackageVersion, pfci *PackageFileCreationInfo, packageType packages_model.Type) (*packages_model.PackageFile, *packages_model.PackageBlob, bool, error) {
 	log.Trace("Adding package file: %v, %s", pv.ID, pfci.Filename)
 
 	pb, exists, err := packages_model.GetOrInsertBlob(ctx, NewPackageBlob(pfci.Data))
@@ -304,7 +304,7 @@ func addFileToPackageVersionUnchecked(ctx context.Context, pv *packages_model.Pa
 		VersionID:    pv.ID,
 		BlobID:       pb.ID,
 		Name:         pfci.Filename,
-		LowerName:    strings.ToLower(pfci.Filename),
+		LowerName:    packages_model.ResolvePackageName(pfci.Filename, packageType),
 		CompositeKey: pfci.CompositeKey,
 		IsLead:       pfci.IsLead,
 	}
diff --git a/services/packages/rpm/repository.go b/services/packages/rpm/repository.go
index 961de7828f..26f34be2bc 100644
--- a/services/packages/rpm/repository.go
+++ b/services/packages/rpm/repository.go
@@ -26,10 +26,10 @@ import (
 	"forgejo.org/modules/util"
 	packages_service "forgejo.org/services/packages"
 
+	"code.forgejo.org/forgejo/go-rpmutils"
 	"github.com/ProtonMail/go-crypto/openpgp"
 	"github.com/ProtonMail/go-crypto/openpgp/armor"
 	"github.com/ProtonMail/go-crypto/openpgp/packet"
-	"github.com/sassoftware/go-rpmutils"
 )
 
 // GetOrCreateRepositoryVersion gets or creates the internal repository package
@@ -410,7 +410,6 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs []
 				files = append(files, f)
 			}
 		}
-		packageVersion := fmt.Sprintf("%s-%s", pd.FileMetadata.Version, pd.FileMetadata.Release)
 		packages = append(packages, &Package{
 			Type:         "rpm",
 			Name:         pd.Package.Name,
@@ -439,7 +438,7 @@ func buildPrimary(ctx context.Context, pv *packages_model.PackageVersion, pfs []
 				Archive:   pd.FileMetadata.ArchiveSize,
 			},
 			Location: Location{
-				Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, packageVersion, pd.FileMetadata.Architecture, pd.Package.Name, packageVersion, pd.FileMetadata.Architecture),
+				Href: fmt.Sprintf("package/%s/%s/%s/%s-%s.%s.rpm", pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture, pd.Package.Name, pd.Version.Version, pd.FileMetadata.Architecture),
 			},
 			Format: Format{
 				License:   pd.VersionMetadata.License,
diff --git a/services/pull/check.go b/services/pull/check.go
index d038b3d829..c31d107605 100644
--- a/services/pull/check.go
+++ b/services/pull/check.go
@@ -28,6 +28,7 @@ import (
 	"forgejo.org/modules/timeutil"
 	asymkey_service "forgejo.org/services/asymkey"
 	notify_service "forgejo.org/services/notify"
+	shared_automerge "forgejo.org/services/shared/automerge"
 )
 
 // prPatchCheckerQueue represents a queue to handle update pull request tests
@@ -170,7 +171,7 @@ func isSignedIfRequired(ctx context.Context, pr *issues_model.PullRequest, doer
 
 // checkAndUpdateStatus checks if pull request is possible to leaving checking status,
 // and set to be either conflict or mergeable.
-func checkAndUpdateStatus(ctx context.Context, pr *issues_model.PullRequest) {
+func checkAndUpdateStatus(ctx context.Context, pr *issues_model.PullRequest) bool {
 	// If status has not been changed to conflict by testPatch then we are mergeable
 	if pr.Status == issues_model.PullRequestStatusChecking {
 		pr.Status = issues_model.PullRequestStatusMergeable
@@ -184,12 +185,15 @@ func checkAndUpdateStatus(ctx context.Context, pr *issues_model.PullRequest) {
 
 	if has {
 		log.Trace("Not updating status for %-v as it is due to be rechecked", pr)
-		return
+		return false
 	}
 
 	if err := pr.UpdateColsIfNotMerged(ctx, "merge_base", "status", "conflicted_files", "changed_protected_files"); err != nil {
 		log.Error("Update[%-v]: %v", pr, err)
+		return false
 	}
+
+	return true
 }
 
 // getMergeCommit checks if a pull request has been merged
@@ -339,15 +343,22 @@ func handler(items ...string) []string {
 }
 
 func testPR(id int64) {
-	pullWorkingPool.CheckIn(fmt.Sprint(id))
-	defer pullWorkingPool.CheckOut(fmt.Sprint(id))
 	ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("Test PR[%d] from patch checking queue", id))
 	defer finished()
 
+	if pr, updated := testPRProtected(ctx, id); pr != nil && updated {
+		shared_automerge.AddToQueueIfMergeable(ctx, pr)
+	}
+}
+
+func testPRProtected(ctx context.Context, id int64) (*issues_model.PullRequest, bool) {
+	pullWorkingPool.CheckIn(fmt.Sprint(id))
+	defer pullWorkingPool.CheckOut(fmt.Sprint(id))
+
 	pr, err := issues_model.GetPullRequestByID(ctx, id)
 	if err != nil {
 		log.Error("Unable to GetPullRequestByID[%d] for testPR: %v", id, err)
-		return
+		return nil, false
 	}
 
 	log.Trace("Testing %-v", pr)
@@ -357,12 +368,12 @@ func testPR(id int64) {
 
 	if pr.HasMerged {
 		log.Trace("%-v is already merged (status: %s, merge commit: %s)", pr, pr.Status, pr.MergedCommitID)
-		return
+		return nil, false
 	}
 
 	if manuallyMerged(ctx, pr) {
 		log.Trace("%-v is manually merged (status: %s, merge commit: %s)", pr, pr.Status, pr.MergedCommitID)
-		return
+		return nil, false
 	}
 
 	if err := TestPatch(pr); err != nil {
@@ -371,9 +382,10 @@ func testPR(id int64) {
 		if err := pr.UpdateCols(ctx, "status"); err != nil {
 			log.Error("update pr [%-v] status to PullRequestStatusError failed: %v", pr, err)
 		}
-		return
+		return nil, false
 	}
-	checkAndUpdateStatus(ctx, pr)
+
+	return pr, checkAndUpdateStatus(ctx, pr)
 }
 
 // CheckPRsForBaseBranch check all pulls with baseBrannch
@@ -392,10 +404,14 @@ func CheckPRsForBaseBranch(ctx context.Context, baseRepo *repo_model.Repository,
 
 // Init runs the task queue to test all the checking status pull requests
 func Init() error {
+	if err := LoadMergeMessageTemplates(); err != nil {
+		return err
+	}
+
 	prPatchCheckerQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "pr_patch_checker", handler)
 
 	if prPatchCheckerQueue == nil {
-		return fmt.Errorf("unable to create pr_patch_checker queue")
+		return errors.New("unable to create pr_patch_checker queue")
 	}
 
 	go graceful.GetManager().RunWithCancel(prPatchCheckerQueue)
diff --git a/services/pull/check_test.go b/services/pull/check_test.go
index b965d90236..9b7e1660bc 100644
--- a/services/pull/check_test.go
+++ b/services/pull/check_test.go
@@ -52,7 +52,7 @@ func TestPullRequest_AddToTaskQueue(t *testing.T) {
 
 	select {
 	case id := <-idChan:
-		assert.EqualValues(t, pr.ID, id)
+		assert.Equal(t, pr.ID, id)
 	case <-time.After(time.Second):
 		assert.FailNow(t, "Timeout: nothing was added to pullRequestQueue")
 	}
diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go
index 3c864c8ef2..0a95ea1152 100644
--- a/services/pull/commit_status.go
+++ b/services/pull/commit_status.go
@@ -12,7 +12,6 @@ import (
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
-	"forgejo.org/modules/git"
 	"forgejo.org/modules/gitrepo"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/structs"
@@ -105,7 +104,7 @@ func GetPullRequestCommitStatusState(ctx context.Context, pr *issues_model.PullR
 	if pr.Flow == issues_model.PullRequestFlowGithub && !headGitRepo.IsBranchExist(pr.HeadBranch) {
 		return "", errors.New("head branch does not exist, can not merge")
 	}
-	if pr.Flow == issues_model.PullRequestFlowAGit && !git.IsReferenceExist(ctx, headGitRepo.Path, pr.GetGitRefName()) {
+	if pr.Flow == issues_model.PullRequestFlowAGit && !headGitRepo.IsReferenceExist(pr.GetGitRefName()) {
 		return "", errors.New("head branch does not exist, can not merge")
 	}
 
diff --git a/services/pull/merge.go b/services/pull/merge.go
index 9b0d632377..a2542176f0 100644
--- a/services/pull/merge.go
+++ b/services/pull/merge.go
@@ -6,6 +6,7 @@ package pull
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -13,6 +14,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"unicode"
 
 	"forgejo.org/models"
 	"forgejo.org/models/db"
@@ -33,6 +35,30 @@ import (
 	notify_service "forgejo.org/services/notify"
 )
 
+var mergeMessageTemplates = make(map[repo_model.MergeStyle]string, len(repo_model.MergeStyles))
+
+func LoadMergeMessageTemplates() error {
+	// Load templates for all known merge styles
+	for _, mergeStyle := range repo_model.MergeStyles {
+		templateFilename := filepath.Join(
+			setting.CustomPath,
+			"default_merge_message",
+			fmt.Sprintf("%s_TEMPLATE.md", strings.ToUpper(string(mergeStyle))),
+		)
+
+		content, err := os.ReadFile(templateFilename)
+		if err == nil {
+			mergeMessageTemplates[mergeStyle] = string(content)
+		} else if os.IsNotExist(err) {
+			// The file no longer exists, so delete any previous content
+			delete(mergeMessageTemplates, mergeStyle)
+		} else {
+			return err
+		}
+	}
+	return nil
+}
+
 // getMergeMessage composes the message used when merging a pull request.
 func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issues_model.PullRequest, mergeStyle repo_model.MergeStyle, extraVars map[string]string) (message, body string, err error) {
 	if err := pr.LoadBaseRepo(ctx); err != nil {
@@ -77,6 +103,13 @@ func getMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issue
 		if _, ok := err.(git.ErrNotExist); ok {
 			templateContent, err = commit.GetFileContent(templateFilepathGitea, setting.Repository.PullRequest.DefaultMergeMessageSize)
 		}
+
+		if _, ok := err.(git.ErrNotExist); ok {
+			if preloadedContent, ok := mergeMessageTemplates[mergeStyle]; ok {
+				templateContent, err = preloadedContent, nil
+			}
+		}
+
 		if err != nil {
 			if !git.IsErrNotExist(err) {
 				return "", "", err
@@ -168,10 +201,68 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr
 	return getMergeMessage(ctx, baseGitRepo, pr, mergeStyle, nil)
 }
 
+func AddCommitMessageTrailer(message, tailerKey, tailerValue string) string {
+	trailerLine := tailerKey + ": " + tailerValue
+	message = strings.ReplaceAll(message, "\r\n", "\n")
+	message = strings.ReplaceAll(message, "\r", "\n")
+	if strings.Contains(message, "\n"+trailerLine+"\n") || strings.HasSuffix(message, "\n"+trailerLine) {
+		return message
+	}
+
+	if !strings.HasSuffix(message, "\n") {
+		message += "\n"
+	}
+	lastNewLine := strings.LastIndexByte(message[:len(message)-1], '\n')
+	keyEnd := -1
+	if lastNewLine != -1 {
+		keyEnd = strings.IndexByte(message[lastNewLine:], ':')
+		if keyEnd != -1 {
+			keyEnd += lastNewLine
+		}
+	}
+	var lastLineKey string
+	if lastNewLine != -1 && keyEnd != -1 {
+		lastLineKey = message[lastNewLine+1 : keyEnd]
+	}
+
+	isLikelyTrailerLine := lastLineKey != "" && unicode.IsUpper(rune(lastLineKey[0])) && strings.Contains(message, "-")
+	for i := 0; isLikelyTrailerLine && i < len(lastLineKey); i++ {
+		r := rune(lastLineKey[i])
+		isLikelyTrailerLine = unicode.IsLetter(r) || unicode.IsDigit(r) || r == '-'
+	}
+	if !strings.HasSuffix(message, "\n\n") && !isLikelyTrailerLine {
+		message += "\n"
+	}
+	return message + trailerLine
+}
+
 // Merge merges pull request to base repository.
 // Caller should check PR is ready to be merged (review and status checks)
 func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, baseGitRepo *git.Repository, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string, wasAutoMerged bool) error {
-	if err := pr.LoadBaseRepo(ctx); err != nil {
+	pullWorkingPool.CheckIn(fmt.Sprint(pr.ID))
+	defer pullWorkingPool.CheckOut(fmt.Sprint(pr.ID))
+
+	pr, err := issues_model.GetPullRequestByID(ctx, pr.ID)
+	if err != nil {
+		log.Error("Unable to load pull request itself: %v", err)
+		return fmt.Errorf("unable to load pull request itself: %w", err)
+	}
+
+	if pr.HasMerged {
+		return models.ErrPullRequestHasMerged{
+			ID:         pr.ID,
+			IssueID:    pr.IssueID,
+			HeadRepoID: pr.HeadRepoID,
+			BaseRepoID: pr.BaseRepoID,
+			HeadBranch: pr.HeadBranch,
+			BaseBranch: pr.BaseBranch,
+		}
+	}
+
+	if err := pr.LoadIssue(ctx); err != nil {
+		log.Error("Unable to load issue: %v", err)
+		return fmt.Errorf("unable to load issue: %w", err)
+	} else if err := pr.LoadBaseRepo(ctx); err != nil {
 		log.Error("Unable to load base repo: %v", err)
 		return fmt.Errorf("unable to load base repo: %w", err)
 	} else if err := pr.LoadHeadRepo(ctx); err != nil {
@@ -179,9 +270,6 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U
 		return fmt.Errorf("unable to load head repo: %w", err)
 	}
 
-	pullWorkingPool.CheckIn(fmt.Sprint(pr.ID))
-	defer pullWorkingPool.CheckOut(fmt.Sprint(pr.ID))
-
 	prUnit, err := pr.BaseRepo.GetUnit(ctx, unit.TypePullRequests)
 	if err != nil {
 		log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)
@@ -518,13 +606,13 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
 
 		objectFormat := git.ObjectFormatFromName(pr.BaseRepo.ObjectFormatName)
 		if len(commitID) != objectFormat.FullLength() {
-			return fmt.Errorf("Wrong commit ID")
+			return errors.New("Wrong commit ID")
 		}
 
 		commit, err := baseGitRepo.GetCommit(commitID)
 		if err != nil {
 			if git.IsErrNotExist(err) {
-				return fmt.Errorf("Wrong commit ID")
+				return errors.New("Wrong commit ID")
 			}
 			return err
 		}
@@ -535,7 +623,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
 			return err
 		}
 		if !ok {
-			return fmt.Errorf("Wrong commit ID")
+			return errors.New("Wrong commit ID")
 		}
 
 		pr.MergedCommitID = commitID
@@ -548,7 +636,7 @@ func MergedManually(ctx context.Context, pr *issues_model.PullRequest, doer *use
 		if merged, err = pr.SetMerged(ctx); err != nil {
 			return err
 		} else if !merged {
-			return fmt.Errorf("SetMerged failed")
+			return errors.New("SetMerged failed")
 		}
 		return nil
 	}); err != nil {
diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go
index fb09515dbd..4598d57b7a 100644
--- a/services/pull/merge_prepare.go
+++ b/services/pull/merge_prepare.go
@@ -236,10 +236,77 @@ func getDiffTree(ctx context.Context, repoPath, baseBranch, headBranch string, o
 // rebaseTrackingOnToBase checks out the tracking branch as staging and rebases it on to the base branch
 // if there is a conflict it will return a models.ErrRebaseConflicts
 func rebaseTrackingOnToBase(ctx *mergeContext, mergeStyle repo_model.MergeStyle) error {
-	// Checkout head branch
-	if err := git.NewCommand(ctx, "checkout", "-b").AddDynamicArguments(stagingBranch, trackingBranch).
+	// Create staging branch
+	if err := git.NewCommand(ctx, "branch").AddDynamicArguments(stagingBranch, trackingBranch).
 		Run(ctx.RunOpts()); err != nil {
-		return fmt.Errorf("unable to git checkout tracking as staging in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String())
+		return fmt.Errorf(
+			"unable to git branch tracking as staging in temp repo for %v: %w\n%s\n%s",
+			ctx.pr, err,
+			ctx.outbuf.String(),
+			ctx.errbuf.String(),
+		)
+	}
+	ctx.outbuf.Reset()
+	ctx.errbuf.Reset()
+
+	// If the pull request is zero commits behind, then no rebasing needs to be done.
+	if ctx.pr.CommitsBehind == 0 {
+		return nil
+	}
+
+	// Check git version for availability of git-replay. If it is available, we use
+	// it for performance and to preserve unknown commit headers like the
+	// "change-id" header used by Jujutsu and GitButler to track changes across
+	// rebase, amend etc.
+	if err := git.CheckGitVersionAtLeast("2.44"); err == nil {
+		// Use git-replay for performance and to preserve unknown headers,
+		// like the "change-id" header used by Jujutsu and GitButler.
+		if err := git.NewCommand(ctx, "replay", "--onto").AddDynamicArguments(baseBranch).
+			AddDynamicArguments(fmt.Sprintf("%s..%s", baseBranch, stagingBranch)).
+			Run(ctx.RunOpts()); err != nil {
+			// git-replay doesn't tell us which commit first created a merge conflict.
+			// In order to preserve the quality of our error messages, fall back to
+			// regular git-rebase.
+			goto regular_rebase
+		}
+		// git-replay worked, stdout contains the instructions for update-ref
+		updateRefInstructions := ctx.outbuf.String()
+		opts := ctx.RunOpts()
+		opts.Stdin = strings.NewReader(updateRefInstructions)
+		if err := git.NewCommand(ctx, "update-ref", "--stdin").Run(opts); err != nil {
+			return fmt.Errorf(
+				"Failed to update ref for %v: %w\n%s\n%s",
+				ctx.pr,
+				err,
+				ctx.outbuf.String(),
+				ctx.errbuf.String(),
+			)
+		}
+		// Checkout staging branch
+		if err := git.NewCommand(ctx, "checkout").AddDynamicArguments(stagingBranch).
+			Run(ctx.RunOpts()); err != nil {
+			return fmt.Errorf(
+				"unable to git checkout staging in temp repo for %v: %w\n%s\n%s",
+				ctx.pr,
+				err,
+				ctx.outbuf.String(),
+				ctx.errbuf.String(),
+			)
+		}
+		ctx.outbuf.Reset()
+		ctx.errbuf.Reset()
+		return nil
+	}
+
+	// The available git version is too old to support git-replay, or git-replay
+	// failed and we want to determine the first commit that produced a
+	// merge-conflict. Fall back to regular rebase.
+regular_rebase:
+
+	// Checkout head branch
+	if err := git.NewCommand(ctx, "checkout").AddDynamicArguments(stagingBranch).
+		Run(ctx.RunOpts()); err != nil {
+		return fmt.Errorf("unable to git checkout staging in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String())
 	}
 	ctx.outbuf.Reset()
 	ctx.errbuf.Reset()
diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go
index 1c6f734a25..f655224c5e 100644
--- a/services/pull/merge_squash.go
+++ b/services/pull/merge_squash.go
@@ -5,7 +5,6 @@ package pull
 
 import (
 	"fmt"
-	"strings"
 
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
@@ -67,10 +66,8 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {
 
 	if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() {
 		// add trailer
-		if !strings.Contains(message, fmt.Sprintf("Co-authored-by: %s", sig.String())) {
-			message += fmt.Sprintf("\nCo-authored-by: %s", sig.String())
-		}
-		message += fmt.Sprintf("\nCo-committed-by: %s\n", sig.String())
+		message = AddCommitMessageTrailer(message, "Co-authored-by", sig.String())
+		message = AddCommitMessageTrailer(message, "Co-committed-by", sig.String()) // FIXME: this one should be removed, it is not really used or widely used
 	}
 	cmdCommit := git.NewCommand(ctx, "commit").
 		AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email).
diff --git a/services/pull/merge_test.go b/services/pull/merge_test.go
index 6df6f55d46..aa033b8cdb 100644
--- a/services/pull/merge_test.go
+++ b/services/pull/merge_test.go
@@ -4,9 +4,22 @@
 package pull
 
 import (
+	"os"
+	"path"
+	"strings"
 	"testing"
 
+	"forgejo.org/models"
+	issues_model "forgejo.org/models/issues"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/gitrepo"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_expandDefaultMergeMessage(t *testing.T) {
@@ -65,3 +78,102 @@ func Test_expandDefaultMergeMessage(t *testing.T) {
 		})
 	}
 }
+
+func TestAddCommitMessageTailer(t *testing.T) {
+	// add tailer for empty message
+	assert.Equal(t, "\n\nTest-tailer: TestValue", AddCommitMessageTrailer("", "Test-tailer", "TestValue"))
+
+	// add tailer for message without newlines
+	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nNot tailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n\nNot tailer: xxx", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nNotTailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n\nNotTailer: xxx", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nnot-tailer: xxx\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n\nnot-tailer: xxx", "Test-tailer", "TestValue"))
+
+	// add tailer for message with one EOL
+	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n", "Test-tailer", "TestValue"))
+
+	// add tailer for message with two EOLs
+	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n\n", "Test-tailer", "TestValue"))
+
+	// add tailer for message with existing tailer (won't duplicate)
+	assert.Equal(t, "title\n\nTest-tailer: TestValue", AddCommitMessageTrailer("title\n\nTest-tailer: TestValue", "Test-tailer", "TestValue"))
+	assert.Equal(t, "title\n\nTest-tailer: TestValue\n", AddCommitMessageTrailer("title\n\nTest-tailer: TestValue\n", "Test-tailer", "TestValue"))
+
+	// add tailer for message with existing tailer and different value (will append)
+	assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1", "Test-tailer", "v2"))
+	assert.Equal(t, "title\n\nTest-tailer: v1\nTest-tailer: v2", AddCommitMessageTrailer("title\n\nTest-tailer: v1\n", "Test-tailer", "v2"))
+}
+
+func prepareLoadMergeMessageTemplates(targetDir string) error {
+	for _, template := range []string{"MERGE", "REBASE", "REBASE-MERGE", "SQUASH", "MANUALLY-MERGED", "REBASE-UPDATE-ONLY"} {
+		file, err := os.Create(path.Join(targetDir, template+"_TEMPLATE.md"))
+		defer file.Close()
+
+		if err == nil {
+			_, err = file.WriteString("Contents for " + template)
+		}
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func TestLoadMergeMessageTemplates(t *testing.T) {
+	defer test.MockVariableValue(&setting.CustomPath, t.TempDir())()
+	templateTemp := path.Join(setting.CustomPath, "default_merge_message")
+
+	require.NoError(t, os.MkdirAll(templateTemp, 0o755))
+	require.NoError(t, prepareLoadMergeMessageTemplates(templateTemp))
+
+	testStyles := []repo_model.MergeStyle{
+		repo_model.MergeStyleMerge,
+		repo_model.MergeStyleRebase,
+		repo_model.MergeStyleRebaseMerge,
+		repo_model.MergeStyleSquash,
+		repo_model.MergeStyleManuallyMerged,
+		repo_model.MergeStyleRebaseUpdate,
+	}
+
+	// Load all templates
+	require.NoError(t, LoadMergeMessageTemplates())
+
+	// Check their correctness
+	assert.Len(t, mergeMessageTemplates, len(testStyles))
+	for _, mergeStyle := range testStyles {
+		assert.Equal(t, "Contents for "+strings.ToUpper(string(mergeStyle)), mergeMessageTemplates[mergeStyle])
+	}
+
+	// Unload all templates
+	require.NoError(t, os.RemoveAll(templateTemp))
+	require.NoError(t, LoadMergeMessageTemplates())
+	assert.Empty(t, mergeMessageTemplates)
+}
+
+func TestMergeMergedPR(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1})
+	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	require.NoError(t, pr.LoadBaseRepo(t.Context()))
+
+	gitRepo, err := gitrepo.OpenRepository(t.Context(), pr.BaseRepo)
+	require.NoError(t, err)
+	defer gitRepo.Close()
+
+	assert.True(t, pr.HasMerged)
+	pr.HasMerged = false
+
+	err = Merge(t.Context(), pr, doer, gitRepo, repo_model.MergeStyleRebase, "", "I should not exist", false)
+	require.Error(t, err)
+	assert.True(t, models.IsErrPullRequestHasMerged(err))
+
+	if mergeErr, ok := err.(models.ErrPullRequestHasMerged); ok {
+		assert.Equal(t, pr.ID, mergeErr.ID)
+		assert.Equal(t, pr.IssueID, mergeErr.IssueID)
+		assert.Equal(t, pr.HeadBranch, mergeErr.HeadBranch)
+		assert.Equal(t, pr.BaseBranch, mergeErr.BaseBranch)
+	}
+}
diff --git a/services/pull/patch.go b/services/pull/patch.go
index 35d1b101e2..89581c916b 100644
--- a/services/pull/patch.go
+++ b/services/pull/patch.go
@@ -5,7 +5,7 @@
 package pull
 
 import (
-	"bufio"
+	"bytes"
 	"context"
 	"fmt"
 	"io"
@@ -16,14 +16,11 @@ import (
 	"forgejo.org/models"
 	git_model "forgejo.org/models/git"
 	issues_model "forgejo.org/models/issues"
-	"forgejo.org/models/unit"
-	"forgejo.org/modules/container"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/gitrepo"
 	"forgejo.org/modules/graceful"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/process"
-	"forgejo.org/modules/setting"
 	"forgejo.org/modules/util"
 
 	"github.com/gobwas/glob"
@@ -49,66 +46,162 @@ func DownloadDiffOrPatch(ctx context.Context, pr *issues_model.PullRequest, w io
 	return nil
 }
 
-var patchErrorSuffices = []string{
-	": already exists in index",
-	": patch does not apply",
-	": already exists in working directory",
-	"unrecognized input",
-	": No such file or directory",
-	": does not exist in index",
-}
-
 // TestPatch will test whether a simple patch will apply
 func TestPatch(pr *issues_model.PullRequest) error {
 	ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("TestPatch: %s", pr))
 	defer finished()
 
-	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
-	if err != nil {
-		if !git_model.IsErrBranchNotExist(err) {
-			log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err)
-		}
-		return err
-	}
-	defer cancel()
-
-	return testPatch(ctx, prCtx, pr)
+	testPatchCtx, err := testPatch(ctx, pr)
+	testPatchCtx.close()
+	return err
 }
 
-func testPatch(ctx context.Context, prCtx *prContext, pr *issues_model.PullRequest) error {
-	gitRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath)
-	if err != nil {
-		return fmt.Errorf("OpenRepository: %w", err)
-	}
-	defer gitRepo.Close()
+type testPatchContext struct {
+	headRev        string
+	headIsCommitID bool
+	baseRev        string
+	env            []string
+	gitRepo        *git.Repository
+	close          func()
+}
 
-	// 1. update merge base
-	pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base", "--", "base", "tracking").RunStdString(&git.RunOpts{Dir: prCtx.tmpBasePath})
-	if err != nil {
-		var err2 error
-		pr.MergeBase, err2 = gitRepo.GetRefCommitID(git.BranchPrefix + "base")
-		if err2 != nil {
-			return fmt.Errorf("GetMergeBase: %v and can't find commit ID for base: %w", err, err2)
+// LoadHeadRevision loads the necessary information to access the head revision.
+func (t *testPatchContext) LoadHeadRevision(ctx context.Context, pr *issues_model.PullRequest) error {
+	// If AGit, then use HeadCommitID if set (AGit flow creates pull request),
+	// otherwise use the pull request reference.
+	if pr.Flow == issues_model.PullRequestFlowAGit {
+		if len(pr.HeadCommitID) > 0 {
+			t.headRev = pr.HeadCommitID
+			t.headIsCommitID = true
+			return nil
 		}
-	}
-	pr.MergeBase = strings.TrimSpace(pr.MergeBase)
-	if pr.HeadCommitID, err = gitRepo.GetRefCommitID(git.BranchPrefix + "tracking"); err != nil {
-		return fmt.Errorf("GetBranchCommitID: can't find commit ID for head: %w", err)
-	}
-
-	if pr.HeadCommitID == pr.MergeBase {
-		pr.Status = issues_model.PullRequestStatusAncestor
+		t.headRev = pr.GetGitRefName()
 		return nil
 	}
 
-	// 2. Check for conflicts
-	if conflicts, err := checkConflicts(ctx, pr, gitRepo, prCtx.tmpBasePath); err != nil || conflicts || pr.Status == issues_model.PullRequestStatusEmpty {
+	// If it is within the same repository, simply return the branch name.
+	if pr.BaseRepoID == pr.HeadRepoID {
+		t.headRev = pr.GetGitHeadBranchRefName()
+		return nil
+	}
+
+	// We are in Github flow, head and base repository are different.
+	// Resolve the head branch to a commitID and return a Git alternate
+	// environment for the head repository.
+	gitRepo, err := git.OpenRepository(ctx, pr.HeadRepo.RepoPath())
+	if err != nil {
+		return err
+	}
+	defer gitRepo.Close()
+
+	headCommitID, err := gitRepo.GetRefCommitID(pr.GetGitHeadBranchRefName())
+	if err != nil {
 		return err
 	}
 
+	t.headRev = headCommitID
+	t.headIsCommitID = true
+	t.env = append(os.Environ(), `GIT_ALTERNATE_OBJECT_DIRECTORIES=`+pr.HeadRepo.RepoPath()+"/objects")
+	return nil
+}
+
+// getTestPatchCtx constructs a new testpatch context for the given pull request.
+// If `onBare` is true, then the context will use the base repository that does
+// not contain a working tree. Otherwise a temprorary repository is created that
+// contains a working tree.
+func getTestPatchCtx(ctx context.Context, pr *issues_model.PullRequest, onBare bool) (*testPatchContext, error) {
+	testPatchCtx := &testPatchContext{
+		close: func() {},
+	}
+
+	if onBare {
+		if err := pr.LoadBaseRepo(ctx); err != nil {
+			return testPatchCtx, fmt.Errorf("LoadBaseRepo: %w", err)
+		}
+		if err := pr.LoadHeadRepo(ctx); err != nil {
+			return testPatchCtx, fmt.Errorf("LoadHeadRepo: %w", err)
+		}
+
+		if err := testPatchCtx.LoadHeadRevision(ctx, pr); err != nil {
+			return testPatchCtx, fmt.Errorf("LoadHeadRevision: %w", err)
+		}
+
+		gitRepo, err := git.OpenRepository(ctx, pr.BaseRepo.RepoPath())
+		if err != nil {
+			return testPatchCtx, fmt.Errorf("OpenRepository: %w", err)
+		}
+
+		testPatchCtx.baseRev = git.BranchPrefix + pr.BaseBranch
+		testPatchCtx.gitRepo = gitRepo
+		testPatchCtx.close = func() {
+			gitRepo.Close()
+		}
+	} else {
+		prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
+		if err != nil {
+			return testPatchCtx, fmt.Errorf("createTemporaryRepoForPR: %w", err)
+		}
+		testPatchCtx.close = cancel
+
+		gitRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath)
+		if err != nil {
+			return testPatchCtx, fmt.Errorf("OpenRepository: %w", err)
+		}
+
+		testPatchCtx.baseRev = git.BranchPrefix + baseBranch
+		testPatchCtx.headRev = git.BranchPrefix + trackingBranch
+		testPatchCtx.gitRepo = gitRepo
+		testPatchCtx.close = func() {
+			cancel()
+			gitRepo.Close()
+		}
+	}
+	return testPatchCtx, nil
+}
+
+func testPatch(ctx context.Context, pr *issues_model.PullRequest) (*testPatchContext, error) {
+	testPatchCtx, err := getTestPatchCtx(ctx, pr, git.SupportGitMergeTree)
+	if err != nil {
+		return testPatchCtx, fmt.Errorf("getTestPatchCtx: %w", err)
+	}
+
+	// 1. update merge base
+	pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base").AddDashesAndList(testPatchCtx.baseRev, testPatchCtx.headRev).RunStdString(&git.RunOpts{Dir: testPatchCtx.gitRepo.Path, Env: testPatchCtx.env})
+	if err != nil {
+		var err2 error
+		pr.MergeBase, err2 = testPatchCtx.gitRepo.GetRefCommitID(testPatchCtx.baseRev)
+		if err2 != nil {
+			return testPatchCtx, fmt.Errorf("GetMergeBase: %v and can't find commit ID for base: %w", err, err2)
+		}
+	}
+	pr.MergeBase = strings.TrimSpace(pr.MergeBase)
+
+	if testPatchCtx.headIsCommitID {
+		pr.HeadCommitID = testPatchCtx.headRev
+	} else {
+		if pr.HeadCommitID, err = testPatchCtx.gitRepo.GetRefCommitID(testPatchCtx.headRev); err != nil {
+			return testPatchCtx, fmt.Errorf("GetRefCommitID: can't find commit ID for head: %w", err)
+		}
+	}
+
+	// If the head commit is equal to the merge base it roughly means that the
+	// head commit is a parent of the base commit.
+	if pr.HeadCommitID == pr.MergeBase {
+		pr.Status = issues_model.PullRequestStatusAncestor
+		return testPatchCtx, nil
+	}
+
+	// 2. Check for conflicts
+	if conflicts, err := checkConflicts(ctx, pr, testPatchCtx); err != nil || conflicts || pr.Status == issues_model.PullRequestStatusEmpty {
+		if err != nil {
+			return testPatchCtx, fmt.Errorf("checkConflicts: %w", err)
+		}
+		return testPatchCtx, nil
+	}
+
 	// 3. Check for protected files changes
-	if err = checkPullFilesProtection(ctx, pr, gitRepo); err != nil {
-		return fmt.Errorf("pr.CheckPullFilesProtection(): %v", err)
+	if err = checkPullFilesProtection(ctx, pr, testPatchCtx); err != nil {
+		return testPatchCtx, fmt.Errorf("checkPullFilesProtection: %v", err)
 	}
 
 	if len(pr.ChangedProtectedFiles) > 0 {
@@ -117,7 +210,7 @@ func testPatch(ctx context.Context, prCtx *prContext, pr *issues_model.PullReque
 
 	pr.Status = issues_model.PullRequestStatusMergeable
 
-	return nil
+	return testPatchCtx, nil
 }
 
 type errMergeConflict struct {
@@ -236,12 +329,12 @@ func attemptMerge(ctx context.Context, file *unmergedFile, tmpBasePath string, f
 }
 
 // AttemptThreeWayMerge will attempt to three way merge using git read-tree and then follow the git merge-one-file algorithm to attempt to resolve basic conflicts
-func AttemptThreeWayMerge(ctx context.Context, gitPath string, gitRepo *git.Repository, base, ours, theirs, description string) (bool, []string, error) {
+func AttemptThreeWayMerge(ctx context.Context, gitRepo *git.Repository, base, ours, theirs, description string) (bool, []string, error) {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	// First we use read-tree to do a simple three-way merge
-	if _, _, err := git.NewCommand(ctx, "read-tree", "-m").AddDynamicArguments(base, ours, theirs).RunStdString(&git.RunOpts{Dir: gitPath}); err != nil {
+	if _, _, err := git.NewCommand(ctx, "read-tree", "-m").AddDynamicArguments(base, ours, theirs).RunStdString(&git.RunOpts{Dir: gitRepo.Path}); err != nil {
 		log.Error("Unable to run read-tree -m! Error: %v", err)
 		return false, nil, fmt.Errorf("unable to run read-tree -m! Error: %w", err)
 	}
@@ -251,7 +344,7 @@ func AttemptThreeWayMerge(ctx context.Context, gitPath string, gitRepo *git.Repo
 
 	// Then we use git ls-files -u to list the unmerged files and collate the triples in unmergedfiles
 	unmerged := make(chan *unmergedFile)
-	go unmergedFiles(ctx, gitPath, unmerged)
+	go unmergedFiles(ctx, gitRepo.Path, unmerged)
 
 	defer func() {
 		cancel()
@@ -274,7 +367,7 @@ func AttemptThreeWayMerge(ctx context.Context, gitPath string, gitRepo *git.Repo
 		}
 
 		// OK now we have the unmerged file triplet attempt to merge it
-		if err := attemptMerge(ctx, file, gitPath, &filesToRemove, &filesToAdd); err != nil {
+		if err := attemptMerge(ctx, file, gitRepo.Path, &filesToRemove, &filesToAdd); err != nil {
 			if conflictErr, ok := err.(*errMergeConflict); ok {
 				log.Trace("Conflict: %s in %s", conflictErr.filename, description)
 				conflict = true
@@ -299,14 +392,82 @@ func AttemptThreeWayMerge(ctx context.Context, gitPath string, gitRepo *git.Repo
 	return conflict, conflictedFiles, nil
 }
 
-func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *git.Repository, tmpBasePath string) (bool, error) {
-	// 1. checkConflicts resets the conflict status - therefore - reset the conflict status
+// MergeTree runs a 3-way merge between `ours` and `theirs` with
+// `base` as the merge base.
+//
+// It uses git-merge-tree(1) to do this merge without requiring a work-tree and
+// can run in a base repository. It returns the object ID of the merge tree, if
+// there are any conflicts and conflicted files.
+func MergeTree(ctx context.Context, gitRepo *git.Repository, base, ours, theirs string, env []string) (string, bool, []string, error) {
+	cmd := git.NewCommand(ctx, "merge-tree", "--write-tree", "-z", "--name-only", "--no-messages")
+	if git.CheckGitVersionAtLeast("2.40") == nil {
+		cmd.AddOptionFormat("--merge-base=%s", base)
+	}
+
+	stdout := &bytes.Buffer{}
+	gitErr := cmd.AddDynamicArguments(ours, theirs).Run(&git.RunOpts{Dir: gitRepo.Path, Stdout: stdout, Env: env})
+	if gitErr != nil && !git.IsErrorExitCode(gitErr, 1) {
+		log.Error("Unable to run merge-tree: %v", gitErr)
+		return "", false, nil, fmt.Errorf("unable to run merge-tree: %w", gitErr)
+	}
+
+	// There are two situations that we consider for the output:
+	// 1. Clean merge and the output is <OID of toplevel tree>NUL
+	// 2. Merge conflict and the output is <OID of toplevel tree>NUL<Conflicted file info>NUL
+	treeOID, conflictedFileInfo, _ := strings.Cut(stdout.String(), "\x00")
+	if len(conflictedFileInfo) == 0 {
+		return treeOID, git.IsErrorExitCode(gitErr, 1), nil, nil
+	}
+
+	// Remove last NULL-byte from conflicted file info, then split with NULL byte as seperator.
+	return treeOID, true, strings.Split(conflictedFileInfo[:len(conflictedFileInfo)-1], "\x00"), nil
+}
+
+// checkConflicts takes a pull request and checks if merging it would result in
+// merge conflicts and checks if the diff is empty; the status is set accordingly.
+func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, testPatchCtx *testPatchContext) (bool, error) {
+	// Resets the conflict status.
 	pr.ConflictedFiles = nil
 
+	if git.SupportGitMergeTree {
+		// Check for conflicts via a merge-tree.
+		treeHash, conflict, conflictFiles, err := MergeTree(ctx, testPatchCtx.gitRepo, pr.MergeBase, testPatchCtx.baseRev, testPatchCtx.headRev, testPatchCtx.env)
+		if err != nil {
+			return false, fmt.Errorf("MergeTree: %w", err)
+		}
+
+		if !conflict {
+			// No conflicts were detected, now check if the pull request actually
+			// contains anything useful via a diff. git-diff-tree(1) with --quiet
+			// will return exit code 0 if there's no diff and exit code 1 if there's
+			// a diff.
+			err := git.NewCommand(ctx, "diff-tree", "--quiet").AddDynamicArguments(treeHash, pr.MergeBase).Run(&git.RunOpts{Dir: testPatchCtx.gitRepo.Path, Env: testPatchCtx.env})
+			isEmpty := true
+			if err != nil {
+				if git.IsErrorExitCode(err, 1) {
+					isEmpty = false
+				} else {
+					return false, fmt.Errorf("DiffTree: %w", err)
+				}
+			}
+
+			if isEmpty {
+				log.Debug("PullRequest[%d]: Patch is empty - ignoring", pr.ID)
+				pr.Status = issues_model.PullRequestStatusEmpty
+			}
+			return false, nil
+		}
+
+		pr.Status = issues_model.PullRequestStatusConflict
+		pr.ConflictedFiles = conflictFiles
+
+		log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
+		return true, nil
+	}
+
 	// 2. AttemptThreeWayMerge first - this is much quicker than plain patch to base
 	description := fmt.Sprintf("PR[%d] %s/%s#%d", pr.ID, pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Index)
-	conflict, conflictFiles, err := AttemptThreeWayMerge(ctx,
-		tmpBasePath, gitRepo, pr.MergeBase, "base", "tracking", description)
+	conflict, conflictFiles, err := AttemptThreeWayMerge(ctx, testPatchCtx.gitRepo, pr.MergeBase, testPatchCtx.baseRev, testPatchCtx.headRev, description)
 	if err != nil {
 		return false, err
 	}
@@ -315,13 +476,13 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
 		// No conflicts detected so we need to check if the patch is empty...
 		// a. Write the newly merged tree and check the new tree-hash
 		var treeHash string
-		treeHash, _, err = git.NewCommand(ctx, "write-tree").RunStdString(&git.RunOpts{Dir: tmpBasePath})
+		treeHash, _, err = git.NewCommand(ctx, "write-tree").RunStdString(&git.RunOpts{Dir: testPatchCtx.gitRepo.Path})
 		if err != nil {
-			lsfiles, _, _ := git.NewCommand(ctx, "ls-files", "-u").RunStdString(&git.RunOpts{Dir: tmpBasePath})
+			lsfiles, _, _ := git.NewCommand(ctx, "ls-files", "-u").RunStdString(&git.RunOpts{Dir: testPatchCtx.gitRepo.Path})
 			return false, fmt.Errorf("unable to write unconflicted tree: %w\n`git ls-files -u`:\n%s", err, lsfiles)
 		}
 		treeHash = strings.TrimSpace(treeHash)
-		baseTree, err := gitRepo.GetTree("base")
+		baseTree, err := testPatchCtx.gitRepo.GetTree(testPatchCtx.baseRev)
 		if err != nil {
 			return false, err
 		}
@@ -335,171 +496,11 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
 		return false, nil
 	}
 
-	// 3. OK the three-way merge method has detected conflicts
-	// 3a. Are still testing with GitApply? If not set the conflict status and move on
-	if !setting.Repository.PullRequest.TestConflictingPatchesWithGitApply {
-		pr.Status = issues_model.PullRequestStatusConflict
-		pr.ConflictedFiles = conflictFiles
+	pr.Status = issues_model.PullRequestStatusConflict
+	pr.ConflictedFiles = conflictFiles
 
-		log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
-		return true, nil
-	}
-
-	// 3b. Create a plain patch from head to base
-	tmpPatchFile, err := os.CreateTemp("", "patch")
-	if err != nil {
-		log.Error("Unable to create temporary patch file! Error: %v", err)
-		return false, fmt.Errorf("unable to create temporary patch file! Error: %w", err)
-	}
-	defer func() {
-		_ = util.Remove(tmpPatchFile.Name())
-	}()
-
-	if err := gitRepo.GetDiffBinary(pr.MergeBase, "tracking", tmpPatchFile); err != nil {
-		tmpPatchFile.Close()
-		log.Error("Unable to get patch file from %s to %s in %s Error: %v", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err)
-		return false, fmt.Errorf("unable to get patch file from %s to %s in %s Error: %w", pr.MergeBase, pr.HeadBranch, pr.BaseRepo.FullName(), err)
-	}
-	stat, err := tmpPatchFile.Stat()
-	if err != nil {
-		tmpPatchFile.Close()
-		return false, fmt.Errorf("unable to stat patch file: %w", err)
-	}
-	patchPath := tmpPatchFile.Name()
-	tmpPatchFile.Close()
-
-	// 3c. if the size of that patch is 0 - there can be no conflicts!
-	if stat.Size() == 0 {
-		log.Debug("PullRequest[%d]: Patch is empty - ignoring", pr.ID)
-		pr.Status = issues_model.PullRequestStatusEmpty
-		return false, nil
-	}
-
-	log.Trace("PullRequest[%d].testPatch (patchPath): %s", pr.ID, patchPath)
-
-	// 4. Read the base branch in to the index of the temporary repository
-	_, _, err = git.NewCommand(gitRepo.Ctx, "read-tree", "base").RunStdString(&git.RunOpts{Dir: tmpBasePath})
-	if err != nil {
-		return false, fmt.Errorf("git read-tree %s: %w", pr.BaseBranch, err)
-	}
-
-	// 5. Now get the pull request configuration to check if we need to ignore whitespace
-	prUnit, err := pr.BaseRepo.GetUnit(ctx, unit.TypePullRequests)
-	if err != nil {
-		return false, err
-	}
-	prConfig := prUnit.PullRequestsConfig()
-
-	// 6. Prepare the arguments to apply the patch against the index
-	cmdApply := git.NewCommand(gitRepo.Ctx, "apply", "--check", "--cached")
-	if prConfig.IgnoreWhitespaceConflicts {
-		cmdApply.AddArguments("--ignore-whitespace")
-	}
-	is3way := false
-	if git.CheckGitVersionAtLeast("2.32.0") == nil {
-		cmdApply.AddArguments("--3way")
-		is3way = true
-	}
-	cmdApply.AddDynamicArguments(patchPath)
-
-	// 7. Prep the pipe:
-	//   - Here we could do the equivalent of:
-	//  `git apply --check --cached patch_file > conflicts`
-	//     Then iterate through the conflicts. However, that means storing all the conflicts
-	//     in memory - which is very wasteful.
-	//   - alternatively we can do the equivalent of:
-	//  `git apply --check ... | grep ...`
-	//     meaning we don't store all of the conflicts unnecessarily.
-	stderrReader, stderrWriter, err := os.Pipe()
-	if err != nil {
-		log.Error("Unable to open stderr pipe: %v", err)
-		return false, fmt.Errorf("unable to open stderr pipe: %w", err)
-	}
-	defer func() {
-		_ = stderrReader.Close()
-		_ = stderrWriter.Close()
-	}()
-
-	// 8. Run the check command
-	conflict = false
-	err = cmdApply.Run(&git.RunOpts{
-		Dir:    tmpBasePath,
-		Stderr: stderrWriter,
-		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
-			// Close the writer end of the pipe to begin processing
-			_ = stderrWriter.Close()
-			defer func() {
-				// Close the reader on return to terminate the git command if necessary
-				_ = stderrReader.Close()
-			}()
-
-			const prefix = "error: patch failed:"
-			const errorPrefix = "error: "
-			const threewayFailed = "Failed to perform three-way merge..."
-			const appliedPatchPrefix = "Applied patch to '"
-			const withConflicts = "' with conflicts."
-
-			conflicts := make(container.Set[string])
-
-			// Now scan the output from the command
-			scanner := bufio.NewScanner(stderrReader)
-			for scanner.Scan() {
-				line := scanner.Text()
-				log.Trace("PullRequest[%d].testPatch: stderr: %s", pr.ID, line)
-				if strings.HasPrefix(line, prefix) {
-					conflict = true
-					filepath := strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0])
-					conflicts.Add(filepath)
-				} else if is3way && line == threewayFailed {
-					conflict = true
-				} else if strings.HasPrefix(line, errorPrefix) {
-					conflict = true
-					for _, suffix := range patchErrorSuffices {
-						if strings.HasSuffix(line, suffix) {
-							filepath := strings.TrimSpace(strings.TrimSuffix(line[len(errorPrefix):], suffix))
-							if filepath != "" {
-								conflicts.Add(filepath)
-							}
-							break
-						}
-					}
-				} else if is3way && strings.HasPrefix(line, appliedPatchPrefix) && strings.HasSuffix(line, withConflicts) {
-					conflict = true
-					filepath := strings.TrimPrefix(strings.TrimSuffix(line, withConflicts), appliedPatchPrefix)
-					if filepath != "" {
-						conflicts.Add(filepath)
-					}
-				}
-				// only list 10 conflicted files
-				if len(conflicts) >= 10 {
-					break
-				}
-			}
-
-			if len(conflicts) > 0 {
-				pr.ConflictedFiles = make([]string, 0, len(conflicts))
-				for key := range conflicts {
-					pr.ConflictedFiles = append(pr.ConflictedFiles, key)
-				}
-			}
-
-			return nil
-		},
-	})
-
-	// 9. Check if the found conflictedfiles is non-zero, "err" could be non-nil, so we should ignore it if we found conflicts.
-	// Note: `"err" could be non-nil` is due that if enable 3-way merge, it doesn't return any error on found conflicts.
-	if len(pr.ConflictedFiles) > 0 {
-		if conflict {
-			pr.Status = issues_model.PullRequestStatusConflict
-			log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
-
-			return true, nil
-		}
-	} else if err != nil {
-		return false, fmt.Errorf("git apply --check: %w", err)
-	}
-	return false, nil
+	log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
+	return true, nil
 }
 
 // CheckFileProtection check file Protection
@@ -558,7 +559,7 @@ func CheckUnprotectedFiles(repo *git.Repository, oldCommitID, newCommitID string
 }
 
 // checkPullFilesProtection check if pr changed protected files and save results
-func checkPullFilesProtection(ctx context.Context, pr *issues_model.PullRequest, gitRepo *git.Repository) error {
+func checkPullFilesProtection(ctx context.Context, pr *issues_model.PullRequest, testPatchCtx *testPatchContext) error {
 	if pr.Status == issues_model.PullRequestStatusEmpty {
 		pr.ChangedProtectedFiles = nil
 		return nil
@@ -574,7 +575,7 @@ func checkPullFilesProtection(ctx context.Context, pr *issues_model.PullRequest,
 		return nil
 	}
 
-	pr.ChangedProtectedFiles, err = CheckFileProtection(gitRepo, pr.MergeBase, "tracking", pb.GetProtectedFilePatterns(), 10, os.Environ())
+	pr.ChangedProtectedFiles, err = CheckFileProtection(testPatchCtx.gitRepo, pr.MergeBase, testPatchCtx.headRev, pb.GetProtectedFilePatterns(), 10, testPatchCtx.env)
 	if err != nil && !models.IsErrFilePathProtected(err) {
 		return err
 	}
diff --git a/services/pull/patch_test.go b/services/pull/patch_test.go
new file mode 100644
index 0000000000..bcab19fc58
--- /dev/null
+++ b/services/pull/patch_test.go
@@ -0,0 +1,62 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package pull
+
+import (
+	"fmt"
+	"testing"
+
+	issues_model "forgejo.org/models/issues"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/setting"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestLoadHeadRevision(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	t.Run("AGit", func(t *testing.T) {
+		t.Run("New", func(t *testing.T) {
+			ctx := &testPatchContext{}
+			require.NoError(t, ctx.LoadHeadRevision(t.Context(), &issues_model.PullRequest{Flow: issues_model.PullRequestFlowAGit, HeadCommitID: "Commit!"}))
+
+			assert.Empty(t, ctx.env)
+			assert.Equal(t, "Commit!", ctx.headRev)
+			assert.True(t, ctx.headIsCommitID)
+		})
+		t.Run("Existing", func(t *testing.T) {
+			ctx := &testPatchContext{}
+			require.NoError(t, ctx.LoadHeadRevision(t.Context(), &issues_model.PullRequest{Flow: issues_model.PullRequestFlowAGit, Index: 371}))
+
+			assert.Empty(t, ctx.env)
+			assert.Equal(t, "refs/pull/371/head", ctx.headRev)
+			assert.False(t, ctx.headIsCommitID)
+		})
+	})
+
+	t.Run("Same repository", func(t *testing.T) {
+		ctx := &testPatchContext{}
+		require.NoError(t, ctx.LoadHeadRevision(t.Context(), unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1})))
+
+		assert.Empty(t, ctx.env)
+		assert.Equal(t, "refs/heads/branch1", ctx.headRev)
+		assert.False(t, ctx.headIsCommitID)
+	})
+
+	t.Run("Across repository", func(t *testing.T) {
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 3})
+		require.NoError(t, pr.LoadHeadRepo(t.Context()))
+
+		ctx := &testPatchContext{}
+		require.NoError(t, ctx.LoadHeadRevision(t.Context(), pr))
+
+		if assert.NotEmpty(t, ctx.env) {
+			assert.Equal(t, fmt.Sprintf("GIT_ALTERNATE_OBJECT_DIRECTORIES=%s/user13/repo11.git/objects", setting.RepoRootPath), ctx.env[len(ctx.env)-1])
+		}
+		assert.Equal(t, "0abcb056019adb8336cf9db3ad9d9cf80cd4b141", ctx.headRev)
+		assert.True(t, ctx.headIsCommitID)
+	})
+}
diff --git a/services/pull/pull.go b/services/pull/pull.go
index 18f63cf95d..c1fe6c6b55 100644
--- a/services/pull/pull.go
+++ b/services/pull/pull.go
@@ -4,11 +4,9 @@
 package pull
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"io"
-	"os"
 	"regexp"
 	"strings"
 	"time"
@@ -30,7 +28,6 @@ import (
 	repo_module "forgejo.org/modules/repository"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/sync"
-	"forgejo.org/modules/util"
 	gitea_context "forgejo.org/services/context"
 	issue_service "forgejo.org/services/issue"
 	notify_service "forgejo.org/services/notify"
@@ -46,22 +43,15 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
 		return user_model.ErrBlockedByUser
 	}
 
-	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
+	testPatchCtx, err := testPatch(ctx, pr)
+	defer testPatchCtx.close()
 	if err != nil {
-		if !git_model.IsErrBranchNotExist(err) {
-			log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err)
-		}
-		return err
-	}
-	defer cancel()
-
-	if err := testPatch(ctx, prCtx, pr); err != nil {
-		return err
+		return fmt.Errorf("testPatch: %w", err)
 	}
 
-	divergence, err := git.GetDivergingCommits(ctx, prCtx.tmpBasePath, baseBranch, trackingBranch)
+	divergence, err := git.GetDivergingCommits(ctx, testPatchCtx.gitRepo.Path, testPatchCtx.baseRev, testPatchCtx.headRev, testPatchCtx.env)
 	if err != nil {
-		return err
+		return fmt.Errorf("GetDivergingCommits: %w", err)
 	}
 	pr.CommitsAhead = divergence.Ahead
 	pr.CommitsBehind = divergence.Behind
@@ -391,98 +381,51 @@ func TestPullRequest(ctx context.Context, doer *user_model.User, repoID, olderTh
 // Update commit divergence.
 func ValidatePullRequest(ctx context.Context, pr *issues_model.PullRequest, newCommitID, oldCommitID string, doer *user_model.User) {
 	objectFormat := git.ObjectFormatFromName(pr.BaseRepo.ObjectFormatName)
-	if newCommitID != "" && newCommitID != objectFormat.EmptyObjectID().String() {
-		changed, err := checkIfPRContentChanged(ctx, pr, oldCommitID, newCommitID)
+	if newCommitID == "" || newCommitID == objectFormat.EmptyObjectID().String() {
+		return
+	}
+
+	testPatchCtx, err := getTestPatchCtx(ctx, pr, true)
+	defer testPatchCtx.close()
+	if err != nil {
+		log.Error("testPatchCtx: %v", err)
+		return
+	}
+
+	changed, err := testPatchCtx.gitRepo.CheckIfDiffDiffers(testPatchCtx.baseRev, oldCommitID, newCommitID, testPatchCtx.env)
+	if err != nil {
+		log.Error("CheckIfDiffDiffers: %v", err)
+	}
+	if changed {
+		if err := issues_model.MarkReviewsAsStale(ctx, pr.IssueID); err != nil {
+			log.Error("MarkReviewsAsStale: %v", err)
+		}
+
+		pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)
 		if err != nil {
-			log.Error("checkIfPRContentChanged: %v", err)
+			log.Error("GetFirstMatchProtectedBranchRule: %v", err)
 		}
-		if changed {
-			if err := issues_model.MarkReviewsAsStale(ctx, pr.IssueID); err != nil {
-				log.Error("MarkReviewsAsStale: %v", err)
+		if pb != nil && pb.DismissStaleApprovals {
+			if err := DismissApprovalReviews(ctx, doer, pr); err != nil {
+				log.Error("DismissApprovalReviews: %v", err)
 			}
+		}
+	}
+	if err := issues_model.MarkReviewsAsNotStale(ctx, pr.IssueID, newCommitID); err != nil {
+		log.Error("MarkReviewsAsNotStale: %v", err)
+	}
 
-			pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)
-			if err != nil {
-				log.Error("GetFirstMatchProtectedBranchRule: %v", err)
-			}
-			if pb != nil && pb.DismissStaleApprovals {
-				if err := DismissApprovalReviews(ctx, doer, pr); err != nil {
-					log.Error("DismissApprovalReviews: %v", err)
-				}
-			}
-		}
-		if err := issues_model.MarkReviewsAsNotStale(ctx, pr.IssueID, newCommitID); err != nil {
-			log.Error("MarkReviewsAsNotStale: %v", err)
-		}
-		divergence, err := GetDiverging(ctx, pr)
+	divergence, err := git.GetDivergingCommits(ctx, testPatchCtx.gitRepo.Path, testPatchCtx.baseRev, testPatchCtx.headRev, testPatchCtx.env)
+	if err != nil {
+		log.Error("GetDivergingCommits: %v", err)
+	} else {
+		err = pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
 		if err != nil {
-			log.Error("GetDiverging: %v", err)
-		} else {
-			err = pr.UpdateCommitDivergence(ctx, divergence.Ahead, divergence.Behind)
-			if err != nil {
-				log.Error("UpdateCommitDivergence: %v", err)
-			}
+			log.Error("UpdateCommitDivergence: %v", err)
 		}
 	}
 }
 
-// checkIfPRContentChanged checks if diff to target branch has changed by push
-// A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged
-func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) {
-	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
-	if err != nil {
-		log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err)
-		return false, err
-	}
-	defer cancel()
-
-	tmpRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath)
-	if err != nil {
-		return false, fmt.Errorf("OpenRepository: %w", err)
-	}
-	defer tmpRepo.Close()
-
-	// Find the merge-base
-	_, base, err := tmpRepo.GetMergeBase("", "base", "tracking")
-	if err != nil {
-		return false, fmt.Errorf("GetMergeBase: %w", err)
-	}
-
-	cmd := git.NewCommand(ctx, "diff", "--name-only", "-z").AddDynamicArguments(newCommitID, oldCommitID, base)
-	stdoutReader, stdoutWriter, err := os.Pipe()
-	if err != nil {
-		return false, fmt.Errorf("unable to open pipe for to run diff: %w", err)
-	}
-
-	stderr := new(bytes.Buffer)
-	if err := cmd.Run(&git.RunOpts{
-		Dir:    prCtx.tmpBasePath,
-		Stdout: stdoutWriter,
-		Stderr: stderr,
-		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
-			_ = stdoutWriter.Close()
-			defer func() {
-				_ = stdoutReader.Close()
-			}()
-			return util.IsEmptyReader(stdoutReader)
-		},
-	}); err != nil {
-		if err == util.ErrNotEmpty {
-			return true, nil
-		}
-		err = git.ConcatenateError(err, stderr.String())
-
-		log.Error("Unable to run diff on %s %s %s in tempRepo for PR[%d]%s/%s...%s/%s: Error: %v",
-			newCommitID, oldCommitID, base,
-			pr.ID, pr.BaseRepo.FullName(), pr.BaseBranch, pr.HeadRepo.FullName(), pr.HeadBranch,
-			err)
-
-		return false, fmt.Errorf("Unable to run git diff --name-only -z %s %s %s: %w", newCommitID, oldCommitID, base, err)
-	}
-
-	return false, nil
-}
-
 // PushToBaseRepo pushes commits from branches of head repository to
 // corresponding branches of base repository.
 // FIXME: Only push branches that are actually updates?
diff --git a/services/pull/pull_test.go b/services/pull/pull_test.go
index 010b7a6404..99607c5b35 100644
--- a/services/pull/pull_test.go
+++ b/services/pull/pull_test.go
@@ -92,3 +92,39 @@ func TestPullRequest_GetDefaultMergeMessage_ExternalTracker(t *testing.T) {
 
 	assert.Equal(t, "Merge pull request 'issue3' (#3) from user2/repo2:branch2 into master", mergeMessage)
 }
+
+func TestPullRequest_GetDefaultMergeMessage_GlobalTemplate(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2})
+
+	require.NoError(t, pr.LoadBaseRepo(t.Context()))
+	gitRepo, err := gitrepo.OpenRepository(t.Context(), pr.BaseRepo)
+	require.NoError(t, err)
+	defer gitRepo.Close()
+
+	templateRepo, err := git.OpenRepository(t.Context(), "./../../modules/git/tests/repos/templates_repo")
+	require.NoError(t, err)
+	defer templateRepo.Close()
+
+	mergeMessageTemplates[repo_model.MergeStyleMerge] = "${PullRequestTitle} (${PullRequestReference})\n${PullRequestDescription}"
+
+	// Check template is used for Merge...
+	mergeMessage, body, err := GetDefaultMergeMessage(t.Context(), gitRepo, pr, repo_model.MergeStyleMerge)
+	require.NoError(t, err)
+
+	assert.Equal(t, "issue3 (#3)", mergeMessage)
+	assert.Equal(t, "content for the third issue", body)
+
+	// ...but not for RebaseMerge
+	mergeMessage, _, err = GetDefaultMergeMessage(t.Context(), gitRepo, pr, repo_model.MergeStyleRebaseMerge)
+	require.NoError(t, err)
+
+	assert.Equal(t, "Merge pull request 'issue3' (#3) from branch2 into master", mergeMessage)
+
+	// ...and that custom Merge template takes priority
+	mergeMessage, body, err = GetDefaultMergeMessage(t.Context(), templateRepo, pr, repo_model.MergeStyleMerge)
+	require.NoError(t, err)
+
+	assert.Equal(t, "Default merge message template", mergeMessage)
+	assert.Equal(t, "This line was read from .forgejo/default_merge_message/MERGE_TEMPLATE.md", body)
+}
diff --git a/services/pull/review.go b/services/pull/review.go
index d61d9623b6..b0ab700fa6 100644
--- a/services/pull/review.go
+++ b/services/pull/review.go
@@ -6,10 +6,9 @@ package pull
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
-	"regexp"
-	"strings"
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
@@ -24,8 +23,6 @@ import (
 	notify_service "forgejo.org/services/notify"
 )
 
-var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`)
-
 // ErrDismissRequestOnClosedPR represents an error when an user tries to dismiss a review associated to a closed or merged PR.
 type ErrDismissRequestOnClosedPR struct{}
 
@@ -47,8 +44,8 @@ func (err ErrDismissRequestOnClosedPR) Unwrap() error {
 // If the line got changed the comment is going to be invalidated.
 func checkInvalidation(ctx context.Context, c *issues_model.Comment, repo *git.Repository, branch string) error {
 	// FIXME differentiate between previous and proposed line
-	commit, err := repo.LineBlame(branch, repo.Path, c.TreePath, uint(c.UnsignedLine()))
-	if err != nil && (strings.Contains(err.Error(), "fatal: no such path") || notEnoughLines.MatchString(err.Error())) {
+	commit, err := repo.LineBlame(branch, c.TreePath, c.UnsignedLine())
+	if err != nil && (errors.Is(err, git.ErrBlameFileDoesNotExist) || errors.Is(err, git.ErrBlameFileNotEnoughLines)) {
 		c.Invalidated = true
 		return issues_model.UpdateCommentInvalidate(ctx, c)
 	}
@@ -229,10 +226,10 @@ func CreateCodeCommentKnownReviewID(ctx context.Context, doer *user_model.User,
 			// FIXME validate treePath
 			// Get latest commit referencing the commented line
 			// No need for get commit for base branch changes
-			commit, err := gitRepo.LineBlame(head, gitRepo.Path, treePath, uint(line))
+			commit, err := gitRepo.LineBlame(head, treePath, uint64(line))
 			if err == nil {
 				commitID = commit.ID.String()
-			} else if !(strings.Contains(err.Error(), "exit status 128 - fatal: no such path") || notEnoughLines.MatchString(err.Error())) {
+			} else if !errors.Is(err, git.ErrBlameFileDoesNotExist) && !errors.Is(err, git.ErrBlameFileNotEnoughLines) {
 				return nil, fmt.Errorf("LineBlame[%s, %s, %s, %d]: %w", pr.GetGitRefName(), gitRepo.Path, treePath, line, err)
 			}
 		}
@@ -301,10 +298,16 @@ func SubmitReview(ctx context.Context, doer *user_model.User, gitRepo *git.Repos
 		if headCommitID == commitID {
 			stale = false
 		} else {
-			stale, err = checkIfPRContentChanged(ctx, pr, commitID, headCommitID)
+			testPatchCtx, err := getTestPatchCtx(ctx, pr, true)
+			defer testPatchCtx.close()
 			if err != nil {
 				return nil, nil, err
 			}
+
+			stale, err = testPatchCtx.gitRepo.CheckIfDiffDiffers(testPatchCtx.baseRev, commitID, headCommitID, testPatchCtx.env)
+			if err != nil {
+				return nil, nil, fmt.Errorf("CheckIfDiffDiffers: %w", err)
+			}
 		}
 	}
 
@@ -387,7 +390,7 @@ func DismissReview(ctx context.Context, reviewID, repoID int64, message string,
 	}
 
 	if review.Type != issues_model.ReviewTypeApprove && review.Type != issues_model.ReviewTypeReject {
-		return nil, fmt.Errorf("not need to dismiss this review because it's type is not Approve or change request")
+		return nil, errors.New("not need to dismiss this review because it's type is not Approve or change request")
 	}
 
 	// load data for notify
@@ -397,7 +400,7 @@ func DismissReview(ctx context.Context, reviewID, repoID int64, message string,
 
 	// Check if the review's repoID is the one we're currently expecting.
 	if review.Issue.RepoID != repoID {
-		return nil, fmt.Errorf("reviews's repository is not the same as the one we expect")
+		return nil, errors.New("reviews's repository is not the same as the one we expect")
 	}
 
 	issue := review.Issue
diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go
index 1805ffc527..76ae0df018 100644
--- a/services/pull/temp_repo.go
+++ b/services/pull/temp_repo.go
@@ -103,11 +103,7 @@ func createTemporaryRepoForPR(ctx context.Context, pr *issues_model.PullRequest)
 	remoteRepoName := "head_repo"
 	baseBranch := "base"
 
-	fetchArgs := git.TrustedCmdArgs{"--no-tags"}
-	if git.CheckGitVersionAtLeast("2.25.0") == nil {
-		// Writing the commit graph can be slow and is not needed here
-		fetchArgs = append(fetchArgs, "--no-write-commit-graph")
-	}
+	fetchArgs := git.TrustedCmdArgs{"--no-tags", "--no-write-commit-graph"}
 
 	// addCacheRepo adds git alternatives for the cacheRepoPath in the repoPath
 	addCacheRepo := func(repoPath, cacheRepoPath string) error {
diff --git a/services/pull/update.go b/services/pull/update.go
index 1b4b6b039d..563c11fff3 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -5,6 +5,7 @@ package pull
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	git_model "forgejo.org/models/git"
@@ -22,7 +23,7 @@ import (
 func Update(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, message string, rebase bool) error {
 	if pr.Flow == issues_model.PullRequestFlowAGit {
 		// TODO: update of agit flow pull request's head branch is unsupported
-		return fmt.Errorf("update of agit flow pull request's head branch is unsupported")
+		return errors.New("update of agit flow pull request's head branch is unsupported")
 	}
 
 	pullWorkingPool.CheckIn(fmt.Sprint(pr.ID))
@@ -175,6 +176,6 @@ func GetDiverging(ctx context.Context, pr *issues_model.PullRequest) (*git.Diver
 	}
 	defer cancel()
 
-	diff, err := git.GetDivergingCommits(ctx, prCtx.tmpBasePath, baseBranch, trackingBranch)
+	diff, err := git.GetDivergingCommits(ctx, prCtx.tmpBasePath, baseBranch, trackingBranch, nil)
 	return &diff, err
 }
diff --git a/services/release/release.go b/services/release/release.go
index f0682c4dca..90eb1320ed 100644
--- a/services/release/release.go
+++ b/services/release/release.go
@@ -161,17 +161,17 @@ func CreateRelease(gitRepo *git.Repository, rel *repo_model.Release, msg string,
 
 	for _, attachmentChange := range attachmentChanges {
 		if attachmentChange.Action != "add" {
-			return fmt.Errorf("can only create new attachments when creating release")
+			return errors.New("can only create new attachments when creating release")
 		}
 		switch attachmentChange.Type {
 		case "attachment":
 			if attachmentChange.UUID == "" {
-				return fmt.Errorf("new attachment should have a uuid")
+				return errors.New("new attachment should have a uuid")
 			}
 			addAttachmentUUIDs.Add(attachmentChange.UUID)
 		case "external":
 			if attachmentChange.Name == "" || attachmentChange.ExternalURL == "" {
-				return fmt.Errorf("new external attachment should have a name and external url")
+				return errors.New("new external attachment should have a name and external url")
 			}
 
 			_, err = attachment.NewExternalAttachment(gitRepo.Ctx, &repo_model.Attachment{
@@ -186,7 +186,7 @@ func CreateRelease(gitRepo *git.Repository, rel *repo_model.Release, msg string,
 			}
 		default:
 			if attachmentChange.Type == "" {
-				return fmt.Errorf("missing attachment type")
+				return errors.New("missing attachment type")
 			}
 			return fmt.Errorf("unknown attachment type: '%q'", attachmentChange.Type)
 		}
@@ -280,7 +280,7 @@ func UpdateRelease(ctx context.Context, doer *user_model.User, gitRepo *git.Repo
 				addAttachmentUUIDs.Add(attachmentChange.UUID)
 			case "external":
 				if attachmentChange.Name == "" || attachmentChange.ExternalURL == "" {
-					return fmt.Errorf("new external attachment should have a name and external url")
+					return errors.New("new external attachment should have a name and external url")
 				}
 				_, err := attachment.NewExternalAttachment(ctx, &repo_model.Attachment{
 					Name:        attachmentChange.Name,
@@ -294,13 +294,13 @@ func UpdateRelease(ctx context.Context, doer *user_model.User, gitRepo *git.Repo
 				}
 			default:
 				if attachmentChange.Type == "" {
-					return fmt.Errorf("missing attachment type")
+					return errors.New("missing attachment type")
 				}
 				return fmt.Errorf("unknown attachment type: %q", attachmentChange.Type)
 			}
 		case "delete":
 			if attachmentChange.UUID == "" {
-				return fmt.Errorf("attachment deletion should have a uuid")
+				return errors.New("attachment deletion should have a uuid")
 			}
 			delAttachmentUUIDs.Add(attachmentChange.UUID)
 		case "update":
@@ -308,7 +308,7 @@ func UpdateRelease(ctx context.Context, doer *user_model.User, gitRepo *git.Repo
 			updateAttachments.Add(attachmentChange)
 		default:
 			if attachmentChange.Action == "" {
-				return fmt.Errorf("missing attachment action")
+				return errors.New("missing attachment action")
 			}
 			return fmt.Errorf("unknown attachment action: %q", attachmentChange.Action)
 		}
diff --git a/services/release/release_test.go b/services/release/release_test.go
index 66106eb606..f03b4d42b8 100644
--- a/services/release/release_test.go
+++ b/services/release/release_test.go
@@ -6,7 +6,6 @@ package release
 import (
 	"strings"
 	"testing"
-	"time"
 
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
@@ -14,6 +13,7 @@ import (
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/gitrepo"
+	"forgejo.org/modules/test"
 	"forgejo.org/services/attachment"
 
 	_ "forgejo.org/models/actions"
@@ -138,9 +138,9 @@ func TestRelease_Create(t *testing.T) {
 	}))
 	assert.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, &release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, attach.UUID, release.Attachments[0].UUID)
-	assert.EqualValues(t, attach.Name, release.Attachments[0].Name)
-	assert.EqualValues(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
+	assert.Equal(t, attach.UUID, release.Attachments[0].UUID)
+	assert.Equal(t, attach.Name, release.Attachments[0].Name)
+	assert.Equal(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
 
 	release = repo_model.Release{
 		RepoID:       repo.ID,
@@ -165,8 +165,8 @@ func TestRelease_Create(t *testing.T) {
 	}))
 	assert.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, &release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, "test", release.Attachments[0].Name)
-	assert.EqualValues(t, "https://forgejo.org/", release.Attachments[0].ExternalURL)
+	assert.Equal(t, "test", release.Attachments[0].Name)
+	assert.Equal(t, "https://forgejo.org/", release.Attachments[0].ExternalURL)
 
 	release = repo_model.Release{
 		RepoID:       repo.ID,
@@ -219,7 +219,7 @@ func TestRelease_Update(t *testing.T) {
 	release, err := repo_model.GetRelease(db.DefaultContext, repo.ID, "v1.1.1")
 	require.NoError(t, err)
 	releaseCreatedUnix := release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Note = "Changed note"
 	require.NoError(t, UpdateRelease(db.DefaultContext, user, gitRepo, release, false, []*AttachmentChange{}))
 	release, err = repo_model.GetReleaseByID(db.DefaultContext, release.ID)
@@ -243,7 +243,7 @@ func TestRelease_Update(t *testing.T) {
 	release, err = repo_model.GetRelease(db.DefaultContext, repo.ID, "v1.2.1")
 	require.NoError(t, err)
 	releaseCreatedUnix = release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Title = "Changed title"
 	require.NoError(t, UpdateRelease(db.DefaultContext, user, gitRepo, release, false, []*AttachmentChange{}))
 	release, err = repo_model.GetReleaseByID(db.DefaultContext, release.ID)
@@ -267,7 +267,7 @@ func TestRelease_Update(t *testing.T) {
 	release, err = repo_model.GetRelease(db.DefaultContext, repo.ID, "v1.3.1")
 	require.NoError(t, err)
 	releaseCreatedUnix = release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Title = "Changed title"
 	release.Note = "Changed note"
 	require.NoError(t, UpdateRelease(db.DefaultContext, user, gitRepo, release, false, []*AttachmentChange{}))
@@ -318,10 +318,10 @@ func TestRelease_Update(t *testing.T) {
 	}))
 	require.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, attach.UUID, release.Attachments[0].UUID)
-	assert.EqualValues(t, release.ID, release.Attachments[0].ReleaseID)
-	assert.EqualValues(t, attach.Name, release.Attachments[0].Name)
-	assert.EqualValues(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
+	assert.Equal(t, attach.UUID, release.Attachments[0].UUID)
+	assert.Equal(t, release.ID, release.Attachments[0].ReleaseID)
+	assert.Equal(t, attach.Name, release.Attachments[0].Name)
+	assert.Equal(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
 
 	// update the attachment name
 	require.NoError(t, UpdateRelease(db.DefaultContext, user, gitRepo, release, false, []*AttachmentChange{
@@ -334,10 +334,10 @@ func TestRelease_Update(t *testing.T) {
 	release.Attachments = nil
 	require.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, attach.UUID, release.Attachments[0].UUID)
-	assert.EqualValues(t, release.ID, release.Attachments[0].ReleaseID)
-	assert.EqualValues(t, "test2.txt", release.Attachments[0].Name)
-	assert.EqualValues(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
+	assert.Equal(t, attach.UUID, release.Attachments[0].UUID)
+	assert.Equal(t, release.ID, release.Attachments[0].ReleaseID)
+	assert.Equal(t, "test2.txt", release.Attachments[0].Name)
+	assert.Equal(t, attach.ExternalURL, release.Attachments[0].ExternalURL)
 
 	// delete the attachment
 	require.NoError(t, UpdateRelease(db.DefaultContext, user, gitRepo, release, false, []*AttachmentChange{
@@ -361,9 +361,9 @@ func TestRelease_Update(t *testing.T) {
 	}))
 	assert.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, release.ID, release.Attachments[0].ReleaseID)
-	assert.EqualValues(t, "test", release.Attachments[0].Name)
-	assert.EqualValues(t, "https://forgejo.org/", release.Attachments[0].ExternalURL)
+	assert.Equal(t, release.ID, release.Attachments[0].ReleaseID)
+	assert.Equal(t, "test", release.Attachments[0].Name)
+	assert.Equal(t, "https://forgejo.org/", release.Attachments[0].ExternalURL)
 	externalAttachmentUUID := release.Attachments[0].UUID
 
 	// update the attachment name
@@ -378,10 +378,10 @@ func TestRelease_Update(t *testing.T) {
 	release.Attachments = nil
 	assert.NoError(t, repo_model.GetReleaseAttachments(db.DefaultContext, release))
 	assert.Len(t, release.Attachments, 1)
-	assert.EqualValues(t, externalAttachmentUUID, release.Attachments[0].UUID)
-	assert.EqualValues(t, release.ID, release.Attachments[0].ReleaseID)
-	assert.EqualValues(t, "test2", release.Attachments[0].Name)
-	assert.EqualValues(t, "https://about.gitea.com/", release.Attachments[0].ExternalURL)
+	assert.Equal(t, externalAttachmentUUID, release.Attachments[0].UUID)
+	assert.Equal(t, release.ID, release.Attachments[0].ReleaseID)
+	assert.Equal(t, "test2", release.Attachments[0].Name)
+	assert.Equal(t, "https://about.gitea.com/", release.Attachments[0].ExternalURL)
 }
 
 func TestRelease_createTag(t *testing.T) {
@@ -412,7 +412,7 @@ func TestRelease_createTag(t *testing.T) {
 	require.NoError(t, err)
 	assert.NotEmpty(t, release.CreatedUnix)
 	releaseCreatedUnix := release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Note = "Changed note"
 	_, err = createTag(db.DefaultContext, gitRepo, release, "")
 	require.NoError(t, err)
@@ -435,7 +435,7 @@ func TestRelease_createTag(t *testing.T) {
 	_, err = createTag(db.DefaultContext, gitRepo, release, "")
 	require.NoError(t, err)
 	releaseCreatedUnix = release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Title = "Changed title"
 	_, err = createTag(db.DefaultContext, gitRepo, release, "")
 	require.NoError(t, err)
@@ -458,7 +458,7 @@ func TestRelease_createTag(t *testing.T) {
 	_, err = createTag(db.DefaultContext, gitRepo, release, "")
 	require.NoError(t, err)
 	releaseCreatedUnix = release.CreatedUnix
-	time.Sleep(2 * time.Second) // sleep 2 seconds to ensure a different timestamp
+	test.SleepTillNextSecond()
 	release.Title = "Changed title"
 	release.Note = "Changed note"
 	_, err = createTag(db.DefaultContext, gitRepo, release, "")
diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go
index ec4da2404f..00d82267c9 100644
--- a/services/repository/archiver/archiver_test.go
+++ b/services/repository/archiver/archiver_test.go
@@ -36,7 +36,7 @@ func TestArchive_Basic(t *testing.T) {
 	bogusReq, err := NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, firstCommit, git.ZIP)
 	require.NoError(t, err)
 	assert.NotNil(t, bogusReq)
-	assert.EqualValues(t, firstCommit+".zip", bogusReq.GetArchiveName())
+	assert.Equal(t, firstCommit+".zip", bogusReq.GetArchiveName())
 
 	// Check a series of bogus requests.
 	// Step 1, valid commit with a bad extension.
@@ -57,12 +57,12 @@ func TestArchive_Basic(t *testing.T) {
 	bogusReq, err = NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, "master", git.ZIP)
 	require.NoError(t, err)
 	assert.NotNil(t, bogusReq)
-	assert.EqualValues(t, "master.zip", bogusReq.GetArchiveName())
+	assert.Equal(t, "master.zip", bogusReq.GetArchiveName())
 
 	bogusReq, err = NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, "test/archive", git.ZIP)
 	require.NoError(t, err)
 	assert.NotNil(t, bogusReq)
-	assert.EqualValues(t, "test-archive.zip", bogusReq.GetArchiveName())
+	assert.Equal(t, "test-archive.zip", bogusReq.GetArchiveName())
 
 	// Now two valid requests, firstCommit with valid extensions.
 	zipReq, err := NewRequest(ctx, ctx.Repo.Repository.ID, ctx.Repo.GitRepo, firstCommit, git.ZIP)
diff --git a/services/repository/avatar_test.go b/services/repository/avatar_test.go
index e5fcf7f239..6f28113286 100644
--- a/services/repository/avatar_test.go
+++ b/services/repository/avatar_test.go
@@ -60,7 +60,7 @@ func TestDeleteAvatar(t *testing.T) {
 	err = DeleteAvatar(db.DefaultContext, repo)
 	require.NoError(t, err)
 
-	assert.Equal(t, "", repo.Avatar)
+	assert.Empty(t, repo.Avatar)
 }
 
 func TestTemplateGenerateAvatar(t *testing.T) {
diff --git a/services/repository/branch.go b/services/repository/branch.go
index 689f35803d..bc739825a5 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -28,6 +28,7 @@ import (
 	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/util"
 	webhook_module "forgejo.org/modules/webhook"
+	actions_service "forgejo.org/services/actions"
 	notify_service "forgejo.org/services/notify"
 	pull_service "forgejo.org/services/pull"
 	files_service "forgejo.org/services/repository/files"
@@ -250,7 +251,7 @@ func SyncBranchesToDB(ctx context.Context, repoID, pusherID int64, branchNames,
 	// For other batches, it will hit optimization 4.
 
 	if len(branchNames) != len(commitIDs) {
-		return fmt.Errorf("branchNames and commitIDs length not match")
+		return errors.New("branchNames and commitIDs length not match")
 	}
 
 	return db.WithTx(ctx, func(ctx context.Context) error {
@@ -377,7 +378,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
 				log.Error("DeleteCronTaskByRepo: %v", err)
 			}
 			// cancel running cron jobs of this repository and delete old schedules
-			if err := actions_model.CancelPreviousJobs(
+			if err := actions_service.CancelPreviousJobs(
 				ctx,
 				repo.ID,
 				from,
@@ -578,7 +579,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, gitR
 			log.Error("DeleteCronTaskByRepo: %v", err)
 		}
 		// cancel running cron jobs of this repository and delete old schedules
-		if err := actions_model.CancelPreviousJobs(
+		if err := actions_service.CancelPreviousJobs(
 			ctx,
 			repo.ID,
 			oldDefaultBranchName,
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index ad4cc400cb..1805bd5960 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -111,7 +111,7 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 		var cachedStats map[string]*ContributorData
 		return cachedStats, json.Unmarshal([]byte(v), &cachedStats)
 	default:
-		return nil, fmt.Errorf("unexpected type in cache detected")
+		return nil, errors.New("unexpected type in cache detected")
 	}
 }
 
diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go
index 927c950bec..45af85272d 100644
--- a/services/repository/contributors_graph_test.go
+++ b/services/repository/contributors_graph_test.go
@@ -53,14 +53,14 @@ func TestRepository_ContributorsGraph(t *testing.T) {
 		keys = append(keys, k)
 	}
 	slices.Sort(keys)
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"ethantkoenig@gmail.com",
 		"jimmy.praet@telenet.be",
 		"jon@allspice.io",
 		"total", // generated summary
 	}, keys)
 
-	assert.EqualValues(t, &ContributorData{
+	assert.Equal(t, &ContributorData{
 		Name:         "Ethan Koenig",
 		AvatarLink:   "/assets/img/avatar_default.png",
 		TotalCommits: 1,
@@ -73,7 +73,7 @@ func TestRepository_ContributorsGraph(t *testing.T) {
 			},
 		},
 	}, data["ethantkoenig@gmail.com"])
-	assert.EqualValues(t, &ContributorData{
+	assert.Equal(t, &ContributorData{
 		Name:         "Total",
 		AvatarLink:   "",
 		TotalCommits: 3,
diff --git a/services/repository/create_test.go b/services/repository/create_test.go
index 7eb3c0f805..0a6c34b6fe 100644
--- a/services/repository/create_test.go
+++ b/services/repository/create_test.go
@@ -147,3 +147,13 @@ func TestIncludesAllRepositoriesTeams(t *testing.T) {
 	}
 	require.NoError(t, organization.DeleteOrganization(db.DefaultContext, org), "DeleteOrganization")
 }
+
+func TestCreateRepository(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+
+	r, err := CreateRepositoryDirectly(db.DefaultContext, user, user, CreateRepoOptions{Name: "repo-last"})
+	require.NoError(t, err)
+	require.NotNil(t, r.Topics)
+	require.Empty(t, r.Topics)
+}
diff --git a/services/repository/delete.go b/services/repository/delete.go
index 7c83ba12cd..f4124fb9e2 100644
--- a/services/repository/delete.go
+++ b/services/repository/delete.go
@@ -1,4 +1,5 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package repository
@@ -89,6 +90,11 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
 		}
 	}
 
+	// If the repository was reported as abusive, a shadow copy should be created before deletion.
+	if err := repo_model.IfNeededCreateShadowCopyForRepository(ctx, repo, false); err != nil {
+		return err
+	}
+
 	if cnt, err := sess.ID(repoID).Delete(&repo_model.Repository{}); err != nil {
 		return err
 	} else if cnt != 1 {
diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go
index b6d54c4086..0e88a29230 100644
--- a/services/repository/files/cherry_pick.go
+++ b/services/repository/files/cherry_pick.go
@@ -5,6 +5,7 @@ package files
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -79,21 +80,33 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
 		right, base = base, right
 	}
 
-	description := fmt.Sprintf("CherryPick %s onto %s", right, opts.OldBranch)
-	conflict, _, err := pull.AttemptThreeWayMerge(ctx,
-		t.basePath, t.gitRepo, base, opts.LastCommitID, right, description)
-	if err != nil {
-		return nil, fmt.Errorf("failed to three-way merge %s onto %s: %w", right, opts.OldBranch, err)
-	}
+	var treeHash string
+	if git.SupportGitMergeTree {
+		var conflict bool
+		treeHash, conflict, _, err = pull.MergeTree(ctx, t.gitRepo, base, opts.LastCommitID, right, nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to three-way merge %s onto %s: %w", right, opts.OldBranch, err)
+		}
 
-	if conflict {
-		return nil, fmt.Errorf("failed to merge due to conflicts")
-	}
+		if conflict {
+			return nil, errors.New("failed to merge due to conflicts")
+		}
+	} else {
+		description := fmt.Sprintf("CherryPick %s onto %s", right, opts.OldBranch)
+		conflict, _, err := pull.AttemptThreeWayMerge(ctx, t.gitRepo, base, opts.LastCommitID, right, description)
+		if err != nil {
+			return nil, fmt.Errorf("failed to three-way merge %s onto %s: %w", right, opts.OldBranch, err)
+		}
 
-	treeHash, err := t.WriteTree()
-	if err != nil {
-		// likely non-sensical tree due to merge conflicts...
-		return nil, err
+		if conflict {
+			return nil, errors.New("failed to merge due to conflicts")
+		}
+
+		treeHash, err = t.WriteTree()
+		if err != nil {
+			// likely non-sensical tree due to merge conflicts...
+			return nil, err
+		}
 	}
 
 	// Now commit the tree
diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go
index 0c0671429b..43c9048aaf 100644
--- a/services/repository/files/commit.go
+++ b/services/repository/files/commit.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package files
@@ -14,7 +15,7 @@ import (
 
 // CountDivergingCommits determines how many commits a branch is ahead or behind the repository's base branch
 func CountDivergingCommits(ctx context.Context, repo *repo_model.Repository, branch string) (*git.DivergeObject, error) {
-	divergence, err := git.GetDivergingCommits(ctx, repo.RepoPath(), repo.DefaultBranch, branch)
+	divergence, err := git.GetDivergingCommits(ctx, repo.RepoPath(), repo.DefaultBranch, branch, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +39,7 @@ func GetPayloadCommitVerification(ctx context.Context, commit *git.Commit) *stru
 	verification.Verified = commitVerification.Verified
 	verification.Reason = commitVerification.Reason
 	if verification.Reason == "" && !verification.Verified {
-		verification.Reason = "gpg.error.not_signed_commit"
+		verification.Reason = asymkey_model.NotSigned
 	}
 	return verification
 }
diff --git a/services/repository/files/content.go b/services/repository/files/content.go
index 3eb3049f12..d701508ff0 100644
--- a/services/repository/files/content.go
+++ b/services/repository/files/content.go
@@ -5,6 +5,7 @@ package files
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/url"
 	"path"
@@ -107,7 +108,7 @@ func GetObjectTypeFromTreeEntry(entry *git.TreeEntry) ContentType {
 	switch {
 	case entry.IsDir():
 		return ContentTypeDir
-	case entry.IsSubModule():
+	case entry.IsSubmodule():
 		return ContentTypeSubmodule
 	case entry.IsExecutable(), entry.IsRegular():
 		return ContentTypeRegular
@@ -178,12 +179,13 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 
 	// All content types have these fields in populated
 	contentsResponse := &api.ContentsResponse{
-		Name:          entry.Name(),
-		Path:          treePath,
-		SHA:           entry.ID.String(),
-		LastCommitSHA: lastCommit.ID.String(),
-		Size:          entry.Size(),
-		URL:           &selfURLString,
+		Name:           entry.Name(),
+		Path:           treePath,
+		SHA:            entry.ID.String(),
+		LastCommitSHA:  lastCommit.ID.String(),
+		LastCommitWhen: lastCommit.Committer.When,
+		Size:           entry.Size(),
+		URL:            &selfURLString,
 		Links: &api.FileLinksResponse{
 			Self: &selfURLString,
 		},
@@ -204,19 +206,19 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 	} else if entry.IsLink() {
 		contentsResponse.Type = string(ContentTypeLink)
 		// The target of a symlink file is the content of the file
-		targetFromContent, err := entry.Blob().GetBlobContent(1024)
+		targetFromContent, err := entry.LinkTarget()
 		if err != nil {
 			return nil, err
 		}
 		contentsResponse.Target = &targetFromContent
-	} else if entry.IsSubModule() {
+	} else if entry.IsSubmodule() {
 		contentsResponse.Type = string(ContentTypeSubmodule)
-		submoduleURL, err := commit.GetSubModule(treePath)
+		submodule, err := commit.GetSubmodule(treePath, entry)
 		if err != nil {
 			return nil, err
 		}
-		if submoduleURL != "" {
-			contentsResponse.SubmoduleGitURL = &submoduleURL
+		if submodule.URL != "" {
+			contentsResponse.SubmoduleGitURL = &submodule.URL
 		}
 	}
 	// Handle links
@@ -228,7 +230,7 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 		downloadURLString := downloadURL.String()
 		contentsResponse.DownloadURL = &downloadURLString
 	}
-	if !entry.IsSubModule() {
+	if !entry.IsSubmodule() {
 		htmlURL, err := url.Parse(repo.HTMLURL() + "/src/" + url.PathEscape(string(refType)) + "/" + util.PathEscapeSegments(ref) + "/" + util.PathEscapeSegments(treePath))
 		if err != nil {
 			return nil, err
@@ -249,20 +251,35 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref
 	return contentsResponse, nil
 }
 
-// GetBlobBySHA get the GitBlobResponse of a repository using a sha hash.
-func GetBlobBySHA(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, sha string) (*api.GitBlobResponse, error) {
+// GetBlobsBySHA gets multiple GitBlobs of a repository by sha hash.
+func GetBlobsBySHA(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, shas []string) ([]*api.GitBlob, error) {
+	if len(shas) > setting.API.MaxResponseItems {
+		shas = shas[:setting.API.MaxResponseItems]
+	}
+
+	blobs := make([]*api.GitBlob, 0, len(shas))
+	for _, sha := range shas {
+		blob, err := GetBlobBySHA(ctx, repo, gitRepo, sha)
+		if err != nil {
+			return nil, err
+		}
+		blobs = append(blobs, blob)
+	}
+	return blobs, nil
+}
+
+// GetBlobBySHA get the GitBlob of a repository using a sha hash.
+func GetBlobBySHA(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, sha string) (*api.GitBlob, error) {
 	gitBlob, err := gitRepo.GetBlob(sha)
 	if err != nil {
 		return nil, err
 	}
-	content := ""
-	if gitBlob.Size() <= setting.API.DefaultMaxBlobSize {
-		content, err = gitBlob.GetBlobContentBase64()
-		if err != nil {
-			return nil, err
-		}
+	content, err := gitBlob.GetContentBase64(setting.API.DefaultMaxBlobSize)
+	if err != nil && !errors.As(err, &git.BlobTooLargeError{}) {
+		return nil, err
 	}
-	return &api.GitBlobResponse{
+
+	return &api.GitBlob{
 		SHA:      gitBlob.ID.String(),
 		URL:      repo.APIURL() + "/git/blobs/" + url.PathEscape(gitBlob.ID.String()),
 		Size:     gitBlob.Size(),
diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go
index ca2f861c0b..8fc8f56b4f 100644
--- a/services/repository/files/content_test.go
+++ b/services/repository/files/content_test.go
@@ -5,6 +5,7 @@ package files
 
 import (
 	"testing"
+	"time"
 
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
@@ -33,18 +34,19 @@ func getExpectedReadmeContentsResponse() *api.ContentsResponse {
 	gitURL := "https://try.gitea.io/api/v1/repos/user2/repo1/git/blobs/" + sha
 	downloadURL := "https://try.gitea.io/user2/repo1/raw/branch/master/" + treePath
 	return &api.ContentsResponse{
-		Name:          treePath,
-		Path:          treePath,
-		SHA:           "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
-		LastCommitSHA: "65f1bf27bc3bf70f64657658635e66094edbcb4d",
-		Type:          "file",
-		Size:          30,
-		Encoding:      &encoding,
-		Content:       &content,
-		URL:           &selfURL,
-		HTMLURL:       &htmlURL,
-		GitURL:        &gitURL,
-		DownloadURL:   &downloadURL,
+		Name:           treePath,
+		Path:           treePath,
+		SHA:            "4b4851ad51df6a7d9f25c979345979eaeb5b349f",
+		LastCommitSHA:  "65f1bf27bc3bf70f64657658635e66094edbcb4d",
+		LastCommitWhen: time.Date(2017, time.March, 19, 16, 47, 59, 0, time.FixedZone("", -14400)),
+		Type:           "file",
+		Size:           30,
+		Encoding:       &encoding,
+		Content:        &content,
+		URL:            &selfURL,
+		HTMLURL:        &htmlURL,
+		GitURL:         &gitURL,
+		DownloadURL:    &downloadURL,
 		Links: &api.FileLinksResponse{
 			Self:    &selfURL,
 			GitURL:  &gitURL,
@@ -64,13 +66,13 @@ func TestGetContents(t *testing.T) {
 
 	t.Run("Get README.md contents with GetContents(ctx, )", func(t *testing.T) {
 		fileContentResponse, err := GetContents(db.DefaultContext, repo, treePath, ref, false)
-		assert.EqualValues(t, expectedContentsResponse, fileContentResponse)
+		assert.Equal(t, expectedContentsResponse, fileContentResponse)
 		require.NoError(t, err)
 	})
 
 	t.Run("Get README.md contents with ref as empty string (should then use the repo's default branch) with GetContents(ctx, )", func(t *testing.T) {
 		fileContentResponse, err := GetContents(db.DefaultContext, repo, treePath, "", false)
-		assert.EqualValues(t, expectedContentsResponse, fileContentResponse)
+		assert.Equal(t, expectedContentsResponse, fileContentResponse)
 		require.NoError(t, err)
 	})
 }
@@ -190,7 +192,7 @@ func TestGetBlobBySHA(t *testing.T) {
 	defer gitRepo.Close()
 
 	gbr, err := GetBlobBySHA(db.DefaultContext, repo, gitRepo, "65f1bf27bc3bf70f64657658635e66094edbcb4d")
-	expectedGBR := &api.GitBlobResponse{
+	expectedGBR := &api.GitBlob{
 		Content:  "dHJlZSAyYTJmMWQ0NjcwNzI4YTJlMTAwNDllMzQ1YmQ3YTI3NjQ2OGJlYWI2CmF1dGhvciB1c2VyMSA8YWRkcmVzczFAZXhhbXBsZS5jb20+IDE0ODk5NTY0NzkgLTA0MDAKY29tbWl0dGVyIEV0aGFuIEtvZW5pZyA8ZXRoYW50a29lbmlnQGdtYWlsLmNvbT4gMTQ4OTk1NjQ3OSAtMDQwMAoKSW5pdGlhbCBjb21taXQK",
 		Encoding: "base64",
 		URL:      "https://try.gitea.io/api/v1/repos/user2/repo1/git/blobs/65f1bf27bc3bf70f64657658635e66094edbcb4d",
@@ -200,3 +202,43 @@ func TestGetBlobBySHA(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, expectedGBR, gbr)
 }
+
+func TestGetBlobsBySHA(t *testing.T) {
+	unittest.PrepareTestEnv(t)
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+
+	gitRepo, err := gitrepo.OpenRepository(db.DefaultContext, repo)
+	require.NoError(t, err)
+	defer gitRepo.Close()
+
+	gbr, err := GetBlobsBySHA(db.DefaultContext, repo, gitRepo, []string{
+		"ea82fc8777a24b07c26b3a4bf4e2742c03733eab", // Home.md
+		"6395b68e1feebb1e4c657b4f9f6ba2676a283c0b", // line.svg
+		"26f842bcad37fa40a1bb34cbb5ee219ee35d863d", // test.xml
+	})
+	expectedGBR := []*api.GitBlob{
+		{
+			Content:  "IyBIb21lIHBhZ2UKClRoaXMgaXMgdGhlIGhvbWUgcGFnZSEK",
+			Encoding: "base64",
+			URL:      "https://try.gitea.io/api/v1/repos/user2/repo2/git/blobs/ea82fc8777a24b07c26b3a4bf4e2742c03733eab",
+			SHA:      "ea82fc8777a24b07c26b3a4bf4e2742c03733eab",
+			Size:     36,
+		},
+		{
+			Content:  "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZwogICB4bWxuczpzdmc9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIgogICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHdpZHRoPSIxMjgiCiAgIGhlaWdodD0iMTI4IgogICB2aWV3Qm94PSIwIDAgMTI4IDEyOCI+CgogIDxsaW5lIHgxPSIwIiB5MT0iNyIgeDI9IjEwIiB5Mj0iNyIgc3Ryb2tlLXdpZHRoPSIxLjUiLz4KPC9zdmc+",
+			Encoding: "base64",
+			URL:      "https://try.gitea.io/api/v1/repos/user2/repo2/git/blobs/6395b68e1feebb1e4c657b4f9f6ba2676a283c0b",
+			SHA:      "6395b68e1feebb1e4c657b4f9f6ba2676a283c0b",
+			Size:     246,
+		},
+		{
+			Content:  "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHRlc3Q+VGhpcyBpcyBYTUw8L3Rlc3Q+Cg==",
+			Encoding: "base64",
+			URL:      "https://try.gitea.io/api/v1/repos/user2/repo2/git/blobs/26f842bcad37fa40a1bb34cbb5ee219ee35d863d",
+			SHA:      "26f842bcad37fa40a1bb34cbb5ee219ee35d863d",
+			Size:     64,
+		},
+	}
+	require.NoError(t, err)
+	assert.Equal(t, expectedGBR, gbr)
+}
diff --git a/services/repository/files/diff_test.go b/services/repository/files/diff_test.go
index d6265273c7..67c63803d3 100644
--- a/services/repository/files/diff_test.go
+++ b/services/repository/files/diff_test.go
@@ -124,7 +124,7 @@ func TestGetDiffPreview(t *testing.T) {
 		require.NoError(t, err)
 		bs, err := json.Marshal(diff)
 		require.NoError(t, err)
-		assert.EqualValues(t, string(expectedBs), string(bs))
+		assert.Equal(t, string(expectedBs), string(bs))
 	})
 
 	t.Run("empty branch, same results", func(t *testing.T) {
@@ -134,7 +134,7 @@ func TestGetDiffPreview(t *testing.T) {
 		require.NoError(t, err)
 		bs, err := json.Marshal(diff)
 		require.NoError(t, err)
-		assert.EqualValues(t, expectedBs, bs)
+		assert.Equal(t, expectedBs, bs)
 	})
 }
 
diff --git a/services/repository/files/file.go b/services/repository/files/file.go
index 810c60163d..5b93258840 100644
--- a/services/repository/files/file.go
+++ b/services/repository/files/file.go
@@ -5,7 +5,7 @@ package files
 
 import (
 	"context"
-	"fmt"
+	"errors"
 	"net/url"
 	"strings"
 	"time"
@@ -50,10 +50,10 @@ func GetFileResponseFromFilesResponse(filesResponse *api.FilesResponse, index in
 // GetFileCommitResponse Constructs a FileCommitResponse from a Commit object
 func GetFileCommitResponse(repo *repo_model.Repository, commit *git.Commit) (*api.FileCommitResponse, error) {
 	if repo == nil {
-		return nil, fmt.Errorf("repo cannot be nil")
+		return nil, errors.New("repo cannot be nil")
 	}
 	if commit == nil {
-		return nil, fmt.Errorf("commit cannot be nil")
+		return nil, errors.New("commit cannot be nil")
 	}
 	commitURL, _ := url.Parse(repo.APIURL() + "/git/commits/" + url.PathEscape(commit.ID.String()))
 	commitTreeURL, _ := url.Parse(repo.APIURL() + "/git/trees/" + url.PathEscape(commit.Tree.ID.String()))
@@ -104,36 +104,35 @@ func GetAuthorAndCommitterUsers(author, committer *IdentityOptions, doer *user_m
 	// then we use bogus User objects for them to store their FullName and Email.
 	// If only one of the two are provided, we set both of them to it.
 	// If neither are provided, both are the doer.
-	if committer != nil && committer.Email != "" {
-		if doer != nil && strings.EqualFold(doer.Email, committer.Email) {
-			committerUser = doer // the committer is the doer, so will use their user object
-			if committer.Name != "" {
-				committerUser.FullName = committer.Name
+	getUser := func(identity *IdentityOptions) *user_model.User {
+		if identity == nil || identity.Email == "" {
+			return nil
+		}
+
+		if doer != nil && strings.EqualFold(doer.Email, identity.Email) {
+			user := doer // the committer is the doer, so will use their user object
+			if identity.Name != "" {
+				user.FullName = identity.Name
 			}
 			// Use the provided email and not revert to placeholder mail.
-			committerUser.KeepEmailPrivate = false
-		} else {
-			committerUser = &user_model.User{
-				FullName: committer.Name,
-				Email:    committer.Email,
-			}
-		}
-	}
-	if author != nil && author.Email != "" {
-		if doer != nil && strings.EqualFold(doer.Email, author.Email) {
-			authorUser = doer // the author is the doer, so will use their user object
-			if authorUser.Name != "" {
-				authorUser.FullName = author.Name
-			}
-			// Use the provided email and not revert to placeholder mail.
-			authorUser.KeepEmailPrivate = false
-		} else {
-			authorUser = &user_model.User{
-				FullName: author.Name,
-				Email:    author.Email,
-			}
+			user.KeepEmailPrivate = false
+			return user
+		}
+
+		var id int64
+		if doer != nil {
+			id = doer.ID
+		}
+		return &user_model.User{
+			ID:       id, // Needed to ensure the doer is checked to pass rules for instance signing of CRUD actions.
+			FullName: identity.Name,
+			Email:    identity.Email,
 		}
 	}
+
+	committerUser = getUser(committer)
+	authorUser = getUser(author)
+
 	if authorUser == nil {
 		if committerUser != nil {
 			authorUser = committerUser // No valid author was given so use the committer
diff --git a/services/repository/files/file_test.go b/services/repository/files/file_test.go
index db2f4403f4..169cafba0d 100644
--- a/services/repository/files/file_test.go
+++ b/services/repository/files/file_test.go
@@ -14,13 +14,13 @@ func TestCleanUploadFileName(t *testing.T) {
 		name := "this/is/test"
 		cleanName := CleanUploadFileName(name)
 		expectedCleanName := name
-		assert.EqualValues(t, expectedCleanName, cleanName)
+		assert.Equal(t, expectedCleanName, cleanName)
 	})
 
 	t.Run("Clean a .git path", func(t *testing.T) {
 		name := "this/is/test/.git"
 		cleanName := CleanUploadFileName(name)
 		expectedCleanName := ""
-		assert.EqualValues(t, expectedCleanName, cleanName)
+		assert.Equal(t, expectedCleanName, cleanName)
 	})
 }
diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go
index 5b1dd65b5a..18b5226c02 100644
--- a/services/repository/files/patch.go
+++ b/services/repository/files/patch.go
@@ -147,11 +147,7 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
 	stdout := &strings.Builder{}
 	stderr := &strings.Builder{}
 
-	cmdApply := git.NewCommand(ctx, "apply", "--index", "--recount", "--cached", "--ignore-whitespace", "--whitespace=fix", "--binary")
-	if git.CheckGitVersionAtLeast("2.32") == nil {
-		cmdApply.AddArguments("-3")
-	}
-
+	cmdApply := git.NewCommand(ctx, "apply", "--index", "--recount", "--cached", "--ignore-whitespace", "--whitespace=fix", "--binary", "-3")
 	if err := cmdApply.Run(&git.RunOpts{
 		Dir:    t.basePath,
 		Stdout: stdout,
diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go
index b3aadbc6cb..64d3e5887d 100644
--- a/services/repository/files/temp_repo.go
+++ b/services/repository/files/temp_repo.go
@@ -6,6 +6,7 @@ package files
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -368,7 +369,7 @@ func (t *TemporaryUploadRepository) DiffIndex() (*gitdiff.Diff, error) {
 // GetBranchCommit Gets the commit object of the given branch
 func (t *TemporaryUploadRepository) GetBranchCommit(branch string) (*git.Commit, error) {
 	if t.gitRepo == nil {
-		return nil, fmt.Errorf("repository has not been cloned")
+		return nil, errors.New("repository has not been cloned")
 	}
 	return t.gitRepo.GetBranchCommit(branch)
 }
@@ -376,7 +377,7 @@ func (t *TemporaryUploadRepository) GetBranchCommit(branch string) (*git.Commit,
 // GetCommit Gets the commit object of the given commit ID
 func (t *TemporaryUploadRepository) GetCommit(commitID string) (*git.Commit, error) {
 	if t.gitRepo == nil {
-		return nil, fmt.Errorf("repository has not been cloned")
+		return nil, errors.New("repository has not been cloned")
 	}
 	return t.gitRepo.GetCommit(commitID)
 }
diff --git a/services/repository/files/tree.go b/services/repository/files/tree.go
index 1e575f95e8..5a369b27a5 100644
--- a/services/repository/files/tree.go
+++ b/services/repository/files/tree.go
@@ -87,7 +87,7 @@ func GetTreeBySHA(ctx context.Context, repo *repo_model.Repository, gitRepo *git
 		if entries[e].IsDir() {
 			copy(treeURL[copyPos:], entries[e].ID.String())
 			tree.Entries[i].URL = string(treeURL)
-		} else if entries[e].IsSubModule() {
+		} else if entries[e].IsSubmodule() {
 			// In Github Rest API Version=2022-11-28, if a tree entry is a submodule,
 			// its url will be returned as an empty string.
 			// So the URL will be set to "" here.
diff --git a/services/repository/files/tree_test.go b/services/repository/files/tree_test.go
index 7865fcf2e2..5cd628722b 100644
--- a/services/repository/files/tree_test.go
+++ b/services/repository/files/tree_test.go
@@ -48,5 +48,5 @@ func TestGetTreeBySHA(t *testing.T) {
 		TotalCount: 1,
 	}
 
-	assert.EqualValues(t, expectedTree, tree)
+	assert.Equal(t, expectedTree, tree)
 }
diff --git a/services/repository/files/update.go b/services/repository/files/update.go
index 5e8834c6de..8fb9644fa4 100644
--- a/services/repository/files/update.go
+++ b/services/repository/files/update.go
@@ -193,28 +193,34 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 	}
 
 	if hasOldBranch {
-		// Get the commit of the original branch
-		commit, err := t.GetBranchCommit(opts.OldBranch)
+		// Get the current commit of the original branch
+		actualBaseCommit, err := t.GetBranchCommit(opts.OldBranch)
 		if err != nil {
 			return nil, err // Couldn't get a commit for the branch
 		}
 
-		// Assigned LastCommitID in opts if it hasn't been set
-		if opts.LastCommitID == "" {
-			opts.LastCommitID = commit.ID.String()
-		} else {
-			lastCommitID, err := t.gitRepo.ConvertToGitID(opts.LastCommitID)
+		var lastKnownCommit git.ObjectID // when nil, the sha provided in the opts.Files must match the current blob-sha
+		if opts.OldBranch != opts.NewBranch {
+			// when creating a new branch, ignore if a file has been changed in the meantime
+			// (such changes will visible when doing the merge)
+			lastKnownCommit = actualBaseCommit.ID
+		} else if opts.LastCommitID != "" {
+			lastKnownCommit, err = t.gitRepo.ConvertToGitID(opts.LastCommitID)
 			if err != nil {
 				return nil, fmt.Errorf("ConvertToSHA1: Invalid last commit ID: %w", err)
 			}
-			opts.LastCommitID = lastCommitID.String()
 		}
 
 		for _, file := range opts.Files {
-			if err := handleCheckErrors(file, commit, opts); err != nil {
+			if err := handleCheckErrors(file, actualBaseCommit, lastKnownCommit); err != nil {
 				return nil, err
 			}
 		}
+
+		if opts.LastCommitID == "" {
+			// needed for t.CommitTree
+			opts.LastCommitID = actualBaseCommit.ID.String()
+		}
 	}
 
 	contentStore := lfs.NewContentStore()
@@ -277,9 +283,9 @@ func ChangeRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use
 }
 
 // handles the check for various issues for ChangeRepoFiles
-func handleCheckErrors(file *ChangeRepoFile, commit *git.Commit, opts *ChangeRepoFilesOptions) error {
+func handleCheckErrors(file *ChangeRepoFile, actualBaseCommit *git.Commit, lastKnownCommit git.ObjectID) error {
 	if file.Operation == "update" || file.Operation == "delete" {
-		fromEntry, err := commit.GetTreeEntryByPath(file.Options.fromTreePath)
+		fromEntry, err := actualBaseCommit.GetTreeEntryByPath(file.Options.fromTreePath)
 		if err != nil {
 			return err
 		}
@@ -292,22 +298,22 @@ func handleCheckErrors(file *ChangeRepoFile, commit *git.Commit, opts *ChangeRep
 					CurrentSHA: fromEntry.ID.String(),
 				}
 			}
-		} else if opts.LastCommitID != "" {
-			// If a lastCommitID was given and it doesn't match the commitID of the head of the branch throw
-			// an error, but only if we aren't creating a new branch.
-			if commit.ID.String() != opts.LastCommitID && opts.OldBranch == opts.NewBranch {
-				if changed, err := commit.FileChangedSinceCommit(file.Options.treePath, opts.LastCommitID); err != nil {
+		} else if lastKnownCommit != nil {
+			if actualBaseCommit.ID.String() != lastKnownCommit.String() {
+				// If a lastKnownCommit was given and it doesn't match the actualBaseCommit,
+				// check if the file has been changed in between
+				if changed, err := actualBaseCommit.FileChangedSinceCommit(file.Options.treePath, lastKnownCommit.String()); err != nil {
 					return err
 				} else if changed {
 					return models.ErrCommitIDDoesNotMatch{
-						GivenCommitID:   opts.LastCommitID,
-						CurrentCommitID: opts.LastCommitID,
+						GivenCommitID:   lastKnownCommit.String(),
+						CurrentCommitID: actualBaseCommit.ID.String(),
 					}
 				}
-				// The file wasn't modified, so we are good to delete it
+				// The file wasn't modified, so we are good to update it
 			}
 		} else {
-			// When updating a file, a lastCommitID or SHA needs to be given to make sure other commits
+			// When updating a file, a lastKnownCommit or SHA needs to be given to make sure other commits
 			// haven't been made. We throw an error if one wasn't provided.
 			return models.ErrSHAOrCommitIDNotProvided{}
 		}
@@ -322,7 +328,7 @@ func handleCheckErrors(file *ChangeRepoFile, commit *git.Commit, opts *ChangeRep
 		subTreePath := ""
 		for index, part := range treePathParts {
 			subTreePath = path.Join(subTreePath, part)
-			entry, err := commit.GetTreeEntryByPath(subTreePath)
+			entry, err := actualBaseCommit.GetTreeEntryByPath(subTreePath)
 			if err != nil {
 				if git.IsErrNotExist(err) {
 					// Means there is no item with that name, so we're good
diff --git a/services/repository/fork_test.go b/services/repository/fork_test.go
index 227dd1850e..6de241e4d4 100644
--- a/services/repository/fork_test.go
+++ b/services/repository/fork_test.go
@@ -11,6 +11,7 @@ import (
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -36,7 +37,7 @@ func TestForkRepository(t *testing.T) {
 	assert.False(t, repo_model.IsErrReachLimitOfRepo(err))
 
 	// change AllowForkWithoutMaximumLimit to false for the test
-	setting.Repository.AllowForkWithoutMaximumLimit = false
+	defer test.MockVariableValue(&setting.Repository.AllowForkWithoutMaximumLimit, false)()
 	// user has reached maximum limit of repositories
 	user.MaxRepoCreation = 0
 	fork2, err := ForkRepositoryAndUpdates(git.DefaultContext, user, user, ForkRepoOptions{
diff --git a/services/repository/generate.go b/services/repository/generate.go
index 9aeb057c3d..e23e294de1 100644
--- a/services/repository/generate.go
+++ b/services/repository/generate.go
@@ -43,12 +43,8 @@ type expansion struct {
 var defaultTransformers = []transformer{
 	{Name: "SNAKE", Transform: xstrings.ToSnakeCase},
 	{Name: "KEBAB", Transform: xstrings.ToKebabCase},
-	// as of xstrings v1.5.0 the CAMEL & PASCAL workarounds are no longer necessary
-	// and can be removed https://codeberg.org/forgejo/forgejo/pulls/4050
-	{Name: "CAMEL", Transform: func(str string) string {
-		return xstrings.FirstRuneToLower(xstrings.ToCamelCase(str))
-	}},
-	{Name: "PASCAL", Transform: xstrings.ToCamelCase},
+	{Name: "CAMEL", Transform: xstrings.ToCamelCase},
+	{Name: "PASCAL", Transform: xstrings.ToPascalCase},
 	{Name: "LOWER", Transform: strings.ToLower},
 	{Name: "UPPER", Transform: strings.ToUpper},
 	{Name: "TITLE", Transform: util.ToTitleCase},
diff --git a/services/repository/generate_test.go b/services/repository/generate_test.go
index b0f97d0ffb..2eb3a55e96 100644
--- a/services/repository/generate_test.go
+++ b/services/repository/generate_test.go
@@ -65,3 +65,30 @@ func TestFileNameSanitize(t *testing.T) {
 	assert.Equal(t, "_", fileNameSanitize("\u0000"))
 	assert.Equal(t, "目标", fileNameSanitize("目标"))
 }
+
+func TestTransformers(t *testing.T) {
+	input := "Foo_Forgejo-BAR"
+
+	tests := []struct {
+		name     string
+		expected string
+	}{
+		{"SNAKE", "foo_forgejo_bar"},
+		{"KEBAB", "foo-forgejo-bar"},
+		{"CAMEL", "fooForgejoBar"},
+		{"PASCAL", "FooForgejoBar"},
+		{"LOWER", "foo_forgejo-bar"},
+		{"UPPER", "FOO_FORGEJO-BAR"},
+		{"TITLE", "Foo_forgejo-Bar"},
+	}
+
+	for i, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tranform := defaultTransformers[i]
+			assert.Equal(t, tt.name, tranform.Name)
+
+			got := tranform.Transform(input)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}
diff --git a/services/repository/lfs.go b/services/repository/lfs.go
index 43acb8ee6c..2e090290a7 100644
--- a/services/repository/lfs.go
+++ b/services/repository/lfs.go
@@ -76,7 +76,7 @@ func GarbageCollectLFSMetaObjectsForRepo(ctx context.Context, repo *repo_model.R
 
 	err = git_model.IterateLFSMetaObjectsForRepo(ctx, repo.ID, func(ctx context.Context, metaObject *git_model.LFSMetaObject) error {
 		total++
-		pointerSha := git.ComputeBlobHash(objectFormat, []byte(metaObject.Pointer.StringContent()))
+		pointerSha := git.ComputeBlobHash(objectFormat, []byte(metaObject.StringContent()))
 
 		if gitRepo.IsObjectExist(pointerSha.String()) {
 			return git_model.MarkLFSMetaObject(ctx, metaObject.ID)
diff --git a/services/repository/push.go b/services/repository/push.go
index 53574a7d93..eaedd80e1f 100644
--- a/services/repository/push.go
+++ b/services/repository/push.go
@@ -66,7 +66,7 @@ func PushUpdates(opts []*repo_module.PushUpdateOptions) error {
 
 	for _, opt := range opts {
 		if opt.IsNewRef() && opt.IsDelRef() {
-			return fmt.Errorf("Old and new revisions are both NULL")
+			return errors.New("Old and new revisions are both NULL")
 		}
 	}
 
diff --git a/services/repository/repository.go b/services/repository/repository.go
index a2620740b1..41f3a96dd1 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -6,6 +6,7 @@ package repository
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"forgejo.org/models/db"
@@ -72,10 +73,10 @@ func PushCreateRepo(ctx context.Context, authUser, owner *user_model.User, repoN
 			if ok, err := organization.CanCreateOrgRepo(ctx, owner.ID, authUser.ID); err != nil {
 				return nil, err
 			} else if !ok {
-				return nil, fmt.Errorf("cannot push-create repository for org")
+				return nil, errors.New("cannot push-create repository for org")
 			}
 		} else if authUser.ID != owner.ID {
-			return nil, fmt.Errorf("cannot push-create repository for another user")
+			return nil, errors.New("cannot push-create repository for another user")
 		}
 	}
 
diff --git a/services/repository/setting.go b/services/repository/setting.go
index c127f3129e..68cdfc370b 100644
--- a/services/repository/setting.go
+++ b/services/repository/setting.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"slices"
 
-	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unit"
@@ -29,7 +28,7 @@ func UpdateRepositoryUnits(ctx context.Context, repo *repo_model.Repository, uni
 	}
 
 	if slices.Contains(deleteUnitTypes, unit.TypeActions) {
-		if err := actions_model.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
+		if err := actions_service.CleanRepoScheduleTasks(ctx, repo, true); err != nil {
 			log.Error("CleanRepoScheduleTasks: %v", err)
 		}
 	}
diff --git a/services/repository/sync_fork.go b/services/repository/sync_fork.go
new file mode 100644
index 0000000000..ebcac76136
--- /dev/null
+++ b/services/repository/sync_fork.go
@@ -0,0 +1,113 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repository
+
+import (
+	"context"
+	"fmt"
+	"slices"
+
+	git_model "forgejo.org/models/git"
+	repo_model "forgejo.org/models/repo"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	repo_module "forgejo.org/modules/repository"
+	api "forgejo.org/modules/structs"
+)
+
+// SyncFork syncs a branch of a fork with the base repo
+func SyncFork(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, branch string) error {
+	err := repo.MustNotBeArchived()
+	if err != nil {
+		return err
+	}
+
+	err = repo.GetBaseRepo(ctx)
+	if err != nil {
+		return err
+	}
+
+	err = git.Push(ctx, repo.BaseRepo.RepoPath(), git.PushOptions{
+		Remote: repo.RepoPath(),
+		Branch: fmt.Sprintf("%s:%s", branch, branch),
+		Env:    repo_module.PushingEnvironment(doer, repo),
+	})
+
+	return err
+}
+
+// CanSyncFork returns information about syncing a fork
+func GetSyncForkInfo(ctx context.Context, repo *repo_model.Repository, branch string) (*api.SyncForkInfo, error) {
+	info := new(api.SyncForkInfo)
+
+	if !repo.IsFork {
+		return info, nil
+	}
+
+	if repo.IsArchived {
+		return info, nil
+	}
+
+	err := repo.GetBaseRepo(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	forkBranch, err := git_model.GetBranch(ctx, repo.ID, branch)
+	if err != nil {
+		return nil, err
+	}
+
+	info.ForkCommit = forkBranch.CommitID
+
+	baseBranch, err := git_model.GetBranch(ctx, repo.BaseRepo.ID, branch)
+	if err != nil {
+		if git_model.IsErrBranchNotExist(err) {
+			// If the base repo don't have the branch, we don't need to continue
+			return info, nil
+		}
+		return nil, err
+	}
+
+	info.BaseCommit = baseBranch.CommitID
+
+	// If both branches has the same latest commit, we don't need to sync
+	if forkBranch.CommitID == baseBranch.CommitID {
+		return info, nil
+	}
+
+	// Check if the latest commit of the fork is also in the base
+	gitRepo, err := git.OpenRepository(ctx, repo.BaseRepo.RepoPath())
+	if err != nil {
+		return nil, err
+	}
+	defer gitRepo.Close()
+
+	commit, err := gitRepo.GetCommit(forkBranch.CommitID)
+	if err != nil {
+		if git.IsErrNotExist(err) {
+			return info, nil
+		}
+		return nil, err
+	}
+
+	branchList, err := commit.GetAllBranches()
+	if err != nil {
+		return nil, err
+	}
+
+	if !slices.Contains(branchList, branch) {
+		return info, nil
+	}
+
+	diff, err := git.GetDivergingCommits(ctx, repo.BaseRepo.RepoPath(), baseBranch.CommitID, forkBranch.CommitID, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	info.Allowed = true
+	info.CommitsBehind = diff.Behind
+
+	return info, nil
+}
diff --git a/services/secrets/secrets.go b/services/secrets/secrets.go
index 2d5aebdbc1..2de83ef5a2 100644
--- a/services/secrets/secrets.go
+++ b/services/secrets/secrets.go
@@ -15,16 +15,16 @@ func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data
 		return nil, false, err
 	}
 
-	s, err := db.Find[secret_model.Secret](ctx, secret_model.FindSecretsOptions{
+	s, exists, err := db.Get[secret_model.Secret](ctx, secret_model.FindSecretsOptions{
 		OwnerID: ownerID,
 		RepoID:  repoID,
 		Name:    name,
-	})
+	}.ToConds())
 	if err != nil {
 		return nil, false, err
 	}
 
-	if len(s) == 0 {
+	if !exists {
 		s, err := secret_model.InsertEncryptedSecret(ctx, ownerID, repoID, name, data)
 		if err != nil {
 			return nil, false, err
@@ -32,11 +32,11 @@ func CreateOrUpdateSecret(ctx context.Context, ownerID, repoID int64, name, data
 		return s, true, nil
 	}
 
-	if err := secret_model.UpdateSecret(ctx, s[0].ID, data); err != nil {
+	s.SetSecret(data)
+	if _, err := db.GetEngine(ctx).Cols("data").ID(s.ID).Update(s); err != nil {
 		return nil, false, err
 	}
-
-	return s[0], false, nil
+	return s, false, nil
 }
 
 func DeleteSecretByID(ctx context.Context, ownerID, repoID, secretID int64) error {
diff --git a/services/shared/automerge/automerge.go b/services/shared/automerge/automerge.go
index 1dc309f4b3..be7b2f6eb4 100644
--- a/services/shared/automerge/automerge.go
+++ b/services/shared/automerge/automerge.go
@@ -21,9 +21,9 @@ import (
 var PRAutoMergeQueue *queue.WorkerPoolQueue[string]
 
 func addToQueue(pr *issues_model.PullRequest, sha string) {
-	log.Trace("Adding pullID: %d to the pull requests patch checking queue with sha %s", pr.ID, sha)
+	log.Trace("Adding pullID: %d to the automerge queue with sha %s", pr.ID, sha)
 	if err := PRAutoMergeQueue.Push(fmt.Sprintf("%d_%s", pr.ID, sha)); err != nil {
-		log.Error("Error adding pullID: %d to the pull requests patch checking queue %v", pr.ID, err)
+		log.Error("Error adding pullID: %d to the automerge queue %v", pr.ID, err)
 	}
 }
 
@@ -43,32 +43,29 @@ func StartPRCheckAndAutoMergeBySHA(ctx context.Context, sha string, repo *repo_m
 	return nil
 }
 
-// StartPRCheckAndAutoMerge start an automerge check and auto merge task for a pull request
 func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullRequest) {
 	if pull == nil || pull.HasMerged || !pull.CanAutoMerge() {
 		return
 	}
 
-	if err := pull.LoadBaseRepo(ctx); err != nil {
-		log.Error("LoadBaseRepo: %v", err)
-		return
+	commitID := pull.HeadCommitID
+	if commitID == "" {
+		commitID = getCommitIDFromRefName(ctx, pull)
 	}
 
-	gitRepo, err := gitrepo.OpenRepository(ctx, pull.BaseRepo)
-	if err != nil {
-		log.Error("OpenRepository: %v", err)
-		return
-	}
-	defer gitRepo.Close()
-	commitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())
-	if err != nil {
-		log.Error("GetRefCommitID: %v", err)
+	if commitID == "" {
 		return
 	}
 
 	addToQueue(pull, commitID)
 }
 
+var AddToQueueIfMergeable = func(ctx context.Context, pull *issues_model.PullRequest) {
+	if pull.Status == issues_model.PullRequestStatusMergeable {
+		StartPRCheckAndAutoMerge(ctx, pull)
+	}
+}
+
 func getPullRequestsByHeadSHA(ctx context.Context, sha string, repo *repo_model.Repository, filter func(*issues_model.PullRequest) bool) (map[int64]*issues_model.PullRequest, error) {
 	gitRepo, err := gitrepo.OpenRepository(ctx, repo)
 	if err != nil {
@@ -118,3 +115,24 @@ func getPullRequestsByHeadSHA(ctx context.Context, sha string, repo *repo_model.
 
 	return pulls, nil
 }
+
+func getCommitIDFromRefName(ctx context.Context, pull *issues_model.PullRequest) string {
+	if err := pull.LoadBaseRepo(ctx); err != nil {
+		log.Error("LoadBaseRepo: %v", err)
+		return ""
+	}
+
+	gitRepo, err := gitrepo.OpenRepository(ctx, pull.BaseRepo)
+	if err != nil {
+		log.Error("OpenRepository: %v", err)
+		return ""
+	}
+	defer gitRepo.Close()
+	commitID, err := gitRepo.GetRefCommitID(pull.GetGitRefName())
+	if err != nil {
+		log.Error("GetRefCommitID: %v", err)
+		return ""
+	}
+
+	return commitID
+}
diff --git a/services/task/task.go b/services/task/task.go
index 3181fc79d7..f030bdb38c 100644
--- a/services/task/task.go
+++ b/services/task/task.go
@@ -5,6 +5,7 @@ package task
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	admin_model "forgejo.org/models/admin"
@@ -41,7 +42,7 @@ func Run(ctx context.Context, t *admin_model.Task) error {
 func Init() error {
 	taskQueue = queue.CreateSimpleQueue(graceful.GetManager().ShutdownContext(), "task", handler)
 	if taskQueue == nil {
-		return fmt.Errorf("unable to create task queue")
+		return errors.New("unable to create task queue")
 	}
 	go graceful.GetManager().RunWithCancel(taskQueue)
 	return nil
diff --git a/services/user/avatar_test.go b/services/user/avatar_test.go
index b208efeb6f..17132a74ab 100644
--- a/services/user/avatar_test.go
+++ b/services/user/avatar_test.go
@@ -42,7 +42,7 @@ func TestUserDeleteAvatar(t *testing.T) {
 		err := UploadAvatar(db.DefaultContext, user, buff.Bytes())
 		require.NoError(t, err)
 		verification := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-		assert.NotEqual(t, "", verification.Avatar)
+		assert.NotEmpty(t, verification.Avatar)
 
 		// fail to delete ...
 		storage.Avatars = storage.UninitializedStorage
@@ -60,7 +60,7 @@ func TestUserDeleteAvatar(t *testing.T) {
 
 		// ... the avatar is removed from the database
 		verification = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-		assert.Equal(t, "", verification.Avatar)
+		assert.Empty(t, verification.Avatar)
 	})
 
 	t.Run("Success", func(t *testing.T) {
@@ -70,12 +70,12 @@ func TestUserDeleteAvatar(t *testing.T) {
 		err := UploadAvatar(db.DefaultContext, user, buff.Bytes())
 		require.NoError(t, err)
 		verification := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-		assert.NotEqual(t, "", verification.Avatar)
+		assert.NotEmpty(t, verification.Avatar)
 
 		err = DeleteAvatar(db.DefaultContext, user)
 		require.NoError(t, err)
 
 		verification = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
-		assert.Equal(t, "", verification.Avatar)
+		assert.Empty(t, verification.Avatar)
 	})
 }
diff --git a/services/user/delete.go b/services/user/delete.go
index 9ce917cd27..bed7abde07 100644
--- a/services/user/delete.go
+++ b/services/user/delete.go
@@ -1,4 +1,5 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
@@ -216,6 +217,11 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (err error)
 	}
 	// ***** END: ExternalLoginUser *****
 
+	// If the user was reported as abusive, a shadow copy should be created before deletion.
+	if err = user_model.IfNeededCreateShadowCopyForUser(ctx, u.ID, u); err != nil {
+		return err
+	}
+
 	if _, err = db.DeleteByID[user_model.User](ctx, u.ID); err != nil {
 		return fmt.Errorf("delete: %w", err)
 	}
diff --git a/services/user/email.go b/services/user/email.go
index f49efde1be..36a1145aec 100644
--- a/services/user/email.go
+++ b/services/user/email.go
@@ -1,4 +1,5 @@
 // Copyright 2024 The Gitea Authors. All rights reserved.
+// Copyright 2024 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package user
@@ -203,6 +204,11 @@ func MakeEmailAddressPrimary(ctx context.Context, u *user_model.User, newPrimary
 
 	oldPrimaryEmail := u.Email
 
+	// If the user was reported as abusive, a shadow copy should be created before first update (of certain columns).
+	if err = user_model.IfNeededCreateShadowCopyForUser(ctx, u.ID, u, "email"); err != nil {
+		return err
+	}
+
 	// 1. Update user table
 	u.Email = newPrimaryEmail.Email
 	if _, err = sess.ID(u.ID).Cols("email").Update(u); err != nil {
diff --git a/services/user/user.go b/services/user/user.go
index d90fbac978..9cb6858f0c 100644
--- a/services/user/user.go
+++ b/services/user/user.go
@@ -13,6 +13,7 @@ import (
 
 	"forgejo.org/models"
 	asymkey_model "forgejo.org/models/asymkey"
+	"forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	"forgejo.org/models/organization"
 	packages_model "forgejo.org/models/packages"
@@ -25,6 +26,7 @@ import (
 	"forgejo.org/modules/storage"
 	"forgejo.org/modules/util"
 	"forgejo.org/services/agit"
+	"forgejo.org/services/auth/source/oauth2"
 	org_service "forgejo.org/services/org"
 	"forgejo.org/services/packages"
 	container_service "forgejo.org/services/packages/container"
@@ -47,10 +49,28 @@ func renameUser(ctx context.Context, u *user_model.User, newUserName string, doe
 	}
 
 	// Non-local users are not allowed to change their username.
-	if !u.IsOrganization() && !u.IsLocal() {
-		return user_model.ErrUserIsNotLocal{
-			UID:  u.ID,
-			Name: u.Name,
+	// If the doer is an admin, then allow the rename - they know better.
+	if !doerIsAdmin && !u.IsOrganization() && !u.IsLocal() {
+		// If the user's authentication source is OAuth2 and that source allows for
+		// username changes then don't make a fuzz about it.
+
+		if !u.IsOAuth2() {
+			return user_model.ErrUserIsNotLocal{
+				UID:  u.ID,
+				Name: u.Name,
+			}
+		}
+
+		source, err := auth.GetSourceByID(ctx, u.LoginSource)
+		if err != nil {
+			return err
+		}
+		sourceCfg := source.Cfg.(*oauth2.Source)
+		if !sourceCfg.AllowUsernameChange {
+			return user_model.ErrUserIsNotLocal{
+				UID:  u.ID,
+				Name: u.Name,
+			}
 		}
 	}
 
diff --git a/services/user/user_test.go b/services/user/user_test.go
index 64a9ed2d23..0747833557 100644
--- a/services/user/user_test.go
+++ b/services/user/user_test.go
@@ -15,13 +15,17 @@ import (
 	asymkey_model "forgejo.org/models/asymkey"
 	"forgejo.org/models/auth"
 	"forgejo.org/models/db"
+	"forgejo.org/models/moderation"
 	"forgejo.org/models/organization"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/json"
+	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	"forgejo.org/modules/timeutil"
+	"forgejo.org/services/auth/source/oauth2"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -137,17 +141,10 @@ func TestCreateUser(t *testing.T) {
 }
 
 func TestRenameUser(t *testing.T) {
+	defer unittest.OverrideFixtures("models/user/fixtures/")()
 	require.NoError(t, unittest.PrepareTestDatabase())
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 21})
 
-	t.Run("Non-Local", func(t *testing.T) {
-		u := &user_model.User{
-			Type:      user_model.UserTypeIndividual,
-			LoginType: auth.OAuth2,
-		}
-		require.ErrorIs(t, RenameUser(db.DefaultContext, u, "user_rename"), user_model.ErrUserIsNotLocal{})
-	})
-
 	t.Run("Same username", func(t *testing.T) {
 		require.NoError(t, RenameUser(db.DefaultContext, user, user.Name))
 	})
@@ -189,7 +186,7 @@ func TestRenameUser(t *testing.T) {
 
 		redirectUID, err := user_model.LookupUserRedirect(db.DefaultContext, oldUsername)
 		require.NoError(t, err)
-		assert.EqualValues(t, user.ID, redirectUID)
+		assert.Equal(t, user.ID, redirectUID)
 
 		unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user.ID, OwnerName: user.Name})
 	})
@@ -205,17 +202,41 @@ func TestRenameUser(t *testing.T) {
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user_rename"})
 
 		// The granularity of created_unix is a second.
-		time.Sleep(time.Second)
+		test.SleepTillNextSecond()
 		require.NoError(t, RenameUser(db.DefaultContext, user, "redirect-2"))
 		unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "user_rename"})
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "redirect-1"})
 
 		setting.Service.MaxUserRedirects = 2
-		time.Sleep(time.Second)
+		test.SleepTillNextSecond()
 		require.NoError(t, RenameUser(db.DefaultContext, user, "redirect-3"))
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "redirect-1"})
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "redirect-2"})
 	})
+
+	t.Run("Non-local", func(t *testing.T) {
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1041, LoginSource: 1001})
+		authSource := unittest.AssertExistsAndLoadBean(t, &auth.Source{ID: user.LoginSource})
+		assert.False(t, user.IsLocal())
+		assert.True(t, user.IsOAuth2())
+
+		t.Run("Allowed", func(t *testing.T) {
+			require.NoError(t, RenameUser(t.Context(), user, "I-am-a-local-username"))
+		})
+
+		t.Run("Not allowed", func(t *testing.T) {
+			authSourceCfg := authSource.Cfg.(*oauth2.Source)
+			authSourceCfg.AllowUsernameChange = false
+			authSource.Cfg = authSourceCfg
+			_, err := db.GetEngine(t.Context()).Cols("cfg").ID(authSource.ID).Update(authSource)
+			require.NoError(t, err)
+
+			require.ErrorIs(t, RenameUser(t.Context(), user, "Another-username-change"), user_model.ErrUserIsNotLocal{UID: user.ID, Name: user.Name})
+			t.Run("Admin", func(t *testing.T) {
+				require.NoError(t, AdminRenameUser(t.Context(), user, "Another-username-change"))
+			})
+		})
+	})
 }
 
 func TestCreateUser_Issue5882(t *testing.T) {
@@ -277,3 +298,56 @@ func TestDeleteInactiveUsers(t *testing.T) {
 	unittest.AssertExistsIf(t, true, newUser)
 	unittest.AssertExistsIf(t, true, newEmail)
 }
+
+func TestCreateShadowCopyOnUserUpdate(t *testing.T) {
+	defer unittest.OverrideFixtures("models/fixtures/ModerationFeatures")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	userAlexSmithID := int64(1002)
+	abuseReportID := int64(2)     // submitted for @alexsmith
+	newDummyValue := "[REDACTED]" // used for updating profile text fields
+
+	// Retrieve the abusive user (@alexsmith) and the abuse report already created for this user.
+	abuser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userAlexSmithID})
+	report := unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReport{
+		ID:          abuseReportID,
+		ContentType: moderation.ReportedContentTypeUser,
+		ContentID:   abuser.ID,
+	})
+	// The report should not already have a shadow copy linked.
+	assert.False(t, report.ShadowCopyID.Valid)
+
+	// Keep a copy of old field values before updating them.
+	oldUserData := user_model.UserData{
+		FullName:    abuser.FullName,
+		Location:    abuser.Location,
+		Website:     abuser.Website,
+		Pronouns:    abuser.Pronouns,
+		Description: abuser.Description,
+	}
+
+	// The abusive user is updating their profile.
+	opts := &UpdateOptions{
+		FullName:    optional.Some(newDummyValue),
+		Location:    optional.Some(newDummyValue),
+		Website:     optional.Some(newDummyValue),
+		Pronouns:    optional.Some(newDummyValue),
+		Description: optional.Some(newDummyValue),
+	}
+	require.NoError(t, UpdateUser(t.Context(), abuser, opts))
+
+	// Reload the report.
+	report = unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReport{ID: report.ID})
+	// A shadow copy should have been created and linked to our report.
+	assert.True(t, report.ShadowCopyID.Valid)
+	// Retrieve the newly created shadow copy and unmarshal the stored JSON so that we can check the values.
+	shadowCopy := unittest.AssertExistsAndLoadBean(t, &moderation.AbuseReportShadowCopy{ID: report.ShadowCopyID.Int64})
+	shadowCopyUserData := new(user_model.UserData)
+	require.NoError(t, json.Unmarshal([]byte(shadowCopy.RawValue), &shadowCopyUserData))
+	// Check to see if the initial field values of the user were stored within the shadow copy.
+	assert.Equal(t, oldUserData.FullName, shadowCopyUserData.FullName)
+	assert.Equal(t, oldUserData.Location, shadowCopyUserData.Location)
+	assert.Equal(t, oldUserData.Website, shadowCopyUserData.Website)
+	assert.Equal(t, oldUserData.Pronouns, shadowCopyUserData.Pronouns)
+	assert.Equal(t, oldUserData.Description, shadowCopyUserData.Description)
+}
diff --git a/services/webhook/default.go b/services/webhook/default.go
index 30717a7352..797b98f99a 100644
--- a/services/webhook/default.go
+++ b/services/webhook/default.go
@@ -36,8 +36,7 @@ func (dh defaultHandler) Type() webhook_module.HookType {
 
 func (dh defaultHandler) Icon(size int) template.HTML {
 	if dh.forgejo {
-		// forgejo.svg is not in web_src/svg/, so svg.RenderHTML does not work
-		return shared.ImgIcon("forgejo.svg", size)
+		return svg.RenderHTML("gitea-forgejo", size, "img")
 	}
 	return svg.RenderHTML("gitea-gitea", size, "img")
 }
diff --git a/services/webhook/default_test.go b/services/webhook/default_test.go
index f946870d57..fcef4612e1 100644
--- a/services/webhook/default_test.go
+++ b/services/webhook/default_test.go
@@ -237,7 +237,7 @@ func TestOpenProjectPayload(t *testing.T) {
 		assert.Equal(t, 12, j.Get("number").MustBeValid().ToInt())
 		assert.Equal(t, "http://localhost:3000/test/repo/pulls/12", j.Get("html_url").MustBeValid().ToString())
 		assert.Equal(t, jsoniter.NilValue, j.Get("updated_at").ValueType())
-		assert.Equal(t, "", j.Get("state").MustBeValid().ToString())
+		assert.Empty(t, j.Get("state").MustBeValid().ToString())
 		assert.Equal(t, "Fix bug", j.Get("title").MustBeValid().ToString())
 		assert.Equal(t, "fixes bug #2", j.Get("body").MustBeValid().ToString())
 
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
index 0c7c039f10..23aca80345 100644
--- a/services/webhook/deliver.go
+++ b/services/webhook/deliver.go
@@ -6,6 +6,7 @@ package webhook
 import (
 	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -218,7 +219,7 @@ func Init() error {
 
 	hookQueue = queue.CreateUniqueQueue(graceful.GetManager().ShutdownContext(), "webhook_sender", handler)
 	if hookQueue == nil {
-		return fmt.Errorf("unable to create webhook_sender queue")
+		return errors.New("unable to create webhook_sender queue")
 	}
 	go graceful.GetManager().RunWithCancel(hookQueue)
 
diff --git a/services/webhook/deliver_test.go b/services/webhook/deliver_test.go
index 4dd898e60a..1a9ce05de4 100644
--- a/services/webhook/deliver_test.go
+++ b/services/webhook/deliver_test.go
@@ -137,7 +137,7 @@ func TestWebhookDeliverHookTask(t *testing.T) {
 		case "/webhook/66d222a5d6349e1311f551e50722d837e30fce98":
 			// Version 1
 			assert.Equal(t, "push", r.Header.Get("X-GitHub-Event"))
-			assert.Equal(t, "", r.Header.Get("Content-Type"))
+			assert.Empty(t, r.Header.Get("Content-Type"))
 			body, err := io.ReadAll(r.Body)
 			require.NoError(t, err)
 			assert.Equal(t, `{"data": 42}`, string(body))
diff --git a/services/webhook/dingtalk.go b/services/webhook/dingtalk.go
index 9d5c7e573f..ec53c79c2c 100644
--- a/services/webhook/dingtalk.go
+++ b/services/webhook/dingtalk.go
@@ -207,6 +207,12 @@ func (dc dingtalkConvertor) Package(p *api.PackagePayload) (DingtalkPayload, err
 	return createDingtalkPayload(text, text, "view package", p.Package.HTMLURL), nil
 }
 
+func (dc dingtalkConvertor) Action(p *api.ActionPayload) (DingtalkPayload, error) {
+	text, _ := getActionPayloadInfo(p, noneLinkFormatter)
+
+	return createDingtalkPayload(text, text, "view action", p.Run.HTMLURL), nil
+}
+
 func createDingtalkPayload(title, text, singleTitle, singleURL string) DingtalkPayload {
 	return DingtalkPayload{
 		MsgType: "actionCard",
diff --git a/services/webhook/discord.go b/services/webhook/discord.go
index 3970a2552d..7259c4a995 100644
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@@ -16,6 +16,7 @@ import (
 	"unicode/utf8"
 
 	webhook_model "forgejo.org/models/webhook"
+	"forgejo.org/modules/base"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/json"
 	"forgejo.org/modules/log"
@@ -151,6 +152,18 @@ var (
 	redColor         = color("ff3232")
 )
 
+// https://discord.com/developers/docs/resources/message#embed-object-embed-limits
+// Discord has some limits in place for the embeds.
+// According to some tests, there is no consistent limit for different character sets.
+// For example: 4096 ASCII letters are allowed, but only 2490 emoji characters are allowed.
+// To keep it simple, we currently truncate at 2000.
+const discordDescriptionCharactersLimit = 2000
+
+type discordConvertor struct {
+	Username  string
+	AvatarURL string
+}
+
 // Create implements PayloadConvertor Create method
 func (d discordConvertor) Create(p *api.CreatePayload) (DiscordPayload, error) {
 	// created tag/branch
@@ -312,9 +325,10 @@ func (d discordConvertor) Package(p *api.PackagePayload) (DiscordPayload, error)
 	return d.createPayload(p.Sender, text, "", p.Package.HTMLURL, color), nil
 }
 
-type discordConvertor struct {
-	Username  string
-	AvatarURL string
+func (d discordConvertor) Action(p *api.ActionPayload) (DiscordPayload, error) {
+	text, color := getActionPayloadInfo(p, noneLinkFormatter)
+
+	return d.createPayload(p.Run.TriggerUser, text, "", p.Run.HTMLURL, color), nil
 }
 
 var _ shared.PayloadConvertor[DiscordPayload] = discordConvertor{}
@@ -336,7 +350,7 @@ func parseHookPullRequestEventType(event webhook_module.HookEventType) (string,
 	case webhook_module.HookEventPullRequestReviewApproved:
 		return "approved", nil
 	case webhook_module.HookEventPullRequestReviewRejected:
-		return "rejected", nil
+		return "requested changes", nil
 	case webhook_module.HookEventPullRequestReviewComment:
 		return "comment", nil
 	default:
@@ -357,7 +371,7 @@ func (d discordConvertor) createPayload(s *api.User, title, text, url string, co
 		Embeds: []DiscordEmbed{
 			{
 				Title:       title,
-				Description: text,
+				Description: base.TruncateString(text, discordDescriptionCharactersLimit),
 				URL:         url,
 				Color:       color,
 				Author: DiscordEmbedAuthor{
diff --git a/services/webhook/discord_test.go b/services/webhook/discord_test.go
index ce3aaa10cf..b04be30bc6 100644
--- a/services/webhook/discord_test.go
+++ b/services/webhook/discord_test.go
@@ -175,7 +175,7 @@ func TestDiscordPayload(t *testing.T) {
 		require.NoError(t, err)
 
 		assert.Len(t, pl.Embeds, 1)
-		assert.Len(t, pl.Embeds[0].Description, 4096)
+		assert.Len(t, pl.Embeds[0].Description, 2000)
 	})
 
 	t.Run("IssueComment", func(t *testing.T) {
diff --git a/services/webhook/feishu.go b/services/webhook/feishu.go
index 01b3d07983..57f2362783 100644
--- a/services/webhook/feishu.go
+++ b/services/webhook/feishu.go
@@ -191,6 +191,12 @@ func (fc feishuConvertor) Package(p *api.PackagePayload) (FeishuPayload, error)
 	return newFeishuTextPayload(text), nil
 }
 
+func (fc feishuConvertor) Action(p *api.ActionPayload) (FeishuPayload, error) {
+	text, _ := getActionPayloadInfo(p, noneLinkFormatter)
+
+	return newFeishuTextPayload(text), nil
+}
+
 type feishuConvertor struct{}
 
 var _ shared.PayloadConvertor[FeishuPayload] = feishuConvertor{}
diff --git a/services/webhook/general.go b/services/webhook/general.go
index 40a2467177..c728b6ba1a 100644
--- a/services/webhook/general.go
+++ b/services/webhook/general.go
@@ -37,11 +37,12 @@ func getPullRequestInfo(p *api.PullRequestPayload) (title, link, by, operator, o
 	for i, user := range assignList {
 		assignStringList[i] = user.UserName
 	}
-	if p.Action == api.HookIssueAssigned {
+	switch p.Action {
+	case api.HookIssueAssigned:
 		operateResult = fmt.Sprintf("%s assign this to %s", p.Sender.UserName, assignList[len(assignList)-1].UserName)
-	} else if p.Action == api.HookIssueUnassigned {
+	case api.HookIssueUnassigned:
 		operateResult = fmt.Sprintf("%s unassigned this for someone", p.Sender.UserName)
-	} else if p.Action == api.HookIssueMilestoned {
+	case api.HookIssueMilestoned:
 		operateResult = fmt.Sprintf("%s/milestone/%d", p.Repository.HTMLURL, p.PullRequest.Milestone.ID)
 	}
 	link = p.PullRequest.HTMLURL
@@ -62,11 +63,12 @@ func getIssuesInfo(p *api.IssuePayload) (issueTitle, link, by, operator, operate
 	for i, user := range assignList {
 		assignStringList[i] = user.UserName
 	}
-	if p.Action == api.HookIssueAssigned {
+	switch p.Action {
+	case api.HookIssueAssigned:
 		operateResult = fmt.Sprintf("%s assign this to %s", p.Sender.UserName, assignList[len(assignList)-1].UserName)
-	} else if p.Action == api.HookIssueUnassigned {
+	case api.HookIssueUnassigned:
 		operateResult = fmt.Sprintf("%s unassigned this for someone", p.Sender.UserName)
-	} else if p.Action == api.HookIssueMilestoned {
+	case api.HookIssueMilestoned:
 		operateResult = fmt.Sprintf("%s/milestone/%d", p.Repository.HTMLURL, p.Issue.Milestone.ID)
 	}
 	link = p.Issue.HTMLURL
@@ -302,6 +304,25 @@ func getPackagePayloadInfo(p *api.PackagePayload, linkFormatter linkFormatter, w
 	return text, color
 }
 
+func getActionPayloadInfo(p *api.ActionPayload, linkFormatter linkFormatter) (text string, color int) {
+	runLink := linkFormatter(p.Run.HTMLURL, p.Run.Title)
+	repoLink := linkFormatter(p.Run.Repo.HTMLURL, p.Run.Repo.FullName)
+
+	switch p.Action {
+	case api.HookActionFailure:
+		text = fmt.Sprintf("%s Action Failed in %s %s", runLink, repoLink, p.Run.PrettyRef)
+		color = redColor
+	case api.HookActionRecover:
+		text = fmt.Sprintf("%s Action Recovered in %s %s", runLink, repoLink, p.Run.PrettyRef)
+		color = greenColor
+	case api.HookActionSuccess:
+		text = fmt.Sprintf("%s Action Succeeded in %s %s", runLink, repoLink, p.Run.PrettyRef)
+		color = greenColor
+	}
+
+	return text, color
+}
+
 // ToHook convert models.Webhook to api.Hook
 // This function is not part of the convert package to prevent an import cycle
 func ToHook(repoLink string, w *webhook_model.Webhook) (*api.Hook, error) {
diff --git a/services/webhook/general_test.go b/services/webhook/general_test.go
index b321fb3f8c..10c779742d 100644
--- a/services/webhook/general_test.go
+++ b/services/webhook/general_test.go
@@ -270,6 +270,22 @@ func pullReleaseTestPayload() *api.ReleasePayload {
 	}
 }
 
+func ActionTestPayload() *api.ActionPayload {
+	// this is not a complete action payload but enough for testing purposes
+	return &api.ActionPayload{
+		Run: &api.ActionRun{
+			Repo: &api.Repository{
+				HTMLURL:  "http://localhost:3000/test/repo",
+				Name:     "repo",
+				FullName: "test/repo",
+			},
+			PrettyRef: "main",
+			HTMLURL:   "http://localhost:3000/test/repo/actions/runs/69",
+			Title:     "Build release",
+		},
+	}
+}
+
 func pullRequestTestPayload() *api.PullRequestPayload {
 	return &api.PullRequestPayload{
 		Action: api.HookIssueOpened,
@@ -675,3 +691,36 @@ func TestGetIssueCommentPayloadInfo(t *testing.T) {
 		assert.Equal(t, c.color, color, "case %d", i)
 	}
 }
+
+func TestGetActionPayloadInfo(t *testing.T) {
+	p := ActionTestPayload()
+
+	cases := []struct {
+		action api.HookActionAction
+		text   string
+		color  int
+	}{
+		{
+			api.HookActionFailure,
+			"Build release Action Failed in test/repo main",
+			redColor,
+		},
+		{
+			api.HookActionSuccess,
+			"Build release Action Succeeded in test/repo main",
+			greenColor,
+		},
+		{
+			api.HookActionRecover,
+			"Build release Action Recovered in test/repo main",
+			greenColor,
+		},
+	}
+
+	for i, c := range cases {
+		p.Action = c.action
+		text, color := getActionPayloadInfo(p, noneLinkFormatter)
+		assert.Equal(t, c.text, text, "case %d", i)
+		assert.Equal(t, c.color, color, "case %d", i)
+	}
+}
diff --git a/services/webhook/matrix.go b/services/webhook/matrix.go
index f1cc9384d3..bdb0c292ab 100644
--- a/services/webhook/matrix.go
+++ b/services/webhook/matrix.go
@@ -273,6 +273,12 @@ func (m matrixConvertor) Package(p *api.PackagePayload) (MatrixPayload, error) {
 	return m.newPayload(text)
 }
 
+func (m matrixConvertor) Action(p *api.ActionPayload) (MatrixPayload, error) {
+	text, _ := getActionPayloadInfo(p, htmlLinkFormatter)
+
+	return m.newPayload(text)
+}
+
 var urlRegex = regexp.MustCompile(`<a [^>]*?href="([^">]*?)">(.*?)</a>`)
 
 func getMessageBody(htmlText string) string {
diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go
index 1ed03afd26..3b35c407e1 100644
--- a/services/webhook/msteams.go
+++ b/services/webhook/msteams.go
@@ -326,6 +326,23 @@ func (m msteamsConvertor) Package(p *api.PackagePayload) (MSTeamsPayload, error)
 	), nil
 }
 
+func (m msteamsConvertor) Action(p *api.ActionPayload) (MSTeamsPayload, error) {
+	title, color := getActionPayloadInfo(p, noneLinkFormatter)
+
+	// TODO: is TriggerUser correct here?
+	// if you'd like to test these proprietary services, see the discussion on: https://codeberg.org/forgejo/forgejo/pulls/7508
+	return createMSTeamsPayload(
+		p.Run.Repo,
+		p.Run.TriggerUser,
+		title,
+		"",
+		p.Run.HTMLURL,
+		color,
+		// TODO: does this make any sense?
+		&MSTeamsFact{"Action:", p.Run.Title},
+	), nil
+}
+
 func createMSTeamsPayload(r *api.Repository, s *api.User, title, text, actionTarget string, color int, fact *MSTeamsFact) MSTeamsPayload {
 	facts := make([]MSTeamsFact, 0, 2)
 	if r != nil {
diff --git a/services/webhook/msteams_test.go b/services/webhook/msteams_test.go
index b210f299bc..da6439f198 100644
--- a/services/webhook/msteams_test.go
+++ b/services/webhook/msteams_test.go
@@ -335,7 +335,7 @@ func TestMSTeamsPayload(t *testing.T) {
 		assert.Equal(t, "[test/repo] New wiki page 'index' (Wiki change comment)", pl.Summary)
 		assert.Len(t, pl.Sections, 1)
 		assert.Equal(t, "user1", pl.Sections[0].ActivitySubtitle)
-		assert.Equal(t, "", pl.Sections[0].Text)
+		assert.Empty(t, pl.Sections[0].Text)
 		assert.Len(t, pl.Sections[0].Facts, 2)
 		for _, fact := range pl.Sections[0].Facts {
 			if fact.Name == "Repository:" {
@@ -356,7 +356,7 @@ func TestMSTeamsPayload(t *testing.T) {
 		assert.Equal(t, "[test/repo] Wiki page 'index' edited (Wiki change comment)", pl.Summary)
 		assert.Len(t, pl.Sections, 1)
 		assert.Equal(t, "user1", pl.Sections[0].ActivitySubtitle)
-		assert.Equal(t, "", pl.Sections[0].Text)
+		assert.Empty(t, pl.Sections[0].Text)
 		assert.Len(t, pl.Sections[0].Facts, 2)
 		for _, fact := range pl.Sections[0].Facts {
 			if fact.Name == "Repository:" {
diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go
index e9fd52c940..009efc994f 100644
--- a/services/webhook/notifier.go
+++ b/services/webhook/notifier.go
@@ -6,6 +6,7 @@ package webhook
 import (
 	"context"
 
+	actions_model "forgejo.org/models/actions"
 	issues_model "forgejo.org/models/issues"
 	packages_model "forgejo.org/models/packages"
 	"forgejo.org/models/perm"
@@ -887,6 +888,45 @@ func (m *webhookNotifier) PackageDelete(ctx context.Context, doer *user_model.Us
 	notifyPackage(ctx, doer, pd, api.HookPackageDeleted)
 }
 
+func (m *webhookNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
+	source := EventSource{
+		Repository: run.Repo,
+		Owner:      run.TriggerUser,
+	}
+
+	// The doer is the one whose perspective is used to view this ActionRun.
+	// In the best case we use the user that created the webhook.
+	// Unfortunately we don't know who that was.
+	// So instead we use the repo owner, who is able to create webhooks and allow others to do so by making them repo admins.
+	// This is pretty close to perfect.
+	doer := run.Repo.Owner
+
+	payload := &api.ActionPayload{
+		Run:         convert.ToActionRun(ctx, run, doer),
+		LastRun:     convert.ToActionRun(ctx, lastRun, doer),
+		PriorStatus: priorStatus.String(),
+	}
+
+	if run.Status.IsSuccess() {
+		payload.Action = api.HookActionSuccess
+		if err := PrepareWebhooks(ctx, source, webhook_module.HookEventActionRunSuccess, payload); err != nil {
+			log.Error("PrepareWebhooks: %v", err)
+		}
+		// send another event when this is a recover
+		if lastRun != nil && !lastRun.Status.IsSuccess() {
+			payload.Action = api.HookActionRecover
+			if err := PrepareWebhooks(ctx, source, webhook_module.HookEventActionRunRecover, payload); err != nil {
+				log.Error("PrepareWebhooks: %v", err)
+			}
+		}
+	} else {
+		payload.Action = api.HookActionFailure
+		if err := PrepareWebhooks(ctx, source, webhook_module.HookEventActionRunFailure, payload); err != nil {
+			log.Error("PrepareWebhooks: %v", err)
+		}
+	}
+}
+
 func notifyPackage(ctx context.Context, sender *user_model.User, pd *packages_model.PackageDescriptor, action api.HookPackageAction) {
 	source := EventSource{
 		Repository: pd.Repository,
diff --git a/services/webhook/notifier_test.go b/services/webhook/notifier_test.go
index 46eb1f089c..a810de91c1 100644
--- a/services/webhook/notifier_test.go
+++ b/services/webhook/notifier_test.go
@@ -6,6 +6,7 @@ package webhook
 import (
 	"testing"
 
+	actions_model "forgejo.org/models/actions"
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
@@ -13,10 +14,12 @@ import (
 	webhook_model "forgejo.org/models/webhook"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/json"
+	"forgejo.org/modules/log"
 	"forgejo.org/modules/repository"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
+	webhook_module "forgejo.org/modules/webhook"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -83,7 +86,7 @@ func TestSyncPushCommits(t *testing.T) {
 		var payloadContent structs.PushPayload
 		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
 		assert.Len(t, payloadContent.Commits, 1)
-		assert.EqualValues(t, "2c54faec6c45d31c1abfaecdab471eac6633738a", payloadContent.Commits[0].ID)
+		assert.Equal(t, "2c54faec6c45d31c1abfaecdab471eac6633738a", payloadContent.Commits[0].ID)
 	})
 }
 
@@ -116,6 +119,193 @@ func TestPushCommits(t *testing.T) {
 		var payloadContent structs.PushPayload
 		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
 		assert.Len(t, payloadContent.Commits, 1)
-		assert.EqualValues(t, "2c54faec6c45d31c1abfaecdab471eac6633738a", payloadContent.Commits[0].ID)
+		assert.Equal(t, "2c54faec6c45d31c1abfaecdab471eac6633738a", payloadContent.Commits[0].ID)
+	})
+}
+
+func assertActionEqual(t *testing.T, expectedRun *actions_model.ActionRun, actualRun *structs.ActionRun) {
+	assert.NotNil(t, expectedRun)
+	assert.NotNil(t, actualRun)
+	// only test a few things
+	assert.Equal(t, expectedRun.ID, actualRun.ID)
+	assert.Equal(t, expectedRun.Status.String(), actualRun.Status)
+	assert.Equal(t, expectedRun.Index, actualRun.Index)
+	assert.Equal(t, expectedRun.RepoID, actualRun.Repo.ID)
+	// convert to unix because of time zones
+	assert.Equal(t, expectedRun.Stopped.AsTime().Unix(), actualRun.Stopped.Unix())
+	assert.Equal(t, expectedRun.Title, actualRun.Title)
+	assert.Equal(t, expectedRun.WorkflowID, actualRun.WorkflowID)
+}
+
+func TestAction(t *testing.T) {
+	defer unittest.OverrideFixtures("services/webhook/TestPushCommits")()
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	triggerUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2, OwnerID: triggerUser.ID})
+
+	oldSuccessRun := &actions_model.ActionRun{
+		ID:            1,
+		Status:        actions_model.StatusSuccess,
+		Index:         1,
+		RepoID:        repo.ID,
+		Stopped:       1693648027,
+		WorkflowID:    "some_workflow",
+		Title:         "oldSuccessRun",
+		TriggerUser:   triggerUser,
+		TriggerUserID: triggerUser.ID,
+		TriggerEvent:  "push",
+	}
+	oldSuccessRun.LoadAttributes(db.DefaultContext)
+	oldFailureRun := &actions_model.ActionRun{
+		ID:            1,
+		Status:        actions_model.StatusFailure,
+		Index:         1,
+		RepoID:        repo.ID,
+		Stopped:       1693648027,
+		WorkflowID:    "some_workflow",
+		Title:         "oldFailureRun",
+		TriggerUser:   triggerUser,
+		TriggerUserID: triggerUser.ID,
+		TriggerEvent:  "push",
+	}
+	oldFailureRun.LoadAttributes(db.DefaultContext)
+	newSuccessRun := &actions_model.ActionRun{
+		ID:            1,
+		Status:        actions_model.StatusSuccess,
+		Index:         1,
+		RepoID:        repo.ID,
+		Stopped:       1693648327,
+		WorkflowID:    "some_workflow",
+		Title:         "newSuccessRun",
+		TriggerUser:   triggerUser,
+		TriggerUserID: triggerUser.ID,
+		TriggerEvent:  "push",
+	}
+	newSuccessRun.LoadAttributes(db.DefaultContext)
+	newFailureRun := &actions_model.ActionRun{
+		ID:            1,
+		Status:        actions_model.StatusFailure,
+		Index:         1,
+		RepoID:        repo.ID,
+		Stopped:       1693648327,
+		WorkflowID:    "some_workflow",
+		Title:         "newFailureRun",
+		TriggerUser:   triggerUser,
+		TriggerUserID: triggerUser.ID,
+		TriggerEvent:  "push",
+	}
+	newFailureRun.LoadAttributes(db.DefaultContext)
+
+	t.Run("Successful Run after Nothing", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newSuccessRun, actions_model.StatusWaiting, nil)
+
+		// there's only one of these at the time
+		hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_success' AND payload_content LIKE '%success%newSuccessRun%'"))
+		assert.Equal(t, webhook_module.HookEventActionRunSuccess, hookTask.EventType)
+
+		var payloadContent structs.ActionPayload
+		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+		assert.Equal(t, structs.HookActionSuccess, payloadContent.Action)
+		assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+		assertActionEqual(t, newSuccessRun, payloadContent.Run)
+		assert.Nil(t, payloadContent.LastRun)
+	})
+
+	t.Run("Successful Run after Failure", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newSuccessRun, actions_model.StatusWaiting, oldFailureRun)
+
+		{
+			hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_success' AND payload_content LIKE '%success%newSuccessRun%oldFailureRun%'"))
+			assert.Equal(t, webhook_module.HookEventActionRunSuccess, hookTask.EventType)
+
+			var payloadContent structs.ActionPayload
+			require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+			assert.Equal(t, structs.HookActionSuccess, payloadContent.Action)
+			assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+			assertActionEqual(t, newSuccessRun, payloadContent.Run)
+			assertActionEqual(t, oldFailureRun, payloadContent.LastRun)
+		}
+		{
+			hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_recover' AND payload_content LIKE '%recover%newSuccessRun%oldFailureRun%'"))
+			assert.Equal(t, webhook_module.HookEventActionRunRecover, hookTask.EventType)
+
+			log.Error("something: %s", hookTask.PayloadContent)
+			var payloadContent structs.ActionPayload
+			require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+			assert.Equal(t, structs.HookActionRecover, payloadContent.Action)
+			assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+			assertActionEqual(t, newSuccessRun, payloadContent.Run)
+			assertActionEqual(t, oldFailureRun, payloadContent.LastRun)
+		}
+	})
+
+	t.Run("Successful Run after Success", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newSuccessRun, actions_model.StatusWaiting, oldSuccessRun)
+
+		hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_success' AND payload_content LIKE '%success%newSuccessRun%oldSuccessRun%'"))
+		assert.Equal(t, webhook_module.HookEventActionRunSuccess, hookTask.EventType)
+
+		var payloadContent structs.ActionPayload
+		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+		assert.Equal(t, structs.HookActionSuccess, payloadContent.Action)
+		assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+		assertActionEqual(t, newSuccessRun, payloadContent.Run)
+		assertActionEqual(t, oldSuccessRun, payloadContent.LastRun)
+	})
+
+	t.Run("Failed Run after Nothing", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newFailureRun, actions_model.StatusWaiting, nil)
+
+		// there should only be this one at the time
+		hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_failure' AND payload_content LIKE '%failure%newFailureRun%'"))
+		assert.Equal(t, webhook_module.HookEventActionRunFailure, hookTask.EventType)
+
+		var payloadContent structs.ActionPayload
+		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+		assert.Equal(t, structs.HookActionFailure, payloadContent.Action)
+		assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+		assertActionEqual(t, newFailureRun, payloadContent.Run)
+		assert.Nil(t, payloadContent.LastRun)
+	})
+
+	t.Run("Failed Run after Failure", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newFailureRun, actions_model.StatusWaiting, oldFailureRun)
+
+		hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_failure' AND payload_content LIKE '%failure%newFailureRun%oldFailureRun%'"))
+		assert.Equal(t, webhook_module.HookEventActionRunFailure, hookTask.EventType)
+
+		var payloadContent structs.ActionPayload
+		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+		assert.Equal(t, structs.HookActionFailure, payloadContent.Action)
+		assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+		assertActionEqual(t, newFailureRun, payloadContent.Run)
+		assertActionEqual(t, oldFailureRun, payloadContent.LastRun)
+	})
+
+	t.Run("Failed Run after Success", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Webhook.PayloadCommitLimit, 10)()
+
+		NewNotifier().ActionRunNowDone(db.DefaultContext, newFailureRun, actions_model.StatusWaiting, oldSuccessRun)
+
+		hookTask := unittest.AssertExistsAndLoadBean(t, &webhook_model.HookTask{}, unittest.Cond("event_type == 'action_run_failure' AND payload_content LIKE '%failure%newFailureRun%oldSuccessRun%'"))
+		assert.Equal(t, webhook_module.HookEventActionRunFailure, hookTask.EventType)
+
+		var payloadContent structs.ActionPayload
+		require.NoError(t, json.Unmarshal([]byte(hookTask.PayloadContent), &payloadContent))
+		assert.Equal(t, structs.HookActionFailure, payloadContent.Action)
+		assert.Equal(t, actions_model.StatusWaiting.String(), payloadContent.PriorStatus)
+		assertActionEqual(t, newFailureRun, payloadContent.Run)
+		assertActionEqual(t, oldSuccessRun, payloadContent.LastRun)
 	})
 }
diff --git a/services/webhook/shared/payloader.go b/services/webhook/shared/payloader.go
index 0a6535eddb..e3be4c4b4c 100644
--- a/services/webhook/shared/payloader.go
+++ b/services/webhook/shared/payloader.go
@@ -36,6 +36,7 @@ type PayloadConvertor[T any] interface {
 	Release(*api.ReleasePayload) (T, error)
 	Wiki(*api.WikiPayload) (T, error)
 	Package(*api.PackagePayload) (T, error)
+	Action(*api.ActionPayload) (T, error)
 }
 
 func convertUnmarshalledJSON[T, P any](convert func(P) (T, error), data []byte) (T, error) {
@@ -86,6 +87,8 @@ func NewPayload[T any](rc PayloadConvertor[T], data []byte, event webhook_module
 		return convertUnmarshalledJSON(rc.Wiki, data)
 	case webhook_module.HookEventPackage:
 		return convertUnmarshalledJSON(rc.Package, data)
+	case webhook_module.HookEventActionRunFailure, webhook_module.HookEventActionRunRecover, webhook_module.HookEventActionRunSuccess:
+		return convertUnmarshalledJSON(rc.Action, data)
 	}
 	var t T
 	return t, fmt.Errorf("newPayload unsupported event: %s", event)
diff --git a/services/webhook/slack.go b/services/webhook/slack.go
index e854f89c6c..8c61e7ba25 100644
--- a/services/webhook/slack.go
+++ b/services/webhook/slack.go
@@ -142,6 +142,7 @@ func SlackLinkToRef(repoURL, ref string) string {
 	return SlackLinkFormatter(url, refName)
 }
 
+// TODO: fix spelling to Converter
 // Create implements payloadConvertor Create method
 func (s slackConvertor) Create(p *api.CreatePayload) (SlackPayload, error) {
 	refLink := SlackLinkToRef(p.Repo.HTMLURL, p.Ref)
@@ -311,6 +312,12 @@ func (s slackConvertor) Repository(p *api.RepositoryPayload) (SlackPayload, erro
 	return s.createPayload(text, nil), nil
 }
 
+func (s slackConvertor) Action(p *api.ActionPayload) (SlackPayload, error) {
+	text, _ := getActionPayloadInfo(p, SlackLinkFormatter)
+
+	return s.createPayload(text, nil), nil
+}
+
 func (s slackConvertor) createPayload(text string, attachments []SlackAttachment) SlackPayload {
 	return SlackPayload{
 		Channel:     s.Channel,
diff --git a/services/webhook/sourcehut/builds.go b/services/webhook/sourcehut/builds.go
index bd3eeebc6c..2593afb0b2 100644
--- a/services/webhook/sourcehut/builds.go
+++ b/services/webhook/sourcehut/builds.go
@@ -190,6 +190,10 @@ func (pc sourcehutConvertor) Package(_ *api.PackagePayload) (graphqlPayload[buil
 	return graphqlPayload[buildsVariables]{}, shared.ErrPayloadTypeNotSupported
 }
 
+func (pc sourcehutConvertor) Action(_ *api.ActionPayload) (graphqlPayload[buildsVariables], error) {
+	return graphqlPayload[buildsVariables]{}, shared.ErrPayloadTypeNotSupported
+}
+
 // newPayload opens and adjusts the manifest to submit to the builds service
 //
 // in case of an error the Error field will be set, to be visible by the end-user under recent deliveries
diff --git a/services/webhook/telegram.go b/services/webhook/telegram.go
index d0abd667f4..e6897f68bc 100644
--- a/services/webhook/telegram.go
+++ b/services/webhook/telegram.go
@@ -205,6 +205,12 @@ func (t telegramConvertor) Package(p *api.PackagePayload) (TelegramPayload, erro
 	return createTelegramPayload(text), nil
 }
 
+func (telegramConvertor) Action(p *api.ActionPayload) (TelegramPayload, error) {
+	text, _ := getActionPayloadInfo(p, htmlLinkFormatter)
+
+	return createTelegramPayload(text), nil
+}
+
 func createTelegramPayload(message string) TelegramPayload {
 	return TelegramPayload{
 		Message:           markup.Sanitize(strings.TrimSpace(message)),
diff --git a/services/webhook/webhook.go b/services/webhook/webhook.go
index 989b535564..ecbbfcfbd6 100644
--- a/services/webhook/webhook.go
+++ b/services/webhook/webhook.go
@@ -103,7 +103,7 @@ type EventSource struct {
 	Owner      *user_model.User
 }
 
-// handle delivers hook tasks
+// handler delivers hook tasks
 func handler(items ...int64) []int64 {
 	ctx := graceful.GetManager().HammerContext()
 
diff --git a/services/webhook/webhook_test.go b/services/webhook/webhook_test.go
index c9af09d3e9..15cb8f620c 100644
--- a/services/webhook/webhook_test.go
+++ b/services/webhook/webhook_test.go
@@ -14,6 +14,7 @@ import (
 	webhook_model "forgejo.org/models/webhook"
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
 	webhook_module "forgejo.org/modules/webhook"
 	"forgejo.org/services/convert"
 
@@ -104,7 +105,8 @@ func TestPrepareWebhooksBranchFilterNoMatch(t *testing.T) {
 
 func TestWebhookUserMail(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
-	setting.Service.NoReplyAddress = "no-reply.com"
+	defer test.MockVariableValue(&setting.Service.NoReplyAddress, "no-reply.com")()
+
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 	assert.Equal(t, user.GetPlaceholderEmail(), convert.ToUser(db.DefaultContext, user, nil).Email)
 	assert.Equal(t, user.Email, convert.ToUser(db.DefaultContext, user, user).Email)
diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go
index 323d23aba7..5c765b0754 100644
--- a/services/webhook/wechatwork.go
+++ b/services/webhook/wechatwork.go
@@ -201,6 +201,12 @@ func (wc wechatworkConvertor) Package(p *api.PackagePayload) (WechatworkPayload,
 	return newWechatworkMarkdownPayload(text), nil
 }
 
+func (wc wechatworkConvertor) Action(p *api.ActionPayload) (WechatworkPayload, error) {
+	text, _ := getActionPayloadInfo(p, noneLinkFormatter)
+
+	return newWechatworkMarkdownPayload(text), nil
+}
+
 type wechatworkConvertor struct{}
 
 var _ shared.PayloadConvertor[WechatworkPayload] = wechatworkConvertor{}
diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go
index d76104dfc7..cb984425af 100644
--- a/services/wiki/wiki_test.go
+++ b/services/wiki/wiki_test.go
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
 
 func TestWebPathSegments(t *testing.T) {
 	a := WebPathSegments("a%2Fa/b+c/d-e/f-g.-")
-	assert.EqualValues(t, []string{"a/a", "b c", "d e", "f-g"}, a)
+	assert.Equal(t, []string{"a/a", "b c", "d e", "f-g"}, a)
 }
 
 func TestUserTitleToWebPath(t *testing.T) {
@@ -63,7 +63,7 @@ func TestWebPathToDisplayName(t *testing.T) {
 		{"a b", "a%20b.md"},
 	} {
 		_, displayName := WebPathToUserTitle(test.WebPath)
-		assert.EqualValues(t, test.Expected, displayName)
+		assert.Equal(t, test.Expected, displayName)
 	}
 }
 
@@ -80,7 +80,7 @@ func TestWebPathToGitPath(t *testing.T) {
 		{"2000-01-02-meeting.md", "2000-01-02+meeting"},
 		{"2000-01-02 meeting.-.md", "2000-01-02%20meeting.-"},
 	} {
-		assert.EqualValues(t, test.Expected, WebPathToGitPath(test.WikiName))
+		assert.Equal(t, test.Expected, WebPathToGitPath(test.WikiName))
 	}
 }
 
@@ -134,9 +134,9 @@ func TestUserWebGitPathConsistency(t *testing.T) {
 		_, userTitle1 := WebPathToUserTitle(webPath1)
 		gitPath1 := WebPathToGitPath(webPath1)
 
-		assert.EqualValues(t, userTitle, userTitle1, "UserTitle for userTitle: %q", userTitle)
-		assert.EqualValues(t, webPath, webPath1, "WebPath for userTitle: %q", userTitle)
-		assert.EqualValues(t, gitPath, gitPath1, "GitPath for userTitle: %q", userTitle)
+		assert.Equal(t, userTitle, userTitle1, "UserTitle for userTitle: %q", userTitle)
+		assert.Equal(t, webPath, webPath1, "WebPath for userTitle: %q", userTitle)
+		assert.Equal(t, gitPath, gitPath1, "GitPath for userTitle: %q", userTitle)
 	}
 }
 
@@ -175,7 +175,7 @@ func TestRepository_AddWikiPage(t *testing.T) {
 			gitPath := WebPathToGitPath(webPath)
 			entry, err := masterTree.GetTreeEntryByPath(gitPath)
 			require.NoError(t, err)
-			assert.EqualValues(t, gitPath, entry.Name(), "%s not added correctly", userTitle)
+			assert.Equal(t, gitPath, entry.Name(), "%s not added correctly", userTitle)
 		})
 	}
 
@@ -220,7 +220,7 @@ func TestRepository_EditWikiPage(t *testing.T) {
 		gitPath := WebPathToGitPath(webPath)
 		entry, err := masterTree.GetTreeEntryByPath(gitPath)
 		require.NoError(t, err)
-		assert.EqualValues(t, gitPath, entry.Name(), "%s not edited correctly", newWikiName)
+		assert.Equal(t, gitPath, entry.Name(), "%s not edited correctly", newWikiName)
 
 		if newWikiName != "Home" {
 			_, err := masterTree.GetTreeEntryByPath("Home.md")
@@ -284,12 +284,12 @@ func TestPrepareWikiFileName(t *testing.T) {
 			}
 			if existence != tt.existence {
 				if existence {
-					t.Errorf("expect to find no escaped file but we detect one")
+					t.Error("expect to find no escaped file but we detect one")
 				} else {
-					t.Errorf("expect to find an escaped file but we could not detect one")
+					t.Error("expect to find an escaped file but we could not detect one")
 				}
 			}
-			assert.EqualValues(t, tt.wikiPath, newWikiPath)
+			assert.Equal(t, tt.wikiPath, newWikiPath)
 		})
 	}
 }
@@ -311,13 +311,13 @@ func TestPrepareWikiFileName_FirstPage(t *testing.T) {
 	existence, newWikiPath, err := prepareGitPath(gitRepo, "master", "Home")
 	assert.False(t, existence)
 	require.NoError(t, err)
-	assert.EqualValues(t, "Home.md", newWikiPath)
+	assert.Equal(t, "Home.md", newWikiPath)
 }
 
 func TestWebPathConversion(t *testing.T) {
 	assert.Equal(t, "path/wiki", WebPathToURLPath(WebPath("path/wiki")))
 	assert.Equal(t, "wiki", WebPathToURLPath(WebPath("wiki")))
-	assert.Equal(t, "", WebPathToURLPath(WebPath("")))
+	assert.Empty(t, WebPathToURLPath(WebPath("")))
 }
 
 func TestWebPathFromRequest(t *testing.T) {
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000000..cfd555fa37
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,28 @@
+{
+  pkgs ? import <nixpkgs> { },
+}:
+
+pkgs.mkShell {
+  name = "forgejo";
+  nativeBuildInputs = with pkgs; [
+    # generic
+    git
+    git-lfs
+    gnumake
+    gnused
+    gnutar
+    gzip
+
+    # frontend
+    nodejs
+
+    # backend
+    gofumpt
+    sqlite
+    go
+    gopls
+
+    # tests
+    openssh
+  ];
+}
diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
index 1ca5573cae..d4eaa29117 100644
--- a/templates/admin/auth/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
@@ -299,6 +299,13 @@
 							<p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
 						</div>
 					</div>
+					<div class="optional field">
+						<div class="ui checkbox">
+							<label for="allow_username_change"><strong>{{ctx.Locale.Tr "admin.auths.allow_username_change"}}</strong></label>
+							<input id="allow_username_change" name="allow_username_change" type="checkbox" {{if $cfg.AllowUsernameChange}}checked{{end}}>
+							<p class="help">{{ctx.Locale.Tr "admin.auths.allow_username_change.description"}}</p>
+						</div>
+					</div>
 					<div class="oauth2_use_custom_url inline field">
 						<div class="ui checkbox">
 							<label><strong>{{ctx.Locale.Tr "admin.auths.oauth2_use_custom_url"}}</strong></label>
@@ -397,7 +404,7 @@
 
 				<div class="field">
 					<button class="ui primary button">{{ctx.Locale.Tr "admin.auths.update"}}</button>
-					<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}">{{ctx.Locale.Tr "admin.auths.delete"}}</button>
+					<button class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.Source.ID}}" data-modal-id="delete-auth-source">{{ctx.Locale.Tr "admin.auths.delete"}}</button>
 				</div>
 			</form>
 		</div>
@@ -414,7 +421,7 @@
 		</div>
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-auth-source">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "admin.auths.delete_auth_title"}}
diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl
index 7d0a64d269..0cb9ea56bc 100644
--- a/templates/admin/auth/source/oauth.tmpl
+++ b/templates/admin/auth/source/oauth.tmpl
@@ -35,6 +35,13 @@
 			<p class="help">{{ctx.Locale.Tr "admin.auths.skip_local_two_fa_helper"}}</p>
 		</div>
 	</div>
+	<div class="optional field">
+		<div class="ui checkbox">
+			<label for="allow_username_change"><strong>{{ctx.Locale.Tr "admin.auths.allow_username_change"}}</strong></label>
+			<input id="allow_username_change" name="allow_username_change" type="checkbox" {{if .allow_username_change}}checked{{end}}>
+			<p class="help">{{ctx.Locale.Tr "admin.auths.allow_username_change.description"}}</p>
+		</div>
+	</div>
 
 	<div class="oauth2_use_custom_url inline field">
 		<div class="ui checkbox">
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 8f2b1c12e3..36d44f21f3 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -51,6 +51,16 @@
 			</dl>
 		</div>
 
+		<h4 class="ui top attached header">
+			{{ctx.Locale.Tr "admin.config.security"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="admin-dl-horizontal">
+				<dt>{{ctx.Locale.Tr "admin.config.global_2fa_requirement.title"}}</dt>
+				<dd>{{ctx.Locale.Tr (print "admin.config.global_2fa_requirement." .GlobalTwoFactorRequirement)}}</dd>
+			</dl>
+		</div>
+
 		<h4 class="ui top attached header">
 			{{ctx.Locale.Tr "admin.config.ssh_config"}}
 		</h4>
@@ -247,6 +257,16 @@
 			</dl>
 		</div>
 
+		<h4 class="ui top attached header">
+			{{ctx.Locale.Tr "admin.config.moderation_config"}}
+		</h4>
+		<div class="ui attached table segment">
+			<dl class="admin-dl-horizontal">
+				<dt>{{ctx.Locale.Tr "enabled"}}</dt>
+				<dd>{{if .Moderation.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}</dd>
+			</dl>
+		</div>
+
 		<h4 class="ui top attached header">
 			{{ctx.Locale.Tr "admin.config.cache_config"}}
 		</h4>
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 5c30df87af..0a9a28fa2d 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -62,7 +62,7 @@
 							</td>
 							<td>
 								<div class="tw-flex tw-gap-2">
-									<a class="delete-button" href="" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-data-uid="{{.UID}}">{{svg "octicon-trash"}}</a>
+									<a class="delete-button" href="" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-data-uid="{{.UID}}" data-modal-id="delete-email">{{svg "octicon-trash"}}</a>
 								</div>
 							</td>
 						</tr>
@@ -104,7 +104,7 @@
 
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-email">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "admin.emails.delete"}}
diff --git a/templates/admin/moderation/report_details.tmpl b/templates/admin/moderation/report_details.tmpl
new file mode 100644
index 0000000000..26a8b5964b
--- /dev/null
+++ b/templates/admin/moderation/report_details.tmpl
@@ -0,0 +1,65 @@
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}
+<div class="admin-setting-content">
+	<h4 class="ui top attached header">
+		{{ctx.Locale.Tr "admin.moderation.reports"}}
+	</h4>
+	{{if .Reports}}
+	<div class="ui attached segment">
+		<div class="flex-item tw-items-center">
+			<div class="flex-item-leading">
+				{{svg .ContentTypeIconName 24}}
+			</div>
+			<div class="flex-item-main">
+				<div class="flex-item-title">
+					{{if .ContentURL}}<a href="{{.ContentURL}}">{{.ContentReference}}</a>{{else}}<em>{{.ContentReference}}</em>{{end}}
+					{{if .Poster}}<span> — {{.Poster}}</span>{{end}}
+				</div>
+			</div>
+		</div>
+	</div>
+	{{end}}
+	<div class="ui attached segment">
+		{{if .Reports}}
+		<div class="flex-list">
+			{{range .Reports}}
+			<div class="flex-item">
+				<div class="flex-item-main">
+					<div class="flex-items-inline">
+						<span class="item tw-mr-2">
+							{{svg "octicon-calendar"}}
+							{{DateUtils.AbsoluteShort .CreatedUnix}}
+						</span>
+						<span class="item tw-mr-2">
+							{{svg "octicon-report"}}
+							{{if .ReporterName}}<a href="/{{.ReporterName}}">{{.ReporterName}}</a>{{else}}{{$.GhostUserName}}{{end}}
+						</span>
+						<span class="item ui label">
+							{{svg "octicon-tag" 12}}
+							{{ctx.Locale.Tr (index $.AbuseCategories .Category)}}
+						</span>
+					</div>
+
+					<pre>{{.Remarks}}</pre>
+
+					{{if .ShadowCopyID.Valid}}
+						<details><summary>{{DateUtils.FullTime .ShadowCopyDate}} shadow copy</summary>
+						<table class="ui very basic striped table unstackable">
+							{{range $scField := (call $.GetShadowCopyMap $.Context .)}}
+							<tr>
+								<td>{{$scField.Key}}</td>
+								<td>{{$scField.Value}}</td>
+							</tr>
+							{{end}}
+						</table>
+						</details>
+					{{end}}
+				</div>
+			</div>
+			{{end}}
+		</div>
+		{{else}}
+		<p class="tw-text-center">{{ctx.Locale.Tr "admin.moderation.no_open_reports"}}</p>
+		{{end}}
+	</div>
+</div>
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/moderation/reports.tmpl b/templates/admin/moderation/reports.tmpl
new file mode 100644
index 0000000000..151a079673
--- /dev/null
+++ b/templates/admin/moderation/reports.tmpl
@@ -0,0 +1,66 @@
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}
+<div class="admin-setting-content">
+	<h4 class="ui top attached header">
+		{{ctx.Locale.Tr "admin.moderation.reports"}}
+	</h4>
+
+	<div class="ui attached segment">
+		{{if .Reports}}
+		<div class="flex-list">
+			<div class="flex-item tw-items-center">
+				<div class="flex-item-leading">
+					<span class="inline">Type</span>
+				</div>
+				<div class="flex-item-main">
+					<span class="inline">Summary</span>
+				</div>
+				<div class="flex-item-trailing">
+					<span>{{ctx.Locale.Tr "admin.moderation.reports"}}</span>
+				</div>
+			</div>
+			{{range .Reports}}
+			<div class="flex-item report" id="report-{{.ID}}">
+				<div class="flex-item-leading">
+					{{svg .ContentTypeIconName 24}}
+				</div>
+				<div class="flex-item-main">
+					<div class="flex-item-title">
+						{{if .ContentReference}}
+						<a href="{{AppSubUrl}}/{{.ContentURL}}">{{.ContentReference}}</a>
+						{{else}}
+						<em>{{ctx.Locale.Tr "admin.moderation.deleted_content_ref" .ContentType .ContentID}}</em>
+						{{end}}
+					</div>
+					<div class="flex-items-inline">
+						<span class="item tw-mr-2">
+							{{svg "octicon-calendar"}}
+							{{DateUtils.TimeSince .CreatedUnix}}
+						</span>
+						<span class="item tw-mr-2">
+							{{svg "octicon-report"}}
+							{{if .ReporterName}}<a href="{{AppSubUrl}}/{{.ReporterName}}">{{.ReporterName}}</a>{{else}}{{$.GhostUserName}}{{end}}
+						</span>
+						<span class="item ui label">
+							{{svg "octicon-tag" 12}}
+							{{ctx.Locale.Tr (index $.AbuseCategories .Category)}}
+						</span>
+					</div>
+
+					<div class="flex-item-body">
+						<span class="text truncate">{{ctx.Locale.Tr "moderation.report_remarks"}}: <em>{{.Remarks}}</em></span>
+					</div>
+				</div>
+				<a href="{{AppSubUrl}}/admin/moderation/reports/type/{{.ContentType}}/id/{{.ContentID}}">
+				<div class="flex-item-trailing">
+						<span class="tw-text-16 tw-font-semibold">{{.ReportedTimes}}</span>{{svg "octicon-report" "tw-ml-2"}}
+				</div>
+				</a>
+			</div>
+			{{end}}
+		</div>
+		{{else}}
+			<p class="tw-text-center">{{ctx.Locale.Tr "admin.moderation.no_open_reports"}}</p>
+		{{end}}
+	</div>
+</div>
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index 1ec703b296..7ca8538bce 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -108,5 +108,10 @@
 				</a>
 			</div>
 		</details>
+		{{if .EnableModeration}}
+		<a class="{{if .PageIsAdminModerationReports}}active {{end}}item" href="{{AppSubUrl}}/admin/moderation/reports">
+			{{ctx.Locale.Tr "admin.moderation.moderation_reports"}}
+		</a>
+		{{end}}
 	</div>
 </div>
diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl
index 5f9965e34c..6b6b463a6b 100644
--- a/templates/admin/packages/list.tmpl
+++ b/templates/admin/packages/list.tmpl
@@ -72,7 +72,7 @@
 							</td>
 							<td>{{ctx.Locale.TrSize .CalculateBlobSize}}</td>
 							<td>{{DateUtils.AbsoluteShort .Version.CreatedUnix}}</td>
-							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}">{{svg "octicon-trash"}}</a></td>
+							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.Version.ID}}" data-name="{{.Package.Name}}" data-data-version="{{.Version.Version}}" data-modal-id="delete-package">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{else}}
 						<tr><td class="tw-text-center" colspan="10">{{ctx.Locale.Tr "repo.pulls.no_results"}}</td></tr>
@@ -84,7 +84,7 @@
 		{{template "base/paginate" .}}
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-package">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "packages.settings.delete"}}
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index 7a75ceded7..7722bcf4eb 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -84,7 +84,7 @@
 							<td>{{ctx.Locale.TrSize .LFSSize}}</td>
 							<td>{{DateUtils.AbsoluteShort .UpdatedUnix}}</td>
 							<td>{{DateUtils.AbsoluteShort .CreatedUnix}}</td>
-							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}">{{svg "octicon-trash"}}</a></td>
+							<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Paginater.Current}}&sort={{$.SortType}}" data-id="{{.ID}}" data-name="{{.Name}}" data-modal-id="delete-repo">{{svg "octicon-trash"}}</a></td>
 						</tr>
 					{{else}}
 						<tr><td class="tw-text-center" colspan="12">{{ctx.Locale.Tr "repo.pulls.no_results"}}</td></tr>
@@ -96,7 +96,7 @@
 		{{template "base/paginate" .}}
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-repo">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.settings.delete"}}
diff --git a/templates/admin/stacktrace-row.tmpl b/templates/admin/stacktrace-row.tmpl
index 048056cf4e..cafaed277f 100644
--- a/templates/admin/stacktrace-row.tmpl
+++ b/templates/admin/stacktrace-row.tmpl
@@ -19,7 +19,7 @@
 		</div>
 		<div>
 			{{if or (eq .Process.Type "request") (eq .Process.Type "normal")}}
-				<a class="delete-button icon" href="" data-url="{{.root.Link}}/cancel/{{.Process.PID}}" data-id="{{.Process.PID}}" data-name="{{.Process.Description}}">{{svg "octicon-trash" 16 "text-red"}}</a>
+				<a class="delete-button icon" href="" data-url="{{.root.Link}}/cancel/{{.Process.PID}}" data-id="{{.Process.PID}}" data-name="{{.Process.Description}}" data-modal-id="cancel-process">{{svg "octicon-trash" 16 "text-red"}}</a>
 			{{end}}
 		</div>
 	</div>
diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl
index afe8e6942a..57c0c210cc 100644
--- a/templates/admin/stacktrace.tmpl
+++ b/templates/admin/stacktrace.tmpl
@@ -35,7 +35,7 @@
 	{{end}}
 </div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="cancel-process">
 	<div class="header">
 		{{ctx.Locale.Tr "admin.monitor.process.cancel"}}
 	</div>
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index f5c85e9290..a1ff3d4117 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -9,7 +9,7 @@
 				{{.CsrfTokenHtml}}
 				<div class="field {{if .Err_UserName}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}} maxlength="40">
+					<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal}}disabled{{end}} maxlength="40" autocorrect="off" autocapitalize="none">
 				</div>
 				<!-- Types and name -->
 				<div class="inline required field {{if .Err_LoginType}}error{{end}}">
@@ -208,6 +208,7 @@
 				<div class="inline field tw-pl-4">
 					<label for="avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label>
 					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
+					<br/><span class=help>{{ctx.Locale.Tr "avatar.constraints_hint" (ctx.Locale.TrSize .MaxAvatarFileSize) .MaxAvatarWidth .MaxAvatarHeight}}</span>
 				</div>
 
 				<div class="field">
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index b04ebc4b60..0f7f930ec0 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -53,7 +53,7 @@
 				</div>
 				<div class="required field {{if .Err_UserName}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required maxlength="40">
+					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required maxlength="40" autocorrect="off" autocapitalize="none">
 				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index fed426a469..3c2def228a 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -13,7 +13,7 @@
 
 	{{template "base/footer_content" .}}
 
-	<script src="{{AssetUrlPrefix}}/js/index.js?v={{AssetVersion}}" onerror="alert('Failed to load asset files from ' + this.src + '. Please make sure the asset files can be accessed.')"></script>
+	<script src="{{AssetUrlPrefix}}/js/index.js?v={{AssetVersion}}" onerror="alert('{{ctx.Locale.Tr "alert.asset_load_failed"}}'.replace('{path}', this.src))"></script>
 
 	{{template "custom/footer" .}}
 </body>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 7ec2ac87b3..6357981549 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -25,7 +25,7 @@
 	{{template "base/head_style" .}}
 	{{template "custom/header" .}}
 </head>
-<body hx-headers='{"x-csrf-token": "{{.CsrfToken}}"}' hx-swap="outerHTML" hx-ext="morph" hx-push-url="false">
+<body class="no-js" hx-headers='{"x-csrf-token": "{{.CsrfToken}}"}' hx-swap="outerHTML" hx-ext="morph" hx-push-url="false">
 	{{template "custom/body_outer_pre" .}}
 
 	<div class="full height">
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 0c13f9e844..dc3ca33712 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -24,7 +24,7 @@
 		</div>
 
 		<!-- navbar links non-mobile -->
-		{{if and .IsSigned .MustChangePassword}}
+		{{if and .IsSigned .HideNavbarLinks}}
 			{{/* No links */}}
 		{{else if .IsSigned}}
 			{{if not .UnitIssuesGlobalDisabled}}
@@ -54,7 +54,7 @@
 
 	<!-- the full dropdown menus -->
 	<div class="navbar-right ui secondary menu">
-		{{if and .IsSigned .MustChangePassword}}
+		{{if and .IsSigned .HideNavbarLinks}}
 			<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
 				<span class="text tw-flex tw-items-center">
 					{{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
diff --git a/templates/devtest/gitea-ui.tmpl b/templates/devtest/gitea-ui.tmpl
index 5490f71784..1c88333520 100644
--- a/templates/devtest/gitea-ui.tmpl
+++ b/templates/devtest/gitea-ui.tmpl
@@ -40,8 +40,6 @@
 					<button class="ui basic red button">Basic Red</button>
 					<button class="ui primary button">Green</button>
 					<button class="ui basic primary button">Basic Green</button>
-					<button class="ui blue button">Blue</button>
-					<button class="ui basic blue button">Basic Blue</button>
 					<button class="ui orange button">Orange</button>
 					<button class="ui basic orange button">Basic Orange</button>
 					<button class="ui yellow button">Yellow</button>
@@ -52,16 +50,10 @@
 					<p>Do not use if there is no strong requirement. Do not use grey/black buttons, they don't work well with dark theme.</p>
 					<button class="ui secondary button">Secondary</button>
 					<button class="ui basic secondary button">Basic Secondary</button>
-					<button class="ui olive button">Olive</button>
-					<button class="ui basic olive button">Basic Olive</button>
 					<button class="ui teal button">Teal</button>
 					<button class="ui basic teal button">Basic Teal</button>
-					<button class="ui violet button">Violet</button>
-					<button class="ui basic violet button">Basic Violet</button>
 					<button class="ui purple button">Purple</button>
 					<button class="ui basic purple button">Basic Purple</button>
-					<button class="ui pink button">Pink</button>
-					<button class="ui basic pink button">Basic Pink</button>
 					<button class="ui brown button">Brown</button>
 					<button class="ui basic brown button">Basic Brown</button>
 				</li>
diff --git a/templates/devtest/hashbox.tmpl b/templates/devtest/hashbox.tmpl
new file mode 100644
index 0000000000..7321c9956d
--- /dev/null
+++ b/templates/devtest/hashbox.tmpl
@@ -0,0 +1,82 @@
+{{template "base/head" .}}
+
+<div class="page-content devtest ui container">
+	<h1>Hashbox (shabox)</h1>
+
+	<h2>Unsigned</h2>
+	{{template "repo/shabox" (dict
+		"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+	)}}
+
+	<h2>Unknown signature</h2>
+	<div class="tw-flex">
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UnknownVerif
+		)}}
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UnknownVerifUnk
+		)}}
+	</div>
+
+	<h2>Trusted</h2>
+	<div class="tw-flex">
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .TrustedVerif
+		)}}
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .TrustedVerifUnk
+		)}}
+	</div>
+
+	<h2>Untrusted</h2>
+	<div class="tw-flex">
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UntrustedVerif
+		)}}
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UntrustedVerifUnk
+		)}}
+	</div>
+
+	<h2>Unmatched</h2>
+	<div class="tw-flex">
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UnmatchedVerif
+		)}}
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .UnmatchedVerifUnk
+		)}}
+	</div>
+
+	<h2>Warning</h2>
+	<div class="tw-flex">
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .WarnVerif
+		)}}
+		{{template "repo/shabox" (dict
+			"sha1" "475e3471b4e8da8776fe7e66a3390c8a30c19f08"
+			"signature" "true"
+			"verification" .WarnVerifUnk
+		)}}
+	</div>
+</div>
+
+{{template "base/footer" .}}
diff --git a/templates/devtest/list.tmpl b/templates/devtest/list.tmpl
index 90b1fcc9d0..e169311222 100644
--- a/templates/devtest/list.tmpl
+++ b/templates/devtest/list.tmpl
@@ -1,10 +1,21 @@
 {{template "base/head" .}}
 
-<ul>
-	{{range .SubNames}}
-	<li><a href="{{AppSubUrl}}/devtest/{{.}}">{{.}}</a></li>
-	{{end}}
-</ul>
+<div role="main" class="page-content ui container">
+	<ul>
+		{{range .SubNames}}
+		<li><a href="{{AppSubUrl}}/devtest/{{.}}">{{.}}</a></li>
+		{{end}}
+	</ul>
+
+	<article>
+		<h2>Error pages</h2>
+		<ul>
+			<li><a href="./error/404">Not found</a></li>
+			<li><a href="./error/413">Quota exhaustion</a></li>
+			<li><a href="./error/500">Server error</a></li>
+		</ul>
+	</article>
+</div>
 
 <style>
 ul {
diff --git a/templates/htmx/milestone_sidebar.tmpl b/templates/htmx/milestone_sidebar.tmpl
index 05bbd802cc..3898ebd058 100644
--- a/templates/htmx/milestone_sidebar.tmpl
+++ b/templates/htmx/milestone_sidebar.tmpl
@@ -1,4 +1,5 @@
+{{template "repo/issue/milestone/clear_milestone" dict "." . "UseHTMX" true}}
 <div id="insert-timeline" hx-swap-oob="beforebegin">
 	{{template "repo/issue/view_content/comments" .}}
 </div>
-{{template "repo/issue/view_content/sidebar/milestones" .}}
+{{template "repo/issue/milestone/selected" .}}
diff --git a/templates/mail/actions/now_done.tmpl b/templates/mail/actions/now_done.tmpl
new file mode 100644
index 0000000000..adc990c545
--- /dev/null
+++ b/templates/mail/actions/now_done.tmpl
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<style>
+		.footer { font-size:small; color:#666;}
+	</style>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+
+{{$repo_link := HTMLFormat "<a href='%s'>%s</a>" .Run.Repo.HTMLURL .RepoFullName}}
+{{$action_run_link := HTMLFormat "<a href='%s'>%s</a>" .Link .Run.Title}}
+{{$trigger_user_link := HTMLFormat "<a href='%s'>@%s</a>" .Run.TriggerUser.HTMLURL .Run.TriggerUser.Name}}
+<body>
+	<p>
+		{{if .IsSuccess}}
+			{{.locale.Tr "mail.actions.successful_run_after_failure" $action_run_link $repo_link}}
+		{{else}}
+			{{.locale.Tr "mail.actions.not_successful_run" $action_run_link $repo_link}}
+		{{end}}
+
+		<br />
+
+		{{.locale.Tr "mail.actions.run_info_cur_status" .Run.Status .PriorStatus}}<br />
+		{{.locale.Tr "mail.actions.run_info_sha" .CommitSHA}}<br />
+		{{if .LastRun}}
+			{{.locale.Tr "mail.actions.run_info_previous_status" .LastRun.Status}}<br />
+		{{end}}
+		{{.locale.Tr "mail.actions.run_info_trigger" .Run.TriggerEvent $trigger_user_link}}
+	</p>
+	<div class="footer">
+		<p>
+			---
+			<br>
+			<a href="{{.Link}}">{{.locale.Tr "mail.view_it_on" AppName}}</a>.
+		</p>
+	</div>
+</body>
+</html>
diff --git a/templates/mail/auth/removed_security_key.tmpl b/templates/mail/auth/removed_security_key.tmpl
index 18ae18725e..55c355f875 100644
--- a/templates/mail/auth/removed_security_key.tmpl
+++ b/templates/mail/auth/removed_security_key.tmpl
@@ -6,7 +6,7 @@
 <body>
 	<p>{{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}</p><br>
 	<p>{{.locale.Tr "mail.removed_security_key.text_1" .SecurityKeyName}}</p><br>
-	{{if and (not .HasWebAuthn) (not .HasTOTP)}}<p>{{.locale.Tr "mail.removed_security_key.no_2fa"}}</p><br>{{end}}
+	{{if (not .HasTwoFactor)}}<p>{{.locale.Tr "mail.removed_security_key.no_2fa"}}</p><br>{{end}}
 	<p>{{.locale.Tr "mail.account_security_caution.text_1"}}</p><br>
 	<p>{{.locale.Tr "mail.account_security_caution.text_2"}}</p><br>
 
diff --git a/templates/moderation/new_abuse_report.tmpl b/templates/moderation/new_abuse_report.tmpl
new file mode 100644
index 0000000000..1964e0eac1
--- /dev/null
+++ b/templates/moderation/new_abuse_report.tmpl
@@ -0,0 +1,45 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content moderation new-report">
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+				<h3 class="ui top attached header">
+					{{ctx.Locale.Tr "moderation.report_abuse_form.header"}}
+				</h3>
+				<div class="ui attached segment">
+					{{template "base/alert" .}}
+					<p class="ui center">{{ctx.Locale.Tr "moderation.report_abuse_form.details"}}</p>
+
+					<input type="hidden" name="content_id" value="{{.ContentID}}" />
+					<input type="hidden" name="content_type" value="{{.ContentType}}" />
+
+					<fieldset{{if not .ContentID}} disabled{{end}}>
+						<label{{if .Err_AbuseCategory}} class="field error"{{end}}>
+							{{ctx.Locale.Tr "moderation.abuse_category"}}
+							<select class="ui selection dropdown" id="abuse_category" name="abuse_category" required autofocus>
+								<option value="">{{ctx.Locale.Tr "moderation.abuse_category.placeholder"}}</option>
+								{{range $cat := .AbuseCategories}}
+								<option value="{{$cat.Value}}"{{if eq $.abuse_category $cat.Value}} selected{{end}}>{{ctx.Locale.Tr $cat.TranslationKey}}</option>
+								{{end}}
+							</select>
+						</label>
+						<label{{if .Err_Remarks}} class="field error"{{end}}>
+							{{ctx.Locale.Tr "moderation.report_remarks"}}
+							<textarea id="remarks" name="remarks" required minlength="20" maxlength="500" placeholder="{{ctx.Locale.Tr "moderation.report_remarks.placeholder"}}">{{.remarks}}</textarea>
+						</label>
+					</fieldset>
+
+					<div class="divider"></div>
+					<div class="text right actions">
+						<a class="ui cancel button" href="{{$.CancelLink}}">{{ctx.Locale.Tr "cancel"}}</a>
+						{{if .ContentID}}
+						<button class="ui primary button">{{ctx.Locale.Tr "moderation.submit_report"}}</button>
+						{{end}}
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index ad172ea990..74d1a421bc 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -19,15 +19,15 @@
 						<span class="inline required field"><label for="visibility">{{ctx.Locale.Tr "org.settings.visibility"}}</label></span>
 						<div class="inline-grouped-list">
 							<div class="ui radio checkbox">
-								<input class="enable-system-radio" name="visibility" type="radio" value="0" {{if .DefaultOrgVisibilityMode.IsPublic}}checked{{end}}>
+								<input class="enable-system-radio" name="visibility" type="radio" value="0" {{if .visibility.IsPublic}}checked{{end}}>
 								<label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="enable-system-radio" name="visibility" type="radio" value="1" {{if .DefaultOrgVisibilityMode.IsLimited}}checked{{end}}>
+								<input class="enable-system-radio" name="visibility" type="radio" value="1" {{if .visibility.IsLimited}}checked{{end}}>
 								<label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
 							</div>
 							<div class="ui radio checkbox">
-								<input class="enable-system-radio" name="visibility" type="radio" value="2" {{if .DefaultOrgVisibilityMode.IsPrivate}}checked{{end}}>
+								<input class="enable-system-radio" name="visibility" type="radio" value="2" {{if .visibility.IsPrivate}}checked{{end}}>
 								<label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
 							</div>
 						</div>
@@ -37,7 +37,7 @@
 						<span class="inline field"><label>{{ctx.Locale.Tr "org.settings.permission"}}</label></span>
 						<div class="inline-grouped-list">
 							<div class="ui checkbox">
-								<input type="checkbox" name="repo_admin_change_team_access" checked>
+								<input type="checkbox" name="repo_admin_change_team_access" {{if .repo_admin_change_team_access}}checked{{end}}>
 								<label>{{ctx.Locale.Tr "org.settings.repoadminchangeteam"}}</label>
 							</div>
 						</div>
diff --git a/templates/org/follow_unfollow.tmpl b/templates/org/follow_unfollow.tmpl
index ba0bd01efe..9175088da4 100644
--- a/templates/org/follow_unfollow.tmpl
+++ b/templates/org/follow_unfollow.tmpl
@@ -1,4 +1,4 @@
-<button class="ui basic button tw-mr-0" hx-post="{{.Org.HomeLink}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}">
+<button class="ui basic button" hx-post="{{.Org.HomeLink}}?action={{if $.IsFollowing}}unfollow{{else}}follow{{end}}">
 	{{if $.IsFollowing}}
 		{{ctx.Locale.Tr "user.unfollow"}}
 	{{else}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 4359b819a1..8f9a8a7043 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -1,25 +1,41 @@
-<div class="ui container tw-flex">
+<div class="ui container tw-flex tw-gap-x-4">
 	{{ctx.AvatarUtils.Avatar .Org 100 "org-avatar"}}
 	<div id="org-info" class="tw-flex tw-flex-col">
-		<div class="ui header">
+		<div class="org-header tw-flex">
 			<div class="org-title">
-				{{.Org.DisplayName}}
+				<h1>{{.Org.DisplayName}}</h1>
 				<span class="org-visibility">
 					{{if .Org.Visibility.IsLimited}}<span class="ui large horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
 					{{if .Org.Visibility.IsPrivate}}<span class="ui large horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}}
 				</span>
 			</div>
-			<span class="tw-flex tw-items-center button-row tw-ml-auto tw-text-16 tw-whitespace-nowrap">
-				{{if .EnableFeed}}
-					<a class="ui basic label button tw-mr-0" href="{{.Org.HomeLink}}.rss" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
-						{{svg "octicon-rss" 24}}
-					</a>
-				{{end}}
+			<span class="button-sequence tw-items-center tw-ml-auto tw-whitespace-nowrap">
 				{{if .IsSigned}}
 					{{template "org/follow_unfollow" .}}
 				{{end}}
 				{{if .IsOrganizationMember}}
-					<a class="ui basic button tw-mr-0" href="{{.OrgLink}}/dashboard">{{ctx.Locale.Tr "org.open_dashboard"}}</a>
+					<a class="ui basic button" href="{{.OrgLink}}/dashboard">{{ctx.Locale.Tr "org.open_dashboard"}}</a>
+				{{end}}
+				{{$moderationEntryNeeded := and .IsModerationEnabled .IsSigned (not .IsOrganizationOwner)}}
+				{{if or .EnableFeed $moderationEntryNeeded}}
+					<details class="dropdown dir-rtl">
+						<summary data-tooltip-content="{{ctx.Locale.Tr "profile.actions.tooltip"}}">{{svg "octicon-kebab-horizontal" 20}}</summary>
+						<ul>
+							{{if .EnableFeed}}
+								<li>
+									<a class="item" href="{{.Org.HomeLink}}.rss">{{svg "octicon-rss"}}{{ctx.Locale.Tr "rss_feed"}}</a>
+								</li>
+								<li>
+									<a class="item" href="{{.Org.HomeLink}}.atom">{{svg "octicon-rss"}}{{ctx.Locale.Tr "feed.atom.link"}}</a>
+								</li>
+							{{end}}
+							{{if $moderationEntryNeeded}}
+								<li>
+									<a class="item orange text" href="{{AppSubUrl}}/report_abuse?type=org&id={{$.Org.ID}}">{{svg "octicon-stop"}}{{ctx.Locale.Tr "moderation.report_abuse"}}</a>
+								</li>
+							{{end}}
+						</ul>
+					</details>
 				{{end}}
 			</span>
 		</div>
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index e1ef471e34..5c07f99879 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -14,14 +14,14 @@
 							<label for="org_name">{{ctx.Locale.Tr "org.org_name_holder"}}</label>
 							<input id="org_name" name="org_name" value="" autocomplete="off" autofocus required>
 						</div>
-						<button class="ui red button delete-button" data-type="form" data-form="#delete-form">
+						<button class="ui red button delete-button" data-type="form" data-form="#delete-form" data-modal-id="delete-org">
 							{{ctx.Locale.Tr "org.settings.confirm_delete_account"}}
 						</button>
 					</form>
 				</div>
 			</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-org">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "org.settings.delete_org_title"}}
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 2ef7031aef..562f3f3ae3 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -94,6 +94,7 @@
 						<div class="inline field">
 							<label for="avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label>
 							<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
+							<br/><span class=help>{{ctx.Locale.Tr "avatar.constraints_hint" (ctx.Locale.TrSize .MaxAvatarFileSize) .MaxAvatarWidth .MaxAvatarHeight}}</span>
 						</div>
 
 						<div class="field">
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index ed9cb9893a..5c29b9a293 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -124,7 +124,7 @@
 							{{else}}
 								<button class="ui primary button">{{ctx.Locale.Tr "org.teams.update_settings"}}</button>
 								{{if not (eq .Team.LowerName "owners")}}
-									<button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.Team.Name | PathEscape}}/delete">{{ctx.Locale.Tr "org.teams.delete_team"}}</button>
+									<button class="ui red button delete-button" data-url="{{.OrgLink}}/teams/{{.Team.Name | PathEscape}}/delete" data-modal-id="delete-team">{{ctx.Locale.Tr "org.teams.delete_team"}}</button>
 								{{end}}
 							{{end}}
 						</div>
@@ -135,7 +135,7 @@
 	</div>
 </div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-team">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "org.teams.delete_team_title"}}
diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl
index c9f80259e2..faf0c336a0 100644
--- a/templates/org/team/sidebar.tmpl
+++ b/templates/org/team/sidebar.tmpl
@@ -42,11 +42,8 @@
 						<li>{{ctx.Locale.Tr "org.teams.can_create_org_repo"}}</li>
 					{{end}}
 				</ul>
-				{{if (eq .Team.AccessMode 2)}}
-					<h3>{{ctx.Locale.Tr "org.settings.permission"}}</h3>
-					{{ctx.Locale.Tr "org.teams.write_permission_desc"}}
-				{{else if (eq .Team.AccessMode 3)}}
-					<h3>{{ctx.Locale.Tr "org.settings.permission"}}</h3>
+				<h3>{{ctx.Locale.Tr "org.settings.permission"}}</h3>
+				{{if (eq .Team.AccessMode 3)}}
 					{{ctx.Locale.Tr "org.teams.admin_permission_desc"}}
 				{{else}}
 					<table class="ui table">
diff --git a/templates/package/content/alt.tmpl b/templates/package/content/alt.tmpl
index 9a5e9c7656..0a5c328e6d 100644
--- a/templates/package/content/alt.tmpl
+++ b/templates/package/content/alt.tmpl
@@ -24,7 +24,7 @@ apt-get install {{$.PackageDescriptor.Package.Name}}</code></pre>
 				</div>
 			</div>
 			<div class="field">
-				<label>{{ctx.Locale.Tr "packages.registry.documentation" "ALT" "https://docs.gitea.com/usage/packages/alt/"}}</label>
+				<label>{{ctx.Locale.Tr "packages.registry.documentation" "ALT" "https://forgejo.org/docs/latest/user/packages/alt/"}}</label>
 			</div>
 		</div>
 	</div>
diff --git a/templates/package/shared/cargo.tmpl b/templates/package/shared/cargo.tmpl
index 5b0f63965d..8e158d60d8 100644
--- a/templates/package/shared/cargo.tmpl
+++ b/templates/package/shared/cargo.tmpl
@@ -3,25 +3,25 @@
 </h4>
 <div class="ui attached segment">
 	<div class="ui form">
-		{{if .CargoIndexExists}}
 		<div class="field">
-			<label>{{ctx.Locale.Tr "packages.owner.settings.cargo.rebuild.description"}}</label>
+			<label>{{ctx.Locale.Tr "packages.registry.documentation" "Cargo" "https://forgejo.org/docs/latest/user/packages/cargo/"}}</label>
 		</div>
+		{{if .CargoIndexExists}}
 		<form class="field" action="{{.Link}}/cargo/rebuild" method="post">
 			{{.CsrfTokenHtml}}
 			<button class="ui primary button">{{ctx.Locale.Tr "packages.owner.settings.cargo.rebuild"}}</button>
 		</form>
-		{{else}}
 		<div class="field">
-			<label>{{ctx.Locale.Tr "packages.owner.settings.cargo.initialize.description"}}</label>
+			<label>{{ctx.Locale.Tr "packages.owner.settings.cargo.rebuild.description"}}</label>
 		</div>
+		{{else}}
 		<form class="field" action="{{.Link}}/cargo/initialize" method="post">
 			{{.CsrfTokenHtml}}
 			<button class="ui primary button">{{ctx.Locale.Tr "packages.owner.settings.cargo.initialize"}}</button>
 		</form>
-		{{end}}
 		<div class="field">
-			<label>{{ctx.Locale.Tr "packages.registry.documentation" "Cargo" "https://forgejo.org/docs/latest/user/packages/cargo/"}}</label>
+			<label>{{ctx.Locale.Tr "packages.owner.settings.cargo.initialize.description"}}</label>
 		</div>
+		{{end}}
 	</div>
 </div>
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl
index 8c9b7c6e6f..b97713ec12 100644
--- a/templates/projects/list.tmpl
+++ b/templates/projects/list.tmpl
@@ -66,7 +66,7 @@
 					{{else}}
 						<a class="link-action flex-text-inline" href data-url="{{.Link ctx}}/close">{{svg "octicon-skip" 14}}{{ctx.Locale.Tr "repo.projects.close"}}</a>
 					{{end}}
-					<a class="delete-button flex-text-inline" href="#" data-url="{{.Link ctx}}/delete">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
+					<a class="delete-button flex-text-inline" href="#" data-url="{{.Link ctx}}/delete" data-modal-id="delete-project">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
 				</div>
 				{{end}}
 			</div>
@@ -82,7 +82,7 @@
 </div>
 
 {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-project">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.projects.deletion"}}
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
index 0e2fc87958..e1141a398c 100644
--- a/templates/projects/view.tmpl
+++ b/templates/projects/view.tmpl
@@ -20,7 +20,7 @@
 						{{ctx.Locale.Tr "repo.projects.close"}}
 					</button>
 				{{end}}
-				<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
+				<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}" data-modal-id="delete-project">
 					{{svg "octicon-trash"}}
 					{{ctx.Locale.Tr "repo.issues.label_delete"}}
 				</button>
@@ -167,7 +167,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-	<div class="ui g-modal-confirm delete modal">
+	<div class="ui g-modal-confirm delete modal" id="delete-project">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{ctx.Locale.Tr "repo.projects.deletion"}}
diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl
index 263530f9a7..d973e6f3b2 100644
--- a/templates/repo/actions/list.tmpl
+++ b/templates/repo/actions/list.tmpl
@@ -4,89 +4,38 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 
-		{{if .HasWorkflowsOrRuns}}
-		<div class="ui stackable grid">
-			<div class="four wide column">
-				<div class="ui fluid vertical menu">
-					<a class="item{{if not $.CurWorkflow}} active{{end}}" href="?actor={{$.CurActor}}&status={{$.CurStatus}}">{{ctx.Locale.Tr "actions.runs.all_workflows"}}</a>
-					{{range .workflows}}
-						<a class="item{{if eq .Entry.Name $.CurWorkflow}} active{{end}}" href="?workflow={{.Entry.Name}}&actor={{$.CurActor}}&status={{$.CurStatus}}">{{.Entry.Name}}
-							{{if .ErrMsg}}
-								<span data-tooltip-content="{{.ErrMsg}}">
-									{{svg "octicon-alert" 16 "text red"}}
-								</span>
-							{{end}}
-
-							{{if $.ActionsConfig.IsWorkflowDisabled .Entry.Name}}
-								<div class="ui red label">{{ctx.Locale.Tr "disabled"}}</div>
-							{{end}}
-						</a>
-					{{end}}
-				</div>
-			</div>
-			<div class="twelve wide column content">
-				<div class="ui secondary filter menu tw-justify-end tw-flex tw-items-center">
-					<!-- Actor -->
-					<div class="ui{{if not .Actors}} disabled{{end}} dropdown jump item">
-						<span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							<div class="ui icon search input">
-								<i class="icon">{{svg "octicon-search"}}</i>
-								<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.actor"}}">
-							</div>
-							<a class="item{{if not $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&status={{$.CurStatus}}&actor=0">
-								{{ctx.Locale.Tr "actions.runs.actors_no_select"}}
-							</a>
-							{{range .Actors}}
-								<a class="item{{if eq .ID $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{.ID}}&status={{$.CurStatus}}">
-									{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
-								</a>
-							{{end}}
-						</div>
-					</div>
-					<!-- Status -->
-					<div class="ui dropdown jump item">
-						<span class="text">{{ctx.Locale.Tr "actions.runs.status"}}</span>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						<div class="menu">
-							<div class="ui icon search input">
-								<i class="icon">{{svg "octicon-search"}}</i>
-								<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.status"}}">
-							</div>
-							<a class="item{{if not $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status=0">
-								{{ctx.Locale.Tr "actions.runs.status_no_select"}}
-							</a>
-							{{range .StatusInfoList}}
-								<a class="item{{if eq .Status $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{.Status}}">
-									{{.DisplayedStatus}}
-								</a>
-							{{end}}
-						</div>
-					</div>
-
-					{{if .AllowDisableOrEnableWorkflow}}
-						<button class="ui jump dropdown btn interact-bg tw-p-2">
-							{{svg "octicon-kebab-horizontal"}}
-							<div class="menu">
-								<a class="item link-action" data-url="{{$.Link}}/{{if .CurWorkflowDisabled}}enable{{else}}disable{{end}}?workflow={{$.CurWorkflow}}&actor={{.CurActor}}&status={{$.CurStatus}}">
-									{{if .CurWorkflowDisabled}}{{ctx.Locale.Tr "actions.workflow.enable"}}{{else}}{{ctx.Locale.Tr "actions.workflow.disable"}}{{end}}
-								</a>
-							</div>
-						</button>
-					{{end}}
-				</div>
-
-				{{if $.CurWorkflowDispatch}}
-					{{template "repo/actions/dispatch" .}}
-				{{end}}
-
-				{{template "repo/actions/runs_list" .}}
-			</div>
+		{{/* Refresh the list every interval (30s) unless the document isn't visible or a dropdown is open; refresh
+		if visibility changes as well. simulate-polling-interval is a custom event used for e2e tests to mimic
+		the polling interval and should be defined identically to the `every` clause for accurate testing. */}}
+		<div
+			hx-get="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{$.CurStatus}}&page={{$.Page.Paginater.Current}}&list_inner=true"
+			hx-swap="morph:innerHTML"
+			hx-trigger="every 30s [pollingOk()], visibilitychange[document.visibilityState === 'visible'] from:document, simulate-polling-interval[pollingOk()] from:document"
+			hx-indicator="#reloading-indicator">
+			{{template "repo/actions/list_inner" .}}
 		</div>
-		{{else}}
-			{{template "repo/actions/no_workflows" .}}
-		{{end}}
 	</div>
 </div>
+
+<script type="text/javascript">
+
+function pollingOk() {
+	return document.visibilityState === 'visible' && noActiveDropdowns();
+}
+
+// Intent: If the "Actor" or "Status" dropdowns are currently open and being navigated, or the workflow dispatch
+// dropdown form is open, the htmx refresh would replace them with closed dropdowns.  Instead this prevents the list
+// refresh from occurring while those dropdowns are open.
+//
+// Can't inline this into the `hx-trigger` above because using a left-brace ('[') breaks htmx's trigger parsing.
+function noActiveDropdowns() {
+	if (document.querySelector('[aria-expanded=true]') !== null)
+		return false;
+	const dropdownForm = document.querySelector('#branch-dropdown-form');
+	if (dropdownForm !== null && dropdownForm.checkVisibility())
+		return false;
+	return true;
+}
+</script>
+
 {{template "base/footer" .}}
diff --git a/templates/repo/actions/list_inner.tmpl b/templates/repo/actions/list_inner.tmpl
new file mode 100644
index 0000000000..088d7d8454
--- /dev/null
+++ b/templates/repo/actions/list_inner.tmpl
@@ -0,0 +1,85 @@
+{{if .HasWorkflowsOrRuns}}
+<div class="ui stackable grid">
+	<div class="four wide column">
+		<div class="ui fluid vertical menu">
+			<a class="item{{if not $.CurWorkflow}} active{{end}}" href="?actor={{$.CurActor}}&status={{$.CurStatus}}">{{ctx.Locale.Tr "actions.runs.all_workflows"}}</a>
+			{{range .workflows}}
+				<a class="item{{if eq .Entry.Name $.CurWorkflow}} active{{end}}" href="?workflow={{.Entry.Name}}&actor={{$.CurActor}}&status={{$.CurStatus}}">{{.Entry.Name}}
+					{{if .ErrMsg}}
+						<span data-tooltip-content="{{.ErrMsg}}">
+							{{svg "octicon-alert" 16 "text red"}}
+						</span>
+					{{end}}
+
+					{{if $.ActionsConfig.IsWorkflowDisabled .Entry.Name}}
+						<div class="ui red label">{{ctx.Locale.Tr "disabled"}}</div>
+					{{end}}
+				</a>
+			{{end}}
+		</div>
+	</div>
+	<div class="twelve wide column content">
+		<div class="ui secondary filter menu tw-justify-end tw-flex tw-items-center">
+			<div id="reloading-indicator" class="htmx-indicator"></div>
+
+			<!-- Actor -->
+			<div id="actor_dropdown" class="ui{{if not .Actors}} disabled{{end}} dropdown jump item">
+				<span class="text">{{ctx.Locale.Tr "actions.runs.actor"}}</span>
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+				<div class="menu">
+					<div class="ui icon search input">
+						<i class="icon">{{svg "octicon-search"}}</i>
+						<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.actor"}}">
+					</div>
+					<a class="item{{if not $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&status={{$.CurStatus}}&actor=0">
+						{{ctx.Locale.Tr "actions.runs.actors_no_select"}}
+					</a>
+					{{range .Actors}}
+						<a class="item{{if eq .ID $.CurActor}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{.ID}}&status={{$.CurStatus}}">
+							{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
+						</a>
+					{{end}}
+				</div>
+			</div>
+			<!-- Status -->
+			<div id="status_dropdown" class="ui dropdown jump item">
+				<span class="text">{{ctx.Locale.Tr "actions.runs.status"}}</span>
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+				<div class="menu">
+					<div class="ui icon search input">
+						<i class="icon">{{svg "octicon-search"}}</i>
+						<input type="text" placeholder="{{ctx.Locale.Tr "actions.runs.status"}}">
+					</div>
+					<a class="item{{if not $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status=0">
+						{{ctx.Locale.Tr "actions.runs.status_no_select"}}
+					</a>
+					{{range .StatusInfoList}}
+						<a class="item{{if eq .Status $.CurStatus}} active{{end}}" href="?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{.Status}}">
+							{{.DisplayedStatus}}
+						</a>
+					{{end}}
+				</div>
+			</div>
+
+			{{if .AllowDisableOrEnableWorkflow}}
+				<button class="ui jump dropdown btn interact-bg tw-p-2">
+					{{svg "octicon-kebab-horizontal"}}
+					<div class="menu">
+						<a class="item link-action" data-url="{{$.Link}}/{{if .CurWorkflowDisabled}}enable{{else}}disable{{end}}?workflow={{$.CurWorkflow}}&actor={{.CurActor}}&status={{$.CurStatus}}">
+							{{if .CurWorkflowDisabled}}{{ctx.Locale.Tr "actions.workflow.enable"}}{{else}}{{ctx.Locale.Tr "actions.workflow.disable"}}{{end}}
+						</a>
+					</div>
+				</button>
+			{{end}}
+		</div>
+
+		{{if $.CurWorkflowDispatch}}
+			{{template "repo/actions/dispatch" .}}
+		{{end}}
+
+		{{template "repo/actions/runs_list" .}}
+	</div>
+</div>
+{{else}}
+	{{template "repo/actions/no_workflows" .}}
+{{end}}
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index c60017ba87..82d4495ebc 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -30,7 +30,7 @@
 								<p class="info tw-flex tw-items-center tw-my-1">{{svg "octicon-git-commit" 16 "tw-mr-1"}}<a href="{{.RepoLink}}/commit/{{PathEscape .DefaultBranchBranch.DBBranch.CommitID}}">{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}}</a> · <span class="commit-message">{{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}}</span> · {{ctx.Locale.Tr "org.repo_updated" (DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime)}}{{if .DefaultBranchBranch.DBBranch.Pusher}} &nbsp;{{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}</p>
 							</td>
 							<td class="right aligned middle aligned overflow-visible">
-								{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
+								{{if and $.IsWriter (not $.Repository.IsArchived) (not $.Repository.IsMirror) (not .IsDeleted)}}
 									<button class="btn interact-bg show-create-branch-modal tw-p-2"
 										data-modal="#create-branch-modal"
 										data-branch-from="{{$.DefaultBranchBranch.DBBranch.Name}}"
@@ -121,7 +121,11 @@
 								{{end}}
 							</td>
 							<td class="two wide right aligned">
-								{{if not .LatestPullRequest}}
+								{{if not ($.Permission.CanRead $.UnitTypePullRequests)}}
+									<a href="{{$.RepoLink}}/compare/{{PathEscapeSegments $.DefaultBranchBranch.DBBranch.Name}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{PathEscape $.Owner.Name}}:{{end}}{{PathEscapeSegments .DBBranch.Name}}">
+										<button class="ui compact basic button tw-mr-0">{{ctx.Locale.Tr "compare.branches.title"}}</button>
+									</a>
+								{{else if not .LatestPullRequest}}
 									{{if .IsIncluded}}
 										<span class="ui orange large label" data-tooltip-content="{{ctx.Locale.Tr "repo.branch.included_desc"}}">
 											{{svg "octicon-git-pull-request"}} {{ctx.Locale.Tr "repo.branch.included"}}
@@ -151,7 +155,7 @@
 								{{end}}
 							</td>
 							<td class="three wide right aligned overflow-visible">
-								{{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}}
+								{{if and $.IsWriter (not $.Repository.IsArchived) (not $.Repository.IsMirror) (not .DBBranch.IsDeleted)}}
 									<button class="btn interact-bg tw-p-2 show-modal show-create-branch-modal"
 										data-branch-from="{{.DBBranch.Name}}"
 										data-branch-from-urlcomponent="{{PathEscapeSegments .DBBranch.Name}}"
@@ -191,7 +195,7 @@
 											</span>
 										</button>
 									{{else}}
-										<button class="btn interact-bg tw-p-2 delete-button delete-branch-button" data-url="{{$.Link}}/delete?name={{.DBBranch.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{ctx.Locale.Tr "repo.branch.delete" (.DBBranch.Name)}}" data-name="{{.DBBranch.Name}}">
+										<button class="btn interact-bg tw-p-2 delete-button delete-branch-button" data-url="{{$.Link}}/delete?name={{.DBBranch.Name}}&page={{$.Page.Paginater.Current}}" data-tooltip-content="{{ctx.Locale.Tr "repo.branch.delete" (.DBBranch.Name)}}" data-name="{{.DBBranch.Name}}" data-modal-id="delete-branch">
 											{{svg "octicon-trash"}}
 										</button>
 									{{end}}
@@ -206,7 +210,7 @@
 	</div>
 </div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-branch">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.branch.delete_html"}} <span class="name"></span>
diff --git a/templates/repo/code/fork_sync_message.tmpl b/templates/repo/code/fork_sync_message.tmpl
new file mode 100644
index 0000000000..b09d7b138e
--- /dev/null
+++ b/templates/repo/code/fork_sync_message.tmpl
@@ -0,0 +1,15 @@
+{{if .CanSyncFork}}
+	<div class="ui positive message tw-flex tw-items-center" id="sync_fork_msg">
+		<div class="tw-flex-1">
+			{{$baseBranchHTML := HTMLFormat "<a href='%s'>%s:%s</a>" .BaseBranchLink .Repository.BaseRepo.FullName .BranchName}}
+			{{ctx.Locale.TrN .ForkCommitsBehind "repo.sync_fork.branch_behind_one" "repo.sync_fork.branch_behind_few" .ForkCommitsBehind $baseBranchHTML}}
+		</div>
+		<form method="post" action="{{.RepoLink}}/sync_fork">
+			{{.CsrfTokenHtml}}
+			<input type="hidden" name="branch" value="{{.BranchName}}">
+			<button class="ui compact positive button tw-m-0">
+				{{ctx.Locale.Tr "repo.sync_fork.button"}}
+			</button>
+		</form>
+	</div>
+{{end}}
diff --git a/templates/repo/commit_header.tmpl b/templates/repo/commit_header.tmpl
new file mode 100644
index 0000000000..f0c094c9bd
--- /dev/null
+++ b/templates/repo/commit_header.tmpl
@@ -0,0 +1,355 @@
+{{$class := ""}}
+{{if .Commit.Signature}}
+	{{$class = (print $class " isSigned")}}
+	{{if .Verification.Verified}}
+		{{if eq .Verification.TrustStatus "trusted"}}
+			{{$class = (print $class " isVerified")}}
+		{{else if eq .Verification.TrustStatus "untrusted"}}
+			{{$class = (print $class " isVerifiedUntrusted")}}
+		{{else}}
+			{{$class = (print $class " isVerifiedUnmatched")}}
+		{{end}}
+	{{else if .Verification.Warning}}
+		{{$class = (print $class " isWarning")}}
+	{{end}}
+{{end}}
+<div class="ui top attached header clearing segment tw-relative commit-header {{$class}}">
+	<div class="tw-flex tw-mb-4 tw-gap-1 max-sm:tw-flex-col">
+		<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
+		<div class="commit-header-buttons">
+			{{if .PageIsPullFiles}}
+				<div class="ui buttons">
+					<a class="ui small button {{if .PrevCommitLink}}" href="{{.PrevCommitLink}}"{{else}}disabled"{{end}}>
+						{{svg "octicon-chevron-left"}} {{ctx.Locale.Tr "repo.diff.commit.previous-short"}}
+					</a>
+					<a class="ui small button {{if .NextCommitLink}}" href="{{.NextCommitLink}}"{{else}}disabled"{{end}}>
+						{{ctx.Locale.Tr "repo.diff.commit.next-short"}} {{svg "octicon-chevron-right"}}
+					</a>
+				</div>
+			{{else if not $.PageIsWiki}}
+				<a class="ui primary tiny button" href="{{.SourcePath}}">
+					{{ctx.Locale.Tr "repo.diff.browse_source"}}
+				</a>
+				{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}}
+					<div class="ui dropdown primary tiny button">
+						{{ctx.Locale.Tr "repo.commit.operations"}}
+						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						<div class="menu">
+							<div class="ui header">{{ctx.Locale.Tr "repo.commit.operations"}}</div>
+							<div class="divider"></div>
+							<div class="item show-create-branch-modal"
+								data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
+								data-branch-from="{{ShortSha .CommitID}}"
+								data-branch-from-urlcomponent="{{.CommitID}}"
+								data-modal="#create-branch-modal">
+								{{ctx.Locale.Tr "repo.branch.create_branch_operation"}}
+							</div>
+							<div class="item show-create-branch-modal"
+								data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
+								data-branch-from="{{ShortSha .CommitID}}"
+								data-branch-from-urlcomponent="{{.CommitID}}"
+								data-modal="#create-tag-modal"
+								data-modal-from-span="#modal-create-tag-from-span"
+								data-modal-form="#create-tag-form">
+								{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
+							</div>
+							<div class="item show-modal revert-button"
+								data-modal="#cherry-pick-modal"
+								data-modal-cherry-pick-type="revert"
+								data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.revert-header" (ShortSha .CommitID)}}"
+								data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.revert-content"}}"
+								data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.revert"}}">{{ctx.Locale.Tr "repo.commit.revert"}}</div>
+							<div class="item cherry-pick-button show-modal"
+								data-modal="#cherry-pick-modal"
+								data-modal-cherry-pick-type="cherry-pick"
+								data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
+								data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.cherry-pick-content"}}"
+								data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.cherry-pick"}}">{{ctx.Locale.Tr "repo.commit.cherry-pick"}}</div>
+							<div class="ui g-modal-confirm modal" id="cherry-pick-modal">
+								<div class="header">
+									<span id="cherry-pick-header"></span>
+								</div>
+								<div class="content">
+									<p id="cherry-pick-content" class="branch-dropdown"></p>
+									{{template "repo/branch_dropdown" dict "root" .
+										"noTag" true "disableCreateBranch" true
+										"branchForm" "branch-dropdown-form"
+										"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
+										"setAction" true "submitForm" true}}
+									<form method="get" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{PathEscapeSegments $.Repository.DefaultBranch}}" id="branch-dropdown-form">
+										<input type="hidden" name="ref" value="{{$.Repository.DefaultBranch}}">
+										<input type="hidden" name="refType" value="branch">
+										<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br>
+										<button type="submit" id="cherry-pick-submit" class="ui primary button"></button>
+									</form>
+								</div>
+							</div>
+							<div class="ui small modal" id="create-branch-modal">
+								<div class="header">
+									{{ctx.Locale.Tr "repo.branch.new_branch"}}
+								</div>
+								<div class="content">
+									<form class="ui form" id="create-branch-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
+										{{.CsrfTokenHtml}}
+										<div class="field">
+											<label>
+												{{ctx.Locale.Tr "repo.branch.new_branch_from" (`<span class="text" id="modal-create-branch-from-span"></span>`|SafeHTML)}}
+											</label>
+										</div>
+										<div class="required field">
+											<label for="new_branch_name">{{ctx.Locale.Tr "repo.branch.name"}}</label>
+											<input id="new_branch_name" name="new_branch_name" required>
+										</div>
+
+										<div class="text right actions">
+											<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+											<button class="ui primary button">{{ctx.Locale.Tr "repo.branch.confirm_create_branch"}}</button>
+										</div>
+									</form>
+								</div>
+							</div>
+							<div class="ui small modal" id="create-tag-modal">
+								<div class="header">
+									{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
+								</div>
+								<div class="content">
+									<form class="ui form" id="create-tag-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
+										{{.CsrfTokenHtml}}
+										<input type="hidden" name="create_tag" value="true">
+										<div class="field">
+											<label>
+												{{ctx.Locale.Tr "repo.tag.create_tag_from" (`<span class="text" id="modal-create-tag-from-span"></span>`|SafeHTML)}}
+											</label>
+										</div>
+										<div class="required field">
+											<label for="new_branch_name">{{ctx.Locale.Tr "repo.release.tag_name"}}</label>
+											<input id="new_branch_name" name="new_branch_name" required>
+										</div>
+
+										<div class="text right actions">
+											<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+											<button class="ui primary button">{{ctx.Locale.Tr "repo.tag.confirm_create_tag"}}</button>
+										</div>
+									</form>
+								</div>
+							</div>
+							{{if not .NoteRendered}}
+								<div id="commit-notes-add-button" class="item">
+									{{ctx.Locale.Tr "repo.diff.git-notes.add"}}
+								</div>
+							{{end}}
+						</div>
+					</div>
+				{{end}}
+			{{end}}
+		</div>
+	</div>
+	{{if IsMultilineCommitMessage .Commit.Message}}
+		<pre class="commit-body">{{RenderCommitBody $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</pre>
+	{{end}}
+	{{template "repo/commit_load_branches_and_tags" .}}
+</div>
+<div class="ui attached segment tw-flex tw-items-center tw-justify-between tw-py-1 commit-header-row tw-flex-wrap {{$class}}">
+		<div class="tw-flex tw-items-center author">
+			{{if .Author}}
+				{{ctx.AvatarUtils.Avatar .Author 28 "tw-mr-2"}}
+				{{if .Author.FullName}}
+					<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
+				{{else}}
+					<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
+				{{end}}
+			{{else}}
+				{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "tw-mr-2"}}
+				<strong>{{.Commit.Author.Name}}</strong>
+			{{end}}
+			<span class="text grey tw-ml-2" id="authored-time">{{DateUtils.TimeSince .Commit.Author.When}}</span>
+			{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
+				<span class="tw-ml-2">•</span>
+				<span class="text grey tw-mx-2">{{ctx.Locale.Tr "repo.diff.committed_by"}}</span>
+				{{if ne .Verification.CommittingUser.ID 0}}
+					{{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mr-2"}}
+					<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a>
+				{{else}}
+					{{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "tw-mr-2"}}
+					<strong>{{.Commit.Committer.Name}}</strong>
+				{{end}}
+			{{end}}
+		</div>
+		<div class="tw-flex tw-items-center">
+			{{if .Parents}}
+				<div>
+					<span>{{ctx.Locale.Tr "repo.diff.parent"}}</span>
+					{{range .Parents}}
+						{{if $.PageIsWiki}}
+							<a class="primary sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">
+								<span class="shortsha">{{ShortSha .}}</span>
+							</a>
+						{{else}}
+							<a class="primary sha label" href="{{$.RepoLink}}/commit/{{PathEscape .}}">
+								<span class="shortsha">{{ShortSha .}}</span>
+							</a>
+						{{end}}
+					{{end}}
+				</div>
+			{{end}}
+			<div class="item">
+				<span>{{ctx.Locale.Tr "repo.diff.commit"}}</span>
+				{{if .PageIsPullFiles}}
+					{{$commitShaLink := (printf "%s/commit/%s" $.RepoLink (PathEscape .CommitID))}}
+					<a href="{{$commitShaLink}}" class="ui primary sha label">
+						<span class="shortsha">{{ShortSha .CommitID}}</span>
+					</a>
+				{{else}}
+					<span class="primary sha label">
+						<span class="shortsha">{{ShortSha .CommitID}}</span>
+					</span>
+				{{end}}
+			</div>
+		</div>
+</div>
+{{if .Commit.Signature}}
+	<div class="ui bottom attached message tw-text-left tw-flex tw-items-center tw-justify-between commit-header-row tw-flex-wrap tw-mb-0 {{$class}}">
+		<div class="tw-flex tw-items-center">
+			{{if .Verification.Verified}}
+				{{if ne .Verification.SigningUser.ID 0}}
+					{{svg "gitea-lock" 16 "tw-mr-2"}}
+					{{if eq .Verification.TrustStatus "trusted"}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
+					{{else if eq .Verification.TrustStatus "untrusted"}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}:</span>
+					{{else}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
+					{{end}}
+					{{ctx.AvatarUtils.Avatar .Verification.SigningUser 28 "tw-mr-2"}}
+					<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
+				{{else}}
+					<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "tw-mr-2"}}</span>
+					<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
+					{{ctx.AvatarUtils.AvatarByEmail .Verification.SigningEmail "" 28 "tw-mr-2"}}
+					<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
+				{{end}}
+			{{else}}
+				{{svg "gitea-unlock" 16 "tw-mr-2"}}
+				<span class="ui text">{{ctx.Locale.Tr .Verification.Reason}}</span>
+			{{end}}
+		</div>
+		<div class="tw-flex tw-items-center">
+			{{if .Verification.Verified}}
+				{{svg "octicon-verified" 16 "tw-mr-2"}}
+				{{if ne .Verification.SigningUser.ID 0}}
+					{{if .Verification.SigningSSHKey}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
+						{{.Verification.SigningSSHKey.Fingerprint}}
+					{{else}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
+						{{.Verification.SigningKey.PaddedKeyID}}
+					{{end}}
+				{{else}}
+					{{if .Verification.SigningSSHKey}}
+						<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
+						{{.Verification.SigningSSHKey.Fingerprint}}
+					{{else}}
+						<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
+						{{.Verification.SigningKey.PaddedKeyID}}
+					{{end}}
+				{{end}}
+			{{else if .Verification.Warning}}
+				{{svg "octicon-unverified" 16 "tw-mr-2"}}
+				{{if .Verification.SigningSSHKey}}
+					<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
+					{{.Verification.SigningSSHKey.Fingerprint}}
+				{{else}}
+					<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
+					{{.Verification.SigningKey.PaddedKeyID}}
+				{{end}}
+			{{else}}
+				{{if .Verification.SigningKey}}
+					{{if ne .Verification.SigningKey.KeyID ""}}
+						{{svg "octicon-verified" 16 "tw-mr-2"}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
+						{{.Verification.SigningKey.PaddedKeyID}}
+					{{end}}
+				{{end}}
+				{{if .Verification.SigningSSHKey}}
+					{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
+						{{svg "octicon-verified" 16 "tw-mr-2"}}
+						<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
+						{{.Verification.SigningSSHKey.Fingerprint}}
+					{{end}}
+				{{end}}
+			{{end}}
+		</div>
+	</div>
+{{end}}
+{{if .NoteRendered}}
+	<div class="ui top attached header segment git-notes tw-flex tw-gap-1 tw-flex-wrap">
+		{{svg "octicon-note" 16 "tw-mr-2"}}
+		{{ctx.Locale.Tr "repo.diff.git-notes"}}:
+		{{if .NoteAuthor}}
+			<a href="{{.NoteAuthor.HomeLink}}">
+				{{if .NoteAuthor.FullName}}
+					<strong>{{.NoteAuthor.FullName}}</strong>
+				{{else}}
+					<strong>{{.NoteCommit.Author.Name}}</strong>
+				{{end}}
+			</a>
+		{{else}}
+			<strong>{{.NoteCommit.Author.Name}}</strong>
+		{{end}}
+		<span class="text grey tw-flex-1" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span>
+		{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
+			<div class="ui tw-flex tw-items-center">
+				<button id="commit-notes-edit-button" class="ui tiny primary button tw-py-[6px] tw-px-[10px]">{{ctx.Locale.Tr "edit"}}</button>
+				<button class="ui tiny button red show-modal tw-py-[6px] tw-px-[10px]" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button>
+			</div>
+			<div class="ui small modal" id="delete-note-modal">
+				<div class="header">
+					{{ctx.Locale.Tr "repo.diff.git-notes.remove-header"}}
+				</div>
+				<div class="content">
+					<p>{{ctx.Locale.Tr "repo.diff.git-notes.remove-body"}}</p>
+					<div class="text right actions">
+						<form action="{{.Link}}/notes/remove" method="post">
+							{{.CsrfTokenHtml}}
+							<button type="button" class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
+							<button type="submit" class="ui red button" href="{{.Link}}/notes/remove">{{ctx.Locale.Tr "remove"}}</button>
+						</form>
+					</div>
+				</div>
+			</div>
+		{{end}}
+	</div>
+	<div id="commit-notes-display-area" class="ui bottom attached info segment git-notes">
+		<pre class="commit-body">{{.NoteRendered | SanitizeHTML}}</pre>
+	</div>
+	{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
+		<div id="commit-notes-edit-area" class="ui bottom attached info segment git-notes tw-hidden">
+			<form class="ui form" action="{{.Link}}/notes" method="post">
+				{{.CsrfTokenHtml}}
+
+				<div class="field">
+					<textarea name="notes">{{.NoteRendered | SanitizeHTML}}</textarea>
+				</div>
+
+				<div class="field">
+					<button id="notes-save-button" class="ui primary button">{{ctx.Locale.Tr "save"}}</button>
+				</div>
+			</form>
+		</div>
+	{{end}}
+{{else if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
+	<div id="commit-notes-add-area" class="ui tw-mt-3 segment tw-hidden">
+		<form class="ui form" action="{{.Link}}/notes" method="post">
+			{{.CsrfTokenHtml}}
+
+			<div class="field">
+				<textarea name="notes"></textarea>
+			</div>
+
+			<div class="field">
+				<button class="ui primary button">{{ctx.Locale.Tr "add"}}</button>
+			</div>
+		</form>
+	</div>
+{{end}}
+
diff --git a/templates/repo/commit_load_branches_and_tags.tmpl b/templates/repo/commit_load_branches_and_tags.tmpl
index ffa0e530e8..25402ca2f4 100644
--- a/templates/repo/commit_load_branches_and_tags.tmpl
+++ b/templates/repo/commit_load_branches_and_tags.tmpl
@@ -1,4 +1,4 @@
-{{if not .PageIsWiki}}
+{{if not (or .PageIsWiki .PageIsPullFiles)}}
 <div class="branch-and-tag-area" data-text-default-branch-tooltip="{{ctx.Locale.Tr "repo.commit.contained_in_default_branch"}}">
 	<button class="ui button ellipsis-button load-branches-and-tags tw-mt-2" aria-expanded="false"
 		data-fetch-url="{{.RepoLink}}/commit/{{.CommitID}}/load-branches-and-tags"
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index 7bc6dd1c97..5b292ac8c4 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -2,338 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository diff">
 	{{template "repo/header" .}}
 	<div class="ui container fluid padded">
-		{{$class := ""}}
-		{{if .Commit.Signature}}
-			{{$class = (print $class " isSigned")}}
-			{{if .Verification.Verified}}
-				{{if eq .Verification.TrustStatus "trusted"}}
-					{{$class = (print $class " isVerified")}}
-				{{else if eq .Verification.TrustStatus "untrusted"}}
-					{{$class = (print $class " isVerifiedUntrusted")}}
-				{{else}}
-					{{$class = (print $class " isVerifiedUnmatched")}}
-				{{end}}
-			{{else if .Verification.Warning}}
-				{{$class = (print $class " isWarning")}}
-			{{end}}
-		{{end}}
-		<div class="ui top attached header clearing segment tw-relative commit-header {{$class}}">
-			<div class="tw-flex tw-mb-4 tw-gap-1">
-				<h3 class="tw-mb-0 tw-flex-1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses}}</h3>
-				{{if not $.PageIsWiki}}
-					<div class="commit-header-buttons">
-						<a class="ui primary tiny button" href="{{.SourcePath}}">
-							{{ctx.Locale.Tr "repo.diff.browse_source"}}
-						</a>
-						{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}{{- /* */ -}}
-							<div class="ui dropdown primary tiny button">
-								{{ctx.Locale.Tr "repo.commit.operations"}}
-								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-								<div class="menu">
-									<div class="ui header">{{ctx.Locale.Tr "repo.commit.operations"}}</div>
-									<div class="divider"></div>
-									<div class="item show-create-branch-modal"
-										data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
-										data-branch-from="{{ShortSha .CommitID}}"
-										data-branch-from-urlcomponent="{{.CommitID}}"
-										data-modal="#create-branch-modal">
-										{{ctx.Locale.Tr "repo.branch.create_branch_operation"}}
-									</div>
-									<div class="item show-create-branch-modal"
-										data-content="{{ctx.Locale.Tr "repo.branch.new_branch_from" (.CommitID)}}" {{/* used by the form */}}
-										data-branch-from="{{ShortSha .CommitID}}"
-										data-branch-from-urlcomponent="{{.CommitID}}"
-										data-modal="#create-tag-modal"
-										data-modal-from-span="#modal-create-tag-from-span"
-										data-modal-form="#create-tag-form">
-										{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
-									</div>
-									<div class="item show-modal revert-button"
-										data-modal="#cherry-pick-modal"
-										data-modal-cherry-pick-type="revert"
-										data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.revert-header" (ShortSha .CommitID)}}"
-										data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.revert-content"}}"
-										data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.revert"}}">{{ctx.Locale.Tr "repo.commit.revert"}}</div>
-									<div class="item cherry-pick-button show-modal"
-										data-modal="#cherry-pick-modal"
-										data-modal-cherry-pick-type="cherry-pick"
-										data-modal-cherry-pick-header="{{ctx.Locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
-										data-modal-cherry-pick-content="{{ctx.Locale.Tr "repo.commit.cherry-pick-content"}}"
-										data-modal-cherry-pick-submit="{{ctx.Locale.Tr "repo.commit.cherry-pick"}}">{{ctx.Locale.Tr "repo.commit.cherry-pick"}}</div>
-									<div class="ui g-modal-confirm modal" id="cherry-pick-modal">
-										<div class="header">
-											<span id="cherry-pick-header"></span>
-										</div>
-										<div class="content">
-											<p id="cherry-pick-content" class="branch-dropdown"></p>
-											{{template "repo/branch_dropdown" dict "root" .
-												"noTag" true "disableCreateBranch" true
-												"branchForm" "branch-dropdown-form"
-												"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
-												"setAction" true "submitForm" true}}
-											<form method="get" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{PathEscapeSegments $.Repository.DefaultBranch}}" id="branch-dropdown-form">
-												<input type="hidden" name="ref" value="{{$.Repository.DefaultBranch}}">
-												<input type="hidden" name="refType" value="branch">
-												<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br>
-												<button type="submit" id="cherry-pick-submit" class="ui primary button"></button>
-											</form>
-										</div>
-									</div>
-									<div class="ui small modal" id="create-branch-modal">
-										<div class="header">
-											{{ctx.Locale.Tr "repo.branch.new_branch"}}
-										</div>
-										<div class="content">
-											<form class="ui form" id="create-branch-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
-												{{.CsrfTokenHtml}}
-												<div class="field">
-													<label>
-														{{ctx.Locale.Tr "repo.branch.new_branch_from" (`<span class="text" id="modal-create-branch-from-span"></span>`|SafeHTML)}}
-													</label>
-												</div>
-												<div class="required field">
-													<label for="new_branch_name">{{ctx.Locale.Tr "repo.branch.name"}}</label>
-													<input id="new_branch_name" name="new_branch_name" required>
-												</div>
-
-												<div class="text right actions">
-													<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
-													<button class="ui primary button">{{ctx.Locale.Tr "repo.branch.confirm_create_branch"}}</button>
-												</div>
-											</form>
-										</div>
-									</div>
-									<div class="ui small modal" id="create-tag-modal">
-										<div class="header">
-											{{ctx.Locale.Tr "repo.tag.create_tag_operation"}}
-										</div>
-										<div class="content">
-											<form class="ui form" id="create-tag-form" action="" data-base-action="{{.RepoLink}}/branches/_new/commit/" method="post">
-												{{.CsrfTokenHtml}}
-												<input type="hidden" name="create_tag" value="true">
-												<div class="field">
-													<label>
-														{{ctx.Locale.Tr "repo.tag.create_tag_from" (`<span class="text" id="modal-create-tag-from-span"></span>`|SafeHTML)}}
-													</label>
-												</div>
-												<div class="required field">
-													<label for="new_branch_name">{{ctx.Locale.Tr "repo.release.tag_name"}}</label>
-													<input id="new_branch_name" name="new_branch_name" required>
-												</div>
-
-												<div class="text right actions">
-													<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
-													<button class="ui primary button">{{ctx.Locale.Tr "repo.tag.confirm_create_tag"}}</button>
-												</div>
-											</form>
-										</div>
-									</div>
-									{{if not .NoteRendered}}
-										<div id="commit-notes-add-button" class="item">
-											{{ctx.Locale.Tr "repo.diff.git-notes.add"}}
-										</div>
-									{{end}}
-								</div>
-							</div>
-						{{end}}
-					</div>
-				{{end}}
-			</div>
-			{{if IsMultilineCommitMessage .Commit.Message}}
-				<pre class="commit-body">{{RenderCommitBody $.Context .Commit.Message ($.Repository.ComposeMetas ctx)}}</pre>
-			{{end}}
-			{{template "repo/commit_load_branches_and_tags" .}}
-		</div>
-		<div class="ui attached segment tw-flex tw-items-center tw-justify-between tw-py-1 commit-header-row tw-flex-wrap {{$class}}">
-				<div class="tw-flex tw-items-center author">
-					{{if .Author}}
-						{{ctx.AvatarUtils.Avatar .Author 28 "tw-mr-2"}}
-						{{if .Author.FullName}}
-							<a href="{{.Author.HomeLink}}"><strong>{{.Author.FullName}}</strong></a>
-						{{else}}
-							<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a>
-						{{end}}
-					{{else}}
-						{{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "tw-mr-2"}}
-						<strong>{{.Commit.Author.Name}}</strong>
-					{{end}}
-					<span class="text grey tw-ml-2" id="authored-time">{{DateUtils.TimeSince .Commit.Author.When}}</span>
-					{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
-						<span class="tw-ml-2">•</span>
-						<span class="text grey tw-mx-2">{{ctx.Locale.Tr "repo.diff.committed_by"}}</span>
-						{{if ne .Verification.CommittingUser.ID 0}}
-							{{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mr-2"}}
-							<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong></a>
-						{{else}}
-							{{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "tw-mr-2"}}
-							<strong>{{.Commit.Committer.Name}}</strong>
-						{{end}}
-					{{end}}
-				</div>
-				<div class="tw-flex tw-items-center">
-					{{if .Parents}}
-						<div>
-							<span>{{ctx.Locale.Tr "repo.diff.parent"}}</span>
-							{{range .Parents}}
-								{{if $.PageIsWiki}}
-									<a class="ui primary sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
-								{{else}}
-									<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{PathEscape .}}">{{ShortSha .}}</a>
-								{{end}}
-							{{end}}
-						</div>
-					{{end}}
-					<div class="item">
-						<span>{{ctx.Locale.Tr "repo.diff.commit"}}</span>
-						<span class="ui primary sha label">{{ShortSha .CommitID}}</span>
-					</div>
-				</div>
-		</div>
-		{{if .Commit.Signature}}
-			<div class="ui bottom attached message tw-text-left tw-flex tw-items-center tw-justify-between commit-header-row tw-flex-wrap tw-mb-0 {{$class}}">
-				<div class="tw-flex tw-items-center">
-					{{if .Verification.Verified}}
-						{{if ne .Verification.SigningUser.ID 0}}
-							{{svg "gitea-lock" 16 "tw-mr-2"}}
-							{{if eq .Verification.TrustStatus "trusted"}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
-							{{else if eq .Verification.TrustStatus "untrusted"}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}:</span>
-							{{else}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}:</span>
-							{{end}}
-							{{ctx.AvatarUtils.Avatar .Verification.SigningUser 28 "tw-mr-2"}}
-							<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
-						{{else}}
-							<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "tw-mr-2"}}</span>
-							<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.signed_by"}}:</span>
-							{{ctx.AvatarUtils.AvatarByEmail .Verification.SigningEmail "" 28 "tw-mr-2"}}
-							<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
-						{{end}}
-					{{else}}
-						{{svg "gitea-unlock" 16 "tw-mr-2"}}
-						<span class="ui text">{{ctx.Locale.Tr .Verification.Reason}}</span>
-					{{end}}
-				</div>
-				<div class="tw-flex tw-items-center">
-					{{if .Verification.Verified}}
-						{{svg "octicon-verified" 16 "tw-mr-2"}}
-						{{if ne .Verification.SigningUser.ID 0}}
-							{{if .Verification.SigningSSHKey}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
-								{{.Verification.SigningSSHKey.Fingerprint}}
-							{{else}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
-								{{.Verification.SigningKey.PaddedKeyID}}
-							{{end}}
-						{{else}}
-							{{if .Verification.SigningSSHKey}}
-								<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
-								{{.Verification.SigningSSHKey.Fingerprint}}
-							{{else}}
-								<span class="ui text tw-mr-2" data-tooltip-content="{{ctx.Locale.Tr "gpg.default_key"}}">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
-								{{.Verification.SigningKey.PaddedKeyID}}
-							{{end}}
-						{{end}}
-					{{else if .Verification.Warning}}
-						{{svg "octicon-unverified" 16 "tw-mr-2"}}
-						{{if .Verification.SigningSSHKey}}
-							<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
-							{{.Verification.SigningSSHKey.Fingerprint}}
-						{{else}}
-							<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
-							{{.Verification.SigningKey.PaddedKeyID}}
-						{{end}}
-					{{else}}
-						{{if .Verification.SigningKey}}
-							{{if ne .Verification.SigningKey.KeyID ""}}
-								{{svg "octicon-verified" 16 "tw-mr-2"}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.gpg_key_id"}}:</span>
-								{{.Verification.SigningKey.PaddedKeyID}}
-							{{end}}
-						{{end}}
-						{{if .Verification.SigningSSHKey}}
-							{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
-								{{svg "octicon-verified" 16 "tw-mr-2"}}
-								<span class="ui text tw-mr-2">{{ctx.Locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
-								{{.Verification.SigningSSHKey.Fingerprint}}
-							{{end}}
-						{{end}}
-					{{end}}
-				</div>
-			</div>
-		{{end}}
-		{{if .NoteRendered}}
-			<div class="ui top attached header segment git-notes tw-flex tw-gap-1 tw-flex-wrap">
-				{{svg "octicon-note" 16 "tw-mr-2"}}
-				{{ctx.Locale.Tr "repo.diff.git-notes"}}:
-				{{if .NoteAuthor}}
-					<a href="{{.NoteAuthor.HomeLink}}">
-						{{if .NoteAuthor.FullName}}
-							<strong>{{.NoteAuthor.FullName}}</strong>
-						{{else}}
-							<strong>{{.NoteCommit.Author.Name}}</strong>
-						{{end}}
-					</a>
-				{{else}}
-					<strong>{{.NoteCommit.Author.Name}}</strong>
-				{{end}}
-				<span class="text grey tw-flex-1" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span>
-				{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
-					<div class="ui tw-flex tw-items-center">
-						<button id="commit-notes-edit-button" class="ui tiny primary button tw-py-[6px] tw-px-[10px]">{{ctx.Locale.Tr "edit"}}</button>
-						<button class="ui tiny button red show-modal tw-py-[6px] tw-px-[10px]" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button>
-					</div>
-					<div class="ui small modal" id="delete-note-modal">
-						<div class="header">
-							{{ctx.Locale.Tr "repo.diff.git-notes.remove-header"}}
-						</div>
-						<div class="content">
-							<p>{{ctx.Locale.Tr "repo.diff.git-notes.remove-body"}}</p>
-							<div class="text right actions">
-								<form action="{{.Link}}/notes/remove" method="post">
-									{{.CsrfTokenHtml}}
-									<button type="button" class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
-									<button type="submit" class="ui red button" href="{{.Link}}/notes/remove">{{ctx.Locale.Tr "remove"}}</button>
-								</form>
-							</div>
-						</div>
-					</div>
-				{{end}}
-			</div>
-			<div id="commit-notes-display-area" class="ui bottom attached info segment git-notes">
-				<pre class="commit-body">{{.NoteRendered | SanitizeHTML}}</pre>
-			</div>
-			{{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
-				<div id="commit-notes-edit-area" class="ui bottom attached info segment git-notes tw-hidden">
-					<form class="ui form" action="{{.Link}}/notes" method="post">
-						{{.CsrfTokenHtml}}
-
-						<div class="field">
-							<textarea name="notes">{{.NoteRendered | SanitizeHTML}}</textarea>
-						</div>
-
-						<div class="field">
-							<button id="notes-save-button" class="ui primary button">{{ctx.Locale.Tr "save"}}</button>
-						</div>
-					</form>
-				</div>
-			{{end}}
-		{{else if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}}
-			<div id="commit-notes-add-area" class="ui tw-mt-3 segment tw-hidden">
-				<form class="ui form" action="{{.Link}}/notes" method="post">
-					{{.CsrfTokenHtml}}
-
-					<div class="field">
-						<textarea name="notes"></textarea>
-					</div>
-
-					<div class="field">
-						<button class="ui primary button">{{ctx.Locale.Tr "add"}}</button>
-					</div>
-				</form>
-			</div>
-		{{end}}
+		{{template "repo/commit_header" .}}
 		{{template "repo/diff/box" .}}
 	</div>
 </div>
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl
index 86df88f6e3..e6efe1ff54 100644
--- a/templates/repo/commits.tmpl
+++ b/templates/repo/commits.tmpl
@@ -13,11 +13,6 @@
 			</div>
 		</div>
 		{{template "repo/commits_table" .}}
-		{{if .OldFilename}}
-			<div class="ui bottom attached header">
-				<span>{{ctx.Locale.Tr "repo.commits.renamed_from" .OldFilename}} (<a href="{{.OldFilenameHistory}}">{{ctx.Locale.Tr "repo.commits.browse_further"}}</a>)</span>
-			</div>
-		{{end}}
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index a9015e6089..2c0a93f2ba 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -28,21 +28,6 @@
 							</div>
 						</td>
 						<td class="sha">
-							{{$class := "ui sha label"}}
-							{{if .Signature}}
-								{{$class = (print $class " isSigned")}}
-								{{if .Verification.Verified}}
-									{{if eq .Verification.TrustStatus "trusted"}}
-										{{$class = (print $class " isVerified")}}
-									{{else if eq .Verification.TrustStatus "untrusted"}}
-										{{$class = (print $class " isVerifiedUntrusted")}}
-									{{else}}
-										{{$class = (print $class " isVerifiedUnmatched")}}
-									{{end}}
-								{{else if .Verification.Warning}}
-									{{$class = (print $class " isWarning")}}
-								{{end}}
-							{{end}}
 							{{$commitShaLink := ""}}
 							{{if $.PageIsWiki}}
 								{{$commitShaLink = (printf "%s/wiki/commit/%s" $commitRepoLink (PathEscape .ID.String))}}
@@ -51,10 +36,12 @@
 							{{else if $.Reponame}}
 								{{$commitShaLink = (printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String))}}
 							{{end}}
-							<a {{if $commitShaLink}}href="{{$commitShaLink}}"{{end}} class="{{$class}}">
-								<span class="shortsha">{{ShortSha .ID.String}}</span>
-								{{if .Signature}}{{template "repo/shabox_badge" dict "root" $ "verification" .Verification}}{{end}}
-							</a>
+							{{template "repo/shabox" (dict
+								"sha1" .ID.String
+								"commitLink" $commitShaLink
+								"signature" .Signature
+								"verification" .Verification
+							)}}
 						</td>
 						<td class="message">
 							<span class="message-wrapper">
@@ -62,6 +49,9 @@
 								<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{.Summary | RenderEmoji $.Context}}</span>
 							{{else}}
 								{{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}}
+								{{if $.PageIsPullCommits}}
+									{{$commitLink = (printf "%s/pulls/%d/commits/%s" $commitRepoLink $.Issue.Index (PathEscape .ID.String))}}
+								{{end}}
 								<span class="commit-summary {{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject $.Context .Message $commitLink ($.Repository.ComposeMetas ctx)}}</span>
 							{{end}}
 							</span>
@@ -69,6 +59,14 @@
 							<button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
 							{{end}}
 							{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
+							{{if $.CommitTagsMap}}
+								{{$tags := index $.CommitTagsMap .ID.String}}
+								{{if $tags}}
+									{{range $tags}}
+										{{- template "repo/tag/name" dict "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}}
+									{{end}}
+								{{end}}
+							{{end}}
 							{{if IsMultilineCommitMessage .Message}}
 							<pre class="commit-body tw-hidden">{{RenderCommitBody $.Context .Message ($.Repository.ComposeMetas ctx)}}</pre>
 							{{end}}
diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl
index 4c67319b8c..6efc812e8f 100644
--- a/templates/repo/commits_list_small.tmpl
+++ b/templates/repo/commits_list_small.tmpl
@@ -11,7 +11,14 @@
 			{{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 20}}
 		{{end}}
 
-		{{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
+		{{$commitLink := printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}}
+
+		{{/* Only link those commits in the file diff view that can actually be reviewed there.
+					A force push or other rewriting of history will cause a commit to not be
+					part of the pull request anymore. */}}
+		{{if index $.root.CommitIDs .ID.String}}
+			{{$commitLink = printf "%s/pulls/%d/commits/%s" $.comment.Issue.PullRequest.BaseRepo.Link $.comment.Issue.Index (PathEscape .ID.String)}}
+		{{end}}
 
 		<span class="tw-flex-1 tw-font-mono gt-ellipsis" title="{{.Summary}}">
 			{{- RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx) -}}
@@ -21,29 +28,14 @@
 			<button class="ui button ellipsis-button show-panel toggle" data-panel="[data-singular-commit-body-for='{{$tag}}']">...</button>
 		{{end}}
 
-		<span class="shabox tw-flex tw-items-center">
+		<span class="shabox tw-flex tw-items-center tw-gap-2">
 			{{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}}
-			{{$class := "ui sha label"}}
-			{{if .Signature}}
-				{{$class = (print $class " isSigned")}}
-				{{if .Verification.Verified}}
-					{{if eq .Verification.TrustStatus "trusted"}}
-						{{$class = (print $class " isVerified")}}
-					{{else if eq .Verification.TrustStatus "untrusted"}}
-						{{$class = (print $class " isVerifiedUntrusted")}}
-					{{else}}
-						{{$class = (print $class " isVerifiedUnmatched")}}
-					{{end}}
-				{{else if .Verification.Warning}}
-					{{$class = (print $class " isWarning")}}
-				{{end}}
-			{{end}}
-			<a href="{{$commitLink}}" rel="nofollow" class="tw-ml-2 {{$class}}">
-				<span class="shortsha">{{ShortSha .ID.String}}</span>
-				{{if .Signature}}
-					{{template "repo/shabox_badge" dict "root" $.root "verification" .Verification}}
-				{{end}}
-			</a>
+			{{template "repo/shabox" (dict
+				"sha1" .ID.String
+				"commitLink" $commitLink
+				"signature" .Signature
+				"verification" .Verification
+			)}}
 		</span>
 	</div>
 	{{if IsMultilineCommitMessage .Message}}
diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl
index 7249becbab..be6462b269 100644
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -1,7 +1,7 @@
 <h4 class="ui top attached header commits-table tw-flex tw-items-center tw-justify-between">
 	<div class="commits-table-left tw-flex tw-items-center">
 		{{if or .PageIsCommits (gt .CommitCount 0)}}
-			{{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (StringUtils.ToString .CommitCount)}}
+			{{ctx.Locale.TrN .CommitCount "repo.n_commit_one" "repo.n_commit_few" (ctx.Locale.PrettyNumber .CommitCount)}}
 		{{else if .IsNothingToCompare}}
 			{{ctx.Locale.Tr "repo.commits.nothing_to_compare"}}
 		{{else}}
@@ -10,9 +10,13 @@
 	</div>
 	{{if .IsDiffCompare}}
 		<div class="commits-table-right tw-whitespace-nowrap">
-			<a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID | PathEscape}}" class="ui green sha label tw-mx-0">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a>
+			<a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID | PathEscape}}" class="primary sha label tw-mx-0">
+				<span class="shortsha">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</span>
+			</a>
 			...
-			<a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID | PathEscape}}" class="ui green sha label tw-mx-0">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</a>
+			<a href="{{$.CommitRepoLink}}/commit/{{.AfterCommitID | PathEscape}}" class="primary sha label tw-mx-0">
+				<span class="shortsha">{{if not .HeadIsCommit}}{{if .HeadIsBranch}}{{svg "octicon-git-branch"}}{{else if .HeadIsTag}}{{svg "octicon-tag"}}{{end}}{{.HeadBranch}}{{else}}{{ShortSha .HeadBranch}}{{end}}</span>
+			</a>
 		</div>
 	{{end}}
 </h4>
@@ -33,4 +37,10 @@
 	{{template "repo/commits_list" .}}
 {{end}}
 
+{{if .OldFilename}}
+	<div class="ui bottom attached header">
+		<span>{{ctx.Locale.Tr "repo.commits.renamed_from" .OldFilename}} (<a href="{{.OldFilenameHistory}}">{{ctx.Locale.Tr "repo.commits.browse_further"}}</a>)</span>
+	</div>
+{{end}}
+
 {{template "base/paginate" .}}
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 7ee8587435..7c07f80c86 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -8,42 +8,48 @@
 					{{ctx.Locale.Tr "new_repo.title"}}
 				</h3>
 				<div class="ui attached segment">
-					{{template "base/alert" .}}
-					{{template "repo/create_helper" .}}
+					{{if or .CanCreateRepo .Orgs}}
+						{{template "base/alert" .}}
+						{{template "repo/create_helper" .}}
 
-					{{if not .CanCreateRepo}}
+						{{if and (not .CanCreateRepo) (ne .MaxCreationLimit 0)}}
+							<div class="ui negative message">
+								<p>{{ctx.Locale.TrN .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n" .MaxCreationLimit}}</p>
+							</div>
+						{{end}}
+						<fieldset>
+							{{template "repo/create_basic" .}}
+						</fieldset>
+
+						<fieldset>
+							<legend>
+								{{ctx.Locale.Tr "repo.new_from_template"}}
+								<span class="help">{{ctx.Locale.Tr "repo.new_from_template_description"}}</span>
+							</legend>
+							{{template "repo/create_from_template" .}}
+						</fieldset>
+
+						<div id="non_template">
+							<fieldset>
+								<legend>{{ctx.Locale.Tr "repo.auto_init"}}</legend>
+								{{template "repo/create_init" .}}
+							</fieldset>
+
+							<fieldset>
+								<legend>{{ctx.Locale.Tr "repo.new_advanced"}}</legend>
+								<details><summary>{{ctx.Locale.Tr "repo.new_advanced_expand"}}</summary>
+									{{template "repo/create_advanced" .}}
+								</details>
+							</fieldset>
+						</div>
+						<button class="ui primary button">
+							{{ctx.Locale.Tr "repo.create_repo"}}
+						</button>
+					{{else}}
 						<div class="ui negative message">
-							<p>{{ctx.Locale.TrN .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n" .MaxCreationLimit}}</p>
+							{{ctx.Locale.Tr "repo.form.cannot_create"}}
 						</div>
 					{{end}}
-					<fieldset>
-						{{template "repo/create_basic" .}}
-					</fieldset>
-
-					<fieldset>
-						<legend>
-							{{ctx.Locale.Tr "repo.new_from_template"}}
-							<span class="help">{{ctx.Locale.Tr "repo.new_from_template_description"}}</span>
-						</legend>
-						{{template "repo/create_from_template" .}}
-					</fieldset>
-
-					<div id="non_template">
-						<fieldset>
-							<legend>{{ctx.Locale.Tr "repo.auto_init"}}</legend>
-							{{template "repo/create_init" .}}
-						</fieldset>
-
-						<fieldset>
-							<legend>{{ctx.Locale.Tr "repo.new_advanced"}}</legend>
-							<details><summary>{{ctx.Locale.Tr "repo.new_advanced_expand"}}</summary>
-								{{template "repo/create_advanced" .}}
-							</details>
-						</fieldset>
-					</div>
-					<button class="ui primary button{{if not .CanCreateRepo}} disabled{{end}}">
-						{{ctx.Locale.Tr "repo.create_repo"}}
-					</button>
 				</div>
 			</form>
 		</div>
diff --git a/templates/repo/create_basic.tmpl b/templates/repo/create_basic.tmpl
index 0396629fef..90545c2769 100644
--- a/templates/repo/create_basic.tmpl
+++ b/templates/repo/create_basic.tmpl
@@ -2,17 +2,27 @@
 	{{ctx.Locale.Tr "repo.owner"}}
 	<div class="ui selection required dropdown" aria-labelledby="repo_owner_label">
 		{{/* uid id is used by the repo-template code */}}
-		<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
-		<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
-			{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
-			<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
-		</span>
+		{{if .CanCreateRepo}}
+			<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
+			<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
+				{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
+				<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
+			</span>
+		{{else if .Orgs}}
+			<input type="hidden" id="uid" name="uid" value="{{(index .Orgs 0).ID}}" required>
+			<span class="text truncated-item-container" title="{{(index .Orgs 0).Name}}">
+				{{ctx.AvatarUtils.Avatar (index .Orgs 0) 28 "mini"}}
+				<span class="truncated-item-name">{{(index .Orgs 0).ShortName 40}}</span>
+			</span>
+		{{end}}
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
-				{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
-				<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
-			</div>
+			{{if .CanCreateRepo}}
+				<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
+					{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
+					<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
+				</div>
+			{{end}}
 			{{range .Orgs}}
 				<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
 					{{ctx.AvatarUtils.Avatar . 28 "mini"}}
diff --git a/templates/repo/create_init.tmpl b/templates/repo/create_init.tmpl
index 729b44c8e6..468d9a9ae5 100644
--- a/templates/repo/create_init.tmpl
+++ b/templates/repo/create_init.tmpl
@@ -7,7 +7,7 @@
 <div class="hide-unless-checked">
 	<label>
 		.gitignore
-		<div class="ui multiple search selection dropdown">
+		<div class="ui multiple search selection dropdown tw-flex-wrap">
 			<input type="hidden" name="gitignores" value="{{.gitignores}}">
 			<div class="default text">{{ctx.Locale.Tr "repo.repo_gitignore_helper"}}</div>
 			<div class="menu">
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index e24c880746..f3c0c0989d 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -53,7 +53,7 @@
 	{{if not .DiffNotAvailable}}
 		{{if and .IsShowingOnlySingleCommit .PageIsPullFiles}}
 			<div class="ui info message">
-				<div>{{ctx.Locale.Tr "repo.pulls.showing_only_single_commit" (ShortSha .AfterCommitID)}} - <a href="{{$.Issue.Link}}/files?style={{if $.IsSplitStyle}}split{{else}}unified{{end}}&whitespace={{$.WhitespaceBehavior}}&show-outdated={{$.ShowOutdatedComments}}">{{ctx.Locale.Tr "repo.pulls.show_all_commits"}}</a></div>
+				<div>{{ctx.Locale.Tr "repo.pulls.showing_only_single_commit" (ShortSha .CommitID)}} - <a href="{{$.Issue.Link}}/files?style={{if $.IsSplitStyle}}split{{else}}unified{{end}}&whitespace={{$.WhitespaceBehavior}}&show-outdated={{$.ShowOutdatedComments}}">{{ctx.Locale.Tr "repo.pulls.show_all_commits"}}</a></div>
 			</div>
 		{{else if and (not .IsShowingAllCommits) .PageIsPullFiles}}
 			<div class="ui info message">
@@ -93,6 +93,12 @@
 				if (diffTreeVisible) document.getElementById('diff-file-tree').classList.remove('tw-hidden');
 			</script>
 		{{end}}
+		<div id="diff-content-container">
+		{{if .IsShowingOnlySingleCommit}}
+			<div id="diff-commit-header">
+			{{template "repo/commit_header" .}}
+			</div>
+		{{end}}
 		{{if .DiffNotAvailable}}
 			<h4>{{ctx.Locale.Tr "repo.diff.data_not_available"}}</h4>
 		{{else}}
@@ -230,6 +236,7 @@
 				{{end}}
 			</div>
 		{{end}}
+		</div>
 	</div>
 
 	{{if and (not $.Repository.IsArchived) (not .DiffNotAvailable)}}
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index c1b00c5f9e..9dadb13510 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -2,11 +2,16 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}">
 	{{template "repo/header" .}}
 	{{$showDiffBox := false}}
+	{{$canReadPullRequests := .Permission.CanRead $.UnitTypePullRequests}}
 	<div class="ui container fluid padded">
 	<h2 class="ui header">
 		{{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}}
-			{{ctx.Locale.Tr "repo.pulls.compare_changes"}}
-			<div class="sub header">{{ctx.Locale.Tr "repo.pulls.compare_changes_desc"}}</div>
+			{{if $canReadPullRequests}}
+				{{ctx.Locale.Tr "repo.pulls.compare_changes"}}
+				<div class="sub header">{{ctx.Locale.Tr "repo.pulls.compare_changes_desc"}}</div>
+			{{else}}
+				{{ctx.Locale.Tr "compare.branches.title"}}
+			{{end}}
 		{{else}}
 			{{ctx.Locale.Tr "action.compare_commits_general"}}
 		{{end}}
@@ -166,7 +171,7 @@
 		{{else}}
 			<div class="ui segment">{{ctx.Locale.Tr "repo.pulls.nothing_to_compare_have_tag"}}</div>
 		{{end}}
-	{{else if and .PageIsComparePull (gt .CommitCount 0)}}
+	{{else if and .PageIsComparePull (gt .CommitCount 0) $canReadPullRequests}}
 		{{if .HasPullRequest}}
 			<div class="ui segment grid title">
 				<div class="twelve wide column issue-title">
diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl
index 13d09babe1..ded7a6c5fc 100644
--- a/templates/repo/diff/new_review.tmpl
+++ b/templates/repo/diff/new_review.tmpl
@@ -1,17 +1,14 @@
 <div id="review-box">
 	<div
-		{{if not $.IsShowingAllCommits}}
-			data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.review_only_possible_for_full_diff"}}"
-		{{else if .Repository.IsArchived}}
+		{{if .Repository.IsArchived}}
 			data-tooltip-content="{{ctx.Locale.Tr "repo.archive.pull.noreview"}}"
 		{{end}}>
-		<button class="ui tiny primary button tw-pr-1 tw-flex js-btn-review {{if or (not $.IsShowingAllCommits) .Repository.IsArchived}}disabled{{end}}">
+		<button class="ui tiny primary button tw-pr-1 tw-flex js-btn-review {{if .Repository.IsArchived}}disabled{{end}}">
 			{{ctx.Locale.Tr "repo.diff.review"}}
 			<span class="ui small label review-comments-counter" data-pending-comment-number="{{.PendingCodeCommentNumber}}">{{.PendingCodeCommentNumber}}</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		</button>
 	</div>
-	{{if $.IsShowingAllCommits}}
 	<div class="review-box-panel tippy-target">
 		<div class="ui segment">
 			<form class="ui form form-fetch-action" action="{{.Link}}/reviews/submit" method="post">
@@ -55,5 +52,4 @@
 			</form>
 		</div>
 	</div>
-	{{end}}
 </div>
diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl
index f9c9eef5aa..362b8d52ee 100644
--- a/templates/repo/editor/cherry_pick.tmpl
+++ b/templates/repo/editor/cherry_pick.tmpl
@@ -11,7 +11,7 @@
 			<div class="repo-editor-header">
 				<div class="ui breadcrumb field {{if .Err_TreePath}}error{{end}}">
 					{{$shaurl := printf "%s/commit/%s" $.RepoLink (PathEscape .SHA)}}
-					{{$shalink := HTMLFormat `<a class="ui primary sha label" href="%s">%s</a>` $shaurl (ShortSha .SHA)}}
+					{{$shalink := HTMLFormat `<a class="primary sha label" href="%s"><span class="shortsha">%s</span></a>` $shaurl (ShortSha .SHA)}}
 					{{if eq .CherryPickType "revert"}}
 						{{ctx.Locale.Tr "repo.editor.revert" $shalink}}
 					{{else}}
diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl
index d3a81bc51d..3a8995bfea 100644
--- a/templates/repo/empty.tmpl
+++ b/templates/repo/empty.tmpl
@@ -50,8 +50,8 @@
 								<h3>{{ctx.Locale.Tr "repo.create_new_repo_command"}}</h3>
 								<div class="markup">
 									<pre><code>touch README.md
-git init
-{{if ne .Repository.DefaultBranch "master"}}git checkout -b {{.Repository.DefaultBranch}}{{end}}
+git init{{if eq .Repository.ObjectFormatName "sha256"}} --object-format=sha256{{end}}
+{{if ne .Repository.DefaultBranch "master"}}git switch -c {{.Repository.DefaultBranch}}{{end}}
 git add README.md
 git commit -m "first commit"
 git remote add origin <span class="js-clone-url">{{$.CloneButtonOriginLink.HTTPS}}</span>
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl
index f0ff0d2970..0c4cb49e9d 100644
--- a/templates/repo/graph/commits.tmpl
+++ b/templates/repo/graph/commits.tmpl
@@ -6,27 +6,12 @@
 					<span></span>
 				{{else}}
 					<span class="sha" id="{{$commit.ShortRev}}">
-						{{$class := "ui sha label"}}
-						{{if $commit.Commit.Signature}}
-							{{$class = (print $class " isSigned")}}
-							{{if $commit.Verification.Verified}}
-								{{if eq $commit.Verification.TrustStatus "trusted"}}
-									{{$class = (print $class " isVerified")}}
-								{{else if eq $commit.Verification.TrustStatus "untrusted"}}
-									{{$class = (print $class " isVerifiedUntrusted")}}
-								{{else}}
-									{{$class = (print $class " isVerifiedUnmatched")}}
-								{{end}}
-							{{else if $commit.Verification.Warning}}
-								{{$class = (print $class " isWarning")}}
-							{{end}}
-						{{end}}
-						<a href="{{$.RepoLink}}/commit/{{$commit.Rev|PathEscape}}" rel="nofollow" class="{{$class}}">
-							<span class="shortsha">{{ShortSha $commit.Commit.ID.String}}</span>
-							{{- if $commit.Commit.Signature -}}
-								{{template "repo/shabox_badge" dict "root" $ "verification" $commit.Verification}}
-							{{- end -}}
-						</a>
+						{{template "repo/shabox" (dict
+							"sha1" $commit.Commit.ID.String
+							"commitLink" (printf "%s/commit/%s" $.RepoLink ($commit.Rev|PathEscape))
+							"signature" $commit.Commit.Signature
+							"verification" $commit.Verification
+						)}}
 					</span>
 					<span class="message tw-inline-block gt-ellipsis tw-mr-2">
 						<span>{{RenderCommitMessage $.Context $commit.Subject ($.Repository.ComposeMetas ctx)}}</span>
@@ -42,9 +27,7 @@
 									</a>
 								{{end}}
 							{{else if eq $refGroup "tags"}}
-								<a class="ui basic button" href="{{$.RepoLink}}/src/tag/{{.ShortName|PathEscape}}">
-									{{svg "octicon-tag"}} {{.ShortName}}
-								</a>
+								{{- template "repo/tag/name" dict "RepoLink" $.Repository.Link "TagName" .ShortName -}}
 							{{else if eq $refGroup "remotes"}}
 								<a class="ui basic button" href="{{$.RepoLink}}/src/commit/{{$commit.Rev|PathEscape}}">
 									{{svg "octicon-cross-reference"}} {{.ShortName}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 5162fd429b..b6cbfc7283 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -67,6 +67,14 @@
 					{{if not $.DisableForks}}
 					{{template "repo/header_fork" $}}
 					{{end}}
+					{{if and $.IsModerationEnabled $.IsSigned (not $.IsRepositoryAdmin)}}
+					<button class="ui small compact jump dropdown icon button" data-tooltip-content="{{ctx.Locale.Tr "repo.more_operations"}}" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">
+						{{svg "octicon-kebab-horizontal"}}
+						<div class="menu top left">
+							<a class="item context" href="{{AppSubUrl}}/report_abuse?type=repo&id={{$.Repository.ID}}">{{ctx.Locale.Tr "moderation.report_content"}}</a>
+						</div>
+					</button>
+					{{end}}
 				</div>
 			{{end}}
 		</div>
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 871790ce28..39d0c6c751 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,7 +3,6 @@
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
-		{{template "repo/code/recently_pushed_new_branches" .}}
 		{{if and (not .HideRepoInfo) (not .IsBlame)}}
 		<div class="repo-description">
 			<div id="repo-desc" class="tw-break-anywhere tw-text-16">
@@ -56,8 +55,8 @@
 		{{$l := Eval $n "-" 1}}
 		{{$isHomepage := (eq $n 0)}}
 		<div class="repo-button-row">
-			<div class="tw-flex tw-items-center tw-gap-y-2">
-				{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mr-1"}}
+			<div class="tw-gap-y-2 button-sequence">
+				{{template "repo/branch_dropdown" dict "root" .}}
 				{{if and .CanCompareOrPull .IsViewBranch (not .Repository.IsArchived)}}
 					{{$cmpBranch := ""}}
 					{{if ne .Repository.ID .BaseRepo.ID}}
@@ -141,7 +140,7 @@
 					{{template "repo/cite/cite_modal" .}}
 				{{end}}
 				{{if and (not $isHomepage) (not .IsViewFile) (not .IsBlame)}}{{/* IsViewDirectory (not home), TODO: split the templates, avoid using "if" tricks */}}
-					<div class="button-row folder-actions">
+					<div class="button-sequence folder-actions">
 						<a class="ui button" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}/{{.TreePath | PathEscapeSegments}}">
 							{{svg "octicon-history" 16 "tw-mr-2"}}{{ctx.Locale.Tr "repo.file_history"}}
 						</a>
@@ -158,6 +157,10 @@
 				{{end}}
 			</div>
 		</div>
+
+		{{template "repo/code/recently_pushed_new_branches" .}}
+		{{template "repo/code/fork_sync_message" .}}
+
 		{{if .IsViewFile}}
 			{{template "repo/view_file" .}}
 		{{else if .IsBlame}}
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl
index c29c14a54b..ba6022ae3a 100644
--- a/templates/repo/issue/card.tmpl
+++ b/templates/repo/issue/card.tmpl
@@ -4,7 +4,7 @@
 		{{if $attachments}}
 		<div class="card-attachment-images">
 			{{range $attachments}}
-				<img src="{{.DownloadURL}}" alt="{{.Name}}" />
+				<img src="{{.DownloadURL}}" alt="{{.Name}}" loading="lazy"/>
 			{{end}}
 		</div>
 		{{end}}
@@ -45,7 +45,7 @@
 		{{if $.Page.LinkedPRs}}
 		{{range index $.Page.LinkedPRs .ID}}
 		<div class="meta tw-my-1">
-			<a href="{{$.Issue.Repo.Link}}/pulls/{{.Index}}">
+			<a href="{{.Repo.Link}}/pulls/{{.Index}}">
 				<span class="tw-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "tw-mr-1 tw-align-middle"}}</span>
 				<span class="tw-align-middle">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
 			</a>
@@ -65,7 +65,7 @@
 	<div class="issue-card-bottom">
 		<div class="labels-list">
 			{{range .Labels}}
-				<a target="_blank" href="{{$.Issue.Repo.Link}}/issues?labels={{.ID}}">{{RenderLabel ctx ctx.Locale .}}</a>
+				<a target="_blank" href="{{$.Issue.Repo.Link}}/issues?labels={{.ID}}">{{RenderLabel ctx .}}</a>
 			{{end}}
 		</div>
 		<div class="issue-card-assignees">
diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl
index 60237f225d..ea7878c47b 100644
--- a/templates/repo/issue/filter_actions.tmpl
+++ b/templates/repo/issue/filter_actions.tmpl
@@ -30,7 +30,7 @@
 					{{end}}
 					{{$previousExclusiveScope = $exclusiveScope}}
 					<div class="item issue-action tw-flex tw-justify-between" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
-						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context ctx.Locale .}}
+						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel ctx .}}
 						{{template "repo/issue/labels/label_archived" .}}
 					</div>
 				{{end}}
diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl
index ae50ac4c46..84ba6e5358 100644
--- a/templates/repo/issue/filter_list.tmpl
+++ b/templates/repo/issue/filter_list.tmpl
@@ -127,7 +127,7 @@
 		</span>
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			<a rel="nofollow" class="{{if eq .ViewType "all"}}active {{end}}item" href="?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_type.all_issues"}}</a>
+			<a rel="nofollow" class="{{if eq .ViewType "all"}}active {{end}}item" href="?q={{$.Keyword}}&type=all&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_type.all_pull_requests"}}</a>
 			<a rel="nofollow" class="{{if eq .ViewType "assigned"}}active {{end}}item" href="?q={{$.Keyword}}&type=assigned&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}}</a>
 			<a rel="nofollow" class="{{if eq .ViewType "created_by"}}active {{end}}item" href="?q={{$.Keyword}}&type=created_by&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}}</a>
 			{{if .PageIsPullList}}
diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index fcf69217ea..a4732d35ec 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -1,4 +1,4 @@
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-label">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.issues.label_deletion"}}
diff --git a/templates/repo/issue/labels/label.tmpl b/templates/repo/issue/labels/label.tmpl
index 7844362911..fe4c7494bb 100644
--- a/templates/repo/issue/labels/label.tmpl
+++ b/templates/repo/issue/labels/label.tmpl
@@ -4,5 +4,5 @@
 	href="{{.root.RepoLink}}/{{if or .root.IsPull .root.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.label.ID}}"{{/* FIXME: use .root.Issue.Link or create .root.Link */}}
 	rel="nofollow"
 >
-	{{- RenderLabel $.Context ctx.Locale .label -}}
+	{{- RenderLabel ctx .label -}}
 </a>
diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl
index 8d7fc2c3db..cc65830eda 100644
--- a/templates/repo/issue/labels/label_list.tmpl
+++ b/templates/repo/issue/labels/label_list.tmpl
@@ -32,7 +32,7 @@
 		{{range .Labels}}
 		<li class="item">
 			<div class="label-title">
-				{{RenderLabel $.Context ctx.Locale .}}
+				{{RenderLabel ctx .}}
 				{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
 			</div>
 			<div class="label-issues">
@@ -45,12 +45,9 @@
 			<div class="label-operation tw-flex">
 				{{template "repo/issue/labels/label_archived" .}}
 				<div class="tw-flex tw-ml-auto">
-					{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
+					{{if or ($.PageIsOrgSettingsLabels) (and (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls))}}
 						<a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} {{if gt .ArchivedUnix 0}}data-is-archived{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-						<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
-					{{else if $.PageIsOrgSettingsLabels}}
-						<a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} {{if gt .ArchivedUnix 0}}data-is-archived{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-						<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
+						<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-modal-id="delete-label">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
 					{{end}}
 				</div>
 			</div>
@@ -72,7 +69,7 @@
 			{{range .OrgLabels}}
 			<li class="item org-label">
 				<div class="label-title">
-					{{RenderLabel $.Context ctx.Locale .}}
+					{{RenderLabel ctx .}}
 					{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
 				</div>
 				<div class="label-issues">
diff --git a/templates/repo/issue/labels/labels_selector_field.tmpl b/templates/repo/issue/labels/labels_selector_field.tmpl
index 9e54e7a649..8a931a9433 100644
--- a/templates/repo/issue/labels/labels_selector_field.tmpl
+++ b/templates/repo/issue/labels/labels_selector_field.tmpl
@@ -21,7 +21,7 @@
 					<div class="divider"></div>
 				{{end}}
 				{{$previousExclusiveScope = $exclusiveScope}}
-				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel $.Context ctx.Locale .}}
+				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel ctx .}}
 					{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
 					<p class="archived-label-hint">{{template "repo/issue/labels/label_archived" .}}</p>
 				</a>
@@ -34,7 +34,7 @@
 					<div class="divider"></div>
 				{{end}}
 				{{$previousExclusiveScope = $exclusiveScope}}
-				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel $.Context ctx.Locale .}}
+				<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}</span>&nbsp;&nbsp;{{RenderLabel ctx .}}
 					{{if .Description}}<br><small class="desc">{{.Description | RenderEmoji $.Context}}</small>{{end}}
 					<p class="archived-label-hint">{{template "repo/issue/labels/label_archived" .}}</p>
 				</a>
diff --git a/templates/repo/issue/milestone/clear_milestone.tmpl b/templates/repo/issue/milestone/clear_milestone.tmpl
new file mode 100644
index 0000000000..eb1b21fbfe
--- /dev/null
+++ b/templates/repo/issue/milestone/clear_milestone.tmpl
@@ -0,0 +1,3 @@
+<div hx-swap-oob="true" id="clear-milestone" class="{{if and .UseHTMX (or (and (not .OpenMilestones) (not .ClosedMilestones)) (not .Issue.Milestone))}}disabled {{end}}no-select item"{{if .UseHTMX}} hx-post="{{$.RepoLink}}/issues/milestone?issue_ids={{.Issue.ID}}&htmx=true"{{end}}>
+	{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}
+</div>
diff --git a/templates/repo/issue/milestone/select_menu.tmpl b/templates/repo/issue/milestone/select_menu.tmpl
index 570acc2eee..19b0049578 100644
--- a/templates/repo/issue/milestone/select_menu.tmpl
+++ b/templates/repo/issue/milestone/select_menu.tmpl
@@ -6,7 +6,7 @@
 	</div>
 	<div class="divider"></div>
 {{end}}
-<div class="no-select item"{{if $useHTMX}} hx-post="{{$.RepoLink}}/issues/milestone?issue_ids={{$.Issue.ID}}&htmx=true"{{end}}>{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
+{{template "repo/issue/milestone/clear_milestone" dict "." . "UseHTMX" $useHTMX}}
 {{if and (not .OpenMilestones) (not .ClosedMilestones)}}
 	<div class="disabled item">
 		{{ctx.Locale.Tr "repo.issues.new.no_items"}}
diff --git a/templates/repo/issue/milestone/selected.tmpl b/templates/repo/issue/milestone/selected.tmpl
new file mode 100644
index 0000000000..68acf1023c
--- /dev/null
+++ b/templates/repo/issue/milestone/selected.tmpl
@@ -0,0 +1,11 @@
+<div hx-swap-oob="true" id="selected-milestone" class="ui select-milestone list">
+		<span class="no-select item {{if .Issue.Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
+		<div class="selected">
+			{{if .Issue.Milestone}}
+				<a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}">
+					{{svg "octicon-milestone" 18 "tw-mr-2"}}
+					{{.Issue.Milestone.Name}}
+				</a>
+			{{end}}
+		</div>
+</div>
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl
index a070a02f72..1298a8138a 100644
--- a/templates/repo/issue/milestones.tmpl
+++ b/templates/repo/issue/milestones.tmpl
@@ -78,7 +78,7 @@
 								{{else}}
 									<a class="link-action flex-text-inline" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x" 14}}{{ctx.Locale.Tr "repo.milestones.close"}}</a>
 								{{end}}
-								<a class="delete-button flex-text-inline" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
+								<a class="delete-button flex-text-inline" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}" data-modal-id="delete-milestone">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
 							</div>
 						{{end}}
 					</div>
@@ -96,7 +96,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui g-modal-confirm delete modal">
+	<div class="ui g-modal-confirm delete modal" id="delete-milestone">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{ctx.Locale.Tr "repo.milestones.deletion"}}
diff --git a/templates/repo/issue/search.tmpl b/templates/repo/issue/search.tmpl
index 17abe263e7..bdbb9a9daf 100644
--- a/templates/repo/issue/search.tmpl
+++ b/templates/repo/issue/search.tmpl
@@ -8,6 +8,7 @@
 			<input type="hidden" name="project" value="{{$.ProjectID}}">
 			<input type="hidden" name="assignee" value="{{$.AssigneeID}}">
 			<input type="hidden" name="poster" value="{{$.PosterID}}">
+			<input type="hidden" name="sort" value="{{$.SortType}}">
 		{{end}}
 		{{if .PageIsPullList}}
 			{{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.pull_kind") "Tooltip" (ctx.Locale.Tr "explore.go_to")}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 8ede0f36e5..e9cba3601c 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -79,8 +79,19 @@
 				{{template "repo/issue/view_content/pull".}}
 			{{end}}
 
-			{{if and .IsSigned (not .IsBlocked)}}
-				{{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
+			{{if .Repository.IsArchived}}
+				<div class="ui warning message tw-text-center">
+					{{ctx.Locale.Tr "repo.archive.nocomment"}}
+				</div>
+			{{else if .IsBlocked}}
+				<div class="ui warning message">
+					{{ctx.Locale.Tr "repo.comment.blocked_by_user"}}
+				</div>
+			{{else if and .Issue.IsLocked (not (or .IsRepoAdmin .HasIssuesOrPullsWritePermission))}}
+				<div class="ui warning message">
+					{{ctx.Locale.Tr "discussion.locked"}}
+				</div>
+			{{else if .IsSigned}}
 				<div class="timeline-item comment form">
 					<a class="timeline-avatar" href="{{.SignedUser.HomeLink}}">
 						{{ctx.AvatarUtils.Avatar .SignedUser 40}}
@@ -114,38 +125,11 @@
 						</form>
 					</div>
 				</div>
-				{{else if .Repository.IsArchived}}
-					<div class="ui warning message tw-text-center">
-						{{if .Issue.IsPull}}
-							{{ctx.Locale.Tr "repo.archive.pull.nocomment"}}
-						{{else}}
-							{{ctx.Locale.Tr "repo.archive.issue.nocomment"}}
-						{{end}}
-					</div>
-				{{end}}
-			{{else if .IsBlocked}}
-				<div class="ui warning message">
-					{{if .Issue.IsPull}}
-						{{ctx.Locale.Tr "repo.pulls.comment.blocked_by_user"}}
-					{{else}}
-						{{ctx.Locale.Tr "repo.issues.comment.blocked_by_user"}}
-					{{end}}
-				</div>
 			{{else}} {{/* not .IsSigned */}}
-				{{if .Repository.IsArchived}}
-					<div class="ui warning message tw-text-center">
-						{{if .Issue.IsPull}}
-							{{ctx.Locale.Tr "repo.archive.pull.nocomment"}}
-						{{else}}
-							{{ctx.Locale.Tr "repo.archive.issue.nocomment"}}
-						{{end}}
-					</div>
-				{{else}}
-					<div class="ui warning message">
-						{{ctx.Locale.Tr "repo.issues.sign_in_require_desc" .SignInLink}}
-					</div>
-				{{end}}
-			{{end}}{{/* end if: .IsSigned */}}
+				<div class="ui warning message">
+					{{ctx.Locale.Tr "repo.issues.sign_in_require_desc" .SignInLink}}
+				</div>
+			{{end}}
 		</div>
 	</div>
 
@@ -184,7 +168,7 @@
 	<span class="no-content">{{ctx.Locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-branch">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.branch.delete" .HeadTarget}}
diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl
index 79085df3ab..8b5094771a 100644
--- a/templates/repo/issue/view_content/attachments.tmpl
+++ b/templates/repo/issue/view_content/attachments.tmpl
@@ -31,7 +31,7 @@
 				{{if FilenameIsImage .Name}}
 					{{if not (StringUtils.Contains (StringUtils.ToString $.RenderedContent) .UUID)}}
 					<a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}">
-						<img alt="{{.Name}}" src="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}">
+						<img alt="{{.Name}}" src="{{.DownloadURL}}" title="{{ctx.Locale.Tr "repo.issues.attachment.open_tab" .Name}}" loading="lazy">
 					</a>
 					{{end}}
 				{{end}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index f7d4f7c96e..3b097aacaf 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -1,7 +1,7 @@
 {{template "base/alert"}}
 {{range .Issue.Comments}}
 	{{if call $.ShouldShowCommentType .Type}}
-		{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
+		{{$createdStr := HTMLFormat `<a id="%s" href="#%s">%s</a>` .EventTag .HashTag (DateUtils.TimeSince .CreatedUnix)}}
 
 		<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
 		5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE,
@@ -87,9 +87,9 @@
 				<span class="text grey muted-links">
 					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
 					{{if .Issue.IsPull}}
-						{{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.pulls.reopened_at" $createdStr}}
 					{{else}}
-						{{ctx.Locale.Tr "repo.issues.reopened_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.issues.reopened_at" $createdStr}}
 					{{end}}
 				</span>
 			</div>
@@ -102,9 +102,9 @@
 				<span class="text grey muted-links">
 					{{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}}
 					{{if .Issue.IsPull}}
-						{{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.pulls.closed_at" $createdStr}}
 					{{else}}
-						{{ctx.Locale.Tr "repo.issues.closed_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.issues.closed_at" $createdStr}}
 					{{end}}
 				</span>
 			</div>
@@ -137,14 +137,13 @@
 			{{else if eq .RefAction 2}}
 				{{$refTr = "repo.issues.ref_reopening_from"}}
 			{{end}}
-			{{$createdStr:= DateUtils.TimeSince .CreatedUnix}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-bookmark"}}</span>
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
 				{{if eq .RefAction 3}}<del>{{end}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-					{{ctx.Locale.Tr $refTr .EventTag $createdStr (.RefCommentLink ctx) $refFrom}}
+					{{ctx.Locale.Tr $refTr $createdStr (.RefCommentLink ctx) $refFrom}}
 				</span>
 				{{if eq .RefAction 3}}</del>{{end}}
 
@@ -159,9 +158,9 @@
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
 					{{if .Issue.IsPull}}
-						{{ctx.Locale.Tr "repo.pulls.commit_ref_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.pulls.commit_ref_at" $createdStr}}
 					{{else}}
-						{{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}}
+						{{ctx.Locale.Tr "repo.issues.commit_ref_at" $createdStr}}
 					{{end}}
 				</span>
 				<div class="detail flex-text-block">
@@ -177,11 +176,11 @@
 					<span class="text grey muted-links">
 						{{template "shared/user/authorlink" .Poster}}
 						{{if and .AddedLabels (not .RemovedLabels)}}
-							{{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+							{{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels ctx .AddedLabels $.RepoLink .Issue.IsPull) $createdStr}}
 						{{else if and (not .AddedLabels) .RemovedLabels}}
-							{{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+							{{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels ctx .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels ctx .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels ctx .RemovedLabels $.RepoLink .Issue.IsPull) $createdStr}}
 						{{end}}
 					</span>
 				</div>
@@ -192,33 +191,53 @@
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-					{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.change_milestone_at" .OldMilestone.Name .Milestone.Name $createdStr}}{{else}}{{ctx.Locale.Tr "repo.issues.remove_milestone_at" .OldMilestone.Name $createdStr}}{{end}}{{else if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.add_milestone_at" .Milestone.Name $createdStr}}{{end}}
+					{{$newMilestoneDisplayHtml := ""}}
+					{{if gt .MilestoneID 0}}
+						{{if .Milestone.IsGhost}}
+							{{$newMilestoneDisplayHtml = .Milestone.Name}}
+						{{else}}
+							{{$newMilestoneDisplayHtml = HTMLFormat `<a href='%s/milestone/%d' rel='nofollow'>%s</a>` $.RepoLink .MilestoneID .Milestone.Name}}
+						{{end}}
+					{{end}}
+					{{$oldMilestoneDisplayHtml := ""}}
+					{{if gt .OldMilestoneID 0}}
+						{{if .OldMilestone.IsGhost}}
+							{{$oldMilestoneDisplayHtml = .OldMilestone.Name}}
+						{{else}}
+							{{$oldMilestoneDisplayHtml = HTMLFormat `<a href='%s/milestone/%d' rel='nofollow'>%s</a>` $.RepoLink .OldMilestoneID .OldMilestone.Name}}
+						{{end}}
+					{{end}}
+					{{if gt .OldMilestoneID 0}}
+						{{if gt .MilestoneID 0}}
+							{{ctx.Locale.Tr "repo.issues.change_milestone_at" $oldMilestoneDisplayHtml $newMilestoneDisplayHtml $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.remove_milestone_at" $oldMilestoneDisplayHtml $createdStr}}
+						{{end}}
+					{{else}}
+						{{ctx.Locale.Tr "repo.issues.add_milestone_at" $newMilestoneDisplayHtml $createdStr}}
+					{{end}}
 				</span>
 			</div>
 		{{else if and (eq .Type 9) (gt .AssigneeID 0)}}
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-person"}}</span>
-				{{if .RemovedAssignee}}
-					{{template "shared/user/avatarlink" dict "user" .Assignee}}
-					<span class="text grey muted-links">
-						{{template "shared/user/authorlink" .Assignee}}
+				{{template "shared/user/avatarlink" dict "user" .Assignee}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Assignee}}
+					{{if .RemovedAssignee}}
 						{{if eq .Poster.ID .Assignee.ID}}
 							{{ctx.Locale.Tr "repo.issues.remove_self_assignment" $createdStr}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.remove_assignee_at" .Poster.GetDisplayName $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.remove_assignee_at" (RenderUser $.Context .Poster) $createdStr}}
 						{{end}}
-					</span>
-				{{else}}
-					{{template "shared/user/avatarlink" dict "user" .Assignee}}
-					<span class="text grey muted-links">
-						{{template "shared/user/authorlink" .Assignee}}
+					{{else}}
 						{{if eq .Poster.ID .AssigneeID}}
 							{{ctx.Locale.Tr "repo.issues.self_assign_at" $createdStr}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.add_assignee_at" .Poster.GetDisplayName $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.add_assignee_at" (RenderUser $.Context .Poster) $createdStr}}
 						{{end}}
-					</span>
-				{{end}}
+					{{end}}
+				</span>
 			</div>
 		{{else if eq .Type 10}}
 			<div class="timeline-item event" id="{{.HashTag}}">
@@ -529,14 +548,15 @@
 					<span class="badge">{{svg "octicon-eye"}}</span>
 					{{template "shared/user/avatarlink" dict "user" .Poster}}
 					<span class="text grey muted-links">
+						{{template "shared/user/authorlink" .Poster}}
 						{{if and (eq (len .RemovedRequestReview) 1) (eq (len .AddedRequestReview) 0) (eq ((index .RemovedRequestReview 0).ID) .PosterID) (eq ((index .RemovedRequestReview 0).Type) "user")}}
 							<span class="review-request-list">{{ctx.Locale.Tr "repo.issues.review.remove_review_request_self" $createdStr}}</span>
 						{{else if and .AddedRequestReview (not .RemovedRequestReview)}}
-							{{ctx.Locale.TrN (len .AddedRequestReview) "repo.issues.review.add_review_request" "repo.issues.review.add_review_requests" (RenderReviewRequest .AddedRequestReview) $createdStr}}
+							{{ctx.Locale.TrN (len .AddedRequestReview) "repo.issues.review.add_review_request" "repo.issues.review.add_review_requests" (RenderReviewRequest $.Context .AddedRequestReview) $createdStr}}
 						{{else if and (not .AddedRequestReview) .RemovedRequestReview}}
-							{{ctx.Locale.TrN (len .RemovedRequestReview) "repo.issues.review.remove_review_request" "repo.issues.review.remove_review_requests" (RenderReviewRequest .RemovedRequestReview) $createdStr}}
+							{{ctx.Locale.TrN (len .RemovedRequestReview) "repo.issues.review.remove_review_request" "repo.issues.review.remove_review_requests" (RenderReviewRequest $.Context .RemovedRequestReview) $createdStr}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.review.add_remove_review_requests" (RenderReviewRequest .AddedRequestReview) (RenderReviewRequest .RemovedRequestReview) $createdStr}}
+							{{ctx.Locale.Tr "repo.issues.review.add_remove_review_requests" (RenderReviewRequest $.Context .AddedRequestReview) (RenderReviewRequest $.Context .RemovedRequestReview) $createdStr}}
 						{{end}}
 					</span>
 				</div>
@@ -549,18 +569,25 @@
 			<div class="timeline-item event" id="{{.HashTag}}">
 				<span class="badge">{{svg "octicon-repo-push"}}</span>
 				<span class="text grey muted-links">
-					{{template "shared/user/authorlink" .Poster}}
 					{{if .IsForcePush}}
-						{{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr "ui sha"}}
+						<span class="forced-push">
+							<span>
+								{{
+									template "shared/user/authorlink" .Poster}}
+									{{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr "ui sha"
+									(ExecuteTemplate ctx "repo/commit_statuses" (dict "Status" (index .Commits 0).Status "Statuses" (index .Commits 0).Statuses))
+									(ExecuteTemplate ctx "repo/commit_statuses" (dict "Status" (index .Commits 1).Status "Statuses" (index .Commits 1).Statuses))
+								}}
+							</span>
+							{{if $.Issue.PullRequest.BaseRepo.Name}}
+								<a href="{{$.Issue.PullRequest.BaseRepo.Link}}/compare/{{PathEscape .OldCommit}}..{{PathEscape .NewCommit}}" rel="nofollow" class="ui compare label">{{ctx.Locale.Tr "repo.issues.force_push_compare"}}</a>
+							{{end}}
+						</span>
 					{{else}}
+						{{template "shared/user/authorlink" .Poster}}
 						{{ctx.Locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr}}
 					{{end}}
 				</span>
-				{{if and .IsForcePush $.Issue.PullRequest.BaseRepo.Name}}
-				<span class="tw-float-right comparebox">
-					<a href="{{$.Issue.PullRequest.BaseRepo.Link}}/compare/{{PathEscape .OldCommit}}..{{PathEscape .NewCommit}}" rel="nofollow" class="ui compare label">{{ctx.Locale.Tr "repo.issues.force_push_compare"}}</a>
-				</span>
-				{{end}}
 			</div>
 			{{if not .IsForcePush}}
 				{{template "repo/commits_list_small" dict "comment" . "root" $}}
@@ -572,27 +599,33 @@
 				{{template "shared/user/avatarlink" dict "user" .Poster}}
 				<span class="text grey muted-links">
 					{{template "shared/user/authorlink" .Poster}}
-					{{$oldProjectDisplayHtml := "Unknown Project"}}
+					{{$oldProjectDisplayHtml := ""}}
 					{{if .OldProject}}
-						{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
-						{{if not .OldProject.IsGhost}}
-							{{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .OldProject.Type)}}
+						{{if .OldProject.IsGhost}}
+							{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+							{{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .OldProject.Title}}
+						{{else}}
+							{{$tooltip := ctx.Locale.Tr (printf "projects.type-%d.display_name" .OldProject.Type)}}
+							{{$oldProjectDisplayHtml = HTMLFormat `<a href="%s/projects/%d" rel="nofollow"><span data-tooltip-content="%s">%s</span></a>` $.RepoLink .OldProjectID $tooltip .OldProject.Title}}
 						{{end}}
-						{{$oldProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .OldProject.Title}}
 					{{end}}
-					{{$newProjectDisplayHtml := "Unknown Project"}}
+					{{$newProjectDisplayHtml := ""}}
 					{{if .Project}}
-						{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
-						{{if not .Project.IsGhost}}
-							{{$tooltip = ctx.Locale.Tr (printf "projects.type-%d.display_name" .Project.Type)}}
+						{{if .Project.IsGhost}}
+							{{$tooltip := ctx.Locale.Tr "projects.deleted.display_name"}}
+							{{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .Project.Title}}
+						{{else}}
+							{{$tooltip := ctx.Locale.Tr (printf "projects.type-%d.display_name" .Project.Type)}}
+							{{$newProjectDisplayHtml = HTMLFormat `<a href="%s/projects/%d" rel="nofollow"><span data-tooltip-content="%s">%s</span></a>` $.RepoLink .ProjectID $tooltip .Project.Title}}
 						{{end}}
-						{{$newProjectDisplayHtml = HTMLFormat `<span data-tooltip-content="%s">%s</span>` $tooltip .Project.Title}}
 					{{end}}
-					{{if and (gt .OldProjectID 0) (gt .ProjectID 0)}}
-						{{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}}
-					{{else if gt .OldProjectID 0}}
-						{{ctx.Locale.Tr "repo.issues.remove_project_at" $oldProjectDisplayHtml $createdStr}}
-					{{else if gt .ProjectID 0}}
+					{{if .OldProject}}
+						{{if .Project}}
+							{{ctx.Locale.Tr "repo.issues.change_project_at" $oldProjectDisplayHtml $newProjectDisplayHtml $createdStr}}
+						{{else}}
+							{{ctx.Locale.Tr "repo.issues.remove_project_at" $oldProjectDisplayHtml $createdStr}}
+						{{end}}
+					{{else}}
 						{{ctx.Locale.Tr "repo.issues.add_project_at" $newProjectDisplayHtml $createdStr}}
 					{{end}}
 				</span>
@@ -602,7 +635,7 @@
 			<div class="timeline-item-group">
 				<div class="timeline-item event" id="{{.HashTag}}">
 					<a class="timeline-avatar"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}>
-						<img src="{{.Poster.AvatarLink $.Context}}" alt="" width="40" height="40">
+						<img src="{{.Poster.AvatarLink $.Context}}" alt="" width="40" height="40" loading="lazy">
 					</a>
 					<span class="badge grey">{{svg "octicon-x" 16}}</span>
 					<span class="text grey muted-links">
@@ -692,18 +725,18 @@
 							<li>
 							<span class="badge tw-bg-green tw-text-white">{{svg "octicon-dot-fill"}}</span>
 							{{if .Issue.IsPull}}
-								{{ctx.Locale.Tr "repo.pulls.reopened_at" "" ""}}
+								{{ctx.Locale.Tr "repo.pulls.reopened_at" ""}}
 							{{else}}
-								{{ctx.Locale.Tr "repo.issues.reopened_at" "" ""}}
+								{{ctx.Locale.Tr "repo.issues.reopened_at" ""}}
 							{{end}}
 							</li>
 						{{else if and (not .Aggregator.PrevClosed) .Aggregator.IsClosed}}
 							<span class="badge tw-bg-red tw-text-white">{{svg "octicon-circle-slash"}}</span>
 							<li>
 							{{if .Issue.IsPull}}
-								{{ctx.Locale.Tr "repo.pulls.closed_at" "" ""}}
+								{{ctx.Locale.Tr "repo.pulls.closed_at" ""}}
 							{{else}}
-								{{ctx.Locale.Tr "repo.issues.closed_at" "" ""}}
+								{{ctx.Locale.Tr "repo.issues.closed_at" ""}}
 							{{end}}
 							</li>
 						{{end}}
@@ -713,11 +746,11 @@
 						<li>
 						<span class="badge">{{svg "octicon-tag" 20}}</span>
 						{{if and .AddedLabels (not .RemovedLabels)}}
-							{{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) ""}}
+							{{ctx.Locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels ctx .AddedLabels $.RepoLink .Issue.IsPull) ""}}
 						{{else if and (not .AddedLabels) .RemovedLabels}}
-							{{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) ""}}
+							{{ctx.Locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels ctx .RemovedLabels $.RepoLink .Issue.IsPull) ""}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels $.Context ctx.Locale .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels $.Context ctx.Locale .RemovedLabels $.RepoLink .Issue.IsPull) ""}}
+							{{ctx.Locale.Tr "repo.issues.add_remove_labels" (RenderLabels ctx .AddedLabels $.RepoLink .Issue.IsPull) (RenderLabels ctx .RemovedLabels $.RepoLink .Issue.IsPull) ""}}
 						{{end}}
 						</li>
 						{{end}}
@@ -730,11 +763,11 @@
 						{{if and (eq (len .RemovedRequestReview) 1) (eq (len .AddedRequestReview) 0) (eq ((index .RemovedRequestReview 0).ID) .PosterID) (eq ((index .RemovedRequestReview 0).Type) "user")}}
 							<span class="review-request-list">{{ctx.Locale.Tr "repo.issues.review.remove_review_request_self" ""}}</span>
 						{{else if and .AddedRequestReview (not .RemovedRequestReview)}}
-							{{ctx.Locale.TrN (len .AddedRequestReview) "repo.issues.review.add_review_request" "repo.issues.review.add_review_requests" (RenderReviewRequest .AddedRequestReview) ""}}
+							{{ctx.Locale.TrN (len .AddedRequestReview) "repo.issues.review.add_review_request" "repo.issues.review.add_review_requests" (RenderReviewRequest  $.Context .AddedRequestReview) ""}}
 						{{else if and (not .AddedRequestReview) .RemovedRequestReview}}
-							{{ctx.Locale.TrN (len .RemovedRequestReview) "repo.issues.review.remove_review_request" "repo.issues.review.remove_review_requests" (RenderReviewRequest .RemovedRequestReview) ""}}
+							{{ctx.Locale.TrN (len .RemovedRequestReview) "repo.issues.review.remove_review_request" "repo.issues.review.remove_review_requests" (RenderReviewRequest $.Context .RemovedRequestReview) ""}}
 						{{else}}
-							{{ctx.Locale.Tr "repo.issues.review.add_remove_review_requests" (RenderReviewRequest .AddedRequestReview) (RenderReviewRequest .RemovedRequestReview) ""}}
+							{{ctx.Locale.Tr "repo.issues.review.add_remove_review_requests" (RenderReviewRequest $.Context .AddedRequestReview) (RenderReviewRequest $.Context .RemovedRequestReview) ""}}
 						{{end}}
 
 						</span>
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl
index 5fc5af400f..8cd4a056f0 100644
--- a/templates/repo/issue/view_content/context_menu.tmpl
+++ b/templates/repo/issue/view_content/context_menu.tmpl
@@ -11,7 +11,7 @@
 		{{end}}
 		<div class="item context js-aria-clickable" data-clipboard-text-type="url" data-clipboard-text="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.copy_link"}}</div>
 		{{if and .ctxData.IsSigned (not .ctxData.Repository.IsArchived)}}
-			<div class="item context js-aria-clickable quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-content" data-author="{{.item.Poster.Name}}" data-reference-url="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}</div>
+			<div class="item context js-aria-clickable quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.HashTag}}-content" data-author="{{.item.Poster.Name}}" data-reference-url="{{$referenceUrl}}" data-context="{{.ctxData.Repository.Link}}">{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}</div>
 			{{if not .ctxData.UnitIssuesGlobalDisabled}}
 				<div class="item context js-aria-clickable reference-issue" data-target="{{.item.HashTag}}-raw" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-poster-username="{{.item.Poster.Name}}" data-reference="{{$referenceUrl}}">{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}</div>
 			{{end}}
@@ -23,5 +23,13 @@
 				{{end}}
 			{{end}}
 		{{end}}
+		{{if and .ctxData.IsModerationEnabled .ctxData.IsSigned (not .IsCommentPoster)}}
+			{{$contentType := "comment"}}
+			{{if eq .item .ctxData.Issue}}
+				{{if .ctxData.Issue.IsPull}} {{$contentType = "pull"}} {{else}} {{$contentType = "issue"}} {{end}}
+			{{end}}
+			<div class="divider"></div>
+			<a class="item context" href="{{AppSubUrl}}/report_abuse?type={{$contentType}}&id={{.item.ID}}">{{ctx.Locale.Tr "moderation.report_content"}}</a>
+		{{end}}
 	</div>
 </div>
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 58d85dbf1b..c03d40674b 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -45,7 +45,7 @@
 							</div>
 						</div>
 						<div class="item-section-right">
-							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
+							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}" data-modal-id="delete-branch">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
 						</div>
 					</div>
 				{{end}}
@@ -63,7 +63,7 @@
 					</div>
 					{{if and .IsPullBranchDeletable (not .IsPullRequestBroken)}}
 						<div class="item-section-right">
-							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
+							<button class="delete-button ui button" data-url="{{.DeleteBranchLink}}" data-modal-id="delete-branch">{{ctx.Locale.Tr "repo.branch.delete_html"}}</button>
 						</div>
 					{{end}}
 				</div>
@@ -199,7 +199,7 @@
 
 				{{if .AllowMerge}} {{/* user is allowed to merge */}}
 					{{$prUnit := .Repository.MustGetUnit $.Context $.UnitTypePullRequests}}
-					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash $prUnit.PullRequestsConfig.AllowFastForwardOnly}}
+					{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash $prUnit.PullRequestsConfig.AllowFastForwardOnly $prUnit.PullRequestsConfig.AllowManualMerge}}
 						{{$hasPendingPullRequestMergeTip := ""}}
 						{{if .HasPendingPullRequestMerge}}
 							{{$createdPRMergeStr := DateUtils.TimeSince .PendingPullRequestMerge.CreatedUnix}}
diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
index b7aae53424..dd30a3a8d6 100644
--- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl
+++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl
@@ -12,7 +12,7 @@
 		{{else}}
 			<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
 		{{end}}
-		<div>git checkout {{$localBranch}}</div>
+		<div>git switch {{$localBranch}}</div>
 	</div>
 	{{if .ShowMergeInstructions}}
 	<div id="merge-instructions">
@@ -24,31 +24,31 @@
 	</div>
 	<div class="ui secondary segment">
 		<div data-pull-merge-style="merge">
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge --no-ff {{$localBranch}}</div>
 		</div>
 		<div class="tw-hidden" data-pull-merge-style="rebase">
-			<div>git checkout {{$localBranch}}</div>
+			<div>git switch {{$localBranch}}</div>
 			<div>git rebase {{.PullRequest.BaseBranch}}</div>
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge --ff-only {{$localBranch}}</div>
 		</div>
 		<div class="tw-hidden" data-pull-merge-style="rebase-merge">
-			<div>git checkout {{$localBranch}}</div>
+			<div>git switch {{$localBranch}}</div>
 			<div>git rebase {{.PullRequest.BaseBranch}}</div>
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge --no-ff {{$localBranch}}</div>
 		</div>
 		<div class="tw-hidden" data-pull-merge-style="squash">
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge --squash {{$localBranch}}</div>
 		</div>
 		<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge --ff-only {{$localBranch}}</div>
 		</div>
 		<div class="tw-hidden" data-pull-merge-style="manually-merged">
-			<div>git checkout {{.PullRequest.BaseBranch}}</div>
+			<div>git switch {{.PullRequest.BaseBranch}}</div>
 			<div>git merge {{$localBranch}}</div>
 		</div>
 		<div>git push origin {{.PullRequest.BaseBranch}}</div>
diff --git a/templates/repo/issue/view_content/sidebar/milestones.tmpl b/templates/repo/issue/view_content/sidebar/milestones.tmpl
index 44d9419f9b..ffcd87e8fd 100644
--- a/templates/repo/issue/view_content/sidebar/milestones.tmpl
+++ b/templates/repo/issue/view_content/sidebar/milestones.tmpl
@@ -1,4 +1,4 @@
-<div id="milestone-section" hx-swap="morph" hx-target="this" hx-indicator="this">
+<div id="milestone-section" hx-swap="morph" hx-target="#selected-milestone" hx-indicator="this">
 	<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
 		<a class="text muted flex-text-block">
 			<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong>
@@ -10,15 +10,5 @@
 			{{template "repo/issue/milestone/select_menu" .}}
 		</div>
 	</div>
-	<div class="ui select-milestone list">
-		<span class="no-select item {{if .Issue.Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
-		<div class="selected">
-			{{if .Issue.Milestone}}
-				<a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}">
-					{{svg "octicon-milestone" 18 "tw-mr-2"}}
-					{{.Issue.Milestone.Name}}
-				</a>
-			{{end}}
-		</div>
-	</div>
+	{{template "repo/issue/milestone/selected" .}}
 </div>
diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl
index bbbc099558..5083b97fc2 100644
--- a/templates/repo/issue/view_content/sidebar/reference.tmpl
+++ b/templates/repo/issue/view_content/sidebar/reference.tmpl
@@ -1,7 +1,19 @@
-<div class="ui equal width compact grid">
-	{{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
-	<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
-		<span class="text column truncate">{{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}}</span>
-		<button class="ui two wide button column tw-p-2" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
+<div class="ui reference">
+	{{$issueReferenceLink := ""}}
+	{{if .Issue.IsPull}}
+		{{$issueReferenceLink = printf "%s!%d" .Issue.Repo.FullName .Issue.Index}}
+	{{else}}
+		{{$issueReferenceLink = printf "%s#%d" .Issue.Repo.FullName .Issue.Index}}
+	{{end}}
+	<span class="text">
+		<strong>
+			{{ctx.Locale.Tr "discussion.sidebar.reference"}}
+		</strong>
+	</span>
+	<div class="ui equal width compact grid">
+		<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
+			<span class="text column truncate">{{$issueReferenceLink}}</span>
+			<button class="ui two wide button column tw-p-2" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
+		</div>
 	</div>
 </div>
diff --git a/templates/repo/latest_commit.tmpl b/templates/repo/latest_commit.tmpl
index 222d582cd3..d19d8d9f9b 100644
--- a/templates/repo/latest_commit.tmpl
+++ b/templates/repo/latest_commit.tmpl
@@ -14,12 +14,12 @@
 			<span class="author-wrapper" title="{{.LatestCommit.Author.Name}}"><strong>{{.LatestCommit.Author.Name}}</strong></span>
 		{{end}}
 	{{end}}
-	<a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified}} isVerified{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}Untrusted{{else}}Unmatched{{end}}{{else if .LatestCommitVerification.Warning}} isWarning{{end}}{{end}}" href="{{.RepoLink}}/commit/{{PathEscape .LatestCommit.ID.String}}">
-		<span class="shortsha">{{ShortSha .LatestCommit.ID.String}}</span>
-		{{if .LatestCommit.Signature}}
-			{{template "repo/shabox_badge" dict "root" $ "verification" .LatestCommitVerification}}
-		{{end}}
-	</a>
+	{{template "repo/shabox" (dict
+		"sha1" .LatestCommit.ID.String
+		"commitLink" (printf "%s/commit/%s" .RepoLink (.LatestCommit.ID.String|PathEscape))
+		"signature" .LatestCommit.Signature
+		"verification" .LatestCommitVerification
+	)}}
 	{{template "repo/commit_statuses" dict "Status" .LatestCommitStatus "Statuses" .LatestCommitStatuses}}
 	{{$commitLink:= printf "%s/commit/%s" .RepoLink (PathEscape .LatestCommit.ID.String)}}
 	<span class="grey commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject $.Context .LatestCommit.Message $commitLink ($.Repository.ComposeMetas ctx)}}</span>
diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl
index cf46c8daf3..1343e52cdc 100644
--- a/templates/repo/migrate/codebase.tmpl
+++ b/templates/repo/migrate/codebase.tmpl
@@ -13,7 +13,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
@@ -109,7 +109,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl
index 5ebf4cfd6a..981260de5a 100644
--- a/templates/repo/migrate/git.tmpl
+++ b/templates/repo/migrate/git.tmpl
@@ -13,7 +13,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl
index e8d6b60dea..b8d82eb7e2 100644
--- a/templates/repo/migrate/gitbucket.tmpl
+++ b/templates/repo/migrate/gitbucket.tmpl
@@ -13,7 +13,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl
index 2f40d58bec..baaff53d8d 100644
--- a/templates/repo/migrate/gitea.tmpl
+++ b/templates/repo/migrate/gitea.tmpl
@@ -12,7 +12,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 							{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
@@ -121,7 +121,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl
index 91c1a272c7..a23baf9780 100644
--- a/templates/repo/migrate/github.tmpl
+++ b/templates/repo/migrate/github.tmpl
@@ -12,7 +12,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}
 						</span>
@@ -123,7 +123,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl
index d93a00104a..03edf5c787 100644
--- a/templates/repo/migrate/gitlab.tmpl
+++ b/templates/repo/migrate/gitlab.tmpl
@@ -12,7 +12,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
@@ -120,7 +120,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl
index 6c647be0ed..52da3d243b 100644
--- a/templates/repo/migrate/gogs.tmpl
+++ b/templates/repo/migrate/gogs.tmpl
@@ -12,7 +12,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 							{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
@@ -120,7 +120,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl
index c5c697edff..9d10bba49d 100644
--- a/templates/repo/migrate/migrate.tmpl
+++ b/templates/repo/migrate/migrate.tmpl
@@ -1,31 +1,26 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
-	<div class="ui middle very relaxed page grid">
-		<div class="column">
-			{{template "repo/migrate/helper" .}}
-			<div class="ui cards migrate-entries">
-				{{range .Services}}
-					<a class="ui card migrate-entry tw-flex tw-items-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
-						{{if eq .Name "github"}}
-							{{svg "octicon-mark-github" 184 "tw-p-4"}}
-						{{else if eq .Name "gitlab"}}
-							{{svg "gitea-gitlab" 184 "tw-p-4"}}
-						{{else if eq .Name "gitbucket"}}
-							{{svg "gitea-gitbucket" 184 "tw-p-4"}}
-						{{else}}
-							{{svg (printf "gitea-%s" .Name) 184}}
-						{{end}}
-						<div class="content">
-							<div class="header tw-text-center">
-								{{.Title}}
-							</div>
-							<div class="description tw-text-center">
-								{{ctx.Locale.Tr (printf "repo.migrate.%s.description" .Name)}}
-							</div>
+	<div class="ui container">
+		<h2 class="tw-mt-4">Migrate repository</h1>
+		{{template "repo/migrate/helper" .}}
+		<div class="migrate-entries">
+			{{range .Services}}
+				<a class="migrate-entry tw-items-center" href="{{AppSubUrl}}/repo/migrate?service_type={{.}}&org={{$.Org}}&mirror={{$.Mirror}}">
+					{{if eq .Name "github"}}
+						{{svg "octicon-mark-github" 184}}
+					{{else}}
+						{{svg (printf "gitea-%s" .Name) 184}}
+					{{end}}
+					<div class="content">
+						<h3>
+							{{.Title}}
+						</h3>
+						<div class="description">
+							{{ctx.Locale.Tr (printf "repo.migrate.%s.description" .Name)}}
 						</div>
-					</a>
-				{{end}}
-			</div>
+					</div>
+				</a>
+			{{end}}
 		</div>
 	</div>
 </div>
diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl
index ec155555d0..0434bcbe68 100644
--- a/templates/repo/migrate/onedev.tmpl
+++ b/templates/repo/migrate/onedev.tmpl
@@ -13,7 +13,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
 						<label for="clone_addr">{{ctx.Locale.Tr "repo.migrate.clone_address"}}</label>
-						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
 						<span class="help">
 						{{ctx.Locale.Tr "repo.migrate.clone_address_desc"}}{{if .ContextUser.CanImportLocal}} {{ctx.Locale.Tr "repo.migrate.clone_local_path"}}{{end}}
 						</span>
@@ -109,7 +109,7 @@
 					</div>
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{ctx.Locale.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="description" maxlength="2048">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="2048" placeholder="{{ctx.Locale.Tr "repo.migrate.repo_desc_helper"}}">{{.description}}</textarea>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/repo/migrate/pagure.tmpl b/templates/repo/migrate/pagure.tmpl
new file mode 100644
index 0000000000..60dc8cb380
--- /dev/null
+++ b/templates/repo/migrate/pagure.tmpl
@@ -0,0 +1,118 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository new migrate">
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<form class="ui form" action="{{.Link}}" method="post">
+				{{template "base/disable_form_autofill"}}
+				{{.CsrfTokenHtml}}
+				<h3 class="ui top attached header">
+					{{ctx.Locale.Tr "repo.migrate.migrate" .service.Title}}
+					<input id="service_type" type="hidden" name="service" value="{{.service}}">
+				</h3>
+				<div class="ui attached segment">
+					{{template "base/alert" .}}
+					<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
+						<label for="clone_addr">{{ctx.Locale.Tr "migrate.pagure.project_url"}}</label>
+						<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required autocomplete="url">
+						<span class="help">
+							{{ctx.Locale.Tr "migrate.pagure.project_example"}}
+							{{if .Err_CloneAddr}}
+								{{ctx.Locale.Tr "migrate.pagure.incorrect_url"}}
+							{{end}}
+						</span>
+					</div>
+					<div class="inline required field {{if .Err_RepoName}}error{{end}}">
+						<label for="repo_name">{{ctx.Locale.Tr "repo.repo_name"}}</label>
+						<input id="repo_name" name="repo_name" value="{{.repo_name}}" required maxlength="100">
+					</div>
+					{{template "repo/migrate/options" .}}
+					<div id="migrate_items">
+						<div class="inline field">
+							<label>{{ctx.Locale.Tr "repo.migrate_items"}}</label>
+							<div class="ui checkbox">
+								<input name="issues" type="checkbox" {{if .issues}}checked{{end}}>
+								<label>{{ctx.Locale.Tr "repo.migrate_items_issues"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="pull_requests" type="checkbox" {{if .pull_requests}}checked{{end}}>
+								<label>{{ctx.Locale.Tr "repo.migrate_items_pullrequests"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="labels" type="checkbox" {{if .labels}}checked{{end}}>
+								<label>{{ctx.Locale.Tr "repo.migrate_items_labels"}}</label>
+							</div>
+						</div>
+						<div class="inline field">
+							<label></label>
+							<div class="ui checkbox">
+								<input name="milestones" type="checkbox" {{if .milestones}}checked{{end}}>
+								<label>{{ctx.Locale.Tr "repo.migrate_items_milestones"}}</label>
+							</div>
+						</div>
+					</div>
+					<div class="divider"></div>
+					<div class="inline required field {{if .Err_Owner}}error{{end}}">
+						<label>{{ctx.Locale.Tr "repo.owner"}}</label>
+						<div class="ui selection owner dropdown">
+							<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
+							<span class="text truncated-item-container" title="{{.ContextUser.Name}}">
+								{{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}}
+								<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
+							</span>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+							<div class="menu" title="{{.SignedUser.Name}}">
+								<div class="item truncated-item-container" data-value="{{.SignedUser.ID}}">
+									{{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}}
+									<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
+								</div>
+								{{range .Orgs}}
+									<div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}">
+										{{ctx.AvatarUtils.Avatar . 28 "mini"}}
+										<span class="truncated-item-name">{{.ShortName 40}}</span>
+									</div>
+								{{end}}
+							</div>
+						</div>
+					</div>
+					<div class="inline field">
+						<label>{{ctx.Locale.Tr "repo.visibility"}}</label>
+						<div class="ui checkbox">
+							<input name="private" type="checkbox"
+								{{if .IsForcedPrivate}}
+									checked disabled
+								{{else}}
+									{{if .private}}checked{{end}}
+								{{end}}>
+							<label>{{ctx.Locale.Tr "repo.visibility_helper"}}</label>
+						</div>
+						{{if .IsForcedPrivate}}
+							<span class="help">{{ctx.Locale.Tr "repo.visibility_helper_forced"}}</span>
+						{{end}}
+						<span class="help">{{ctx.Locale.Tr "repo.visibility_description"}}</span>
+					</div>
+					<div class="divider"></div>
+					<div class="inline field {{if .Err_Auth}}error{{end}}">
+						<label for="auth_token">{{ctx.Locale.Tr "migrate.pagure.token_label"}}</label>
+						<input id="auth_token" name="auth_token" value="{{.auth_token}}" {{if not .auth_token}}data-need-clear="true"{{end}}>
+						<span class="help">{{ctx.Locale.Tr "migrate.pagure.token_body_a"}}</span>
+						<span class="help">{{ctx.Locale.Tr "migrate.pagure.token_body_b"}}</span>
+					</div>
+					<div class="divider"></div>
+					<div class="inline field">
+						<label></label>
+						<button class="ui primary button">
+							{{ctx.Locale.Tr "repo.migrate_repo"}}
+						</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index b2471dc17e..7536b96c63 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -1,14 +1,18 @@
+{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
+
 <div class="ui fluid vertical menu">
 	<a class="{{if .PageIsPulse}}active {{end}}item" href="{{.RepoLink}}/activity">
 		{{ctx.Locale.Tr "repo.activity.navbar.pulse"}}
 	</a>
-	<a class="{{if .PageIsContributors}}active {{end}}item" href="{{.RepoLink}}/activity/contributors">
-		{{ctx.Locale.Tr "repo.activity.navbar.contributors"}}
-	</a>
-	<a class="{{if .PageIsCodeFrequency}}active{{end}} item" href="{{.RepoLink}}/activity/code-frequency">
-		{{ctx.Locale.Tr "repo.activity.navbar.code_frequency"}}
-	</a>
-	<a class="{{if .PageIsRecentCommits}}active{{end}} item" href="{{.RepoLink}}/activity/recent-commits">
-		{{ctx.Locale.Tr "repo.activity.navbar.recent_commits"}}
-	</a>
+	{{if $canReadCode}}
+		<a class="{{if .PageIsContributors}}active {{end}}item" href="{{.RepoLink}}/activity/contributors">
+			{{ctx.Locale.Tr "repo.activity.navbar.contributors"}}
+		</a>
+		<a class="{{if .PageIsCodeFrequency}}active{{end}} item" href="{{.RepoLink}}/activity/code-frequency">
+			{{ctx.Locale.Tr "repo.activity.navbar.code_frequency"}}
+		</a>
+		<a class="{{if .PageIsRecentCommits}}active{{end}} item" href="{{.RepoLink}}/activity/recent-commits">
+			{{ctx.Locale.Tr "repo.activity.navbar.recent_commits"}}
+		</a>
+	{{end}}
 </div>
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 082fc8eb92..3fdecf5cc3 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -49,7 +49,7 @@
 			</div>
 			{{else}}
 			<div class="stats-table">
-				<a class="table-cell tiny background light grey"></a>
+				<a class="table-cell tiny tw-bg-grey"></a>
 			</div>
 			{{end}}
 			{{ctx.Locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index 54571f065a..bcd14719f6 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -98,17 +98,17 @@
 									{{range $release.Attachments}}
 										{{if .ExternalURL}}
 											<li>
-												<a class="tw-flex-1 flex-text-inline tw-font-bold" target="_blank" rel="nofollow" href="{{.DownloadURL}}" download>
+												<a class="tw-flex-1 flex-text-inline tw-font-bold" target="_blank" rel="nofollow" href="{{.DownloadURL}}">
 													{{svg "octicon-link-external" 16 "tw-mr-1"}}{{.Name}}
 												</a>
 											</li>
 										{{else}}
-											<li>
+											<li class="max-sm:tw-flex-col max-sm:tw-gap-2">
 												<a class="tw-flex-1 flex-text-inline tw-font-bold" target="_blank" rel="nofollow" href="{{.DownloadURL}}" download>
 													{{svg "octicon-package" 16 "tw-mr-1"}}{{.Name}}
 												</a>
 												<div>
-													<span class="text grey">{{ctx.Locale.TrN .DownloadCount "repo.release.download_count_one" "repo.release.download_count_few" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{.Size | ctx.Locale.TrSize}}</span>
+													<span class="text grey">{{ctx.Locale.TrN .DownloadCount "repo.release.download_count_one" "repo.release.download_count_few" (ctx.Locale.PrettyNumber .DownloadCount)}} · {{DateUtils.TimeSince .CreatedUnix}} · {{.Size | ctx.Locale.TrSize}}</span>
 												</div>
 											</li>
 										{{end}}
@@ -126,17 +126,4 @@
 	</div>
 </div>
 
-{{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-	<div class="ui g-modal-confirm delete modal">
-		<div class="header">
-			{{svg "octicon-trash"}}
-			{{ctx.Locale.Tr "repo.release.delete_tag"}}
-		</div>
-		<div class="content">
-			<p>{{ctx.Locale.Tr "repo.release.deletion_tag_desc"}}</p>
-		</div>
-		{{template "base/modal_actions_confirm" .}}
-	</div>
-{{end}}
-
 {{template "base/footer" .}}
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 788d7f015c..e0cb40b956 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -46,7 +46,7 @@
 			</div>
 			<div class="eleven wide tw-pt-0">
 				<div class="field {{if .Err_Title}}error{{end}}">
-					<input id="release-title" name="title" aria-label="{{ctx.Locale.Tr "repo.release.title"}}" placeholder="{{ctx.Locale.Tr "repo.release.title"}}" value="{{.tag_name}}" autofocus maxlength="255">
+					<input id="release-title" name="title" aria-label="{{ctx.Locale.Tr "repo.release.title"}}" placeholder="{{ctx.Locale.Tr "repo.release.title"}}" value="{{if .PageIsEditRelease}}{{.title}}{{else}}{{.tag_name}}{{end}}" autofocus maxlength="255">
 				</div>
 				<div class="field">
 					{{template "shared/combomarkdowneditor" (dict
@@ -139,7 +139,7 @@
 							<a class="ui small button" href="{{.RepoLink}}/releases">
 								{{ctx.Locale.Tr "repo.release.cancel"}}
 							</a>
-							<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}">
+							<a class="ui small red button delete-button" data-url="{{$.RepoLink}}/releases/delete" data-id="{{.ID}}" data-modal-id="delete-release">
 								{{ctx.Locale.Tr "repo.release.delete_release"}}
 							</a>
 							{{if .IsDraft}}
@@ -169,7 +169,7 @@
 </div>
 
 {{if .PageIsEditRelease}}
-	<div class="ui g-modal-confirm delete modal">
+	<div class="ui g-modal-confirm delete modal" id="delete-release">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{ctx.Locale.Tr "repo.release.deletion"}}
diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl
index 63d0689c50..75a115e31e 100644
--- a/templates/repo/release_tag_header.tmpl
+++ b/templates/repo/release_tag_header.tmpl
@@ -2,24 +2,23 @@
 {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
 
 {{if $canReadReleases}}
-	<div class="tw-flex">
-		<div class="tw-flex-1 tw-flex tw-items-center">
-			<h2 class="ui compact small menu small-menu-items">
-				<a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases{{if .Keyword}}?q={{.Keyword}}{{end}}">{{ctx.Locale.TrN .NumReleases "repo.n_release_one" "repo.n_release_few" (ctx.Locale.PrettyNumber .NumReleases)}}</a>
-				{{if $canReadCode}}
-					<a class="{{if or .PageIsTagList .PageIsSingleTag}}active {{end}}item" href="{{.RepoLink}}/tags{{if .Keyword}}?q={{.Keyword}}{{end}}">{{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (ctx.Locale.PrettyNumber .NumTags)}}</a>
-				{{end}}
-			</h2>
+	<div class="list-header">
+		<div class="switch">
+			<a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases{{if .Keyword}}?q={{.Keyword}}{{end}}">{{ctx.Locale.TrN .NumReleases "repo.n_release_one" "repo.n_release_few" (ctx.Locale.PrettyNumber .NumReleases)}}</a>
+			{{if $canReadCode}}
+				<a class="{{if or .PageIsTagList .PageIsSingleTag}}active {{end}}item" href="{{.RepoLink}}/tags{{if .Keyword}}?q={{.Keyword}}{{end}}">{{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (ctx.Locale.PrettyNumber .NumTags)}}</a>
+			{{end}}
 		</div>
 		{{if .ShowReleaseSearch}}
-			<form class="ignore-dirty tw-w-1/5 tw-mr-3" method="get">
+			<form class="ignore-dirty list-header-search release-list-search" method="get">
 				{{template "shared/search/combo" dict "Value" .Keyword}}
 			</form>
 		{{end}}
-		<div class="button-row">
+		<div class="button-sequence release-list-buttons">
 			{{if .EnableFeed}}
-				<a class="ui small button tw-h-full" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
-					{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}}
+				<a class="ui small button" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
+					{{svg "octicon-rss" 16}}
+					<label class="not-mobile">{{ctx.Locale.Tr "rss_feed"}}</label>
 				</a>
 			{{end}}
 			{{if and (not .PageIsTagList) .CanCreateRelease}}
diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl
index 52c0c2c800..3a36ebb759 100644
--- a/templates/repo/settings/branches.tmpl
+++ b/templates/repo/settings/branches.tmpl
@@ -49,7 +49,7 @@
 							</div>
 							<div class="flex-item-trailing">
 								<a class="rm ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{ctx.Locale.Tr "repo.settings.edit_protected_branch"}}</a>
-								<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
+								<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}" data-modal-id="delete-protected-branch">
 									{{ctx.Locale.Tr "repo.settings.protected_branch.delete_rule"}}
 								</button>
 							</div>
@@ -64,7 +64,7 @@
 		{{end}}
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-protected-branch">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.settings.protected_branch_deletion"}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index 8028642a7d..2da597dbe9 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -29,7 +29,7 @@
 									</div>
 								</div>
 							</div>
-							<button class="ui red tiny button inline delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+							<button class="ui red tiny button inline delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-modal-id="delete-collaborator">
 								{{ctx.Locale.Tr "repo.settings.delete_collaborator"}}
 							</button>
 						</div>
@@ -75,7 +75,7 @@
 						</div>
 						{{if $allowedToChangeTeams}}
 							<div class="flex-item-trailing" {{if .IncludesAllRepositories}} data-tooltip-content="{{ctx.Locale.Tr "repo.settings.delete_team_tip"}}"{{end}}>
-								<button class="ui red tiny button inline delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}">
+								<button class="ui red tiny button inline delete-button {{if .IncludesAllRepositories}}disabled{{end}}" data-url="{{$.Link}}/team/delete" data-id="{{.ID}}" data-modal-id="delete-collaborator">
 										{{ctx.Locale.Tr "repo.settings.delete_collaborator"}}
 								</button>
 							</div>
@@ -103,7 +103,7 @@
 		{{end}}
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-collaborator">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.settings.collaborator_deletion"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 91ef1df623..240f06241c 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -59,7 +59,7 @@
 								</div>
 							</div>
 							<div class="flex-item-trailing">
-								<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+								<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-modal-id="delete-deploy-key">
 									{{ctx.Locale.Tr "settings.delete_key"}}
 								</button>
 							</div>
@@ -72,7 +72,7 @@
 		</div>
 	</div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-deploy-key">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.settings.deploy_key_deletion"}}
diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl
index 3b6b763536..00bbae616a 100644
--- a/templates/repo/settings/lfs_file.tmpl
+++ b/templates/repo/settings/lfs_file.tmpl
@@ -31,7 +31,15 @@
 									<strong>{{ctx.Locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
 								</audio>
 							{{else if .IsPDFFile}}
-								<div class="pdf-content is-loading" data-src="{{$.RawFileLink}}" data-fallback-button-text="{{ctx.Locale.Tr "repo.diff.view_file"}}"></div>
+								<lazy-webc tag="pdf-object" src="{{$.RawFileLink}}">
+									<a href="{{$.RawFileLink}}" class="ui basic button">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
+								</lazy-webc>
+							{{else if .Is3DModelFile}}
+								{{if .IsGLBFile}}
+									<lazy-webc tag="model-viewer" src="{{$.RawFileLink}}" ar shadow-intensity="2" camera-controls touch-action="pan-y"></lazy-webc>
+								{{else}}
+									<a href="{{$.RawFileLink}}" rel="nofollow">{{ctx.Locale.Tr "repo.file_view_raw"}}!</a>
+								{{end}}
 							{{else}}
 								<a href="{{$.RawFileLink}}" rel="nofollow">{{ctx.Locale.Tr "repo.file_view_raw"}}</a>
 							{{end}}
diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl
index 4c6943618e..e5e508d019 100644
--- a/templates/repo/settings/lfs_file_find.tmpl
+++ b/templates/repo/settings/lfs_file_find.tmpl
@@ -26,11 +26,15 @@
 								{{if .ParentHashes}}
 									{{ctx.Locale.Tr "repo.diff.parent"}}
 									{{range .ParentHashes}}
-										<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">{{ShortSha .String}}</a>
+										<a class="primary sha label" href="{{$.RepoLink}}/commit/{{.String}}">
+											<span class="shortsha">{{ShortSha .String}}</span>
+										</a>
 									{{end}}
 								{{end}}
 								{{ctx.Locale.Tr "repo.diff.commit"}}
-								<a class="ui primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">{{ShortSha .SHA}}</a>
+								<a class="primary sha label" href="{{$.RepoLink}}/commit/{{.SHA}}">
+									<span class="shortsha">{{ShortSha .SHA}}</span>
+								</a>
 							</td>
 							<td>{{DateUtils.TimeSince .When}}</td>
 						</tr>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 0f6cb74d8c..6e9f396e2e 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -7,7 +7,7 @@
 		<details class="item toggleable-item" {{if .PageIsRepoSettingsUnits}}open{{end}}>
 			<summary {{if .PageIsRepoSettingsUnits}}class="active"{{end}}>{{ctx.Locale.Tr "repo.settings.units.units"}}</summary>
 			<div class="menu">
-				<a class="item" href="{{.RepoLink}}/settings/units#overview">
+				<a class="item" href="{{.RepoLink}}/settings/units">
 					{{ctx.Locale.Tr "repo.settings.units.overview"}}
 				</a>
 				<a class="item" href="{{.RepoLink}}/settings/units#issues">
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index c466541382..ff15aff59f 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -56,6 +56,7 @@
 				<div class="inline field">
 					<label for="avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label>
 					<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
+					<br/><span class=help>{{ctx.Locale.Tr "avatar.constraints_hint" (ctx.Locale.TrSize .MaxAvatarFileSize) .MaxAvatarWidth .MaxAvatarHeight}}</span>
 				</div>
 				<div class="field">
 					<button class="ui primary button">{{ctx.Locale.Tr "settings.update_avatar"}}</button>
@@ -253,6 +254,7 @@
 										data-modal-push-mirror-edit-id="{{.ID}}"
 										data-modal-push-mirror-edit-interval="{{.Interval}}"
 										data-modal-push-mirror-edit-address="{{.RemoteAddress}}"
+										data-modal-push-mirror-edit-branch-filter="{{.BranchFilter}}"
 									>
 										{{svg "octicon-pencil" 14}}
 									</button>
@@ -287,6 +289,11 @@
 												<input id="push_mirror_address" name="push_mirror_address" value="{{.push_mirror_address}}" required>
 												<p class="help">{{ctx.Locale.Tr "repo.mirror_address_desc"}}</p>
 											</div>
+											<div class="field {{if .Err_PushMirrorBranchFilter}}error{{end}}">
+												<label for="push_mirror_branch_filter">{{ctx.Locale.Tr "repo.settings.push_mirror.branch_filter.label"}}</label>
+												<input id="push_mirror_branch_filter" name="push_mirror_branch_filter" value="{{.push_mirror_branch_filter}}" maxlength="2048">
+												<p class="help">{{ctx.Locale.Tr "repo.settings.push_mirror.branch_filter.description" "https://forgejo.org/docs/latest/user/repo-mirror/#branch-filter" "Forgejo"}}</p>
+											</div>
 											<details class="ui optional field" {{if or .Err_PushMirrorAuth .push_mirror_username}}open{{end}}>
 												<summary class="tw-p-1">
 													{{ctx.Locale.Tr "repo.need_auth"}}
@@ -410,7 +417,7 @@
 						<label>{{ctx.Locale.Tr "repo.settings.admin_indexer_commit_sha"}}</label>
 						<span class="field">
 							{{if .CodeIndexerStatus}}
-								<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
+								<a rel="nofollow" class="sha label" href="{{.RepoLink}}/commit/{{.CodeIndexerStatus.CommitSha}}">
 									<span class="shortsha">{{ShortSha .CodeIndexerStatus.CommitSha}}</span>
 								</a>
 							{{else}}
@@ -422,6 +429,14 @@
 						</div>
 					</div>
 				{{end}}
+
+				<h4 class="ui header">{{ctx.Locale.Tr "repo.issue_indexer.title"}}</h4>
+				<div class="inline fields">
+					<div class="field">
+						<button class="ui primary button" name="request_reindex_type" value="issues">{{ctx.Locale.Tr "repo.settings.reindex_button"}}</button>
+					</div>
+				</div>
+
 				<h4 class="ui header">{{ctx.Locale.Tr "repo.settings.admin_stats_indexer"}}</h4>
 				<div class="inline fields">
 					{{if and .StatsIndexerStatus .StatsIndexerStatus.CommitSha}}
@@ -429,7 +444,7 @@
 					{{end}}
 					<span class="field">
 						{{if and .StatsIndexerStatus .StatsIndexerStatus.CommitSha}}
-							<a rel="nofollow" class="ui sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
+							<a rel="nofollow" class="sha label" href="{{.RepoLink}}/commit/{{.StatsIndexerStatus.CommitSha}}">
 								<span class="shortsha">{{ShortSha .StatsIndexerStatus.CommitSha}}</span>
 							</a>
 						{{else}}
diff --git a/templates/repo/settings/push_mirror_sync_modal.tmpl b/templates/repo/settings/push_mirror_sync_modal.tmpl
index e8dad61a48..00b1b9dcd5 100644
--- a/templates/repo/settings/push_mirror_sync_modal.tmpl
+++ b/templates/repo/settings/push_mirror_sync_modal.tmpl
@@ -15,7 +15,16 @@
 			</div>
 			<div class="inline field">
 				<label for="push-mirror-edit-interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label>
-				<input id="push-mirror-edit-interval" name="push_mirror_interval" autofocus>
+				<div class="ui small input">
+					<input id="push-mirror-edit-interval" name="push_mirror_interval" autofocus>
+				</div>
+			</div>
+			<div class="field">
+				<label for="push-mirror-edit-branch-filter">{{ctx.Locale.Tr "repo.settings.push_mirror.branch_filter.label"}}</label>
+				<div class="ui small input">
+					<input id="push-mirror-edit-branch-filter" name="push_mirror_branch_filter" maxlength="2048">
+				</div>
+				<p class="help">{{ctx.Locale.Tr "repo.settings.push_mirror.branch_filter.description" "https://forgejo.org/docs/latest/user/repo-mirror/#branch-filter" "Forgejo"}}</p>
 			</div>
 			<div class="actions">
 				<button class="ui small basic cancel button">
diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl
index 36e75a7eb5..8f29a5f510 100644
--- a/templates/repo/settings/webhook/base_list.tmpl
+++ b/templates/repo/settings/webhook/base_list.tmpl
@@ -19,7 +19,7 @@
 					<a title="{{.URL}}" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a>
 				</div>
 				<a class="muted tw-p-2" href="{{$.BaseLink}}/{{.ID}}">{{svg "octicon-pencil"}}</a>
-				<a class="delete-button tw-p-2" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}}</a>
+				<a class="delete-button tw-p-2" data-url="{{$.Link}}/delete" data-id="{{.ID}}" data-modal-id="delete-webhook">{{svg "octicon-trash"}}</a>
 			</div>
 		{{end}}
 	</div>
diff --git a/templates/repo/settings/webhook/delete_modal.tmpl b/templates/repo/settings/webhook/delete_modal.tmpl
index 9955ed3a2f..b9efca44e1 100644
--- a/templates/repo/settings/webhook/delete_modal.tmpl
+++ b/templates/repo/settings/webhook/delete_modal.tmpl
@@ -1,4 +1,4 @@
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-webhook">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.settings.webhook_deletion"}}
diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl
index f82aec1390..c66fc3ba40 100644
--- a/templates/repo/settings/webhook/history.tmpl
+++ b/templates/repo/settings/webhook/history.tmpl
@@ -26,7 +26,9 @@
 							{{else}}
 								<span class="text red">{{svg "octicon-alert"}}</span>
 							{{end}}
-							<a class="ui primary sha label toggle button show-panel" data-panel="#info-{{.ID}}">{{.UUID}}</a>
+							<a class="primary sha label toggle button show-panel" data-panel="#info-{{.ID}}">
+								<span class="shortsha">{{.UUID}}</span>
+							</a>
 						</div>
 						<span class="text grey">
 							{{DateUtils.TimeSince .Delivered}}
diff --git a/templates/repo/shabox.tmpl b/templates/repo/shabox.tmpl
new file mode 100644
index 0000000000..86413a5412
--- /dev/null
+++ b/templates/repo/shabox.tmpl
@@ -0,0 +1,21 @@
+{{$class := "sha label"}}
+{{if .signature}}
+	{{$class = (print $class " isSigned")}}
+	{{if .verification.Verified}}
+		{{if eq .verification.TrustStatus "trusted"}}
+			{{$class = (print $class " isVerified")}}
+		{{else if eq .verification.TrustStatus "untrusted"}}
+			{{$class = (print $class " isVerifiedUntrusted")}}
+		{{else}}
+			{{$class = (print $class " isVerifiedUnmatched")}}
+		{{end}}
+	{{else if .verification.Warning}}
+		{{$class = (print $class " isWarning")}}
+	{{end}}
+{{end}}
+<a {{if .commitLink}}href="{{.commitLink}}"{{end}} rel="nofollow" class="{{$class}}">
+	<span class="shortsha">{{ShortSha .sha1}}</span>
+	{{- if .signature -}}
+		{{template "repo/shabox_badge" dict "verification" .verification}}
+	{{- end -}}
+</a>
diff --git a/templates/repo/shabox_badge.tmpl b/templates/repo/shabox_badge.tmpl
index 939292ba91..ef3b567177 100644
--- a/templates/repo/shabox_badge.tmpl
+++ b/templates/repo/shabox_badge.tmpl
@@ -1,14 +1,14 @@
-<div class="ui detail icon button">
+<div class="signature">
 	{{if .verification.Verified}}
-		<div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}">
-		{{if ne .verification.SigningUser.ID 0}}
-			{{svg "gitea-lock"}}
-			{{ctx.AvatarUtils.Avatar .verification.SigningUser 28 "signature"}}
-		{{else}}
-			<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
-			{{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28 "signature"}}
-		{{end}}
-		</div>
+		<span class="signature-author" title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}">
+			{{if ne .verification.SigningUser.ID 0}}
+				{{svg "gitea-lock"}}
+				{{ctx.AvatarUtils.Avatar .verification.SigningUser 28}}
+			{{else}}
+				<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
+				{{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 28}}
+			{{end}}
+		</span>
 	{{else}}
 		<span title="{{ctx.Locale.Tr .verification.Reason}}">{{svg "gitea-unlock"}}</span>
 	{{end}}
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index ee1b959a7c..6216ad6191 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -3,14 +3,14 @@
 	<div class="ui segment repository-menu">
 		{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}}
 			<a class="item muted {{if .PageIsCommits}}active{{end}}" href="{{.RepoLink}}/commits/{{.BranchNameSubURL}}">
-				{{svg "octicon-history"}} {{ctx.Locale.TrN .CommitsCount "repo.n_commit_one" "repo.n_commit_few" (printf "<b>%d</b>" .CommitsCount | SafeHTML)}}
+				{{svg "octicon-history"}} {{ctx.Locale.TrN .CommitsCount "repo.n_commit_one" "repo.n_commit_few" (printf "<b>%s</b>" (ctx.Locale.PrettyNumber .CommitsCount) | SafeHTML)}}
 			</a>
 			<a class="item muted {{if .PageIsBranches}}active{{end}}" href="{{.RepoLink}}/branches">
-				{{svg "octicon-git-branch"}} {{ctx.Locale.TrN .BranchesCount "repo.n_branch_one" "repo.n_branch_few" (printf "<b>%d</b>" .BranchesCount | SafeHTML)}}
+				{{svg "octicon-git-branch"}} {{ctx.Locale.TrN .BranchesCount "repo.n_branch_one" "repo.n_branch_few" (printf "<b>%s</b>" (ctx.Locale.PrettyNumber .BranchesCount) | SafeHTML)}}
 			</a>
 			{{if $.Permission.CanRead $.UnitTypeCode}}
 				<a class="item muted {{if .PageIsTagList}}active{{end}}" href="{{.RepoLink}}/tags">
-					{{svg "octicon-tag"}} {{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (printf "<b>%d</b>" .NumTags | SafeHTML)}}
+					{{svg "octicon-tag"}} {{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (printf "<b>%s</b>" (ctx.Locale.PrettyNumber .NumTags) | SafeHTML)}}
 				</a>
 			{{end}}
 			<span class="item" {{if not (eq .Repository.Size 0)}}data-tooltip-content="{{.Repository.SizeDetailsString ctx.Locale}}"{{end}}>
diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl
index 8aa4a806c8..6e6bc607b1 100644
--- a/templates/repo/tag/list.tmpl
+++ b/templates/repo/tag/list.tmpl
@@ -42,7 +42,7 @@
 										{{end}}
 
 										{{if (and ($.Permission.CanWrite $.UnitTypeCode) $release.IsTag)}}
-											<a class="ui delete-button tw-mr-2 muted" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}">
+											<a class="ui delete-button tw-mr-2 muted" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}" data-modal-id="delete-tag">
 												{{svg "octicon-trash" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.delete_tag"}}
 											</a>
 										{{end}}
@@ -64,7 +64,7 @@
 </div>
 
 {{if $.Permission.CanWrite $.UnitTypeCode}}
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-tag">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.release.delete_tag"}}
diff --git a/templates/repo/tag/name.tmpl b/templates/repo/tag/name.tmpl
new file mode 100644
index 0000000000..a0445545e6
--- /dev/null
+++ b/templates/repo/tag/name.tmpl
@@ -0,0 +1,3 @@
+<a class="ui label basic tw-p-1 primary{{if .IsRelease}} primary{{end}}" href="{{.RepoLink}}/src/tag/{{.TagName|PathEscape}}">
+{{svg "octicon-tag"}} {{.TagName}}
+</a>
diff --git a/templates/repo/tag/verification_line.tmpl b/templates/repo/tag/verification_line.tmpl
index 5f8335abcc..0aef18b321 100644
--- a/templates/repo/tag/verification_line.tmpl
+++ b/templates/repo/tag/verification_line.tmpl
@@ -9,7 +9,7 @@
 		{{$class = (print $class " isWarning")}}
 	{{end}}
 
-	<div class="ui attached message tw-text-left tw-flex tw-content-center tw-justify-between tag-signature-row tw-flex-wrap {{$class}}">
+	<div class="ui attached message tw-text-left tw-flex tw-mb-4 tw-content-center tw-justify-between tag-signature-row tw-flex-wrap {{$class}}">
 		<div class="tw-flex tw-content-center">
 			{{if $v.Verified}}
 				{{if ne $v.SigningUser.ID 0}}
diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl
index fbd4ef0cee..95871ee0dc 100644
--- a/templates/repo/user_cards.tmpl
+++ b/templates/repo/user_cards.tmpl
@@ -4,29 +4,33 @@
 			{{.CardsTitle}}
 		</h2>
 	{{end}}
-	<ul class="list">
-		{{range .Cards}}
-			<li class="card">
-				<a href="{{.HomeLink}}">
-					{{ctx.AvatarUtils.Avatar .}}
-				</a>
-				<div>
-					<h3 class="name">
-						<a href="{{.HomeLink}}">{{.DisplayName}}</a>
-					</h3>
-					<div class="meta">
-						{{if .Website}}
-							{{svg "octicon-link"}} <a href="{{.Website}}" target="_blank" rel="noopener noreferrer">{{.Website}}</a>
-						{{else if .Location}}
-							{{svg "octicon-location"}} {{.Location}}
-						{{else}}
-							{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
-						{{end}}
+	{{if .Cards}}
+		<ul class="list">
+			{{range .Cards}}
+				<li class="card">
+					<a href="{{.HomeLink}}">
+						{{ctx.AvatarUtils.Avatar .}}
+					</a>
+					<div class="content">
+						<h3 class="name">
+							<a href="{{.HomeLink}}">{{.DisplayName}}</a>
+						</h3>
+						<div class="meta">
+							{{if .Website}}
+								{{svg "octicon-link"}} <a href="{{.Website}}" target="_blank" rel="noopener noreferrer">{{.Website}}</a>
+							{{else if .Location}}
+								{{svg "octicon-location"}} {{.Location}}
+							{{else}}
+								{{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .CreatedUnix)}}
+							{{end}}
+						</div>
 					</div>
-				</div>
-			</li>
-		{{end}}
-	</ul>
+				</li>
+			{{end}}
+		</ul>
+	{{else if .CardsNoneMsg}}
+		<div>{{.CardsNoneMsg}}</div>
+	{{end}}
 
 	{{template "base/paginate" .}}
 </div>
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index b2443e82c4..65be791405 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -59,8 +59,12 @@
 						<button class="ui mini basic button escape-button">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
 					{{end}}
 				</div>
-				<a download href="{{$.RawFileLink}}"><span class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}">{{svg "octicon-download"}}</span></a>
-				<a href="#" id="copy-content" class="btn-octicon {{if not .CanCopyContent}} disabled{{end}}"{{if or .IsImageFile (and .HasSourceRenderedToggle (not .IsDisplayingSource))}} data-link="{{$.RawFileLink}}"{{end}} data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}">{{svg "octicon-copy" 14}}</a>
+				<a download class="btn-octicon" href="{{$.RawFileLink}}" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}">
+					{{svg "octicon-download"}}
+				</a>
+				<a href="#" id="copy-content" class="btn-octicon {{if not .CanCopyContent}} disabled{{end}}"{{if or .IsImageFile (and .HasSourceRenderedToggle (not .IsDisplayingSource))}} data-link="{{$.RawFileLink}}"{{end}} data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}">
+					{{svg "octicon-copy" 14}}
+				</a>
 				{{if .EnableFeed}}
 					{{if .IsViewBranch}}
 						<a class="btn-octicon" href="{{$.FeedURL}}/rss/{{$.BranchNameSubURL}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
@@ -74,14 +78,22 @@
 				{{end}}
 				{{if .Repository.CanEnableEditor}}
 					{{if .CanEditFile}}
-						<a href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}"><span class="btn-octicon" data-tooltip-content="{{.EditFileTooltip}}">{{svg "octicon-pencil"}}</span></a>
+						<a class="btn-octicon" href="{{.RepoLink}}/_edit/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{.EditFileTooltip}}">
+							{{svg "octicon-pencil"}}
+						</a>
 					{{else}}
-						<span class="btn-octicon disabled" data-tooltip-content="{{.EditFileTooltip}}">{{svg "octicon-pencil"}}</span>
+						<span class="btn-octicon disabled" data-tooltip-content="{{.EditFileTooltip}}">
+							{{svg "octicon-pencil"}}
+						</span>
 					{{end}}
 					{{if .CanDeleteFile}}
-						<a href="{{.RepoLink}}/_delete/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}"><span class="btn-octicon btn-octicon-danger"  data-tooltip-content="{{.DeleteFileTooltip}}">{{svg "octicon-trash"}}</span></a>
+						<a class="btn-octicon btn-octicon-danger" href="{{.RepoLink}}/_delete/{{PathEscapeSegments .BranchName}}/{{PathEscapeSegments .TreePath}}" data-tooltip-content="{{.DeleteFileTooltip}}">
+							{{svg "octicon-trash"}}
+						</a>
 					{{else}}
-						<span class="btn-octicon disabled" data-tooltip-content="{{.DeleteFileTooltip}}">{{svg "octicon-trash"}}</span>
+						<span class="btn-octicon disabled" data-tooltip-content="{{.DeleteFileTooltip}}">
+							{{svg "octicon-trash"}}
+						</span>
 					{{end}}
 				{{end}}
 			{{else if .EscapeStatus.Escaped}}
@@ -115,7 +127,15 @@
 							<strong>{{ctx.Locale.Tr "repo.audio_not_supported_in_browser"}}</strong>
 						</audio>
 					{{else if .IsPDFFile}}
-						<div class="pdf-content is-loading" data-src="{{$.RawFileLink}}" data-fallback-button-text="{{ctx.Locale.Tr "repo.diff.view_file"}}"></div>
+						<lazy-webc tag="pdf-object" src="{{$.RawFileLink}}">
+							<a href="{{$.RawFileLink}}" class="ui basic button">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
+						</lazy-webc>
+					{{else if .Is3DModelFile}}
+						{{if .IsGLBFile}}
+							<lazy-webc tag="model-viewer" src="{{$.RawFileLink}}" ar shadow-intensity="2" camera-controls touch-action="pan-y"></lazy-webc>
+						{{else}}
+							<a href="{{$.RawFileLink}}" rel="nofollow">{{ctx.Locale.Tr "repo.file_view_raw"}}</a>
+						{{end}}
 					{{else}}
 						<a href="{{$.RawFileLink}}" rel="nofollow">{{ctx.Locale.Tr "repo.file_view_raw"}}</a>
 					{{end}}
@@ -135,7 +155,7 @@
 						{{range $idx, $code := .FileContent}}
 						{{$line := Eval $idx "+" 1}}
 						<tr>
-							<td id="L{{$line}}" class="lines-num"><span id="L{{$line}}" data-line-number="{{$line}}"></span></td>
+							<td class="lines-num"><span id="L{{$line}}" data-line-number="{{$line}}"></span></td>
 							{{if $.EscapeStatus.Escaped}}
 								<td class="lines-escape">{{if (index $.LineEscapeStatus $idx).Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{if (index $.LineEscapeStatus $idx).HasInvisible}}{{ctx.Locale.Tr "repo.invisible_runes_line"}} {{end}}{{if (index $.LineEscapeStatus $idx).HasAmbiguous}}{{ctx.Locale.Tr "repo.ambiguous_runes_line"}}{{end}}"></button>{{end}}</td>
 							{{end}}
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 6d6af58c48..ffd8b1a515 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -20,17 +20,17 @@
 		{{range $item := .Files}}
 			{{$entry := $item.Entry}}
 			{{$commit := $item.Commit}}
-			{{$subModuleFile := $item.SubModuleFile}}
 			<tr data-entryname="{{$entry.Name}}" data-ready="{{if $commit}}true{{else}}false{{end}}" class="{{if not $commit}}not{{end}}ready entry">
 				<td class="name four wide">
 					<span class="truncate">
-						{{if $entry.IsSubModule}}
-							{{$refURL := $subModuleFile.RefURL AppUrl $.Repository.FullName $.SSHDomain}} {{/* FIXME: the usage of AppUrl seems incorrect, it would be fixed in the future, use AppSubUrl instead */}}
+						{{if $entry.IsSubmodule}}
+							{{$submodule := $item.Submodule}}
+							{{$refURL := $submodule.ResolveUpstreamURL $.Repository.HTMLURL}}
 							{{$icon := (svg "octicon-file-submodule" 16 "tw-mr-2")}}
 							{{if $refURL}}
-								<a class="muted" href="{{$refURL}}">{{$icon}}{{$entry.Name}}</a><span class="at">@</span><a href="{{$refURL}}/commit/{{PathEscape $subModuleFile.RefID}}">{{ShortSha $subModuleFile.RefID}}</a>
+								<a class="muted" href="{{$refURL}}">{{$icon}}{{$entry.Name}}</a><span class="at">@</span><a href="{{$refURL}}/commit/{{PathEscape $submodule.Commit.String}}">{{ShortSha $submodule.Commit.String}}</a>
 							{{else}}
-								{{$icon}}{{$entry.Name}}<span class="at">@</span>{{ShortSha $subModuleFile.RefID}}
+								{{$icon}}{{$entry.Name}}<span class="at">@</span>{{ShortSha $submodule.Commit.String}}
 							{{end}}
 						{{else}}
 							{{if $entry.IsDir}}
diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl
index 045cc41d81..1e03457047 100644
--- a/templates/repo/wiki/revision.tmpl
+++ b/templates/repo/wiki/revision.tmpl
@@ -6,7 +6,7 @@
 		<div class="ui stackable grid">
 			<div class="ui eight wide column">
 				<div class="ui header">
-					<a class="file-revisions-btn ui basic button" title="{{ctx.Locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}"><span>{{.revision}}</span> {{svg "octicon-home"}}</a>
+					<a class="file-revisions-btn ui basic button" title="{{ctx.Locale.Tr "repo.wiki.back_to_wiki"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}">{{if .revision}}<span>{{.revision}}</span> {{end}}{{svg "octicon-home"}}</a>
 					{{$title}}
 					<div class="ui sub header tw-break-anywhere">
 						{{$timeSince := DateUtils.TimeSince .Author.When}}
diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 9f77976f35..1af583c8a5 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -45,7 +45,7 @@
 		<div class="ui dividing header">
 			<div class="ui stackable grid">
 				<div class="eight wide column">
-					<a class="file-revisions-btn ui basic button" title="{{ctx.Locale.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_revision" ><span>{{.CommitCount}}</span> {{svg "octicon-history"}}</a>
+					<a class="file-revisions-btn ui basic button" title="{{ctx.Locale.Tr "repo.wiki.file_revision"}}" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_revision" >{{if .CommitCount}}<span>{{.CommitCount}}</span> {{end}}{{svg "octicon-history"}}</a>
 					{{$title}}
 					<div class="ui sub header">
 						{{$timeSince := DateUtils.TimeSince .Author.When}}
@@ -61,7 +61,7 @@
 						<div class="ui right">
 							<a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_edit">{{ctx.Locale.Tr "repo.wiki.edit_page_button"}}</a>
 							<a class="ui small primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a>
-							<a class="ui small red button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
+							<a class="ui small red button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}" data-modal-id="delete-wiki-page">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
 						</div>
 					{{end}}
 				</div>
@@ -110,7 +110,7 @@
 	</div>
 </div>
 
-<div class="ui g-modal-confirm delete modal">
+<div class="ui g-modal-confirm delete modal" id="delete-wiki-page">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 54250f830b..b4eaf6db9b 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -40,7 +40,7 @@
 
 			<div class="field">
 				<button class="ui primary button" data-url="{{.Link}}">{{ctx.Locale.Tr "actions.runners.update_runner"}}</button>
-				<button class="ui red button delete-button show-modal" data-url="{{.Link}}/delete" data-modal="#runner-delete-modal">
+				<button class="ui red button delete-button" data-url="{{.Link}}/delete" data-modal-id="runner-delete-modal">
 					{{ctx.Locale.Tr "actions.runners.delete_runner"}}</button>
 			</div>
 		</form>
diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl
index 1ea22660f7..febca5ec7f 100644
--- a/templates/shared/combomarkdowneditor.tmpl
+++ b/templates/shared/combomarkdowneditor.tmpl
@@ -12,44 +12,47 @@ Template Attributes:
 * DisableAutosize: whether to disable automatic height resizing
 * EasyMDE: whether to display button for switching to legacy editor
 */}}
-<div {{if .ContainerId}}id="{{.ContainerId}}"{{end}} class="combo-markdown-editor {{.ContainerClasses}}" data-dropzone-parent-container="{{.DropzoneParentContainer}}">
-	{{if .MarkdownPreviewUrl}}
-	<div class="ui top tabular menu">
-		<a href="#" class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a>
-		<a href="#" class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a>
-	</div>
-	{{end}}
+<div {{if .ContainerId}}id="{{.ContainerId}}"{{end}} class="combo-markdown-editor {{.ContainerClasses}}" data-dropzone-parent-container="{{.DropzoneParentContainer}}" data-tab-hint="{{ctx.Locale.TrString "editor.textarea.tab_hint"}}" data-shift-tab-hint="{{ctx.Locale.TrString "editor.textarea.shift_tab_hint"}}">
+
+	<markdown-toolbar>
+		{{if .MarkdownPreviewUrl}}
+		<div class="markdown-toolbar-switch">
+			<div class="switch">
+				<a href="#" class="active item" data-tab-for="markdown-writer">{{ctx.Locale.Tr "write"}}</a>
+				<a href="#" class="item" data-tab-for="markdown-previewer" data-preview-url="{{.MarkdownPreviewUrl}}" data-preview-context="{{.MarkdownPreviewContext}}">{{ctx.Locale.Tr "preview"}}</a>
+			</div>
+		</div>
+		{{end}}
+		<div class="markdown-toolbar-group">
+			<md-header class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.heading.tooltip"}}">{{svg "octicon-heading"}}</md-header>
+			<md-bold class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.bold.tooltip"}}">{{svg "octicon-bold"}}</md-bold>
+			<md-italic class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.italic.tooltip"}}">{{svg "octicon-italic"}}</md-italic>
+		</div>
+		<div class="markdown-toolbar-group">
+			<md-quote class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.quote.tooltip"}}">{{svg "octicon-quote"}}</md-quote>
+			<md-code class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.code.tooltip"}}">{{svg "octicon-code"}}</md-code>
+			<button class="markdown-toolbar-button show-modal button" data-md-button data-md-action="new-link" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.link.tooltip"}}">{{svg "octicon-link"}}</button>
+		</div>
+		<div class="markdown-toolbar-group">
+			<md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list>
+			<md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list>
+			<md-task-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list>
+			<button type="button" class="markdown-toolbar-button" data-md-button data-md-action="unindent" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.unindent.tooltip"}}">{{svg "octicon-arrow-left"}}</button>
+			<button type="button" class="markdown-toolbar-button" data-md-button data-md-action="indent" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.indent.tooltip"}}">{{svg "octicon-arrow-right"}}</button>
+		</div>
+		<div class="markdown-toolbar-group">
+			<button type="button" class="markdown-toolbar-button show-modal button" data-md-button data-md-action="new-table" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.new_table.tooltip"}}">{{svg "octicon-table"}}</button>
+			<md-mention class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.mention.tooltip"}}">{{svg "octicon-mention"}}</md-mention>
+			<md-ref class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.ref.tooltip"}}">{{svg "octicon-cross-reference"}}</md-ref>
+		</div>
+		<div class="markdown-toolbar-group">
+			<button class="markdown-toolbar-button markdown-switch-monospace" data-md-button role="switch" data-enable-text="{{ctx.Locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{ctx.Locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button>
+			{{if .EasyMDE}}
+				<button class="markdown-toolbar-button markdown-switch-easymde" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button>
+			{{end}}
+		</div>
+	</markdown-toolbar>
 	<div class="ui tab active" data-tab-panel="markdown-writer">
-		<markdown-toolbar>
-			<div class="markdown-toolbar-group">
-				<md-header class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.heading.tooltip"}}">{{svg "octicon-heading"}}</md-header>
-				<md-bold class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.bold.tooltip"}}">{{svg "octicon-bold"}}</md-bold>
-				<md-italic class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.italic.tooltip"}}">{{svg "octicon-italic"}}</md-italic>
-			</div>
-			<div class="markdown-toolbar-group">
-				<md-quote class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.quote.tooltip"}}">{{svg "octicon-quote"}}</md-quote>
-				<md-code class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.code.tooltip"}}">{{svg "octicon-code"}}</md-code>
-				<button class="markdown-toolbar-button show-modal button" data-md-button data-md-action="new-link" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.link.tooltip"}}">{{svg "octicon-link"}}</button>
-			</div>
-			<div class="markdown-toolbar-group">
-				<md-unordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.unordered.tooltip"}}">{{svg "octicon-list-unordered"}}</md-unordered-list>
-				<md-ordered-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.ordered.tooltip"}}">{{svg "octicon-list-ordered"}}</md-ordered-list>
-				<md-task-list class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.list.task.tooltip"}}">{{svg "octicon-tasklist"}}</md-task-list>
-				<button type="button" class="markdown-toolbar-button" data-md-button data-md-action="unindent" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.unindent.tooltip"}}">{{svg "octicon-arrow-left"}}</button>
-				<button type="button" class="markdown-toolbar-button" data-md-button data-md-action="indent" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.indent.tooltip"}}">{{svg "octicon-arrow-right"}}</button>
-			</div>
-			<div class="markdown-toolbar-group">
-				<button type="button" class="markdown-toolbar-button show-modal button" data-md-button data-md-action="new-table" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.new_table.tooltip"}}">{{svg "octicon-table"}}</button>
-				<md-mention class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.mention.tooltip"}}">{{svg "octicon-mention"}}</md-mention>
-				<md-ref class="markdown-toolbar-button" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.ref.tooltip"}}">{{svg "octicon-cross-reference"}}</md-ref>
-			</div>
-			<div class="markdown-toolbar-group">
-				<button class="markdown-toolbar-button markdown-switch-monospace" data-md-button role="switch" data-enable-text="{{ctx.Locale.Tr "editor.buttons.enable_monospace_font"}}" data-disable-text="{{ctx.Locale.Tr "editor.buttons.disable_monospace_font"}}">{{svg "octicon-typography"}}</button>
-				{{if .EasyMDE}}
-					<button class="markdown-toolbar-button markdown-switch-easymde" data-tooltip-content="{{ctx.Locale.Tr "editor.buttons.switch_to_legacy.tooltip"}}">{{svg "octicon-arrow-switch"}}</button>
-				{{end}}
-			</div>
-		</markdown-toolbar>
 		<text-expander keys=": @" suffix="">
 			<textarea class="markdown-text-editor js-quick-submit"{{if .TextareaName}} name="{{.TextareaName}}"{{end}}{{if .TextareaPlaceholder}} placeholder="{{.TextareaPlaceholder}}"{{end}}{{if .TextareaAriaLabel}} aria-label="{{.TextareaAriaLabel}}"{{end}}{{if .DisableAutosize}} data-disable-autosize="{{.DisableAutosize}}"{{end}}>{{.TextareaContent}}</textarea>
 		</text-expander>
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 53575d82b2..256b5e3e07 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -21,7 +21,7 @@
 						{{end}}
 						<span class="labels-list tw-ml-1">
 							{{range .Labels}}
-								<a href="?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}" rel="nofollow">{{RenderLabel $.Context ctx.Locale .}}</a>
+								<a href="?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}" rel="nofollow">{{RenderLabel ctx .}}</a>
 							{{end}}
 						</span>
 					</div>
@@ -52,25 +52,27 @@
 					</div>
 					{{end}}
 				</div>
-				<div class="flex-item-body">
-					<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
-						{{if eq $.listType "dashboard"}}
-							{{.Repo.FullName}}#{{.Index}}
+				<div class="flex-item-body issue-meta">
+					<span>
+						<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
+							{{if eq $.listType "dashboard"}}
+								{{.Repo.FullName}}#{{.Index}}
+							{{else}}
+								#{{.Index}}
+							{{end}}
+						</a>
+						{{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}}
+						{{if .OriginalAuthor}}
+							{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}}
+						{{else if gt .Poster.ID 0}}
+							{{ctx.Locale.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.GetDisplayName}}
 						{{else}}
-							#{{.Index}}
+							{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .Poster.GetDisplayName}}
 						{{end}}
-					</a>
-					{{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}}
-					{{if .OriginalAuthor}}
-						{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}}
-					{{else if gt .Poster.ID 0}}
-						{{ctx.Locale.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.GetDisplayName}}
-					{{else}}
-						{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .Poster.GetDisplayName}}
-					{{end}}
+					</span>
 					{{if .IsPull}}
-						<div class="branches flex-text-inline">
-							{{svg "gitea-double-chevron-right" 12}}
+						{{svg "gitea-double-chevron-right" 12}}
+						<div class="flex-text-inline issue-meta-branch">
 							<div class="branch">
 								<a href="{{.PullRequest.BaseRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
 									{{/* inline to remove the spaces between spans */}}
diff --git a/templates/shared/label_filter.tmpl b/templates/shared/label_filter.tmpl
index 50040c208d..0c8d537cc7 100644
--- a/templates/shared/label_filter.tmpl
+++ b/templates/shared/label_filter.tmpl
@@ -42,7 +42,7 @@
 						{{svg "octicon-check"}}
 					{{end}}
 				{{end}}
-				{{RenderLabel $.Context ctx.Locale .}}
+				{{RenderLabel ctx .}}
 				<p class="tw-ml-auto">{{template "repo/issue/labels/label_archived" .}}</p>
 			</a>
 		{{end}}
diff --git a/templates/shared/user/actions_menu.tmpl b/templates/shared/user/actions_menu.tmpl
new file mode 100644
index 0000000000..4095ada6d9
--- /dev/null
+++ b/templates/shared/user/actions_menu.tmpl
@@ -0,0 +1,47 @@
+<details class="dropdown dir-auto">
+	<summary data-tooltip-content="{{ctx.Locale.Tr "profile.actions.tooltip"}}">{{svg "octicon-kebab-horizontal"}}</summary>
+	<ul>
+		{{if eq .SignedUserID .ContextUser.ID}}
+			<li>
+				<a href="{{AppSubUrl}}/user/settings" class="item">{{svg "octicon-pencil"}}{{ctx.Locale.Tr "profile.edit.link"}}</a>
+			</li>
+		{{end}}
+		{{if .IsAdmin}}
+			<li>
+				<a href="{{AppSubUrl}}/admin/users/{{.ContextUser.ID}}" class="item">{{svg "octicon-gear"}}{{ctx.Locale.Tr "admin.users.details"}}</a>
+			</li>
+		{{end}}
+		{{if and .EnableFeed (or .IsAdmin (eq .SignedUserID .ContextUser.ID) (not .ContextUser.KeepActivityPrivate))}}
+			<li>
+				<a href="{{.ContextUser.HomeLink}}.rss" class="item">{{svg "octicon-rss"}}{{ctx.Locale.Tr "rss_feed"}}</a>
+			</li>
+			<li>
+				<a href="{{.ContextUser.HomeLink}}.atom" class="item">{{svg "octicon-rss"}}{{ctx.Locale.Tr "feed.atom.link"}}</a>
+			</li>
+		{{end}}
+		<li>
+			<a href="{{.ContextUser.HomeLink}}.keys" class="item">{{svg "octicon-key"}}{{ctx.Locale.Tr "keys.ssh.link"}}</a>
+		</li>
+		<li>
+			<a href="{{.ContextUser.HomeLink}}.gpg" class="item">{{svg "octicon-key"}}{{ctx.Locale.Tr "keys.gpg.link"}}</a>
+		</li>
+		{{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}}
+			<li hx-target="#profile-avatar-card" hx-indicator="#profile-avatar-card" id="action-block">
+				{{if .IsBlocked}}
+					<button class="item orange text" hx-post="{{.ContextUser.HomeLink}}?action=unblock">
+						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unblock"}}
+					</button>
+				{{else}}
+					<button class="item orange text" data-modal-id="block-user" hx-post="{{.ContextUser.HomeLink}}?action=block" hx-confirm="-">
+						{{svg "octicon-blocked"}} {{ctx.Locale.Tr "user.block"}}
+					</button>
+				{{end}}
+			</li>
+		{{end}}
+		{{if and .IsModerationEnabled .IsSigned (ne .SignedUserID .ContextUser.ID)}}
+			<li>
+				<a href="{{AppSubUrl}}/report_abuse?type=user&id={{.ContextUser.ID}}" class="item orange text">{{svg "octicon-stop"}}{{ctx.Locale.Tr "moderation.report_abuse"}}</a>
+			</li>
+		{{end}}
+	</ul>
+</details>
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl
index d718fa390f..ca3a5a2076 100644
--- a/templates/shared/user/profile_big_avatar.tmpl
+++ b/templates/shared/user/profile_big_avatar.tmpl
@@ -1,10 +1,13 @@
 {{if .IsHTMX}}
 	{{template "base/alert" .}}
 {{end}}
+
+{{$showFollow := and .IsSigned (ne .SignedUserID .ContextUser.ID)}}
+
 <div id="profile-avatar-card" class="ui card" hx-swap="morph">
 	<div id="profile-avatar" class="content tw-flex">
 	{{if eq .SignedUserID .ContextUser.ID}}
-		<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">
+		<a class="image" href="{{AppSubUrl}}/user/settings#avatar-settings" data-tooltip-content="{{ctx.Locale.Tr "user.change_avatar"}}">
 			{{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}}
 			{{ctx.AvatarUtils.Avatar .ContextUser 256}}
 		</a>
@@ -16,18 +19,32 @@
 	</div>
 	<div class="content tw-break-anywhere profile-avatar-name">
 		{{if .ContextUser.FullName}}<span class="header text center">{{.ContextUser.FullName}}</span>{{end}}
-		<span class="username text center">{{.ContextUser.Name}} {{if .ContextUser.GetPronouns .IsSigned}} · {{.ContextUser.GetPronouns .IsSigned}}{{end}} {{if .IsAdmin}}
-					<a class="muted" href="{{AppSubUrl}}/admin/users/{{.ContextUser.ID}}" data-tooltip-content="{{ctx.Locale.Tr "admin.users.details"}}">
-						{{svg "octicon-gear" 18}}
-					</a>
-				{{end}}</span>
-		<div class="tw-mt-2">
-			<a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-people" 18 "tw-mr-1"}}{{ctx.Locale.TrN .NumFollowers "user.followers_one" "user.followers_few" .NumFollowers}}</a> · <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{ctx.Locale.TrN .NumFollowing "user.following_one" "user.following_few" .NumFollowing}}</a>
-			{{if and .EnableFeed (or .IsAdmin (eq .SignedUserID .ContextUser.ID) (not .ContextUser.KeepActivityPrivate))}}
-				<a href="{{.ContextUser.HomeLink}}.rss"><i class="ui text grey tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
+		<span class="username">{{.ContextUser.Name}} {{if .ContextUser.GetPronouns .IsSigned}} · {{.ContextUser.GetPronouns .IsSigned}}{{end}}</span>
+		<div class="tw-mt-2 tw-flex tw-items-center tw-gap-2 tw-justify-center">
+			<span>
+				<a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-people" 18 "tw-mr-1"}}{{ctx.Locale.TrN .NumFollowers "user.followers_one" "user.followers_few" .NumFollowers}}</a> · <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{ctx.Locale.TrN .NumFollowing "user.following_one" "user.following_few" .NumFollowing}}</a>
+			</span>
+			{{if not $showFollow}}
+				{{template "shared/user/actions_menu" .}}
 			{{end}}
 		</div>
 	</div>
+	{{if $showFollow}}
+		<div class="actions">
+			<div class="primary-action" hx-target="#profile-avatar-card" hx-indicator="#profile-avatar-card">
+				{{if .IsFollowing}}
+					<button hx-post="{{.ContextUser.HomeLink}}?action=unfollow" class="ui basic red button tw-flex tw-gap-1">
+						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unfollow"}}
+					</button>
+				{{else}}
+					<button hx-post="{{.ContextUser.HomeLink}}?action=follow" class="ui basic primary button tw-flex tw-gap-1">
+						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.follow"}}
+					</button>
+				{{end}}
+			</div>
+			{{template "shared/user/actions_menu" .}}
+		</div>
+	{{end}}
 	<div class="extra content tw-break-anywhere">
 		<ul>
 			{{if .ContextUser.Location}}
@@ -42,17 +59,17 @@
 				</li>
 			{{end}}
 			{{if .ShowUserEmail}}
-					<li>
-						{{svg "octicon-mail"}}
-						<a class="tw-flex-1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
-						{{if (eq .SignedUserID .ContextUser.ID)}}
-							<a href="{{AppSubUrl}}/user/settings#privacy-user-settings">
-								<i data-tooltip-content="{{ctx.Locale.Tr "user.email_visibility.limited"}}">
-									{{svg "octicon-unlock"}}
-								</i>
-							</a>
-						{{end}}
-					</li>
+				<li>
+					{{svg "octicon-mail"}}
+					<a class="tw-flex-1" href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
+					{{if (eq .SignedUserID .ContextUser.ID)}}
+						<a href="{{AppSubUrl}}/user/settings#privacy-user-settings">
+							<i data-tooltip-content="{{ctx.Locale.Tr "user.email_visibility.limited"}}">
+								{{svg "octicon-unlock"}}
+							</i>
+						</a>
+					{{end}}
+				</li>
 			{{end}}
 			{{if .ContextUser.Website}}
 				<li>
@@ -73,7 +90,10 @@
 					</li>
 				{{end}}
 			{{end}}
-			<li>{{svg "octicon-calendar"}} <span>{{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .ContextUser.CreatedUnix)}}</span></li>
+			<li>
+				{{svg "octicon-calendar"}}
+				<span>{{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .ContextUser.CreatedUnix)}}</span>
+			</li>
 			{{if and .Orgs .HasOrgsVisible}}
 			<li>
 				<ul class="user-orgs">
@@ -100,30 +120,6 @@
 				</ul>
 			</li>
 			{{end}}
-			{{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}}
-			<li class="follow" hx-target="#profile-avatar-card" hx-indicator="#profile-avatar-card">
-				{{if $.IsFollowing}}
-					<button hx-post="{{.ContextUser.HomeLink}}?action=unfollow" class="ui basic red button">
-						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unfollow"}}
-					</button>
-				{{else}}
-					<button hx-post="{{.ContextUser.HomeLink}}?action=follow" class="ui basic primary button">
-						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.follow"}}
-					</button>
-				{{end}}
-			</li>
-			<li class="block" hx-target="#profile-avatar-card" hx-indicator="#profile-avatar-card">
-				{{if $.IsBlocked}}
-					<button class="ui basic red button" hx-post="{{.ContextUser.HomeLink}}?action=unblock">
-						{{svg "octicon-person"}} {{ctx.Locale.Tr "user.unblock"}}
-					</button>
-				{{else}}
-					<button type="submit" class="ui basic orange button" data-modal-id="block-user" hx-post="{{.ContextUser.HomeLink}}?action=block" hx-confirm="-">
-						{{svg "octicon-blocked"}} {{ctx.Locale.Tr "user.block"}}
-					</button>
-				{{end}}
-			</li>
-			{{end}}
 		</ul>
 	</div>
 </div>
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index 59f7c25688..4e7e64d9c7 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -16,19 +16,14 @@
 </head>
 <body>
 	<div class="full height">
-		<nav class="ui secondary menu">
-			<div class="ui container tw-flex">
-				<div class="item tw-flex-1">
-					<a href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}">
-						<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
-					</a>
-				</div>
-				<div class="item">
-					<button class="ui icon button disabled">{{svg "octicon-three-bars"}}</button>{{/* a fake button to make the UI looks better*/}}
-				</div>
+		<nav id="navbar" aria-label="{{ctx.Locale.Tr "aria.navbar"}}">
+			<div class="navbar-left ui secondary menu">
+				<a class="item" id="navbar-logo" href="{{AppSubUrl}}/" aria-label="{{ctx.Locale.Tr "home"}}">
+					<img width="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg" alt="{{ctx.Locale.Tr "logo"}}" aria-hidden="true">
+				</a>
 			</div>
 		</nav>
-		<div class="divider tw-my-0"></div>
+
 		<div role="main" class="page-content status-page-500">
 			<div class="ui container" >
 				<style> .ui.message.flash-message { text-align: left; } </style>
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index a16deb61a8..353abe76c0 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -142,6 +142,72 @@
         }
       }
     },
+    "/activitypub/user-id/{user-id}/activities/{activity-id}": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "activitypub"
+        ],
+        "summary": "Get a specific activity object of the user",
+        "operationId": "activitypubPersonActivityNote",
+        "parameters": [
+          {
+            "type": "integer",
+            "description": "user ID of the user",
+            "name": "user-id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "description": "activity ID of the sought activity",
+            "name": "activity-id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/ActivityPub"
+          }
+        }
+      }
+    },
+    "/activitypub/user-id/{user-id}/activities/{activity-id}/activity": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "activitypub"
+        ],
+        "summary": "Get a specific activity of the user",
+        "operationId": "activitypubPersonActivity",
+        "parameters": [
+          {
+            "type": "integer",
+            "description": "user ID of the user",
+            "name": "user-id",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "description": "activity ID of the sought activity",
+            "name": "activity-id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/ActivityPub"
+          }
+        }
+      }
+    },
     "/activitypub/user-id/{user-id}/inbox": {
       "post": {
         "produces": [
@@ -162,12 +228,41 @@
           }
         ],
         "responses": {
-          "204": {
+          "202": {
             "$ref": "#/responses/empty"
           }
         }
       }
     },
+    "/activitypub/user-id/{user-id}/outbox": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "activitypub"
+        ],
+        "summary": "List the user's recorded activity",
+        "operationId": "activitypubPersonFeed",
+        "parameters": [
+          {
+            "type": "integer",
+            "description": "user ID of the user",
+            "name": "user-id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/PersonFeed"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          }
+        }
+      }
+    },
     "/admin/cron": {
       "get": {
         "produces": [
@@ -239,7 +334,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "List all emails",
+        "summary": "List all users' email addresses",
         "operationId": "adminGetAllEmails",
         "parameters": [
           {
@@ -273,7 +368,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "Search all emails",
+        "summary": "Search users' email addresses",
         "operationId": "adminSearchEmails",
         "parameters": [
           {
@@ -313,7 +408,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "List system's webhooks",
+        "summary": "List global (system) webhooks",
         "operationId": "adminListHooks",
         "parameters": [
           {
@@ -1220,7 +1315,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "Create a user",
+        "summary": "Create a user account",
         "operationId": "adminCreateUser",
         "parameters": [
           {
@@ -1255,7 +1350,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "Delete a user",
+        "summary": "Delete user account",
         "operationId": "adminDeleteUser",
         "parameters": [
           {
@@ -1342,7 +1437,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "Add a public key on behalf of a user",
+        "summary": "Add an SSH public key to user's account",
         "operationId": "adminCreatePublicKey",
         "parameters": [
           {
@@ -1381,7 +1476,7 @@
         "tags": [
           "admin"
         ],
-        "summary": "Delete a user's public key",
+        "summary": "Remove a public key from user's account",
         "operationId": "adminDeleteUserPublicKey",
         "parameters": [
           {
@@ -2158,7 +2253,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Get list of organizations",
+        "summary": "List all organizations",
         "operationId": "orgGetAll",
         "parameters": [
           {
@@ -2381,7 +2476,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "List an organization's actions secrets",
+        "summary": "List actions secrets of an organization",
         "operationId": "orgListActionsSecrets",
         "parameters": [
           {
@@ -2514,7 +2609,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Get an org-level variables list",
+        "summary": "List variables of an organization",
         "operationId": "getOrgVariablesList",
         "parameters": [
           {
@@ -2558,7 +2653,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Get an org-level variable",
+        "summary": "Get organization's variable by name",
         "operationId": "getOrgVariable",
         "parameters": [
           {
@@ -2598,7 +2693,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Update an org-level variable",
+        "summary": "Update variable in organization",
         "operationId": "updateOrgVariable",
         "parameters": [
           {
@@ -2648,7 +2743,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Create an org-level variable",
+        "summary": "Create a new variable in organization",
         "operationId": "createOrgVariable",
         "parameters": [
           {
@@ -2695,7 +2790,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Delete an org-level variable",
+        "summary": "Delete organization's variable by name",
         "operationId": "deleteOrgVariable",
         "parameters": [
           {
@@ -2788,7 +2883,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Update Avatar",
+        "summary": "Update an organization's avatar",
         "operationId": "orgUpdateAvatar",
         "parameters": [
           {
@@ -2822,7 +2917,7 @@
         "tags": [
           "organization"
         ],
-        "summary": "Delete Avatar",
+        "summary": "Delete an organization's avatar. It will be replaced by a default one",
         "operationId": "orgDeleteAvatar",
         "parameters": [
           {
@@ -4524,6 +4619,24 @@
             "description": "Number of items per page",
             "name": "limit",
             "in": "query"
+          },
+          {
+            "enum": [
+              "relevance",
+              "latest",
+              "oldest",
+              "recentupdate",
+              "leastupdate",
+              "mostcomment",
+              "leastcomment",
+              "nearduedate",
+              "farduedate"
+            ],
+            "type": "string",
+            "default": "latest",
+            "description": "Type of sort",
+            "name": "sort",
+            "in": "query"
           }
         ],
         "responses": {
@@ -4904,6 +5017,148 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/actions/runs": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "List a repository's action runs",
+        "operationId": "ListActionRuns",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "description": "page number of results to return (1-based)",
+            "name": "page",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "description": "page size of results, default maximum page size is 50",
+            "name": "limit",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Returns workflow run triggered by the specified events. For example, `push`, `pull_request` or `workflow_dispatch`.",
+            "name": "event",
+            "in": "query"
+          },
+          {
+            "type": "array",
+            "items": {
+              "enum": [
+                "unknown",
+                "waiting",
+                "running",
+                "success",
+                "failure",
+                "cancelled",
+                "skipped",
+                "blocked"
+              ],
+              "type": "string"
+            },
+            "description": "Returns workflow runs with the check run status or conclusion that is specified. For example, a conclusion can be success or a status can be in_progress. Only Forgejo Actions can set a status of waiting, pending, or requested.\n",
+            "name": "status",
+            "in": "query"
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "Returns the workflow run associated with the run number.\n",
+            "name": "run_number",
+            "in": "query"
+          },
+          {
+            "type": "string",
+            "description": "Only returns workflow runs that are associated with the specified head_sha.",
+            "name": "head_sha",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/ActionRunList"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          }
+        }
+      }
+    },
+    "/repos/{owner}/{repo}/actions/runs/{run_id}": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Get an action run",
+        "operationId": "ActionRun",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "id of the action run",
+            "name": "run_id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/ActionRun"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/actions/secrets": {
       "get": {
         "produces": [
@@ -5373,7 +5628,7 @@
         }
       }
     },
-    "/repos/{owner}/{repo}/actions/workflows/{workflowname}/dispatches": {
+    "/repos/{owner}/{repo}/actions/workflows/{workflowfilename}/dispatches": {
       "post": {
         "consumes": [
           "application/json"
@@ -5401,7 +5656,7 @@
           {
             "type": "string",
             "description": "name of the workflow",
-            "name": "workflowname",
+            "name": "workflowfilename",
             "in": "path",
             "required": true
           },
@@ -5570,7 +5825,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "Update avatar",
+        "summary": "Update a repository's avatar",
         "operationId": "repoUpdateAvatar",
         "parameters": [
           {
@@ -5611,7 +5866,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "Delete avatar",
+        "summary": "Delete a repository's avatar",
         "operationId": "repoDeleteAvatar",
         "parameters": [
           {
@@ -6755,6 +7010,9 @@
           "404": {
             "$ref": "#/responses/notFound"
           },
+          "409": {
+            "$ref": "#/responses/conflict"
+          },
           "413": {
             "$ref": "#/responses/quotaExceeded"
           },
@@ -6868,6 +7126,9 @@
           "404": {
             "$ref": "#/responses/notFound"
           },
+          "409": {
+            "$ref": "#/responses/conflict"
+          },
           "413": {
             "$ref": "#/responses/quotaExceeded"
           },
@@ -6932,6 +7193,9 @@
           "404": {
             "$ref": "#/responses/notFound"
           },
+          "409": {
+            "$ref": "#/responses/conflict"
+          },
           "413": {
             "$ref": "#/responses/quotaExceeded"
           },
@@ -7465,6 +7729,49 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/git/blobs": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Gets multiplbe blobs of a repository.",
+        "operationId": "GetBlobs",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "a comma separated list of blob-sha (mind the overall URL-length limit of ~2,083 chars)",
+            "name": "shas",
+            "in": "query",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/GitBlobList"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/git/blobs/{sha}": {
       "get": {
         "produces": [
@@ -7492,7 +7799,7 @@
           },
           {
             "type": "string",
-            "description": "sha of the commit",
+            "description": "sha of the blob to retrieve",
             "name": "sha",
             "in": "path",
             "required": true
@@ -7500,7 +7807,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/GitBlobResponse"
+            "$ref": "#/responses/GitBlob"
           },
           "400": {
             "$ref": "#/responses/error"
@@ -12767,7 +13074,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "List a repo's pull requests",
+        "summary": "List a repo's pull requests. If a pull request is selected but fails to be retrieved for any reason, it will be a null value in the list of results.",
         "operationId": "repoListPullRequests",
         "parameters": [
           {
@@ -12800,6 +13107,7 @@
             "enum": [
               "oldest",
               "recentupdate",
+              "recentclose",
               "leastupdate",
               "mostcomment",
               "leastcomment",
@@ -13477,7 +13785,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "create review requests for a pull request",
+        "summary": "Create review requests for a pull request",
         "operationId": "repoCreatePullReviewRequests",
         "parameters": [
           {
@@ -13530,7 +13838,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "cancel review requests for a pull request",
+        "summary": "Cancel review requests for a pull request",
         "operationId": "repoDeletePullReviewRequests",
         "parameters": [
           {
@@ -14345,7 +14653,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "add a push mirror to the repository",
+        "summary": "Set up a new push mirror in a repository",
         "operationId": "repoAddPushMirror",
         "parameters": [
           {
@@ -14489,7 +14797,7 @@
         "tags": [
           "repository"
         ],
-        "summary": "deletes a push mirror from a repository by remoteName",
+        "summary": "Remove a push mirror from a repository by remoteName",
         "operationId": "repoDeletePushMirror",
         "parameters": [
           {
@@ -15630,6 +15938,172 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/sync_fork": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Gets information about syncing the fork default branch with the base branch",
+        "operationId": "repoSyncForkDefaultInfo",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/SyncForkInfo"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      },
+      "post": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Syncs the default branch of a fork with the base branch",
+        "operationId": "repoSyncForkDefault",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
+    "/repos/{owner}/{repo}/sync_fork/{branch}": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Gets information about syncing a fork branch with the base branch",
+        "operationId": "repoSyncForkBranchInfo",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "The branch",
+            "name": "branch",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/SyncForkInfo"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      },
+      "post": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Syncs a fork branch with the base branch",
+        "operationId": "repoSyncForkBranch",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "The branch",
+            "name": "branch",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          },
+          "400": {
+            "$ref": "#/responses/error"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/tag_protections": {
       "get": {
         "produces": [
@@ -17149,6 +17623,29 @@
         }
       }
     },
+    "/signing-key.ssh": {
+      "get": {
+        "produces": [
+          "text/plain"
+        ],
+        "tags": [
+          "miscellaneous"
+        ],
+        "summary": "Get default signing-key.ssh",
+        "operationId": "getSSHSigningKey",
+        "responses": {
+          "200": {
+            "description": "SSH public key in OpenSSH authorized key format",
+            "schema": {
+              "type": "string"
+            }
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
     "/teams/{id}": {
       "get": {
         "produces": [
@@ -17624,12 +18121,12 @@
         "tags": [
           "repository"
         ],
-        "summary": "search topics via keyword",
+        "summary": "Search for topics by keyword",
         "operationId": "topicSearch",
         "parameters": [
           {
             "type": "string",
-            "description": "keywords to search",
+            "description": "keyword to search for",
             "name": "q",
             "in": "query",
             "required": true
@@ -18088,7 +18585,7 @@
         "tags": [
           "user"
         ],
-        "summary": "creates a new OAuth2 application",
+        "summary": "Creates a new OAuth2 application",
         "operationId": "userCreateOAuth2Application",
         "parameters": [
           {
@@ -18124,7 +18621,7 @@
         "tags": [
           "user"
         ],
-        "summary": "get an OAuth2 Application",
+        "summary": "Get an OAuth2 application",
         "operationId": "userGetOAuth2Application",
         "parameters": [
           {
@@ -18158,7 +18655,7 @@
         "tags": [
           "user"
         ],
-        "summary": "delete an OAuth2 Application",
+        "summary": "Delete an OAuth2 application",
         "operationId": "userDeleteOAuth2Application",
         "parameters": [
           {
@@ -18192,7 +18689,7 @@
         "tags": [
           "user"
         ],
-        "summary": "update an OAuth2 Application, this includes regenerating the client secret",
+        "summary": "Update an OAuth2 application, this includes regenerating the client secret",
         "operationId": "userUpdateOAuth2Application",
         "parameters": [
           {
@@ -18236,7 +18733,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Update Avatar",
+        "summary": "Update avatar of the current user",
         "operationId": "userUpdateAvatar",
         "parameters": [
           {
@@ -18266,7 +18763,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Delete Avatar",
+        "summary": "Delete avatar of the current user. It will be replaced by a default one",
         "operationId": "userDeleteAvatar",
         "responses": {
           "204": {
@@ -18289,7 +18786,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Blocks a user from the doer.",
+        "summary": "Blocks a user from the doer",
         "operationId": "userBlockUser",
         "parameters": [
           {
@@ -18327,7 +18824,7 @@
         "tags": [
           "user"
         ],
-        "summary": "List the authenticated user's email addresses",
+        "summary": "List all email addresses of the current user",
         "operationId": "userListEmails",
         "responses": {
           "200": {
@@ -18348,7 +18845,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Add email addresses",
+        "summary": "Add an email addresses to the current user's account",
         "operationId": "userAddEmail",
         "parameters": [
           {
@@ -18381,7 +18878,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Delete email addresses",
+        "summary": "Delete email addresses from the current user's account",
         "operationId": "userDeleteEmail",
         "parameters": [
           {
@@ -18678,7 +19175,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Create a GPG key",
+        "summary": "Add a GPG public key to current user's account",
         "operationId": "userCurrentPostGPGKey",
         "parameters": [
           {
@@ -18750,7 +19247,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Remove a GPG key",
+        "summary": "Remove a GPG public key from current user's account",
         "operationId": "userCurrentDeleteGPGKey",
         "parameters": [
           {
@@ -19460,7 +19957,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Get user settings",
+        "summary": "Get current user's account settings",
         "operationId": "getUserSettings",
         "responses": {
           "200": {
@@ -19481,7 +19978,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Update user settings",
+        "summary": "Update settings in current user's account",
         "operationId": "updateUserSettings",
         "parameters": [
           {
@@ -19828,7 +20325,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Unblocks a user from the doer.",
+        "summary": "Unblocks a user from the doer",
         "operationId": "userUnblockUser",
         "parameters": [
           {
@@ -19882,6 +20379,20 @@
             "name": "uid",
             "in": "query"
           },
+          {
+            "enum": [
+              "oldest",
+              "newest",
+              "alphabetically",
+              "reversealphabetically",
+              "recentupdate",
+              "leastupdate"
+            ],
+            "type": "string",
+            "description": "sort order of results",
+            "name": "sort",
+            "in": "query"
+          },
           {
             "type": "integer",
             "description": "page number of results to return (1-based)",
@@ -20487,7 +20998,7 @@
         "tags": [
           "user"
         ],
-        "summary": "Create an access token",
+        "summary": "Generate an access token for the current user",
         "operationId": "userCreateToken",
         "parameters": [
           {
@@ -20529,7 +21040,7 @@
         "tags": [
           "user"
         ],
-        "summary": "delete an access token",
+        "summary": "Delete an access token from current user's account",
         "operationId": "userDeleteAccessToken",
         "parameters": [
           {
@@ -20705,6 +21216,28 @@
       },
       "x-go-package": "forgejo.org/services/context"
     },
+    "APPersonFollowItem": {
+      "type": "object",
+      "properties": {
+        "actor_id": {
+          "type": "string",
+          "x-go-name": "ActorID"
+        },
+        "note": {
+          "type": "string",
+          "x-go-name": "Note"
+        },
+        "original_item": {
+          "type": "string",
+          "x-go-name": "OriginalItem"
+        },
+        "original_url": {
+          "type": "string",
+          "x-go-name": "OriginalURL"
+        }
+      },
+      "x-go-package": "forgejo.org/modules/structs"
+    },
     "AccessToken": {
       "type": "object",
       "title": "AccessToken represents an API access token.",
@@ -20736,6 +21269,129 @@
       },
       "x-go-package": "forgejo.org/modules/structs"
     },
+    "ActionRun": {
+      "description": "ActionRun represents an action run",
+      "type": "object",
+      "properties": {
+        "ScheduleID": {
+          "description": "the cron id for the schedule trigger",
+          "type": "integer",
+          "format": "int64"
+        },
+        "approved_by": {
+          "description": "who approved this action run",
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "ApprovedBy"
+        },
+        "commit_sha": {
+          "description": "the commit sha the action run ran on",
+          "type": "string",
+          "x-go-name": "CommitSHA"
+        },
+        "created": {
+          "description": "when the action run was created",
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Created"
+        },
+        "duration": {
+          "$ref": "#/definitions/Duration"
+        },
+        "event": {
+          "description": "the webhook event that causes the workflow to run",
+          "type": "string",
+          "x-go-name": "Event"
+        },
+        "event_payload": {
+          "description": "the payload of the webhook event that causes the workflow to run",
+          "type": "string",
+          "x-go-name": "EventPayload"
+        },
+        "html_url": {
+          "description": "the url of this action run",
+          "type": "string",
+          "x-go-name": "HTMLURL"
+        },
+        "id": {
+          "description": "the action run id",
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "ID"
+        },
+        "index_in_repo": {
+          "description": "a unique number for each run of a repository",
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Index"
+        },
+        "is_fork_pull_request": {
+          "description": "If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow.",
+          "type": "boolean",
+          "x-go-name": "IsForkPullRequest"
+        },
+        "is_ref_deleted": {
+          "description": "has the commit/tag/… the action run ran on been deleted",
+          "type": "boolean",
+          "x-go-name": "IsRefDeleted"
+        },
+        "need_approval": {
+          "description": "may need approval if it's a fork pull request",
+          "type": "boolean",
+          "x-go-name": "NeedApproval"
+        },
+        "prettyref": {
+          "description": "the commit/tag/… the action run ran on",
+          "type": "string",
+          "x-go-name": "PrettyRef"
+        },
+        "repository": {
+          "$ref": "#/definitions/Repository"
+        },
+        "started": {
+          "description": "when the action run was started",
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Started"
+        },
+        "status": {
+          "description": "the current status of this run",
+          "type": "string",
+          "x-go-name": "Status"
+        },
+        "stopped": {
+          "description": "when the action run was stopped",
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Stopped"
+        },
+        "title": {
+          "description": "the action run's title",
+          "type": "string",
+          "x-go-name": "Title"
+        },
+        "trigger_event": {
+          "description": "the trigger event defined in the `on` configuration of the triggered workflow",
+          "type": "string",
+          "x-go-name": "TriggerEvent"
+        },
+        "trigger_user": {
+          "$ref": "#/definitions/User"
+        },
+        "updated": {
+          "description": "when the action run was last updated",
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "Updated"
+        },
+        "workflow_id": {
+          "description": "the name of workflow file",
+          "type": "string",
+          "x-go-name": "WorkflowID"
+        }
+      },
+      "x-go-package": "forgejo.org/modules/structs"
+    },
     "ActionRunJob": {
       "description": "ActionRunJob represents a job of a run",
       "type": "object",
@@ -21833,6 +22489,11 @@
           "type": "string",
           "x-go-name": "LastCommitSHA"
         },
+        "last_commit_when": {
+          "type": "string",
+          "format": "date-time",
+          "x-go-name": "LastCommitWhen"
+        },
         "name": {
           "type": "string",
           "x-go-name": "Name"
@@ -21888,7 +22549,18 @@
           "items": {
             "type": "string"
           },
-          "x-go-name": "Scopes"
+          "x-go-name": "Scopes",
+          "example": [
+            "all",
+            "read:activitypub",
+            "read:issue",
+            "write:misc",
+            "read:notification",
+            "read:organization",
+            "read:package",
+            "read:repository",
+            "read:user"
+          ]
         }
       },
       "x-go-package": "forgejo.org/modules/structs"
@@ -22570,6 +23242,10 @@
       "type": "object",
       "title": "CreatePushMirrorOption represents need information to create a push mirror of a repository.",
       "properties": {
+        "branch_filter": {
+          "type": "string",
+          "x-go-name": "BranchFilter"
+        },
         "interval": {
           "type": "string",
           "x-go-name": "Interval"
@@ -23206,6 +23882,12 @@
       },
       "x-go-package": "forgejo.org/modules/structs"
     },
+    "Duration": {
+      "description": "A Duration represents the elapsed time between two instants\nas an int64 nanosecond count. The representation limits the\nlargest representable duration to approximately 290 years.",
+      "type": "integer",
+      "format": "int64",
+      "x-go-package": "time"
+    },
     "EditAttachmentOptions": {
       "description": "EditAttachmentOptions options for editing attachments",
       "type": "object",
@@ -24504,8 +25186,8 @@
       },
       "x-go-package": "forgejo.org/modules/structs"
     },
-    "GitBlobResponse": {
-      "description": "GitBlobResponse represents a git blob",
+    "GitBlob": {
+      "description": "GitBlob represents a git blob",
       "type": "object",
       "properties": {
         "content": {
@@ -25172,6 +25854,25 @@
       },
       "x-go-package": "forgejo.org/modules/structs"
     },
+    "ListActionRunResponse": {
+      "description": "ListActionRunResponse return a list of ActionRun",
+      "type": "object",
+      "properties": {
+        "total_count": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "TotalCount"
+        },
+        "workflow_runs": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ActionRun"
+          },
+          "x-go-name": "Entries"
+        }
+      },
+      "x-go-package": "forgejo.org/modules/structs"
+    },
     "MarkdownOption": {
       "description": "MarkdownOption markdown options",
       "type": "object",
@@ -26428,6 +27129,10 @@
       "description": "PushMirror represents information of a push mirror",
       "type": "object",
       "properties": {
+        "branch_filter": {
+          "type": "string",
+          "x-go-name": "BranchFilter"
+        },
         "created": {
           "type": "string",
           "format": "date-time",
@@ -27432,6 +28137,30 @@
       },
       "x-go-package": "forgejo.org/modules/structs"
     },
+    "SyncForkInfo": {
+      "description": "SyncForkInfo information about syncing a fork",
+      "type": "object",
+      "properties": {
+        "allowed": {
+          "type": "boolean",
+          "x-go-name": "Allowed"
+        },
+        "base_commit": {
+          "type": "string",
+          "x-go-name": "BaseCommit"
+        },
+        "commits_behind": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "CommitsBehind"
+        },
+        "fork_commit": {
+          "type": "string",
+          "x-go-name": "ForkCommit"
+        }
+      },
+      "x-go-package": "forgejo.org/modules/structs"
+    },
     "Tag": {
       "description": "Tag represents a repository tag",
       "type": "object",
@@ -28352,6 +29081,18 @@
         }
       }
     },
+    "ActionRun": {
+      "description": "ActionRun",
+      "schema": {
+        "$ref": "#/definitions/ActionRun"
+      }
+    },
+    "ActionRunList": {
+      "description": "ActionRunList",
+      "schema": {
+        "$ref": "#/definitions/ListActionRunResponse"
+      }
+    },
     "ActionVariable": {
       "description": "ActionVariable",
       "schema": {
@@ -28668,10 +29409,19 @@
         "$ref": "#/definitions/GeneralUISettings"
       }
     },
-    "GitBlobResponse": {
-      "description": "GitBlobResponse",
+    "GitBlob": {
+      "description": "GitBlob",
       "schema": {
-        "$ref": "#/definitions/GitBlobResponse"
+        "$ref": "#/definitions/GitBlob"
+      }
+    },
+    "GitBlobList": {
+      "description": "GitBlobList",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/GitBlob"
+        }
       }
     },
     "GitHook": {
@@ -28933,6 +29683,15 @@
         }
       }
     },
+    "PersonFeed": {
+      "description": "Personfeed",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/APPersonFollowItem"
+        }
+      }
+    },
     "PublicKey": {
       "description": "PublicKey",
       "schema": {
@@ -29211,6 +29970,15 @@
         }
       }
     },
+    "SyncForkInfo": {
+      "description": "SyncForkInfo",
+      "schema": {
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/SyncForkInfo"
+        }
+      }
+    },
     "Tag": {
       "description": "Tag",
       "schema": {
@@ -29457,7 +30225,7 @@
   },
   "securityDefinitions": {
     "AccessToken": {
-      "description": "This authentication option is deprecated for removal in Gitea 1.23. Please use AuthorizationHeaderToken instead.",
+      "description": "This authentication option is deprecated for removal in Forgejo v13.0.0. Please use AuthorizationHeaderToken instead.",
       "type": "apiKey",
       "name": "access_token",
       "in": "query"
@@ -29490,7 +30258,7 @@
       "in": "header"
     },
     "Token": {
-      "description": "This authentication option is deprecated for removal in Gitea 1.23. Please use AuthorizationHeaderToken instead.",
+      "description": "This authentication option is deprecated for removal in Forgejo v13.0.0. Please use AuthorizationHeaderToken instead.",
       "type": "apiKey",
       "name": "token",
       "in": "query"
diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl
index 9d0d6cfb6f..b2deb5a2c9 100644
--- a/templates/user/auth/captcha.tmpl
+++ b/templates/user/auth/captcha.tmpl
@@ -1,7 +1,7 @@
 {{if .EnableCaptcha}}{{if eq .CaptchaType "image"}}
 	<div class="inline field tw-text-center">
 		<input type="hidden" name="img-captcha-id" value="{{.Captcha}}">
-		<img style="transform: scaleX(-1)" onclick="this.src=`{{AppSubUrl}}/captcha/{{.Captcha}}.png?reload=${Date.now()}`" class="captcha-img" src="{{AppSubUrl}}/captcha/{{.Captcha}}.png" alt="{{ctx.Locale.Tr "captcha"}}">
+		<img style="transform: scaleX(-1);background-color: white" onclick="this.src=`{{AppSubUrl}}/captcha/{{.Captcha}}.png?reload=${Date.now()}`" class="captcha-img" src="{{AppSubUrl}}/captcha/{{.Captcha}}.png" alt="{{ctx.Locale.Tr "captcha"}}">
 	</div>
 	<div class="required field {{if .Err_Captcha}}error{{end}}">
 		<label for="captcha">{{ctx.Locale.Tr "captcha"}}</label>
@@ -11,12 +11,12 @@
 	<div class="inline field tw-text-center required">
 		<div id="captcha" data-captcha-type="g-recaptcha" class="g-recaptcha-style" data-sitekey="{{.RecaptchaSitekey}}"></div>
 	</div>
-	<script src='{{URLJoin .RecaptchaURL "api.js"}}'></script>
+	<script defer src='{{URLJoin .RecaptchaURL "api.js"}}'></script>
 {{else if eq .CaptchaType "hcaptcha"}}
 	<div class="inline field tw-text-center required">
 		<div id="captcha" data-captcha-type="h-captcha" class="h-captcha-style" data-sitekey="{{.HcaptchaSitekey}}"></div>
 	</div>
-	<script src='https://hcaptcha.com/1/api.js'></script>
+	<script defer src='https://hcaptcha.com/1/api.js'></script>
 {{else if eq .CaptchaType "mcaptcha"}}
 	<div class="inline field tw-text-center">
 		<div class="m-captcha-style" id="mcaptcha__widget-container"></div>
@@ -26,5 +26,5 @@
 	<div class="inline field tw-text-center">
 		<div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div>
 	</div>
-	<script src='https://challenges.cloudflare.com/turnstile/v0/api.js'></script>
+	<script defer src='https://challenges.cloudflare.com/turnstile/v0/api.js'></script>
 {{end}}{{end}}
diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl
index 372471368f..a7a4495820 100644
--- a/templates/user/auth/finalize_openid.tmpl
+++ b/templates/user/auth/finalize_openid.tmpl
@@ -13,7 +13,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required inline field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required autocorrect="off" autocapitalize="none">
 					</div>
 					<div class="required inline field {{if .Err_Password}}error{{end}}">
 						<label for="password">{{ctx.Locale.Tr "password"}}</label>
diff --git a/templates/user/auth/oidc_wellknown.tmpl b/templates/user/auth/oidc_wellknown.tmpl
index 54bb4a763d..d8edcae41d 100644
--- a/templates/user/auth/oidc_wellknown.tmpl
+++ b/templates/user/auth/oidc_wellknown.tmpl
@@ -1,5 +1,5 @@
 {
-    "issuer": "{{AppUrl | JSEscape}}",
+    "issuer": "{{.Issuer | JSEscape}}",
     "authorization_endpoint": "{{AppUrl | JSEscape}}login/oauth/authorize",
     "token_endpoint": "{{AppUrl | JSEscape}}login/oauth/access_token",
     "jwks_uri": "{{AppUrl | JSEscape}}login/oauth/keys",
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index f8303feef3..130c262a40 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -13,7 +13,7 @@
 					{{if .user_email}}
 						<div class="inline field">
 							<label for="user_name">{{ctx.Locale.Tr "email"}}</label>
-							<input id="user_name" type="text" value="{{.user_email}}" disabled>
+							<input id="user_name" type="text" value="{{.user_email}}" disabled autocorrect="off" autocapitalize="none">
 						</div>
 					{{end}}
 					{{if .IsResetForm}}
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 4abb4646d1..79c3c2cc08 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -15,7 +15,7 @@
 			{{.CsrfTokenHtml}}
 			<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 				<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-				<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+				<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required autocorrect="off" autocapitalize="none">
 			</div>
 			{{if or (not .DisablePassword) .LinkAccountMode}}
 			<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 6c5ac6731f..6dc3644364 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -17,7 +17,7 @@
 			{{else}}
 				<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required autocorrect="off" autocapitalize="none">
 				</div>
 				<div class="required field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
diff --git a/templates/user/auth/signup_openid_connect.tmpl b/templates/user/auth/signup_openid_connect.tmpl
index e4b7936374..77f95cc98e 100644
--- a/templates/user/auth/signup_openid_connect.tmpl
+++ b/templates/user/auth/signup_openid_connect.tmpl
@@ -14,7 +14,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required inline field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required autocorrect="off" autocapitalize="none">
 					</div>
 					<div class="required inline field {{if .Err_Password}}error{{end}}">
 						<label for="password">{{ctx.Locale.Tr "password"}}</label>
diff --git a/templates/user/auth/signup_openid_register.tmpl b/templates/user/auth/signup_openid_register.tmpl
index c017a0e65b..6248a68738 100644
--- a/templates/user/auth/signup_openid_register.tmpl
+++ b/templates/user/auth/signup_openid_register.tmpl
@@ -14,7 +14,7 @@
 					{{.CsrfTokenHtml}}
 					<div class="required field {{if .Err_UserName}}error{{end}}">
 						<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+						<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required autocorrect="off" autocapitalize="none">
 					</div>
 					<div class="required field {{if .Err_Email}}error{{end}}">
 						<label for="email">{{ctx.Locale.Tr "email"}}</label>
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl
index d245239171..86ec4fe88d 100644
--- a/templates/user/auth/twofa.tmpl
+++ b/templates/user/auth/twofa.tmpl
@@ -11,7 +11,7 @@
 					{{template "base/alert" .}}
 					<div class="required field">
 						<label for="passcode">{{ctx.Locale.Tr "passcode"}}</label>
-						<input id="passcode" name="passcode" type="text" autocomplete="one-time-code" inputmode="numeric" pattern="[0-9]*" autofocus required>
+						<input id="passcode" name="passcode" type="text" autocomplete="one-time-code" spellcheck="false" inputmode="numeric" pattern="[0-9]*" autofocus required>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl
index 7d7e3c1b54..aa0413e1c4 100644
--- a/templates/user/auth/twofa_scratch.tmpl
+++ b/templates/user/auth/twofa_scratch.tmpl
@@ -11,7 +11,7 @@
 					{{template "base/alert" .}}
 					<div class="required field">
 						<label for="token">{{ctx.Locale.Tr "auth.scratch_code"}}</label>
-						<input id="token" name="token" type="text" autocomplete="off" autofocus required>
+						<input id="token" name="token" type="text" autocomplete="off" spellcheck="false" autofocus required>
 					</div>
 
 					<div class="inline field">
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index e9fbb7a5b9..82fc0b8e6e 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -76,7 +76,7 @@
 					{{else if .GetOpType.InActions "publish_release"}}
 						{{$linkText := .Content | RenderEmoji $.Context}}
 						{{ctx.Locale.Tr "action.publish_release" (.GetRepoLink ctx) (printf "%s/releases/tag/%s" (.GetRepoLink ctx) .GetTag) (.ShortRepoPath ctx) $linkText}}
-					{{else if .GetOpType.InActions "review_dismissed"}}
+					{{else if .GetOpType.InActions "pull_review_dismissed"}}
 						{{$index := index .GetIssueInfos 0}}
 						{{$reviewer := index .GetIssueInfos 1}}
 						{{ctx.Locale.Tr "action.review_dismissed" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx) $reviewer}}
@@ -84,15 +84,19 @@
 					{{DateUtils.TimeSince .GetCreate}}
 				</div>
 				{{if .GetOpType.InActions "commit_repo" "mirror_sync_push"}}
-					{{$push := ActionContent2Commits .}}
+					{{$push := ActionContent2Commits ctx .}}
 					{{$repoLink := (.GetRepoLink ctx)}}
 					{{$repo := .Repo}}
 					<div class="tw-flex tw-flex-col tw-gap-1">
 						{{range $push.Commits}}
-							{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
 							<div class="flex-text-block">
-								<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" alt="" title="{{.AuthorName}}" width="16" height="16">
-								<a class="ui sha label" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
+								<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" alt="" title="{{.AuthorName}}" width="16" height="16" loading="lazy">
+								{{template "repo/shabox" (dict
+									"sha1" .Sha1
+									"commitLink" (printf "%s/commit/%s" $repoLink .Sha1)
+									"signature" .Signature
+									"verification" .Verification
+								)}}
 								<span class="text truncate">
 									{{RenderCommitMessage $.Context .Message ($repo.ComposeMetas ctx)}}
 								</span>
@@ -117,8 +121,8 @@
 				{{else if .GetOpType.InActions "close_issue" "reopen_issue" "close_pull_request" "reopen_pull_request"}}
 					<span class="text truncate issue title">{{RenderIssueTitle ctx (.GetIssueTitle ctx) (.Repo.ComposeMetas ctx)}}</span>
 				{{else if .GetOpType.InActions "pull_review_dismissed"}}
-				<div class="flex-item-body text black">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
-				<div class="flex-item-body text black">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
+					<div class="flex-item-body text black">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
+					<div class="flex-item-body text black">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
 				{{end}}
 			</div>
 			<div class="flex-item-trailing">
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 347e7a81bf..67111c6d38 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -114,7 +114,7 @@
 											{{ctx.Locale.Tr "repo.milestones.closed" $closedDate}}
 										{{else}}
 											{{if .DeadlineString}}
-												<span{{if .IsOverdue}} class="text red"{{end}}>
+												<span class="flex-text-inline {{if .IsOverdue}}text red{{end}}">
 													{{svg "octicon-calendar" 14}}
 													{{DateUtils.AbsoluteShort (.DeadlineString|DateUtils.ParseLegacy)}}
 												</span>
@@ -125,17 +125,6 @@
 										{{end}}
 									</div>
 								</div>
-								{{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
-									<div class="group">
-										<a class="flex-text-inline" href="{{$.Link}}/{{.ID}}/edit">{{svg "octicon-pencil" 14}}{{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-										{{if .IsClosed}}
-											<a class="link-action flex-text-inline" href data-url="{{$.Link}}/{{.ID}}/open">{{svg "octicon-check" 14}}{{ctx.Locale.Tr "repo.milestones.open"}}</a>
-										{{else}}
-											<a class="link-action flex-text-inline" href data-url="{{$.Link}}/{{.ID}}/close">{{svg "octicon-x" 14}}{{ctx.Locale.Tr "repo.milestones.close"}}</a>
-										{{end}}
-										<a class="delete-button flex-text-inline" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trash" 14}}{{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
-									</div>
-								{{end}}
 							</div>
 							{{if .Content}}
 								<div class="markup content">
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 1f39576ac2..1d62f3eea9 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -12,12 +12,12 @@
 					{{if eq .SignedUserID .ContextUser.ID}}
 					<p id="visibility-hint">
 						{{if .ContextUser.KeepActivityPrivate}}
-							{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private" "/user/settings#keep-activity-private"}}
+							{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private" (print AppSubUrl "/user/settings#keep-activity-private")}}
 						{{else}}
 							{{if eq .ContextUser.Visibility 2}}
-								{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private_profile" "/user/settings#visibility-setting"}}
+								{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private_profile" (print AppSubUrl "/user/settings#visibility-setting")}}
 							{{else}}
-								{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" "/user/settings#keep-activity-private"}}
+								{{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" (print AppSubUrl "/user/settings#keep-activity-private")}}
 							{{end}}
 						{{end}}
 					</p>
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index b8783dead0..d7cc074db8 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -77,16 +77,21 @@
 							<label for="token">{{ctx.Locale.Tr "settings.ssh_token"}}</label>
 							<input readonly="" value="{{$.TokenToSign}}">
 							<div class="help">
+								<br>
 								<p>{{ctx.Locale.Tr "settings.ssh_token_help"}}</p>
-								<p><code>echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
+								<div class="markup"><pre class="code-block"><code>echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f ~/.ssh/id_ed25519 # or the path to the private key if it is different.</code></pre></div>
+								<br>
+								<p>{{ctx.Locale.Tr "settings.ssh_token_help_ssh_agent"}}</p>
+								<div class="markup"><pre class="code-block"><code>bash -c "echo -n '{{$.TokenToSign}}' | ssh-keygen -Y sign -n gitea -f <(echo '{{.OmitEmail}}')"</code></pre></div>
+								<br>
 								<details>
 									<summary>Windows PowerShell</summary>
-									<p><code>cmd /c "&lt;NUL set /p=`"{{$.TokenToSign}}`"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></p>
+									<div class="markup"><pre class="code-block"><code>cmd /c "&lt;NUL set /p=`"{{$.TokenToSign}}`"| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey"</code></pre></div>
 								</details>
 								<br>
 								<details>
 									<summary>Windows CMD</summary>
-									<p><code>set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></p>
+									<div class="markup"><pre class="code-block"><code>set /p={{$.TokenToSign}}| ssh-keygen -Y sign -n gitea -f /path_to_PrivateKey_or_RelatedPublicKey</code></pre></div>
 								</details>
 							</div>
 							<br>
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index eadf2ee9e5..325fdada7d 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -1,3 +1,4 @@
+{{if not .HideNavbarLinks}}
 <div class="flex-container-nav">
 	<div class="ui fluid vertical menu">
 		<div class="header item">{{ctx.Locale.Tr "user.settings"}}</div>
@@ -61,3 +62,4 @@
 		</a>
 	</div>
 </div>
+{{end}}
diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl
index bd7d69b259..bdfdac8e37 100644
--- a/templates/user/settings/packages.tmpl
+++ b/templates/user/settings/packages.tmpl
@@ -9,14 +9,14 @@
 		<div class="ui attached segment">
 			<div class="ui form">
 				<div class="field">
-					<label>{{ctx.Locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
+					<label>{{ctx.Locale.Tr "packages.registry.documentation" "Chef" "https://forgejo.org/docs/latest/user/packages/chef/"}}</label>
 				</div>
 				<form class="field" action="{{.Link}}/chef/regenerate_keypair" method="post">
 					{{.CsrfTokenHtml}}
 					<button class="ui primary button">{{ctx.Locale.Tr "packages.owner.settings.chef.keypair"}}</button>
 				</form>
 				<div class="field">
-					<label>{{ctx.Locale.Tr "packages.registry.documentation" "Chef" "https://forgejo.org/docs/latest/user/packages/chef/"}}</label>
+					<label>{{ctx.Locale.Tr "packages.owner.settings.chef.keypair.description"}}</label>
 				</div>
 			</div>
 		</div>
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 3bc8800a76..203da3f341 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -83,6 +83,7 @@
 								{{end}}
 							</div>
 						</div>
+						<span class="help">{{ctx.Locale.Tr "settings.visibility.description" "https://forgejo.org/docs/latest/user/repo-permissions/#profile-and-visibility"}}</span>
 					</label>
 
 					<label>
@@ -108,7 +109,7 @@
 			</form>
 		</div>
 
-		<h4 class="ui top attached header">
+		<h4 id="avatar-settings" class="ui top attached header">
 			{{ctx.Locale.Tr "settings.avatar"}}
 		</h4>
 		<div class="ui attached segment">
@@ -137,6 +138,7 @@
 				<div class="inline field tw-pl-4">
 					<label for="new-avatar">{{ctx.Locale.Tr "settings.choose_new_avatar"}}</label>
 					<input id="new-avatar" name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
+					<br/><span class=help>{{ctx.Locale.Tr "avatar.constraints_hint" (ctx.Locale.TrSize .MaxAvatarFileSize) .MaxAvatarWidth .MaxAvatarHeight}}</span>
 				</div>
 
 				<div class="field">
diff --git a/templates/user/settings/security/security.tmpl b/templates/user/settings/security/security.tmpl
index aee0456b8f..9c85beab3e 100644
--- a/templates/user/settings/security/security.tmpl
+++ b/templates/user/settings/security/security.tmpl
@@ -1,10 +1,15 @@
-{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security")}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security" "HideNavbarLinks" .HideNavbarLinks)}}
 	<div class="user-setting-content">
+		{{if .MustEnableTwoFactor}}
+			<div class="ui red message">{{ctx.Locale.Tr "settings.must_enable_2fa"}}</div>
+		{{end}}
 		{{template "user/settings/security/twofa" .}}
 		{{template "user/settings/security/webauthn" .}}
-		{{template "user/settings/security/accountlinks" .}}
-		{{if .EnableOpenIDSignIn}}
-		{{template "user/settings/security/openid" .}}
+		{{if not .MustEnableTwoFactor}}
+			{{template "user/settings/security/accountlinks" .}}
+			{{if .EnableOpenIDSignIn}}
+				{{template "user/settings/security/openid" .}}
+			{{end}}
 		{{end}}
 	</div>
 
diff --git a/templates/user/settings/security/twofa.tmpl b/templates/user/settings/security/twofa.tmpl
index adebce4265..bee15f17ef 100644
--- a/templates/user/settings/security/twofa.tmpl
+++ b/templates/user/settings/security/twofa.tmpl
@@ -5,16 +5,24 @@
 	<p>{{ctx.Locale.Tr "settings.twofa_desc"}}</p>
 	{{if .TOTPEnrolled}}
 	<p>{{ctx.Locale.Tr "settings.twofa_is_enrolled"}}</p>
+	<div class="inline field">
+		<p>{{ctx.Locale.Tr "settings.twofa_reenroll.description"}}</p>
+		<a class="ui primary button" href="{{AppSubUrl}}/user/settings/security/two_factor/reenroll">{{ctx.Locale.Tr "settings.twofa_reenroll"}}</a>
+	</div>
 	<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data">
 		{{.CsrfTokenHtml}}
 		<p>{{ctx.Locale.Tr "settings.regenerate_scratch_token_desc"}}</p>
 		<button class="ui primary button">{{ctx.Locale.Tr "settings.twofa_scratch_token_regenerate"}}</button>
 	</form>
-	<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
-		{{.CsrfTokenHtml}}
-		<p>{{ctx.Locale.Tr "settings.twofa_disable_note"}}</p>
-		<button class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{ctx.Locale.Tr "settings.twofa_disable"}}</button>
-	</form>
+	{{if .SignedUser.MustHaveTwoFactor}}
+		<p class="tw-mt-4 tw-mb-0">{{ctx.Locale.Tr "settings.twofa_unroll_unavailable"}}</p>
+	{{else}}
+		<form class="ui form" action="{{AppSubUrl}}/user/settings/security/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form">
+			{{.CsrfTokenHtml}}
+			<p>{{ctx.Locale.Tr "settings.twofa_disable_note"}}</p>
+			<button class="ui red button delete-button" data-modal-id="disable-twofa" data-type="form" data-form="#disable-form">{{ctx.Locale.Tr "settings.twofa_disable"}}</button>
+		</form>
+	{{end}}
 	{{else}}
 	{{/* The recovery tip is there as a means of encouraging a user to enroll */}}
 	<p>{{ctx.Locale.Tr "settings.twofa_recovery_tip"}}</p>
diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl
index cac88ee1d0..3987b2258d 100644
--- a/templates/user/settings/security/twofa_enroll.tmpl
+++ b/templates/user/settings/security/twofa_enroll.tmpl
@@ -1,7 +1,11 @@
-{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa")}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa" "HideNavbarLinks" .HideNavbarLinks)}}
 	<div class="user-setting-content">
 		<h4 class="ui top attached header">
-			{{ctx.Locale.Tr "settings.twofa_enroll"}}
+			{{if .ReenrollTwofa}}
+				{{ctx.Locale.Tr "settings.twofa_reenroll"}}
+			{{else}}
+				{{ctx.Locale.Tr "settings.twofa_enroll"}}
+			{{end}}
 		</h4>
 		<div class="ui attached segment">
 			<p>{{ctx.Locale.Tr "settings.scan_this_image"}}</p>
diff --git a/templates/webhook/shared-settings.tmpl b/templates/webhook/shared-settings.tmpl
index b6c05b78ed..47bce87e9e 100644
--- a/templates/webhook/shared-settings.tmpl
+++ b/templates/webhook/shared-settings.tmpl
@@ -153,6 +153,28 @@
 					<span class="help">{{ctx.Locale.Tr "repo.settings.event_pull_request_review_request_desc"}}</span>
 				</label>
 			</fieldset>
+			<!-- Action Run Events -->
+			<fieldset class="simple-grid grid-2">
+				<legend>{{ctx.Locale.Tr "repo.settings.event_header_action"}}</legend>
+				<!-- Action Run Failure -->
+				<label>
+					<input name="action_failure" type="checkbox" {{if .Webhook.ActionRunFailure}}checked{{end}}>
+					{{ctx.Locale.Tr "repo.settings.event_action_failure"}}
+					<span class="help">{{ctx.Locale.Tr "repo.settings.event_action_failure_desc"}}</span>
+				</label>
+				<!-- Action Run Recover -->
+				<label>
+					<input name="action_recover" type="checkbox" {{if .Webhook.ActionRunRecover}}checked{{end}}>
+					{{ctx.Locale.Tr "repo.settings.event_action_recover"}}
+					<span class="help">{{ctx.Locale.Tr "repo.settings.event_action_recover_desc"}}</span>
+				</label>
+				<!-- Action Run Success -->
+				<label>
+					<input name="action_success" type="checkbox" {{if .Webhook.ActionRunSuccess}}checked{{end}}>
+					{{ctx.Locale.Tr "repo.settings.event_action_success"}}
+					<span class="help">{{ctx.Locale.Tr "repo.settings.event_action_success_desc"}}</span>
+				</label>
+			</fieldset>
 		</fieldset>
 	</fieldset>
 </div>
@@ -186,7 +208,7 @@
 		<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.add_webhook"}}</button>
 	{{else}}
 		<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_webhook"}}</button>
-		<a class="ui red delete-button button" data-url="{{.BaseLink}}/delete" data-id="{{.Webhook.ID}}">{{ctx.Locale.Tr "repo.settings.delete_webhook"}}</a>
+		<a class="ui red delete-button button" data-url="{{.BaseLink}}/delete" data-id="{{.Webhook.ID}}" data-modal-id="delete-webhook">{{ctx.Locale.Tr "repo.settings.delete_webhook"}}</a>
 	{{end}}
 </fieldset>
 
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index 35fc5e7d1d..d70bf399a5 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -364,7 +364,7 @@ the click will succeed,
 but the depending interaction won't,
 although playwright repeatedly tries to find the content.
 
-You can [group statements using toPass]()https://playwright.dev/docs/test-assertions#expecttopass).
+You can [group statements using toPass](https://playwright.dev/docs/test-assertions#expecttopass).
 This code retries the dropdown click until the second item is found.
 
 ~~~js
diff --git a/tests/e2e/actions.test.e2e.ts b/tests/e2e/actions.test.e2e.ts
index 4e93b89ee0..0293d6b60c 100644
--- a/tests/e2e/actions.test.e2e.ts
+++ b/tests/e2e/actions.test.e2e.ts
@@ -9,10 +9,27 @@
 // routers/web/repo/actions/**
 // @watch end
 
-import {expect} from '@playwright/test';
+import {expect, type Page, type TestInfo} from '@playwright/test';
 import {save_visual, test} from './utils_e2e.ts';
 
 const workflow_trigger_notification_text = 'This workflow has a workflow_dispatch event trigger.';
+
+async function dispatchSuccess(page: Page, testInfo: TestInfo) {
+  test.skip(testInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383');
+  await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
+
+  await page.locator('#workflow_dispatch_dropdown>button').click();
+
+  await page.fill('input[name="inputs[string2]"]', 'abc');
+  await save_visual(page);
+  await page.locator('#workflow-dispatch-submit').click();
+
+  await expect(page.getByText('Workflow run was successfully requested.')).toBeVisible();
+
+  await expect(page.locator('.run-list>:first-child .run-list-meta', {hasText: 'now'})).toBeVisible();
+  await save_visual(page);
+}
+
 test.describe('Workflow Authenticated user2', () => {
   test.use({user: 'user2'});
 
@@ -50,20 +67,10 @@ test.describe('Workflow Authenticated user2', () => {
     await save_visual(page);
   });
 
+  // no assertions as the login in this test case is extracted for reuse
+  // eslint-disable-next-line playwright/expect-expect
   test('dispatch success', async ({page}, testInfo) => {
-    test.skip(testInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383');
-    await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
-
-    await page.locator('#workflow_dispatch_dropdown>button').click();
-
-    await page.fill('input[name="inputs[string2]"]', 'abc');
-    await save_visual(page);
-    await page.locator('#workflow-dispatch-submit').click();
-
-    await expect(page.getByText('Workflow run was successfully requested.')).toBeVisible();
-
-    await expect(page.locator('.run-list>:first-child .run-list-meta', {hasText: 'now'})).toBeVisible();
-    await save_visual(page);
+    await dispatchSuccess(page, testInfo);
   });
 });
 
@@ -73,3 +80,127 @@ test('workflow dispatch box not available for unauthenticated users', async ({pa
   await expect(page.locator('body')).not.toContainText(workflow_trigger_notification_text);
   await save_visual(page);
 });
+
+async function completeDynamicRefresh(page: Page) {
+  // Ensure that the reloading indicator isn't active, indicating that dynamic refresh is done.
+  await expect(page.locator('#reloading-indicator')).not.toHaveClass(/(^|\s)is-loading(\s|$)/);
+}
+
+async function simulatePollingInterval(page: Page) {
+  // In order to simulate the background page sitting around for > 30s, a custom event `simulate-polling-interval` is
+  // fired into the document to mimic the polling interval expiring -- although this isn't a perfectly great E2E test
+  // with this kind of mimicry, it's better than having multiple >30s execution-time tests.
+  await page.evaluate(() => {
+    document.dispatchEvent(new Event('simulate-polling-interval'));
+  });
+  await completeDynamicRefresh(page);
+}
+
+test.describe('workflow list dynamic refresh', () => {
+  test.use({user: 'user2'});
+
+  test('refreshes on visibility change', async ({page}, testInfo) => {
+    // Test operates by creating two pages; one which is sitting idle on the workflows list (backgroundPage), and one
+    // which triggers a workflow dispatch.  Then a document visibilitychange event is fired on the background page to
+    // mimic a user returning to the tab on their browser, which should trigger the workflow list to refresh and display
+    // the newly dispatched workflow from the other page.
+
+    const backgroundPage = await page.context().newPage();
+    await backgroundPage.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
+
+    // Mirror the `Workflow Authenticated user2 > dispatch success` test:
+    await dispatchSuccess(page, testInfo);
+    const latestDispatchedRun = await page.locator('.run-list>:first-child .flex-item-body>b').textContent();
+    expect(latestDispatchedRun).toMatch(/^#/); // workflow ID, eg. "#53"
+
+    // Synthetically trigger a visibilitychange event, as if we were returning to backgroundPage:
+    await backgroundPage.evaluate(() => {
+      document.dispatchEvent(new Event('visibilitychange'));
+    });
+    await completeDynamicRefresh(page);
+    await expect(backgroundPage.locator('.run-list>:first-child .flex-item-body>b', {hasText: latestDispatchedRun})).toBeVisible();
+    await save_visual(backgroundPage);
+  });
+
+  test('refreshes on interval', async ({page}, testInfo) => {
+    // Test operates by creating two pages; one which is sitting idle on the workflows list (backgroundPage), and one
+    // which triggers a workflow dispatch.  After the polling, the page should refresh and show the newly dispatched
+    // workflow from the other page.
+
+    const backgroundPage = await page.context().newPage();
+    await backgroundPage.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
+
+    // Mirror the `Workflow Authenticated user2 > dispatch success` test:
+    await dispatchSuccess(page, testInfo);
+    const latestDispatchedRun = await page.locator('.run-list>:first-child .flex-item-body>b').textContent();
+    expect(latestDispatchedRun).toMatch(/^#/); // workflow ID, eg. "#53"
+
+    await simulatePollingInterval(backgroundPage);
+    await expect(backgroundPage.locator('.run-list>:first-child .flex-item-body>b', {hasText: latestDispatchedRun})).toBeVisible();
+    await save_visual(backgroundPage);
+  });
+
+  test('post-refresh the dropdowns continue to operate', async ({page}, testInfo) => {
+    // Verify that after the page is dynamically refreshed, the 'Actor', 'Status', and 'Run workflow' dropdowns work
+    // correctly -- that the htmx morph hasn't messed up any JS event handlers.
+    await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
+
+    // Mirror the `Workflow Authenticated user2 > dispatch success` test -- this creates data for the 'Actor' dropdown
+    await dispatchSuccess(page, testInfo);
+
+    // Perform a dynamic refresh before checking the functionality of each dropdown.
+    await simulatePollingInterval(page);
+
+    // Workflow run dialog
+    await expect(page.locator('input[name="inputs[string2]"]')).toBeHidden();
+    await page.locator('#workflow_dispatch_dropdown>button').click();
+    await expect(page.locator('input[name="inputs[string2]"]')).toBeVisible();
+    await page.locator('#workflow_dispatch_dropdown>button').click();
+
+    // Status dropdown
+    await expect(page.getByText('Waiting')).toBeHidden();
+    await expect(page.getByText('Failure')).toBeHidden();
+    await page.locator('#status_dropdown').click();
+    await expect(page.getByText('Waiting')).toBeVisible();
+    await expect(page.getByText('Failure')).toBeVisible();
+
+    // Actor dropdown
+    await expect(page.getByText('All actors')).toBeHidden();
+    await page.locator('#actor_dropdown').click();
+    await expect(page.getByText('All Actors')).toBeVisible();
+  });
+
+  test('refresh does not break interacting with open drop-downs', async ({page}, testInfo) => {
+    // Verify that if the polling refresh occurs while interacting with any multi-step dropdown on the page, the
+    // multi-step interaction continues to be visible and functional.  This is implemented by preventing the refresh,
+    // but that isn't the subject of the test here -- as long as the dropdown isn't broken by the refresh, that's fine.
+    await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0');
+
+    // Mirror the `Workflow Authenticated user2 > dispatch success` test -- this creates data for the 'Actor' dropdown
+    await dispatchSuccess(page, testInfo);
+
+    // Workflow run dialog
+    await expect(page.locator('input[name="inputs[string2]"]')).toBeHidden();
+    await page.locator('#workflow_dispatch_dropdown>button').click();
+    await expect(page.locator('input[name="inputs[string2]"]')).toBeVisible();
+    await simulatePollingInterval(page);
+    await expect(page.locator('input[name="inputs[string2]"]')).toBeVisible();
+
+    // Status dropdown
+    await expect(page.getByText('Waiting')).toBeHidden();
+    await expect(page.getByText('Failure')).toBeHidden();
+    await page.locator('#status_dropdown').click();
+    await expect(page.getByText('Waiting')).toBeVisible();
+    await expect(page.getByText('Failure')).toBeVisible();
+    await simulatePollingInterval(page);
+    await expect(page.getByText('Waiting')).toBeVisible();
+    await expect(page.getByText('Failure')).toBeVisible();
+
+    // Actor dropdown
+    await expect(page.getByText('All actors')).toBeHidden();
+    await page.locator('#actor_dropdown').click();
+    await expect(page.getByText('All Actors')).toBeVisible();
+    await simulatePollingInterval(page);
+    await expect(page.getByText('All Actors')).toBeVisible();
+  });
+});
diff --git a/tests/e2e/changes.go b/tests/e2e/changes.go
index d1d318fd06..5e9238dfa7 100644
--- a/tests/e2e/changes.go
+++ b/tests/e2e/changes.go
@@ -16,10 +16,15 @@ import (
 var (
 	changesetFiles     []string
 	changesetAvailable bool
-	globalFullRun      bool
+	globalFullRun      = false
 )
 
 func initChangedFiles() {
+	_, globalFullRun = os.LookupEnv("RUN_ALL")
+	if globalFullRun {
+		log.Info("Full run of all tests requested via RUN_ALL environment.")
+		return
+	}
 	var changes string
 	changes, changesetAvailable = os.LookupEnv("CHANGED_FILES")
 	// the output of the Action seems to actually contain \n and not a newline literal
@@ -44,7 +49,7 @@ func initChangedFiles() {
 	for _, expr := range globalPatterns {
 		fullRunPatterns = append(fullRunPatterns, glob.MustCompile(expr, '.', '/'))
 	}
-	globalFullRun = false
+
 	for _, changedFile := range changesetFiles {
 		for _, pattern := range fullRunPatterns {
 			if pattern.Match(changedFile) {
diff --git a/tests/e2e/declare_repos_test.go b/tests/e2e/declare_repos_test.go
index f45687651c..836c2c6552 100644
--- a/tests/e2e/declare_repos_test.go
+++ b/tests/e2e/declare_repos_test.go
@@ -9,16 +9,23 @@ import (
 	"testing"
 	"time"
 
+	"forgejo.org/models/db"
+	issues_model "forgejo.org/models/issues"
+	repo_model "forgejo.org/models/repo"
 	unit_model "forgejo.org/models/unit"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
 	"forgejo.org/modules/indexer/stats"
+	"forgejo.org/modules/optional"
+	"forgejo.org/modules/timeutil"
+	issue_service "forgejo.org/services/issue"
 	files_service "forgejo.org/services/repository/files"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"xorm.io/xorm/convert"
 )
 
 // first entry represents filename
@@ -29,19 +36,34 @@ type FileChanges struct {
 	Versions  []string
 }
 
+// performs additional repo setup as needed
+type SetupRepo func(*user_model.User, *repo_model.Repository)
+
 // put your Git repo declarations in here
 // feel free to amend the helper function below or use the raw variant directly
 func DeclareGitRepos(t *testing.T) func() {
+	now := timeutil.TimeStampNow()
+	postIssue := func(repo *repo_model.Repository, user *user_model.User, age int64, title, content string) {
+		issue := &issues_model.Issue{
+			RepoID:      repo.ID,
+			PosterID:    user.ID,
+			Title:       title,
+			Content:     content,
+			CreatedUnix: now.Add(-age),
+		}
+		require.NoError(t, issue_service.NewIssue(db.DefaultContext, repo, issue, nil, nil, nil))
+	}
+
 	cleanupFunctions := []func(){
-		newRepo(t, 2, "diff-test", []FileChanges{{
+		newRepo(t, 2, "diff-test", nil, []FileChanges{{
 			Filename: "testfile",
 			Versions: []string{"hello", "hallo", "hola", "native", "ubuntu-latest", "- runs-on: ubuntu-latest", "- runs-on: debian-latest"},
-		}}),
-		newRepo(t, 2, "language-stats-test", []FileChanges{{
+		}}, nil),
+		newRepo(t, 2, "language-stats-test", nil, []FileChanges{{
 			Filename: "main.rs",
 			Versions: []string{"fn main() {", "println!(\"Hello World!\");", "}"},
-		}}),
-		newRepo(t, 2, "mentions-highlighted", []FileChanges{
+		}}, nil),
+		newRepo(t, 2, "mentions-highlighted", nil, []FileChanges{
 			{
 				Filename:  "history1.md",
 				Versions:  []string{""},
@@ -52,6 +74,49 @@ func DeclareGitRepos(t *testing.T) func() {
 				Versions:  []string{""},
 				CommitMsg: "Another commit which mentions @user1 in the title\nand @user2 in the text",
 			},
+		}, nil),
+		newRepo(t, 2, "unicode-escaping", nil, []FileChanges{{
+			Filename: "a-file",
+			Versions: []string{"{a}{а}"},
+		}}, nil),
+		newRepo(t, 2, "multiple-combo-boxes", nil, []FileChanges{{
+			Filename: ".forgejo/issue_template/multi-combo-boxes.yaml",
+			Versions: []string{`
+name: "Multiple combo-boxes"
+description: "To show something"
+body:
+- type: textarea
+  id: textarea-one
+  attributes:
+    label: one
+- type: textarea
+  id: textarea-two
+  attributes:
+    label: two
+`},
+		}}, nil),
+		newRepo(t, 11, "dependency-test", &tests.DeclarativeRepoOptions{
+			UnitConfig: optional.Some(map[unit_model.Type]convert.Conversion{
+				unit_model.TypeIssues: &repo_model.IssuesConfig{
+					EnableDependencies: true,
+				},
+			}),
+		}, []FileChanges{}, func(user *user_model.User, repo *repo_model.Repository) {
+			postIssue(repo, user, 500, "first issue here", "an issue created earlier")
+			postIssue(repo, user, 400, "second issue here (not 1)", "not the right issue, but in the right repo")
+			postIssue(repo, user, 300, "third issue here", "depends on things")
+			postIssue(repo, user, 200, "unrelated issue", "shrug emoji")
+			postIssue(repo, user, 100, "newest issue", "very new")
+		}),
+		newRepo(t, 11, "dependency-test-2", &tests.DeclarativeRepoOptions{
+			UnitConfig: optional.Some(map[unit_model.Type]convert.Conversion{
+				unit_model.TypeIssues: &repo_model.IssuesConfig{
+					EnableDependencies: true,
+				},
+			}),
+		}, []FileChanges{}, func(user *user_model.User, repo *repo_model.Repository) {
+			postIssue(repo, user, 450, "right issue", "an issue containing word right")
+			postIssue(repo, user, 150, "left issue", "an issue containing word left")
 		}),
 		// add your repo declarations here
 	}
@@ -63,13 +128,20 @@ func DeclareGitRepos(t *testing.T) func() {
 	}
 }
 
-func newRepo(t *testing.T, userID int64, repoName string, fileChanges []FileChanges) func() {
+func newRepo(t *testing.T, userID int64, repoName string, initOpts *tests.DeclarativeRepoOptions, fileChanges []FileChanges, setup SetupRepo) func() {
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID})
-	somerepo, _, cleanupFunc := tests.CreateDeclarativeRepo(t, user, repoName,
-		[]unit_model.Type{unit_model.TypeCode, unit_model.TypeIssues}, nil,
-		nil,
-	)
 
+	opts := tests.DeclarativeRepoOptions{}
+	if initOpts != nil {
+		opts = *initOpts
+	}
+	opts.Name = optional.Some(repoName)
+	if !opts.EnabledUnits.Has() {
+		opts.EnabledUnits = optional.Some([]unit_model.Type{unit_model.TypeCode, unit_model.TypeIssues})
+	}
+	somerepo, _, cleanupFunc := tests.CreateDeclarativeRepoWithOptions(t, user, opts)
+
+	var lastCommitID string
 	for _, file := range fileChanges {
 		for i, version := range file.Versions {
 			operation := "update"
@@ -104,12 +176,19 @@ func newRepo(t *testing.T, userID int64, repoName string, fileChanges []FileChan
 					Author:    time.Now(),
 					Committer: time.Now(),
 				},
+				LastCommitID: lastCommitID,
 			})
 			require.NoError(t, err)
 			assert.NotEmpty(t, resp)
+
+			lastCommitID = resp.Commit.SHA
 		}
 	}
 
+	if setup != nil {
+		setup(user, somerepo)
+	}
+
 	err := stats.UpdateRepoIndexer(somerepo)
 	require.NoError(t, err)
 
diff --git a/tests/e2e/dimmer.test.e2e.ts b/tests/e2e/dimmer.test.e2e.ts
new file mode 100644
index 0000000000..48084b0e52
--- /dev/null
+++ b/tests/e2e/dimmer.test.e2e.ts
@@ -0,0 +1,74 @@
+// @watch start
+// templates/shared/user/**
+// web_src/css/modules/dimmer.ts
+// web_src/css/modules/dimmer.css
+// @watch end
+
+import {expect} from '@playwright/test';
+import {save_visual, test} from './utils_e2e.ts';
+
+test.use({user: 'user2'});
+
+test('Dimmed modal', async ({page}) => {
+  await page.goto('/user1');
+
+  await expect(page.locator('#action-block')).toContainText('Block');
+
+  // Ensure the modal is hidden
+  await expect(page.locator('#block-user')).toBeHidden();
+
+  await page.locator('.actions .dropdown').click();
+  await page.locator('#action-block').click();
+
+  // Modal and dimmer should be visible.
+  await expect(page.locator('#block-user')).toBeVisible();
+  await expect(page.locator('.ui.dimmer')).toBeVisible();
+  await save_visual(page);
+
+  // After canceling, modal and dimmer should be hidden.
+  await page.locator('#block-user .cancel').click();
+  await expect(page.locator('.ui.dimmer')).toBeHidden();
+  await expect(page.locator('#block-user')).toBeHidden();
+  await save_visual(page);
+
+  // Open the block modal and make the dimmer visible again.
+  await page.locator('.actions .dropdown').click();
+  await page.locator('#action-block').click();
+  await expect(page.locator('#block-user')).toBeVisible();
+  await expect(page.locator('.ui.dimmer')).toBeVisible();
+  await expect(page.locator('.ui.dimmer')).toHaveCount(1);
+  await save_visual(page);
+});
+
+test('Dimmed overflow', async ({page}, workerInfo) => {
+  test.skip(['Mobile Safari'].includes(workerInfo.project.name), 'Mouse wheel is not supported in mobile WebKit');
+  await page.goto('/user2/repo1/_new/master/');
+
+  // Type in a file name.
+  await page.locator('#file-name').click();
+  await page.keyboard.type('todo.txt');
+
+  // Scroll to the bottom.
+  const scrollY = await page.evaluate(() => document.body.scrollHeight);
+  await page.mouse.wheel(0, scrollY);
+
+  // Click on 'Commit changes'
+  await page.locator('#commit-button').click();
+
+  // Expect a 'are you sure, this file is empty' modal.
+  await expect(page.locator('.ui.dimmer')).toBeVisible();
+  await expect(page.locator('.ui.dimmer .header')).toContainText('Commit an empty file');
+  await save_visual(page);
+
+  // Trickery to check that the dimmer covers the whole page.
+  const viewport = page.viewportSize();
+  const box = await page.locator('.ui.dimmer').boundingBox();
+  expect(box.x).toBe(0);
+  expect(box.y).toBe(0);
+  expect(box.width).toBe(viewport.width);
+  expect(box.height).toBe(viewport.height);
+
+  // Trickery to check the page cannot be scrolled.
+  const {scrollHeight, clientHeight} = await page.evaluate(() => document.body);
+  expect(scrollHeight).toBe(clientHeight);
+});
diff --git a/tests/e2e/dropdown.test.e2e.ts b/tests/e2e/dropdown.test.e2e.ts
new file mode 100644
index 0000000000..5f226f94bb
--- /dev/null
+++ b/tests/e2e/dropdown.test.e2e.ts
@@ -0,0 +1,106 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// @watch start
+// templates/shared/user/**
+// web_src/js/modules/dropdown.ts
+// @watch end
+
+import {expect} from '@playwright/test';
+import {test} from './utils_e2e.ts';
+
+test('JS enhanced', async ({page}) => {
+  await page.goto('/user1');
+
+  await expect(page.locator('body')).not.toContainClass('no-js');
+  const nojsNotice = page.locator('body .full noscript');
+  await expect(nojsNotice).toBeHidden();
+
+  // Open and close by clicking summary
+  const dropdownSummary = page.locator('details.dropdown summary');
+  const dropdownContent = page.locator('details.dropdown ul');
+  await expect(dropdownContent).toBeHidden();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeHidden();
+
+  // Close by clicking elsewhere
+  const elsewhere = page.locator('.username');
+  await expect(dropdownContent).toBeHidden();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeVisible();
+  await elsewhere.click();
+  await expect(dropdownContent).toBeHidden();
+
+  // Open and close with keypressing
+  await dropdownSummary.focus();
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Space`);
+  await expect(dropdownContent).toBeHidden();
+
+  await dropdownSummary.press(`Space`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeHidden();
+
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Escape`);
+  await expect(dropdownContent).toBeHidden();
+
+  // Open and close by opening a different dropdown
+  const languageMenu = page.locator('.language-menu');
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeVisible();
+  await expect(languageMenu).toBeHidden();
+  await page.locator('.language.dropdown').click();
+  await expect(dropdownContent).toBeHidden();
+  await expect(languageMenu).toBeVisible();
+});
+
+test('No JS', async ({browser}) => {
+  const context = await browser.newContext({javaScriptEnabled: false});
+  const nojsPage = await context.newPage();
+  await nojsPage.goto('/user1');
+
+  const nojsNotice = nojsPage.locator('body .full noscript');
+  await expect(nojsNotice).toBeVisible();
+  await expect(nojsPage.locator('body')).toContainClass('no-js');
+
+  // Open and close by clicking summary
+  const dropdownSummary = nojsPage.locator('details.dropdown summary');
+  const dropdownContent = nojsPage.locator('details.dropdown ul');
+  await expect(dropdownContent).toBeHidden();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeHidden();
+
+  // Close by clicking elsewhere (by hitting ::before with increased z-index)
+  const elsewhere = nojsPage.locator('#navbar');
+  await expect(dropdownContent).toBeHidden();
+  await dropdownSummary.click();
+  await expect(dropdownContent).toBeVisible();
+  // eslint-disable-next-line playwright/no-force-option
+  await elsewhere.click({force: true});
+  await expect(dropdownContent).toBeHidden();
+
+  // Open and close with keypressing
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Space`);
+  await expect(dropdownContent).toBeHidden();
+
+  await dropdownSummary.press(`Space`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeHidden();
+
+  // Escape is not usable w/o JS enhancements
+  await dropdownSummary.press(`Enter`);
+  await expect(dropdownContent).toBeVisible();
+  await dropdownSummary.press(`Escape`);
+  await expect(dropdownContent).toBeVisible();
+});
diff --git a/tests/e2e/fixtures/comment.yml b/tests/e2e/fixtures/comment.yml
index f3f8a2d8e8..ae7c850036 100644
--- a/tests/e2e/fixtures/comment.yml
+++ b/tests/e2e/fixtures/comment.yml
@@ -3,7 +3,7 @@
   type: 0 # comment
   poster_id: 2
   issue_id: 1 # in repo_id 1
-  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:"
+  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:\n![hi there](/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)\n\n<img src='/user2/repo1/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2' alt='something something' width='500' height='500' />"
   created_unix: 946684811
   updated_unix: 946684811
   content_version: 1
@@ -13,7 +13,7 @@
   type: 21 # code comment
   poster_id: 2
   issue_id: 19
-  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:"
+  content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:\n![hi there](/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)\n\n<img src='/user2/commitsonpr/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2' alt='something something' width='500' height='500' />"
   review_id: 1001
   line: 1
   tree_path: "test1.txt"
diff --git a/tests/e2e/fixtures/repository.yml b/tests/e2e/fixtures/repository.yml
index ac87721d6a..6afbd138e8 100644
--- a/tests/e2e/fixtures/repository.yml
+++ b/tests/e2e/fixtures/repository.yml
@@ -10,3 +10,4 @@
   is_private: true
   status: 0
   lfs_size: 8192
+  topics: '[]'
diff --git a/tests/e2e/image-diff.test.e2e.ts b/tests/e2e/image-diff.test.e2e.ts
new file mode 100644
index 0000000000..f7d4f7bd69
--- /dev/null
+++ b/tests/e2e/image-diff.test.e2e.ts
@@ -0,0 +1,66 @@
+// @watch start
+// templates/repo/diff/**
+// web_src/css/features/imagediff.css
+// web_src/css/modules/tab.css
+// web_src/js/modules/tab.ts
+// @watch end
+
+import {expect} from '@playwright/test';
+import {save_visual, test, dynamic_id} from './utils_e2e.ts';
+
+test.use({user: 'user2'});
+
+test('Repository image diff', async ({page}) => {
+  // Generate a temporary SVG and edit it.
+  let response = await page.goto('/user2/repo1/_new/master', {waitUntil: 'domcontentloaded'});
+  expect(response?.status()).toBe(200);
+
+  const filename = `${dynamic_id()}.svg`;
+
+  await page.getByPlaceholder('Name your file…').fill(filename);
+  await page.locator('.monaco-editor').click();
+  await page.keyboard.type('<svg version="1.1" width="300" height="200" xmlns="http://www.w3.org/2000/svg"><circle cx="150" cy="100" r="80" fill="green" /></svg>\n');
+
+  await page.locator('.quick-pull-choice input[value="direct"]').click();
+  await page.getByRole('button', {name: 'Commit changes'}).click();
+
+  response = await page.goto(`/user2/repo1/_edit/master/${filename}`, {waitUntil: 'domcontentloaded'});
+  expect(response?.status()).toBe(200);
+
+  await page.locator('.monaco-editor').click();
+  await page.keyboard.press('Meta+KeyA');
+  await page.keyboard.type('<svg version="1.1" width="300" height="200" xmlns="http://www.w3.org/2000/svg"><circle cx="150" cy="100" r="80" fill="red" /></svg>\n');
+
+  await page.locator('.quick-pull-choice input[value="direct"]').click();
+  await page.getByRole('button', {name: 'Commit changes'}).click();
+
+  // Go to the commit page, where a image diff is shown.
+  await page.locator('.commit-summary a.default-link').click();
+
+  // Exhaustively test tabs works as expected
+  await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-swipe-1"]')).not.toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-overlay-1"]')).not.toContainClass('active');
+  await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeVisible();
+  await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeHidden();
+  await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeHidden();
+  await save_visual(page);
+
+  await page.getByText('Swipe').click();
+  await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).not.toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-swipe-1"]')).toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-overlay-1"]')).not.toContainClass('active');
+  await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeHidden();
+  await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeVisible();
+  await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeHidden();
+  await save_visual(page);
+
+  await page.getByText('Overlay').click();
+  await expect(page.locator('.item[data-tab="diff-side-by-side-1"]')).not.toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-swipe-1"]')).not.toContainClass('active');
+  await expect(page.locator('.item[data-tab="diff-overlay-1"]')).toContainClass('active');
+  await expect(page.locator('.tab[data-tab="diff-side-by-side-1"]')).toBeHidden();
+  await expect(page.locator('.tab[data-tab="diff-swipe-1"]')).toBeHidden();
+  await expect(page.locator('.tab[data-tab="diff-overlay-1"]')).toBeVisible();
+  await save_visual(page);
+});
diff --git a/tests/e2e/issue-comment-dropzone.test.e2e.ts b/tests/e2e/issue-comment-dropzone.test.e2e.ts
new file mode 100644
index 0000000000..33ea2c9403
--- /dev/null
+++ b/tests/e2e/issue-comment-dropzone.test.e2e.ts
@@ -0,0 +1,94 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// @watch start
+// web_src/js/features/common-global.js
+// web_src/js/features/comp/Paste.js
+// web_src/js/features/repo-issue.js
+// web_src/js/features/repo-legacy.js
+// @watch end
+
+import {expect, type Locator, type Page, type TestInfo} from '@playwright/test';
+import {test, save_visual, dynamic_id} from './utils_e2e.ts';
+
+test.use({user: 'user2'});
+
+async function pasteImage(el: Locator) {
+  await el.evaluate(async (el) => {
+    const base64 = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAHklEQVQoU2MUk1P7z0AGYBzViDvURgMHT4oaQoEDAFuJEu2fuGfhAAAAAElFTkSuQmCC`;
+    // eslint-disable-next-line no-restricted-syntax
+    const response = await fetch(base64);
+    const blob = await response.blob();
+
+    el.focus();
+
+    let pasteEvent = new Event('paste', {bubbles: true, cancelable: true});
+    pasteEvent = Object.assign(pasteEvent, {
+      clipboardData: {
+        items: [
+          {
+            kind: 'file',
+            type: 'image/png',
+            getAsFile() {
+              return new File([blob], 'foo.png', {type: blob.type});
+            },
+          },
+        ],
+      },
+    });
+
+    el.dispatchEvent(pasteEvent);
+  });
+}
+
+async function assertCopy(page: Page, workerInfo: TestInfo, startWith: string) {
+  const project = workerInfo.project.name;
+  if (project === 'webkit' || project === 'Mobile Safari') return;
+
+  const dropzone = page.locator('.dropzone');
+  const preview = dropzone.locator('.dz-preview');
+  const copyLink = preview.locator('.octicon-copy').locator('..');
+  await copyLink.click();
+
+  const clipboardContent = await page.evaluate(() => navigator.clipboard.readText());
+  expect(clipboardContent).toContain(startWith);
+}
+
+test('Paste image in new comment', async ({page}, workerInfo) => {
+  await page.goto('/user2/repo1/issues/new');
+
+  await pasteImage(page.locator('.markdown-text-editor'));
+
+  const dropzone = page.locator('.dropzone');
+  await expect(dropzone.locator('.files')).toHaveCount(1);
+  const preview = dropzone.locator('.dz-preview');
+  await expect(preview).toHaveCount(1);
+  await expect(preview.locator('.dz-filename')).toHaveText('foo.png');
+  await expect(preview.locator('.octicon-copy')).toBeVisible();
+  await assertCopy(page, workerInfo, '![foo](');
+
+  await save_visual(page);
+});
+
+test('Re-add images to dropzone on edit', async ({page}, workerInfo) => {
+  await page.goto('/user2/repo1/issues/new');
+
+  const issueTitle = dynamic_id();
+  await page.locator('#issue_title').fill(issueTitle);
+  await pasteImage(page.locator('.markdown-text-editor'));
+  await page.getByRole('button', {name: 'Create issue'}).click();
+
+  await expect(page).toHaveURL(/\/user2\/repo1\/issues\/\d+$/);
+  await page.click('.comment-container .context-menu');
+  await page.click('.comment-container .menu > .edit-content');
+
+  const dropzone = page.locator('.dropzone');
+  await expect(dropzone.locator('.files').first()).toHaveCount(1);
+  const preview = dropzone.locator('.dz-preview');
+  await expect(preview).toHaveCount(1);
+  await expect(preview.locator('.dz-filename')).toHaveText('foo.png');
+  await expect(preview.locator('.octicon-copy')).toBeVisible();
+  await assertCopy(page, workerInfo, '![foo](');
+
+  await save_visual(page);
+});
diff --git a/tests/e2e/issue-comment.test.e2e.ts b/tests/e2e/issue-comment.test.e2e.ts
index d2dbafafd0..2017e4563e 100644
--- a/tests/e2e/issue-comment.test.e2e.ts
+++ b/tests/e2e/issue-comment.test.e2e.ts
@@ -123,7 +123,8 @@ test('Quote reply', async ({page}, workerInfo) => {
                                            "> alert('evil')\n" +
                                            '> ```\n' +
                                            '> \n' +
-                                           '> :+1: :100:\n\n');
+                                           '> :+1: :100: [![hi there](/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)](/user2/repo1/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)\n' +
+                                           '> <img alt="something something" width="500" height="500" src="/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2">\n\n');
 
   await editorTextarea.fill('');
 
@@ -197,7 +198,8 @@ test('Pull quote reply', async ({page}, workerInfo) => {
                                            "> alert('evil')\n" +
                                            '> ```\n' +
                                            '> \n' +
-                                           '> :+1: :100:\n\n');
+                                           '> :+1: :100: [![hi there](/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)](/user2/commitsonpr/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2)\n' +
+                                           '> <img alt="something something" width="500" height="500" src="/attachments/3f4f4016-877b-46b3-b79f-ad24519a9cf2">\n\n');
 
   await editorTextarea.fill('');
 });
diff --git a/tests/e2e/issue-sidebar.test.e2e.ts b/tests/e2e/issue-sidebar.test.e2e.ts
index fe2a6cec87..f181185d69 100644
--- a/tests/e2e/issue-sidebar.test.e2e.ts
+++ b/tests/e2e/issue-sidebar.test.e2e.ts
@@ -50,7 +50,6 @@ test.describe('Pull: Toggle WIP', () => {
 
   test('simple toggle', async ({page}, workerInfo) => {
     test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
-    await page.goto('/user2/repo1/pulls/5');
     // toggle to WIP
     await toggle_wip_to({page}, true);
     await check_wip({page}, true);
@@ -94,7 +93,7 @@ test.describe('Pull: Toggle WIP', () => {
 test('Issue: Labels', async ({page}, workerInfo) => {
   test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636');
 
-  async function submitLabels({page}: { page: Page }) {
+  async function submitLabels({page}: {page: Page}) {
     const submitted = page.waitForResponse('/user2/repo1/issues/labels');
     await page.locator('textarea').first().click(); // close via unrelated element
     await submitted;
@@ -222,7 +221,7 @@ test('Issue: Milestone', async ({page}, workerInfo) => {
   const response = await page.goto('/user2/repo1/issues/1');
   expect(response?.status()).toBe(200);
 
-  const selectedMilestone = page.locator('.issue-content-right .select-milestone.list');
+  const selectedMilestone = page.locator('.issue-content-right #selected-milestone');
   const milestoneDropdown = page.locator('.issue-content-right .select-milestone.dropdown');
   await expect(selectedMilestone).toContainText('No milestone');
 
@@ -262,3 +261,107 @@ test('New Issue: Milestone', async ({page}, workerInfo) => {
   await expect(selectedMilestone).toContainText('No milestone');
   await save_visual(page);
 });
+
+test.describe('Dependency dropdown', () => {
+  test.use({user: 'user11'});
+  test('Issue: Dependencies', async ({page}) => {
+    const response = await page.goto('/user11/dependency-test/issues/3');
+    expect(response?.status()).toBe(200);
+
+    const depsBlock = page.locator('.issue-content-right .depending');
+    const deleteDepBtn = page.locator('.issue-content-right .depending .delete-dependency-button');
+
+    const input = page.locator('#new-dependency-drop-list .search');
+    const current = page.locator('#new-dependency-drop-list .text').first();
+    const menu = page.locator('#new-dependency-drop-list .menu');
+    const items = page.locator('#new-dependency-drop-list .menu .item');
+
+    const confirmDelete = async () => {
+      const modal = page.locator('.modal.remove-dependency');
+      await expect(modal).toBeVisible();
+      await expect(modal).toContainText('This will remove the dependency from this issue');
+      await modal.locator('button.ok').click();
+    };
+
+    // A kludge to set the dropdown to the *wrong* value so it lets us select the correct one next.
+    const resetDropdown = async () => {
+      if (await current.textContent().then((s) => s.includes('#4'))) return;
+      await input.click();
+      await input.fill('unrelated');
+      await expect(items.first()).toContainText('unrelated');
+      await items.first().click();
+      await expect(current).toContainText('#4');
+      await input.click();
+    };
+
+    await expect(depsBlock).toBeVisible();
+    while (await deleteDepBtn.first().isVisible()) {
+      await deleteDepBtn.first().click(); // wipe added dependencies from any previously failed tests
+      await confirmDelete();
+    }
+    await expect(depsBlock).toContainText('No dependencies set');
+
+    await input.scrollIntoViewIfNeeded();
+    await input.click();
+
+    const first = 'first issue here';
+    const second = 'second issue here';
+    const newest = 'newest issue';
+
+    // Without query, it should show issues in the same repo, sorted by date, except current one.
+    await expect(menu).toBeVisible();
+    await expect(items).toHaveCount(4); // 5 issues in this repo, minus current one
+    await expect(items.first()).toContainText(newest);
+    await expect(items.last()).toContainText(first);
+    await resetDropdown();
+
+    // With query, it should search all repos, but show current repo issues first.
+    await input.fill('right');
+    await expect(items.first()).toContainText(second);
+    await expect.poll(() => items.count()).toBeGreaterThan(1); // there is an issue in user11/dependency-test-2 containing the word "right"
+    await resetDropdown();
+
+    // When entering an issue number, it should always show that one first, then all text matches.
+    await input.fill('1');
+    await expect(items.first()).toContainText(first);
+    await expect(items.nth(1)).toBeVisible();
+    await resetDropdown();
+
+    // Should behave the same with a prefix
+    await input.fill('#1');
+    await expect(items.first()).toContainText(first);
+
+    // Selecting an issue
+    await items.first().click();
+    await expect(current).toContainText(first);
+
+    // Add dependency
+    const link = page.locator('.issue-content-right .depending .dependency a.title');
+    await page.locator('.issue-content-right .depending button').click();
+    await expect(link).toHaveAttribute('href', '/user11/dependency-test/issues/1');
+
+    // Remove dependency
+    await expect(deleteDepBtn).toBeVisible();
+    await deleteDepBtn.click();
+
+    await confirmDelete();
+
+    await expect(depsBlock).toContainText('No dependencies set');
+  });
+});
+
+test('Issue: Reference', async ({page}) => {
+  let response = await page.goto('/user2/repo1/pulls/5');
+  expect(response?.status()).toBe(200);
+
+  await expect(page.locator('.ui.reference .truncate')).toContainText(
+    'user2/repo1!5',
+  );
+
+  response = await page.goto('/user2/repo1/issues/1');
+  expect(response?.status()).toBe(200);
+
+  await expect(page.locator('.ui.reference .truncate')).toContainText(
+    'user2/repo1#1',
+  );
+});
diff --git a/tests/e2e/issue-timetracking.test.e2e.ts b/tests/e2e/issue-timetracking.test.e2e.ts
new file mode 100644
index 0000000000..901cbe793f
--- /dev/null
+++ b/tests/e2e/issue-timetracking.test.e2e.ts
@@ -0,0 +1,48 @@
+// @watch start
+// web_src/js/features/comp/**
+// web_src/js/features/repo-**
+// templates/repo/issue/view_content/*
+// @watch end
+
+import {expect} from '@playwright/test';
+import {test, save_visual} from './utils_e2e.ts';
+
+test.use({user: 'user2'});
+
+test('Issue timetracking', async ({page}) => {
+  await page.goto('/user2/repo1/issues/new');
+
+  // Create temporary issue.
+  await page.getByPlaceholder('Title').fill('Just a title');
+  await page.getByPlaceholder('Leave a comment').fill('Hi, have you considered using a rotating fish as logo?');
+  await page.getByRole('button', {name: 'Create issue'}).click();
+  await expect(page).toHaveURL(/\/user2\/repo1\/issues\/\d+$/);
+
+  // Manually add time to the time tracker.
+  await page.getByRole('button', {name: 'Add time'}).click();
+  await page.getByPlaceholder('Hours').fill('5');
+  await page.getByPlaceholder('Minutes').fill('32');
+  await page.getByRole('button', {name: 'Add time', exact: true}).click();
+
+  // Verify this was added in the timeline.
+  await expect(page.locator('.ui.timeline')).toContainText('added spent time');
+  await expect(page.locator('.ui.timeline')).toContainText('5 hours 32 minutes');
+
+  // Verify it is shown in the issue sidebar
+  await expect(page.locator('.issue-content-right .comments')).toContainText('Total time spent: 5 hours 32 minutes');
+
+  await save_visual(page);
+
+  // Delete the added time.
+  await page.getByRole('button', {name: 'Delete this time log'}).click();
+  await page.getByRole('button', {name: 'Yes'}).click();
+
+  // Verify this was removed in the timeline.
+  await expect(page.locator('.ui.timeline')).toContainText('deleted spent time');
+  await expect(page.locator('.ui.timeline')).toContainText('- 5 hours 32 minutes');
+
+  // Delete the issue.
+  await page.getByRole('button', {name: 'Delete'}).click();
+  await page.getByRole('button', {name: 'Yes'}).click();
+  await expect(page).toHaveURL('/user2/repo1/issues');
+});
diff --git a/tests/e2e/login.test.e2e.ts b/tests/e2e/login.test.e2e.ts
index 1ffa0b2e5d..01cf4d7b8d 100644
--- a/tests/e2e/login.test.e2e.ts
+++ b/tests/e2e/login.test.e2e.ts
@@ -10,7 +10,8 @@
 import {expect} from '@playwright/test';
 import {test, save_visual, test_context} from './utils_e2e.ts';
 
-test('Mismatched ROOT_URL', async ({browser}) => {
+test('Mismatched ROOT_URL', async ({browser}, workerInfo) => {
+  test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'init script gets randomly ignored');
   const context = await test_context(browser);
   const page = await context.newPage();
 
diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts
index 39ced25bc3..d0ab88fe26 100644
--- a/tests/e2e/markdown-editor.test.e2e.ts
+++ b/tests/e2e/markdown-editor.test.e2e.ts
@@ -1,4 +1,6 @@
 // @watch start
+// web_src/js/modules/tab.ts
+// web_src/css/modules/tab.css
 // web_src/js/features/comp/ComboMarkdownEditor.js
 // web_src/css/editor/combomarkdowneditor.css
 // templates/shared/combomarkdowneditor.tmpl
@@ -39,7 +41,7 @@ test('Markdown image preview behaviour', async ({page}, workerInfo) => {
   await save_visual(page);
 });
 
-test('markdown indentation', async ({page}) => {
+test('Markdown indentation via toolbar', async ({page}) => {
   const initText = `* first\n* second\n* third\n* last`;
 
   const response = await page.goto('/user2/repo1/issues/new');
@@ -50,7 +52,6 @@ test('markdown indentation', async ({page}) => {
   const indent = page.locator('button[data-md-action="indent"]');
   const unindent = page.locator('button[data-md-action="unindent"]');
   await textarea.fill(initText);
-  await textarea.click(); // Tab handling is disabled until pointer event or input.
 
   // Indent, then unindent first line
   await textarea.focus();
@@ -109,7 +110,147 @@ test('markdown indentation', async ({page}) => {
   await expect(textarea).toHaveValue(initText);
 });
 
-test('markdown list continuation', async ({page}) => {
+test('markdown indentation with Tab', async ({page}) => {
+  const initText = `* first\n* second\n* third\n* last`;
+
+  const response = await page.goto('/user2/repo1/issues/new');
+  expect(response?.status()).toBe(200);
+
+  const textarea = page.locator('textarea[name=content]');
+  const toast = page.locator('.toastify');
+  const tab = '    ';
+
+  await textarea.fill(initText);
+
+  await textarea.click(); // Tab handling is disabled until pointer event or input.
+
+  // Indent, then unindent first line
+  await textarea.focus();
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(0, 0));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`${tab}* first\n* second\n* third\n* last`);
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(initText);
+
+  // Attempt unindent again, ensure focus is not immediately lost and toast is shown, but then focus is lost on next attempt.
+  await expect(toast).toBeHidden(); // toast should not already be there
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toBeFocused();
+  await expect(toast).toBeVisible();
+  await textarea.press('Shift+Tab');
+  await expect(textarea).not.toBeFocused();
+
+  // Indent lines 2-4
+  await textarea.click();
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('\n') + 1, it.value.length));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`* first\n${tab}* second\n${tab}* third\n${tab}* last`);
+
+  // Indent second line while in whitespace, then unindent.
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf(' * third'), it.value.indexOf(' * third')));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`* first\n${tab}* second\n${tab}${tab}* third\n${tab}* last`);
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(`* first\n${tab}* second\n${tab}* third\n${tab}* last`);
+
+  // Select all and unindent, then lose focus.
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.select());
+  await textarea.press('Shift+Tab'); // Everything is unindented.
+  await expect(textarea).toHaveValue(initText);
+  await textarea.press('Shift+Tab'); // Valid, but nothing happens -> switch to "about to lose focus" state.
+  await expect(textarea).toBeFocused();
+  await textarea.press('Shift+Tab');
+  await expect(textarea).not.toBeFocused();
+
+  // Attempt the same with cursor within list element body.
+  await textarea.focus();
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(0, 0));
+  await textarea.press('ArrowRight');
+  await textarea.press('ArrowRight');
+  await textarea.press('Tab');
+  // Whole line should be indented.
+  await expect(textarea).toHaveValue(`${tab}* first\n* second\n* third\n* last`);
+  await textarea.press('Shift+Tab');
+
+  // Subsequently, select a chunk of 2nd and 3rd line and indent both, preserving the cursor position in relation to text
+  const line3 = `* first\n* second\n${tab}* third\n* last`;
+  const lines23 = `* first\n${tab}* second\n${tab}${tab}* third\n* last`;
+  await textarea.focus();
+  await textarea.fill(line3);
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('hird')));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(lines23);
+  await expect(textarea).toHaveJSProperty('selectionStart', lines23.indexOf('cond'));
+  await expect(textarea).toHaveJSProperty('selectionEnd', lines23.indexOf('hird'));
+
+  // Then unindent twice, erasing all indents.
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(line3);
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(initText);
+
+  // Check that partial indents are cleared
+  await textarea.focus();
+  await textarea.fill(initText);
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('* second'), it.value.indexOf('* second')));
+  await textarea.pressSequentially('  ');
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(initText);
+});
+
+test('markdown block quote indentation', async ({page}) => {
+  const initText = `> first\n> second\n> third\n> last`;
+
+  const response = await page.goto('/user2/repo1/issues/new');
+  expect(response?.status()).toBe(200);
+
+  const textarea = page.locator('textarea[name=content]');
+  const toast = page.locator('.toastify');
+
+  await textarea.fill(initText);
+
+  await textarea.click(); // Tab handling is disabled until pointer event or input.
+
+  // Indent, then unindent first line twice (quotes can quote quotes!)
+  await textarea.focus();
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(0, 0));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`> > first\n> second\n> third\n> last`);
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`> > > first\n> second\n> third\n> last`);
+  await textarea.press('Shift+Tab');
+  await textarea.press('Shift+Tab');
+  await expect(textarea).toHaveValue(initText);
+
+  // Attempt unindent again.
+  await expect(toast).toBeHidden(); // toast should not already be there
+  await textarea.press('Shift+Tab');
+  // Nothing happens - quote should not stop being a quote
+  await expect(textarea).toHaveValue(initText);
+  // Focus is not immediately lost and toast is shown,
+  await expect(textarea).toBeFocused();
+  await expect(toast).toBeVisible();
+  // Focus is lost on next attempt,
+  await textarea.press('Shift+Tab');
+  await expect(textarea).not.toBeFocused();
+
+  // Indent lines 2-4
+  await textarea.click();
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('\n') + 1, it.value.length));
+  await textarea.press('Tab');
+  await expect(textarea).toHaveValue(`> first\n> > second\n> > third\n> > last`);
+
+  // Select all and unindent, then lose focus.
+  await textarea.evaluate((it:HTMLTextAreaElement) => it.select());
+  await textarea.press('Shift+Tab'); // Everything is unindented.
+  await expect(textarea).toHaveValue(initText);
+  await textarea.press('Shift+Tab'); // Valid, but nothing happens -> switch to "about to lose focus" state.
+  await expect(textarea).toBeFocused();
+  await textarea.press('Shift+Tab');
+  await expect(textarea).not.toBeFocused();
+});
+
+test('Markdown list continuation', async ({page}) => {
   const initText = `* first\n* second`;
 
   const response = await page.goto('/user2/repo1/issues/new');
@@ -202,7 +343,7 @@ test('markdown list continuation', async ({page}) => {
   }
 });
 
-test('markdown insert table', async ({page}) => {
+test('Markdown insert table', async ({page}) => {
   const response = await page.goto('/user2/repo1/issues/new');
   expect(response?.status()).toBe(200);
 
@@ -225,7 +366,7 @@ test('markdown insert table', async ({page}) => {
   await save_visual(page);
 });
 
-test('markdown insert link', async ({page}) => {
+test('Markdown insert link', async ({page}) => {
   const response = await page.goto('/user2/repo1/issues/new');
   expect(response?.status()).toBe(200);
 
@@ -277,3 +418,102 @@ test('text expander has higher prio then prefix continuation', async ({page}) =>
   await textarea.press('Enter');
   await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 \n* `);
 });
+
+test('Combo Markdown: preview mode switch', async ({page}) => {
+  // Load page with editor
+  const response = await page.goto('/user2/repo1/issues/new');
+  expect(response?.status()).toBe(200);
+
+  const toolbarItem = page.locator('md-header');
+  const editorPanel = page.locator('[data-tab-panel="markdown-writer"]');
+  const previewPanel = page.locator('[data-tab-panel="markdown-previewer"]');
+
+  // Verify correct visibility of related UI elements
+  await expect(toolbarItem).toBeVisible();
+  await expect(editorPanel).toBeVisible();
+  await expect(previewPanel).toBeHidden();
+
+  // Fill some content
+  const textarea = page.locator('textarea.markdown-text-editor');
+  await textarea.fill('**Content** :100: _100_');
+
+  // Switch to preview mode
+  await page.locator('a[data-tab-for="markdown-previewer"]').click();
+
+  // Verify that the related UI elements were switched correctly
+  await expect(toolbarItem).toBeHidden();
+  await expect(editorPanel).toBeHidden();
+  await expect(previewPanel).toBeVisible();
+  await save_visual(page);
+
+  // Verify that some content rendered
+  await expect(page.locator('[data-tab-panel="markdown-previewer"] .emoji[data-alias="100"]')).toBeVisible();
+
+  // Switch back to edit mode
+  await page.locator('a[data-tab-for="markdown-writer"]').click();
+
+  // Verify that the related UI elements were switched back correctly
+  await expect(toolbarItem).toBeVisible();
+  await expect(editorPanel).toBeVisible();
+  await expect(previewPanel).toBeHidden();
+  await save_visual(page);
+});
+
+test('Multiple combo markdown: insert table', async ({page}) => {
+  const response = await page.goto('/user2/multiple-combo-boxes/issues/new?template=.forgejo%2fissue_template%2fmulti-combo-boxes.yaml');
+  expect(response?.status()).toBe(200);
+
+  // check that there are two textareas
+  const textareaOne = page.locator('textarea[name=form-field-textarea-one]');
+  const comboboxOne = page.locator('textarea#_combo_markdown_editor_0');
+  await expect(textareaOne).toBeVisible();
+  await expect(comboboxOne).toBeHidden();
+  const textareaTwo = page.locator('textarea[name=form-field-textarea-two]');
+  const comboboxTwo = page.locator('textarea#_combo_markdown_editor_1');
+  await expect(textareaTwo).toBeVisible();
+  await expect(comboboxTwo).toBeHidden();
+
+  // focus first one and add table to it
+  await textareaOne.click();
+  await expect(comboboxOne).toBeVisible();
+  await expect(comboboxTwo).toBeHidden();
+
+  const newTableButtonOne = page.locator('[for="_combo_markdown_editor_0"] button[data-md-action="new-table"]');
+  await newTableButtonOne.click();
+
+  const newTableModalOne = page.locator('div[data-markdown-table-modal-id="0"]');
+  await expect(newTableModalOne).toBeVisible();
+
+  await newTableModalOne.locator('input[name="table-rows"]').fill('3');
+  await newTableModalOne.locator('input[name="table-columns"]').fill('2');
+
+  await newTableModalOne.locator('button[data-selector-name="ok-button"]').click();
+
+  await expect(newTableModalOne).toBeHidden();
+
+  await expect(comboboxOne).toHaveValue('| Header  | Header  |\n|---------|---------|\n| Content | Content |\n| Content | Content |\n| Content | Content |\n');
+  await expect(comboboxTwo).toBeEmpty();
+  await save_visual(page);
+
+  // focus second one and add table to it
+  await textareaTwo.click();
+  await expect(comboboxOne).toBeHidden();
+  await expect(comboboxTwo).toBeVisible();
+
+  const newTableButtonTwo = page.locator('[for="_combo_markdown_editor_1"] button[data-md-action="new-table"]');
+  await newTableButtonTwo.click();
+
+  const newTableModalTwo = page.locator('div[data-markdown-table-modal-id="1"]');
+  await expect(newTableModalTwo).toBeVisible();
+
+  await newTableModalTwo.locator('input[name="table-rows"]').fill('2');
+  await newTableModalTwo.locator('input[name="table-columns"]').fill('3');
+
+  await newTableModalTwo.locator('button[data-selector-name="ok-button"]').click();
+
+  await expect(newTableModalTwo).toBeHidden();
+
+  await expect(comboboxOne).toHaveValue('| Header  | Header  |\n|---------|---------|\n| Content | Content |\n| Content | Content |\n| Content | Content |\n');
+  await expect(comboboxTwo).toHaveValue('| Header  | Header  | Header  |\n|---------|---------|---------|\n| Content | Content | Content |\n| Content | Content | Content |\n');
+  await save_visual(page);
+});
diff --git a/tests/e2e/markup.test.e2e.ts b/tests/e2e/markup.test.e2e.ts
index 398a0a6300..b26e83661b 100644
--- a/tests/e2e/markup.test.e2e.ts
+++ b/tests/e2e/markup.test.e2e.ts
@@ -5,7 +5,8 @@
 import {expect} from '@playwright/test';
 import {save_visual, test} from './utils_e2e.ts';
 
-test('markup with #xyz-mode-only', async ({page}) => {
+test('markup with #xyz-mode-only', async ({page}, workerInfo) => {
+  test.skip(['webkit', 'Mobile Safari'].includes(workerInfo.project.name), 'Newest version contains a regression');
   const response = await page.goto('/user2/repo1/issues/1');
   expect(response?.status()).toBe(200);
 
diff --git a/tests/e2e/org-teams-overview.test.e2e.ts b/tests/e2e/org-teams-overview.test.e2e.ts
new file mode 100644
index 0000000000..c3006568cd
--- /dev/null
+++ b/tests/e2e/org-teams-overview.test.e2e.ts
@@ -0,0 +1,116 @@
+// @watch start
+// templates/org/team/sidebar.tmpl
+// @watch end
+/* eslint playwright/expect-expect: ["error", { "assertFunctionNames": ["assertPermissionsDetails", "assertRestrictedAccess", "assertOwnerPermissions"] }] */
+import {expect, type Page} from '@playwright/test';
+import {test} from './utils_e2e.ts';
+
+type Permission = 'No access' | 'Write' | 'Read';
+
+const UNIT_VALUES = [
+  'Code',
+  'Issues',
+  'Pull requests',
+  'Releases',
+  'Wiki',
+  'External Wiki',
+  'External issues',
+  'Projects',
+  'Packages',
+  'Actions',
+] as const;
+
+type Unit = typeof UNIT_VALUES[number];
+
+const assertPermission = async (page: Page, name: Unit, permission: Permission) => {
+  await expect.soft(page.getByRole('row', {name}).getByRole('cell').nth(1)).toHaveText(permission);
+};
+
+const testTeamUrl = '/org/org17/teams/test_team';
+const reviewTeamUrl = '/org/org17/teams/review_team';
+const ownersUrl = '/org/org17/teams/owners';
+const adminUrl = '/org/org17/teams/super-user';
+
+const cases: Record<string, {read?: Unit[], write?: Unit[]}> = {
+  [testTeamUrl]: {write: ['Issues']},
+  [reviewTeamUrl]: {read: ['Code']},
+};
+
+const assertOwnerPermissions = async (page: Page, code: number = 200) => {
+  const response = await page.goto(ownersUrl);
+  expect(response?.status()).toBe(code);
+
+  await expect(page.getByText('Owners have full access to all repositories and have administrator access to the organization.')).toBeVisible();
+};
+
+const assertAdminPermissions = async (page: Page, code: number = 200) => {
+  const response = await page.goto(adminUrl);
+  expect(response?.status()).toBe(code);
+
+  await expect(page.getByText('This team grants Administrator access: members can read from, push to and add collaborators to team repositories.')).toBeVisible();
+};
+
+const assertRestrictedAccess = async (page: Page, ...urls: string[]) => {
+  for (const url of urls) {
+    expect((await page.goto(url))?.status(), 'should not see any details').toBe(404);
+  }
+};
+
+const assertPermissionsDetails = async (page: Page, url: (keyof typeof cases)) => {
+  const response = await page.goto(url);
+  expect(response?.status()).toBe(200);
+
+  const per = cases[url];
+
+  for (const unit of UNIT_VALUES) {
+    if (per.read?.includes(unit)) {
+      await assertPermission(page, unit, 'Read');
+    } else if (per.write?.includes(unit)) {
+      await assertPermission(page, unit, 'Write');
+    } else {
+      await assertPermission(page, unit, 'No access');
+    }
+  }
+};
+
+test.describe('Orga team overview', () => {
+  test.describe('admin', () => {
+    test.use({user: 'user1'});
+
+    test('should see all', async ({page}) => {
+      await assertPermissionsDetails(page, testTeamUrl);
+      await assertPermissionsDetails(page, reviewTeamUrl);
+      await assertOwnerPermissions(page);
+      await assertAdminPermissions(page);
+    });
+  });
+
+  test.describe('owner', () => {
+    test.use({user: 'user18'});
+
+    test('should see all', async ({page}) => {
+      await assertPermissionsDetails(page, testTeamUrl);
+      await assertPermissionsDetails(page, reviewTeamUrl);
+      await assertOwnerPermissions(page);
+      await assertAdminPermissions(page);
+    });
+  });
+
+  test.describe('reviewer team', () => {
+    test.use({user: 'user29'});
+
+    test('should only see permissions for `reviewer team` and restricted access to other resources', async ({page}) => {
+      await assertPermissionsDetails(page, reviewTeamUrl);
+      await assertRestrictedAccess(page, ownersUrl, testTeamUrl, adminUrl);
+    });
+  });
+
+  test.describe('test_team', () => {
+    test.use({user: 'user2'});
+
+    test('should only see permissions for test_team and restricted access to other resources', async ({page}) => {
+      await assertPermissionsDetails(page, testTeamUrl);
+      await assertRestrictedAccess(page, ownersUrl, reviewTeamUrl, adminUrl);
+    });
+  });
+});
diff --git a/tests/e2e/pr-review.test.e2e.ts b/tests/e2e/pr-review.test.e2e.ts
index b619cdbcd1..577c8bf20a 100644
--- a/tests/e2e/pr-review.test.e2e.ts
+++ b/tests/e2e/pr-review.test.e2e.ts
@@ -11,7 +11,7 @@ import {save_visual, test} from './utils_e2e.ts';
 
 test.use({user: 'user2'});
 
-test('PR: Finish review', async ({page}) => {
+test('PR: Create review from files', async ({page}) => {
   const response = await page.goto('/user2/repo1/pulls/5/files');
   expect(response?.status()).toBe(200);
 
@@ -22,4 +22,93 @@ test('PR: Finish review', async ({page}) => {
   await page.locator('#review-box .js-btn-review').click();
   await expect(page.locator('.tippy-box .review-box-panel')).toBeVisible();
   await save_visual(page);
+
+  await page.locator('.review-box-panel textarea#_combo_markdown_editor_0')
+    .fill('This is a review');
+  await page.locator('.review-box-panel button.btn-submit[value="approve"]').click();
+  await page.waitForURL(/.*\/user2\/repo1\/pulls\/5#issuecomment-\d+/);
+  await save_visual(page);
+});
+
+test('PR: Create review from commit', async ({page}) => {
+  const response = await page.goto('/user2/repo1/pulls/3/commits/4a357436d925b5c974181ff12a994538ddc5a269');
+  expect(response?.status()).toBe(200);
+
+  await page.locator('button.add-code-comment').click();
+  const code_comment = page.locator('.comment-code-cloud form textarea.markdown-text-editor');
+  await expect(code_comment).toBeVisible();
+
+  await code_comment.fill('This is a code comment');
+  await save_visual(page);
+
+  const start_button = page.locator('.comment-code-cloud form button.btn-start-review');
+  // Workaround for #7152, where there might already be a pending review state from previous
+  // test runs (most likely to happen when debugging tests).
+  if (await start_button.isVisible({timeout: 100})) {
+    await start_button.click();
+  } else {
+    await page.locator('.comment-code-cloud form button.btn-add-comment').click();
+  }
+
+  await expect(page.locator('.comment-list .comment-container')).toBeVisible();
+
+  // We need to wait for the review to be processed. Checking the comment counter
+  // conveniently does that.
+  await expect(page.locator('#review-box .js-btn-review > span.review-comments-counter')).toHaveText('1');
+
+  await page.locator('#review-box .js-btn-review').click();
+  await expect(page.locator('.tippy-box .review-box-panel')).toBeVisible();
+  await save_visual(page);
+
+  await page.locator('.review-box-panel textarea.markdown-text-editor')
+    .fill('This is a review');
+  await page.locator('.review-box-panel button.btn-submit[value="approve"]').click();
+  await page.waitForURL(/.*\/user2\/repo1\/pulls\/3#issuecomment-\d+/);
+  await save_visual(page);
+
+  // In addition to testing the ability to delete comments, this also
+  // performs clean up. If tests are run for multiple platforms, the data isn't reset
+  // in-between, and subsequent runs of this test would fail, because when there already is
+  // a comment, the on-hover button to start a conversation doesn't appear anymore.
+  await page.goto('/user2/repo1/pulls/3/commits/4a357436d925b5c974181ff12a994538ddc5a269');
+  await page.locator('.comment-header-right.actions a.context-menu').click();
+
+  await expect(page.locator('.comment-header-right.actions div.menu').getByText(/Copy link.*/)).toBeVisible();
+  // The button to delete a comment will prompt for confirmation using a browser alert.
+  page.on('dialog', (dialog) => dialog.accept());
+  await page.locator('.comment-header-right.actions div.menu .delete-comment').click();
+
+  await expect(page.locator('.comment-list .comment-container')).toBeHidden();
+  await save_visual(page);
+});
+
+test('PR: Navigate by single commit', async ({page}) => {
+  const response = await page.goto('/user2/repo1/pulls/3/commits');
+  expect(response?.status()).toBe(200);
+
+  await page.locator('tbody.commit-list td.message a').nth(1).click();
+  await page.waitForURL(/.*\/user2\/repo1\/pulls\/3\/commits\/4a357436d925b5c974181ff12a994538ddc5a269/);
+  await save_visual(page);
+
+  let prevButton = page.locator('.commit-header-buttons').getByText(/Prev/);
+  let nextButton = page.locator('.commit-header-buttons').getByText(/Next/);
+  await prevButton.waitFor();
+  await nextButton.waitFor();
+
+  await expect(prevButton).toHaveClass(/disabled/);
+  await expect(nextButton).not.toHaveClass(/disabled/);
+  await expect(nextButton).toHaveAttribute('href', '/user2/repo1/pulls/3/commits/5f22f7d0d95d614d25a5b68592adb345a4b5c7fd');
+  await nextButton.click();
+
+  await page.waitForURL(/.*\/user2\/repo1\/pulls\/3\/commits\/5f22f7d0d95d614d25a5b68592adb345a4b5c7fd/);
+  await save_visual(page);
+
+  prevButton = page.locator('.commit-header-buttons').getByText(/Prev/);
+  nextButton = page.locator('.commit-header-buttons').getByText(/Next/);
+  await prevButton.waitFor();
+  await nextButton.waitFor();
+
+  await expect(prevButton).not.toHaveClass(/disabled/);
+  await expect(nextButton).toHaveClass(/disabled/);
+  await expect(prevButton).toHaveAttribute('href', '/user2/repo1/pulls/3/commits/4a357436d925b5c974181ff12a994538ddc5a269');
 });
diff --git a/tests/e2e/profile_actions.test.e2e.ts b/tests/e2e/profile_actions.test.e2e.ts
index a66dc43aab..e27ecf64cf 100644
--- a/tests/e2e/profile_actions.test.e2e.ts
+++ b/tests/e2e/profile_actions.test.e2e.ts
@@ -2,6 +2,7 @@
 // routers/web/user/**
 // templates/shared/user/**
 // web_src/js/features/common-global.js
+// web_src/js/modules/dropdown.ts
 // @watch end
 
 import {expect} from '@playwright/test';
@@ -9,13 +10,11 @@ import {save_visual, test} from './utils_e2e.ts';
 
 test.use({user: 'user2'});
 
-test('Follow actions', async ({page}) => {
+test('Follow and block actions', async ({page}) => {
   await page.goto('/user1');
 
   // Check if following and then unfollowing works.
-  // This checks that the event listeners of
-  // the buttons aren't disappearing.
-  const followButton = page.locator('.follow');
+  const followButton = page.locator('.primary-action button');
   await expect(followButton).toContainText('Follow');
   await followButton.click();
   await expect(followButton).toContainText('Unfollow');
@@ -23,13 +22,19 @@ test('Follow actions', async ({page}) => {
   await expect(followButton).toContainText('Follow');
 
   // Simple block interaction.
-  await expect(page.locator('.block')).toContainText('Block');
+  const actionsDropdownBtn = page.locator('.actions .dropdown summary');
+  const blockButton = page.locator('#action-block');
+  await expect(blockButton).toBeHidden();
 
-  await page.locator('.block').click();
+  await actionsDropdownBtn.click();
+  await expect(blockButton).toBeVisible();
+  await expect(blockButton).toContainText('Block');
+
+  await blockButton.click();
   await expect(page.locator('#block-user')).toBeVisible();
   await save_visual(page);
   await page.locator('#block-user .ok').click();
-  await expect(page.locator('.block')).toContainText('Unblock');
+  await expect(blockButton).toContainText('Unblock');
   await expect(page.locator('#block-user')).toBeHidden();
 
   // Check that following the user yields in a error being shown.
@@ -40,6 +45,7 @@ test('Follow actions', async ({page}) => {
   await save_visual(page);
 
   // Unblock interaction.
-  await page.locator('.block').click();
-  await expect(page.locator('.block')).toContainText('Block');
+  await actionsDropdownBtn.click();
+  await blockButton.click();
+  await expect(blockButton).toContainText('Block');
 });
diff --git a/tests/e2e/relative-time.test.e2e.ts b/tests/e2e/relative-time.test.e2e.ts
new file mode 100644
index 0000000000..ab8bbc19de
--- /dev/null
+++ b/tests/e2e/relative-time.test.e2e.ts
@@ -0,0 +1,35 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// @watch start
+// templates/admin/dashboard.tmpl
+// web_src/js/webcomponents/relative-time.js
+// @watch end
+
+import {expect} from '@playwright/test';
+import {test} from './utils_e2e.ts';
+
+test.use({user: 'user1'});
+
+test('Relative time after htmx swap', async ({page}, workerInfo) => {
+  test.skip(
+    workerInfo.project.name !== 'firefox' && workerInfo.project.name !== 'Mobile Chrome',
+    'This is a really slow test, so limit to a subset of client.',
+  );
+  await page.goto('/admin');
+
+  const relativeTime = page.locator('.admin-dl-horizontal > dd:nth-child(2) > relative-time');
+  await expect(relativeTime).toContainText('ago');
+
+  const body = page.locator('body');
+  await body.evaluate(
+    (element) =>
+      new Promise((resolve) =>
+        element.addEventListener('htmx:afterSwap', () => {
+          resolve();
+        }),
+      ),
+  );
+
+  await expect(relativeTime).toContainText('ago');
+});
diff --git a/tests/e2e/release.test.e2e.ts b/tests/e2e/release.test.e2e.ts
index 044e7b93ab..a4303a7320 100644
--- a/tests/e2e/release.test.e2e.ts
+++ b/tests/e2e/release.test.e2e.ts
@@ -14,78 +14,100 @@ import {validate_form} from './shared/forms.ts';
 
 test.use({user: 'user2'});
 
-test.describe.configure({
-  timeout: 30000,
-});
-
-test('External Release Attachments', async ({page, isMobile}) => {
-  test.skip(isMobile);
-
-  // Click "New Release"
-  await page.goto('/user2/repo2/releases');
-  await page.click('.button.small.primary');
-
-  // Fill out form and create new release
-  await expect(page).toHaveURL('/user2/repo2/releases/new');
-  await validate_form({page}, 'fieldset');
-  const textarea = page.locator('input[name=tag_name]');
-  await textarea.pressSequentially('2.0');
-  await expect(page.locator('input[name=title]')).toHaveValue('2.0');
-  await page.click('#add-external-link');
-  await page.click('#add-external-link');
-  await page.fill('input[name=attachment-new-name-2]', 'Test');
-  await page.fill('input[name=attachment-new-exturl-2]', 'https://forgejo.org/');
-  await page.click('.remove-rel-attach');
-  await save_visual(page);
-  await page.click('.button.small.primary');
-
-  // Validate release page and click edit
-  await expect(page).toHaveURL('/user2/repo2/releases');
-  await expect(page.locator('.download[open] li')).toHaveCount(3);
-
-  await expect(page.locator('.download[open] li:nth-of-type(1)')).toContainText('Source code (ZIP)');
-  await expect(page.locator('.download[open] li:nth-of-type(1) span[data-tooltip-content]')).toHaveAttribute('data-tooltip-content', 'This attachment is automatically generated.');
-  await expect(page.locator('.download[open] li:nth-of-type(1) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.zip');
-  await expect(page.locator('.download[open] li:nth-of-type(1) a')).toHaveAttribute('type', 'application/zip');
-
-  await expect(page.locator('.download[open] li:nth-of-type(2)')).toContainText('Source code (TAR.GZ)');
-  await expect(page.locator('.download[open] li:nth-of-type(2) span[data-tooltip-content]')).toHaveAttribute('data-tooltip-content', 'This attachment is automatically generated.');
-  await expect(page.locator('.download[open] li:nth-of-type(2) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.tar.gz');
-  await expect(page.locator('.download[open] li:nth-of-type(2) a')).toHaveAttribute('type', 'application/gzip');
-
-  await expect(page.locator('.download[open] li:nth-of-type(3)')).toContainText('Test');
-  await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://forgejo.org/');
-  await save_visual(page);
-  await page.locator('.octicon-pencil').first().click();
-
-  // Validate edit page and edit the release
-  await expect(page).toHaveURL('/user2/repo2/releases/edit/2.0');
-  await validate_form({page}, 'fieldset');
-  await expect(page.locator('.attachment_edit:visible')).toHaveCount(2);
-  await expect(page.locator('.attachment_edit:visible').nth(0)).toHaveValue('Test');
-  await expect(page.locator('.attachment_edit:visible').nth(1)).toHaveValue('https://forgejo.org/');
-  await page.locator('.attachment_edit:visible').nth(0).fill('Test2');
-  await page.locator('.attachment_edit:visible').nth(1).fill('https://gitea.io/');
-  await page.click('#add-external-link');
-  await expect(page.locator('.attachment_edit:visible')).toHaveCount(4);
-  await page.locator('.attachment_edit:visible').nth(2).fill('Test3');
-  await page.locator('.attachment_edit:visible').nth(3).fill('https://gitea.com/');
-  await save_visual(page);
-  await page.click('.button.small.primary');
-
-  // Validate release page and click edit
-  await expect(page).toHaveURL('/user2/repo2/releases');
-  await expect(page.locator('.download[open] li')).toHaveCount(4);
-  await expect(page.locator('.download[open] li:nth-of-type(3)')).toContainText('Test2');
-  await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://gitea.io/');
-  await expect(page.locator('.download[open] li:nth-of-type(4)')).toContainText('Test3');
-  await expect(page.locator('.download[open] li:nth-of-type(4) a')).toHaveAttribute('href', 'https://gitea.com/');
-  await save_visual(page);
-  await page.locator('.octicon-pencil').first().click();
-
-  // Delete release
-  await expect(page).toHaveURL('/user2/repo2/releases/edit/2.0');
-  await page.click('.delete-button');
-  await page.click('.button.ok');
-  await expect(page).toHaveURL('/user2/repo2/releases');
+test.describe('repo branch protection settings', () => {
+  test('External Release Attachments', async ({page, isMobile}, workerInfo) => {
+    test.skip(isMobile || workerInfo.project.name === 'webkit');
+
+    // Click "New Release"
+    await page.goto('/user2/repo2/releases');
+    await page.click('.button.small.primary');
+
+    // Fill out form and create new release
+    await expect(page).toHaveURL('/user2/repo2/releases/new');
+    await validate_form({page}, 'fieldset');
+    const textarea = page.locator('input[name=tag_name]');
+    await textarea.pressSequentially('2.0');
+    await expect(page.locator('input[name=title]')).toHaveValue('2.0');
+    await page.click('#add-external-link');
+    await page.click('#add-external-link');
+    await page.fill('input[name=attachment-new-name-2]', 'Test');
+    await page.fill('input[name=attachment-new-exturl-2]', 'https://forgejo.org/');
+    await page.click('.remove-rel-attach');
+    await save_visual(page);
+    await page.click('.button.small.primary');
+
+    // Validate release page and click edit
+    await expect(page).toHaveURL('/user2/repo2/releases');
+    await expect(page.locator('.download[open] li')).toHaveCount(3);
+
+    await expect(page.locator('.download[open] li:nth-of-type(1)')).toContainText('Source code (ZIP)');
+    await expect(page.locator('.download[open] li:nth-of-type(1) span[data-tooltip-content]')).toHaveAttribute('data-tooltip-content', 'This attachment is automatically generated.');
+    await expect(page.locator('.download[open] li:nth-of-type(1) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.zip');
+    await expect(page.locator('.download[open] li:nth-of-type(1) a')).toHaveAttribute('type', 'application/zip');
+
+    await expect(page.locator('.download[open] li:nth-of-type(2)')).toContainText('Source code (TAR.GZ)');
+    await expect(page.locator('.download[open] li:nth-of-type(2) span[data-tooltip-content]')).toHaveAttribute('data-tooltip-content', 'This attachment is automatically generated.');
+    await expect(page.locator('.download[open] li:nth-of-type(2) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.tar.gz');
+    await expect(page.locator('.download[open] li:nth-of-type(2) a')).toHaveAttribute('type', 'application/gzip');
+
+    await expect(page.locator('.download[open] li:nth-of-type(3)')).toContainText('Test');
+    await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://forgejo.org/');
+    await save_visual(page);
+    await page.locator('.octicon-pencil').first().click();
+
+    // Validate edit page and edit the release
+    await expect(page).toHaveURL('/user2/repo2/releases/edit/2.0');
+    await validate_form({page}, 'fieldset');
+    await expect(page.locator('.attachment_edit:visible')).toHaveCount(2);
+    await expect(page.locator('.attachment_edit:visible').nth(0)).toHaveValue('Test');
+    await expect(page.locator('.attachment_edit:visible').nth(1)).toHaveValue('https://forgejo.org/');
+    await page.locator('.attachment_edit:visible').nth(0).fill('Test2');
+    await page.locator('.attachment_edit:visible').nth(1).fill('https://gitea.io/');
+    await page.click('#add-external-link');
+    await expect(page.locator('.attachment_edit:visible')).toHaveCount(4);
+    await page.locator('.attachment_edit:visible').nth(2).fill('Test3');
+    await page.locator('.attachment_edit:visible').nth(3).fill('https://gitea.com/');
+    await save_visual(page);
+    await page.click('.button.small.primary');
+
+    // Validate release page and click edit
+    await expect(page).toHaveURL('/user2/repo2/releases');
+    await expect(page.locator('.download[open] li')).toHaveCount(4);
+    await expect(page.locator('.download[open] li:nth-of-type(3)')).toContainText('Test2');
+    await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://gitea.io/');
+    await expect(page.locator('.download[open] li:nth-of-type(4)')).toContainText('Test3');
+    await expect(page.locator('.download[open] li:nth-of-type(4) a')).toHaveAttribute('href', 'https://gitea.com/');
+    await save_visual(page);
+    await page.locator('.octicon-pencil').first().click();
+  });
+
+  test('Release name equals tag name if created from tag', async ({page}) => {
+    await page.goto('/user2/repo2/releases/new?tag=v1.1');
+
+    await expect(page.locator('input[name=title]')).toHaveValue('v1.1');
+  });
+
+  test('Release name equals release name if edit', async ({page, isMobile}) => {
+    test.skip(isMobile);
+
+    await page.goto('/user2/repo2/releases/new');
+
+    await page.locator('input[name=title]').pressSequentially('v2.0');
+    await page.locator('input[name=tag_name]').pressSequentially('2.0');
+    await page.click('.button.small.primary');
+
+    await page.goto('/user2/repo2/releases/edit/2.0');
+
+    await expect(page.locator('input[name=title]')).toHaveValue('v2.0');
+  });
+
+  test.afterEach(async ({page}) => {
+    // Delete release
+    const response = await page.goto('/user2/repo2/releases/edit/2.0');
+    test.skip(response.status() === 404, 'No release to delete');
+
+    await page.locator('.delete-button').dispatchEvent('click');
+    await page.locator('.button.ok').click();
+    await expect(page).toHaveURL('/user2/repo2/releases');
+  });
 });
diff --git a/tests/e2e/repo-code.test.e2e.ts b/tests/e2e/repo-code.test.e2e.ts
index 11b710c956..9184c3ce67 100644
--- a/tests/e2e/repo-code.test.e2e.ts
+++ b/tests/e2e/repo-code.test.e2e.ts
@@ -1,7 +1,13 @@
+// Copyright 2024 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // @watch start
-// web_src/js/features/repo-code.js
-// web_src/css/repo.css
 // services/gitdiff/**
+// templates/repo/view_file.tmpl
+// web_src/css/repo.css
+// web_src/css/repo/file-view.css
+// web_src/js/features/repo-code.js
+// web_src/js/features/repo-unicode-escape.js
 // @watch end
 
 import {expect, type Page} from '@playwright/test';
@@ -16,7 +22,7 @@ async function assertSelectedLines(page: Page, nums: string[]) {
       .toStrictEqual(nums);
 
     // the first line selected has an action button
-    if (nums.length > 0) await expect(page.locator(`#L${nums[0]} .code-line-button`)).toBeVisible();
+    if (nums.length > 0) await expect(page.locator(`.lines-num:has(#L${nums[0]}) .code-line-button`)).toBeVisible();
   };
 
   await pageAssertions();
@@ -99,3 +105,25 @@ test.describe('As authenticated user', () => {
     await save_visual(page);
   });
 });
+
+test('Unicode escape highlight', async ({page}) => {
+  const unselectedBg = 'rgba(0, 0, 0, 0)';
+  const selectedBg = 'rgb(255, 237, 213)';
+
+  const response = await page.goto('/user2/unicode-escaping/src/branch/main/a-file');
+  expect(response?.status()).toBe(200);
+
+  await expect(page.locator('.unicode-escape-prompt')).toBeVisible();
+  expect(await page.locator('.lines-num').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(unselectedBg);
+  expect(await page.locator('.lines-escape').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(unselectedBg);
+  expect(await page.locator('.lines-code').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(unselectedBg);
+
+  await page.locator('#L1').click();
+  expect(await page.locator('.lines-num').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(selectedBg);
+  expect(await page.locator('.lines-escape').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(selectedBg);
+  expect(await page.locator('.lines-code').evaluate((el) => getComputedStyle(el).backgroundColor)).toBe(selectedBg);
+
+  await page.locator('.code-line-button').click();
+  await expect(page.locator('.tippy-box .view_git_blame[href$="/a-file#L1"]')).toBeVisible();
+  await expect(page.locator('.tippy-box .copy-line-permalink[data-url$="/a-file#L1"]')).toBeVisible();
+});
diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.ts
index 5e67f89ed1..f0be73e777 100644
--- a/tests/e2e/repo-migrate.test.e2e.ts
+++ b/tests/e2e/repo-migrate.test.e2e.ts
@@ -3,28 +3,75 @@
 // @watch end
 
 import {expect} from '@playwright/test';
-import {test, save_visual, test_context} from './utils_e2e.ts';
+import {test, save_visual, test_context, dynamic_id} from './utils_e2e.ts';
 
 test.use({user: 'user2'});
 
+test('Migration type seleciton screen', async ({page}) => {
+  await page.goto('/repo/migrate');
+
+  // For branding purposes, it is desired that `gitea-` prefixes in SVGs are
+  // replaced with something like `productlogo-`.
+  await expect(page.locator('svg.gitea-git')).toBeVisible();
+  await expect(page.locator('svg.octicon-mark-github')).toBeVisible();
+  await expect(page.locator('svg.gitea-gitlab')).toBeVisible();
+  await expect(page.locator('svg.gitea-forgejo')).toBeVisible();
+  await expect(page.locator('svg.gitea-gitea')).toBeVisible();
+  await expect(page.locator('svg.gitea-gogs')).toBeVisible();
+  await expect(page.locator('svg.gitea-onedev')).toBeVisible();
+  await expect(page.locator('svg.gitea-gitbucket')).toBeVisible();
+  await expect(page.locator('svg.gitea-codebase')).toBeVisible();
+
+  await save_visual(page);
+});
+
+test('Migration Repo Name detection', async ({page}, workerInfo) => {
+  test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari');
+
+  await page.goto('/repo/migrate?service_type=2');
+
+  const form = page.locator('form');
+
+  // Test trailing slashes are stripped
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test/');
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur();
+  await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test');
+
+  // Test trailing .git is stripped
+  await page.reload();
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test.git');
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur();
+  await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test');
+
+  // Test trailing .git and trailing / together is stripped
+  await page.reload();
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://github.com/example/test.git/');
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).blur();
+  await expect(form.getByRole('textbox', {name: 'Repository Name'})).toHaveValue('test');
+
+  // Save screenshot only once
+  await save_visual(page);
+});
+
 test('Migration Progress Page', async ({page, browser}, workerInfo) => {
   test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari');
 
-  expect((await page.goto('/user2/invalidrepo'))?.status(), 'repo should not exist yet').toBe(404);
+  const repoName = dynamic_id();
+  expect((await page.goto(`/user2/${repoName}`))?.status(), 'repo should not exist yet').toBe(404);
 
   await page.goto('/repo/migrate?service_type=1');
 
   const form = page.locator('form');
-  await form.getByRole('textbox', {name: 'Repository Name'}).fill('invalidrepo');
-  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://codeberg.org/forgejo/invalidrepo');
+  await form.getByRole('textbox', {name: 'Repository Name'}).fill(repoName);
+  await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill(`https://codeberg.org/forgejo/${repoName}`);
   await save_visual(page);
   await form.locator('button.primary').click({timeout: 5000});
-  await expect(page).toHaveURL('user2/invalidrepo');
+  await expect(page).toHaveURL(`user2/${repoName}`);
   await save_visual(page);
 
-  const ctx = await test_context(browser);
+  const ctx = await test_context(browser, {storageState: {cookies: [], origins: []}});
   const unauthenticatedPage = await ctx.newPage();
-  expect((await unauthenticatedPage.goto('/user2/invalidrepo'))?.status(), 'public migration page should be accessible').toBe(200);
+  expect((await unauthenticatedPage.goto(`/user2/${repoName}`))?.status(), 'public migration page should be accessible').toBe(200);
   await expect(unauthenticatedPage.locator('#repo_migrating_progress')).toBeVisible();
 
   await page.reload();
@@ -32,7 +79,7 @@ test('Migration Progress Page', async ({page, browser}, workerInfo) => {
   await save_visual(page);
   await page.getByRole('button', {name: 'Delete this repository'}).click();
   const deleteModal = page.locator('#delete-repo-modal');
-  await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill('user2/invalidrepo');
+  await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill(`user2/${repoName}`);
   await save_visual(page);
   await deleteModal.getByRole('button', {name: 'Delete repository'}).click();
   await expect(page).toHaveURL('/');
diff --git a/tests/e2e/repo-new.test.e2e.ts b/tests/e2e/repo-new.test.e2e.ts
index ad202825a0..ed5e0beb00 100644
--- a/tests/e2e/repo-new.test.e2e.ts
+++ b/tests/e2e/repo-new.test.e2e.ts
@@ -125,3 +125,24 @@ test('New repo: label set', async ({page}) => {
   await expect(page.getByText('Kind/Bug Something is not')).toBeVisible();
   await save_visual(page);
 });
+
+test('New repo: gitignore', async ({page}) => {
+  await page.goto('/repo/create');
+
+  await page.getByText('Start the Git history with').click();
+  const gitignoreDropdown = page.locator('.hide-unless-checked label:first-of-type > div');
+  await gitignoreDropdown.click();
+  await page.getByRole('option', {name: 'ArchLinuxPackages'}).click();
+  await page.getByRole('option', {name: 'Android'}).click();
+  await page.getByRole('option', {name: 'ChefCookbook'}).click();
+  await page.getByRole('option', {name: 'GNOMEShellExtension'}).click();
+  await page.getByRole('option', {name: 'JupyterNotebooks'}).click();
+  await page.getByRole('option', {name: 'NotesAndExtendedConfiguration'}).click();
+  await page.getByRole('option', {name: 'MetaProgrammingSystem'}).click();
+  await page.getByRole('option', {name: 'AppceleratorTitanium'}).click();
+  await save_visual(page);
+
+  const segmentWidth = (await page.locator('.segment').boundingBox()).width;
+  const dropdownWidth = (await gitignoreDropdown.boundingBox()).width;
+  expect(dropdownWidth).toBeLessThan(segmentWidth);
+});
diff --git a/tests/e2e/repo-wiki.test.e2e.ts b/tests/e2e/repo-wiki.test.e2e.ts
index 4ce66da8bc..e31201ccf7 100644
--- a/tests/e2e/repo-wiki.test.e2e.ts
+++ b/tests/e2e/repo-wiki.test.e2e.ts
@@ -21,8 +21,10 @@ for (const searchTerm of ['space', 'consectetur']) {
       // workaround: HTMX listens on keyup events, playwright's fill only triggers the input event
       // so we manually "type" the last letter
       await page.getByPlaceholder('Search wiki').dispatchEvent('keyup');
-      // timeout is necessary because HTMX search could be slow
-      await expect(page.locator('#wiki-search a[href]')).toBeInViewport({ratio: 1});
+
+      await expect(page.locator('#wiki-search a[href]')).toBeInViewport({
+        ratio: workerInfo.project.name === 'webkit' ? 0.9 : 1,
+      });
       await save_visual(page);
     });
   }
diff --git a/tests/e2e/shared/forms.ts b/tests/e2e/shared/forms.ts
index adb5b6e3cb..862a243600 100644
--- a/tests/e2e/shared/forms.ts
+++ b/tests/e2e/shared/forms.ts
@@ -10,6 +10,9 @@ export async function validate_form({page}: {page: Page}, scope: 'form' | 'field
     // legacy dropdowns don't use semantic HTML yet,
     // avoid using these where possible
     '.ui.dropdown',
+    // for some reason we use h1 to h5 for form sections,
+    // and it usually makes no sense semantically
+    '.ui.top.attached.header',
   ];
   await accessibilityCheck({page}, [scope], excludedElements, []);
 
diff --git a/tests/e2e/user-cards.test.e2e.ts b/tests/e2e/user-cards.test.e2e.ts
new file mode 100644
index 0000000000..22c31965d6
--- /dev/null
+++ b/tests/e2e/user-cards.test.e2e.ts
@@ -0,0 +1,29 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// @watch start
+// templates/repo/user_cards.tmpl
+// web_src/css/modules/user-cards.css
+// @watch end
+
+import {expect} from '@playwright/test';
+import {test} from './utils_e2e.ts';
+
+test('Usercards width', async ({page}) => {
+  await page.goto('/user8?tab=followers');
+
+  // Regardless of whether cards in a grid or flex mode, they should be ~same
+  // width. Verifying this relies on fixtures with users that have long website
+  // link or other content that could push the card width.
+  const widths = [];
+  const amount = 3;
+
+  for (let i = 1; i <= amount; i++) {
+    const card = await page.locator(`.user-cards .card:nth-child(${i})`).boundingBox();
+    widths.push(Math.round(card.width));
+  }
+
+  for (const width of widths) {
+    expect(width).toBe(widths[0]);
+  }
+});
diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go
index d57c7bc2d3..efa1657cee 100644
--- a/tests/e2e/utils_e2e_test.go
+++ b/tests/e2e/utils_e2e_test.go
@@ -5,7 +5,6 @@ package e2e
 
 import (
 	"context"
-	"crypto/rand"
 	"encoding/hex"
 	"fmt"
 	"net"
@@ -23,6 +22,7 @@ import (
 	"forgejo.org/modules/json"
 	modules_session "forgejo.org/modules/session"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/util"
 	"forgejo.org/tests"
 
 	"code.forgejo.org/go-chi/session"
@@ -93,7 +93,10 @@ func createSessions(t testing.TB) {
 	users := []string{
 		"user1",
 		"user2",
+		"user11",
 		"user12",
+		"user18",
+		"user29",
 		"user40",
 	}
 
@@ -153,11 +156,7 @@ func stateHelper(t testing.TB) func(stateFile string, user *user_model.User) {
 	require.NoError(t, err)
 
 	return func(stateFile string, user *user_model.User) {
-		buf := make([]byte, opt.IDLength/2)
-		_, err = rand.Read(buf)
-		require.NoError(t, err)
-
-		sessionID := hex.EncodeToString(buf)
+		sessionID := hex.EncodeToString(util.CryptoRandomBytes(int64(opt.IDLength) / 2))
 
 		s, err := vsp.Read(sessionID)
 		require.NoError(t, err)
diff --git a/tests/e2e/webauthn.test.e2e.ts b/tests/e2e/webauthn.test.e2e.ts
index 144f52e374..d4b81621d2 100644
--- a/tests/e2e/webauthn.test.e2e.ts
+++ b/tests/e2e/webauthn.test.e2e.ts
@@ -40,9 +40,8 @@ test('WebAuthn register & login flow', async ({browser, request}, workerInfo) =>
   // Logout.
   await expect(async () => {
     await page.locator('div[aria-label="Profile and settings…"]').click();
-    await page.getByText('Sign Out').click();
+    await page.getByText('Sign out').click();
   }).toPass();
-  await page.waitForURL(`${workerInfo.project.use.baseURL}/`);
 
   // Login.
   response = await page.goto('/user/login');
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/logs/refs/heads/branch1 b/tests/gitea-repositories-meta/user2/commitsonpr.git/logs/refs/heads/branch1
index cf96195665..34c9ccecdd 100644
--- a/tests/gitea-repositories-meta/user2/commitsonpr.git/logs/refs/heads/branch1
+++ b/tests/gitea-repositories-meta/user2/commitsonpr.git/logs/refs/heads/branch1
@@ -1 +1,2 @@
 0000000000000000000000000000000000000000 1978192d98bb1b65e11c2cf37da854fbf94bffd6 Gitea <gitea@fake.local> 1688672383 +0200	push
+1978192d98bb1b65e11c2cf37da854fbf94bffd6 9b93963cf6de4dc33f915bb67f192d099c301f43 Forgejo <forgejo@fake.local> 1749737639 +0200	push
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/06/c5865eaeaaa2f92e8fce75a281f6272ee68e90 b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/06/c5865eaeaaa2f92e8fce75a281f6272ee68e90
new file mode 100644
index 0000000000..009c9849d9
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/06/c5865eaeaaa2f92e8fce75a281f6272ee68e90 differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/2d/65d92dc800c6f448541240c18e82bf36b954bb b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/2d/65d92dc800c6f448541240c18e82bf36b954bb
new file mode 100644
index 0000000000..e50c7ad5eb
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/2d/65d92dc800c6f448541240c18e82bf36b954bb differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/9b/93963cf6de4dc33f915bb67f192d099c301f43 b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/9b/93963cf6de4dc33f915bb67f192d099c301f43
new file mode 100644
index 0000000000..41814996f1
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/9b/93963cf6de4dc33f915bb67f192d099c301f43 differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/ab/a2b386a1eb0b0273ada0fed4f7d075d6e343c1 b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/ab/a2b386a1eb0b0273ada0fed4f7d075d6e343c1
new file mode 100644
index 0000000000..2d936251cd
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/ab/a2b386a1eb0b0273ada0fed4f7d075d6e343c1 differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/b3/b178fe7c45986f6325aeac1b036c74825ae8f4 b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/b3/b178fe7c45986f6325aeac1b036c74825ae8f4
new file mode 100644
index 0000000000..7852ab9100
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/b3/b178fe7c45986f6325aeac1b036c74825ae8f4 differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/c9/cf8a3095808af2425255056e01746fef420801 b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/c9/cf8a3095808af2425255056e01746fef420801
new file mode 100644
index 0000000000..32a51a2837
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/commitsonpr.git/objects/c9/cf8a3095808af2425255056e01746fef420801 differ
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/heads/branch1 b/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/heads/branch1
index 357fc9d6ed..6fc9179bdd 100644
--- a/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/heads/branch1
+++ b/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/heads/branch1
@@ -1 +1 @@
-1978192d98bb1b65e11c2cf37da854fbf94bffd6
+9b93963cf6de4dc33f915bb67f192d099c301f43
diff --git a/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/pull/1/head b/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/pull/1/head
index 357fc9d6ed..6fc9179bdd 100644
--- a/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/pull/1/head
+++ b/tests/gitea-repositories-meta/user2/commitsonpr.git/refs/pull/1/head
@@ -1 +1 @@
-1978192d98bb1b65e11c2cf37da854fbf94bffd6
+9b93963cf6de4dc33f915bb67f192d099c301f43
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph
index d151dc87e6..f85243ea3f 100644
Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph and b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/commit-graph differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs
index 0374746b5e..43c2b98699 100644
--- a/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs
+++ b/tests/gitea-repositories-meta/user2/repo59.git/objects/info/packs
@@ -1,2 +1,2 @@
-P pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack
+P pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack
 
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx
new file mode 100644
index 0000000000..2f71563020
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.idx differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack
new file mode 100644
index 0000000000..73622aa52c
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.pack differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev
new file mode 100644
index 0000000000..a03b42c9c0
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-1cc75cb726e1cc54d31c00c741912da8baa644a4.rev differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx
deleted file mode 100644
index aaa9981cf5..0000000000
Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.idx and /dev/null differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack
deleted file mode 100644
index ddb8c16caf..0000000000
Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.pack and /dev/null differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev b/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev
deleted file mode 100644
index 81554dba74..0000000000
Binary files a/tests/gitea-repositories-meta/user2/repo59.git/objects/pack/pack-6dd3a6fe138f1d77e14c2e6b8e6c41e5ae242adf.rev and /dev/null differ
diff --git a/tests/gitea-repositories-meta/user2/repo59.git/packed-refs b/tests/gitea-repositories-meta/user2/repo59.git/packed-refs
index 77fedbf67d..b3e7aa4eca 100644
--- a/tests/gitea-repositories-meta/user2/repo59.git/packed-refs
+++ b/tests/gitea-repositories-meta/user2/repo59.git/packed-refs
@@ -1,4 +1,4 @@
 # pack-refs with: peeled fully-peeled sorted 
 d8f53dfb33f6ccf4169c34970b5e747511c18beb refs/heads/cake-recipe
-80b83c5c8220c3aa3906e081f202a2a7563ec879 refs/heads/master
+f3e315de30a90851c5b27f824a3c4efc3caa9941 refs/heads/master
 d8f53dfb33f6ccf4169c34970b5e747511c18beb refs/tags/v1.0
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/COMMIT_EDITMSG b/tests/gitea-repositories-meta/user2/test_action_run_search.git/COMMIT_EDITMSG
new file mode 100644
index 0000000000..6be072ebc0
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/COMMIT_EDITMSG
@@ -0,0 +1 @@
+fix: bug
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/FETCH_HEAD b/tests/gitea-repositories-meta/user2/test_action_run_search.git/FETCH_HEAD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/HEAD b/tests/gitea-repositories-meta/user2/test_action_run_search.git/HEAD
new file mode 100644
index 0000000000..b870d82622
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/config b/tests/gitea-repositories-meta/user2/test_action_run_search.git/config
new file mode 100644
index 0000000000..515f483629
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/config
@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/description b/tests/gitea-repositories-meta/user2/test_action_run_search.git/description
new file mode 100644
index 0000000000..498b267a8c
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/index b/tests/gitea-repositories-meta/user2/test_action_run_search.git/index
new file mode 100644
index 0000000000..cca2ada835
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/index differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/info/exclude b/tests/gitea-repositories-meta/user2/test_action_run_search.git/info/exclude
new file mode 100644
index 0000000000..a5196d1be8
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/HEAD b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/HEAD
new file mode 100644
index 0000000000..51870db479
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/HEAD
@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745918688 +0200	commit (initial): initial
+97f29ee599c373c729132a5c46a046978311e0ee 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745921505 +0200	checkout: moving from master to main
+97f29ee599c373c729132a5c46a046978311e0ee 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745922102 +0200	checkout: moving from main to bugfix-1
+97f29ee599c373c729132a5c46a046978311e0ee 35c5cddfc19397501ec8f4f7bb808a7c8f04445f User 2 <user2@example.com> 1745922142 +0200	commit: fix: bug
+35c5cddfc19397501ec8f4f7bb808a7c8f04445f 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745922150 +0200	checkout: moving from bugfix-1 to main
+97f29ee599c373c729132a5c46a046978311e0ee 35c5cddfc19397501ec8f4f7bb808a7c8f04445f User 2 <user2@example.com> 1745922198 +0200	checkout: moving from main to bugfix-1
+35c5cddfc19397501ec8f4f7bb808a7c8f04445f 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745922272 +0200	checkout: moving from bugfix-1 to main
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/bugfix-1 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/bugfix-1
new file mode 100644
index 0000000000..d8977c9d15
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/bugfix-1
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745922102 +0200	branch: Created from HEAD
+97f29ee599c373c729132a5c46a046978311e0ee 35c5cddfc19397501ec8f4f7bb808a7c8f04445f User 2 <user2@example.com> 1745922142 +0200	commit: fix: bug
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/main b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/main
new file mode 100644
index 0000000000..30a780778b
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/logs/refs/heads/main
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 97f29ee599c373c729132a5c46a046978311e0ee User 2 <user2@example.com> 1745921505 +0200	branch: Created from HEAD
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/05/daa94891793ad0f183273cfb9902b903782e2a b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/05/daa94891793ad0f183273cfb9902b903782e2a
new file mode 100644
index 0000000000..741f3a665f
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/05/daa94891793ad0f183273cfb9902b903782e2a differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/18/722d8d68a60af7e66213ef4a15d05dae365f2b b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/18/722d8d68a60af7e66213ef4a15d05dae365f2b
new file mode 100644
index 0000000000..cececf6633
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/18/722d8d68a60af7e66213ef4a15d05dae365f2b differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/35/c5cddfc19397501ec8f4f7bb808a7c8f04445f b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/35/c5cddfc19397501ec8f4f7bb808a7c8f04445f
new file mode 100644
index 0000000000..3f921384ba
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/35/c5cddfc19397501ec8f4f7bb808a7c8f04445f differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/76/ebce62dde5d6c40cfdda5782ff171f02a618b9 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/76/ebce62dde5d6c40cfdda5782ff171f02a618b9
new file mode 100644
index 0000000000..920604316e
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/76/ebce62dde5d6c40cfdda5782ff171f02a618b9 differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/7f/56afb8a0b9ffbc39e8edd537f252412254d112 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/7f/56afb8a0b9ffbc39e8edd537f252412254d112
new file mode 100644
index 0000000000..4dad68d944
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/7f/56afb8a0b9ffbc39e8edd537f252412254d112 differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8d/6860a6d6bb80661d308b060509ef41f099c390 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8d/6860a6d6bb80661d308b060509ef41f099c390
new file mode 100644
index 0000000000..893f680834
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8d/6860a6d6bb80661d308b060509ef41f099c390 differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8f/2069876727126f91aa756d84caa59f93670dfc b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8f/2069876727126f91aa756d84caa59f93670dfc
new file mode 100644
index 0000000000..92663ca712
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/8f/2069876727126f91aa756d84caa59f93670dfc differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/97/f29ee599c373c729132a5c46a046978311e0ee b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/97/f29ee599c373c729132a5c46a046978311e0ee
new file mode 100644
index 0000000000..9a835a73c4
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/97/f29ee599c373c729132a5c46a046978311e0ee differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a5/3a19de56c7594844459c2951497c15dba8adee b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a5/3a19de56c7594844459c2951497c15dba8adee
new file mode 100644
index 0000000000..44b7d5774d
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a5/3a19de56c7594844459c2951497c15dba8adee differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a6/2cdde48ab95bb49294c30cf0971ce2511008c5 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a6/2cdde48ab95bb49294c30cf0971ce2511008c5
new file mode 100644
index 0000000000..e6f7dccf30
Binary files /dev/null and b/tests/gitea-repositories-meta/user2/test_action_run_search.git/objects/a6/2cdde48ab95bb49294c30cf0971ce2511008c5 differ
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/bugfix-1 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/bugfix-1
new file mode 100644
index 0000000000..ae12ad5d79
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/bugfix-1
@@ -0,0 +1 @@
+35c5cddfc19397501ec8f4f7bb808a7c8f04445f
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/main b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/main
new file mode 100644
index 0000000000..d46cce7027
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/heads/main
@@ -0,0 +1 @@
+97f29ee599c373c729132a5c46a046978311e0ee
diff --git a/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/tags/v1 b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/tags/v1
new file mode 100644
index 0000000000..d46cce7027
--- /dev/null
+++ b/tests/gitea-repositories-meta/user2/test_action_run_search.git/refs/tags/v1
@@ -0,0 +1 @@
+97f29ee599c373c729132a5c46a046978311e0ee
diff --git a/tests/integration/README.md b/tests/integration/README.md
index d83685388e..ea742581d2 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -71,11 +71,17 @@ TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test?multiStatements=true TEST_
 ### Run pgsql integration tests
 Setup a pgsql database inside docker
 ```
-docker run -e "POSTGRES_DB=test" -e POSTGRES_PASSWORD=postgres -p 5432:5432 --rm --name pgsql postgres:latest #(Ctrl-c to stop the database)
+docker run -e "POSTGRES_DB=test" -e POSTGRES_PASSWORD=postgres -e POSTGRESQL_FSYNC=off -e POSTGRESQL_EXTRA_FLAGS="-c full_page_writes=off" -p 5432:5432 --rm --name pgsql data.forgejo.org/oci/bitnami/postgresql:16 #(Ctrl-c to stop)
 ```
+
+Setup a S3 server inside docker
+```
+docker run -e MINIO_ROOT_USER=123456 -e MINIO_ROOT_PASSWORD=12345678 -p 9000:9000 --rm --name minio data.forgejo.org/oci/bitnami/minio:2024.8.17 #(Ctrl-c to stop)
+```
+
 Start tests based on the database container
 ```
-TEST_STORAGE_TYPE=local TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql
+TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres TEST_S3_HOST=localhost:9000 make 'test-pgsql#Test'
 ```
 
 ### Running individual tests
diff --git a/tests/integration/actions_commit_status_test.go b/tests/integration/actions_commit_status_test.go
index a14b427c98..fdc12205fe 100644
--- a/tests/integration/actions_commit_status_test.go
+++ b/tests/integration/actions_commit_status_test.go
@@ -4,6 +4,7 @@
 package integration
 
 import (
+	"net/http"
 	"net/url"
 	"testing"
 
@@ -17,6 +18,7 @@ import (
 	"forgejo.org/modules/test"
 	"forgejo.org/services/actions"
 	"forgejo.org/services/automerge"
+	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -48,3 +50,14 @@ func TestActionsAutomerge(t *testing.T) {
 	},
 	)
 }
+
+func TestForcePushCommitStatus(t *testing.T) {
+	defer unittest.OverrideFixtures("tests/integration/fixtures/TestForcePushCommitStatus/")()
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	htmlDoc.AssertElement(t, ".forced-push [data-tippy='commit-statuses']:nth-of-type(3) svg.commit-status.octicon-dot-fill", true)
+	htmlDoc.AssertElement(t, ".forced-push [data-tippy='commit-statuses']:nth-of-type(5) svg.commit-status.octicon-check", true)
+}
diff --git a/tests/integration/actions_notifications_test.go b/tests/integration/actions_notifications_test.go
new file mode 100644
index 0000000000..e47cb64b83
--- /dev/null
+++ b/tests/integration/actions_notifications_test.go
@@ -0,0 +1,88 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"fmt"
+	"net/url"
+	"testing"
+
+	actions_model "forgejo.org/models/actions"
+	auth_model "forgejo.org/models/auth"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestActionNotifications(t *testing.T) {
+	if !setting.Database.Type.IsSQLite3() {
+		t.Skip()
+	}
+
+	testCases := []struct {
+		name        string
+		treePath    string
+		fileContent string
+		notifyEmail bool
+	}{
+		{
+			name:     "enabled",
+			treePath: ".forgejo/workflows/enabled.yml",
+			fileContent: `name: enabled
+on:
+  push:
+enable-email-notifications: true
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo job1
+`,
+			notifyEmail: true,
+		},
+		{
+			name:     "disabled",
+			treePath: ".forgejo/workflows/disabled.yml",
+			fileContent: `name: disabled
+on:
+  push:
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo job1
+`,
+			notifyEmail: false,
+		},
+	}
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+
+		for _, testCase := range testCases {
+			t.Run(testCase.name, func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				apiRepo := createActionsTestRepo(t, token, testCase.name, false)
+				runner := newMockRunner()
+				runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"})
+				opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", testCase.treePath), testCase.fileContent)
+				createWorkflowFile(t, token, user2.Name, apiRepo.Name, testCase.treePath, opts)
+
+				task := runner.fetchTask(t)
+				actionTask := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: task.Id})
+				actionRunJob := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: actionTask.JobID})
+				actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: actionRunJob.RunID})
+				assert.Equal(t, testCase.notifyEmail, actionRun.NotifyEmail)
+
+				httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository)
+				doAPIDeleteRepository(httpContext)(t)
+			})
+		}
+	})
+}
diff --git a/tests/integration/actions_run_now_done_notification_test.go b/tests/integration/actions_run_now_done_notification_test.go
new file mode 100644
index 0000000000..480d67a73d
--- /dev/null
+++ b/tests/integration/actions_run_now_done_notification_test.go
@@ -0,0 +1,145 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"context"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	actions_model "forgejo.org/models/actions"
+	"forgejo.org/models/db"
+	unit_model "forgejo.org/models/unit"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/gitrepo"
+	"forgejo.org/modules/setting"
+	actions_service "forgejo.org/services/actions"
+	notify_service "forgejo.org/services/notify"
+	files_service "forgejo.org/services/repository/files"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type mockNotifier struct {
+	notify_service.NullNotifier
+	testIdx   int
+	t         *testing.T
+	runID     int64
+	lastRunID int64
+}
+
+var _ notify_service.Notifier = &mockNotifier{}
+
+func (m *mockNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) {
+	switch m.testIdx {
+	case 0:
+		// we accept the first id as okay and just check that the following ones make sense
+		m.runID = run.ID
+		assert.Equal(m.t, actions_model.StatusSuccess, run.Status)
+		assert.Equal(m.t, actions_model.StatusRunning, priorStatus)
+		assert.Nil(m.t, lastRun)
+		assert.True(m.t, run.NotifyEmail)
+	case 1:
+		assert.Equal(m.t, m.runID, run.ID)
+		assert.Equal(m.t, actions_model.StatusFailure, run.Status)
+		assert.Equal(m.t, actions_model.StatusRunning, priorStatus)
+		assert.True(m.t, run.NotifyEmail)
+	case 2:
+		assert.Equal(m.t, m.runID, run.ID)
+		assert.Equal(m.t, actions_model.StatusCancelled, run.Status)
+		assert.Equal(m.t, actions_model.StatusRunning, priorStatus)
+		assert.True(m.t, run.NotifyEmail)
+	default:
+		assert.Fail(m.t, "too many notifications")
+	}
+	m.runID++
+	m.testIdx++
+}
+
+// ensure all tests have been run
+func (m *mockNotifier) complete() {
+	assert.Equal(m.t, 3, m.testIdx)
+}
+
+func TestActionNowDoneNotification(t *testing.T) {
+	if !setting.Database.Type.IsSQLite3() {
+		t.Skip()
+	}
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		notifier := mockNotifier{t: t, testIdx: 0, lastRunID: -1, runID: -1}
+		notify_service.RegisterNotifier(&notifier)
+
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+		// create the repo
+		repo, sha, f := tests.CreateDeclarativeRepo(t, user2, "repo-workflow-dispatch",
+			[]unit_model.Type{unit_model.TypeActions}, nil,
+			[]*files_service.ChangeRepoFile{
+				{
+					Operation: "create",
+					TreePath:  ".forgejo/workflows/dispatch.yml",
+					ContentReader: strings.NewReader(
+						"name: test\n" +
+							"enable-email-notifications: true\n" +
+							"on: [workflow_dispatch]\n" +
+							"jobs:\n" +
+							"  test:\n" +
+							"    runs-on: ubuntu-latest\n" +
+							"    steps:\n" +
+							"      - run: echo helloworld\n",
+					),
+				},
+			},
+		)
+		defer f()
+
+		gitRepo, err := gitrepo.OpenRepository(db.DefaultContext, repo)
+		require.NoError(t, err)
+		defer gitRepo.Close()
+
+		workflow, err := actions_service.GetWorkflowFromCommit(gitRepo, "main", "dispatch.yml")
+		require.NoError(t, err)
+		assert.Equal(t, "refs/heads/main", workflow.Ref)
+		assert.Equal(t, sha, workflow.Commit.ID.String())
+
+		inputGetter := func(key string) string {
+			return ""
+		}
+
+		runner := newMockRunner()
+		runner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-runner", []string{"ubuntu-latest"})
+
+		// 0: first successful run
+		_, _, err = workflow.Dispatch(db.DefaultContext, inputGetter, repo, user2)
+		require.NoError(t, err)
+		task := runner.fetchTask(t)
+		runner.succeedAtTask(t, task)
+
+		// we can't differentiate different runs without a delay
+		time.Sleep(time.Millisecond * 2000)
+
+		// 1: failed run
+		_, _, err = workflow.Dispatch(db.DefaultContext, inputGetter, repo, user2)
+		require.NoError(t, err)
+		task = runner.fetchTask(t)
+		runner.failAtTask(t, task)
+
+		// we can't differentiate different runs without a delay
+		time.Sleep(time.Millisecond * 2000)
+
+		// 2: canceled run
+		_, _, err = workflow.Dispatch(db.DefaultContext, inputGetter, repo, user2)
+		require.NoError(t, err)
+		task = runner.fetchTask(t)
+		require.NoError(t, actions_service.StopTask(db.DefaultContext, task.Id, actions_model.StatusCancelled))
+
+		notifier.complete()
+	})
+}
diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go
index 93f38db9ee..859406997e 100644
--- a/tests/integration/actions_runner_test.go
+++ b/tests/integration/actions_runner_test.go
@@ -101,28 +101,26 @@ func (r *mockRunner) fetchTask(t *testing.T, timeout ...time.Duration) *runnerv1
 	if len(timeout) > 0 {
 		fetchTimeout = timeout[0]
 	}
-	ddl := time.Now().Add(fetchTimeout)
+
 	var task *runnerv1.Task
-	for time.Now().Before(ddl) {
+	assert.Eventually(t, func() bool {
 		resp, err := r.client.runnerServiceClient.FetchTask(t.Context(), connect.NewRequest(&runnerv1.FetchTaskRequest{
 			TasksVersion: 0,
 		}))
 		require.NoError(t, err)
 		if resp.Msg.Task != nil {
 			task = resp.Msg.Task
-			break
+			return true
 		}
-		time.Sleep(time.Second)
-	}
-	assert.NotNil(t, task, "failed to fetch a task")
+		return false
+	}, fetchTimeout, time.Millisecond*100, "failed to fetch a task")
 	return task
 }
 
 type mockTaskOutcome struct {
-	result   runnerv1.Result
-	outputs  map[string]string
-	logRows  []*runnerv1.LogRow
-	execTime time.Duration
+	result  runnerv1.Result
+	outputs map[string]string
+	logRows []*runnerv1.LogRow
 }
 
 func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTaskOutcome) {
@@ -149,7 +147,6 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTa
 		sentOutputKeys = append(sentOutputKeys, outputKey)
 		assert.ElementsMatch(t, sentOutputKeys, resp.Msg.SentOutputs)
 	}
-	time.Sleep(outcome.execTime)
 	resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
 		State: &runnerv1.TaskState{
 			Id:        task.Id,
@@ -160,3 +157,30 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTa
 	require.NoError(t, err)
 	assert.Equal(t, outcome.result, resp.Msg.State.Result)
 }
+
+// Simply pretend we're running the task and succeed at that.
+// We're that great!
+func (r *mockRunner) succeedAtTask(t *testing.T, task *runnerv1.Task) {
+	resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
+		State: &runnerv1.TaskState{
+			Id:        task.Id,
+			Result:    runnerv1.Result_RESULT_SUCCESS,
+			StoppedAt: timestamppb.Now(),
+		},
+	}))
+	require.NoError(t, err)
+	assert.Equal(t, runnerv1.Result_RESULT_SUCCESS, resp.Msg.State.Result)
+}
+
+// Pretend we're running the task, do nothing and fail at that.
+func (r *mockRunner) failAtTask(t *testing.T, task *runnerv1.Task) {
+	resp, err := r.client.runnerServiceClient.UpdateTask(t.Context(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
+		State: &runnerv1.TaskState{
+			Id:        task.Id,
+			Result:    runnerv1.Result_RESULT_FAILURE,
+			StoppedAt: timestamppb.Now(),
+		},
+	}))
+	require.NoError(t, err)
+	assert.Equal(t, runnerv1.Result_RESULT_FAILURE, resp.Msg.State.Result)
+}
diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go
index 2d5dd3b957..0e61e05547 100644
--- a/tests/integration/actions_trigger_test.go
+++ b/tests/integration/actions_trigger_test.go
@@ -350,6 +350,87 @@ jobs:
 	})
 }
 
+func TestPullRequestWithInvalidWorkflow(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo
+		session := loginUser(t, "user2")
+
+		// prepare the repository
+		baseRepo, _, f := tests.CreateDeclarativeRepo(t, user2, "repo-pull-request",
+			[]unit_model.Type{unit_model.TypeActions}, nil, []*files_service.ChangeRepoFile{
+				{
+					Operation: "create",
+					TreePath:  ".forgejo/workflows/broken.yml",
+					ContentReader: strings.NewReader(`name: broken
+on:
+pull_request:
+types:
+	- opened
+jobs:
+test:
+runs-on: docker
+	- run: true
+`),
+				},
+			})
+		defer f()
+		baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
+		require.NoError(t, err)
+		defer func() {
+			baseGitRepo.Close()
+		}()
+
+		// create the pull request
+		testEditFileToNewBranch(t, session, "user2", "repo-pull-request", "main", "wip-something", "README.md", "Hello, world 1")
+		testPullCreate(t, session, "user2", "repo-pull-request", true, "main", "wip-something", "Commit status PR")
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: baseRepo.ID})
+		require.NoError(t, pr.LoadIssue(t.Context()))
+
+		// check that one of the status associated with the commit sha matches both
+		// context & state
+		checkCommitStatus := func(sha, context string, state api.CommitStatusState) bool {
+			commitStatuses, _, err := git_model.GetLatestCommitStatus(t.Context(), pr.BaseRepoID, sha, db.ListOptionsAll)
+			require.NoError(t, err)
+			for _, commitStatus := range commitStatuses {
+				if state == commitStatus.State && context == commitStatus.Context {
+					return true
+				}
+			}
+			return false
+		}
+
+		var actionRuns []*actions_model.ActionRun
+
+		// wait for ActionRun(s) to be created
+		require.Eventually(t, func() bool {
+			actionRuns = make([]*actions_model.ActionRun, 0)
+			require.NoError(t, db.GetEngine(t.Context()).Where("event=? AND status=? AND repo_id=?", "pull_request", actions_model.StatusFailure, baseRepo.ID).Find(&actionRuns))
+			return len(actionRuns) == 1
+		}, 30*time.Second, 1*time.Second)
+
+		// verify the expected  ActionRuns were created
+		sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
+		require.NoError(t, err)
+
+		// verify the commit status changes to CommitStatusFailure
+		require.Eventually(t, func() bool {
+			return checkCommitStatus(sha, "broken.yml / Update README.md (pull_request)", api.CommitStatusFailure)
+		}, 30*time.Second, 1*time.Second)
+
+		require.Len(t, actionRuns, 1)
+		actionRun := actionRuns[0]
+		// verify the expected  ActionRunJob was created and is StatusFailure
+		job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: actionRun.ID, CommitSHA: sha})
+		assert.Equal(t, actions_model.StatusFailure, job.Status)
+		assert.Equal(t, "broken.yml", actionRun.WorkflowID)
+		assert.Equal(t, sha, actionRun.CommitSHA)
+		assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
+		event, err := actionRun.GetPullRequestEventPayload()
+		require.NoError(t, err)
+		assert.Equal(t, api.HookIssueOpened, event.Action)
+	})
+}
+
 func TestPullRequestTargetEvent(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo
diff --git a/tests/integration/actions_variables_test.go b/tests/integration/actions_variables_test.go
index b27d30a480..2442710ea1 100644
--- a/tests/integration/actions_variables_test.go
+++ b/tests/integration/actions_variables_test.go
@@ -64,12 +64,12 @@ func TestActionVariablesModification(t *testing.T) {
 			resp := sess.MakeRequest(t, req, http.StatusBadRequest)
 			var error errorJSON
 			DecodeJSON(t, resp, &error)
-			assert.EqualValues(t, "Failed to find the variable.", error.Error)
+			assert.Equal(t, "Failed to find the variable.", error.Error)
 		} else {
 			sess.MakeRequest(t, req, http.StatusOK)
 			flashCookie := sess.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Bvariable%2Bhas%2Bbeen%2Bedited.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Bvariable%2Bhas%2Bbeen%2Bedited.", flashCookie.Value)
 		}
 
 		req = NewRequestWithValues(t, "POST", baseURL+fmt.Sprintf("/%d/delete", id), map[string]string{
@@ -79,12 +79,12 @@ func TestActionVariablesModification(t *testing.T) {
 			resp := sess.MakeRequest(t, req, http.StatusBadRequest)
 			var error errorJSON
 			DecodeJSON(t, resp, &error)
-			assert.EqualValues(t, "Failed to find the variable.", error.Error)
+			assert.Equal(t, "Failed to find the variable.", error.Error)
 		} else {
 			sess.MakeRequest(t, req, http.StatusOK)
 			flashCookie := sess.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Bvariable%2Bhas%2Bbeen%2Bremoved.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Bvariable%2Bhas%2Bbeen%2Bremoved.", flashCookie.Value)
 		}
 	}
 
diff --git a/tests/integration/activitypub_client_test.go b/tests/integration/activitypub_client_test.go
new file mode 100644
index 0000000000..67482a7277
--- /dev/null
+++ b/tests/integration/activitypub_client_test.go
@@ -0,0 +1,55 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/url"
+	"testing"
+	"time"
+
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestActivityPubClientBodySize(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+		url := u.JoinPath("/api/v1/nodeinfo").String()
+
+		ctx, _ := contexttest.MockAPIContext(t, url)
+		clientFactory, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+
+		apClient, err := clientFactory.WithKeys(ctx, user1, user1.KeyID())
+		require.NoError(t, err)
+
+		// Request with normal MaxSize
+		t.Run("NormalMaxSize", func(t *testing.T) {
+			resp, err := apClient.GetBody(url)
+			require.NoError(t, err)
+			assert.Contains(t, string(resp), "forgejo")
+		})
+
+		// Set MaxSize to something very low to always fail
+		// Request with low MaxSize
+		t.Run("LowMaxSize", func(t *testing.T) {
+			defer test.MockVariableValue(&setting.Federation.MaxSize, 100)()
+
+			_, err = apClient.GetBody(url)
+			require.Error(t, err)
+			assert.ErrorContains(t, err, "Request returned")
+		})
+	})
+}
diff --git a/tests/integration/admin_auth_source_test.go b/tests/integration/admin_auth_source_test.go
new file mode 100644
index 0000000000..4b46541318
--- /dev/null
+++ b/tests/integration/admin_auth_source_test.go
@@ -0,0 +1,32 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later.
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	"forgejo.org/models/auth"
+	"forgejo.org/tests"
+)
+
+func TestAdminAuthAllowUsernameChangeSetting(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user1")
+
+	source := addAuthSource(t, map[string]string{
+		"type":                  fmt.Sprintf("%d", auth.OAuth2),
+		"name":                  "some-name",
+		"is_active":             "on",
+		"allow_username_change": "on",
+		"oauth2_provider":       "gitlab",
+	})
+
+	response := session.MakeRequest(t, NewRequestf(t, "GET", "/admin/auths/%d", source.ID), http.StatusOK)
+	htmlDoc := NewHTMLParser(t, response.Body)
+
+	htmlDoc.AssertElement(t, "#allow_username_change[checked]", true)
+}
diff --git a/tests/integration/admin_moderation_test.go b/tests/integration/admin_moderation_test.go
new file mode 100644
index 0000000000..de0daebe86
--- /dev/null
+++ b/tests/integration/admin_moderation_test.go
@@ -0,0 +1,158 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func testReportDetails(t *testing.T, htmlDoc *HTMLDoc, reportID, contentIcon, contentRef, contentURL, category, reportsNo string) {
+	// Check icon octicon
+	icon := htmlDoc.Find("#report-" + reportID + " svg." + contentIcon)
+	assert.Equal(t, 1, icon.Length())
+
+	// Check content reference and URL
+	title := htmlDoc.Find("#report-" + reportID + " .flex-item-main .flex-item-title a")
+	if len(contentURL) == 0 {
+		// No URL means that the content was already deleted, so we should not find the anchor element.
+		assert.Zero(t, title.Length())
+		// Instead we should find an emphasis element.
+		title = htmlDoc.Find("#report-" + reportID + " .flex-item-main .flex-item-title em")
+		assert.Equal(t, 1, title.Length())
+		assert.Equal(t, contentRef, title.Text())
+	} else {
+		assert.Equal(t, 1, title.Length())
+		assert.Equal(t, contentRef, title.Text())
+
+		href, exists := title.Attr("href")
+		assert.True(t, exists)
+		assert.Equal(t, contentURL, href)
+	}
+
+	// Check category
+	cat := htmlDoc.Find("#report-" + reportID + " .flex-item-main .flex-items-inline .item:nth-child(3)")
+	assert.Equal(t, 1, cat.Length())
+	assert.Equal(t, category, strings.TrimSpace(cat.Text()))
+
+	// Check number of reports for the same content
+	count := htmlDoc.Find("#report-" + reportID + " a span")
+	assert.Equal(t, 1, count.Length())
+	assert.Equal(t, reportsNo, count.Text())
+}
+
+func TestAdminModerationViewReports(t *testing.T) {
+	defer unittest.OverrideFixtures("tests/integration/fixtures/TestAdminModerationViewReports")()
+	defer tests.PrepareTestEnv(t)()
+
+	t.Run("Moderation enabled", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.Moderation.Enabled, true)()
+		defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+		t.Run("Anonymous user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			MakeRequest(t, req, http.StatusSeeOther)
+			req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+			MakeRequest(t, req, http.StatusSeeOther)
+		})
+
+		t.Run("Normal user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, "user2")
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			session.MakeRequest(t, req, http.StatusForbidden)
+			req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+			session.MakeRequest(t, req, http.StatusForbidden)
+		})
+
+		t.Run("Admin user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, "user1")
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			resp := session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+
+			// Check how many reports are being displayed.
+			// Reports linked to the same content (type and id) should be grouped; therefore we should see only 6 instead of 9.
+			reports := htmlDoc.Find(".admin-setting-content .flex-list .flex-item.report")
+			assert.Equal(t, 7, reports.Length())
+
+			// Check details for shown reports.
+			testReportDetails(t, htmlDoc, "1", "octicon-person", "@SPAM-services", "/SPAM-services", "Illegal content", "1")
+			testReportDetails(t, htmlDoc, "2", "octicon-repo", "SPAM-services/spammer-Tools", "/SPAM-services/spammer-Tools", "Illegal content", "1")
+			testReportDetails(t, htmlDoc, "3", "octicon-issue-opened", "SPAM-services/spammer-Tools#1", "/SPAM-services/spammer-Tools/issues/1", "Spam", "1")
+			// #4 is combined with #7 and #9
+			testReportDetails(t, htmlDoc, "4", "octicon-person", "@spammer01", "/spammer01", "Spam", "3")
+			// #5 is combined with #6
+			testReportDetails(t, htmlDoc, "5", "octicon-comment", "contributor/first/issues/1#issuecomment-1001", "/contributor/first/issues/1#issuecomment-1001", "Malware", "2")
+			testReportDetails(t, htmlDoc, "8", "octicon-issue-opened", "contributor/first#1", "/contributor/first/issues/1", "Other violations of platform rules", "1")
+			// #10 is for a Ghost user
+			testReportDetails(t, htmlDoc, "10", "octicon-person", "Reported content with type 1 and id 9999 no longer exists", "", "Other violations of platform rules", "1")
+
+			t.Run("reports details page", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+				resp = session.MakeRequest(t, req, http.StatusOK)
+				htmlDoc = NewHTMLParser(t, resp.Body)
+
+				// Check the title (content reference) and corresponding URL
+				title := htmlDoc.Find(".admin-setting-content .flex-item-main .flex-item-title a")
+				assert.Equal(t, 1, title.Length())
+				assert.Equal(t, "spammer01", title.Text())
+				href, exists := title.Attr("href")
+				assert.True(t, exists)
+				assert.Equal(t, "/spammer01", href)
+
+				// Check how many reports are being displayed for user 1002.
+				reports = htmlDoc.Find(".admin-setting-content .flex-list .flex-item")
+				assert.Equal(t, 3, reports.Length())
+			})
+		})
+	})
+
+	t.Run("Moderation disabled", func(t *testing.T) {
+		t.Run("Anonymous user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			MakeRequest(t, req, http.StatusNotFound)
+			req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+			MakeRequest(t, req, http.StatusNotFound)
+		})
+
+		t.Run("Normal user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, "user2")
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			session.MakeRequest(t, req, http.StatusNotFound)
+			req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+			session.MakeRequest(t, req, http.StatusNotFound)
+		})
+
+		t.Run("Admin user", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			session := loginUser(t, "user1")
+			req := NewRequest(t, "GET", "/admin/moderation/reports")
+			session.MakeRequest(t, req, http.StatusNotFound)
+			req = NewRequest(t, "GET", "/admin/moderation/reports/type/1/id/1002")
+			session.MakeRequest(t, req, http.StatusNotFound)
+		})
+	})
+}
diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go
index b7a9deb522..f460cf22f5 100644
--- a/tests/integration/admin_user_test.go
+++ b/tests/integration/admin_user_test.go
@@ -38,7 +38,7 @@ func TestAdminViewUsers(t *testing.T) {
 
 		// 6th column is the 2FA column.
 		// One user that has TOTP and another user that has WebAuthn.
-		assert.EqualValues(t, 2, htmlDoc.Find(".admin-setting-content table tbody tr td:nth-child(6) .octicon-check").Length())
+		assert.Equal(t, 2, htmlDoc.Find(".admin-setting-content table tbody tr td:nth-child(6) .octicon-check").Length())
 	})
 
 	t.Run("Normal user", func(t *testing.T) {
diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go
index dc2b86d28b..1526ae3585 100644
--- a/tests/integration/api_actions_artifact_test.go
+++ b/tests/integration/api_actions_artifact_test.go
@@ -56,7 +56,7 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) {
 		SetHeader("x-actions-results-md5", "XVlf820rMInUi64wmMi6EA==") // base64(md5(body))
 	MakeRequest(t, req, http.StatusOK)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	// confirm artifact upload
 	req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-single").
@@ -206,7 +206,7 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) {
 		MakeRequest(t, req, http.StatusOK)
 	}
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	// confirm artifact upload
 	req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName="+testArtifactName).
@@ -297,7 +297,7 @@ func TestActionsArtifactUploadWithRetentionDays(t *testing.T) {
 		SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body))
 	MakeRequest(t, req, http.StatusOK)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	// confirm artifact upload
 	req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-retention-days").
@@ -316,8 +316,10 @@ func TestActionsArtifactOverwrite(t *testing.T) {
 		var listResp listArtifactsResponse
 		DecodeJSON(t, resp, &listResp)
 
+		const itemName = "artifact-download"
+		assert.Equal(t, itemName, listResp.Value[0].Name)
 		idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/")
-		url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download"
+		url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=" + itemName
 		req = NewRequest(t, "GET", url).
 			AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
 		resp = MakeRequest(t, req, http.StatusOK)
diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go
index 9fa7590620..af0dcb98a9 100644
--- a/tests/integration/api_actions_artifact_v4_test.go
+++ b/tests/integration/api_actions_artifact_v4_test.go
@@ -59,7 +59,7 @@ func uploadArtifact(t *testing.T, body string) string {
 	req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body))
 	MakeRequest(t, req, http.StatusCreated)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	sha := sha256.Sum256([]byte(body))
 
@@ -113,7 +113,7 @@ func TestActionsArtifactV4UploadSingleFileWrongChecksum(t *testing.T) {
 	req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body))
 	MakeRequest(t, req, http.StatusCreated)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	sha := sha256.Sum256([]byte(strings.Repeat("A", 1024)))
 
@@ -158,7 +158,7 @@ func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) {
 	req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body))
 	MakeRequest(t, req, http.StatusCreated)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	sha := sha256.Sum256([]byte(body))
 
@@ -221,7 +221,7 @@ func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing
 	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
 	MakeRequest(t, req, http.StatusCreated)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	sha := sha256.Sum256([]byte(body))
 
@@ -286,7 +286,7 @@ func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) {
 	req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList))
 	MakeRequest(t, req, http.StatusCreated)
 
-	t.Logf("Create artifact confirm")
+	t.Log("Create artifact confirm")
 
 	sha := sha256.Sum256([]byte(bodya + bodyb))
 
diff --git a/tests/integration/api_activitypub_actor_test.go b/tests/integration/api_activitypub_actor_test.go
index 778a34d785..42232bd640 100644
--- a/tests/integration/api_activitypub_actor_test.go
+++ b/tests/integration/api_activitypub_actor_test.go
@@ -4,12 +4,18 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
+	"net/url"
+	"strconv"
 	"testing"
 
+	"forgejo.org/modules/forgefed"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
+	"forgejo.org/services/federation"
 	"forgejo.org/tests"
 
 	ap "github.com/go-ap/activitypub"
@@ -31,10 +37,9 @@ func TestActivityPubActor(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, ap.ApplicationType, actor.Type)
-	assert.Equal(t, setting.Domain, actor.PreferredUsername.String())
+	assert.Equal(t, "ghost", actor.PreferredUsername.String())
 	keyID := actor.GetID().String()
 	assert.Regexp(t, "activitypub/actor$", keyID)
-	assert.Regexp(t, "activitypub/actor/outbox$", actor.Outbox.GetID().String())
 	assert.Regexp(t, "activitypub/actor/inbox$", actor.Inbox.GetID().String())
 
 	pubKey := actor.PublicKey
@@ -46,3 +51,27 @@ func TestActivityPubActor(t *testing.T) {
 	assert.NotNil(t, pubKeyPem)
 	assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem)
 }
+
+func TestActorNewFromKeyId(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		ctx, _ := contexttest.MockAPIContext(t, "/api/v1/activitypub/actor")
+		sut, err := federation.NewActorIDFromKeyID(ctx.Base, fmt.Sprintf("%sapi/v1/activitypub/actor#main-key", u))
+		require.NoError(t, err)
+
+		port, err := strconv.ParseUint(u.Port(), 10, 16)
+		require.NoError(t, err)
+
+		assert.Equal(t, forgefed.ActorID{
+			ID:                 "actor",
+			HostSchema:         "http",
+			Path:               "api/v1/activitypub",
+			Host:               setting.Domain,
+			HostPort:           uint16(port),
+			UnvalidatedInput:   fmt.Sprintf("http://%s:%d/api/v1/activitypub/actor", setting.Domain, port),
+			IsPortSupplemented: false,
+		}, sut)
+	})
+}
diff --git a/tests/integration/api_activitypub_person_inbox_follow_test.go b/tests/integration/api_activitypub_person_inbox_follow_test.go
new file mode 100644
index 0000000000..f171b8951f
--- /dev/null
+++ b/tests/integration/api_activitypub_person_inbox_follow_test.go
@@ -0,0 +1,105 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+	"time"
+
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
+	"forgejo.org/services/federation"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// Flow of this test is documented at: https://codeberg.org/forgejo-contrib/federation/src/branch/main/doc/user-activity-following.md
+func TestActivityPubPersonInboxFollow(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	federation.Init()
+
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
+
+	onGiteaRun(t, func(t *testing.T, localUrl *url.URL) {
+		defer test.MockVariableValue(&setting.AppURL, localUrl.String())()
+
+		distantURL := federatedSrv.URL
+		distantUser15URL := fmt.Sprintf("%s/api/v1/activitypub/user-id/15", distantURL)
+
+		localUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		localUser2URL := localUrl.JoinPath("/api/v1/activitypub/user-id/2").String()
+		localUser2Inbox := localUrl.JoinPath("/api/v1/activitypub/user-id/2/inbox").String()
+
+		ctx, _ := contexttest.MockAPIContext(t, localUser2Inbox)
+
+		// distant follows local
+		followActivity := []byte(fmt.Sprintf(
+			`{"type":"Follow",`+
+				`"actor":"%s",`+
+				`"object":"%s"}`,
+			distantUser15URL,
+			localUser2URL,
+		))
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+		c, err := cf.WithKeysDirect(ctx, mock.ApActor.PrivKey,
+			mock.ApActor.KeyID(federatedSrv.URL))
+		require.NoError(t, err)
+		resp, err := c.Post(followActivity, localUser2Inbox)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusAccepted, resp.StatusCode)
+
+		// local follow exists
+		distantFederatedUser := unittest.AssertExistsAndLoadBean(t, &user_model.FederatedUser{ExternalID: "15"})
+		unittest.AssertExistsAndLoadBean(t,
+			&user_model.FederatedUserFollower{
+				FollowedUserID:  localUser.ID,
+				FollowingUserID: distantFederatedUser.UserID,
+			},
+		)
+
+		// distant is informed about accepting follow
+		assert.Contains(t, mock.LastPost, "\"type\":\"Accept\"")
+
+		// distant undoes follow
+		undoFollowActivity := []byte(fmt.Sprintf(
+			`{"type":"Undo",`+
+				`"actor":"%s",`+
+				`"object":{"type":"Follow",`+
+				`"actor":"%s",`+
+				`"object":"%s"}}`,
+			distantUser15URL,
+			distantUser15URL,
+			localUser2URL,
+		))
+		c, err = cf.WithKeysDirect(ctx, mock.ApActor.PrivKey,
+			mock.ApActor.KeyID(federatedSrv.URL))
+		require.NoError(t, err)
+		resp, err = c.Post(undoFollowActivity, localUser2Inbox)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusNoContent, resp.StatusCode)
+
+		// local follow removed
+		unittest.AssertNotExistsBean(t,
+			&user_model.FederatedUserFollower{
+				FollowedUserID:  localUser.ID,
+				FollowingUserID: distantFederatedUser.UserID,
+			},
+		)
+	})
+}
diff --git a/tests/integration/api_activitypub_person_inbox_useractivity_test.go b/tests/integration/api_activitypub_person_inbox_useractivity_test.go
new file mode 100644
index 0000000000..39f08f4d9c
--- /dev/null
+++ b/tests/integration/api_activitypub_person_inbox_useractivity_test.go
@@ -0,0 +1,100 @@
+// Copyright 2022, 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+	"time"
+
+	auth_model "forgejo.org/models/auth"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
+	"forgejo.org/services/federation"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestActivityPubPersonInboxNoteToDistant(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	federation.Init()
+
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
+
+	onGiteaRun(t, func(t *testing.T, localUrl *url.URL) {
+		defer test.MockVariableValue(&setting.AppURL, localUrl.String())()
+
+		distantURL := federatedSrv.URL
+		distantUser15URL := fmt.Sprintf("%s/api/v1/activitypub/user-id/15", distantURL)
+
+		localUser2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		localUser2URL := localUrl.JoinPath("/api/v1/activitypub/user-id/2").String()
+		localUser2Inbox := fmt.Sprintf("%v/inbox", localUser2URL)
+		localSession2 := loginUser(t, localUser2.LoginName)
+		localSecssion2Token := getTokenForLoggedInUser(t, localSession2, auth_model.AccessTokenScopeWriteIssue)
+
+		repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, localUser2, tests.DeclarativeRepoOptions{})
+		defer f()
+
+		// follow (distant follows local)
+		followActivity := []byte(fmt.Sprintf(
+			`{"type":"Follow",`+
+				`"actor":"%s",`+
+				`"object":"%s"}`,
+			distantUser15URL,
+			localUser2URL,
+		))
+		ctx, _ := contexttest.MockAPIContext(t, localUser2Inbox)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+		c, err := cf.WithKeysDirect(ctx, mock.ApActor.PrivKey,
+			mock.ApActor.KeyID(federatedSrv.URL))
+		require.NoError(t, err)
+		resp, err := c.Post(followActivity, localUser2Inbox)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusAccepted, resp.StatusCode)
+
+		// local action which triggers a user activity
+		IssueURL := fmt.Sprintf("/api/v1/repos/%s/issues?state=all", repo.FullName())
+		req := NewRequestWithJSON(t, "POST", IssueURL, &structs.CreateIssueOption{
+			Title: "ActivityFeed test",
+			Body:  "Nothing to see here!",
+		}).AddTokenAuth(localSecssion2Token)
+		MakeRequest(t, req, http.StatusCreated)
+
+		// distant request outbox
+		localUser2Outbox := fmt.Sprintf("%v/outbox", localUser2URL)
+		resp, err = c.Get(localUser2Outbox)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+
+		// distant request activity & activity note
+		localUser2ActivityNote := fmt.Sprintf("%v/activities/1", localUser2URL)
+		localUser2Activity := fmt.Sprintf("%v/activities/1/activity", localUser2URL)
+		resp, err = c.Get(localUser2ActivityNote)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		resp, err = c.Get(localUser2Activity)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+
+		// check for activity on distant inbox
+		assert.Contains(t, mock.LastPost, "user2</a> opened issue")
+	})
+}
diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go
index d8492942e5..bd21c13612 100644
--- a/tests/integration/api_activitypub_person_test.go
+++ b/tests/integration/api_activitypub_person_test.go
@@ -8,14 +8,15 @@ import (
 	"net/http"
 	"net/url"
 	"testing"
+	"time"
 
-	"forgejo.org/models/db"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/activitypub"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
 	"forgejo.org/tests"
 
 	ap "github.com/go-ap/activitypub"
@@ -26,39 +27,59 @@ import (
 func TestActivityPubPerson(t *testing.T) {
 	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
 	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
-	defer tests.PrepareTestEnv(t)()
 
-	userID := 2
-	username := "user2"
-	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/user-id/%v", userID))
-	resp := MakeRequest(t, req, http.StatusOK)
-	assert.Contains(t, resp.Body.String(), "@context")
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
 
-	var person ap.Person
-	err := person.UnmarshalJSON(resp.Body.Bytes())
-	require.NoError(t, err)
+	onGiteaRun(t, func(t *testing.T, localUrl *url.URL) {
+		defer test.MockVariableValue(&setting.AppURL, localUrl.String())()
 
-	assert.Equal(t, ap.PersonType, person.Type)
-	assert.Equal(t, username, person.PreferredUsername.String())
-	keyID := person.GetID().String()
-	assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v$", userID), keyID)
-	assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/outbox$", userID), person.Outbox.GetID().String())
-	assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/inbox$", userID), person.Inbox.GetID().String())
+		localUserID := 2
+		localUserName := "user2"
+		localUserURL := fmt.Sprintf("%sapi/v1/activitypub/user-id/%d", localUrl, localUserID)
 
-	pubKey := person.PublicKey
-	assert.NotNil(t, pubKey)
-	publicKeyID := keyID + "#main-key"
-	assert.Equal(t, pubKey.ID.String(), publicKeyID)
+		// Unsigned request
+		t.Run("UnsignedRequest", func(t *testing.T) {
+			req := NewRequest(t, "GET", localUserURL)
+			MakeRequest(t, req, http.StatusBadRequest)
+		})
 
-	pubKeyPem := pubKey.PublicKeyPem
-	assert.NotNil(t, pubKeyPem)
-	assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem)
+		// Signed request
+		t.Run("SignedRequestValidation", func(t *testing.T) {
+			ctx, _ := contexttest.MockAPIContext(t, localUserURL)
+			cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+			require.NoError(t, err)
+
+			c, err := cf.WithKeysDirect(ctx, mock.Persons[0].PrivKey,
+				mock.Persons[0].KeyID(federatedSrv.URL))
+			require.NoError(t, err)
+
+			resp, err := c.GetBody(localUserURL)
+			require.NoError(t, err)
+
+			var person ap.Person
+			err = person.UnmarshalJSON(resp)
+			require.NoError(t, err)
+
+			assert.Equal(t, ap.PersonType, person.Type)
+			assert.Equal(t, localUserName, person.PreferredUsername.String())
+			assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d$", localUserID), person.GetID())
+			assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d/inbox$", localUserID), person.Inbox.GetID().String())
+
+			assert.NotNil(t, person.PublicKey)
+			assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d#main-key$", localUserID), person.PublicKey.ID)
+
+			assert.NotNil(t, person.PublicKey.PublicKeyPem)
+			assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", person.PublicKey.PublicKeyPem)
+		})
+	})
 }
 
 func TestActivityPubMissingPerson(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
 	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
 	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
-	defer tests.PrepareTestEnv(t)()
 
 	req := NewRequest(t, "GET", "/api/v1/activitypub/user-id/999999999")
 	resp := MakeRequest(t, req, http.StatusNotFound)
@@ -74,19 +95,43 @@ func TestActivityPubPersonInbox(t *testing.T) {
 		user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 
 		user1url := u.JoinPath("/api/v1/activitypub/user-id/1").String() + "#main-key"
-		cf, err := activitypub.GetClientFactory(db.DefaultContext)
-		require.NoError(t, err)
-		c, err := cf.WithKeys(db.DefaultContext, user1, user1url)
-		require.NoError(t, err)
 		user2inboxurl := u.JoinPath("/api/v1/activitypub/user-id/2/inbox").String()
+		ctx, _ := contexttest.MockAPIContext(t, user2inboxurl)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+		c, err := cf.WithKeys(ctx, user1, user1url)
+		require.NoError(t, err)
 
-		// Signed request succeeds
+		// invalid request is rejected
 		resp, err := c.Post([]byte{}, user2inboxurl)
 		require.NoError(t, err)
-		assert.Equal(t, http.StatusNoContent, resp.StatusCode)
-
-		// Unsigned request fails
-		req := NewRequest(t, "POST", user2inboxurl)
-		MakeRequest(t, req, http.StatusBadRequest)
+		assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode)
+	})
+}
+
+func TestActivityPubPersonOutbox(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.AppURL, u.String())()
+		user2outboxurl := u.JoinPath("/api/v1/activitypub/user-id/2/outbox").String()
+
+		ctx, _ := contexttest.MockAPIContext(t, user2outboxurl)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+
+		c, err := cf.WithKeysDirect(ctx, mock.Persons[0].PrivKey,
+			mock.Persons[0].KeyID(federatedSrv.URL))
+		require.NoError(t, err)
+
+		// request outbox
+		resp, err := c.Get(user2outboxurl)
+		require.NoError(t, err)
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
 	})
 }
diff --git a/tests/integration/api_activitypub_repository_test.go b/tests/integration/api_activitypub_repository_test.go
index 29fbe6d781..b4be0407b9 100644
--- a/tests/integration/api_activitypub_repository_test.go
+++ b/tests/integration/api_activitypub_repository_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"forgejo.org/models/db"
 	"forgejo.org/models/forgefed"
 	"forgejo.org/models/unittest"
 	"forgejo.org/models/user"
@@ -19,7 +18,7 @@ import (
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
 	"forgejo.org/routers"
-	"forgejo.org/tests"
+	"forgejo.org/services/contexttest"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -28,27 +27,43 @@ import (
 func TestActivityPubRepository(t *testing.T) {
 	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
 	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
-	defer tests.PrepareTestEnv(t)()
 
-	repositoryID := 2
-	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", repositoryID))
-	resp := MakeRequest(t, req, http.StatusOK)
-	assert.Contains(t, resp.Body.String(), "@context")
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
 
-	var repository forgefed_modules.Repository
-	err := repository.UnmarshalJSON(resp.Body.Bytes())
-	require.NoError(t, err)
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		repositoryID := 2
 
-	assert.Regexp(t, fmt.Sprintf("activitypub/repository-id/%v$", repositoryID), repository.GetID().String())
+		localRepository := fmt.Sprintf("%sapi/v1/activitypub/repository-id/%d", u, repositoryID)
+
+		ctx, _ := contexttest.MockAPIContext(t, localRepository)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+
+		c, err := cf.WithKeysDirect(ctx, mock.Persons[0].PrivKey,
+			mock.Persons[0].KeyID(federatedSrv.URL))
+		require.NoError(t, err)
+
+		resp, err := c.GetBody(localRepository)
+		require.NoError(t, err)
+		assert.Contains(t, string(resp), "@context")
+
+		var repository forgefed_modules.Repository
+		err = repository.UnmarshalJSON(resp)
+		require.NoError(t, err)
+
+		assert.Regexp(t, fmt.Sprintf("activitypub/repository-id/%d$", repositoryID), repository.GetID().String())
+	})
 }
 
 func TestActivityPubMissingRepository(t *testing.T) {
 	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)()
 	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
-	defer tests.PrepareTestEnv(t)()
 
 	repositoryID := 9999999
-	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", repositoryID))
+	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID))
 	resp := MakeRequest(t, req, http.StatusNotFound)
 	assert.Contains(t, resp.Body.String(), "repository does not exist")
 }
@@ -62,15 +77,17 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
 	defer federatedSrv.Close()
 
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		actionsUser := user.NewActionsUser()
 		repositoryID := 2
 		timeNow := time.Now().UTC()
+		localRepoInbox := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String()
 
-		cf, err := activitypub.GetClientFactory(db.DefaultContext)
+		ctx, _ := contexttest.MockAPIContext(t, localRepoInbox)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
 		require.NoError(t, err)
-		c, err := cf.WithKeys(db.DefaultContext, actionsUser, "not used")
+
+		c, err := cf.WithKeysDirect(ctx, mock.Persons[0].PrivKey,
+			mock.Persons[0].KeyID(federatedSrv.URL))
 		require.NoError(t, err)
-		repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String()
 
 		activity1 := []byte(fmt.Sprintf(
 			`{"type":"Like",`+
@@ -80,7 +97,7 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
 			timeNow.Format(time.RFC3339),
 			federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)).String()))
 		t.Logf("activity: %s", activity1)
-		resp, err := c.Post(activity1, repoInboxURL)
+		resp, err := c.Post(activity1, localRepoInbox)
 
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusNoContent, resp.StatusCode)
@@ -99,7 +116,7 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
 			timeNow.Add(time.Second).Format(time.RFC3339),
 			federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)).String()))
 		t.Logf("activity: %s", activity2)
-		resp, err = c.Post(activity2, repoInboxURL)
+		resp, err = c.Post(activity2, localRepoInbox)
 
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusNoContent, resp.StatusCode)
@@ -128,7 +145,7 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
 		unittest.AssertExistsAndLoadBean(t, &user.User{ID: federatedUser.UserID})
 
 		// Replay activity2.
-		resp, err = c.Post(activity2, repoInboxURL)
+		resp, err = c.Post(activity2, localRepoInbox)
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode)
 	})
@@ -136,19 +153,23 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
 
 func TestActivityPubRepositoryInboxInvalid(t *testing.T) {
 	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)()
 	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
 
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		actionsUser := user.NewActionsUser()
+		apServerActor := user.NewAPServerActor()
 		repositoryID := 2
-		cf, err := activitypub.GetClientFactory(db.DefaultContext)
-		require.NoError(t, err)
-		c, err := cf.WithKeys(db.DefaultContext, actionsUser, "not used")
+		localRepo2Inbox := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String()
+
+		ctx, _ := contexttest.MockAPIContext(t, localRepo2Inbox)
+		cf, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+
+		c, err := cf.WithKeys(ctx, apServerActor, apServerActor.KeyID())
 		require.NoError(t, err)
 
-		repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%v/inbox", repositoryID)).String()
 		activity := []byte(`{"type":"Wrong"}`)
-		resp, err := c.Post(activity, repoInboxURL)
+		resp, err := c.Post(activity, localRepo2Inbox)
 		require.NoError(t, err)
 		assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode)
 	})
diff --git a/tests/integration/api_admin_actions_test.go b/tests/integration/api_admin_actions_test.go
index 763c35544a..8e87d98ef0 100644
--- a/tests/integration/api_admin_actions_test.go
+++ b/tests/integration/api_admin_actions_test.go
@@ -35,5 +35,5 @@ func TestAPISearchActionJobs_GlobalRunner(t *testing.T) {
 	DecodeJSON(t, res, &jobs)
 
 	assert.Len(t, jobs, 1)
-	assert.EqualValues(t, job.ID, jobs[0].ID)
+	assert.Equal(t, job.ID, jobs[0].ID)
 }
diff --git a/tests/integration/api_admin_test.go b/tests/integration/api_admin_test.go
index c5f8906bfc..9351dd9c20 100644
--- a/tests/integration/api_admin_test.go
+++ b/tests/integration/api_admin_test.go
@@ -211,7 +211,7 @@ func TestAPIEditUser(t *testing.T) {
 
 	errMap := make(map[string]any)
 	json.Unmarshal(resp.Body.Bytes(), &errMap)
-	assert.EqualValues(t, "e-mail invalid [email: ]", errMap["message"].(string))
+	assert.Equal(t, "e-mail invalid [email: ]", errMap["message"].(string))
 
 	user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{LoginName: "user2"})
 	assert.False(t, user2.IsRestricted)
@@ -333,11 +333,11 @@ func TestAPICron(t *testing.T) {
 			AddTokenAuth(token)
 		resp := MakeRequest(t, req, http.StatusOK)
 
-		assert.Equal(t, "28", resp.Header().Get("X-Total-Count"))
+		assert.Equal(t, "29", resp.Header().Get("X-Total-Count"))
 
 		var crons []api.Cron
 		DecodeJSON(t, resp, &crons)
-		assert.Len(t, crons, 28)
+		assert.Len(t, crons, 29)
 	})
 
 	t.Run("Execute", func(t *testing.T) {
diff --git a/tests/integration/api_block_test.go b/tests/integration/api_block_test.go
index 8b25ce9283..0e2cf7ee25 100644
--- a/tests/integration/api_block_test.go
+++ b/tests/integration/api_block_test.go
@@ -4,8 +4,10 @@
 package integration
 
 import (
+	"cmp"
 	"fmt"
 	"net/http"
+	"slices"
 	"testing"
 
 	auth_model "forgejo.org/models/auth"
@@ -46,6 +48,7 @@ func TestAPIUserBlock(t *testing.T) {
 		var blockedUsers []api.BlockedUser
 		DecodeJSON(t, resp, &blockedUsers)
 		assert.Len(t, blockedUsers, 2)
+		slices.SortFunc(blockedUsers, func(a, b api.BlockedUser) int { return cmp.Compare(a.BlockID, b.BlockID) })
 		assert.EqualValues(t, 1, blockedUsers[0].BlockID)
 		assert.EqualValues(t, 2, blockedUsers[1].BlockID)
 	})
diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go
index df6b7022cd..d8800217d3 100644
--- a/tests/integration/api_branch_test.go
+++ b/tests/integration/api_branch_test.go
@@ -25,13 +25,13 @@ func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
 		AddTokenAuth(token)
 	resp := MakeRequest(t, req, NoExpectedStatus)
 	if !exists {
-		assert.EqualValues(t, http.StatusNotFound, resp.Code)
+		assert.Equal(t, http.StatusNotFound, resp.Code)
 		return
 	}
-	assert.EqualValues(t, http.StatusOK, resp.Code)
+	assert.Equal(t, http.StatusOK, resp.Code)
 	var branch api.Branch
 	DecodeJSON(t, resp, &branch)
-	assert.EqualValues(t, branchName, branch.Name)
+	assert.Equal(t, branchName, branch.Name)
 	assert.True(t, branch.UserCanPush)
 	assert.True(t, branch.UserCanMerge)
 }
@@ -45,7 +45,7 @@ func testAPIGetBranchProtection(t *testing.T, branchName string, expectedHTTPSta
 	if resp.Code == http.StatusOK {
 		var branchProtection api.BranchProtection
 		DecodeJSON(t, resp, &branchProtection)
-		assert.EqualValues(t, branchName, branchProtection.RuleName)
+		assert.Equal(t, branchName, branchProtection.RuleName)
 		return &branchProtection
 	}
 	return nil
@@ -61,7 +61,7 @@ func testAPICreateBranchProtection(t *testing.T, branchName string, expectedHTTP
 	if resp.Code == http.StatusCreated {
 		var branchProtection api.BranchProtection
 		DecodeJSON(t, resp, &branchProtection)
-		assert.EqualValues(t, branchName, branchProtection.RuleName)
+		assert.Equal(t, branchName, branchProtection.RuleName)
 	}
 }
 
@@ -74,7 +74,7 @@ func testAPIEditBranchProtection(t *testing.T, branchName string, body *api.Bran
 	if resp.Code == http.StatusOK {
 		var branchProtection api.BranchProtection
 		DecodeJSON(t, resp, &branchProtection)
-		assert.EqualValues(t, branchName, branchProtection.RuleName)
+		assert.Equal(t, branchName, branchProtection.RuleName)
 	}
 }
 
@@ -116,7 +116,7 @@ func testAPICreateBranches(t *testing.T, giteaURL *url.URL) {
 		ctx := NewAPITestContext(t, "user2", "my-noo-repo-"+objectFormat.Name(), auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
 		giteaURL.Path = ctx.GitPath()
 
-		t.Run("CreateRepo", doAPICreateRepository(ctx, false, objectFormat))
+		t.Run("CreateRepo", doAPICreateRepository(ctx, nil, objectFormat))
 		testCases := []struct {
 			OldBranch          string
 			NewBranch          string
@@ -182,7 +182,7 @@ func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBran
 	DecodeJSON(t, resp, &branch)
 
 	if resp.Result().StatusCode == http.StatusCreated {
-		assert.EqualValues(t, newBranch, branch.Name)
+		assert.Equal(t, newBranch, branch.Name)
 	}
 
 	return resp.Result().StatusCode == status
diff --git a/tests/integration/api_comment_test.go b/tests/integration/api_comment_test.go
index fd0cadbb1a..810b5b9727 100644
--- a/tests/integration/api_comment_test.go
+++ b/tests/integration/api_comment_test.go
@@ -115,7 +115,7 @@ func TestAPICreateComment(t *testing.T) {
 
 	var updatedComment api.Comment
 	DecodeJSON(t, resp, &updatedComment)
-	assert.EqualValues(t, commentBody, updatedComment.Body)
+	assert.Equal(t, commentBody, updatedComment.Body)
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: updatedComment.ID, IssueID: issue.ID, Content: commentBody})
 
 	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/comments",
@@ -373,8 +373,8 @@ func TestAPIEditComment(t *testing.T) {
 
 	var updatedComment api.Comment
 	DecodeJSON(t, resp, &updatedComment)
-	assert.EqualValues(t, comment.ID, updatedComment.ID)
-	assert.EqualValues(t, newCommentBody, updatedComment.Body)
+	assert.Equal(t, comment.ID, updatedComment.ID)
+	assert.Equal(t, newCommentBody, updatedComment.Body)
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: comment.ID, IssueID: issue.ID, Content: newCommentBody})
 }
 
diff --git a/tests/integration/api_federation_httpsig_test.go b/tests/integration/api_federation_httpsig_test.go
new file mode 100644
index 0000000000..f5c4c78648
--- /dev/null
+++ b/tests/integration/api_federation_httpsig_test.go
@@ -0,0 +1,85 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+	"time"
+
+	"forgejo.org/models/db"
+	"forgejo.org/models/forgefed"
+	"forgejo.org/models/unittest"
+	"forgejo.org/models/user"
+	"forgejo.org/modules/activitypub"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+	"forgejo.org/services/contexttest"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestFederationHttpSigValidation(t *testing.T) {
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+	defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())()
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		userID := 2
+		userURL := fmt.Sprintf("%sapi/v1/activitypub/user-id/%d", u, userID)
+
+		user1 := unittest.AssertExistsAndLoadBean(t, &user.User{ID: 1})
+
+		ctx, _ := contexttest.MockAPIContext(t, userURL)
+		clientFactory, err := activitypub.NewClientFactoryWithTimeout(60 * time.Second)
+		require.NoError(t, err)
+
+		apClient, err := clientFactory.WithKeys(ctx, user1, user1.KeyID())
+		require.NoError(t, err)
+
+		// Unsigned request
+		t.Run("UnsignedRequest", func(t *testing.T) {
+			req := NewRequest(t, "GET", userURL)
+			MakeRequest(t, req, http.StatusBadRequest)
+		})
+
+		// Signed request
+		t.Run("SignedRequest", func(t *testing.T) {
+			resp, err := apClient.Get(userURL)
+			require.NoError(t, err)
+			assert.Equal(t, http.StatusOK, resp.StatusCode)
+		})
+
+		// HACK HACK HACK: the host part of the URL gets set to which IP forgejo is
+		// listening on, NOT localhost, which is the Domain given to forgejo which
+		// is then used for eg. the keyID all requests
+		applicationKeyID := fmt.Sprintf("%sapi/v1/activitypub/actor#main-key", setting.AppURL)
+		actorKeyID := fmt.Sprintf("%sapi/v1/activitypub/user-id/1#main-key", setting.AppURL)
+
+		// Check for cached public keys
+		t.Run("ValidateCaches", func(t *testing.T) {
+			host, err := forgefed.FindFederationHostByKeyID(db.DefaultContext, applicationKeyID)
+			require.NoError(t, err)
+			assert.NotNil(t, host)
+			assert.True(t, host.PublicKey.Valid)
+
+			_, user, err := user.FindFederatedUserByKeyID(db.DefaultContext, actorKeyID)
+			require.NoError(t, err)
+			assert.NotNil(t, user)
+			assert.True(t, user.PublicKey.Valid)
+		})
+
+		// Disable signature validation
+		defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)()
+
+		// Unsigned request
+		t.Run("SignatureValidationDisabled", func(t *testing.T) {
+			req := NewRequest(t, "GET", userURL)
+			MakeRequest(t, req, http.StatusOK)
+		})
+	})
+}
diff --git a/tests/integration/api_fork_test.go b/tests/integration/api_fork_test.go
index 2809af2748..0d38831b10 100644
--- a/tests/integration/api_fork_test.go
+++ b/tests/integration/api_fork_test.go
@@ -133,7 +133,7 @@ func TestAPIForkListPrivateRepo(t *testing.T) {
 		DecodeJSON(t, resp, &forks)
 
 		assert.Empty(t, forks)
-		assert.EqualValues(t, "0", resp.Header().Get("X-Total-Count"))
+		assert.Equal(t, "0", resp.Header().Get("X-Total-Count"))
 	})
 
 	t.Run("Logged in", func(t *testing.T) {
@@ -146,6 +146,6 @@ func TestAPIForkListPrivateRepo(t *testing.T) {
 		DecodeJSON(t, resp, &forks)
 
 		assert.Len(t, forks, 1)
-		assert.EqualValues(t, "1", resp.Header().Get("X-Total-Count"))
+		assert.Equal(t, "1", resp.Header().Get("X-Total-Count"))
 	})
 }
diff --git a/tests/integration/api_gpg_keys_test.go b/tests/integration/api_gpg_keys_test.go
index 1acbf91de0..b042c2ce6b 100644
--- a/tests/integration/api_gpg_keys_test.go
+++ b/tests/integration/api_gpg_keys_test.go
@@ -86,13 +86,13 @@ func TestGPGKeys(t *testing.T) {
 		assert.Len(t, keys, 1)
 
 		primaryKey1 := keys[0] // Primary key 1
-		assert.EqualValues(t, "38EA3BCED732982C", primaryKey1.KeyID)
+		assert.Equal(t, "38EA3BCED732982C", primaryKey1.KeyID)
 		assert.Len(t, primaryKey1.Emails, 1)
-		assert.EqualValues(t, "user2@example.com", primaryKey1.Emails[0].Email)
+		assert.Equal(t, "user2@example.com", primaryKey1.Emails[0].Email)
 		assert.True(t, primaryKey1.Emails[0].Verified)
 
 		subKey := primaryKey1.SubsKey[0] // Subkey of 38EA3BCED732982C
-		assert.EqualValues(t, "70D7C694D17D03AD", subKey.KeyID)
+		assert.Equal(t, "70D7C694D17D03AD", subKey.KeyID)
 		assert.Empty(t, subKey.Emails)
 
 		var key api.GPGKey
@@ -100,16 +100,16 @@ func TestGPGKeys(t *testing.T) {
 														AddTokenAuth(tokenWithGPGKeyScope)
 		resp = MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &key)
-		assert.EqualValues(t, "38EA3BCED732982C", key.KeyID)
+		assert.Equal(t, "38EA3BCED732982C", key.KeyID)
 		assert.Len(t, key.Emails, 1)
-		assert.EqualValues(t, "user2@example.com", key.Emails[0].Email)
+		assert.Equal(t, "user2@example.com", key.Emails[0].Email)
 		assert.True(t, key.Emails[0].Verified)
 
 		req = NewRequest(t, "GET", "/api/v1/user/gpg_keys/"+strconv.FormatInt(subKey.ID, 10)). // Subkey of 38EA3BCED732982C
 													AddTokenAuth(tokenWithGPGKeyScope)
 		resp = MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &key)
-		assert.EqualValues(t, "70D7C694D17D03AD", key.KeyID)
+		assert.Equal(t, "70D7C694D17D03AD", key.KeyID)
 		assert.Empty(t, key.Emails)
 	})
 
diff --git a/tests/integration/api_helper_for_declarative_test.go b/tests/integration/api_helper_for_declarative_test.go
index b5941b3389..ada6a2c311 100644
--- a/tests/integration/api_helper_for_declarative_test.go
+++ b/tests/integration/api_helper_for_declarative_test.go
@@ -48,20 +48,22 @@ func (ctx APITestContext) GitPath() string {
 	return fmt.Sprintf("%s/%s.git", ctx.Username, ctx.Reponame)
 }
 
-func doAPICreateRepository(ctx APITestContext, empty bool, objectFormat git.ObjectFormat, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
+func doAPICreateRepository(ctx APITestContext, opts *api.CreateRepoOption, objectFormat git.ObjectFormat, callback ...func(*testing.T, api.Repository)) func(*testing.T) {
 	return func(t *testing.T) {
-		createRepoOption := &api.CreateRepoOption{
-			AutoInit:         !empty,
-			Description:      "Temporary repo",
-			Name:             ctx.Reponame,
-			Private:          true,
-			Template:         true,
-			Gitignores:       "",
-			License:          "WTFPL",
-			Readme:           "Default",
-			ObjectFormatName: objectFormat.Name(),
+		if opts == nil {
+			opts = &api.CreateRepoOption{
+				AutoInit:    true,
+				Description: "Temporary repo",
+				Name:        ctx.Reponame,
+				Private:     true,
+				Template:    true,
+				Gitignores:  "",
+				License:     "WTFPL",
+				Readme:      "Default",
+			}
 		}
-		req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", createRepoOption).
+		opts.ObjectFormatName = objectFormat.Name()
+		req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", opts).
 			AddTokenAuth(ctx.Token)
 		if ctx.ExpectedCode != 0 {
 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
@@ -237,8 +239,8 @@ func doAPICreatePullRequest(ctx APITestContext, owner, repo, baseBranch, headBra
 	}
 }
 
-func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) (api.PullRequest, error) {
-	return func(t *testing.T) (api.PullRequest, error) {
+func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) api.PullRequest {
+	return func(t *testing.T) api.PullRequest {
 		req := NewRequest(t, http.MethodGet, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d", owner, repo, index)).
 			AddTokenAuth(ctx.Token)
 
@@ -248,10 +250,9 @@ func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) fu
 		}
 		resp := ctx.Session.MakeRequest(t, req, expected)
 
-		decoder := json.NewDecoder(resp.Body)
 		pr := api.PullRequest{}
-		err := decoder.Decode(&pr)
-		return pr, err
+		DecodeJSON(t, resp, &pr)
+		return pr
 	}
 }
 
@@ -294,7 +295,7 @@ func doAPIMergePullRequestForm(t *testing.T, ctx APITestContext, owner, repo str
 		expected = http.StatusOK
 	}
 
-	if !assert.EqualValues(t, expected, resp.Code,
+	if !assert.Equal(t, expected, resp.Code,
 		"Request: %s %s", req.Method, req.URL.String()) {
 		logUnexpectedResponse(t, resp)
 	}
@@ -347,20 +348,40 @@ func doAPICancelAutoMergePullRequest(ctx APITestContext, owner, repo string, ind
 	}
 }
 
-func doAPIGetBranch(ctx APITestContext, branch string, callback ...func(*testing.T, api.Branch)) func(*testing.T) {
-	return func(t *testing.T) {
+func doAPIGetBranch(ctx APITestContext, branch string) func(*testing.T) api.Branch {
+	return func(t *testing.T) api.Branch {
 		req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/branches/%s", ctx.Username, ctx.Reponame, branch).
 			AddTokenAuth(ctx.Token)
+		expected := http.StatusOK
+		if ctx.ExpectedCode != 0 {
+			expected = ctx.ExpectedCode
+		}
+		resp := ctx.Session.MakeRequest(t, req, expected)
+
+		branch := api.Branch{}
+		DecodeJSON(t, resp, &branch)
+		return branch
+	}
+}
+
+func doAPICreateTag(ctx APITestContext, tag, target, message string, callback ...func(*testing.T, api.Tag)) func(*testing.T) {
+	return func(t *testing.T) {
+		req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/tags", ctx.Username, ctx.Reponame), &api.CreateTagOption{
+			TagName: tag,
+			Message: message,
+			Target:  target,
+		}).
+			AddTokenAuth(ctx.Token)
 		if ctx.ExpectedCode != 0 {
 			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
 			return
 		}
-		resp := ctx.Session.MakeRequest(t, req, http.StatusOK)
+		resp := ctx.Session.MakeRequest(t, req, http.StatusCreated)
 
-		var branch api.Branch
-		DecodeJSON(t, resp, &branch)
+		var tag api.Tag
+		DecodeJSON(t, resp, &tag)
 		if len(callback) > 0 {
-			callback[0](t, branch)
+			callback[0](t, tag)
 		}
 	}
 }
diff --git a/tests/integration/api_issue_config_test.go b/tests/integration/api_issue_config_test.go
index 809be572da..3653a859b1 100644
--- a/tests/integration/api_issue_config_test.go
+++ b/tests/integration/api_issue_config_test.go
@@ -155,7 +155,7 @@ func TestAPIRepoIssueConfigPaths(t *testing.T) {
 				assert.False(t, issueConfig.BlankIssuesEnabled)
 				assert.Empty(t, issueConfig.ContactLinks)
 
-				_, err = deleteFileInBranch(owner, repo, fullPath, repo.DefaultBranch)
+				err = deleteFileInBranch(owner, repo, fullPath, repo.DefaultBranch)
 				require.NoError(t, err)
 			})
 		}
diff --git a/tests/integration/api_issue_label_test.go b/tests/integration/api_issue_label_test.go
index 7b2fbd18be..665e4b2f2a 100644
--- a/tests/integration/api_issue_label_test.go
+++ b/tests/integration/api_issue_label_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	actions_model "forgejo.org/models/actions"
 	auth_model "forgejo.org/models/auth"
 	issues_model "forgejo.org/models/issues"
 	repo_model "forgejo.org/models/repo"
@@ -41,8 +42,8 @@ func TestAPIModifyLabels(t *testing.T) {
 	apiLabel := new(api.Label)
 	DecodeJSON(t, resp, &apiLabel)
 	dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, RepoID: repo.ID})
-	assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
-	assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
+	assert.Equal(t, dbLabel.Name, apiLabel.Name)
+	assert.Equal(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
 
 	req = NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{
 		Name:        "TestL 2",
@@ -70,7 +71,7 @@ func TestAPIModifyLabels(t *testing.T) {
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiLabel)
-	assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
+	assert.Equal(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
 
 	// EditLabel
 	newName := "LabelNewName"
@@ -82,7 +83,7 @@ func TestAPIModifyLabels(t *testing.T) {
 	}).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiLabel)
-	assert.EqualValues(t, newColor, apiLabel.Color)
+	assert.Equal(t, newColor, apiLabel.Color)
 	req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{
 		Color: &newColorWrong,
 	}).AddTokenAuth(token)
@@ -149,6 +150,28 @@ func TestAPIAddIssueLabelsWithLabelNames(t *testing.T) {
 	MakeRequest(t, req, http.StatusNoContent)
 }
 
+func TestAPIRemoveIssueLabel(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+	issueLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issue.ID})
+
+	task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	task.RepoID = repo.ID
+	task.OwnerID = repo.OwnerID
+	require.NoError(t, task.GenerateToken())
+	actions_model.UpdateTask(t.Context(), task)
+
+	deleteURL := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels/%d", owner.Name, repo.Name, issue.Index, issueLabel.LabelID)
+	req := NewRequest(t, "DELETE", deleteURL).
+		AddTokenAuth(task.Token)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	unittest.AssertCount(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: issueLabel.LabelID}, 0)
+}
+
 func TestAPIAddIssueLabelsAutoDate(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -211,7 +234,7 @@ func TestAPIReplaceIssueLabels(t *testing.T) {
 	var apiLabels []*api.Label
 	DecodeJSON(t, resp, &apiLabels)
 	if assert.Len(t, apiLabels, 1) {
-		assert.EqualValues(t, label.ID, apiLabels[0].ID)
+		assert.Equal(t, label.ID, apiLabels[0].ID)
 	}
 
 	unittest.AssertCount(t, &issues_model.IssueLabel{IssueID: issue.ID}, 1)
@@ -237,7 +260,7 @@ func TestAPIReplaceIssueLabelsWithLabelNames(t *testing.T) {
 	var apiLabels []*api.Label
 	DecodeJSON(t, resp, &apiLabels)
 	if assert.Len(t, apiLabels, 1) {
-		assert.EqualValues(t, label.Name, apiLabels[0].Name)
+		assert.Equal(t, label.Name, apiLabels[0].Name)
 	}
 }
 
@@ -261,8 +284,8 @@ func TestAPIModifyOrgLabels(t *testing.T) {
 	apiLabel := new(api.Label)
 	DecodeJSON(t, resp, &apiLabel)
 	dbLabel := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: apiLabel.ID, OrgID: owner.ID})
-	assert.EqualValues(t, dbLabel.Name, apiLabel.Name)
-	assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
+	assert.Equal(t, dbLabel.Name, apiLabel.Name)
+	assert.Equal(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
 
 	req = NewRequestWithJSON(t, "POST", urlStr, &api.CreateLabelOption{
 		Name:        "TestL 2",
@@ -290,7 +313,7 @@ func TestAPIModifyOrgLabels(t *testing.T) {
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiLabel)
-	assert.EqualValues(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
+	assert.Equal(t, strings.TrimLeft(dbLabel.Color, "#"), apiLabel.Color)
 
 	// EditLabel
 	newName := "LabelNewName"
@@ -302,7 +325,7 @@ func TestAPIModifyOrgLabels(t *testing.T) {
 	}).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiLabel)
-	assert.EqualValues(t, newColor, apiLabel.Color)
+	assert.Equal(t, newColor, apiLabel.Color)
 	req = NewRequestWithJSON(t, "PATCH", singleURLStr, &api.EditLabelOption{
 		Color: &newColorWrong,
 	}).AddTokenAuth(token)
@@ -313,3 +336,28 @@ func TestAPIModifyOrgLabels(t *testing.T) {
 		AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusNoContent)
 }
+
+func TestAPIReplaceIssueLabelsActionsToken(t *testing.T) {
+	require.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+	task.RepoID = repo.ID
+	task.OwnerID = owner.ID
+	task.IsForkPullRequest = true // Read permission.
+	require.NoError(t, task.GenerateToken())
+
+	// Explicitly need "is_fork_pull_request".
+	require.NoError(t, actions_model.UpdateTask(t.Context(), task, "repo_id", "owner_id", "is_fork_pull_request", "token", "token_salt", "token_hash", "token_last_eight"))
+
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/labels",
+		owner.Name, repo.Name, issue.Index)
+	req := NewRequestWithJSON(t, "PUT", urlStr, &api.IssueLabelsOption{
+		Labels: []any{label.Name},
+	}).AddTokenAuth(task.Token)
+	MakeRequest(t, req, http.StatusForbidden)
+}
diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go
index 2ab7f9a346..16ebf36721 100644
--- a/tests/integration/api_issue_milestone_test.go
+++ b/tests/integration/api_issue_milestone_test.go
@@ -71,7 +71,7 @@ func TestAPIIssuesMilestone(t *testing.T) {
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiMilestone)
-	assert.EqualValues(t, apiMilestones[2], apiMilestone)
+	assert.Equal(t, apiMilestones[2], apiMilestone)
 
 	req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s&name=%s", owner.Name, repo.Name, "all", "milestone2")).
 		AddTokenAuth(token)
diff --git a/tests/integration/api_issue_stopwatch_test.go b/tests/integration/api_issue_stopwatch_test.go
index f395ad1a61..f83519a504 100644
--- a/tests/integration/api_issue_stopwatch_test.go
+++ b/tests/integration/api_issue_stopwatch_test.go
@@ -35,11 +35,11 @@ func TestAPIListStopWatches(t *testing.T) {
 	stopwatch := unittest.AssertExistsAndLoadBean(t, &issues_model.Stopwatch{UserID: owner.ID})
 	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: stopwatch.IssueID})
 	if assert.Len(t, apiWatches, 1) {
-		assert.EqualValues(t, stopwatch.CreatedUnix.AsTime().Unix(), apiWatches[0].Created.Unix())
-		assert.EqualValues(t, issue.Index, apiWatches[0].IssueIndex)
-		assert.EqualValues(t, issue.Title, apiWatches[0].IssueTitle)
-		assert.EqualValues(t, repo.Name, apiWatches[0].RepoName)
-		assert.EqualValues(t, repo.OwnerName, apiWatches[0].RepoOwnerName)
+		assert.Equal(t, stopwatch.CreatedUnix.AsTime().Unix(), apiWatches[0].Created.Unix())
+		assert.Equal(t, issue.Index, apiWatches[0].IssueIndex)
+		assert.Equal(t, issue.Title, apiWatches[0].IssueTitle)
+		assert.Equal(t, repo.Name, apiWatches[0].RepoName)
+		assert.Equal(t, repo.OwnerName, apiWatches[0].RepoOwnerName)
 		assert.Positive(t, apiWatches[0].Seconds)
 	}
 }
diff --git a/tests/integration/api_issue_subscription_test.go b/tests/integration/api_issue_subscription_test.go
index 4d1b9b2fb1..254bc09aea 100644
--- a/tests/integration/api_issue_subscription_test.go
+++ b/tests/integration/api_issue_subscription_test.go
@@ -43,11 +43,11 @@ func TestAPIIssueSubscriptions(t *testing.T) {
 		wi := new(api.WatchInfo)
 		DecodeJSON(t, resp, wi)
 
-		assert.EqualValues(t, isWatching, wi.Subscribed)
-		assert.EqualValues(t, !isWatching, wi.Ignored)
-		assert.EqualValues(t, issue.APIURL(db.DefaultContext)+"/subscriptions", wi.URL)
+		assert.Equal(t, isWatching, wi.Subscribed)
+		assert.Equal(t, !isWatching, wi.Ignored)
+		assert.Equal(t, issue.APIURL(db.DefaultContext)+"/subscriptions", wi.URL)
 		assert.EqualValues(t, issue.CreatedUnix, wi.CreatedAt.Unix())
-		assert.EqualValues(t, issueRepo.APIURL(), wi.RepositoryURL)
+		assert.Equal(t, issueRepo.APIURL(), wi.RepositoryURL)
 	}
 
 	testSubscription(issue1, true)
diff --git a/tests/integration/api_issue_templates_test.go b/tests/integration/api_issue_templates_test.go
index 49b1a6f277..47ba34198a 100644
--- a/tests/integration/api_issue_templates_test.go
+++ b/tests/integration/api_issue_templates_test.go
@@ -47,9 +47,7 @@ func TestAPIIssueTemplateList(t *testing.T) {
 			for _, template := range templateCandidates {
 				t.Run(template, func(t *testing.T) {
 					defer tests.PrintCurrentTest(t)()
-					defer func() {
-						deleteFileInBranch(user, repo, template, repo.DefaultBranch)
-					}()
+					defer deleteFileInBranch(user, repo, template, repo.DefaultBranch)
 
 					err := createOrReplaceFileInBranch(user, repo, template, repo.DefaultBranch,
 						`---
diff --git a/tests/integration/api_issue_test.go b/tests/integration/api_issue_test.go
index 99fc158fdd..764ddd38d2 100644
--- a/tests/integration/api_issue_test.go
+++ b/tests/integration/api_issue_test.go
@@ -506,7 +506,7 @@ func TestAPISearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 20)
 
 	query.Add("limit", "10")
@@ -514,7 +514,7 @@ func TestAPISearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String()).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 10)
 
 	query = url.Values{"assigned": {"true"}, "state": {"all"}}
diff --git a/tests/integration/api_issue_tracked_time_test.go b/tests/integration/api_issue_tracked_time_test.go
index 41def89a55..a4f3d15f88 100644
--- a/tests/integration/api_issue_tracked_time_test.go
+++ b/tests/integration/api_issue_tracked_time_test.go
@@ -42,8 +42,8 @@ func TestAPIGetTrackedTimes(t *testing.T) {
 
 	for i, time := range expect {
 		assert.Equal(t, time.ID, apiTimes[i].ID)
-		assert.EqualValues(t, issue2.Title, apiTimes[i].Issue.Title)
-		assert.EqualValues(t, issue2.ID, apiTimes[i].IssueID)
+		assert.Equal(t, issue2.Title, apiTimes[i].Issue.Title)
+		assert.Equal(t, issue2.ID, apiTimes[i].IssueID)
 		assert.Equal(t, time.Created.Unix(), apiTimes[i].Created.Unix())
 		assert.Equal(t, time.Time, apiTimes[i].Time)
 		user, err := user_model.GetUserByID(db.DefaultContext, time.UserID)
@@ -126,6 +126,6 @@ func TestAPIAddTrackedTimes(t *testing.T) {
 	DecodeJSON(t, resp, &apiNewTime)
 
 	assert.EqualValues(t, 33, apiNewTime.Time)
-	assert.EqualValues(t, user2.ID, apiNewTime.UserID)
+	assert.Equal(t, user2.ID, apiNewTime.UserID)
 	assert.EqualValues(t, 947688818, apiNewTime.Created.Unix())
 }
diff --git a/tests/integration/api_misc_test.go b/tests/integration/api_misc_test.go
new file mode 100644
index 0000000000..2687a9bb31
--- /dev/null
+++ b/tests/integration/api_misc_test.go
@@ -0,0 +1,38 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"net/http"
+	"testing"
+
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
+)
+
+func TestAPISSHSigningKey(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	t.Run("No signing key", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.SSHInstanceKey, nil)()
+		defer tests.PrintCurrentTest(t)()
+
+		MakeRequest(t, NewRequest(t, "GET", "/api/v1/signing-key.ssh"), http.StatusNotFound)
+	})
+	t.Run("With signing key", func(t *testing.T) {
+		publicKey := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH\n"
+		pubKey, _, _, _, err := ssh.ParseAuthorizedKey([]byte(publicKey))
+		require.NoError(t, err)
+		defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)()
+		defer tests.PrintCurrentTest(t)()
+
+		resp := MakeRequest(t, NewRequest(t, "GET", "/api/v1/signing-key.ssh"), http.StatusOK)
+		assert.Equal(t, publicKey, resp.Body.String())
+	})
+}
diff --git a/tests/integration/api_notification_test.go b/tests/integration/api_notification_test.go
index b9efaa43a3..9f5c5394e5 100644
--- a/tests/integration/api_notification_test.go
+++ b/tests/integration/api_notification_test.go
@@ -105,10 +105,10 @@ func TestAPINotification(t *testing.T) {
 	assert.EqualValues(t, 5, apiN.ID)
 	assert.False(t, apiN.Pinned)
 	assert.True(t, apiN.Unread)
-	assert.EqualValues(t, "issue4", apiN.Subject.Title)
+	assert.Equal(t, "issue4", apiN.Subject.Title)
 	assert.EqualValues(t, "Issue", apiN.Subject.Type)
-	assert.EqualValues(t, thread5.Issue.APIURL(db.DefaultContext), apiN.Subject.URL)
-	assert.EqualValues(t, thread5.Repository.HTMLURL(), apiN.Repository.HTMLURL)
+	assert.Equal(t, thread5.Issue.APIURL(db.DefaultContext), apiN.Subject.URL)
+	assert.Equal(t, thread5.Repository.HTMLURL(), apiN.Repository.HTMLURL)
 
 	MakeRequest(t, NewRequest(t, "GET", "/api/v1/notifications/new"), http.StatusUnauthorized)
 
diff --git a/tests/integration/api_oauth2_apps_test.go b/tests/integration/api_oauth2_apps_test.go
index 2490a11888..6e238e897d 100644
--- a/tests/integration/api_oauth2_apps_test.go
+++ b/tests/integration/api_oauth2_apps_test.go
@@ -43,12 +43,12 @@ func testAPICreateOAuth2Application(t *testing.T) {
 	var createdApp *api.OAuth2Application
 	DecodeJSON(t, resp, &createdApp)
 
-	assert.EqualValues(t, appBody.Name, createdApp.Name)
+	assert.Equal(t, appBody.Name, createdApp.Name)
 	assert.Len(t, createdApp.ClientSecret, 56)
 	assert.Len(t, createdApp.ClientID, 36)
 	assert.True(t, createdApp.ConfidentialClient)
 	assert.NotEmpty(t, createdApp.Created)
-	assert.EqualValues(t, appBody.RedirectURIs[0], createdApp.RedirectURIs[0])
+	assert.Equal(t, appBody.RedirectURIs[0], createdApp.RedirectURIs[0])
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{UID: user.ID, Name: createdApp.Name})
 }
 
@@ -74,12 +74,12 @@ func testAPIListOAuth2Applications(t *testing.T) {
 	DecodeJSON(t, resp, &appList)
 	expectedApp := appList[0]
 
-	assert.EqualValues(t, expectedApp.Name, existApp.Name)
-	assert.EqualValues(t, expectedApp.ClientID, existApp.ClientID)
+	assert.Equal(t, expectedApp.Name, existApp.Name)
+	assert.Equal(t, expectedApp.ClientID, existApp.ClientID)
 	assert.Equal(t, expectedApp.ConfidentialClient, existApp.ConfidentialClient)
 	assert.Len(t, expectedApp.ClientID, 36)
 	assert.Empty(t, expectedApp.ClientSecret)
-	assert.EqualValues(t, expectedApp.RedirectURIs[0], existApp.RedirectURIs[0])
+	assert.Equal(t, expectedApp.RedirectURIs[0], existApp.RedirectURIs[0])
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
 
@@ -128,13 +128,13 @@ func testAPIGetOAuth2Application(t *testing.T) {
 	DecodeJSON(t, resp, &app)
 	expectedApp := app
 
-	assert.EqualValues(t, expectedApp.Name, existApp.Name)
-	assert.EqualValues(t, expectedApp.ClientID, existApp.ClientID)
+	assert.Equal(t, expectedApp.Name, existApp.Name)
+	assert.Equal(t, expectedApp.ClientID, existApp.ClientID)
 	assert.Equal(t, expectedApp.ConfidentialClient, existApp.ConfidentialClient)
 	assert.Len(t, expectedApp.ClientID, 36)
 	assert.Empty(t, expectedApp.ClientSecret)
 	assert.Len(t, expectedApp.RedirectURIs, 1)
-	assert.EqualValues(t, expectedApp.RedirectURIs[0], existApp.RedirectURIs[0])
+	assert.Equal(t, expectedApp.RedirectURIs[0], existApp.RedirectURIs[0])
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
 
@@ -168,8 +168,8 @@ func testAPIUpdateOAuth2Application(t *testing.T) {
 	expectedApp := app
 
 	assert.Len(t, expectedApp.RedirectURIs, 2)
-	assert.EqualValues(t, expectedApp.RedirectURIs[0], appBody.RedirectURIs[0])
-	assert.EqualValues(t, expectedApp.RedirectURIs[1], appBody.RedirectURIs[1])
+	assert.Equal(t, expectedApp.RedirectURIs[0], appBody.RedirectURIs[0])
+	assert.Equal(t, expectedApp.RedirectURIs[1], appBody.RedirectURIs[1])
 	assert.Equal(t, expectedApp.ConfidentialClient, appBody.ConfidentialClient)
 	unittest.AssertExistsAndLoadBean(t, &auth_model.OAuth2Application{ID: expectedApp.ID, Name: expectedApp.Name})
 }
diff --git a/tests/integration/api_org_actions_test.go b/tests/integration/api_org_actions_test.go
index ed8f91e5c2..a5497130f9 100644
--- a/tests/integration/api_org_actions_test.go
+++ b/tests/integration/api_org_actions_test.go
@@ -34,5 +34,5 @@ func TestAPISearchActionJobs_OrgRunner(t *testing.T) {
 	DecodeJSON(t, res, &jobs)
 
 	assert.Len(t, jobs, 1)
-	assert.EqualValues(t, job.ID, jobs[0].ID)
+	assert.Equal(t, job.ID, jobs[0].ID)
 }
diff --git a/tests/integration/api_org_test.go b/tests/integration/api_org_test.go
index 37e6035045..d20387747b 100644
--- a/tests/integration/api_org_test.go
+++ b/tests/integration/api_org_test.go
@@ -76,7 +76,7 @@ func TestAPIOrgCreate(t *testing.T) {
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiOrg)
-	assert.EqualValues(t, org.UserName, apiOrg.Name)
+	assert.Equal(t, org.UserName, apiOrg.Name)
 
 	req = NewRequestf(t, "GET", "/api/v1/orgs/%s/repos", org.UserName).
 		AddTokenAuth(token)
@@ -96,7 +96,7 @@ func TestAPIOrgCreate(t *testing.T) {
 	var users []*api.User
 	DecodeJSON(t, resp, &users)
 	assert.Len(t, users, 1)
-	assert.EqualValues(t, "user1", users[0].UserName)
+	assert.Equal(t, "user1", users[0].UserName)
 }
 
 func TestAPIOrgRename(t *testing.T) {
@@ -238,7 +238,7 @@ func TestAPIOrgSearchEmptyTeam(t *testing.T) {
 	DecodeJSON(t, resp, &data)
 	assert.True(t, data.Ok)
 	if assert.Len(t, data.Data, 1) {
-		assert.EqualValues(t, "Empty", data.Data[0].Name)
+		assert.Equal(t, "Empty", data.Data[0].Name)
 	}
 }
 
diff --git a/tests/integration/api_packages_alt_test.go b/tests/integration/api_packages_alt_test.go
index e84af7dd15..f43759364e 100644
--- a/tests/integration/api_packages_alt_test.go
+++ b/tests/integration/api_packages_alt_test.go
@@ -214,7 +214,7 @@ enabled=1`,
 					}
 
 					assert.Equal(t, "classic", result.Component)
-					assert.Equal(t, "Alt Linux Team", result.Origin)
+					assert.Equal(t, "Forgejo", result.Origin)
 					assert.Equal(t, "Forgejo", result.Label)
 					assert.Equal(t, "x86_64", result.Architecture)
 					assert.False(t, result.NotAutomatic)
@@ -299,17 +299,17 @@ enabled=1`,
 
 					assert.Equal(t, "Forgejo", result.Origin)
 					assert.Equal(t, "Forgejo", result.Label)
-					assert.Equal(t, "Sisyphus", result.Suite)
+					assert.Equal(t, "Unknown", result.Suite)
 					assert.Equal(t, "x86_64", result.Architectures)
 
 					assert.Len(t, result.MD5Sum, 3)
-					assert.Equal(t, "bbf7ae6b2f540673ed1cfc0266b5f319", result.MD5Sum[0].Hash)
-					assert.Equal(t, 1003, result.MD5Sum[0].Size)
+					assert.Equal(t, "3f25f44163e8e512efb248d3b96949c3", result.MD5Sum[0].Hash)
+					assert.Equal(t, 1147, result.MD5Sum[0].Size)
 					assert.Equal(t, "base/pkglist.classic", result.MD5Sum[0].File)
 
 					assert.Len(t, result.BLAKE2B, 3)
-					assert.Equal(t, "b527bf038895ce29107ec3a6d2eebd7c365e8ce5ab767276eeddd7c549a159025225cb0ecfdbf7b71da13db7e865e77bcb0e2dae4d21335df01a4a17e0056a70", result.BLAKE2B[0].Hash)
-					assert.Equal(t, 1003, result.BLAKE2B[0].Size)
+					assert.Equal(t, "21a63e12a41f70e0697d354ae31e22ad6f024ec5ead2ea498b9a1b7db0f98a4e441f46c96d6912fba19148ff013457561fbb9bf3fca2a21d04cf15a325be7de9", result.BLAKE2B[0].Hash)
+					assert.Equal(t, 1147, result.BLAKE2B[0].Size)
 					assert.Equal(t, "base/pkglist.classic", result.BLAKE2B[0].File)
 				})
 
@@ -567,9 +567,9 @@ enabled=1`,
 					assert.Equal(t, "https://gitea.io", result.URL)
 					assert.Equal(t, "x86_64", result.Arch)
 					assert.Equal(t, "gitea-test-1.0.2-1.src.rpm", result.SourceRpm)
-					assert.Equal(t, []string{"", ""}, result.ProvideNames)
+					assert.Equal(t, []string{"gitea-test(x86-64)", "gitea-test(x86-64)"}, result.ProvideNames)
 					assert.Equal(t, []int{16777226, 16777226, 16777226, 16777226, 16777226, 16777226, 16777226}, result.RequireFlags)
-					assert.Equal(t, []string{"", "", "", "", "", "", ""}, result.RequireNames)
+					assert.Equal(t, []string{"rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)"}, result.RequireNames)
 					assert.Equal(t, []string{"5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1"}, result.RequireVersions)
 					assert.Equal(t, []int{1678276800}, result.ChangeLogTimes)
 					assert.Equal(t, []string{"KN4CK3R <dummy@gitea.io>"}, result.ChangeLogNames)
@@ -579,7 +579,7 @@ enabled=1`,
 					assert.Equal(t, []int(nil), result.DirIndexes)
 					assert.Equal(t, []string{"hello"}, result.BaseNames)
 					assert.Equal(t, []string{"/usr/local/bin/"}, result.DirNames)
-					assert.Equal(t, "", result.DistTag)
+					assert.Empty(t, result.DistTag)
 					assert.Equal(t, "gitea-test-1.0.2-1.x86_64.rpm", result.AptIndexLegacyFileName)
 					assert.Equal(t, 7116, result.AptIndexLegacyFileSize)
 					assert.Equal(t, "9ea82dd62968719aea19c08cd2ced79a", result.MD5Sum)
diff --git a/tests/integration/api_packages_cargo_test.go b/tests/integration/api_packages_cargo_test.go
index 048859e312..9e03d9e8a8 100644
--- a/tests/integration/api_packages_cargo_test.go
+++ b/tests/integration/api_packages_cargo_test.go
@@ -403,7 +403,7 @@ func TestRebuildCargo(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "error%3DCannot%2Brebuild%252C%2Bno%2Bindex%2Bis%2Binitialized.", flashCookie.Value)
+			assert.Equal(t, "error%3DCannot%2Brebuild%252C%2Bno%2Bindex%2Bis%2Binitialized.", flashCookie.Value)
 			unittest.AssertExistsIf(t, false, &repo_model.Repository{OwnerID: user.ID, Name: cargo_service.IndexRepositoryName})
 		})
 
@@ -441,7 +441,7 @@ func TestRebuildCargo(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2BCargo%2Bindex%2Bwas%2Bsuccessfully%2Brebuild.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2BCargo%2Bindex%2Bwas%2Bsuccessfully%2Brebuilt.", flashCookie.Value)
 		})
 	})
 }
diff --git a/tests/integration/api_packages_conan_test.go b/tests/integration/api_packages_conan_test.go
index c0185c852d..02a716b671 100644
--- a/tests/integration/api_packages_conan_test.go
+++ b/tests/integration/api_packages_conan_test.go
@@ -328,7 +328,7 @@ func TestPackageConan(t *testing.T) {
 
 						assert.Equal(t, int64(len(contentConaninfo)), pb.Size)
 					} else {
-						assert.FailNow(t, "unknown file: %s", pf.Name)
+						assert.FailNow(t, "unknown file", "name: %s", pf.Name)
 					}
 				}
 			})
diff --git a/tests/integration/api_packages_container_cleanup_sha256_test.go b/tests/integration/api_packages_container_cleanup_sha256_test.go
index b1ed435b80..5c661a6858 100644
--- a/tests/integration/api_packages_container_cleanup_sha256_test.go
+++ b/tests/integration/api_packages_container_cleanup_sha256_test.go
@@ -53,7 +53,7 @@ func TestPackagesContainerCleanupSHA256(t *testing.T) {
 		for range expected {
 			filtered = append(filtered, true)
 		}
-		assert.EqualValues(t, filtered, logFiltered, expected)
+		assert.Equal(t, filtered, logFiltered, expected)
 	}
 
 	userToken := ""
diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go
index 223c865dec..fb092c91c7 100644
--- a/tests/integration/api_packages_container_test.go
+++ b/tests/integration/api_packages_container_test.go
@@ -56,7 +56,7 @@ func TestPackageContainer(t *testing.T) {
 		return values
 	}
 
-	images := []string{"test", "te/st"}
+	images := []string{"test", "te/st", "oras-artifact"}
 	tags := []string{"latest", "main"}
 	multiTag := "multi"
 
@@ -177,6 +177,90 @@ func TestPackageContainer(t *testing.T) {
 		assert.Equal(t, "registry/2.0", resp.Header().Get("Docker-Distribution-Api-Version"))
 	})
 
+	t.Run("ORAS Artifact Upload", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		image := "oras-artifact"
+		url := fmt.Sprintf("%sv2/%s/%s", setting.AppURL, user.Name, image)
+
+		// Empty config blob (common in ORAS artifacts)
+		emptyConfigDigest := "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+		emptyConfigContent := ""
+
+		// Upload empty config blob
+		req := NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, emptyConfigDigest), bytes.NewReader([]byte(emptyConfigContent))).
+			AddTokenAuth(userToken)
+		resp := MakeRequest(t, req, http.StatusCreated)
+		assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, emptyConfigDigest), resp.Header().Get("Location"))
+		assert.Equal(t, emptyConfigDigest, resp.Header().Get("Docker-Content-Digest"))
+
+		// Verify empty blob exists and has correct Content-Length
+		req = NewRequest(t, "HEAD", fmt.Sprintf("%s/blobs/%s", url, emptyConfigDigest)).
+			AddTokenAuth(userToken)
+		resp = MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "0", resp.Header().Get("Content-Length")) // This was the main fix
+		assert.Equal(t, emptyConfigDigest, resp.Header().Get("Docker-Content-Digest"))
+
+		// Upload a small data blob (e.g., artifacthub metadata)
+		artifactData := `{"name":"test-artifact","version":"1.0.0"}`
+		artifactDigest := fmt.Sprintf("sha256:%x", sha256.Sum256([]byte(artifactData)))
+
+		req = NewRequestWithBody(t, "POST", fmt.Sprintf("%s/blobs/uploads?digest=%s", url, artifactDigest), bytes.NewReader([]byte(artifactData))).
+			AddTokenAuth(userToken)
+		resp = MakeRequest(t, req, http.StatusCreated)
+		assert.Equal(t, fmt.Sprintf("/v2/%s/%s/blobs/%s", user.Name, image, artifactDigest), resp.Header().Get("Location"))
+
+		// Create OCI artifact manifest
+		artifactManifest := fmt.Sprintf(`{
+			"schemaVersion": 2,
+			"mediaType": "application/vnd.oci.image.manifest.v1+json",
+			"artifactType": "application/vnd.cncf.artifacthub.config.v1+yaml",
+			"config": {
+				"mediaType": "application/vnd.cncf.artifacthub.config.v1+yaml",
+				"digest": "%s",
+				"size": %d
+			},
+			"layers": [
+				{
+					"mediaType": "application/vnd.cncf.artifacthub.repository-metadata.layer.v1.yaml",
+					"digest": "%s",
+					"size": %d
+				}
+			]
+		}`, emptyConfigDigest, len(emptyConfigContent), artifactDigest, len(artifactData))
+
+		artifactManifestDigest := fmt.Sprintf("sha256:%x", sha256.Sum256([]byte(artifactManifest)))
+
+		// Upload artifact manifest
+		req = NewRequestWithBody(t, "PUT", fmt.Sprintf("%s/manifests/artifact-v1", url), bytes.NewReader([]byte(artifactManifest))).
+			AddTokenAuth(userToken).
+			SetHeader("Content-Type", "application/vnd.oci.image.manifest.v1+json")
+		resp = MakeRequest(t, req, http.StatusCreated)
+		assert.Equal(t, fmt.Sprintf("/v2/%s/%s/manifests/artifact-v1", user.Name, image), resp.Header().Get("Location"))
+		assert.Equal(t, artifactManifestDigest, resp.Header().Get("Docker-Content-Digest"))
+
+		// Verify manifest can be retrieved
+		req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/artifact-v1", url)).
+			AddTokenAuth(userToken).
+			SetHeader("Accept", "application/vnd.oci.image.manifest.v1+json")
+		resp = MakeRequest(t, req, http.StatusOK)
+		assert.Equal(t, "application/vnd.oci.image.manifest.v1+json", resp.Header().Get("Content-Type"))
+		assert.Equal(t, artifactManifestDigest, resp.Header().Get("Docker-Content-Digest"))
+
+		// Verify package was created with correct metadata
+		pvs, err := packages_model.GetVersionsByPackageType(db.DefaultContext, user.ID, packages_model.TypeContainer)
+		require.NoError(t, err)
+
+		found := false
+		for _, pv := range pvs {
+			if pv.LowerVersion == "artifact-v1" {
+				found = true
+				break
+			}
+		}
+		assert.True(t, found, "ORAS artifact package should be created")
+	})
+
 	for _, image := range images {
 		t.Run(fmt.Sprintf("[Image:%s]", image), func(t *testing.T) {
 			url := fmt.Sprintf("%sv2/%s/%s", setting.AppURL, user.Name, image)
@@ -392,7 +476,7 @@ func TestPackageContainer(t *testing.T) {
 								assert.Equal(t, "application/vnd.docker.image.rootfs.diff.tar.gzip", pfd.Properties.GetByName(container_module.PropertyMediaType))
 								assert.Equal(t, blobDigest, pfd.Properties.GetByName(container_module.PropertyDigest))
 							default:
-								assert.FailNow(t, "unknown file: %s", pfd.File.Name)
+								assert.FailNow(t, "unknown file", "name: %s", pfd.File.Name)
 							}
 						}
 
@@ -430,14 +514,19 @@ func TestPackageContainer(t *testing.T) {
 						assert.Equal(t, manifestDigest, resp.Header().Get("Docker-Content-Digest"))
 					})
 
-					t.Run("GetManifest", func(t *testing.T) {
+					t.Run("GetManifest unknown-tag", func(t *testing.T) {
 						defer tests.PrintCurrentTest(t)()
 
 						req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/unknown-tag", url)).
 							AddTokenAuth(userToken)
 						MakeRequest(t, req, http.StatusNotFound)
+					})
 
-						req = NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)).
+					t.Run("GetManifest serv indirect", func(t *testing.T) {
+						defer tests.PrintCurrentTest(t)()
+						defer test.MockVariableValue(&setting.Packages.Storage.MinioConfig.ServeDirect, false)()
+
+						req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)).
 							AddTokenAuth(userToken)
 						resp := MakeRequest(t, req, http.StatusOK)
 
@@ -446,6 +535,25 @@ func TestPackageContainer(t *testing.T) {
 						assert.Equal(t, manifestDigest, resp.Header().Get("Docker-Content-Digest"))
 						assert.Equal(t, manifestContent, resp.Body.String())
 					})
+
+					t.Run("GetManifest serv direct", func(t *testing.T) {
+						if setting.Packages.Storage.Type != setting.MinioStorageType {
+							t.Skip("Test skipped for non-Minio-storage.")
+							return
+						}
+
+						defer tests.PrintCurrentTest(t)()
+						defer test.MockVariableValue(&setting.Packages.Storage.MinioConfig.ServeDirect, true)()
+
+						req := NewRequest(t, "GET", fmt.Sprintf("%s/manifests/%s", url, tag)).
+							AddTokenAuth(userToken)
+						resp := MakeRequest(t, req, http.StatusTemporaryRedirect)
+
+						assert.Empty(t, resp.Header().Get("Content-Length"))
+						assert.NotEmpty(t, resp.Header().Get("Location"))
+						assert.Equal(t, "text/html; charset=utf-8", resp.Header().Get("Content-Type"))
+						assert.Empty(t, resp.Header().Get("Docker-Content-Digest"))
+					})
 				})
 			}
 
@@ -580,36 +688,76 @@ func TestPackageContainer(t *testing.T) {
 			t.Run("GetTagList", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
-				cases := []struct {
+				var cases []struct {
 					URL          string
 					ExpectedTags []string
 					ExpectedLink string
-				}{
-					{
-						URL:          fmt.Sprintf("%s/tags/list", url),
-						ExpectedTags: []string{"latest", "main", "multi"},
-						ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
-					},
-					{
-						URL:          fmt.Sprintf("%s/tags/list?n=0", url),
-						ExpectedTags: []string{},
-						ExpectedLink: "",
-					},
-					{
-						URL:          fmt.Sprintf("%s/tags/list?n=2", url),
-						ExpectedTags: []string{"latest", "main"},
-						ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=2>; rel="next"`, user.Name, image),
-					},
-					{
-						URL:          fmt.Sprintf("%s/tags/list?last=main", url),
-						ExpectedTags: []string{"multi"},
-						ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
-					},
-					{
-						URL:          fmt.Sprintf("%s/tags/list?n=1&last=latest", url),
-						ExpectedTags: []string{"main"},
-						ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=1>; rel="next"`, user.Name, image),
-					},
+				}
+
+				if image == "oras-artifact" {
+					cases = []struct {
+						URL          string
+						ExpectedTags []string
+						ExpectedLink string
+					}{
+						{
+							URL:          fmt.Sprintf("%s/tags/list", url),
+							ExpectedTags: []string{"artifact-v1", "latest", "main", "multi"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=0", url),
+							ExpectedTags: []string{},
+							ExpectedLink: "",
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=2", url),
+							ExpectedTags: []string{"artifact-v1", "latest"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=latest&n=2>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?last=main", url),
+							ExpectedTags: []string{"multi"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=1&last=latest", url),
+							ExpectedTags: []string{"main"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=1>; rel="next"`, user.Name, image),
+						},
+					}
+				} else {
+					cases = []struct {
+						URL          string
+						ExpectedTags []string
+						ExpectedLink string
+					}{
+						{
+							URL:          fmt.Sprintf("%s/tags/list", url),
+							ExpectedTags: []string{"latest", "main", "multi"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=0", url),
+							ExpectedTags: []string{},
+							ExpectedLink: "",
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=2", url),
+							ExpectedTags: []string{"latest", "main"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=2>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?last=main", url),
+							ExpectedTags: []string{"multi"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=multi>; rel="next"`, user.Name, image),
+						},
+						{
+							URL:          fmt.Sprintf("%s/tags/list?n=1&last=latest", url),
+							ExpectedTags: []string{"main"},
+							ExpectedLink: fmt.Sprintf(`</v2/%s/%s/tags/list?last=main&n=1>; rel="next"`, user.Name, image),
+						},
+					}
 				}
 
 				for _, c := range cases {
@@ -636,7 +784,11 @@ func TestPackageContainer(t *testing.T) {
 
 				var apiPackages []*api.Package
 				DecodeJSON(t, resp, &apiPackages)
-				assert.Len(t, apiPackages, 4) // "latest", "main", "multi", "sha256:..."
+				if image == "oras-artifact" {
+					assert.Len(t, apiPackages, 5) // "artifact-v1", "latest", "main", "multi", "sha256:..."
+				} else {
+					assert.Len(t, apiPackages, 4) // "latest", "main", "multi", "sha256:..."
+				}
 			})
 
 			t.Run("Delete", func(t *testing.T) {
diff --git a/tests/integration/api_packages_goproxy_test.go b/tests/integration/api_packages_goproxy_test.go
index 1534fa73cc..1b95da8650 100644
--- a/tests/integration/api_packages_goproxy_test.go
+++ b/tests/integration/api_packages_goproxy_test.go
@@ -15,6 +15,7 @@ import (
 	"forgejo.org/models/packages"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/test"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
@@ -88,12 +89,12 @@ func TestPackageGo(t *testing.T) {
 			AddBasicAuth(user.Name)
 		MakeRequest(t, req, http.StatusConflict)
 
-		time.Sleep(time.Second)
-
 		content = createArchive(map[string][]byte{
 			packageName + "@" + packageVersion2 + "/go.mod": []byte(goModContent),
 		})
 
+		test.SleepTillNextSecond()
+
 		req = NewRequestWithBody(t, "PUT", url+"/upload", bytes.NewReader(content)).
 			AddBasicAuth(user.Name)
 		MakeRequest(t, req, http.StatusCreated)
diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go
index 438c2f0fb5..9490d52890 100644
--- a/tests/integration/api_packages_maven_test.go
+++ b/tests/integration/api_packages_maven_test.go
@@ -29,12 +29,12 @@ func TestPackageMaven(t *testing.T) {
 
 	groupID := "com.gitea"
 	artifactID := "test-project"
-	packageName := groupID + "-" + artifactID
+	packageName := groupID + ":" + artifactID
 	packageVersion := "1.0.1"
 	packageDescription := "Test Description"
 
 	root := fmt.Sprintf("/api/packages/%s/maven/%s/%s", user.Name, strings.ReplaceAll(groupID, ".", "/"), artifactID)
-	filename := fmt.Sprintf("%s-%s.jar", packageName, packageVersion)
+	filename := fmt.Sprintf("%s:%s.jar", packageName, packageVersion)
 
 	putFile := func(t *testing.T, path, content string, expectedStatus int) {
 		req := NewRequestWithBody(t, "PUT", root+path, strings.NewReader(content)).
@@ -249,7 +249,7 @@ func TestPackageMaven(t *testing.T) {
 
 		partialVersion := packageVersion + "-PARTIAL"
 		putFile(t, fmt.Sprintf("/%s/%s", partialVersion, filename), "test", http.StatusCreated)
-		pkgUIURL := fmt.Sprintf("/%s/-/packages/maven/%s-%s/%s", user.Name, groupID, artifactID, partialVersion)
+		pkgUIURL := fmt.Sprintf("/%s/-/packages/maven/%s:%s/%s", user.Name, groupID, artifactID, partialVersion)
 		req := NewRequest(t, "GET", pkgUIURL)
 		resp := MakeRequest(t, req, http.StatusOK)
 		assert.NotContains(t, resp.Body.String(), "Internal server error")
diff --git a/tests/integration/api_packages_nuget_test.go b/tests/integration/api_packages_nuget_test.go
index b4da9695f0..5596925d86 100644
--- a/tests/integration/api_packages_nuget_test.go
+++ b/tests/integration/api_packages_nuget_test.go
@@ -393,7 +393,7 @@ AAAjQmxvYgAAAGm7ENm9SGxMtAFVvPUsPJTF6PbtAAAAAFcVogEJAAAAAQAAAA==`)
 					assert.Equal(t, nuget_module.PropertySymbolID, pps[0].Name)
 					assert.Equal(t, symbolID, pps[0].Value)
 				default:
-					assert.FailNow(t, "unexpected file: %v", pf.Name)
+					assert.FailNow(t, "unexpected file", "name: %s", pf.Name)
 				}
 			}
 
diff --git a/tests/integration/api_packages_rpm_test.go b/tests/integration/api_packages_rpm_test.go
index 3abaec3462..89faa7a67f 100644
--- a/tests/integration/api_packages_rpm_test.go
+++ b/tests/integration/api_packages_rpm_test.go
@@ -24,8 +24,8 @@ import (
 	"forgejo.org/modules/util"
 	"forgejo.org/tests"
 
+	"code.forgejo.org/forgejo/go-rpmutils"
 	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/sassoftware/go-rpmutils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -317,7 +317,7 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`,
 					var result Metadata
 					decodeGzipXML(t, resp, &result)
 
-					assert.EqualValues(t, 1, result.PackageCount)
+					assert.Equal(t, 1, result.PackageCount)
 					assert.Len(t, result.Packages, 1)
 					p := result.Packages[0]
 					assert.Equal(t, "rpm", p.Type)
@@ -366,7 +366,7 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`,
 					var result Filelists
 					decodeGzipXML(t, resp, &result)
 
-					assert.EqualValues(t, 1, result.PackageCount)
+					assert.Equal(t, 1, result.PackageCount)
 					assert.Len(t, result.Packages, 1)
 					p := result.Packages[0]
 					assert.NotEmpty(t, p.Pkgid)
@@ -403,7 +403,7 @@ gpgkey=%sapi/packages/%s/rpm/repository.key`,
 					var result Other
 					decodeGzipXML(t, resp, &result)
 
-					assert.EqualValues(t, 1, result.PackageCount)
+					assert.Equal(t, 1, result.PackageCount)
 					assert.Len(t, result.Packages, 1)
 					p := result.Packages[0]
 					assert.NotEmpty(t, p.Pkgid)
diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go
index ec0d4a2b81..080f2400ff 100644
--- a/tests/integration/api_packages_swift_test.go
+++ b/tests/integration/api_packages_swift_test.go
@@ -35,6 +35,7 @@ func TestPackageSwift(t *testing.T) {
 	packageName := "test_package"
 	packageID := packageScope + "." + packageName
 	packageVersion := "1.0.3"
+	packageVersion2 := "1.0.4"
 	packageAuthor := "KN4CK3R"
 	packageDescription := "Gitea Test Package"
 	packageRepositoryURL := "https://gitea.io/gitea/gitea"
@@ -184,6 +185,94 @@ func TestPackageSwift(t *testing.T) {
 		)
 	})
 
+	t.Run("UploadMultipart", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		uploadPackage := func(t *testing.T, url string, expectedStatus int, sr io.Reader, metadata string) {
+			var body bytes.Buffer
+			mpw := multipart.NewWriter(&body)
+
+			// Read the source archive content
+			sourceContent, err := io.ReadAll(sr)
+			require.NoError(t, err)
+			mpw.WriteField("source-archive", string(sourceContent))
+
+			if metadata != "" {
+				mpw.WriteField("metadata", metadata)
+			}
+
+			mpw.Close()
+
+			req := NewRequestWithBody(t, "PUT", url, &body).
+				SetHeader("Content-Type", mpw.FormDataContentType()).
+				SetHeader("Accept", swift_router.AcceptJSON).
+				AddBasicAuth(user.Name)
+			MakeRequest(t, req, expectedStatus)
+		}
+
+		createArchive := func(files map[string]string) *bytes.Buffer {
+			var buf bytes.Buffer
+			zw := zip.NewWriter(&buf)
+			for filename, content := range files {
+				w, _ := zw.Create(filename)
+				w.Write([]byte(content))
+			}
+			zw.Close()
+			return &buf
+		}
+
+		uploadURL := fmt.Sprintf("%s/%s/%s/%s", url, packageScope, packageName, packageVersion2)
+
+		req := NewRequestWithBody(t, "PUT", uploadURL, bytes.NewReader([]byte{}))
+		MakeRequest(t, req, http.StatusUnauthorized)
+
+		// Test with metadata as form field
+		uploadPackage(
+			t,
+			uploadURL,
+			http.StatusCreated,
+			createArchive(map[string]string{
+				"Package.swift":           contentManifest1,
+				"Package@swift-5.6.swift": contentManifest2,
+			}),
+			`{"name":"`+packageName+`","version":"`+packageVersion2+`","description":"`+packageDescription+`","codeRepository":"`+packageRepositoryURL+`","author":{"givenName":"`+packageAuthor+`"},"repositoryURLs":["`+packageRepositoryURL+`"]}`,
+		)
+
+		pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeSwift)
+		require.NoError(t, err)
+		require.Len(t, pvs, 2) // ATTENTION: many subtests are unable to run separately, they depend on the results of previous tests
+		thisPackageVersion := pvs[0]
+		pd, err := packages.GetPackageDescriptor(db.DefaultContext, thisPackageVersion)
+		require.NoError(t, err)
+		assert.NotNil(t, pd.SemVer)
+		assert.Equal(t, packageID, pd.Package.Name)
+		assert.Equal(t, packageVersion2, pd.Version.Version)
+		assert.IsType(t, &swift_module.Metadata{}, pd.Metadata)
+		metadata := pd.Metadata.(*swift_module.Metadata)
+		assert.Equal(t, packageDescription, metadata.Description)
+		assert.Len(t, metadata.Manifests, 2)
+		assert.Equal(t, contentManifest1, metadata.Manifests[""].Content)
+		assert.Equal(t, contentManifest2, metadata.Manifests["5.6"].Content)
+		assert.Len(t, pd.VersionProperties, 1)
+		assert.Equal(t, packageRepositoryURL, pd.VersionProperties.GetByName(swift_module.PropertyRepositoryURL))
+
+		pfs, err := packages.GetFilesByVersionID(db.DefaultContext, thisPackageVersion.ID)
+		require.NoError(t, err)
+		assert.Len(t, pfs, 1)
+		assert.Equal(t, fmt.Sprintf("%s-%s.zip", packageName, packageVersion2), pfs[0].Name)
+		assert.True(t, pfs[0].IsLead)
+
+		uploadPackage(
+			t,
+			uploadURL,
+			http.StatusConflict,
+			createArchive(map[string]string{
+				"Package.swift": contentManifest1,
+			}),
+			"",
+		)
+	})
+
 	t.Run("Download", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
@@ -212,7 +301,7 @@ func TestPackageSwift(t *testing.T) {
 			SetHeader("Accept", swift_router.AcceptJSON)
 		resp := MakeRequest(t, req, http.StatusOK)
 
-		versionURL := setting.AppURL + url[1:] + fmt.Sprintf("/%s/%s/%s", packageScope, packageName, packageVersion)
+		versionURL := setting.AppURL + url[1:] + fmt.Sprintf("/%s/%s/%s", packageScope, packageName, packageVersion2)
 
 		assert.Equal(t, "1", resp.Header().Get("Content-Version"))
 		assert.Equal(t, fmt.Sprintf(`<%s>; rel="latest-version"`, versionURL), resp.Header().Get("Link"))
@@ -222,9 +311,9 @@ func TestPackageSwift(t *testing.T) {
 		var result *swift_router.EnumeratePackageVersionsResponse
 		DecodeJSON(t, resp, &result)
 
-		assert.Len(t, result.Releases, 1)
-		assert.Contains(t, result.Releases, packageVersion)
-		assert.Equal(t, versionURL, result.Releases[packageVersion].URL)
+		assert.Len(t, result.Releases, 2)
+		assert.Contains(t, result.Releases, packageVersion2)
+		assert.Equal(t, versionURL, result.Releases[packageVersion2].URL)
 
 		req = NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s.json", url, packageScope, packageName)).
 			AddBasicAuth(user.Name)
diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go
index a157d18cd5..183c5ef4a4 100644
--- a/tests/integration/api_packages_test.go
+++ b/tests/integration/api_packages_test.go
@@ -21,11 +21,13 @@ import (
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
 	"forgejo.org/modules/util"
 	packages_service "forgejo.org/services/packages"
 	packages_cleanup_service "forgejo.org/services/packages/cleanup"
 	"forgejo.org/tests"
 
+	"github.com/pquerna/otp/totp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -50,8 +52,7 @@ func TestPackageAPI(t *testing.T) {
 	t.Run("ListPackages", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
-		req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", user.Name)).
-			AddTokenAuth(tokenReadPackage)
+		req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s", user.Name))
 		resp := MakeRequest(t, req, http.StatusOK)
 
 		var apiPackages []*api.Package
@@ -68,12 +69,10 @@ func TestPackageAPI(t *testing.T) {
 	t.Run("GetPackage", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
-		req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s", user.Name, packageName, packageVersion)).
-			AddTokenAuth(tokenReadPackage)
+		req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/dummy/%s/%s", user.Name, packageName, packageVersion))
 		MakeRequest(t, req, http.StatusNotFound)
 
-		req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).
-			AddTokenAuth(tokenReadPackage)
+		req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion))
 		resp := MakeRequest(t, req, http.StatusOK)
 
 		var p *api.Package
@@ -108,6 +107,9 @@ func TestPackageAPI(t *testing.T) {
 			req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/link/%s", user.Name, packageName, repo.Name)).AddTokenAuth(tokenWritePackage)
 			MakeRequest(t, req, http.StatusCreated)
 
+			req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/link/%s", user.Name, packageName, repo.Name))
+			MakeRequest(t, req, http.StatusUnauthorized)
+
 			req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).
 				AddTokenAuth(tokenReadPackage)
 			resp = MakeRequest(t, req, http.StatusOK)
@@ -115,7 +117,7 @@ func TestPackageAPI(t *testing.T) {
 			var ap2 *api.Package
 			DecodeJSON(t, resp, &ap2)
 			assert.NotNil(t, ap2.Repository)
-			assert.EqualValues(t, repo.ID, ap2.Repository.ID)
+			assert.Equal(t, repo.ID, ap2.Repository.ID)
 
 			// link to repository without write access, should fail
 			req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/link/%s", user.Name, packageName, "repo3")).AddTokenAuth(tokenWritePackage)
@@ -125,6 +127,9 @@ func TestPackageAPI(t *testing.T) {
 			req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/unlink", user.Name, packageName)).AddTokenAuth(tokenWritePackage)
 			MakeRequest(t, req, http.StatusNoContent)
 
+			req = NewRequest(t, "POST", fmt.Sprintf("/api/v1/packages/%s/generic/%s/-/unlink", user.Name, packageName))
+			MakeRequest(t, req, http.StatusUnauthorized)
+
 			req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).
 				AddTokenAuth(tokenReadPackage)
 			resp = MakeRequest(t, req, http.StatusOK)
@@ -137,7 +142,7 @@ func TestPackageAPI(t *testing.T) {
 			privateRepoID := int64(6)
 			require.NoError(t, packages_model.SetRepositoryLink(db.DefaultContext, p.ID, privateRepoID))
 
-			req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).AddTokenAuth(tokenReadPackage)
+			req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion))
 			resp = MakeRequest(t, req, http.StatusOK)
 
 			var ap4 *api.Package
@@ -178,6 +183,9 @@ func TestPackageAPI(t *testing.T) {
 			AddTokenAuth(tokenWritePackage)
 		MakeRequest(t, req, http.StatusNotFound)
 
+		req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion))
+		MakeRequest(t, req, http.StatusUnauthorized)
+
 		req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/packages/%s/generic/%s/%s", user.Name, packageName, packageVersion)).
 			AddTokenAuth(tokenWritePackage)
 		MakeRequest(t, req, http.StatusNoContent)
@@ -486,7 +494,7 @@ func TestPackageCleanup(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
 		// Upload and delete a generic package and upload a container blob
-		data, _ := util.CryptoRandomBytes(5)
+		data := util.CryptoRandomBytes(5)
 		url := fmt.Sprintf("/api/packages/%s/generic/cleanup-test/1.1.1/file.bin", user.Name)
 		req := NewRequestWithBody(t, "PUT", url, bytes.NewReader(data)).
 			AddBasicAuth(user.Name)
@@ -496,7 +504,7 @@ func TestPackageCleanup(t *testing.T) {
 			AddBasicAuth(user.Name)
 		MakeRequest(t, req, http.StatusNoContent)
 
-		data, _ = util.CryptoRandomBytes(5)
+		data = util.CryptoRandomBytes(5)
 		url = fmt.Sprintf("/v2/%s/cleanup-test/blobs/uploads?digest=sha256:%x", user.Name, sha256.Sum256(data))
 		req = NewRequestWithBody(t, "POST", url, bytes.NewReader(data)).
 			AddBasicAuth(user.Name)
@@ -667,3 +675,97 @@ func TestPackageCleanup(t *testing.T) {
 		}
 	})
 }
+
+func TestPackageWithTwoFactor(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+
+	runTest := func(t *testing.T, doer *user_model.User, useTOTP bool, expectedStatus int) {
+		t.Helper()
+		if doer != nil {
+			defer unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: doer.ID})
+		}
+
+		passcode := func() string {
+			if !useTOTP {
+				return ""
+			}
+
+			otpKey, err := totp.Generate(totp.GenerateOpts{
+				SecretSize:  40,
+				Issuer:      "forgejo-test",
+				AccountName: doer.Name,
+			})
+			require.NoError(t, err)
+
+			require.NoError(t, auth_model.NewTwoFactor(t.Context(), &auth_model.TwoFactor{UID: doer.ID}, otpKey.Secret()))
+
+			passcode, err := totp.GenerateCode(otpKey.Secret(), time.Now())
+			require.NoError(t, err)
+			return passcode
+		}()
+
+		url := fmt.Sprintf("/api/v1/packages/%s", normalUser.Name) // a public packge to test
+		req := NewRequest(t, "GET", url)
+		if doer != nil {
+			req.AddBasicAuth(doer.Name)
+		}
+
+		if useTOTP {
+			MakeRequest(t, req, http.StatusUnauthorized)
+
+			req = NewRequest(t, "GET", url).
+				AddBasicAuth(doer.Name)
+			req.Header.Set("X-Forgejo-OTP", passcode)
+		}
+
+		MakeRequest(t, req, expectedStatus)
+	}
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		// this should be the default, so don't have to set the variable
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusOK)
+			runTest(t, normalUser, false, http.StatusOK)
+			runTest(t, nil, false, http.StatusOK) // anonymous
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK)
+			runTest(t, normalUser, true, http.StatusOK)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusForbidden)
+			runTest(t, normalUser, false, http.StatusForbidden)
+			runTest(t, nil, false, http.StatusOK) // anonymous
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK)
+			runTest(t, normalUser, true, http.StatusOK)
+		})
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusForbidden)
+			runTest(t, normalUser, false, http.StatusOK)
+			runTest(t, nil, false, http.StatusOK) // anonymous
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK)
+			runTest(t, normalUser, true, http.StatusOK)
+		})
+	})
+}
diff --git a/tests/integration/api_private_serv_test.go b/tests/integration/api_private_serv_test.go
index a7dc59a611..6a62169b40 100644
--- a/tests/integration/api_private_serv_test.go
+++ b/tests/integration/api_private_serv_test.go
@@ -5,12 +5,19 @@ package integration
 
 import (
 	"context"
+	"net/http"
 	"net/url"
 	"testing"
 
 	asymkey_model "forgejo.org/models/asymkey"
+	"forgejo.org/models/auth"
 	"forgejo.org/models/perm"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/private"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -152,3 +159,90 @@ func TestAPIPrivateServ(t *testing.T) {
 		assert.Equal(t, int64(20), results.RepoID)
 	})
 }
+
+func TestAPIPrivateServAndNoServWithRequiredTwoFactor(t *testing.T) {
+	onGiteaRun(t, func(*testing.T, *url.URL) {
+		ctx, cancel := context.WithCancel(t.Context())
+		defer cancel()
+
+		runTest := func(t *testing.T, user *user_model.User, useTOTP, servAllowed bool) {
+			t.Helper()
+			repo, _, reset := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{})
+			defer reset()
+
+			pubKey, err := asymkey_model.AddPublicKey(ctx, user.ID, "tmp-key-"+user.Name, "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBGXEEzWmm1dxb+57RoK5KVCL0w2eNv9cqJX2AGGVlkFsVDhOXHzsadS3LTK4VlEbbrDMJdoti9yM8vclA8IeRacAAAAEc3NoOg== nocomment", 0)
+			require.NoError(t, err)
+			defer unittest.AssertSuccessfulDelete(t, &asymkey_model.PublicKey{ID: pubKey.ID})
+
+			if useTOTP {
+				session := loginUser(t, user.Name)
+				session.EnrollTOTP(t)
+				session.MakeRequest(t, NewRequest(t, "POST", "/user/logout"), http.StatusOK)
+				defer unittest.AssertSuccessfulDelete(t, &auth.TwoFactor{UID: user.ID})
+			}
+
+			// Can push to a repo
+			_, extra := private.ServCommand(ctx, pubKey.ID, user.Name, repo.Name, perm.AccessModeWrite, "git-upload-pack", "")
+			_, _, err = private.ServNoCommand(ctx, pubKey.ID)
+			if servAllowed {
+				require.NoError(t, extra.Error)
+				require.NoError(t, err)
+			} else {
+				require.Error(t, extra.Error)
+				require.Error(t, err)
+			}
+		}
+
+		adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+		normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+		restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+
+		t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+			// this should be the default, so don't have to set the variable
+
+			t.Run("no 2fa", func(t *testing.T) {
+				runTest(t, adminUser, false, true)
+				runTest(t, normalUser, false, true)
+				runTest(t, restrictedUser, false, true)
+			})
+
+			t.Run("enabled 2fa", func(t *testing.T) {
+				runTest(t, adminUser, true, true)
+				runTest(t, normalUser, true, true)
+				runTest(t, restrictedUser, true, true)
+			})
+		})
+
+		t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+			defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+			t.Run("no 2fa", func(t *testing.T) {
+				runTest(t, adminUser, false, false)
+				runTest(t, normalUser, false, false)
+				runTest(t, restrictedUser, false, false)
+			})
+
+			t.Run("enabled 2fa", func(t *testing.T) {
+				runTest(t, adminUser, true, true)
+				runTest(t, normalUser, true, true)
+				runTest(t, restrictedUser, true, true)
+			})
+		})
+
+		t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+			defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+			t.Run("no 2fa", func(t *testing.T) {
+				runTest(t, adminUser, false, false)
+				runTest(t, normalUser, false, true)
+				runTest(t, restrictedUser, false, true)
+			})
+
+			t.Run("enabled 2fa", func(t *testing.T) {
+				runTest(t, adminUser, true, true)
+				runTest(t, normalUser, true, true)
+				runTest(t, restrictedUser, true, true)
+			})
+		})
+	})
+}
diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go
index 930f9b816b..9f00686b57 100644
--- a/tests/integration/api_pull_review_test.go
+++ b/tests/integration/api_pull_review_test.go
@@ -85,7 +85,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 				resp := MakeRequest(t, req, http.StatusOK)
 				DecodeJSON(t, resp, &review)
 				require.EqualValues(t, string(event), review.State)
-				require.EqualValues(t, 0, review.CodeCommentsCount)
+				require.Equal(t, 0, review.CodeCommentsCount)
 			}
 
 			{
@@ -94,7 +94,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 				resp := MakeRequest(t, req, http.StatusOK)
 				var getReview api.PullReview
 				DecodeJSON(t, resp, &getReview)
-				require.EqualValues(t, getReview, review)
+				require.Equal(t, getReview, review)
 			}
 			requireReviewCount(2)
 
@@ -109,11 +109,11 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 				}).AddTokenAuth(token)
 				resp := MakeRequest(t, req, http.StatusOK)
 				DecodeJSON(t, resp, &reviewComment)
-				assert.EqualValues(t, review.ID, reviewComment.ReviewID)
-				assert.EqualValues(t, newCommentBody, reviewComment.Body)
+				assert.Equal(t, review.ID, reviewComment.ReviewID)
+				assert.Equal(t, newCommentBody, reviewComment.Body)
 				assert.EqualValues(t, reviewLine, reviewComment.OldLineNum)
 				assert.EqualValues(t, 0, reviewComment.LineNum)
-				assert.EqualValues(t, path, reviewComment.Path)
+				assert.Equal(t, path, reviewComment.Path)
 			}
 
 			{
@@ -123,7 +123,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) {
 
 				var comment api.PullReviewComment
 				DecodeJSON(t, resp, &comment)
-				assert.EqualValues(t, reviewComment, comment)
+				assert.Equal(t, reviewComment, comment)
 			}
 
 			{
@@ -167,17 +167,17 @@ func TestAPIPullReview(t *testing.T) {
 		return
 	}
 	for _, r := range reviews {
-		assert.EqualValues(t, pullIssue.HTMLURL(), r.HTMLPullURL)
+		assert.Equal(t, pullIssue.HTMLURL(), r.HTMLPullURL)
 	}
 	assert.EqualValues(t, 8, reviews[3].ID)
 	assert.EqualValues(t, "APPROVED", reviews[3].State)
-	assert.EqualValues(t, 0, reviews[3].CodeCommentsCount)
+	assert.Equal(t, 0, reviews[3].CodeCommentsCount)
 	assert.True(t, reviews[3].Stale)
 	assert.False(t, reviews[3].Official)
 
 	assert.EqualValues(t, 10, reviews[5].ID)
 	assert.EqualValues(t, "REQUEST_CHANGES", reviews[5].State)
-	assert.EqualValues(t, 1, reviews[5].CodeCommentsCount)
+	assert.Equal(t, 1, reviews[5].CodeCommentsCount)
 	assert.EqualValues(t, -1, reviews[5].Reviewer.ID) // ghost user
 	assert.False(t, reviews[5].Stale)
 	assert.True(t, reviews[5].Official)
@@ -188,13 +188,13 @@ func TestAPIPullReview(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	var review api.PullReview
 	DecodeJSON(t, resp, &review)
-	assert.EqualValues(t, *reviews[3], review)
+	assert.Equal(t, *reviews[3], review)
 
 	req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, reviews[5].ID).
 		AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &review)
-	assert.EqualValues(t, *reviews[5], review)
+	assert.Equal(t, *reviews[5], review)
 
 	// test GetPullReviewComments
 	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 7})
@@ -204,11 +204,11 @@ func TestAPIPullReview(t *testing.T) {
 	var reviewComments []*api.PullReviewComment
 	DecodeJSON(t, resp, &reviewComments)
 	assert.Len(t, reviewComments, 1)
-	assert.EqualValues(t, "Ghost", reviewComments[0].Poster.UserName)
-	assert.EqualValues(t, "a review from a deleted user", reviewComments[0].Body)
-	assert.EqualValues(t, comment.ID, reviewComments[0].ID)
+	assert.Equal(t, "Ghost", reviewComments[0].Poster.UserName)
+	assert.Equal(t, "a review from a deleted user", reviewComments[0].Body)
+	assert.Equal(t, comment.ID, reviewComments[0].ID)
 	assert.EqualValues(t, comment.UpdatedUnix, reviewComments[0].Updated.Unix())
-	assert.EqualValues(t, comment.HTMLURL(db.DefaultContext), reviewComments[0].HTMLURL)
+	assert.Equal(t, comment.HTMLURL(db.DefaultContext), reviewComments[0].HTMLURL)
 
 	// test CreatePullReview
 	req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews", repo.OwnerName, repo.Name, pullIssue.Index), &api.CreatePullReviewOptions{
@@ -237,7 +237,7 @@ func TestAPIPullReview(t *testing.T) {
 	DecodeJSON(t, resp, &review)
 	assert.EqualValues(t, 6, review.ID)
 	assert.EqualValues(t, "PENDING", review.State)
-	assert.EqualValues(t, 3, review.CodeCommentsCount)
+	assert.Equal(t, 3, review.CodeCommentsCount)
 
 	// test SubmitPullReview
 	req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, review.ID), &api.SubmitPullReviewOptions{
@@ -248,7 +248,7 @@ func TestAPIPullReview(t *testing.T) {
 	DecodeJSON(t, resp, &review)
 	assert.EqualValues(t, 6, review.ID)
 	assert.EqualValues(t, "APPROVED", review.State)
-	assert.EqualValues(t, 3, review.CodeCommentsCount)
+	assert.Equal(t, 3, review.CodeCommentsCount)
 
 	// test dismiss review
 	req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d/dismissals", repo.OwnerName, repo.Name, pullIssue.Index, review.ID), &api.DismissPullReviewOptions{
@@ -275,7 +275,7 @@ func TestAPIPullReview(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &review)
 	assert.EqualValues(t, "COMMENT", review.State)
-	assert.EqualValues(t, 0, review.CodeCommentsCount)
+	assert.Equal(t, 0, review.CodeCommentsCount)
 	req = NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d", repo.OwnerName, repo.Name, pullIssue.Index, review.ID).
 		AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusNoContent)
@@ -303,7 +303,7 @@ func TestAPIPullReview(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &commentReview)
 	assert.EqualValues(t, "COMMENT", commentReview.State)
-	assert.EqualValues(t, 2, commentReview.CodeCommentsCount)
+	assert.Equal(t, 2, commentReview.CodeCommentsCount)
 	assert.Empty(t, commentReview.Body)
 	assert.False(t, commentReview.Dismissed)
 
@@ -318,8 +318,8 @@ func TestAPIPullReview(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &commentReview)
 	assert.EqualValues(t, "COMMENT", commentReview.State)
-	assert.EqualValues(t, 0, commentReview.CodeCommentsCount)
-	assert.EqualValues(t, commentBody, commentReview.Body)
+	assert.Equal(t, 0, commentReview.CodeCommentsCount)
+	assert.Equal(t, commentBody, commentReview.Body)
 	assert.False(t, commentReview.Dismissed)
 
 	// test CreatePullReview Comment without body and no comments
@@ -331,7 +331,7 @@ func TestAPIPullReview(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusUnprocessableEntity)
 	errMap := make(map[string]any)
 	json.Unmarshal(resp.Body.Bytes(), &errMap)
-	assert.EqualValues(t, "review event COMMENT requires a body or a comment", errMap["message"].(string))
+	assert.Equal(t, "review event COMMENT requires a body or a comment", errMap["message"].(string))
 
 	// test get review requests
 	// to make it simple, use same api with get review
@@ -345,14 +345,14 @@ func TestAPIPullReview(t *testing.T) {
 	DecodeJSON(t, resp, &reviews)
 	assert.EqualValues(t, 11, reviews[0].ID)
 	assert.EqualValues(t, "REQUEST_REVIEW", reviews[0].State)
-	assert.EqualValues(t, 0, reviews[0].CodeCommentsCount)
+	assert.Equal(t, 0, reviews[0].CodeCommentsCount)
 	assert.False(t, reviews[0].Stale)
 	assert.True(t, reviews[0].Official)
-	assert.EqualValues(t, "test_team", reviews[0].ReviewerTeam.Name)
+	assert.Equal(t, "test_team", reviews[0].ReviewerTeam.Name)
 
 	assert.EqualValues(t, 12, reviews[1].ID)
 	assert.EqualValues(t, "REQUEST_REVIEW", reviews[1].State)
-	assert.EqualValues(t, 0, reviews[0].CodeCommentsCount)
+	assert.Equal(t, 0, reviews[0].CodeCommentsCount)
 	assert.False(t, reviews[1].Stale)
 	assert.True(t, reviews[1].Official)
 	assert.EqualValues(t, 1, reviews[1].Reviewer.ID)
diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go
index e35eca38cf..301d351238 100644
--- a/tests/integration/api_pull_test.go
+++ b/tests/integration/api_pull_test.go
@@ -56,9 +56,9 @@ func TestAPIViewPulls(t *testing.T) {
 				if assert.Len(t, files, 1) {
 					assert.Equal(t, "File-WoW", files[0].Filename)
 					assert.Empty(t, files[0].PreviousFilename)
-					assert.EqualValues(t, 1, files[0].Additions)
-					assert.EqualValues(t, 1, files[0].Changes)
-					assert.EqualValues(t, 0, files[0].Deletions)
+					assert.Equal(t, 1, files[0].Additions)
+					assert.Equal(t, 1, files[0].Changes)
+					assert.Equal(t, 0, files[0].Deletions)
 					assert.Equal(t, "added", files[0].Status)
 				}
 			}))
@@ -177,12 +177,12 @@ func TestAPICreatePullWithFieldsSuccess(t *testing.T) {
 	DecodeJSON(t, res, pull)
 
 	assert.NotNil(t, pull.Milestone)
-	assert.EqualValues(t, opts.Milestone, pull.Milestone.ID)
+	assert.Equal(t, opts.Milestone, pull.Milestone.ID)
 	if assert.Len(t, pull.Assignees, 1) {
-		assert.EqualValues(t, opts.Assignees[0], owner10.Name)
+		assert.Equal(t, opts.Assignees[0], owner10.Name)
 	}
 	assert.NotNil(t, pull.Labels)
-	assert.EqualValues(t, opts.Labels[0], pull.Labels[0].ID)
+	assert.Equal(t, opts.Labels[0], pull.Labels[0].ID)
 }
 
 func TestAPICreatePullWithFieldsFailure(t *testing.T) {
@@ -236,7 +236,7 @@ func TestAPIEditPull(t *testing.T) {
 	apiPull := new(api.PullRequest)
 	resp := MakeRequest(t, req, http.StatusCreated)
 	DecodeJSON(t, resp, apiPull)
-	assert.EqualValues(t, "master", apiPull.Base.Name)
+	assert.Equal(t, "master", apiPull.Base.Name)
 
 	newTitle := "edit a this pr"
 	newBody := "edited body"
@@ -248,7 +248,7 @@ func TestAPIEditPull(t *testing.T) {
 	}).AddTokenAuth(token)
 	resp = MakeRequest(t, req, http.StatusCreated)
 	DecodeJSON(t, resp, apiPull)
-	assert.EqualValues(t, "feature/1", apiPull.Base.Name)
+	assert.Equal(t, "feature/1", apiPull.Base.Name)
 	// check comment history
 	pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: apiPull.ID})
 	err := pull.LoadIssue(db.DefaultContext)
@@ -264,7 +264,7 @@ func TestAPIEditPull(t *testing.T) {
 	apiPullIdempotent := new(api.PullRequest)
 	resp = MakeRequest(t, req, http.StatusCreated)
 	DecodeJSON(t, resp, apiPullIdempotent)
-	assert.EqualValues(t, apiPull.State, apiPullIdempotent.State)
+	assert.Equal(t, apiPull.State, apiPullIdempotent.State)
 
 	req = NewRequestWithJSON(t, http.MethodPatch, urlStr, &api.EditPullRequestOption{
 		Base: "not-exist",
@@ -340,7 +340,7 @@ func TestAPIPullDeleteBranchPerms(t *testing.T) {
 		var bodyResp userResponse
 		DecodeJSON(t, resp, &bodyResp)
 
-		assert.EqualValues(t, "insufficient permission to delete head branch", bodyResp.Message)
+		assert.Equal(t, "insufficient permission to delete head branch", bodyResp.Message)
 
 		// Check that the branch still exist.
 		req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/branches/base-pr").AddTokenAuth(token)
diff --git a/tests/integration/api_push_mirror_test.go b/tests/integration/api_push_mirror_test.go
index 282c3aaba0..48976fd5eb 100644
--- a/tests/integration/api_push_mirror_test.go
+++ b/tests/integration/api_push_mirror_test.go
@@ -14,6 +14,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"testing"
 	"time"
 
@@ -123,7 +124,7 @@ func testAPIPushMirror(t *testing.T, u *url.URL) {
 			if testCase.message != "" {
 				err := api.APIError{}
 				DecodeJSON(t, resp, &err)
-				assert.EqualValues(t, testCase.message, err.Message)
+				assert.Equal(t, testCase.message, err.Message)
 			}
 
 			req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
@@ -132,7 +133,7 @@ func testAPIPushMirror(t *testing.T, u *url.URL) {
 			DecodeJSON(t, resp, &pushMirrors)
 			if assert.Len(t, pushMirrors, testCase.mirrorCount) && testCase.mirrorCount > 0 {
 				pushMirror := pushMirrors[0]
-				assert.EqualValues(t, remoteAddress, pushMirror.RemoteAddress)
+				assert.Equal(t, remoteAddress, pushMirror.RemoteAddress)
 
 				repo_model.DeletePushMirrors = deletePushMirrors
 				req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirror.RemoteName)).AddTokenAuth(token)
@@ -142,6 +143,159 @@ func testAPIPushMirror(t *testing.T, u *url.URL) {
 	}
 }
 
+func TestAPIPushMirrorBranchFilter(t *testing.T) {
+	onGiteaRun(t, testAPIPushMirrorBranchFilter)
+}
+
+func testAPIPushMirrorBranchFilter(t *testing.T, u *url.URL) {
+	defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+	defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+	defer test.MockProtect(&mirror_service.AddPushMirrorRemote)()
+	defer test.MockProtect(&repo_model.DeletePushMirrors)()
+
+	require.NoError(t, migrations.Init())
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: srcRepo.OwnerID})
+	session := loginUser(t, user.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAll)
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/push_mirrors", owner.Name, srcRepo.Name)
+
+	mirrorRepo, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+	defer f()
+	remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo.Name))
+
+	t.Run("Create push mirror with branch filter", func(t *testing.T) {
+		req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+			RemoteAddress: remoteAddress,
+			Interval:      "8h",
+			BranchFilter:  "main,develop",
+		}).AddTokenAuth(token)
+
+		MakeRequest(t, req, http.StatusOK)
+
+		// Verify the push mirror was created with branch filter
+		req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+		resp := MakeRequest(t, req, http.StatusOK)
+		var pushMirrors []*api.PushMirror
+		DecodeJSON(t, resp, &pushMirrors)
+		require.Len(t, pushMirrors, 1)
+		assert.Equal(t, "main,develop", pushMirrors[0].BranchFilter)
+
+		// Cleanup
+		req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirrors[0].RemoteName)).AddTokenAuth(token)
+		MakeRequest(t, req, http.StatusNoContent)
+	})
+
+	t.Run("Create push mirror with empty branch filter", func(t *testing.T) {
+		req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+			RemoteAddress: remoteAddress,
+			Interval:      "8h",
+			BranchFilter:  "",
+		}).AddTokenAuth(token)
+
+		MakeRequest(t, req, http.StatusOK)
+
+		// Verify the push mirror was created with empty branch filter
+		req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+		resp := MakeRequest(t, req, http.StatusOK)
+		var pushMirrors []*api.PushMirror
+		DecodeJSON(t, resp, &pushMirrors)
+		require.Len(t, pushMirrors, 1)
+		assert.Empty(t, pushMirrors[0].BranchFilter)
+
+		// Cleanup
+		req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirrors[0].RemoteName)).AddTokenAuth(token)
+		MakeRequest(t, req, http.StatusNoContent)
+	})
+
+	t.Run("Create push mirror without branch filter parameter", func(t *testing.T) {
+		req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+			RemoteAddress: remoteAddress,
+			Interval:      "8h",
+			// BranchFilter: ""
+		}).AddTokenAuth(token)
+
+		MakeRequest(t, req, http.StatusOK)
+
+		// Verify the push mirror defaults to empty branch filter
+		req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+		resp := MakeRequest(t, req, http.StatusOK)
+		var pushMirrors []*api.PushMirror
+		DecodeJSON(t, resp, &pushMirrors)
+		require.Len(t, pushMirrors, 1)
+		assert.Empty(t, pushMirrors[0].BranchFilter)
+
+		// Cleanup
+		req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirrors[0].RemoteName)).AddTokenAuth(token)
+		MakeRequest(t, req, http.StatusNoContent)
+	})
+
+	t.Run("Retrieve multiple push mirrors with different branch filters", func(t *testing.T) {
+		// Create multiple push mirrors with different branch filters
+		testCases := []struct {
+			name         string
+			branchFilter string
+		}{
+			{"mirror-1", "main"},
+			{"mirror-2", "develop,feature-*"},
+			{"mirror-3", ""},
+		}
+
+		// Create mirrors
+		mirrorCleanups := []func(){}
+		defer func() {
+			for _, mirror := range mirrorCleanups {
+				mirror()
+			}
+		}()
+		for _, tc := range testCases {
+			mirrorRepo, _, f := tests.CreateDeclarativeRepo(t, user, tc.name, []unit.Type{unit.TypeCode}, nil, nil)
+			mirrorCleanups = append(mirrorCleanups, f)
+
+			remoteAddr := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo.Name))
+			req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+				RemoteAddress: remoteAddr,
+				Interval:      "8h",
+				BranchFilter:  tc.branchFilter,
+			}).AddTokenAuth(token)
+
+			MakeRequest(t, req, http.StatusOK)
+		}
+
+		// Retrieve all mirrors and verify branch filters
+		req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+		resp := MakeRequest(t, req, http.StatusOK)
+		var pushMirrors []*api.PushMirror
+		DecodeJSON(t, resp, &pushMirrors)
+		require.Len(t, pushMirrors, 3)
+
+		// Create a map for easier verification
+		filterMap := make(map[string]string)
+		var createdMirrors []*api.PushMirror
+		for _, mirror := range pushMirrors {
+			for _, tc := range testCases {
+				if strings.Contains(mirror.RemoteAddress, tc.name) {
+					filterMap[tc.name] = mirror.BranchFilter
+					createdMirrors = append(createdMirrors, mirror)
+					break
+				}
+			}
+		}
+
+		assert.Equal(t, "main", filterMap["mirror-1"])
+		assert.Equal(t, "develop,feature-*", filterMap["mirror-2"])
+		assert.Empty(t, filterMap["mirror-3"])
+
+		// Cleanup
+		for _, mirror := range createdMirrors {
+			req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, mirror.RemoteName)).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusNoContent)
+		}
+	})
+}
+
 func TestAPIPushMirrorSSH(t *testing.T) {
 	_, err := exec.LookPath("ssh")
 	if err != nil {
@@ -182,7 +336,7 @@ func TestAPIPushMirrorSSH(t *testing.T) {
 
 			var apiError api.APIError
 			DecodeJSON(t, resp, &apiError)
-			assert.EqualValues(t, "'use_ssh' is mutually exclusive with 'remote_username' and 'remote_passoword'", apiError.Message)
+			assert.Equal(t, "'use_ssh' is mutually exclusive with 'remote_username' and 'remote_passoword'", apiError.Message)
 		})
 
 		t.Run("SSH not available", func(t *testing.T) {
@@ -198,7 +352,7 @@ func TestAPIPushMirrorSSH(t *testing.T) {
 
 			var apiError api.APIError
 			DecodeJSON(t, resp, &apiError)
-			assert.EqualValues(t, "SSH authentication not available.", apiError.Message)
+			assert.Equal(t, "SSH authentication not available.", apiError.Message)
 		})
 
 		t.Run("Normal", func(t *testing.T) {
@@ -228,7 +382,7 @@ func TestAPIPushMirrorSSH(t *testing.T) {
 				var pushMirrors []*api.PushMirror
 				DecodeJSON(t, resp, &pushMirrors)
 				assert.Len(t, pushMirrors, 1)
-				assert.EqualValues(t, publickey, pushMirrors[0].PublicKey)
+				assert.Equal(t, publickey, pushMirrors[0].PublicKey)
 			})
 
 			t.Run("Add deploy key", func(t *testing.T) {
@@ -262,7 +416,7 @@ func TestAPIPushMirrorSSH(t *testing.T) {
 				DecodeJSON(t, resp, &commitList)
 
 				assert.Len(t, commitList, 1)
-				assert.EqualValues(t, sha, commitList[0].SHA)
+				assert.Equal(t, sha, commitList[0].SHA)
 
 				assert.Eventually(t, func() bool {
 					req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/commits?limit=1", srcRepo.FullName())).AddTokenAuth(token)
diff --git a/tests/integration/api_quota_management_test.go b/tests/integration/api_quota_management_test.go
index c46c857197..5a30fc638e 100644
--- a/tests/integration/api_quota_management_test.go
+++ b/tests/integration/api_quota_management_test.go
@@ -122,20 +122,20 @@ func TestAPIQuotaCreateGroupWithRules(t *testing.T) {
 	require.NoError(t, err)
 	assert.NotNil(t, rule)
 	assert.EqualValues(t, -1, rule.Limit)
-	assert.EqualValues(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeAll}, rule.Subjects)
+	assert.Equal(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeAll}, rule.Subjects)
 
 	rule, err = quota_model.GetRuleByName(db.DefaultContext, "deny-git-lfs")
 	require.NoError(t, err)
 	assert.NotNil(t, rule)
 	assert.EqualValues(t, 0, rule.Limit)
-	assert.EqualValues(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeGitLFS}, rule.Subjects)
+	assert.Equal(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeGitLFS}, rule.Subjects)
 
 	// Verify that the new rule was also created
 	rule, err = quota_model.GetRuleByName(db.DefaultContext, "new-rule")
 	require.NoError(t, err)
 	assert.NotNil(t, rule)
 	assert.EqualValues(t, 0, rule.Limit)
-	assert.EqualValues(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeAssetsAll}, rule.Subjects)
+	assert.Equal(t, quota_model.LimitSubjects{quota_model.LimitSubjectSizeAssetsAll}, rule.Subjects)
 
 	t.Run("invalid rule spec", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
@@ -176,7 +176,7 @@ func TestAPIQuotaEmptyState(t *testing.T) {
 		var q api.QuotaInfo
 		DecodeJSON(t, resp, &q)
 
-		assert.EqualValues(t, api.QuotaUsed{}, q.Used)
+		assert.Equal(t, api.QuotaUsed{}, q.Used)
 		assert.Empty(t, q.Groups)
 	})
 
@@ -189,7 +189,7 @@ func TestAPIQuotaEmptyState(t *testing.T) {
 		var q api.QuotaInfo
 		DecodeJSON(t, resp, &q)
 
-		assert.EqualValues(t, api.QuotaUsed{}, q.Used)
+		assert.Equal(t, api.QuotaUsed{}, q.Used)
 		assert.Empty(t, q.Groups)
 
 		t.Run("#/user/quota/artifacts", func(t *testing.T) {
@@ -295,7 +295,7 @@ func TestAPIQuotaAdminRoutesRules(t *testing.T) {
 
 		assert.Equal(t, "deny-all", q.Name)
 		assert.EqualValues(t, 0, q.Limit)
-		assert.EqualValues(t, []string{"size:all"}, q.Subjects)
+		assert.Equal(t, []string{"size:all"}, q.Subjects)
 
 		rule, err := quota_model.GetRuleByName(db.DefaultContext, "deny-all")
 		require.NoError(t, err)
diff --git a/tests/integration/api_quota_use_test.go b/tests/integration/api_quota_use_test.go
index 2b50cca4ab..1cac2d8d76 100644
--- a/tests/integration/api_quota_use_test.go
+++ b/tests/integration/api_quota_use_test.go
@@ -377,7 +377,7 @@ func TestAPIQuotaError(t *testing.T) {
 		var msg context.APIQuotaExceeded
 		DecodeJSON(t, resp, &msg)
 
-		assert.EqualValues(t, env.Orgs.Limited.ID, msg.UserID)
+		assert.Equal(t, env.Orgs.Limited.ID, msg.UserID)
 		assert.Equal(t, env.Orgs.Limited.UserName, msg.UserName)
 	})
 }
diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go
index 98fc293fbc..f25948989a 100644
--- a/tests/integration/api_releases_test.go
+++ b/tests/integration/api_releases_test.go
@@ -99,7 +99,7 @@ func createNewReleaseUsingAPI(t *testing.T, token string, owner *user_model.User
 		Title:   newRelease.Title,
 	}
 	unittest.AssertExistsAndLoadBean(t, rel)
-	assert.EqualValues(t, newRelease.Note, rel.Note)
+	assert.Equal(t, newRelease.Note, rel.Note)
 
 	return &newRelease
 }
@@ -157,7 +157,7 @@ func TestAPICreateAndUpdateRelease(t *testing.T) {
 		Title:   newRelease.Title,
 	}
 	unittest.AssertExistsAndLoadBean(t, rel)
-	assert.EqualValues(t, rel.Note, newRelease.Note)
+	assert.Equal(t, rel.Note, newRelease.Note)
 	assert.True(t, newRelease.HideArchiveLinks)
 }
 
@@ -336,7 +336,7 @@ func TestAPIUploadAssetRelease(t *testing.T) {
 		var attachment *api.Attachment
 		DecodeJSON(t, resp, &attachment)
 
-		assert.EqualValues(t, filename, attachment.Name)
+		assert.Equal(t, filename, attachment.Name)
 		assert.EqualValues(t, 104, attachment.Size)
 
 		req = NewRequestWithBody(t, http.MethodPost, assetURL+"?name=test-asset", bytes.NewReader(body.Bytes())).
@@ -347,7 +347,7 @@ func TestAPIUploadAssetRelease(t *testing.T) {
 		var attachment2 *api.Attachment
 		DecodeJSON(t, resp, &attachment2)
 
-		assert.EqualValues(t, "test-asset", attachment2.Name)
+		assert.Equal(t, "test-asset", attachment2.Name)
 		assert.EqualValues(t, 104, attachment2.Size)
 	})
 
@@ -365,9 +365,9 @@ func TestAPIUploadAssetRelease(t *testing.T) {
 		var attachment *api.Attachment
 		DecodeJSON(t, resp, &attachment)
 
-		assert.EqualValues(t, "stream.bin", attachment.Name)
+		assert.Equal(t, "stream.bin", attachment.Name)
 		assert.EqualValues(t, 104, attachment.Size)
-		assert.EqualValues(t, "attachment", attachment.Type)
+		assert.Equal(t, "attachment", attachment.Type)
 	})
 }
 
@@ -424,10 +424,34 @@ func TestAPIExternalAssetRelease(t *testing.T) {
 	var attachment *api.Attachment
 	DecodeJSON(t, resp, &attachment)
 
-	assert.EqualValues(t, "test-asset", attachment.Name)
+	assert.Equal(t, "test-asset", attachment.Name)
 	assert.EqualValues(t, 0, attachment.Size)
-	assert.EqualValues(t, "https://forgejo.org/", attachment.DownloadURL)
-	assert.EqualValues(t, "external", attachment.Type)
+	assert.Equal(t, "https://forgejo.org/", attachment.DownloadURL)
+	assert.Equal(t, "external", attachment.Type)
+}
+
+func TestAPIAllowedAPIURLInRelease(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+	session := loginUser(t, owner.LowerName)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+
+	r := createNewReleaseUsingAPI(t, token, owner, repo, "release-tag", "", "Release Tag", "test")
+	internalURL := "https://localhost:3003/api/packages/owner/generic/test/1.0.0/test.txt"
+
+	req := NewRequest(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/releases/%d/assets?name=test-asset&external_url=%s", owner.Name, repo.Name, r.ID, url.QueryEscape(internalURL))).
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusCreated)
+
+	var attachment *api.Attachment
+	DecodeJSON(t, resp, &attachment)
+
+	assert.Equal(t, "test-asset", attachment.Name)
+	assert.EqualValues(t, 0, attachment.Size)
+	assert.Equal(t, internalURL, attachment.DownloadURL)
+	assert.Equal(t, "external", attachment.Type)
 }
 
 func TestAPIDuplicateAssetRelease(t *testing.T) {
diff --git a/tests/integration/api_repo_actions_test.go b/tests/integration/api_repo_actions_test.go
index 42c1038a0e..af2aa10cfd 100644
--- a/tests/integration/api_repo_actions_test.go
+++ b/tests/integration/api_repo_actions_test.go
@@ -44,7 +44,7 @@ func TestAPISearchActionJobs_RepoRunner(t *testing.T) {
 	DecodeJSON(t, res, &jobs)
 
 	assert.Len(t, jobs, 1)
-	assert.EqualValues(t, job.ID, jobs[0].ID)
+	assert.Equal(t, job.ID, jobs[0].ID)
 }
 
 func TestAPIWorkflowDispatchReturnInfo(t *testing.T) {
@@ -101,3 +101,143 @@ jobs:
 		assert.Len(t, run.Jobs, 2)
 	})
 }
+
+func TestAPIGetListActionRun(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	var (
+		runIDs = []int64{892, 893, 894}
+		dbRuns = make(map[int64]*actions_model.ActionRun, 3)
+	)
+
+	for _, id := range runIDs {
+		dbRuns[id] = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: id})
+	}
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: dbRuns[runIDs[0]].RepoID})
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+	token := getUserToken(t, user.LowerName, auth_model.AccessTokenScopeWriteRepository)
+
+	testqueries := []struct {
+		name        string
+		query       string
+		expectedIDs []int64
+	}{
+		{
+			name:        "No query parameters",
+			query:       "",
+			expectedIDs: runIDs,
+		},
+		{
+			name:        "Search for workflow_dispatch events",
+			query:       "?event=workflow_dispatch",
+			expectedIDs: []int64{894},
+		},
+		{
+			name:        "Search for multiple events",
+			query:       "?event=workflow_dispatch&event=push",
+			expectedIDs: []int64{892, 894},
+		},
+		{
+			name:        "Search for failed status",
+			query:       "?status=failure",
+			expectedIDs: []int64{893},
+		},
+		{
+			name:        "Search for multiple statuses",
+			query:       "?status=failure&status=running",
+			expectedIDs: []int64{893, 894},
+		},
+		{
+			name:        "Search for num_nr",
+			query:       "?run_number=1",
+			expectedIDs: []int64{892},
+		},
+		{
+			name:        "Search for sha",
+			query:       "?head_sha=97f29ee599c373c729132a5c46a046978311e0ee",
+			expectedIDs: []int64{892, 894},
+		},
+	}
+
+	for _, tt := range testqueries {
+		t.Run(tt.name, func(t *testing.T) {
+			req := NewRequest(t, http.MethodGet,
+				fmt.Sprintf("/api/v1/repos/%s/%s/actions/runs%s",
+					repo.OwnerName, repo.Name, tt.query,
+				),
+			)
+			req.AddTokenAuth(token)
+
+			res := MakeRequest(t, req, http.StatusOK)
+			apiRuns := new(api.ListActionRunResponse)
+			DecodeJSON(t, res, apiRuns)
+
+			assert.Equal(t, int64(len(tt.expectedIDs)), apiRuns.TotalCount)
+			assert.Len(t, apiRuns.Entries, len(tt.expectedIDs))
+
+			resultIDs := make([]int64, apiRuns.TotalCount)
+			for i, run := range apiRuns.Entries {
+				resultIDs[i] = run.ID
+			}
+
+			assert.ElementsMatch(t, tt.expectedIDs, resultIDs)
+		})
+	}
+}
+
+func TestAPIGetActionRun(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 63})
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+	token := getUserToken(t, user.LowerName, auth_model.AccessTokenScopeWriteRepository)
+
+	testqueries := []struct {
+		name           string
+		runID          int64
+		expectedStatus int
+	}{
+		{
+			name:           "existing return ok",
+			runID:          892,
+			expectedStatus: http.StatusOK,
+		},
+		{
+			name:           "non existing run",
+			runID:          9876543210, // I hope this run will not exists, else just change it to another.
+			expectedStatus: http.StatusNotFound,
+		},
+		{
+			name:           "existing run but wrong repo should not be found",
+			runID:          891,
+			expectedStatus: http.StatusNotFound,
+		},
+	}
+
+	for _, tt := range testqueries {
+		t.Run(tt.name, func(t *testing.T) {
+			req := NewRequest(t, http.MethodGet,
+				fmt.Sprintf("/api/v1/repos/%s/%s/actions/runs/%d",
+					repo.OwnerName, repo.Name, tt.runID,
+				),
+			)
+			req.AddTokenAuth(token)
+
+			res := MakeRequest(t, req, tt.expectedStatus)
+
+			// Only interested in the data if 200 OK
+			if tt.expectedStatus != http.StatusOK {
+				return
+			}
+
+			dbRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: tt.runID})
+			apiRun := new(api.ActionRun)
+			DecodeJSON(t, res, apiRun)
+
+			assert.Equal(t, dbRun.Index, apiRun.Index)
+			assert.Equal(t, dbRun.Status.String(), apiRun.Status)
+			assert.Equal(t, dbRun.CommitSHA, apiRun.CommitSHA)
+			assert.Equal(t, dbRun.TriggerUserID, apiRun.TriggerUser.ID)
+		})
+	}
+}
diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go
index 30e62943f0..d4ada17b86 100644
--- a/tests/integration/api_repo_archive_test.go
+++ b/tests/integration/api_repo_archive_test.go
@@ -34,14 +34,14 @@ func TestAPIDownloadArchive(t *testing.T) {
 	bs, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	assert.Len(t, bs, 320)
-	assert.EqualValues(t, "application/zip", resp.Header().Get("Content-Type"))
+	assert.Equal(t, "application/zip", resp.Header().Get("Content-Type"))
 
 	link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.tar.gz", user2.Name, repo.Name))
 	resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
 	bs, err = io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	assert.Len(t, bs, 266)
-	assert.EqualValues(t, "application/gzip", resp.Header().Get("Content-Type"))
+	assert.Equal(t, "application/gzip", resp.Header().Get("Content-Type"))
 
 	// Must return a link to a commit ID as the "immutable" archive link
 	linkHeaderRe := regexp.MustCompile(`<(?P<url>https?://.*/api/v1/repos/user2/repo1/archive/[a-f0-9]+\.tar\.gz.*)>; rel="immutable"`)
@@ -51,14 +51,14 @@ func TestAPIDownloadArchive(t *testing.T) {
 	bs2, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	// The locked URL should give the same bytes as the non-locked one
-	assert.EqualValues(t, bs, bs2)
+	assert.Equal(t, bs, bs2)
 
 	link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name))
 	resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
 	bs, err = io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	assert.Len(t, bs, 382)
-	assert.EqualValues(t, "application/octet-stream", resp.Header().Get("Content-Type"))
+	assert.Equal(t, "application/octet-stream", resp.Header().Get("Content-Type"))
 
 	link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master", user2.Name, repo.Name))
 	MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusBadRequest)
@@ -92,7 +92,7 @@ func TestAPIDownloadArchive2(t *testing.T) {
 	bs2, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	// The locked URL should give the same bytes as the non-locked one
-	assert.EqualValues(t, bs, bs2)
+	assert.Equal(t, bs, bs2)
 
 	link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/bundle/master", user2.Name, repo.Name))
 	resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go
index caadea7e39..6ffe40ff44 100644
--- a/tests/integration/api_repo_branch_test.go
+++ b/tests/integration/api_repo_branch_test.go
@@ -43,8 +43,8 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		var branches []*api.Branch
 		require.NoError(t, json.Unmarshal(bs, &branches))
 		assert.Len(t, branches, 2)
-		assert.EqualValues(t, "test_branch", branches[0].Name)
-		assert.EqualValues(t, "master", branches[1].Name)
+		assert.Equal(t, "test_branch", branches[0].Name)
+		assert.Equal(t, "master", branches[1].Name)
 
 		link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo3.Name))
 		MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
@@ -54,7 +54,7 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		require.NoError(t, err)
 		var branch api.Branch
 		require.NoError(t, json.Unmarshal(bs, &branch))
-		assert.EqualValues(t, "test_branch", branch.Name)
+		assert.Equal(t, "test_branch", branch.Name)
 
 		MakeRequest(t, NewRequest(t, "POST", link.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden)
 
@@ -66,8 +66,8 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		require.NoError(t, err)
 		var branch2 api.Branch
 		require.NoError(t, json.Unmarshal(bs, &branch2))
-		assert.EqualValues(t, "test_branch2", branch2.Name)
-		assert.EqualValues(t, branch.Commit.ID, branch2.Commit.ID)
+		assert.Equal(t, "test_branch2", branch2.Name)
+		assert.Equal(t, branch.Commit.ID, branch2.Commit.ID)
 
 		resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK)
 		bs, err = io.ReadAll(resp.Body)
@@ -76,9 +76,9 @@ func TestAPIRepoBranchesPlain(t *testing.T) {
 		branches = []*api.Branch{}
 		require.NoError(t, json.Unmarshal(bs, &branches))
 		assert.Len(t, branches, 3)
-		assert.EqualValues(t, "test_branch", branches[0].Name)
-		assert.EqualValues(t, "test_branch2", branches[1].Name)
-		assert.EqualValues(t, "master", branches[2].Name)
+		assert.Equal(t, "test_branch", branches[0].Name)
+		assert.Equal(t, "test_branch2", branches[1].Name)
+		assert.Equal(t, "master", branches[2].Name)
 
 		link3, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch2", repo3.Name))
 		MakeRequest(t, NewRequest(t, "DELETE", link3.String()), http.StatusNotFound)
@@ -105,8 +105,8 @@ func TestAPIRepoBranchesMirror(t *testing.T) {
 	var branches []*api.Branch
 	require.NoError(t, json.Unmarshal(bs, &branches))
 	assert.Len(t, branches, 2)
-	assert.EqualValues(t, "test_branch", branches[0].Name)
-	assert.EqualValues(t, "master", branches[1].Name)
+	assert.Equal(t, "test_branch", branches[0].Name)
+	assert.Equal(t, "master", branches[1].Name)
 
 	link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo5.Name))
 	resp = MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(token), http.StatusOK)
@@ -114,7 +114,7 @@ func TestAPIRepoBranchesMirror(t *testing.T) {
 	require.NoError(t, err)
 	var branch api.Branch
 	require.NoError(t, json.Unmarshal(bs, &branch))
-	assert.EqualValues(t, "test_branch", branch.Name)
+	assert.Equal(t, "test_branch", branch.Name)
 
 	req := NewRequest(t, "POST", link.String()).AddTokenAuth(token)
 	req.Header.Add("Content-Type", "application/json")
@@ -122,10 +122,10 @@ func TestAPIRepoBranchesMirror(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusForbidden)
 	bs, err = io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	assert.EqualValues(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
+	assert.Equal(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
 
 	resp = MakeRequest(t, NewRequest(t, "DELETE", link2.String()).AddTokenAuth(token), http.StatusForbidden)
 	bs, err = io.ReadAll(resp.Body)
 	require.NoError(t, err)
-	assert.EqualValues(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
+	assert.Equal(t, "{\"message\":\"Git Repository is a mirror.\",\"url\":\""+setting.AppURL+"api/swagger\"}\n", string(bs))
 }
diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go
index 35f0a21d82..1724924fdc 100644
--- a/tests/integration/api_repo_compare_test.go
+++ b/tests/integration/api_repo_compare_test.go
@@ -4,56 +4,268 @@
 package integration
 
 import (
+	"encoding/base64"
+	"fmt"
 	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
 	"testing"
+	"time"
 
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
 	api "forgejo.org/modules/structs"
-	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
-func TestAPICompareBranches(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	// Login as User2.
-	session := loginUser(t, user.Name)
-	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
-
-	repoName := "repo20"
-
-	req := NewRequestf(t, "GET", "/api/v1/repos/user2/%s/compare/add-csv...remove-files-b", repoName).
-		AddTokenAuth(token)
-	resp := MakeRequest(t, req, http.StatusOK)
-
-	var apiResp *api.Compare
-	DecodeJSON(t, resp, &apiResp)
-
-	assert.Equal(t, 2, apiResp.TotalCommits)
-	assert.Len(t, apiResp.Commits, 2)
-	assert.Len(t, apiResp.Files, 3)
-}
-
 func TestAPICompareCommits(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	// Login as User2.
-	session := loginUser(t, user.Name)
-	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
-
-	req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/c8e31bc...8babce9").
-		AddTokenAuth(token)
-	resp := MakeRequest(t, req, http.StatusOK)
-
-	var apiResp *api.Compare
-	DecodeJSON(t, resp, &apiResp)
-
-	assert.Equal(t, 2, apiResp.TotalCommits)
-	assert.Len(t, apiResp.Commits, 2)
-	assert.Len(t, apiResp.Files, 3)
+	forEachObjectFormat(t, testAPICompareCommits)
+}
+
+func testAPICompareCommits(t *testing.T, objectFormat git.ObjectFormat) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		newBranchAndFile := func(ctx APITestContext, user *user_model.User, branch, filename string) func(*testing.T) {
+			return func(t *testing.T) {
+				doAPICreateFile(ctx, filename, &api.CreateFileOptions{
+					FileOptions: api.FileOptions{
+						NewBranchName: branch,
+						Message:       "create " + filename,
+						Author: api.Identity{
+							Name:  user.Name,
+							Email: user.Email,
+						},
+						Committer: api.Identity{
+							Name:  user.Name,
+							Email: user.Email,
+						},
+						Dates: api.CommitDateOptions{
+							Author:    time.Now(),
+							Committer: time.Now(),
+						},
+					},
+					ContentBase64: base64.StdEncoding.EncodeToString([]byte("content " + filename)),
+				})(t)
+			}
+		}
+
+		requireErrorContains := func(t *testing.T, resp *httptest.ResponseRecorder, expected string) {
+			t.Helper()
+
+			type response struct {
+				Message string   `json:"message"`
+				Errors  []string `json:"errors"`
+			}
+			var bodyResp response
+			DecodeJSON(t, resp, &bodyResp)
+
+			if strings.Contains(bodyResp.Message, expected) {
+				return
+			}
+			for _, error := range bodyResp.Errors {
+				if strings.Contains(error, expected) {
+					return
+				}
+			}
+			t.Log(fmt.Sprintf("expected %s in %+v", expected, bodyResp))
+			t.Fail()
+		}
+
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		user2repo := "repoA"
+		user2Ctx := NewAPITestContext(t, user2.Name, user2repo, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateUser2Repository", doAPICreateRepository(user2Ctx, &api.CreateRepoOption{
+			AutoInit:    true,
+			Description: "Temporary repo",
+			Name:        user2Ctx.Reponame,
+		}, objectFormat))
+		user2branchName := "user2branch"
+		t.Run("CreateUser2RepositoryBranch", newBranchAndFile(user2Ctx, user2, user2branchName, "user2branchfilename.txt"))
+		user2branch := doAPIGetBranch(user2Ctx, user2branchName)(t)
+		user2master := doAPIGetBranch(user2Ctx, "master")(t)
+		user2tag1 := "tag1"
+		t.Run("CreateUser2RepositoryTag1", doAPICreateTag(user2Ctx, user2tag1, "master", "user2branchtag1"))
+		user2tag2 := "tag2"
+		t.Run("CreateUser2RepositoryTag1", doAPICreateTag(user2Ctx, user2tag2, user2branchName, "user2branchtag2"))
+
+		shortCommitLength := 7
+
+		for _, testCase := range []struct {
+			name string
+			a    string
+			b    string
+		}{
+			{
+				name: "Commits",
+				a:    user2master.Commit.ID,
+				b:    user2branch.Commit.ID,
+			},
+			{
+				name: "ShortCommits",
+				a:    user2master.Commit.ID[:shortCommitLength],
+				b:    user2branch.Commit.ID[:shortCommitLength],
+			},
+			{
+				name: "Branches",
+				a:    "master",
+				b:    user2branchName,
+			},
+			{
+				name: "Tags",
+				a:    user2tag1,
+				b:    user2tag2,
+			},
+		} {
+			t.Run("SameRepo"+testCase.name, func(t *testing.T) {
+				// a...b
+				req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s...%s", user2.Name, user2repo, testCase.a, testCase.b).
+					AddTokenAuth(user2Ctx.Token)
+				resp := MakeRequest(t, req, http.StatusOK)
+
+				var apiResp *api.Compare
+				DecodeJSON(t, resp, &apiResp)
+
+				assert.Equal(t, 1, apiResp.TotalCommits)
+				assert.Len(t, apiResp.Commits, 1)
+				assert.Len(t, apiResp.Files, 1)
+
+				// b...a
+				req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s...%s", user2.Name, user2repo, testCase.b, testCase.a).
+					AddTokenAuth(user2Ctx.Token)
+				resp = MakeRequest(t, req, http.StatusOK)
+
+				DecodeJSON(t, resp, &apiResp)
+
+				assert.Equal(t, 0, apiResp.TotalCommits)
+				assert.Empty(t, apiResp.Commits)
+				assert.Empty(t, apiResp.Files)
+			})
+		}
+
+		user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+		user4Ctx := NewAPITestContext(t, user4.Name, user2repo, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+
+		t.Run("ForkNotFound", func(t *testing.T) {
+			req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s...%s:%s", user2.Name, user2repo, "master", user4.Name, user2branchName).
+				AddTokenAuth(user2Ctx.Token)
+			resp := MakeRequest(t, req, http.StatusNotFound)
+			requireErrorContains(t, resp, "user4 does not have a fork of user2/repoA and user2/repoA is not a fork of a repository from user4")
+		})
+
+		t.Run("User4ForksUser2Repository", doAPIForkRepository(user4Ctx, user2.Name))
+		user4branchName := "user4branch"
+		t.Run("CreateUser4RepositoryBranch", newBranchAndFile(user4Ctx, user4, user4branchName, "user4branchfilename.txt"))
+		user4branch := doAPIGetBranch(user4Ctx, user4branchName)(t)
+		user4tag4 := "tag4"
+		t.Run("CreateUser4RepositoryTag4", doAPICreateTag(user4Ctx, user4tag4, user4branchName, "user4branchtag4"))
+
+		t.Run("FromTheForkedRepo", func(t *testing.T) {
+			// user4/repoA is a fork of user2/repoA and when evaluating
+			//
+			// user4/repoA/compare/master...user2:user2branch
+			//
+			// user2/repoA is not explicitly specified, it is implicitly the repository
+			// from which user4/repoA was forked
+			req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s...%s:%s", user4.Name, user2repo, "master", user2.Name, user2branchName).
+				AddTokenAuth(user4Ctx.Token)
+			resp := MakeRequest(t, req, http.StatusOK)
+
+			var apiResp *api.Compare
+			DecodeJSON(t, resp, &apiResp)
+
+			assert.Equal(t, 1, apiResp.TotalCommits)
+			assert.Len(t, apiResp.Commits, 1)
+			assert.Len(t, apiResp.Files, 1)
+		})
+
+		for _, testCase := range []struct {
+			name string
+			a    string
+			b    string
+		}{
+			{
+				name: "Commits",
+				a:    user2master.Commit.ID,
+				b:    fmt.Sprintf("%s:%s", user4.Name, user4branch.Commit.ID),
+			},
+			{
+				name: "ShortCommits",
+				a:    user2master.Commit.ID[:shortCommitLength],
+				b:    fmt.Sprintf("%s:%s", user4.Name, user4branch.Commit.ID[:shortCommitLength]),
+			},
+			{
+				name: "Branches",
+				a:    "master",
+				b:    fmt.Sprintf("%s:%s", user4.Name, user4branchName),
+			},
+			{
+				name: "Tags",
+				a:    user2tag1,
+				b:    fmt.Sprintf("%s:%s", user4.Name, user4tag4),
+			},
+			{
+				name: "SameRepo",
+				a:    "master",
+				b:    fmt.Sprintf("%s:%s", user2.Name, user2branchName),
+			},
+		} {
+			t.Run("ForkedRepo"+testCase.name, func(t *testing.T) {
+				// user2/repoA is forked into user4/repoA and when evaluating
+				//
+				// user2/repoA/compare/a...user4:b
+				//
+				// user4/repoA is not explicitly specified, it is implicitly the repository
+				// owned by user4 which is a fork of repoA
+				req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s...%s", user2.Name, user2repo, testCase.a, testCase.b).
+					AddTokenAuth(user2Ctx.Token)
+				resp := MakeRequest(t, req, http.StatusOK)
+
+				var apiResp *api.Compare
+				DecodeJSON(t, resp, &apiResp)
+
+				assert.Equal(t, 1, apiResp.TotalCommits)
+				assert.Len(t, apiResp.Commits, 1)
+				assert.Len(t, apiResp.Files, 1)
+			})
+		}
+
+		t.Run("ForkUserDoesNotExist", func(t *testing.T) {
+			notUser := "notauser"
+			req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/master...%s:branchname", user2.Name, user2repo, notUser).
+				AddTokenAuth(user2Ctx.Token)
+			resp := MakeRequest(t, req, http.StatusNotFound)
+			requireErrorContains(t, resp, fmt.Sprintf("the owner %s does not exist", notUser))
+		})
+
+		t.Run("HeadHasTooManyColon", func(t *testing.T) {
+			req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/master...one:two:many", user2.Name, user2repo).
+				AddTokenAuth(user2Ctx.Token)
+			resp := MakeRequest(t, req, http.StatusNotFound)
+			requireErrorContains(t, resp, fmt.Sprintf("must contain zero or one colon (:) but contains 2"))
+		})
+
+		for _, testCase := range []struct {
+			what     string
+			baseHead string
+		}{
+			{
+				what:     "base",
+				baseHead: "notexists...master",
+			},
+			{
+				what:     "head",
+				baseHead: "master...notexists",
+			},
+		} {
+			t.Run("BaseHeadNotExists "+testCase.what, func(t *testing.T) {
+				req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/compare/%s", user2.Name, user2repo, testCase.baseHead).
+					AddTokenAuth(user2Ctx.Token)
+				resp := MakeRequest(t, req, http.StatusNotFound)
+				requireErrorContains(t, resp, fmt.Sprintf("could not find 'notexists' to be a commit, branch or tag in the %s", testCase.what))
+			})
+		}
+	})
 }
diff --git a/tests/integration/api_repo_file_create_test.go b/tests/integration/api_repo_file_create_test.go
index cff891f6d8..4916ef97ef 100644
--- a/tests/integration/api_repo_file_create_test.go
+++ b/tests/integration/api_repo_file_create_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package integration
@@ -12,6 +13,7 @@ import (
 	"testing"
 	"time"
 
+	"forgejo.org/models/asymkey"
 	auth_model "forgejo.org/models/auth"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
@@ -106,7 +108,7 @@ func getExpectedFileResponseForCreate(repoFullName, commitID, treePath, latestCo
 		},
 		Verification: &api.PayloadCommitVerification{
 			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
+			Reason:    asymkey.NotSigned,
 			Signature: "",
 			Payload:   "",
 		},
@@ -177,15 +179,17 @@ func TestAPICreateFile(t *testing.T) {
 			expectedFileResponse := getExpectedFileResponseForCreate("user2/repo1", commitID, treePath, latestCommit.ID.String())
 			var fileResponse api.FileResponse
 			DecodeJSON(t, resp, &fileResponse)
-			assert.EqualValues(t, expectedFileResponse.Content, fileResponse.Content)
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Date, fileResponse.Commit.Author.Date)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Email, fileResponse.Commit.Committer.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Name, fileResponse.Commit.Committer.Name)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Date, fileResponse.Commit.Committer.Date)
+			// Testify cannot assert time.Time correctly.
+			expectedFileResponse.Content.LastCommitWhen = fileResponse.Content.LastCommitWhen
+			assert.Equal(t, expectedFileResponse.Content, fileResponse.Content)
+			assert.Equal(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Date, fileResponse.Commit.Author.Date)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Email, fileResponse.Commit.Committer.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Name, fileResponse.Commit.Committer.Name)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Date, fileResponse.Commit.Committer.Date)
 			gitRepo.Close()
 		}
 
@@ -203,10 +207,10 @@ func TestAPICreateFile(t *testing.T) {
 		expectedSHA := "a635aa942442ddfdba07468cf9661c08fbdf0ebf"
 		expectedHTMLURL := fmt.Sprintf(setting.AppURL+"user2/repo1/src/branch/new_branch/new/file%d.txt", fileID)
 		expectedDownloadURL := fmt.Sprintf(setting.AppURL+"user2/repo1/raw/branch/new_branch/new/file%d.txt", fileID)
-		assert.EqualValues(t, expectedSHA, fileResponse.Content.SHA)
-		assert.EqualValues(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
-		assert.EqualValues(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
-		assert.EqualValues(t, createFileOptions.Message+"\n", fileResponse.Commit.Message)
+		assert.Equal(t, expectedSHA, fileResponse.Content.SHA)
+		assert.Equal(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
+		assert.Equal(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
+		assert.Equal(t, createFileOptions.Message+"\n", fileResponse.Commit.Message)
 
 		// Test creating a file without a message
 		createFileOptions = getCreateFileOptions()
@@ -218,7 +222,7 @@ func TestAPICreateFile(t *testing.T) {
 		resp = MakeRequest(t, req, http.StatusCreated)
 		DecodeJSON(t, resp, &fileResponse)
 		expectedMessage := "Add " + treePath + "\n"
-		assert.EqualValues(t, expectedMessage, fileResponse.Commit.Message)
+		assert.Equal(t, expectedMessage, fileResponse.Commit.Message)
 
 		// Test trying to create a file that already exists, should fail
 		createFileOptions = getCreateFileOptions()
@@ -283,7 +287,14 @@ func TestAPICreateFile(t *testing.T) {
 		// Test creating a file in an empty repository
 		forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) {
 			reponame := "empty-repo-" + objectFormat.Name()
-			doAPICreateRepository(NewAPITestContext(t, "user2", reponame, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser), true, objectFormat)(t)
+			ctx := NewAPITestContext(t, "user2", reponame, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			opts := &api.CreateRepoOption{
+				Description: "Temporary repo",
+				Name:        ctx.Reponame,
+				Private:     true,
+				Template:    true,
+			}
+			doAPICreateRepository(ctx, opts, objectFormat)(t)
 			createFileOptions = getCreateFileOptions()
 			fileID++
 			treePath = fmt.Sprintf("new/file%d.txt", fileID)
@@ -296,15 +307,17 @@ func TestAPICreateFile(t *testing.T) {
 			latestCommit, _ := gitRepo.GetCommitByPath(treePath)
 			expectedFileResponse := getExpectedFileResponseForCreate("user2/"+reponame, commitID, treePath, latestCommit.ID.String())
 			DecodeJSON(t, resp, &fileResponse)
-			assert.EqualValues(t, expectedFileResponse.Content, fileResponse.Content)
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Date, fileResponse.Commit.Author.Date)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Email, fileResponse.Commit.Committer.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Name, fileResponse.Commit.Committer.Name)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Date, fileResponse.Commit.Committer.Date)
+			// Testify cannot assert time.Time correctly.
+			expectedFileResponse.Content.LastCommitWhen = fileResponse.Content.LastCommitWhen
+			assert.Equal(t, expectedFileResponse.Content, fileResponse.Content)
+			assert.Equal(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Date, fileResponse.Commit.Author.Date)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Email, fileResponse.Commit.Committer.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Name, fileResponse.Commit.Committer.Name)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Date, fileResponse.Commit.Committer.Date)
 			gitRepo.Close()
 		})
 	})
diff --git a/tests/integration/api_repo_file_delete_test.go b/tests/integration/api_repo_file_delete_test.go
index b76edf45ca..428ef37e34 100644
--- a/tests/integration/api_repo_file_delete_test.go
+++ b/tests/integration/api_repo_file_delete_test.go
@@ -87,7 +87,7 @@ func TestAPIDeleteFile(t *testing.T) {
 		DecodeJSON(t, resp, &fileResponse)
 		assert.NotNil(t, fileResponse)
 		assert.Nil(t, fileResponse.Content)
-		assert.EqualValues(t, deleteFileOptions.Message+"\n", fileResponse.Commit.Message)
+		assert.Equal(t, deleteFileOptions.Message+"\n", fileResponse.Commit.Message)
 
 		// Test deleting file without a message
 		fileID++
@@ -100,7 +100,7 @@ func TestAPIDeleteFile(t *testing.T) {
 		resp = MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &fileResponse)
 		expectedMessage := "Delete " + treePath + "\n"
-		assert.EqualValues(t, expectedMessage, fileResponse.Commit.Message)
+		assert.Equal(t, expectedMessage, fileResponse.Commit.Message)
 
 		// Test deleting a file with the wrong SHA
 		fileID++
diff --git a/tests/integration/api_repo_file_get_test.go b/tests/integration/api_repo_file_get_test.go
index 7bd7393b01..ab82e5cf15 100644
--- a/tests/integration/api_repo_file_get_test.go
+++ b/tests/integration/api_repo_file_get_test.go
@@ -17,36 +17,40 @@ import (
 )
 
 func TestAPIGetRawFileOrLFS(t *testing.T) {
-	defer tests.PrepareTestEnv(t)()
-
-	// Test with raw file
-	req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/media/README.md")
-	resp := MakeRequest(t, req, http.StatusOK)
-	assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
-
-	// Test with LFS
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		httpContext := NewAPITestContext(t, "user2", "repo-lfs-test", auth_model.AccessTokenScopeWriteRepository)
-		doAPICreateRepository(httpContext, false, git.Sha1ObjectFormat, func(t *testing.T, repository api.Repository) { // FIXME: use forEachObjectFormat
-			u.Path = httpContext.GitPath()
-			dstPath := t.TempDir()
+		t.Run("Normal raw file", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 
-			u.Path = httpContext.GitPath()
-			u.User = url.UserPassword("user2", userPassword)
+			req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/media/README.md")
+			resp := MakeRequest(t, req, http.StatusOK)
+			assert.Equal(t, "# repo1\n\nDescription for repo1", resp.Body.String())
+		})
 
-			t.Run("Clone", doGitClone(dstPath, u))
+		t.Run("LFS raw file", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
 
-			dstPath2 := t.TempDir()
+			httpContext := NewAPITestContext(t, "user2", "repo-lfs-test", auth_model.AccessTokenScopeWriteRepository)
+			doAPICreateRepository(httpContext, nil, git.Sha1ObjectFormat, func(t *testing.T, repository api.Repository) { // FIXME: use forEachObjectFormat
+				u.Path = httpContext.GitPath()
+				dstPath := t.TempDir()
 
-			t.Run("Partial Clone", doPartialGitClone(dstPath2, u))
+				u.Path = httpContext.GitPath()
+				u.User = url.UserPassword("user2", userPassword)
 
-			lfs, _ := lfsCommitAndPushTest(t, dstPath)
+				t.Run("Clone", doGitClone(dstPath, u))
 
-			reqLFS := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/media/"+lfs)
-			respLFS := MakeRequestNilResponseRecorder(t, reqLFS, http.StatusOK)
-			assert.Equal(t, littleSize, respLFS.Length)
+				dstPath2 := t.TempDir()
 
-			doAPIDeleteRepository(httpContext)
+				t.Run("Partial Clone", doPartialGitClone(dstPath2, u))
+
+				lfs, _ := lfsCommitAndPushTest(t, dstPath)
+
+				reqLFS := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/media/"+lfs)
+				respLFS := MakeRequestNilResponseRecorder(t, reqLFS, http.StatusOK)
+				assert.Equal(t, littleSize, respLFS.Length)
+
+				doAPIDeleteRepository(httpContext)
+			})
 		})
 	})
 }
diff --git a/tests/integration/api_repo_file_helpers.go b/tests/integration/api_repo_file_helpers.go
index 09cf93d8a5..61407bf1bf 100644
--- a/tests/integration/api_repo_file_helpers.go
+++ b/tests/integration/api_repo_file_helpers.go
@@ -10,6 +10,7 @@ import (
 	repo_model "forgejo.org/models/repo"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
+	"forgejo.org/modules/gitrepo"
 	api "forgejo.org/modules/structs"
 	files_service "forgejo.org/services/repository/files"
 )
@@ -30,7 +31,12 @@ func createFileInBranch(user *user_model.User, repo *repo_model.Repository, tree
 	return files_service.ChangeRepoFiles(git.DefaultContext, repo, user, opts)
 }
 
-func deleteFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName string) (*api.FilesResponse, error) {
+func deleteFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName string) error {
+	commitID, err := gitrepo.GetBranchCommitID(git.DefaultContext, repo, branchName)
+	if err != nil {
+		return err
+	}
+
 	opts := &files_service.ChangeRepoFilesOptions{
 		Files: []*files_service.ChangeRepoFile{
 			{
@@ -38,16 +44,17 @@ func deleteFileInBranch(user *user_model.User, repo *repo_model.Repository, tree
 				TreePath:  treePath,
 			},
 		},
-		OldBranch: branchName,
-		Author:    nil,
-		Committer: nil,
+		OldBranch:    branchName,
+		Author:       nil,
+		Committer:    nil,
+		LastCommitID: commitID,
 	}
-	return files_service.ChangeRepoFiles(git.DefaultContext, repo, user, opts)
+	_, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, user, opts)
+	return err
 }
 
 func createOrReplaceFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, branchName, content string) error {
-	_, err := deleteFileInBranch(user, repo, treePath, branchName)
-
+	err := deleteFileInBranch(user, repo, treePath, branchName)
 	if err != nil && !models.IsErrRepoFileDoesNotExist(err) {
 		return err
 	}
diff --git a/tests/integration/api_repo_file_update_test.go b/tests/integration/api_repo_file_update_test.go
index 4ed0df2b08..878d865aff 100644
--- a/tests/integration/api_repo_file_update_test.go
+++ b/tests/integration/api_repo_file_update_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package integration
@@ -11,6 +12,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"forgejo.org/models/asymkey"
 	auth_model "forgejo.org/models/auth"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
@@ -97,7 +99,7 @@ func getExpectedFileResponseForUpdate(commitID, treePath, lastCommitSHA string)
 		},
 		Verification: &api.PayloadCommitVerification{
 			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
+			Reason:    asymkey.NotSigned,
 			Signature: "",
 			Payload:   "",
 		},
@@ -140,11 +142,13 @@ func TestAPIUpdateFile(t *testing.T) {
 			expectedFileResponse := getExpectedFileResponseForUpdate(commitID, treePath, lasCommit.ID.String())
 			var fileResponse api.FileResponse
 			DecodeJSON(t, resp, &fileResponse)
-			assert.EqualValues(t, expectedFileResponse.Content, fileResponse.Content)
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
+			// Testify cannot assert time.Time correctly.
+			expectedFileResponse.Content.LastCommitWhen = fileResponse.Content.LastCommitWhen
+			assert.Equal(t, expectedFileResponse.Content, fileResponse.Content)
+			assert.Equal(t, expectedFileResponse.Commit.SHA, fileResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, fileResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, fileResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, fileResponse.Commit.Author.Name)
 			gitRepo.Close()
 		}
 
@@ -163,10 +167,10 @@ func TestAPIUpdateFile(t *testing.T) {
 		expectedSHA := "08bd14b2e2852529157324de9c226b3364e76136"
 		expectedHTMLURL := fmt.Sprintf(setting.AppURL+"user2/repo1/src/branch/new_branch/update/file%d.txt", fileID)
 		expectedDownloadURL := fmt.Sprintf(setting.AppURL+"user2/repo1/raw/branch/new_branch/update/file%d.txt", fileID)
-		assert.EqualValues(t, expectedSHA, fileResponse.Content.SHA)
-		assert.EqualValues(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
-		assert.EqualValues(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
-		assert.EqualValues(t, updateFileOptions.Message+"\n", fileResponse.Commit.Message)
+		assert.Equal(t, expectedSHA, fileResponse.Content.SHA)
+		assert.Equal(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
+		assert.Equal(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
+		assert.Equal(t, updateFileOptions.Message+"\n", fileResponse.Commit.Message)
 
 		// Test updating a file and renaming it
 		updateFileOptions = getUpdateFileOptions()
@@ -183,9 +187,9 @@ func TestAPIUpdateFile(t *testing.T) {
 		expectedSHA = "08bd14b2e2852529157324de9c226b3364e76136"
 		expectedHTMLURL = fmt.Sprintf(setting.AppURL+"user2/repo1/src/branch/master/rename/update/file%d.txt", fileID)
 		expectedDownloadURL = fmt.Sprintf(setting.AppURL+"user2/repo1/raw/branch/master/rename/update/file%d.txt", fileID)
-		assert.EqualValues(t, expectedSHA, fileResponse.Content.SHA)
-		assert.EqualValues(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
-		assert.EqualValues(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
+		assert.Equal(t, expectedSHA, fileResponse.Content.SHA)
+		assert.Equal(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
+		assert.Equal(t, expectedDownloadURL, *fileResponse.Content.DownloadURL)
 
 		// Test updating a file without a message
 		updateFileOptions = getUpdateFileOptions()
@@ -199,7 +203,7 @@ func TestAPIUpdateFile(t *testing.T) {
 		resp = MakeRequest(t, req, http.StatusOK)
 		DecodeJSON(t, resp, &fileResponse)
 		expectedMessage := "Update " + treePath + "\n"
-		assert.EqualValues(t, expectedMessage, fileResponse.Commit.Message)
+		assert.Equal(t, expectedMessage, fileResponse.Commit.Message)
 
 		// Test updating a file with the wrong SHA
 		fileID++
@@ -210,7 +214,7 @@ func TestAPIUpdateFile(t *testing.T) {
 		updateFileOptions.SHA = "badsha"
 		req = NewRequestWithJSON(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", user2.Name, repo1.Name, treePath), &updateFileOptions).
 			AddTokenAuth(token2)
-		resp = MakeRequest(t, req, http.StatusUnprocessableEntity)
+		resp = MakeRequest(t, req, http.StatusConflict)
 		expectedAPIError := context.APIError{
 			Message: "sha does not match [given: " + updateFileOptions.SHA + ", expected: " + correctSHA + "]",
 			URL:     setting.API.SwaggerURL,
diff --git a/tests/integration/api_repo_files_change_test.go b/tests/integration/api_repo_files_change_test.go
index d188751dab..6b1edd047b 100644
--- a/tests/integration/api_repo_files_change_test.go
+++ b/tests/integration/api_repo_files_change_test.go
@@ -104,19 +104,23 @@ func TestAPIChangeFiles(t *testing.T) {
 			var filesResponse api.FilesResponse
 			DecodeJSON(t, resp, &filesResponse)
 
+			// Testify cannot assert time.Time correctly.
+			expectedCreateFileResponse.Content.LastCommitWhen = filesResponse.Files[0].LastCommitWhen
+			expectedUpdateFileResponse.Content.LastCommitWhen = filesResponse.Files[1].LastCommitWhen
+
 			// check create file
-			assert.EqualValues(t, expectedCreateFileResponse.Content, filesResponse.Files[0])
+			assert.Equal(t, expectedCreateFileResponse.Content, filesResponse.Files[0])
 
 			// check update file
-			assert.EqualValues(t, expectedUpdateFileResponse.Content, filesResponse.Files[1])
+			assert.Equal(t, expectedUpdateFileResponse.Content, filesResponse.Files[1])
 
 			// test commit info
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.Committer.Email, filesResponse.Commit.Committer.Email)
-			assert.EqualValues(t, expectedCreateFileResponse.Commit.Committer.Name, filesResponse.Commit.Committer.Name)
+			assert.Equal(t, expectedCreateFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.Equal(t, expectedCreateFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedCreateFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
+			assert.Equal(t, expectedCreateFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
+			assert.Equal(t, expectedCreateFileResponse.Commit.Committer.Email, filesResponse.Commit.Committer.Email)
+			assert.Equal(t, expectedCreateFileResponse.Commit.Committer.Name, filesResponse.Commit.Committer.Name)
 
 			// test delete file
 			assert.Nil(t, filesResponse.Files[2])
@@ -149,15 +153,15 @@ func TestAPIChangeFiles(t *testing.T) {
 		expectedUpdateSHA := "08bd14b2e2852529157324de9c226b3364e76136"
 		expectedUpdateHTMLURL := fmt.Sprintf(setting.AppURL+"user2/repo1/src/branch/new_branch/update/file%d.txt", fileID)
 		expectedUpdateDownloadURL := fmt.Sprintf(setting.AppURL+"user2/repo1/raw/branch/new_branch/update/file%d.txt", fileID)
-		assert.EqualValues(t, expectedCreateSHA, filesResponse.Files[0].SHA)
-		assert.EqualValues(t, expectedCreateHTMLURL, *filesResponse.Files[0].HTMLURL)
-		assert.EqualValues(t, expectedCreateDownloadURL, *filesResponse.Files[0].DownloadURL)
-		assert.EqualValues(t, expectedUpdateSHA, filesResponse.Files[1].SHA)
-		assert.EqualValues(t, expectedUpdateHTMLURL, *filesResponse.Files[1].HTMLURL)
-		assert.EqualValues(t, expectedUpdateDownloadURL, *filesResponse.Files[1].DownloadURL)
+		assert.Equal(t, expectedCreateSHA, filesResponse.Files[0].SHA)
+		assert.Equal(t, expectedCreateHTMLURL, *filesResponse.Files[0].HTMLURL)
+		assert.Equal(t, expectedCreateDownloadURL, *filesResponse.Files[0].DownloadURL)
+		assert.Equal(t, expectedUpdateSHA, filesResponse.Files[1].SHA)
+		assert.Equal(t, expectedUpdateHTMLURL, *filesResponse.Files[1].HTMLURL)
+		assert.Equal(t, expectedUpdateDownloadURL, *filesResponse.Files[1].DownloadURL)
 		assert.Nil(t, filesResponse.Files[2])
 
-		assert.EqualValues(t, changeFilesOptions.Message+"\n", filesResponse.Commit.Message)
+		assert.Equal(t, changeFilesOptions.Message+"\n", filesResponse.Commit.Message)
 
 		// Test updating a file and renaming it
 		changeFilesOptions = getChangeFilesOptions()
@@ -175,9 +179,9 @@ func TestAPIChangeFiles(t *testing.T) {
 		expectedUpdateSHA = "08bd14b2e2852529157324de9c226b3364e76136"
 		expectedUpdateHTMLURL = fmt.Sprintf(setting.AppURL+"user2/repo1/src/branch/master/rename/update/file%d.txt", fileID)
 		expectedUpdateDownloadURL = fmt.Sprintf(setting.AppURL+"user2/repo1/raw/branch/master/rename/update/file%d.txt", fileID)
-		assert.EqualValues(t, expectedUpdateSHA, filesResponse.Files[0].SHA)
-		assert.EqualValues(t, expectedUpdateHTMLURL, *filesResponse.Files[0].HTMLURL)
-		assert.EqualValues(t, expectedUpdateDownloadURL, *filesResponse.Files[0].DownloadURL)
+		assert.Equal(t, expectedUpdateSHA, filesResponse.Files[0].SHA)
+		assert.Equal(t, expectedUpdateHTMLURL, *filesResponse.Files[0].HTMLURL)
+		assert.Equal(t, expectedUpdateDownloadURL, *filesResponse.Files[0].DownloadURL)
 
 		// Test updating a file without a message
 		changeFilesOptions = getChangeFilesOptions()
@@ -197,7 +201,7 @@ func TestAPIChangeFiles(t *testing.T) {
 		resp = MakeRequest(t, req, http.StatusCreated)
 		DecodeJSON(t, resp, &filesResponse)
 		expectedMessage := fmt.Sprintf("Add %v\nUpdate %v\nDelete %v\n", createTreePath, updateTreePath, deleteTreePath)
-		assert.EqualValues(t, expectedMessage, filesResponse.Commit.Message)
+		assert.Equal(t, expectedMessage, filesResponse.Commit.Message)
 
 		// Test updating a file with the wrong SHA
 		fileID++
@@ -210,7 +214,7 @@ func TestAPIChangeFiles(t *testing.T) {
 		changeFilesOptions.Files[0].SHA = "badsha"
 		req = NewRequestWithJSON(t, "POST", url, &changeFilesOptions).
 			AddTokenAuth(token2)
-		resp = MakeRequest(t, req, http.StatusUnprocessableEntity)
+		resp = MakeRequest(t, req, http.StatusConflict)
 		expectedAPIError := context.APIError{
 			Message: "sha does not match [given: " + changeFilesOptions.Files[0].SHA + ", expected: " + correctSHA + "]",
 			URL:     setting.API.SwaggerURL,
diff --git a/tests/integration/api_repo_get_contents_list_test.go b/tests/integration/api_repo_get_contents_list_test.go
index 543f10f6d2..7d010ffdf1 100644
--- a/tests/integration/api_repo_get_contents_list_test.go
+++ b/tests/integration/api_repo_get_contents_list_test.go
@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"path/filepath"
 	"testing"
+	"time"
 
 	auth_model "forgejo.org/models/auth"
 	repo_model "forgejo.org/models/repo"
@@ -32,16 +33,17 @@ func getExpectedContentsListResponseForContents(ref, refType, lastCommitSHA stri
 	downloadURL := setting.AppURL + "user2/repo1/raw/" + refType + "/" + ref + "/" + treePath
 	return []*api.ContentsResponse{
 		{
-			Name:          filepath.Base(treePath),
-			Path:          treePath,
-			SHA:           sha,
-			LastCommitSHA: lastCommitSHA,
-			Type:          "file",
-			Size:          30,
-			URL:           &selfURL,
-			HTMLURL:       &htmlURL,
-			GitURL:        &gitURL,
-			DownloadURL:   &downloadURL,
+			Name:           filepath.Base(treePath),
+			Path:           treePath,
+			SHA:            sha,
+			LastCommitSHA:  lastCommitSHA,
+			LastCommitWhen: time.Date(2017, time.March, 19, 16, 47, 59, 0, time.FixedZone("", -14400)),
+			Type:           "file",
+			Size:           30,
+			URL:            &selfURL,
+			HTMLURL:        &htmlURL,
+			GitURL:         &gitURL,
+			DownloadURL:    &downloadURL,
 			Links: &api.FileLinksResponse{
 				Self:    &selfURL,
 				GitURL:  &gitURL,
@@ -100,7 +102,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	lastCommit, err := gitRepo.GetCommitByPath("README.md")
 	require.NoError(t, err)
 	expectedContentsListResponse := getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
+	assert.Equal(t, expectedContentsListResponse, contentsListResponse)
 
 	// No ref
 	refType = "branch"
@@ -110,7 +112,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	assert.NotNil(t, contentsListResponse)
 
 	expectedContentsListResponse = getExpectedContentsListResponseForContents(repo1.DefaultBranch, refType, lastCommit.ID.String())
-	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
+	assert.Equal(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is the branch we created above in setup
 	ref = newBranch
@@ -124,7 +126,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	lastCommit, err = branchCommit.GetCommitByPath("README.md")
 	require.NoError(t, err)
 	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
+	assert.Equal(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is the new tag we created above in setup
 	ref = newTag
@@ -138,7 +140,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	lastCommit, err = tagCommit.GetCommitByPath("README.md")
 	require.NoError(t, err)
 	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
+	assert.Equal(t, expectedContentsListResponse, contentsListResponse)
 
 	// ref is a commit
 	ref = commitID
@@ -148,7 +150,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
 	DecodeJSON(t, resp, &contentsListResponse)
 	assert.NotNil(t, contentsListResponse)
 	expectedContentsListResponse = getExpectedContentsListResponseForContents(ref, refType, commitID)
-	assert.EqualValues(t, expectedContentsListResponse, contentsListResponse)
+	assert.Equal(t, expectedContentsListResponse, contentsListResponse)
 
 	// Test file contents a file with a bad ref
 	ref = "badref"
diff --git a/tests/integration/api_repo_get_contents_test.go b/tests/integration/api_repo_get_contents_test.go
index 9cf266b3dd..47ac4cfc03 100644
--- a/tests/integration/api_repo_get_contents_test.go
+++ b/tests/integration/api_repo_get_contents_test.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/url"
 	"testing"
+	"time"
 
 	auth_model "forgejo.org/models/auth"
 	repo_model "forgejo.org/models/repo"
@@ -33,18 +34,19 @@ func getExpectedContentsResponseForContents(ref, refType, lastCommitSHA string)
 	gitURL := setting.AppURL + "api/v1/repos/user2/repo1/git/blobs/" + sha
 	downloadURL := setting.AppURL + "user2/repo1/raw/" + refType + "/" + ref + "/" + treePath
 	return &api.ContentsResponse{
-		Name:          treePath,
-		Path:          treePath,
-		SHA:           sha,
-		LastCommitSHA: lastCommitSHA,
-		Type:          "file",
-		Size:          30,
-		Encoding:      &encoding,
-		Content:       &content,
-		URL:           &selfURL,
-		HTMLURL:       &htmlURL,
-		GitURL:        &gitURL,
-		DownloadURL:   &downloadURL,
+		Name:           treePath,
+		Path:           treePath,
+		SHA:            sha,
+		LastCommitSHA:  lastCommitSHA,
+		LastCommitWhen: time.Date(2017, time.March, 19, 16, 47, 59, 0, time.FixedZone("", -14400)),
+		Type:           "file",
+		Size:           30,
+		Encoding:       &encoding,
+		Content:        &content,
+		URL:            &selfURL,
+		HTMLURL:        &htmlURL,
+		GitURL:         &gitURL,
+		DownloadURL:    &downloadURL,
 		Links: &api.FileLinksResponse{
 			Self:    &selfURL,
 			GitURL:  &gitURL,
@@ -102,7 +104,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
 	assert.NotNil(t, contentsResponse)
 	lastCommit, _ := gitRepo.GetCommitByPath("README.md")
 	expectedContentsResponse := getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, *expectedContentsResponse, contentsResponse)
+	assert.Equal(t, *expectedContentsResponse, contentsResponse)
 
 	// No ref
 	refType = "branch"
@@ -111,7 +113,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
 	DecodeJSON(t, resp, &contentsResponse)
 	assert.NotNil(t, contentsResponse)
 	expectedContentsResponse = getExpectedContentsResponseForContents(repo1.DefaultBranch, refType, lastCommit.ID.String())
-	assert.EqualValues(t, *expectedContentsResponse, contentsResponse)
+	assert.Equal(t, *expectedContentsResponse, contentsResponse)
 
 	// ref is the branch we created above  in setup
 	ref = newBranch
@@ -123,7 +125,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
 	branchCommit, _ := gitRepo.GetBranchCommit(ref)
 	lastCommit, _ = branchCommit.GetCommitByPath("README.md")
 	expectedContentsResponse = getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, *expectedContentsResponse, contentsResponse)
+	assert.Equal(t, *expectedContentsResponse, contentsResponse)
 
 	// ref is the new tag we created above in setup
 	ref = newTag
@@ -135,7 +137,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
 	tagCommit, _ := gitRepo.GetTagCommit(ref)
 	lastCommit, _ = tagCommit.GetCommitByPath("README.md")
 	expectedContentsResponse = getExpectedContentsResponseForContents(ref, refType, lastCommit.ID.String())
-	assert.EqualValues(t, *expectedContentsResponse, contentsResponse)
+	assert.Equal(t, *expectedContentsResponse, contentsResponse)
 
 	// ref is a commit
 	ref = commitID
@@ -145,7 +147,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
 	DecodeJSON(t, resp, &contentsResponse)
 	assert.NotNil(t, contentsResponse)
 	expectedContentsResponse = getExpectedContentsResponseForContents(ref, refType, commitID)
-	assert.EqualValues(t, *expectedContentsResponse, contentsResponse)
+	assert.Equal(t, *expectedContentsResponse, contentsResponse)
 
 	// Test file contents a file with a bad ref
 	ref = "badref"
@@ -181,16 +183,16 @@ func TestAPIGetContentsRefFormats(t *testing.T) {
 		resp := MakeRequest(t, NewRequest(t, http.MethodGet, noRef), http.StatusOK)
 		raw, err := io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		assert.EqualValues(t, content, string(raw))
+		assert.Equal(t, content, string(raw))
 
 		resp = MakeRequest(t, NewRequest(t, http.MethodGet, refInPath), http.StatusOK)
 		raw, err = io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		assert.EqualValues(t, content, string(raw))
+		assert.Equal(t, content, string(raw))
 
 		resp = MakeRequest(t, NewRequest(t, http.MethodGet, refInQuery), http.StatusOK)
 		raw, err = io.ReadAll(resp.Body)
 		require.NoError(t, err)
-		assert.EqualValues(t, content, string(raw))
+		assert.Equal(t, content, string(raw))
 	})
 }
diff --git a/tests/integration/api_repo_git_blobs_test.go b/tests/integration/api_repo_git_blobs_test.go
index 980fff1e52..a4424a3348 100644
--- a/tests/integration/api_repo_git_blobs_test.go
+++ b/tests/integration/api_repo_git_blobs_test.go
@@ -37,7 +37,7 @@ func TestAPIReposGitBlobs(t *testing.T) {
 	// Test a public repo that anyone can GET the blob of
 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/git/blobs/%s", user2.Name, repo1.Name, repo1ReadmeSHA)
 	resp := MakeRequest(t, req, http.StatusOK)
-	var gitBlobResponse api.GitBlobResponse
+	var gitBlobResponse api.GitBlob
 	DecodeJSON(t, resp, &gitBlobResponse)
 	assert.NotNil(t, gitBlobResponse)
 	expectedContent := "dHJlZSAyYTJmMWQ0NjcwNzI4YTJlMTAwNDllMzQ1YmQ3YTI3NjQ2OGJlYWI2CmF1dGhvciB1c2VyMSA8YWRkcmVzczFAZXhhbXBsZS5jb20+IDE0ODk5NTY0NzkgLTA0MDAKY29tbWl0dGVyIEV0aGFuIEtvZW5pZyA8ZXRoYW50a29lbmlnQGdtYWlsLmNvbT4gMTQ4OTk1NjQ3OSAtMDQwMAoKSW5pdGlhbCBjb21taXQK"
diff --git a/tests/integration/api_repo_git_commits_test.go b/tests/integration/api_repo_git_commits_test.go
index e80c0024b8..db73307653 100644
--- a/tests/integration/api_repo_git_commits_test.go
+++ b/tests/integration/api_repo_git_commits_test.go
@@ -72,12 +72,12 @@ func TestAPIReposGitCommitList(t *testing.T) {
 	DecodeJSON(t, resp, &apiData)
 
 	assert.Len(t, apiData, 2)
-	assert.EqualValues(t, "cfe3b3c1fd36fba04f9183287b106497e1afe986", apiData[0].CommitMeta.SHA)
+	assert.Equal(t, "cfe3b3c1fd36fba04f9183287b106497e1afe986", apiData[0].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"link_hi", "test.csv"}, apiData[0].Files)
-	assert.EqualValues(t, "c8e31bc7688741a5287fcde4fbb8fc129ca07027", apiData[1].CommitMeta.SHA)
+	assert.Equal(t, "c8e31bc7688741a5287fcde4fbb8fc129ca07027", apiData[1].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"test.csv"}, apiData[1].Files)
 
-	assert.EqualValues(t, "2", resp.Header().Get("X-Total"))
+	assert.Equal(t, "2", resp.Header().Get("X-Total"))
 }
 
 func TestAPIReposGitCommitListNotMaster(t *testing.T) {
@@ -96,14 +96,14 @@ func TestAPIReposGitCommitListNotMaster(t *testing.T) {
 	DecodeJSON(t, resp, &apiData)
 
 	assert.Len(t, apiData, 3)
-	assert.EqualValues(t, "69554a64c1e6030f051e5c3f94bfbd773cd6a324", apiData[0].CommitMeta.SHA)
+	assert.Equal(t, "69554a64c1e6030f051e5c3f94bfbd773cd6a324", apiData[0].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"readme.md"}, apiData[0].Files)
-	assert.EqualValues(t, "27566bd5738fc8b4e3fef3c5e72cce608537bd95", apiData[1].CommitMeta.SHA)
+	assert.Equal(t, "27566bd5738fc8b4e3fef3c5e72cce608537bd95", apiData[1].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"readme.md"}, apiData[1].Files)
-	assert.EqualValues(t, "5099b81332712fe655e34e8dd63574f503f61811", apiData[2].CommitMeta.SHA)
+	assert.Equal(t, "5099b81332712fe655e34e8dd63574f503f61811", apiData[2].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"readme.md"}, apiData[2].Files)
 
-	assert.EqualValues(t, "3", resp.Header().Get("X-Total"))
+	assert.Equal(t, "3", resp.Header().Get("X-Total"))
 }
 
 func TestAPIReposGitCommitListPage2Empty(t *testing.T) {
@@ -177,7 +177,7 @@ func TestDownloadCommitDiffOrPatch(t *testing.T) {
 	reqDiff := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.diff", user.Name).
 		AddTokenAuth(token)
 	resp := MakeRequest(t, reqDiff, http.StatusOK)
-	assert.EqualValues(t,
+	assert.Equal(t,
 		"commit f27c2b2b03dcab38beaf89b0ab4ff61f6de63441\nAuthor: User2 <user2@example.com>\nDate:   Sun Aug 6 19:55:01 2017 +0200\n\n    good signed commit\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n",
 		resp.Body.String())
 
@@ -185,7 +185,7 @@ func TestDownloadCommitDiffOrPatch(t *testing.T) {
 	reqPatch := NewRequestf(t, "GET", "/api/v1/repos/%s/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441.patch", user.Name).
 		AddTokenAuth(token)
 	resp = MakeRequest(t, reqPatch, http.StatusOK)
-	assert.EqualValues(t,
+	assert.Equal(t,
 		"From f27c2b2b03dcab38beaf89b0ab4ff61f6de63441 Mon Sep 17 00:00:00 2001\nFrom: User2 <user2@example.com>\nDate: Sun, 6 Aug 2017 19:55:01 +0200\nSubject: [PATCH] good signed commit\n\n---\n readme.md | 1 +\n 1 file changed, 1 insertion(+)\n create mode 100644 readme.md\n\ndiff --git a/readme.md b/readme.md\nnew file mode 100644\nindex 0000000..458121c\n--- /dev/null\n+++ b/readme.md\n@@ -0,0 +1 @@\n+good sign\n",
 		resp.Body.String())
 }
@@ -208,7 +208,7 @@ func TestGetFileHistory(t *testing.T) {
 	assert.Equal(t, "f27c2b2b03dcab38beaf89b0ab4ff61f6de63441", apiData[0].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"readme.md"}, apiData[0].Files)
 
-	assert.EqualValues(t, "1", resp.Header().Get("X-Total"))
+	assert.Equal(t, "1", resp.Header().Get("X-Total"))
 }
 
 func TestGetFileHistoryNotOnMaster(t *testing.T) {
@@ -229,5 +229,24 @@ func TestGetFileHistoryNotOnMaster(t *testing.T) {
 	assert.Equal(t, "c8e31bc7688741a5287fcde4fbb8fc129ca07027", apiData[0].CommitMeta.SHA)
 	compareCommitFiles(t, []string{"test.csv"}, apiData[0].Files)
 
-	assert.EqualValues(t, "1", resp.Header().Get("X-Total"))
+	assert.Equal(t, "1", resp.Header().Get("X-Total"))
+}
+
+func TestAPIReposGitCommit(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository)
+
+	req := NewRequest(t, "GET", "/api/v1/repos/user2/repo16/git/commits/f27c2b2b03dcab38beaf89b0ab4ff61f6de63441").
+		AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	var apiData api.Commit
+	DecodeJSON(t, resp, &apiData)
+
+	assert.Equal(t, "f27c2b2b03dcab38beaf89b0ab4ff61f6de63441", apiData.CommitMeta.SHA)
+	assert.Equal(t, 1, apiData.Stats.Total)
+	assert.Equal(t, 1, apiData.Stats.Additions)
+	assert.Equal(t, 0, apiData.Stats.Deletions)
 }
diff --git a/tests/integration/api_repo_languages_test.go b/tests/integration/api_repo_languages_test.go
index 3572e2a8e1..d9a7f38db1 100644
--- a/tests/integration/api_repo_languages_test.go
+++ b/tests/integration/api_repo_languages_test.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"net/url"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -35,9 +34,6 @@ func TestRepoLanguages(t *testing.T) {
 		})
 		session.MakeRequest(t, req, http.StatusSeeOther)
 
-		// let gitea calculate language stats
-		time.Sleep(time.Second)
-
 		// Save new file to master branch
 		req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/languages")
 		resp = MakeRequest(t, req, http.StatusOK)
diff --git a/tests/integration/api_repo_lfs_locks_test.go b/tests/integration/api_repo_lfs_locks_test.go
index b3a295c2de..e844b1f158 100644
--- a/tests/integration/api_repo_lfs_locks_test.go
+++ b/tests/integration/api_repo_lfs_locks_test.go
@@ -112,7 +112,7 @@ func TestAPILFSLocksLogged(t *testing.T) {
 			var lfsLock api.LFSLockResponse
 			DecodeJSON(t, resp, &lfsLock)
 			assert.Equal(t, test.user.Name, lfsLock.Lock.Owner.Name)
-			assert.EqualValues(t, lfsLock.Lock.LockedAt.Format(time.RFC3339), lfsLock.Lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
+			assert.Equal(t, lfsLock.Lock.LockedAt.Format(time.RFC3339), lfsLock.Lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
 			for _, id := range test.addTime {
 				resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now())
 			}
@@ -129,9 +129,9 @@ func TestAPILFSLocksLogged(t *testing.T) {
 		DecodeJSON(t, resp, &lfsLocks)
 		assert.Len(t, lfsLocks.Locks, test.totalCount)
 		for i, lock := range lfsLocks.Locks {
-			assert.EqualValues(t, test.locksOwners[i].Name, lock.Owner.Name)
+			assert.Equal(t, test.locksOwners[i].Name, lock.Owner.Name)
 			assert.WithinDuration(t, test.locksTimes[i], lock.LockedAt, 10*time.Second)
-			assert.EqualValues(t, lock.LockedAt.Format(time.RFC3339), lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
+			assert.Equal(t, lock.LockedAt.Format(time.RFC3339), lock.LockedAt.Format(time.RFC3339Nano)) // locked at should be rounded to second
 		}
 
 		req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks/verify", test.repo.FullName()), map[string]string{})
@@ -143,7 +143,7 @@ func TestAPILFSLocksLogged(t *testing.T) {
 		assert.Len(t, lfsLocksVerify.Ours, test.oursCount)
 		assert.Len(t, lfsLocksVerify.Theirs, test.theirsCount)
 		for _, lock := range lfsLocksVerify.Ours {
-			assert.EqualValues(t, test.user.Name, lock.Owner.Name)
+			assert.Equal(t, test.user.Name, lock.Owner.Name)
 			deleteTests = append(deleteTests, struct {
 				user   *user_model.User
 				repo   *repo_model.Repository
diff --git a/tests/integration/api_repo_lfs_migrate_test.go b/tests/integration/api_repo_lfs_migrate_test.go
index fcfa43cac4..e95ee64639 100644
--- a/tests/integration/api_repo_lfs_migrate_test.go
+++ b/tests/integration/api_repo_lfs_migrate_test.go
@@ -41,7 +41,7 @@ func TestAPIRepoLFSMigrateLocal(t *testing.T) {
 		LFS:         true,
 	}).AddTokenAuth(token)
 	resp := MakeRequest(t, req, NoExpectedStatus)
-	assert.EqualValues(t, http.StatusCreated, resp.Code)
+	assert.Equal(t, http.StatusCreated, resp.Code)
 
 	store := lfs.NewContentStore()
 	ok, _ := store.Verify(lfs.Pointer{Oid: "fb8f7d8435968c4f82a726a92395be4d16f2f63116caf36c8ad35c60831ab041", Size: 6})
diff --git a/tests/integration/api_repo_lfs_test.go b/tests/integration/api_repo_lfs_test.go
index 078cedf78e..b0edf7b854 100644
--- a/tests/integration/api_repo_lfs_test.go
+++ b/tests/integration/api_repo_lfs_test.go
@@ -21,6 +21,7 @@ import (
 	"forgejo.org/modules/json"
 	"forgejo.org/modules/lfs"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
@@ -63,7 +64,7 @@ func TestAPILFSMediaType(t *testing.T) {
 
 func createLFSTestRepository(t *testing.T, name string) *repo_model.Repository {
 	ctx := NewAPITestContext(t, "user2", "lfs-"+name+"-repo", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-	t.Run("CreateRepo", doAPICreateRepository(ctx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
+	t.Run("CreateRepo", doAPICreateRepository(ctx, nil, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
 
 	repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "lfs-"+name+"-repo")
 	require.NoError(t, err)
@@ -228,9 +229,7 @@ func TestAPILFSBatch(t *testing.T) {
 
 		t.Run("FileTooBig", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
-
-			oldMaxFileSize := setting.LFS.MaxFileSize
-			setting.LFS.MaxFileSize = 2
+			defer test.MockVariableValue(&setting.LFS.MaxFileSize, 2)()
 
 			req := newRequest(t, &lfs.BatchRequest{
 				Operation: "upload",
@@ -245,8 +244,6 @@ func TestAPILFSBatch(t *testing.T) {
 			assert.NotNil(t, br.Objects[0].Error)
 			assert.Equal(t, http.StatusUnprocessableEntity, br.Objects[0].Error.Code)
 			assert.Equal(t, "Size must be less than or equal to 2", br.Objects[0].Error.Message)
-
-			setting.LFS.MaxFileSize = oldMaxFileSize
 		})
 
 		t.Run("AddMeta", func(t *testing.T) {
diff --git a/tests/integration/api_repo_raw_test.go b/tests/integration/api_repo_raw_test.go
index 5ae11a8e71..bc48119a46 100644
--- a/tests/integration/api_repo_raw_test.go
+++ b/tests/integration/api_repo_raw_test.go
@@ -30,11 +30,11 @@ func TestAPIReposRaw(t *testing.T) {
 		req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/%s/README.md", user.Name, ref).
 			AddTokenAuth(token)
 		resp := MakeRequest(t, req, http.StatusOK)
-		assert.EqualValues(t, "file", resp.Header().Get("x-gitea-object-type"))
+		assert.Equal(t, "file", resp.Header().Get("x-gitea-object-type"))
 	}
 	// Test default branch
 	req := NewRequestf(t, "GET", "/api/v1/repos/%s/repo1/raw/README.md", user.Name).
 		AddTokenAuth(token)
 	resp := MakeRequest(t, req, http.StatusOK)
-	assert.EqualValues(t, "file", resp.Header().Get("x-gitea-object-type"))
+	assert.Equal(t, "file", resp.Header().Get("x-gitea-object-type"))
 }
diff --git a/tests/integration/api_repo_tags_test.go b/tests/integration/api_repo_tags_test.go
index 81475249a1..9c69ff31bb 100644
--- a/tests/integration/api_repo_tags_test.go
+++ b/tests/integration/api_repo_tags_test.go
@@ -48,10 +48,10 @@ func TestAPIRepoTags(t *testing.T) {
 	assert.Len(t, tags, 2)
 	for _, tag := range tags {
 		if tag.Name != "v1.1" {
-			assert.EqualValues(t, newTag.Name, tag.Name)
-			assert.EqualValues(t, newTag.Message, tag.Message)
-			assert.EqualValues(t, "nice!\nand some text", tag.Message)
-			assert.EqualValues(t, newTag.Commit.SHA, tag.Commit.SHA)
+			assert.Equal(t, newTag.Name, tag.Name)
+			assert.Equal(t, newTag.Message, tag.Message)
+			assert.Equal(t, "nice!\nand some text", tag.Message)
+			assert.Equal(t, newTag.Commit.SHA, tag.Commit.SHA)
 		}
 	}
 
@@ -61,7 +61,7 @@ func TestAPIRepoTags(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	var tag *api.Tag
 	DecodeJSON(t, resp, &tag)
-	assert.EqualValues(t, newTag, tag)
+	assert.Equal(t, newTag, tag)
 
 	// delete tag
 	delReq := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/tags/%s", user.Name, repoName, newTag.Name).
diff --git a/tests/integration/api_repo_teams_test.go b/tests/integration/api_repo_teams_test.go
index c75714d003..59905282a5 100644
--- a/tests/integration/api_repo_teams_test.go
+++ b/tests/integration/api_repo_teams_test.go
@@ -37,15 +37,15 @@ func TestAPIRepoTeams(t *testing.T) {
 	var teams []*api.Team
 	DecodeJSON(t, res, &teams)
 	if assert.Len(t, teams, 2) {
-		assert.EqualValues(t, "Owners", teams[0].Name)
+		assert.Equal(t, "Owners", teams[0].Name)
 		assert.True(t, teams[0].CanCreateOrgRepo)
 		assert.True(t, util.SliceSortedEqual(unit.AllUnitKeyNames(), teams[0].Units))
-		assert.EqualValues(t, "owner", teams[0].Permission)
+		assert.Equal(t, "owner", teams[0].Permission)
 
-		assert.EqualValues(t, "test_team", teams[1].Name)
+		assert.Equal(t, "test_team", teams[1].Name)
 		assert.False(t, teams[1].CanCreateOrgRepo)
-		assert.EqualValues(t, []string{"repo.issues"}, teams[1].Units)
-		assert.EqualValues(t, "write", teams[1].Permission)
+		assert.Equal(t, []string{"repo.issues"}, teams[1].Units)
+		assert.Equal(t, "write", teams[1].Permission)
 	}
 
 	// IsTeam
@@ -54,7 +54,7 @@ func TestAPIRepoTeams(t *testing.T) {
 	res = MakeRequest(t, req, http.StatusOK)
 	var team *api.Team
 	DecodeJSON(t, res, &team)
-	assert.EqualValues(t, teams[1], team)
+	assert.Equal(t, teams[1], team)
 
 	req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/teams/%s", publicOrgRepo.FullName(), "NonExistingTeam")).
 		AddTokenAuth(token)
diff --git a/tests/integration/api_repo_test.go b/tests/integration/api_repo_test.go
index cd79c6eee6..e81f4307ee 100644
--- a/tests/integration/api_repo_test.go
+++ b/tests/integration/api_repo_test.go
@@ -39,7 +39,7 @@ func TestAPIUserReposNotLogin(t *testing.T) {
 		unittest.Cond("is_private = ?", false))
 	assert.Len(t, apiRepos, expectedLen)
 	for _, repo := range apiRepos {
-		assert.EqualValues(t, user.ID, repo.Owner.ID)
+		assert.Equal(t, user.ID, repo.Owner.ID)
 		assert.False(t, repo.Private)
 	}
 }
@@ -268,25 +268,25 @@ func TestAPIViewRepo(t *testing.T) {
 	resp := MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &repo)
 	assert.EqualValues(t, 1, repo.ID)
-	assert.EqualValues(t, "repo1", repo.Name)
-	assert.EqualValues(t, 2, repo.Releases)
-	assert.EqualValues(t, 1, repo.OpenIssues)
-	assert.EqualValues(t, 3, repo.OpenPulls)
+	assert.Equal(t, "repo1", repo.Name)
+	assert.Equal(t, 2, repo.Releases)
+	assert.Equal(t, 1, repo.OpenIssues)
+	assert.Equal(t, 3, repo.OpenPulls)
 
 	req = NewRequest(t, "GET", "/api/v1/repos/user12/repo10")
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &repo)
 	assert.EqualValues(t, 10, repo.ID)
-	assert.EqualValues(t, "repo10", repo.Name)
-	assert.EqualValues(t, 1, repo.OpenPulls)
-	assert.EqualValues(t, 1, repo.Forks)
+	assert.Equal(t, "repo10", repo.Name)
+	assert.Equal(t, 1, repo.OpenPulls)
+	assert.Equal(t, 1, repo.Forks)
 
 	req = NewRequest(t, "GET", "/api/v1/repos/user5/repo4")
 	resp = MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &repo)
 	assert.EqualValues(t, 4, repo.ID)
-	assert.EqualValues(t, "repo4", repo.Name)
-	assert.EqualValues(t, 1, repo.Stars)
+	assert.Equal(t, "repo4", repo.Name)
+	assert.Equal(t, 1, repo.Stars)
 }
 
 func TestAPIOrgRepos(t *testing.T) {
@@ -339,9 +339,7 @@ func TestAPIOrgReposWithCodeUnitDisabled(t *testing.T) {
 	var units []unit_model.Type
 	units = append(units, unit_model.TypeCode)
 
-	if err := repo_service.UpdateRepositoryUnits(db.DefaultContext, repo21, nil, units); err != nil {
-		assert.Fail(t, "should have been able to delete code repository unit; failed to %v", err)
-	}
+	require.NoError(t, repo_service.UpdateRepositoryUnits(db.DefaultContext, repo21, nil, units))
 	assert.False(t, repo21.UnitEnabled(db.DefaultContext, unit_model.TypeCode))
 
 	session := loginUser(t, "user2")
@@ -378,11 +376,11 @@ func TestAPIRepoMigrate(t *testing.T) {
 		cloneURL, repoName string
 		expectedStatus     int
 	}{
-		{ctxUserID: 1, userID: 2, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-admin", expectedStatus: http.StatusCreated},
-		{ctxUserID: 2, userID: 2, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-own", expectedStatus: http.StatusCreated},
-		{ctxUserID: 2, userID: 1, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-bad", expectedStatus: http.StatusForbidden},
-		{ctxUserID: 2, userID: 3, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-org", expectedStatus: http.StatusCreated},
-		{ctxUserID: 2, userID: 6, cloneURL: "https://github.com/go-gitea/test_repo.git", repoName: "git-bad-org", expectedStatus: http.StatusForbidden},
+		{ctxUserID: 1, userID: 2, cloneURL: "https://code.forgejo.org/forgejo/migration-test.git", repoName: "git-admin", expectedStatus: http.StatusCreated},
+		{ctxUserID: 2, userID: 2, cloneURL: "https://code.forgejo.org/forgejo/migration-test.git", repoName: "git-own", expectedStatus: http.StatusCreated},
+		{ctxUserID: 2, userID: 1, cloneURL: "https://code.forgejo.org/forgejo/migration-test.git", repoName: "git-bad", expectedStatus: http.StatusForbidden},
+		{ctxUserID: 2, userID: 3, cloneURL: "https://code.forgejo.org/forgejo/migration-test.git", repoName: "git-org", expectedStatus: http.StatusCreated},
+		{ctxUserID: 2, userID: 6, cloneURL: "https://code.forgejo.org/forgejo/migration-test.git", repoName: "git-bad-org", expectedStatus: http.StatusForbidden},
 		{ctxUserID: 2, userID: 3, cloneURL: "https://localhost:3000/user/test_repo.git", repoName: "private-ip", expectedStatus: http.StatusUnprocessableEntity},
 		{ctxUserID: 2, userID: 3, cloneURL: "https://10.0.0.1/user/test_repo.git", repoName: "private-ip", expectedStatus: http.StatusUnprocessableEntity},
 	}
@@ -396,22 +394,10 @@ func TestAPIRepoMigrate(t *testing.T) {
 			CloneAddr:   testCase.cloneURL,
 			RepoOwnerID: testCase.userID,
 			RepoName:    testCase.repoName,
+			Wiki:        true,
 		}).AddTokenAuth(token)
 		resp := MakeRequest(t, req, NoExpectedStatus)
-		if resp.Code == http.StatusUnprocessableEntity {
-			respJSON := map[string]string{}
-			DecodeJSON(t, resp, &respJSON)
-			switch respJSON["message"] {
-			case "Remote visit addressed rate limitation.":
-				t.Log("test hit github rate limitation")
-			case "You can not import from disallowed hosts.":
-				assert.EqualValues(t, "private-ip", testCase.repoName)
-			default:
-				assert.FailNow(t, "unexpected error '%v' on url '%s'", respJSON["message"], testCase.cloneURL)
-			}
-		} else {
-			assert.EqualValues(t, testCase.expectedStatus, resp.Code)
-		}
+		require.Equalf(t, testCase.expectedStatus, resp.Code, "unexpected status (may be due to throttling): '%v' on url '%s'", resp.Body.String(), testCase.cloneURL)
 	}
 }
 
@@ -429,13 +415,13 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) {
 		httpContext := baseAPITestContext
 
 		httpContext.Reponame = "repo-tmp-17"
-		t.Run("CreateRepo", doAPICreateRepository(httpContext, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
+		t.Run("CreateRepo", doAPICreateRepository(httpContext, nil, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
 
 		user, err := user_model.GetUserByName(db.DefaultContext, httpContext.Username)
 		require.NoError(t, err)
 		userID := user.ID
 
-		cloneURL := "https://github.com/go-gitea/test_repo.git"
+		cloneURL := "https://code.forgejo.org/forgejo/migration-test.git"
 
 		req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate",
 			&api.MigrateRepoOptions{
@@ -512,7 +498,7 @@ func testAPIRepoCreateConflict(t *testing.T, u *url.URL) {
 		httpContext := baseAPITestContext
 
 		httpContext.Reponame = "repo-tmp-17"
-		t.Run("CreateRepo", doAPICreateRepository(httpContext, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
+		t.Run("CreateRepo", doAPICreateRepository(httpContext, nil, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
 
 		req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos",
 			&api.CreateRepoOption{
@@ -748,7 +734,7 @@ func TestAPIViewRepoObjectFormat(t *testing.T) {
 	req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1")
 	resp := MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &repo)
-	assert.EqualValues(t, "sha1", repo.ObjectFormatName)
+	assert.Equal(t, "sha1", repo.ObjectFormatName)
 }
 
 func TestAPIRepoCommitPull(t *testing.T) {
@@ -798,12 +784,12 @@ func TestAPIListOwnRepoSorting(t *testing.T) {
 		DecodeJSON(t, resp, &repos)
 
 		assert.Len(t, repos, 2)
-		assert.EqualValues(t, "big_test_private_4", repos[0].Name)
+		assert.Equal(t, "big_test_private_4", repos[0].Name)
 		// Postgres doesn't do ascii sorting.
 		if setting.Database.Type.IsPostgreSQL() {
-			assert.EqualValues(t, "commitsonpr", repos[1].Name)
+			assert.Equal(t, "commitsonpr", repos[1].Name)
 		} else {
-			assert.EqualValues(t, "commits_search_test", repos[1].Name)
+			assert.Equal(t, "commits_search_test", repos[1].Name)
 		}
 	})
 
@@ -815,7 +801,7 @@ func TestAPIListOwnRepoSorting(t *testing.T) {
 		DecodeJSON(t, resp, &repos)
 
 		assert.Len(t, repos, 2)
-		assert.EqualValues(t, "utf8", repos[0].Name)
-		assert.EqualValues(t, "test_workflows", repos[1].Name)
+		assert.Equal(t, "utf8", repos[0].Name)
+		assert.Equal(t, "test_workflows", repos[1].Name)
 	})
 }
diff --git a/tests/integration/api_repo_topic_test.go b/tests/integration/api_repo_topic_test.go
index c826fbd818..69008bbf64 100644
--- a/tests/integration/api_repo_topic_test.go
+++ b/tests/integration/api_repo_topic_test.go
@@ -62,7 +62,7 @@ func TestAPITopicSearch(t *testing.T) {
 	res := MakeRequest(t, NewRequest(t, "GET", searchURL.String()), http.StatusOK)
 	DecodeJSON(t, res, &topics)
 	assert.Len(t, topics.TopicNames, 4)
-	assert.EqualValues(t, "6", res.Header().Get("x-total-count"))
+	assert.Equal(t, "6", res.Header().Get("x-total-count"))
 
 	query.Add("q", "topic")
 	searchURL.RawQuery = query.Encode()
@@ -76,8 +76,8 @@ func TestAPITopicSearch(t *testing.T) {
 	DecodeJSON(t, res, &topics)
 	if assert.Len(t, topics.TopicNames, 1) {
 		assert.EqualValues(t, 2, topics.TopicNames[0].ID)
-		assert.EqualValues(t, "database", topics.TopicNames[0].Name)
-		assert.EqualValues(t, 1, topics.TopicNames[0].RepoCount)
+		assert.Equal(t, "database", topics.TopicNames[0].Name)
+		assert.Equal(t, 1, topics.TopicNames[0].RepoCount)
 	}
 }
 
diff --git a/tests/integration/api_settings_test.go b/tests/integration/api_settings_test.go
index e13f4062da..dad4b1d776 100644
--- a/tests/integration/api_settings_test.go
+++ b/tests/integration/api_settings_test.go
@@ -30,7 +30,7 @@ func TestAPIExposedSettings(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 
 	DecodeJSON(t, resp, &apiSettings)
-	assert.EqualValues(t, &api.GeneralAPISettings{
+	assert.Equal(t, &api.GeneralAPISettings{
 		MaxResponseItems:       setting.API.MaxResponseItems,
 		DefaultPagingNum:       setting.API.DefaultPagingNum,
 		DefaultGitTreesPerPage: setting.API.DefaultGitTreesPerPage,
@@ -42,7 +42,7 @@ func TestAPIExposedSettings(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 
 	DecodeJSON(t, resp, &repo)
-	assert.EqualValues(t, &api.GeneralRepoSettings{
+	assert.Equal(t, &api.GeneralRepoSettings{
 		MirrorsDisabled:      !setting.Mirror.Enabled,
 		HTTPGitDisabled:      setting.Repository.DisableHTTPGit,
 		MigrationsDisabled:   setting.Repository.DisableMigrations,
@@ -55,7 +55,7 @@ func TestAPIExposedSettings(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 
 	DecodeJSON(t, resp, &attachment)
-	assert.EqualValues(t, &api.GeneralAttachmentSettings{
+	assert.Equal(t, &api.GeneralAttachmentSettings{
 		Enabled:      setting.Attachment.Enabled,
 		AllowedTypes: setting.Attachment.AllowedTypes,
 		MaxFiles:     setting.Attachment.MaxFiles,
diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go
index 41d34dcd50..2d16ea2b95 100644
--- a/tests/integration/api_team_test.go
+++ b/tests/integration/api_team_test.go
@@ -41,9 +41,9 @@ func TestAPITeam(t *testing.T) {
 
 	var apiTeam api.Team
 	DecodeJSON(t, resp, &apiTeam)
-	assert.EqualValues(t, team.ID, apiTeam.ID)
+	assert.Equal(t, team.ID, apiTeam.ID)
 	assert.Equal(t, team.Name, apiTeam.Name)
-	assert.EqualValues(t, convert.ToOrganization(db.DefaultContext, org), apiTeam.Organization)
+	assert.Equal(t, convert.ToOrganization(db.DefaultContext, org), apiTeam.Organization)
 
 	// non team member user will not access the teams details
 	teamUser2 := unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{ID: 3})
@@ -248,10 +248,10 @@ func checkTeamResponse(t *testing.T, testName string, apiTeam *api.Team, name, d
 		if units != nil {
 			sort.StringSlice(units).Sort()
 			sort.StringSlice(apiTeam.Units).Sort()
-			assert.EqualValues(t, units, apiTeam.Units, "units")
+			assert.Equal(t, units, apiTeam.Units, "units")
 		}
 		if unitsMap != nil {
-			assert.EqualValues(t, unitsMap, apiTeam.UnitsMap, "unitsMap")
+			assert.Equal(t, unitsMap, apiTeam.UnitsMap, "unitsMap")
 		}
 	})
 }
diff --git a/tests/integration/api_team_user_test.go b/tests/integration/api_team_user_test.go
index 0c76dd459d..239252786e 100644
--- a/tests/integration/api_team_user_test.go
+++ b/tests/integration/api_team_user_test.go
@@ -40,8 +40,8 @@ func TestAPITeamUser(t *testing.T) {
 	expectedUser := convert.ToUser(db.DefaultContext, user, user)
 
 	// test time via unix timestamp
-	assert.EqualValues(t, expectedUser.LastLogin.Unix(), user2.LastLogin.Unix())
-	assert.EqualValues(t, expectedUser.Created.Unix(), user2.Created.Unix())
+	assert.Equal(t, expectedUser.LastLogin.Unix(), user2.LastLogin.Unix())
+	assert.Equal(t, expectedUser.Created.Unix(), user2.Created.Unix())
 	expectedUser.LastLogin = user2.LastLogin
 	expectedUser.Created = user2.Created
 
diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go
index aba6a25256..9d9a44b5d4 100644
--- a/tests/integration/api_token_test.go
+++ b/tests/integration/api_token_test.go
@@ -524,7 +524,7 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model
 				} else if minRequiredLevel == auth_model.Write {
 					unauthorizedLevel = auth_model.Read
 				} else {
-					assert.FailNow(t, "Invalid test case: Unknown access token scope level: %v", minRequiredLevel)
+					assert.FailNow(t, "Invalid test case", "Unknown access token scope level: %v", minRequiredLevel)
 				}
 			}
 
diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go
index 6441b23199..ab173fc9f9 100644
--- a/tests/integration/api_twofa_test.go
+++ b/tests/integration/api_twofa_test.go
@@ -4,7 +4,9 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
+	"strings"
 	"testing"
 	"time"
 
@@ -12,6 +14,9 @@ import (
 	"forgejo.org/models/db"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/modules/translation"
 	"forgejo.org/tests"
 
 	"github.com/pquerna/otp/totp"
@@ -77,5 +82,129 @@ func TestAPIWebAuthn(t *testing.T) {
 
 	DecodeJSON(t, resp, &userParsed)
 
-	assert.EqualValues(t, "Basic authorization is not allowed while having security keys enrolled", userParsed.Message)
+	assert.Equal(t, "Basic authorization is not allowed while having security keys enrolled", userParsed.Message)
+}
+
+func TestAPIWithRequiredTwoFactor(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	type userResponse struct {
+		Message string `json:"message"`
+	}
+
+	locale := translation.NewLocale("en-US")
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	inactiveUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 9})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+	prohibitLoginUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 37})
+
+	require2FaMessage := locale.TrString("error.must_enable_2fa", fmt.Sprintf("%suser/settings/security", setting.AppURL))
+	const prohibitedMessage = "This account is prohibited from signing in, please contact your site administrator."
+	const loginNotAllowedMessage = "user is not allowed login"
+
+	runTest := func(t *testing.T, user *user_model.User, useTOTP bool, status int, messagePrefix string) {
+		t.Helper()
+		defer unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
+
+		passcode := func() string {
+			if !useTOTP {
+				return ""
+			}
+
+			otpKey, err := totp.Generate(totp.GenerateOpts{
+				SecretSize:  40,
+				Issuer:      "forgejo-test",
+				AccountName: user.Name,
+			})
+			require.NoError(t, err)
+
+			require.NoError(t, auth_model.NewTwoFactor(t.Context(), &auth_model.TwoFactor{UID: user.ID}, otpKey.Secret()))
+
+			passcode, err := totp.GenerateCode(otpKey.Secret(), time.Now())
+			require.NoError(t, err)
+			return passcode
+		}()
+
+		req := NewRequest(t, "GET", "/api/v1/user").
+			AddBasicAuth(user.Name)
+
+		if useTOTP {
+			MakeRequest(t, req, http.StatusUnauthorized)
+
+			req = NewRequestf(t, "GET", "/api/v1/user").
+				AddBasicAuth(user.Name)
+			req.Header.Set("X-Forgejo-OTP", passcode)
+		}
+
+		resp := MakeRequest(t, req, status)
+
+		if messagePrefix != "" {
+			var response userResponse
+			DecodeJSON(t, resp, &response)
+
+			assert.True(t, strings.HasPrefix(response.Message, messagePrefix))
+		}
+	}
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		// this should be the default, so don't have to set the variable
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusOK, "")
+			runTest(t, normalUser, false, http.StatusOK, "")
+			runTest(t, inactiveUser, false, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, false, http.StatusOK, "")
+			runTest(t, prohibitLoginUser, false, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK, "")
+			runTest(t, normalUser, true, http.StatusOK, "")
+			runTest(t, inactiveUser, true, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, true, http.StatusOK, "")
+			runTest(t, prohibitLoginUser, true, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusForbidden, require2FaMessage)
+			runTest(t, normalUser, false, http.StatusForbidden, require2FaMessage)
+			runTest(t, inactiveUser, false, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, false, http.StatusForbidden, require2FaMessage)
+			runTest(t, prohibitLoginUser, false, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK, "")
+			runTest(t, normalUser, true, http.StatusOK, "")
+			runTest(t, inactiveUser, true, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, true, http.StatusOK, "")
+			runTest(t, prohibitLoginUser, true, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, http.StatusForbidden, require2FaMessage)
+			runTest(t, normalUser, false, http.StatusOK, "")
+			runTest(t, inactiveUser, false, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, false, http.StatusOK, "")
+			runTest(t, prohibitLoginUser, false, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, http.StatusOK, "")
+			runTest(t, normalUser, true, http.StatusOK, "")
+			runTest(t, inactiveUser, true, http.StatusForbidden, prohibitedMessage)
+			runTest(t, restrictedUser, true, http.StatusOK, "")
+			runTest(t, prohibitLoginUser, true, http.StatusUnauthorized, loginNotAllowedMessage)
+		})
+	})
 }
diff --git a/tests/integration/api_user_actions_test.go b/tests/integration/api_user_actions_test.go
index 1eb5089ee4..f8d5bb500e 100644
--- a/tests/integration/api_user_actions_test.go
+++ b/tests/integration/api_user_actions_test.go
@@ -34,5 +34,5 @@ func TestAPISearchActionJobs_UserRunner(t *testing.T) {
 	DecodeJSON(t, res, &jobs)
 
 	assert.Len(t, jobs, 1)
-	assert.EqualValues(t, job.ID, jobs[0].ID)
+	assert.Equal(t, job.ID, jobs[0].ID)
 }
diff --git a/tests/integration/api_user_email_test.go b/tests/integration/api_user_email_test.go
index b0907ad1cf..424d8c1e5e 100644
--- a/tests/integration/api_user_email_test.go
+++ b/tests/integration/api_user_email_test.go
@@ -28,7 +28,7 @@ func TestAPIListEmails(t *testing.T) {
 	var emails []*api.Email
 	DecodeJSON(t, resp, &emails)
 
-	assert.EqualValues(t, []*api.Email{
+	assert.Equal(t, []*api.Email{
 		{
 			Email:    "user2@example.com",
 			Verified: true,
@@ -66,7 +66,7 @@ func TestAPIAddEmail(t *testing.T) {
 
 	var emails []*api.Email
 	DecodeJSON(t, resp, &emails)
-	assert.EqualValues(t, []*api.Email{
+	assert.Equal(t, []*api.Email{
 		{
 			Email:    "user2@example.com",
 			Verified: true,
@@ -119,7 +119,7 @@ func TestAPIDeleteEmail(t *testing.T) {
 
 	var emails []*api.Email
 	DecodeJSON(t, resp, &emails)
-	assert.EqualValues(t, []*api.Email{
+	assert.Equal(t, []*api.Email{
 		{
 			Email:    "user2@example.com",
 			Verified: true,
diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go
index 3df3e45778..0e8f7a123e 100644
--- a/tests/integration/api_user_search_test.go
+++ b/tests/integration/api_user_search_test.go
@@ -4,18 +4,25 @@
 package integration
 
 import (
+	"context"
+	"fmt"
 	"net/http"
+	"strconv"
 	"testing"
+	"time"
 
 	auth_model "forgejo.org/models/auth"
+	"forgejo.org/models/db"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
+	"forgejo.org/modules/timeutil"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type SearchResults struct {
@@ -68,7 +75,7 @@ func TestAPIUserSearchNotLoggedIn(t *testing.T) {
 	for _, user := range results.Data {
 		assert.Contains(t, user.UserName, query)
 		modelUser = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: user.ID})
-		assert.EqualValues(t, modelUser.GetPlaceholderEmail(), user.Email)
+		assert.Equal(t, modelUser.GetPlaceholderEmail(), user.Email)
 	}
 }
 
@@ -106,8 +113,8 @@ func TestAPIUserSearchSystemUsers(t *testing.T) {
 			assert.NotEmpty(t, results.Data)
 			if assert.Len(t, results.Data, 1) {
 				user := results.Data[0]
-				assert.EqualValues(t, user.UserName, systemUser.Name)
-				assert.EqualValues(t, user.ID, systemUser.ID)
+				assert.Equal(t, user.UserName, systemUser.Name)
+				assert.Equal(t, user.ID, systemUser.ID)
 			}
 		})
 	}
@@ -129,7 +136,7 @@ func TestAPIUserSearchAdminLoggedInUserHidden(t *testing.T) {
 	for _, user := range results.Data {
 		assert.Contains(t, user.UserName, query)
 		assert.NotEmpty(t, user.Email)
-		assert.EqualValues(t, "private", user.Visibility)
+		assert.Equal(t, "private", user.Visibility)
 	}
 }
 
@@ -179,3 +186,61 @@ func TestAPIUserSearchByEmail(t *testing.T) {
 	assert.Len(t, results.Data, 1)
 	assert.Equal(t, query, results.Data[0].Email)
 }
+
+func TestUsersSearchSorted(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	createTimestamp := time.Now().Unix() - 1000
+	updateTimestamp := time.Now().Unix() - 500
+	sess := db.GetEngine(context.Background())
+
+	for i := int64(1); i <= 10; i++ {
+		name := "sorttest" + strconv.Itoa(int(i))
+		user := &user_model.User{
+			Name:        name,
+			LowerName:   name,
+			LoginName:   name,
+			Email:       name + "@example.com",
+			Passwd:      name + ".password",
+			Avatar:      "xyz",
+			Type:        user_model.UserTypeIndividual,
+			LoginType:   auth_model.OAuth2,
+			CreatedUnix: timeutil.TimeStamp(createTimestamp - i),
+			UpdatedUnix: timeutil.TimeStamp(updateTimestamp - i),
+		}
+		_, err := sess.NoAutoTime().Insert(user)
+		require.NoError(t, err)
+	}
+
+	session := loginUser(t, "user1")
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser)
+
+	testCases := []struct {
+		sortType      string
+		expectedUsers []string
+	}{
+		{"alphabetically", []string{"sorttest1", "sorttest10", "sorttest2", "sorttest3"}},
+		{"reversealphabetically", []string{"sorttest9", "sorttest8", "sorttest7", "sorttest6"}},
+		{"newest", []string{"sorttest1", "sorttest2", "sorttest3", "sorttest4"}},
+		{"oldest", []string{"sorttest10", "sorttest9", "sorttest8", "sorttest7"}},
+		{"recentupdate", []string{"sorttest1", "sorttest2", "sorttest3", "sorttest4"}},
+		{"leastupdate", []string{"sorttest10", "sorttest9", "sorttest8", "sorttest7"}},
+	}
+
+	for _, testCase := range testCases {
+		req := NewRequest(
+			t,
+			"GET",
+			fmt.Sprintf("/api/v1/users/search?q=sorttest&sort=%s&limit=4",
+				testCase.sortType,
+			),
+		).AddTokenAuth(token)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		var results SearchResults
+		DecodeJSON(t, resp, &results)
+		assert.Len(t, results.Data, 4)
+		for i, searchData := range results.Data {
+			assert.Equalf(t, testCase.expectedUsers[i], searchData.UserName, "Sort type: %s, index %d", testCase.sortType, i)
+		}
+	}
+}
diff --git a/tests/integration/appearance_settings_test.go b/tests/integration/appearance_settings_test.go
index 33ca9f97aa..968d30ef08 100644
--- a/tests/integration/appearance_settings_test.go
+++ b/tests/integration/appearance_settings_test.go
@@ -38,13 +38,13 @@ func testSelectedTheme(t *testing.T, session *TestSession, expectedTheme, expect
 
 	dataTheme, dataThemeExists := page.Find("html").Attr("data-theme")
 	assert.True(t, dataThemeExists)
-	assert.EqualValues(t, expectedTheme, dataTheme)
+	assert.Equal(t, expectedTheme, dataTheme)
 
 	selectedTheme := page.Find("form[action='/user/settings/appearance/theme'] .menu .item.selected")
 	selectorTheme, selectorThemeExists := selectedTheme.Attr("data-value")
 	assert.True(t, selectorThemeExists)
-	assert.EqualValues(t, expectedTheme, selectorTheme)
-	assert.EqualValues(t, expectedName, strings.TrimSpace(selectedTheme.Text()))
+	assert.Equal(t, expectedTheme, selectorTheme)
+	assert.Equal(t, expectedName, strings.TrimSpace(selectedTheme.Text()))
 }
 
 // testSelectedTheme changes user's theme
diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go
index 6b9a71a5aa..fa38b29941 100644
--- a/tests/integration/auth_ldap_test.go
+++ b/tests/integration/auth_ldap_test.go
@@ -220,7 +220,7 @@ func TestLDAPAuthChange(t *testing.T) {
 	binddn, _ = doc.Find(`input[name="bind_dn"]`).Attr("value")
 	assert.Equal(t, "uid=gitea,ou=service,dc=planetexpress,dc=com", binddn)
 	domainname, _ := doc.Find(`input[name="default_domain_name"]`).Attr("value")
-	assert.Equal(t, "", domainname)
+	assert.Empty(t, domainname)
 
 	req = NewRequestWithValues(t, "POST", href, buildAuthSourceLDAPPayload(csrf, "", "", "test.org", "", "", "off"))
 	session.MakeRequest(t, req, http.StatusSeeOther)
diff --git a/tests/integration/auth_token_test.go b/tests/integration/auth_token_test.go
index b4242c2681..abb2e2550f 100644
--- a/tests/integration/auth_token_test.go
+++ b/tests/integration/auth_token_test.go
@@ -116,7 +116,7 @@ func TestLTAPasswordChange(t *testing.T) {
 	assert.NotNil(t, rememberCookie)
 
 	// Check if the password really changed.
-	assert.NotEqualValues(t, unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).Passwd, user.Passwd)
+	assert.NotEqual(t, unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).Passwd, user.Passwd)
 
 	// /user/settings/account should provide with a new LTA cookie, so check for that.
 	// If LTA cookie provides authentication /user/login shouldn't return status 200.
diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go
index 7a2756522b..7c328c8936 100644
--- a/tests/integration/block_test.go
+++ b/tests/integration/block_test.go
@@ -159,7 +159,7 @@ func TestBlockUserFromOrganization(t *testing.T) {
 		assert.False(t, unittest.BeanExists(t, &user_model.BlockedUser{BlockID: doer.ID, UserID: org.ID}))
 		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "error%3DYou%2Bcannot%2Bblock%2Byourself.", flashCookie.Value)
+		assert.Equal(t, "error%3DYou%2Bcannot%2Bblock%2Byourself.", flashCookie.Value)
 	})
 }
 
@@ -236,7 +236,7 @@ func TestBlockActions(t *testing.T) {
 	// Ensures that comment creation on doer's owned repositories and doer's
 	// posted issues are blocked.
 	t.Run("Comment creation", func(t *testing.T) {
-		expectedMessage := locale.Tr("repo.issues.comment.blocked_by_user")
+		expectedMessage := locale.Tr("repo.comment.blocked_by_user")
 
 		t.Run("Blocked by repository owner", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
@@ -258,7 +258,7 @@ func TestBlockActions(t *testing.T) {
 			resp = session.MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
 			msg := htmlDoc.doc.Find("div .warning").Text()
-			assert.Contains(t, msg, "You cannot comment on this issue because you are blocked")
+			assert.Contains(t, msg, expectedMessage)
 		})
 
 		t.Run("Blocked by issue poster", func(t *testing.T) {
@@ -285,7 +285,7 @@ func TestBlockActions(t *testing.T) {
 			resp = session.MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
 			msg := htmlDoc.doc.Find("div .warning").Text()
-			assert.Contains(t, msg, "You cannot comment on this issue because you are blocked")
+			assert.Contains(t, msg, expectedMessage)
 		})
 	})
 
@@ -393,7 +393,7 @@ func TestBlockActions(t *testing.T) {
 
 			flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "error%3DCannot%2Badd%2Bthe%2Bcollaborator%252C%2Bbecause%2Bthe%2Brepository%2Bowner%2Bhas%2Bblocked%2Bthem.", flashCookie.Value)
+			assert.Equal(t, "error%3DCannot%2Badd%2Bthe%2Bcollaborator%252C%2Bbecause%2Bthe%2Brepository%2Bowner%2Bhas%2Bblocked%2Bthem.", flashCookie.Value)
 		})
 
 		t.Run("BlockedUser Add doer", func(t *testing.T) {
@@ -410,7 +410,7 @@ func TestBlockActions(t *testing.T) {
 
 			flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "error%3DCannot%2Badd%2Bthe%2Bcollaborator%252C%2Bbecause%2Bthey%2Bhave%2Bblocked%2Bthe%2Brepository%2Bowner.", flashCookie.Value)
+			assert.Equal(t, "error%3DCannot%2Badd%2Bthe%2Bcollaborator%252C%2Bbecause%2Bthey%2Bhave%2Bblocked%2Bthe%2Brepository%2Bowner.", flashCookie.Value)
 		})
 	})
 
diff --git a/tests/integration/cmd_admin_test.go b/tests/integration/cmd_admin_test.go
index 043ecef346..c06f7f7213 100644
--- a/tests/integration/cmd_admin_test.go
+++ b/tests/integration/cmd_admin_test.go
@@ -4,21 +4,24 @@
 package integration
 
 import (
+	"fmt"
 	"net/url"
 	"testing"
 
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/tests"
 
+	"github.com/go-webauthn/webauthn/webauthn"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Cmd_AdminUser(t *testing.T) {
 	onGiteaRun(t, func(*testing.T, *url.URL) {
-		for _, testCase := range []struct {
+		for i, testCase := range []struct {
 			name               string
 			options            []string
 			mustChangePassword bool
@@ -46,7 +49,7 @@ func Test_Cmd_AdminUser(t *testing.T) {
 		} {
 			t.Run(testCase.name, func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
-				name := "testuser"
+				name := fmt.Sprintf("testuser%d", i)
 
 				options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
 				options = append(options, testCase.options...)
@@ -147,3 +150,41 @@ func Test_Cmd_AdminFirstUser(t *testing.T) {
 		}
 	})
 }
+
+func Test_Cmd_AdminUserResetMFA(t *testing.T) {
+	onGiteaRun(t, func(*testing.T, *url.URL) {
+		name := "testuser"
+
+		options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"}
+		output, err := runMainApp("admin", options...)
+		require.NoError(t, err)
+		assert.Contains(t, output, "has been successfully created")
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: name})
+
+		twoFactor := &auth_model.TwoFactor{
+			UID: user.ID,
+		}
+		token := twoFactor.GenerateScratchToken()
+		require.NoError(t, auth_model.NewTwoFactor(t.Context(), twoFactor, token))
+		twoFactor, err = auth_model.GetTwoFactorByUID(t.Context(), user.ID)
+		require.NoError(t, err)
+		require.NotNil(t, twoFactor)
+
+		authn, err := auth_model.CreateCredential(t.Context(), user.ID, "test", &webauthn.Credential{})
+		require.NoError(t, err)
+
+		options = []string{"user", "reset-mfa", "--username", name}
+		output, err = runMainApp("admin", options...)
+		require.NoError(t, err)
+		assert.Contains(t, output, "two-factor authentication settings have been removed")
+
+		_, err = auth_model.GetTwoFactorByUID(t.Context(), user.ID)
+		require.ErrorContains(t, err, "user not enrolled in 2FA")
+
+		_, err = auth_model.GetWebAuthnCredentialByID(t.Context(), authn.ID)
+		require.ErrorContains(t, err, "WebAuthn credential does not exist")
+
+		_, err = runMainApp("admin", "user", "delete", "--username", name)
+		require.NoError(t, err)
+	})
+}
diff --git a/tests/integration/cmd_forgejo_actions_test.go b/tests/integration/cmd_forgejo_actions_test.go
index bee50a6d98..01696d3171 100644
--- a/tests/integration/cmd_forgejo_actions_test.go
+++ b/tests/integration/cmd_forgejo_actions_test.go
@@ -69,7 +69,7 @@ func Test_CmdForgejo_Actions(t *testing.T) {
 			t.Run(testCase.testName, func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 				output, err := runMainApp("forgejo-cli", "actions", "register", "--secret", testCase.secret, "--scope", testCase.scope)
-				assert.EqualValues(t, "", output)
+				assert.Empty(t, output)
 
 				var exitErr *exec.ExitError
 				require.ErrorAs(t, err, &exitErr)
@@ -110,7 +110,7 @@ func Test_CmdForgejo_Actions(t *testing.T) {
 			t.Run(testCase.testName, func(t *testing.T) {
 				uuid, err := runMainAppWithStdin(testCase.stdin, "forgejo-cli", "actions", "register", testCase.secretOption(), "--scope=org26")
 				require.NoError(t, err)
-				assert.EqualValues(t, expecteduuid, uuid)
+				assert.Equal(t, expecteduuid, uuid)
 			})
 		}
 
@@ -186,7 +186,7 @@ func Test_CmdForgejo_Actions(t *testing.T) {
 				for i := 0; i < 2; i++ {
 					uuid, err := runMainApp("forgejo-cli", cmd...)
 					require.NoError(t, err)
-					if assert.EqualValues(t, testCase.uuid, uuid) {
+					if assert.Equal(t, testCase.uuid, uuid) {
 						ownerName, repoName, found := strings.Cut(testCase.scope, "/")
 						action, err := actions_model.GetRunnerByUUID(t.Context(), uuid)
 						require.NoError(t, err)
@@ -199,14 +199,14 @@ func Test_CmdForgejo_Actions(t *testing.T) {
 							assert.Equal(t, repoName, repo.Name, action.RepoID)
 						}
 						if testCase.name != "" {
-							assert.EqualValues(t, testCase.name, action.Name)
+							assert.Equal(t, testCase.name, action.Name)
 						}
 						if testCase.labels != "" {
 							labels := strings.Split(testCase.labels, ",")
-							assert.EqualValues(t, labels, action.AgentLabels)
+							assert.Equal(t, labels, action.AgentLabels)
 						}
 						if testCase.version != "" {
-							assert.EqualValues(t, testCase.version, action.Version)
+							assert.Equal(t, testCase.version, action.Version)
 						}
 					}
 				}
diff --git a/tests/integration/cmd_forgejo_f3_test.go b/tests/integration/cmd_forgejo_f3_test.go
index 1eda413e4c..19390eec90 100644
--- a/tests/integration/cmd_forgejo_f3_test.go
+++ b/tests/integration/cmd_forgejo_f3_test.go
@@ -25,7 +25,7 @@ import (
 	f3_tests "code.forgejo.org/f3/gof3/v3/tree/tests/f3"
 	f3_tests_forge "code.forgejo.org/f3/gof3/v3/tree/tests/f3/forge"
 	"github.com/stretchr/testify/require"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 func runApp(ctx context.Context, args ...string) (string, error) {
@@ -33,10 +33,10 @@ func runApp(ctx context.Context, args ...string) (string, error) {
 	ctx = f3_logger.ContextSetLogger(ctx, l)
 	ctx = forgejo.ContextSetNoInit(ctx, true)
 
-	app := cli.NewApp()
+	app := cli.Command{}
 
-	app.Writer = l.GetBuffer()
-	app.ErrWriter = l.GetBuffer()
+	app.Root().Writer = l.GetBuffer()
+	app.Root().ErrWriter = l.GetBuffer()
 
 	defer func() {
 		if r := recover(); r != nil {
@@ -48,7 +48,7 @@ func runApp(ctx context.Context, args ...string) (string, error) {
 	app.Commands = []*cli.Command{
 		forgejo.SubcmdF3Mirror(ctx),
 	}
-	err := app.Run(args)
+	err := app.Run(ctx, args)
 
 	fmt.Println(l.String())
 
@@ -83,7 +83,7 @@ func TestF3_CmdMirror_LocalForgejo(t *testing.T) {
 		user := users.CreateChild(ctx)
 		user.FromFormat(userFormat)
 		user.Upsert(ctx)
-		require.EqualValues(t, user.GetID(), users.GetIDFromName(ctx, userFormat.UserName))
+		require.Equal(t, user.GetID(), users.GetIDFromName(ctx, userFormat.UserName))
 
 		projectFormat := creator.GenerateProject()
 		projectFormat.SetID(fixtureProjectID)
@@ -91,7 +91,7 @@ func TestF3_CmdMirror_LocalForgejo(t *testing.T) {
 		project := projects.CreateChild(ctx)
 		project.FromFormat(projectFormat)
 		project.Upsert(ctx)
-		require.EqualValues(t, project.GetID(), projects.GetIDFromName(ctx, projectFormat.Name))
+		require.Equal(t, project.GetID(), projects.GetIDFromName(ctx, projectFormat.Name))
 
 		fromPath = fmt.Sprintf("/forge/users/%s/projects/%s", userFormat.UserName, projectFormat.Name)
 	}
@@ -106,14 +106,14 @@ func TestF3_CmdMirror_LocalForgejo(t *testing.T) {
 		user := users.CreateChild(ctx)
 		user.FromFormat(userFormat)
 		user.Upsert(ctx)
-		require.EqualValues(t, user.GetID(), users.GetIDFromName(ctx, userFormat.UserName))
+		require.Equal(t, user.GetID(), users.GetIDFromName(ctx, userFormat.UserName))
 
 		projectFormat := creator.GenerateProject()
 		projects = user.MustFind(f3_generic.NewPathFromString("projects"))
 		project := projects.CreateChild(ctx)
 		project.FromFormat(projectFormat)
 		project.Upsert(ctx)
-		require.EqualValues(t, project.GetID(), projects.GetIDFromName(ctx, projectFormat.Name))
+		require.Equal(t, project.GetID(), projects.GetIDFromName(ctx, projectFormat.Name))
 
 		toPath = fmt.Sprintf("/forge/users/%s/projects/%s", userFormat.UserName, projectFormat.Name)
 	}
diff --git a/tests/integration/cmd_keys_test.go b/tests/integration/cmd_keys_test.go
index c76055c4a8..55d97a3a1d 100644
--- a/tests/integration/cmd_keys_test.go
+++ b/tests/integration/cmd_keys_test.go
@@ -24,8 +24,8 @@ func Test_CmdKeys(t *testing.T) {
 			wantErr        bool
 			expectedOutput string
 		}{
-			{"test_empty_1", []string{"--username=git", "--type=test", "--content=test"}, true, ""},
-			{"test_empty_2", []string{"-e", "git", "-u", "git", "-t", "test", "-k", "test"}, true, ""},
+			{"test_empty_1", []string{"--username=git", "--type=test", "--content=test"}, true, "Command error: internal API error response, status=500, err=public key does not exist [id: 0]\n"},
+			{"test_empty_2", []string{"-e", "git", "-u", "git", "-t", "test", "-k", "test"}, true, "Command error: internal API error response, status=500, err=public key does not exist [id: 0]\n"},
 			{
 				"with_key",
 				[]string{"-e", "git", "-u", "git", "-t", "ssh-rsa", "-k", "AAAAB3NzaC1yc2EAAAADAQABAAABgQDWVj0fQ5N8wNc0LVNA41wDLYJ89ZIbejrPfg/avyj3u/ZohAKsQclxG4Ju0VirduBFF9EOiuxoiFBRr3xRpqzpsZtnMPkWVWb+akZwBFAx8p+jKdy4QXR/SZqbVobrGwip2UjSrri1CtBxpJikojRIZfCnDaMOyd9Jp6KkujvniFzUWdLmCPxUE9zhTaPu0JsEP7MW0m6yx7ZUhHyfss+NtqmFTaDO+QlMR7L2QkDliN2Jl3Xa3PhuWnKJfWhdAq1Cw4oraKUOmIgXLkuiuxVQ6mD3AiFupkmfqdHq6h+uHHmyQqv3gU+/sD8GbGAhf6ftqhTsXjnv1Aj4R8NoDf9BS6KRkzkeun5UisSzgtfQzjOMEiJtmrep2ZQrMGahrXa+q4VKr0aKJfm+KlLfwm/JztfsBcqQWNcTURiCFqz+fgZw0Ey/de0eyMzldYTdXXNRYCKjs9bvBK+6SSXRM7AhftfQ0ZuoW5+gtinPrnmoOaSCEJbAiEiTO/BzOHgowiM="},
@@ -44,10 +44,11 @@ func Test_CmdKeys(t *testing.T) {
 				}
 				if tt.wantErr {
 					require.Error(t, err)
+					assert.Equal(t, tt.expectedOutput, string(exitErr.Stderr))
 				} else {
 					require.NoError(t, err)
+					assert.Equal(t, tt.expectedOutput, out)
 				}
-				assert.Equal(t, tt.expectedOutput, out)
 			})
 		}
 	})
diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go
index e2eeb843d8..b85a5f213d 100644
--- a/tests/integration/codeowner_test.go
+++ b/tests/integration/codeowner_test.go
@@ -26,175 +26,192 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestCodeOwner(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+func CodeOwnerTestCommon(t *testing.T, u *url.URL, codeownerTest CodeownerTest) {
+	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 
-		// Create the repo.
-		repo, _, f := tests.CreateDeclarativeRepo(t, user2, "",
-			[]unit_model.Type{unit_model.TypePullRequests}, nil,
-			[]*files_service.ChangeRepoFile{
-				{
-					Operation:     "create",
-					TreePath:      "CODEOWNERS",
-					ContentReader: strings.NewReader("README.md @user5\ntest-file @user4"),
-				},
+	// Create the repo.
+	repo, _, f := tests.CreateDeclarativeRepo(t, user2, codeownerTest.Name,
+		[]unit_model.Type{unit_model.TypePullRequests}, nil,
+		[]*files_service.ChangeRepoFile{
+			{
+				Operation:     "create",
+				TreePath:      codeownerTest.Path,
+				ContentReader: strings.NewReader("README.md @user5\ntest-file @user4"),
 			},
-		)
-		defer f()
+		},
+	)
+	defer f()
 
-		dstPath := t.TempDir()
-		r := fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name)
-		cloneURL, _ := url.Parse(r)
-		cloneURL.User = url.UserPassword("user2", userPassword)
-		require.NoError(t, git.CloneWithArgs(t.Context(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{}))
+	dstPath := t.TempDir()
+	r := fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name)
+	cloneURL, _ := url.Parse(r)
+	cloneURL.User = url.UserPassword("user2", userPassword)
+	require.NoError(t, git.CloneWithArgs(t.Context(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{}))
 
-		t.Run("Normal", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+	t.Run("Normal", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			err := os.WriteFile(path.Join(dstPath, "README.md"), []byte("## test content"), 0o666)
-			require.NoError(t, err)
+		err := os.WriteFile(path.Join(dstPath, "README.md"), []byte("## test content"), 0o666)
+		require.NoError(t, err)
 
-			err = git.AddChanges(dstPath, true)
-			require.NoError(t, err)
+		err = git.AddChanges(dstPath, true)
+		require.NoError(t, err)
 
-			err = git.CommitChanges(dstPath, git.CommitChangesOptions{
-				Committer: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Author: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Message: "Add README.",
-			})
-			require.NoError(t, err)
-
-			err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-normal").Run(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
-
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-normal"})
-			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+		err = git.CommitChanges(dstPath, git.CommitChangesOptions{
+			Committer: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Author: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Message: "Add README.",
 		})
+		require.NoError(t, err)
 
-		t.Run("Forked repository", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+		err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-normal").Run(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
 
-			session := loginUser(t, "user1")
-			testRepoFork(t, session, user2.Name, repo.Name, "user1", "repo1")
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-normal"})
+		unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+	})
 
-			repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
+	t.Run("Forked repository", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			r := fmt.Sprintf("%suser1/repo1.git", u.String())
-			remoteURL, _ := url.Parse(r)
-			remoteURL.User = url.UserPassword("user2", userPassword)
-			doGitAddRemote(dstPath, "forked", remoteURL)(t)
+		session := loginUser(t, "user1")
+		testRepoFork(t, session, user2.Name, repo.Name, "user1", codeownerTest.Name)
 
-			err := git.NewCommand(git.DefaultContext, "push", "forked", "HEAD:refs/for/main", "-o", "topic=codeowner-forked").Run(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: codeownerTest.Name})
 
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-forked"})
-			unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+		r := fmt.Sprintf("%suser1/%s.git", u.String(), codeownerTest.Name)
+		remoteURL, _ := url.Parse(r)
+		remoteURL.User = url.UserPassword("user2", userPassword)
+		doGitAddRemote(dstPath, "forked", remoteURL)(t)
+
+		err := git.NewCommand(git.DefaultContext, "push", "forked", "HEAD:refs/for/main", "-o", "topic=codeowner-forked").Run(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
+
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-forked"})
+		unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+	})
+
+	t.Run("Out of date", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		// Push the changes made from the previous subtest.
+		require.NoError(t, git.NewCommand(git.DefaultContext, "push", "origin").Run(&git.RunOpts{Dir: dstPath}))
+
+		// Reset the tree to the previous commit.
+		require.NoError(t, git.NewCommand(git.DefaultContext, "reset", "--hard", "HEAD~1").Run(&git.RunOpts{Dir: dstPath}))
+
+		err := os.WriteFile(path.Join(dstPath, "test-file"), []byte("## test content"), 0o666)
+		require.NoError(t, err)
+
+		err = git.AddChanges(dstPath, true)
+		require.NoError(t, err)
+
+		err = git.CommitChanges(dstPath, git.CommitChangesOptions{
+			Committer: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Author: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Message: "Add test-file.",
 		})
+		require.NoError(t, err)
 
-		t.Run("Out of date", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+		err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-out-of-date").Run(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
 
-			// Push the changes made from the previous subtest.
-			require.NoError(t, git.NewCommand(git.DefaultContext, "push", "origin").Run(&git.RunOpts{Dir: dstPath}))
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-out-of-date"})
+		unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
+		unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+	})
+	t.Run("From a forked repository", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			// Reset the tree to the previous commit.
-			require.NoError(t, git.NewCommand(git.DefaultContext, "reset", "--hard", "HEAD~1").Run(&git.RunOpts{Dir: dstPath}))
+		session := loginUser(t, "user1")
 
-			err := os.WriteFile(path.Join(dstPath, "test-file"), []byte("## test content"), 0o666)
-			require.NoError(t, err)
+		r := fmt.Sprintf("%suser1/%s.git", u.String(), codeownerTest.Name)
+		remoteURL, _ := url.Parse(r)
+		remoteURL.User = url.UserPassword("user1", userPassword)
+		doGitAddRemote(dstPath, "forked-2", remoteURL)(t)
 
-			err = git.AddChanges(dstPath, true)
-			require.NoError(t, err)
+		err := git.NewCommand(git.DefaultContext, "push", "forked-2", "HEAD:branch").Run(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
 
-			err = git.CommitChanges(dstPath, git.CommitChangesOptions{
-				Committer: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Author: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Message: "Add test-file.",
-			})
-			require.NoError(t, err)
-
-			err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-out-of-date").Run(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
-
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-out-of-date"})
-			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
-			unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+		req := NewRequestWithValues(t, "POST", repo.FullName()+"/compare/main...user1/"+codeownerTest.Name+":branch", map[string]string{
+			"_csrf": GetCSRF(t, session, repo.FullName()+"/compare/main...user1/"+codeownerTest.Name+":branch"),
+			"title": "pull request",
 		})
-		t.Run("From a forked repository", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+		session.MakeRequest(t, req, http.StatusOK)
 
-			session := loginUser(t, "user1")
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "branch"})
+		unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
+	})
 
-			r := fmt.Sprintf("%suser1/repo1.git", u.String())
-			remoteURL, _ := url.Parse(r)
-			remoteURL.User = url.UserPassword("user1", userPassword)
-			doGitAddRemote(dstPath, "forked-2", remoteURL)(t)
+	t.Run("Codeowner user with no permission", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
 
-			err := git.NewCommand(git.DefaultContext, "push", "forked-2", "HEAD:branch").Run(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
+		// Make repository private, only user2 (owner of repository) has now access to this repository.
+		repo.IsPrivate = true
+		_, err := db.GetEngine(db.DefaultContext).Cols("is_private").Update(repo)
+		require.NoError(t, err)
 
-			req := NewRequestWithValues(t, "POST", repo.FullName()+"/compare/main...user1/repo1:branch", map[string]string{
-				"_csrf": GetCSRF(t, session, repo.FullName()+"/compare/main...user1/repo1:branch"),
-				"title": "pull request",
-			})
-			session.MakeRequest(t, req, http.StatusOK)
+		err = os.WriteFile(path.Join(dstPath, "README.md"), []byte("## very sensitive info"), 0o666)
+		require.NoError(t, err)
 
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "branch"})
-			unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4})
+		err = git.AddChanges(dstPath, true)
+		require.NoError(t, err)
+
+		err = git.CommitChanges(dstPath, git.CommitChangesOptions{
+			Committer: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Author: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "user2",
+				When:  time.Now(),
+			},
+			Message: "Add secrets to the README.",
 		})
+		require.NoError(t, err)
 
-		t.Run("Codeowner user with no permission", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
+		err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-private").Run(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
 
-			// Make repository private, only user2 (owner of repository) has now access to this repository.
-			repo.IsPrivate = true
-			_, err := db.GetEngine(db.DefaultContext).Cols("is_private").Update(repo)
-			require.NoError(t, err)
-
-			err = os.WriteFile(path.Join(dstPath, "README.md"), []byte("## very sensitive info"), 0o666)
-			require.NoError(t, err)
-
-			err = git.AddChanges(dstPath, true)
-			require.NoError(t, err)
-
-			err = git.CommitChanges(dstPath, git.CommitChangesOptions{
-				Committer: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Author: &git.Signature{
-					Email: "user2@example.com",
-					Name:  "user2",
-					When:  time.Now(),
-				},
-				Message: "Add secrets to the README.",
-			})
-			require.NoError(t, err)
-
-			err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-private").Run(&git.RunOpts{Dir: dstPath})
-			require.NoError(t, err)
-
-			// In CODEOWNERS file the codeowner for README.md is user5, but does not have access to this private repository.
-			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-private"})
-			unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
-		})
+		// In CODEOWNERS file the codeowner for README.md is user5, but does not have access to this private repository.
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-private"})
+		unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5})
+	})
+}
+
+type CodeownerTest struct {
+	Name string
+	Path string
+}
+
+func TestCodeOwner(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		tests := []CodeownerTest{
+			{Name: "root", Path: "CODEOWNERS"},
+			{Name: "docs", Path: "docs/CODEOWNERS"},
+			{Name: "gitea", Path: ".gitea/CODEOWNERS"},
+			{Name: "forgejo", Path: ".forgejo/CODEOWNERS"},
+		}
+		for _, test := range tests {
+			CodeOwnerTestCommon(t, u, test)
+		}
 	})
 }
diff --git a/tests/integration/comment_roles_system_test.go b/tests/integration/comment_roles_system_test.go
index 0b4e78048a..4a2b941fda 100644
--- a/tests/integration/comment_roles_system_test.go
+++ b/tests/integration/comment_roles_system_test.go
@@ -49,7 +49,7 @@ func TestSystemCommentRoles(t *testing.T) {
 			resp := MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
 
-			assert.EqualValues(t, tc.username, htmlDoc.Find("a.author").Text())
+			assert.Equal(t, tc.username, htmlDoc.Find("a.author").Text())
 			assert.EqualValues(t, tc.roleCount, htmlDoc.Find(".role-label").Length())
 		})
 	}
diff --git a/tests/integration/comment_roles_test.go b/tests/integration/comment_roles_test.go
index 00bec95722..fc9bc6f565 100644
--- a/tests/integration/comment_roles_test.go
+++ b/tests/integration/comment_roles_test.go
@@ -61,39 +61,39 @@ func TestCommentRoles(t *testing.T) {
 		response = sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "pulls", testID)), http.StatusOK)
 		page = NewHTMLParser(t, response.Body)
 		commentHeads := page.Find(".timeline .comment .comment-header .comment-header-right")
-		assert.EqualValues(t, 6, commentHeads.Length())
+		assert.Equal(t, 6, commentHeads.Length())
 
 		// Test the first comment and it's label "Owner"
 		labels := commentHeads.Eq(0).Find(".role-label")
-		assert.EqualValues(t, 1, labels.Length())
+		assert.Equal(t, 1, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip)
 
 		// Test the second (review) comment and it's labels "Author" and "Owner"
 		labels = commentHeads.Eq(1).Find(".role-label")
-		assert.EqualValues(t, 2, labels.Length())
+		assert.Equal(t, 2, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
 		testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
 
 		// Test the third (review) comment and it's labels "Author" and "Owner"
 		labels = commentHeads.Eq(2).Find(".role-label")
-		assert.EqualValues(t, 2, labels.Length())
+		assert.Equal(t, 2, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
 		testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
 
 		// Test the fourth comment and it's labels "Author" and "Owner"
 		labels = commentHeads.Eq(3).Find(".role-label")
-		assert.EqualValues(t, 2, labels.Length())
+		assert.Equal(t, 2, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipPR)
 		testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
 
 		// Test the fivth comment and it's label "Contributor"
 		labels = commentHeads.Eq(4).Find(".role-label")
-		assert.EqualValues(t, 1, labels.Length())
+		assert.Equal(t, 1, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Contributor", contributorTooltip)
 
 		// Test the sixth comment and it's label "First-time contributor"
 		labels = commentHeads.Eq(5).Find(".role-label")
-		assert.EqualValues(t, 1, labels.Length())
+		assert.Equal(t, 1, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "First-time contributor", newContributorTooltip)
 	})
 
@@ -123,27 +123,27 @@ func TestCommentRoles(t *testing.T) {
 		response := sessionUser2.MakeRequest(t, NewRequest(t, "GET", path.Join(user, repo, "issues", testID)), http.StatusOK)
 		page := NewHTMLParser(t, response.Body)
 		commentHeads := page.Find(".timeline .comment .comment-header .comment-header-right")
-		assert.EqualValues(t, 4, commentHeads.Length())
+		assert.Equal(t, 4, commentHeads.Length())
 
 		// Test the first comment and it's label "Owner"
 		labels := commentHeads.Eq(0).Find(".role-label")
-		assert.EqualValues(t, 1, labels.Length())
+		assert.Equal(t, 1, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Owner", ownerTooltip)
 
 		// Test the second comment and it's labels "Author" and "Owner"
 		labels = commentHeads.Eq(1).Find(".role-label")
-		assert.EqualValues(t, 2, labels.Length())
+		assert.Equal(t, 2, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Author", authorTooltipIssue)
 		testIssueCommentUserLabel(t, labels.Eq(1), "Owner", ownerTooltip)
 
 		// Test the third comment and it's label "Contributor"
 		labels = commentHeads.Eq(2).Find(".role-label")
-		assert.EqualValues(t, 1, labels.Length())
+		assert.Equal(t, 1, labels.Length())
 		testIssueCommentUserLabel(t, labels.Eq(0), "Contributor", contributorTooltip)
 
 		// Test the fifth comment and it's lack of labels
 		labels = commentHeads.Eq(3).Find(".role-label")
-		assert.EqualValues(t, 0, labels.Length())
+		assert.Equal(t, 0, labels.Length())
 	})
 }
 
@@ -153,8 +153,8 @@ func testIssueCommentUserLabel(t *testing.T, label *goquery.Selection, expectedT
 	title := label.Text()
 	tooltip, exists := label.Attr("data-tooltip-content")
 	assert.True(t, exists)
-	assert.EqualValues(t, expectedTitle, strings.TrimSpace(title))
-	assert.EqualValues(t, expectedTooltip, strings.TrimSpace(tooltip))
+	assert.Equal(t, expectedTitle, strings.TrimSpace(title))
+	assert.Equal(t, expectedTooltip, strings.TrimSpace(tooltip))
 }
 
 // testEasyLeaveIssueComment is used to create a comment on an issue with minimum code and parameters
diff --git a/tests/integration/commit_status_test.go b/tests/integration/commit_status_test.go
index 9dd1bcd283..adcedcc41b 100644
--- a/tests/integration/commit_status_test.go
+++ b/tests/integration/commit_status_test.go
@@ -23,7 +23,7 @@ func TestGetLatestCommitStatusForPairs(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, nil)
 		require.NoError(t, err)
-		assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs)
+		assert.Equal(t, map[int64][]*git_model.CommitStatus{}, pairs)
 	})
 
 	t.Run("Repo 1", func(t *testing.T) {
@@ -31,7 +31,7 @@ func TestGetLatestCommitStatusForPairs(t *testing.T) {
 		pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 1, SHA: "1234123412341234123412341234123412341234"}})
 		require.NoError(t, err)
 
-		assert.EqualValues(t, map[int64][]*git_model.CommitStatus{
+		assert.Equal(t, map[int64][]*git_model.CommitStatus{
 			1: {
 				{
 					ID:          7,
@@ -77,7 +77,7 @@ func TestGetLatestCommitStatusForPairs(t *testing.T) {
 		pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 62, SHA: "774f93df12d14931ea93259ae93418da4482fcc1"}})
 		require.NoError(t, err)
 
-		assert.EqualValues(t, map[int64][]*git_model.CommitStatus{
+		assert.Equal(t, map[int64][]*git_model.CommitStatus{
 			62: {
 				{
 					ID:          8,
@@ -100,7 +100,7 @@ func TestGetLatestCommitStatusForPairs(t *testing.T) {
 		pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 62, SHA: "774f93df12d14931ea93259ae93418da4482fcc"}})
 		require.NoError(t, err)
 
-		assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs)
+		assert.Equal(t, map[int64][]*git_model.CommitStatus{}, pairs)
 	})
 
 	t.Run("SHA with non-existent repo id", func(t *testing.T) {
@@ -108,7 +108,7 @@ func TestGetLatestCommitStatusForPairs(t *testing.T) {
 		pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 1, SHA: "774f93df12d14931ea93259ae93418da4482fcc1"}})
 		require.NoError(t, err)
 
-		assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs)
+		assert.Equal(t, map[int64][]*git_model.CommitStatus{}, pairs)
 	})
 }
 
@@ -119,14 +119,14 @@ func TestGetLatestCommitStatusForRepoCommitIDs(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, nil)
 		require.NoError(t, err)
-		assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
+		assert.Equal(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
 	})
 
 	t.Run("Repo 1", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 1, []string{"1234123412341234123412341234123412341234"})
 		require.NoError(t, err)
-		assert.EqualValues(t, map[string][]*git_model.CommitStatus{
+		assert.Equal(t, map[string][]*git_model.CommitStatus{
 			"1234123412341234123412341234123412341234": {
 				{
 					ID:          3,
@@ -172,7 +172,7 @@ func TestGetLatestCommitStatusForRepoCommitIDs(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, []string{"774f93df12d14931ea93259ae93418da4482fcc1"})
 		require.NoError(t, err)
-		assert.EqualValues(t, map[string][]*git_model.CommitStatus{
+		assert.Equal(t, map[string][]*git_model.CommitStatus{
 			"774f93df12d14931ea93259ae93418da4482fcc1": {
 				{
 					ID:          8,
@@ -194,13 +194,13 @@ func TestGetLatestCommitStatusForRepoCommitIDs(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, []string{"774f93df12d14931ea93259ae93418da4482fcc"})
 		require.NoError(t, err)
-		assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
+		assert.Equal(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
 	})
 
 	t.Run("non-existent repo ID", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 		repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 1, []string{"774f93df12d14931ea93259ae93418da4482fcc"})
 		require.NoError(t, err)
-		assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
+		assert.Equal(t, map[string][]*git_model.CommitStatus{}, repoStatuses)
 	})
 }
diff --git a/tests/integration/common_navigation_test.go b/tests/integration/common_navigation_test.go
new file mode 100644
index 0000000000..93a2c15ece
--- /dev/null
+++ b/tests/integration/common_navigation_test.go
@@ -0,0 +1,41 @@
+// Copyright 2024-2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+	"testing"
+
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/translation"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// This test verifies common elements that are visible on all pages but most
+// likely to be first seen on `/`
+func TestCommonNavigationElements(t *testing.T) {
+	require.NoError(t, unittest.PrepareTestDatabase())
+
+	session := loginUser(t, "user1")
+	locale := translation.NewLocale("en-US")
+
+	response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
+	page := NewHTMLParser(t, response.Body)
+
+	// Navbar
+	links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu")
+	assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text()))
+	assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text()))
+	assert.Equal(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text()))
+
+	// After footer: index.js
+	page.AssertElement(t, "script[src^='/assets/js/index.js']", true)
+	onerror, _ := page.Find("script[src^='/assets/js/index.js']").Attr("onerror")
+	expected := fmt.Sprintf("alert('%s'.replace('{path}', this.src))", locale.TrString("alert.asset_load_failed"))
+	assert.Equal(t, expected, onerror)
+}
diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go
index 3c3e8adf94..581aa67659 100644
--- a/tests/integration/compare_test.go
+++ b/tests/integration/compare_test.go
@@ -267,13 +267,14 @@ func TestCompareWithPRsDisabled(t *testing.T) {
 			[]unit_model.Type{unit_model.TypePullRequests})
 		require.NoError(t, err)
 
-		t.Run("branch view doesn't offer creating PRs", func(t *testing.T) {
+		t.Run("branch view offer comparing branches", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			req := NewRequest(t, "GET", "/user1/repo1/branches")
 			resp := session.MakeRequest(t, req, http.StatusOK)
 			htmlDoc := NewHTMLParser(t, resp.Body)
-			htmlDoc.AssertElement(t, "a[href='/user1/repo1/compare/master...recent-push']", false)
+			compareLink := htmlDoc.Find("a[href='/user1/repo1/compare/master...recent-push']")
+			assert.Equal(t, "Compare branches", strings.TrimSpace(compareLink.Text()))
 		})
 
 		t.Run("compare doesn't offer local branches", func(t *testing.T) {
@@ -290,11 +291,13 @@ func TestCompareWithPRsDisabled(t *testing.T) {
 			}
 		})
 
-		t.Run("comparing against a disabled-PR repo is 404", func(t *testing.T) {
+		t.Run("comparing against a disabled-PR repo", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			req := NewRequest(t, "GET", "/user1/repo1/compare/master...recent-push")
-			session.MakeRequest(t, req, http.StatusNotFound)
+			resp := session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			assert.Equal(t, "Compare branches", strings.TrimSpace(htmlDoc.Find("h2.header").Text()))
 		})
 	})
 }
diff --git a/tests/integration/create_no_session_test.go b/tests/integration/create_no_session_test.go
index ed547c5b5a..7a3b902eca 100644
--- a/tests/integration/create_no_session_test.go
+++ b/tests/integration/create_no_session_test.go
@@ -12,6 +12,7 @@ import (
 
 	"forgejo.org/modules/json"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/routers"
 	"forgejo.org/tests"
 
@@ -53,16 +54,11 @@ func sessionFileExist(t *testing.T, tmpDir, sessionID string) bool {
 
 func TestSessionFileCreation(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	oldSessionConfig := setting.SessionConfig.ProviderConfig
-	defer func() {
-		setting.SessionConfig.ProviderConfig = oldSessionConfig
-		testWebRoutes = routers.NormalRoutes()
-	}()
+	defer test.MockProtect(&setting.SessionConfig.ProviderConfig)()
+	defer test.MockProtect(&testWebRoutes)()
 
 	var config session.Options
-
-	err := json.Unmarshal([]byte(oldSessionConfig), &config)
+	err := json.Unmarshal([]byte(setting.SessionConfig.ProviderConfig), &config)
 	require.NoError(t, err)
 
 	config.Provider = "file"
diff --git a/tests/integration/db_collation_test.go b/tests/integration/db_collation_test.go
index 6bfe656b9b..c41209f1fe 100644
--- a/tests/integration/db_collation_test.go
+++ b/tests/integration/db_collation_test.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"xorm.io/xorm"
 )
 
 type TestCollationTbl struct {
@@ -48,11 +47,13 @@ func TestDatabaseCollationSelfCheckUI(t *testing.T) {
 }
 
 func TestDatabaseCollation(t *testing.T) {
-	x := db.GetEngine(db.DefaultContext).(*xorm.Engine)
+	engine, err := db.GetMasterEngine(db.GetEngine(db.DefaultContext))
+	require.NoError(t, err)
+	x := engine
 
 	// all created tables should use case-sensitive collation by default
 	_, _ = x.Exec("DROP TABLE IF EXISTS test_collation_tbl")
-	err := x.Sync(&TestCollationTbl{})
+	err = x.Sync(&TestCollationTbl{})
 	require.NoError(t, err)
 	_, _ = x.Exec("INSERT INTO test_collation_tbl (txt) VALUES ('main')")
 	_, _ = x.Exec("INSERT INTO test_collation_tbl (txt) VALUES ('Main')") // case-sensitive, so it inserts a new row
@@ -96,11 +97,14 @@ func TestDatabaseCollation(t *testing.T) {
 
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "utf8mb4_bin")()
 		require.NoError(t, db.ConvertDatabaseTable())
-		time.Sleep(5 * time.Second)
 
-		r, err := db.CheckCollations(x)
-		require.NoError(t, err)
-		assert.Equal(t, "utf8mb4_bin", r.DatabaseCollation)
+		var r *db.CheckCollationsResult
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.DatabaseCollation == "utf8mb4_bin"
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 
@@ -117,11 +121,14 @@ func TestDatabaseCollation(t *testing.T) {
 
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "utf8mb4_general_ci")()
 		require.NoError(t, db.ConvertDatabaseTable())
-		time.Sleep(5 * time.Second)
 
-		r, err := db.CheckCollations(x)
-		require.NoError(t, err)
-		assert.Equal(t, "utf8mb4_general_ci", r.DatabaseCollation)
+		var r *db.CheckCollationsResult
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.DatabaseCollation == "utf8mb4_general_ci"
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 
@@ -138,11 +145,16 @@ func TestDatabaseCollation(t *testing.T) {
 
 		defer test.MockVariableValue(&setting.Database.CharsetCollation, "")()
 		require.NoError(t, db.ConvertDatabaseTable())
-		time.Sleep(5 * time.Second)
 
+		var r *db.CheckCollationsResult
 		r, err := db.CheckCollations(x)
 		require.NoError(t, err)
-		assert.True(t, r.IsCollationCaseSensitive(r.DatabaseCollation))
+		assert.Eventually(t, func() bool {
+			r, err = db.CheckCollations(x)
+			require.NoError(t, err)
+
+			return r.IsCollationCaseSensitive(r.DatabaseCollation)
+		}, time.Second*30, time.Second)
 		assert.True(t, r.CollationEquals(r.ExpectedCollation, r.DatabaseCollation))
 		assert.Empty(t, r.InconsistentCollationColumns)
 	})
diff --git a/tests/integration/devtest_error_test.go b/tests/integration/devtest_error_test.go
new file mode 100644
index 0000000000..b0148b3fd1
--- /dev/null
+++ b/tests/integration/devtest_error_test.go
@@ -0,0 +1,61 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"net/http"
+	"testing"
+
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/routers"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// `/devtest/error/{errcode}` provides a convenient way of testing various
+// error pages sometimes which can be hard to reach otherwise.
+// This file is a test of various attributes on those pages.
+
+func enableDevtest() func() {
+	resetIsProd := test.MockVariableValue(&setting.IsProd, false)
+	resetRoutes := test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())
+	return func() {
+		resetIsProd()
+		resetRoutes()
+	}
+}
+
+func TestDevtestErrorpages(t *testing.T) {
+	defer enableDevtest()()
+
+	t.Run("Server error", func(t *testing.T) {
+		// `/devtest/error/x` returns 500 for any x by default.
+		// `/500` is simply for good look here
+		req := NewRequest(t, "GET", "/devtest/error/500")
+		resp := MakeRequest(t, req, http.StatusInternalServerError)
+		doc := NewHTMLParser(t, resp.Body)
+		assert.Equal(t, "500", doc.Find(".error-code").Text())
+		assert.Contains(t, doc.Find("head title").Text(), "Internal server error")
+	})
+
+	t.Run("Page not found",
+		func(t *testing.T) {
+			req := NewRequest(t, "GET", "/devtest/error/404").
+				// Without this header `notFoundInternal` returns plaintext error message
+				SetHeader("Accept", "text/html")
+			resp := MakeRequest(t, req, http.StatusNotFound)
+			doc := NewHTMLParser(t, resp.Body)
+			assert.Equal(t, "404", doc.Find(".error-code").Text())
+			assert.Contains(t, doc.Find("head title").Text(), "Page not found")
+		})
+
+	t.Run("Quota exhaustion",
+		func(t *testing.T) {
+			req := NewRequest(t, "GET", "/devtest/error/413")
+			resp := MakeRequest(t, req, http.StatusRequestEntityTooLarge)
+			doc := NewHTMLParser(t, resp.Body)
+			assert.Equal(t, "413", doc.Find(".error-code").Text())
+		})
+}
diff --git a/tests/integration/dump_restore_test.go b/tests/integration/dump_restore_test.go
index 239170a256..855cf2810d 100644
--- a/tests/integration/dump_restore_test.go
+++ b/tests/integration/dump_restore_test.go
@@ -180,7 +180,7 @@ func (c *compareDump) assertEquals(repoBefore, repoAfter *repo_model.Repository)
 		}).([]*base.Comment)
 		assert.True(c.t, ok)
 		for _, comment := range comments {
-			assert.EqualValues(c.t, issue.Number, comment.IssueIndex)
+			assert.Equal(c.t, issue.Number, comment.IssueIndex)
 		}
 	}
 
@@ -207,7 +207,7 @@ func (c *compareDump) assertEquals(repoBefore, repoAfter *repo_model.Repository)
 		comments, ok := c.assertEqual(filename, []base.Comment{}, compareFields{}).([]*base.Comment)
 		assert.True(c.t, ok)
 		for _, comment := range comments {
-			assert.EqualValues(c.t, pr.Number, comment.IssueIndex)
+			assert.Equal(c.t, pr.Number, comment.IssueIndex)
 		}
 	}
 }
@@ -215,7 +215,7 @@ func (c *compareDump) assertEquals(repoBefore, repoAfter *repo_model.Repository)
 func (c *compareDump) assertLoadYAMLFiles(beforeFilename, afterFilename string, before, after any) {
 	_, beforeErr := os.Stat(beforeFilename)
 	_, afterErr := os.Stat(afterFilename)
-	assert.EqualValues(c.t, errors.Is(beforeErr, os.ErrNotExist), errors.Is(afterErr, os.ErrNotExist))
+	assert.Equal(c.t, errors.Is(beforeErr, os.ErrNotExist), errors.Is(afterErr, os.ErrNotExist))
 	if errors.Is(beforeErr, os.ErrNotExist) {
 		return
 	}
@@ -267,7 +267,7 @@ func (c *compareDump) assertEqual(filename string, kind any, fields compareField
 }
 
 func (c *compareDump) assertEqualSlices(before, after reflect.Value, fields compareFields) any {
-	assert.EqualValues(c.t, before.Len(), after.Len())
+	assert.Equal(c.t, before.Len(), after.Len())
 	if before.Len() == after.Len() {
 		for i := 0; i < before.Len(); i++ {
 			_ = c.assertEqualValues(
@@ -300,15 +300,15 @@ func (c *compareDump) assertEqualValues(before, after reflect.Value, fields comp
 				assert.True(c.t, ok)
 				as, ok := ai.(string)
 				assert.True(c.t, ok)
-				assert.EqualValues(c.t, compare.transform(bs), compare.transform(as))
+				assert.Equal(c.t, compare.transform(bs), compare.transform(as))
 				continue
 			}
 			if compare.before != nil && compare.after != nil {
 				//
 				// The fields are expected to have different values
 				//
-				assert.EqualValues(c.t, compare.before, bi)
-				assert.EqualValues(c.t, compare.after, ai)
+				assert.Equal(c.t, compare.before, bi)
+				assert.Equal(c.t, compare.after, ai)
 				continue
 			}
 			if compare.nested != nil {
@@ -319,7 +319,7 @@ func (c *compareDump) assertEqualValues(before, after reflect.Value, fields comp
 				continue
 			}
 		}
-		assert.EqualValues(c.t, bi, ai)
+		assert.Equal(c.t, bi, ai)
 	}
 	return after.Interface()
 }
diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go
index 7321aa26c9..b6faf8a118 100644
--- a/tests/integration/editor_test.go
+++ b/tests/integration/editor_test.go
@@ -43,7 +43,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 		// Check if master branch has been locked successfully
 		flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Brule%2B%2522master%2522%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DBranch%2Bprotection%2Bfor%2Brule%2B%2522master%2522%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 		// Request editor page
 		req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
@@ -79,12 +79,12 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 
 		res := make(map[string]string)
 		require.NoError(t, json.NewDecoder(resp.Body).Decode(&res))
-		assert.EqualValues(t, "/user2/repo1/settings/branches", res["redirect"])
+		assert.Equal(t, "/user2/repo1/settings/branches", res["redirect"])
 
 		// Check if master branch has been locked successfully
 		flashCookie = session.GetCookie(gitea_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "error%3DRemoving%2Bbranch%2Bprotection%2Brule%2B%25221%2522%2Bfailed.", flashCookie.Value)
+		assert.Equal(t, "error%3DRemoving%2Bbranch%2Bprotection%2Brule%2B%25221%2522%2Bfailed.", flashCookie.Value)
 	})
 }
 
@@ -113,7 +113,7 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
 	// Verify the change
 	req = NewRequest(t, "GET", path.Join(user, repo, "raw/branch", branch, filePath))
 	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.EqualValues(t, newContent, resp.Body.String())
+	assert.Equal(t, newContent, resp.Body.String())
 
 	return resp
 }
@@ -144,7 +144,7 @@ func testEditFileToNewBranch(t *testing.T, session *TestSession, user, repo, bra
 	// Verify the change
 	req = NewRequest(t, "GET", path.Join(user, repo, "raw/branch", targetBranch, filePath))
 	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.EqualValues(t, newContent, resp.Body.String())
+	assert.Equal(t, newContent, resp.Body.String())
 
 	return resp
 }
@@ -173,7 +173,7 @@ func TestEditorAddTranslation(t *testing.T) {
 
 	placeholder, ok := htmlDoc.Find("input[name='commit_summary']").Attr("placeholder")
 	assert.True(t, ok)
-	assert.EqualValues(t, `Add "<filename>"`, placeholder)
+	assert.Equal(t, `Add "<filename>"`, placeholder)
 }
 
 func TestCommitMail(t *testing.T) {
@@ -188,7 +188,7 @@ func TestCommitMail(t *testing.T) {
 		assert.False(t, inactivatedMail.IsActivated)
 
 		otherEmail := unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{ID: 1, IsActivated: true})
-		assert.NotEqualValues(t, otherEmail.UID, user.ID)
+		assert.NotEqual(t, otherEmail.UID, user.ID)
 
 		primaryEmail := unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{ID: 3, UID: user.ID, IsActivated: true})
 
@@ -277,16 +277,16 @@ func TestCommitMail(t *testing.T) {
 				session.MakeRequest(t, req, http.StatusSeeOther)
 				if !case2.skipLastCommit {
 					newlastCommit, _ := lastCommitAndCSRF(t, case1.link, false)
-					assert.NotEqualValues(t, newlastCommit, lastCommit)
+					assert.NotEqual(t, newlastCommit, lastCommit)
 				}
 
 				commit, err := gitRepo.GetCommitByPath(case1.fileName)
 				require.NoError(t, err)
 
-				assert.EqualValues(t, "user2", commit.Author.Name)
-				assert.EqualValues(t, "user2@noreply.example.org", commit.Author.Email)
-				assert.EqualValues(t, "user2", commit.Committer.Name)
-				assert.EqualValues(t, "user2@noreply.example.org", commit.Committer.Email)
+				assert.Equal(t, "user2", commit.Author.Name)
+				assert.Equal(t, "user2@noreply.example.org", commit.Author.Email)
+				assert.Equal(t, "user2", commit.Committer.Name)
+				assert.Equal(t, "user2@noreply.example.org", commit.Committer.Email)
 			})
 
 			t.Run("Normal", func(t *testing.T) {
@@ -302,16 +302,16 @@ func TestCommitMail(t *testing.T) {
 				session.MakeRequest(t, req, http.StatusSeeOther)
 				if !case2.skipLastCommit {
 					newlastCommit, _ := lastCommitAndCSRF(t, case2.link, false)
-					assert.NotEqualValues(t, newlastCommit, lastCommit)
+					assert.NotEqual(t, newlastCommit, lastCommit)
 				}
 
 				commit, err := gitRepo.GetCommitByPath(case2.fileName)
 				require.NoError(t, err)
 
-				assert.EqualValues(t, "user2", commit.Author.Name)
-				assert.EqualValues(t, primaryEmail.Email, commit.Author.Email)
-				assert.EqualValues(t, "user2", commit.Committer.Name)
-				assert.EqualValues(t, primaryEmail.Email, commit.Committer.Email)
+				assert.Equal(t, "user2", commit.Author.Name)
+				assert.Equal(t, primaryEmail.Email, commit.Author.Email)
+				assert.Equal(t, "user2", commit.Committer.Name)
+				assert.Equal(t, primaryEmail.Email, commit.Committer.Email)
 			})
 		}
 
diff --git a/tests/integration/empty_repo_test.go b/tests/integration/empty_repo_test.go
index baea2566ff..151f9450bd 100644
--- a/tests/integration/empty_repo_test.go
+++ b/tests/integration/empty_repo_test.go
@@ -123,7 +123,7 @@ func TestEmptyRepoAddFileByAPI(t *testing.T) {
 	var fileResponse api.FileResponse
 	DecodeJSON(t, resp, &fileResponse)
 	expectedHTMLURL := setting.AppURL + "user30/empty/src/branch/new_branch/new-file.txt"
-	assert.EqualValues(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
+	assert.Equal(t, expectedHTMLURL, *fileResponse.Content.HTMLURL)
 
 	req = NewRequest(t, "GET", "/user30/empty/src/branch/new_branch/new-file.txt")
 	resp = session.MakeRequest(t, req, http.StatusOK)
diff --git a/tests/integration/explore_repos_test.go b/tests/integration/explore_repos_test.go
index 604d473ac5..5109707df5 100644
--- a/tests/integration/explore_repos_test.go
+++ b/tests/integration/explore_repos_test.go
@@ -25,7 +25,7 @@ func TestExploreRepos(t *testing.T) {
 		resp := MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body).Find("#repo-search-form")
 
-		assert.EqualValues(t, "Go", htmlDoc.Find("input[name='language']").AttrOr("value", "not found"))
-		assert.EqualValues(t, "true", htmlDoc.Find("input[name='topic']").AttrOr("value", "not found"))
+		assert.Equal(t, "Go", htmlDoc.Find("input[name='language']").AttrOr("value", "not found"))
+		assert.Equal(t, "true", htmlDoc.Find("input[name='topic']").AttrOr("value", "not found"))
 	})
 }
diff --git a/tests/integration/feed_repo_test.go b/tests/integration/feed_repo_test.go
index a4d5ef2610..d75d23170d 100644
--- a/tests/integration/feed_repo_test.go
+++ b/tests/integration/feed_repo_test.go
@@ -30,7 +30,7 @@ func TestFeedRepo(t *testing.T) {
 		assert.Contains(t, rss.Channel.Link, "/user2/repo1")
 		assert.NotEmpty(t, rss.Channel.PubDate)
 		assert.Len(t, rss.Channel.Items, 1)
-		assert.EqualValues(t, "issue5", rss.Channel.Items[0].Description)
+		assert.Equal(t, "issue5", rss.Channel.Items[0].Description)
 		assert.NotEmpty(t, rss.Channel.Items[0].PubDate)
 	})
 }
diff --git a/tests/integration/feed_user_test.go b/tests/integration/feed_user_test.go
index dfcb33b35d..c914e15f69 100644
--- a/tests/integration/feed_user_test.go
+++ b/tests/integration/feed_user_test.go
@@ -76,6 +76,7 @@ func TestFeed(t *testing.T) {
 				data := resp.Body.String()
 				assert.Contains(t, data, `<feed xmlns="http://www.w3.org/2005/Atom"`)
 				assert.Contains(t, data, "This is a very long text, so lets scream together: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+				assert.Contains(t, data, "Well, this test is short | succient | distinct.")
 			})
 			t.Run("RSS", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
@@ -86,6 +87,7 @@ func TestFeed(t *testing.T) {
 				data := resp.Body.String()
 				assert.Contains(t, data, `<rss version="2.0"`)
 				assert.Contains(t, data, "This is a very long text, so lets scream together: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+				assert.Contains(t, data, "Well, this test is short | succient | distinct.")
 			})
 		})
 		t.Run("Branch", func(t *testing.T) {
diff --git a/tests/integration/fixtures/TestAdminDeleteUser/repository.yml b/tests/integration/fixtures/TestAdminDeleteUser/repository.yml
index 2c12c7e1de..d71232d834 100644
--- a/tests/integration/fixtures/TestAdminDeleteUser/repository.yml
+++ b/tests/integration/fixtures/TestAdminDeleteUser/repository.yml
@@ -28,3 +28,4 @@
   size: 0
   is_fsck_enabled: true
   close_issues_via_commit_in_any_branch: false
+  topics: '[]'
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/abuse_report.yml b/tests/integration/fixtures/TestAdminModerationViewReports/abuse_report.yml
new file mode 100644
index 0000000000..8bc3c0834b
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/abuse_report.yml
@@ -0,0 +1,111 @@
+-
+  id: 1
+  status: 1         # Open
+  reporter_id: 1004 # @reporter1
+  content_type: 1   # User (users or organizations)
+  content_id: 1003  # @SPAM-services
+  category: 4       # IllegalContent
+  remarks: This organization was created for spamming.
+  shadow_copy_id: null
+  created_unix: 1121423460 # 2005-07-15 10:31:00
+
+-
+  id: 2
+  status: 1
+  reporter_id: 1004 # @reporter1
+  content_type: 2   # Repository
+  content_id: 1002  # SPAM-services/spammer-tools
+  category: 4       # IllegalContent
+  remarks: This repository was created for building spamming tools.
+  shadow_copy_id: null
+  created_unix: 1121423520 # 2005-07-15 10:32:00
+
+-
+  id: 3
+  status: 1
+  reporter_id: 1004 # @reporter1
+  content_type: 3   # Issue (issues or pull requests)
+  content_id: 1002  # SPAM-services/spammer-tools#1
+  category: 2       # Spam
+  remarks: This issue advertises spam services.
+  shadow_copy_id: null
+  created_unix: 1121423580 # 2005-07-15 10:33:00
+
+-
+  id: 4
+  status: 1
+  reporter_id: 1004 # @reporter1
+  content_type: 1   # User (users or organizations)
+  content_id: 1002  # @spammer01
+  category: 2       # Spam
+  remarks: |
+    This profile advertises spam services and the user already created spam content.
+    I have reported some of them.
+  shadow_copy_id: null
+  created_unix: 1121423640 # 2005-07-15 10:34:00
+
+-
+  id: 5
+  status: 1
+  reporter_id: 1004 # @reporter1
+  content_type: 4   # Comment
+  content_id: 1001  # contributor/first/issues/1#issuecomment-1001
+  category: 3       # Malware
+  remarks: This comment references a spammy issue from a spammy repository of a spammy organization created by a spammer.
+  shadow_copy_id: null
+  created_unix: 1121423700 # 2005-07-15 10:35:00
+
+-
+  id: 6
+  status: 1
+  reporter_id: 1001 # @contributor
+  content_type: 4   # Comment
+  content_id: 1001  # contributor/first/issues/1#issuecomment-1001
+  category: 2       # Spam
+  remarks: I should delete this, since I can; but first I want to test the reporting functionality.
+  shadow_copy_id: null
+  created_unix: 1121423730 # 2005-07-15 10:35:30
+
+-
+  id: 7
+  status: 1
+  reporter_id: 1001 # @contributor
+  content_type: 1   # User (users or organizations)
+  content_id: 1002  # @spammer01
+  category: 1       # Other
+  remarks: Should investigate the origin of this abuser.
+  shadow_copy_id: null
+  created_unix: 1121423760 # 2005-07-15 10:36:00
+
+-
+  id: 8
+  status: 1
+  reporter_id: 1002 # @spammer01
+  content_type: 3   # Issue (issues or pull requests)
+  content_id: 1001  # contributor/first#1
+  category: 1       # Other
+  remarks: Just because you are the administrator of this Forgejo instance this doesn't mean that you should be more privileged compared to the rest of average users. I believe it is my right to post links to external websites where users can find more about myself and my own work, even if they are professional services. I strongly believe you should reconsider your totalitarian behaviour. The users of this instance deserve better, more inclusive rules that should prevent abuses from administrators or mod.
+  shadow_copy_id: null
+  created_unix: 1121424000 # 2005-07-15 10:40:00
+
+-
+  id: 9
+  status: 1
+  reporter_id: 1005 # @reporter2
+  content_type: 1   # User (users or organizations)
+  content_id: 1002  # @spammer01
+  category: 2       # Spam
+  remarks: This user is just spamming wherever they can.
+  shadow_copy_id: null
+  created_unix: 1121424030 # 2005-07-15 10:40:30
+
+-
+  id: 10
+  status: 1
+  reporter_id: 1005 # @reporter2
+  content_type: 1   # User (users or organizations)
+  content_id: 9999  # Ghost user
+  category: 1       # Other
+  remarks: Check this spammer as soon as possible, before they delete their account.
+  shadow_copy_id: null
+  created_unix: 1121424150 # 2005-07-15 10:42:30
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/comment.yml b/tests/integration/fixtures/TestAdminModerationViewReports/comment.yml
new file mode 100644
index 0000000000..a7ee83d53e
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/comment.yml
@@ -0,0 +1,21 @@
+-
+  id: 1001
+  type: 0 # Standard comment
+  poster_id: 1002 # @spammer01
+  issue_id: 1001 # contributor/first#1
+  content: And the first spammer; check SPAM-services/spammer-Tools#1
+  created_unix: 1121422990 # 2005-07-15 10:23:10
+
+-
+  id: 1002
+  type: 5 # Reference from a comment
+  poster_id: 1002 # @spammer01
+  issue_id: 1002 # SPAM-services/spammer-tools#1
+  content: ''
+  content_version: 0
+  created_unix: 1121422990
+  ref_repo_id: 1001
+  ref_issue_id: 1001
+  ref_comment_id: 1001
+  ref_action: 0
+  ref_is_pull: false
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/issue.yml b/tests/integration/fixtures/TestAdminModerationViewReports/issue.yml
new file mode 100644
index 0000000000..74af88b3b6
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/issue.yml
@@ -0,0 +1,23 @@
+-
+  id: 1001
+  repo_id: 1001 # contributor/first
+  index: 1
+  poster_id: 1001
+  name: first repo should have a first issue
+  content: so here we go
+  is_closed: false
+  is_pull: false
+  num_comments: 1
+  created_unix: 1121422320 # 2005-07-15 10:12:00
+
+-
+  id: 1002
+  repo_id: 1002 # SPAM-services/spammer-tools
+  index: 1
+  poster_id: 1002
+  name: Professional marketing services
+  content: Visit my website at spammer.xyz/services for a list of available services.
+  is_closed: false
+  is_pull: false
+  num_comments: 0
+  created_unix: 1121422980 # 2005-07-15 10:23:00
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/issue_index.yml b/tests/integration/fixtures/TestAdminModerationViewReports/issue_index.yml
new file mode 100644
index 0000000000..cecf437282
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/issue_index.yml
@@ -0,0 +1,7 @@
+-
+  group_id: 1001
+  max_index: 1
+
+-
+  group_id: 1002
+  max_index: 1
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/repository.yml b/tests/integration/fixtures/TestAdminModerationViewReports/repository.yml
new file mode 100644
index 0000000000..cee5d6a74c
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/repository.yml
@@ -0,0 +1,45 @@
+-
+  id: 1001
+  owner_id: 1001
+  owner_name: contributor
+  lower_name: first
+  name: first
+  description: ''
+  website: ''
+  default_branch: main
+  num_watches: 1
+  num_stars: 0
+  num_forks: 0
+  num_issues: 1
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  is_private: false
+  is_empty: false
+  is_archived: false
+  size: 0
+  topics: '[]'
+  created_unix: 1121422260 # 2005-07-15 10:11:00
+
+-
+  id: 1002
+  owner_id: 1003
+  owner_name: SPAM-services
+  lower_name: spammer-tools
+  name: spammer-Tools
+  description: Another _place_ for abusive content.
+  website: ''
+  default_branch: main
+  num_watches: 1
+  num_stars: 0
+  num_forks: 0
+  num_issues: 1
+  num_closed_issues: 0
+  num_pulls: 0
+  num_closed_pulls: 0
+  is_private: false
+  is_empty: false
+  is_archived: false
+  size: 0
+  topics: "[\"bulk-email\",\"email-services\",\"spam\",\"spamservices.co\"]"
+  created_unix: 1121422920 # 2005-07-15 10:22:00
diff --git a/tests/integration/fixtures/TestAdminModerationViewReports/user.yml b/tests/integration/fixtures/TestAdminModerationViewReports/user.yml
new file mode 100644
index 0000000000..f00f3de338
--- /dev/null
+++ b/tests/integration/fixtures/TestAdminModerationViewReports/user.yml
@@ -0,0 +1,108 @@
+-
+  id: 1001
+  lower_name: contributor
+  name: contributor
+  full_name: The Contributor
+  email: contributor@example.org
+  keep_email_private: true
+  passwd: passwdSalt:password
+  passwd_hash_algo: dummy
+  type: 0
+  salt: passwdSalt
+  description: ''
+  created_unix: 1121422200 # 2005-07-15 10:10:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  avatar: avatar-hash-1001
+  avatar_email: contributor@example.org
+  use_custom_avatar: false
+  num_repos: 1
+
+-
+  id: 1002
+  lower_name: spammer01
+  name: spammer01
+  full_name: King of SPAM
+  email: spammer01@example.org
+  keep_email_private: false
+  passwd: passwdSalt:password
+  passwd_hash_algo: dummy
+  type: 0
+  location: '@master@smap.net'
+  website: http://spammer.xyz
+  pronouns: http://spam.me
+  salt: passwdSalt
+  description: I can help you abuse others inboxes. Updated prices on spammer.xyz/services
+  created_unix: 1121422800 # 2005-07-15 10:20:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  avatar: avatar-hash-1002
+  avatar_email: spammer01@example.org
+  use_custom_avatar: false
+
+-
+  id: 1003
+  lower_name: spam-services
+  name: SPAM-services
+  full_name: SPAM services
+  email: get@spamservices.co
+  keep_email_private: false
+  email_notifications_preference: ''
+  passwd: ''
+  passwd_hash_algo: ''
+  type: 1
+  location: www.spamservices.co
+  website: https://spamservices.co
+  salt: 1888c34e04642082a791b49cf147cc88
+  description: Contact us for **bulk emails** sending.
+  created_unix: 1121422860 # 2005-07-15 10:21:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  allow_create_organization: false
+  avatar: avatar-hash-1003
+  avatar_email: ''
+  use_custom_avatar: true
+  num_repos: 1
+
+-
+  id: 1004
+  lower_name: reporter1
+  name: reporter1
+  full_name: Reporter One
+  email: reporter1@example.org
+  keep_email_private: true
+  passwd: passwdSalt:password
+  passwd_hash_algo: dummy
+  type: 0
+  salt: passwdSalt
+  description: ''
+  created_unix: 1121423400 # 2005-07-15 10:30:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  avatar: avatar-hash-1004
+  avatar_email: reporter1@example.org
+  use_custom_avatar: false
+
+-
+  id: 1005
+  lower_name: reporter2
+  name: reporter2
+  full_name: Reporter Two
+  email: reporter2@example.org
+  keep_email_private: true
+  passwd: passwdSalt:password
+  passwd_hash_algo: dummy
+  type: 0
+  salt: passwdSalt
+  description: ''
+  created_unix: 1121424000 # 2005-07-15 10:40:00
+  is_active: true
+  is_admin: false
+  is_restricted: false
+  avatar: avatar-hash-1005
+  avatar_email: reporter2@example.org
+  use_custom_avatar: false
diff --git a/tests/integration/fixtures/TestFeed/action.yml b/tests/integration/fixtures/TestFeed/action.yml
index c00e4bcc59..9b7453b4ad 100644
--- a/tests/integration/fixtures/TestFeed/action.yml
+++ b/tests/integration/fixtures/TestFeed/action.yml
@@ -7,3 +7,12 @@
   is_private: false
   created_unix: 1680454039
   content: '1|This is a very long text, so lets scream together: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa…'
+- id: 1002
+  user_id: 2
+  op_type: 10 # close issue
+  act_user_id: 2
+  comment_id: 1001
+  repo_id: 1 # public
+  is_private: false
+  created_unix: 1680454039
+  content: '["1","Well, this test is short | succient | distinct."]'
diff --git a/tests/integration/fixtures/TestForcePushCommitStatus/commit_status.yml b/tests/integration/fixtures/TestForcePushCommitStatus/commit_status.yml
new file mode 100644
index 0000000000..9673410671
--- /dev/null
+++ b/tests/integration/fixtures/TestForcePushCommitStatus/commit_status.yml
@@ -0,0 +1,22 @@
+-
+  id: 1000
+  index: 1
+  repo_id: 58
+  state: "pending"
+  sha: "1978192d98bb1b65e11c2cf37da854fbf94bffd6"
+  target_url: https://example.com/builds/
+  description: My awesome CI-service
+  context: ci/awesomeness
+  context_hash: c65f4d64a3b14a3eced0c9b36799e66e1bd5ced7
+  creator_id: 2
+-
+  id: 1001
+  index: 1
+  repo_id: 58
+  state: "success"
+  sha: "9b93963cf6de4dc33f915bb67f192d099c301f43"
+  target_url: https://example.com/builds/
+  description: My awesome CI-service
+  context: ci/awesomeness
+  context_hash: c65f4d64a3b14a3eced0c9b36799e66e1bd5ced7
+  creator_id: 2
\ No newline at end of file
diff --git a/tests/integration/forgejo_confirmation_repo_test.go b/tests/integration/forgejo_confirmation_repo_test.go
index 0229046efc..28d6777aea 100644
--- a/tests/integration/forgejo_confirmation_repo_test.go
+++ b/tests/integration/forgejo_confirmation_repo_test.go
@@ -55,7 +55,7 @@ func TestDangerZoneConfirmation(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThis%2Brepository%2Bhas%2Bbeen%2Bmarked%2Bfor%2Btransfer%2Band%2Bawaits%2Bconfirmation%2Bfrom%2B%2522User%2BOne%2522", flashCookie.Value)
+			assert.Equal(t, "success%3DThis%2Brepository%2Bhas%2Bbeen%2Bmarked%2Bfor%2Btransfer%2Band%2Bawaits%2Bconfirmation%2Bfrom%2B%2522User%2BOne%2522", flashCookie.Value)
 		})
 	})
 
@@ -85,7 +85,7 @@ func TestDangerZoneConfirmation(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Bfork%2Bhas%2Bbeen%2Bconverted%2Binto%2Ba%2Bregular%2Brepository.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Bfork%2Bhas%2Bbeen%2Bconverted%2Binto%2Ba%2Bregular%2Brepository.", flashCookie.Value)
 		})
 	})
 
@@ -118,7 +118,7 @@ func TestDangerZoneConfirmation(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Brepository%2Bwiki%2527s%2Bbranch%2Bname%2Bhas%2Bbeen%2Bsuccessfully%2Bnormalized.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Brepository%2Bwiki%2527s%2Bbranch%2Bname%2Bhas%2Bbeen%2Bsuccessfully%2Bnormalized.", flashCookie.Value)
 		})
 	})
 
@@ -148,7 +148,7 @@ func TestDangerZoneConfirmation(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Brepository%2Bwiki%2Bdata%2Bhas%2Bbeen%2Bdeleted.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Brepository%2Bwiki%2Bdata%2Bhas%2Bbeen%2Bdeleted.", flashCookie.Value)
 		})
 	})
 
@@ -178,7 +178,7 @@ func TestDangerZoneConfirmation(t *testing.T) {
 
 			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DThe%2Brepository%2Bhas%2Bbeen%2Bdeleted.", flashCookie.Value)
+			assert.Equal(t, "success%3DThe%2Brepository%2Bhas%2Bbeen%2Bdeleted.", flashCookie.Value)
 		})
 	})
 }
diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go
index 110bb6c886..22dd127a4c 100644
--- a/tests/integration/git_push_test.go
+++ b/tests/integration/git_push_test.go
@@ -27,6 +27,10 @@ import (
 
 func forEachObjectFormat(t *testing.T, f func(t *testing.T, objectFormat git.ObjectFormat)) {
 	for _, objectFormat := range []git.ObjectFormat{git.Sha256ObjectFormat, git.Sha1ObjectFormat} {
+		if !git.SupportHashSha256 && objectFormat == git.Sha256ObjectFormat {
+			continue
+		}
+
 		t.Run(objectFormat.Name(), func(t *testing.T) {
 			f(t, objectFormat)
 		})
@@ -176,7 +180,7 @@ func runTestGitPush(t *testing.T, u *url.URL, objectFormat git.ObjectFormat, git
 
 	dbBranches := make([]*git_model.Branch, 0)
 	require.NoError(t, db.GetEngine(db.DefaultContext).Where("repo_id=?", repo.ID).Find(&dbBranches))
-	assert.Equalf(t, len(pushedBranches), len(dbBranches), "mismatched number of branches in db")
+	assert.Lenf(t, dbBranches, len(pushedBranches), "mismatched number of branches in db")
 	dbBranchesMap := make(map[string]*git_model.Branch, len(dbBranches))
 	for _, branch := range dbBranches {
 		dbBranchesMap[branch.Name] = branch
diff --git a/tests/integration/git_smart_http_test.go b/tests/integration/git_smart_http_test.go
index 671ba07d23..84de08751d 100644
--- a/tests/integration/git_smart_http_test.go
+++ b/tests/integration/git_smart_http_test.go
@@ -71,7 +71,7 @@ func testGitSmartHTTP(t *testing.T, u *url.URL) {
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			defer resp.Body.Close()
-			assert.EqualValues(t, kase.code, resp.StatusCode)
+			assert.Equal(t, kase.code, resp.StatusCode)
 			_, err = io.ReadAll(resp.Body)
 			require.NoError(t, err)
 		})
diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go
index a51c1cc75a..fcd81cf6b2 100644
--- a/tests/integration/git_test.go
+++ b/tests/integration/git_test.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 	"time"
 
+	actions_model "forgejo.org/models/actions"
 	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	git_model "forgejo.org/models/git"
@@ -51,6 +52,33 @@ func TestGit(t *testing.T) {
 	onGiteaRun(t, testGit)
 }
 
+func TestActionsTokenAuth(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		task := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionTask{ID: 47})
+		task.GenerateToken()
+		actions_model.UpdateTask(db.DefaultContext, task)
+		u.User = url.UserPassword("token", task.Token)
+
+		t.Run("clone task's own repo", func(t *testing.T) {
+			repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: task.RepoID})
+			u.Path = fmt.Sprintf("/%s/%s.git", repo.OwnerName, repo.Name)
+			doGitClone(t.TempDir(), u)(t)
+		})
+
+		t.Run("clone public repo of limited owner", func(t *testing.T) {
+			repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 38})
+			u.Path = fmt.Sprintf("/%s/%s.git", repo.OwnerName, repo.Name)
+			doGitClone(t.TempDir(), u)(t)
+		})
+
+		t.Run("cannot clone private repo", func(t *testing.T) {
+			repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+			u.Path = fmt.Sprintf("/%s/%s.git", repo.OwnerName, repo.Name)
+			doGitCloneFail(u)(t)
+		})
+	})
+}
+
 func testGit(t *testing.T, u *url.URL) {
 	username := "user2"
 	baseAPITestContext := NewAPITestContext(t, username, "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
@@ -69,7 +97,7 @@ func testGit(t *testing.T, u *url.URL) {
 
 			dstPath := t.TempDir()
 
-			t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false, objectFormat))
+			t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, nil, objectFormat))
 			t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, httpContext.Username, perm.AccessModeRead))
 
 			t.Run("ForkFromDifferentUser", doAPIForkRepository(httpContext, forkedUserCtx.Username))
@@ -110,7 +138,7 @@ func testGit(t *testing.T, u *url.URL) {
 			sshContext.Reponame = "repo-tmp-18-" + objectFormat.Name()
 			keyname := "my-testing-key"
 			forkedUserCtx.Reponame = sshContext.Reponame
-			t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, false, objectFormat))
+			t.Run("CreateRepoInDifferentUser", doAPICreateRepository(forkedUserCtx, nil, objectFormat))
 			t.Run("AddUserAsCollaborator", doAPIAddCollaborator(forkedUserCtx, sshContext.Username, perm.AccessModeRead))
 			t.Run("ForkFromDifferentUser", doAPIForkRepository(sshContext, forkedUserCtx.Username))
 
@@ -469,7 +497,7 @@ func doProtectBranch(ctx APITestContext, branch string, addParameter ...paramete
 		// Check if master branch has been locked successfully
 		flashCookie := ctx.Session.GetCookie(gitea_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Brule%2B%2522"+url.QueryEscape(branch)+"%2522%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DBranch%2Bprotection%2Bfor%2Brule%2B%2522"+url.QueryEscape(branch)+"%2522%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 	}
 }
 
@@ -529,8 +557,7 @@ func doMergeFork(ctx, baseCtx APITestContext, baseBranch, headBranch string) fun
 		t.Run("EnsureCanSeePull", doEnsureCanSeePull(headCtx, pr, false))
 		t.Run("CheckPR", func(t *testing.T) {
 			oldMergeBase := pr.MergeBase
-			pr2, err := doAPIGetPullRequest(baseCtx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
-			require.NoError(t, err)
+			pr2 := doAPIGetPullRequest(baseCtx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
 			assert.Equal(t, oldMergeBase, pr2.MergeBase)
 		})
 		t.Run("EnsurDiffNoChange", doEnsureDiffNoChange(baseCtx, pr, diffHash, diffLength))
@@ -585,7 +612,7 @@ func doEnsureCanSeePull(ctx APITestContext, pr api.PullRequest, editable bool) f
 		doc := NewHTMLParser(t, resp.Body)
 		editButtonCount := doc.doc.Find("div.diff-file-header-actions a[href*='/_edit/']").Length()
 		if editable {
-			assert.Positive(t, editButtonCount, 0, "Expected to find a button to edit a file in the PR diff view but there were none")
+			assert.Positive(t, editButtonCount, "Expected to find a button to edit a file in the PR diff view but there were none")
 		} else {
 			assert.Equal(t, 0, editButtonCount, "Expected not to find any buttons to edit files in PR diff view but there were some")
 		}
@@ -730,27 +757,21 @@ func doAutoPRMerge(baseCtx *APITestContext, dstPath string) func(t *testing.T) {
 
 		// Check pr status
 		ctx.ExpectedCode = 0
-		pr, err = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
-		require.NoError(t, err)
+		pr = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
 		assert.False(t, pr.HasMerged)
 
 		// Call API to add Failure status for commit
 		t.Run("CreateStatus", addCommitStatus(api.CommitStatusFailure))
 
 		// Check pr status
-		pr, err = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
-		require.NoError(t, err)
+		pr = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
 		assert.False(t, pr.HasMerged)
 
 		// Call API to add Success status for commit
 		t.Run("CreateStatus", addCommitStatus(api.CommitStatusSuccess))
 
-		// wait to let gitea merge stuff
-		time.Sleep(time.Second)
-
 		// test pr status
-		pr, err = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
-		require.NoError(t, err)
+		pr = doAPIGetPullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)(t)
 		assert.True(t, pr.HasMerged)
 	}
 }
@@ -778,11 +799,6 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 	return func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
-		// skip this test if git version is low
-		if git.CheckGitVersionAtLeast("2.29") != nil {
-			return
-		}
-
 		gitRepo, err := git.OpenRepository(git.DefaultContext, dstPath)
 		require.NoError(t, err)
 
@@ -839,8 +855,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 			assert.Equal(t, 1, pr1.CommitsAhead)
 			assert.Equal(t, 0, pr1.CommitsBehind)
 
-			prMsg, err := doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index)(t)
-			require.NoError(t, err)
+			prMsg := doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index)(t)
 
 			assert.Equal(t, "user2/"+headBranch, pr1.HeadBranch)
 			assert.False(t, prMsg.HasMerged)
@@ -861,8 +876,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 			}
 			assert.Equal(t, 1, pr2.CommitsAhead)
 			assert.Equal(t, 0, pr2.CommitsBehind)
-			prMsg, err = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr2.Index)(t)
-			require.NoError(t, err)
+			prMsg = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr2.Index)(t)
 
 			assert.Equal(t, "user2/test/"+headBranch, pr2.HeadBranch)
 			assert.False(t, prMsg.HasMerged)
@@ -913,8 +927,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 			require.NoError(t, err)
 
 			unittest.AssertCount(t, &issues_model.PullRequest{}, pullNum+2)
-			prMsg, err := doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index)(t)
-			require.NoError(t, err)
+			prMsg := doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr1.Index)(t)
 
 			assert.False(t, prMsg.HasMerged)
 			assert.Equal(t, commit, prMsg.Head.Sha)
@@ -931,8 +944,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 			require.NoError(t, err)
 
 			unittest.AssertCount(t, &issues_model.PullRequest{}, pullNum+2)
-			prMsg, err = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr2.Index)(t)
-			require.NoError(t, err)
+			prMsg = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr2.Index)(t)
 
 			assert.False(t, prMsg.HasMerged)
 			assert.Equal(t, commit, prMsg.Head.Sha)
@@ -956,8 +968,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 				err := pr3.LoadIssue(db.DefaultContext)
 				require.NoError(t, err)
 
-				_, err2 := doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr3.Index)(t)
-				require.NoError(t, err2)
+				doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr3.Index)(t)
 
 				assert.Equal(t, "Testing commit 2", pr3.Issue.Title)
 				assert.Contains(t, pr3.Issue.Content, "Longer description.")
@@ -978,8 +989,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 				err := pr.LoadIssue(db.DefaultContext)
 				require.NoError(t, err)
 
-				_, err = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr.Index)(t)
-				require.NoError(t, err)
+				doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr.Index)(t)
 
 				assert.Equal(t, "my-shiny-title", pr.Issue.Title)
 				assert.Contains(t, pr.Issue.Content, "Longer description.")
@@ -1001,8 +1011,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 				err := pr.LoadIssue(db.DefaultContext)
 				require.NoError(t, err)
 
-				_, err = doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr.Index)(t)
-				require.NoError(t, err)
+				doAPIGetPullRequest(*ctx, ctx.Username, ctx.Reponame, pr.Index)(t)
 
 				assert.Equal(t, "Testing commit 2", pr.Issue.Title)
 				assert.Contains(t, pr.Issue.Content, "custom")
@@ -1042,7 +1051,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 
 				currentHeadCommitID, err := upstreamGitRepo.GetRefCommitID(pr.GetGitRefName())
 				require.NoError(t, err)
-				assert.EqualValues(t, headCommitID, currentHeadCommitID)
+				assert.Equal(t, headCommitID, currentHeadCommitID)
 			})
 			t.Run("Succeeds", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
@@ -1052,7 +1061,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 
 				currentHeadCommitID, err := upstreamGitRepo.GetRefCommitID(pr.GetGitRefName())
 				require.NoError(t, err)
-				assert.NotEqualValues(t, headCommitID, currentHeadCommitID)
+				assert.NotEqual(t, headCommitID, currentHeadCommitID)
 			})
 		})
 
diff --git a/tests/integration/gpg_git_test.go b/tests/integration/gpg_git_test.go
deleted file mode 100644
index 0fd998e815..0000000000
--- a/tests/integration/gpg_git_test.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package integration
-
-import (
-	"encoding/base64"
-	"fmt"
-	"net/url"
-	"os"
-	"testing"
-
-	auth_model "forgejo.org/models/auth"
-	"forgejo.org/models/unittest"
-	user_model "forgejo.org/models/user"
-	"forgejo.org/modules/git"
-	"forgejo.org/modules/process"
-	"forgejo.org/modules/setting"
-	api "forgejo.org/modules/structs"
-	"forgejo.org/modules/test"
-	"forgejo.org/tests"
-
-	"github.com/ProtonMail/go-crypto/openpgp"
-	"github.com/ProtonMail/go-crypto/openpgp/armor"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGPGGit(t *testing.T) {
-	tmpDir := t.TempDir() // use a temp dir to avoid messing with the user's GPG keyring
-	err := os.Chmod(tmpDir, 0o700)
-	require.NoError(t, err)
-
-	t.Setenv("GNUPGHOME", tmpDir)
-	require.NoError(t, err)
-
-	// Need to create a root key
-	rootKeyPair, err := importTestingKey()
-	require.NoError(t, err, "importTestingKey")
-
-	defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())()
-	defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "gitea")()
-	defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "gitea@fake.local")()
-	defer test.MockVariableValue(&setting.Repository.Signing.InitialCommit, []string{"never"})()
-	defer test.MockVariableValue(&setting.Repository.Signing.CRUDActions, []string{"never"})()
-
-	username := "user2"
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username})
-	baseAPITestContext := NewAPITestContext(t, username, "repo1")
-
-	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		u.Path = baseAPITestContext.GitPath()
-
-		t.Run("Unsigned-Initial", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
-			t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) {
-				assert.NotNil(t, branch.Commit)
-				assert.NotNil(t, branch.Commit.Verification)
-				assert.False(t, branch.Commit.Verification.Verified)
-				assert.Empty(t, branch.Commit.Verification.Signature)
-			}))
-			t.Run("CreateCRUDFile-Never", crudActionCreateFile(
-				t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-			t.Run("CreateCRUDFile-Never", crudActionCreateFile(
-				t, testCtx, user, "never", "never2", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
-		t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
-				t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-			t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
-				t, testCtx, user, "parentsigned", "parentsigned2", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"never"}
-		t.Run("Unsigned-Initial-CRUD-Never", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateCRUDFile-Never", crudActionCreateFile(
-				t, testCtx, user, "parentsigned", "parentsigned-never", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"always"}
-		t.Run("Unsigned-Initial-CRUD-Always", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateCRUDFile-Always", crudActionCreateFile(
-				t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) {
-					assert.NotNil(t, response.Verification)
-					if response.Verification == nil {
-						assert.FailNow(t, "no verification provided with response! %v", response)
-					}
-					assert.True(t, response.Verification.Verified)
-					if !response.Verification.Verified {
-						t.FailNow()
-					}
-					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
-				}))
-			t.Run("CreateCRUDFile-ParentSigned-always", crudActionCreateFile(
-				t, testCtx, user, "parentsigned", "parentsigned-always", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) {
-					assert.NotNil(t, response.Verification)
-					if response.Verification == nil {
-						assert.FailNow(t, "no verification provided with response! %v", response)
-					}
-					assert.True(t, response.Verification.Verified)
-					if !response.Verification.Verified {
-						t.FailNow()
-					}
-					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
-		t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateCRUDFile-Always-ParentSigned", crudActionCreateFile(
-				t, testCtx, user, "always", "always-parentsigned", "signed-always-parentsigned.txt", func(t *testing.T, response api.FileResponse) {
-					assert.NotNil(t, response.Verification)
-					if response.Verification == nil {
-						assert.FailNow(t, "no verification provided with response! %v", response)
-					}
-					assert.True(t, response.Verification.Verified)
-					if !response.Verification.Verified {
-						t.FailNow()
-					}
-					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
-				}))
-		})
-
-		setting.Repository.Signing.InitialCommit = []string{"always"}
-		t.Run("AlwaysSign-Initial", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
-			t.Run("CheckMasterBranchSigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) {
-				assert.NotNil(t, branch.Commit)
-				if branch.Commit == nil {
-					assert.FailNow(t, "no commit provided with branch! %v", branch)
-				}
-				assert.NotNil(t, branch.Commit.Verification)
-				if branch.Commit.Verification == nil {
-					assert.FailNow(t, "no verification provided with branch commit! %v", branch.Commit)
-				}
-				assert.True(t, branch.Commit.Verification.Verified)
-				if !branch.Commit.Verification.Verified {
-					t.FailNow()
-				}
-				assert.Equal(t, "gitea@fake.local", branch.Commit.Verification.Signer.Email)
-			}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"never"}
-		t.Run("AlwaysSign-Initial-CRUD-Never", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-always-never", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
-			t.Run("CreateCRUDFile-Never", crudActionCreateFile(
-				t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) {
-					assert.False(t, response.Verification.Verified)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
-		t.Run("AlwaysSign-Initial-CRUD-ParentSigned-On-Always", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-always-parent", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
-			t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
-				t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) {
-					assert.True(t, response.Verification.Verified)
-					if !response.Verification.Verified {
-						t.FailNow()
-						return
-					}
-					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
-				}))
-		})
-
-		setting.Repository.Signing.CRUDActions = []string{"always"}
-		t.Run("AlwaysSign-Initial-CRUD-Always", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-always-always", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreateRepository", doAPICreateRepository(testCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
-			t.Run("CreateCRUDFile-Always", crudActionCreateFile(
-				t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) {
-					assert.True(t, response.Verification.Verified)
-					if !response.Verification.Verified {
-						t.FailNow()
-						return
-					}
-					assert.Equal(t, "gitea@fake.local", response.Verification.Signer.Email)
-				}))
-		})
-
-		setting.Repository.Signing.Merges = []string{"commitssigned"}
-		t.Run("UnsignedMerging", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreatePullRequest", func(t *testing.T) {
-				pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t)
-				require.NoError(t, err)
-				t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
-			})
-			t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) {
-				assert.NotNil(t, branch.Commit)
-				assert.NotNil(t, branch.Commit.Verification)
-				assert.False(t, branch.Commit.Verification.Verified)
-				assert.Empty(t, branch.Commit.Verification.Signature)
-			}))
-		})
-
-		setting.Repository.Signing.Merges = []string{"basesigned"}
-		t.Run("BaseSignedMerging", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreatePullRequest", func(t *testing.T) {
-				pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t)
-				require.NoError(t, err)
-				t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
-			})
-			t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) {
-				assert.NotNil(t, branch.Commit)
-				assert.NotNil(t, branch.Commit.Verification)
-				assert.False(t, branch.Commit.Verification.Verified)
-				assert.Empty(t, branch.Commit.Verification.Signature)
-			}))
-		})
-
-		setting.Repository.Signing.Merges = []string{"commitssigned"}
-		t.Run("CommitsSignedMerging", func(t *testing.T) {
-			defer tests.PrintCurrentTest(t)()
-			testCtx := NewAPITestContext(t, username, "initial-unsigned", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
-			t.Run("CreatePullRequest", func(t *testing.T) {
-				pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t)
-				require.NoError(t, err)
-				t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
-			})
-			t.Run("CheckMasterBranchUnsigned", doAPIGetBranch(testCtx, "master", func(t *testing.T, branch api.Branch) {
-				assert.NotNil(t, branch.Commit)
-				assert.NotNil(t, branch.Commit.Verification)
-				assert.True(t, branch.Commit.Verification.Verified)
-			}))
-		})
-	})
-}
-
-func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) {
-	return doAPICreateFile(ctx, path, &api.CreateFileOptions{
-		FileOptions: api.FileOptions{
-			BranchName:    from,
-			NewBranchName: to,
-			Message:       fmt.Sprintf("from:%s to:%s path:%s", from, to, path),
-			Author: api.Identity{
-				Name:  user.FullName,
-				Email: user.Email,
-			},
-			Committer: api.Identity{
-				Name:  user.FullName,
-				Email: user.Email,
-			},
-		},
-		ContentBase64: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("This is new text for %s", path))),
-	}, callback...)
-}
-
-func importTestingKey() (*openpgp.Entity, error) {
-	if _, _, err := process.GetManager().Exec("gpg --import tests/integration/private-testing.key", "gpg", "--import", "tests/integration/private-testing.key"); err != nil {
-		return nil, err
-	}
-	keyringFile, err := os.Open("tests/integration/private-testing.key")
-	if err != nil {
-		return nil, err
-	}
-	defer keyringFile.Close()
-
-	block, err := armor.Decode(keyringFile)
-	if err != nil {
-		return nil, err
-	}
-
-	keyring, err := openpgp.ReadKeyRing(block.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Keyring access failed: '%w'", err)
-	}
-
-	// There should only be one entity in this file.
-	return keyring[0], nil
-}
diff --git a/tests/integration/html_helper.go b/tests/integration/html_helper.go
index 802dcb05a4..0caa50d0c0 100644
--- a/tests/integration/html_helper.go
+++ b/tests/integration/html_helper.go
@@ -51,7 +51,7 @@ func (doc *HTMLDoc) AssertDropdownHasOptions(t testing.TB, dropdownName string)
 	t.Helper()
 
 	options := doc.AssertDropdown(t, dropdownName).Find(".menu [data-value]:not([data-value=''])")
-	assert.Positive(t, options.Length(), 0, fmt.Sprintf("%s dropdown has no options", dropdownName))
+	assert.Positive(t, options.Length(), "%s dropdown has no options", dropdownName)
 }
 
 func (doc *HTMLDoc) AssertDropdownHasSelectedOption(t testing.TB, dropdownName, expectedValue string) {
@@ -76,17 +76,28 @@ func (doc *HTMLDoc) Find(selector string) *goquery.Selection {
 	return doc.doc.Find(selector)
 }
 
+// FindByText gets all elements by selector that also has the given text
+func (doc *HTMLDoc) FindByText(selector, text string) *goquery.Selection {
+	return doc.doc.Find(selector).FilterFunction(func(i int, s *goquery.Selection) bool {
+		return s.Text() == text
+	})
+}
+
 // GetCSRF for getting CSRF token value from input
 func (doc *HTMLDoc) GetCSRF() string {
 	return doc.GetInputValueByName("_csrf")
 }
 
-// AssertElement check if element by selector exists or does not exist depending on checkExists
-func (doc *HTMLDoc) AssertElement(t testing.TB, selector string, checkExists bool) {
-	sel := doc.doc.Find(selector)
+// AssertSelection check if selection exists or does not exist depending on checkExists
+func (doc *HTMLDoc) AssertSelection(t testing.TB, selection *goquery.Selection, checkExists bool) {
 	if checkExists {
-		assert.Equal(t, 1, sel.Length())
+		assert.Equal(t, 1, selection.Length())
 	} else {
-		assert.Equal(t, 0, sel.Length())
+		assert.Equal(t, 0, selection.Length())
 	}
 }
+
+// AssertElement check if element by selector exists or does not exist depending on checkExists
+func (doc *HTMLDoc) AssertElement(t testing.TB, selector string, checkExists bool) {
+	doc.AssertSelection(t, doc.doc.Find(selector), checkExists)
+}
diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go
index a47aaed87a..40a501b0cf 100644
--- a/tests/integration/incoming_email_test.go
+++ b/tests/integration/incoming_email_test.go
@@ -52,12 +52,12 @@ func TestIncomingEmail(t *testing.T) {
 		ref, err := incoming_payload.GetReferenceFromPayload(db.DefaultContext, issuePayload)
 		require.NoError(t, err)
 		assert.IsType(t, ref, new(issues_model.Issue))
-		assert.EqualValues(t, issue.ID, ref.(*issues_model.Issue).ID)
+		assert.Equal(t, issue.ID, ref.(*issues_model.Issue).ID)
 
 		ref, err = incoming_payload.GetReferenceFromPayload(db.DefaultContext, commentPayload)
 		require.NoError(t, err)
 		assert.IsType(t, ref, new(issues_model.Comment))
-		assert.EqualValues(t, comment.ID, ref.(*issues_model.Comment).ID)
+		assert.Equal(t, comment.ID, ref.(*issues_model.Comment).ID)
 	})
 
 	t.Run("Token", func(t *testing.T) {
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index 4257a999d9..ac3c86e332 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -19,6 +19,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"sync/atomic"
@@ -32,6 +33,7 @@ import (
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/graceful"
 	"forgejo.org/modules/json"
+	"forgejo.org/modules/keying"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/testlogger"
@@ -40,6 +42,7 @@ import (
 	"forgejo.org/routers"
 	"forgejo.org/services/auth/source/remote"
 	gitea_context "forgejo.org/services/context"
+	"forgejo.org/services/mailer"
 	user_service "forgejo.org/services/user"
 	"forgejo.org/tests"
 
@@ -48,6 +51,7 @@ import (
 	"github.com/markbates/goth/gothic"
 	goth_github "github.com/markbates/goth/providers/github"
 	goth_gitlab "github.com/markbates/goth/providers/gitlab"
+	"github.com/pquerna/otp/totp"
 	"github.com/santhosh-tekuri/jsonschema/v6"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -109,6 +113,9 @@ func runMainAppWithStdin(stdin io.Reader, subcommand string, args ...string) (st
 		"GITEA_WORK_DIR="+setting.AppWorkPath)
 	cmd.Stdin = stdin
 	out, err := cmd.Output()
+	if ee, ok := err.(*exec.ExitError); ok {
+		log.Error("%s %v exit on error %s", os.Args[0], args, ee.Stderr)
+	}
 	return string(out), err
 }
 
@@ -271,6 +278,30 @@ func (s *TestSession) MakeRequestNilResponseHashSumRecorder(t testing.TB, rw *Re
 	return resp
 }
 
+func (s *TestSession) EnrollTOTP(t testing.TB) {
+	t.Helper()
+
+	req := NewRequest(t, "GET", "/user/settings/security/two_factor/enroll")
+	resp := s.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	totpSecretKey, has := htmlDoc.Find(".twofa img[src^='data:image/png;base64']").Attr("alt")
+	assert.True(t, has)
+
+	currentTOTP, err := totp.GenerateCode(totpSecretKey, time.Now())
+	require.NoError(t, err)
+
+	req = NewRequestWithValues(t, "POST", "/user/settings/security/two_factor/enroll", map[string]string{
+		"_csrf":    htmlDoc.GetCSRF(),
+		"passcode": currentTOTP,
+	})
+	s.MakeRequest(t, req, http.StatusSeeOther)
+
+	flashCookie := s.GetCookie(gitea_context.CookieNameFlash)
+	assert.NotNil(t, flashCookie)
+	assert.Contains(t, flashCookie.Value, "success%3DYour%2Baccount%2Bhas%2Bbeen%2Bsuccessfully%2Benrolled.")
+}
+
 const userPassword = "password"
 
 func emptyTestSession(t testing.TB) *TestSession {
@@ -413,6 +444,40 @@ func loginUserWithPasswordRemember(t testing.TB, userName, password string, reme
 	return session
 }
 
+func loginUserWithTOTP(t testing.TB, user *user_model.User) *TestSession {
+	t.Helper()
+	session := loginUser(t, user.Name)
+
+	twoFactor, err := auth.GetTwoFactorByUID(db.DefaultContext, user.ID)
+	require.NoError(t, err)
+
+	key := keying.DeriveKey(keying.ContextTOTP)
+	code, err := key.Decrypt(twoFactor.Secret, keying.ColumnAndID("secret", twoFactor.ID))
+	require.NoError(t, err)
+
+	passcode, err := totp.GenerateCode(string(code), time.Now())
+	require.NoError(t, err)
+
+	req := NewRequestWithValues(t, "POST", "/user/two_factor", map[string]string{
+		"_csrf":    GetCSRF(t, session, "/user/two_factor"),
+		"passcode": passcode,
+	})
+	session.MakeRequest(t, req, http.StatusSeeOther)
+
+	return session
+}
+
+func loginUserMaybeTOTP(t testing.TB, user *user_model.User, useTOTP bool) *TestSession {
+	if useTOTP {
+		sess := loginUser(t, user.Name)
+		sess.EnrollTOTP(t)
+		sess.MakeRequest(t, NewRequest(t, "POST", "/user/logout"), http.StatusOK)
+
+		return loginUserWithTOTP(t, user)
+	}
+	return loginUser(t, user.Name)
+}
+
 // token has to be unique this counter take care of
 var tokenCounter int64
 
@@ -561,7 +626,7 @@ func MakeRequest(t testing.TB, rw *RequestWrapper, expectedStatus int) *httptest
 	}
 	testWebRoutes.ServeHTTP(recorder, req)
 	if expectedStatus != NoExpectedStatus {
-		if !assert.EqualValues(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) {
+		if !assert.Equal(t, expectedStatus, recorder.Code, "Request: %s %s", req.Method, req.URL.String()) {
 			logUnexpectedResponse(t, recorder)
 		}
 	}
@@ -574,7 +639,7 @@ func MakeRequestNilResponseRecorder(t testing.TB, rw *RequestWrapper, expectedSt
 	recorder := NewNilResponseRecorder()
 	testWebRoutes.ServeHTTP(recorder, req)
 	if expectedStatus != NoExpectedStatus {
-		if !assert.EqualValues(t, expectedStatus, recorder.Code,
+		if !assert.Equal(t, expectedStatus, recorder.Code,
 			"Request: %s %s", req.Method, req.URL.String()) {
 			logUnexpectedResponse(t, &recorder.ResponseRecorder)
 		}
@@ -588,7 +653,7 @@ func MakeRequestNilResponseHashSumRecorder(t testing.TB, rw *RequestWrapper, exp
 	recorder := NewNilResponseHashSumRecorder()
 	testWebRoutes.ServeHTTP(recorder, req)
 	if expectedStatus != NoExpectedStatus {
-		if !assert.EqualValues(t, expectedStatus, recorder.Code,
+		if !assert.Equal(t, expectedStatus, recorder.Code,
 			"Request: %s %s", req.Method, req.URL.String()) {
 			logUnexpectedResponse(t, &recorder.ResponseRecorder)
 		}
@@ -691,3 +756,9 @@ func GetHTMLTitle(t testing.TB, session *TestSession, urlStr string) string {
 	doc := NewHTMLParser(t, resp.Body)
 	return doc.Find("head title").Text()
 }
+
+func SortMailerMessages(msgs []*mailer.Message) {
+	slices.SortFunc(msgs, func(a, b *mailer.Message) int {
+		return strings.Compare(b.To, a.To)
+	})
+}
diff --git a/tests/integration/issue_comment_test.go b/tests/integration/issue_comment_test.go
new file mode 100644
index 0000000000..a604378479
--- /dev/null
+++ b/tests/integration/issue_comment_test.go
@@ -0,0 +1,573 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"net/http"
+	"strconv"
+	"strings"
+	"testing"
+
+	"forgejo.org/models/db"
+	issues_model "forgejo.org/models/issues"
+	org_model "forgejo.org/models/organization"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/tests"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func testIssueCommentChangeEvent(t *testing.T, htmlDoc *HTMLDoc, commentID, badgeOcticon, avatarTitle, avatarLink string, texts, links []string) {
+	// Check badge octicon
+	badge := htmlDoc.Find("#issuecomment-" + commentID + " .badge svg." + badgeOcticon)
+	assert.Equal(t, 1, badge.Length())
+
+	// Check avatar title
+	avatarImg := htmlDoc.Find("#issuecomment-" + commentID + " img.avatar")
+	if len(avatarTitle) == 0 {
+		assert.Zero(t, avatarImg.Length())
+	} else {
+		assert.Equal(t, 1, avatarImg.Length())
+		title, exists := avatarImg.Attr("title")
+		assert.True(t, exists)
+		assert.Equal(t, avatarTitle, title)
+	}
+
+	// Check avatar link
+	avatarA := htmlDoc.Find("#issuecomment-" + commentID + " a.avatar")
+	if len(avatarLink) == 0 {
+		assert.Zero(t, avatarA.Length())
+	} else {
+		assert.Equal(t, 1, avatarA.Length())
+		href, exists := avatarA.Attr("href")
+		assert.True(t, exists)
+		assert.Equal(t, avatarLink, href)
+	}
+
+	event := htmlDoc.Find("#issuecomment-" + commentID + " .text")
+
+	// Check text content
+	for _, text := range texts {
+		assert.Contains(t, strings.Join(strings.Fields(event.Text()), " "), text)
+	}
+
+	var ids []string
+	var hrefs []string
+	event.Find("a").Each(func(i int, s *goquery.Selection) {
+		if id, exists := s.Attr("id"); exists {
+			ids = append(ids, id)
+		}
+		if href, exists := s.Attr("href"); exists {
+			hrefs = append(hrefs, href)
+		}
+	})
+
+	// Check anchors (id)
+	assert.Equal(t, []string{"event-" + commentID}, ids)
+
+	// Check links (href)
+	issueCommentLink := "#issuecomment-" + commentID
+	found := false
+	for _, link := range links {
+		if link == issueCommentLink {
+			found = true
+			break
+		}
+	}
+	if !found {
+		links = append(links, issueCommentLink)
+	}
+	assert.Equal(t, links, hrefs)
+}
+
+func TestIssueCommentChangeMilestone(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Add milestone
+	testIssueCommentChangeEvent(t, htmlDoc, "2000",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 added this to the milestone1 milestone"},
+		[]string{"/user1", "/user2/repo1/milestone/1"})
+
+	// Modify milestone
+	testIssueCommentChangeEvent(t, htmlDoc, "2001",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 modified the milestone from milestone1 to milestone2"},
+		[]string{"/user1", "/user2/repo1/milestone/1", "/user2/repo1/milestone/2"})
+
+	// Remove milestone
+	testIssueCommentChangeEvent(t, htmlDoc, "2002",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 removed this from the milestone2 milestone"},
+		[]string{"/user1", "/user2/repo1/milestone/2"})
+
+	// Added milestone that in the meantime was deleted
+	testIssueCommentChangeEvent(t, htmlDoc, "2003",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 added this to the (deleted) milestone"},
+		[]string{"/user1"})
+
+	// Modified milestone - from a meantime deleted one to a valid one
+	testIssueCommentChangeEvent(t, htmlDoc, "2004",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 modified the milestone from (deleted) to milestone1"},
+		[]string{"/user1", "/user2/repo1/milestone/1"})
+
+	// Modified milestone - from a valid one to a meantime deleted one
+	testIssueCommentChangeEvent(t, htmlDoc, "2005",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 modified the milestone from milestone1 to (deleted)"},
+		[]string{"/user1", "/user2/repo1/milestone/1"})
+
+	// Modified milestone - from a meantime deleted one to a meantime deleted one
+	testIssueCommentChangeEvent(t, htmlDoc, "2006",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 modified the milestone from (deleted) to (deleted)"},
+		[]string{"/user1"})
+
+	// Removed milestone that in the meantime was deleted
+	testIssueCommentChangeEvent(t, htmlDoc, "2007",
+		"octicon-milestone", "User One", "/user1",
+		[]string{"user1 removed this from the (deleted) milestone"},
+		[]string{"/user1"})
+}
+
+func TestIssueCommentChangeProject(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Add project
+	testIssueCommentChangeEvent(t, htmlDoc, "2010",
+		"octicon-project", "User One", "/user1",
+		[]string{"user1 added this to the First project project"},
+		[]string{"/user1", "/user2/repo1/projects/1"})
+
+	// Modify project
+	testIssueCommentChangeEvent(t, htmlDoc, "2011",
+		"octicon-project", "User One", "/user1",
+		[]string{"user1 modified the project from First project to second project"},
+		[]string{"/user1", "/user2/repo1/projects/1", "/user2/repo1/projects/2"})
+
+	// Remove project
+	testIssueCommentChangeEvent(t, htmlDoc, "2012",
+		"octicon-project", "User One", "/user1",
+		[]string{"user1 removed this from the second project project"},
+		[]string{"/user1", "/user2/repo1/projects/2"})
+
+	// Deleted project
+	testIssueCommentChangeEvent(t, htmlDoc, "2013",
+		"octicon-project", "User One", "/user1",
+		[]string{"user1 added this to the (deleted) project"},
+		[]string{"/user1"})
+}
+
+func TestIssueCommentChangeLabel(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Add multiple labels
+	testIssueCommentChangeEvent(t, htmlDoc, "2020",
+		"octicon-tag", "User One", "/user1",
+		[]string{"user1 added the label1 label2 labels "},
+		[]string{"/user1", "/user2/repo1/issues?labels=1", "/user2/repo1/issues?labels=2"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-2021 .text").Text())
+
+	// Remove single label
+	testIssueCommentChangeEvent(t, htmlDoc, "2022",
+		"octicon-tag", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 removed the label1 label "},
+		[]string{"/user2", "/user2/repo1/issues?labels=1"})
+
+	// Modify labels (add and remove)
+	testIssueCommentChangeEvent(t, htmlDoc, "2023",
+		"octicon-tag", "User One", "/user1",
+		[]string{"user1 added label1 and removed label2 labels "},
+		[]string{"/user1", "/user2/repo1/issues?labels=1", "/user2/repo1/issues?labels=2"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-2024 .text").Text())
+
+	// Add single label
+	testIssueCommentChangeEvent(t, htmlDoc, "2025",
+		"octicon-tag", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 added the label2 label "},
+		[]string{"/user2", "/user2/repo1/issues?labels=2"})
+
+	// Remove multiple labels
+	testIssueCommentChangeEvent(t, htmlDoc, "2026",
+		"octicon-tag", "User One", "/user1",
+		[]string{"user1 removed the label1 label2 labels "},
+		[]string{"/user1", "/user2/repo1/issues?labels=1", "/user2/repo1/issues?labels=2"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-2027 .text").Text())
+}
+
+func TestIssueCommentChangeAssignee(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Self-assign
+	testIssueCommentChangeEvent(t, htmlDoc, "2040",
+		"octicon-person", "User One", "/user1",
+		[]string{"user1 self-assigned this"},
+		[]string{"/user1"})
+
+	// Remove other
+	testIssueCommentChangeEvent(t, htmlDoc, "2041",
+		"octicon-person", "User One", "/user1",
+		[]string{"user1 was unassigned by user2"},
+		[]string{"/user1", "/user2"})
+
+	// Add other
+	testIssueCommentChangeEvent(t, htmlDoc, "2042",
+		"octicon-person", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 was assigned by user1"},
+		[]string{"/user2", "/user1"})
+
+	// Self-remove
+	testIssueCommentChangeEvent(t, htmlDoc, "2043",
+		"octicon-person", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 removed their assignment"},
+		[]string{"/user2"})
+}
+
+func TestIssueCommentChangeReviewRequest(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 6})
+	require.NoError(t, pull.LoadIssue(db.DefaultContext))
+	issue := pull.Issue
+	require.NoError(t, issue.LoadRepo(db.DefaultContext))
+
+	user1, err := user_model.GetUserByID(db.DefaultContext, 1)
+	require.NoError(t, err)
+	user2, err := user_model.GetUserByID(db.DefaultContext, 2)
+	require.NoError(t, err)
+	team1, err := org_model.GetTeamByID(db.DefaultContext, 2)
+	require.NoError(t, err)
+	assert.NotNil(t, team1)
+
+	// Request from other
+	comment1, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user2, user1)
+	require.NoError(t, err)
+
+	// Refuse review
+	comment2, err := issues_model.RemoveReviewRequest(db.DefaultContext, issue, user2, user2)
+	require.NoError(t, err)
+
+	// Request from other
+	comment3, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user2, user1)
+	require.NoError(t, err)
+	// Request from team
+	comment4, err := issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team1, user1)
+	require.NoError(t, err)
+
+	// Remove request from team
+	comment5, err := issues_model.RemoveTeamReviewRequest(db.DefaultContext, issue, team1, user2)
+	require.NoError(t, err)
+	// Request from other
+	comment6, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user1, user2)
+	require.NoError(t, err)
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/org3/repo3/pulls/2")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Request from other
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment1.ID, 10),
+		"octicon-eye", "User One", "/user1",
+		[]string{"user1 requested review from user2"},
+		[]string{"/user1", "/user2"})
+
+	// Refuse review
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment2.ID, 10),
+		"octicon-eye", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 refused to review"},
+		[]string{"/user2"})
+
+	// Request review from other and from team
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment3.ID, 10),
+		"octicon-eye", "User One", "/user1",
+		[]string{"user1 requested reviews from user2, team1"},
+		[]string{"/user1", "/user2", "/org/org3/teams/team1"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-"+strconv.FormatInt(comment4.ID, 10)+" .text").Text())
+
+	// Remove and add request
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment5.ID, 10),
+		"octicon-eye", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 requested reviews from user1 and removed review requests for team1"},
+		[]string{"/user2", "/user1", "/org/org3/teams/team1"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-"+strconv.FormatInt(comment6.ID, 10)+" .text").Text())
+}
+
+func TestIssueCommentChangeReviewRequestAggregated(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	pull := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 6})
+	require.NoError(t, pull.LoadIssue(db.DefaultContext))
+	issue := pull.Issue
+	require.NoError(t, issue.LoadRepo(db.DefaultContext))
+
+	user1, err := user_model.GetUserByID(db.DefaultContext, 1)
+	require.NoError(t, err)
+	user2, err := user_model.GetUserByID(db.DefaultContext, 2)
+	require.NoError(t, err)
+	team1, err := org_model.GetTeamByID(db.DefaultContext, 2)
+	require.NoError(t, err)
+	assert.NotNil(t, team1)
+	label, err := issues_model.GetLabelByID(db.DefaultContext, 1)
+	require.NoError(t, err)
+	assert.NotNil(t, label)
+
+	// Request from other
+	comment1, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user2, user1)
+	require.NoError(t, err)
+	// Add label
+	issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
+		Type:  issues_model.CommentTypeLabel,
+		Doer:  user1,
+		Issue: issue,
+		Label: label,
+		Repo:  issue.Repo,
+	})
+
+	// Refuse review
+	comment2, err := issues_model.RemoveReviewRequest(db.DefaultContext, issue, user2, user2)
+	require.NoError(t, err)
+	// Remove label
+	issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
+		Type:  issues_model.CommentTypeLabel,
+		Doer:  user2,
+		Issue: issue,
+		Label: label,
+		Repo:  issue.Repo,
+	})
+
+	// Request from other
+	comment3, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user2, user1)
+	require.NoError(t, err)
+	// Request from team
+	comment4, err := issues_model.AddTeamReviewRequest(db.DefaultContext, issue, team1, user1)
+	require.NoError(t, err)
+	// Add label
+	issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
+		Type:  issues_model.CommentTypeLabel,
+		Doer:  user1,
+		Issue: issue,
+		Label: label,
+		Repo:  issue.Repo,
+	})
+
+	// Remove request from team
+	comment5, err := issues_model.RemoveTeamReviewRequest(db.DefaultContext, issue, team1, user2)
+	require.NoError(t, err)
+	// Request from other
+	comment6, err := issues_model.AddReviewRequest(db.DefaultContext, issue, user1, user2)
+	require.NoError(t, err)
+	// Remove label
+	issues_model.CreateComment(db.DefaultContext, &issues_model.CreateCommentOptions{
+		Type:  issues_model.CommentTypeLabel,
+		Doer:  user2,
+		Issue: issue,
+		Label: label,
+		Repo:  issue.Repo,
+	})
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/org3/repo3/pulls/2")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Request from other
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment1.ID, 10),
+		"octicon-eye", "User One", "/user1",
+		[]string{"user1 requested review from user2"},
+		[]string{"/user1", "#issuecomment-" + strconv.FormatInt(comment1.ID, 10), "/org3/repo3/pulls?labels=1", "/user2"})
+
+	// Refuse review
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment2.ID, 10),
+		"octicon-eye", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 refused to review"},
+		[]string{"/user2", "#issuecomment-" + strconv.FormatInt(comment2.ID, 10), "/org3/repo3/pulls?labels=1"})
+
+	// Request review from other and from team
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment3.ID, 10),
+		"octicon-eye", "User One", "/user1",
+		[]string{"user1 requested reviews from user2, team1"},
+		[]string{"/user1", "#issuecomment-" + strconv.FormatInt(comment3.ID, 10), "/org3/repo3/pulls?labels=1", "/user2", "/org/org3/teams/team1"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-"+strconv.FormatInt(comment4.ID, 10)+" .text").Text())
+
+	// Remove and add request
+	testIssueCommentChangeEvent(t, htmlDoc, strconv.FormatInt(comment5.ID, 10),
+		"octicon-eye", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 requested reviews from user1 and removed review requests for team1"},
+		[]string{"/user2", "#issuecomment-" + strconv.FormatInt(comment5.ID, 10), "/org3/repo3/pulls?labels=1", "/user1", "/org/org3/teams/team1"})
+	assert.Empty(t, htmlDoc.Find("#issuecomment-"+strconv.FormatInt(comment6.ID, 10)+" .text").Text())
+}
+
+func TestIssueCommentChangeLock(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Lock without reason
+	testIssueCommentChangeEvent(t, htmlDoc, "2050",
+		"octicon-lock", "User One", "/user1",
+		[]string{"user1 locked and limited conversation to collaborators"},
+		[]string{"/user1"})
+
+	// Unlock
+	testIssueCommentChangeEvent(t, htmlDoc, "2051",
+		"octicon-key", "User One", "/user1",
+		[]string{"user1 unlocked this conversation"},
+		[]string{"/user1"})
+
+	// Lock with reason
+	testIssueCommentChangeEvent(t, htmlDoc, "2052",
+		"octicon-lock", "User One", "/user1",
+		[]string{"user1 locked as Too heated and limited conversation to collaborators"},
+		[]string{"/user1"})
+
+	// Unlock
+	testIssueCommentChangeEvent(t, htmlDoc, "2053",
+		"octicon-key", "User One", "/user1",
+		[]string{"user1 unlocked this conversation"},
+		[]string{"/user1"})
+}
+
+func TestIssueCommentChangePin(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Pin
+	testIssueCommentChangeEvent(t, htmlDoc, "2060",
+		"octicon-pin", "User One", "/user1",
+		[]string{"user1 pinned this"},
+		[]string{"/user1"})
+
+	// Unpin
+	testIssueCommentChangeEvent(t, htmlDoc, "2061",
+		"octicon-pin", "User One", "/user1",
+		[]string{"user1 unpinned this"},
+		[]string{"/user1"})
+}
+
+func TestIssueCommentChangeOpen(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Close issue
+	testIssueCommentChangeEvent(t, htmlDoc, "2070",
+		"octicon-circle-slash", "User One", "/user1",
+		[]string{"user1 closed this issue"},
+		[]string{"/user1"})
+
+	// Reopen issue
+	testIssueCommentChangeEvent(t, htmlDoc, "2071",
+		"octicon-dot-fill", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 reopened this issue"},
+		[]string{"/user2"})
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/2")
+	resp = MakeRequest(t, req, http.StatusOK)
+	htmlDoc = NewHTMLParser(t, resp.Body)
+
+	// Close pull request
+	testIssueCommentChangeEvent(t, htmlDoc, "2072",
+		"octicon-circle-slash", "User One", "/user1",
+		[]string{"user1 closed this pull request"},
+		[]string{"/user1"})
+
+	// Reopen pull request
+	testIssueCommentChangeEvent(t, htmlDoc, "2073",
+		"octicon-dot-fill", "< U<se>r Tw<o > ><", "/user2",
+		[]string{"user2 reopened this pull request"},
+		[]string{"/user2"})
+}
+
+func TestIssueCommentChangeIssueReference(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Issue reference from issue
+	testIssueCommentChangeEvent(t, htmlDoc, "2080",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this issue ", "issue5 #4"},
+		[]string{"/user1", "/user2/repo1/issues/4", "#issuecomment-2080", "/user2/repo1/issues/4"})
+
+	// Issue reference from pull
+	testIssueCommentChangeEvent(t, htmlDoc, "2081",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this issue ", "issue2 #2"},
+		[]string{"/user1", "/user2/repo1/pulls/2", "#issuecomment-2081", "/user2/repo1/pulls/2"})
+
+	// Issue reference from issue in different repo
+	testIssueCommentChangeEvent(t, htmlDoc, "2082",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this issue from org3/repo21", "just a normal issue #1"},
+		[]string{"/user1", "/org3/repo21/issues/1", "#issuecomment-2082", "/org3/repo21/issues/1"})
+
+	// Issue reference from pull in different repo
+	testIssueCommentChangeEvent(t, htmlDoc, "2083",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this issue from user12/repo10 ", "pr2 #1"},
+		[]string{"/user1", "/user12/repo10/pulls/1", "#issuecomment-2083", "/user12/repo10/pulls/1"})
+}
+
+func TestIssueCommentChangePullReference(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/pulls/2")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	// Pull reference from issue
+	testIssueCommentChangeEvent(t, htmlDoc, "2090",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this pull request ", "issue1 #1"},
+		[]string{"/user1", "/user2/repo1/issues/1", "#issuecomment-2090", "/user2/repo1/issues/1"})
+
+	// Pull reference from pull
+	testIssueCommentChangeEvent(t, htmlDoc, "2091",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this pull request ", "issue2 #2"},
+		[]string{"/user1", "/user2/repo1/pulls/2", "#issuecomment-2091", "/user2/repo1/pulls/2"})
+
+	// Pull reference from issue in different repo
+	testIssueCommentChangeEvent(t, htmlDoc, "2092",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this pull request from org3/repo21", "just a normal issue #1"},
+		[]string{"/user1", "/org3/repo21/issues/1", "#issuecomment-2092", "/org3/repo21/issues/1"})
+
+	// Pull reference from pull in different repo
+	testIssueCommentChangeEvent(t, htmlDoc, "2093",
+		"octicon-bookmark", "User One", "/user1",
+		[]string{"user1 referenced this pull request from user12/repo10 ", "pr2 #1"},
+		[]string{"/user1", "/user12/repo10/pulls/1", "#issuecomment-2093", "/user12/repo10/pulls/1"})
+}
diff --git a/tests/integration/issue_subscribe_test.go b/tests/integration/issue_subscribe_test.go
index 32001cd22d..533526c388 100644
--- a/tests/integration/issue_subscribe_test.go
+++ b/tests/integration/issue_subscribe_test.go
@@ -29,16 +29,16 @@ func testIssueSubscribe(t *testing.T, session TestSession, unavailable bool) {
 	resp := session.MakeRequest(t, NewRequest(t, "GET", path.Join(testIssue)), http.StatusOK)
 	area := NewHTMLParser(t, resp.Body).Find(selector)
 	tooltip, exists := area.Attr("data-tooltip-content")
-	assert.EqualValues(t, unavailable, exists)
+	assert.Equal(t, unavailable, exists)
 	if unavailable {
-		assert.EqualValues(t, "Sign in to subscribe to this issue.", tooltip)
+		assert.Equal(t, "Sign in to subscribe to this issue.", tooltip)
 	}
 
 	resp = session.MakeRequest(t, NewRequest(t, "GET", path.Join(testPull)), http.StatusOK)
 	area = NewHTMLParser(t, resp.Body).Find(selector)
 	tooltip, exists = area.Attr("data-tooltip-content")
-	assert.EqualValues(t, unavailable, exists)
+	assert.Equal(t, unavailable, exists)
 	if unavailable {
-		assert.EqualValues(t, "Sign in to subscribe to this pull request.", tooltip)
+		assert.Equal(t, "Sign in to subscribe to this pull request.", tooltip)
 	}
 }
diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go
index 6845612a6d..e203adf245 100644
--- a/tests/integration/issue_test.go
+++ b/tests/integration/issue_test.go
@@ -7,6 +7,7 @@ package integration
 import (
 	"fmt"
 	"net/http"
+	"net/http/httptest"
 	"net/url"
 	"path"
 	"regexp"
@@ -29,7 +30,9 @@ import (
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
+	"forgejo.org/modules/translation"
 	files_service "forgejo.org/services/repository/files"
+	user_service "forgejo.org/services/user"
 	"forgejo.org/tests"
 
 	"github.com/PuerkitoBio/goquery"
@@ -39,7 +42,7 @@ import (
 
 func getIssuesSelection(t testing.TB, htmlDoc *HTMLDoc) *goquery.Selection {
 	issueList := htmlDoc.doc.Find("#issue-list")
-	assert.EqualValues(t, 1, issueList.Length())
+	assert.Equal(t, 1, issueList.Length())
 	return issueList.Find(".flex-item").Find(".issue-title")
 }
 
@@ -103,11 +106,11 @@ func TestViewIssuesSortByType(t *testing.T) {
 	if expectedNumIssues > setting.UI.IssuePagingNum {
 		expectedNumIssues = setting.UI.IssuePagingNum
 	}
-	assert.EqualValues(t, expectedNumIssues, issuesSelection.Length())
+	assert.Equal(t, expectedNumIssues, issuesSelection.Length())
 
 	issuesSelection.Each(func(_ int, selection *goquery.Selection) {
 		issue := getIssue(t, repo.ID, selection)
-		assert.EqualValues(t, user.ID, issue.PosterID)
+		assert.Equal(t, user.ID, issue.PosterID)
 	})
 }
 
@@ -120,7 +123,6 @@ func TestViewIssuesKeyword(t *testing.T) {
 		Index:  1,
 	})
 	issues.UpdateIssueIndexer(t.Context(), issue.ID)
-	time.Sleep(time.Second * 1)
 
 	const keyword = "first"
 	req := NewRequestf(t, "GET", "%s/issues?q=%s", repo.Link(), keyword)
@@ -128,7 +130,7 @@ func TestViewIssuesKeyword(t *testing.T) {
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	issuesSelection := getIssuesSelection(t, htmlDoc)
-	assert.EqualValues(t, 1, issuesSelection.Length())
+	assert.Equal(t, 1, issuesSelection.Length())
 	issuesSelection.Each(func(_ int, selection *goquery.Selection) {
 		issue := getIssue(t, repo.ID, selection)
 		assert.False(t, issue.IsClosed)
@@ -142,14 +144,14 @@ func TestViewIssuesKeyword(t *testing.T) {
 	resp = MakeRequest(t, req, http.StatusOK)
 	htmlDoc = NewHTMLParser(t, resp.Body)
 	issuesSelection = getIssuesSelection(t, htmlDoc)
-	assert.EqualValues(t, 0, issuesSelection.Length())
+	assert.Equal(t, 0, issuesSelection.Length())
 
 	// should match as 'first' when using a standard query
 	req = NewRequestf(t, "GET", "%s/issues?q=%st", repo.Link(), keyword)
 	resp = MakeRequest(t, req, http.StatusOK)
 	htmlDoc = NewHTMLParser(t, resp.Body)
 	issuesSelection = getIssuesSelection(t, htmlDoc)
-	assert.EqualValues(t, 1, issuesSelection.Length())
+	assert.Equal(t, 1, issuesSelection.Length())
 	issuesSelection.Each(func(_ int, selection *goquery.Selection) {
 		issue := getIssue(t, repo.ID, selection)
 		assert.False(t, issue.IsClosed)
@@ -172,7 +174,7 @@ func TestViewIssuesSearchOptions(t *testing.T) {
 		resp := MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		issuesSelection := getIssuesSelection(t, htmlDoc)
-		assert.EqualValues(t, 3, issuesSelection.Length())
+		assert.Equal(t, 3, issuesSelection.Length())
 	})
 
 	t.Run("Issues with no project", func(t *testing.T) {
@@ -180,7 +182,7 @@ func TestViewIssuesSearchOptions(t *testing.T) {
 		resp := MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		issuesSelection := getIssuesSelection(t, htmlDoc)
-		assert.EqualValues(t, 1, issuesSelection.Length())
+		assert.Equal(t, 1, issuesSelection.Length())
 		issuesSelection.Each(func(_ int, selection *goquery.Selection) {
 			issue := getIssue(t, repo.ID, selection)
 			assert.Equal(t, issueNoProject.ID, issue.ID)
@@ -194,7 +196,7 @@ func TestViewIssuesSearchOptions(t *testing.T) {
 		resp := MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		issuesSelection := getIssuesSelection(t, htmlDoc)
-		assert.EqualValues(t, 2, issuesSelection.Length())
+		assert.Equal(t, 2, issuesSelection.Length())
 		found := map[int64]bool{
 			1: false,
 			5: false,
@@ -216,6 +218,108 @@ func TestNoLoginViewIssue(t *testing.T) {
 	MakeRequest(t, req, http.StatusOK)
 }
 
+func TestViewIssueCommentBox(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	locale := translation.NewLocale("en-US")
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
+	collaborator := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	viewer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+	ownerSession := loginUser(t, owner.Name)
+	collaboratorSession := loginUser(t, collaborator.Name)
+	viewerSession := loginUser(t, viewer.Name)
+
+	openIssueURL, _ := testIssueWithBean(t, owner.Name, repo.ID, "Open", "Description")
+
+	warningSignin := string(locale.Tr("repo.issues.sign_in_require_desc", fmt.Sprintf("/user/login?redirect_to=%s", url.QueryEscape(openIssueURL))))
+	warningLocked := locale.TrString("discussion.locked")
+	warningBlocked := locale.TrString("repo.comment.blocked_by_user")
+
+	assertCommentForm := func(session *TestSession, url string, shouldExist bool) *HTMLDoc {
+		var resp *httptest.ResponseRecorder
+
+		req := NewRequest(t, "GET", url)
+		if session != nil {
+			resp = session.MakeRequest(t, req, http.StatusOK)
+		} else {
+			resp = MakeRequest(t, req, http.StatusOK)
+		}
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		htmlDoc.AssertElement(t, ".issue-content #comment-form", shouldExist)
+
+		return htmlDoc
+	}
+
+	assertWarning := func(session *TestSession, url, warning string) {
+		htmlDoc := assertCommentForm(session, url, false)
+
+		timeline := htmlDoc.doc.Find(".issue-content .ui.timeline").Children()
+		assert.Positivef(t, timeline.Length(), "There should be at least one entry in the timeline")
+
+		html, _ := timeline.Last().Html()
+		assert.Equal(t, strings.TrimSpace(html), warning)
+	}
+
+	t.Run("Owner can see comment box", func(t *testing.T) {
+		assertCommentForm(ownerSession, openIssueURL, true)
+	})
+
+	t.Run("Collaborator can see comment box", func(t *testing.T) {
+		assertCommentForm(collaboratorSession, openIssueURL, true)
+	})
+
+	t.Run("Viewer can see comment box", func(t *testing.T) {
+		assertCommentForm(viewerSession, openIssueURL, true)
+	})
+
+	t.Run("Anonymous will see singin warning", func(t *testing.T) {
+		assertWarning(nil, openIssueURL, warningSignin)
+	})
+
+	lockedIssueURL, lockedIssue := testIssueWithBean(t, owner.Name, repo.ID, "Locked", "Description")
+
+	// Lock the issue
+	req := NewRequest(t, "GET", lockedIssueURL)
+	resp := ownerSession.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	req = NewRequestWithValues(t, "POST", fmt.Sprintf("%s/lock", lockedIssueURL), map[string]string{
+		"_csrf":  htmlDoc.GetCSRF(),
+		"reason": "Too heated",
+	})
+	_ = ownerSession.MakeRequest(t, req, http.StatusOK)
+
+	lockedIssue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: lockedIssue.ID})
+	assert.True(t, lockedIssue.IsLocked)
+
+	t.Run("Owner can see comment box in locked issue", func(t *testing.T) {
+		assertCommentForm(ownerSession, lockedIssueURL, true)
+	})
+
+	t.Run("Collaborator can see comment box in locked issue", func(t *testing.T) {
+		assertCommentForm(collaboratorSession, lockedIssueURL, true)
+	})
+
+	t.Run("Viewer will see warning in locked issue", func(t *testing.T) {
+		assertWarning(viewerSession, lockedIssueURL, warningLocked)
+	})
+
+	t.Run("Anonymous will see warning in locked issue", func(t *testing.T) {
+		assertWarning(nil, lockedIssueURL, warningLocked)
+	})
+
+	err := user_service.BlockUser(db.DefaultContext, owner.ID, viewer.ID)
+	require.NoError(t, err)
+
+	t.Run("Blocked viewer will see warning", func(t *testing.T) {
+		assertWarning(viewerSession, lockedIssueURL, warningBlocked)
+		assertWarning(viewerSession, openIssueURL, warningBlocked)
+	})
+}
+
 func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content string) string {
 	req := NewRequest(t, "GET", path.Join(user, repo, "issues", "new"))
 	resp := session.MakeRequest(t, req, http.StatusOK)
@@ -389,7 +493,7 @@ func TestIssueDependencies(t *testing.T) {
 
 		if hasDependency {
 			assert.NotEmpty(t, issues)
-			assert.EqualValues(t, issues[0].Index, dependencyID)
+			assert.Equal(t, issues[0].Index, dependencyID)
 		} else {
 			assert.Empty(t, issues)
 		}
@@ -525,7 +629,12 @@ func TestIssueCommentAttachment(t *testing.T) {
 	assert.NotEqual(t, 0, id)
 
 	req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/comments/%d/attachments", "user2", "repo1", id))
-	session.MakeRequest(t, req, http.StatusOK)
+	resp = session.MakeRequest(t, req, http.StatusOK)
+	var attachments []*api.WebAttachment
+	DecodeJSON(t, resp, &attachments)
+	assert.Len(t, attachments, 1)
+	assert.Equal(t, attachments[0].UUID, uuid)
+	assert.Equal(t, "image/png", attachments[0].MimeType)
 
 	// Using the ID of a comment that does not belong to the repository must fail
 	req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/comments/%d/attachments", "user5", "repo4", id))
@@ -569,7 +678,7 @@ func TestIssueCommentUpdate(t *testing.T) {
 	session.MakeRequest(t, req, http.StatusOK)
 
 	comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: commentID})
-	assert.Equal(t, "", comment.Content)
+	assert.Empty(t, comment.Content)
 }
 
 func TestIssueCommentUpdateSimultaneously(t *testing.T) {
@@ -798,7 +907,7 @@ func TestSearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String())
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 20)
 
 	query.Add("limit", "5")
@@ -806,7 +915,7 @@ func TestSearchIssues(t *testing.T) {
 	req = NewRequest(t, "GET", link.String())
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	DecodeJSON(t, resp, &apiIssues)
-	assert.EqualValues(t, "22", resp.Header().Get("X-Total-Count"))
+	assert.Equal(t, "22", resp.Header().Get("X-Total-Count"))
 	assert.Len(t, apiIssues, 5)
 
 	query = url.Values{"assigned": {"true"}, "state": {"all"}}
@@ -930,14 +1039,14 @@ func TestGetIssueInfo(t *testing.T) {
 	var apiIssue api.Issue
 	DecodeJSON(t, resp, &apiIssue)
 
-	assert.EqualValues(t, issue.ID, apiIssue.ID)
+	assert.Equal(t, issue.ID, apiIssue.ID)
 }
 
 func TestIssuePinMove(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	session := loginUser(t, "user2")
 	issueURL, issue := testIssueWithBean(t, "user2", 1, "Title", "Content")
-	assert.EqualValues(t, 0, issue.PinOrder)
+	assert.Equal(t, 0, issue.PinOrder)
 
 	req := NewRequestWithValues(t, "POST", fmt.Sprintf("%s/pin", issueURL), map[string]string{
 		"_csrf": GetCSRF(t, session, issueURL),
@@ -946,7 +1055,7 @@ func TestIssuePinMove(t *testing.T) {
 	issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
 
 	position := 1
-	assert.EqualValues(t, position, issue.PinOrder)
+	assert.Equal(t, position, issue.PinOrder)
 
 	newPosition := 2
 
@@ -961,7 +1070,7 @@ func TestIssuePinMove(t *testing.T) {
 		session5.MakeRequest(t, req, http.StatusNotFound)
 
 		issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
-		assert.EqualValues(t, position, issue.PinOrder)
+		assert.Equal(t, position, issue.PinOrder)
 	}
 
 	movePinURL := issueURL[:strings.LastIndexByte(issueURL, '/')] + "/move_pin?_csrf=" + GetCSRF(t, session, issueURL)
@@ -972,7 +1081,7 @@ func TestIssuePinMove(t *testing.T) {
 	session.MakeRequest(t, req, http.StatusNoContent)
 
 	issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: issue.ID})
-	assert.EqualValues(t, newPosition, issue.PinOrder)
+	assert.Equal(t, newPosition, issue.PinOrder)
 }
 
 func TestUpdateIssueDeadline(t *testing.T) {
@@ -1001,7 +1110,7 @@ func TestUpdateIssueDeadline(t *testing.T) {
 	var apiIssue api.IssueDeadline
 	DecodeJSON(t, resp, &apiIssue)
 
-	assert.EqualValues(t, "2022-04-06", apiIssue.Deadline.Format("2006-01-02"))
+	assert.Equal(t, "2022-04-06", apiIssue.Deadline.Format("2006-01-02"))
 }
 
 func TestUpdateIssueTitle(t *testing.T) {
@@ -1059,7 +1168,7 @@ func TestUpdateIssueTitle(t *testing.T) {
 			}{}
 
 			DecodeJSON(t, resp, &issueAfter)
-			assert.EqualValues(t, issueTitleUpdateTest.title, issueAfter.Title)
+			assert.Equal(t, issueTitleUpdateTest.title, issueAfter.Title)
 		}
 	}
 }
@@ -1077,10 +1186,10 @@ func TestIssueReferenceURL(t *testing.T) {
 
 	// the "reference" uses relative URLs, then JS code will convert them to absolute URLs for current origin, in case users are using multiple domains
 	ref, _ := htmlDoc.Find(`.timeline-item.comment.first .reference-issue`).Attr("data-reference")
-	assert.EqualValues(t, "/user2/repo1/issues/1#issue-1", ref)
+	assert.Equal(t, "/user2/repo1/issues/1#issue-1", ref)
 
 	ref, _ = htmlDoc.Find(`.timeline-item.comment:not(.first) .reference-issue`).Attr("data-reference")
-	assert.EqualValues(t, "/user2/repo1/issues/1#issuecomment-2", ref)
+	assert.Equal(t, "/user2/repo1/issues/1#issuecomment-2", ref)
 }
 
 func TestGetContentHistory(t *testing.T) {
@@ -1109,7 +1218,7 @@ func TestGetContentHistory(t *testing.T) {
 		var respJSON contentHistoryResp
 		DecodeJSON(t, resp, &respJSON)
 
-		assert.EqualValues(t, canDelete, respJSON.CanSoftDelete)
+		assert.Equal(t, canDelete, respJSON.CanSoftDelete)
 		assert.EqualValues(t, contentHistory.ID, respJSON.HistoryID)
 		assert.EqualValues(t, contentHistory.ID-1, respJSON.PrevHistoryID)
 	}
@@ -1246,8 +1355,6 @@ body:
 
 func TestIssueUnsubscription(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		defer tests.PrepareTestEnv(t)()
-
 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 		repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{
 			AutoInit: optional.Some(false),
@@ -1334,6 +1441,47 @@ func TestIssueCount(t *testing.T) {
 	assert.Contains(t, allCount, "2\u00a0All")
 }
 
+func TestIssueDefaultValues(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	links := []string{"/user2/repo1/issues", "/user2/repo1/pulls"}
+	values := []url.Values{
+		{
+			"type": {"created_by"},
+		},
+		{
+			"poster": {"1"},
+		},
+		{
+			"sort": {"latest"},
+		},
+		{
+			"type":   {"all"},
+			"sort":   {"latest"},
+			"poster": {"1"},
+		},
+		{
+			"type":   {"assigned"},
+			"sort":   {"oldest"},
+			"poster": {"1"},
+		},
+	}
+
+	for _, link := range links {
+		t.Run(link[13:], func(t *testing.T) {
+			for _, value := range values {
+				req := NewRequestf(t, "GET", "%s?%s", link, value.Encode())
+				resp := MakeRequest(t, req, http.StatusOK)
+
+				htmlDoc := NewHTMLParser(t, resp.Body)
+				for name := range value {
+					assert.Equal(t, value.Get(name), htmlDoc.GetInputValueByName(name))
+				}
+			}
+		})
+	}
+}
+
 func TestIssuePostersSearch(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -1357,7 +1505,7 @@ func TestIssuePostersSearch(t *testing.T) {
 		DecodeJSON(t, resp, &data)
 
 		assert.Len(t, data.Results, 1)
-		assert.EqualValues(t, "user2", data.Results[0].UserName)
+		assert.Equal(t, "user2", data.Results[0].UserName)
 		assert.EqualValues(t, 2, data.Results[0].UserID)
 	})
 
@@ -1372,7 +1520,51 @@ func TestIssuePostersSearch(t *testing.T) {
 		DecodeJSON(t, resp, &data)
 
 		assert.Len(t, data.Results, 1)
-		assert.EqualValues(t, "user1", data.Results[0].UserName)
+		assert.Equal(t, "user1", data.Results[0].UserName)
 		assert.EqualValues(t, 1, data.Results[0].UserID)
 	})
 }
+
+func TestIssueTimelineLabels(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+	assert.NotContains(t, resp.Body.String(), `status-page-500`)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	filterLinks := htmlDoc.Find(".timeline .labels-list a")
+	assert.Equal(t, 9, filterLinks.Length())
+}
+
+func TestIssueAndPullRedirect(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/issues/1")
+	MakeRequest(t, req, http.StatusOK)
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/2")
+	MakeRequest(t, req, http.StatusOK)
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/1")
+	resp := MakeRequest(t, req, http.StatusSeeOther)
+	assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/1/commits")
+	resp = MakeRequest(t, req, http.StatusSeeOther)
+	assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/1/files")
+	resp = MakeRequest(t, req, http.StatusSeeOther)
+	assert.Equal(t, "/user2/repo1/issues/1", resp.Header().Get("Location"))
+
+	req = NewRequest(t, "GET", "/user2/repo1/issues/2")
+	resp = MakeRequest(t, req, http.StatusSeeOther)
+	assert.Equal(t, "/user2/repo1/pulls/2", resp.Header().Get("Location"))
+
+	req = NewRequest(t, "GET", "/user2/repo1/issues/9999999")
+	MakeRequest(t, req, http.StatusNotFound)
+
+	req = NewRequest(t, "GET", "/user2/repo1/pulls/9999999")
+	MakeRequest(t, req, http.StatusNotFound)
+}
diff --git a/tests/integration/issue_tracked_time_test.go b/tests/integration/issue_tracked_time_test.go
new file mode 100644
index 0000000000..f2e0df5a84
--- /dev/null
+++ b/tests/integration/issue_tracked_time_test.go
@@ -0,0 +1,77 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"net/http"
+	"testing"
+
+	issues_model "forgejo.org/models/issues"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	forgejo_context "forgejo.org/services/context"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestIssueAddTimeManually(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	session := loginUser(t, user2.Name)
+	issue2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
+	require.NoError(t, issue2.LoadRepo(t.Context()))
+
+	t.Run("No time", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		session.MakeRequest(t, NewRequestWithValues(t, "POST", issue2.Link()+"/times/add", map[string]string{
+			"_csrf": GetCSRF(t, session, issue2.Link()),
+		}), http.StatusSeeOther)
+
+		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
+		assert.NotNil(t, flashCookie)
+		assert.Contains(t, flashCookie.Value, "error%3DNo%2Btime%2Bwas%2Bentered.")
+	})
+
+	t.Run("Invalid hours", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		session.MakeRequest(t, NewRequestWithValues(t, "POST", issue2.Link()+"/times/add", map[string]string{
+			"_csrf": GetCSRF(t, session, issue2.Link()),
+			"hours": "-1",
+		}), http.StatusSeeOther)
+
+		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
+		assert.NotNil(t, flashCookie)
+		assert.Contains(t, flashCookie.Value, "error%3DHours%2Bmust%2Bbe%2Ba%2Bnumber%2Bbetween%2B0%2Band%2B1%252C000.")
+	})
+
+	t.Run("Invalid minutes", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		session.MakeRequest(t, NewRequestWithValues(t, "POST", issue2.Link()+"/times/add", map[string]string{
+			"_csrf":   GetCSRF(t, session, issue2.Link()),
+			"minutes": "-1",
+		}), http.StatusSeeOther)
+
+		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
+		assert.NotNil(t, flashCookie)
+		assert.Contains(t, flashCookie.Value, "error%3DMinutes%2Bmust%2Bbe%2Ba%2Bnumber%2Bbetween%2B0%2Band%2B1%252C000.")
+	})
+
+	t.Run("Normal", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		session.MakeRequest(t, NewRequestWithValues(t, "POST", issue2.Link()+"/times/add", map[string]string{
+			"_csrf":   GetCSRF(t, session, issue2.Link()),
+			"hours":   "3",
+			"minutes": "14",
+		}), http.StatusSeeOther)
+
+		unittest.AssertExistsIf(t, true, &issues_model.TrackedTime{IssueID: issue2.ID, Time: 11640, UserID: user2.ID})
+	})
+}
diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go
index 3d240f900a..ccfaf144cf 100644
--- a/tests/integration/links_test.go
+++ b/tests/integration/links_test.go
@@ -60,7 +60,7 @@ func TestRedirectsNoLogin(t *testing.T) {
 	for link, redirectLink := range redirects {
 		req := NewRequest(t, "GET", link)
 		resp := MakeRequest(t, req, http.StatusSeeOther)
-		assert.EqualValues(t, path.Join(setting.AppSubURL, redirectLink), test.RedirectURL(resp))
+		assert.Equal(t, path.Join(setting.AppSubURL, redirectLink), test.RedirectURL(resp))
 	}
 }
 
@@ -195,7 +195,7 @@ func TestRedirectsWebhooks(t *testing.T) {
 		for _, info := range redirects {
 			req := NewRequest(t, info.verb, info.from)
 			resp := MakeRequest(t, req, http.StatusSeeOther)
-			assert.EqualValues(t, path.Join(setting.AppSubURL, info.to), test.RedirectURL(resp), info.from)
+			assert.Equal(t, path.Join(setting.AppSubURL, info.to), test.RedirectURL(resp), info.from)
 		}
 	}
 
diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go
index e77d9682a4..a7cbdf37cb 100644
--- a/tests/integration/markup_external_test.go
+++ b/tests/integration/markup_external_test.go
@@ -27,7 +27,7 @@ func TestExternalMarkupRenderer(t *testing.T) {
 	const repoURL = "user30/renderer"
 	req := NewRequest(t, "GET", repoURL+"/src/branch/master/README.html")
 	resp := MakeRequest(t, req, http.StatusOK)
-	assert.EqualValues(t, "text/html; charset=utf-8", resp.Header()["Content-Type"][0])
+	assert.Equal(t, "text/html; charset=utf-8", resp.Header()["Content-Type"][0])
 
 	bs, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
@@ -36,5 +36,5 @@ func TestExternalMarkupRenderer(t *testing.T) {
 	div := doc.Find("div.file-view")
 	data, err := div.Html()
 	require.NoError(t, err)
-	assert.EqualValues(t, "<div>\n\ttest external renderer\n</div>", strings.TrimSpace(data))
+	assert.Equal(t, "<div>\n\ttest external renderer\n</div>", strings.TrimSpace(data))
 }
diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go
index 32b3ef867d..dc11101d97 100644
--- a/tests/integration/migrate_test.go
+++ b/tests/integration/migrate_test.go
@@ -106,7 +106,7 @@ func TestMigrate(t *testing.T) {
 				})
 				resp = session.MakeRequest(t, req, http.StatusSeeOther)
 				// Step 5: a redirection displays the migrated repository
-				assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp))
+				assert.Equal(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp))
 				// Step 6: check the repo was created
 				unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName})
 			})
@@ -163,7 +163,7 @@ func TestMigrateWithWiki(t *testing.T) {
 				})
 				resp = session.MakeRequest(t, req, http.StatusSeeOther)
 				// Step 5: a redirection displays the migrated repository
-				assert.EqualValues(t, fmt.Sprintf("/%s/%s", user.Name, migratedRepoName), test.RedirectURL(resp))
+				assert.Equal(t, fmt.Sprintf("/%s/%s", user.Name, migratedRepoName), test.RedirectURL(resp))
 				// Step 6: check the repo was created and load the repo
 				migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName, WikiBranch: "obscure-name"})
 				// Step 7: check if the wiki is enabled
@@ -219,7 +219,7 @@ func TestMigrateWithReleases(t *testing.T) {
 				})
 				resp = session.MakeRequest(t, req, http.StatusSeeOther)
 				// Step 5: a redirection displays the migrated repository
-				assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp))
+				assert.Equal(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp))
 				// Step 6: check the repo was created and load the repo
 				migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName})
 				// Step 7: check if releases are enabled
diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go
index 8076dfa452..798161a560 100644
--- a/tests/integration/migration-test/migration_test.go
+++ b/tests/integration/migration-test/migration_test.go
@@ -278,23 +278,36 @@ func doMigrationTest(t *testing.T, version string) {
 
 	setting.InitSQLLoggersForCli(log.INFO)
 
-	err := db.InitEngineWithMigration(t.Context(), wrappedMigrate)
+	err := db.InitEngineWithMigration(t.Context(), func(e db.Engine) error {
+		engine, err := db.GetMasterEngine(e)
+		if err != nil {
+			return err
+		}
+		currentEngine = engine
+		return wrappedMigrate(engine)
+	})
 	require.NoError(t, err)
 	currentEngine.Close()
 
 	beans, _ := db.NamesToBean()
 
-	err = db.InitEngineWithMigration(t.Context(), func(x *xorm.Engine) error {
-		currentEngine = x
-		return migrate_base.RecreateTables(beans...)(x)
+	err = db.InitEngineWithMigration(t.Context(), func(e db.Engine) error {
+		currentEngine, err = db.GetMasterEngine(e)
+		if err != nil {
+			return err
+		}
+		return migrate_base.RecreateTables(beans...)(currentEngine)
 	})
 	require.NoError(t, err)
 	currentEngine.Close()
 
 	// We do this a second time to ensure that there is not a problem with retained indices
-	err = db.InitEngineWithMigration(t.Context(), func(x *xorm.Engine) error {
-		currentEngine = x
-		return migrate_base.RecreateTables(beans...)(x)
+	err = db.InitEngineWithMigration(t.Context(), func(e db.Engine) error {
+		currentEngine, err = db.GetMasterEngine(e)
+		if err != nil {
+			return err
+		}
+		return migrate_base.RecreateTables(beans...)(currentEngine)
 	})
 	require.NoError(t, err)
 
diff --git a/tests/integration/mirror_pull_test.go b/tests/integration/mirror_pull_test.go
index c9c8037e27..c98af1b773 100644
--- a/tests/integration/mirror_pull_test.go
+++ b/tests/integration/mirror_pull_test.go
@@ -88,7 +88,7 @@ func TestMirrorPull(t *testing.T) {
 
 	count, err := db.Count[repo_model.Release](db.DefaultContext, findOptions)
 	require.NoError(t, err)
-	assert.EqualValues(t, initCount+1, count)
+	assert.Equal(t, initCount+1, count)
 
 	release, err := repo_model.GetRelease(db.DefaultContext, repo.ID, "v0.2")
 	require.NoError(t, err)
@@ -99,5 +99,5 @@ func TestMirrorPull(t *testing.T) {
 
 	count, err = db.Count[repo_model.Release](db.DefaultContext, findOptions)
 	require.NoError(t, err)
-	assert.EqualValues(t, initCount, count)
+	assert.Equal(t, initCount, count)
 }
diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go
index ca8d536e46..73b275ed2d 100644
--- a/tests/integration/mirror_push_test.go
+++ b/tests/integration/mirror_push_test.go
@@ -13,10 +13,12 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"testing"
 	"time"
 
 	asymkey_model "forgejo.org/models/asymkey"
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unit"
@@ -26,6 +28,7 @@ import (
 	"forgejo.org/modules/gitrepo"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
+	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
 	gitea_context "forgejo.org/services/context"
 	doctor "forgejo.org/services/doctor"
@@ -34,6 +37,7 @@ import (
 	repo_service "forgejo.org/services/repository"
 	"forgejo.org/tests"
 
+	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -43,7 +47,6 @@ func TestMirrorPush(t *testing.T) {
 }
 
 func testMirrorPush(t *testing.T, u *url.URL) {
-	defer tests.PrepareTestEnv(t)()
 	defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
 
 	require.NoError(t, migrations.Init())
@@ -135,6 +138,27 @@ func doCreatePushMirror(ctx APITestContext, address, username, password string)
 	}
 }
 
+func doCreatePushMirrorWithBranchFilter(ctx APITestContext, address, username, password, branchFilter string) func(t *testing.T) {
+	return func(t *testing.T) {
+		csrf := GetCSRF(t, ctx.Session, fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
+
+		req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)), map[string]string{
+			"_csrf":                     csrf,
+			"action":                    "push-mirror-add",
+			"push_mirror_address":       address,
+			"push_mirror_username":      username,
+			"push_mirror_password":      password,
+			"push_mirror_interval":      "0",
+			"push_mirror_branch_filter": branchFilter,
+		})
+		ctx.Session.MakeRequest(t, req, http.StatusSeeOther)
+
+		flashCookie := ctx.Session.GetCookie(gitea_context.CookieNameFlash)
+		assert.NotNil(t, flashCookie)
+		assert.Contains(t, flashCookie.Value, "success")
+	}
+}
+
 func doRemovePushMirror(ctx APITestContext, address, username, password string, pushMirrorID int) func(t *testing.T) {
 	return func(t *testing.T) {
 		csrf := GetCSRF(t, ctx.Session, fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
@@ -261,7 +285,7 @@ func TestSSHPushMirror(t *testing.T) {
 				htmlDoc := NewHTMLParser(t, resp.Body)
 
 				publickey = htmlDoc.Find(".ui.table td a[data-clipboard-text]").AttrOr("data-clipboard-text", "")
-				assert.EqualValues(t, publickey, pushMirror.GetPublicKey())
+				assert.Equal(t, publickey, pushMirror.GetPublicKey())
 			})
 
 			t.Run("Add deploy key", func(t *testing.T) {
@@ -301,10 +325,10 @@ func TestSSHPushMirror(t *testing.T) {
 
 				assert.Eventually(t, func() bool {
 					req = NewRequest(t, "GET", fmt.Sprintf("/%s", pushToRepo.FullName()))
-					resp = sess.MakeRequest(t, req, http.StatusOK)
+					resp = sess.MakeRequest(t, req, NoExpectedStatus)
 					htmlDoc = NewHTMLParser(t, resp.Body)
 
-					return htmlDoc.Find(".shortsha").Text() == shortSHA
+					return resp.Code == http.StatusOK && htmlDoc.Find(".shortsha").Text() == shortSHA
 				}, time.Second*30, time.Second)
 			})
 
@@ -323,6 +347,196 @@ func TestSSHPushMirror(t *testing.T) {
 	})
 }
 
+func TestPushMirrorBranchFilterWebUI(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+		defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+		require.NoError(t, migrations.Init())
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		sess := loginUser(t, user.Name)
+
+		mirrorRepo, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+		defer f()
+
+		ctx := NewAPITestContext(t, user.LowerName, srcRepo.Name)
+		ctx.Session = sess
+		remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo.Name))
+
+		t.Run("Create push mirror with branch filter via web UI", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress, user.LowerName, userPassword, "main,develop")(t)
+
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 1)
+			assert.Equal(t, "main,develop", mirrors[0].BranchFilter)
+			assert.Equal(t, remoteAddress, mirrors[0].RemoteAddress)
+		})
+
+		t.Run("Create push mirror with empty branch filter via web UI", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			remoteAddress2 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape("foo"))
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress2, user.LowerName, userPassword, "")(t)
+
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 2)
+
+			var emptyMirror *repo_model.PushMirror
+			for _, mirror := range mirrors {
+				if mirror.RemoteAddress == remoteAddress2 {
+					emptyMirror = mirror
+					break
+				}
+			}
+			require.NotNil(t, emptyMirror)
+			assert.Empty(t, emptyMirror.BranchFilter)
+		})
+
+		t.Run("Verify branch filter field is visible in settings page", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
+			resp := sess.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+
+			htmlDoc.AssertElement(t, "input#push_mirror_branch_filter", true)
+		})
+
+		t.Run("Verify existing branch filter values are pre-populated", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
+			resp := sess.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+
+			// Find all edit buttons for push mirrors
+			editButtons := htmlDoc.Find("button[data-modal='#push-mirror-edit-modal']")
+			assert.Equal(t, 2, editButtons.Length(), "Should have 2 push mirror edit buttons")
+
+			// Get the created mirrors from database to match with UI elements
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 2)
+
+			// Create a map of remote address to branch filter for easy lookup
+			expectedFilters := make(map[string]string)
+			for _, mirror := range mirrors {
+				expectedFilters[mirror.RemoteAddress] = mirror.BranchFilter
+			}
+
+			// Check each edit button has the correct branch filter data attribute
+			editButtons.Each(func(i int, s *goquery.Selection) {
+				remoteAddress, exists := s.Attr("data-modal-push-mirror-edit-address")
+				assert.True(t, exists, "Edit button should have remote address data attribute")
+
+				branchFilter, exists := s.Attr("data-modal-push-mirror-edit-branch-filter")
+				assert.True(t, exists, "Edit button should have branch filter data attribute")
+
+				expectedFilter, found := expectedFilters[remoteAddress]
+				assert.True(t, found, "Remote address should match one of the created mirrors")
+				assert.Equal(t, expectedFilter, branchFilter, "Branch filter should match the expected value for remote %s", remoteAddress)
+			})
+
+			// Verify the edit modal has the correct input field for branch filter editing
+			htmlDoc.AssertElement(t, "#push-mirror-edit-modal input[name='push_mirror_branch_filter']", true)
+		})
+	})
+}
+
+func TestPushMirrorBranchFilterIntegration(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+		defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+		require.NoError(t, migrations.Init())
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		sess := loginUser(t, user.Name)
+		token := getTokenForLoggedInUser(t, sess, auth_model.AccessTokenScopeAll)
+
+		ctx := NewAPITestContext(t, user.LowerName, srcRepo.Name)
+		ctx.Session = sess
+		remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape("foo"))
+		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/push_mirrors", user.LowerName, srcRepo.Name)
+
+		t.Run("Web UI to API integration", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create push mirror with branch filter via web UI
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress, user.LowerName, userPassword, "main,develop")(t)
+
+			// Verify it appears in API responses
+			req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+			require.Len(t, pushMirrors, 1)
+			assert.Equal(t, "main,develop", pushMirrors[0].BranchFilter)
+			assert.Equal(t, remoteAddress, pushMirrors[0].RemoteAddress)
+
+			// Verify it's stored correctly in database
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 1)
+			assert.Equal(t, "main,develop", mirrors[0].BranchFilter)
+		})
+
+		t.Run("API to Web UI integration", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repo for this test
+			mirrorRepo2, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user, user, repo_service.CreateRepoOptions{
+				Name: "test-api-to-ui",
+			})
+			require.NoError(t, err)
+			remoteAddress2 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo2.Name))
+
+			// Create push mirror with branch filter via API
+			req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+				RemoteAddress: remoteAddress2,
+				Interval:      "8h",
+				BranchFilter:  "feature-*,hotfix-*",
+			}).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusOK)
+
+			// Verify it's stored in database
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 2) // Should have 2 mirrors now
+
+			// Find the mirror created via API
+			var apiMirror *repo_model.PushMirror
+			for _, mirror := range mirrors {
+				if mirror.RemoteAddress == remoteAddress2 {
+					apiMirror = mirror
+					break
+				}
+			}
+			require.NotNil(t, apiMirror)
+			assert.Equal(t, "feature-*,hotfix-*", apiMirror.BranchFilter)
+
+			// Verify it appears in web UI with correct branch filter data
+			req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/settings", url.PathEscape(ctx.Username), url.PathEscape(ctx.Reponame)))
+			resp := sess.MakeRequest(t, req, http.StatusOK)
+			assert.Equal(t, http.StatusOK, resp.Code)
+
+			// Check that the edit button has the correct data attributes for branch filter
+			doc := NewHTMLParser(t, resp.Body)
+			editButton := doc.Find(fmt.Sprintf(`button[data-modal-push-mirror-edit-address="%s"]`, remoteAddress2))
+			require.Equal(t, 1, editButton.Length(), "Should find exactly one edit button for the API-created mirror")
+
+			branchFilterAttr, exists := editButton.Attr("data-modal-push-mirror-edit-branch-filter")
+			require.True(t, exists, "Edit button should have branch filter data attribute")
+			assert.Equal(t, "feature-*,hotfix-*", branchFilterAttr, "Branch filter data attribute should match what was set via API")
+		})
+	})
+}
+
 func TestPushMirrorSettings(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
@@ -401,3 +615,459 @@ func TestPushMirrorSettings(t *testing.T) {
 		})
 	})
 }
+
+func TestPushMirrorBranchFilterSyncOperations(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+		defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+		require.NoError(t, migrations.Init())
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		sess := loginUser(t, user.Name)
+
+		// Create test repository with multiple branches
+		testRepoPath := srcRepo.RepoPath()
+
+		// Create additional branches in source repository
+		_, _, err := git.NewCommand(git.DefaultContext, "update-ref", "refs/heads/develop", "refs/heads/master").RunStdString(&git.RunOpts{Dir: testRepoPath})
+		require.NoError(t, err)
+		_, _, err = git.NewCommand(git.DefaultContext, "update-ref", "refs/heads/feature-auth", "refs/heads/master").RunStdString(&git.RunOpts{Dir: testRepoPath})
+		require.NoError(t, err)
+		_, _, err = git.NewCommand(git.DefaultContext, "update-ref", "refs/heads/feature-ui", "refs/heads/master").RunStdString(&git.RunOpts{Dir: testRepoPath})
+		require.NoError(t, err)
+		_, _, err = git.NewCommand(git.DefaultContext, "update-ref", "refs/heads/hotfix-123", "refs/heads/master").RunStdString(&git.RunOpts{Dir: testRepoPath})
+		require.NoError(t, err)
+
+		ctx := NewAPITestContext(t, user.LowerName, srcRepo.Name)
+		ctx.Session = sess
+
+		t.Run("Create push mirror with branch filter and trigger sync", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create mirror repository
+			mirrorRepo, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user, user, repo_service.CreateRepoOptions{
+				Name: "test-sync-branch-filter",
+			})
+			require.NoError(t, err)
+			remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo.Name))
+
+			// Create push mirror with specific branch filter via web UI
+			branchFilter := "master,develop,feature-auth"
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress, user.LowerName, userPassword, branchFilter)(t)
+
+			// Verify the push mirror was created with branch filter
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 1)
+			assert.Equal(t, branchFilter, mirrors[0].BranchFilter)
+
+			// Verify git remote configuration includes correct refspecs for filtered branches
+			output, _, err := git.NewCommand(git.DefaultContext, "config", "--get-all").AddDynamicArguments(fmt.Sprintf("remote.%s.push", mirrors[0].RemoteName)).RunStdString(&git.RunOpts{Dir: testRepoPath})
+			require.NoError(t, err)
+			assert.Contains(t, output, "+refs/heads/master:refs/heads/master")
+			assert.Contains(t, output, "+refs/heads/develop:refs/heads/develop")
+			assert.Contains(t, output, "+refs/heads/feature-auth:refs/heads/feature-auth")
+			assert.NotContains(t, output, "+refs/heads/feature-ui:refs/heads/feature-ui")
+			assert.NotContains(t, output, "+refs/heads/hotfix-123:refs/heads/hotfix-123")
+			assert.Contains(t, output, "+refs/tags/*:refs/tags/*") // Tags should always be pushed
+
+			// Trigger sync operation
+			ok := mirror_service.SyncPushMirror(db.DefaultContext, mirrors[0].ID)
+			assert.True(t, ok)
+
+			// Verify only filtered branches were pushed to mirror
+			mirrorGitRepo, err := gitrepo.OpenRepository(git.DefaultContext, mirrorRepo)
+			require.NoError(t, err)
+			defer mirrorGitRepo.Close()
+
+			// Check that filtered branches exist in mirror
+			_, err = mirrorGitRepo.GetBranchCommit("master")
+			require.NoError(t, err, "master branch should exist in mirror")
+			_, err = mirrorGitRepo.GetBranchCommit("develop")
+			require.NoError(t, err, "develop branch should exist in mirror")
+			_, err = mirrorGitRepo.GetBranchCommit("feature-auth")
+			require.NoError(t, err, "feature-auth branch should exist in mirror")
+
+			// Check that non-filtered branches don't exist in mirror
+			_, err = mirrorGitRepo.GetBranchCommit("feature-ui")
+			require.Error(t, err, "feature-ui branch should not exist in mirror")
+			_, err = mirrorGitRepo.GetBranchCommit("hotfix-123")
+			require.Error(t, err, "hotfix-123 branch should not exist in mirror")
+		})
+
+		t.Run("Update branch filter and verify git remote settings are updated", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Get the existing mirror
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 1)
+			mirror := mirrors[0]
+			mirror.Repo = srcRepo
+
+			// Update branch filter to include different branches
+			mirror.BranchFilter = "master,feature-ui,hotfix-123"
+			err = repo_model.UpdatePushMirror(db.DefaultContext, mirror)
+			require.NoError(t, err)
+
+			// Update git remote configuration
+			err = mirror_service.UpdatePushMirrorBranchFilter(db.DefaultContext, mirror)
+			require.NoError(t, err)
+
+			// Verify git remote configuration was updated
+			output, _, err := git.NewCommand(git.DefaultContext, "config", "--get-all").AddDynamicArguments(fmt.Sprintf("remote.%s.push", mirror.RemoteName)).RunStdString(&git.RunOpts{Dir: testRepoPath})
+			require.NoError(t, err)
+			assert.Contains(t, output, "+refs/heads/master:refs/heads/master")
+			assert.Contains(t, output, "+refs/heads/feature-ui:refs/heads/feature-ui")
+			assert.Contains(t, output, "+refs/heads/hotfix-123:refs/heads/hotfix-123")
+			assert.NotContains(t, output, "+refs/heads/develop:refs/heads/develop")
+			assert.NotContains(t, output, "+refs/heads/feature-auth:refs/heads/feature-auth")
+			assert.Contains(t, output, "+refs/tags/*:refs/tags/*") // Tags should always be pushed
+
+			// Trigger sync operation with updated filter
+			ok := mirror_service.SyncPushMirror(db.DefaultContext, mirror.ID)
+			assert.True(t, ok)
+		})
+
+		t.Run("Test empty branch filter pushes all branches", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repository for this test
+			mirrorRepo2, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user, user, repo_service.CreateRepoOptions{
+				Name: "test-sync-empty-filter",
+			})
+			require.NoError(t, err)
+			remoteAddress2 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo2.Name))
+
+			// Create push mirror with empty branch filter
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress2, user.LowerName, userPassword, "")(t)
+
+			// Get the new mirror
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 2) // Should have 2 mirrors now
+
+			var emptyFilterMirror *repo_model.PushMirror
+			for _, mirror := range mirrors {
+				if mirror.RemoteAddress == remoteAddress2 {
+					emptyFilterMirror = mirror
+					break
+				}
+			}
+			require.NotNil(t, emptyFilterMirror)
+			assert.Empty(t, emptyFilterMirror.BranchFilter)
+
+			// Verify git remote configuration for empty filter (should mirror all branches)
+			output, _, err := git.NewCommand(git.DefaultContext, "config", "--get-all").AddDynamicArguments(fmt.Sprintf("remote.%s.push", emptyFilterMirror.RemoteName)).RunStdString(&git.RunOpts{Dir: testRepoPath})
+			require.NoError(t, err)
+			assert.Contains(t, output, "+refs/heads/*:refs/heads/*") // Should mirror all branches
+			assert.Contains(t, output, "+refs/tags/*:refs/tags/*")
+
+			// Trigger sync operation
+			ok := mirror_service.SyncPushMirror(db.DefaultContext, emptyFilterMirror.ID)
+			assert.True(t, ok)
+
+			// Verify all branches were pushed to mirror
+			mirrorGitRepo2, err := gitrepo.OpenRepository(git.DefaultContext, mirrorRepo2)
+			require.NoError(t, err)
+			defer mirrorGitRepo2.Close()
+
+			// Check that all branches exist in mirror
+			_, err = mirrorGitRepo2.GetBranchCommit("master")
+			require.NoError(t, err, "master branch should exist in mirror")
+			_, err = mirrorGitRepo2.GetBranchCommit("develop")
+			require.NoError(t, err, "develop branch should exist in mirror")
+			_, err = mirrorGitRepo2.GetBranchCommit("feature-auth")
+			require.NoError(t, err, "feature-auth branch should exist in mirror")
+			_, err = mirrorGitRepo2.GetBranchCommit("feature-ui")
+			require.NoError(t, err, "feature-ui branch should exist in mirror")
+			_, err = mirrorGitRepo2.GetBranchCommit("hotfix-123")
+			require.NoError(t, err, "hotfix-123 branch should exist in mirror")
+		})
+
+		t.Run("Test glob pattern branch filter in sync operations", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repository for this test
+			mirrorRepo3, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user, user, repo_service.CreateRepoOptions{
+				Name: "test-sync-glob-filter",
+			})
+			require.NoError(t, err)
+			remoteAddress3 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo3.Name))
+
+			// Create push mirror with glob pattern branch filter
+			globFilter := "master,feature-*"
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress3, user.LowerName, userPassword, globFilter)(t)
+
+			// Get the new mirror
+			mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, mirrors, 3) // Should have 3 mirrors now
+
+			var globMirror *repo_model.PushMirror
+			for _, mirror := range mirrors {
+				if mirror.RemoteAddress == remoteAddress3 {
+					globMirror = mirror
+					break
+				}
+			}
+			require.NotNil(t, globMirror)
+			assert.Equal(t, globFilter, globMirror.BranchFilter)
+
+			// Verify git remote configuration includes glob pattern branches
+			output, _, err := git.NewCommand(git.DefaultContext, "config", "--get-all").AddDynamicArguments(fmt.Sprintf("remote.%s.push", globMirror.RemoteName)).RunStdString(&git.RunOpts{Dir: testRepoPath})
+			require.NoError(t, err)
+			assert.Contains(t, output, "+refs/heads/master:refs/heads/master")
+			assert.Contains(t, output, "+refs/heads/feature-*:refs/heads/feature-*")
+			assert.NotContains(t, output, "+refs/heads/develop:refs/heads/develop")
+			assert.NotContains(t, output, "+refs/heads/hotfix-123:refs/heads/hotfix-123")
+			assert.Contains(t, output, "+refs/tags/*:refs/tags/*")
+
+			// Trigger sync operation
+			ok := mirror_service.SyncPushMirror(db.DefaultContext, globMirror.ID)
+			assert.True(t, ok)
+
+			// Verify only matching branches were pushed to mirror
+			mirrorGitRepo3, err := gitrepo.OpenRepository(git.DefaultContext, mirrorRepo3)
+			require.NoError(t, err)
+			defer mirrorGitRepo3.Close()
+
+			// Check that matching branches exist in mirror
+			_, err = mirrorGitRepo3.GetBranchCommit("master")
+			require.NoError(t, err, "master branch should exist in mirror")
+			_, err = mirrorGitRepo3.GetBranchCommit("feature-auth")
+			require.NoError(t, err, "feature-auth branch should exist in mirror")
+			_, err = mirrorGitRepo3.GetBranchCommit("feature-ui")
+			require.NoError(t, err, "feature-ui branch should exist in mirror")
+
+			// Check that non-matching branches don't exist in mirror
+			_, err = mirrorGitRepo3.GetBranchCommit("develop")
+			require.Error(t, err, "develop branch should not exist in mirror")
+			_, err = mirrorGitRepo3.GetBranchCommit("hotfix-123")
+			require.Error(t, err, "hotfix-123 branch should not exist in mirror")
+		})
+	})
+}
+
+func TestPushMirrorWebUIToAPIIntegration(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)()
+		defer test.MockVariableValue(&setting.Mirror.Enabled, true)()
+		require.NoError(t, migrations.Init())
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		session := loginUser(t, user.Name)
+		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAll)
+
+		mirrorRepo, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+		defer f()
+
+		ctx := NewAPITestContext(t, user.LowerName, srcRepo.Name)
+		ctx.Session = session
+		remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo.Name))
+		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/push_mirrors", user.Name, srcRepo.Name)
+
+		t.Run("Set branch filter via web UI and verify in API response", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create push mirror with branch filter via web UI
+			branchFilter := "main,develop,feature-*"
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress, user.LowerName, userPassword, branchFilter)(t)
+
+			// Verify via API that branch filter is set correctly
+			req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+
+			require.Len(t, pushMirrors, 1)
+			assert.Equal(t, branchFilter, pushMirrors[0].BranchFilter, "Branch filter set via web UI should appear in API response")
+			assert.Equal(t, remoteAddress, pushMirrors[0].RemoteAddress)
+
+			// Store mirror info for cleanup
+			mirrorRemoteName := pushMirrors[0].RemoteName
+
+			// Cleanup
+			req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, mirrorRemoteName)).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusNoContent)
+		})
+
+		t.Run("Set empty branch filter via web UI and verify in API response", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repo for this test
+			mirrorRepo2, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+			defer f()
+			remoteAddress2 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo2.Name))
+
+			// Create push mirror with empty branch filter via web UI
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress2, user.LowerName, userPassword, "")(t)
+
+			// Verify via API that branch filter is empty
+			req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+
+			require.Len(t, pushMirrors, 1)
+			assert.Empty(t, pushMirrors[0].BranchFilter, "Empty branch filter set via web UI should appear as empty in API response")
+			assert.Equal(t, remoteAddress2, pushMirrors[0].RemoteAddress)
+
+			// Cleanup
+			req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirrors[0].RemoteName)).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusNoContent)
+		})
+
+		t.Run("Set complex branch filter via web UI and verify in API response", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repo for this test
+			mirrorRepo3, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+			defer f()
+			remoteAddress3 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo3.Name))
+
+			// Create push mirror with complex branch filter via web UI
+			complexFilter := "main,release/v*,hotfix-*,feature-auth,feature-ui"
+			doCreatePushMirrorWithBranchFilter(ctx, remoteAddress3, user.LowerName, userPassword, complexFilter)(t)
+
+			// Verify via API that complex branch filter is preserved
+			req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+
+			require.Len(t, pushMirrors, 1)
+			assert.Equal(t, complexFilter, pushMirrors[0].BranchFilter, "Complex branch filter set via web UI should be preserved in API response")
+			assert.Equal(t, remoteAddress3, pushMirrors[0].RemoteAddress)
+
+			// Cleanup
+			req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, pushMirrors[0].RemoteName)).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusNoContent)
+		})
+
+		t.Run("Update branch filter via API and verify in web UI", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create another mirror repo for this test
+			mirrorRepo4, _, f := tests.CreateDeclarativeRepo(t, user, "", []unit.Type{unit.TypeCode}, nil, nil)
+			defer f()
+			remoteAddress4 := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(mirrorRepo4.Name))
+
+			// First create a push mirror via API with initial branch filter
+			initialFilter := "main"
+			req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+				RemoteAddress: remoteAddress4,
+				Interval:      "8h",
+				BranchFilter:  initialFilter,
+			}).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusOK)
+
+			// Get the created mirror info
+			req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+			require.Len(t, pushMirrors, 1)
+			assert.Equal(t, initialFilter, pushMirrors[0].BranchFilter)
+			mirrorRemoteName := pushMirrors[0].RemoteName
+
+			// Get the actual mirror from database to get the ID
+			dbMirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{})
+			require.NoError(t, err)
+			require.Len(t, dbMirrors, 1)
+
+			// Update branch filter via web form (using existing repo settings endpoint)
+			updatedFilter := "main,develop,feature-*"
+			req = NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/%s/settings", url.PathEscape(user.Name), url.PathEscape(srcRepo.Name)), map[string]string{
+				"_csrf":                     GetCSRF(t, session, fmt.Sprintf("/%s/%s/settings", url.PathEscape(user.Name), url.PathEscape(srcRepo.Name))),
+				"action":                    "push-mirror-update",
+				"push_mirror_id":            fmt.Sprintf("%d", dbMirrors[0].ID),
+				"push_mirror_interval":      "8h",
+				"push_mirror_branch_filter": updatedFilter,
+			})
+			session.MakeRequest(t, req, http.StatusSeeOther)
+
+			// Verify the branch filter was updated via API
+			req = NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp = MakeRequest(t, req, http.StatusOK)
+			DecodeJSON(t, resp, &pushMirrors)
+			require.Len(t, pushMirrors, 1)
+			assert.Equal(t, updatedFilter, pushMirrors[0].BranchFilter, "Branch filter should be updated via web form")
+
+			// Verify the branch filter is visible in the web UI settings page
+			req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/settings", url.PathEscape(user.Name), url.PathEscape(srcRepo.Name)))
+			resp = session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			editButton := htmlDoc.Find(fmt.Sprintf(`button[data-modal-push-mirror-edit-address="%s"]`, remoteAddress4))
+			require.Equal(t, 1, editButton.Length(), "Should find exactly one edit button for the updated mirror")
+
+			branchFilterAttr, exists := editButton.Attr("data-modal-push-mirror-edit-branch-filter")
+			require.True(t, exists, "Edit button should have branch filter data attribute")
+			assert.Equal(t, updatedFilter, branchFilterAttr, "Branch filter data attribute should match the updated value")
+
+			// Cleanup
+			req = NewRequest(t, "DELETE", fmt.Sprintf("%s/%s", urlStr, mirrorRemoteName)).AddTokenAuth(token)
+			MakeRequest(t, req, http.StatusNoContent)
+		})
+
+		t.Run("Multiple mirrors with different branch filters - UI to API consistency", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Create multiple mirror repos
+			testCases := []struct {
+				name         string
+				branchFilter string
+			}{
+				{"multi-test-1", "main,develop"},
+				{"multi-test-2", "feature-*,hotfix-*"},
+				{"multi-test-3", ""},
+			}
+			for _, tc := range testCases {
+				remoteAddress := fmt.Sprintf("%s%s/%s", u.String(), url.PathEscape(user.Name), url.PathEscape(tc.name))
+				req := NewRequestWithJSON(t, "POST", urlStr, &api.CreatePushMirrorOption{
+					RemoteAddress: remoteAddress,
+					Interval:      "8h",
+					BranchFilter:  tc.branchFilter,
+				}).AddTokenAuth(token)
+				MakeRequest(t, req, http.StatusOK)
+			}
+
+			// Verify all mirrors and their branch filters via API
+			req := NewRequest(t, "GET", urlStr).AddTokenAuth(token)
+			resp := MakeRequest(t, req, http.StatusOK)
+			var pushMirrors []*api.PushMirror
+			DecodeJSON(t, resp, &pushMirrors)
+			require.Len(t, pushMirrors, 3)
+
+			// Create a map for easier verification
+			filterMap := make(map[string]string)
+			for _, mirror := range pushMirrors {
+				for _, tc := range testCases {
+					if strings.Contains(mirror.RemoteAddress, tc.name) {
+						filterMap[tc.name] = mirror.BranchFilter
+						// createdMirrors = append(createdMirrors, mirror.RemoteName)
+						break
+					}
+				}
+			}
+
+			// Verify each branch filter is correctly preserved
+			assert.Equal(t, "main,develop", filterMap["multi-test-1"], "First mirror branch filter should match")
+			assert.Equal(t, "feature-*,hotfix-*", filterMap["multi-test-2"], "Second mirror branch filter should match")
+			assert.Empty(t, filterMap["multi-test-3"], "Third mirror branch filter should be empty")
+		})
+
+		t.Run("Verify branch filter field exists in web UI form", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Access the push mirror settings page
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/settings", url.PathEscape(user.Name), url.PathEscape(srcRepo.Name)))
+			resp := session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+
+			htmlDoc.AssertElement(t, "#push_mirror_branch_filter", true)
+		})
+	})
+}
diff --git a/tests/integration/new_org_test.go b/tests/integration/new_org_test.go
index ab9ee4bc18..5ea386573a 100644
--- a/tests/integration/new_org_test.go
+++ b/tests/integration/new_org_test.go
@@ -32,6 +32,6 @@ func TestNewOrganizationForm(t *testing.T) {
 
 		// Verify page header
 		header := strings.TrimSpace(page.Find(".form[action='/org/create'] .header").Text())
-		assert.EqualValues(t, locale.TrString("new_org.title"), header)
+		assert.Equal(t, locale.TrString("new_org.title"), header)
 	})
 }
diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go
index 2097afcfae..ebfd386ee0 100644
--- a/tests/integration/oauth_test.go
+++ b/tests/integration/oauth_test.go
@@ -632,6 +632,31 @@ func TestSignInOAuthCallbackPKCE(t *testing.T) {
 	})
 }
 
+func TestWellKnownOpenIDConfiguration(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	t.Run("Issuer does not end with a slash", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		req := NewRequest(t, "GET", "/.well-known/openid-configuration")
+		resp := MakeRequest(t, req, http.StatusOK)
+		type response struct {
+			Issuer string `json:"issuer"`
+		}
+		parsed := new(response)
+
+		DecodeJSON(t, resp, parsed)
+		assert.Equal(t, strings.TrimSuffix(setting.AppURL, "/"), parsed.Issuer)
+	})
+
+	t.Run("Not found if OAuth2 is not enabled", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		defer test.MockVariableValue(&setting.OAuth2.Enabled, false)()
+
+		MakeRequest(t, NewRequest(t, "GET", "/.well-known/openid-configuration"), http.StatusNotFound)
+	})
+}
+
 func TestSignInOAuthCallbackRedirectToEscaping(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -697,7 +722,7 @@ func setupMockOIDCServer() *httptest.Server {
 		case "/.well-known/openid-configuration":
 			w.WriteHeader(http.StatusOK)
 			w.Write([]byte(`{
-				"issuer": "` + mockServer.URL + `",
+				"issuer": "` + strings.TrimSuffix(mockServer.URL, "/") + `",
 				"authorization_endpoint": "` + mockServer.URL + `/authorize",
 				"token_endpoint": "` + mockServer.URL + `/token",
 				"userinfo_endpoint": "` + mockServer.URL + `/userinfo"
@@ -921,7 +946,7 @@ func requireCookieCSRF(t *testing.T, resp http.ResponseWriter) string {
 			return c.Value
 		}
 	}
-	require.True(t, false, "_csrf not found in cookies")
+	require.Fail(t, "_csrf not found in cookies")
 	return ""
 }
 
@@ -1522,3 +1547,64 @@ func TestSignUpViaOAuth2FA(t *testing.T) {
 	// Make sure user has to go through 2FA.
 	assert.Equal(t, "/user/webauthn", test.RedirectURL(resp))
 }
+
+func TestAccessTokenWithPKCE(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	var u *url.URL
+	t.Run("Grant", func(t *testing.T) {
+		session := loginUser(t, "user4")
+		req := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{
+			"_csrf":        GetCSRF(t, session, "/login/oauth/authorize?client_id=ce5a1322-42a7-11ed-b878-0242ac120002&redirect_uri=b&response_type=code&code_challenge_method=plain&code_challenge=CODE&state=thestate"),
+			"client_id":    "ce5a1322-42a7-11ed-b878-0242ac120002",
+			"redirect_uri": "b",
+			"state":        "thestate",
+			"granted":      "true",
+		})
+		resp := session.MakeRequest(t, req, http.StatusSeeOther)
+
+		var err error
+		u, err = url.Parse(test.RedirectURL(resp))
+		require.NoError(t, err)
+	})
+
+	t.Run("Incorrect code verfifier", func(t *testing.T) {
+		req := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{
+			"client_id":     "ce5a1322-42a7-11ed-b878-0242ac120002",
+			"code":          u.Query().Get("code"),
+			"code_verifier": "just a guess",
+			"grant_type":    "authorization_code",
+			"redirect_uri":  "b",
+		})
+		resp := MakeRequest(t, req, http.StatusBadRequest)
+
+		var respBody map[string]any
+		DecodeJSON(t, resp, &respBody)
+
+		if assert.Len(t, respBody, 2) {
+			assert.Equal(t, "unauthorized_client", respBody["error"])
+			assert.Equal(t, "failed PKCE code challenge", respBody["error_description"])
+		}
+	})
+
+	t.Run("Get access token", func(t *testing.T) {
+		req := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{
+			"client_id":     "ce5a1322-42a7-11ed-b878-0242ac120002",
+			"code":          u.Query().Get("code"),
+			"code_verifier": "CODE",
+			"grant_type":    "authorization_code",
+			"redirect_uri":  "b",
+		})
+		resp := MakeRequest(t, req, http.StatusOK)
+
+		var respBody map[string]any
+		DecodeJSON(t, resp, &respBody)
+
+		if assert.Len(t, respBody, 4) {
+			assert.NotEmpty(t, respBody["access_token"])
+			assert.NotEmpty(t, respBody["token_type"])
+			assert.NotEmpty(t, respBody["expires_in"])
+			assert.NotEmpty(t, respBody["refresh_token"])
+		}
+	})
+}
diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go
index 38998d0c76..aa6d8daf5c 100644
--- a/tests/integration/opengraph_test.go
+++ b/tests/integration/opengraph_test.go
@@ -98,7 +98,7 @@ func TestOpenGraphProperties(t *testing.T) {
 				"og:url":          setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt",
 				"og:type":         "object",
 				"og:image":        setting.AppURL + "user27/repo49/-/summary-card",
-				"og:image:alt":    "Summary card of repository user27/repo49",
+				"og:image:alt":    "Summary card of repository user27/repo49, described as: A wonderful repository with more than just a README.md",
 				"og:image:width":  "1200",
 				"og:image:height": "600",
 				"og:site_name":    siteName,
@@ -141,7 +141,7 @@ func TestOpenGraphProperties(t *testing.T) {
 				"og:description":  "A wonderful repository with more than just a README.md",
 				"og:type":         "object",
 				"og:image":        setting.AppURL + "user27/repo49/-/summary-card",
-				"og:image:alt":    "Summary card of repository user27/repo49",
+				"og:image:alt":    "Summary card of repository user27/repo49, described as: A wonderful repository with more than just a README.md",
 				"og:image:width":  "1200",
 				"og:image:height": "600",
 				"og:site_name":    siteName,
@@ -180,7 +180,7 @@ func TestOpenGraphProperties(t *testing.T) {
 				foundProps[prop] = content
 			})
 
-			assert.EqualValues(t, tc.expected, foundProps, "mismatching opengraph properties")
+			assert.Equal(t, tc.expected, foundProps, "mismatching opengraph properties")
 		})
 	}
 }
diff --git a/tests/integration/org_nav_test.go b/tests/integration/org_nav_test.go
index 09736d12a0..d8f4368a51 100644
--- a/tests/integration/org_nav_test.go
+++ b/tests/integration/org_nav_test.go
@@ -41,8 +41,8 @@ func TestOrgNavigationDashboard(t *testing.T) {
 
 	// Verify the "New repository" and "New migration" buttons
 	links := doc.Find(".organization.profile .grid .column .center")
-	assert.EqualValues(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href^='/repo/create?org=']").Text()))
-	assert.EqualValues(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href^='/repo/migrate?org=']").Text()))
+	assert.Equal(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href^='/repo/create?org=']").Text()))
+	assert.Equal(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href^='/repo/migrate?org=']").Text()))
 
 	// Check if the "View <orgname>" button is available on dashboard for the org admin (member)
 	resp = session1.MakeRequest(t, NewRequest(t, "GET", "/org/org_navigation_test/dashboard"), http.StatusOK)
diff --git a/tests/integration/org_profile_test.go b/tests/integration/org_profile_test.go
new file mode 100644
index 0000000000..8125c3e6ba
--- /dev/null
+++ b/tests/integration/org_profile_test.go
@@ -0,0 +1,154 @@
+// Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"net/url"
+	"strings"
+	"testing"
+
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	files_service "forgejo.org/services/repository/files"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOrgProfile(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		checkReadme := func(t *testing.T, title, readmeFilename string, expectedCount int) {
+			t.Run(title, func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Prepare the test repository
+				org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+
+				var ops []*files_service.ChangeRepoFile
+				op := "create"
+				if readmeFilename != "README.md" {
+					ops = append(ops, &files_service.ChangeRepoFile{
+						Operation: "delete",
+						TreePath:  "README.md",
+					})
+				} else {
+					op = "update"
+				}
+				if readmeFilename != "" {
+					ops = append(ops, &files_service.ChangeRepoFile{
+						Operation:     op,
+						TreePath:      readmeFilename,
+						ContentReader: strings.NewReader("# Hi!\n"),
+					})
+				}
+
+				_, _, f := tests.CreateDeclarativeRepo(t, org3, ".profile", nil, nil, ops)
+				defer f()
+
+				// Perform the test
+				req := NewRequest(t, "GET", "/org3")
+				resp := MakeRequest(t, req, http.StatusOK)
+
+				doc := NewHTMLParser(t, resp.Body)
+				readmeCount := doc.Find("#readme_profile").Length()
+
+				assert.Equal(t, expectedCount, readmeCount)
+			})
+		}
+
+		checkReadme(t, "No readme", "", 0)
+		checkReadme(t, "README.md", "README.md", 1)
+		checkReadme(t, "readme.md", "readme.md", 1)
+		checkReadme(t, "ReadMe.mD", "ReadMe.mD", 1)
+		checkReadme(t, "readme.org does not render", "README.org", 0)
+
+		t.Run("readme-size", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Prepare the test repository
+			org3 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
+
+			_, _, f := tests.CreateDeclarativeRepo(t, org3, ".profile", nil, nil, []*files_service.ChangeRepoFile{
+				{
+					Operation: "update",
+					TreePath:  "README.md",
+					ContentReader: strings.NewReader(`## Lorem ipsum
+dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+## Ut enim ad minim veniam
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum`),
+				},
+			})
+			defer f()
+
+			t.Run("full", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				defer test.MockVariableValue(&setting.UI.MaxDisplayFileSize, 500)()
+
+				req := NewRequest(t, "GET", "/org3")
+				resp := MakeRequest(t, req, http.StatusOK)
+				assert.Contains(t, resp.Body.String(), "Ut enim ad minim veniam")
+				assert.Contains(t, resp.Body.String(), "mollit anim id est laborum")
+			})
+
+			t.Run("truncated", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				defer test.MockVariableValue(&setting.UI.MaxDisplayFileSize, 146)()
+
+				req := NewRequest(t, "GET", "/org3")
+				resp := MakeRequest(t, req, http.StatusOK)
+				assert.Contains(t, resp.Body.String(), "Ut enim ad minim")
+				assert.NotContains(t, resp.Body.String(), "veniam")
+			})
+		})
+
+		t.Run("More actions - feeds only", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			defer test.MockVariableValue(&setting.Other.EnableFeed, true)()
+			defer test.MockVariableValue(&setting.Moderation.Enabled, false)()
+
+			// Both guests and logged in users should see the feed option
+			doc := NewHTMLParser(t, MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown a[href='/org3.rss']", true)
+			doc.AssertElement(t, "details.dropdown a[href^='/report_abuse']", false)
+
+			doc = NewHTMLParser(t, loginUser(t, "user10").MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown a[href='/org3.rss']", true)
+			doc.AssertElement(t, "details.dropdown a[href^='/report_abuse']", false)
+		})
+
+		t.Run("More actions - none", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			defer test.MockVariableValue(&setting.Other.EnableFeed, false)()
+			defer test.MockVariableValue(&setting.Moderation.Enabled, false)()
+
+			// The dropdown won't appear if no entries are available, for both guests and logged in users
+			doc := NewHTMLParser(t, MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown", false)
+
+			doc = NewHTMLParser(t, loginUser(t, "user10").MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown", false)
+		})
+
+		t.Run("More actions - moderation", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			defer test.MockVariableValue(&setting.Other.EnableFeed, false)()
+			defer test.MockVariableValue(&setting.Moderation.Enabled, true)()
+
+			// The report option shouldn't be available to a guest
+			doc := NewHTMLParser(t, MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown", false)
+
+			// But should be available to a logged in user
+			doc = NewHTMLParser(t, loginUser(t, "user10").MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown a[href^='/report_abuse']", true)
+
+			// But the org owner shouldn't see the report option
+			doc = NewHTMLParser(t, loginUser(t, "user1").MakeRequest(t, NewRequest(t, "GET", "/org3"), http.StatusOK).Body)
+			doc.AssertElement(t, "details.dropdown", false)
+		})
+	})
+}
diff --git a/tests/integration/org_settings_test.go b/tests/integration/org_settings_test.go
index fde57e2e26..3ea6f10bf6 100644
--- a/tests/integration/org_settings_test.go
+++ b/tests/integration/org_settings_test.go
@@ -57,7 +57,9 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = "invalid"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK).Body)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", true)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Equal(t, "org3@example.com", org.Email)
@@ -69,7 +71,10 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = "example@example.com"
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther).Body)
+		doc.AssertElement(t, "body", true)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", false)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Equal(t, "example@example.com", org.Email)
@@ -81,7 +86,10 @@ func TestOrgSettingsChangeEmail(t *testing.T) {
 		settings := getOrgSettingsFormData(t, session, orgName)
 
 		settings["email"] = ""
-		session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther)
+		doc := NewHTMLParser(t, session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther).Body)
+		doc.AssertElement(t, "body", true)
+		doc.AssertElement(t, ".status-page-500", false)
+		doc.AssertElement(t, ".flash-error", false)
 
 		org := getOrgSettings(t, token, orgName)
 		assert.Empty(t, org.Email)
diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go
index 3ca236a5dd..5abac148ed 100644
--- a/tests/integration/org_team_invite_test.go
+++ b/tests/integration/org_team_invite_test.go
@@ -233,13 +233,7 @@ func TestOrgTeamEmailInviteRedirectsNewUserWithActivation(t *testing.T) {
 		t.Skip()
 		return
 	}
-
-	// enable email confirmation temporarily
-	defer func(prevVal bool) {
-		setting.Service.RegisterEmailConfirm = prevVal
-	}(setting.Service.RegisterEmailConfirm)
-	setting.Service.RegisterEmailConfirm = true
-
+	defer test.MockVariableValue(&setting.Service.RegisterEmailConfirm, true)()
 	defer tests.PrepareTestEnv(t)()
 
 	org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go
index bc1a5bbe72..4035818e1a 100644
--- a/tests/integration/org_test.go
+++ b/tests/integration/org_test.go
@@ -47,7 +47,7 @@ func TestOrgRepos(t *testing.T) {
 				sel := htmlDoc.doc.Find("a.name")
 				assert.Len(t, repos, len(sel.Nodes))
 				for i := 0; i < len(repos); i++ {
-					assert.EqualValues(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+					assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
 				}
 			}
 		})
diff --git a/tests/integration/patch_status_test.go b/tests/integration/patch_status_test.go
new file mode 100644
index 0000000000..3ce1dc4cb9
--- /dev/null
+++ b/tests/integration/patch_status_test.go
@@ -0,0 +1,349 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package integration
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	issues_model "forgejo.org/models/issues"
+	repo_model "forgejo.org/models/repo"
+	unit_model "forgejo.org/models/unit"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	"forgejo.org/modules/optional"
+	"forgejo.org/modules/test"
+	pull_service "forgejo.org/services/pull"
+	files_service "forgejo.org/services/repository/files"
+	shared_automerge "forgejo.org/services/shared/automerge"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPatchStatus(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+
+		var objectFormat optional.Option[string]
+		if git.SupportHashSha256 {
+			objectFormat = optional.Some("sha256")
+		}
+
+		repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user2, tests.DeclarativeRepoOptions{
+			AutoInit:     optional.Some(true),
+			EnabledUnits: optional.Some([]unit_model.Type{unit_model.TypeCode}),
+			ObjectFormat: objectFormat,
+			Files: optional.Some([]*files_service.ChangeRepoFile{
+				{
+					Operation:     "create",
+					TreePath:      ".spokeperson",
+					ContentReader: strings.NewReader("n0toose"),
+				},
+			}),
+		})
+		defer f()
+
+		testAutomergeQueued := func(t *testing.T, pr *issues_model.PullRequest, expected issues_model.PullRequestStatus) {
+			t.Helper()
+
+			var actual issues_model.PullRequestStatus = -1
+			defer test.MockVariableValue(&shared_automerge.AddToQueueIfMergeable, func(ctx context.Context, pull *issues_model.PullRequest) {
+				actual = pull.Status
+			})()
+
+			pull_service.AddToTaskQueue(t.Context(), pr)
+			assert.Eventually(t, func() bool {
+				return expected == actual
+			}, time.Second*5, time.Millisecond*200)
+		}
+
+		testRepoFork(t, session, "user2", repo.Name, "org3", "forked-repo")
+		forkRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "org3", Name: "forked-repo"})
+
+		u.User = url.UserPassword(user2.Name, userPassword)
+		u.Path = repo.FullName()
+
+		// Clone repository.
+		dstPath := t.TempDir()
+		require.NoError(t, git.Clone(t.Context(), u.String(), dstPath, git.CloneRepoOptions{}))
+
+		// Add `fork` remote.
+		u.Path = forkRepo.FullName()
+		_, _, err := git.NewCommand(git.DefaultContext, "remote", "add", "fork").AddDynamicArguments(u.String()).RunStdString(&git.RunOpts{Dir: dstPath})
+		require.NoError(t, err)
+
+		var normalAGitPR *issues_model.PullRequest
+
+		// Normal pull request, should be mergeable.
+		t.Run("Normal", func(t *testing.T) {
+			require.NoError(t, git.NewCommand(t.Context(), "switch", "-c", "normal").AddDynamicArguments(repo.DefaultBranch).Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, os.WriteFile(filepath.Join(dstPath, "CONTACT"), []byte("n0toose@example.com"), 0o600))
+			require.NoError(t, git.NewCommand(t.Context(), "add", "CONTACT").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "commit", "--message=fancy").Run(&git.RunOpts{Dir: dstPath}))
+
+			test := func(t *testing.T, pr *issues_model.PullRequest) {
+				t.Helper()
+
+				assert.Empty(t, pr.ConflictedFiles)
+				assert.Equal(t, issues_model.PullRequestStatusMergeable, pr.Status)
+				assert.Equal(t, 1, pr.CommitsAhead)
+				assert.Equal(t, 0, pr.CommitsBehind)
+				assert.True(t, pr.Mergeable(t.Context()))
+			}
+
+			t.Run("Across repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "fork", "HEAD:normal").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkRepo.OwnerName, forkRepo.Name, "normal", "across repo normal")
+
+				pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "normal"}, "flow = 0")
+				test(t, pr)
+				testAutomergeQueued(t, pr, issues_model.PullRequestStatusMergeable)
+			})
+
+			t.Run("Same repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:normal").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, repo.OwnerName, repo.Name, "normal", "same repo normal")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "normal"}, "flow = 0"))
+			})
+
+			t.Run("AGit", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=normal").Run(&git.RunOpts{Dir: dstPath}))
+
+				normalAGitPR = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "user2/normal", Flow: issues_model.PullRequestFlowAGit})
+				test(t, normalAGitPR)
+			})
+		})
+
+		// If there's a merge conflict, either on update of the base branch or on
+		// creation of the pull request then it should be marked as such.
+		t.Run("Conflict", func(t *testing.T) {
+			require.NoError(t, git.NewCommand(t.Context(), "switch").AddDynamicArguments(repo.DefaultBranch).Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, os.WriteFile(filepath.Join(dstPath, "CONTACT"), []byte("gusted@example.com"), 0o600))
+			require.NoError(t, git.NewCommand(t.Context(), "add", "CONTACT").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "commit", "--message=fancy").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:main").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "switch", "normal").Run(&git.RunOpts{Dir: dstPath}))
+
+			// Wait until status check queue is done, we cannot access the queue's
+			// internal information so we rely on the status of the patch being changed.
+			assert.Eventually(t, func() bool {
+				return unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: normalAGitPR.ID}).Status == issues_model.PullRequestStatusConflict
+			}, time.Second*30, time.Millisecond*200)
+
+			test := func(t *testing.T, pr *issues_model.PullRequest) {
+				t.Helper()
+				if assert.Len(t, pr.ConflictedFiles, 1) {
+					assert.Equal(t, "CONTACT", pr.ConflictedFiles[0])
+				}
+				assert.Equal(t, issues_model.PullRequestStatusConflict, pr.Status)
+				assert.Equal(t, 1, pr.CommitsAhead)
+				assert.Equal(t, 1, pr.CommitsBehind)
+				assert.False(t, pr.Mergeable(t.Context()))
+			}
+
+			t.Run("Across repository patch", func(t *testing.T) {
+				t.Run("Existing", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "normal"}, "flow = 0")
+					test(t, pr)
+					testAutomergeQueued(t, pr, issues_model.PullRequestStatusConflict)
+				})
+
+				t.Run("New", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					require.NoError(t, git.NewCommand(t.Context(), "push", "fork", "HEAD:conflict").Run(&git.RunOpts{Dir: dstPath}))
+					testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkRepo.OwnerName, forkRepo.Name, "conflict", "across repo conflict")
+
+					test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "conflict"}, "flow = 0"))
+				})
+			})
+
+			t.Run("Same repository patch", func(t *testing.T) {
+				t.Run("Existing", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "normal"}, "flow = 0"))
+				})
+
+				t.Run("New", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:conflict").Run(&git.RunOpts{Dir: dstPath}))
+					testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, repo.OwnerName, repo.Name, "conflict", "same repo conflict")
+
+					test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "conflict"}, "flow = 0"))
+				})
+			})
+
+			t.Run("AGit", func(t *testing.T) {
+				t.Run("Existing", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "user2/normal", Flow: issues_model.PullRequestFlowAGit}))
+				})
+
+				t.Run("New", func(t *testing.T) {
+					defer tests.PrintCurrentTest(t)()
+
+					require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=conflict").Run(&git.RunOpts{Dir: dstPath}))
+
+					test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "user2/conflict", Flow: issues_model.PullRequestFlowAGit}))
+				})
+			})
+		})
+
+		// Test that the status is set to empty if the diff is empty.
+		t.Run("Empty diff", func(t *testing.T) {
+			require.NoError(t, git.NewCommand(t.Context(), "switch", "-c", "empty-patch").AddDynamicArguments(repo.DefaultBranch).Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "commit", "--allow-empty", "--message=empty").Run(&git.RunOpts{Dir: dstPath}))
+
+			test := func(t *testing.T, pr *issues_model.PullRequest) {
+				t.Helper()
+
+				assert.Empty(t, pr.ConflictedFiles)
+				assert.Equal(t, issues_model.PullRequestStatusEmpty, pr.Status)
+				assert.Equal(t, 1, pr.CommitsAhead)
+				assert.Equal(t, 0, pr.CommitsBehind)
+				assert.True(t, pr.Mergeable(t.Context()))
+			}
+
+			t.Run("Across repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "fork", "HEAD:empty-patch").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkRepo.OwnerName, forkRepo.Name, "empty-patch", "across repo empty patch")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "empty-patch"}, "flow = 0"))
+			})
+
+			t.Run("Same repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:empty-patch").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, repo.OwnerName, repo.Name, "empty-patch", "same repo empty patch")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "empty-patch"}, "flow = 0"))
+			})
+
+			t.Run("AGit", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=empty-patch").Run(&git.RunOpts{Dir: dstPath}))
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "user2/empty-patch", Flow: issues_model.PullRequestFlowAGit}))
+			})
+		})
+
+		// If a patch modifies a protected file, it should be marked as such.
+		t.Run("Protected file", func(t *testing.T) {
+			// Add protected branch.
+			link := fmt.Sprintf("/%s/settings/branches/edit", repo.FullName())
+			session.MakeRequest(t, NewRequestWithValues(t, "POST", link, map[string]string{
+				"_csrf":                   GetCSRF(t, session, link),
+				"rule_name":               "main",
+				"protected_file_patterns": "LICENSE",
+			}), http.StatusSeeOther)
+
+			require.NoError(t, git.NewCommand(t.Context(), "switch", "-c", "protected").AddDynamicArguments(repo.DefaultBranch).Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, os.WriteFile(filepath.Join(dstPath, "LICENSE"), []byte(`# "THE SPEZI-WARE LICENSE" (Revision 2137):
+
+As long as you retain this notice, you can do whatever you want with this
+project. If we meet some day, and you think this stuff is worth it, you
+can buy me/us a Paulaner Spezi in return.        ~sdomi, Project SERVFAIL`), 0o600))
+			require.NoError(t, git.NewCommand(t.Context(), "add", "LICENSE").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "commit", "--message=servfail").Run(&git.RunOpts{Dir: dstPath}))
+
+			test := func(t *testing.T, pr *issues_model.PullRequest) {
+				t.Helper()
+				if assert.Len(t, pr.ChangedProtectedFiles, 1) {
+					assert.Equal(t, "license", pr.ChangedProtectedFiles[0])
+				}
+				assert.Equal(t, issues_model.PullRequestStatusMergeable, pr.Status)
+				assert.Equal(t, 1, pr.CommitsAhead)
+				assert.Equal(t, 0, pr.CommitsBehind)
+				assert.True(t, pr.Mergeable(t.Context()))
+			}
+
+			t.Run("Across repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "fork", "HEAD:protected").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkRepo.OwnerName, forkRepo.Name, "protected", "accros repo protected")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "protected"}, "flow = 0"))
+			})
+
+			t.Run("Same repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:protected").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, repo.OwnerName, repo.Name, "protected", "same repo protected")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "protected"}, "flow = 0"))
+			})
+
+			t.Run("AGit", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=protected").Run(&git.RunOpts{Dir: dstPath}))
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "user2/protected", Flow: issues_model.PullRequestFlowAGit}))
+			})
+		})
+
+		// If the head branch is a ancestor of the base branch, then it should be marked.
+		t.Run("Ancestor", func(t *testing.T) {
+			require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "protected:protected").Run(&git.RunOpts{Dir: dstPath}))
+			require.NoError(t, git.NewCommand(t.Context(), "switch").AddDynamicArguments(repo.DefaultBranch).Run(&git.RunOpts{Dir: dstPath}))
+
+			test := func(t *testing.T, pr *issues_model.PullRequest) {
+				t.Helper()
+				assert.Equal(t, issues_model.PullRequestStatusAncestor, pr.Status)
+				assert.Equal(t, 0, pr.CommitsAhead)
+				assert.Equal(t, 1, pr.CommitsBehind)
+				assert.True(t, pr.Mergeable(t.Context()))
+			}
+
+			// AGit has a check to not allow AGit to get in this state.
+
+			t.Run("Across repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "fork", "HEAD:ancestor").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, "protected", forkRepo.OwnerName, forkRepo.Name, "ancestor", "accros repo ancestor")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkRepo.ID, HeadBranch: "ancestor"}, "flow = 0"))
+			})
+
+			t.Run("Same repository", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:ancestor").Run(&git.RunOpts{Dir: dstPath}))
+				testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, "protected", repo.OwnerName, repo.Name, "ancestor", "same repo ancestor")
+
+				test(t, unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: repo.ID, HeadBranch: "ancestor"}, "flow = 0"))
+			})
+		})
+	})
+}
diff --git a/tests/integration/private_project_test.go b/tests/integration/private_project_test.go
index ea6788cb64..e14b677b0f 100644
--- a/tests/integration/private_project_test.go
+++ b/tests/integration/private_project_test.go
@@ -48,19 +48,19 @@ func TestPrivateIssueProject(t *testing.T) {
 		htmlDoc = NewHTMLParser(t, resp.Body)
 		issueCardsLen := htmlDoc.Find(".project-column .issue-card").Length()
 		if hasAccess {
-			assert.EqualValues(t, 2, issueCardsLen)
+			assert.Equal(t, 2, issueCardsLen)
 		} else {
-			assert.EqualValues(t, 1, issueCardsLen)
+			assert.Equal(t, 1, issueCardsLen)
 			// Ensure that the public issue is shown.
-			assert.EqualValues(t, publicIssueHref[0], htmlDoc.Find(".project-column .issue-card .issue-card-title").AttrOr("href", ""))
+			assert.Equal(t, publicIssueHref[0], htmlDoc.Find(".project-column .issue-card .issue-card-title").AttrOr("href", ""))
 		}
 
 		// And that the issue count is correct.
 		issueCount := strings.TrimSpace(htmlDoc.Find(".project-column-issue-count").Text())
 		if hasAccess {
-			assert.EqualValues(t, "2", issueCount)
+			assert.Equal(t, "2", issueCount)
 		} else {
-			assert.EqualValues(t, "1", issueCount)
+			assert.Equal(t, "1", issueCount)
 		}
 	}
 
diff --git a/tests/integration/project_test.go b/tests/integration/project_test.go
index 7dc8bf112d..2fbc5d00c5 100644
--- a/tests/integration/project_test.go
+++ b/tests/integration/project_test.go
@@ -76,9 +76,9 @@ func TestMoveRepoProjectColumns(t *testing.T) {
 	columnsAfter, err := project1.GetColumns(db.DefaultContext)
 	require.NoError(t, err)
 	assert.Len(t, columns, 3)
-	assert.EqualValues(t, columns[1].ID, columnsAfter[0].ID)
-	assert.EqualValues(t, columns[2].ID, columnsAfter[1].ID)
-	assert.EqualValues(t, columns[0].ID, columnsAfter[2].ID)
+	assert.Equal(t, columns[1].ID, columnsAfter[0].ID)
+	assert.Equal(t, columns[2].ID, columnsAfter[1].ID)
+	assert.Equal(t, columns[0].ID, columnsAfter[2].ID)
 
 	require.NoError(t, project_model.DeleteProjectByID(db.DefaultContext, project1.ID))
 }
diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go
index 90d16d725d..8a632fa338 100644
--- a/tests/integration/pull_commit_test.go
+++ b/tests/integration/pull_commit_test.go
@@ -4,13 +4,26 @@
 package integration
 
 import (
+	"context"
+	"encoding/base64"
+	"fmt"
 	"net/http"
+	"net/url"
+	"os"
 	"testing"
 
+	auth_model "forgejo.org/models/auth"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	"forgejo.org/modules/setting"
+	api "forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
 	pull_service "forgejo.org/services/pull"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestListPullCommits(t *testing.T) {
@@ -31,3 +44,100 @@ func TestListPullCommits(t *testing.T) {
 	}
 	assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha)
 }
+
+func TestPullCommitLinks(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits")
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	commitSha := htmlDoc.Find(".commit-list td.sha a.sha.label").First()
+	commitShaHref, _ := commitSha.Attr("href")
+	assert.Equal(t, "/user2/repo1/pulls/3/commits/5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", commitShaHref)
+
+	commitLink := htmlDoc.Find(".commit-list td.message a").First()
+	commitLinkHref, _ := commitLink.Attr("href")
+	assert.Equal(t, "/user2/repo1/pulls/3/commits/5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", commitLinkHref)
+}
+
+func TestPullCommitSignature(t *testing.T) {
+	t.Cleanup(func() {
+		// Cannot use t.Context(), it is in the done state.
+		require.NoError(t, git.InitFull(context.Background()))
+	})
+
+	defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")()
+	defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")()
+	defer test.MockVariableValue(&setting.Repository.Signing.CRUDActions, []string{"always"})()
+	defer test.MockVariableValue(&setting.Repository.Signing.InitialCommit, []string{"always"})()
+
+	filePath := "signed.txt"
+	fromBranch := "master"
+	toBranch := "branch-signed"
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		// Use a new GNUPGPHOME to avoid messing with the existing GPG keyring.
+		tmpDir := t.TempDir()
+		require.NoError(t, os.Chmod(tmpDir, 0o700))
+		t.Setenv("GNUPGHOME", tmpDir)
+
+		rootKeyPair, err := importTestingKey()
+		require.NoError(t, err)
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())()
+		defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")()
+
+		// Ensure the git config is updated with the new signing format.
+		require.NoError(t, git.InitFull(t.Context()))
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		testCtx := NewAPITestContext(t, user.Name, "pull-request-commit-header-signed", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		u.Path = testCtx.GitPath()
+
+		t.Run("Create repository", doAPICreateRepository(testCtx, nil, git.Sha1ObjectFormat))
+
+		t.Run("Create commit", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			options := &api.CreateFileOptions{
+				FileOptions: api.FileOptions{
+					BranchName:    fromBranch,
+					NewBranchName: toBranch,
+					Message:       fmt.Sprintf("from:%s to:%s path:%s", fromBranch, toBranch, filePath),
+					Author: api.Identity{
+						Name:  user.FullName,
+						Email: user.Email,
+					},
+					Committer: api.Identity{
+						Name:  user.FullName,
+						Email: user.Email,
+					},
+				},
+				ContentBase64: base64.StdEncoding.EncodeToString(fmt.Appendf(nil, "This is new text for %s", filePath)),
+			}
+
+			req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", testCtx.Username, testCtx.Reponame, filePath), &options).
+				AddTokenAuth(testCtx.Token)
+			resp := testCtx.Session.MakeRequest(t, req, http.StatusCreated)
+
+			var contents api.FileResponse
+			DecodeJSON(t, resp, &contents)
+
+			assert.True(t, contents.Verification.Verified)
+		})
+
+		t.Run("Create pull request", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, fromBranch, toBranch)(t)
+			require.NoError(t, err)
+
+			req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d/commits/%s", testCtx.Username, testCtx.Reponame, pr.Index, pr.Head.Sha))
+			resp := testCtx.Session.MakeRequest(t, req, http.StatusOK)
+
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			htmlDoc.AssertElement(t, "#diff-commit-header .commit-header-row.message.isSigned.isVerified", true)
+		})
+	})
+}
diff --git a/tests/integration/pull_compare_test.go b/tests/integration/pull_compare_test.go
index adb24c60f6..59248588fb 100644
--- a/tests/integration/pull_compare_test.go
+++ b/tests/integration/pull_compare_test.go
@@ -24,5 +24,5 @@ func TestPullCompare(t *testing.T) {
 
 	req = NewRequest(t, "GET", link)
 	resp = session.MakeRequest(t, req, http.StatusOK)
-	assert.EqualValues(t, http.StatusOK, resp.Code)
+	assert.Equal(t, http.StatusOK, resp.Code)
 }
diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go
index 42155076a8..8c9bdcdfc6 100644
--- a/tests/integration/pull_create_test.go
+++ b/tests/integration/pull_create_test.go
@@ -287,8 +287,6 @@ func testDeleteRepository(t *testing.T, session *TestSession, ownerName, repoNam
 
 func TestPullBranchDelete(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-		defer tests.PrepareTestEnv(t)()
-
 		session := loginUser(t, "user1")
 		testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
 		testCreateBranch(t, session, "user1", "repo1", "branch/master", "master1", http.StatusSeeOther)
@@ -539,16 +537,16 @@ func TestRecentlyPushed(t *testing.T) {
 
 			respChildPR := testPullCreateDirectly(t, session, "user2", "repo1", "master", "user1", "repo1", "recent-push", "Child Pull Request")
 			elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
-			assert.EqualValues(t, "user2", elemChildPR[1])
-			assert.EqualValues(t, "repo1", elemChildPR[2])
-			assert.EqualValues(t, "pulls", elemChildPR[3])
+			assert.Equal(t, "user2", elemChildPR[1])
+			assert.Equal(t, "repo1", elemChildPR[2])
+			assert.Equal(t, "pulls", elemChildPR[3])
 			session2 := loginUser(t, "user2")
 			// Merge the PR from the fork
 			testPullMerge(t, session2, elemChildPR[1], elemChildPR[2], elemChildPR[4], repo_model.MergeStyleSquash, false)
 
 			respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "recent-push-base", "Base Pull Request")
 			elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
-			assert.EqualValues(t, "pulls", elemBasePR[3])
+			assert.Equal(t, "pulls", elemBasePR[3])
 			// Leave the PR from the base repo open (it conflicts with the PR from the fork anyway)
 
 			// Count recently pushed branches on the base repo
diff --git a/tests/integration/pull_diff_test.go b/tests/integration/pull_diff_test.go
index 70e0d5d33a..7442909aec 100644
--- a/tests/integration/pull_diff_test.go
+++ b/tests/integration/pull_diff_test.go
@@ -4,32 +4,45 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
+	"net/url"
+	"os"
+	"path"
+	"strings"
 	"testing"
+	"time"
 
+	issues_model "forgejo.org/models/issues"
+	unit_model "forgejo.org/models/unit"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	files_service "forgejo.org/services/repository/files"
 	"forgejo.org/tests"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestPullDiff_CompletePRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files", false, []string{"test1.txt", "test10.txt", "test2.txt", "test3.txt", "test4.txt", "test5.txt", "test6.txt", "test7.txt", "test8.txt", "test9.txt"})
+	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files", []string{"test1.txt", "test10.txt", "test2.txt", "test3.txt", "test4.txt", "test5.txt", "test6.txt", "test7.txt", "test8.txt", "test9.txt"}, true)
 }
 
 func TestPullDiff_SingleCommitPRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/commits/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", true, []string{"test3.txt"})
+	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/commits/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", []string{"test3.txt"}, true)
 }
 
 func TestPullDiff_CommitRangePRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files/4ca8bcaf27e28504df7bf996819665986b01c847..23576dd018294e476c06e569b6b0f170d0558705", true, []string{"test2.txt", "test3.txt", "test4.txt"})
+	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files/4ca8bcaf27e28504df7bf996819665986b01c847..23576dd018294e476c06e569b6b0f170d0558705", []string{"test2.txt", "test3.txt", "test4.txt"}, true)
 }
 
 func TestPullDiff_StartingFromBaseToCommitPRDiff(t *testing.T) {
-	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", true, []string{"test1.txt", "test2.txt", "test3.txt"})
+	doTestPRDiff(t, "/user2/commitsonpr/pulls/1/files/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2", []string{"test1.txt", "test2.txt", "test3.txt"}, true)
 }
 
-func doTestPRDiff(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expectedFilenames []string) {
+func doTestPRDiff(t *testing.T, prDiffURL string, expectedFilenames []string, editable bool) {
 	defer tests.PrepareTestEnv(t)()
 
 	session := loginUser(t, "user2")
@@ -51,8 +64,73 @@ func doTestPRDiff(t *testing.T, prDiffURL string, reviewBtnDisabled bool, expect
 	fileContents.Each(func(i int, s *goquery.Selection) {
 		filename, _ := s.Attr("data-old-filename")
 		assert.Equal(t, expectedFilenames[i], filename)
+		doc.AssertElement(t, "h4.diff-file-header a.button[href=\"/user2/commitsonpr/_edit/branch1/"+filename+"\"]", editable)
+	})
+}
+
+func TestPullDiff_AGitNotEditable(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+
+		// Create temporary repository.
+		repo, _, f := tests.CreateDeclarativeRepo(t, user2, "myrepo",
+			[]unit_model.Type{unit_model.TypePullRequests}, nil,
+			[]*files_service.ChangeRepoFile{
+				{
+					Operation:     "create",
+					TreePath:      "FUNFACT",
+					ContentReader: strings.NewReader("Smithy was the runner up to be Forgejo's name"),
+				},
+			},
+		)
+		defer f()
+
+		clone := func(t *testing.T, clone string) string {
+			t.Helper()
+
+			dstPath := t.TempDir()
+			cloneURL, _ := url.Parse(clone)
+			cloneURL.User = url.UserPassword("user2", userPassword)
+			require.NoError(t, git.CloneWithArgs(t.Context(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{}))
+
+			return dstPath
+		}
+
+		firstCommit := func(t *testing.T, dstPath string) {
+			t.Helper()
+
+			require.NoError(t, os.WriteFile(path.Join(dstPath, "README.md"), []byte("## test content"), 0o600))
+			require.NoError(t, git.AddChanges(dstPath, true))
+			require.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{
+				Committer: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Author: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Message: "Add README.",
+			}))
+		}
+		dstPath := clone(t, fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name))
+
+		// Create first commit.
+		firstCommit(t, dstPath)
+
+		// Create agit PR.
+		require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath}))
+
+		pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{Index: 1, BaseRepoID: repo.ID})
+		assert.Equal(t, issues_model.PullRequestFlowAGit, pr.Flow)
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", fmt.Sprintf("/%s/pulls/%d/files", repo.FullName(), pr.Index)), http.StatusOK)
+
+		doc := NewHTMLParser(t, resp.Body)
+		// There is no edit button on any changed file
+		doc.AssertElement(t, "h4.diff-file-header a.button[href^=\"/"+repo.FullName()+"/_edit\"]", false)
 	})
-
-	// Ensure the review button is enabled for full PR reviews
-	assert.Equal(t, reviewBtnDisabled, doc.doc.Find(".js-btn-review").HasClass("disabled"))
 }
diff --git a/tests/integration/pull_files_test.go b/tests/integration/pull_files_test.go
new file mode 100644
index 0000000000..eb7072a4e6
--- /dev/null
+++ b/tests/integration/pull_files_test.go
@@ -0,0 +1,106 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/git"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPullFilesCommitHeader(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	t.Run("Verify commit info", func(t *testing.T) {
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		gitRepo, err := git.OpenRepository(git.DefaultContext, repo.RepoPath())
+		require.NoError(t, err)
+		defer gitRepo.Close()
+
+		commit, err := gitRepo.GetCommit("62fb502a7172d4453f0322a2cc85bddffa57f07a")
+		require.NoError(t, err)
+
+		req := NewRequest(t, "GET", "/user2/repo1/pulls/5/commits/62fb502a7172d4453f0322a2cc85bddffa57f07a")
+		resp := MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		header := htmlDoc.doc.Find("#diff-commit-header")
+
+		summary := header.Find(".commit-header h3")
+		assert.Equal(t, commit.Summary(), strings.TrimSpace(summary.Text()))
+
+		author := header.Find(".author strong")
+		assert.Equal(t, commit.Author.Name, author.Text())
+
+		date, _ := header.Find("#authored-time relative-time").Attr("datetime")
+		assert.Equal(t, commit.Author.When.Format(time.RFC3339), date)
+
+		sha := header.Find(".commit-header-row .sha.label")
+		shaHref, _ := sha.Attr("href")
+		assert.Equal(t, commit.ID.String()[:10], sha.Find(".shortsha").Text())
+		assert.Equal(t, "/user2/repo1/commit/62fb502a7172d4453f0322a2cc85bddffa57f07a", shaHref)
+	})
+
+	t.Run("Navigation", func(t *testing.T) {
+		t.Run("No previous on first commit", func(t *testing.T) {
+			req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1/commits/4ca8bcaf27e28504df7bf996819665986b01c847")
+			resp := MakeRequest(t, req, http.StatusOK)
+
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			buttons := htmlDoc.doc.Find(".commit-header-buttons a.small.button")
+
+			assert.Equal(t, 2, buttons.Length(), "expected two buttons in commit header")
+
+			assert.True(t, buttons.First().HasClass("disabled"), "'prev' button should be disabled")
+			assert.False(t, buttons.Last().HasClass("disabled"), "'next' button should not be disabled")
+
+			href, _ := buttons.Last().Attr("href")
+			assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/96cef4a7b72b3c208340ae6f0cf55a93e9077c93", href)
+		})
+
+		t.Run("No next on last commit", func(t *testing.T) {
+			req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1/commits/9b93963cf6de4dc33f915bb67f192d099c301f43")
+			resp := MakeRequest(t, req, http.StatusOK)
+
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			buttons := htmlDoc.doc.Find(".commit-header-buttons a.small.button")
+
+			assert.Equal(t, 2, buttons.Length(), "expected two buttons in commit header")
+
+			assert.False(t, buttons.First().HasClass("disabled"), "'prev' button should not be disabled")
+			assert.True(t, buttons.Last().HasClass("disabled"), "'next' button should be disabled")
+
+			href, _ := buttons.First().Attr("href")
+			assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/2d65d92dc800c6f448541240c18e82bf36b954bb", href)
+		})
+
+		t.Run("Both directions on middle commit", func(t *testing.T) {
+			req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1/commits/c5626fc9eff57eb1bb7b796b01d4d0f2f3f792a2")
+			resp := MakeRequest(t, req, http.StatusOK)
+
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			buttons := htmlDoc.doc.Find(".commit-header-buttons a.small.button")
+
+			assert.Equal(t, 2, buttons.Length(), "expected two buttons in commit header")
+
+			assert.False(t, buttons.First().HasClass("disabled"), "'prev' button should not be disabled")
+			assert.False(t, buttons.Last().HasClass("disabled"), "'next' button should not be disabled")
+
+			href, _ := buttons.First().Attr("href")
+			assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/96cef4a7b72b3c208340ae6f0cf55a93e9077c93", href)
+
+			href, _ = buttons.Last().Attr("href")
+			assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/23576dd018294e476c06e569b6b0f170d0558705", href)
+		})
+	})
+}
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
index f60fc27bb3..b8923dd6f4 100644
--- a/tests/integration/pull_merge_test.go
+++ b/tests/integration/pull_merge_test.go
@@ -40,10 +40,10 @@ import (
 	"forgejo.org/services/forms"
 	"forgejo.org/services/pull"
 	commitstatus_service "forgejo.org/services/repository/commitstatus"
-	files_service "forgejo.org/services/repository/files"
 	webhook_service "forgejo.org/services/webhook"
 	"forgejo.org/tests"
 
+	"github.com/hashicorp/go-version"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -84,7 +84,7 @@ func testPullMergeForm(t *testing.T, session *TestSession, expectedCode int, use
 		}{}
 		DecodeJSON(t, resp, &respJSON)
 
-		assert.EqualValues(t, fmt.Sprintf("/%s/%s/pulls/%s", user, repo, pullnum), respJSON.Redirect)
+		assert.Equal(t, fmt.Sprintf("/%s/%s/pulls/%s", user, repo, pullnum), respJSON.Redirect)
 	}
 
 	return resp
@@ -144,7 +144,7 @@ func TestPullMerge(t *testing.T) {
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
 
 		hookTasks = retrieveHookTasks(t, 1, false)
@@ -164,7 +164,7 @@ func TestPullRebase(t *testing.T) {
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebase, false)
 
 		hookTasks = retrieveHookTasks(t, 1, false)
@@ -184,7 +184,7 @@ func TestPullRebaseMerge(t *testing.T) {
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebaseMerge, false)
 
 		hookTasks = retrieveHookTasks(t, 1, false)
@@ -205,7 +205,7 @@ func TestPullSquash(t *testing.T) {
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleSquash, false)
 
 		hookTasks = retrieveHookTasks(t, 1, false)
@@ -222,7 +222,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "feature/test", "This is a pull title")
 
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
 
 		// Check PR branch deletion
@@ -235,7 +235,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
 		assert.NotEmpty(t, respJSON.Redirect, "Redirected URL is not found")
 
 		elem = strings.Split(respJSON.Redirect, "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 
 		// Check branch deletion result
 		req := NewRequest(t, "GET", respJSON.Redirect)
@@ -244,7 +244,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
 
-		assert.EqualValues(t, "Branch \"user1/repo1:feature/test\" has been deleted.", resultMsg)
+		assert.Equal(t, "Branch \"user1/repo1:feature/test\" has been deleted.", resultMsg)
 	})
 }
 
@@ -302,13 +302,37 @@ func TestCantMergeConflict(t *testing.T) {
 		gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo1)
 		require.NoError(t, err)
 
-		err = pull.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT", false)
-		require.Error(t, err, "Merge should return an error due to conflict")
-		assert.True(t, models.IsErrMergeConflicts(err), "Merge error is not a conflict error")
+		t.Run("Rebase", func(t *testing.T) {
+			t.Run("Git version without replay", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				oldVersion, err := version.NewVersion("2.43.0")
+				require.NoError(t, err)
+				defer test.MockVariableValue(&git.GitVersion, oldVersion)()
+
+				err = pull.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT", false)
+				require.Error(t, err, "Merge should return an error due to conflict")
+				assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
+			})
+			t.Run("Git version with replay", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				if git.CheckGitVersionAtLeast("2.44") != nil {
+					t.SkipNow()
+				}
+
+				err = pull.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT", false)
+				require.Error(t, err, "Merge should return an error due to conflict")
+				assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
+			})
+		})
+
+		t.Run("Merge", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			err = pull.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleMerge, "", "CONFLICT", false)
+			require.Error(t, err, "Merge should return an error due to conflict")
+			assert.True(t, models.IsErrMergeConflicts(err), "Merge error is not a conflict error")
+		})
 
-		err = pull.Merge(t.Context(), pr, user1, gitRepo, repo_model.MergeStyleRebase, "", "CONFLICT", false)
-		require.Error(t, err, "Merge should return an error due to conflict")
-		assert.True(t, models.IsErrRebaseConflicts(err), "Merge error is not a conflict error")
 		gitRepo.Close()
 	})
 }
@@ -492,78 +516,6 @@ func TestCantFastForwardOnlyMergeDiverging(t *testing.T) {
 	})
 }
 
-func TestConflictChecking(t *testing.T) {
-	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
-		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-
-		// Create new clean repo to test conflict checking.
-		baseRepo, _, f := tests.CreateDeclarativeRepo(t, user, "conflict-checking", nil, nil, nil)
-		defer f()
-
-		// create a commit on new branch.
-		_, err := files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user, &files_service.ChangeRepoFilesOptions{
-			Files: []*files_service.ChangeRepoFile{
-				{
-					Operation:     "create",
-					TreePath:      "important_file",
-					ContentReader: strings.NewReader("Just a non-important file"),
-				},
-			},
-			Message:   "Add a important file",
-			OldBranch: "main",
-			NewBranch: "important-secrets",
-		})
-		require.NoError(t, err)
-
-		// create a commit on main branch.
-		_, err = files_service.ChangeRepoFiles(git.DefaultContext, baseRepo, user, &files_service.ChangeRepoFilesOptions{
-			Files: []*files_service.ChangeRepoFile{
-				{
-					Operation:     "create",
-					TreePath:      "important_file",
-					ContentReader: strings.NewReader("Not the same content :P"),
-				},
-			},
-			Message:   "Add a important file",
-			OldBranch: "main",
-			NewBranch: "main",
-		})
-		require.NoError(t, err)
-
-		// create Pull to merge the important-secrets branch into main branch.
-		pullIssue := &issues_model.Issue{
-			RepoID:   baseRepo.ID,
-			Title:    "PR with conflict!",
-			PosterID: user.ID,
-			Poster:   user,
-			IsPull:   true,
-		}
-
-		pullRequest := &issues_model.PullRequest{
-			HeadRepoID: baseRepo.ID,
-			BaseRepoID: baseRepo.ID,
-			HeadBranch: "important-secrets",
-			BaseBranch: "main",
-			HeadRepo:   baseRepo,
-			BaseRepo:   baseRepo,
-			Type:       issues_model.PullRequestGitea,
-		}
-		err = pull.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
-		require.NoError(t, err)
-
-		issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"})
-		require.NoError(t, issue.LoadPullRequest(db.DefaultContext))
-		conflictingPR := issue.PullRequest
-
-		// Ensure conflictedFiles is populated.
-		assert.Len(t, conflictingPR.ConflictedFiles, 1)
-		// Check if status is correct.
-		assert.Equal(t, issues_model.PullRequestStatusConflict, conflictingPR.Status)
-		// Ensure that mergeable returns false
-		assert.False(t, conflictingPR.Mergeable(db.DefaultContext))
-	})
-}
-
 func TestPullRetargetChildOnBranchDelete(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
 		session := loginUser(t, "user1")
@@ -573,11 +525,11 @@ func TestPullRetargetChildOnBranchDelete(t *testing.T) {
 
 		respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "base-pr", "Base Pull Request")
 		elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
-		assert.EqualValues(t, "pulls", elemBasePR[3])
+		assert.Equal(t, "pulls", elemBasePR[3])
 
 		respChildPR := testPullCreate(t, session, "user1", "repo1", false, "base-pr", "child-pr", "Child Pull Request")
 		elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
-		assert.EqualValues(t, "pulls", elemChildPR[3])
+		assert.Equal(t, "pulls", elemChildPR[3])
 
 		testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
 
@@ -589,8 +541,8 @@ func TestPullRetargetChildOnBranchDelete(t *testing.T) {
 		targetBranch := htmlDoc.doc.Find("#branch_target>a").Text()
 		prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
 
-		assert.EqualValues(t, "master", targetBranch)
-		assert.EqualValues(t, "Open", prStatus)
+		assert.Equal(t, "master", targetBranch)
+		assert.Equal(t, "Open", prStatus)
 	})
 }
 
@@ -603,11 +555,11 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
 
 		respBasePR := testPullCreate(t, session, "user1", "repo1", false, "master", "base-pr", "Base Pull Request")
 		elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/")
-		assert.EqualValues(t, "pulls", elemBasePR[3])
+		assert.Equal(t, "pulls", elemBasePR[3])
 
 		respChildPR := testPullCreate(t, session, "user1", "repo1", true, "base-pr", "child-pr", "Child Pull Request")
 		elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
-		assert.EqualValues(t, "pulls", elemChildPR[3])
+		assert.Equal(t, "pulls", elemChildPR[3])
 
 		testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
 
@@ -619,8 +571,8 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
 		targetBranch := htmlDoc.doc.Find("#branch_target>a").Text()
 		prStatus := strings.TrimSpace(htmlDoc.doc.Find(".issue-title-meta>.issue-state-label").Text())
 
-		assert.EqualValues(t, "base-pr", targetBranch)
-		assert.EqualValues(t, "Closed", prStatus)
+		assert.Equal(t, "base-pr", targetBranch)
+		assert.Equal(t, "Closed", prStatus)
 	})
 }
 
@@ -633,7 +585,6 @@ func TestPullMergeIndexerNotifier(t *testing.T) {
 		createPullResp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "Indexer notifier test pull")
 
 		require.NoError(t, queue.GetManager().FlushAll(t.Context(), 0))
-		time.Sleep(time.Second)
 
 		repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
 			OwnerName: "user2",
@@ -662,7 +613,7 @@ func TestPullMergeIndexerNotifier(t *testing.T) {
 
 		// merge the pull request
 		elem := strings.Split(test.RedirectURL(createPullResp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
 
 		// check if the issue is closed
@@ -672,7 +623,6 @@ func TestPullMergeIndexerNotifier(t *testing.T) {
 		assert.True(t, issue.IsClosed)
 
 		require.NoError(t, queue.GetManager().FlushAll(t.Context(), 0))
-		time.Sleep(time.Second)
 
 		// search issues again
 		searchIssuesResp = session.MakeRequest(t, NewRequest(t, "GET", link.String()), http.StatusOK)
@@ -696,7 +646,7 @@ func testResetRepo(t *testing.T, repoPath, branch, commitID string) {
 	defer repo.Close()
 	id, err := repo.GetBranchCommitID(branch)
 	require.NoError(t, err)
-	assert.EqualValues(t, commitID, id)
+	assert.Equal(t, commitID, id)
 }
 
 func TestPullMergeBranchProtect(t *testing.T) {
@@ -941,8 +891,6 @@ func testPullAutoMergeAfterCommitStatusSucceed(t *testing.T, ctx APITestContext,
 	})
 	require.NoError(t, err)
 
-	time.Sleep(2 * time.Second)
-
 	// approve PR if necessary
 	if approval {
 		// reload PR again
@@ -956,8 +904,6 @@ func testPullAutoMergeAfterCommitStatusSucceed(t *testing.T, ctx APITestContext,
 		resp := approveSession.MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK)
-
-		time.Sleep(2 * time.Second)
 	}
 
 	// reload PR again
@@ -1138,8 +1084,6 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
 		})
 		require.NoError(t, err)
 
-		time.Sleep(2 * time.Second)
-
 		// reload pr again
 		pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
 		assert.False(t, pr.HasMerged)
@@ -1152,8 +1096,6 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK)
 
-		time.Sleep(2 * time.Second)
-
 		// realod pr again
 		pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
 		assert.True(t, pr.HasMerged)
@@ -1186,10 +1128,80 @@ func TestPullDeleteBranchPerms(t *testing.T) {
 
 		flashCookie := user4Session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "error%3DYou%2Bdon%2527t%2Bhave%2Bpermission%2Bto%2Bdelete%2Bthe%2Bhead%2Bbranch.", flashCookie.Value)
+		assert.Equal(t, "error%3DYou%2Bdon%2527t%2Bhave%2Bpermission%2Bto%2Bdelete%2Bthe%2Bhead%2Bbranch.", flashCookie.Value)
 
 		// Check that the branch still exist.
 		req = NewRequest(t, "GET", "/user2/repo1/src/branch/base-pr")
 		user4Session.MakeRequest(t, req, http.StatusOK)
 	})
 }
+
+// Test that rebasing only happens when its necessary.
+func TestRebaseWhenNecessary(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
+		session := loginUser(t, "user1")
+		testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
+
+		t.Run("No rebase needed", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
+
+			resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
+			pullLink := test.RedirectURL(resp)
+
+			resp = session.MakeRequest(t, NewRequest(t, "GET", test.RedirectURL(resp)+"/commits"), http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			commitLinkBefore, ok := htmlDoc.Find("a.sha").Attr("href")
+			assert.True(t, ok)
+			commitBefore := commitLinkBefore[strings.LastIndexByte(commitLinkBefore, '/'):]
+
+			elem := strings.Split(pullLink, "/")
+			testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebase, false)
+
+			resp = session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1"), http.StatusOK)
+			htmlDoc = NewHTMLParser(t, resp.Body)
+			commitLinkAfter, ok := htmlDoc.Find(".latest-commit a.sha").Attr("href")
+			assert.True(t, ok)
+			commitAfter := commitLinkAfter[strings.LastIndexByte(commitLinkAfter, '/'):]
+
+			assert.Equal(t, commitBefore, commitAfter)
+		})
+
+		t.Run("Rebase needed", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Make user2/repo1 ahead of user1/repo1
+			testEditFile(t, session, "user2", "repo1", "master", "README.md", "Hello, World (Edited 2x)\n")
+
+			// To avoid conflicts, create a new file on /user/repo1.
+			session.MakeRequest(t, NewRequestWithValues(t, "POST", "/user1/repo1/_new/master", map[string]string{
+				"_csrf":          GetCSRF(t, session, "/user/settings"),
+				"commit_choice":  "direct",
+				"tree_path":      "test-file.md",
+				"content":        "newly-added-test-file",
+				"commit_mail_id": "-1",
+			}), http.StatusSeeOther)
+
+			resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is another pull")
+			pullLink := test.RedirectURL(resp)
+
+			resp = session.MakeRequest(t, NewRequest(t, "GET", test.RedirectURL(resp)+"/commits"), http.StatusOK)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			commitLinkBefore, ok := htmlDoc.Find("a.sha").Attr("href")
+			assert.True(t, ok)
+			commitBefore := commitLinkBefore[strings.LastIndexByte(commitLinkBefore, '/'):]
+
+			elem := strings.Split(pullLink, "/")
+			testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleRebase, false)
+
+			resp = session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1"), http.StatusOK)
+			htmlDoc = NewHTMLParser(t, resp.Body)
+			commitLinkAfter, ok := htmlDoc.Find(".latest-commit a.sha").Attr("href")
+			assert.True(t, ok)
+			commitAfter := commitLinkAfter[strings.LastIndexByte(commitLinkAfter, '/'):]
+
+			assert.NotEqual(t, commitBefore, commitAfter)
+		})
+	})
+}
diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go
index 4be493b196..67acfe6f00 100644
--- a/tests/integration/pull_review_test.go
+++ b/tests/integration/pull_review_test.go
@@ -5,20 +5,26 @@
 package integration
 
 import (
+	"bytes"
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"path"
 	"strconv"
 	"strings"
 	"testing"
+	"time"
 
 	"forgejo.org/models/db"
 	issues_model "forgejo.org/models/issues"
 	repo_model "forgejo.org/models/repo"
+	unit_model "forgejo.org/models/unit"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
 	"forgejo.org/modules/gitrepo"
 	repo_module "forgejo.org/modules/repository"
 	"forgejo.org/modules/test"
@@ -93,23 +99,16 @@ func TestPullView_SelfReviewNotification(t *testing.T) {
 		require.NoError(t, err)
 
 		// create a new branch to prepare for pull request
-		_, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
-			NewBranch: "codeowner-basebranch",
-			Files: []*files_service.ChangeRepoFile{
-				{
-					Operation:     "update",
-					TreePath:      "README.md",
-					ContentReader: strings.NewReader("# This is a new project\n"),
-				},
-			},
-		})
+		err = updateFileInBranch(user2, repo, "README.md", "codeowner-basebranch",
+			strings.NewReader("# This is a new project\n"),
+		)
 		require.NoError(t, err)
 
 		// Create a pull request.
 		resp := testPullCreate(t, user2Session, "user2", "test_reviewer", false, repo.DefaultBranch, "codeowner-basebranch", "Test Pull Request")
 		prURL := test.RedirectURL(resp)
 		elem := strings.Split(prURL, "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 
 		req := NewRequest(t, http.MethodGet, prURL)
 		resp = MakeRequest(t, req, http.StatusOK)
@@ -366,16 +365,9 @@ func TestPullView_CodeOwner(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			// create a new branch to prepare for pull request
-			_, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
-				NewBranch: "codeowner-basebranch",
-				Files: []*files_service.ChangeRepoFile{
-					{
-						Operation:     "update",
-						TreePath:      "README.md",
-						ContentReader: strings.NewReader("# This is a new project\n"),
-					},
-				},
-			})
+			err := updateFileInBranch(user2, repo, "README.md", "codeowner-basebranch",
+				strings.NewReader("# This is a new project\n"),
+			)
 			require.NoError(t, err)
 
 			// Create a pull request.
@@ -390,41 +382,28 @@ func TestPullView_CodeOwner(t *testing.T) {
 			require.NoError(t, err)
 			prUpdated1 := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
 			require.NoError(t, prUpdated1.LoadIssue(db.DefaultContext))
-			assert.EqualValues(t, "[WIP] Test Pull Request", prUpdated1.Issue.Title)
+			assert.Equal(t, "[WIP] Test Pull Request", prUpdated1.Issue.Title)
 
 			err = issue_service.ChangeTitle(db.DefaultContext, prUpdated1.Issue, user2, "Test Pull Request2")
 			require.NoError(t, err)
 			prUpdated2 := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
 			require.NoError(t, prUpdated2.LoadIssue(db.DefaultContext))
-			assert.EqualValues(t, "Test Pull Request2", prUpdated2.Issue.Title)
+			assert.Equal(t, "Test Pull Request2", prUpdated2.Issue.Title)
 		})
 
 		// change the default branch CODEOWNERS file to change README.md's codeowner
-		_, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
-			Files: []*files_service.ChangeRepoFile{
-				{
-					Operation:     "update",
-					TreePath:      "CODEOWNERS",
-					ContentReader: strings.NewReader("README.md @user8\n"),
-				},
-			},
-		})
+		err := updateFileInBranch(user2, repo, "CODEOWNERS", "",
+			strings.NewReader("README.md @user8\n"),
+		)
 		require.NoError(t, err)
 
 		t.Run("Second Pull Request", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			// create a new branch to prepare for pull request
-			_, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
-				NewBranch: "codeowner-basebranch2",
-				Files: []*files_service.ChangeRepoFile{
-					{
-						Operation:     "update",
-						TreePath:      "README.md",
-						ContentReader: strings.NewReader("# This is a new project2\n"),
-					},
-				},
-			})
+			err := updateFileInBranch(user2, repo, "README.md", "codeowner-basebranch2",
+				strings.NewReader("# This is a new project2\n"),
+			)
 			require.NoError(t, err)
 
 			// Create a pull request.
@@ -446,16 +425,9 @@ func TestPullView_CodeOwner(t *testing.T) {
 			require.NoError(t, err)
 
 			// create a new branch to prepare for pull request
-			_, err = files_service.ChangeRepoFiles(db.DefaultContext, forkedRepo, user5, &files_service.ChangeRepoFilesOptions{
-				NewBranch: "codeowner-basebranch-forked",
-				Files: []*files_service.ChangeRepoFile{
-					{
-						Operation:     "update",
-						TreePath:      "README.md",
-						ContentReader: strings.NewReader("# This is a new forked project\n"),
-					},
-				},
-			})
+			err = updateFileInBranch(user5, forkedRepo, "README.md", "codeowner-basebranch-forked",
+				strings.NewReader("# This is a new forked project\n"),
+			)
 			require.NoError(t, err)
 
 			session := loginUser(t, "user5")
@@ -496,7 +468,7 @@ func TestPullView_GivenApproveOrRejectReviewOnClosedPR(t *testing.T) {
 			testEditFile(t, user1Session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
 			resp := testPullCreate(t, user1Session, "user1", "repo1", false, "master", "master", "This is a pull title")
 			elem := strings.Split(test.RedirectURL(resp), "/")
-			assert.EqualValues(t, "pulls", elem[3])
+			assert.Equal(t, "pulls", elem[3])
 			testPullMerge(t, user1Session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
 
 			// Get the commit SHA
@@ -528,7 +500,7 @@ func TestPullView_GivenApproveOrRejectReviewOnClosedPR(t *testing.T) {
 			testEditFileToNewBranch(t, user1Session, "user1", "repo1", "master", "a-test-branch", "README.md", "Hello, World (Edited...again)\n")
 			resp := testPullCreate(t, user1Session, "user1", "repo1", false, "master", "a-test-branch", "This is a pull title")
 			elem := strings.Split(test.RedirectURL(resp), "/")
-			assert.EqualValues(t, "pulls", elem[3])
+			assert.Equal(t, "pulls", elem[3])
 			testIssueClose(t, user1Session, elem[1], elem[2], elem[4], true)
 
 			// Get the commit SHA
@@ -712,8 +684,9 @@ func TestPullRequestReplyMail(t *testing.T) {
 			called := false
 			defer test.MockVariableValue(&mailer.SendAsync, func(msgs ...*mailer.Message) {
 				assert.Len(t, msgs, 2)
+				SortMailerMessages(msgs)
 				assert.Equal(t, "user1@example.com", msgs[0].To)
-				assert.EqualValues(t, "Re: [user2/repo1] issue2 (PR #2)", msgs[0].Subject)
+				assert.Equal(t, "Re: [user2/repo1] issue2 (PR #2)", msgs[0].Subject)
 				assert.Contains(t, msgs[0].Body, "Notification time!")
 				called = true
 			})()
@@ -740,8 +713,9 @@ func TestPullRequestReplyMail(t *testing.T) {
 			called := false
 			defer test.MockVariableValue(&mailer.SendAsync, func(msgs ...*mailer.Message) {
 				assert.Len(t, msgs, 2)
+				SortMailerMessages(msgs)
 				assert.Equal(t, "user1@example.com", msgs[0].To)
-				assert.EqualValues(t, "Re: [user2/repo1] issue2 (PR #2)", msgs[0].Subject)
+				assert.Equal(t, "Re: [user2/repo1] issue2 (PR #2)", msgs[0].Subject)
 				assert.Contains(t, msgs[0].Body, "Notification time 2!")
 				called = true
 			})()
@@ -762,3 +736,295 @@ func TestPullRequestReplyMail(t *testing.T) {
 		})
 	})
 }
+
+func updateFileInBranch(user *user_model.User, repo *repo_model.Repository, treePath, newBranch string, content io.ReadSeeker) error {
+	oldBranch, err := gitrepo.GetDefaultBranch(git.DefaultContext, repo)
+	if err != nil {
+		return err
+	}
+
+	commitID, err := gitrepo.GetBranchCommitID(git.DefaultContext, repo, oldBranch)
+	if err != nil {
+		return err
+	}
+
+	opts := &files_service.ChangeRepoFilesOptions{
+		Files: []*files_service.ChangeRepoFile{
+			{
+				Operation:     "update",
+				TreePath:      treePath,
+				ContentReader: content,
+			},
+		},
+		OldBranch:    oldBranch,
+		NewBranch:    newBranch,
+		Author:       nil,
+		Committer:    nil,
+		LastCommitID: commitID,
+	}
+	_, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, user, opts)
+	return err
+}
+
+func TestPullRequestStaleReview(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		session := loginUser(t, user2.Name)
+
+		// Create temporary repository.
+		repo, _, f := tests.CreateDeclarativeRepo(t, user2, "",
+			[]unit_model.Type{unit_model.TypePullRequests}, nil,
+			[]*files_service.ChangeRepoFile{
+				{
+					Operation:     "create",
+					TreePath:      "FUNFACT",
+					ContentReader: strings.NewReader("Smithy was the runner up to be Forgejo's name"),
+				},
+			},
+		)
+		defer f()
+
+		clone := func(t *testing.T, clone string) string {
+			t.Helper()
+
+			dstPath := t.TempDir()
+			cloneURL, _ := url.Parse(clone)
+			cloneURL.User = url.UserPassword("user2", userPassword)
+			require.NoError(t, git.CloneWithArgs(t.Context(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{}))
+
+			return dstPath
+		}
+
+		firstCommit := func(t *testing.T, dstPath string) string {
+			t.Helper()
+
+			require.NoError(t, os.WriteFile(path.Join(dstPath, "README.md"), []byte("## test content"), 0o600))
+			require.NoError(t, git.AddChanges(dstPath, true))
+			require.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{
+				Committer: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Author: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Message: "Add README.",
+			}))
+			stdout := &bytes.Buffer{}
+			require.NoError(t, git.NewCommand(t.Context(), "rev-parse", "HEAD").Run(&git.RunOpts{Dir: dstPath, Stdout: stdout}))
+
+			return strings.TrimSpace(stdout.String())
+		}
+
+		secondCommit := func(t *testing.T, dstPath string) {
+			require.NoError(t, os.WriteFile(path.Join(dstPath, "README.md"), []byte("## I prefer this heading"), 0o600))
+			require.NoError(t, git.AddChanges(dstPath, true))
+			require.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{
+				Committer: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Author: &git.Signature{
+					Email: "user2@example.com",
+					Name:  "user2",
+					When:  time.Now(),
+				},
+				Message: "Add README.",
+			}))
+		}
+
+		firstReview := func(t *testing.T, firstCommitID string, index int64) {
+			t.Helper()
+
+			resp := session.MakeRequest(t, NewRequest(t, "GET", fmt.Sprintf("/%s/pulls/%d/files/reviews/new_comment", repo.FullName(), index)), http.StatusOK)
+			doc := NewHTMLParser(t, resp.Body)
+
+			req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/pulls/%d/files/reviews/comments", repo.FullName(), index), map[string]string{
+				"_csrf":            doc.GetCSRF(),
+				"origin":           doc.GetInputValueByName("origin"),
+				"latest_commit_id": firstCommitID,
+				"side":             "proposed",
+				"line":             "1",
+				"path":             "FUNFACT",
+				"diff_start_cid":   doc.GetInputValueByName("diff_start_cid"),
+				"diff_end_cid":     doc.GetInputValueByName("diff_end_cid"),
+				"diff_base_cid":    doc.GetInputValueByName("diff_base_cid"),
+				"content":          "nitpicking comment",
+				"pending_review":   "",
+			})
+			session.MakeRequest(t, req, http.StatusOK)
+
+			req = NewRequestWithValues(t, "POST", "/"+repo.FullName()+"/pulls/1/files/reviews/submit", map[string]string{
+				"_csrf":     doc.GetCSRF(),
+				"commit_id": firstCommitID,
+				"content":   "looks good",
+				"type":      "comment",
+			})
+			session.MakeRequest(t, req, http.StatusOK)
+		}
+
+		staleReview := func(t *testing.T, firstCommitID string, index int64) {
+			// Review based on the first commit, which is a stale review because the
+			// PR's head is at the seconnd commit.
+			req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/pulls/%d/files/reviews/submit", repo.FullName(), index), map[string]string{
+				"_csrf":     GetCSRF(t, session, fmt.Sprintf("/%s/pulls/%d/files/reviews/new_comment", repo.FullName(), index)),
+				"commit_id": firstCommitID,
+				"content":   "looks good",
+				"type":      "approve",
+			})
+			session.MakeRequest(t, req, http.StatusOK)
+		}
+
+		t.Run("Across repositories", func(t *testing.T) {
+			testRepoFork(t, session, "user2", repo.Name, "org3", "forked-repo")
+
+			// Clone it.
+			dstPath := clone(t, fmt.Sprintf("%sorg3/forked-repo.git", u.String()))
+
+			// Create first commit.
+			firstCommitID := firstCommit(t, dstPath)
+
+			// Create PR across repositories.
+			require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "main").Run(&git.RunOpts{Dir: dstPath}))
+			session.MakeRequest(t, NewRequestWithValues(t, "POST", repo.FullName()+"/compare/main...org3/forked-repo:main", map[string]string{
+				"_csrf": GetCSRF(t, session, repo.FullName()+"/compare/main...org3/forked-repo:main"),
+				"title": "pull request",
+			}), http.StatusOK)
+			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{Index: 1, BaseRepoID: repo.ID})
+
+			t.Run("Mark review as stale", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Create first review
+				firstReview(t, firstCommitID, pr.Index)
+
+				// Review is not stale.
+				review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID})
+				assert.False(t, review.Stale)
+
+				// Create second commit
+				secondCommit(t, dstPath)
+
+				// Push to PR.
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "main").Run(&git.RunOpts{Dir: dstPath}))
+
+				// Review is stale.
+				assert.Eventually(t, func() bool {
+					return unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID}).Stale == true
+				}, time.Second*10, time.Microsecond*100)
+			})
+
+			t.Run("Create stale review", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Review based on the first commit, which is a stale review because the
+				// PR's head is at the seconnd commit.
+				staleReview(t, firstCommitID, pr.Index)
+
+				// There does not exist a review that is not stale, because all reviews
+				// are based on the first commit and the PR's head is at the second commit.
+				unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = false")
+			})
+
+			t.Run("Mark unstale", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Force push the PR to the first commit.
+				require.NoError(t, git.NewCommand(t.Context(), "reset", "--hard", "HEAD~1").Run(&git.RunOpts{Dir: dstPath}))
+				require.NoError(t, git.NewCommand(t.Context(), "push", "--force-with-lease", "origin", "main").Run(&git.RunOpts{Dir: dstPath}))
+
+				// There does not exist a review that is stale, because all reviews
+				// are based on the first commit and thus all reviews are no longer marked
+				// as stale.
+				assert.Eventually(t, func() bool {
+					return !unittest.BeanExists(t, &issues_model.Review{IssueID: pr.IssueID}, "stale = true")
+				}, time.Second*10, time.Microsecond*100)
+			})
+
+			t.Run("Diff did not change", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Create a empty commit and push it to the PR.
+				require.NoError(t, git.NewCommand(t.Context(), "commit", "--allow-empty", "-m", "Empty commit").Run(&git.RunOpts{Dir: dstPath}))
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "main").Run(&git.RunOpts{Dir: dstPath}))
+
+				// There does not exist a review that is stale, because the diff did not
+				// change.
+				unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = true")
+			})
+		})
+
+		t.Run("AGit", func(t *testing.T) {
+			dstPath := clone(t, fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name))
+
+			// Create first commit.
+			firstCommitID := firstCommit(t, dstPath)
+
+			// Create agit PR.
+			require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath}))
+
+			pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{Index: 2, BaseRepoID: repo.ID})
+
+			t.Run("Mark review as stale", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				firstReview(t, firstCommitID, pr.Index)
+
+				// Review is not stale.
+				review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID})
+				assert.False(t, review.Stale)
+
+				// Create second commit
+				secondCommit(t, dstPath)
+
+				// Push to agit PR.
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath}))
+
+				// Review is stale.
+				review = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID})
+				assert.True(t, review.Stale)
+			})
+
+			t.Run("Create stale review", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Review based on the first commit, which is a stale review because the
+				// PR's head is at the seconnd commit.
+				staleReview(t, firstCommitID, pr.Index)
+
+				// There does not exist a review that is not stale, because all reviews
+				// are based on the first commit and the PR's head is at the second commit.
+				unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = false")
+			})
+
+			t.Run("Mark unstale", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Force push the PR to the first commit.
+				require.NoError(t, git.NewCommand(t.Context(), "reset", "--hard", "HEAD~1").Run(&git.RunOpts{Dir: dstPath}))
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr", "-o", "force-push").Run(&git.RunOpts{Dir: dstPath}))
+
+				// There does not exist a review that is stale, because all reviews
+				// are based on the first commit and thus all reviews are no longer marked
+				// as stale.
+				unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = true")
+			})
+
+			t.Run("Diff did not change", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+
+				// Create a empty commit and push it to the PR.
+				require.NoError(t, git.NewCommand(t.Context(), "commit", "--allow-empty", "-m", "Empty commit").Run(&git.RunOpts{Dir: dstPath}))
+				require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath}))
+
+				// There does not exist a review that is stale, because the diff did not
+				// change.
+				unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = true")
+			})
+		})
+	})
+}
diff --git a/tests/integration/pull_status_test.go b/tests/integration/pull_status_test.go
index 1fdc871bb3..9786c559ea 100644
--- a/tests/integration/pull_status_test.go
+++ b/tests/integration/pull_status_test.go
@@ -86,7 +86,7 @@ func TestPullCreate_CommitStatus(t *testing.T) {
 			commitURL, exists = doc.doc.Find("#commits-table tbody tr td.sha a").Last().Attr("href")
 			assert.True(t, exists)
 			assert.NotEmpty(t, commitURL)
-			assert.EqualValues(t, commitID, path.Base(commitURL))
+			assert.Equal(t, commitID, path.Base(commitURL))
 
 			cls, ok := doc.doc.Find("#commits-table tbody tr td.message .commit-status").Last().Attr("class")
 			assert.True(t, ok)
@@ -95,7 +95,7 @@ func TestPullCreate_CommitStatus(t *testing.T) {
 
 		repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})
 		css := unittest.AssertExistsAndLoadBean(t, &git_model.CommitStatusSummary{RepoID: repo1.ID, SHA: commitID})
-		assert.EqualValues(t, api.CommitStatusWarning, css.State)
+		assert.Equal(t, api.CommitStatusWarning, css.State)
 	})
 }
 
diff --git a/tests/integration/pull_test.go b/tests/integration/pull_test.go
index d5321f6ae5..8ff715a1b5 100644
--- a/tests/integration/pull_test.go
+++ b/tests/integration/pull_test.go
@@ -30,6 +30,43 @@ func TestViewPulls(t *testing.T) {
 	assert.Equal(t, "Search pulls…", placeholder)
 }
 
+func TestPullViewConversation(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1")
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	t.Run("Commits", func(t *testing.T) {
+		commitLists := htmlDoc.Find(".timeline-item.commits-list")
+		assert.Equal(t, 4, commitLists.Length())
+
+		commits := commitLists.Find(".singular-commit")
+		assert.Equal(t, 10, commits.Length())
+
+		// First one has not been affected by a force push, therefore it's still part of the
+		// PR and should link to the PR-scoped review tab
+		firstCommit := commits.Eq(0)
+		firstCommitMessageHref, _ := firstCommit.Find("a.default-link").Attr("href")
+		firstCommitShaHref, _ := firstCommit.Find("a.sha.label").Attr("href")
+		assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/4ca8bcaf27e28504df7bf996819665986b01c847", firstCommitMessageHref)
+		assert.Equal(t, "/user2/commitsonpr/pulls/1/commits/4ca8bcaf27e28504df7bf996819665986b01c847", firstCommitShaHref)
+
+		// The fifth commit has been overwritten by a force push.
+		// Attempting to view the old one in the review tab won't work:
+		req := NewRequest(t, "GET", "/user2/commitsonpr/pulls/1/commits/3e64625bd6eb5bcba69ac97de6c8f507402df861")
+		MakeRequest(t, req, http.StatusNotFound)
+
+		// Therefore, this commit should link to the non-PR commit view instead
+		fifthCommit := commits.Eq(4)
+		fifthCommitMessageHref, _ := fifthCommit.Find("a.default-link").Attr("href")
+		fifthCommitShaHref, _ := fifthCommit.Find("a.sha.label").Attr("href")
+		assert.Equal(t, "/user2/commitsonpr/commit/3e64625bd6eb5bcba69ac97de6c8f507402df861", fifthCommitMessageHref)
+		assert.Equal(t, "/user2/commitsonpr/commit/3e64625bd6eb5bcba69ac97de6c8f507402df861", fifthCommitShaHref)
+	})
+}
+
 func TestPullManuallyMergeWarning(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -99,3 +136,24 @@ func TestPullCombinedReviewRequest(t *testing.T) {
 	helper(t, "detach", "9", "removed review request for user11")
 	helper(t, "detach", "2", "removed review requests for user11, user2")
 }
+
+func TestShowMergeForManualMerge(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	// Only allow manual merge strategy for this repository.
+	pullRepoUnit := unittest.AssertExistsAndLoadBean(t, &repo_model.RepoUnit{ID: 5, RepoID: 1, Type: unit.TypePullRequests})
+	pullRepoUnit.Config = &repo_model.PullRequestsConfig{
+		AllowManualMerge:  true,
+		DefaultMergeStyle: repo_model.MergeStyleManuallyMerged,
+	}
+	repo_model.UpdateRepoUnit(t.Context(), pullRepoUnit)
+
+	session := loginUser(t, "user2")
+
+	req := NewRequest(t, "GET", "/user2/repo1/pulls/5")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	// Assert that the mergebox is shown.
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	htmlDoc.AssertElement(t, "#pull-request-merge-form", true)
+}
diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go
index 18766e8fa4..692699d24f 100644
--- a/tests/integration/pull_update_test.go
+++ b/tests/integration/pull_update_test.go
@@ -39,8 +39,8 @@ func TestAPIPullUpdate(t *testing.T) {
 		// Test GetDiverging
 		diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, diffCount.Behind)
-		assert.EqualValues(t, 1, diffCount.Ahead)
+		assert.Equal(t, 1, diffCount.Behind)
+		assert.Equal(t, 1, diffCount.Ahead)
 		require.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 		require.NoError(t, pr.LoadIssue(db.DefaultContext))
 
@@ -53,8 +53,8 @@ func TestAPIPullUpdate(t *testing.T) {
 		// Test GetDiverging after update
 		diffCount, err = pull_service.GetDiverging(git.DefaultContext, pr)
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, diffCount.Behind)
-		assert.EqualValues(t, 2, diffCount.Ahead)
+		assert.Equal(t, 0, diffCount.Behind)
+		assert.Equal(t, 2, diffCount.Ahead)
 	})
 }
 
@@ -68,8 +68,8 @@ func TestAPIPullUpdateByRebase(t *testing.T) {
 		// Test GetDiverging
 		diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, diffCount.Behind)
-		assert.EqualValues(t, 1, diffCount.Ahead)
+		assert.Equal(t, 1, diffCount.Behind)
+		assert.Equal(t, 1, diffCount.Ahead)
 		require.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 		require.NoError(t, pr.LoadIssue(db.DefaultContext))
 
@@ -82,14 +82,13 @@ func TestAPIPullUpdateByRebase(t *testing.T) {
 		// Test GetDiverging after update
 		diffCount, err = pull_service.GetDiverging(git.DefaultContext, pr)
 		require.NoError(t, err)
-		assert.EqualValues(t, 0, diffCount.Behind)
-		assert.EqualValues(t, 1, diffCount.Ahead)
+		assert.Equal(t, 0, diffCount.Behind)
+		assert.Equal(t, 1, diffCount.Ahead)
 	})
 }
 
 func TestAPIViewUpdateSettings(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) {
-		defer tests.PrepareTestEnv(t)()
 		// Create PR to test
 		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 		org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26})
@@ -98,8 +97,8 @@ func TestAPIViewUpdateSettings(t *testing.T) {
 		// Test GetDiverging
 		diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 		require.NoError(t, err)
-		assert.EqualValues(t, 1, diffCount.Behind)
-		assert.EqualValues(t, 1, diffCount.Ahead)
+		assert.Equal(t, 1, diffCount.Behind)
+		assert.Equal(t, 1, diffCount.Ahead)
 		require.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 		require.NoError(t, pr.LoadIssue(db.DefaultContext))
 
@@ -136,7 +135,6 @@ func TestViewPullUpdateByRebase(t *testing.T) {
 
 func testViewPullUpdate(t *testing.T, updateStyle string) {
 	defer test.MockVariableValue(&setting.Repository.PullRequest.DefaultUpdateStyle, updateStyle)()
-	defer tests.PrepareTestEnv(t)()
 	// Create PR to test
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 	org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26})
@@ -145,8 +143,8 @@ func testViewPullUpdate(t *testing.T, updateStyle string) {
 	// Test GetDiverging
 	diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr)
 	require.NoError(t, err)
-	assert.EqualValues(t, 1, diffCount.Behind)
-	assert.EqualValues(t, 1, diffCount.Ahead)
+	assert.Equal(t, 1, diffCount.Behind)
+	assert.Equal(t, 1, diffCount.Ahead)
 	require.NoError(t, pr.LoadBaseRepo(db.DefaultContext))
 	require.NoError(t, pr.LoadIssue(db.DefaultContext))
 
@@ -273,3 +271,19 @@ func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *issues_mod
 
 	return issue.PullRequest
 }
+
+func TestStatusDuringUpdate(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		session := loginUser(t, "user2")
+
+		// Adjust this pull request to be in the conflict checker and having a head
+		// branch that is pointing to the an incorrect commit ID.
+		_, err := db.GetEngine(t.Context()).Cols("status", "head_branch").Update(&issues_model.PullRequest{ID: 5, Status: issues_model.PullRequestStatusChecking, HeadBranch: "master"})
+		require.NoError(t, err)
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/pulls/5"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		assert.Contains(t, htmlDoc.Find(".merge-section .item").Text(), "Merge conflict checking is in progress. Try again in few moments.")
+	})
+}
diff --git a/tests/integration/quota_use_test.go b/tests/integration/quota_use_test.go
index 314dcff6e9..105c2305d0 100644
--- a/tests/integration/quota_use_test.go
+++ b/tests/integration/quota_use_test.go
@@ -697,7 +697,7 @@ func (ctx *quotaWebEnvAsContext) ExpectFlashMessage(value string) {
 	htmlDoc := NewHTMLParser(ctx.t, ctx.response.Body)
 	flashMessage := strings.TrimSpace(htmlDoc.Find(`.flash-message`).Text())
 
-	assert.EqualValues(ctx.t, value, flashMessage)
+	assert.Equal(ctx.t, value, flashMessage)
 }
 
 func (ctx *quotaWebEnvAsContext) ExpectFlashMessageContains(parts ...string) {
diff --git a/tests/integration/release_feed_test.go b/tests/integration/release_feed_test.go
index 0ab299f617..eded0459c8 100644
--- a/tests/integration/release_feed_test.go
+++ b/tests/integration/release_feed_test.go
@@ -4,6 +4,7 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
 	"regexp"
 	"testing"
@@ -27,50 +28,56 @@ func TestReleaseFeed(t *testing.T) {
 	t.Run("RSS feed", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
-		resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/releases.rss"), http.StatusOK)
-		assert.EqualValues(t, `<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
+		releasesPath := "/user2/repo1/releases"
+		MakeRequest(t, NewRequest(t, "GET", releasesPath), http.StatusOK)
+
+		resp := MakeRequest(t, NewRequest(t, "GET", releasesPath+".rss"), http.StatusOK)
+		assert.Equal(t, fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?><rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
   <channel>
     <title>Releases for user2/repo1</title>
-    <link>http://localhost/user2/repo1/release</link>
+    <link>http://localhost%[1]s</link>
     <description></description>
     <pubDate></pubDate>
     <item>
       <title>pre-release</title>
-      <link>http://localhost/user2/repo1/releases/tag/v1.0</link>
+      <link>http://localhost%[1]s/tag/v1.0</link>
       <description></description>
       <content:encoded><![CDATA[<p dir="auto">some text for a pre release</p>
 ]]></content:encoded>
       <author>user2</author>
-      <guid>5: http://localhost/user2/repo1/releases/tag/v1.0</guid>
+      <guid>5: http://localhost%[1]s/tag/v1.0</guid>
       <pubDate></pubDate>
     </item>
     <item>
       <title>testing-release</title>
-      <link>http://localhost/user2/repo1/releases/tag/v1.1</link>
+      <link>http://localhost%[1]s/tag/v1.1</link>
       <description></description>
       <author>user2</author>
-      <guid>1: http://localhost/user2/repo1/releases/tag/v1.1</guid>
+      <guid>1: http://localhost%[1]s/tag/v1.1</guid>
       <pubDate></pubDate>
     </item>
   </channel>
-</rss>`, normalize(resp.Body.String()))
+</rss>`, releasesPath), normalize(resp.Body.String()))
 	})
 
 	t.Run("Atom feed", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
-		resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/releases.atom"), http.StatusOK)
-		assert.EqualValues(t, `<?xml version="1.0" encoding="UTF-8"?><feed xmlns="http://www.w3.org/2005/Atom">
+		releasesPath := "/user2/repo1/releases"
+		MakeRequest(t, NewRequest(t, "GET", releasesPath), http.StatusOK)
+
+		resp := MakeRequest(t, NewRequest(t, "GET", releasesPath+".atom"), http.StatusOK)
+		assert.Equal(t, fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?><feed xmlns="http://www.w3.org/2005/Atom">
   <title>Releases for user2/repo1</title>
-  <id>http://localhost/user2/repo1/release</id>
+  <id>http://localhost%[1]s</id>
   <updated></updated>
-  <link href="http://localhost/user2/repo1/release"></link>
+  <link href="http://localhost%[1]s"></link>
   <entry>
     <title>pre-release</title>
     <updated></updated>
-    <id>5: http://localhost/user2/repo1/releases/tag/v1.0</id>
+    <id>5: http://localhost%[1]s/tag/v1.0</id>
     <content type="html">&lt;p dir=&#34;auto&#34;&gt;some text for a pre release&lt;/p&gt;&#xA;</content>
-    <link href="http://localhost/user2/repo1/releases/tag/v1.0" rel="alternate"></link>
+    <link href="http://localhost%[1]s/tag/v1.0" rel="alternate"></link>
     <author>
       <name>user2</name>
       <email>user2@noreply.example.org</email>
@@ -79,13 +86,13 @@ func TestReleaseFeed(t *testing.T) {
   <entry>
     <title>testing-release</title>
     <updated></updated>
-    <id>1: http://localhost/user2/repo1/releases/tag/v1.1</id>
-    <link href="http://localhost/user2/repo1/releases/tag/v1.1" rel="alternate"></link>
+    <id>1: http://localhost%[1]s/tag/v1.1</id>
+    <link href="http://localhost%[1]s/tag/v1.1" rel="alternate"></link>
     <author>
       <name>user2</name>
       <email>user2@noreply.example.org</email>
     </author>
   </entry>
-</feed>`, normalize(resp.Body.String()))
+</feed>`, releasesPath), normalize(resp.Body.String()))
 	})
 }
diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go
index b1162780ab..8e2ec20c76 100644
--- a/tests/integration/release_test.go
+++ b/tests/integration/release_test.go
@@ -18,6 +18,7 @@ import (
 	"forgejo.org/modules/setting"
 	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
+	"forgejo.org/modules/timeutil"
 	"forgejo.org/modules/translation"
 	"forgejo.org/tests"
 
@@ -64,19 +65,19 @@ func checkLatestReleaseAndCount(t *testing.T, session *TestSession, repoURL, ver
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	labelText := htmlDoc.doc.Find("#release-list > li .detail .label").First().Text()
-	assert.EqualValues(t, label, labelText)
+	assert.Equal(t, label, labelText)
 	titleText := htmlDoc.doc.Find("#release-list > li .detail h4 a").First().Text()
-	assert.EqualValues(t, version, titleText)
+	assert.Equal(t, version, titleText)
 
 	// Check release count in the counter on the Release/Tag switch, as well as that the tab is highlighted
 	if count < 10 { // Only check values less than 10, should be enough attempts before this test cracks
 		// 10 is the pagination limit, but the counter can have more than that
-		releaseTab := htmlDoc.doc.Find(".repository.releases .ui.compact.menu a.active.item[href$='/releases']")
+		releaseTab := htmlDoc.doc.Find(".repository.releases .switch a.active.item[href$='/releases']")
 		assert.Contains(t, releaseTab.Text(), strconv.Itoa(count)+" release") // Could be "1 release" or "4 releases"
 	}
 
 	releaseList := htmlDoc.doc.Find("#release-list > li")
-	assert.EqualValues(t, count, releaseList.Length())
+	assert.Equal(t, count, releaseList.Length())
 }
 
 func TestViewReleases(t *testing.T) {
@@ -85,9 +86,6 @@ func TestViewReleases(t *testing.T) {
 	session := loginUser(t, "user2")
 	req := NewRequest(t, "GET", "/user2/repo1/releases")
 	session.MakeRequest(t, req, http.StatusOK)
-
-	// if CI is too slow this test fail, so lets wait a bit
-	time.Sleep(time.Millisecond * 100)
 }
 
 func TestViewReleasesNoLogin(t *testing.T) {
@@ -212,14 +210,14 @@ func TestViewReleaseListNoLogin(t *testing.T) {
 		commitsToMain = append(commitsToMain, s.Find(".ahead > a").Text())
 	})
 
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"/user2/repo-release/releases/tag/empty-target-branch",
 		"/user2/repo-release/releases/tag/non-existing-target-branch",
 		"/user2/repo-release/releases/tag/v2.0",
 		"/user2/repo-release/releases/tag/v1.1",
 		"/user2/repo-release/releases/tag/v1.0",
 	}, links)
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"1 commits", // like v1.1
 		"1 commits", // like v1.1
 		"0 commits",
@@ -237,8 +235,8 @@ func TestViewSingleReleaseNoLogin(t *testing.T) {
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	// check the "number of commits to main since this release"
 	releaseList := htmlDoc.doc.Find("#release-list .ahead > a")
-	assert.EqualValues(t, 1, releaseList.Length())
-	assert.EqualValues(t, "3 commits", releaseList.First().Text())
+	assert.Equal(t, 1, releaseList.Length())
+	assert.Equal(t, "3 commits", releaseList.First().Text())
 }
 
 func TestViewReleaseListLogin(t *testing.T) {
@@ -265,7 +263,7 @@ func TestViewReleaseListLogin(t *testing.T) {
 		links = append(links, link)
 	})
 
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"/user2/repo1/releases/tag/draft-release",
 		"/user2/repo1/releases/tag/v1.0",
 		"/user2/repo1/releases/tag/v1.1",
@@ -296,7 +294,7 @@ func TestViewReleaseListKeyword(t *testing.T) {
 		links = append(links, link)
 	})
 
-	assert.EqualValues(t, []string{
+	assert.Equal(t, []string{
 		"/user2/repo1/releases/tag/v1.1",
 	}, links)
 }
@@ -330,7 +328,24 @@ func TestViewTagsList(t *testing.T) {
 		tagNames = append(tagNames, s.Find(".tag a.tw-flex.tw-items-center").Text())
 	})
 
-	assert.EqualValues(t, []string{"v1.0", "delete-tag", "v1.1"}, tagNames)
+	assert.Equal(t, []string{"v1.0", "delete-tag", "v1.1"}, tagNames)
+}
+
+func TestAttachmentTimestamp(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	req := NewRequest(t, "GET", "user2/repo1/releases")
+	resp := MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	var timeStamp int64 = 946684800
+	unittest.AssertExistsAndLoadBean(t, &repo_model.Attachment{
+		UUID:        "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a20",
+		CreatedUnix: timeutil.TimeStamp(timeStamp),
+	})
+
+	formattedTime := time.Unix(timeStamp, 0).Format(time.RFC3339)
+	htmlDoc.AssertElement(t, fmt.Sprintf("details.download relative-time[datetime='%s']", formattedTime), true)
 }
 
 func TestDownloadReleaseAttachment(t *testing.T) {
diff --git a/tests/integration/remote_test.go b/tests/integration/remote_test.go
index 506ee8ecaa..b079b7289f 100644
--- a/tests/integration/remote_test.go
+++ b/tests/integration/remote_test.go
@@ -73,7 +73,7 @@ func TestRemote_MaybePromoteUserSuccess(t *testing.T) {
 	assert.Equal(t, auth_model.Remote, userBeforeSignIn.LoginType)
 	assert.Equal(t, auth_model.OAuth2, userAfterSignIn.LoginType)
 	// the OAuth2 email was used to set the missing user email
-	assert.Equal(t, "", userBeforeSignIn.Email)
+	assert.Empty(t, userBeforeSignIn.Email)
 	assert.Equal(t, gitlabEmail, userAfterSignIn.Email)
 }
 
diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go
index d7440e5125..2029a3732b 100644
--- a/tests/integration/rename_branch_test.go
+++ b/tests/integration/rename_branch_test.go
@@ -165,7 +165,7 @@ func testRenameBranch(t *testing.T, u *url.URL) {
 
 		flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "error%3DCannot%2Brename%2Bbranch%2Bmain2%2Bbecause%2Bit%2Bis%2Ba%2Bprotected%2Bbranch.", flashCookie.Value)
+		assert.Equal(t, "error%3DCannot%2Brename%2Bbranch%2Bmain2%2Bbecause%2Bit%2Bis%2Ba%2Bprotected%2Bbranch.", flashCookie.Value)
 
 		// Verify it didn't change.
 		repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
diff --git a/tests/integration/repo_activity_test.go b/tests/integration/repo_activity_test.go
index 6199373119..967a55cad6 100644
--- a/tests/integration/repo_activity_test.go
+++ b/tests/integration/repo_activity_test.go
@@ -35,7 +35,7 @@ func TestRepoActivity(t *testing.T) {
 		testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
 		resp := testPullCreate(t, session, "user1", "repo1", false, "master", "master", "This is a pull title")
 		elem := strings.Split(test.RedirectURL(resp), "/")
-		assert.EqualValues(t, "pulls", elem[3])
+		assert.Equal(t, "pulls", elem[3])
 		testPullMerge(t, session, elem[1], elem[2], elem[4], repo_model.MergeStyleMerge, false)
 
 		testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feat/better_readme", "README.md", "Hello, World (Edited Again)\n")
diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go
index 46cd29d025..3cb6e42c89 100644
--- a/tests/integration/repo_branch_test.go
+++ b/tests/integration/repo_branch_test.go
@@ -204,3 +204,28 @@ func TestDatabaseMissingABranch(t *testing.T) {
 		assert.Equal(t, firstBranchCount-1, secondBranchCount)
 	})
 }
+
+func TestCreateBranchButtonVisibility(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		session := loginUser(t, "user1")
+
+		t.Run("Check create branch button", func(t *testing.T) {
+			t.Run("Normal repository", func(t *testing.T) {
+				repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+
+				// Check that the button is present
+				resp := session.MakeRequest(t, NewRequest(t, "GET", "/"+repo1.FullName()+"/branches"), http.StatusOK)
+				htmlDoc := NewHTMLParser(t, resp.Body)
+				assert.Positive(t, htmlDoc.doc.Find(".show-create-branch-modal").Length())
+			})
+			t.Run("Mirrored repository", func(t *testing.T) {
+				repo5 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 5})
+
+				// Check that the button is NOT present
+				resp := session.MakeRequest(t, NewRequest(t, "GET", "/"+repo5.FullName()+"/branches"), http.StatusOK)
+				htmlDoc := NewHTMLParser(t, resp.Body)
+				assert.Equal(t, 0, htmlDoc.doc.Find(".show-create-branch-modal").Length())
+			})
+		})
+	})
+}
diff --git a/tests/integration/repo_collaborator_test.go b/tests/integration/repo_collaborator_test.go
index e18308e7cb..4ca0dad708 100644
--- a/tests/integration/repo_collaborator_test.go
+++ b/tests/integration/repo_collaborator_test.go
@@ -24,14 +24,14 @@ func TestRepoCollaborators(t *testing.T) {
 	page := NewHTMLParser(t, response.Body).Find(".repo-setting-content")
 
 	// Veirfy header
-	assert.EqualValues(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text()))
+	assert.Equal(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text()))
 
 	// Veirfy button text
 	page = page.Find("#repo-collab-form")
-	assert.EqualValues(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text()))
+	assert.Equal(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text()))
 
 	// Veirfy placeholder
 	placeholder, exists := page.Find("#search-user-box input").Attr("placeholder")
 	assert.True(t, exists)
-	assert.EqualValues(t, "Search users…", placeholder)
+	assert.Equal(t, "Search users…", placeholder)
 }
diff --git a/tests/integration/repo_commit_test.go b/tests/integration/repo_commit_test.go
new file mode 100644
index 0000000000..1e22192cd9
--- /dev/null
+++ b/tests/integration/repo_commit_test.go
@@ -0,0 +1,84 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+	"time"
+
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	"forgejo.org/modules/git"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestRepoCommitHeader(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+
+	t.Run("Verify commit info", func(t *testing.T) {
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		gitRepo, err := git.OpenRepository(git.DefaultContext, repo.RepoPath())
+		require.NoError(t, err)
+		defer gitRepo.Close()
+
+		commit, err := gitRepo.GetCommit("65f1bf27bc3bf70f64657658635e66094edbcb4d")
+		require.NoError(t, err)
+
+		req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		summary := htmlDoc.Find(".commit-header h3")
+		assert.Equal(t, commit.Summary(), strings.TrimSpace(summary.Text()))
+
+		author := htmlDoc.Find(".commit-header-row .author strong").First()
+		assert.Equal(t, commit.Author.Name, author.Text())
+
+		committer := htmlDoc.Find(".commit-header-row .author strong").Last()
+		assert.Equal(t, commit.Committer.Name, committer.Text())
+
+		date, _ := htmlDoc.Find(".commit-header-row #authored-time relative-time").Attr("datetime")
+		assert.Equal(t, commit.Author.When.Format(time.RFC3339), date)
+
+		sha := htmlDoc.Find(".commit-header-row .sha.label")
+		assert.Equal(t, commit.ID.String()[:10], sha.Find(".shortsha").Text())
+	})
+
+	t.Run("Verify parent commit ID", func(t *testing.T) {
+		repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+		gitRepo, err := git.OpenRepository(git.DefaultContext, repo.RepoPath())
+		require.NoError(t, err)
+		defer gitRepo.Close()
+
+		commit, err := gitRepo.GetCommit("205ac761f3326a7ebe416e8673760016450b5cec")
+		require.NoError(t, err)
+
+		req := NewRequest(t, "GET", "/user2/repo2/commit/205ac761f3326a7ebe416e8673760016450b5cec")
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		shas := htmlDoc.Find(".commit-header-row .sha.label")
+		assert.Equal(t, 2, shas.Length())
+
+		parentSha := shas.First()
+		parentHref, _ := parentSha.Attr("href")
+		assert.Equal(t, "/user2/repo2/commit/2c54faec6c45d31c1abfaecdab471eac6633738a", parentHref)
+
+		parentID, err := commit.ParentID(0)
+		require.NoError(t, err)
+		assert.Equal(t, parentID.String()[:10], parentSha.Find(".shortsha").Text())
+
+		sha := shas.Last()
+		assert.Equal(t, commit.ID.String()[:10], sha.Find(".shortsha").Text())
+	})
+}
diff --git a/tests/integration/repo_commits_search_test.go b/tests/integration/repo_commits_search_test.go
index 92ff74ba68..5d7d215678 100644
--- a/tests/integration/repo_commits_search_test.go
+++ b/tests/integration/repo_commits_search_test.go
@@ -23,7 +23,7 @@ func testRepoCommitsSearch(t *testing.T, query, commit string) {
 
 	doc := NewHTMLParser(t, resp.Body)
 	sel := doc.doc.Find("#commits-table tbody tr td.sha a")
-	assert.EqualValues(t, commit, strings.TrimSpace(sel.Text()))
+	assert.Equal(t, commit, strings.TrimSpace(sel.Text()))
 }
 
 func TestRepoCommitsSearch(t *testing.T) {
diff --git a/tests/integration/repo_commits_tags_test.go b/tests/integration/repo_commits_tags_test.go
new file mode 100644
index 0000000000..a6797fce94
--- /dev/null
+++ b/tests/integration/repo_commits_tags_test.go
@@ -0,0 +1,73 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+
+	"forgejo.org/tests"
+
+	"github.com/PuerkitoBio/goquery"
+	"github.com/stretchr/testify/assert"
+)
+
+// TestRepoCommitsWithTags tests that tags are displayed inline with commit messages
+// in the commits list, and not in a separate column
+func TestRepoCommitsWithTags(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/repo1/commits/branch/master")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	doc := NewHTMLParser(t, resp.Body)
+
+	// Find the commit with SHA 65f1bf27bc3bf70f64657658635e66094edbcb4d
+	// This commit should have tags v1.1
+	commitRow := doc.doc.Find(`#commits-table tbody tr`).FilterFunction(func(i int, s *goquery.Selection) bool {
+		shaLink := s.Find("td.sha a")
+		href, _ := shaLink.Attr("href")
+		return strings.Contains(href, "65f1bf27bc3bf70f64657658635e66094edbcb4d")
+	})
+
+	// 1. Check for tag labels within the message cell
+	messageCell := commitRow.Find("td.message")
+	tagLabels := messageCell.Find("a.ui.label.basic")
+	assert.GreaterOrEqual(t, tagLabels.Length(), 1, "Should find tag label")
+
+	// 2. tag has proper HTML attr and links to the correct tag
+	tagFound := false
+	tagLabels.Each(func(i int, s *goquery.Selection) {
+		if strings.Contains(s.Text(), "v1.1") {
+			tagFound = true
+			href, exists := s.Attr("href")
+			assert.True(t, exists, "Tag should have href")
+			assert.Contains(t, href, "/src/tag/v1.1", "Tag link should point to tag page")
+			assert.Equal(t, 1, s.Find("svg.octicon-tag").Length(), "Tag should have octicon-tag icon")
+		}
+	})
+	assert.True(t, tagFound, "Should find v1.1 tag")
+
+	// 3. tags appear after the commit messsage and status indicators
+	messageHTML, _ := messageCell.Html()
+	messageWrapperPos := strings.Index(messageHTML, "message-wrapper")
+	ellipsisButtonPos := strings.Index(messageHTML, "ellipsis-button")
+	commitStatusPos := strings.Index(messageHTML, "commit-status")
+	tagLabelPos := strings.Index(messageHTML, "ui label basic")
+
+	// 4. Tags should appear after the message wrapper
+	assert.Greater(t, tagLabelPos, messageWrapperPos, "Tags should appear after message wrapper")
+
+	// 5. If ellipsis button exists, tags should appear after that one
+	if ellipsisButtonPos > 0 {
+		assert.Greater(t, tagLabelPos, ellipsisButtonPos, "Tags should appear after ellipsis button")
+	}
+
+	// 6. If commit status exists, tags should appear after that one
+	if commitStatusPos > 0 {
+		assert.Greater(t, tagLabelPos, commitStatusPos, "Tags should appear after commit status")
+	}
+}
diff --git a/tests/integration/repo_commits_template_test.go b/tests/integration/repo_commits_template_test.go
new file mode 100644
index 0000000000..8243ecc62a
--- /dev/null
+++ b/tests/integration/repo_commits_template_test.go
@@ -0,0 +1,61 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"net/http"
+	"strings"
+	"testing"
+
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+// TestRepoCommitsTemplateVariables ensures that template variables in commits_list.tmpl are correctly referenced
+func TestRepoCommitsTemplateVariables(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+
+	// Test the main commits page
+	req := NewRequest(t, "GET", "/user2/repo1/commits/branch/master")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	assert.Equal(t, http.StatusOK, resp.Code, "Template should render without errors")
+
+	doc := NewHTMLParser(t, resp.Body)
+
+	// 1. Repository.Link is used in tag template
+	tagLinks := doc.doc.Find("a.ui.label.basic[href*='/src/tag/']")
+	if tagLinks.Length() > 0 {
+		href, _ := tagLinks.First().Attr("href")
+		assert.Contains(t, href, "/user2/repo1/src/tag/", "Repository link should be correctly rendered in tag URLs")
+	}
+
+	// 2. Repository.ObjectFormatName is used in the SHA column header
+	shaHeader := doc.doc.Find("#commits-table thead tr th.sha")
+	assert.Equal(t, 1, shaHeader.Length(), "SHA column header should exist")
+	headerText := strings.TrimSpace(shaHeader.Text())
+	assert.NotEmpty(t, headerText, "SHA column header should have text (ObjectFormatName)")
+	// Should be uppercase SHA1 or SHA256 depending on the repository format
+	assert.True(t, headerText == "SHA1" || headerText == "SHA256", "ObjectFormatName should be rendered correctly, got: %s", headerText)
+
+	// 3. Repository.ComposeMetas is used for rendering commit messages
+	commitMessages := doc.doc.Find("#commits-table tbody tr td.message .commit-summary")
+	assert.Positive(t, commitMessages.Length(), "Should have commit messages rendered")
+
+	// 4. RepoLink variable is used throughout
+	commitLinks := doc.doc.Find("#commits-table tbody tr td.sha a[href*='/commit/']")
+	assert.Positive(t, commitLinks.Length(), "Should have commit links")
+	firstCommitLink, _ := commitLinks.First().Attr("href")
+	assert.Contains(t, firstCommitLink, "/user2/repo1/commit/", "RepoLink should be correctly used in commit URLs")
+
+	// 5. CommitTagsMap is used for tag rendering
+	// If $.CommitTagsMap is mistyped, the template would fail with a 500 error
+	// (for detailed tag rendering tests see repo_commits_tags_test.go)
+	tagLabels := doc.doc.Find("#commits-table tbody tr td.message a.ui.label.basic")
+	if tagLabels.Length() > 0 {
+		assert.NotContains(t, tagLabels.First().Text(), "{{", "Tags should be properly rendered without template syntax")
+	}
+}
diff --git a/tests/integration/repo_commits_test.go b/tests/integration/repo_commits_test.go
index f3d3a145ae..47cf7e8534 100644
--- a/tests/integration/repo_commits_test.go
+++ b/tests/integration/repo_commits_test.go
@@ -101,7 +101,7 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
 		assert.Equal(t, api.CommitStatusState(state), statuses[0].State)
 		assert.Equal(t, setting.AppURL+"api/v1/repos/user2/repo1/statuses/65f1bf27bc3bf70f64657658635e66094edbcb4d", statuses[0].URL)
 		assert.Equal(t, "http://test.ci/", statuses[0].TargetURL)
-		assert.Equal(t, "", statuses[0].Description)
+		assert.Empty(t, statuses[0].Description)
 		assert.Equal(t, "testci", statuses[0].Context)
 
 		assert.Len(t, status.Statuses, 1)
diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go
index 03bbba1b2c..c986164b50 100644
--- a/tests/integration/repo_fork_test.go
+++ b/tests/integration/repo_fork_test.go
@@ -135,7 +135,7 @@ func TestRepoFork(t *testing.T) {
 			htmlDoc := NewHTMLParser(t, resp.Body)
 
 			forkButton := htmlDoc.Find("a[href*='/forks']")
-			assert.EqualValues(t, 1, forkButton.Length())
+			assert.Equal(t, 1, forkButton.Length())
 
 			href, _ := forkButton.Attr("href")
 			assert.Equal(t, "/user2/repo1/forks", href)
diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go
index fd29156e4e..44987c14b0 100644
--- a/tests/integration/repo_generate_test.go
+++ b/tests/integration/repo_generate_test.go
@@ -15,6 +15,7 @@ import (
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
 	"forgejo.org/modules/test"
@@ -36,16 +37,20 @@ func assertRepoCreateForm(t *testing.T, htmlDoc *HTMLDoc, owner *user_model.User
 
 	// Verify form header
 	header := strings.TrimSpace(htmlDoc.doc.Find(".form[action='/repo/create'] .header").Text())
-	assert.EqualValues(t, locale.TrString("new_repo.title"), header)
+	assert.Equal(t, locale.TrString("new_repo.title"), header)
 
 	htmlDoc.AssertDropdownHasSelectedOption(t, "uid", strconv.FormatInt(owner.ID, 10))
 
 	// the template menu is loaded client-side, so don't assert the option exists
 	assert.Equal(t, templateID, htmlDoc.GetInputValueByName("repo_template"), "Unexpected repo_template selection")
 
-	for _, name := range []string{"issue_labels", "gitignores", "license", "object_format_name"} {
+	for _, name := range []string{"issue_labels", "gitignores", "license"} {
 		htmlDoc.AssertDropdownHasOptions(t, name)
 	}
+
+	if git.SupportHashSha256 {
+		htmlDoc.AssertDropdownHasOptions(t, "object_format_name")
+	}
 }
 
 func testRepoGenerate(t *testing.T, session *TestSession, templateID, templateOwnerName, templateRepoName string, user, generateOwner *user_model.User, generateRepoName string) {
@@ -126,6 +131,63 @@ func TestRepoCreateForm(t *testing.T) {
 	assertRepoCreateForm(t, htmlDoc, user, "")
 }
 
+func TestRepoCreateFormRepoLimit(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	org := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "org3"})
+	userName := "user2"
+	session := loginUser(t, userName)
+	locale := translation.NewLocale("en-US")
+	cannotCreateTr := locale.Tr("repo.form.cannot_create")
+
+	// Test the case where a user has hit the global max creation limit, but can still create
+	// a repo in an organization. Because the limit is greater than 0 we also show an alert
+	// to tell the user they have hit the limit.
+	t.Run("Limit above zero", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		maxCreationLimit := 1
+		creationLimitTr := locale.TrN(maxCreationLimit, "repo.form.reach_limit_of_creation_1", "repo.form.reach_limit_of_creation_n", maxCreationLimit)
+		defer test.MockVariableValue(&setting.Repository.MaxCreationLimit, maxCreationLimit)()
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/repo/create"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		assertRepoCreateForm(t, htmlDoc, org, "")
+
+		alert := htmlDoc.doc.Find("div.ui.negative.message").Text()
+		assert.Contains(t, alert, creationLimitTr)
+	})
+
+	// Test the case where a user has hit the global max creation limit, but can still create
+	// a repo in an organization. Because the limit is 0 we DO NOT show the alert.
+	t.Run("Limit is zero", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		maxCreationLimit := 0
+		defer test.MockVariableValue(&setting.Repository.MaxCreationLimit, maxCreationLimit)()
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/repo/create"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		assertRepoCreateForm(t, htmlDoc, org, "")
+
+		htmlDoc.AssertElement(t, "div.ui.negative.message", false)
+	})
+
+	// Test the case where a user has hit the global max creation limit, and also cannot create
+	// a repo in any of their orgs. The form isnt shown, and we deisplay an alert telling the user
+	// they can't create a repo.
+	t.Run("Global limit", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		maxCreationLimit := 0
+		defer test.MockVariableValue(&setting.Repository.MaxCreationLimit, maxCreationLimit)()
+
+		session := loginUser(t, "user8")
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/repo/create"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		alert := htmlDoc.doc.Find("div.ui.negative.message").Text()
+		assert.Contains(t, alert, cannotCreateTr)
+	})
+}
+
 func TestRepoGenerate(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	userName := "user1"
@@ -157,7 +219,7 @@ func TestRepoCreateFormTrimSpace(t *testing.T) {
 	})
 	resp := session.MakeRequest(t, req, http.StatusSeeOther)
 
-	assert.EqualValues(t, "/user2/spaced-name", test.RedirectURL(resp))
+	assert.Equal(t, "/user2/spaced-name", test.RedirectURL(resp))
 	unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: 2, Name: "spaced-name"})
 }
 
diff --git a/tests/integration/repo_mergecommit_revert_test.go b/tests/integration/repo_mergecommit_revert_test.go
index 600ee991f8..ef2c82bf66 100644
--- a/tests/integration/repo_mergecommit_revert_test.go
+++ b/tests/integration/repo_mergecommit_revert_test.go
@@ -34,5 +34,5 @@ func TestRepoMergeCommitRevert(t *testing.T) {
 	resp = session.MakeRequest(t, req, http.StatusSeeOther)
 
 	// A successful revert redirects to the main branch
-	assert.EqualValues(t, "/user2/test_commit_revert/src/branch/main", resp.Header().Get("Location"))
+	assert.Equal(t, "/user2/test_commit_revert/src/branch/main", resp.Header().Get("Location"))
 }
diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go
index 5e2f0c0a76..279e9861fe 100644
--- a/tests/integration/repo_migration_ui_test.go
+++ b/tests/integration/repo_migration_ui_test.go
@@ -1,9 +1,10 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 package integration
 
 import (
+	"fmt"
 	"net/http"
 	"testing"
 
@@ -13,104 +14,92 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+// TestRepoMigrationUI is used to test various form properties of different migration types
 func TestRepoMigrationUI(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-	sessionUser1 := loginUser(t, "user1")
-	// Nothing is tested in plain Git migration form right now
-	testRepoMigrationFormGitHub(t, sessionUser1)
-	testRepoMigrationFormGitea(t, sessionUser1)
-	testRepoMigrationFormGitLab(t, sessionUser1)
-	testRepoMigrationFormGogs(t, sessionUser1)
-	testRepoMigrationFormOneDev(t, sessionUser1)
-	testRepoMigrationFormGitBucket(t, sessionUser1)
-	testRepoMigrationFormCodebase(t, sessionUser1)
-	testRepoMigrationFormForgejo(t, sessionUser1)
-}
+	session := loginUser(t, "user1")
+	// Note: nothing is tested in plain Git migration form right now
 
-func testRepoMigrationFormGitHub(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=2"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
+	type Migration struct {
+		Name                      string
+		ExpectedItems             []string
+		DescriptionHasPlaceholder bool
+	}
 
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones", "releases"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
+	migrations := map[int]Migration{
+		2: {
+			"GitHub",
+			[]string{"issues", "pull_requests", "labels", "milestones", "releases"},
+			true,
+		},
+		3: {
+			"Gitea",
+			[]string{"issues", "pull_requests", "labels", "milestones", "releases"},
+			true,
+		},
+		4: {
+			"GitLab",
+			// Note: the checkbox "Merge requests" has name "pull_requests"
+			[]string{"issues", "pull_requests", "labels", "milestones", "releases"},
+			true,
+		},
+		5: {
+			"Gogs",
+			[]string{"issues", "labels", "milestones"},
+			true,
+		},
+		6: {
+			"OneDev",
+			[]string{"issues", "pull_requests", "labels", "milestones"},
+			true,
+		},
+		7: {
+			"GitBucket",
+			[]string{"issues", "pull_requests", "labels", "milestones", "releases"},
+			false,
+		},
+		8: {
+			"Codebase",
+			// Note: the checkbox "Merge requests" has name "pull_requests"
+			[]string{"issues", "pull_requests", "labels", "milestones"},
+			true,
+		},
+		9: {
+			"Forgejo",
+			[]string{"issues", "pull_requests", "labels", "milestones", "releases"},
+			true,
+		},
+	}
 
-func testRepoMigrationFormGitea(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=3"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
+	for id, migration := range migrations {
+		t.Run(migration.Name, func(t *testing.T) {
+			response := session.MakeRequest(t, NewRequest(t, "GET", fmt.Sprintf("/repo/migrate?service_type=%d", id)), http.StatusOK)
+			page := NewHTMLParser(t, response.Body)
 
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones", "releases"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
+			items := page.Find("#migrate_items .field .checkbox input")
+			testRepoMigrationFormItems(t, items, migration.ExpectedItems)
 
-func testRepoMigrationFormGitLab(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=4"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
+			page.AssertElement(t, "#clone_addr", true)
+			autocomplete, _ := page.Find("#clone_addr").Attr("autocomplete")
+			assert.Equal(t, "url", autocomplete)
 
-	items := page.Find("#migrate_items .field .checkbox input")
-	// Note: the checkbox "Merge requests" has name "pull_requests"
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones", "releases"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
-
-func testRepoMigrationFormGogs(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=5"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "labels", "milestones"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
-
-func testRepoMigrationFormOneDev(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=6"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
-
-func testRepoMigrationFormGitBucket(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=7"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones", "releases"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
-
-func testRepoMigrationFormCodebase(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=8"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-
-	items := page.Find("#migrate_items .field .checkbox input")
-	// Note: the checkbox "Merge requests" has name "pull_requests"
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones"}
-	testRepoMigrationFormItems(t, items, expectedItems)
-}
-
-func testRepoMigrationFormForgejo(t *testing.T, session *TestSession) {
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/repo/migrate?service_type=9"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-
-	items := page.Find("#migrate_items .field .checkbox input")
-	expectedItems := []string{"issues", "pull_requests", "labels", "milestones", "releases"}
-	testRepoMigrationFormItems(t, items, expectedItems)
+			page.AssertElement(t, "#description", true)
+			_, descriptionHasPlaceholder := page.Find("#description").Attr("placeholder")
+			assert.Equal(t, migration.DescriptionHasPlaceholder, descriptionHasPlaceholder)
+		})
+	}
 }
 
 func testRepoMigrationFormItems(t *testing.T, items *goquery.Selection, expectedItems []string) {
 	t.Helper()
 
 	// Compare lengths of item lists
-	assert.EqualValues(t, len(expectedItems), items.Length())
+	assert.Equal(t, len(expectedItems), items.Length())
 
 	// Compare contents of item lists
 	for index, expectedName := range expectedItems {
 		name, exists := items.Eq(index).Attr("name")
 		assert.True(t, exists)
-		assert.EqualValues(t, expectedName, name)
+		assert.Equal(t, expectedName, name)
 	}
 }
diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go
index 909668d3ca..aaaa4618cf 100644
--- a/tests/integration/repo_search_test.go
+++ b/tests/integration/repo_search_test.go
@@ -100,7 +100,7 @@ func testSearch(t *testing.T, url string, expected []string, indexer bool) {
 	container := doc.Find(".repository").Find(".ui.container")
 
 	branchDropdown := container.Find(".js-branch-tag-selector")
-	assert.EqualValues(t, indexer, len(branchDropdown.Nodes) == 0)
+	assert.Equal(t, indexer, len(branchDropdown.Nodes) == 0)
 
 	dropdownOptions := container.
 		Find(".menu[data-test-tag=fuzzy-dropdown]").
@@ -112,9 +112,9 @@ func testSearch(t *testing.T, url string, expected []string, indexer bool) {
 		})
 
 	if indexer {
-		assert.EqualValues(t, []string{"exact", "union"}, dropdownOptions)
+		assert.Equal(t, []string{"exact", "union"}, dropdownOptions)
 	} else {
-		assert.EqualValues(t, []string{"exact", "union", "regexp"}, dropdownOptions)
+		assert.Equal(t, []string{"exact", "union", "regexp"}, dropdownOptions)
 	}
 
 	filenames := resultFilenames(t, doc)
diff --git a/tests/integration/repo_settings_hook_test.go b/tests/integration/repo_settings_hook_test.go
index f7349d4e66..51feecb7fd 100644
--- a/tests/integration/repo_settings_hook_test.go
+++ b/tests/integration/repo_settings_hook_test.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"forgejo.org/models/db"
+	"forgejo.org/models/webhook"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
@@ -16,6 +18,8 @@ import (
 
 func TestRepoSettingsHookHistory(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
+	_, err := db.GetEngine(t.Context()).ID(2).Cols("is_delivered").Update(&webhook.HookTask{IsDelivered: false})
+	require.NoError(t, err)
 
 	session := loginUser(t, "user2")
 
@@ -26,6 +30,8 @@ func TestRepoSettingsHookHistory(t *testing.T) {
 	doc := NewHTMLParser(t, resp.Body)
 
 	t.Run("1/delivered", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
 		html, err := doc.doc.Find(".webhook div[data-tab='request-1']").Html()
 		require.NoError(t, err)
 		assert.Contains(t, html, "<strong>Request URL:</strong> /matrix-delivered\n")
@@ -39,6 +45,8 @@ func TestRepoSettingsHookHistory(t *testing.T) {
 	})
 
 	t.Run("2/undelivered", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
 		html, err := doc.doc.Find(".webhook div[data-tab='request-2']").Html()
 		require.NoError(t, err)
 		assert.Equal(t, "-", strings.TrimSpace(html))
@@ -49,6 +57,8 @@ func TestRepoSettingsHookHistory(t *testing.T) {
 	})
 
 	t.Run("3/success", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
 		html, err := doc.doc.Find(".webhook div[data-tab='request-3']").Html()
 		require.NoError(t, err)
 		assert.Contains(t, html, "<strong>Request URL:</strong> /matrix-success\n")
diff --git a/tests/integration/repo_settings_test.go b/tests/integration/repo_settings_test.go
index f78df96a93..6b467d78b2 100644
--- a/tests/integration/repo_settings_test.go
+++ b/tests/integration/repo_settings_test.go
@@ -6,26 +6,22 @@ package integration
 import (
 	"fmt"
 	"net/http"
-	"strings"
 	"testing"
 
 	"forgejo.org/models/db"
-	"forgejo.org/models/forgefed"
 	git_model "forgejo.org/models/git"
 	repo_model "forgejo.org/models/repo"
 	unit_model "forgejo.org/models/unit"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
-	fm "forgejo.org/modules/forgefed"
 	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
-	"forgejo.org/modules/test"
-	"forgejo.org/modules/validation"
 	gitea_context "forgejo.org/services/context"
 	repo_service "forgejo.org/services/repository"
 	user_service "forgejo.org/services/user"
 	"forgejo.org/tests"
 
+	"github.com/PuerkitoBio/goquery"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -40,6 +36,47 @@ func TestRepoSettingsUnits(t *testing.T) {
 	session.MakeRequest(t, req, http.StatusOK)
 }
 
+func TestRepoSettingsAdminOptions(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"})
+	admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{IsAdmin: true})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user.ID, Name: "repo1"})
+	link := repo.Link()
+
+	hasAdminOpts := func(t *testing.T, doer string, admin bool) {
+		session := loginUser(t, doer)
+
+		req := NewRequest(t, "GET", fmt.Sprintf("%s/settings", link))
+		resp := session.MakeRequest(t, req, http.StatusOK)
+		html := NewHTMLParser(t, resp.Body)
+
+		elems := html.doc.Find("button[name=request_reindex_type]")
+		if !admin {
+			assert.Empty(t, elems.Nodes)
+			return
+		}
+
+		values := []string{"code", "issues", "stats"}
+		if !setting.Indexer.RepoIndexerEnabled {
+			values = values[1:]
+		}
+		elems.Each(func(i int, s *goquery.Selection) {
+			attr, exists := s.Attr("value")
+			require.True(t, exists)
+			assert.Equal(t, values[i], attr)
+		})
+	}
+
+	t.Run("guest", func(t *testing.T) {
+		hasAdminOpts(t, user.Name, false)
+	})
+
+	t.Run("admin", func(t *testing.T) {
+		hasAdminOpts(t, admin.Name, true)
+	})
+}
+
 func TestRepoAddMoreUnitsHighlighting(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user2"})
@@ -263,72 +300,9 @@ func TestProtectedBranch(t *testing.T) {
 		session.MakeRequest(t, req, http.StatusSeeOther)
 		flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "error%3DThere%2Bis%2Balready%2Ba%2Brule%2Bfor%2Bthis%2Bset%2Bof%2Bbranches", flashCookie.Value)
+		assert.Equal(t, "error%3DThere%2Bis%2Balready%2Ba%2Brule%2Bfor%2Bthis%2Bset%2Bof%2Bbranches", flashCookie.Value)
 
 		// Verify it wasn't added.
 		unittest.AssertCount(t, &git_model.ProtectedBranch{RuleName: "master", RepoID: repo.ID}, 1)
 	})
 }
-
-func TestRepoFollowing(t *testing.T) {
-	setting.Federation.Enabled = true
-	defer tests.PrepareTestEnv(t)()
-	defer func() {
-		setting.Federation.Enabled = false
-	}()
-
-	mock := test.NewFederationServerMock()
-	federatedSrv := mock.DistantServer(t)
-	defer federatedSrv.Close()
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, OwnerID: user.ID})
-	session := loginUser(t, user.Name)
-
-	t.Run("Add a following repo", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
-		link := fmt.Sprintf("/%s/settings", repo.FullName())
-
-		req := NewRequestWithValues(t, "POST", link, map[string]string{
-			"_csrf":           GetCSRF(t, session, link),
-			"action":          "federation",
-			"following_repos": fmt.Sprintf("%s/api/v1/activitypub/repository-id/1", federatedSrv.URL),
-		})
-		session.MakeRequest(t, req, http.StatusSeeOther)
-
-		// Verify it was added.
-		federationHost := unittest.AssertExistsAndLoadBean(t, &forgefed.FederationHost{HostFqdn: "127.0.0.1"})
-		unittest.AssertExistsAndLoadBean(t, &repo_model.FollowingRepo{
-			ExternalID:       "1",
-			FederationHostID: federationHost.ID,
-		})
-	})
-
-	t.Run("Star a repo having a following repo", func(t *testing.T) {
-		defer tests.PrintCurrentTest(t)()
-		repoLink := fmt.Sprintf("/%s", repo.FullName())
-		link := fmt.Sprintf("%s/action/star", repoLink)
-		req := NewRequestWithValues(t, "POST", link, map[string]string{
-			"_csrf": GetCSRF(t, session, repoLink),
-		})
-
-		session.MakeRequest(t, req, http.StatusOK)
-
-		// Verify distant server received a like activity
-		like := fm.ForgeLike{}
-		err := like.UnmarshalJSON([]byte(mock.LastPost))
-		if err != nil {
-			t.Errorf("Error unmarshalling ForgeLike: %q", err)
-		}
-		if isValid, err := validation.IsValid(like); !isValid {
-			t.Errorf("ForgeLike is not valid: %q", err)
-		}
-		activityType := like.Type
-		object := like.Object.GetLink().String()
-		isLikeType := activityType == "Like"
-		isCorrectObject := strings.HasSuffix(object, "/api/v1/activitypub/repository-id/1")
-		if !isLikeType || !isCorrectObject {
-			t.Errorf("Activity is not a like for this repo")
-		}
-	})
-}
diff --git a/tests/integration/repo_star_federation_test.go b/tests/integration/repo_star_federation_test.go
new file mode 100644
index 0000000000..ae9a4e9f83
--- /dev/null
+++ b/tests/integration/repo_star_federation_test.go
@@ -0,0 +1,81 @@
+// Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+	"testing"
+
+	"forgejo.org/models/forgefed"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	fm "forgejo.org/modules/forgefed"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/modules/validation"
+	"forgejo.org/tests"
+)
+
+func TestActivityPubRepoFollowing(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
+
+	mock := test.NewFederationServerMock()
+	federatedSrv := mock.DistantServer(t)
+	defer federatedSrv.Close()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, OwnerID: user.ID})
+	session := loginUser(t, user.Name)
+
+	t.Run("Add a following repo", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		link := fmt.Sprintf("/%s/settings", repo.FullName())
+
+		req := NewRequestWithValues(t, "POST", link, map[string]string{
+			"_csrf":           GetCSRF(t, session, link),
+			"action":          "federation",
+			"following_repos": fmt.Sprintf("%s/api/v1/activitypub/repository-id/1", federatedSrv.URL),
+		})
+		session.MakeRequest(t, req, http.StatusSeeOther)
+
+		// Verify it was added.
+		federationHost := unittest.AssertExistsAndLoadBean(t, &forgefed.FederationHost{HostFqdn: "127.0.0.1"})
+		unittest.AssertExistsAndLoadBean(t, &repo_model.FollowingRepo{
+			ExternalID:       "1",
+			FederationHostID: federationHost.ID,
+		})
+	})
+
+	t.Run("Star a repo having a following repo", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		repoLink := fmt.Sprintf("/%s", repo.FullName())
+		link := fmt.Sprintf("%s/action/star", repoLink)
+		req := NewRequestWithValues(t, "POST", link, map[string]string{
+			"_csrf": GetCSRF(t, session, repoLink),
+		})
+
+		session.MakeRequest(t, req, http.StatusOK)
+
+		// Verify distant server received a like activity
+		like := fm.ForgeLike{}
+		err := like.UnmarshalJSON([]byte(mock.LastPost))
+		if err != nil {
+			t.Errorf("Error unmarshalling ForgeLike: %q", err)
+		}
+		if isValid, err := validation.IsValid(like); !isValid {
+			t.Errorf("ForgeLike is not valid: %q", err)
+		}
+		activityType := like.Type
+		object := like.Object.GetLink().String()
+		isLikeType := activityType == "Like"
+		isCorrectObject := strings.HasSuffix(object, "/api/v1/activitypub/repository-id/1")
+		if !isLikeType || !isCorrectObject {
+			t.Error("Activity is not a like for this repo")
+		}
+	})
+}
diff --git a/tests/integration/repo_starwatch_test.go b/tests/integration/repo_starwatch_test.go
index 3bcfa29fe3..85100eca30 100644
--- a/tests/integration/repo_starwatch_test.go
+++ b/tests/integration/repo_starwatch_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func testRepoStarringOrWatching(t *testing.T, action, listURI string) {
+func testRepoStarringOrWatching(t *testing.T, action, listURI string, expectEmpty bool) {
 	t.Helper()
 
 	defer tests.PrepareTestEnv(t)()
@@ -50,6 +50,12 @@ func testRepoStarringOrWatching(t *testing.T, action, listURI string) {
 	htmlDoc = NewHTMLParser(t, resp.Body)
 	htmlDoc.AssertElement(t, ".user-cards .list .card > a[href='/user5']", true)
 
+	if expectEmpty {
+		// Verify which user-cards elements are present
+		htmlDoc.AssertElement(t, ".user-cards > .list", true)
+		htmlDoc.AssertElement(t, ".user-cards > div", false)
+	}
+
 	// Unstar/unwatch the repo as user5
 	req = NewRequestWithValues(t, "POST", fmt.Sprintf("/user2/repo1/action/%s", oppositeAction), map[string]string{
 		"_csrf": GetCSRF(t, session, "/user2/repo1"),
@@ -73,15 +79,22 @@ func testRepoStarringOrWatching(t *testing.T, action, listURI string) {
 
 	// Verify that "user5" is not among the stargazers/watchers
 	htmlDoc = NewHTMLParser(t, resp.Body)
-	htmlDoc.AssertElement(t, ".user-cards .list .item.ui.segment > a[href='/user5']", false)
+	htmlDoc.AssertElement(t, ".user-cards .list .item.ui.segment > a[href='/user2']", false)
+
+	if expectEmpty {
+		// Verify which user-cards elements are present
+		htmlDoc.AssertElement(t, ".user-cards > .list", false)
+		htmlDoc.AssertElement(t, ".user-cards > div", true)
+	}
 }
 
 func TestRepoStarUnstarUI(t *testing.T) {
-	testRepoStarringOrWatching(t, "star", "stars")
+	testRepoStarringOrWatching(t, "star", "stars", true)
 }
 
 func TestRepoWatchUnwatchUI(t *testing.T) {
-	testRepoStarringOrWatching(t, "watch", "watchers")
+	testRepoStarringOrWatching(t, "watch", "watchers", false)
+	// Empty list state is not checked because repo is watched by many users
 }
 
 func TestDisabledStars(t *testing.T) {
diff --git a/tests/integration/repo_sync_fork_test.go b/tests/integration/repo_sync_fork_test.go
new file mode 100644
index 0000000000..fb08a69d8b
--- /dev/null
+++ b/tests/integration/repo_sync_fork_test.go
@@ -0,0 +1,152 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+
+	auth_model "forgejo.org/models/auth"
+	repo_model "forgejo.org/models/repo"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	api "forgejo.org/modules/structs"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func syncForkTest(t *testing.T, forkName, branchName string, webSync bool) {
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20})
+
+	baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	baseUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: baseRepo.OwnerID})
+
+	session := loginUser(t, user.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+
+	// Create a new fork
+	req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/forks", baseRepo.FullName()), &api.CreateForkOption{Name: &forkName}).AddTokenAuth(token)
+	MakeRequest(t, req, http.StatusAccepted)
+
+	req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/sync_fork/%s", user.Name, forkName, branchName).AddTokenAuth(token)
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	var syncForkInfo *api.SyncForkInfo
+	DecodeJSON(t, resp, &syncForkInfo)
+
+	// This is a new fork, so the commits in both branches should be the same
+	assert.False(t, syncForkInfo.Allowed)
+	assert.Equal(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit)
+
+	// Make a commit on the base branch
+	err := createOrReplaceFileInBranch(baseUser, baseRepo, "sync_fork.txt", branchName, "Hello")
+	require.NoError(t, err)
+
+	req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/sync_fork/%s", user.Name, forkName, branchName).AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+
+	DecodeJSON(t, resp, &syncForkInfo)
+
+	// The commits should no longer be the same and we can sync
+	assert.True(t, syncForkInfo.Allowed)
+	assert.NotEqual(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit)
+
+	// Sync the fork
+	if webSync {
+		session.MakeRequest(t, NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/%s/sync_fork", user.Name, forkName), map[string]string{
+			"_csrf":  GetCSRF(t, session, fmt.Sprintf("/%s/%s", user.Name, forkName)),
+			"branch": branchName,
+		}), http.StatusSeeOther)
+	} else {
+		req = NewRequestf(t, "POST", "/api/v1/repos/%s/%s/sync_fork/%s", user.Name, forkName, branchName).AddTokenAuth(token)
+		MakeRequest(t, req, http.StatusNoContent)
+	}
+
+	req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/sync_fork/%s", user.Name, forkName, branchName).AddTokenAuth(token)
+	resp = MakeRequest(t, req, http.StatusOK)
+
+	DecodeJSON(t, resp, &syncForkInfo)
+
+	// After the sync both commits should be the same again
+	assert.False(t, syncForkInfo.Allowed)
+	assert.Equal(t, syncForkInfo.BaseCommit, syncForkInfo.ForkCommit)
+}
+
+func TestAPIRepoSyncForkDefault(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		syncForkTest(t, "SyncForkDefault", "master", false)
+	})
+}
+
+func TestAPIRepoSyncForkBranch(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		syncForkTest(t, "SyncForkBranch", "master", false)
+	})
+}
+
+func TestWebRepoSyncForkBranch(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		syncForkTest(t, "SyncForkBranch", "master", true)
+	})
+}
+
+func TestWebRepoSyncForkHomepage(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+		baseOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: baseRepo.OwnerID})
+		baseOwnerSession := loginUser(t, baseOwner.Name)
+
+		forkOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 20})
+		forkOwnerSession := loginUser(t, forkOwner.Name)
+		token := getTokenForLoggedInUser(t, forkOwnerSession, auth_model.AccessTokenScopeWriteRepository)
+
+		forkName := "SyncForkHomepage"
+		forkLink := fmt.Sprintf("/%s/%s", forkOwner.Name, forkName)
+		branchName := "<script>alert('0ko')</script>&amp;"
+		branchHTMLEscaped := "&lt;script&gt;alert(&#39;0ko&#39;)&lt;/script&gt;&amp;amp;"
+		branchURLEscaped := "%3Cscript%3Ealert%28%270ko%27%29%3C/script%3E&amp;amp%3B"
+
+		// Rename branch "master" to test name escaping in the UI
+		baseOwnerSession.MakeRequest(t, NewRequestWithValues(t, "POST",
+			"/user2/repo1/settings/rename_branch", map[string]string{
+				"_csrf": GetCSRF(t, baseOwnerSession, "/user2/repo1/branches"),
+				"from":  "master",
+				"to":    branchName,
+			}), http.StatusSeeOther)
+
+		// Create a new fork
+		req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/forks", baseRepo.FullName()), &api.CreateForkOption{Name: &forkName}).AddTokenAuth(token)
+		MakeRequest(t, req, http.StatusAccepted)
+
+		// Make a commit on the base branch
+		err := createOrReplaceFileInBranch(baseOwner, baseRepo, "sync_fork.txt", branchName, "Hello")
+		require.NoError(t, err)
+
+		doc := NewHTMLParser(t, forkOwnerSession.MakeRequest(t,
+			NewRequest(t, "GET", forkLink), http.StatusOK).Body)
+
+		// Verify correct URL escaping of branch name in the form
+		form := doc.Find("#sync_fork_msg form")
+		assert.Equal(t, 1, form.Length())
+		updateLink, exists := form.Attr("action")
+		assert.True(t, exists)
+
+		// Verify correct escaping of branch name in the message
+		raw, _ := doc.Find("#sync_fork_msg").Html()
+		assert.Contains(t, raw, fmt.Sprintf(`This branch is 1 commit behind <a href="http://localhost:%s/user2/repo1/src/branch/%s">user2/repo1:%s</a>`,
+			u.Port(), branchURLEscaped, branchHTMLEscaped))
+
+		// Verify that the form link doesn't do anything for a GET request
+		forkOwnerSession.MakeRequest(t, NewRequest(t, "GET", updateLink), http.StatusMethodNotAllowed)
+
+		// Verify that the form link does not error out
+		forkOwnerSession.MakeRequest(t, NewRequestWithValues(t, "POST", updateLink, map[string]string{
+			"_csrf":  GetCSRF(t, forkOwnerSession, forkLink),
+			"branch": branchName,
+		}), http.StatusSeeOther)
+	})
+}
diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go
index 9be33ec8a8..4f72b58d12 100644
--- a/tests/integration/repo_tag_test.go
+++ b/tests/integration/repo_tag_test.go
@@ -41,11 +41,11 @@ func TestTagViewWithoutRelease(t *testing.T) {
 
 	// Test that the tags sub-menu is active and has a counter
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	tagsTab := htmlDoc.Find(".small-menu-items .active.item[href$='/tags']")
+	tagsTab := htmlDoc.Find(".switch .active.item[href$='/tags']")
 	assert.Contains(t, tagsTab.Text(), "4 tags")
 
 	// Test that the release sub-menu isn't active
-	releaseLink := htmlDoc.Find(".small-menu-items .item[href$='/releases']")
+	releaseLink := htmlDoc.Find(".switch .item[href$='/releases']")
 	assert.False(t, releaseLink.HasClass("active"))
 
 	// Test that the title is displayed
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index 308942e4fe..898d0d1fa6 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -1,24 +1,32 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
+// Copyright 2023 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package integration
 
 import (
+	"context"
+	"encoding/base64"
 	"fmt"
 	"net/http"
 	"net/url"
+	"os"
 	"path"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
 
+	auth_model "forgejo.org/models/auth"
 	"forgejo.org/models/db"
 	repo_model "forgejo.org/models/repo"
 	unit_model "forgejo.org/models/unit"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/git"
+	"forgejo.org/modules/optional"
 	"forgejo.org/modules/setting"
+	api "forgejo.org/modules/structs"
 	"forgejo.org/modules/test"
 	"forgejo.org/modules/translation"
 	repo_service "forgejo.org/services/repository"
@@ -95,7 +103,7 @@ func testViewRepo(t *testing.T) {
 	})
 
 	commitT := time.Date(2017, time.June, 14, 13, 54, 21, 0, time.UTC).In(time.Local).Format(time.RFC1123)
-	assert.EqualValues(t, []file{
+	assert.Equal(t, []file{
 		{
 			fileName:   "doc",
 			commitID:   "2a47ca4b614a9f5a43abbd5ad851a54a616ffee6",
@@ -190,9 +198,9 @@ func TestViewRepoWithSymlinks(t *testing.T) {
 
 // TestViewAsRepoAdmin tests PR #2167
 func TestViewAsRepoAdmin(t *testing.T) {
-	for _, user := range []string{"user2", "user4"} {
-		defer tests.PrepareTestEnv(t)()
+	defer tests.PrepareTestEnv(t)()
 
+	for _, user := range []string{"user2", "user4"} {
 		session := loginUser(t, user)
 
 		req := NewRequest(t, "GET", "/user2/repo1.git")
@@ -217,13 +225,13 @@ func TestRepoHTMLTitle(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1")
-			assert.EqualValues(t, "user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 		t.Run("With description", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user27/repo49")
-			assert.EqualValues(t, "user27/repo49: A wonderful repository with more than just a README.md - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "user27/repo49: A wonderful repository with more than just a README.md - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 	})
 
@@ -233,25 +241,25 @@ func TestRepoHTMLTitle(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/branch/master/deep/nesting")
-				assert.EqualValues(t, "repo59/deep/nesting at master - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting at master - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Non-default branch", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/branch/cake-recipe/deep/nesting")
-				assert.EqualValues(t, "repo59/deep/nesting at cake-recipe - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting at cake-recipe - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Commit", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/commit/d8f53dfb33f6ccf4169c34970b5e747511c18beb/deep/nesting/")
-				assert.EqualValues(t, "repo59/deep/nesting at d8f53dfb33f6ccf4169c34970b5e747511c18beb - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting at d8f53dfb33f6ccf4169c34970b5e747511c18beb - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Tag", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/tag/v1.0/deep/nesting/")
-				assert.EqualValues(t, "repo59/deep/nesting at v1.0 - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting at v1.0 - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 		})
 		t.Run("File", func(t *testing.T) {
@@ -259,25 +267,25 @@ func TestRepoHTMLTitle(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/branch/master/deep/nesting/folder/secret_sauce_recipe.txt")
-				assert.EqualValues(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at master - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at master - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Non-default branch", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/branch/cake-recipe/deep/nesting/folder/secret_sauce_recipe.txt")
-				assert.EqualValues(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at cake-recipe - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at cake-recipe - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Commit", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/commit/d8f53dfb33f6ccf4169c34970b5e747511c18beb/deep/nesting/folder/secret_sauce_recipe.txt")
-				assert.EqualValues(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at d8f53dfb33f6ccf4169c34970b5e747511c18beb - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at d8f53dfb33f6ccf4169c34970b5e747511c18beb - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 			t.Run("Tag", func(t *testing.T) {
 				defer tests.PrintCurrentTest(t)()
 
 				htmlTitle := GetHTMLTitle(t, nil, "/user2/repo59/src/tag/v1.0/deep/nesting/folder/secret_sauce_recipe.txt")
-				assert.EqualValues(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at v1.0 - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+				assert.Equal(t, "repo59/deep/nesting/folder/secret_sauce_recipe.txt at v1.0 - user2/repo59 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 			})
 		})
 	})
@@ -287,13 +295,13 @@ func TestRepoHTMLTitle(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/issues")
-			assert.EqualValues(t, "Issues - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "Issues - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 		t.Run("View issue page", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/issues/1")
-			assert.EqualValues(t, "#1 - issue1 - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "#1 - issue1 - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 	})
 
@@ -302,13 +310,13 @@ func TestRepoHTMLTitle(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/pulls")
-			assert.EqualValues(t, "Pull requests - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "Pull requests - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 		t.Run("View pull request", func(t *testing.T) {
 			defer tests.PrintCurrentTest(t)()
 
 			htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/pulls/2")
-			assert.EqualValues(t, "#2 - issue2 - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
+			assert.Equal(t, "#2 - issue2 - user2/repo1 - Forgejo: Beyond coding. We Forge.", htmlTitle)
 		})
 	})
 }
@@ -327,9 +335,9 @@ func TestViewFileInRepo(t *testing.T) {
 	repoTopics := htmlDoc.doc.Find("#repo-topics")
 	repoSummary := htmlDoc.doc.Find(".repository-summary")
 
-	assert.EqualValues(t, 0, description.Length())
-	assert.EqualValues(t, 0, repoTopics.Length())
-	assert.EqualValues(t, 0, repoSummary.Length())
+	assert.Equal(t, 0, description.Length())
+	assert.Equal(t, 0, repoTopics.Length())
+	assert.Equal(t, 0, repoSummary.Length())
 }
 
 func TestViewFileInRepoRSSFeed(t *testing.T) {
@@ -383,9 +391,9 @@ func TestBlameFileInRepo(t *testing.T) {
 		repoTopics := htmlDoc.doc.Find("#repo-topics")
 		repoSummary := htmlDoc.doc.Find(".repository-summary")
 
-		assert.EqualValues(t, 0, description.Length())
-		assert.EqualValues(t, 0, repoTopics.Length())
-		assert.EqualValues(t, 0, repoSummary.Length())
+		assert.Equal(t, 0, description.Length())
+		assert.Equal(t, 0, repoTopics.Length())
+		assert.Equal(t, 0, repoSummary.Length())
 	})
 
 	t.Run("File size", func(t *testing.T) {
@@ -579,6 +587,26 @@ func TestRenamedFileHistory(t *testing.T) {
 		assert.Equal(t, "/user2/repo59/commits/commit/80b83c5c8220c3aa3906e081f202a2a7563ec879/licnse", oldFileHistoryLink)
 	})
 
+	t.Run("Renamed file, pagination", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		defer test.MockVariableValue(&setting.Git.CommitsRangeSize, 1)() // Limit commits displayed on the page to one
+
+		resp := MakeRequest(t, NewRequest(t, "GET", "/user2/repo59/commits/branch/master/license"), http.StatusOK)
+		page1 := NewHTMLParser(t, resp.Body)
+
+		resp = MakeRequest(t, NewRequest(t, "GET", "/user2/repo59/commits/branch/master/license?page=2"), http.StatusOK)
+		page2 := NewHTMLParser(t, resp.Body)
+
+		// Browse further is only shown on 2nd page
+		browseFurtherSel := ".ui.bottom.attached.header a[href='/user2/repo59/commits/commit/80b83c5c8220c3aa3906e081f202a2a7563ec879/licnse']"
+		page1.AssertElement(t, browseFurtherSel, false)
+		page2.AssertElement(t, browseFurtherSel, true)
+
+		// Pagination goes after Browser further
+		afterBrowseFurther := page2.Find(browseFurtherSel).Parent().Parent().NextAll()
+		assert.Equal(t, 1, afterBrowseFurther.Find(".pagination.menu").Length())
+	})
+
 	t.Run("Non renamed file", func(t *testing.T) {
 		req := NewRequest(t, "GET", "/user2/repo59/commits/branch/master/README.md")
 		resp := MakeRequest(t, req, http.StatusOK)
@@ -679,6 +707,79 @@ func TestViewCommit(t *testing.T) {
 	assert.True(t, test.IsNormalPageCompleted(resp.Body.String()), "non-existing commit should render 404 page")
 }
 
+func TestViewCommitSignature(t *testing.T) {
+	t.Cleanup(func() {
+		// Cannot use t.Context(), it is in the done state.
+		require.NoError(t, git.InitFull(context.Background()))
+	})
+
+	defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")()
+	defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")()
+	defer test.MockVariableValue(&setting.Repository.Signing.CRUDActions, []string{"always"})()
+	defer test.MockVariableValue(&setting.Repository.Signing.InitialCommit, []string{"always"})()
+
+	filePath := "signed.txt"
+	fromBranch := "master"
+	toBranch := "branch-signed"
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		// Use a new GNUPGPHOME to avoid messing with the existing GPG keyring.
+		tmpDir := t.TempDir()
+		require.NoError(t, os.Chmod(tmpDir, 0o700))
+		t.Setenv("GNUPGHOME", tmpDir)
+
+		rootKeyPair, err := importTestingKey()
+		require.NoError(t, err)
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())()
+		defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")()
+
+		// Ensure the git config is updated with the new signing format.
+		require.NoError(t, git.InitFull(t.Context()))
+
+		user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+		testCtx := NewAPITestContext(t, user.Name, "commit-header-signed", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		u.Path = testCtx.GitPath()
+
+		t.Run("Create repository", doAPICreateRepository(testCtx, nil, git.Sha1ObjectFormat))
+
+		t.Run("Create commit", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			options := &api.CreateFileOptions{
+				FileOptions: api.FileOptions{
+					BranchName:    fromBranch,
+					NewBranchName: toBranch,
+					Message:       fmt.Sprintf("from:%s to:%s path:%s", fromBranch, toBranch, filePath),
+					Author: api.Identity{
+						Name:  user.FullName,
+						Email: user.Email,
+					},
+					Committer: api.Identity{
+						Name:  user.FullName,
+						Email: user.Email,
+					},
+				},
+				ContentBase64: base64.StdEncoding.EncodeToString(fmt.Appendf(nil, "This is new text for %s", filePath)),
+			}
+
+			req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", testCtx.Username, testCtx.Reponame, filePath), &options).
+				AddTokenAuth(testCtx.Token)
+			resp := testCtx.Session.MakeRequest(t, req, http.StatusCreated)
+
+			var contents api.FileResponse
+			DecodeJSON(t, resp, &contents)
+
+			assert.True(t, contents.Verification.Verified)
+
+			req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/commit/%s", testCtx.Username, testCtx.Reponame, contents.Commit.SHA))
+			resp = testCtx.Session.MakeRequest(t, req, http.StatusOK)
+
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			htmlDoc.AssertElement(t, ".commit-header-row.message.isSigned.isVerified", true)
+		})
+	})
+}
+
 func TestCommitView(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -691,7 +792,7 @@ func TestCommitView(t *testing.T) {
 
 		// Really ensure that 404 is being sent back.
 		doc := NewHTMLParser(t, resp.Body)
-		doc.AssertElement(t, `[aria-label="Page Not Found"]`, true)
+		doc.AssertElement(t, `[aria-label="Page not found"]`, true)
 	})
 
 	t.Run("Too short commit ID", func(t *testing.T) {
@@ -884,7 +985,7 @@ func TestRepoFilesList(t *testing.T) {
 			return s.AttrOr("data-entryname", "")
 		})
 
-		assert.EqualValues(t, []string{"Charlie", "alpha", "Beta", "delta", "licensa", "LICENSE", "licensz", "README.md", "zEta"}, filesList)
+		assert.Equal(t, []string{"Charlie", "alpha", "Beta", "delta", "licensa", "LICENSE", "licensz", "README.md", "zEta"}, filesList)
 	})
 }
 
@@ -1443,3 +1544,41 @@ func TestBlameDirectory(t *testing.T) {
 	req = NewRequest(t, "GET", "/user2/repo59/blame/branch/master/deep")
 	MakeRequest(t, req, http.StatusNotFound)
 }
+
+func TestInitInstructions(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+	session := loginUser(t, user.Name)
+
+	forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) {
+		defer tests.PrintCurrentTest(t)()
+		name := objectFormat.Name()
+		var init string
+		if name == "sha1" {
+			init = "git init"
+		} else {
+			init = fmt.Sprintf("git init --object-format=%s", name)
+		}
+
+		repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{
+			Name:         optional.Some(name + "-instruction"),
+			AutoInit:     optional.Some(false),
+			EnabledUnits: optional.Some([]unit_model.Type{unit_model.TypeCode}),
+			ObjectFormat: optional.Some(name),
+		})
+		defer f()
+
+		portMatcher := regexp.MustCompile(`localhost:\d+`)
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "/"+repo.FullName()), http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		assert.Equal(t, fmt.Sprintf(`touch README.md
+%s
+git switch -c main
+git add README.md
+git commit -m "first commit"
+git remote add origin http://localhost/user2/%s-instruction.git
+git push -u origin main`, init, name), portMatcher.ReplaceAllString(htmlDoc.Find(".empty-repo-guide code").First().Text(), "localhost"))
+	})
+}
diff --git a/tests/integration/repo_topic_test.go b/tests/integration/repo_topic_test.go
index 6dc60e2c3a..0f11d451d6 100644
--- a/tests/integration/repo_topic_test.go
+++ b/tests/integration/repo_topic_test.go
@@ -32,7 +32,7 @@ func TestTopicSearch(t *testing.T) {
 	res := MakeRequest(t, NewRequest(t, "GET", searchURL.String()), http.StatusOK)
 	DecodeJSON(t, res, &topics)
 	assert.Len(t, topics.TopicNames, 4)
-	assert.EqualValues(t, "6", res.Header().Get("x-total-count"))
+	assert.Equal(t, "6", res.Header().Get("x-total-count"))
 
 	query.Add("q", "topic")
 	searchURL.RawQuery = query.Encode()
@@ -46,8 +46,8 @@ func TestTopicSearch(t *testing.T) {
 	DecodeJSON(t, res, &topics)
 	if assert.Len(t, topics.TopicNames, 1) {
 		assert.EqualValues(t, 2, topics.TopicNames[0].ID)
-		assert.EqualValues(t, "database", topics.TopicNames[0].Name)
-		assert.EqualValues(t, 1, topics.TopicNames[0].RepoCount)
+		assert.Equal(t, "database", topics.TopicNames[0].Name)
+		assert.Equal(t, 1, topics.TopicNames[0].RepoCount)
 	}
 }
 
diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go
index be1b9cbcec..ffddd47faa 100644
--- a/tests/integration/repo_webhook_test.go
+++ b/tests/integration/repo_webhook_test.go
@@ -337,6 +337,8 @@ func testWebhookFormsShared(t *testing.T, endpoint, name string, session *TestSe
 	resp := session.MakeRequest(t, NewRequest(t, "GET", endpoint+"/"+name+"/new"), http.StatusOK)
 	htmlForm := NewHTMLParser(t, resp.Body).Find(`form[action^="` + endpoint + `/"]`)
 
+	testWebhookFormsSharedChooseEvents(t, htmlForm)
+
 	// fill the form
 	payload := map[string]string{
 		"_csrf":  htmlForm.Find(`input[name="_csrf"]`).AttrOr("value", ""),
@@ -472,3 +474,37 @@ func assertHasFlashMessages(t *testing.T, resp *httptest.ResponseRecorder, expec
 		t.Errorf("unexpected flash message %q: %q", k, v)
 	}
 }
+
+func testWebhookFormsSharedChooseEvents(t *testing.T, htmlForm *goquery.Selection) {
+	webhookTypes := []string{
+		"create",
+		"delete",
+		"fork",
+		"push",
+		"repository",
+		"release",
+		"package",
+		"wiki",
+		"issues",
+		"issue_assign",
+		"issue_label",
+		"issue_milestone",
+		"issue_comment",
+		"pull_request",
+		"pull_request_assign",
+		"pull_request_label",
+		"pull_request_milestone",
+		"pull_request_comment",
+		"pull_request_review",
+		"pull_request_sync",
+		"pull_request_review_request",
+		"action_failure",
+		"action_recover",
+		"action_success",
+	}
+
+	// check all types of webhooks are present in the form
+	for _, webhookType := range webhookTypes {
+		assertInput(t, htmlForm, webhookType)
+	}
+}
diff --git a/tests/integration/repo_wiki_test.go b/tests/integration/repo_wiki_test.go
index 5cd893702d..7ade01bf10 100644
--- a/tests/integration/repo_wiki_test.go
+++ b/tests/integration/repo_wiki_test.go
@@ -6,6 +6,8 @@ package integration
 import (
 	"fmt"
 	"net/http"
+	"net/http/httptest"
+	"strings"
 	"testing"
 
 	auth_model "forgejo.org/models/auth"
@@ -110,6 +112,107 @@ func TestWikiTOC(t *testing.T) {
 		resp := MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
 
-		assert.EqualValues(t, "Helpdesk", htmlDoc.Find(".wiki-content-toc a").Text())
+		assert.Equal(t, "Helpdesk", htmlDoc.Find(".wiki-content-toc a").Text())
+	})
+}
+
+func canEditWiki(t *testing.T, username, url string, canEdit bool) {
+	t.Helper()
+	// t.Parallel()
+
+	req := NewRequest(t, "GET", url)
+
+	var resp *httptest.ResponseRecorder
+	if username != "" {
+		session := loginUser(t, username)
+		resp = session.MakeRequest(t, req, http.StatusOK)
+	} else {
+		resp = MakeRequest(t, req, http.StatusOK)
+	}
+	doc := NewHTMLParser(t, resp.Body)
+	res := doc.Find(`a[href^="` + url + `"]`).Map(func(_ int, el *goquery.Selection) string {
+		return el.AttrOr("href", "")
+	})
+	found := false
+	for _, href := range res {
+		if strings.HasSuffix(href, "?action=_new") {
+			if !canEdit {
+				t.Errorf("unexpected edit link: %s", href)
+			}
+			found = true
+			break
+		}
+	}
+	if canEdit {
+		assert.True(t, found, "could not find ?action=_new link among %v", res)
+	}
+}
+
+func TestWikiPermissions(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	t.Run("default settings", func(t *testing.T) {
+		t.Run("anonymous", func(t *testing.T) {
+			canEditWiki(t, "", "/user5/repo4/wiki", false)
+		})
+		t.Run("owner", func(t *testing.T) {
+			canEditWiki(t, "user5", "/user5/repo4/wiki", true)
+		})
+		t.Run("collaborator", func(t *testing.T) {
+			canEditWiki(t, "user4", "/user5/repo4/wiki", true)
+			canEditWiki(t, "user29", "/user5/repo4/wiki", true)
+		})
+		t.Run("other user", func(t *testing.T) {
+			canEditWiki(t, "user2", "/user5/repo4/wiki", false)
+		})
+	})
+
+	t.Run("saved unchanged settings", func(t *testing.T) {
+		session := loginUser(t, "user5")
+		csrf := GetCSRF(t, session, "/user5/repo4/settings/units")
+		req := NewRequestWithValues(t, "POST", "/user5/repo4/settings/units", map[string]string{
+			"_csrf":       csrf,
+			"enable_wiki": "on",
+		})
+		session.MakeRequest(t, req, http.StatusSeeOther)
+
+		t.Run("anonymous", func(t *testing.T) {
+			canEditWiki(t, "", "/user5/repo4/wiki", false)
+		})
+		t.Run("owner", func(t *testing.T) {
+			canEditWiki(t, "user5", "/user5/repo4/wiki", true)
+		})
+		t.Run("collaborator", func(t *testing.T) {
+			canEditWiki(t, "user4", "/user5/repo4/wiki", true)
+			canEditWiki(t, "user29", "/user5/repo4/wiki", true)
+		})
+		t.Run("other user", func(t *testing.T) {
+			canEditWiki(t, "user2", "/user5/repo4/wiki", false)
+		})
+	})
+
+	t.Run("globally writable", func(t *testing.T) {
+		session := loginUser(t, "user5")
+		csrf := GetCSRF(t, session, "/user5/repo4/settings/units")
+		req := NewRequestWithValues(t, "POST", "/user5/repo4/settings/units", map[string]string{
+			"_csrf":                   csrf,
+			"enable_wiki":             "on",
+			"globally_writeable_wiki": "on",
+		})
+		session.MakeRequest(t, req, http.StatusSeeOther)
+
+		t.Run("anonymous", func(t *testing.T) {
+			canEditWiki(t, "", "/user5/repo4/wiki", false)
+		})
+		t.Run("owner", func(t *testing.T) {
+			canEditWiki(t, "user5", "/user5/repo4/wiki", true)
+		})
+		t.Run("collaborator", func(t *testing.T) {
+			canEditWiki(t, "user4", "/user5/repo4/wiki", true)
+			canEditWiki(t, "user29", "/user5/repo4/wiki", true)
+		})
+		t.Run("other user", func(t *testing.T) {
+			canEditWiki(t, "user2", "/user5/repo4/wiki", true)
+		})
 	})
 }
diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go
index dce310b0fc..42d47c4591 100644
--- a/tests/integration/repofiles_change_test.go
+++ b/tests/integration/repofiles_change_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
 package integration
@@ -10,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"forgejo.org/models/asymkey"
 	repo_model "forgejo.org/models/repo"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
@@ -101,14 +103,14 @@ func getExpectedFileResponseForRepofilesDelete() *api.FileResponse {
 		},
 		Verification: &api.PayloadCommitVerification{
 			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
+			Reason:    asymkey.NotSigned,
 			Signature: "",
 			Payload:   "",
 		},
 	}
 }
 
-func getExpectedFileResponseForRepofilesCreate(commitID, lastCommitSHA string) *api.FileResponse {
+func getExpectedFileResponseForRepofilesCreate(commitID, lastCommitSHA string, lastCommitWhen time.Time) *api.FileResponse {
 	treePath := "new/file.txt"
 	encoding := "base64"
 	content := "VGhpcyBpcyBhIE5FVyBmaWxl"
@@ -118,18 +120,19 @@ func getExpectedFileResponseForRepofilesCreate(commitID, lastCommitSHA string) *
 	downloadURL := setting.AppURL + "user2/repo1/raw/branch/master/" + treePath
 	return &api.FileResponse{
 		Content: &api.ContentsResponse{
-			Name:          filepath.Base(treePath),
-			Path:          treePath,
-			SHA:           "103ff9234cefeee5ec5361d22b49fbb04d385885",
-			LastCommitSHA: lastCommitSHA,
-			Type:          "file",
-			Size:          18,
-			Encoding:      &encoding,
-			Content:       &content,
-			URL:           &selfURL,
-			HTMLURL:       &htmlURL,
-			GitURL:        &gitURL,
-			DownloadURL:   &downloadURL,
+			Name:           filepath.Base(treePath),
+			Path:           treePath,
+			SHA:            "103ff9234cefeee5ec5361d22b49fbb04d385885",
+			LastCommitSHA:  lastCommitSHA,
+			LastCommitWhen: lastCommitWhen,
+			Type:           "file",
+			Size:           18,
+			Encoding:       &encoding,
+			Content:        &content,
+			URL:            &selfURL,
+			HTMLURL:        &htmlURL,
+			GitURL:         &gitURL,
+			DownloadURL:    &downloadURL,
 			Links: &api.FileLinksResponse{
 				Self:    &selfURL,
 				GitURL:  &gitURL,
@@ -170,14 +173,14 @@ func getExpectedFileResponseForRepofilesCreate(commitID, lastCommitSHA string) *
 		},
 		Verification: &api.PayloadCommitVerification{
 			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
+			Reason:    asymkey.NotSigned,
 			Signature: "",
 			Payload:   "",
 		},
 	}
 }
 
-func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA string) *api.FileResponse {
+func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA string, lastCommitWhen time.Time) *api.FileResponse {
 	encoding := "base64"
 	content := "VGhpcyBpcyBVUERBVEVEIGNvbnRlbnQgZm9yIHRoZSBSRUFETUUgZmlsZQ=="
 	selfURL := setting.AppURL + "api/v1/repos/user2/repo1/contents/" + filename + "?ref=master"
@@ -186,18 +189,19 @@ func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA
 	downloadURL := setting.AppURL + "user2/repo1/raw/branch/master/" + filename
 	return &api.FileResponse{
 		Content: &api.ContentsResponse{
-			Name:          filename,
-			Path:          filename,
-			SHA:           "dbf8d00e022e05b7e5cf7e535de857de57925647",
-			LastCommitSHA: lastCommitSHA,
-			Type:          "file",
-			Size:          43,
-			Encoding:      &encoding,
-			Content:       &content,
-			URL:           &selfURL,
-			HTMLURL:       &htmlURL,
-			GitURL:        &gitURL,
-			DownloadURL:   &downloadURL,
+			Name:           filename,
+			Path:           filename,
+			SHA:            "dbf8d00e022e05b7e5cf7e535de857de57925647",
+			LastCommitSHA:  lastCommitSHA,
+			LastCommitWhen: lastCommitWhen,
+			Type:           "file",
+			Size:           43,
+			Encoding:       &encoding,
+			Content:        &content,
+			URL:            &selfURL,
+			HTMLURL:        &htmlURL,
+			GitURL:         &gitURL,
+			DownloadURL:    &downloadURL,
 			Links: &api.FileLinksResponse{
 				Self:    &selfURL,
 				GitURL:  &gitURL,
@@ -238,7 +242,7 @@ func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA
 		},
 		Verification: &api.PayloadCommitVerification{
 			Verified:  false,
-			Reason:    "gpg.error.not_signed_commit",
+			Reason:    asymkey.NotSigned,
 			Signature: "",
 			Payload:   "",
 		},
@@ -264,12 +268,12 @@ func TestChangeRepoFiles(t *testing.T) {
 			require.NoError(t, err)
 			lastCommit, err := gitRepo.GetCommitByPath("new/file.txt")
 			require.NoError(t, err)
-			expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String())
-			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
+			expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String(), lastCommit.Committer.When)
+			assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
+			assert.Equal(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
 		})
 
 		t.Run("Update", func(t *testing.T) {
@@ -282,12 +286,36 @@ func TestChangeRepoFiles(t *testing.T) {
 			require.NoError(t, err)
 			lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
 			require.NoError(t, err)
-			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
-			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When)
+			assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
+			assert.Equal(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
+		})
+
+		t.Run("Update with commit ID (without blob sha)", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			opts := getUpdateRepoFilesOptions(repo)
+
+			commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
+			require.NoError(t, err)
+
+			opts.Files[0].SHA = ""
+			opts.LastCommitID = commit.ID.String()
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			require.NoError(t, err)
+
+			commit, err = gitRepo.GetBranchCommit(opts.NewBranch)
+			require.NoError(t, err)
+			lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
+			require.NoError(t, err)
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When)
+			assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
+			assert.Equal(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name)
 		})
 
 		t.Run("Update and move", func(t *testing.T) {
@@ -303,7 +331,7 @@ func TestChangeRepoFiles(t *testing.T) {
 			require.NoError(t, err)
 			lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath)
 			require.NoError(t, err)
-			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When)
 
 			// assert that the old file no longer exists in the last commit of the branch
 			fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath)
@@ -318,12 +346,12 @@ func TestChangeRepoFiles(t *testing.T) {
 			assert.Nil(t, fromEntry)  // Should no longer exist here
 			assert.NotNil(t, toEntry) // Should exist here
 			// assert SHA has remained the same but paths use the new file name
-			assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA)
-			assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name)
-			assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path)
-			assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL)
-			assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
-			assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
+			assert.Equal(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA)
+			assert.Equal(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name)
+			assert.Equal(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path)
+			assert.Equal(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL)
+			assert.Equal(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA)
+			assert.Equal(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL)
 		})
 
 		t.Run("Change without branch names", func(t *testing.T) {
@@ -339,8 +367,8 @@ func TestChangeRepoFiles(t *testing.T) {
 
 			commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch)
 			lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath)
-			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String())
-			assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0])
+			expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String(), lastCommit.Committer.When)
+			assert.Equal(t, expectedFileResponse.Content, filesResponse.Files[0])
 		})
 
 		t.Run("Delete files", func(t *testing.T) {
@@ -352,10 +380,10 @@ func TestChangeRepoFiles(t *testing.T) {
 			expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
 			assert.NotNil(t, filesResponse)
 			assert.Nil(t, filesResponse.Files[0])
-			assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-			assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
+			assert.Equal(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
+			assert.Equal(t, expectedFileResponse.Verification, filesResponse.Verification)
 
 			filesResponse, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
 			assert.Nil(t, filesResponse)
@@ -376,10 +404,10 @@ func TestChangeRepoFiles(t *testing.T) {
 			expectedFileResponse := getExpectedFileResponseForRepofilesDelete()
 			assert.NotNil(t, filesResponse)
 			assert.Nil(t, filesResponse.Files[0])
-			assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
-			assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
-			assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
-			assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification)
+			assert.Equal(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message)
+			assert.Equal(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity)
+			assert.Equal(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity)
+			assert.Equal(t, expectedFileResponse.Verification, filesResponse.Verification)
 		})
 	})
 }
@@ -411,6 +439,26 @@ func TestChangeRepoFilesErrors(t *testing.T) {
 			assert.EqualError(t, err, expectedError)
 		})
 
+		t.Run("missing SHA", func(t *testing.T) {
+			opts := getUpdateRepoFilesOptions(repo)
+			opts.Files[0].SHA = ""
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			assert.Nil(t, filesResponse)
+			require.Error(t, err)
+			expectedError := "a SHA or commit ID must be provided when updating a file"
+			assert.EqualError(t, err, expectedError)
+		})
+
+		t.Run("bad last commit ID", func(t *testing.T) {
+			opts := getUpdateRepoFilesOptions(repo)
+			opts.LastCommitID = "bad"
+			filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts)
+			assert.Nil(t, filesResponse)
+			require.Error(t, err)
+			expectedError := "ConvertToSHA1: Invalid last commit ID: object does not exist [id: bad, rel_path: ]"
+			assert.EqualError(t, err, expectedError)
+		})
+
 		t.Run("new branch already exists", func(t *testing.T) {
 			opts := getUpdateRepoFilesOptions(repo)
 			opts.NewBranch = "develop"
diff --git a/tests/integration/runner_test.go b/tests/integration/runner_test.go
index 09555caacf..2d9c0ec0c4 100644
--- a/tests/integration/runner_test.go
+++ b/tests/integration/runner_test.go
@@ -61,7 +61,7 @@ func TestRunnerModification(t *testing.T) {
 			sess.MakeRequest(t, req, http.StatusSeeOther)
 			flashCookie := sess.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DRunner%2Bupdated%2Bsuccessfully", flashCookie.Value)
+			assert.Equal(t, "success%3DRunner%2Bupdated%2Bsuccessfully", flashCookie.Value)
 		}
 
 		req = NewRequestWithValues(t, "POST", baseURL+fmt.Sprintf("/%d/delete", id), map[string]string{
@@ -73,7 +73,7 @@ func TestRunnerModification(t *testing.T) {
 			sess.MakeRequest(t, req, http.StatusOK)
 			flashCookie := sess.GetCookie(forgejo_context.CookieNameFlash)
 			assert.NotNil(t, flashCookie)
-			assert.EqualValues(t, "success%3DRunner%2Bdeleted%2Bsuccessfully", flashCookie.Value)
+			assert.Equal(t, "success%3DRunner%2Bdeleted%2Bsuccessfully", flashCookie.Value)
 		}
 	}
 
diff --git a/tests/integration/session_test.go b/tests/integration/session_test.go
index 7af5645dec..b03714d85a 100644
--- a/tests/integration/session_test.go
+++ b/tests/integration/session_test.go
@@ -28,11 +28,11 @@ func Test_RegenerateSession(t *testing.T) {
 
 	sess, err := auth.RegenerateSession(db.DefaultContext, "", key)
 	require.NoError(t, err)
-	assert.EqualValues(t, key, sess.Key)
+	assert.Equal(t, key, sess.Key)
 	assert.Empty(t, sess.Data, 0)
 
 	sess, err = auth.ReadSession(db.DefaultContext, key2)
 	require.NoError(t, err)
-	assert.EqualValues(t, key2, sess.Key)
+	assert.Equal(t, key2, sess.Key)
 	assert.Empty(t, sess.Data, 0)
 }
diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go
index 66790e5835..4a65a8d44e 100644
--- a/tests/integration/setting_test.go
+++ b/tests/integration/setting_test.go
@@ -13,6 +13,8 @@ import (
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
+	"forgejo.org/modules/translation"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
@@ -98,8 +100,7 @@ func TestSettingShowUserEmailProfile(t *testing.T) {
 
 func TestSettingLandingPage(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	landingPage := setting.LandingPageURL
+	defer test.MockProtect(&setting.LandingPageURL)()
 
 	setting.LandingPageURL = setting.LandingPageHome
 	req := NewRequest(t, "GET", "/")
@@ -119,8 +120,6 @@ func TestSettingLandingPage(t *testing.T) {
 	req = NewRequest(t, "GET", "/")
 	resp = MakeRequest(t, req, http.StatusSeeOther)
 	assert.Equal(t, "/user/login", resp.Header().Get("Location"))
-
-	setting.LandingPageURL = landingPage
 }
 
 func TestSettingSecurityAuthSource(t *testing.T) {
@@ -157,3 +156,123 @@ func TestSettingSecurityAuthSource(t *testing.T) {
 	assert.Contains(t, resp.Body.String(), `gitlab-active`)
 	assert.Contains(t, resp.Body.String(), `gitlab-inactive`)
 }
+
+func TestSettingSecurityTwoFactorRequirement(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	locale := translation.NewLocale("en-US")
+
+	runTest := func(t *testing.T, user *user_model.User, forceTOTP, showReroll, showUnroll bool) {
+		t.Helper()
+		defer unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
+
+		useTOTP := forceTOTP || user.MustHaveTwoFactor()
+		session := loginUserMaybeTOTP(t, user, useTOTP)
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "user/settings/security"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		htmlDoc.AssertSelection(t, htmlDoc.FindByText("a", locale.TrString("settings.twofa_reenroll")), showReroll)
+		htmlDoc.AssertElement(t, "#disable-form", showUnroll)
+		htmlDoc.AssertSelection(t, htmlDoc.FindByText("p", locale.TrString("settings.twofa_unroll_unavailable")), showReroll && !showUnroll)
+
+		req := NewRequestWithValues(t, "POST", "user/settings/security/two_factor/disable", map[string]string{
+			"_csrf": htmlDoc.GetCSRF(),
+		})
+		if user.MustHaveTwoFactor() {
+			session.MakeRequest(t, req, http.StatusNotFound)
+		} else {
+			resp := session.MakeRequest(t, req, http.StatusSeeOther)
+			assert.Equal(t, "/user/settings/security", resp.Header().Get("Location"))
+		}
+	}
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false, false)
+			runTest(t, normalUser, false, false, false)
+			runTest(t, restrictedUser, false, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true, true)
+			runTest(t, normalUser, true, true, true)
+			runTest(t, restrictedUser, true, true, true)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		runTest(t, adminUser, false, true, false)
+		runTest(t, normalUser, false, true, false)
+		runTest(t, restrictedUser, false, true, false)
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, true, false)
+			runTest(t, normalUser, false, false, false)
+			runTest(t, restrictedUser, false, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true, false)
+			runTest(t, normalUser, true, true, true)
+			runTest(t, restrictedUser, true, true, true)
+		})
+	})
+}
+
+func TestUserAvatarSizeNotice(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user1")
+	req := NewRequest(t, "GET", "/user/settings")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	assert.Contains(t,
+		htmlDoc.doc.Find("form div:has(input#new-avatar) .help").Text(),
+		"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
+}
+
+func TestRepoAvatarSizeNotice(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/user2/repo1/settings")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	assert.Contains(t,
+		htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
+		"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
+}
+
+func TestOrgAvatarSizeNotice(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+	req := NewRequest(t, "GET", "/org/org3/settings")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	assert.Contains(t,
+		htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
+		"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
+}
+
+func TestAdminAvatarSizeNotice(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user1")
+	req := NewRequest(t, "GET", "/admin/users/2/edit")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	assert.Contains(t,
+		htmlDoc.doc.Find("form div:has(input[name=\"avatar\"]) .help").Text(),
+		"Custom avatar may not exceed 1 MiB in size or be larger than 4096x4096 pixels")
+}
diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go
index dd8322214a..5e8dead5b7 100644
--- a/tests/integration/signin_test.go
+++ b/tests/integration/signin_test.go
@@ -5,11 +5,13 @@
 package integration
 
 import (
+	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
 
+	"forgejo.org/models/auth"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
@@ -32,7 +34,7 @@ func testLoginFailed(t *testing.T, username, password, message string) {
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
 
-	assert.EqualValues(t, message, resultMsg)
+	assert.Equal(t, message, resultMsg)
 }
 
 func TestSignin(t *testing.T) {
@@ -141,3 +143,136 @@ func TestDisableSignin(t *testing.T) {
 		})
 	})
 }
+
+func TestGlobalTwoFactorRequirement(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	locale := translation.NewLocale("en-US")
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+
+	runTest := func(t *testing.T, user *user_model.User, useTOTP, loginAllowed bool) {
+		t.Helper()
+		defer unittest.AssertSuccessfulDelete(t, &auth.TwoFactor{UID: user.ID})
+
+		session := loginUserMaybeTOTP(t, user, useTOTP)
+
+		req := NewRequest(t, "GET", fmt.Sprintf("/%s", user.Name))
+
+		if loginAllowed {
+			session.MakeRequest(t, req, http.StatusOK)
+
+			// not found page
+			req = NewRequest(t, "GET", "/absolutly/not/found")
+			req.Header.Add("Accept", "text/html")
+			resp := session.MakeRequest(t, req, http.StatusNotFound)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			assert.Greater(t, htmlDoc.Find(".navbar-left > a.item").Length(), 1) // show the Logo, and other links
+			assert.Greater(t, htmlDoc.Find(".navbar-right .user-menu a.item").Length(), 1)
+
+			// 500 page
+			reset := enableDevtest()
+			req = NewRequest(t, "GET", "/devtest/error/500")
+			req.Header.Add("Accept", "text/html")
+			resp = session.MakeRequest(t, req, http.StatusInternalServerError)
+			htmlDoc = NewHTMLParser(t, resp.Body)
+			assert.Equal(t, 1, htmlDoc.Find(".navbar-left > a.item").Length())
+			htmlDoc.AssertElement(t, ".navbar-right", false)
+			reset()
+		} else {
+			resp := session.MakeRequest(t, req, http.StatusSeeOther)
+			assert.Equal(t, "/user/settings/security", resp.Header().Get("Location"))
+
+			// not found page
+			req = NewRequest(t, "GET", "/absolutly/not/found")
+			req.Header.Add("Accept", "text/html")
+			resp = session.MakeRequest(t, req, http.StatusNotFound)
+			htmlDoc := NewHTMLParser(t, resp.Body)
+			assert.Equal(t, 1, htmlDoc.Find(".navbar-left > a.item").Length()) // only show the Logo, no other links
+
+			userLinks := htmlDoc.Find(".navbar-right .user-menu a.item")
+			assert.Equal(t, 1, userLinks.Length()) // only logout link
+			assert.Equal(t, "Sign out", strings.TrimSpace(userLinks.Text()))
+
+			// 500 page
+			reset := enableDevtest()
+			req = NewRequest(t, "GET", "/devtest/error/500")
+			req.Header.Add("Accept", "text/html")
+			resp = session.MakeRequest(t, req, http.StatusInternalServerError)
+			htmlDoc = NewHTMLParser(t, resp.Body)
+			assert.Equal(t, 1, htmlDoc.Find(".navbar-left > a.item").Length())
+			htmlDoc.AssertElement(t, ".navbar-right", false)
+			reset()
+
+			// 2fa page
+			req = NewRequest(t, "GET", "/user/settings/security")
+			resp = session.MakeRequest(t, req, http.StatusOK)
+			htmlDoc = NewHTMLParser(t, resp.Body)
+			assert.Equal(t, locale.TrString("settings.must_enable_2fa"), htmlDoc.Find(".ui.red.message").Text())
+			assert.Equal(t, 1, htmlDoc.Find(".navbar-left > a.item").Length()) // only show the Logo, no other links
+
+			userLinks = htmlDoc.Find(".navbar-right .user-menu a.item")
+			assert.Equal(t, 1, userLinks.Length()) // only logout link
+			assert.Equal(t, "Sign out", strings.TrimSpace(userLinks.Text()))
+
+			assert.Equal(t, 0, htmlDoc.FindByText("a", locale.TrString("settings.twofa_reenroll")).Length())
+
+			headings := htmlDoc.Find(".user-setting-content h4.attached.header")
+			assert.Equal(t, 2, headings.Length())
+			assert.Equal(t, locale.TrString("settings.twofa"), strings.TrimSpace(headings.First().Text()))
+			assert.Equal(t, locale.TrString("settings.webauthn"), strings.TrimSpace(headings.Last().Text()))
+		}
+	}
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, true)
+			runTest(t, normalUser, false, true)
+			runTest(t, restrictedUser, false, true)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, restrictedUser, true, true)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false)
+			runTest(t, normalUser, false, false)
+			runTest(t, restrictedUser, false, false)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, restrictedUser, true, true)
+		})
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false)
+			runTest(t, normalUser, false, true)
+			runTest(t, restrictedUser, false, true)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true)
+			runTest(t, normalUser, true, true)
+			runTest(t, restrictedUser, true, true)
+		})
+	})
+}
diff --git a/tests/integration/signing_git_test.go b/tests/integration/signing_git_test.go
new file mode 100644
index 0000000000..7018b10376
--- /dev/null
+++ b/tests/integration/signing_git_test.go
@@ -0,0 +1,462 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"net/url"
+	"os"
+	"path/filepath"
+	"testing"
+
+	auth_model "forgejo.org/models/auth"
+	"forgejo.org/models/unittest"
+	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/git"
+	"forgejo.org/modules/process"
+	"forgejo.org/modules/setting"
+	api "forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
+	"forgejo.org/tests"
+
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/crypto/ssh"
+)
+
+func TestInstanceSigning(t *testing.T) {
+	t.Cleanup(func() {
+		// Cannot use t.Context(), it is in the done state.
+		require.NoError(t, git.InitFull(context.Background()))
+	})
+
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")()
+		defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "fox@example.com")()
+		defer test.MockProtect(&setting.Repository.Signing.InitialCommit)()
+		defer test.MockProtect(&setting.Repository.Signing.CRUDActions)()
+
+		t.Run("SSH", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			pubKeyContent, err := os.ReadFile("tests/integration/ssh-signing-key.pub")
+			require.NoError(t, err)
+
+			pubKey, _, _, _, err := ssh.ParseAuthorizedKey(pubKeyContent)
+			require.NoError(t, err)
+			signingKeyPath, err := filepath.Abs("tests/integration/ssh-signing-key")
+			require.NoError(t, err)
+			require.NoError(t, os.Chmod(signingKeyPath, 0o600))
+			defer test.MockVariableValue(&setting.SSHInstanceKey, pubKey)()
+			defer test.MockVariableValue(&setting.Repository.Signing.Format, "ssh")()
+			defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, signingKeyPath)()
+
+			// Ensure the git config is updated with the new signing format.
+			require.NoError(t, git.InitFull(t.Context()))
+
+			forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) {
+				u2 := *u
+				testCRUD(t, &u2, "ssh", objectFormat)
+			})
+		})
+
+		t.Run("PGP", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Use a new GNUPGPHOME to avoid messing with the existing GPG keyring.
+			tmpDir := t.TempDir()
+			require.NoError(t, os.Chmod(tmpDir, 0o700))
+			t.Setenv("GNUPGHOME", tmpDir)
+
+			rootKeyPair, err := importTestingKey()
+			require.NoError(t, err)
+			defer test.MockVariableValue(&setting.Repository.Signing.SigningKey, rootKeyPair.PrimaryKey.KeyIdShortString())()
+			defer test.MockVariableValue(&setting.Repository.Signing.Format, "openpgp")()
+
+			// Ensure the git config is updated with the new signing format.
+			require.NoError(t, git.InitFull(t.Context()))
+
+			forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) {
+				u2 := *u
+				testCRUD(t, &u2, "pgp", objectFormat)
+			})
+		})
+	})
+}
+
+func testCRUD(t *testing.T, u *url.URL, signingFormat string, objectFormat git.ObjectFormat) {
+	t.Helper()
+	setting.Repository.Signing.CRUDActions = []string{"never"}
+	setting.Repository.Signing.InitialCommit = []string{"never"}
+
+	username := "user2"
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: username})
+	baseAPITestContext := NewAPITestContext(t, username, "repo1")
+	u.Path = baseAPITestContext.GitPath()
+
+	suffix := "-" + signingFormat + "-" + objectFormat.Name()
+
+	t.Run("Unsigned-Initial", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+		t.Run("CheckMasterBranchUnsigned", func(t *testing.T) {
+			branch := doAPIGetBranch(testCtx, "master")(t)
+			assert.NotNil(t, branch.Commit)
+			assert.NotNil(t, branch.Commit.Verification)
+			assert.False(t, branch.Commit.Verification.Verified)
+			assert.Empty(t, branch.Commit.Verification.Signature)
+		})
+		t.Run("CreateCRUDFile-Never", crudActionCreateFile(
+			t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+		t.Run("CreateCRUDFile-Never", crudActionCreateFile(
+			t, testCtx, user, "never", "never2", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+	})
+
+	t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
+			t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+		t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
+			t, testCtx, user, "parentsigned", "parentsigned2", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+	})
+
+	t.Run("Unsigned-Initial-CRUD-Never", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.InitialCommit = []string{"never"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateCRUDFile-Never", crudActionCreateFile(
+			t, testCtx, user, "parentsigned", "parentsigned-never", "unsigned-never2.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+	})
+
+	t.Run("Unsigned-Initial-CRUD-Always", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"always"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateCRUDFile-Always", crudActionCreateFile(
+			t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) {
+				require.NotNil(t, response.Verification)
+				assert.True(t, response.Verification.Verified)
+				assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+			}))
+		t.Run("CreateCRUDFile-ParentSigned-always", crudActionCreateFile(
+			t, testCtx, user, "parentsigned", "parentsigned-always", "signed-parent2.txt", func(t *testing.T, response api.FileResponse) {
+				require.NotNil(t, response.Verification)
+				assert.True(t, response.Verification.Verified)
+				assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+			}))
+	})
+
+	t.Run("Unsigned-Initial-CRUD-ParentSigned", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateCRUDFile-Always-ParentSigned", crudActionCreateFile(
+			t, testCtx, user, "always", "always-parentsigned", "signed-always-parentsigned.txt", func(t *testing.T, response api.FileResponse) {
+				require.NotNil(t, response.Verification)
+				assert.True(t, response.Verification.Verified)
+				assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+			}))
+	})
+
+	t.Run("AlwaysSign-Pubkey", func(t *testing.T) {
+		setting.Repository.Signing.InitialCommit = []string{"pubkey"}
+
+		t.Run("Has publickey", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, username, "initial-pubkey"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CheckMasterBranchSigned", func(t *testing.T) {
+				branch := doAPIGetBranch(testCtx, "master")(t)
+				require.NotNil(t, branch.Commit)
+				require.NotNil(t, branch.Commit.Verification)
+				assert.True(t, branch.Commit.Verification.Verified)
+				assert.Equal(t, "fox@example.com", branch.Commit.Verification.Signer.Email)
+			})
+		})
+
+		t.Run("No publickey", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, "user4", "initial-no-pubkey"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CheckMasterBranchSigned", func(t *testing.T) {
+				branch := doAPIGetBranch(testCtx, "master")(t)
+				require.NotNil(t, branch.Commit)
+				require.NotNil(t, branch.Commit.Verification)
+				assert.False(t, branch.Commit.Verification.Verified)
+			})
+		})
+	})
+
+	t.Run("AlwaysSign-Twofa", func(t *testing.T) {
+		setting.Repository.Signing.InitialCommit = []string{"twofa"}
+
+		t.Run("Has 2fa", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			t.Cleanup(func() {
+				unittest.AssertSuccessfulDelete(t, &auth_model.WebAuthnCredential{UserID: user.ID})
+			})
+
+			testCtx := NewAPITestContext(t, username, "initial-2fa"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			unittest.AssertSuccessfulInsert(t, &auth_model.WebAuthnCredential{UserID: user.ID})
+
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CheckMasterBranchSigned", func(t *testing.T) {
+				branch := doAPIGetBranch(testCtx, "master")(t)
+				require.NotNil(t, branch.Commit)
+				require.NotNil(t, branch.Commit.Verification)
+				assert.True(t, branch.Commit.Verification.Verified)
+				assert.Equal(t, "fox@example.com", branch.Commit.Verification.Signer.Email)
+			})
+		})
+
+		t.Run("No 2fa", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, "user4", "initial-no-2fa"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CheckMasterBranchSigned", func(t *testing.T) {
+				branch := doAPIGetBranch(testCtx, "master")(t)
+				require.NotNil(t, branch.Commit)
+				require.NotNil(t, branch.Commit.Verification)
+				assert.False(t, branch.Commit.Verification.Verified)
+			})
+		})
+	})
+
+	t.Run("AlwaysSign-Initial", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.InitialCommit = []string{"always"}
+
+		testCtx := NewAPITestContext(t, username, "initial-always"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+		t.Run("CheckMasterBranchSigned", func(t *testing.T) {
+			branch := doAPIGetBranch(testCtx, "master")(t)
+			require.NotNil(t, branch.Commit)
+			require.NotNil(t, branch.Commit.Verification)
+			assert.True(t, branch.Commit.Verification.Verified)
+			assert.Equal(t, "fox@example.com", branch.Commit.Verification.Signer.Email)
+		})
+	})
+
+	t.Run("AlwaysSign-Initial-CRUD-Never", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"never"}
+
+		testCtx := NewAPITestContext(t, username, "initial-always-never"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+		t.Run("CreateCRUDFile-Never", crudActionCreateFile(
+			t, testCtx, user, "master", "never", "unsigned-never.txt", func(t *testing.T, response api.FileResponse) {
+				assert.False(t, response.Verification.Verified)
+			}))
+	})
+
+	t.Run("AlwaysSign-Initial-CRUD-ParentSigned-On-Always", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"parentsigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-always-parent"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+		t.Run("CreateCRUDFile-ParentSigned", crudActionCreateFile(
+			t, testCtx, user, "master", "parentsigned", "signed-parent.txt", func(t *testing.T, response api.FileResponse) {
+				assert.True(t, response.Verification.Verified)
+				assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+			}))
+	})
+
+	t.Run("AlwaysSign-Initial-CRUD-Pubkey", func(t *testing.T) {
+		setting.Repository.Signing.CRUDActions = []string{"pubkey"}
+
+		t.Run("Has publickey", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, username, "initial-always-pubkey"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CreateCRUDFile-Pubkey", crudActionCreateFile(
+				t, testCtx, user, "master", "pubkey", "signed-pubkey.txt", func(t *testing.T, response api.FileResponse) {
+					assert.True(t, response.Verification.Verified)
+					assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+				}))
+		})
+
+		t.Run("No publickey", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, "user4", "initial-always-no-pubkey"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CreateCRUDFile-Pubkey", crudActionCreateFile(
+				t, testCtx, user, "master", "pubkey", "unsigned-pubkey.txt", func(t *testing.T, response api.FileResponse) {
+					assert.False(t, response.Verification.Verified)
+				}))
+		})
+	})
+
+	t.Run("AlwaysSign-Initial-CRUD-Twofa", func(t *testing.T) {
+		setting.Repository.Signing.CRUDActions = []string{"twofa"}
+
+		t.Run("Has 2fa", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			t.Cleanup(func() {
+				unittest.AssertSuccessfulDelete(t, &auth_model.WebAuthnCredential{UserID: user.ID})
+			})
+
+			testCtx := NewAPITestContext(t, username, "initial-always-twofa"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			unittest.AssertSuccessfulInsert(t, &auth_model.WebAuthnCredential{UserID: user.ID})
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CreateCRUDFile-Twofa", crudActionCreateFile(
+				t, testCtx, user, "master", "twofa", "signed-twofa.txt", func(t *testing.T, response api.FileResponse) {
+					assert.True(t, response.Verification.Verified)
+					assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+				}))
+		})
+
+		t.Run("No 2fa", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			testCtx := NewAPITestContext(t, "user4", "initial-always-no-twofa"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+			t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+			t.Run("CreateCRUDFile-Pubkey", crudActionCreateFile(
+				t, testCtx, user, "master", "twofa", "unsigned-twofa.txt", func(t *testing.T, response api.FileResponse) {
+					assert.False(t, response.Verification.Verified)
+				}))
+		})
+	})
+
+	t.Run("AlwaysSign-Initial-CRUD-Always", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.CRUDActions = []string{"always"}
+
+		testCtx := NewAPITestContext(t, username, "initial-always-always"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreateRepository", doAPICreateRepository(testCtx, nil, objectFormat))
+		t.Run("CreateCRUDFile-Always", crudActionCreateFile(
+			t, testCtx, user, "master", "always", "signed-always.txt", func(t *testing.T, response api.FileResponse) {
+				assert.True(t, response.Verification.Verified)
+				assert.Equal(t, "fox@example.com", response.Verification.Signer.Email)
+			}))
+	})
+
+	t.Run("UnsignedMerging", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.Merges = []string{"commitssigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreatePullRequest", func(t *testing.T) {
+			pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "never2")(t)
+			require.NoError(t, err)
+			t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
+		})
+		t.Run("CheckMasterBranchUnsigned", func(t *testing.T) {
+			branch := doAPIGetBranch(testCtx, "master")(t)
+			require.NotNil(t, branch.Commit)
+			require.NotNil(t, branch.Commit.Verification)
+			assert.False(t, branch.Commit.Verification.Verified)
+			assert.Empty(t, branch.Commit.Verification.Signature)
+		})
+	})
+
+	t.Run("BaseSignedMerging", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.Merges = []string{"basesigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreatePullRequest", func(t *testing.T) {
+			pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "parentsigned2")(t)
+			require.NoError(t, err)
+			t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
+		})
+		t.Run("CheckMasterBranchUnsigned", func(t *testing.T) {
+			branch := doAPIGetBranch(testCtx, "master")(t)
+			require.NotNil(t, branch.Commit)
+			require.NotNil(t, branch.Commit.Verification)
+			assert.False(t, branch.Commit.Verification.Verified)
+			assert.Empty(t, branch.Commit.Verification.Signature)
+		})
+	})
+
+	t.Run("CommitsSignedMerging", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		setting.Repository.Signing.Merges = []string{"commitssigned"}
+
+		testCtx := NewAPITestContext(t, username, "initial-unsigned"+suffix, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+		t.Run("CreatePullRequest", func(t *testing.T) {
+			pr, err := doAPICreatePullRequest(testCtx, testCtx.Username, testCtx.Reponame, "master", "always-parentsigned")(t)
+			require.NoError(t, err)
+			t.Run("MergePR", doAPIMergePullRequest(testCtx, testCtx.Username, testCtx.Reponame, pr.Index))
+		})
+		t.Run("CheckMasterBranchUnsigned", func(t *testing.T) {
+			branch := doAPIGetBranch(testCtx, "master")(t)
+			require.NotNil(t, branch.Commit)
+			require.NotNil(t, branch.Commit.Verification)
+			assert.True(t, branch.Commit.Verification.Verified)
+		})
+	})
+}
+
+func crudActionCreateFile(_ *testing.T, ctx APITestContext, user *user_model.User, from, to, path string, callback ...func(*testing.T, api.FileResponse)) func(*testing.T) {
+	return doAPICreateFile(ctx, path, &api.CreateFileOptions{
+		FileOptions: api.FileOptions{
+			BranchName:    from,
+			NewBranchName: to,
+			Message:       fmt.Sprintf("from:%s to:%s path:%s", from, to, path),
+			Author: api.Identity{
+				Name:  user.FullName,
+				Email: user.Email,
+			},
+			Committer: api.Identity{
+				Name:  user.FullName,
+				Email: user.Email,
+			},
+		},
+		ContentBase64: base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("This is new text for %s", path))),
+	}, callback...)
+}
+
+func importTestingKey() (*openpgp.Entity, error) {
+	if _, _, err := process.GetManager().Exec("gpg --import tests/integration/private-testing.key", "gpg", "--import", "tests/integration/private-testing.key"); err != nil {
+		return nil, err
+	}
+	keyringFile, err := os.Open("tests/integration/private-testing.key")
+	if err != nil {
+		return nil, err
+	}
+	defer keyringFile.Close()
+
+	block, err := armor.Decode(keyringFile)
+	if err != nil {
+		return nil, err
+	}
+
+	keyring, err := openpgp.ReadKeyRing(block.Body)
+	if err != nil {
+		return nil, fmt.Errorf("Keyring access failed: '%w'", err)
+	}
+
+	// There should only be one entity in this file.
+	return keyring[0], nil
+}
diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go
index 91752d415e..e66b193e15 100644
--- a/tests/integration/signup_test.go
+++ b/tests/integration/signup_test.go
@@ -23,8 +23,7 @@ import (
 
 func TestSignup(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	setting.Service.EnableCaptcha = false
+	defer test.MockVariableValue(&setting.Service.EnableCaptcha, false)()
 
 	req := NewRequestWithValues(t, "POST", "/user/sign_up", map[string]string{
 		"user_name": "exampleUser",
@@ -41,9 +40,8 @@ func TestSignup(t *testing.T) {
 
 func TestSignupAsRestricted(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	setting.Service.EnableCaptcha = false
-	setting.Service.DefaultUserIsRestricted = true
+	defer test.MockVariableValue(&setting.Service.EnableCaptcha, false)()
+	defer test.MockVariableValue(&setting.Service.DefaultUserIsRestricted, true)()
 
 	req := NewRequestWithValues(t, "POST", "/user/sign_up", map[string]string{
 		"user_name": "restrictedUser",
@@ -63,8 +61,7 @@ func TestSignupAsRestricted(t *testing.T) {
 
 func TestSignupEmail(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	setting.Service.EnableCaptcha = false
+	defer test.MockVariableValue(&setting.Service.EnableCaptcha, false)()
 
 	tests := []struct {
 		email      string
diff --git a/tests/integration/ssh-signing-key b/tests/integration/ssh-signing-key
new file mode 100644
index 0000000000..e67df477c5
--- /dev/null
+++ b/tests/integration/ssh-signing-key
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBXkQvBnxcl7YstH9RO4S7++wV1u3uvLRbyHLPP9vWKhwAAAJhlmhmkZZoZ
+pAAAAAtzc2gtZWQyNTUxOQAAACBXkQvBnxcl7YstH9RO4S7++wV1u3uvLRbyHLPP9vWKhw
+AAAEDnOTuE2rDECN+2OsuUbQgGrMSY22tn+IF5JG5nuyJinVeRC8GfFyXtiy0f1E7hLv77
+BXW7e68tFvIcs8/29YqHAAAAE2d1c3RlZEBndXN0ZWQtYmVhc3QBAg==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/tests/integration/ssh-signing-key.pub b/tests/integration/ssh-signing-key.pub
new file mode 100644
index 0000000000..3d1ab60b47
--- /dev/null
+++ b/tests/integration/ssh-signing-key.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeRC8GfFyXtiy0f1E7hLv77BXW7e68tFvIcs8/29YqH
diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go
index aece9c3fd9..a92694d2fa 100644
--- a/tests/integration/ssh_key_test.go
+++ b/tests/integration/ssh_key_test.go
@@ -55,7 +55,13 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) {
 		keyname := fmt.Sprintf("%s-push", ctx.Reponame)
 		u.Path = ctx.GitPath()
 
-		t.Run("CreateEmptyRepository", doAPICreateRepository(ctx, true, objectFormat))
+		opts := &api.CreateRepoOption{
+			Description: "Temporary repo",
+			Name:        ctx.Reponame,
+			Private:     true,
+			Template:    true,
+		}
+		t.Run("CreateEmptyRepository", doAPICreateRepository(ctx, opts, objectFormat))
 
 		t.Run("CheckIsEmpty", doCheckRepositoryEmptyStatus(ctx, true))
 
@@ -105,8 +111,8 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
 	failCtx := ctx
 	failCtx.ExpectedCode = http.StatusUnprocessableEntity
 
-	t.Run("CreateRepository", doAPICreateRepository(ctx, false, git.Sha1ObjectFormat))           // FIXME: use forEachObjectFormat
-	t.Run("CreateOtherRepository", doAPICreateRepository(otherCtx, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
+	t.Run("CreateRepository", doAPICreateRepository(ctx, nil, git.Sha1ObjectFormat))           // FIXME: use forEachObjectFormat
+	t.Run("CreateOtherRepository", doAPICreateRepository(otherCtx, nil, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
 
 	withKeyFile(t, keyname, func(keyFile string) {
 		var userKeyPublicKeyID int64
@@ -180,7 +186,7 @@ func testKeyOnlyOneType(t *testing.T, u *url.URL) {
 
 			t.Run("DeleteOtherRepository", doAPIDeleteRepository(otherCtxWithDeleteRepo))
 
-			t.Run("RecreateRepository", doAPICreateRepository(ctxWithDeleteRepo, false, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
+			t.Run("RecreateRepository", doAPICreateRepository(ctxWithDeleteRepo, nil, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat
 
 			t.Run("CreateUserKey", doAPICreateUserKey(ctx, keyname, keyFile, func(t *testing.T, publicKey api.PublicKey) {
 				userKeyPublicKeyID = publicKey.ID
diff --git a/tests/integration/timetracking_test.go b/tests/integration/timetracking_test.go
index 49ae92033e..9aba9f43e6 100644
--- a/tests/integration/timetracking_test.go
+++ b/tests/integration/timetracking_test.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"path"
 	"testing"
-	"time"
 
 	"forgejo.org/modules/test"
 	"forgejo.org/tests"
@@ -60,9 +59,6 @@ func testViewTimetrackingControls(t *testing.T, session *TestSession, user, repo
 		htmlDoc.AssertElement(t, ".timetrack .issue-stop-time", true)
 		htmlDoc.AssertElement(t, ".timetrack .issue-cancel-time", true)
 
-		// Sleep for 1 second to not get wrong order for stopping timer
-		time.Sleep(time.Second)
-
 		req = NewRequestWithValues(t, "POST", path.Join(user, repo, "issues", issue, "times", "stopwatch", "toggle"), map[string]string{
 			"_csrf": htmlDoc.GetCSRF(),
 		})
diff --git a/tests/integration/translations_test.go b/tests/integration/translations_test.go
index 9cfa3423b7..7b80025618 100644
--- a/tests/integration/translations_test.go
+++ b/tests/integration/translations_test.go
@@ -24,7 +24,7 @@ func TestMissingTranslationHandling(t *testing.T) {
 	// Currently new languages can only be added to localestore via AddLocaleByIni
 	// so this line is here to make the other one work. When INI locales are removed,
 	// it will not be needed by this test.
-	i18n.DefaultLocales.AddLocaleByIni("fun", "Funlang", nil, []byte(""), nil)
+	i18n.DefaultLocales.AddLocaleByIni("fun", "Funlang", nil, nil, []byte(""), nil)
 
 	// Add a testing locale to the store
 	i18n.DefaultLocales.AddToLocaleFromJSON("fun", []byte(`{
diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go
index b0d930d71f..2d3fd0a7a9 100644
--- a/tests/integration/user_avatar_test.go
+++ b/tests/integration/user_avatar_test.go
@@ -10,6 +10,7 @@ import (
 	"io"
 	"mime/multipart"
 	"net/http"
+	"net/url"
 	"testing"
 
 	"forgejo.org/models/db"
@@ -81,7 +82,43 @@ func TestUserAvatar(t *testing.T) {
 
 	req = NewRequestf(t, "GET", "/%s.png", user2.Name)
 	resp := MakeRequest(t, req, http.StatusSeeOther)
-	assert.EqualValues(t, fmt.Sprintf("/avatars/%s", user2.Avatar), resp.Header().Get("location"))
+	assert.Equal(t, fmt.Sprintf("/avatars/%s", user2.Avatar), resp.Header().Get("location"))
 
 	// Can't test if the response matches because the image is re-generated on upload but checking that this at least doesn't give a 404 should be enough.
 }
+
+func TestAvatarAnchorDestination(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	// If the user is logged in, and looking at their own profile,
+	// the avatar becomes a link towards the user settings page.
+	// Test that the link does not show up when not viewing one's own profile,
+	// and that, if the link does show up, there is a corresponding element
+	// on the user settings page matching the fragment of the anchor.
+
+	t.Run("viewing other's profile", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		profilePage := NewHTMLParser(t, MakeRequest(t, NewRequest(t, "GET", "/user2"), http.StatusOK).Body)
+		profilePage.AssertElement(t, "#profile-avatar", true)
+		// When viewing another user's profile, there shouldn't be a link to user settings
+		profilePage.AssertElement(t, "#profile-avatar a", false)
+	})
+
+	t.Run("viewing own profile", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+
+		session := loginUser(t, "user2")
+
+		profilePage := NewHTMLParser(t, session.MakeRequest(t, NewRequest(t, "GET", "/user2"), http.StatusOK).Body)
+		profilePage.AssertElement(t, "#profile-avatar a", true)
+		href, has := profilePage.Find("#profile-avatar a").Attr("href")
+		assert.True(t, has)
+
+		settingsURL, err := url.Parse(href)
+		require.NoError(t, err, "Change avatar link can't be parsed to URL")
+
+		settingsPage := NewHTMLParser(t, session.MakeRequest(t, NewRequest(t, "GET", href), http.StatusOK).Body)
+		settingsPage.AssertElement(t, fmt.Sprintf("#%s", settingsURL.Fragment), true)
+	})
+}
diff --git a/tests/integration/user_dashboard_test.go b/tests/integration/user_dashboard_test.go
index b95bdab078..fefe5f1399 100644
--- a/tests/integration/user_dashboard_test.go
+++ b/tests/integration/user_dashboard_test.go
@@ -1,4 +1,4 @@
-// Copyright 2024 The Forgejo Authors. All rights reserved.
+// Copyright 2024-2025 The Forgejo Authors. All rights reserved.
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 package integration
@@ -10,12 +10,13 @@ import (
 	"strings"
 	"testing"
 
-	"forgejo.org/models/db"
+	"forgejo.org/models/issues"
 	unit_model "forgejo.org/models/unit"
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
-	"forgejo.org/modules/translation"
+	"forgejo.org/modules/gitrepo"
 	issue_service "forgejo.org/services/issue"
+	pr_service "forgejo.org/services/pull"
 	files_service "forgejo.org/services/repository/files"
 	"forgejo.org/tests"
 
@@ -24,20 +25,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestUserDashboardActionLinks(t *testing.T) {
-	require.NoError(t, unittest.PrepareTestDatabase())
-
-	session := loginUser(t, "user1")
-	locale := translation.NewLocale("en-US")
-
-	response := session.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
-	page := NewHTMLParser(t, response.Body)
-	links := page.Find("#navbar .dropdown[data-tooltip-content='Create…'] .menu")
-	assert.EqualValues(t, locale.TrString("new_repo.link"), strings.TrimSpace(links.Find("a[href='/repo/create']").Text()))
-	assert.EqualValues(t, locale.TrString("new_migrate.link"), strings.TrimSpace(links.Find("a[href='/repo/migrate']").Text()))
-	assert.EqualValues(t, locale.TrString("new_org.link"), strings.TrimSpace(links.Find("a[href='/org/create']").Text()))
-}
-
 func TestUserDashboardFeedWelcome(t *testing.T) {
 	require.NoError(t, unittest.PrepareTestDatabase())
 
@@ -77,10 +64,10 @@ func TestDashboardTitleRendering(t *testing.T) {
 		issue := createIssue(t, user4, repo, "`:exclamation:` not rendered", "Hi there!")
 		pr := createPullRequest(t, user4, repo, "testing", "`:exclamation:` not rendered")
 
-		_, err := issue_service.CreateIssueComment(db.DefaultContext, user4, repo, issue, "hi", nil)
+		_, err := issue_service.CreateIssueComment(t.Context(), user4, repo, issue, "hi", nil)
 		require.NoError(t, err)
 
-		_, err = issue_service.CreateIssueComment(db.DefaultContext, user4, repo, pr.Issue, "hi", nil)
+		_, err = issue_service.CreateIssueComment(t.Context(), user4, repo, pr.Issue, "hi", nil)
 		require.NoError(t, err)
 
 		testIssueClose(t, sess, repo.OwnerName, repo.Name, strconv.Itoa(int(issue.Index)), false)
@@ -93,12 +80,87 @@ func TestDashboardTitleRendering(t *testing.T) {
 		htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
 			count++
 			if s.IsMatcher(goquery.Single("a")) {
-				assert.EqualValues(t, "❗ not rendered", s.Text())
+				assert.Equal(t, "❗ not rendered", s.Text())
 			} else {
-				assert.EqualValues(t, ":exclamation: not rendered", s.Text())
+				assert.Equal(t, ":exclamation: not rendered", s.Text())
 			}
 		})
 
-		assert.EqualValues(t, 6, count)
+		assert.Equal(t, 6, count)
+	})
+}
+
+func TestDashboardActionEscaping(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+		sess := loginUser(t, user4.Name)
+
+		repo, _, f := tests.CreateDeclarativeRepo(t, user4, "",
+			[]unit_model.Type{unit_model.TypePullRequests, unit_model.TypeIssues}, nil,
+			[]*files_service.ChangeRepoFile{},
+		)
+		defer f()
+
+		issue := createIssue(t, user4, repo, "Issue with | in title", "Hey here's a | for you")
+
+		_, err := issue_service.CreateIssueComment(t.Context(), user4, repo, issue, "Comment with a | in it", nil)
+		require.NoError(t, err)
+
+		testIssueClose(t, sess, repo.OwnerName, repo.Name, strconv.Itoa(int(issue.Index)), false)
+
+		response := sess.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, response.Body)
+
+		count := 0
+		htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
+			count++
+			assert.Equal(t, "Issue with | in title", s.Text())
+		})
+		htmlDoc.doc.Find("#activity-feed .flex-item-main .markup").Each(func(i int, s *goquery.Selection) {
+			count++
+			assert.Equal(t, "Comment with a | in it\n", s.Text())
+		})
+
+		assert.Equal(t, 4, count)
+	})
+}
+
+func TestDashboardReviewWorkflows(t *testing.T) {
+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
+		user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+		sess := loginUser(t, user4.Name)
+
+		repo, _, f := tests.CreateDeclarativeRepo(t, user4, "",
+			[]unit_model.Type{unit_model.TypePullRequests, unit_model.TypeIssues}, nil,
+			[]*files_service.ChangeRepoFile{},
+		)
+		defer f()
+		gitRepo, err := gitrepo.OpenRepository(t.Context(), repo)
+		require.NoError(t, err)
+
+		pr := createPullRequest(t, user4, repo, "testing", "My very first PR!")
+
+		review, _, err := pr_service.SubmitReview(t.Context(), user4, gitRepo, pr.Issue, issues.ReviewTypeReject, "This isn't good enough!", "HEAD", []string{})
+		require.NoError(t, err)
+
+		_, err = pr_service.DismissReview(t.Context(), review.ID, repo.ID, "Come on, give the newbie a break!", user4, true, true)
+		require.NoError(t, err)
+
+		response := sess.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, response.Body)
+
+		count := 0
+		htmlDoc.doc.Find("#activity-feed .flex-item-main .title").Each(func(i int, s *goquery.Selection) {
+			count++
+			assert.Equal(t, "My very first PR!", s.Text())
+		})
+		htmlDoc.doc.Find("#activity-feed .flex-item-main .flex-item-body").Each(func(i int, s *goquery.Selection) {
+			count++
+			if s.Text() != "Reason:" && s.Text() != "Come on, give the newbie a break!" {
+				assert.Fail(t, "Unexpected feed text", "Expected 'Reason:' and reason explanation, but found: %q", s.Text())
+			}
+		})
+
+		assert.Equal(t, 4, count)
 	})
 }
diff --git a/tests/integration/user_federationhost_xorm_test.go b/tests/integration/user_federationhost_xorm_test.go
new file mode 100644
index 0000000000..ed29a23ab7
--- /dev/null
+++ b/tests/integration/user_federationhost_xorm_test.go
@@ -0,0 +1,109 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"database/sql"
+	"testing"
+
+	"forgejo.org/models/db"
+	"forgejo.org/models/forgefed"
+	"forgejo.org/models/user"
+	"forgejo.org/tests"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStoreFederationHost(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	t.Run("ExplicitNull", func(t *testing.T) {
+		federationHost := forgefed.FederationHost{
+			HostFqdn: "ExplicitNull",
+			// Explicit null on KeyID and PublicKey
+			KeyID:     sql.NullString{Valid: false},
+			PublicKey: sql.Null[sql.RawBytes]{Valid: false},
+		}
+
+		_, err := db.GetEngine(db.DefaultContext).Insert(&federationHost)
+		require.NoError(t, err)
+
+		dbFederationHost := new(forgefed.FederationHost)
+		has, err := db.GetEngine(db.DefaultContext).Where("host_fqdn=?", "ExplicitNull").Get(dbFederationHost)
+		require.NoError(t, err)
+		assert.True(t, has)
+
+		assert.False(t, dbFederationHost.KeyID.Valid)
+		assert.False(t, dbFederationHost.PublicKey.Valid)
+	})
+
+	t.Run("NotNull", func(t *testing.T) {
+		federationHost := forgefed.FederationHost{
+			HostFqdn:  "ImplicitNull",
+			KeyID:     sql.NullString{Valid: true, String: "meow"},
+			PublicKey: sql.Null[sql.RawBytes]{Valid: true, V: sql.RawBytes{0x23, 0x42}},
+		}
+
+		_, err := db.GetEngine(db.DefaultContext).Insert(&federationHost)
+		require.NoError(t, err)
+
+		dbFederationHost := new(forgefed.FederationHost)
+		has, err := db.GetEngine(db.DefaultContext).Where("host_fqdn=?", "ImplicitNull").Get(dbFederationHost)
+		require.NoError(t, err)
+		assert.True(t, has)
+
+		assert.True(t, dbFederationHost.KeyID.Valid)
+		assert.Equal(t, "meow", dbFederationHost.KeyID.String)
+
+		assert.True(t, dbFederationHost.PublicKey.Valid)
+		assert.Equal(t, sql.RawBytes{0x23, 0x42}, dbFederationHost.PublicKey.V)
+	})
+}
+
+func TestStoreFederatedUser(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	t.Run("ExplicitNull", func(t *testing.T) {
+		federatedUser := user.FederatedUser{
+			UserID:           0,
+			ExternalID:       "ExplicitNull",
+			FederationHostID: 0,
+			KeyID:            sql.NullString{Valid: false},
+			PublicKey:        sql.Null[sql.RawBytes]{Valid: false},
+		}
+
+		_, err := db.GetEngine(db.DefaultContext).Insert(&federatedUser)
+		require.NoError(t, err)
+
+		dbFederatedUser := new(user.FederatedUser)
+		has, err := db.GetEngine(db.DefaultContext).Where("user_id=?", 0).Get(dbFederatedUser)
+		require.NoError(t, err)
+		assert.True(t, has)
+
+		assert.False(t, dbFederatedUser.KeyID.Valid)
+		assert.False(t, dbFederatedUser.PublicKey.Valid)
+	})
+
+	t.Run("NotNull", func(t *testing.T) {
+		federatedUser := user.FederatedUser{
+			UserID:           1,
+			ExternalID:       "ImplicitNull",
+			FederationHostID: 1,
+			KeyID:            sql.NullString{Valid: true, String: "woem"},
+			PublicKey:        sql.Null[sql.RawBytes]{Valid: true, V: sql.RawBytes{0x42, 0x23}},
+		}
+
+		_, err := db.GetEngine(db.DefaultContext).Insert(&federatedUser)
+		require.NoError(t, err)
+
+		dbFederatedUser := new(user.FederatedUser)
+		has, err := db.GetEngine(db.DefaultContext).Where("user_id=?", 1).Get(dbFederatedUser)
+		require.NoError(t, err)
+		assert.True(t, has)
+
+		assert.True(t, dbFederatedUser.KeyID.Valid)
+		assert.Equal(t, "woem", dbFederatedUser.KeyID.String)
+		assert.True(t, dbFederatedUser.PublicKey.Valid)
+		assert.Equal(t, sql.RawBytes{0x42, 0x23}, dbFederatedUser.PublicKey.V)
+	})
+}
diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_attributes_test.go
similarity index 72%
rename from tests/integration/user_profile_activity_test.go
rename to tests/integration/user_profile_attributes_test.go
index eb9bfa1741..15bf173922 100644
--- a/tests/integration/user_profile_activity_test.go
+++ b/tests/integration/user_profile_attributes_test.go
@@ -8,21 +8,24 @@ import (
 	"strconv"
 	"testing"
 
+	"forgejo.org/modules/setting"
 	"forgejo.org/modules/structs"
+	"forgejo.org/modules/test"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
 )
 
-// TestUserProfileActivity ensures visibility and correctness of elements related to activity of a user:
-// - RSS feed button (doesn't test `other.ENABLE_FEED:false`)
+// TestUserProfileAttributes ensures visibility and correctness of elements related to activity of a user:
+// - RSS/atom feed links (doesn't test `other.ENABLE_FEED:false`) and a few other links nearby
 // - Public activity tab
 // - Banner/hint in the tab
 // - "Configure" link in the hint
 // These elements might depend on the following:
 // - Profile visibility
 // - Public activity visibility
-func TestUserProfileActivity(t *testing.T) {
+func TestUserProfileAttributes(t *testing.T) {
+	defer test.MockVariableValue(&setting.AppSubURL, "/sub")()
 	defer tests.PrepareTestEnv(t)()
 	// This test needs multiple users with different access statuses to check for all possible states
 	userAdmin := loginUser(t, "user1")
@@ -35,10 +38,10 @@ func TestUserProfileActivity(t *testing.T) {
 	// Set activity visibility of user2 to public. This is the default, but won't hurt to set it before testing.
 	testChangeUserActivityVisibility(t, userRegular, "off")
 
-	// Verify availability of RSS button and activity tab
-	testUser2ActivityButtonsAvailability(t, userAdmin, true)
-	testUser2ActivityButtonsAvailability(t, userRegular, true)
-	testUser2ActivityButtonsAvailability(t, userGuest, true)
+	// Verify availability of activity tab and other links
+	testUser2ActivityLinksAvailability(t, userAdmin, true, true, false)
+	testUser2ActivityLinksAvailability(t, userRegular, true, false, true)
+	testUser2ActivityLinksAvailability(t, userGuest, true, false, false)
 
 	// Verify the hint for all types of users: admin, self, guest
 	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.", true)
@@ -52,7 +55,7 @@ func TestUserProfileActivity(t *testing.T) {
 
 	// When profile activity is configured as public, but the profile is private, tell the user about this and link to visibility settings.
 	hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators because your profile is private. Configure.", true)
-	assert.EqualValues(t, "/user/settings#visibility-setting", hintLink)
+	assert.Equal(t, "/sub/user/settings#visibility-setting", hintLink)
 
 	// When the profile is private, tell the admin about this.
 	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
@@ -60,15 +63,15 @@ func TestUserProfileActivity(t *testing.T) {
 	// Set profile visibility of user2 back to public
 	testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePublic)
 
-	// = Private acitivty =
+	// = Private activity =
 
 	// Set activity visibility of user2 to private
 	testChangeUserActivityVisibility(t, userRegular, "on")
 
-	// Verify availability of RSS button and activity tab
-	testUser2ActivityButtonsAvailability(t, userAdmin, true)
-	testUser2ActivityButtonsAvailability(t, userRegular, true)
-	testUser2ActivityButtonsAvailability(t, userGuest, false)
+	// Verify availability of activity tab and other links
+	testUser2ActivityLinksAvailability(t, userAdmin, true, true, false)
+	testUser2ActivityLinksAvailability(t, userRegular, true, false, true)
+	testUser2ActivityLinksAvailability(t, userGuest, false, false, false)
 
 	// Verify the hint for all types of users: admin, self, guest
 	testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true)
@@ -76,7 +79,7 @@ func TestUserProfileActivity(t *testing.T) {
 	testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false)
 
 	// Verify that Configure link is correct
-	assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink)
+	assert.Equal(t, "/sub/user/settings#keep-activity-private", hintLink)
 }
 
 // testChangeUserActivityVisibility allows to easily change visibility of public activity for a user
@@ -109,24 +112,32 @@ func testUser2ActivityVisibility(t *testing.T, session *TestSession, hint string
 	hintLink, hintLinkExists := page.Find("#visibility-hint a").Attr("href")
 
 	// Check that the hint aligns with the actual feed availability
-	assert.EqualValues(t, availability, page.Find("#activity-feed").Length() > 0)
-
-	// Check availability of RSS feed button too
-	assert.EqualValues(t, availability, page.Find("#profile-avatar-card a[href='/user2.rss']").Length() > 0)
+	page.AssertElement(t, "#activity-feed", availability)
 
 	// Check that the current tab is displayed and is active regardless of it's actual availability
 	// For example, on /<user> it wouldn't be available to guest, but it should be still present on /<user>?tab=activity
-	assert.Positive(t, page.Find("overflow-menu .active.item[href='/user2?tab=activity']").Length())
+	assert.Positive(t, page.Find("overflow-menu .active.item[href='/sub/user2?tab=activity']").Length())
 	if hintLinkExists {
 		return hintLink
 	}
 	return ""
 }
 
-// testUser2ActivityButtonsAvailability checks visibility of Public activity tab on main profile page
-func testUser2ActivityButtonsAvailability(t *testing.T, session *TestSession, buttons bool) {
+// testUser2ActivityLinksAvailability checks visibility of:
+// * Public activity tab on main profile page
+// * user details, profile edit, feed links
+func testUser2ActivityLinksAvailability(t *testing.T, session *TestSession, activity, adminLink, editLink bool) {
 	t.Helper()
 	response := session.MakeRequest(t, NewRequest(t, "GET", "/user2"), http.StatusOK)
 	page := NewHTMLParser(t, response.Body)
-	assert.EqualValues(t, buttons, page.Find("overflow-menu .item[href='/user2?tab=activity']").Length() > 0)
+	page.AssertElement(t, "overflow-menu .item[href='/sub/user2?tab=activity']", activity)
+
+	// User details - for admins only
+	page.AssertElement(t, "#profile-avatar-card a[href='/sub/admin/users/2']", adminLink)
+	// Edit profile - for self only
+	page.AssertElement(t, "#profile-avatar-card a[href='/sub/user/settings']", editLink)
+
+	// Feed links
+	page.AssertElement(t, "#profile-avatar-card a[href='/sub/user2.rss']", activity)
+	page.AssertElement(t, "#profile-avatar-card a[href='/sub/user2.atom']", activity)
 }
diff --git a/tests/integration/user_profile_follows_test.go b/tests/integration/user_profile_follows_test.go
index 08bd58db16..b4216865b7 100644
--- a/tests/integration/user_profile_follows_test.go
+++ b/tests/integration/user_profile_follows_test.go
@@ -1,5 +1,5 @@
 // Copyright 2024 The Forgejo Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 package integration
 
@@ -32,6 +32,7 @@ func TestUserProfileFollows(t *testing.T) {
 	followingLink := "#profile-avatar-card a[href='/user1?tab=following']"
 	listHeader := ".user-cards h2"
 	listItems := ".user-cards .list"
+	listMsg := ".user-cards > div"
 
 	// = No follows =
 
@@ -44,7 +45,8 @@ func TestUserProfileFollows(t *testing.T) {
 	// Verify that user1 has no followers
 	testSelectorEquals(t, page, followersLink, "0 followers")
 	testSelectorEquals(t, page, listHeader, "Followers")
-	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listItems, false)
+	page.AssertElement(t, listMsg, true)
 
 	// Request the profile of user1, the Following tab
 	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
@@ -53,7 +55,8 @@ func TestUserProfileFollows(t *testing.T) {
 	// Verify that user1 does not follow anyone
 	testSelectorEquals(t, page, followingLink, "0 following")
 	testSelectorEquals(t, page, listHeader, "Following")
-	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listItems, false)
+	page.AssertElement(t, listMsg, true)
 
 	// Make user1 and user2 follow each other
 	testUserFollowUser(t, user1, "user2")
@@ -71,6 +74,7 @@ func TestUserProfileFollows(t *testing.T) {
 	testSelectorEquals(t, page, followersLink, "1 follower")
 	testSelectorEquals(t, page, listHeader, "Follower")
 	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listMsg, false)
 
 	// Request the profile of user1, the Following tab
 	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
@@ -80,6 +84,7 @@ func TestUserProfileFollows(t *testing.T) {
 	testSelectorEquals(t, page, followingLink, "1 following")
 	testSelectorEquals(t, page, listHeader, "Following")
 	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listMsg, false)
 
 	// Make user1 and user3 follow each other
 	testUserFollowUser(t, user1, "user5")
@@ -97,6 +102,7 @@ func TestUserProfileFollows(t *testing.T) {
 	testSelectorEquals(t, page, followersLink, "2 followers")
 	testSelectorEquals(t, page, listHeader, "Followers")
 	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listMsg, false)
 
 	// Request the profile of user1, the Following tab
 	response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK)
@@ -106,6 +112,7 @@ func TestUserProfileFollows(t *testing.T) {
 	testSelectorEquals(t, page, followingLink, "2 following")
 	testSelectorEquals(t, page, listHeader, "Following")
 	testListCount(t, page, listItems, followCount)
+	page.AssertElement(t, listMsg, false)
 }
 
 // testUserFollowUser simply follows a user `following` by session of user `follower`
diff --git a/tests/integration/user_profile_test.go b/tests/integration/user_profile_test.go
index 04d87c49ab..fb96efcd64 100644
--- a/tests/integration/user_profile_test.go
+++ b/tests/integration/user_profile_test.go
@@ -11,6 +11,8 @@ import (
 
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
+	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	files_service "forgejo.org/services/repository/files"
 	"forgejo.org/tests"
 
@@ -63,5 +65,44 @@ func TestUserProfile(t *testing.T) {
 		checkReadme(t, "readme.md", "readme.md", 1)
 		checkReadme(t, "ReadMe.mD", "ReadMe.mD", 1)
 		checkReadme(t, "readme.org does not render", "README.org", 0)
+
+		t.Run("readme-size", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+
+			// Prepare the test repository
+			user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+
+			_, _, f := tests.CreateDeclarativeRepo(t, user2, ".profile", nil, nil, []*files_service.ChangeRepoFile{
+				{
+					Operation: "update",
+					TreePath:  "README.md",
+					ContentReader: strings.NewReader(`## Lorem ipsum
+dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+## Ut enim ad minim veniam
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum`),
+				},
+			})
+			defer f()
+
+			t.Run("full", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				defer test.MockVariableValue(&setting.UI.MaxDisplayFileSize, 500)()
+
+				req := NewRequest(t, "GET", "/user2")
+				resp := MakeRequest(t, req, http.StatusOK)
+				assert.Contains(t, resp.Body.String(), "Ut enim ad minim veniam")
+				assert.Contains(t, resp.Body.String(), "mollit anim id est laborum")
+			})
+
+			t.Run("truncated", func(t *testing.T) {
+				defer tests.PrintCurrentTest(t)()
+				defer test.MockVariableValue(&setting.UI.MaxDisplayFileSize, 146)()
+
+				req := NewRequest(t, "GET", "/user2")
+				resp := MakeRequest(t, req, http.StatusOK)
+				assert.Contains(t, resp.Body.String(), "Ut enim ad minim")
+				assert.NotContains(t, resp.Body.String(), "veniam")
+			})
+		})
 	})
 }
diff --git a/tests/integration/user_redirect_test.go b/tests/integration/user_redirect_test.go
index 52dc5d9d3a..ad17b57713 100644
--- a/tests/integration/user_redirect_test.go
+++ b/tests/integration/user_redirect_test.go
@@ -38,7 +38,7 @@ func TestUserRedirect(t *testing.T) {
 
 		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2", RedirectUserID: 2})
 	})
@@ -88,7 +88,7 @@ func TestUserRedirect(t *testing.T) {
 		session.MakeRequest(t, req, http.StatusSeeOther)
 		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DThe%2Buser%2Baccount%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DThe%2Buser%2Baccount%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 		unittest.AssertExistsIf(t, true, &user_model.User{LowerName: "user2"})
 		unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "user2", RedirectUserID: 2})
@@ -105,7 +105,7 @@ func TestUserRedirect(t *testing.T) {
 
 		flashCookie := session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2-new", RedirectUserID: 2})
 
@@ -117,7 +117,7 @@ func TestUserRedirect(t *testing.T) {
 
 		flashCookie = session.GetCookie(forgejo_context.CookieNameFlash)
 		assert.NotNil(t, flashCookie)
-		assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
+		assert.Equal(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 		unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "user2-new", RedirectUserID: 2})
 		unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2-new-2", RedirectUserID: 2})
@@ -143,7 +143,7 @@ func TestUserRedirect(t *testing.T) {
 			defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 8)()
 			defer tests.PrintCurrentTest(t)()
 
-			assert.Contains(t, getPrompt(t), "The old username will be available to everyone after a cooldown period of 8 days, you can still reclaim the old username during the cooldown period.")
+			assert.Contains(t, getPrompt(t), "The old username will be available to everyone after a cooldown period of 8 days. You can still reclaim the old username during the cooldown period.")
 		})
 	})
 
@@ -167,7 +167,7 @@ func TestUserRedirect(t *testing.T) {
 			defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 8)()
 			defer tests.PrintCurrentTest(t)()
 
-			assert.Contains(t, getPrompt(t), "The old organization name will be available to everyone after a cooldown period of 8 days, you can still reclaim the old name during the cooldown period.")
+			assert.Contains(t, getPrompt(t), "The old organization name will be available to everyone after a cooldown period of 8 days. You can still reclaim the old name during the cooldown period.")
 		})
 	})
 }
diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go
index 5e02f90f9e..de59a16e89 100644
--- a/tests/integration/user_test.go
+++ b/tests/integration/user_test.go
@@ -318,12 +318,12 @@ func TestGetUserRss(t *testing.T) {
 		user34 := "the_34-user.with.all.allowedChars"
 		req := NewRequestf(t, "GET", "/%s.rss", user34)
 		resp := MakeRequest(t, req, http.StatusOK)
-		if assert.EqualValues(t, "application/rss+xml;charset=utf-8", resp.Header().Get("Content-Type")) {
+		if assert.Equal(t, "application/rss+xml;charset=utf-8", resp.Header().Get("Content-Type")) {
 			rssDoc := NewHTMLParser(t, resp.Body).Find("channel")
 			title, _ := rssDoc.ChildrenFiltered("title").Html()
-			assert.EqualValues(t, "Feed of &#34;the_1-user.with.all.allowedChars&#34;", title)
+			assert.Equal(t, "Feed of &#34;the_1-user.with.all.allowedChars&#34;", title)
 			description, _ := rssDoc.ChildrenFiltered("description").Html()
-			assert.EqualValues(t, "&lt;p dir=&#34;auto&#34;&gt;some &lt;a href=&#34;https://commonmark.org/&#34; rel=&#34;nofollow&#34;&gt;commonmark&lt;/a&gt;!&lt;/p&gt;\n", description)
+			assert.Equal(t, "&lt;p dir=&#34;auto&#34;&gt;some &lt;a href=&#34;https://commonmark.org/&#34; rel=&#34;nofollow&#34;&gt;commonmark&lt;/a&gt;!&lt;/p&gt;\n", description)
 		}
 	})
 	t.Run("Non-existent user", func(t *testing.T) {
@@ -347,18 +347,18 @@ func TestListStopWatches(t *testing.T) {
 	stopwatch := unittest.AssertExistsAndLoadBean(t, &issues_model.Stopwatch{UserID: owner.ID})
 	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: stopwatch.IssueID})
 	if assert.Len(t, apiWatches, 1) {
-		assert.EqualValues(t, stopwatch.CreatedUnix.AsTime().Unix(), apiWatches[0].Created.Unix())
-		assert.EqualValues(t, issue.Index, apiWatches[0].IssueIndex)
-		assert.EqualValues(t, issue.Title, apiWatches[0].IssueTitle)
-		assert.EqualValues(t, repo.Name, apiWatches[0].RepoName)
-		assert.EqualValues(t, repo.OwnerName, apiWatches[0].RepoOwnerName)
+		assert.Equal(t, stopwatch.CreatedUnix.AsTime().Unix(), apiWatches[0].Created.Unix())
+		assert.Equal(t, issue.Index, apiWatches[0].IssueIndex)
+		assert.Equal(t, issue.Title, apiWatches[0].IssueTitle)
+		assert.Equal(t, repo.Name, apiWatches[0].RepoName)
+		assert.Equal(t, repo.OwnerName, apiWatches[0].RepoOwnerName)
 		assert.Positive(t, apiWatches[0].Seconds)
 	}
 }
 
 func TestUserLocationMapLink(t *testing.T) {
-	setting.Service.UserLocationMapURL = "https://example/foo/"
 	defer tests.PrepareTestEnv(t)()
+	defer test.MockVariableValue(&setting.Service.UserLocationMapURL, "https://example/foo/")()
 
 	session := loginUser(t, "user2")
 	req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{
@@ -450,7 +450,7 @@ func TestUserHints(t *testing.T) {
 			assert.Equal(t, enabled, hintChecked)
 
 			link, _ := htmlDoc.Find("form[action='/user/settings/appearance/language'] a").Attr("href")
-			assert.EqualValues(t, "https://forgejo.org/docs/next/contributor/localization/", link)
+			assert.Equal(t, "https://forgejo.org/docs/next/contributor/localization/", link)
 		}
 
 		t.Run("view", func(t *testing.T) {
@@ -706,7 +706,7 @@ func TestUserPronouns(t *testing.T) {
 		htmlDoc := NewHTMLParser(t, resp.Body)
 
 		userName := strings.TrimSpace(htmlDoc.Find(".profile-avatar-name .username").Text())
-		assert.EqualValues(t, "user2", userName)
+		assert.Equal(t, "user2", userName)
 	})
 }
 
@@ -853,32 +853,6 @@ func TestUserTOTPEnrolled(t *testing.T) {
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 	session := loginUser(t, user.Name)
 
-	enrollTOTP := func(t *testing.T) {
-		t.Helper()
-
-		req := NewRequest(t, "GET", "/user/settings/security/two_factor/enroll")
-		resp := session.MakeRequest(t, req, http.StatusOK)
-
-		htmlDoc := NewHTMLParser(t, resp.Body)
-		totpSecretKey, has := htmlDoc.Find(".twofa img[src^='data:image/png;base64']").Attr("alt")
-		assert.True(t, has)
-
-		currentTOTP, err := totp.GenerateCode(totpSecretKey, time.Now())
-		require.NoError(t, err)
-
-		req = NewRequestWithValues(t, "POST", "/user/settings/security/two_factor/enroll", map[string]string{
-			"_csrf":    htmlDoc.GetCSRF(),
-			"passcode": currentTOTP,
-		})
-		session.MakeRequest(t, req, http.StatusSeeOther)
-
-		flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
-		assert.NotNil(t, flashCookie)
-		assert.Contains(t, flashCookie.Value, "success%3DYour%2Baccount%2Bhas%2Bbeen%2Bsuccessfully%2Benrolled.")
-
-		unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
-	}
-
 	t.Run("No WebAuthn enabled", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
 
@@ -891,7 +865,8 @@ func TestUserTOTPEnrolled(t *testing.T) {
 			called = true
 		})()
 
-		enrollTOTP(t)
+		session.EnrollTOTP(t)
+		unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
 
 		assert.True(t, called)
 	})
@@ -909,12 +884,122 @@ func TestUserTOTPEnrolled(t *testing.T) {
 		})()
 
 		unittest.AssertSuccessfulInsert(t, &auth_model.WebAuthnCredential{UserID: user.ID, Name: "Cueball's primary key"})
-		enrollTOTP(t)
+		session.EnrollTOTP(t)
+		unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
 
 		assert.True(t, called)
 	})
 }
 
+func TestUserTOTPReenroll(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	session := loginUser(t, user.Name)
+
+	resp := session.MakeRequest(t, NewRequest(t, "GET", "/user/settings/security/two_factor/reenroll"), http.StatusSeeOther)
+	assert.Equal(t, "/user/settings/security", resp.Header().Get("Location"))
+
+	session.EnrollTOTP(t)
+
+	resp = session.MakeRequest(t, NewRequest(t, "GET", "/user/settings/security/two_factor/reenroll"), http.StatusOK)
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	totpSecretKey, has := htmlDoc.Find(".twofa img[src^='data:image/png;base64']").Attr("alt")
+	assert.True(t, has)
+
+	currentTOTP, err := totp.GenerateCode(totpSecretKey, time.Now())
+	require.NoError(t, err)
+
+	req := NewRequestWithValues(t, "POST", "/user/settings/security/two_factor/reenroll", map[string]string{
+		"_csrf":    htmlDoc.GetCSRF(),
+		"passcode": currentTOTP,
+	})
+	session.MakeRequest(t, req, http.StatusSeeOther)
+
+	flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
+	assert.NotNil(t, flashCookie)
+	assert.Contains(t, flashCookie.Value, "success%3DYour%2Baccount%2Bhas%2Bbeen%2Bsuccessfully%2Benrolled.")
+}
+
+func TestUserTOTPDisable(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	runTest := func(t *testing.T, user *user_model.User, useTOTP, disableAllowed bool, status int, flashMessage string) {
+		t.Helper()
+		defer unittest.AssertSuccessfulDelete(t, &auth_model.TwoFactor{UID: user.ID})
+
+		session := loginUserMaybeTOTP(t, user, useTOTP)
+
+		resp := session.MakeRequest(t, NewRequest(t, "GET", "user/settings/security"), http.StatusOK)
+		htmlDoc := NewHTMLParser(t, resp.Body)
+		htmlDoc.AssertElement(t, "#disable-form", disableAllowed)
+
+		req := NewRequestWithValues(t, "POST", "user/settings/security/two_factor/disable", map[string]string{
+			"_csrf": htmlDoc.GetCSRF(),
+		})
+		if status == http.StatusSeeOther {
+			resp := session.MakeRequest(t, req, http.StatusSeeOther)
+			assert.Equal(t, "/user/settings/security", resp.Header().Get("Location"))
+		} else {
+			session.MakeRequest(t, req, status)
+		}
+		if flashMessage != "" {
+			flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
+			assert.NotNil(t, flashCookie)
+			if disableAllowed {
+				assert.Contains(t, flashCookie.Value, fmt.Sprintf("success%%3D%s", flashMessage))
+			} else {
+				assert.Contains(t, flashCookie.Value, fmt.Sprintf("error%%3D%s", flashMessage))
+			}
+		}
+	}
+
+	adminUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	normalUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4})
+	restrictedUser := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 29})
+
+	const twofaNotEnrolled = "Your%2Baccount%2Bis%2Bnot%2Bcurrently%2Benrolled%2Bin%2Btwo-factor%2Bauthentication."
+	const twofaDisabled = "Two-factor%2Bauthentication%2Bhas%2Bbeen%2Bdisabled."
+
+	t.Run("NoneTwoFactorRequirement", func(t *testing.T) {
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, adminUser, false, false, http.StatusSeeOther, twofaNotEnrolled)
+			runTest(t, normalUser, false, false, http.StatusSeeOther, twofaNotEnrolled)
+			runTest(t, restrictedUser, false, false, http.StatusSeeOther, twofaNotEnrolled)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, true, http.StatusSeeOther, twofaDisabled)
+			runTest(t, normalUser, true, true, http.StatusSeeOther, twofaDisabled)
+			runTest(t, restrictedUser, true, true, http.StatusSeeOther, twofaDisabled)
+		})
+	})
+
+	t.Run("AllTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AllTwoFactorRequirement)()
+
+		runTest(t, adminUser, true, false, http.StatusNotFound, "")
+		runTest(t, normalUser, true, false, http.StatusNotFound, "")
+		runTest(t, restrictedUser, true, false, http.StatusNotFound, "")
+	})
+
+	t.Run("AdminTwoFactorRequirement", func(t *testing.T) {
+		defer test.MockVariableValue(&setting.GlobalTwoFactorRequirement, setting.AdminTwoFactorRequirement)()
+
+		t.Run("no 2fa", func(t *testing.T) {
+			runTest(t, normalUser, false, false, http.StatusSeeOther, twofaNotEnrolled)
+			runTest(t, restrictedUser, false, false, http.StatusSeeOther, twofaNotEnrolled)
+		})
+
+		t.Run("enabled 2fa", func(t *testing.T) {
+			runTest(t, adminUser, true, false, http.StatusNotFound, "")
+			runTest(t, normalUser, true, true, http.StatusSeeOther, twofaDisabled)
+			runTest(t, restrictedUser, true, true, http.StatusSeeOther, twofaDisabled)
+		})
+	})
+}
+
 func TestUserRepos(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
@@ -934,7 +1019,7 @@ func TestUserRepos(t *testing.T) {
 		sel := htmlDoc.doc.Find("a.name")
 		assert.Len(t, repos, len(sel.Nodes))
 		for i := 0; i < len(repos); i++ {
-			assert.EqualValues(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
+			assert.Equal(t, repos[i], strings.TrimSpace(sel.Eq(i).Text()))
 		}
 	}
 }
@@ -982,7 +1067,7 @@ func TestUserActivate(t *testing.T) {
 	authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.UserActivation)
 	require.NoError(t, err)
 	assert.False(t, authToken.IsExpired())
-	assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
+	assert.Equal(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
 
 	t.Run("No password", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
@@ -1052,7 +1137,7 @@ func TestUserPasswordReset(t *testing.T) {
 	authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.PasswordReset)
 	require.NoError(t, err)
 	assert.False(t, authToken.IsExpired())
-	assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
+	assert.Equal(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
 
 	req = NewRequestWithValues(t, "POST", "/user/recover_account", map[string]string{
 		"_csrf":    GetCSRF(t, session, "/user/recover_account"),
@@ -1062,7 +1147,7 @@ func TestUserPasswordReset(t *testing.T) {
 	session.MakeRequest(t, req, http.StatusSeeOther)
 
 	unittest.AssertNotExistsBean(t, &auth_model.AuthorizationToken{ID: authToken.ID})
-	assert.True(t, unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).ValidatePassword("new_password"))
+	assert.True(t, unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).ValidatePassword(t.Context(), "new_password"))
 }
 
 func TestActivateEmailAddress(t *testing.T) {
@@ -1111,7 +1196,7 @@ func TestActivateEmailAddress(t *testing.T) {
 	authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.EmailActivation("newemail@example.org"))
 	require.NoError(t, err)
 	assert.False(t, authToken.IsExpired())
-	assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
+	assert.Equal(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator))
 
 	req = NewRequestWithValues(t, "POST", "/user/activate_email", map[string]string{
 		"code":  code,
diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go
index 053528d919..bc94d8a59a 100644
--- a/tests/integration/webfinger_test.go
+++ b/tests/integration/webfinger_test.go
@@ -7,11 +7,13 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 	"testing"
 
 	"forgejo.org/models/unittest"
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/setting"
+	"forgejo.org/modules/test"
 	"forgejo.org/tests"
 
 	"github.com/stretchr/testify/assert"
@@ -19,11 +21,7 @@ import (
 
 func TestWebfinger(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
-
-	setting.Federation.Enabled = true
-	defer func() {
-		setting.Federation.Enabled = false
-	}()
+	defer test.MockVariableValue(&setting.Federation.Enabled, true)()
 
 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 
@@ -46,6 +44,8 @@ func TestWebfinger(t *testing.T) {
 
 	session := loginUser(t, "user1")
 
+	ctx := t.Context()
+
 	req := NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, appURL.Host))
 	resp := MakeRequest(t, req, http.StatusOK)
 	assert.Equal(t, "application/jrd+json", resp.Header().Get("Content-Type"))
@@ -53,8 +53,37 @@ func TestWebfinger(t *testing.T) {
 	var jrd webfingerJRD
 	DecodeJSON(t, resp, &jrd)
 	assert.Equal(t, "acct:user2@"+appURL.Host, jrd.Subject)
+	assert.ElementsMatch(t, []*webfingerLink{
+		{
+			Rel:  "http://webfinger.net/rel/profile-page",
+			Type: "text/html",
+			Href: user.HTMLURL(),
+		},
+		{
+			Rel:  "http://webfinger.net/rel/avatar",
+			Href: user.AvatarLink(ctx),
+		},
+		{
+			Rel:  "self",
+			Type: "application/activity+json",
+			Href: appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID),
+		},
+		{
+			Rel:  "http://openid.net/specs/connect/1.0/issuer",
+			Href: strings.TrimSuffix(appURL.String(), "/"),
+		},
+	}, jrd.Links)
 	assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID)}, jrd.Aliases)
 
+	instanceReq := NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:ghost@%s", appURL.Host))
+	instanceResp := MakeRequest(t, instanceReq, http.StatusOK)
+	assert.Equal(t, "application/jrd+json", instanceResp.Header().Get("Content-Type"))
+
+	var instanceActor webfingerJRD
+	DecodeJSON(t, instanceResp, &instanceActor)
+	assert.Equal(t, "acct:ghost@"+appURL.Host, instanceActor.Subject)
+	assert.ElementsMatch(t, []string{appURL.String() + "api/v1/activitypub/actor"}, instanceActor.Aliases)
+
 	req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, "unknown.host"))
 	MakeRequest(t, req, http.StatusBadRequest)
 
diff --git a/tests/integration/wiki_test.go b/tests/integration/wiki_test.go
index 3e4761b9bd..2949038f1f 100644
--- a/tests/integration/wiki_test.go
+++ b/tests/integration/wiki_test.go
@@ -30,7 +30,7 @@ func assertFileExist(t *testing.T, p string) {
 func assertFileEqual(t *testing.T, p string, content []byte) {
 	bs, err := os.ReadFile(p)
 	require.NoError(t, err)
-	assert.EqualValues(t, content, bs)
+	assert.Equal(t, content, bs)
 }
 
 func TestRepoCloneWiki(t *testing.T) {
@@ -67,6 +67,6 @@ func Test_RepoWikiPages(t *testing.T) {
 		href, _ := firstAnchor.Attr("href")
 		pagePath := strings.TrimPrefix(href, "/user2/repo1/wiki/")
 
-		assert.EqualValues(t, expectedPagePaths[i], pagePath)
+		assert.Equal(t, expectedPagePaths[i], pagePath)
 	})
 }
diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go
index 94cbeaf331..d891910fd7 100644
--- a/tests/integration/xss_test.go
+++ b/tests/integration/xss_test.go
@@ -34,8 +34,8 @@ func TestXSSUserFullName(t *testing.T) {
 	req = NewRequestf(t, "GET", "/%s", user.Name)
 	resp := session.MakeRequest(t, req, http.StatusOK)
 	htmlDoc := NewHTMLParser(t, resp.Body)
-	assert.EqualValues(t, 0, htmlDoc.doc.Find("script.evil").Length())
-	assert.EqualValues(t, fullName,
+	assert.Equal(t, 0, htmlDoc.doc.Find("script.evil").Length())
+	assert.Equal(t, fullName,
 		htmlDoc.doc.Find("div.content").Find(".header.text.center").Text(),
 	)
 }
diff --git a/tests/mysql.ini.tmpl b/tests/mysql.ini.tmpl
index e15e79952b..674884cea5 100644
--- a/tests/mysql.ini.tmpl
+++ b/tests/mysql.ini.tmpl
@@ -77,7 +77,7 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-mysql/data/sessions
 MODE                 = {{TEST_LOGGER}}
 ROOT_PATH            = {{REPO_TEST_DIR}}mysql-log
 ENABLE_SSH_LOG       = true
-logger.xorm.MODE     = file
+LOGGER_XORM_MODE     = file
 
 [log.test]
 LEVEL                = Info
@@ -116,3 +116,12 @@ ENABLED = true
 
 [ui.notification]
 EVENT_SOURCE_UPDATE_TIME = 1s
+
+[cron.stop_zombie_tasks]
+ENABLED = false
+
+[cron.stop_endless_tasks]
+ENABLED = false
+
+[cron.check_repo_stats]
+ENABLED = false
diff --git a/tests/pgsql.ini.tmpl b/tests/pgsql.ini.tmpl
index 340531fb38..4af44c3205 100644
--- a/tests/pgsql.ini.tmpl
+++ b/tests/pgsql.ini.tmpl
@@ -82,7 +82,7 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-pgsql/data/sessions
 MODE                 = {{TEST_LOGGER}}
 ROOT_PATH            = {{REPO_TEST_DIR}}pgsql-log
 ENABLE_SSH_LOG       = true
-logger.xorm.MODE     = file
+LOGGER_XORM_MODE     = file
 
 [log.test]
 LEVEL                = Info
@@ -114,7 +114,7 @@ MINIO_BASE_PATH = repo-avatars/
 [storage]
 STORAGE_TYPE = {{TEST_STORAGE_TYPE}}
 SERVE_DIRECT = false
-MINIO_ENDPOINT = minio:9000
+MINIO_ENDPOINT = {{TEST_S3_HOST}}
 MINIO_ACCESS_KEY_ID = 123456
 MINIO_SECRET_ACCESS_KEY = 12345678
 MINIO_BUCKET = gitea
@@ -130,3 +130,12 @@ ENABLED = true
 
 [ui.notification]
 EVENT_SOURCE_UPDATE_TIME = 1s
+
+[cron.stop_zombie_tasks]
+ENABLED = false
+
+[cron.stop_endless_tasks]
+ENABLED = false
+
+[cron.check_repo_stats]
+ENABLED = false
diff --git a/tests/sqlite.ini.tmpl b/tests/sqlite.ini.tmpl
index 277916a539..b3baa314a2 100644
--- a/tests/sqlite.ini.tmpl
+++ b/tests/sqlite.ini.tmpl
@@ -79,7 +79,7 @@ PROVIDER_CONFIG = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/data/sessions
 MODE                 = {{TEST_LOGGER}}
 ROOT_PATH            = {{REPO_TEST_DIR}}sqlite-log
 ENABLE_SSH_LOG       = true
-logger.xorm.MODE     = file
+LOGGER_XORM_MODE     = file
 
 [log.test]
 LEVEL                = Info
@@ -117,3 +117,12 @@ ENABLED = true
 
 [ui.notification]
 EVENT_SOURCE_UPDATE_TIME = 1s
+
+[cron.stop_zombie_tasks]
+ENABLED = false
+
+[cron.stop_endless_tasks]
+ENABLED = false
+
+[cron.check_repo_stats]
+ENABLED = false
diff --git a/tests/test_utils.go b/tests/test_utils.go
index b338ddc052..d72ac476da 100644
--- a/tests/test_utils.go
+++ b/tests/test_utils.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -24,6 +25,7 @@ import (
 	user_model "forgejo.org/models/user"
 	"forgejo.org/modules/base"
 	"forgejo.org/modules/git"
+	"forgejo.org/modules/gitrepo"
 	"forgejo.org/modules/graceful"
 	"forgejo.org/modules/log"
 	"forgejo.org/modules/optional"
@@ -41,6 +43,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"xorm.io/xorm/convert"
 )
 
 func exitf(format string, args ...any) {
@@ -310,9 +313,26 @@ func PrepareCleanPackageData(t testing.TB) {
 	require.NoError(t, storage.Clean(storage.Packages))
 }
 
+// inTestEnv keeps track if we are current inside a test environment, this is
+// used to detect if testing code tries to prepare a test environment more than
+// once.
+var inTestEnv atomic.Bool
+
 func PrepareTestEnv(t testing.TB, skip ...int) func() {
 	t.Helper()
-	deferFn := PrintCurrentTest(t, util.OptionalArg(skip)+1)
+
+	if !inTestEnv.CompareAndSwap(false, true) {
+		t.Fatal("Cannot prepare a test environment if you are already in a test environment. This is a bug in your testing code.")
+	}
+
+	deferPrintCurrentTest := PrintCurrentTest(t, util.OptionalArg(skip)+1)
+	deferFn := func() {
+		deferPrintCurrentTest()
+
+		if !inTestEnv.CompareAndSwap(true, false) {
+			t.Fatal("Tried to leave test environment, but we are no longer in a test environment. This should not happen.")
+		}
+	}
 
 	cancelProcesses(t, 30*time.Second)
 	t.Cleanup(func() { cancelProcesses(t, 0) }) // cancel remaining processes in a non-blocking way
@@ -341,10 +361,12 @@ type DeclarativeRepoOptions struct {
 	Name          optional.Option[string]
 	EnabledUnits  optional.Option[[]unit_model.Type]
 	DisabledUnits optional.Option[[]unit_model.Type]
+	UnitConfig    optional.Option[map[unit_model.Type]convert.Conversion]
 	Files         optional.Option[[]*files_service.ChangeRepoFile]
 	WikiBranch    optional.Option[string]
 	AutoInit      optional.Option[bool]
 	IsTemplate    optional.Option[bool]
+	ObjectFormat  optional.Option[string]
 }
 
 func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts DeclarativeRepoOptions) (*repo_model.Repository, string, func()) {
@@ -368,14 +390,15 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
 
 	// Create the repository
 	repo, err := repo_service.CreateRepository(db.DefaultContext, owner, owner, repo_service.CreateRepoOptions{
-		Name:          repoName,
-		Description:   "Temporary Repo",
-		AutoInit:      autoInit,
-		Gitignores:    "",
-		License:       "WTFPL",
-		Readme:        "Default",
-		DefaultBranch: "main",
-		IsTemplate:    opts.IsTemplate.Value(),
+		Name:             repoName,
+		Description:      "Temporary Repo",
+		AutoInit:         autoInit,
+		Gitignores:       "",
+		License:          "WTFPL",
+		Readme:           "Default",
+		DefaultBranch:    "main",
+		IsTemplate:       opts.IsTemplate.Value(),
+		ObjectFormatName: opts.ObjectFormat.Value(),
 	})
 	require.NoError(t, err)
 	assert.NotEmpty(t, repo)
@@ -387,9 +410,14 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
 		enabledUnits = make([]repo_model.RepoUnit, len(units))
 
 		for i, unitType := range units {
+			var config convert.Conversion
+			if cfg, ok := opts.UnitConfig.Value()[unitType]; ok {
+				config = cfg
+			}
 			enabledUnits[i] = repo_model.RepoUnit{
 				RepoID: repo.ID,
 				Type:   unitType,
+				Config: config,
 			}
 		}
 	}
@@ -406,6 +434,9 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
 		assert.True(t, autoInit, "Files cannot be specified if AutoInit is disabled")
 		files := opts.Files.Value()
 
+		commitID, err := gitrepo.GetBranchCommitID(git.DefaultContext, repo, "main")
+		require.NoError(t, err)
+
 		resp, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, owner, &files_service.ChangeRepoFilesOptions{
 			Files:     files,
 			Message:   "add files",
@@ -423,6 +454,7 @@ func CreateDeclarativeRepoWithOptions(t *testing.T, owner *user_model.User, opts
 				Author:    time.Now(),
 				Committer: time.Now(),
 			},
+			LastCommitID: commitID,
 		})
 		require.NoError(t, err)
 		assert.NotEmpty(t, resp)
@@ -463,6 +495,25 @@ func CreateDeclarativeRepo(t *testing.T, owner *user_model.User, name string, en
 	}
 	if enabledUnits != nil {
 		opts.EnabledUnits = optional.Some(enabledUnits)
+
+		for _, unitType := range enabledUnits {
+			if unitType == unit_model.TypePullRequests {
+				opts.UnitConfig = optional.Some(map[unit_model.Type]convert.Conversion{
+					unit_model.TypePullRequests: &repo_model.PullRequestsConfig{
+						AllowMerge:           true,
+						AllowRebase:          true,
+						AllowRebaseMerge:     true,
+						AllowSquash:          true,
+						AllowFastForwardOnly: true,
+						AllowManualMerge:     true,
+						AllowRebaseUpdate:    true,
+						DefaultMergeStyle:    repo_model.MergeStyleMerge,
+						DefaultUpdateStyle:   repo_model.UpdateStyleMerge,
+					},
+				})
+				break
+			}
+		}
 	}
 	if disabledUnits != nil {
 		opts.DisabledUnits = optional.Some(disabledUnits)
diff --git a/tests/testdata/data/viewer/README.md b/tests/testdata/data/viewer/README.md
new file mode 100644
index 0000000000..e26d11f3c8
--- /dev/null
+++ b/tests/testdata/data/viewer/README.md
@@ -0,0 +1,14 @@
+# GLTF 3D Model Viewer
+
+⚠️ Currently supports `.glb` files only.
+
+3D models with the `.glb` format are rendered in repository file view.
+
+## 🔨 How to Test
+
+1) Create a new repository or use an existing one.
+2) Upload a `.glb` file such as [Unicode❤♻Test.glb](./Unicode❤♻Test.glb) (CC0 1.0 Universal).
+3) View the file in the repository.
+    - Similar to image files, the 3D model should be rendered in a viewer.
+    - Use mouse clicks to turn and zoom.
+
diff --git a/tests/testdata/data/viewer/Unicode❤♻Test.glb b/tests/testdata/data/viewer/Unicode❤♻Test.glb
new file mode 100644
index 0000000000..32b0f4a0e8
Binary files /dev/null and b/tests/testdata/data/viewer/Unicode❤♻Test.glb differ
diff --git a/tools/generate-images.js b/tools/generate-images.js
index d28e0916f7..06f05892fb 100755
--- a/tools/generate-images.js
+++ b/tools/generate-images.js
@@ -1,9 +1,8 @@
-#!/usr/bin/env node
-import imageminZopfli from 'imagemin-zopfli'; // eslint-disable-line import-x/no-unresolved
-import {loadSVGFromString, Canvas, Rect, util} from 'fabric/node'; // eslint-disable-line import-x/no-unresolved
 import {optimize} from 'svgo';
 import {readFile, writeFile} from 'node:fs/promises';
-import {argv, exit} from 'node:process';
+import {exit} from 'node:process';
+import SharpConstructor from 'sharp';
+import {fileURLToPath} from 'node:url';
 
 function doExit(err) {
   if (err) console.error(err);
@@ -28,36 +27,14 @@ async function generate(svg, path, {size, bg}) {
     return;
   }
 
-  const {objects, options} = await loadSVGFromString(svg);
-  const canvas = new Canvas();
-  canvas.setDimensions({width: size, height: size});
-  const ctx = canvas.getContext('2d');
-  ctx.scale(options.width ? (size / options.width) : 1, options.height ? (size / options.height) : 1);
-
+  let sharp = (new SharpConstructor(Buffer.from(svg))).resize(size, size).png({compressionLevel: 9, palette: true, effort: 10, quality: 80});
   if (bg) {
-    canvas.add(new Rect({
-      left: 0,
-      top: 0,
-      height: size * (1 / (size / options.height)),
-      width: size * (1 / (size / options.width)),
-      fill: 'white',
-    }));
+    sharp = sharp.flatten({background: 'white'});
   }
-
-  canvas.add(util.groupSVGElements(objects, options));
-  canvas.renderAll();
-
-  let png = Buffer.from([]);
-  for await (const chunk of canvas.createPNGStream()) {
-    png = Buffer.concat([png, chunk]);
-  }
-
-  png = await imageminZopfli({more: true})(png);
-  await writeFile(outputFile, png);
+  sharp.toFile(fileURLToPath(outputFile), (err) => err !== null && console.error(err) && exit(1));
 }
 
 async function main() {
-  const gitea = argv.slice(2).includes('gitea');
   const logoSvg = await readFile(new URL('../assets/logo.svg', import.meta.url), 'utf8');
   const faviconSvg = await readFile(new URL('../assets/favicon.svg', import.meta.url), 'utf8');
 
@@ -68,7 +45,6 @@ async function main() {
     generate(faviconSvg, '../public/assets/img/favicon.png', {size: 180}),
     generate(logoSvg, '../public/assets/img/avatar_default.png', {size: 200}),
     generate(logoSvg, '../public/assets/img/apple-touch-icon.png', {size: 180, bg: true}),
-    gitea && generate(logoSvg, '../public/assets/img/gitea.svg', {size: 32}),
   ]);
 }
 
diff --git a/tools/lint-go-gopls.sh b/tools/lint-go-gopls.sh
deleted file mode 100755
index a222ea14d7..0000000000
--- a/tools/lint-go-gopls.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -uo pipefail
-
-cd "$(dirname -- "${BASH_SOURCE[0]}")" && cd ..
-
-IGNORE_PATTERNS=(
-  "is deprecated" # TODO: fix these
-)
-
-# lint all go files with 'gopls check' and look for lines starting with the
-# current absolute path, indicating a error was found. This is necessary
-# because the tool does not set non-zero exit code when errors are found.
-# ref: https://github.com/golang/go/issues/67078
-ERROR_LINES=$("$GO" run "$GOPLS_PACKAGE" check "$@" 2>/dev/null | grep -E "^$PWD" | grep -vFf <(printf '%s\n' "${IGNORE_PATTERNS[@]}"));
-NUM_ERRORS=$(echo -n "$ERROR_LINES" | wc -l)
-
-if [ "$NUM_ERRORS" -eq "0" ]; then
-  exit 0;
-else
-  echo "$ERROR_LINES"
-  echo "Found $NUM_ERRORS 'gopls check' errors"
-  exit 1;
-fi
diff --git a/web_src/css/base.css b/web_src/css/base.css
index ad6e8a2a24..af23ecf2c2 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -18,6 +18,7 @@
   /* other variables */
   --border-radius: 4px;
   --border-radius-medium: 6px;
+  --border-radius-large: 25px;
   --border-radius-full: 99999px; /* TODO: use calc(infinity * 1px) */
   --opacity-disabled: 0.55;
   --height-loading: 16rem;
@@ -27,6 +28,7 @@
   --checkbox-size: 15px; /* height and width of checkbox and radio inputs */
   --page-spacing: 16px; /* space between page elements */
   --page-margin-x: 32px; /* minimum space on left and right side of page */
+  --button-spacing: 0.33rem;
 }
 
 @media (min-width: 768px) and (max-width: 1200px) {
@@ -41,6 +43,12 @@
   }
 }
 
+@media (pointer: coarse) {
+  :root {
+    --button-spacing: 0.5rem;
+  }
+}
+
 :root * {
   --fonts-regular: var(--fonts-override, var(--fonts-proportional)), "Noto Sans", "Liberation Sans", sans-serif, var(--fonts-emoji);
 }
@@ -89,6 +97,17 @@ samp,
   font-size: 0.95em; /* compensate for monospace fonts being usually slightly larger */
 }
 
+kbd {
+  padding: 0.15em 0.35em;
+  line-height: 10px;
+  color: var(--color-text-light);
+  vertical-align: middle;
+  background-color: var(--color-markup-code-inline);
+  border: 1px solid var(--color-secondary);
+  border-radius: var(--border-radius);
+  box-shadow: inset 0 -1px 0 var(--color-secondary);
+}
+
 b,
 strong,
 h1,
@@ -247,13 +266,13 @@ h1.error-code {
 }
 
 .button-row {
-  gap: 0.5rem;
+  gap: var(--button-spacing);
 }
 
 .button-sequence {
   display: flex;
   flex-flow: wrap;
-  gap: 0.5em;
+  gap: var(--button-spacing);
 }
 
 .button-sequence.right {
@@ -527,11 +546,6 @@ a.label,
   background: var(--color-active);
 }
 
-.ui.secondary.menu.tight .item {
-  padding-left: 0.85714286em;
-  padding-right: 0.85714286em;
-}
-
 /* remove the menu clearfix so that it won't add undesired gaps when using "gap" */
 .ui.menu::after {
   content: normal;
@@ -668,10 +682,6 @@ img.ui.avatar,
   color: var(--color-yellow) !important;
 }
 
-.text.olive {
-  color: var(--color-olive) !important;
-}
-
 .text.green {
   color: var(--color-green) !important;
 }
@@ -684,18 +694,10 @@ img.ui.avatar,
   color: var(--color-blue) !important;
 }
 
-.text.violet {
-  color: var(--color-violet) !important;
-}
-
 .text.purple {
   color: var(--color-purple) !important;
 }
 
-.text.pink {
-  color: var(--color-pink) !important;
-}
-
 .text.brown {
   color: var(--color-brown) !important;
 }
@@ -750,10 +752,6 @@ img.ui.avatar,
   box-shadow: 0 6px 18px var(--color-shadow) !important;
 }
 
-.ui.dimmer {
-  background: var(--color-overlay-backdrop);
-}
-
 /* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */
 /* This fixes the commit graph button on the commits page */
 /* modal svg icons, copied from fomantic except width and height */
@@ -817,19 +815,6 @@ img.ui.avatar,
   margin-left: 25px;
 }
 
-.ui .sha.label {
-  font-family: var(--fonts-monospace);
-  font-size: 13px;
-  font-weight: var(--font-weight-normal);
-  margin: 0 6px;
-  padding: 5px 10px;
-  flex-shrink: 0;
-}
-
-.ui .sha.label .shortsha {
-  display: inline-block; /* not sure whether it is still needed */
-}
-
 .ui .button.truncate {
   display: inline-block;
   max-width: 100%;
@@ -849,46 +834,6 @@ img.ui.avatar,
   font-weight: var(--font-weight-normal);
 }
 
-.ui .background.red {
-  background-color: var(--color-red) !important;
-}
-
-.ui .background.blue {
-  background-color: var(--color-blue) !important;
-}
-
-.ui .background.black {
-  background-color: var(--color-black) !important;
-}
-
-.ui .background.grey {
-  background-color: var(--color-grey) !important;
-}
-
-.ui .background.light.grey {
-  background-color: var(--color-grey) !important;
-}
-
-.ui .background.green {
-  background-color: var(--color-green) !important;
-}
-
-.ui .background.purple {
-  background-color: var(--color-purple) !important;
-}
-
-.ui .background.yellow {
-  background-color: var(--color-yellow) !important;
-}
-
-.ui .background.orange {
-  background-color: var(--color-orange) !important;
-}
-
-.ui .background.gold {
-  background-color: var(--color-gold) !important;
-}
-
 .ui .migrate {
   color: var(--color-text-light-2) !important;
 }
@@ -1061,6 +1006,10 @@ overflow-menu .overflow-menu-items .item {
   height: 100%;
 }
 
+overflow-menu .overflow-menu-items .item > .svg {
+  align-self: center;
+}
+
 overflow-menu .ui.label {
   margin-left: 7px !important; /* save some space */
 }
@@ -1176,41 +1125,6 @@ svg.text.purple,
   padding-left: 1ch;
 }
 
-.lines-escape {
-  width: 0;
-}
-
-.lines-code {
-  padding-left: 5px;
-}
-
-.file-view tr.active {
-  color: inherit !important;
-  background: inherit !important;
-}
-
-.file-view tr.active .lines-num,
-.file-view tr.active .lines-code {
-  background: var(--color-highlight-bg) !important;
-}
-
-.file-view tr.active:last-of-type .lines-code {
-  border-bottom-right-radius: var(--border-radius);
-}
-
-.file-view tr.active .lines-num {
-  position: relative;
-}
-
-.file-view tr.active .lines-num::before {
-  content: "";
-  position: absolute;
-  left: 0;
-  width: 2px;
-  height: 100%;
-  background: var(--color-highlight-fg);
-}
-
 .code-inner {
   font: 12px var(--fonts-monospace);
   white-space: pre-wrap;
@@ -1284,10 +1198,6 @@ svg.text.purple,
   width: 100%;
 }
 
-.migrate .svg.gitea-git {
-  color: var(--color-git);
-}
-
 .color-icon {
   display: inline-block;
   border-radius: var(--border-radius-full);
diff --git a/web_src/css/editor/combomarkdowneditor.css b/web_src/css/editor/combomarkdowneditor.css
index f190c7eb1f..b151080c64 100644
--- a/web_src/css/editor/combomarkdowneditor.css
+++ b/web_src/css/editor/combomarkdowneditor.css
@@ -11,6 +11,18 @@
   flex-wrap: wrap;
 }
 
+.markdown-toolbar-switch {
+  display: flex;
+  height: 30px;
+}
+.markdown-toolbar-switch .switch .item {
+  padding: 0.25em 1em;
+}
+
+.markdown-toolbar-hidden .markdown-toolbar-button {
+  display: none;
+}
+
 .combo-markdown-editor .markdown-toolbar-group {
   display: flex;
 }
diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css
index 726ac7e9e2..9f44e884b7 100644
--- a/web_src/css/features/gitgraph.css
+++ b/web_src/css/features/gitgraph.css
@@ -125,14 +125,7 @@
 }
 
 #git-graph-container #rev-list .sha.label {
-  padding-top: 5px;
-  padding-bottom: 3px;
-}
-
-#git-graph-container #rev-list .sha.label .ui.detail.icon.button {
-  padding-top: 3px;
-  margin-top: -5px;
-  padding-bottom: 1px;
+  height: 23px;
 }
 
 #git-graph-container #rev-list .author img.ui.avatar {
diff --git a/web_src/css/form.css b/web_src/css/form.css
index 916d76fd0c..3a53b6d8f2 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -491,6 +491,7 @@ input:-webkit-autofill:active,
   margin: 0;
 }
 
+.moderation.new-report form,
 .repository.new.repo form,
 .repository.new.migrate form,
 .repository.new.fork form {
@@ -504,11 +505,13 @@ input:-webkit-autofill:active,
 }
 
 @media (min-width: 768px) {
+  .moderation.new-report form,
   .repository.new.repo form,
   .repository.new.migrate form,
   .repository.new.fork form {
     width: 800px !important;
   }
+  .moderation.new-report form .header,
   .repository.new.repo form .header,
   .repository.new.migrate form .header,
   .repository.new.fork form .header {
@@ -555,6 +558,7 @@ input:-webkit-autofill:active,
   margin-right: 0 !important;
 }
 
+.moderation.new-report form .header,
 .repository.new.repo form .header,
 .repository.new.migrate form .header,
 .repository.new.fork form .header {
diff --git a/web_src/css/home.css b/web_src/css/home.css
index 22f1a2dc98..84dd793612 100644
--- a/web_src/css/home.css
+++ b/web_src/css/home.css
@@ -70,7 +70,7 @@
 .page-footer .right-links > a {
   border-left: 1px solid var(--color-secondary-dark-1);
   padding-left: 8px;
-  margin-left: 5px;
+  margin-left: 8px;
 }
 
 .page-footer .ui.dropdown.language .menu {
diff --git a/web_src/css/index.css b/web_src/css/index.css
index 12830299cf..7b0fa45916 100644
--- a/web_src/css/index.css
+++ b/web_src/css/index.css
@@ -12,12 +12,15 @@
 @import "./modules/segment.css";
 @import "./modules/grid.css";
 @import "./modules/message.css";
+@import "./modules/tab.css";
 @import "./modules/table.css";
 @import "./modules/card.css";
 @import "./modules/checkbox.css";
 @import "./modules/modal.css";
+@import "./modules/dimmer.css";
 
 @import "./modules/switch.css";
+@import "./modules/dropdown.css";
 @import "./modules/select.css";
 @import "./modules/tippy.css";
 @import "./modules/breadcrumb.css";
@@ -26,6 +29,8 @@
 @import "./modules/toast.css";
 @import "./modules/svg.css";
 @import "./modules/flexcontainer.css";
+@import "./modules/user-cards.css";
+@import "./modules/hashbox.css";
 
 @import "./shared/flex-list.css";
 @import "./shared/milestone.css";
@@ -55,6 +60,7 @@
 @import "./form.css";
 
 @import "./repo.css";
+@import "./repo/file-view.css";
 @import "./repo/release-tag.css";
 @import "./repo/issue-card.css";
 @import "./repo/issue-label.css";
@@ -74,6 +80,7 @@
 @import "./explore.css";
 @import "./review.css";
 @import "./actions.css";
+@import "./migrate.css";
 
 @tailwind utilities;
 @import "./helpers.css";
diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css
index 947480a7e8..8a872f2623 100644
--- a/web_src/css/markup/content.css
+++ b/web_src/css/markup/content.css
@@ -2,7 +2,7 @@
   overflow: hidden;
   font-size: 16px;
   line-height: 1.5 !important;
-  word-wrap: break-word;
+  overflow-wrap: break-word;
 }
 
 .markup > *:first-child {
@@ -500,16 +500,7 @@
 }
 
 .markup kbd {
-  display: inline-block;
-  padding: 3px 5px;
-  font-size: 11px;
-  line-height: 10px;
-  color: var(--color-text-light);
-  vertical-align: middle;
-  background-color: var(--color-markup-code-inline);
-  border: 1px solid var(--color-secondary);
-  border-radius: var(--border-radius);
-  box-shadow: inset 0 -1px 0 var(--color-secondary);
+  padding: 0 0.35em;
 }
 
 .markup .ui.list .list,
@@ -561,6 +552,10 @@
   border-top-right-radius: 0 !important;
 }
 
+.file-view.markup {
+  padding: 2em;
+}
+
 .file-view.markup.orgmode li.unchecked::before {
   content: "[ ] ";
 }
diff --git a/web_src/css/migrate.css b/web_src/css/migrate.css
new file mode 100644
index 0000000000..d5e909b42d
--- /dev/null
+++ b/web_src/css/migrate.css
@@ -0,0 +1,68 @@
+.migrate .svg.gitea-git {
+  --git-logo-color: #f05133;
+  color: var(--git-logo-color);
+}
+
+.migrate-entries {
+  display: grid;
+  /* Limited to 4 cols by 1280px container */
+  grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
+  gap: 1.5rem;
+}
+
+.migrate-entry svg {
+  padding: 1.5rem;
+}
+
+.migrate-entry {
+  display: flex;
+  flex-direction: column;
+  color: var(--color-text);
+  background: var(--color-card);
+  border: 1px solid var(--fancy-card-border);
+  border-radius: var(--border-radius-large);
+  transition: all 0.1s ease-in-out;
+}
+
+.migrate-entry:hover {
+  transform: scale(105%);
+  box-shadow: 0 0.5rem 1rem var(--color-shadow);
+  color: var(--color-text);
+}
+
+.migrate-entry .content {
+  width: 100%;
+  margin-top: .5rem;
+  padding: 1rem;
+  flex: 1;
+}
+
+.migrate-entry .description {
+  margin-top: .5rem;
+  text-wrap: balance;
+}
+
+/* Desktop layout features */
+@media (min-width: 599.98px) {
+  .migrate-entry .content {
+    text-align: center;
+    border-top: 1px solid var(--fancy-card-border);
+    border-radius: 0 0 var(--border-radius-large) var(--border-radius-large);
+    background: var(--fancy-card-bg);
+  }
+}
+
+/* Mobile layout features */
+@media (max-width: 600px) {
+  .migrate-entries {
+    grid-template-columns: repeat(1, 1fr);
+  }
+  .migrate-entry {
+    flex-direction: row;
+  }
+  .migrate-entry svg {
+    height: 100%;
+    width: 100%;
+    max-width: 128px;
+  }
+}
diff --git a/web_src/css/modules/animations.css b/web_src/css/modules/animations.css
index a86c9234aa..88b128c643 100644
--- a/web_src/css/modules/animations.css
+++ b/web_src/css/modules/animations.css
@@ -3,11 +3,13 @@
   100% { transform: translate(-50%, -50%) rotate(360deg); }
 }
 
+lazy-webc,
 .is-loading {
   pointer-events: none !important;
   position: relative !important;
 }
 
+lazy-webc > *,
 .is-loading > * {
   opacity: 0.3;
 }
@@ -17,6 +19,7 @@
   opacity: 0;
 }
 
+lazy-webc::after,
 .is-loading::after {
   content: "";
   position: absolute;
@@ -52,8 +55,7 @@ form.single-button-form.is-loading .button {
 }
 
 .markup pre.is-loading,
-.editor-loading.is-loading,
-.pdf-content.is-loading {
+.editor-loading.is-loading {
   height: var(--height-loading);
 }
 
diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css
index 0799ab80ec..469a309a11 100644
--- a/web_src/css/modules/button.css
+++ b/web_src/css/modules/button.css
@@ -349,47 +349,6 @@ It needs some tricks to tweak the left/right borders with active state */
   border-color: var(--color-yellow-dark-2);
 }
 
-/* olive */
-
-.ui.olive.labels .label,
-.ui.ui.ui.olive.label,
-.ui.olive.button,
-.ui.olive.buttons .button,
-.ui.olive.button:focus,
-.ui.olive.buttons .button:focus {
-  background: var(--color-olive);
-}
-
-.ui.olive.button:hover,
-.ui.olive.buttons .button:hover {
-  background: var(--color-olive-dark-1);
-}
-
-.ui.olive.button:active,
-.ui.olive.buttons .button:active {
-  background: var(--color-olive-dark-2);
-}
-
-.ui.basic.olive.buttons .button,
-.ui.basic.olive.button,
-.ui.basic.olive.buttons .button:focus,
-.ui.basic.olive.button:focus {
-  color: var(--color-olive);
-  border-color: var(--color-olive);
-}
-
-.ui.basic.olive.buttons .button:hover,
-.ui.basic.olive.button:hover {
-  color: var(--color-olive-dark-1);
-  border-color: var(--color-olive-dark-1);
-}
-
-.ui.basic.olive.buttons .button:active,
-.ui.basic.olive.button:active {
-  color: var(--color-olive-dark-2);
-  border-color: var(--color-olive-dark-2);
-}
-
 /* green */
 
 .ui.green.labels .label,
@@ -472,88 +431,6 @@ It needs some tricks to tweak the left/right borders with active state */
   border-color: var(--color-teal-dark-2);
 }
 
-/* blue */
-
-.ui.blue.labels .label,
-.ui.ui.ui.blue.label,
-.ui.blue.button,
-.ui.blue.buttons .button,
-.ui.blue.button:focus,
-.ui.blue.buttons .button:focus {
-  background: var(--color-blue);
-}
-
-.ui.blue.button:hover,
-.ui.blue.buttons .button:hover {
-  background: var(--color-blue-dark-1);
-}
-
-.ui.blue.button:active,
-.ui.blue.buttons .button:active {
-  background: var(--color-blue-dark-2);
-}
-
-.ui.basic.blue.buttons .button,
-.ui.basic.blue.button,
-.ui.basic.blue.buttons .button:focus,
-.ui.basic.blue.button:focus {
-  color: var(--color-blue);
-  border-color: var(--color-blue);
-}
-
-.ui.basic.blue.buttons .button:hover,
-.ui.basic.blue.button:hover {
-  color: var(--color-blue-dark-1);
-  border-color: var(--color-blue-dark-1);
-}
-
-.ui.basic.blue.buttons .button:active,
-.ui.basic.blue.button:active {
-  color: var(--color-blue-dark-2);
-  border-color: var(--color-blue-dark-2);
-}
-
-/* violet */
-
-.ui.violet.labels .label,
-.ui.ui.ui.violet.label,
-.ui.violet.button,
-.ui.violet.buttons .button,
-.ui.violet.button:focus,
-.ui.violet.buttons .button:focus {
-  background: var(--color-violet);
-}
-
-.ui.violet.button:hover,
-.ui.violet.buttons .button:hover {
-  background: var(--color-violet-dark-1);
-}
-
-.ui.violet.button:active,
-.ui.violet.buttons .button:active {
-  background: var(--color-violet-dark-2);
-}
-
-.ui.basic.violet.buttons .button,
-.ui.basic.violet.button,
-.ui.basic.violet.buttons .button:focus,
-.ui.basic.violet.button:focus {
-  color: var(--color-violet);
-  border-color: var(--color-violet);
-}
-
-.ui.basic.violet.buttons .button:hover,
-.ui.basic.violet.button:hover {
-  color: var(--color-violet-dark-1);
-  border-color: var(--color-violet-dark-1);
-}
-
-.ui.basic.violet.buttons .button:active,
-.ui.basic.violet.button:active {
-  color: var(--color-violet-dark-2);
-  border-color: var(--color-violet-dark-2);
-}
-
 /* purple */
 
 .ui.purple.labels .label,
@@ -595,47 +472,6 @@ It needs some tricks to tweak the left/right borders with active state */
   border-color: var(--color-purple-dark-2);
 }
 
-/* pink */
-
-.ui.pink.labels .label,
-.ui.ui.ui.pink.label,
-.ui.pink.button,
-.ui.pink.buttons .button,
-.ui.pink.button:focus,
-.ui.pink.buttons .button:focus {
-  background: var(--color-pink);
-}
-
-.ui.pink.button:hover,
-.ui.pink.buttons .button:hover {
-  background: var(--color-pink-dark-1);
-}
-
-.ui.pink.button:active,
-.ui.pink.buttons .button:active {
-  background: var(--color-pink-dark-2);
-}
-
-.ui.basic.pink.buttons .button,
-.ui.basic.pink.button,
-.ui.basic.pink.buttons .button:focus,
-.ui.basic.pink.button:focus {
-  color: var(--color-pink);
-  border-color: var(--color-pink);
-}
-
-.ui.basic.pink.buttons .button:hover,
-.ui.basic.pink.button:hover {
-  color: var(--color-pink-dark-1);
-  border-color: var(--color-pink-dark-1);
-}
-
-.ui.basic.pink.buttons .button:active,
-.ui.basic.pink.button:active {
-  color: var(--color-pink-dark-2);
-  border-color: var(--color-pink-dark-2);
-}
-
 /* brown */
 
 .ui.brown.labels .label,
diff --git a/web_src/css/modules/dimmer.css b/web_src/css/modules/dimmer.css
new file mode 100644
index 0000000000..7ef4618a18
--- /dev/null
+++ b/web_src/css/modules/dimmer.css
@@ -0,0 +1,25 @@
+body:has(> .ui.active.dimmer) {
+  overflow: hidden;
+}
+
+.ui.active.dimmer {
+  display: flex;
+  opacity: 1;
+}
+
+.ui.dimmer {
+  align-items: center;
+  animation-fill-mode: both;
+  background: var(--color-overlay-backdrop);
+  display: none;
+  flex-direction: column;
+  height: 100%;
+  position: fixed;
+  opacity: 0;
+  transform-origin: center center;
+  justify-content: center;
+  user-select: none;
+  width: 100%;
+  will-change: opacity;
+  z-index: 1000;
+}
diff --git a/web_src/css/modules/dropdown.css b/web_src/css/modules/dropdown.css
new file mode 100644
index 0000000000..22920c9f67
--- /dev/null
+++ b/web_src/css/modules/dropdown.css
@@ -0,0 +1,124 @@
+/* This is an implementation of a dropdown menu based on details HTML tag.
+ * It is inspired by https://picocss.com/docs/dropdown.
+ *
+ * NoJS mode could be improved by forcing the same [name] onto all dropdowns, so
+ * that the browser will automatically close all but the one that was just opened
+ * using keyboard. But the code doing that will not be as clean.
+*/
+
+:root details.dropdown {
+  --dropdown-box-shadow: 0 6px 18px var(--color-shadow);
+  --dropdown-item-padding: 0.5rem 0.75rem;
+}
+
+@media (pointer: coarse) {
+  :root details.dropdown {
+    --dropdown-item-padding: 0.75rem 1rem;
+  }
+}
+
+details.dropdown {
+  position: relative;
+}
+
+details.dropdown > summary {
+  /* Optional flex+gap in case summary contains multiple elements */
+  display: flex;
+  gap: 0.75rem;
+  align-items: center;
+  /* Cancel some of default styling */
+  user-select: none;
+  list-style-type: none;
+  /* Main visual properties */
+  border-radius: var(--border-radius);
+  padding: 0.5rem;
+}
+
+details.dropdown > summary:hover,
+details.dropdown > summary + ul > li:hover {
+  background: var(--color-hover);
+}
+
+details.dropdown[open] > summary,
+details.dropdown > summary + ul > li:focus-within {
+  background: var(--color-active);
+}
+
+/* NoJS mode. Creates a virtual fullscreen area. Clicking it closes the dropdown. */
+.no-js details.dropdown[open] > summary::before {
+  z-index: 1;
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  inset: 0;
+  background: 0 0;
+  content: "";
+  cursor: default;
+}
+
+details.dropdown > summary + ul {
+  z-index: 99;
+  position: absolute;
+  min-width: max-content;
+  margin: 0;
+  margin-top: 0.5rem;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  list-style-type: none;
+  border-radius: var(--border-radius);
+  background: var(--color-body);
+  box-shadow: var(--dropdown-box-shadow);
+  border: 1px solid var(--color-secondary);
+}
+
+details.dropdown > summary + ul > li {
+  width: 100%;
+  background: none;
+}
+
+details.dropdown > summary + ul > li:first-child {
+  border-radius: var(--border-radius) var(--border-radius) 0 0;
+}
+
+details.dropdown > summary + ul > li:last-child {
+  border-radius: 0 0 var(--border-radius) var(--border-radius);
+}
+
+/* dir-auto option - switch the direction at a width point where most of layout changes occur. */
+/* There's no way to check with CSS if LTR dropdown will fit on screen without JS. */
+@media (max-width: 767.98px) {
+  details.dropdown.dir-auto > summary + ul {
+    inset-inline: 0 auto;
+    direction: rtl;
+  }
+  details.dropdown.dir-auto > summary + ul > li {
+    direction: ltr;
+  }
+}
+/* Note: https://css-tricks.com/css-anchor-positioning-guide/
+*  looks like a great thing but FF still doesn't support it. */
+
+details.dropdown.dir-rtl > summary + ul {
+  inset-inline: 0 auto;
+  direction: rtl;
+}
+details.dropdown.dir-rtl > summary + ul > li {
+  direction: ltr;
+}
+
+details.dropdown > summary + ul > li > .item {
+  padding: var(--dropdown-item-padding);
+  width: 100%;
+  display: flex;
+  gap: 0.75rem;
+  align-items: center;
+  color: var(--color-text);
+  /* Suppress underline - hover is indicated by background color */
+  text-decoration: none;
+}
+
+/* Cancel default styling of button elements */
+details.dropdown > summary + ul > li button {
+  background: none;
+}
diff --git a/web_src/css/modules/hashbox.css b/web_src/css/modules/hashbox.css
new file mode 100644
index 0000000000..316ac1f655
--- /dev/null
+++ b/web_src/css/modules/hashbox.css
@@ -0,0 +1,104 @@
+.sha.label {
+  display: inline-flex;
+  flex-shrink: 0;
+  gap: 0;
+  align-items: center;
+  margin: 0 6px; /* needs to go but looked into case-by-case */
+  padding: 0;
+  min-width: 0; /* from .ui.label, may be bad actually */
+  background: var(--color-label-bg);
+  color: var(--color-label-text);
+  border: 1px solid var(--color-light-border);
+  border-radius: var(--border-radius);
+  white-space: nowrap;
+  font-family: var(--fonts-monospace);
+  font-size: 13px;
+  font-weight: var(--font-weight-normal);
+  line-height: 1;
+}
+
+.primary.sha.label {
+  border: none;
+  background: var(--color-primary);
+  color: var(--color-primary-contrast);
+}
+
+.sha.label .shortsha {
+  padding: 0.33rem 0.5rem;
+}
+
+.sha.label .signature {
+  color: var(--color-text);
+  background: var(--color-light);
+  padding: 0.25rem 0.33rem;
+  border-left: 1px solid var(--color-light-border);
+  border-top-right-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+
+.sha.label .signature-author {
+  display: flex;
+  gap: 0.25rem;
+}
+
+.sha.label .signature-author .avatar {
+  height: 16px;
+  width: 16px;
+  margin: 0 !important; /* In some areas selectors with .avatar are too broad */
+}
+
+.sha.label.isSigned.isWarning {
+  border: 1px solid var(--color-red-badge);
+  background: var(--color-red-badge-bg);
+}
+
+.sha.label.isSigned.isWarning .signature {
+  border-left: 1px solid var(--color-red-badge);
+  color: var(--color-red-badge);
+}
+
+.sha.label.isSigned.isWarning:hover {
+  background: var(--color-red-badge-hover-bg);
+}
+
+.sha.label.isSigned.isVerified {
+  border: 1px solid var(--color-green-badge);
+  background: var(--color-green-badge-bg);
+}
+
+.sha.label.isSigned.isVerified .signature {
+  border-left: 1px solid var(--color-green-badge);
+  color: var(--color-green-badge);
+}
+
+.sha.label.isSigned.isVerified:hover {
+  background: var(--color-green-badge-hover-bg);
+}
+
+.sha.label.isSigned.isVerifiedUntrusted {
+  border: 1px solid var(--color-yellow-badge);
+  background: var(--color-yellow-badge-bg);
+}
+
+.sha.label.isSigned.isVerifiedUntrusted .signature {
+  border-left: 1px solid var(--color-yellow-badge);
+  color: var(--color-yellow-badge);
+}
+
+.sha.label.isSigned.isVerifiedUntrusted:hover {
+  background: var(--color-yellow-badge-hover-bg);
+}
+
+.sha.label.isSigned.isVerifiedUnmatched {
+  border: 1px solid var(--color-orange-badge);
+  background: var(--color-orange-badge-bg);
+}
+
+.sha.label.isSigned.isVerifiedUnmatched .signature {
+  border-left: 1px solid var(--color-orange-badge);
+  color: var(--color-orange-badge);
+}
+
+.sha.label.isSigned.isVerifiedUnmatched:hover {
+  background: var(--color-orange-badge-hover-bg);
+}
diff --git a/web_src/css/modules/label.css b/web_src/css/modules/label.css
index bc30baafac..4dc469631d 100644
--- a/web_src/css/modules/label.css
+++ b/web_src/css/modules/label.css
@@ -203,11 +203,6 @@ a.ui.ui.ui.basic.yellow.label:hover {
   border-color: var(--color-yellow-dark-1);
   color: var(--color-yellow-dark-1);
 }
-.ui.ui.ui.olive.label {
-  background: var(--color-olive);
-  border-color: var(--color-olive);
-  color: var(--color-white);
-}
 
 .ui.ui.ui.green.label {
   background: var(--color-green);
diff --git a/web_src/css/modules/tab.css b/web_src/css/modules/tab.css
new file mode 100644
index 0000000000..63c83179b2
--- /dev/null
+++ b/web_src/css/modules/tab.css
@@ -0,0 +1,7 @@
+.ui.tab {
+  display: none;
+}
+
+.ui.tab.active {
+  display: block;
+}
diff --git a/web_src/css/modules/user-cards.css b/web_src/css/modules/user-cards.css
new file mode 100644
index 0000000000..d89ea4588c
--- /dev/null
+++ b/web_src/css/modules/user-cards.css
@@ -0,0 +1,55 @@
+.user-cards .list {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 15px;
+  margin: 0 0 10px;
+  padding: 0;
+}
+
+@media (max-width: 767.98px) {
+  .user-cards .list {
+    grid-template-columns: repeat(1, 1fr);
+  }
+}
+
+@media (max-width: 900px) {
+  .user.profile .user-cards .list {
+    grid-template-columns: repeat(1, 1fr);
+  }
+}
+
+.user-cards .card {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  margin: 0;
+  padding: 14px;
+  border-radius: 0.28571429rem;
+  border: 1px solid var(--color-secondary);
+  background: var(--color-box-body);
+}
+
+.user-cards .card,
+.user-cards .card .content,
+.user-cards .card .name,
+.user-cards .card .meta {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.user-cards .card .avatar {
+  width: 48px;
+  height: 48px;
+  margin-right: 14px;
+}
+
+.user-cards .card .name {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-weight: var(--font-weight-normal);
+}
+
+.user-cards .card .meta {
+  margin-top: 5px;
+}
diff --git a/web_src/css/org.css b/web_src/css/org.css
index 6853a26bf7..05eb0c5476 100644
--- a/web_src/css/org.css
+++ b/web_src/css/org.css
@@ -89,28 +89,29 @@
   text-align: center;
 }
 
-.page-content.organization .org-avatar {
-  margin-right: 15px;
-}
-
 .page-content.organization #org-info {
   overflow-wrap: anywhere;
   flex: 1;
 }
 
-.page-content.organization #org-info .ui.header {
+.page-content.organization #org-info .org-title {
   display: flex;
+  column-gap: 1rem;
   align-items: center;
-  font-size: 36px;
-  margin-bottom: 0;
+}
+
+.page-content.organization #org-info .org-title h1 {
+  margin: 0;
+  font-size: 2.5rem;
 }
 
 @media (max-width: 767.98px) {
-  .page-content.organization #org-info .ui.header {
+  .page-content.organization #org-info .org-header {
     flex-direction: column;
     margin-bottom: 1rem;
   }
   .page-content.organization #org-info .org-title {
+    flex-wrap: wrap;
     width: 100%;
     margin-bottom: 0.5rem;
   }
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index f498a992ed..4aa6faa46e 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -415,7 +415,14 @@ td .commit-summary {
   max-width: 600px !important;
 }
 
-.pdf-content {
+lazy-webc[tag="model-viewer"],
+model-viewer {
+  width: 100%;
+  height: 100vh;
+}
+
+lazy-webc[tag="pdf-object"],
+pdf-object {
   width: 100%;
   height: 100vh;
   border: none !important;
@@ -424,10 +431,6 @@ td .commit-summary {
   justify-content: center;
 }
 
-.pdf-content .pdf-fallback-button {
-  margin: 50px auto;
-}
-
 .repository.file.list .non-diff-file-content .plain-text {
   padding: 1em 2em;
 }
@@ -865,54 +868,20 @@ td .commit-summary {
 
 .singular-commit .shabox .sha.label {
   margin: 0;
-  border: 1px solid var(--color-light-border);
 }
 
-.singular-commit .shabox .sha.label.isSigned.isWarning {
-  border: 1px solid var(--color-red-badge);
-  background: var(--color-red-badge-bg);
+@media (min-width: 768px) {
+  .repository.view.issue .comment-list .timeline-item .forced-push {
+    display: grid;
+    grid-template-columns: 1fr auto;
+    column-gap: 1rem;
+  }
 }
 
-.singular-commit .shabox .sha.label.isSigned.isWarning:hover {
-  background: var(--color-red-badge-hover-bg) !important;
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerified {
-  border: 1px solid var(--color-green-badge);
-  background: var(--color-green-badge-bg);
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerified:hover {
-  background: var(--color-green-badge-hover-bg) !important;
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted {
-  border: 1px solid var(--color-yellow-badge);
-  background: var(--color-yellow-badge-bg);
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted:hover {
-  background: var(--color-yellow-badge-hover-bg) !important;
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched {
-  border: 1px solid var(--color-orange-badge);
-  background: var(--color-orange-badge-bg);
-}
-
-.singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched:hover {
-  background: var(--color-orange-badge-hover-bg) !important;
-}
-
-.repository.view.issue .comment-list .timeline-item .comparebox {
-  line-height: 32px;
-  vertical-align: middle;
-}
-
-.repository.view.issue .comment-list .timeline-item .comparebox .compare.label {
+.repository.view.issue .comment-list .timeline-item .compare.label {
   font-size: 1rem;
-  margin: 0;
   border: 1px solid var(--color-light-border);
+  height: fit-content;
 }
 
 @media (max-width: 767.98px) {
@@ -1269,169 +1238,6 @@ td .commit-summary {
   background-color: var(--color-light) !important;
 }
 
-.repository #commits-table td.sha .sha.label,
-.repository #repo-files-table .sha.label,
-.repository #repo-file-commit-box .sha.label,
-.repository #rev-list .sha.label,
-.repository .timeline-item.commits-list .singular-commit .sha.label {
-  border: 1px solid var(--color-light-border);
-}
-
-.repository #commits-table td.sha .sha.label .ui.signature.avatar,
-.repository #repo-files-table .sha.label .ui.signature.avatar,
-.repository #repo-file-commit-box .sha.label .ui.signature.avatar,
-.repository #rev-list .sha.label .ui.signature.avatar,
-.repository .timeline-item.commits-list .singular-commit .sha.label .ui.signature.avatar {
-  height: 16px;
-  margin-bottom: 0;
-  width: 16px;
-}
-
-.repository #commits-table td.sha .sha.label .detail.icon,
-.repository #repo-files-table .sha.label .detail.icon,
-.repository #repo-file-commit-box .sha.label .detail.icon,
-.repository #rev-list .sha.label .detail.icon,
-.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon {
-  background: var(--color-light);
-  margin: -6px -10px -4px 0;
-  padding: 5px 4px 5px 6px;
-  border-left: 1px solid var(--color-light-border);
-  border-top: 0;
-  border-right: 0;
-  border-bottom: 0;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.repository #commits-table td.sha .sha.label .detail.icon img,
-.repository #repo-files-table .sha.label .detail.icon img,
-.repository #repo-file-commit-box .sha.label .detail.icon img,
-.repository #rev-list .sha.label .detail.icon img,
-.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon img {
-  margin-right: 0;
-}
-
-.repository #commits-table td.sha .sha.label .detail.icon .svg,
-.repository #repo-files-table .sha.label .detail.icon .svg,
-.repository #repo-file-commit-box .sha.label .detail.icon .svg,
-.repository #rev-list .sha.label .detail.icon .svg,
-.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon .svg {
-  margin: 0 0.25em 0 0;
-}
-
-.repository #commits-table td.sha .sha.label .detail.icon > div,
-.repository #repo-files-table .sha.label .detail.icon > div,
-.repository #repo-file-commit-box .sha.label .detail.icon > div,
-.repository #rev-list .sha.label .detail.icon > div,
-.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon > div {
-  display: flex;
-  align-items: center;
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isWarning,
-.repository #repo-files-table .sha.label.isSigned.isWarning,
-.repository #repo-file-commit-box .sha.label.isSigned.isWarning,
-.repository #rev-list .sha.label.isSigned.isWarning,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning {
-  border: 1px solid var(--color-red-badge);
-  background: var(--color-red-badge-bg);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isWarning .detail.icon,
-.repository #repo-files-table .sha.label.isSigned.isWarning .detail.icon,
-.repository #repo-file-commit-box .sha.label.isSigned.isWarning .detail.icon,
-.repository #rev-list .sha.label.isSigned.isWarning .detail.icon,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning .detail.icon {
-  border-left: 1px solid var(--color-red-badge);
-  color: var(--color-red-badge);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isWarning:hover,
-.repository #repo-files-table .sha.label.isSigned.isWarning:hover,
-.repository #repo-file-commit-box .sha.label.isSigned.isWarning:hover,
-.repository #rev-list .sha.label.isSigned.isWarning:hover,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning:hover {
-  background: var(--color-red-badge-hover-bg) !important;
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerified,
-.repository #repo-files-table .sha.label.isSigned.isVerified,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerified,
-.repository #rev-list .sha.label.isSigned.isVerified,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified {
-  border: 1px solid var(--color-green-badge);
-  background: var(--color-green-badge-bg);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerified .detail.icon,
-.repository #repo-files-table .sha.label.isSigned.isVerified .detail.icon,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerified .detail.icon,
-.repository #rev-list .sha.label.isSigned.isVerified .detail.icon,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified .detail.icon {
-  border-left: 1px solid var(--color-green-badge);
-  color: var(--color-green-badge);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerified:hover,
-.repository #repo-files-table .sha.label.isSigned.isVerified:hover,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerified:hover,
-.repository #rev-list .sha.label.isSigned.isVerified:hover,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified:hover {
-  background: var(--color-green-badge-hover-bg) !important;
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUntrusted,
-.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted {
-  border: 1px solid var(--color-yellow-badge);
-  background: var(--color-yellow-badge-bg);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
-.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted .detail.icon,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted .detail.icon {
-  border-left: 1px solid var(--color-yellow-badge);
-  color: var(--color-yellow-badge);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted:hover,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted:hover,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUntrusted:hover,
-.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted:hover,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted:hover {
-  background: var(--color-yellow-badge-hover-bg) !important;
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUnmatched,
-.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched {
-  border: 1px solid var(--color-orange-badge);
-  background: var(--color-orange-badge-bg);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
-.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched .detail.icon,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched .detail.icon {
-  border-left: 1px solid var(--color-orange-badge);
-  color: var(--color-orange-badge);
-}
-
-.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched:hover,
-.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched:hover,
-.repository #repo-file-commit-box .sha.label.isSigned.isVerifiedUnmatched:hover,
-.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched:hover,
-.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched:hover {
-  background: var(--color-orange-badge-hover-bg) !important;
-}
-
 .repository .data-table {
   width: 100%;
 }
@@ -1784,9 +1590,6 @@ details.repo-search-result summary::marker {
   white-space: nowrap;
 }
 
-.file-view.markup {
-  padding: 2em;
-}
 .repository .activity-header {
   display: flex;
   justify-content: space-between;
@@ -2110,53 +1913,6 @@ details.repo-search-result summary::marker {
   padding: 0 10px;
 }
 
-.user-cards .list {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 15px;
-  margin: 0 0 10px;
-  padding: 0;
-}
-
-@media (max-width: 767.98px) {
-  .user-cards .list {
-    grid-template-columns: repeat(1, 1fr);
-  }
-}
-
-@media (max-width: 900px) {
-  .user.profile .user-cards .list {
-    grid-template-columns: repeat(1, 1fr);
-  }
-}
-
-.user-cards .list .card {
-  display: flex;
-  flex-direction: row;
-  width: 100%;
-  margin: 0;
-  padding: 14px;
-  border-radius: 0.28571429rem;
-  border: 1px solid var(--color-secondary);
-  background: var(--color-box-body);
-}
-
-.user-cards .list .card .avatar {
-  width: 48px;
-  height: 48px;
-  margin-right: 14px;
-}
-
-.user-cards .list .card .name {
-  margin-top: 0;
-  margin-bottom: 0;
-  font-weight: var(--font-weight-normal);
-}
-
-.user-cards .list .card .meta {
-  margin-top: 5px;
-}
-
 #search-user-box .results .result .image {
   order: 0;
   margin-right: 12px;
@@ -2618,8 +2374,21 @@ tbody.commit-list {
   display: flex;
 }
 
-#diff-file-boxes {
+#diff-content-container {
   flex: 1;
+}
+
+#diff-commit-header {
+  /* Counteract the `+2px` for width in `.segment` */
+  padding: 0 2px;
+}
+
+#diff-commit-header + h4,
+#diff-commit-header + #diff-file-boxes {
+  margin-top: 8px;
+}
+
+#diff-file-boxes {
   max-width: 100%;
   display: flex;
   flex-direction: column;
@@ -2764,37 +2533,6 @@ tbody.commit-list {
   border-left: 1px solid var(--color-secondary);
 }
 
-.migrate-entries {
-  display: grid !important;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 25px;
-  margin: 0 !important;
-}
-
-@media (max-width: 767.98px) {
-  .migrate-entries {
-    grid-template-columns: repeat(1, 1fr);
-  }
-}
-
-.migrate-entry {
-  transition: all 0.1s ease-in-out;
-  box-shadow: none !important;
-  border: 1px solid var(--color-secondary);
-  color: var(--color-text) !important;
-  width: auto !important;
-  margin: 0 !important;
-}
-
-.migrate-entry:hover {
-  transform: scale(105%);
-  box-shadow: 0 0.5rem 1rem var(--color-shadow) !important;
-}
-
-.migrate-entry .description {
-  text-wrap: balance;
-}
-
 .commits-table .commits-table-right form {
   display: flex;
   align-items: center;
diff --git a/web_src/css/repo/file-view.css b/web_src/css/repo/file-view.css
new file mode 100644
index 0000000000..2ce7f3ec0f
--- /dev/null
+++ b/web_src/css/repo/file-view.css
@@ -0,0 +1,39 @@
+.file-view tr.active {
+  color: inherit !important;
+  background: inherit !important;
+}
+
+.lines-escape {
+  width: 0;
+}
+
+.lines-code {
+  padding-left: 5px;
+}
+
+.file-view tr.active .lines-num,
+.file-view tr.active .lines-escape,
+.file-view tr.active .lines-code {
+  background: var(--color-highlight-bg) !important;
+}
+
+.file-view tr.active:last-of-type .lines-code {
+  border-bottom-right-radius: var(--border-radius);
+}
+
+.file-view tr.active .lines-num {
+  position: relative;
+}
+
+.file-view tr.active .interact-bg:hover {
+  background: var(--color-primary-alpha-50) !important;
+}
+
+.file-view tr.active .lines-num::before {
+  content: "";
+  position: absolute;
+  left: 0;
+  width: 2px;
+  height: 100%;
+  background: var(--color-highlight-fg);
+}
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css
index 07ae5a5683..7f1b8c31cd 100644
--- a/web_src/css/repo/issue-list.css
+++ b/web_src/css/repo/issue-list.css
@@ -69,17 +69,17 @@
   }
 }
 
-#issue-list .flex-item-body .branches {
-  display: inline-flex;
+#issue-list .issue-meta {
+  gap: 0 0.5rem;
 }
 
-#issue-list .flex-item-body .branches .branch {
+#issue-list .issue-meta .branch {
   background-color: var(--color-secondary-alpha-50);
   border-radius: var(--border-radius);
   padding: 0 4px;
 }
 
-#issue-list .flex-item-body .branches .truncated-name {
+#issue-list .issue-meta .branch .truncated-name {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -88,18 +88,18 @@
   vertical-align: top;
 }
 
-#issue-list .flex-item-body .checklist progress {
+#issue-list .issue-meta .checklist progress {
   margin-left: 2px;
   width: 80px;
   height: 6px;
   display: inline-block;
 }
 
-#issue-list .flex-item-body .checklist progress::-webkit-progress-value {
+#issue-list .issue-meta .checklist progress::-webkit-progress-value {
   background-color: var(--color-secondary-dark-4);
 }
 
-#issue-list .flex-item-body .checklist progress::-moz-progress-bar {
+#issue-list .issue-meta .checklist progress::-moz-progress-bar {
   background-color: var(--color-secondary-dark-4);
 }
 
diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css
index 9860813e98..4a4158f4ba 100644
--- a/web_src/css/repo/release-tag.css
+++ b/web_src/css/repo/release-tag.css
@@ -110,6 +110,12 @@
   .repository.new.release .field button {
     margin-bottom: 1em;
   }
+  .release-list-search {
+    order: 2 !important;
+  }
+  .release-list-buttons {
+    margin-left: auto;
+  }
 }
 
 .repository.new.release .field .attachment_edit {
diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index c9c538502d..b1b80510d4 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -196,7 +196,6 @@
   --color-orange-badge: #ea580c;
   --color-orange-badge-bg: #ea580c22;
   --color-orange-badge-hover-bg: #ea580c44;
-  --color-git: #f05133;
   /* Icon colors (PR/Issue/...) */
   --color-icon-green: #3fb950;
   --color-icon-red: #f85149;
@@ -228,6 +227,8 @@
   --color-active: var(--steel-650);
   --color-menu: var(--steel-700);
   --color-card: var(--steel-700);
+  --fancy-card-bg: var(--steel-650);
+  --fancy-card-border: var(--steel-600);
   --color-markup-table-row: #ffffff06;
   --color-markup-code-block: var(--steel-800);
   --color-markup-code-inline: var(--steel-850);
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
index a5e4ffe050..277b52165f 100644
--- a/web_src/css/themes/theme-forgejo-light.css
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -212,7 +212,6 @@
   --color-orange-badge: #ea580c;
   --color-orange-badge-bg: #ea580c22;
   --color-orange-badge-hover-bg: #ea580c44;
-  --color-git: #f05133;
   /* Icon colors (PR/Issue/...) */
   --color-icon-green: var(--color-green-light);
   --color-icon-red: var(--color-red-light);
@@ -244,6 +243,8 @@
   --color-active: #d4d4d8aa;
   --color-menu: var(--zinc-100);
   --color-card: var(--zinc-50);
+  --fancy-card-bg: var(--zinc-100);
+  --fancy-card-border: var(--zinc-200);
   --color-markup-table-row: #ffffff06;
   --color-markup-code-block: var(--zinc-150);
   --color-markup-code-inline: var(--zinc-200);
diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css
index 6ad6efe748..7ba428f0b7 100644
--- a/web_src/css/themes/theme-gitea-dark.css
+++ b/web_src/css/themes/theme-gitea-dark.css
@@ -179,7 +179,6 @@
   --color-orange-badge: #f2711c;
   --color-orange-badge-bg: #f2711c1a;
   --color-orange-badge-hover-bg: #f2711c4d;
-  --color-git: #f05133;
   /* Icon colors (PR/Issue/...) */
   --color-icon-green: var(--color-green);
   --color-icon-red: var(--color-red);
@@ -209,6 +208,8 @@
   --color-active: #e8e8ff24;
   --color-menu: #151a1e;
   --color-card: #151a1e;
+  --fancy-card-bg: #14171a;
+  --fancy-card-border: #3b444a;
   --color-markup-table-row: #e8e8ff0f;
   --color-markup-code-block: #e8e8ff12;
   --color-markup-code-inline: #e8e8ff28;
diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css
index 830b96febe..8ad89f44a4 100644
--- a/web_src/css/themes/theme-gitea-light.css
+++ b/web_src/css/themes/theme-gitea-light.css
@@ -179,7 +179,6 @@
   --color-orange-badge: #f2711c;
   --color-orange-badge-bg: #f2711c1a;
   --color-orange-badge-hover-bg: #f2711c4d;
-  --color-git: #f05133;
   /* Icon colors (PR/Issue/...) */
   --color-icon-green: var(--color-green);
   --color-icon-red: var(--color-red);
@@ -209,6 +208,8 @@
   --color-active: #00001714;
   --color-menu: #f8f9fb;
   --color-card: #f8f9fb;
+  --fancy-card-bg: #ffffff;
+  --fancy-card-border: #d0d7de;
   --color-markup-table-row: #0030600a;
   --color-markup-code-block: #00306010;
   --color-markup-code-inline: #00306012;
diff --git a/web_src/css/user.css b/web_src/css/user.css
index bceb16fcf9..7fa81670fb 100644
--- a/web_src/css/user.css
+++ b/web_src/css/user.css
@@ -21,24 +21,26 @@
 }
 
 .user.profile .ui.card .extra.content > ul > li {
-  padding: 10px;
   display: flex;
+  padding: 0.75rem;
+  gap: 0.5rem;
   list-style: none;
   align-items: center;
-  gap: 0.25em;
 }
 
 .user.profile .ui.card .extra.content > ul > li:not(:last-child) {
   border-bottom: 1px solid var(--color-secondary);
 }
 
-.user.profile .ui.card .extra.content > ul > li .svg {
-  margin-left: 1px;
-  margin-right: 5px;
+.user.profile .ui.card .actions {
+  padding: 0.75rem;
+  display: grid;
+  grid-template-columns: 1fr auto;
+  align-items: center;
+  gap: 0.75rem;
 }
 
-.user.profile .ui.card .extra.content > ul > li.follow .ui.button,
-.user.profile .ui.card .extra.content > ul > li.block .ui.button {
+.user.profile .ui.card .primary-action .ui.button {
   align-items: center;
   display: flex;
   justify-content: center;
diff --git a/web_src/fomantic/_site/globals/site.variables b/web_src/fomantic/_site/globals/site.variables
index fbed597788..19375cf047 100644
--- a/web_src/fomantic/_site/globals/site.variables
+++ b/web_src/fomantic/_site/globals/site.variables
@@ -7,15 +7,21 @@
 @disabledOpacity: var(--opacity-disabled);
 @linkHoverUnderline: underline;
 @pageOverflowX: visible;
+@variationAllSizes: mini, tiny, small, large;
 
 @variationAccordionInverted: false;
 @variationBreadcrumbInverted: false;
 @variationButtonAnimated: false;
 @variationButtonAnimatedFade: false;
 @variationButtonAttached: false;
+@variationButtonCircular: false;
+@variationButtonFloated: false;
 @variationButtonInverted: false;
+@variationButtonToggle: false;
 @variationButtonSocial: false;
 @variationButtonTertiary: false;
+@variationButtonOr: false;
+@variationButtonSizes: mini, tiny, small;
 @variationCalendarInverted: false;
 @variationCardInverted: false;
 @variationCheckboxInverted: false;
@@ -23,14 +29,18 @@
 @variationDimmerInverted: false;
 @variationDividerInverted: false;
 @variationDropdownInverted: false;
+@variationDropdownScrollhint: false;
+@variationDropdownSimple: false;
 @variationFeedInverted: false;
 @variationFlyoutInverted: false;
 @variationFormInverted: false;
 @variationFormTransparent: false;
+@variationFormSizes: false;
 @variationGridDoubling: false;
 @variationGridInverted: false;
 @variationHeaderInverted: false;
 @variationIconInverted: false;
+@variationInputAction: false;
 @variationInputInverted: false;
 @variationItemInverted: false;
 @variationLabelCorner: false;
@@ -39,14 +49,25 @@
 @variationLabelRibbon: false;
 @variationLabelTag: false;
 @variationListInverted: false;
+@variationMenuText: false;
+@variationMenuFitted: false;
+@variationMenuFixed: false;
 @variationMenuInverted: false;
 @variationMessageInverted: false;
+@variationModalBasic: false;
 @variationModalInverted: false;
+@variationModalLegacy: false;
+@variationModalOverlay: false;
+@variationModalSizes: mini, tiny, small;
 @variationNagInverted: false;
 @variationPlaceholderInverted: false;
 @variationPopupInverted: false;
 @variationPopupTooltip: false;
 @variationProgressInverted: false;
+@variationSearchAligned: false;
+@variationSearchCategory: false;
+@variationSearchShort: false;
+@variationSearchLong: false;
 @variationSegmentInverted: false;
 @variationSegmentPiled: false;
 @variationSegmentStacked: false;
diff --git a/web_src/fomantic/build/semantic.css b/web_src/fomantic/build/semantic.css
index 49c00c4dad..2212ed2dd5 100644
--- a/web_src/fomantic/build/semantic.css
+++ b/web_src/fomantic/build/semantic.css
@@ -287,24 +287,6 @@
            Variations
 *******************************/
 
-/*-------------------
-         Floated
-  --------------------*/
-
-.ui[class*="left floated"].buttons,
-.ui[class*="left floated"].button {
-  float: left;
-  margin-left: 0;
-  margin-right: 0.25em;
-}
-
-.ui[class*="right floated"].buttons,
-.ui[class*="right floated"].button {
-  float: right;
-  margin-right: 0;
-  margin-left: 0.25em;
-}
-
 /*-------------------
          Compact
   --------------------*/
@@ -363,38 +345,6 @@
   font-size: 0.92857143rem;
 }
 
-.ui.large.buttons .dropdown,
-.ui.large.buttons .dropdown .menu > .item,
-.ui.large.buttons .button,
-.ui.large.buttons .or,
-.ui.ui.ui.ui.large.button {
-  font-size: 1.14285714rem;
-}
-
-.ui.big.buttons .dropdown,
-.ui.big.buttons .dropdown .menu > .item,
-.ui.big.buttons .button,
-.ui.big.buttons .or,
-.ui.ui.ui.ui.big.button {
-  font-size: 1.28571429rem;
-}
-
-.ui.huge.buttons .dropdown,
-.ui.huge.buttons .dropdown .menu > .item,
-.ui.huge.buttons .button,
-.ui.huge.buttons .or,
-.ui.ui.ui.ui.huge.button {
-  font-size: 1.42857143rem;
-}
-
-.ui.massive.buttons .dropdown,
-.ui.massive.buttons .dropdown .menu > .item,
-.ui.massive.buttons .button,
-.ui.massive.buttons .or,
-.ui.ui.ui.ui.massive.button {
-  font-size: 1.71428571rem;
-}
-
 /*--------------
     Icon Only
 ---------------*/
@@ -595,85 +545,6 @@
   animation: loader 2s linear infinite;
 }
 
-/*--------------
-       Toggle
-  ---------------*/
-
-/* Toggle (Modifies active state to give affordances) */
-
-.ui.toggle.buttons .active.button,
-.ui.buttons .button.toggle.active,
-.ui.button.toggle.active {
-  background-color: #21BA45;
-  box-shadow: none;
-  text-shadow: none;
-  color: #FFFFFF;
-}
-
-.ui.button.toggle.active:hover {
-  background-color: #16ab39;
-  text-shadow: none;
-  color: #FFFFFF;
-}
-
-/*--------------
-      Circular
-  ---------------*/
-
-.ui.circular.button {
-  border-radius: 10em;
-}
-
-.ui.circular.button > .icon {
-  width: 1em;
-  vertical-align: baseline;
-}
-
-/*-------------------
-        Or Buttons
-  --------------------*/
-
-.ui.buttons .or {
-  position: relative;
-  width: 0.3em;
-  height: 2.57142857em;
-  z-index: 3;
-}
-
-.ui.buttons .or:before {
-  position: absolute;
-  text-align: center;
-  border-radius: 500rem;
-  content: 'or';
-  top: 50%;
-  left: 50%;
-  background-color: #FFFFFF;
-  text-shadow: none;
-  margin-top: -0.89285714em;
-  margin-left: -0.89285714em;
-  width: 1.78571429em;
-  height: 1.78571429em;
-  line-height: 1.78571429em;
-  color: rgba(0, 0, 0, 0.4);
-  font-style: normal;
-  font-weight: 500;
-  box-shadow: 0 0 0 1px transparent inset;
-}
-
-.ui.buttons .or[data-text]:before {
-  content: attr(data-text);
-}
-
-/* Fluid Or */
-
-.ui.fluid.buttons .or {
-  width: 0 !important;
-}
-
-.ui.fluid.buttons .or:after {
-  display: none;
-}
-
 /*-------------------
           Fluid
   --------------------*/
@@ -2326,363 +2197,6 @@
 /*******************************
          Site Overrides
 *******************************/
-/*!
- * # Fomantic-UI - Dimmer
- * http://github.com/fomantic/Fomantic-UI/
- *
- *
- * Released under the MIT license
- * http://opensource.org/licenses/MIT
- *
- */
-
-/*******************************
-            Dimmer
-*******************************/
-
-.dimmable:not(body) {
-  position: relative;
-}
-
-.ui.dimmer {
-  display: none;
-  position: absolute;
-  top: 0 !important;
-  left: 0 !important;
-  width: 100%;
-  height: 100%;
-  text-align: center;
-  vertical-align: middle;
-  padding: 1em;
-  background: rgba(0, 0, 0, 0.85);
-  opacity: 0;
-  line-height: 1;
-  animation-fill-mode: both;
-  animation-duration: 0.5s;
-  transition: background-color 0.5s linear;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-  will-change: opacity;
-  z-index: 1000;
-}
-
-/* Dimmer Content */
-
-.ui.dimmer > .content {
-  -webkit-user-select: text;
-  -moz-user-select: text;
-  user-select: text;
-  color: #FFFFFF;
-}
-
-/* Loose Coupling */
-
-.ui.segment > .ui.dimmer:not(.page) {
-  border-radius: inherit;
-}
-
-/* Scrollbars */
-
-/*******************************
-            States
-*******************************/
-
-/* Animating */
-
-.animating.dimmable:not(body),
-.dimmed.dimmable:not(body) {
-  overflow: hidden;
-}
-
-/* Animating / Active / Visible */
-
-.dimmed.dimmable > .ui.animating.dimmer,
-.dimmed.dimmable > .ui.visible.dimmer,
-.ui.active.dimmer {
-  display: flex;
-  opacity: 1;
-}
-
-/* Disabled */
-
-.ui.disabled.dimmer {
-  width: 0 !important;
-  height: 0 !important;
-}
-
-/*******************************
-           Variations
-*******************************/
-
-/*--------------
-      Legacy
-  ---------------*/
-
-/* Animating / Active / Visible */
-
-.dimmed.dimmable > .ui.animating.legacy.dimmer,
-.dimmed.dimmable > .ui.visible.legacy.dimmer,
-.ui.active.legacy.dimmer {
-  display: block;
-}
-
-/*--------------
-      Alignment
-  ---------------*/
-
-.ui[class*="top aligned"].dimmer {
-  justify-content: flex-start;
-}
-
-.ui[class*="bottom aligned"].dimmer {
-  justify-content: flex-end;
-}
-
-/*--------------
-        Page
-  ---------------*/
-
-.ui.page.dimmer {
-  position: fixed;
-  transform-style: '';
-  perspective: 2000px;
-  transform-origin: center center;
-}
-
-.ui.page.dimmer.modals {
-  -moz-perspective: none;
-}
-
-body.animating.in.dimmable,
-body.dimmed.dimmable {
-  overflow: hidden;
-}
-
-body.dimmable > .dimmer {
-  position: fixed;
-}
-
-/*--------------
-      Blurring
-  ---------------*/
-
-.blurring.dimmable > :not(.dimmer) {
-  filter: initial;
-  transition: 800ms filter ease;
-}
-
-.blurring.dimmed.dimmable > :not(.dimmer):not(.popup) {
-  filter: blur(5px) grayscale(0.7);
-}
-
-/* Dimmer Color */
-
-.blurring.dimmable > .dimmer {
-  background: rgba(0, 0, 0, 0.6);
-}
-
-.blurring.dimmable > .inverted.dimmer {
-  background: rgba(255, 255, 255, 0.6);
-}
-
-/*--------------
-      Aligned
-  ---------------*/
-
-.ui.dimmer > .top.aligned.content > * {
-  vertical-align: top;
-}
-
-.ui.dimmer > .bottom.aligned.content > * {
-  vertical-align: bottom;
-}
-
-/*--------------
-      Shades
-  ---------------*/
-
-.medium.medium.medium.medium.medium.dimmer {
-  background: rgba(0, 0, 0, 0.65);
-}
-
-.light.light.light.light.light.dimmer {
-  background: rgba(0, 0, 0, 0.45);
-}
-
-.very.light.light.light.light.dimmer {
-  background: rgba(0, 0, 0, 0.25);
-}
-
-/*--------------
-       Simple
-  ---------------*/
-
-/* Displays without javascript */
-
-.ui.simple.dimmer {
-  display: block;
-  overflow: hidden;
-  opacity: 0;
-  width: 0;
-  height: 0;
-  z-index: -100;
-  background: rgba(0, 0, 0, 0);
-}
-
-.dimmed.dimmable > .ui.simple.dimmer {
-  overflow: visible;
-  opacity: 1;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.85);
-  z-index: 1;
-}
-
-.ui.simple.inverted.dimmer {
-  background: rgba(255, 255, 255, 0);
-}
-
-.dimmed.dimmable > .ui.simple.inverted.dimmer {
-  background: rgba(255, 255, 255, 0.85);
-}
-
-/*--------------
-       Partially
-  ----------------*/
-
-.ui[class*="top dimmer"],
-.ui[class*="center dimmer"],
-.ui[class*="bottom dimmer"] {
-  height: auto;
-}
-
-.ui[class*="bottom dimmer"] {
-  top: auto !important;
-  bottom: 0;
-}
-
-.ui[class*="center dimmer"] {
-  top: 50% !important;
-  transform: translateY(-50%);
-  -webkit-transform: translateY(calc(-50% - 0.5px));
-}
-
-.ui.segment > .ui.ui[class*="top dimmer"] {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.ui.segment > .ui.ui[class*="center dimmer"] {
-  border-radius: 0;
-}
-
-.ui.segment > .ui.ui[class*="bottom dimmer"] {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-
-.ui[class*="center dimmer"].transition[class*="fade up"].in {
-  animation-name: fadeInUpCenter;
-}
-
-.ui[class*="center dimmer"].transition[class*="fade down"].in {
-  animation-name: fadeInDownCenter;
-}
-
-.ui[class*="center dimmer"].transition[class*="fade up"].out {
-  animation-name: fadeOutUpCenter;
-}
-
-.ui[class*="center dimmer"].transition[class*="fade down"].out {
-  animation-name: fadeOutDownCenter;
-}
-
-.ui[class*="center dimmer"].bounce.transition {
-  animation-name: bounceCenter;
-}
-
-@keyframes fadeInUpCenter {
-  0% {
-    opacity: 0;
-    transform: translateY(-40%);
-    -webkit-transform: translateY(calc(-40% - 0.5px));
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(-50%);
-    -webkit-transform: translateY(calc(-50% - 0.5px));
-  }
-}
-
-@keyframes fadeInDownCenter {
-  0% {
-    opacity: 0;
-    transform: translateY(-60%);
-    -webkit-transform: translateY(calc(-60% - 0.5px));
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateY(-50%);
-    -webkit-transform: translateY(calc(-50% - 0.5px));
-  }
-}
-
-@keyframes fadeOutUpCenter {
-  0% {
-    opacity: 1;
-    transform: translateY(-50%);
-    -webkit-transform: translateY(calc(-50% - 0.5px));
-  }
-
-  100% {
-    opacity: 0;
-    transform: translateY(-45%);
-    -webkit-transform: translateY(calc(-45% - 0.5px));
-  }
-}
-
-@keyframes fadeOutDownCenter {
-  0% {
-    opacity: 1;
-    transform: translateY(-50%);
-    -webkit-transform: translateY(calc(-50% - 0.5px));
-  }
-
-  100% {
-    opacity: 0;
-    transform: translateY(-55%);
-    -webkit-transform: translateY(calc(-55% - 0.5px));
-  }
-}
-
-@keyframes bounceCenter {
-  0%, 20%, 50%, 80%, 100% {
-    transform: translateY(-50%);
-    -webkit-transform: translateY(calc(-50% - 0.5px));
-  }
-
-  40% {
-    transform: translateY(calc(-50% - 30px));
-  }
-
-  60% {
-    transform: translateY(calc(-50% - 15px));
-  }
-}
-
-/*******************************
-         Theme Overrides
-*******************************/
-
-/*******************************
-        User Overrides
-*******************************/
 /*!
  * # Fomantic-UI - Dropdown
  * http://github.com/fomantic/Fomantic-UI/
@@ -3325,45 +2839,6 @@ select.ui.dropdown {
   box-shadow: none !important;
 }
 
-/* CSS specific to iOS devices or firefox mobile only  */
-
-@supports (-webkit-touch-callout: none) or (-webkit-overflow-scrolling: touch) or (-moz-appearance:none) {
-@media (-moz-touch-enabled), (pointer: coarse) {
-    .ui.dropdown .scrollhint.menu:not(.hidden):before {
-      animation: scrollhint 2s ease 2;
-      content: '';
-      z-index: 15;
-      display: block;
-      position: absolute;
-      opacity: 0;
-      right: 0.25em;
-      top: 0;
-      height: 100%;
-      border-right: 0.25em solid;
-      border-left: 0;
-      -o-border-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0)) 1 100%;
-      border-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0)) 1 100%;
-    }
-
-    .ui.inverted.dropdown .scrollhint.menu:not(.hidden):before {
-      -o-border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75), rgba(255, 255, 255, 0)) 1 100%;
-      border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75), rgba(255, 255, 255, 0)) 1 100%;
-    }
-
-@keyframes scrollhint {
-      0% {
-        opacity: 1;
-        top: 100%;
-      }
-
-      100% {
-        opacity: 0;
-        top: 0;
-      }
-}
-}
-}
-
 /*--------------
      Searchable
   ---------------*/
@@ -4201,85 +3676,6 @@ select.ui.dropdown {
   width: 20%;
 }
 
-/*--------------
-       Simple
-  ---------------*/
-
-/* Displays without javascript */
-
-.ui.simple.dropdown .menu:before,
-.ui.simple.dropdown .menu:after {
-  display: none;
-}
-
-.ui.simple.dropdown .menu {
-  position: absolute;
-  /* IE hack to make dropdown icons appear inline */
-  display: -ms-inline-flexbox !important;
-  display: block;
-  overflow: hidden;
-  top: -9999px;
-  opacity: 0;
-  width: 0;
-  height: 0;
-  transition: opacity 0.1s ease;
-  margin-top: 0 !important;
-}
-
-.ui.simple.active.dropdown,
-.ui.simple.dropdown:hover {
-  border-bottom-left-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-
-.ui.simple.active.dropdown > .menu,
-.ui.simple.dropdown:hover > .menu {
-  overflow: visible;
-  width: auto;
-  height: auto;
-  top: 100%;
-  opacity: 1;
-}
-
-.ui.simple.dropdown > .menu > .item:active > .menu,
-.ui.simple.dropdown .menu .item:hover > .menu {
-  overflow: visible;
-  width: auto;
-  height: auto;
-  top: 0 !important;
-  left: 100%;
-  opacity: 1;
-}
-
-.ui.simple.dropdown > .menu > .item:active > .left.menu,
-.ui.simple.dropdown .menu .item:hover > .left.menu,
-.right.menu .ui.simple.dropdown > .menu > .item:active > .menu:not(.right),
-.right.menu .ui.simple.dropdown > .menu .item:hover > .menu:not(.right) {
-  left: auto;
-  right: 100%;
-}
-
-.ui.simple.disabled.dropdown:hover .menu {
-  display: none;
-  height: 0;
-  width: 0;
-  overflow: hidden;
-}
-
-/* Visible */
-
-.ui.simple.visible.dropdown > .menu {
-  display: block;
-}
-
-/* Scrolling */
-
-.ui.simple.scrolling.active.dropdown > .menu,
-.ui.simple.scrolling.dropdown:hover > .menu {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
 /*--------------
         Fluid
   ---------------*/
@@ -4565,85 +3961,6 @@ select.ui.dropdown {
   font-size: 1.14285714rem;
 }
 
-.ui.big.dropdown,
-.ui.big.dropdown .menu > .item {
-  font-size: 1.28571429rem;
-}
-
-.ui.huge.dropdown,
-.ui.huge.dropdown .menu > .item {
-  font-size: 1.42857143rem;
-}
-
-.ui.massive.dropdown,
-.ui.massive.dropdown .menu > .item {
-  font-size: 1.71428571rem;
-}
-
-/*******************************
-         Theme Overrides
-*******************************/
-
-/* Dropdown Carets */
-
-@font-face {
-  font-family: 'Dropdown';
-  src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMggjB5AAAAC8AAAAYGNtYXAPfuIIAAABHAAAAExnYXNwAAAAEAAAAWgAAAAIZ2x5Zjo82LgAAAFwAAABVGhlYWQAQ88bAAACxAAAADZoaGVhAwcB6QAAAvwAAAAkaG10eAS4ABIAAAMgAAAAIGxvY2EBNgDeAAADQAAAABJtYXhwAAoAFgAAA1QAAAAgbmFtZVcZpu4AAAN0AAABRXBvc3QAAwAAAAAEvAAAACAAAwIAAZAABQAAAUwBZgAAAEcBTAFmAAAA9QAZAIQAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADw2gHg/+D/4AHgACAAAAABAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEADgAAAAKAAgAAgACAAEAIPDa//3//wAAAAAAIPDX//3//wAB/+MPLQADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAIABJQElABMAABM0NzY3BTYXFhUUDwEGJwYvASY1AAUGBwEACAUGBoAFCAcGgAUBEgcGBQEBAQcECQYHfwYBAQZ/BwYAAQAAAG4BJQESABMAADc0PwE2MzIfARYVFAcGIyEiJyY1AAWABgcIBYAGBgUI/wAHBgWABwaABQWABgcHBgUFBgcAAAABABIASQC3AW4AEwAANzQ/ATYXNhcWHQEUBwYnBi8BJjUSBoAFCAcFBgYFBwgFgAbbBwZ/BwEBBwQJ/wgEBwEBB38GBgAAAAABAAAASQClAW4AEwAANxE0NzYzMh8BFhUUDwEGIyInJjUABQYHCAWABgaABQgHBgVbAQAIBQYGgAUIBwWABgYFBwAAAAEAAAABAADZuaKOXw889QALAgAAAAAA0ABHWAAAAADQAEdYAAAAAAElAW4AAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgAAAAAAASUAAQAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAABAAAAASUAAAElAAAAtwASALcAAAAAAAAACgAUAB4AQgBkAIgAqgAAAAEAAAAIABQAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAOAAAAAQAAAAAAAgAOAEcAAQAAAAAAAwAOACQAAQAAAAAABAAOAFUAAQAAAAAABQAWAA4AAQAAAAAABgAHADIAAQAAAAAACgA0AGMAAwABBAkAAQAOAAAAAwABBAkAAgAOAEcAAwABBAkAAwAOACQAAwABBAkABAAOAFUAAwABBAkABQAWAA4AAwABBAkABgAOADkAAwABBAkACgA0AGMAaQBjAG8AbQBvAG8AbgBWAGUAcgBzAGkAbwBuACAAMQAuADAAaQBjAG8AbQBvAG8Abmljb21vb24AaQBjAG8AbQBvAG8AbgBSAGUAZwB1AGwAYQByAGkAYwBvAG0AbwBvAG4ARgBvAG4AdAAgAGcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAuAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=) format('truetype'), url(data:application/font-woff;charset=utf-8;base64,d09GRk9UVE8AAAVwAAoAAAAABSgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRkYgAAAA9AAAAdkAAAHZLDXE/09TLzIAAALQAAAAYAAAAGAIIweQY21hcAAAAzAAAABMAAAATA9+4ghnYXNwAAADfAAAAAgAAAAIAAAAEGhlYWQAAAOEAAAANgAAADYAQ88baGhlYQAAA7wAAAAkAAAAJAMHAelobXR4AAAD4AAAACAAAAAgBLgAEm1heHAAAAQAAAAABgAAAAYACFAAbmFtZQAABAgAAAFFAAABRVcZpu5wb3N0AAAFUAAAACAAAAAgAAMAAAEABAQAAQEBCGljb21vb24AAQIAAQA6+BwC+BsD+BgEHgoAGVP/i4seCgAZU/+LiwwHi2v4lPh0BR0AAACIDx0AAACNER0AAAAJHQAAAdASAAkBAQgPERMWGyAlKmljb21vb25pY29tb29udTB1MXUyMHVGMEQ3dUYwRDh1RjBEOXVGMERBAAACAYkABgAIAgABAAQABwAKAA0AVgCfAOgBL/yUDvyUDvyUDvuUDvtvi/emFYuQjZCOjo+Pj42Qiwj3lIsFkIuQiY6Hj4iNhouGi4aJh4eHCPsU+xQFiIiGiYaLhouHjYeOCPsU9xQFiI+Jj4uQCA77b4v3FBWLkI2Pjo8I9xT3FAWPjo+NkIuQi5CJjogI9xT7FAWPh42Hi4aLhomHh4eIiIaJhosI+5SLBYaLh42HjoiPiY+LkAgO+92d928Vi5CNkI+OCPcU9xQFjo+QjZCLkIuPiY6Hj4iNhouGCIv7lAWLhomHh4iIh4eJhouGi4aNiI8I+xT3FAWHjomPi5AIDvvdi+YVi/eUBYuQjZCOjo+Pj42Qi5CLkImOhwj3FPsUBY+IjYaLhouGiYeHiAj7FPsUBYiHhomGi4aLh42Hj4iOiY+LkAgO+JQU+JQViwwKAAAAAAMCAAGQAAUAAAFMAWYAAABHAUwBZgAAAPUAGQCEAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA8NoB4P/g/+AB4AAgAAAAAQAAAAAAAAAAAAAAIAAAAAAAAgAAAAMAAAAUAAMAAQAAABQABAA4AAAACgAIAAIAAgABACDw2v/9//8AAAAAACDw1//9//8AAf/jDy0AAwABAAAAAAAAAAAAAAABAAH//wAPAAEAAAABAAA5emozXw889QALAgAAAAAA0ABHWAAAAADQAEdYAAAAAAElAW4AAAAIAAIAAAAAAAAAAQAAAeD/4AAAAgAAAAAAASUAAQAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAABAAAAASUAAAElAAAAtwASALcAAAAAUAAACAAAAAAADgCuAAEAAAAAAAEADgAAAAEAAAAAAAIADgBHAAEAAAAAAAMADgAkAAEAAAAAAAQADgBVAAEAAAAAAAUAFgAOAAEAAAAAAAYABwAyAAEAAAAAAAoANABjAAMAAQQJAAEADgAAAAMAAQQJAAIADgBHAAMAAQQJAAMADgAkAAMAAQQJAAQADgBVAAMAAQQJAAUAFgAOAAMAAQQJAAYADgA5AAMAAQQJAAoANABjAGkAYwBvAG0AbwBvAG4AVgBlAHIAcwBpAG8AbgAgADEALgAwAGkAYwBvAG0AbwBvAG5pY29tb29uAGkAYwBvAG0AbwBvAG4AUgBlAGcAdQBsAGEAcgBpAGMAbwBtAG8AbwBuAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-.ui.dropdown > .dropdown.icon {
-  font-family: 'Dropdown';
-  line-height: 1;
-  height: 1em;
-  width: 1.23em;
-  backface-visibility: hidden;
-  font-weight: normal;
-  font-style: normal;
-  text-align: center;
-}
-
-.ui.dropdown > .dropdown.icon {
-  width: auto;
-}
-
-.ui.dropdown > .dropdown.icon:before {
-  content: '\f0d7';
-}
-
-/* Sub Menu */
-
-.ui.dropdown .menu .item .dropdown.icon:before {
-  content: '\f0da' ;
-}
-
-.ui.dropdown .item .left.dropdown.icon:before,
-.ui.dropdown .left.menu .item .dropdown.icon:before {
-  content: "\f0d9" ;
-}
-
-/* Vertical Menu Dropdown */
-
-.ui.vertical.menu .dropdown.item > .dropdown.icon:before {
-  content: "\f0da" ;
-}
-
-/* Icons for Reference
-.dropdown.down.icon {
-  content: "\f0d7";
-}
-.dropdown.up.icon {
-  content: "\f0d8";
-}
-.dropdown.left.icon {
-  content: "\f0d9";
-}
-.dropdown.icon.icon {
-  content: "\f0da";
-}
-*/
-
 /*******************************
         User Overrides
 *******************************/
@@ -5055,38 +4372,6 @@ select.ui.dropdown {
   box-shadow: 0 0 0 0 rgba(34, 36, 38, 0.35) inset;
 }
 
-.ui.form .ui.action.input:not([class*="left action"]) input:not([type]):focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="date"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="datetime-local"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="email"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="number"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="password"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="search"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="tel"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="time"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="text"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="file"]:focus,
-.ui.form .ui.action.input:not([class*="left action"]) input[type="url"]:focus {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.ui.form .ui[class*="left action"].input input:not([type]),
-.ui.form .ui[class*="left action"].input input[type="date"],
-.ui.form .ui[class*="left action"].input input[type="datetime-local"],
-.ui.form .ui[class*="left action"].input input[type="email"],
-.ui.form .ui[class*="left action"].input input[type="number"],
-.ui.form .ui[class*="left action"].input input[type="password"],
-.ui.form .ui[class*="left action"].input input[type="search"],
-.ui.form .ui[class*="left action"].input input[type="tel"],
-.ui.form .ui[class*="left action"].input input[type="time"],
-.ui.form .ui[class*="left action"].input input[type="text"],
-.ui.form .ui[class*="left action"].input input[type="file"],
-.ui.form .ui[class*="left action"].input input[type="url"] {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-}
-
 .ui.form textarea:focus {
   color: rgba(0, 0, 0, 0.95);
   border-color: #85B7D9;
@@ -6428,48 +5713,6 @@ select.ui.dropdown {
   font-size: 1rem;
 }
 
-.ui.mini.form,
-.ui.mini.form .field .dropdown,
-.ui.mini.form .field .dropdown .menu > .item {
-  font-size: 0.78571429rem;
-}
-
-.ui.tiny.form,
-.ui.tiny.form .field .dropdown,
-.ui.tiny.form .field .dropdown .menu > .item {
-  font-size: 0.85714286rem;
-}
-
-.ui.small.form,
-.ui.small.form .field .dropdown,
-.ui.small.form .field .dropdown .menu > .item {
-  font-size: 0.92857143rem;
-}
-
-.ui.large.form,
-.ui.large.form .field .dropdown,
-.ui.large.form .field .dropdown .menu > .item {
-  font-size: 1.14285714rem;
-}
-
-.ui.big.form,
-.ui.big.form .field .dropdown,
-.ui.big.form .field .dropdown .menu > .item {
-  font-size: 1.28571429rem;
-}
-
-.ui.huge.form,
-.ui.huge.form .field .dropdown,
-.ui.huge.form .field .dropdown .menu > .item {
-  font-size: 1.42857143rem;
-}
-
-.ui.massive.form,
-.ui.massive.form .field .dropdown,
-.ui.massive.form .field .dropdown .menu > .item {
-  font-size: 1.71428571rem;
-}
-
 /*******************************
          Theme Overrides
 *******************************/
@@ -7561,139 +6804,6 @@ Floated Menu / Item
   border-color: currentColor;
 }
 
-/*--------------
-      Text Menu
-  ---------------*/
-
-.ui.text.menu {
-  background: none transparent;
-  border-radius: 0;
-  box-shadow: none;
-  border: none;
-  margin: 1em -0.5em;
-}
-
-.ui.text.menu .item {
-  border-radius: 0;
-  box-shadow: none;
-  align-self: center;
-  margin: 0 0;
-  padding: 0.35714286em 0.5em;
-  font-weight: normal;
-  color: rgba(0, 0, 0, 0.6);
-  transition: opacity 0.1s ease;
-}
-
-/* Border */
-
-.ui.text.menu .item:before,
-.ui.text.menu .menu .item:before {
-  display: none !important;
-}
-
-/* Header */
-
-.ui.text.menu .header.item {
-  background-color: transparent;
-  opacity: 1;
-  color: rgba(0, 0, 0, 0.85);
-  font-size: 0.92857143em;
-  text-transform: uppercase;
-  font-weight: 500;
-}
-
-/* Image */
-
-.ui.text.menu .item > img:not(.ui) {
-  margin: 0;
-}
-
-/*--- fluid text ---*/
-
-.ui.text.item.menu .item {
-  margin: 0;
-}
-
-/*--- vertical text ---*/
-
-.ui.vertical.text.menu {
-  margin: 1em 0;
-}
-
-.ui.vertical.text.menu:first-child {
-  margin-top: 0;
-}
-
-.ui.vertical.text.menu:last-child {
-  margin-bottom: 0;
-}
-
-.ui.vertical.text.menu .item {
-  margin: 0.57142857em 0;
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.ui.vertical.text.menu .item > i.icon {
-  float: none;
-  margin: 0 0.35714286em 0 0;
-}
-
-.ui.vertical.text.menu .header.item {
-  margin: 0.57142857em 0 0.71428571em;
-}
-
-/* Vertical Sub Menu */
-
-.ui.vertical.text.menu .item:not(.dropdown) > .menu {
-  margin: 0;
-}
-
-.ui.vertical.text.menu .item:not(.dropdown) > .menu > .item {
-  margin: 0;
-  padding: 0.5em 0;
-}
-
-/*--- hover ---*/
-
-.ui.text.menu .item:hover {
-  opacity: 1;
-  background-color: transparent;
-}
-
-/*--- active ---*/
-
-.ui.text.menu .active.item {
-  background-color: transparent;
-  border: none;
-  box-shadow: none;
-  font-weight: normal;
-  color: rgba(0, 0, 0, 0.95);
-}
-
-/*--- active hover ---*/
-
-.ui.text.menu .active.item:hover {
-  background-color: transparent;
-}
-
-/* Disable Bariations */
-
-.ui.text.pointing.menu .active.item:after {
-  box-shadow: none;
-}
-
-.ui.text.attached.menu {
-  box-shadow: none;
-}
-
-/* Fluid */
-
-.ui.fluid.text.menu {
-  margin-left: 0;
-  margin-right: 0;
-}
-
 /*--------------
     Icon Only
 ---------------*/
@@ -7937,30 +7047,6 @@ Floated Menu / Item
   margin: 0 0 0 0.5rem;
 }
 
-/*--------------
-       Fitted
-  ---------------*/
-
-.ui.fitted.menu .item,
-.ui.fitted.menu .item .menu .item,
-.ui.menu .fitted.item {
-  padding: 0;
-}
-
-.ui.horizontally.fitted.menu .item,
-.ui.horizontally.fitted.menu .item .menu .item,
-.ui.menu .horizontally.fitted.item {
-  padding-top: 0.92857143em;
-  padding-bottom: 0.92857143em;
-}
-
-.ui.vertically.fitted.menu .item,
-.ui.vertically.fitted.menu .item .menu .item,
-.ui.menu .vertically.fitted.item {
-  padding-left: 1.14285714em;
-  padding-right: 1.14285714em;
-}
-
 /*--------------
      Borderless
   ---------------*/
@@ -8079,77 +7165,6 @@ Floated Menu / Item
   width: 8.333%;
 }
 
-/*--------------
-       Fixed
-  ---------------*/
-
-.ui.menu.fixed {
-  position: fixed;
-  z-index: 101;
-  margin: 0;
-  width: 100%;
-}
-
-.ui.menu.fixed,
-.ui.menu.fixed .item:first-child,
-.ui.menu.fixed .item:last-child {
-  border-radius: 0 !important;
-}
-
-.ui.fixed.menu,
-.ui[class*="top fixed"].menu {
-  top: 0;
-  left: 0;
-  right: auto;
-  bottom: auto;
-}
-
-.ui[class*="top fixed"].menu {
-  border-top: none;
-  border-left: none;
-  border-right: none;
-}
-
-.ui[class*="right fixed"].menu {
-  border-top: none;
-  border-bottom: none;
-  border-right: none;
-  top: 0;
-  right: 0;
-  left: auto;
-  bottom: auto;
-  width: auto;
-  height: 100%;
-}
-
-.ui[class*="bottom fixed"].menu {
-  border-bottom: none;
-  border-left: none;
-  border-right: none;
-  bottom: 0;
-  left: 0;
-  top: auto;
-  right: auto;
-}
-
-.ui[class*="left fixed"].menu {
-  border-top: none;
-  border-bottom: none;
-  border-left: none;
-  top: 0;
-  left: 0;
-  right: auto;
-  bottom: auto;
-  width: auto;
-  height: 100%;
-}
-
-/* Coupling with Grid */
-
-.ui.fixed.menu + .ui.grid {
-  padding-top: 2.75rem;
-}
-
 /*-------------------
          Pointing
   --------------------*/
@@ -8416,36 +7431,6 @@ Floated Menu / Item
   width: 18rem;
 }
 
-.ui.big.menu,
-.ui.big.menu .dropdown,
-.ui.big.menu .dropdown .menu > .item {
-  font-size: 1.14285714rem;
-}
-
-.ui.big.vertical.menu:not(.icon) {
-  width: 20rem;
-}
-
-.ui.huge.menu,
-.ui.huge.menu .dropdown,
-.ui.huge.menu .dropdown .menu > .item {
-  font-size: 1.21428571rem;
-}
-
-.ui.huge.vertical.menu:not(.icon) {
-  width: 22rem;
-}
-
-.ui.massive.menu,
-.ui.massive.menu .dropdown,
-.ui.massive.menu .dropdown .menu > .item {
-  font-size: 1.28571429rem;
-}
-
-.ui.massive.vertical.menu:not(.icon) {
-  width: 25rem;
-}
-
 /*-------------------
   Inverted dropdowns
 --------------------*/
@@ -8802,62 +7787,6 @@ Floated Menu / Item
              Types
 *******************************/
 
-.ui.basic.modal {
-  background-color: transparent;
-  border: none;
-  border-radius: 0;
-  box-shadow: none !important;
-  color: #FFFFFF;
-}
-
-.ui.basic.modal > .header,
-.ui.basic.modal > .content,
-.ui.basic.modal > .actions {
-  background-color: transparent;
-}
-
-.ui.basic.modal > .header {
-  color: #FFFFFF;
-  border-bottom: none;
-}
-
-.ui.basic.modal > .close {
-  top: 1rem;
-  right: 1.5rem;
-  color: #FFFFFF;
-}
-
-.ui.inverted.dimmer > .basic.modal {
-  color: rgba(0, 0, 0, 0.87);
-}
-
-.ui.inverted.dimmer > .ui.basic.modal > .header {
-  color: rgba(0, 0, 0, 0.85);
-}
-
-/* Resort to margin positioning if legacy */
-
-.ui.legacy.legacy.modal,
-.ui.legacy.legacy.page.dimmer > .ui.modal {
-  left: 50% !important;
-}
-
-.ui.legacy.legacy.modal:not(.aligned),
-.ui.legacy.legacy.page.dimmer > .ui.modal:not(.aligned) {
-  top: 50%;
-}
-
-.ui.legacy.legacy.page.dimmer > .ui.scrolling.modal:not(.aligned),
-.ui.page.dimmer > .ui.scrolling.legacy.legacy.modal:not(.aligned),
-.ui.top.aligned.legacy.legacy.page.dimmer > .ui.modal:not(.aligned),
-.ui.top.aligned.dimmer > .ui.legacy.legacy.modal:not(.aligned) {
-  top: auto;
-}
-
-.ui.legacy.overlay.fullscreen.modal {
-  margin-top: -2rem !important;
-}
-
 /*******************************
              States
 *******************************/
@@ -8953,14 +7882,6 @@ Floated Menu / Item
   overflow: auto;
 }
 
-.ui.overlay.fullscreen.modal > .content {
-  min-height: calc(100vh - 9.1rem);
-}
-
-.ui.overlay.fullscreen.modal > .scrolling.content {
-  max-height: calc(100vh - 9.1rem);
-}
-
 /*--------------
      Full Screen
   ---------------*/
@@ -8971,14 +7892,6 @@ Floated Menu / Item
   margin: 1em auto;
 }
 
-.ui.overlay.fullscreen.modal {
-  width: 100%;
-  left: 0;
-  margin: 0 auto;
-  top: 0;
-  border-radius: 0;
-}
-
 .ui.modal > .close.inside + .header,
 .ui.fullscreen.modal > .header {
   padding-right: 2.25rem;
@@ -8991,10 +7904,6 @@ Floated Menu / Item
   color: rgba(0, 0, 0, 0.87);
 }
 
-.ui.basic.fullscreen.modal > .close {
-  color: #FFFFFF;
-}
-
 /*--------------
       Size
 ---------------*/
@@ -9120,162 +8029,6 @@ Floated Menu / Item
   }
 }
 
-.ui.large.modal > .header:not(.ui) {
-  font-size: 1.6em;
-}
-
-@media only screen and (max-width: 767.98px) {
-  .ui.large.modal {
-    width: 95%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 768px) {
-  .ui.large.modal {
-    width: 88%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .ui.large.modal {
-    width: 1020px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1200px) {
-  .ui.large.modal {
-    width: 1080px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1920px) {
-  .ui.large.modal {
-    width: 1140px;
-    margin: 0 0 0 0;
-  }
-}
-
-.ui.big.modal > .header:not(.ui) {
-  font-size: 1.6em;
-}
-
-@media only screen and (max-width: 767.98px) {
-  .ui.big.modal {
-    width: 95%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 768px) {
-  .ui.big.modal {
-    width: 88%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .ui.big.modal {
-    width: 1190px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1200px) {
-  .ui.big.modal {
-    width: 1260px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1920px) {
-  .ui.big.modal {
-    width: 1330px;
-    margin: 0 0 0 0;
-  }
-}
-
-.ui.huge.modal > .header:not(.ui) {
-  font-size: 1.6em;
-}
-
-@media only screen and (max-width: 767.98px) {
-  .ui.huge.modal {
-    width: 95%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 768px) {
-  .ui.huge.modal {
-    width: 88%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .ui.huge.modal {
-    width: 1360px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1200px) {
-  .ui.huge.modal {
-    width: 1440px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1920px) {
-  .ui.huge.modal {
-    width: 1520px;
-    margin: 0 0 0 0;
-  }
-}
-
-.ui.massive.modal > .header:not(.ui) {
-  font-size: 1.8em;
-}
-
-@media only screen and (max-width: 767.98px) {
-  .ui.massive.modal {
-    width: 95%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 768px) {
-  .ui.massive.modal {
-    width: 88%;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .ui.massive.modal {
-    width: 1530px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1200px) {
-  .ui.massive.modal {
-    width: 1620px;
-    margin: 0 0 0 0;
-  }
-}
-
-@media only screen and (min-width: 1920px) {
-  .ui.massive.modal {
-    width: 1710px;
-    margin: 0 0 0 0;
-  }
-}
-
 /*******************************
          Theme Overrides
 *******************************/
@@ -9518,14 +8271,6 @@ Floated Menu / Item
       Active
 ---------------*/
 
-.ui.category.search > .results .category.active {
-  background: #F3F4F5;
-}
-
-.ui.category.search > .results .category.active > .name {
-  color: rgba(0, 0, 0, 0.87);
-}
-
 .ui.search > .results .result.active,
 .ui.category.search > .results .category .result.active {
   position: relative;
@@ -9594,75 +8339,6 @@ Floated Menu / Item
   color: #DB2828;
 }
 
-/*--------------
-      Category
-  ---------------*/
-
-.ui.category.search .results {
-  width: 28em;
-}
-
-.ui.category.search .results.animating,
-.ui.category.search .results.visible {
-  display: table;
-}
-
-/* Category */
-
-.ui.category.search > .results .category {
-  display: table-row;
-  background: #F3F4F5;
-  box-shadow: none;
-  transition: background 0.1s ease, border-color 0.1s ease;
-}
-
-/* Last Category */
-
-.ui.category.search > .results .category:last-child {
-  border-bottom: none;
-}
-
-/* First / Last */
-
-.ui.category.search > .results .category:first-child .name + .result {
-  border-radius: 0 0.28571429rem 0 0;
-}
-
-.ui.category.search > .results .category:last-child .result:last-child {
-  border-radius: 0 0 0.28571429rem 0;
-}
-
-/* Category Result Name */
-
-.ui.category.search > .results .category > .name {
-  display: table-cell;
-  text-overflow: ellipsis;
-  width: 100px;
-  white-space: nowrap;
-  background: transparent;
-  font-family: var(--fonts-regular);
-  font-size: 1em;
-  padding: 0.4em 1em;
-  font-weight: 500;
-  color: rgba(0, 0, 0, 0.4);
-  border-bottom: 1px solid rgba(34, 36, 38, 0.1);
-}
-
-/* Category Result */
-
-.ui.category.search > .results .category .results {
-  display: table-cell;
-  background: #FFFFFF;
-  border-left: 1px solid rgba(34, 36, 38, 0.15);
-  border-bottom: 1px solid rgba(34, 36, 38, 0.1);
-}
-
-.ui.category.search > .results .category .result {
-  border-bottom: 1px solid rgba(34, 36, 38, 0.1);
-  transition: background 0.1s ease, border-color 0.1s ease;
-  padding: 0.85714286em 1.14285714em;
-}
-
 /*******************************
            Variations
 *******************************/
@@ -9704,92 +8380,6 @@ Floated Menu / Item
   }
 }
 
-@media only screen and (max-width: 767.98px) {
-  .ui.search.short > .results {
-    max-height: 12.17714286em;
-  }
-
-  .ui.search[class*="very short"] > .results {
-    max-height: 9.13285714em;
-  }
-
-  .ui.search.long > .results {
-    max-height: 24.35428571em;
-  }
-
-  .ui.search[class*="very long"] > .results {
-    max-height: 36.53142857em;
-  }
-}
-
-@media only screen and (min-width: 768px) {
-  .ui.search.short > .results {
-    max-height: 18.26571429em;
-  }
-
-  .ui.search[class*="very short"] > .results {
-    max-height: 13.69928571em;
-  }
-
-  .ui.search.long > .results {
-    max-height: 36.53142857em;
-  }
-
-  .ui.search[class*="very long"] > .results {
-    max-height: 54.79714286em;
-  }
-}
-
-@media only screen and (min-width: 992px) {
-  .ui.search.short > .results {
-    max-height: 24.35428571em;
-  }
-
-  .ui.search[class*="very short"] > .results {
-    max-height: 18.26571429em;
-  }
-
-  .ui.search.long > .results {
-    max-height: 48.70857143em;
-  }
-
-  .ui.search[class*="very long"] > .results {
-    max-height: 73.06285714em;
-  }
-}
-
-@media only screen and (min-width: 1920px) {
-  .ui.search.short > .results {
-    max-height: 36.53142857em;
-  }
-
-  .ui.search[class*="very short"] > .results {
-    max-height: 27.39857143em;
-  }
-
-  .ui.search.long > .results {
-    max-height: 73.06285714em;
-  }
-
-  .ui.search[class*="very long"] > .results {
-    max-height: 109.59428571em;
-  }
-}
-
-/*-------------------
-       Left / Right
-  --------------------*/
-
-.ui[class*="left aligned"].search > .results {
-  right: auto;
-  left: 0;
-}
-
-.ui[class*="right aligned"].search > .results {
-  right: 0;
-  left: auto;
-}
-
 /*--------------
     Fluid
 ---------------*/
@@ -9822,18 +8412,6 @@ Floated Menu / Item
   font-size: 1.14285714em;
 }
 
-.ui.big.search {
-  font-size: 1.28571429em;
-}
-
-.ui.huge.search {
-  font-size: 1.42857143em;
-}
-
-.ui.massive.search {
-  font-size: 1.71428571em;
-}
-
 /*--------------
       Mobile
 ---------------*/
@@ -9850,86 +8428,4 @@ Floated Menu / Item
 
 /*******************************
          Site Overrides
-*******************************/
-/*!
- * # Fomantic-UI - Tab
- * http://github.com/fomantic/Fomantic-UI/
- *
- *
- * Released under the MIT license
- * http://opensource.org/licenses/MIT
- *
- */
-
-/*******************************
-           UI Tabs
-*******************************/
-
-.ui.tab {
-  display: none;
-}
-
-/*******************************
-             States
-*******************************/
-
-/*--------------------
-       Active
----------------------*/
-
-.ui.tab.active,
-.ui.tab.open {
-  display: block;
-}
-
-/*--------------------
-         Loading
-  ---------------------*/
-
-.ui.tab.loading {
-  position: relative;
-  overflow: hidden;
-  display: block;
-  min-height: 250px;
-}
-
-.ui.tab.loading * {
-  position: relative !important;
-  left: -10000px !important;
-}
-
-.ui.tab.loading:before,
-.ui.tab.loading.segment:before {
-  position: absolute;
-  content: '';
-  top: 50%;
-  left: 50%;
-  margin: -1.25em 0 0 -1.25em;
-  width: 2.5em;
-  height: 2.5em;
-  border-radius: 500rem;
-  border: 0.2em solid rgba(0, 0, 0, 0.1);
-}
-
-.ui.tab.loading:after,
-.ui.tab.loading.segment:after {
-  position: absolute;
-  content: '';
-  top: 50%;
-  left: 50%;
-  margin: -1.25em 0 0 -1.25em;
-  width: 2.5em;
-  height: 2.5em;
-  animation: loader 0.6s infinite linear;
-  border: 0.2em solid #767676;
-  border-radius: 500rem;
-  box-shadow: 0 0 0 1px transparent;
-}
-
-/*******************************
-         Tab Overrides
-*******************************/
-
-/*******************************
-        User Overrides
 *******************************/
\ No newline at end of file
diff --git a/web_src/fomantic/build/semantic.js b/web_src/fomantic/build/semantic.js
index fb68705c08..80ddb88eda 100644
--- a/web_src/fomantic/build/semantic.js
+++ b/web_src/fomantic/build/semantic.js
@@ -1184,760 +1184,6 @@ $.api.settings = {
 
 
 
-})( jQuery, window, document );
-
-/*!
- * # Fomantic-UI - Dimmer
- * http://github.com/fomantic/Fomantic-UI/
- *
- *
- * Released under the MIT license
- * http://opensource.org/licenses/MIT
- *
- */
-
-;(function ($, window, document, undefined) {
-
-'use strict';
-
-$.isFunction = $.isFunction || function(obj) {
-  return typeof obj === "function" && typeof obj.nodeType !== "number";
-};
-
-window = (typeof window != 'undefined' && window.Math == Math)
-  ? window
-  : (typeof self != 'undefined' && self.Math == Math)
-    ? self
-    : Function('return this')()
-;
-
-$.fn.dimmer = function(parameters) {
-  var
-    $allModules     = $(this),
-
-    time            = new Date().getTime(),
-    performance     = [],
-
-    query           = arguments[0],
-    methodInvoked   = (typeof query == 'string'),
-    queryArguments  = [].slice.call(arguments, 1),
-
-    returnedValue
-  ;
-
-  $allModules
-    .each(function() {
-      var
-        settings        = ( $.isPlainObject(parameters) )
-          ? $.extend(true, {}, $.fn.dimmer.settings, parameters)
-          : $.extend({}, $.fn.dimmer.settings),
-
-        selector        = settings.selector,
-        namespace       = settings.namespace,
-        className       = settings.className,
-        error           = settings.error,
-
-        eventNamespace  = '.' + namespace,
-        moduleNamespace = 'module-' + namespace,
-        moduleSelector  = $allModules.selector || '',
-
-        clickEvent = "click", unstableClickEvent = ('ontouchstart' in document.documentElement)
-          ? 'touchstart'
-          : 'click',
-
-        $module = $(this),
-        $dimmer,
-        $dimmable,
-
-        element   = this,
-        instance  = $module.data(moduleNamespace),
-        module
-      ;
-
-      module = {
-
-        preinitialize: function() {
-          if( module.is.dimmer() ) {
-
-            $dimmable = $module.parent();
-            $dimmer   = $module;
-          }
-          else {
-            $dimmable = $module;
-            if( module.has.dimmer() ) {
-              if(settings.dimmerName) {
-                $dimmer = $dimmable.find(selector.dimmer).filter('.' + settings.dimmerName);
-              }
-              else {
-                $dimmer = $dimmable.find(selector.dimmer);
-              }
-            }
-            else {
-              $dimmer = module.create();
-            }
-          }
-        },
-
-        initialize: function() {
-          module.debug('Initializing dimmer', settings);
-
-          module.bind.events();
-          module.set.dimmable();
-          module.instantiate();
-        },
-
-        instantiate: function() {
-          module.verbose('Storing instance of module', module);
-          instance = module;
-          $module
-            .data(moduleNamespace, instance)
-          ;
-        },
-
-        destroy: function() {
-          module.verbose('Destroying previous module', $dimmer);
-          module.unbind.events();
-          module.remove.variation();
-          $dimmable
-            .off(eventNamespace)
-          ;
-        },
-
-        bind: {
-          events: function() {
-            if(settings.on == 'hover') {
-              $dimmable
-                .on('mouseenter' + eventNamespace, module.show)
-                .on('mouseleave' + eventNamespace, module.hide)
-              ;
-            }
-            else if(settings.on == 'click') {
-              $dimmable
-                .on(clickEvent + eventNamespace, module.toggle)
-              ;
-            }
-            if( module.is.page() ) {
-              module.debug('Setting as a page dimmer', $dimmable);
-              module.set.pageDimmer();
-            }
-
-            if( module.is.closable() ) {
-              module.verbose('Adding dimmer close event', $dimmer);
-              $dimmable
-                .on(clickEvent + eventNamespace, selector.dimmer, module.event.click)
-              ;
-            }
-          }
-        },
-
-        unbind: {
-          events: function() {
-            $module
-              .removeData(moduleNamespace)
-            ;
-            $dimmable
-              .off(eventNamespace)
-            ;
-          }
-        },
-
-        event: {
-          click: function(event) {
-            module.verbose('Determining if event occurred on dimmer', event);
-            if( $dimmer.find(event.target).length === 0 || $(event.target).is(selector.content) ) {
-              module.hide();
-              event.stopImmediatePropagation();
-            }
-          }
-        },
-
-        addContent: function(element) {
-          var
-            $content = $(element)
-          ;
-          module.debug('Add content to dimmer', $content);
-          if($content.parent()[0] !== $dimmer[0]) {
-            $content.detach().appendTo($dimmer);
-          }
-        },
-
-        create: function() {
-          var
-            $element = $( settings.template.dimmer(settings) )
-          ;
-          if(settings.dimmerName) {
-            module.debug('Creating named dimmer', settings.dimmerName);
-            $element.addClass(settings.dimmerName);
-          }
-          $element
-            .appendTo($dimmable)
-          ;
-          return $element;
-        },
-
-        show: function(callback) {
-          callback = $.isFunction(callback)
-            ? callback
-            : function(){}
-          ;
-          module.debug('Showing dimmer', $dimmer, settings);
-          module.set.variation();
-          if( (!module.is.dimmed() || module.is.animating()) && module.is.enabled() ) {
-            module.animate.show(callback);
-            settings.onShow.call(element);
-            settings.onChange.call(element);
-          }
-          else {
-            module.debug('Dimmer is already shown or disabled');
-          }
-        },
-
-        hide: function(callback) {
-          callback = $.isFunction(callback)
-            ? callback
-            : function(){}
-          ;
-          if( module.is.dimmed() || module.is.animating() ) {
-            module.debug('Hiding dimmer', $dimmer);
-            module.animate.hide(callback);
-            settings.onHide.call(element);
-            settings.onChange.call(element);
-          }
-          else {
-            module.debug('Dimmer is not visible');
-          }
-        },
-
-        toggle: function() {
-          module.verbose('Toggling dimmer visibility', $dimmer);
-          if( !module.is.dimmed() ) {
-            module.show();
-          }
-          else {
-            if ( module.is.closable() ) {
-              module.hide();
-            }
-          }
-        },
-
-        animate: {
-          show: function(callback) {
-            callback = $.isFunction(callback)
-              ? callback
-              : function(){}
-            ;
-            if(settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) {
-              if(settings.useFlex) {
-                module.debug('Using flex dimmer');
-                module.remove.legacy();
-              }
-              else {
-                module.debug('Using legacy non-flex dimmer');
-                module.set.legacy();
-              }
-              if(settings.opacity !== 'auto') {
-                module.set.opacity();
-              }
-              $dimmer
-                .transition({
-                  displayType : settings.useFlex
-                    ? 'flex'
-                    : 'block',
-                  animation   : settings.transition + ' in',
-                  queue       : false,
-                  duration    : module.get.duration(),
-                  useFailSafe : true,
-                  onStart     : function() {
-                    module.set.dimmed();
-                  },
-                  onComplete  : function() {
-                    module.set.active();
-                    callback();
-                  }
-                })
-              ;
-            }
-            else {
-              module.verbose('Showing dimmer animation with javascript');
-              module.set.dimmed();
-              if(settings.opacity == 'auto') {
-                settings.opacity = 0.8;
-              }
-              $dimmer
-                .stop()
-                .css({
-                  opacity : 0,
-                  width   : '100%',
-                  height  : '100%'
-                })
-                .fadeTo(module.get.duration(), settings.opacity, function() {
-                  $dimmer.removeAttr('style');
-                  module.set.active();
-                  callback();
-                })
-              ;
-            }
-          },
-          hide: function(callback) {
-            callback = $.isFunction(callback)
-              ? callback
-              : function(){}
-            ;
-            if(settings.useCSS && $.fn.transition !== undefined && $dimmer.transition('is supported')) {
-              module.verbose('Hiding dimmer with css');
-              $dimmer
-                .transition({
-                  displayType : settings.useFlex
-                    ? 'flex'
-                    : 'block',
-                  animation   : settings.transition + ' out',
-                  queue       : false,
-                  duration    : module.get.duration(),
-                  useFailSafe : true,
-                  onComplete  : function() {
-                    module.remove.dimmed();
-                    module.remove.variation();
-                    module.remove.active();
-                    callback();
-                  }
-                })
-              ;
-            }
-            else {
-              module.verbose('Hiding dimmer with javascript');
-              $dimmer
-                .stop()
-                .fadeOut(module.get.duration(), function() {
-                  module.remove.dimmed();
-                  module.remove.active();
-                  $dimmer.removeAttr('style');
-                  callback();
-                })
-              ;
-            }
-          }
-        },
-
-        get: {
-          dimmer: function() {
-            return $dimmer;
-          },
-          duration: function() {
-            if(typeof settings.duration == 'object') {
-              if( module.is.active() ) {
-                return settings.duration.hide;
-              }
-              else {
-                return settings.duration.show;
-              }
-            }
-            return settings.duration;
-          }
-        },
-
-        has: {
-          dimmer: function() {
-            if(settings.dimmerName) {
-              return ($module.find(selector.dimmer).filter('.' + settings.dimmerName).length > 0);
-            }
-            else {
-              return ( $module.find(selector.dimmer).length > 0 );
-            }
-          }
-        },
-
-        is: {
-          active: function() {
-            return $dimmer.hasClass(className.active);
-          },
-          animating: function() {
-            return ( $dimmer.is(':animated') || $dimmer.hasClass(className.animating) );
-          },
-          closable: function() {
-            if(settings.closable == 'auto') {
-              if(settings.on == 'hover') {
-                return false;
-              }
-              return true;
-            }
-            return settings.closable;
-          },
-          dimmer: function() {
-            return $module.hasClass(className.dimmer);
-          },
-          dimmable: function() {
-            return $module.hasClass(className.dimmable);
-          },
-          dimmed: function() {
-            return $dimmable.hasClass(className.dimmed);
-          },
-          disabled: function() {
-            return $dimmable.hasClass(className.disabled);
-          },
-          enabled: function() {
-            return !module.is.disabled();
-          },
-          page: function () {
-            return $dimmable.is('body');
-          },
-          pageDimmer: function() {
-            return $dimmer.hasClass(className.pageDimmer);
-          }
-        },
-
-        can: {
-          show: function() {
-            return !$dimmer.hasClass(className.disabled);
-          }
-        },
-
-        set: {
-          opacity: function(opacity) {
-            var
-              color      = $dimmer.css('background-color'),
-              colorArray = color.split(','),
-              isRGB      = (colorArray && colorArray.length >= 3)
-            ;
-            opacity    = settings.opacity === 0 ? 0 : settings.opacity || opacity;
-            if(isRGB) {
-              colorArray[2] = colorArray[2].replace(')','');
-              colorArray[3] = opacity + ')';
-              color         = colorArray.join(',');
-            }
-            else {
-              color = 'rgba(0, 0, 0, ' + opacity + ')';
-            }
-            module.debug('Setting opacity to', opacity);
-            $dimmer.css('background-color', color);
-          },
-          legacy: function() {
-            $dimmer.addClass(className.legacy);
-          },
-          active: function() {
-            $dimmer.addClass(className.active);
-          },
-          dimmable: function() {
-            $dimmable.addClass(className.dimmable);
-          },
-          dimmed: function() {
-            $dimmable.addClass(className.dimmed);
-          },
-          pageDimmer: function() {
-            $dimmer.addClass(className.pageDimmer);
-          },
-          disabled: function() {
-            $dimmer.addClass(className.disabled);
-          },
-          variation: function(variation) {
-            variation = variation || settings.variation;
-            if(variation) {
-              $dimmer.addClass(variation);
-            }
-          }
-        },
-
-        remove: {
-          active: function() {
-            $dimmer
-              .removeClass(className.active)
-            ;
-          },
-          legacy: function() {
-            $dimmer.removeClass(className.legacy);
-          },
-          dimmed: function() {
-            $dimmable.removeClass(className.dimmed);
-          },
-          disabled: function() {
-            $dimmer.removeClass(className.disabled);
-          },
-          variation: function(variation) {
-            variation = variation || settings.variation;
-            if(variation) {
-              $dimmer.removeClass(variation);
-            }
-          }
-        },
-
-        setting: function(name, value) {
-          module.debug('Changing setting', name, value);
-          if( $.isPlainObject(name) ) {
-            $.extend(true, settings, name);
-          }
-          else if(value !== undefined) {
-            if($.isPlainObject(settings[name])) {
-              $.extend(true, settings[name], value);
-            }
-            else {
-              settings[name] = value;
-            }
-          }
-          else {
-            return settings[name];
-          }
-        },
-        internal: function(name, value) {
-          if( $.isPlainObject(name) ) {
-            $.extend(true, module, name);
-          }
-          else if(value !== undefined) {
-            module[name] = value;
-          }
-          else {
-            return module[name];
-          }
-        },
-        debug: function() {
-          if(!settings.silent && settings.debug) {
-            if(settings.performance) {
-              module.performance.log(arguments);
-            }
-            else {
-              module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
-              module.debug.apply(console, arguments);
-            }
-          }
-        },
-        verbose: function() {
-          if(!settings.silent && settings.verbose && settings.debug) {
-            if(settings.performance) {
-              module.performance.log(arguments);
-            }
-            else {
-              module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
-              module.verbose.apply(console, arguments);
-            }
-          }
-        },
-        error: function() {
-          if(!settings.silent) {
-            module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
-            module.error.apply(console, arguments);
-          }
-        },
-        performance: {
-          log: function(message) {
-            var
-              currentTime,
-              executionTime,
-              previousTime
-            ;
-            if(settings.performance) {
-              currentTime   = new Date().getTime();
-              previousTime  = time || currentTime;
-              executionTime = currentTime - previousTime;
-              time          = currentTime;
-              performance.push({
-                'Name'           : message[0],
-                'Arguments'      : [].slice.call(message, 1) || '',
-                'Element'        : element,
-                'Execution Time' : executionTime
-              });
-            }
-            clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 500);
-          },
-          display: function() {
-            var
-              title = settings.name + ':',
-              totalTime = 0
-            ;
-            time = false;
-            clearTimeout(module.performance.timer);
-            $.each(performance, function(index, data) {
-              totalTime += data['Execution Time'];
-            });
-            title += ' ' + totalTime + 'ms';
-            if(moduleSelector) {
-              title += ' \'' + moduleSelector + '\'';
-            }
-            if($allModules.length > 1) {
-              title += ' ' + '(' + $allModules.length + ')';
-            }
-            if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
-              console.groupCollapsed(title);
-              if(console.table) {
-                console.table(performance);
-              }
-              else {
-                $.each(performance, function(index, data) {
-                  console.log(data['Name'] + ': ' + data['Execution Time']+'ms');
-                });
-              }
-              console.groupEnd();
-            }
-            performance = [];
-          }
-        },
-        invoke: function(query, passedArguments, context) {
-          var
-            object = instance,
-            maxDepth,
-            found,
-            response
-          ;
-          passedArguments = passedArguments || queryArguments;
-          context         = element         || context;
-          if(typeof query == 'string' && object !== undefined) {
-            query    = query.split(/[\. ]/);
-            maxDepth = query.length - 1;
-            $.each(query, function(depth, value) {
-              var camelCaseValue = (depth != maxDepth)
-                ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
-                : query
-              ;
-              if( $.isPlainObject( object[camelCaseValue] ) && (depth != maxDepth) ) {
-                object = object[camelCaseValue];
-              }
-              else if( object[camelCaseValue] !== undefined ) {
-                found = object[camelCaseValue];
-                return false;
-              }
-              else if( $.isPlainObject( object[value] ) && (depth != maxDepth) ) {
-                object = object[value];
-              }
-              else if( object[value] !== undefined ) {
-                found = object[value];
-                return false;
-              }
-              else {
-                module.error(error.method, query);
-                return false;
-              }
-            });
-          }
-          if ( $.isFunction( found ) ) {
-            response = found.apply(context, passedArguments);
-          }
-          else if(found !== undefined) {
-            response = found;
-          }
-          if(Array.isArray(returnedValue)) {
-            returnedValue.push(response);
-          }
-          else if(returnedValue !== undefined) {
-            returnedValue = [returnedValue, response];
-          }
-          else if(response !== undefined) {
-            returnedValue = response;
-          }
-          return found;
-        }
-      };
-
-      module.preinitialize();
-
-      if(methodInvoked) {
-        if(instance === undefined) {
-          module.initialize();
-        }
-        module.invoke(query);
-      }
-      else {
-        if(instance !== undefined) {
-          instance.invoke('destroy');
-        }
-        module.initialize();
-      }
-    })
-  ;
-
-  return (returnedValue !== undefined)
-    ? returnedValue
-    : this
-  ;
-};
-
-$.fn.dimmer.settings = {
-
-  name        : 'Dimmer',
-  namespace   : 'dimmer',
-
-  silent      : false,
-  debug       : false,
-  verbose     : false,
-  performance : true,
-
-  // whether should use flex layout
-  useFlex     : true,
-
-  // name to distinguish between multiple dimmers in context
-  dimmerName  : false,
-
-  // whether to add a variation type
-  variation   : false,
-
-  // whether to bind close events
-  closable    : 'auto',
-
-  // whether to use css animations
-  useCSS      : true,
-
-  // css animation to use
-  transition  : 'fade',
-
-  // event to bind to
-  on          : false,
-
-  // overriding opacity value
-  opacity     : 'auto',
-
-  // transition durations
-  duration    : {
-    show : 500,
-    hide : 500
-  },
-// whether the dynamically created dimmer should have a loader
-  displayLoader: false,
-  loaderText  : false,
-  loaderVariation : '',
-
-  onChange    : function(){},
-  onShow      : function(){},
-  onHide      : function(){},
-
-  error   : {
-    method   : 'The method you called is not defined.'
-  },
-
-  className : {
-    active     : 'active',
-    animating  : 'animating',
-    dimmable   : 'dimmable',
-    dimmed     : 'dimmed',
-    dimmer     : 'dimmer',
-    disabled   : 'disabled',
-    hide       : 'hide',
-    legacy     : 'legacy',
-    pageDimmer : 'page',
-    show       : 'show',
-    loader     : 'ui loader'
-  },
-
-  selector: {
-    dimmer   : '> .ui.dimmer',
-    content  : '.ui.dimmer > .content, .ui.dimmer > .content > .center'
-  },
-
-  template: {
-    dimmer: function(settings) {
-        var d = $('<div/>').addClass('ui dimmer'),l;
-        if(settings.displayLoader) {
-          l = $('<div/>')
-              .addClass(settings.className.loader)
-              .addClass(settings.loaderVariation);
-          if(!!settings.loaderText){
-            l.text(settings.loaderText);
-            l.addClass('text');
-          }
-          d.append(l);
-        }
-        return d;
-    }
-  }
-
-};
-
 })( jQuery, window, document );
 
 /*!
@@ -10988,1005 +10234,3 @@ $.fn.search.settings = {
 };
 
 })( jQuery, window, document );
-
-/*!
- * # Fomantic-UI - Tab
- * http://github.com/fomantic/Fomantic-UI/
- *
- *
- * Released under the MIT license
- * http://opensource.org/licenses/MIT
- *
- */
-
-;(function ($, window, document, undefined) {
-
-'use strict';
-
-$.isWindow = $.isWindow || function(obj) {
-  return obj != null && obj === obj.window;
-};
-$.isFunction = $.isFunction || function(obj) {
-  return typeof obj === "function" && typeof obj.nodeType !== "number";
-};
-
-window = (typeof window != 'undefined' && window.Math == Math)
-  ? window
-  : (typeof self != 'undefined' && self.Math == Math)
-    ? self
-    : Function('return this')()
-;
-
-$.fn.tab = function(parameters) {
-
-  var
-    // use window context if none specified
-    $allModules     = $.isFunction(this)
-        ? $(window)
-        : $(this),
-
-    moduleSelector  = $allModules.selector || '',
-    time            = new Date().getTime(),
-    performance     = [],
-
-    query           = arguments[0],
-    methodInvoked   = (typeof query == 'string'),
-    queryArguments  = [].slice.call(arguments, 1),
-
-    initializedHistory = false,
-    returnedValue
-  ;
-
-  $allModules
-    .each(function() {
-      var
-
-        settings        = ( $.isPlainObject(parameters) )
-          ? $.extend(true, {}, $.fn.tab.settings, parameters)
-          : $.extend({}, $.fn.tab.settings),
-
-        className       = settings.className,
-        metadata        = settings.metadata,
-        selector        = settings.selector,
-        error           = settings.error,
-        regExp          = settings.regExp,
-
-        eventNamespace  = '.' + settings.namespace,
-        moduleNamespace = 'module-' + settings.namespace,
-
-        $module         = $(this),
-        $context,
-        $tabs,
-
-        cache           = {},
-        firstLoad       = true,
-        recursionDepth  = 0,
-        element         = this,
-        instance        = $module.data(moduleNamespace),
-
-        activeTabPath,
-        parameterArray,
-        module,
-
-        historyEvent
-
-      ;
-
-      module = {
-
-        initialize: function() {
-          module.debug('Initializing tab menu item', $module);
-          module.fix.callbacks();
-          module.determineTabs();
-
-          module.debug('Determining tabs', settings.context, $tabs);
-          // set up automatic routing
-          if(settings.auto) {
-            module.set.auto();
-          }
-          module.bind.events();
-
-          if(settings.history && !initializedHistory) {
-            module.initializeHistory();
-            initializedHistory = true;
-          }
-
-          if(settings.autoTabActivation && instance === undefined && module.determine.activeTab() == null) {
-            module.debug('No active tab detected, setting first tab active', module.get.initialPath());
-            module.changeTab(settings.autoTabActivation === true ? module.get.initialPath() : settings.autoTabActivation);
-          };
-
-          module.instantiate();
-        },
-
-        instantiate: function () {
-          module.verbose('Storing instance of module', module);
-          instance = module;
-          $module
-            .data(moduleNamespace, module)
-          ;
-        },
-
-        destroy: function() {
-          module.debug('Destroying tabs', $module);
-          $module
-            .removeData(moduleNamespace)
-            .off(eventNamespace)
-          ;
-        },
-
-        bind: {
-          events: function() {
-            // if using $.tab don't add events
-            if( !$.isWindow( element ) ) {
-              module.debug('Attaching tab activation events to element', $module);
-              $module
-                .on('click' + eventNamespace, module.event.click)
-              ;
-            }
-          }
-        },
-
-        determineTabs: function() {
-          var
-            $reference
-          ;
-
-          // determine tab context
-          if(settings.context === 'parent') {
-            if($module.closest(selector.ui).length > 0) {
-              $reference = $module.closest(selector.ui);
-              module.verbose('Using closest UI element as parent', $reference);
-            }
-            else {
-              $reference = $module;
-            }
-            $context = $reference.parent();
-            module.verbose('Determined parent element for creating context', $context);
-          }
-          else if(settings.context) {
-            $context = $(settings.context);
-            module.verbose('Using selector for tab context', settings.context, $context);
-          }
-          else {
-            $context = $('body');
-          }
-          // find tabs
-          if(settings.childrenOnly) {
-            $tabs = $context.children(selector.tabs);
-            module.debug('Searching tab context children for tabs', $context, $tabs);
-          }
-          else {
-            $tabs = $context.find(selector.tabs);
-            module.debug('Searching tab context for tabs', $context, $tabs);
-          }
-        },
-
-        fix: {
-          callbacks: function() {
-            if( $.isPlainObject(parameters) && (parameters.onTabLoad || parameters.onTabInit) ) {
-              if(parameters.onTabLoad) {
-                parameters.onLoad = parameters.onTabLoad;
-                delete parameters.onTabLoad;
-                module.error(error.legacyLoad, parameters.onLoad);
-              }
-              if(parameters.onTabInit) {
-                parameters.onFirstLoad = parameters.onTabInit;
-                delete parameters.onTabInit;
-                module.error(error.legacyInit, parameters.onFirstLoad);
-              }
-              settings = $.extend(true, {}, $.fn.tab.settings, parameters);
-            }
-          }
-        },
-
-        initializeHistory: function() {
-          module.debug('Initializing page state');
-          if( $.address === undefined ) {
-            module.error(error.state);
-            return false;
-          }
-          else {
-            if(settings.historyType == 'state') {
-              module.debug('Using HTML5 to manage state');
-              if(settings.path !== false) {
-                $.address
-                  .history(true)
-                  .state(settings.path)
-                ;
-              }
-              else {
-                module.error(error.path);
-                return false;
-              }
-            }
-            $.address
-              .bind('change', module.event.history.change)
-            ;
-          }
-        },
-
-        event: {
-          click: function(event) {
-            var
-              tabPath = $(this).data(metadata.tab)
-            ;
-            if(tabPath !== undefined) {
-              if(settings.history) {
-                module.verbose('Updating page state', event);
-                $.address.value(tabPath);
-              }
-              else {
-                module.verbose('Changing tab', event);
-                module.changeTab(tabPath);
-              }
-              event.preventDefault();
-            }
-            else {
-              module.debug('No tab specified');
-            }
-          },
-          history: {
-            change: function(event) {
-              var
-                tabPath   = event.pathNames.join('/') || module.get.initialPath(),
-                pageTitle = settings.templates.determineTitle(tabPath) || false
-              ;
-              module.performance.display();
-              module.debug('History change event', tabPath, event);
-              historyEvent = event;
-              if(tabPath !== undefined) {
-                module.changeTab(tabPath);
-              }
-              if(pageTitle) {
-                $.address.title(pageTitle);
-              }
-            }
-          }
-        },
-
-        refresh: function() {
-          if(activeTabPath) {
-            module.debug('Refreshing tab', activeTabPath);
-            module.changeTab(activeTabPath);
-          }
-        },
-
-        cache: {
-
-          read: function(cacheKey) {
-            return (cacheKey !== undefined)
-              ? cache[cacheKey]
-              : false
-            ;
-          },
-          add: function(cacheKey, content) {
-            cacheKey = cacheKey || activeTabPath;
-            module.debug('Adding cached content for', cacheKey);
-            cache[cacheKey] = content;
-          },
-          remove: function(cacheKey) {
-            cacheKey = cacheKey || activeTabPath;
-            module.debug('Removing cached content for', cacheKey);
-            delete cache[cacheKey];
-          }
-        },
-
-        escape: {
-          string: function(text) {
-            text =  String(text);
-            return text.replace(regExp.escape, '\\$&');
-          }
-        },
-
-        set: {
-          auto: function() {
-            var
-              url = (typeof settings.path == 'string')
-                ? settings.path.replace(/\/$/, '') + '/{$tab}'
-                : '/{$tab}'
-            ;
-            module.verbose('Setting up automatic tab retrieval from server', url);
-            if($.isPlainObject(settings.apiSettings)) {
-              settings.apiSettings.url = url;
-            }
-            else {
-              settings.apiSettings = {
-                url: url
-              };
-            }
-          },
-          loading: function(tabPath) {
-            var
-              $tab      = module.get.tabElement(tabPath),
-              isLoading = $tab.hasClass(className.loading)
-            ;
-            if(!isLoading) {
-              module.verbose('Setting loading state for', $tab);
-              $tab
-                .addClass(className.loading)
-                .siblings($tabs)
-                  .removeClass(className.active + ' ' + className.loading)
-              ;
-              if($tab.length > 0) {
-                settings.onRequest.call($tab[0], tabPath);
-              }
-            }
-          },
-          state: function(state) {
-            $.address.value(state);
-          }
-        },
-
-        changeTab: function(tabPath) {
-          var
-            pushStateAvailable = (window.history && window.history.pushState),
-            shouldIgnoreLoad   = (pushStateAvailable && settings.ignoreFirstLoad && firstLoad),
-            remoteContent      = (settings.auto || $.isPlainObject(settings.apiSettings) ),
-            // only add default path if not remote content
-            pathArray = (remoteContent && !shouldIgnoreLoad)
-              ? module.utilities.pathToArray(tabPath)
-              : module.get.defaultPathArray(tabPath)
-          ;
-          tabPath = module.utilities.arrayToPath(pathArray);
-          $.each(pathArray, function(index, tab) {
-            var
-              currentPathArray   = pathArray.slice(0, index + 1),
-              currentPath        = module.utilities.arrayToPath(currentPathArray),
-
-              isTab              = module.is.tab(currentPath),
-              isLastIndex        = (index + 1 == pathArray.length),
-
-              $tab               = module.get.tabElement(currentPath),
-              $anchor,
-              nextPathArray,
-              nextPath,
-              isLastTab
-            ;
-            module.verbose('Looking for tab', tab);
-            if(isTab) {
-              module.verbose('Tab was found', tab);
-              // scope up
-              activeTabPath  = currentPath;
-              parameterArray = module.utilities.filterArray(pathArray, currentPathArray);
-
-              if(isLastIndex) {
-                isLastTab = true;
-              }
-              else {
-                nextPathArray = pathArray.slice(0, index + 2);
-                nextPath      = module.utilities.arrayToPath(nextPathArray);
-                isLastTab     = ( !module.is.tab(nextPath) );
-                if(isLastTab) {
-                  module.verbose('Tab parameters found', nextPathArray);
-                }
-              }
-              if(isLastTab && remoteContent) {
-                if(!shouldIgnoreLoad) {
-                  module.activate.navigation(currentPath);
-                  module.fetch.content(currentPath, tabPath);
-                }
-                else {
-                  module.debug('Ignoring remote content on first tab load', currentPath);
-                  firstLoad = false;
-                  module.cache.add(tabPath, $tab.html());
-                  module.activate.all(currentPath);
-                  settings.onFirstLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-                  settings.onLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-                }
-                return false;
-              }
-              else {
-                module.debug('Opened local tab', currentPath);
-                module.activate.all(currentPath);
-                if( !module.cache.read(currentPath) ) {
-                  module.cache.add(currentPath, true);
-                  module.debug('First time tab loaded calling tab init');
-                  settings.onFirstLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-                }
-                settings.onLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-              }
-
-            }
-            else if(tabPath.search('/') == -1 && tabPath !== '') {
-              // look for in page anchor
-              tabPath = module.escape.string(tabPath);
-              $anchor     = $('#' + tabPath + ', a[name="' + tabPath + '"]');
-              currentPath = $anchor.closest('[data-tab]').data(metadata.tab);
-              $tab        = module.get.tabElement(currentPath);
-              // if anchor exists use parent tab
-              if($anchor && $anchor.length > 0 && currentPath) {
-                module.debug('Anchor link used, opening parent tab', $tab, $anchor);
-                if( !$tab.hasClass(className.active) ) {
-                  setTimeout(function() {
-                    module.scrollTo($anchor);
-                  }, 0);
-                }
-                module.activate.all(currentPath);
-                if( !module.cache.read(currentPath) ) {
-                  module.cache.add(currentPath, true);
-                  module.debug('First time tab loaded calling tab init');
-                  settings.onFirstLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-                }
-                settings.onLoad.call($tab[0], currentPath, parameterArray, historyEvent);
-                return false;
-              }
-            }
-            else {
-              module.error(error.missingTab, $module, $context, currentPath);
-              return false;
-            }
-          });
-        },
-
-        scrollTo: function($element) {
-          var
-            scrollOffset = ($element && $element.length > 0)
-              ? $element.offset().top
-              : false
-          ;
-          if(scrollOffset !== false) {
-            module.debug('Forcing scroll to an in-page link in a hidden tab', scrollOffset, $element);
-            $(document).scrollTop(scrollOffset);
-          }
-        },
-
-        update: {
-          content: function(tabPath, html, evaluateScripts) {
-            var
-              $tab = module.get.tabElement(tabPath),
-              tab  = $tab[0]
-            ;
-            evaluateScripts = (evaluateScripts !== undefined)
-              ? evaluateScripts
-              : settings.evaluateScripts
-            ;
-            if(typeof settings.cacheType == 'string' && settings.cacheType.toLowerCase() == 'dom' && typeof html !== 'string') {
-              $tab
-                .empty()
-                .append($(html).clone(true))
-              ;
-            }
-            else {
-              if(evaluateScripts) {
-                module.debug('Updating HTML and evaluating inline scripts', tabPath, html);
-                $tab.html(html);
-              }
-              else {
-                module.debug('Updating HTML', tabPath, html);
-                tab.innerHTML = html;
-              }
-            }
-          }
-        },
-
-        fetch: {
-
-          content: function(tabPath, fullTabPath) {
-            var
-              $tab        = module.get.tabElement(tabPath),
-              apiSettings = {
-                dataType         : 'html',
-                encodeParameters : false,
-                on               : 'now',
-                cache            : settings.alwaysRefresh,
-                headers          : {
-                  'X-Remote': true
-                },
-                onSuccess : function(response) {
-                  if(settings.cacheType == 'response') {
-                    module.cache.add(fullTabPath, response);
-                  }
-                  module.update.content(tabPath, response);
-                  if(tabPath == activeTabPath) {
-                    module.debug('Content loaded', tabPath);
-                    module.activate.tab(tabPath);
-                  }
-                  else {
-                    module.debug('Content loaded in background', tabPath);
-                  }
-                  settings.onFirstLoad.call($tab[0], tabPath, parameterArray, historyEvent);
-                  settings.onLoad.call($tab[0], tabPath, parameterArray, historyEvent);
-
-                  if(settings.loadOnce) {
-                    module.cache.add(fullTabPath, true);
-                  }
-                  else if(typeof settings.cacheType == 'string' && settings.cacheType.toLowerCase() == 'dom' && $tab.children().length > 0) {
-                    setTimeout(function() {
-                      var
-                        $clone = $tab.children().clone(true)
-                      ;
-                      $clone = $clone.not('script');
-                      module.cache.add(fullTabPath, $clone);
-                    }, 0);
-                  }
-                  else {
-                    module.cache.add(fullTabPath, $tab.html());
-                  }
-                },
-                urlData: {
-                  tab: fullTabPath
-                }
-              },
-              request         = $tab.api('get request') || false,
-              existingRequest = ( request && request.state() === 'pending' ),
-              requestSettings,
-              cachedContent
-            ;
-
-            fullTabPath   = fullTabPath || tabPath;
-            cachedContent = module.cache.read(fullTabPath);
-
-
-            if(settings.cache && cachedContent) {
-              module.activate.tab(tabPath);
-              module.debug('Adding cached content', fullTabPath);
-              if(!settings.loadOnce) {
-                if(settings.evaluateScripts == 'once') {
-                  module.update.content(tabPath, cachedContent, false);
-                }
-                else {
-                  module.update.content(tabPath, cachedContent);
-                }
-              }
-              settings.onLoad.call($tab[0], tabPath, parameterArray, historyEvent);
-            }
-            else if(existingRequest) {
-              module.set.loading(tabPath);
-              module.debug('Content is already loading', fullTabPath);
-            }
-            else if($.api !== undefined) {
-              requestSettings = $.extend(true, {}, settings.apiSettings, apiSettings);
-              module.debug('Retrieving remote content', fullTabPath, requestSettings);
-              module.set.loading(tabPath);
-              $tab.api(requestSettings);
-            }
-            else {
-              module.error(error.api);
-            }
-          }
-        },
-
-        activate: {
-          all: function(tabPath) {
-            module.activate.tab(tabPath);
-            module.activate.navigation(tabPath);
-          },
-          tab: function(tabPath) {
-            var
-              $tab          = module.get.tabElement(tabPath),
-              $deactiveTabs = (settings.deactivate == 'siblings')
-                ? $tab.siblings($tabs)
-                : $tabs.not($tab),
-              isActive      = $tab.hasClass(className.active)
-            ;
-            module.verbose('Showing tab content for', $tab);
-            if(!isActive) {
-              $tab
-                .addClass(className.active)
-              ;
-              $deactiveTabs
-                .removeClass(className.active + ' ' + className.loading)
-              ;
-              if($tab.length > 0) {
-                settings.onVisible.call($tab[0], tabPath);
-              }
-            }
-          },
-          navigation: function(tabPath) {
-            var
-              $navigation         = module.get.navElement(tabPath),
-              $deactiveNavigation = (settings.deactivate == 'siblings')
-                ? $navigation.siblings($allModules)
-                : $allModules.not($navigation),
-              isActive    = $navigation.hasClass(className.active)
-            ;
-            module.verbose('Activating tab navigation for', $navigation, tabPath);
-            if(!isActive) {
-              $navigation
-                .addClass(className.active)
-              ;
-              $deactiveNavigation
-                .removeClass(className.active + ' ' + className.loading)
-              ;
-            }
-          }
-        },
-
-        deactivate: {
-          all: function() {
-            module.deactivate.navigation();
-            module.deactivate.tabs();
-          },
-          navigation: function() {
-            $allModules
-              .removeClass(className.active)
-            ;
-          },
-          tabs: function() {
-            $tabs
-              .removeClass(className.active + ' ' + className.loading)
-            ;
-          }
-        },
-
-        is: {
-          tab: function(tabName) {
-            return (tabName !== undefined)
-              ? ( module.get.tabElement(tabName).length > 0 )
-              : false
-            ;
-          }
-        },
-
-        get: {
-          initialPath: function() {
-            return $allModules.eq(0).data(metadata.tab) || $tabs.eq(0).data(metadata.tab);
-          },
-          path: function() {
-            return $.address.value();
-          },
-          // adds default tabs to tab path
-          defaultPathArray: function(tabPath) {
-            return module.utilities.pathToArray( module.get.defaultPath(tabPath) );
-          },
-          defaultPath: function(tabPath) {
-            var
-              $defaultNav = $allModules.filter('[data-' + metadata.tab + '^="' + module.escape.string(tabPath) + '/"]').eq(0),
-              defaultTab  = $defaultNav.data(metadata.tab) || false
-            ;
-            if( defaultTab ) {
-              module.debug('Found default tab', defaultTab);
-              if(recursionDepth < settings.maxDepth) {
-                recursionDepth++;
-                return module.get.defaultPath(defaultTab);
-              }
-              module.error(error.recursion);
-            }
-            else {
-              module.debug('No default tabs found for', tabPath, $tabs);
-            }
-            recursionDepth = 0;
-            return tabPath;
-          },
-          navElement: function(tabPath) {
-            tabPath = tabPath || activeTabPath;
-            return $allModules.filter('[data-' + metadata.tab + '="' + module.escape.string(tabPath) + '"]');
-          },
-          tabElement: function(tabPath) {
-            var
-              $fullPathTab,
-              $simplePathTab,
-              tabPathArray,
-              lastTab
-            ;
-            tabPath        = tabPath || activeTabPath;
-            tabPathArray   = module.utilities.pathToArray(tabPath);
-            lastTab        = module.utilities.last(tabPathArray);
-            $fullPathTab   = $tabs.filter('[data-' + metadata.tab + '="' + module.escape.string(tabPath) + '"]');
-            $simplePathTab = $tabs.filter('[data-' + metadata.tab + '="' + module.escape.string(lastTab) + '"]');
-            return ($fullPathTab.length > 0)
-              ? $fullPathTab
-              : $simplePathTab
-            ;
-          },
-          tab: function() {
-            return activeTabPath;
-          }
-        },
-
-        determine: {
-          activeTab: function() {
-            var activeTab = null;
-
-            $tabs.each(function(_index, tab) {
-              var $tab = $(tab);
-
-              if( $tab.hasClass(className.active) ) {
-                var
-                  tabPath = $(this).data(metadata.tab),
-                  $anchor = $allModules.filter('[data-' + metadata.tab + '="' + module.escape.string(tabPath) + '"]')
-                ;
-
-                if( $anchor.hasClass(className.active) ) {
-                  activeTab = tabPath;
-                }
-              }
-            });
-
-            return activeTab;
-          }
-        },
-
-        utilities: {
-          filterArray: function(keepArray, removeArray) {
-            return $.grep(keepArray, function(keepValue) {
-              return ( $.inArray(keepValue, removeArray) == -1);
-            });
-          },
-          last: function(array) {
-            return Array.isArray(array)
-              ? array[ array.length - 1]
-              : false
-            ;
-          },
-          pathToArray: function(pathName) {
-            if(pathName === undefined) {
-              pathName = activeTabPath;
-            }
-            return typeof pathName == 'string'
-              ? pathName.split('/')
-              : [pathName]
-            ;
-          },
-          arrayToPath: function(pathArray) {
-            return Array.isArray(pathArray)
-              ? pathArray.join('/')
-              : false
-            ;
-          }
-        },
-
-        setting: function(name, value) {
-          module.debug('Changing setting', name, value);
-          if( $.isPlainObject(name) ) {
-            $.extend(true, settings, name);
-          }
-          else if(value !== undefined) {
-            if($.isPlainObject(settings[name])) {
-              $.extend(true, settings[name], value);
-            }
-            else {
-              settings[name] = value;
-            }
-          }
-          else {
-            return settings[name];
-          }
-        },
-        internal: function(name, value) {
-          if( $.isPlainObject(name) ) {
-            $.extend(true, module, name);
-          }
-          else if(value !== undefined) {
-            module[name] = value;
-          }
-          else {
-            return module[name];
-          }
-        },
-        debug: function() {
-          if(!settings.silent && settings.debug) {
-            if(settings.performance) {
-              module.performance.log(arguments);
-            }
-            else {
-              module.debug = Function.prototype.bind.call(console.info, console, settings.name + ':');
-              module.debug.apply(console, arguments);
-            }
-          }
-        },
-        verbose: function() {
-          if(!settings.silent && settings.verbose && settings.debug) {
-            if(settings.performance) {
-              module.performance.log(arguments);
-            }
-            else {
-              module.verbose = Function.prototype.bind.call(console.info, console, settings.name + ':');
-              module.verbose.apply(console, arguments);
-            }
-          }
-        },
-        error: function() {
-          if(!settings.silent) {
-            module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
-            module.error.apply(console, arguments);
-          }
-        },
-        performance: {
-          log: function(message) {
-            var
-              currentTime,
-              executionTime,
-              previousTime
-            ;
-            if(settings.performance) {
-              currentTime   = new Date().getTime();
-              previousTime  = time || currentTime;
-              executionTime = currentTime - previousTime;
-              time          = currentTime;
-              performance.push({
-                'Name'           : message[0],
-                'Arguments'      : [].slice.call(message, 1) || '',
-                'Element'        : element,
-                'Execution Time' : executionTime
-              });
-            }
-            clearTimeout(module.performance.timer);
-            module.performance.timer = setTimeout(module.performance.display, 500);
-          },
-          display: function() {
-            var
-              title = settings.name + ':',
-              totalTime = 0
-            ;
-            time = false;
-            clearTimeout(module.performance.timer);
-            $.each(performance, function(index, data) {
-              totalTime += data['Execution Time'];
-            });
-            title += ' ' + totalTime + 'ms';
-            if(moduleSelector) {
-              title += ' \'' + moduleSelector + '\'';
-            }
-            if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
-              console.groupCollapsed(title);
-              if(console.table) {
-                console.table(performance);
-              }
-              else {
-                $.each(performance, function(index, data) {
-                  console.log(data['Name'] + ': ' + data['Execution Time']+'ms');
-                });
-              }
-              console.groupEnd();
-            }
-            performance = [];
-          }
-        },
-        invoke: function(query, passedArguments, context) {
-          var
-            object = instance,
-            maxDepth,
-            found,
-            response
-          ;
-          passedArguments = passedArguments || queryArguments;
-          context         = element         || context;
-          if(typeof query == 'string' && object !== undefined) {
-            query    = query.split(/[\. ]/);
-            maxDepth = query.length - 1;
-            $.each(query, function(depth, value) {
-              var camelCaseValue = (depth != maxDepth)
-                ? value + query[depth + 1].charAt(0).toUpperCase() + query[depth + 1].slice(1)
-                : query
-              ;
-              if( $.isPlainObject( object[camelCaseValue] ) && (depth != maxDepth) ) {
-                object = object[camelCaseValue];
-              }
-              else if( object[camelCaseValue] !== undefined ) {
-                found = object[camelCaseValue];
-                return false;
-              }
-              else if( $.isPlainObject( object[value] ) && (depth != maxDepth) ) {
-                object = object[value];
-              }
-              else if( object[value] !== undefined ) {
-                found = object[value];
-                return false;
-              }
-              else {
-                module.error(error.method, query);
-                return false;
-              }
-            });
-          }
-          if ( $.isFunction( found ) ) {
-            response = found.apply(context, passedArguments);
-          }
-          else if(found !== undefined) {
-            response = found;
-          }
-          if(Array.isArray(returnedValue)) {
-            returnedValue.push(response);
-          }
-          else if(returnedValue !== undefined) {
-            returnedValue = [returnedValue, response];
-          }
-          else if(response !== undefined) {
-            returnedValue = response;
-          }
-          return found;
-        }
-      };
-      if(methodInvoked) {
-        if(instance === undefined) {
-          module.initialize();
-        }
-        module.invoke(query);
-      }
-      else {
-        if(instance !== undefined) {
-          instance.invoke('destroy');
-        }
-        module.initialize();
-      }
-    })
-  ;
-  return (returnedValue !== undefined)
-    ? returnedValue
-    : this
-  ;
-
-};
-
-// shortcut for tabbed content with no defined navigation
-$.tab = function() {
-  $(window).tab.apply(this, arguments);
-};
-
-$.fn.tab.settings = {
-
-  name            : 'Tab',
-  namespace       : 'tab',
-
-  silent          : false,
-  debug           : false,
-  verbose         : false,
-  performance     : true,
-
-  auto            : false,      // uses pjax style endpoints fetching content from same url with remote-content headers
-  history         : false,      // use browser history
-  historyType     : 'hash',     // #/ or html5 state
-  path            : false,      // base path of url
-
-  context         : false,      // specify a context that tabs must appear inside
-  childrenOnly    : false,      // use only tabs that are children of context
-  maxDepth        : 25,         // max depth a tab can be nested
-
-  deactivate      : 'siblings', // whether tabs should deactivate sibling menu elements or all elements initialized together
-
-  alwaysRefresh   : false,      // load tab content new every tab click
-  cache           : true,       // cache the content requests to pull locally
-  loadOnce        : false,      // Whether tab data should only be loaded once when using remote content
-  cacheType       : 'response', // Whether to cache exact response, or to html cache contents after scripts execute
-  ignoreFirstLoad : false,      // don't load remote content on first load
-
-  apiSettings     : false,      // settings for api call
-  evaluateScripts : 'once',     // whether inline scripts should be parsed (true/false/once). Once will not re-evaluate on cached content
-  autoTabActivation: true,      // whether a non existing active tab will auto activate the first available tab
-
-  onFirstLoad : function(tabPath, parameterArray, historyEvent) {}, // called first time loaded
-  onLoad      : function(tabPath, parameterArray, historyEvent) {}, // called on every load
-  onVisible   : function(tabPath, parameterArray, historyEvent) {}, // called every time tab visible
-  onRequest   : function(tabPath, parameterArray, historyEvent) {}, // called ever time a tab beings loading remote content
-
-  templates : {
-    determineTitle: function(tabArray) {} // returns page title for path
-  },
-
-  error: {
-    api        : 'You attempted to load content without API module',
-    method     : 'The method you called is not defined',
-    missingTab : 'Activated tab cannot be found. Tabs are case-sensitive.',
-    noContent  : 'The tab you specified is missing a content url.',
-    path       : 'History enabled, but no path was specified',
-    recursion  : 'Max recursive depth reached',
-    legacyInit : 'onTabInit has been renamed to onFirstLoad in 2.0, please adjust your code.',
-    legacyLoad : 'onTabLoad has been renamed to onLoad in 2.0. Please adjust your code',
-    state      : 'History requires Asual\'s Address library <https://github.com/asual/jquery-address>'
-  },
-
-  regExp : {
-    escape   : /[-[\]{}()*+?.,\\^$|#\s:=@]/g
-  },
-
-  metadata : {
-    tab    : 'tab',
-    loaded : 'loaded',
-    promise: 'promise'
-  },
-
-  className   : {
-    loading : 'loading',
-    active  : 'active'
-  },
-
-  selector    : {
-    tabs : '.ui.tab',
-    ui   : '.ui'
-  }
-
-};
-
-})( jQuery, window, document );
diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json
index f3fb7fc8a8..49fe27eead 100644
--- a/web_src/fomantic/package-lock.json
+++ b/web_src/fomantic/package-lock.json
@@ -44,9 +44,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
+      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -132,106 +132,106 @@
       }
     },
     "node_modules/@octokit/core": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.4.tgz",
-      "integrity": "sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-7.0.3.tgz",
+      "integrity": "sha512-oNXsh2ywth5aowwIa7RKtawnkdH6LgU1ztfP9AIUCQCvzysB+WeU8o2kyyosDPwBZutPpjZDKPQGIzzrfTWweQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.1.2",
-        "@octokit/request": "^9.2.1",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "before-after-hook": "^3.0.2",
+        "@octokit/auth-token": "^6.0.0",
+        "@octokit/graphql": "^9.0.1",
+        "@octokit/request": "^10.0.2",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "before-after-hook": "^4.0.0",
         "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
+      "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==",
       "license": "MIT",
       "peer": true,
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/endpoint": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz",
-      "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.0.tgz",
+      "integrity": "sha512-hoYicJZaqISMAI3JfaDr1qMNi48OctWuOih1m80bkYow/ayPw6Jj52tqWJ6GEoFTk1gBqfanSoI1iY99Z5+ekQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/types": "^13.6.2",
+        "@octokit/types": "^14.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "version": "25.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
+      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
       "license": "MIT",
       "peer": true
     },
     "node_modules/@octokit/core/node_modules/@octokit/request": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.2.tgz",
-      "integrity": "sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.3.tgz",
+      "integrity": "sha512-V6jhKokg35vk098iBqp2FBKunk3kMTXlmq+PtbV9Gl3TfskWlebSofU9uunVKhUN7xl+0+i5vt0TGTG8/p/7HA==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/endpoint": "^10.1.3",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "fast-content-type-parse": "^2.0.0",
+        "@octokit/endpoint": "^11.0.0",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "fast-content-type-parse": "^3.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/request-error": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz",
-      "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.0.0.tgz",
+      "integrity": "sha512-KRA7VTGdVyJlh0cP5Tf94hTiYVVqmt2f3I6mnimmaVz4UG3gQV/k4mDJlJv3X67iX6rmN7gSHCF8ssqeMnmhZg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/types": "^13.6.2"
+        "@octokit/types": "^14.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/core/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
+      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
+        "@octokit/openapi-types": "^25.1.0"
       }
     },
     "node_modules/@octokit/core/node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz",
+      "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==",
       "license": "Apache-2.0",
       "peer": true
     },
     "node_modules/@octokit/core/node_modules/universal-user-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
-      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
       "license": "ISC",
       "peer": true
     },
@@ -253,85 +253,85 @@
       "license": "ISC"
     },
     "node_modules/@octokit/graphql": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.1.tgz",
-      "integrity": "sha512-n57hXtOoHrhwTWdvhVkdJHdhTv0JstjDbDRhJfwIRNfFqmSo1DaK/mD2syoNUoLCyqSjBpGAKOG0BuwF392slw==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.1.tgz",
+      "integrity": "sha512-j1nQNU1ZxNFx2ZtKmL4sMrs4egy5h65OMDmSbVyuCzjOcwsHq6EaYjOTGXPQxgfiN8dJ4CriYHk6zF050WEULg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/request": "^9.2.2",
-        "@octokit/types": "^13.8.0",
+        "@octokit/request": "^10.0.2",
+        "@octokit/types": "^14.0.0",
         "universal-user-agent": "^7.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/endpoint": {
-      "version": "10.1.3",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.3.tgz",
-      "integrity": "sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.0.tgz",
+      "integrity": "sha512-hoYicJZaqISMAI3JfaDr1qMNi48OctWuOih1m80bkYow/ayPw6Jj52tqWJ6GEoFTk1gBqfanSoI1iY99Z5+ekQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/types": "^13.6.2",
+        "@octokit/types": "^14.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "version": "25.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
+      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
       "license": "MIT",
       "peer": true
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/request": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.2.tgz",
-      "integrity": "sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==",
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.3.tgz",
+      "integrity": "sha512-V6jhKokg35vk098iBqp2FBKunk3kMTXlmq+PtbV9Gl3TfskWlebSofU9uunVKhUN7xl+0+i5vt0TGTG8/p/7HA==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/endpoint": "^10.1.3",
-        "@octokit/request-error": "^6.1.7",
-        "@octokit/types": "^13.6.2",
-        "fast-content-type-parse": "^2.0.0",
+        "@octokit/endpoint": "^11.0.0",
+        "@octokit/request-error": "^7.0.0",
+        "@octokit/types": "^14.0.0",
+        "fast-content-type-parse": "^3.0.0",
         "universal-user-agent": "^7.0.2"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/request-error": {
-      "version": "6.1.7",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.7.tgz",
-      "integrity": "sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.0.0.tgz",
+      "integrity": "sha512-KRA7VTGdVyJlh0cP5Tf94hTiYVVqmt2f3I6mnimmaVz4UG3gQV/k4mDJlJv3X67iX6rmN7gSHCF8ssqeMnmhZg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/types": "^13.6.2"
+        "@octokit/types": "^14.0.0"
       },
       "engines": {
-        "node": ">= 18"
+        "node": ">= 20"
       }
     },
     "node_modules/@octokit/graphql/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
+      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
+        "@octokit/openapi-types": "^25.1.0"
       }
     },
     "node_modules/@octokit/graphql/node_modules/universal-user-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
-      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
+      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
       "license": "ISC",
       "peer": true
     },
@@ -494,12 +494,12 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.13.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.11.tgz",
-      "integrity": "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g==",
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
+      "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.20.0"
+        "undici-types": "~7.10.0"
       }
     },
     "node_modules/@types/vinyl": {
@@ -1086,9 +1086,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
@@ -1117,9 +1117,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.25.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
+      "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
       "funding": [
         {
           "type": "opencollective",
@@ -1136,10 +1136,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
+        "caniuse-lite": "^1.0.30001733",
+        "electron-to-chromium": "^1.5.199",
         "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "update-browserslist-db": "^1.1.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1249,9 +1249,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001707",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz",
-      "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==",
+      "version": "1.0.30001735",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001735.tgz",
+      "integrity": "sha512-EV/laoX7Wq2J9TQlyIXRxTJqIw4sxfXS4OYgudGxBYRuTv0q7AM6yMEpU/Vo1I94thg9U6EZ2NfZx9GJq83u7w==",
       "funding": [
         {
           "type": "opencollective",
@@ -1969,9 +1969,9 @@
       }
     },
     "node_modules/editorconfig/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -1993,9 +1993,9 @@
       }
     },
     "node_modules/editorconfig/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -2005,9 +2005,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.123",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.123.tgz",
-      "integrity": "sha512-refir3NlutEZqlKaBLK0tzlVLe5P2wDKS7UQt/3SpibizgsRAPOsqQC3ffw1nlv3ze5gjRQZYHoPymgVZkplFA==",
+      "version": "1.5.203",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz",
+      "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -2017,9 +2017,9 @@
       "license": "MIT"
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
@@ -2333,9 +2333,9 @@
       }
     },
     "node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-3.0.0.tgz",
+      "integrity": "sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==",
       "funding": [
         {
           "type": "github",
@@ -2787,9 +2787,9 @@
       }
     },
     "node_modules/get-stream/node_modules/pump": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -4638,12 +4638,12 @@
       }
     },
     "node_modules/is": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-      "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/is/-/is-3.3.2.tgz",
+      "integrity": "sha512-a2xr4E3s1PjDS8ORcGgXpWx6V+liNs+O3JRD2mb9aeugD7rtkkZ0zgLdYgw0tWsKhsdiezGYptSiMlVazCBTuQ==",
       "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 0.4"
       }
     },
     "node_modules/is-absolute": {
@@ -5019,9 +5019,9 @@
       }
     },
     "node_modules/js-beautify/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
@@ -5850,9 +5850,9 @@
       "license": "ISC"
     },
     "node_modules/nan": {
-      "version": "2.22.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
-      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz",
+      "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==",
       "license": "MIT",
       "optional": true
     },
@@ -7509,9 +7509,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.21",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
       "license": "CC0-1.0"
     },
     "node_modules/split-string": {
@@ -8226,9 +8226,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "6.20.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
-      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "version": "7.10.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
+      "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
       "license": "MIT"
     },
     "node_modules/union-value": {
diff --git a/web_src/fomantic/semantic.json b/web_src/fomantic/semantic.json
index 5db57bc8d4..14afba2193 100644
--- a/web_src/fomantic/semantic.json
+++ b/web_src/fomantic/semantic.json
@@ -23,12 +23,10 @@
   "components": [
     "api",
     "button",
-    "dimmer",
     "dropdown",
     "form",
     "menu",
     "modal",
-    "search",
-    "tab"
+    "search"
   ]
 }
diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue
index 4b48376088..e8c1b76a7f 100644
--- a/web_src/js/components/DashboardRepoList.vue
+++ b/web_src/js/components/DashboardRepoList.vue
@@ -340,10 +340,10 @@ export default sfc; // activate the IDE's Vue plugin
       <a :class="{item: true, active: tab === 'organizations'}" @click="changeTab('organizations')">{{ textMyOrgs }} <span class="ui grey label tw-ml-2">{{ organizationsTotalCount }}</span></a>
     </div>
     <div v-show="tab === 'repos'" class="ui tab active list dashboard-repos">
-      <h4 v-if="isOrganization" class="ui top attached tw-mt-4 tw-flex tw-items-center">
-        <div class="tw-flex-1 tw-flex tw-items-center">
+      <h4 v-if="isOrganization" class="tw-mt-4 tw-flex tw-items-center">
+        <div class="tw-flex-1 tw-flex tw-gap-2 tw-items-center">
           {{ textMyRepos }}
-          <span class="ui grey label tw-ml-2">{{ reposTotalCount }}</span>
+          <span class="ui grey label">{{ reposTotalCount }}</span>
         </div>
       </h4>
       <div class="ui top attached segment repos-search">
@@ -411,7 +411,7 @@ export default sfc; // activate the IDE's Vue plugin
                 <svg-icon name="octicon-archive" :size="16"/>
               </div>
             </a>
-            <a class="tw-flex tw-items-center" v-if="repo.latest_commit_status" :href="repo.latest_commit_status.TargetURL" :data-tooltip-content="repo.locale_latest_commit_status">
+            <a class="tw-flex tw-items-center" v-if="repo.latest_commit_status" :href="repo.latest_commit_status.TargetURL || null" :data-tooltip-content="repo.locale_latest_commit_status">
               <!-- the commit status icon logic is taken from templates/repo/commit_status.tmpl -->
               <svg-icon :name="statusIcon(repo.latest_commit_status.State)" :class="'tw-ml-2 commit-status icon text ' + statusColor(repo.latest_commit_status.State)" :size="16"/>
             </a>
@@ -457,7 +457,7 @@ export default sfc; // activate the IDE's Vue plugin
               <svg-icon name="octicon-organization" :size="16" class="repo-list-icon"/>
               <div class="text truncate">{{ org.name }}</div>
               <div><!-- div to prevent underline of label on hover -->
-                <span class="ui tiny basic label" v-if="org.org_visibility !== 'public'">
+                <span class="ui label" v-if="org.org_visibility !== 'public'">
                   {{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }}
                 </span>
               </div>
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 75afd708ef..4d34960e46 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -208,8 +208,7 @@ const sfc = {
           el.append(logLine);
 
           const list = document.createElement('div');
-          list.classList.add('job-log-list');
-          list.classList.add('hidden');
+          list.classList.add('job-log-list', 'hidden');
           list.setAttribute('data-group', group.index);
           groupStack.push(list);
           el.append(list);
@@ -419,7 +418,7 @@ export function initRepositoryActionView() {
 }
 </script>
 <template>
-  <div class="ui container action-view-container">
+  <div class="ui container fluid padded action-view-container">
     <div class="action-view-header">
       <div class="action-info-summary">
         <div class="action-info-summary-title">
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 881c7c09ea..81b1244328 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -98,14 +98,14 @@ const sfc = {
           $(`#${this.branchForm} input[name="refType"]`).val('branch');
         }
         if (this.submitForm) {
-          $(`#${this.branchForm}`).trigger('submit');
+          document.getElementById(this.branchForm).requestSubmit();
         }
         this.menuVisible = false;
       }
     },
     createNewBranch() {
       if (!this.showCreateNewBranch) return;
-      $(this.$refs.newBranchForm).trigger('submit');
+      this.$refs.newBranchForm.requestSubmit();
     },
     focusSearchField() {
       nextTick(() => {
diff --git a/web_src/js/components/RepoContributors.test.js b/web_src/js/components/RepoContributors.test.js
new file mode 100644
index 0000000000..d97a862d2d
--- /dev/null
+++ b/web_src/js/components/RepoContributors.test.js
@@ -0,0 +1,76 @@
+import {flushPromises, mount} from '@vue/test-utils';
+import RepoContributors from './RepoContributors.vue';
+
+test('has commits from before 2001', async () => {
+  vi.spyOn(global, 'fetch').mockResolvedValue({
+    json: vi.fn().mockResolvedValue({
+      'daniel@haxx.se': {
+        name: 'Daniel Stenberg',
+        total_commits: 13,
+        weeks: {
+          1754179200000: {
+            week: 1754179200000,
+            additions: 4330,
+            deletions: 47,
+            commits: 10,
+          },
+          946166400000: {
+            week: 946166400000,
+            additions: 37273,
+            deletions: 0,
+            commits: 1,
+          },
+        },
+      },
+      total: {
+        name: 'Total',
+        total_commits: 11,
+        weeks: {
+          1754179200000: {
+            week: 1754179200000,
+            additions: 4330,
+            deletions: 47,
+            commits: 10,
+          },
+          946166400000: {
+            week: 946166400000,
+            additions: 37273,
+            deletions: 0,
+            commits: 1,
+          },
+        },
+      },
+    }),
+    ok: true,
+  });
+
+  const repoContributorsGraph = mount(RepoContributors, {
+    global: {
+      stubs: {
+        'relative-time': {
+          template: '<span>relative time</span>',
+        },
+      },
+    },
+    props: {
+      repoLink: '',
+      repoDefaultBranchName: '',
+      locale: {
+        filterLabel: '',
+        contributionType: {
+          commits: '',
+          additions: '',
+          deletions: '',
+        },
+
+        loadingTitle: '',
+        loadingTitleFailed: '',
+        loadingInfo: '',
+      },
+    },
+  });
+  await flushPromises();
+
+  expect(repoContributorsGraph.componentVM.xAxisStart).toBe(946166400000);
+  expect(repoContributorsGraph.componentVM.contributorsStats['daniel@haxx.se'].weeks[0].week).toBe(946166400000);
+});
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 07ad336cf7..4b15c3714b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -125,7 +125,7 @@ export default {
           const data = await response.json();
           const {total, ...rest} = data;
           // below line might be deleted if we are sure go produces map always sorted by keys
-          total.weeks = Object.fromEntries(Object.entries(total.weeks).sort());
+          total.weeks = Object.fromEntries(Object.entries(total.weeks).map((x) => [parseInt(x[0]), x[1]]).sort((a, b) => a[0] - b[0]));
 
           const weekValues = Object.values(total.weeks);
           this.xAxisStart = weekValues[0].week;
@@ -391,7 +391,7 @@ export default {
         <div class="ui top attached header tw-flex tw-flex-1">
           <b class="ui right">#{{ index + 1 }}</b>
           <a :href="contributor.home_link">
-            <img class="ui avatar tw-align-middle" height="40" width="40" :src="contributor.avatar_link" alt="">
+            <img class="ui avatar tw-align-middle" height="40" width="40" :src="contributor.avatar_link" alt="" loading="lazy">
           </a>
           <div class="tw-ml-2">
             <a v-if="contributor.home_link !== ''" :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js
index 9934c3dd17..76cf4e57f7 100644
--- a/web_src/js/features/admin/common.js
+++ b/web_src/js/features/admin/common.js
@@ -175,7 +175,7 @@ export function initAdminCommon() {
         onUsePagedSearchChange();
       }
     });
-    $('#auth_type').trigger('change');
+    document.getElementById('auth_type').dispatchEvent(new Event('change'));
     document.getElementById('security_protocol')?.addEventListener('change', onSecurityProtocolChange);
     document.getElementById('use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
     document.getElementById('oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
@@ -199,11 +199,13 @@ export function initAdminCommon() {
     }
   }
 
-  if (document.querySelector('.admin.authentication')) {
-    $('#auth_name').on('input', function () {
+  if (document.querySelector('.admin.edit.authentication, .admin.new.authentication')) {
+    const authNameEl = document.getElementById('auth_name');
+    authNameEl.addEventListener('input', (el) => {
       // appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash.
-      document.getElementById('oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(this.value)}/callback`;
-    }).trigger('input');
+      document.getElementById('oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(el.target.value)}/callback`;
+    });
+    authNameEl.dispatchEvent(new Event('input'));
   }
 
   // Notice
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index 7848a14b66..a6c2829b53 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -12,6 +12,7 @@ import {confirmModal} from './comp/ConfirmModal.js';
 import {showErrorToast} from '../modules/toast.js';
 import {request, POST, GET} from '../modules/fetch.js';
 import '../htmx.js';
+import {initTab} from '../modules/tab.ts';
 
 const {appUrl, appSubUrl, csrfToken, i18n} = window.config;
 
@@ -57,7 +58,7 @@ export function initGlobalEnterQuickSubmit() {
 export function initGlobalButtonClickOnEnter() {
   $(document).on('keypress', 'div.ui.button,span.ui.button', (e) => {
     if (e.code === ' ' || e.code === 'Enter') {
-      $(e.target).trigger('click');
+      e.target.click();
       e.preventDefault();
     }
   });
@@ -195,7 +196,9 @@ export function initGlobalCommon() {
   $uiDropdowns.filter('.upward').dropdown('setting', 'direction', 'upward');
   $uiDropdowns.filter('.downward').dropdown('setting', 'direction', 'downward');
 
-  $('.tabular.menu .item').tab();
+  for (const el of document.querySelectorAll('.tabular.menu')) {
+    initTab(el);
+  }
 
   initSubmitEventPolyfill();
   document.addEventListener('submit', formFetchAction);
@@ -208,59 +211,128 @@ export function initGlobalDropzone() {
   }
 }
 
-export function initDropzone(el) {
-  const $dropzone = $(el);
-  const _promise = createDropzone(el, {
-    url: $dropzone.data('upload-url'),
+export async function initDropzone(dropzoneEl, zone = undefined) {
+  if (!dropzoneEl) return;
+
+  let disableRemovedfileEvent = false; // when resetting the dropzone (removeAllFiles), disable the "removedfile" event
+  let fileUuidDict = {}; // to record: if a comment has been saved, then the uploaded files won't be deleted from server when clicking the Remove in the dropzone
+
+  const initFilePreview = (file, data, isReload = false) => {
+    file.uuid = data.uuid;
+    fileUuidDict[file.uuid] = {submitted: isReload};
+    const input = document.createElement('input');
+    input.id = data.uuid;
+    input.name = 'files';
+    input.type = 'hidden';
+    input.value = data.uuid;
+    dropzoneEl.querySelector('.files').append(input);
+
+    // Create a "Copy Link" element, to conveniently copy the image
+    // or file link as Markdown to the clipboard
+    const copyLinkElement = document.createElement('div');
+    copyLinkElement.className = 'tw-text-center';
+    // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone
+    copyLinkElement.innerHTML = `<a href="#" style="cursor: pointer;">${svg('octicon-copy', 14, 'copy link')} Copy link</a>`;
+    copyLinkElement.addEventListener('click', async (e) => {
+      e.preventDefault();
+      const name = file.name.slice(0, file.name.lastIndexOf('.'));
+      let fileMarkdown = `[${name}](/attachments/${file.uuid})`;
+      if (file.type.startsWith('image/')) {
+        fileMarkdown = `!${fileMarkdown}`;
+      } else if (file.type.startsWith('video/')) {
+        fileMarkdown = `<video src="/attachments/${file.uuid}" title="${htmlEscape(name)}" controls></video>`;
+      }
+      const success = await clippie(fileMarkdown);
+      showTemporaryTooltip(e.target, success ? i18n.copy_success : i18n.copy_error);
+    });
+    file.previewTemplate.append(copyLinkElement);
+  };
+  const updateDropzoneState = () => {
+    if (dropzoneEl.querySelector('.dz-preview')) {
+      dropzoneEl.classList.add('dz-started');
+    } else {
+      dropzoneEl.classList.remove('dz-started');
+    }
+  };
+
+  const dz = await createDropzone(dropzoneEl, {
+    url: dropzoneEl.getAttribute('data-upload-url'),
     headers: {'X-Csrf-Token': csrfToken},
-    maxFiles: $dropzone.data('max-file'),
-    maxFilesize: $dropzone.data('max-size'),
-    acceptedFiles: (['*/*', ''].includes($dropzone.data('accepts'))) ? null : $dropzone.data('accepts'),
+    maxFiles: dropzoneEl.getAttribute('data-max-file'),
+    maxFilesize: dropzoneEl.getAttribute('data-max-size'),
+    acceptedFiles: (['*/*', ''].includes(dropzoneEl.getAttribute('data-accepts')) ? null : dropzoneEl.getAttribute('data-accepts')),
     addRemoveLinks: true,
-    dictDefaultMessage: $dropzone.data('default-message'),
-    dictInvalidFileType: $dropzone.data('invalid-input-type'),
-    dictFileTooBig: $dropzone.data('file-too-big'),
-    dictRemoveFile: $dropzone.data('remove-file'),
+    dictDefaultMessage: dropzoneEl.getAttribute('data-default-message'),
+    dictInvalidFileType: dropzoneEl.getAttribute('data-invalid-input-type'),
+    dictFileTooBig: dropzoneEl.getAttribute('data-file-too-big'),
+    dictRemoveFile: dropzoneEl.getAttribute('data-remove-file'),
     timeout: 0,
     thumbnailMethod: 'contain',
     thumbnailWidth: 480,
     thumbnailHeight: 480,
     init() {
-      this.on('success', (file, data) => {
-        file.uuid = data.uuid;
-        const $input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
-        $dropzone.find('.files').append($input);
-        // Create a "Copy Link" element, to conveniently copy the image
-        // or file link as Markdown to the clipboard
-        const copyLinkElement = document.createElement('div');
-        copyLinkElement.className = 'tw-text-center';
-        // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone
-        copyLinkElement.innerHTML = `<a href="#" style="cursor: pointer;">${svg('octicon-copy', 14, 'copy link')} Copy link</a>`;
-        copyLinkElement.addEventListener('click', async (e) => {
-          e.preventDefault();
-          let fileMarkdown = `[${file.name}](/attachments/${file.uuid})`;
-          if (file.type.startsWith('image/')) {
-            fileMarkdown = `!${fileMarkdown}`;
-          } else if (file.type.startsWith('video/')) {
-            fileMarkdown = `<video src="/attachments/${file.uuid}" title="${htmlEscape(file.name)}" controls></video>`;
+      this.on('success', initFilePreview);
+      this.on('removedfile', async (file) => {
+        document.getElementById(file.uuid)?.remove();
+        if (disableRemovedfileEvent) return;
+        if (dropzoneEl.getAttribute('data-remove-url') && !fileUuidDict[file.uuid].submitted) {
+          try {
+            await POST(dropzoneEl.getAttribute('data-remove-url'), {data: new URLSearchParams({file: file.uuid})});
+          } catch (error) {
+            console.error(error);
           }
-          const success = await clippie(fileMarkdown);
-          showTemporaryTooltip(e.target, success ? i18n.copy_success : i18n.copy_error);
-        });
-        file.previewTemplate.append(copyLinkElement);
-      });
-      this.on('removedfile', (file) => {
-        $(`#${file.uuid}`).remove();
-        if ($dropzone.data('remove-url')) {
-          POST($dropzone.data('remove-url'), {
-            data: new URLSearchParams({file: file.uuid}),
-          });
         }
+        updateDropzoneState();
       });
       this.on('error', function (file, message) {
         showErrorToast(message);
         this.removeFile(file);
       });
+      this.on('reload', async () => {
+        if (!zone || !dz.removeAllFiles) return;
+        try {
+          const response = await GET(zone.getAttribute('data-attachment-url'));
+          const data = await response.json();
+          // do not trigger the "removedfile" event, otherwise the attachments would be deleted from server
+          disableRemovedfileEvent = true;
+          dz.removeAllFiles(true);
+          dropzoneEl.querySelector('.files').innerHTML = '';
+          for (const element of dropzoneEl.querySelectorAll('.dz-preview')) element.remove();
+          fileUuidDict = {};
+          disableRemovedfileEvent = false;
+
+          for (const attachment of data) {
+            attachment.type = attachment.mime_type;
+            dz.emit('addedfile', attachment);
+            dz.emit('complete', attachment);
+            if (attachment.type.startsWith('image/')) {
+              const imgSrc = `${dropzoneEl.getAttribute('data-link-url')}/${attachment.uuid}`;
+              dz.emit('thumbnail', attachment, imgSrc);
+            }
+            initFilePreview(attachment, {uuid: attachment.uuid}, true);
+            fileUuidDict[attachment.uuid] = {submitted: true};
+          }
+        } catch (error) {
+          console.error(error);
+        }
+        updateDropzoneState();
+      });
+      this.on('create-thumbnail', (attachment, file) => {
+        if (attachment.type && /image.*/.test(attachment.type)) {
+          // When a new issue is created, a thumbnail cannot be fetch, so we need to create it locally.
+          // The implementation is took from the dropzone library (`dropzone.js` > `_processThumbnailQueue()`)
+          dz.createThumbnail(
+            file,
+            dz.options.thumbnailWidth,
+            dz.options.thumbnailHeight,
+            dz.options.thumbnailMethod,
+            true,
+            (dataUrl) => {
+              dz.emit('thumbnail', attachment, dataUrl);
+            },
+          );
+        }
+      });
     },
   });
 }
@@ -297,12 +369,13 @@ export function initGlobalLinkActions() {
     e.preventDefault();
     const $this = $(this || e.target);
     const dataArray = $this.data();
-    let filter = '';
-    if ($this[0].getAttribute('data-modal-id')) {
-      filter += `#${$this[0].getAttribute('data-modal-id')}`;
+
+    const modalID = $this[0].getAttribute('data-modal-id');
+    if (!modalID) {
+      throw new Error('This button does not specify which modal it wants to open.');
     }
 
-    const $dialog = $(`.delete.modal${filter}`);
+    const $dialog = $(`#${modalID}`);
     $dialog.find('.name').text($this.data('name'));
     for (const [key, value] of Object.entries(dataArray)) {
       if (key && key.startsWith('data')) {
@@ -314,7 +387,7 @@ export function initGlobalLinkActions() {
       closable: false,
       onApprove: async () => {
         if ($this.data('type') === 'form') {
-          $($this.data('form')).trigger('submit');
+          document.querySelector($this.data('form')).requestSubmit();
           return;
         }
         if ($this[0].getAttribute('hx-confirm')) {
diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js
index efd068f354..d96628c644 100644
--- a/web_src/js/features/comp/ComboMarkdownEditor.js
+++ b/web_src/js/features/comp/ComboMarkdownEditor.js
@@ -2,16 +2,15 @@ import '@github/markdown-toolbar-element';
 import '@github/text-expander-element';
 import $ from 'jquery';
 import {attachTribute} from '../tribute.js';
-import {hideElem, showElem, autosize, isElemVisible, replaceTextareaSelection} from '../../utils/dom.js';
+import {autosize, hideElem, isElemVisible, replaceTextareaSelection, showElem} from '../../utils/dom.js';
 import {initEasyMDEPaste, initTextareaPaste} from './Paste.js';
 import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
 import {renderPreviewPanelContent} from '../repo-editor.js';
 import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js';
 import {initTextExpander} from './TextExpander.js';
-import {showErrorToast} from '../../modules/toast.js';
+import {showErrorToast, showHintToast} from '../../modules/toast.js';
 import {POST} from '../../modules/fetch.js';
-
-let elementIdCounter = 0;
+import {initTab} from '../../modules/tab.ts';
 
 /**
  * validate if the given textarea is non-empty.
@@ -35,11 +34,17 @@ export function validateTextareaNonEmpty(textarea) {
   return true;
 }
 
+// Matches the beginning of a line containing leading whitespace and possibly valid list or block quote prefix
+const listPrefixRegex = /^\s*((\d+)[.)]\s|[-*+]\s{1,4}\[[ x]\]\s?|[-*+]\s|(>\s?)+)?/;
+
 class ComboMarkdownEditor {
+  static idSuffixCounter = 0;
+
   constructor(container, options = {}) {
     container._giteaComboMarkdownEditor = this;
     this.options = options;
     this.container = container;
+    this.elementIdSuffix = ComboMarkdownEditor.idSuffixCounter++;
   }
 
   async init() {
@@ -52,8 +57,6 @@ class ComboMarkdownEditor {
     this.setupLinkInserter();
 
     await this.switchToUserPreference();
-
-    elementIdCounter++;
   }
 
   applyEditorHeights(el, heights) {
@@ -71,7 +74,7 @@ class ComboMarkdownEditor {
   setupTextarea() {
     this.textarea = this.container.querySelector('.markdown-text-editor');
     this.textarea._giteaComboMarkdownEditor = this;
-    this.textarea.id = `_combo_markdown_editor_${elementIdCounter}`;
+    this.textarea.id = `_combo_markdown_editor_${this.elementIdSuffix}`;
     this.textarea.addEventListener('input', (e) => this.options?.onContentChanged?.(this, e));
     this.applyEditorHeights(this.textarea, this.options.editorHeights);
 
@@ -88,24 +91,62 @@ class ComboMarkdownEditor {
       if (el.nodeName === 'BUTTON' && !el.getAttribute('type')) el.setAttribute('type', 'button');
     }
     this.textareaMarkdownToolbar.querySelector('button[data-md-action="indent"]')?.addEventListener('click', () => {
-      this.indentSelection(false);
+      this.indentSelection(false, false);
     });
     this.textareaMarkdownToolbar.querySelector('button[data-md-action="unindent"]')?.addEventListener('click', () => {
-      this.indentSelection(true);
+      this.indentSelection(true, false);
     });
-    this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-table"]')?.setAttribute('data-modal', `div[data-markdown-table-modal-id="${elementIdCounter}"]`);
-    this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-link"]')?.setAttribute('data-modal', `div[data-markdown-link-modal-id="${elementIdCounter}"]`);
+    this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-table"]')?.setAttribute('data-modal', `div[data-markdown-table-modal-id="${this.elementIdSuffix}"]`);
+    this.textareaMarkdownToolbar.querySelector('button[data-md-action="new-link"]')?.setAttribute('data-modal', `div[data-markdown-link-modal-id="${this.elementIdSuffix}"]`);
 
+    // Track whether any actual input or pointer action was made after focusing, and only intercept Tab presses after that.
+    this.tabEnabled = false;
+    // This tracks whether last Tab action was ignored, and if it immediately happens *again*, lose focus.
+    this.ignoredTabAction = false;
+    this.ignoredTabToast = null;
+
+    this.textarea.addEventListener('focus', () => {
+      this.tabEnabled = false;
+      this.ignoredTabAction = false;
+    });
+    this.textarea.addEventListener('pointerup', () => {
+      // Assume if a pointer is used then Tab handling is a bit less of an issue.
+      this.tabEnabled = true;
+    });
     this.textarea.addEventListener('keydown', (e) => {
       if (e.shiftKey) {
         e.target._shiftDown = true;
       }
-      if (e.key === 'Enter' && !e.shiftKey && !e.ctrlKey && !e.altKey) {
-        // Prevent special line break handling if currently a text expander popup is open
-        if (this.textarea.hasAttribute('aria-expanded')) return;
+
+      // Prevent special keyboard handling if currently a text expander popup is open
+      if (this.textarea.hasAttribute('aria-expanded')) return;
+
+      const noModifiers = !e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey;
+      if (e.key === 'Escape') {
+        // Explicitly lose focus and reenable tab navigation.
+        e.target.blur();
+        this.tabEnabled = false;
+      } else if (e.key === 'Tab' && this.tabEnabled && !e.altKey && !e.ctrlKey && !e.metaKey) {
+        if (this.indentSelection(e.shiftKey, true)) {
+          this.options?.onContentChanged?.(this, e);
+          e.preventDefault();
+          this.activateTabHandling();
+        } else if (!this.ignoredTabAction) {
+          e.preventDefault();
+          this.ignoredTabAction = true;
+          this.ignoredTabToast?.hideToast();
+          this.ignoredTabToast = showHintToast(
+            this.container.dataset[e.shiftKey ? 'shiftTabHint' : 'tabHint'],
+            {gravity: 'bottom', useHtmlBody: true},
+          );
+          this.ignoredTabToast.toastElement.role = 'alert';
+        }
+      } else if (e.key === 'Enter' && noModifiers) {
         if (!this.breakLine()) return; // Nothing changed, let the default handler work.
         this.options?.onContentChanged?.(this, e);
         e.preventDefault();
+      } else if (noModifiers) {
+        this.activateTabHandling();
       }
     });
     this.textarea.addEventListener('keyup', (e) => {
@@ -142,41 +183,54 @@ class ComboMarkdownEditor {
     }
   }
 
+  activateTabHandling() {
+    this.tabEnabled = true;
+    this.ignoredTabAction = false;
+    if (this.ignoredTabToast) {
+      this.ignoredTabToast.hideToast();
+      this.ignoredTabToast = null;
+    }
+  }
+
   setupDropzone() {
     const dropzoneParentContainer = this.container.getAttribute('data-dropzone-parent-container');
     if (dropzoneParentContainer) {
-      this.dropzone = this.container.closest(this.container.getAttribute('data-dropzone-parent-container'))?.querySelector('.dropzone');
+      this.dropzone = this.container.closest(dropzoneParentContainer)?.querySelector('.dropzone');
     }
   }
 
   setupTab() {
     const $container = $(this.container);
-    const tabs = $container[0].querySelectorAll('.tabular.menu > .item');
+    const switchEl = $container[0].querySelector('.switch');
+    const tabs = switchEl.querySelectorAll('.item');
 
     // Fomantic Tab requires the "data-tab" to be globally unique.
     // So here it uses our defined "data-tab-for" and "data-tab-panel" to generate the "data-tab" attribute for Fomantic.
     const tabEditor = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-writer');
     const tabPreviewer = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-previewer');
-    tabEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`);
-    tabPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`);
+    tabEditor.setAttribute('data-tab', `markdown-writer-${this.elementIdSuffix}`);
+    tabPreviewer.setAttribute('data-tab', `markdown-previewer-${this.elementIdSuffix}`);
+    const toolbar = $container[0].querySelector('markdown-toolbar');
     const panelEditor = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-writer"]');
     const panelPreviewer = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-previewer"]');
-    panelEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`);
-    panelPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`);
+    panelEditor.setAttribute('data-tab', `markdown-writer-${this.elementIdSuffix}`);
+    panelPreviewer.setAttribute('data-tab', `markdown-previewer-${this.elementIdSuffix}`);
 
     tabEditor.addEventListener('click', () => {
+      toolbar.classList.remove('markdown-toolbar-hidden');
       requestAnimationFrame(() => {
         this.focus();
       });
     });
 
-    $(tabs).tab();
+    initTab(switchEl);
 
     this.previewUrl = tabPreviewer.getAttribute('data-preview-url');
     this.previewContext = tabPreviewer.getAttribute('data-preview-context');
     this.previewMode = this.options.previewMode ?? 'comment';
     this.previewWiki = this.options.previewWiki ?? false;
     tabPreviewer.addEventListener('click', async () => {
+      toolbar.classList.add('markdown-toolbar-hidden');
       const formData = new FormData();
       formData.append('mode', this.previewMode);
       formData.append('context', this.previewContext);
@@ -223,10 +277,10 @@ class ComboMarkdownEditor {
 
   setupTableInserter() {
     const newTableModal = this.container.querySelector('div[data-modal-name="new-markdown-table"]');
-    newTableModal.setAttribute('data-markdown-table-modal-id', elementIdCounter);
+    newTableModal.setAttribute('data-markdown-table-modal-id', this.elementIdSuffix);
 
     const button = newTableModal.querySelector('button[data-selector-name="ok-button"]');
-    button.setAttribute('data-element-id', elementIdCounter);
+    button.setAttribute('data-element-id', this.elementIdSuffix);
     button.addEventListener('click', this.addNewTable);
   }
 
@@ -258,8 +312,8 @@ class ComboMarkdownEditor {
 
   setupLinkInserter() {
     const newLinkModal = this.container.querySelector('div[data-modal-name="new-markdown-link"]');
-    newLinkModal.setAttribute('data-markdown-link-modal-id', elementIdCounter);
-    const textarea = document.getElementById(`_combo_markdown_editor_${elementIdCounter}`);
+    newLinkModal.setAttribute('data-markdown-link-modal-id', this.elementIdSuffix);
+    const textarea = document.getElementById(`_combo_markdown_editor_${this.elementIdSuffix}`);
 
     $(newLinkModal).modal({
       // Pre-fill the description field from the selection to create behavior similar
@@ -278,7 +332,7 @@ class ComboMarkdownEditor {
     });
 
     const button = newLinkModal.querySelector('button[data-selector-name="ok-button"]');
-    button.setAttribute('data-element-id', elementIdCounter);
+    button.setAttribute('data-element-id', this.elementIdSuffix);
     button.addEventListener('click', this.addNewLink);
   }
 
@@ -400,13 +454,15 @@ class ComboMarkdownEditor {
     }
   }
 
-  indentSelection(unindent) {
+  // Indent all lines that are included in the selection, partially or whole, while preserving the original selection at the end.
+  indentSelection(unindent, validOnly) {
     // Indent with 4 spaces, unindent 4 spaces or fewer or a lost tab.
     const indentPrefix = '    ';
-    const unindentRegex = /^( {1,4}|\t)/;
+    const unindentRegex = /^( {1,4}|\t|> {0,4})/;
+    const indentLevel = / {4}|\t|> /g;
 
-    // Indent all lines that are included in the selection, partially or whole, while preserving the original selection at the end.
-    const lines = this.textarea.value.split('\n');
+    const value = this.textarea.value;
+    const lines = value.split('\n');
     const changedLines = [];
     // The current selection or cursor position.
     const [start, end] = [this.textarea.selectionStart, this.textarea.selectionEnd];
@@ -416,31 +472,66 @@ class ComboMarkdownEditor {
     let [newStart, newEnd] = [start, end];
     // The start and end position of the current line (where end points to the newline or EOF)
     let [lineStart, lineEnd] = [0, 0];
+    // Index of the first line included in the selection (or containing the cursor)
+    let firstLineIdx = 0;
 
-    for (const line of lines) {
+    // Find all the lines in selection beforehand so we know the full set before we start changing.
+    const linePositions = [];
+    for (const [i, line] of lines.entries()) {
       lineEnd = lineStart + line.length + 1;
       if (lineEnd <= start) {
         lineStart = lineEnd;
         continue;
       }
+      linePositions.push([lineStart, line]);
+      if (start >= lineStart && start < lineEnd) {
+        firstLineIdx = i;
+        editStart = lineStart;
+      }
+      editEnd = lineEnd - 1;
+      if (lineEnd >= end) break;
+      lineStart = lineEnd;
+    }
 
-      const updated = unindent ? line.replace(unindentRegex, '') : indentPrefix + line;
+    // Block quotes need to be nested/unnested instead of whitespace added/removed. However, only do this if the *whole* selection is in a quote.
+    const isQuote = linePositions.every(([_, line]) => line[0] === '>');
+
+    const line = lines[firstLineIdx];
+    // If there's no indent to remove, do nothing
+    if (unindent && start === end && !unindentRegex.test(line)) {
+      return false;
+    }
+
+    // If there is no selection and this is an ambiguous command (Tab handling), only (un)indent if already in a code/list.
+    if (!unindent && validOnly && start === end) {
+      // Check there's any indentation or prefix at all.
+      const match = line.match(listPrefixRegex);
+      if (!match || !match[0].length) return false;
+      // Check that the line isn't already indented in relation to parent.
+      const levels = line.match(indentLevel)?.length ?? 0;
+      const parentLevels = !firstLineIdx ? 0 : lines[firstLineIdx - 1].match(indentLevel)?.length ?? 0;
+      // Quotes can *begin* multiple levels in, so just allow whatever for now.
+      if (levels - parentLevels > 0 && !isQuote) return false;
+    }
+
+    // Apply indentation changes to lines.
+    for (const [i, [lineStart, line]] of linePositions.entries()) {
+      const updated = isQuote ?
+        (unindent ? line.replace(/^>\s{0,4}>/, '>') : `> ${line}`) :
+        (unindent ? line.replace(unindentRegex, '') : indentPrefix + line);
       changedLines.push(updated);
       const move = updated.length - line.length;
-
-      if (start >= lineStart && start < lineEnd) {
-        editStart = lineStart;
-        newStart = Math.max(start + move, lineStart);
-      }
-
+      if (i === 0) newStart = Math.max(start + move, lineStart);
       newEnd += move;
-      editEnd = lineEnd - 1;
-      lineStart = lineEnd;
-      if (lineStart > end) break;
     }
 
     // Update changed lines whole.
     const text = changedLines.join('\n');
+    if (text === value.slice(editStart, editEnd)) {
+      // Nothing changed, likely due to Shift+Tab when no indents are left.
+      return false;
+    }
+
     this.textarea.focus();
     this.textarea.setSelectionRange(editStart, editEnd);
     if (!document.execCommand('insertText', false, text)) {
@@ -451,6 +542,8 @@ class ComboMarkdownEditor {
 
     // Set selection to (effectively) be the same as before.
     this.textarea.setSelectionRange(newStart, Math.max(newStart, newEnd));
+
+    return true;
   }
 
   breakLine() {
@@ -467,7 +560,7 @@ class ComboMarkdownEditor {
     const lineEnd = nextLF === -1 ? value.length : nextLF;
     const line = value.slice(lineStart, lineEnd);
     // Match any whitespace at the start + any repeatable prefix + exactly one space after.
-    const prefix = line.match(/^\s*((\d+)[.)]\s|[-*+]\s{1,4}\[[ x]\]\s?|[-*+]\s|(>\s?)+)?/);
+    const prefix = line.match(listPrefixRegex);
 
     // Defer to browser if we can't do anything more useful, or if the cursor is inside the prefix.
     if (!prefix) return false;
@@ -486,14 +579,18 @@ class ComboMarkdownEditor {
     }
 
     // Insert newline + prefix.
-    let text = `\n${prefix[0]}`;
+    let text = `${prefix[0]}`;
     // Increment a number if present. (perhaps detecting repeating 1. and not doing that then would be a good idea)
     const num = text.match(/\d+/);
     if (num) text = text.replace(num[0], Number(num[0]) + 1);
     text = text.replace('[x]', '[ ]');
 
-    if (!document.execCommand('insertText', false, text)) {
-      this.textarea.setRangeText(text);
+    // Split the newline and prefix addition in two, so that it's two separate undo entries in Firefox
+    // Chrome seems to bundle everything together more aggressively, even with prior text input.
+    if (document.execCommand('insertText', false, '\n')) {
+      document.execCommand('insertText', false, text);
+    } else {
+      this.textarea.setRangeText(`\n${text}`);
     }
 
     return true;
diff --git a/web_src/js/features/comp/LabelEdit.js b/web_src/js/features/comp/LabelEdit.js
index 2cc75cc6b0..a97c7fe34c 100644
--- a/web_src/js/features/comp/LabelEdit.js
+++ b/web_src/js/features/comp/LabelEdit.js
@@ -38,7 +38,7 @@ export function initCompLabelEdit(selector) {
           form.reportValidity();
           return false;
         }
-        $('.new-label.form').trigger('submit');
+        document.querySelector('.new-label.form').requestSubmit();
       },
     }).modal('show');
     return false;
@@ -75,7 +75,7 @@ export function initCompLabelEdit(selector) {
           form.reportValidity();
           return false;
         }
-        $('.edit-label.form').trigger('submit');
+        document.querySelector('.edit-label.form').requestSubmit();
       },
     }).modal('show');
     return false;
diff --git a/web_src/js/features/comp/Paste.js b/web_src/js/features/comp/Paste.js
index 7e4ecbbeda..0fb6cf4615 100644
--- a/web_src/js/features/comp/Paste.js
+++ b/web_src/js/features/comp/Paste.js
@@ -82,9 +82,8 @@ class CodeMirrorEditor {
 
 async function handleClipboardImages(editor, dropzone, images, e) {
   const uploadUrl = dropzone.getAttribute('data-upload-url');
-  const filesContainer = dropzone.querySelector('.files');
 
-  if (!dropzone || !uploadUrl || !filesContainer || !images.length) return;
+  if (!dropzone || !uploadUrl || !images.length) return;
 
   e.preventDefault();
   e.stopPropagation();
@@ -92,7 +91,7 @@ async function handleClipboardImages(editor, dropzone, images, e) {
   for (const img of images) {
     const name = img.name.slice(0, img.name.lastIndexOf('.'));
 
-    const placeholder = `![${name}](uploading ...)`;
+    const placeholder = `![${name}](uploading...)`;
     editor.insertPlaceholder(placeholder);
 
     const {uuid} = await uploadFile(img, uploadUrl);
@@ -101,12 +100,11 @@ async function handleClipboardImages(editor, dropzone, images, e) {
     const text = `![${name}](${url})`;
     editor.replacePlaceholder(placeholder, text);
 
-    const input = document.createElement('input');
-    input.setAttribute('name', 'files');
-    input.setAttribute('type', 'hidden');
-    input.setAttribute('id', uuid);
-    input.value = uuid;
-    filesContainer.append(input);
+    const attachment = {uuid, name: img.name, browser_download_url: url, size: img.size, type: img.type};
+    dropzone.dropzone.emit('addedfile', attachment);
+    dropzone.dropzone.emit('create-thumbnail', attachment, img);
+    dropzone.dropzone.emit('complete', attachment);
+    dropzone.dropzone.emit('success', attachment, {uuid});
   }
 }
 
diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/features/comp/ReactionSelector.js
index fd4601fb91..357a33f469 100644
--- a/web_src/js/features/comp/ReactionSelector.js
+++ b/web_src/js/features/comp/ReactionSelector.js
@@ -23,7 +23,7 @@ export function initCompReactionSelector($parent) {
         $react.remove();
       }
       if (!data.empty) {
-        const $attachments = $content.find('.segment.bottom:first');
+        const $attachments = $content.find('.segment.bottom').first();
         $react = $(data.html);
         if ($attachments.length > 0) {
           $react.insertBefore($attachments);
diff --git a/web_src/js/features/org-team.js b/web_src/js/features/org-team.js
index 9b059b3a46..fe816da865 100644
--- a/web_src/js/features/org-team.js
+++ b/web_src/js/features/org-team.js
@@ -10,13 +10,12 @@ export function initOrgTeamSearchRepoBox() {
       url: `${appSubUrl}/repo/search?q={query}&uid=${$searchRepoBox.data('uid')}`,
       onResponse(response) {
         const items = [];
-        $.each(response.data, (_i, item) => {
+        for (const item of response.data) {
           items.push({
             title: item.repository.full_name.split('/')[1],
             description: item.repository.full_name,
           });
-        });
-
+        }
         return {results: items};
       },
     },
diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js
index 794cc38010..2ff9e611ae 100644
--- a/web_src/js/features/repo-code.js
+++ b/web_src/js/features/repo-code.js
@@ -184,7 +184,8 @@ export function initRepoCodeView() {
           $('html, body').scrollTop($first.offset().top - 200);
         }
       }
-    }).trigger('hashchange');
+    });
+    window.dispatchEvent(new Event('hashchange'));
   }
   $(document).on('click', '.fold-file', ({currentTarget}) => {
     invertFileFolding(currentTarget.closest('.file-content'), currentTarget);
diff --git a/web_src/js/features/repo-commit.js b/web_src/js/features/repo-commit.js
index 988d57b891..c546cfe0c2 100644
--- a/web_src/js/features/repo-commit.js
+++ b/web_src/js/features/repo-commit.js
@@ -22,6 +22,7 @@ export function initCommitStatuses() {
       interactive: true,
       role: 'dialog',
       theme: 'box-with-header',
+      interactiveBorder: element.closest('.forced-push') ? 0 : 20,
     });
   }
 }
diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js
index 052d4ce476..f4fe2f40fd 100644
--- a/web_src/js/features/repo-common.js
+++ b/web_src/js/features/repo-common.js
@@ -33,25 +33,25 @@ export function initRepoArchiveLinks() {
 }
 
 export function initRepoCloneLink() {
-  const $repoCloneSsh = $('#repo-clone-ssh');
-  const $repoCloneHttps = $('#repo-clone-https');
-  const $inputLink = $('#repo-clone-url');
+  const repoCloneSSH = document.getElementById('repo-clone-ssh');
+  const repoCloneHTTPS = document.getElementById('repo-clone-https');
+  const inputLink = document.getElementById('repo-clone-url');
 
-  if ((!$repoCloneSsh.length && !$repoCloneHttps.length) || !$inputLink.length) {
+  if ((!repoCloneSSH && !repoCloneHTTPS) || !inputLink) {
     return;
   }
 
-  $repoCloneSsh.on('click', () => {
+  repoCloneSSH?.addEventListener('click', () => {
     localStorage.setItem('repo-clone-protocol', 'ssh');
     window.updateCloneStates();
   });
-  $repoCloneHttps.on('click', () => {
+  repoCloneHTTPS?.addEventListener('click', () => {
     localStorage.setItem('repo-clone-protocol', 'https');
     window.updateCloneStates();
   });
 
-  $inputLink.on('focus', () => {
-    $inputLink.trigger('select');
+  inputLink.addEventListener('focus', () => {
+    inputLink.select();
   });
 }
 
diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js
index 5b59b66f80..ac4fc8a75e 100644
--- a/web_src/js/features/repo-editor.js
+++ b/web_src/js/features/repo-editor.js
@@ -5,10 +5,11 @@ import {hideElem, showElem, createElementFromHTML} from '../utils/dom.js';
 import {initMarkupContent} from '../markup/content.js';
 import {attachRefIssueContextPopup} from './contextpopup.js';
 import {POST} from '../modules/fetch.js';
+import {initTab} from '../modules/tab.ts';
 
 function initEditPreviewTab($form) {
   const $tabMenu = $form.find('.tabular.menu');
-  $tabMenu.find('.item').tab();
+  initTab($tabMenu[0]);
   const $previewTab = $tabMenu.find(
     `.item[data-tab="${$tabMenu.data('preview')}"]`,
   );
@@ -185,7 +186,7 @@ export function initRepoEditor() {
         $('#edit-empty-content-modal')
           .modal({
             onApprove() {
-              $('.edit.form').trigger('submit');
+              document.querySelector('.edit.form').requestSubmit();
             },
           })
           .modal('show');
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index c28bf08442..84b8e42a61 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -37,27 +37,27 @@ export function initRepoIssueTimeTracking() {
     $('.issue-start-time-modal').modal({
       duration: 200,
       onApprove() {
-        $('#add_time_manual_form').trigger('submit');
+        document.getElementById('add_time_manual_form').requestSubmit();
       },
     }).modal('show');
     $('.issue-start-time-modal input').on('keydown', (e) => {
       if ((e.keyCode || e.key) === 13) {
-        $('#add_time_manual_form').trigger('submit');
+        document.getElementById('add_time_manual_form').requestSubmit();
       }
     });
   });
   $(document).on('click', '.issue-start-time, .issue-stop-time', () => {
-    $('#toggle_stopwatch_form').trigger('submit');
+    document.getElementById('toggle_stopwatch_form').requestSubmit();
   });
   $(document).on('click', '.issue-cancel-time', () => {
-    $('#cancel_stopwatch_form').trigger('submit');
+    document.getElementById('cancel_stopwatch_form').requestSubmit();
   });
   $(document).on('click', 'button.issue-delete-time', function () {
     const sel = `.issue-delete-time-modal[data-id="${$(this).data('id')}"]`;
     $(sel).modal({
       duration: 200,
       onApprove() {
-        $(`${sel} form`).trigger('submit');
+        document.querySelector(`${sel} form`).requestSubmit();
       },
     }).modal('show');
   });
@@ -125,31 +125,36 @@ function excludeLabel(item) {
 export function initRepoIssueSidebarList() {
   const repolink = $('#repolink').val();
   const repoId = $('#repoId').val();
-  const crossRepoSearch = $('#crossRepoSearch').val();
+  const crossRepoSearch = $('#crossRepoSearch').val() === 'true';
   const tp = $('#type').val();
-  let issueSearchUrl = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}`;
-  if (crossRepoSearch === 'true') {
-    issueSearchUrl = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}`;
-  }
   $('#new-dependency-drop-list')
     .dropdown({
       apiSettings: {
-        url: issueSearchUrl,
+        beforeSend(settings) {
+          if (!settings.urlData.query.trim()) {
+            settings.url = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&sort=updated`;
+          } else if (crossRepoSearch) {
+            settings.url = `${appSubUrl}/issues/search?q={query}&priority_repo_id=${repoId}&type=${tp}&sort=relevance`;
+          } else {
+            settings.url = `${appSubUrl}/${repolink}/issues/search?q={query}&type=${tp}&sort=relevance`;
+          }
+          return settings;
+        },
         onResponse(response) {
           const filteredResponse = {success: true, results: []};
           const currIssueId = $('#new-dependency-drop-list').data('issue-id');
           // Parse the response from the api to work with our dropdown
-          $.each(response, (_i, issue) => {
+          for (const [_, issue] of Object.entries(response)) {
             // Don't list current issue in the dependency list.
             if (issue.id === currIssueId) {
-              return;
+              continue;
             }
             filteredResponse.results.push({
               name: `#${issue.number} ${issueTitleHTML(htmlEscape(issue.title))
               }<div class="text small tw-break-anywhere">${htmlEscape(issue.repository.full_name)}</div>`,
               value: issue.id,
             });
-          });
+          }
           return filteredResponse;
         },
         cache: false,
@@ -167,6 +172,7 @@ export function initRepoIssueSidebarList() {
     });
   });
 
+  // FIXME: this is broken, see discussion https://codeberg.org/forgejo/forgejo/pulls/8199
   $('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
     if (e.altKey && e.keyCode === 13) {
       const selectedItem = document.querySelector('.menu .ui.dropdown.label-filter .menu .item.selected');
@@ -247,7 +253,7 @@ export function initRepoIssueDependencyDelete() {
       onApprove: () => {
         $('#removeDependencyID').val(id);
         $('#dependencyType').val(type);
-        $('#removeDependencyForm').trigger('submit');
+        document.getElementById('removeDependencyForm').requestSubmit();
       },
     }).modal('show');
   });
@@ -345,12 +351,12 @@ export function initRepoIssueReferenceRepositorySearch() {
         url: `${appSubUrl}/repo/search?q={query}&limit=20`,
         onResponse(response) {
           const filteredResponse = {success: true, results: []};
-          $.each(response.data, (_r, repo) => {
+          for (const repo of response.data) {
             filteredResponse.results.push({
               name: htmlEscape(repo.repository.full_name),
               value: repo.repository.full_name,
             });
-          });
+          }
           return filteredResponse;
         },
         cache: false,
@@ -369,9 +375,9 @@ export function initRepoIssueWipTitle() {
   $('.title_wip_desc > a').on('click', (e) => {
     e.preventDefault();
 
-    const $issueTitle = $('#issue_title');
-    $issueTitle.trigger('focus');
-    const value = $issueTitle.val().trim().toUpperCase();
+    const issueTitleEl = document.getElementById('issue_title');
+    issueTitleEl.focus();
+    const value = issueTitleEl.value.trim().toUpperCase();
 
     const wipPrefixes = $('.title_wip_desc').data('wip-prefixes');
     for (const prefix of wipPrefixes) {
@@ -380,7 +386,7 @@ export function initRepoIssueWipTitle() {
       }
     }
 
-    $issueTitle.val(`${wipPrefixes[0]} ${$issueTitle.val()}`);
+    issueTitleEl.value = `${wipPrefixes[0]} ${issueTitleEl.value}`;
   });
 }
 
@@ -439,7 +445,7 @@ export async function handleReply($el) {
     // When the page is loaded, the dropzone is initialized by initGlobalDropzone, but the editor is not initialized.
     // When the form is submitted and partially reload, none of them is initialized.
     const dropzone = $form.find('.dropzone')[0];
-    if (!dropzone.dropzone) initDropzone(dropzone);
+    if (!dropzone.dropzone) await initDropzone(dropzone);
     editor = await initComboMarkdownEditor($form.find('.combo-markdown-editor'));
   }
   editor.focus();
@@ -574,7 +580,7 @@ export function initRepoPullRequestReview() {
         $td.find("input[name='side']").val(side === 'left' ? 'previous' : 'proposed');
         $td.find("input[name='path']").val(path);
 
-        initDropzone($td.find('.dropzone')[0]);
+        await initDropzone($td.find('.dropzone')[0]);
         const editor = await initComboMarkdownEditor($td.find('.combo-markdown-editor'));
         editor.focus();
       } catch (error) {
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index 662719b09c..66ee945d02 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -16,7 +16,6 @@ import {
 import {initCitationFileCopyContent} from './citation.js';
 import {initCompLabelEdit} from './comp/LabelEdit.js';
 import {initRepoDiffConversationNav} from './repo-diff.js';
-import {createDropzone} from './dropzone.js';
 import {showErrorToast} from '../modules/toast.js';
 import {initCommentContent, initMarkupContent} from '../markup/content.js';
 import {initCompReactionSelector} from './comp/ReactionSelector.js';
@@ -26,12 +25,10 @@ import {initRepoPullRequestCommitStatus} from './repo-issue-pr-status.js';
 import {hideElem, showElem} from '../utils/dom.js';
 import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
 import {attachRefIssueContextPopup} from './contextpopup.js';
-import {POST, GET} from '../modules/fetch.js';
+import {POST} from '../modules/fetch.js';
 import {MarkdownQuote} from '@github/quote-selection';
 import {toAbsoluteUrl} from '../utils.js';
-import {initGlobalShowModal} from './common-global.js';
-
-const {csrfToken} = window.config;
+import {initDropzone, initGlobalShowModal} from './common-global.js';
 
 export function initRepoCommentForm() {
   const $commentForm = $('.comment.form');
@@ -312,115 +309,27 @@ async function onEditContent(event) {
 
   let comboMarkdownEditor;
 
-  /**
-   * @param {HTMLElement} dropzone
-   */
-  const setupDropzone = async (dropzone) => {
-    if (!dropzone) return null;
-
-    let disableRemovedfileEvent = false; // when resetting the dropzone (removeAllFiles), disable the "removedfile" event
-    let fileUuidDict = {}; // to record: if a comment has been saved, then the uploaded files won't be deleted from server when clicking the Remove in the dropzone
-    const dz = await createDropzone(dropzone, {
-      url: dropzone.getAttribute('data-upload-url'),
-      headers: {'X-Csrf-Token': csrfToken},
-      maxFiles: dropzone.getAttribute('data-max-file'),
-      maxFilesize: dropzone.getAttribute('data-max-size'),
-      acceptedFiles: ['*/*', ''].includes(dropzone.getAttribute('data-accepts')) ? null : dropzone.getAttribute('data-accepts'),
-      addRemoveLinks: true,
-      dictDefaultMessage: dropzone.getAttribute('data-default-message'),
-      dictInvalidFileType: dropzone.getAttribute('data-invalid-input-type'),
-      dictFileTooBig: dropzone.getAttribute('data-file-too-big'),
-      dictRemoveFile: dropzone.getAttribute('data-remove-file'),
-      timeout: 0,
-      thumbnailMethod: 'contain',
-      thumbnailWidth: 480,
-      thumbnailHeight: 480,
-      init() {
-        this.on('success', (file, data) => {
-          file.uuid = data.uuid;
-          fileUuidDict[file.uuid] = {submitted: false};
-          const input = document.createElement('input');
-          input.id = data.uuid;
-          input.name = 'files';
-          input.type = 'hidden';
-          input.value = data.uuid;
-          dropzone.querySelector('.files').append(input);
-        });
-        this.on('removedfile', async (file) => {
-          document.getElementById(file.uuid)?.remove();
-          if (disableRemovedfileEvent) return;
-          if (dropzone.getAttribute('data-remove-url') && !fileUuidDict[file.uuid].submitted) {
-            try {
-              await POST(dropzone.getAttribute('data-remove-url'), {data: new URLSearchParams({file: file.uuid})});
-            } catch (error) {
-              console.error(error);
-            }
-          }
-        });
-        this.on('submit', () => {
-          for (const fileUuid of Object.keys(fileUuidDict)) {
-            fileUuidDict[fileUuid].submitted = true;
-          }
-        });
-        this.on('reload', async () => {
-          try {
-            const response = await GET(editContentZone.getAttribute('data-attachment-url'));
-            const data = await response.json();
-            // do not trigger the "removedfile" event, otherwise the attachments would be deleted from server
-            disableRemovedfileEvent = true;
-            dz.removeAllFiles(true);
-            dropzone.querySelector('.files').innerHTML = '';
-            for (const el of dropzone.querySelectorAll('.dz-preview')) el.remove();
-            fileUuidDict = {};
-            disableRemovedfileEvent = false;
-
-            for (const attachment of data) {
-              const imgSrc = `${dropzone.getAttribute('data-link-url')}/${attachment.uuid}`;
-              dz.emit('addedfile', attachment);
-              dz.emit('thumbnail', attachment, imgSrc);
-              dz.emit('complete', attachment);
-              fileUuidDict[attachment.uuid] = {submitted: true};
-              dropzone.querySelector(`img[src='${imgSrc}']`).style.maxWidth = '100%';
-              const input = document.createElement('input');
-              input.id = attachment.uuid;
-              input.name = 'files';
-              input.type = 'hidden';
-              input.value = attachment.uuid;
-              dropzone.querySelector('.files').append(input);
-            }
-            if (!dropzone.querySelector('.dz-preview')) {
-              dropzone.classList.remove('dz-started');
-            }
-          } catch (error) {
-            console.error(error);
-          }
-        });
-      },
-    });
-    dz.emit('reload');
-    return dz;
-  };
-
   const cancelAndReset = (e) => {
     e.preventDefault();
     showElem(renderContent);
     hideElem(editContentZone);
     comboMarkdownEditor.value(rawContent.textContent);
-    comboMarkdownEditor.attachedDropzoneInst?.emit('reload');
+    editContentZone.querySelector('.dropzone')?.dropzone?.emit('reload');
   };
 
   const saveAndRefresh = async (e) => {
     e.preventDefault();
     showElem(renderContent);
     hideElem(editContentZone);
-    const dropzoneInst = comboMarkdownEditor.attachedDropzoneInst;
+    const dropzone = editContentZone.querySelector('.dropzone')?.dropzone;
+    for (const element of dropzone?.element?.querySelectorAll('.dz-preview') ?? []) element.classList.remove('dz-success');
     try {
       const params = new URLSearchParams({
         content: comboMarkdownEditor.value(),
         context: editContentZone.getAttribute('data-context'),
         content_version: editContentZone.getAttribute('data-content-version'),
       });
-      const files = dropzoneInst?.element?.querySelectorAll('.files [name=files]') ?? [];
+      const files = dropzone?.element?.querySelectorAll('.files [name=files]') ?? [];
       for (const fileInput of files) {
         params.append('files[]', fileInput.value);
       }
@@ -451,8 +360,7 @@ async function onEditContent(event) {
       } else {
         content.querySelector('.dropzone-attachments').outerHTML = data.attachments;
       }
-      dropzoneInst?.emit('submit');
-      dropzoneInst?.emit('reload');
+      dropzone?.emit('submit');
       initMarkupContent();
       initCommentContent();
     } catch (error) {
@@ -463,13 +371,15 @@ async function onEditContent(event) {
   comboMarkdownEditor = getComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor'));
   if (!comboMarkdownEditor) {
     editContentZone.innerHTML = document.getElementById('issue-comment-editor-template').innerHTML;
+    const dropzone = editContentZone.querySelector('.dropzone');
+    if (!dropzone.dropzone) await initDropzone(dropzone, editContentZone);
     comboMarkdownEditor = await initComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor'));
-    comboMarkdownEditor.attachedDropzoneInst = await setupDropzone(editContentZone.querySelector('.dropzone'));
+    dropzone.dropzone.emit('reload');
     editContentZone.addEventListener('ce-quick-submit', saveAndRefresh);
     editContentZone.querySelector('button[data-button-name="cancel-edit"]').addEventListener('click', cancelAndReset);
     editContentZone.querySelector('button[data-button-name="save-edit"]').addEventListener('click', saveAndRefresh);
   } else {
-    const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.tabular.menu > a[data-tab-for=markdown-writer]');
+    const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.switch > a[data-tab-for=markdown-writer]');
     tabEditor?.click();
   }
 
@@ -621,6 +531,13 @@ const filters = {
     }
     return el;
   },
+  IMG(el, context) {
+    const src = el.getAttribute('src');
+    if (src?.startsWith(context)) {
+      el.src = src.slice(context.length);
+    }
+    return el;
+  },
 };
 
 function hasContent(node) {
@@ -628,32 +545,34 @@ function hasContent(node) {
 }
 
 // This code matches that of what is done by @github/quote-selection
-function preprocessFragment(fragment) {
-  const nodeIterator = document.createNodeIterator(fragment, NodeFilter.SHOW_ELEMENT, {
-    acceptNode(node) {
-      if (node.nodeName in filters && hasContent(node)) {
-        return NodeFilter.FILTER_ACCEPT;
+function preprocessFragment(context) {
+  return function(fragment) {
+    const nodeIterator = document.createNodeIterator(fragment, NodeFilter.SHOW_ELEMENT, {
+      acceptNode(node) {
+        if (node.nodeName in filters && hasContent(node)) {
+          return NodeFilter.FILTER_ACCEPT;
+        }
+
+        return NodeFilter.FILTER_SKIP;
+      },
+    });
+    const results = [];
+    let node = nodeIterator.nextNode();
+
+    while (node) {
+      if (node instanceof HTMLElement) {
+        results.push(node);
       }
-
-      return NodeFilter.FILTER_SKIP;
-    },
-  });
-  const results = [];
-  let node = nodeIterator.nextNode();
-
-  while (node) {
-    if (node instanceof HTMLElement) {
-      results.push(node);
+      node = nodeIterator.nextNode();
     }
-    node = nodeIterator.nextNode();
-  }
 
   // process deepest matches first
-  results.reverse();
+    results.reverse();
 
-  for (const el of results) {
-    el.replaceWith(filters[el.nodeName](el));
-  }
+    for (const el of results) {
+      el.replaceWith(filters[el.nodeName](el, context));
+    }
+  };
 }
 
 function initRepoIssueCommentEdit() {
@@ -663,7 +582,7 @@ function initRepoIssueCommentEdit() {
   // Quote reply
   $(document).on('click', '.quote-reply', async (event) => {
     event.preventDefault();
-    const quote = new MarkdownQuote('', preprocessFragment);
+    const quote = new MarkdownQuote('', preprocessFragment(event.target.getAttribute('data-context')));
 
     let editorTextArea;
     if (event.target.classList.contains('quote-reply-diff')) {
@@ -685,7 +604,12 @@ function initRepoIssueCommentEdit() {
 
     // If the selection is in the comment body, then insert the quote.
     if (quote.closest(`#${event.target.getAttribute('data-target')}`)) {
+      // Chromium quirk: Temporarily store the range so it doesn't get lost, caused by appending text in another element.
+      const currentRange = quote.range;
+
       editorTextArea.value += `@${event.target.getAttribute('data-author')} wrote in ${toAbsoluteUrl(event.target.getAttribute('data-reference-url'))}:`;
+
+      quote.range = currentRange;
       quote.insert(editorTextArea);
     }
   });
diff --git a/web_src/js/features/repo-migration.js b/web_src/js/features/repo-migration.js
index 59e282e4e7..538dd414c6 100644
--- a/web_src/js/features/repo-migration.js
+++ b/web_src/js/features/repo-migration.js
@@ -29,7 +29,7 @@ export function initRepoMigration() {
   cloneAddr?.addEventListener('change', () => {
     const repoName = document.getElementById('repo_name');
     if (cloneAddr.value && !repoName?.value) { // Only modify if repo_name input is blank
-      repoName.value = cloneAddr.value.match(/^(.*\/)?((.+?)(\.git)?)$/)[3];
+      repoName.value = cloneAddr.value.match(/^(.*\/)?((.+?)(\.git)?\/?)$/)[3];
     }
   });
 }
@@ -38,7 +38,10 @@ function checkAuth() {
   if (!service) return;
   const serviceType = Number(service.value);
 
-  checkItems(serviceType !== 1);
+  // hack for pagure importer.
+  if (serviceType !== 10) {
+    checkItems(serviceType !== 1);
+  }
 }
 
 function checkItems(tokenAuth) {
diff --git a/web_src/js/features/repo-settings.js b/web_src/js/features/repo-settings.js
index 52c5de2bfa..47ada545de 100644
--- a/web_src/js/features/repo-settings.js
+++ b/web_src/js/features/repo-settings.js
@@ -55,13 +55,12 @@ export function initRepoSettingSearchTeamBox() {
       headers: {'X-Csrf-Token': csrfToken},
       onResponse(response) {
         const items = [];
-        $.each(response.data, (_i, item) => {
+        for (const item of response.data) {
           items.push({
             title: item.name,
             description: `${item.permission} access`, // TODO: translate this string
           });
-        });
-
+        }
         return {results: items};
       },
     },
diff --git a/web_src/js/features/repo-template.js b/web_src/js/features/repo-template.js
index 5f63e8b3ba..5f01be5ad3 100644
--- a/web_src/js/features/repo-template.js
+++ b/web_src/js/features/repo-template.js
@@ -32,12 +32,12 @@ export function initRepoTemplateSearch() {
               value: '',
             });
             // Parse the response from the api to work with our dropdown
-            $.each(response.data, (_r, repo) => {
+            for (const repo of response.data) {
               filteredResponse.results.push({
                 name: htmlEscape(repo.repository.full_name),
                 value: repo.repository.id,
               });
-            });
+            }
             return filteredResponse;
           },
           cache: false,
diff --git a/web_src/js/htmx.js b/web_src/js/htmx.js
index 5ca3018308..c4893f7c1b 100644
--- a/web_src/js/htmx.js
+++ b/web_src/js/htmx.js
@@ -1,4 +1,4 @@
-import * as htmx from 'htmx.org';
+import htmx from 'htmx.org';
 import {showErrorToast} from './modules/toast.js';
 
 // https://github.com/bigskysoftware/idiomorph#htmx
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 7d44b9ff56..98e57ef450 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -22,7 +22,6 @@ import {initRepoIssueContentHistory} from './features/repo-issue-content.js';
 import {initStopwatch} from './features/stopwatch.js';
 import {initFindFileInRepo} from './features/repo-findfile.js';
 import {initCommentContent, initMarkupContent} from './markup/content.js';
-import {initPdfViewer} from './render/pdf.js';
 
 import {initUserAuthOauth2, initUserAuth} from './features/user-auth.js';
 import {
@@ -74,6 +73,7 @@ import {initCopyContent} from './features/copycontent.js';
 import {initCaptcha} from './features/captcha.js';
 import {initRepositoryActionView} from './components/RepoActionView.vue';
 import {initGlobalTooltips} from './modules/tippy.js';
+import {initDropdowns} from './modules/dropdown.ts';
 import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
 import {initRepoIssueList} from './features/repo-issue-list.js';
@@ -102,6 +102,7 @@ onDomReady(() => {
   initGlobalEnterQuickSubmit();
   initGlobalFormDirtyLeaveConfirm();
   initGlobalLinkActions();
+  initDropdowns();
 
   initCommonOrganization();
   initCommonIssueListQuickGoto();
@@ -186,7 +187,9 @@ onDomReady(() => {
   initUserAuthWebAuthnRegister();
   initUserAuth();
   initRepoDiffView();
-  initPdfViewer();
   initScopedAccessTokenCategories();
   initColorPickers();
+
+  // Deactivate CSS-only noJS usability supplements
+  document.body.classList.remove('no-js');
 });
diff --git a/web_src/js/modules/dimmer.ts b/web_src/js/modules/dimmer.ts
new file mode 100644
index 0000000000..7f1cbaa7ad
--- /dev/null
+++ b/web_src/js/modules/dimmer.ts
@@ -0,0 +1,47 @@
+import $ from 'jquery';
+
+class Dimmer {
+  dimmerEl: HTMLDivElement;
+  active: boolean;
+
+  constructor() {
+    this.dimmerEl = document.querySelector('body > div.ui.dimmer') as HTMLDivElement;
+    if (!this.dimmerEl) {
+      this.dimmerEl = document.createElement('div');
+      this.dimmerEl.classList.add('ui', 'dimmer', 'transition');
+      document.body.append(this.dimmerEl);
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  dimmer(functionName: string, ...args: any[]) {
+    if (functionName === 'add content') {
+      this.dimmerEl.append(args[0][0]);
+    } else if (functionName === 'get dimmer') {
+      return $(this.dimmerEl);
+    } else if (functionName === 'show') {
+      this.dimmerEl.classList.add('active');
+      this.dimmerEl.classList.remove('hidden');
+      this.active = true;
+    } else if (functionName === 'hide') {
+      this.dimmerEl.classList.remove('active');
+      this.dimmerEl.classList.add('hidden');
+      this.active = false;
+    } else if (functionName === 'is active') {
+      return this.active;
+    }
+  }
+
+  // JQuery compatibility functions.
+  get(_index: number): HTMLElement {
+    return document.body;
+  }
+  removeClass() {}
+  hasClass() {}
+}
+
+export function initDimmer() {
+  $.fn.dimmer = (arg: string | object) => {
+    if (typeof arg === 'object') return new Dimmer();
+  };
+}
diff --git a/web_src/js/modules/dropdown.ts b/web_src/js/modules/dropdown.ts
new file mode 100644
index 0000000000..0731eeb86f
--- /dev/null
+++ b/web_src/js/modules/dropdown.ts
@@ -0,0 +1,35 @@
+// Copyright 2025 The Forgejo Authors. All rights reserved.
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// Details can be opened by clicking summary or by pressing Space or Enter while
+// being focused on summary. But without JS options for closing it are limited.
+// Event listeners in this file provide more convenient options for that:
+// click iteration with anything on the page and pressing Escape.
+
+export function initDropdowns() {
+  document.addEventListener('click', (event) => {
+    const dropdown = document.querySelector<HTMLDetailsElement>('details.dropdown[open]');
+    // No open dropdowns on page, nothing to do.
+    if (dropdown === null) return;
+
+    const target = event.target as HTMLElement;
+    // User clicked something in the open dropdown, don't interfere.
+    if (dropdown.contains(target)) return;
+
+    // User clicked something that isn't the open dropdown, so close it.
+    dropdown.removeAttribute('open');
+  });
+
+  // Close open dropdowns on Escape press
+  document.addEventListener('keydown', (event) => {
+    // This press wasn't escape, nothing to do.
+    if (event.key !== 'Escape') return;
+
+    const dropdown = document.querySelector<HTMLDetailsElement>('details.dropdown[open]');
+    // No open dropdowns on page, nothing to do.
+    if (dropdown === null) return;
+
+    // User pressed Escape while having an open dropdown, probably wants it be closed.
+    dropdown.removeAttribute('open');
+  });
+}
diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js
index c04bc6e863..9d27a9bb47 100644
--- a/web_src/js/modules/fomantic.js
+++ b/web_src/js/modules/fomantic.js
@@ -6,13 +6,11 @@ import {initAriaDropdownPatch} from './fomantic/dropdown.js';
 import {initAriaModalPatch} from './fomantic/modal.js';
 import {initFomanticTransition} from './fomantic/transition.js';
 import {svg} from '../svg.js';
+import {initDimmer} from './dimmer.ts';
 
 export const fomanticMobileScreen = window.matchMedia('only screen and (max-width: 767.98px)');
 
 export function initGiteaFomantic() {
-  // Silence fomantic's error logging when tabs are used without a target content element
-  $.fn.tab.settings.silent = true;
-
   // By default, use "exact match" for full text search
   $.fn.dropdown.settings.fullTextSearch = 'exact';
   // Do not use "cursor: pointer" for dropdown labels
@@ -31,4 +29,5 @@ export function initGiteaFomantic() {
   initAriaFormFieldPatch();
   initAriaDropdownPatch();
   initAriaModalPatch();
+  initDimmer();
 }
diff --git a/web_src/js/modules/tab.ts b/web_src/js/modules/tab.ts
new file mode 100644
index 0000000000..a19281793f
--- /dev/null
+++ b/web_src/js/modules/tab.ts
@@ -0,0 +1,36 @@
+export function initTab(parentEl: Element) {
+  if (!parentEl) {
+    return;
+  }
+
+  // Keep track of which tab is active for this element.
+  let activeTabPath = parentEl.querySelector('.item.active')?.getAttribute('data-tab');
+  if (!activeTabPath) {
+    return;
+  }
+
+  for (const el of parentEl.querySelectorAll('.item')) {
+    el.addEventListener('click', (ev) => {
+      // There's no data-tab attribute we can't do anything, ignore.
+      const tabPath = el.getAttribute('data-tab');
+      if (!tabPath) {
+        return;
+      }
+
+      // The item is already active, ignore.
+      if (el.classList.contains('active')) {
+        return;
+      }
+
+      // Make the current item active and the previous item inactive.
+      parentEl.querySelector('.item.active').classList.remove('active');
+      document.querySelector(`.tab.active[data-tab=${activeTabPath}]`).classList.remove('active');
+      el.classList.add('active');
+      document.querySelector(`.tab[data-tab=${tabPath}]`).classList.add('active');
+      activeTabPath = tabPath;
+
+      // Not really sure if this is useful, it is kept from how Fomantic did it.
+      ev.preventDefault();
+    }, {passive: false});
+  }
+}
diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js
index d12d203718..177800d4fb 100644
--- a/web_src/js/modules/toast.js
+++ b/web_src/js/modules/toast.js
@@ -3,6 +3,11 @@ import {svg} from '../svg.js';
 import Toastify from 'toastify-js'; // don't use "async import", because when network error occurs, the "async import" also fails and nothing is shown
 
 const levels = {
+  hint: {
+    icon: 'octicon-light-bulb',
+    background: 'var(--color-black-light)',
+    duration: 2500,
+  },
   info: {
     icon: 'octicon-check',
     background: 'var(--color-green)',
@@ -42,6 +47,10 @@ function showToast(message, level, {gravity, position, duration, useHtmlBody, ..
   return toast;
 }
 
+export function showHintToast(message, opts) {
+  return showToast(message, 'hint', opts);
+}
+
 export function showInfoToast(message, opts) {
   return showToast(message, 'info', opts);
 }
diff --git a/web_src/js/render/pdf.js b/web_src/js/render/pdf.js
deleted file mode 100644
index f31f161e6e..0000000000
--- a/web_src/js/render/pdf.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import {htmlEscape} from 'escape-goat';
-
-export async function initPdfViewer() {
-  const els = document.querySelectorAll('.pdf-content');
-  if (!els.length) return;
-
-  const pdfobject = await import(/* webpackChunkName: "pdfobject" */'pdfobject');
-
-  for (const el of els) {
-    const src = el.getAttribute('data-src');
-    const fallbackText = el.getAttribute('data-fallback-button-text');
-    pdfobject.embed(src, el, {
-      fallbackLink: htmlEscape`
-        <a role="button" class="ui basic button pdf-fallback-button" href="[url]">${fallbackText}</a>
-      `,
-    });
-    el.classList.remove('is-loading');
-  }
-}
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
index 3134279c84..13f26348c2 100644
--- a/web_src/js/svg.js
+++ b/web_src/js/svg.js
@@ -42,6 +42,7 @@ import octiconIssueClosed from '../../public/assets/img/svg/octicon-issue-closed
 import octiconIssueOpened from '../../public/assets/img/svg/octicon-issue-opened.svg';
 import octiconItalic from '../../public/assets/img/svg/octicon-italic.svg';
 import octiconKebabHorizontal from '../../public/assets/img/svg/octicon-kebab-horizontal.svg';
+import octiconLightBulb from '../../public/assets/img/svg/octicon-light-bulb.svg';
 import octiconLink from '../../public/assets/img/svg/octicon-link.svg';
 import octiconListOrdered from '../../public/assets/img/svg/octicon-list-ordered.svg';
 import octiconListUnordered from '../../public/assets/img/svg/octicon-list-unordered.svg';
@@ -117,6 +118,7 @@ const svgs = {
   'octicon-issue-opened': octiconIssueOpened,
   'octicon-italic': octiconItalic,
   'octicon-kebab-horizontal': octiconKebabHorizontal,
+  'octicon-light-bulb': octiconLightBulb,
   'octicon-link': octiconLink,
   'octicon-list-ordered': octiconListOrdered,
   'octicon-list-unordered': octiconListUnordered,
diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js
index 535aae874a..365eb63e30 100644
--- a/web_src/js/utils.test.js
+++ b/web_src/js/utils.test.js
@@ -1,3 +1,4 @@
+import {expect, test} from 'vitest';
 import {
   basename, extname, isObject, stripTags, parseIssueHref,
   parseUrl, translateMonth, translateDay, blobToDataURI,
@@ -182,5 +183,5 @@ async function testSleep(ms) {
   await sleep(ms);
   const endTime = Date.now();    // Record the end time
   const actualSleepTime = endTime - startTime;
-  expect(actualSleepTime >= ms).toBeTruthy();
+  expect(actualSleepTime).toBeGreaterThanOrEqual(ms);
 }
diff --git a/web_src/js/vitest.setup.js b/web_src/js/vitest.setup.js
index 5366958fb5..a99b852097 100644
--- a/web_src/js/vitest.setup.js
+++ b/web_src/js/vitest.setup.js
@@ -1,3 +1,7 @@
+import $ from 'jquery';
+
+$.fn.dropdown = () => undefined;
+
 window.__webpack_public_path__ = '';
 
 window.config = {
diff --git a/web_src/js/webcomponents/index.js b/web_src/js/webcomponents/index.js
index 7cec9da734..1572de262f 100644
--- a/web_src/js/webcomponents/index.js
+++ b/web_src/js/webcomponents/index.js
@@ -1,5 +1,5 @@
-import './polyfills.js';
-import '@github/relative-time-element';
+import './relative-time.js';
 import './origin-url.js';
 import './overflow-menu.js';
 import './absolute-date.js';
+import './lazy-webc.js'; // infrequently used components should be lazy-loaded with <lazy-webc tag="..." custom-attrs>...</>
diff --git a/web_src/js/webcomponents/lazy-webc.js b/web_src/js/webcomponents/lazy-webc.js
new file mode 100644
index 0000000000..3570df3b5d
--- /dev/null
+++ b/web_src/js/webcomponents/lazy-webc.js
@@ -0,0 +1,66 @@
+import {onDomReady} from '../utils/dom.js';
+
+/**
+ * Lazy-load the promise (making it a singleton).
+ * @param {()=>Promise} newPromise Promise factory.
+ * @returns {()=>Promise} Singleton promise
+ */
+function lazyPromise(newPromise) {
+  /** @type {Promise?} */
+  let p;
+  return () => {
+    p ??= newPromise();
+    return p;
+  };
+}
+
+// the following web components will only be loaded if present in the page (to reduce the bundle size for infrequently used components)
+const loadableComponents = {
+  'model-viewer': lazyPromise(() => {
+    return import(/* webpackChunkName: "model-viewer" */ '@google/model-viewer');
+  }),
+  'pdf-object': lazyPromise(() => {
+    return import(/* webpackChunkName: "pdf-object" */ './pdf-object.js');
+  }),
+};
+
+/**
+ * Replace elt with an element having the given tag.
+ * @param {HTMLElement} elt The element to replace.
+ * @param {string} name The tagName of the new element.
+ */
+function replaceTag(elt, name) {
+  const successor = document.createElement(name);
+  // Move the children to the successor
+  while (elt.firstChild) {
+    successor.append(elt.firstChild);
+  }
+  // Copy the attributes to the successor
+  for (let index = elt.attributes.length - 1; index >= 0; --index) {
+    successor.attributes.setNamedItem(elt.attributes[index].cloneNode());
+  }
+  // Replace elt with the successor
+  elt.parentNode.replaceChild(successor, elt);
+}
+
+onDomReady(() => {
+  // The lazy-webc component will replace itself with an element of the type given in the attribute tag.
+  // This seems to be the best way without having to create a global mutationObserver.
+  // See https://codeberg.org/forgejo/forgejo/pulls/8510 for discussion.
+  window.customElements.define(
+    'lazy-webc',
+    class extends HTMLElement {
+      connectedCallback() {
+        const name = this.getAttribute('tag');
+        if (loadableComponents[name]) {
+          loadableComponents[name]().finally(() => {
+            replaceTag(this, name);
+          });
+        } else {
+          console.error('lazy-webc: unknown webcomponent:', name);
+          replaceTag(this, name); // still replace it, maybe it was eagerly defined
+        }
+      }
+    },
+  );
+});
diff --git a/web_src/js/webcomponents/pdf-object.js b/web_src/js/webcomponents/pdf-object.js
new file mode 100644
index 0000000000..15334dafe7
--- /dev/null
+++ b/web_src/js/webcomponents/pdf-object.js
@@ -0,0 +1,14 @@
+import pdfobject from 'pdfobject';
+
+window.customElements.define(
+  'pdf-object',
+  class extends HTMLElement {
+    connectedCallback() {
+      // since the web-component is defined after the DOM is ready, it is safe to look at the children.
+      const fallbackLink = this.innerHTML; // eslint-disable-line wc/no-child-traversal-in-connectedcallback
+      pdfobject.embed(this.getAttribute('src'), this, {
+        fallbackLink,
+      });
+    }
+  },
+);
diff --git a/web_src/js/webcomponents/polyfills.js b/web_src/js/webcomponents/polyfills.js
deleted file mode 100644
index 38f50fa02f..0000000000
--- a/web_src/js/webcomponents/polyfills.js
+++ /dev/null
@@ -1,17 +0,0 @@
-try {
-  // some browsers like PaleMoon don't have full support for Intl.NumberFormat, so do the minimum polyfill to support "relative-time-element"
-  // https://repo.palemoon.org/MoonchildProductions/UXP/issues/2289
-  new Intl.NumberFormat('en', {style: 'unit', unit: 'minute'}).format(1);
-} catch {
-  const intlNumberFormat = Intl.NumberFormat;
-  Intl.NumberFormat = function(locales, options) {
-    if (options.style === 'unit') {
-      return {
-        format(value) {
-          return ` ${value} ${options.unit}`;
-        },
-      };
-    }
-    return intlNumberFormat(locales, options);
-  };
-}
diff --git a/web_src/js/webcomponents/relative-time.js b/web_src/js/webcomponents/relative-time.js
new file mode 100644
index 0000000000..c070cd6795
--- /dev/null
+++ b/web_src/js/webcomponents/relative-time.js
@@ -0,0 +1,240 @@
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc.js';
+const {pageData} = window.config;
+
+dayjs.extend(utc);
+
+export const HALF_MINUTE = 30 * 1000;
+export const ONE_MINUTE = 60 * 1000;
+export const ONE_HOUR = 60 * ONE_MINUTE;
+export const ONE_DAY = 24 * ONE_HOUR;
+
+const ABSOLUTE_DATETIME_FORMAT = new Intl.DateTimeFormat(navigator.language, {
+  year: 'numeric',
+  month: 'short',
+  day: 'numeric',
+  hour: '2-digit',
+  minute: '2-digit',
+  timeZoneName: 'short',
+});
+const FALLBACK_DATETIME_FORMAT = new Intl.RelativeTimeFormat(navigator.language, {style: 'long'});
+
+/**
+ * A list of plural rules for all languages.
+ * `plural_rules.go` defines the index for each of the 14 known plural rules.
+ *
+ * `pageData.PLURAL_RULE_LANG` is the index of the plural rule for the current language.
+ * `pageData.PLURAL_RULE_FALLBACK` is the index of the plural rule for the default language,
+ * to be used when a string is not translated in the current language.
+ *
+ * Each plural rule is a function that maps an amount `n` to the appropriate plural form index.
+ * Which index means which rule is specific for each language and also defined in `plural_rules.go`.
+ * The actual strings are in `pageData.PLURALSTRINGS_LANG` and `pageData.PLURALSTRINGS_FALLBACK`
+ * respectively, which is an array indexed by the plural form index.
+ *
+ * Links to the language plural rule and form definitions:
+ * https://codeberg.org/forgejo/forgejo/src/branch/forgejo/modules/translation/plural_rules.go
+ * https://www.unicode.org/cldr/charts/46/supplemental/language_plural_rules.html
+ * https://translate.codeberg.org/languages/$LANGUAGE_CODE/#information
+ * https://github.com/WeblateOrg/language-data/blob/main/languages.csv
+ */
+const PLURAL_RULES = [
+  // [ 0] Common 2-form, e.g. English, German
+  function (n) { return n !== 1 ? 1 : 0 },
+
+  // [ 1] Bengali 2-form
+  function (n) { return n > 1 ? 1 : 0 },
+
+  // [ 2] Icelandic 2-form
+  function (n) { return n % 10 !== 1 || n % 100 === 11 ? 1 : 0 },
+
+  // [ 3] Filipino 2-form
+  function (n) { return n !== 1 && n !== 2 && n !== 3 && (n % 10 === 4 || n % 10 === 6 || n % 10 === 9) ? 1 : 0 },
+
+  // [ 4] One form
+  function (_) { return 0 },
+
+  // [ 5] Czech 3-form
+  function (n) { return (n === 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2 },
+
+  // [ 6] Russian 3-form
+  function (n) { return n % 10 === 1 && n % 100 !== 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2 },
+
+  // [ 7] Polish 3-form
+  function (n) { return n === 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2 },
+
+  // [ 8] Latvian 3-form
+  function (n) { return (n % 10 === 0 || n % 100 >= 11 && n % 100 <= 19) ? 0 : ((n % 10 === 1 && n % 100 !== 11) ? 1 : 2) },
+
+  // [ 9] Lithunian 3-form
+  function (n) { return (n % 10 === 1 && (n % 100 < 11 || n % 100 > 19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? 1 : 2) },
+
+  // [10] French 3-form
+  function (n) { return (n === 0 || n === 1) ? 0 : ((n !== 0 && n % 1000000 === 0) ? 1 : 2) },
+
+  // [11] Catalan 3-form
+  function (n) { return (n === 1) ? 0 : ((n !== 0 && n % 1000000 === 0) ? 1 : 2) },
+
+  // [12] Slovenian 4-form
+  function (n) { return n % 100 === 1 ? 0 : n % 100 === 2 ? 1 : n % 100 === 3 || n % 100 === 4 ? 2 : 3 },
+
+  // [13] Arabic 6-form
+  function (n) { return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5 },
+];
+
+/**
+ * Look up the correct localized plural form for amount `n` for the string with the translation key `key`.
+ * If the current language does not contain a translation for this key, fallback to the browser's formatting.
+ */
+function GetPluralizedStringOrFallback(key, n, unit) {
+  const translation = pageData.PLURALSTRINGS_LANG[key]?.[PLURAL_RULES[pageData.PLURAL_RULE_LANG](n)];
+  if (translation) return translation.replace('%d', n);
+  return FALLBACK_DATETIME_FORMAT.format(-n, unit);
+}
+
+/**
+ * Update the displayed text of the given relative-time DOM element with its
+ * human-readable, localized relative time string.
+ * Returns the recommended interval in milliseconds until the object should be updated again,
+ * or null if the object is invalid.
+ */
+export function DoUpdateRelativeTime(object, now) {
+  const absoluteTime = object.getAttribute('datetime');
+  if (!absoluteTime) {
+    return null;  // Object does not contain a datetime.
+  }
+
+  if (!now) now = Date.now();
+
+  const nowJS = dayjs.utc(now);
+  const thenJS = dayjs.utc(absoluteTime);
+
+  object.setAttribute('data-tooltip-content', ABSOLUTE_DATETIME_FORMAT.format(thenJS.toDate()));
+
+  if (nowJS.isBefore(thenJS)) {
+    // Datetime is in the future.
+    object.textContent = pageData.DATETIMESTRINGS.FUTURE;
+    return -Math.floor(nowJS.diff(thenJS, 'millisecond'));
+  }
+
+  const years = Math.floor(nowJS.diff(thenJS, 'year'));
+  if (years >= 1) {
+    // Datetime is at least one year ago.
+    if (years === 1 && pageData.DATETIMESTRINGS['relativetime.1year']) {
+      // Datetime is one year ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.1year'];
+    } else if (years === 2 && pageData.DATETIMESTRINGS['relativetime.2years']) {
+      // Datetime is two year ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.2years'];
+    } else {
+      // Datetime is more than a year ago.
+      object.textContent = GetPluralizedStringOrFallback('relativetime.years', years, 'year');
+    }
+    return ONE_DAY;
+  }
+
+  const months = Math.floor(nowJS.diff(thenJS, 'month'));
+  if (months >= 1) {
+    // Datetime is at least one month but less than a year ago.
+    if (months === 1 && pageData.DATETIMESTRINGS['relativetime.1month']) {
+      // Datetime is one month ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.1month'];
+    } else if (months === 2 && pageData.DATETIMESTRINGS['relativetime.2months']) {
+      // Datetime is two months ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.2months'];
+    } else {
+      // Datetime is several months ago (but less than a year).
+      object.textContent = GetPluralizedStringOrFallback('relativetime.months', months, 'month');
+    }
+    return ONE_DAY;
+  }
+
+  const weeks = Math.floor(nowJS.diff(thenJS, 'week'));
+  if (weeks >= 1) {
+    // Datetime is at least one week but less than a month ago.
+    if (weeks === 1 && pageData.DATETIMESTRINGS['relativetime.1week']) {
+      // Datetime is one week ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.1week'];
+    } else if (weeks === 2 && pageData.DATETIMESTRINGS['relativetime.2weeks']) {
+      // Datetime is two week ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.2weeks'];
+    } else {
+      // Datetime is several weeks ago (but less than a month).
+      object.textContent = GetPluralizedStringOrFallback('relativetime.weeks', weeks, 'week');
+    }
+    return ONE_DAY;
+  }
+
+  const days = Math.floor(nowJS.diff(thenJS, 'day'));
+  if (days >= 1) {
+    if (days === 1 && pageData.DATETIMESTRINGS['relativetime.1day']) {
+      // Datetime is one day ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.1day'];
+    } else if (days === 2 && pageData.DATETIMESTRINGS['relativetime.2days']) {
+      // Datetime is two days ago.
+      object.textContent = pageData.DATETIMESTRINGS['relativetime.2days'];
+    } else {
+      // Datetime is several days but less than a week ago.
+      object.textContent = GetPluralizedStringOrFallback('relativetime.days', days, 'day');
+    }
+    return ONE_DAY;
+  }
+
+  const hours = Math.floor(nowJS.diff(thenJS, 'hour'));
+  if (hours >= 1) {
+    // Datetime is one or more hours but less than a day ago.
+    object.textContent = GetPluralizedStringOrFallback('relativetime.hours', hours, 'hour');
+    return ONE_HOUR;
+  }
+
+  const minutes = Math.floor(nowJS.diff(thenJS, 'minute'));
+  if (minutes >= 1) {
+    // Datetime is one or more minutes but less than an hour ago.
+    object.textContent = GetPluralizedStringOrFallback('relativetime.mins', minutes, 'minute');
+    return ONE_MINUTE;
+  }
+
+  // Datetime is very recent.
+  object.textContent = pageData.DATETIMESTRINGS.NOW;
+  return HALF_MINUTE;
+}
+
+window.customElements.define('relative-time', class extends HTMLElement {
+  static observedAttributes = ['datetime'];
+
+  alive = false;
+  contentSpan = null;
+
+  update = (recurring) => {
+    if (!this.alive) return;
+
+    if (!this.shadowRoot) {
+      this.attachShadow({mode: 'open'});
+      this.contentSpan = document.createElement('span');
+      this.shadowRoot.append(this.contentSpan);
+    }
+
+    const next = DoUpdateRelativeTime(this);
+    if (recurring && next !== null) setTimeout(() => { this.update(true) }, next);
+  };
+
+  connectedCallback() {
+    this.alive = true;
+    this.update(true);
+  }
+
+  disconnectedCallback() {
+    this.alive = false;
+  }
+
+  attributeChangedCallback(name, oldValue, newValue) {
+    if (name === 'datetime' && oldValue !== newValue) this.update(false);
+  }
+
+  set textContent(value) {
+    if (this.contentSpan) this.contentSpan.textContent = value;
+  }
+  get textContent() {
+    return this.contentSpan?.textContent;
+  }
+});
diff --git a/web_src/js/webcomponents/relative-time.test.js b/web_src/js/webcomponents/relative-time.test.js
new file mode 100644
index 0000000000..5a8e2950e0
--- /dev/null
+++ b/web_src/js/webcomponents/relative-time.test.js
@@ -0,0 +1,213 @@
+import {DoUpdateRelativeTime, HALF_MINUTE, ONE_MINUTE, ONE_HOUR, ONE_DAY} from './relative-time.js';
+
+test('CalculateRelativeTimes', () => {
+  window.config.pageData.PLURAL_RULE_LANG = 0;
+  window.config.pageData.DATETIMESTRINGS = {
+    'FUTURE': 'in future',
+    'NOW': 'now',
+    'relativetime.1day': 'yesterday',
+    'relativetime.1week': 'last week',
+    'relativetime.1month': 'last month',
+    'relativetime.1year': 'last year',
+    'relativetime.2days': 'two days ago',
+    'relativetime.2weeks': 'two weeks ago',
+    'relativetime.2months': 'two months ago',
+    'relativetime.2years': 'two years ago',
+  };
+  window.config.pageData.PLURALSTRINGS_LANG = {
+    'relativetime.mins': ['%d minute ago', '%d minutes ago'],
+    'relativetime.hours': ['%d hour ago', '%d hours ago'],
+    'relativetime.days': ['%d day ago', '%d days ago'],
+    'relativetime.weeks': ['%d week ago', '%d weeks ago'],
+    'relativetime.months': ['%d month ago', '%d months ago'],
+    'relativetime.years': ['%d year ago', '%d years ago'],
+  };
+  const mock = document.createElement('relative-time');
+  document.body.append(mock);
+
+  const now = Date.parse('2024-10-27T04:05:30+01:00');  // One hour after DST switchover, CET.
+
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(null);
+  expect(mock.textContent).toEqual('');
+
+  mock.setAttribute('datetime', '2024-10-27T04:06:40+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(70000);
+  expect(mock.textContent).toEqual('in future');
+
+  mock.setAttribute('datetime', '2024-10-27T04:05:10+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(HALF_MINUTE);
+  expect(mock.textContent).toEqual('now');
+
+  mock.setAttribute('datetime', '2024-10-27T04:04:30+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('1 minute ago');
+
+  mock.setAttribute('datetime', '2024-10-27T04:04:00+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('1 minute ago');
+
+  mock.setAttribute('datetime', '2024-10-27T04:03:20+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('2 minutes ago');
+
+  mock.setAttribute('datetime', '2024-10-27T04:00:00+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('5 minutes ago');
+
+  mock.setAttribute('datetime', '2024-10-27T03:59:30+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('6 minutes ago');
+
+  mock.setAttribute('datetime', '2024-10-27T03:01:00+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('1 hour ago');
+
+  mock.setAttribute('datetime', '2024-10-27T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('4 hours ago');  // This tests DST switchover
+
+  mock.setAttribute('datetime', '2024-10-27T00:01:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('5 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-26T22:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('7 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-26T05:08:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('23 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-26T04:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('yesterday');
+
+  mock.setAttribute('datetime', '2024-10-25T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('two days ago');
+
+  mock.setAttribute('datetime', '2024-10-21T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('6 days ago');
+
+  mock.setAttribute('datetime', '2024-10-20T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last week');
+
+  mock.setAttribute('datetime', '2024-10-14T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last week');
+
+  mock.setAttribute('datetime', '2024-10-13T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('two weeks ago');
+
+  mock.setAttribute('datetime', '2024-10-06T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('3 weeks ago');
+
+  mock.setAttribute('datetime', '2024-09-25T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last month');
+
+  mock.setAttribute('datetime', '2024-08-30T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last month');
+
+  mock.setAttribute('datetime', '2024-07-30T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('two months ago');
+
+  mock.setAttribute('datetime', '2024-05-30T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('4 months ago');
+
+  mock.setAttribute('datetime', '2024-03-01T01:00:00+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('7 months ago');
+
+  mock.setAttribute('datetime', '2024-02-29T01:00:00+01:00');  // Leap day handling
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('7 months ago');
+
+  mock.setAttribute('datetime', '2024-02-27T01:00:00-03:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('7 months ago');
+
+  mock.setAttribute('datetime', '2024-02-27T01:00:00+01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('8 months ago');
+
+  mock.setAttribute('datetime', '2023-11-15T01:00:00+03:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('11 months ago');
+
+  mock.setAttribute('datetime', '2023-10-20T01:00:00+08:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last year');
+
+  mock.setAttribute('datetime', '2022-10-30T01:00:00-05:30');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('last year');
+
+  mock.setAttribute('datetime', '2022-10-20T01:00:00+10:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('two years ago');
+
+  mock.setAttribute('datetime', '2021-10-20T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('3 years ago');
+
+  mock.setAttribute('datetime', '2014-10-20T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_DAY);
+  expect(mock.textContent).toEqual('10 years ago');
+
+  // Timezone tests
+  mock.setAttribute('datetime', '2024-10-27T01:05:30-05:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(3 * ONE_HOUR);
+  expect(mock.textContent).toEqual('in future');
+
+  mock.setAttribute('datetime', '2024-10-27T05:05:25+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(HALF_MINUTE);
+  expect(mock.textContent).toEqual('now');
+
+  mock.setAttribute('datetime', '2024-10-27T05:04:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('1 minute ago');
+
+  mock.setAttribute('datetime', '2024-10-27T05:02:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('3 minutes ago');
+
+  mock.setAttribute('datetime', '2024-10-27T04:06:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_MINUTE);
+  expect(mock.textContent).toEqual('59 minutes ago');
+
+  mock.setAttribute('datetime', '2024-10-27T04:05:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('1 hour ago');
+
+  mock.setAttribute('datetime', '2024-10-27T01:00:00+02:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('4 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-27T01:00:00+04:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('6 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-27T01:00:00+10:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('12 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-27T01:00:00Z');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('2 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-26T15:00:00-01:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('11 hours ago');
+
+  mock.setAttribute('datetime', '2024-10-25T19:00:00-11:00');
+  expect(DoUpdateRelativeTime(mock, now)).toEqual(ONE_HOUR);
+  expect(mock.textContent).toEqual('21 hours ago');
+});
diff --git a/web_src/svg/gitea-forgejo.svg b/web_src/svg/gitea-forgejo.svg
index e00e5963cf..9daa1ff8f3 100644
--- a/web_src/svg/gitea-forgejo.svg
+++ b/web_src/svg/gitea-forgejo.svg
@@ -1,5 +1,5 @@
-<svg width="64" height="64" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" class="forgejo-logo" aria-hidden="true">
-  <g transform="translate(28,28)">
+<svg width="64" height="64" viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg" class="forgejo-logo" aria-hidden="true">
+  <g transform="translate(6,6)">
     <path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" fill="none" stroke="#ff6600" stroke-width="25" />
     <path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" fill="none" stroke="#d40000" stroke-width="25" />
     <circle cx="142" cy="20" r="18" fill="none" stroke="#ff6600" stroke-width="15" />
diff --git a/web_src/svg/gitea-git.svg b/web_src/svg/gitea-git.svg
index 8b8a7b5fed..b60f3818d1 100644
--- a/web_src/svg/gitea-git.svg
+++ b/web_src/svg/gitea-git.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="64px" height="64px"><path d="M42.2,22.1L25.9,5.8C25.4,5.3,24.7,5,24,5c0,0,0,0,0,0c-0.7,0-1.4,0.3-1.9,0.8l-3.5,3.5l4.1,4.1c0.4-0.2,0.8-0.3,1.3-0.3c1.7,0,3,1.3,3,3c0,0.5-0.1,0.9-0.3,1.3l4,4c0.4-0.2,0.8-0.3,1.3-0.3c1.7,0,3,1.3,3,3s-1.3,3-3,3c-1.7,0-3-1.3-3-3c0-0.5,0.1-0.9,0.3-1.3l-4-4c-0.1,0-0.2,0.1-0.3,0.1v10.4c1.2,0.4,2,1.5,2,2.8c0,1.7-1.3,3-3,3s-3-1.3-3-3c0-1.3,0.8-2.4,2-2.8V18.8c-1.2-0.4-2-1.5-2-2.8c0-0.5,0.1-0.9,0.3-1.3l-4.1-4.1L5.8,22.1C5.3,22.6,5,23.3,5,24c0,0.7,0.3,1.4,0.8,1.9l16.3,16.3c0,0,0,0,0,0c0.5,0.5,1.2,0.8,1.9,0.8s1.4-0.3,1.9-0.8l16.3-16.3c0.5-0.5,0.8-1.2,0.8-1.9C43,23.3,42.7,22.6,42.2,22.1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="50.667px" height="50.667px">
+	<path d="M 46.989474,21.6 26.399999,1.0105263 C 25.768421,0.3789474 24.884211,0 24,0 c 0,0 0,0 0,0 -0.884211,0 -1.768421,0.3789474 -2.400001,1.0105263 l -4.421052,4.4210527 5.178947,5.178947 C 22.863158,10.357895 23.368422,10.231579 24,10.231579 c 2.147368,0 3.789474,1.642105 3.789474,3.789474 0,0.631579 -0.126316,1.136842 -0.378947,1.642105 l 5.052631,5.052632 c 0.505264,-0.252632 1.010526,-0.378948 1.642106,-0.378948 2.147368,0 3.789473,1.642105 3.789473,3.789474 0,2.147368 -1.642105,3.789474 -3.789473,3.789474 -2.14737,0 -3.789474,-1.642106 -3.789474,-3.789474 0,-0.631579 0.126316,-1.136842 0.378947,-1.642105 l -5.052631,-5.052632 c -0.126316,0 -0.252633,0.126316 -0.378947,0.126316 v 13.136842 c 1.515788,0.505263 2.526315,1.894737 2.526315,3.536842 0,2.147368 -1.642106,3.789474 -3.789474,3.789474 -2.147368,0 -3.789474,-1.642106 -3.789474,-3.789474 0,-1.642105 1.010527,-3.031579 2.526316,-3.536842 V 17.431579 c -1.515789,-0.505263 -2.526316,-1.894737 -2.526316,-3.536842 0,-0.631579 0.126316,-1.136842 0.378947,-1.642105 L 15.410526,7.073684 1.0105264,21.6 C 0.3789474,22.231579 0,23.11579 0,24 c 0,0.884211 0.3789474,1.768421 1.0105264,2.4 L 21.599999,46.989474 c 0,0 0,0 0,0 C 22.231579,47.621053 23.115789,48 24,48 c 0.884211,0 1.768421,-0.378947 2.399999,-1.010526 L 46.989474,26.4 C 47.621053,25.768421 48,24.884211 48,24 48,23.11579 47.621053,22.231579 46.989474,21.6 Z" />
+</svg>
\ No newline at end of file
diff --git a/web_src/svg/gitea-gogs.svg b/web_src/svg/gitea-gogs.svg
index 7c4d5c23a3..2b0aeb7dea 100644
--- a/web_src/svg/gitea-gogs.svg
+++ b/web_src/svg/gitea-gogs.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="67.73333mm"
-   height="67.73333mm"
-   viewBox="0 0 67.73333 67.73333"
+   width="64mm"
+   height="64mm"
+   viewBox="0 0 67.724868 67.724868"
    version="1.1"
    id="svg8"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
-   sodipodi:docname="gitea-gogs.svg">
+   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
+   sodipodi:docname="gitea-gogs.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs2" />
   <sodipodi:namedview
@@ -24,17 +24,20 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.4352161"
-     inkscape:cx="145.15203"
-     inkscape:cy="129.56614"
+     inkscape:cx="122.57639"
+     inkscape:cy="137.97543"
      inkscape:document-units="mm"
      inkscape:current-layer="layer3"
      inkscape:document-rotation="0"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1006"
-     inkscape:window-x="1200"
-     inkscape:window-y="444"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="2327"
+     inkscape:window-height="1238"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -43,7 +46,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,8 +55,8 @@
      inkscape:label="Layer 3"
      style="display:inline">
     <path
-       style="display:inline;fill:#d75547;fill-opacity:1;fill-rule:evenodd;stroke:#428f29;stroke-width:0.0190672;paint-order:markers fill stroke"
-       d="M 28.763808,62.186078 C 28.552224,62.156588 28.3282,62.079645 28.265977,62.01509 28.123377,61.867145 27.941284,61.235718 27.375971,58.928893 27.128273,57.918138 26.870167,56.952588 26.8024,56.783223 26.653428,56.410912 26.321729,56.197407 24.664484,55.407125 22.815394,54.525354 20.800132,53.303558 19.034519,51.99383 l -0.753641,-0.55905 -2.322335,0.678345 c -1.277286,0.37309 -2.657942,0.75099 -3.068125,0.839774 l -0.745787,0.161424 -0.351437,-0.536616 C 10.841488,51.124528 8.2297585,46.620395 7.1670955,44.599636 L 6.6102577,43.540752 7.0934858,42.948695 c 0.2657754,-0.325634 1.2926661,-1.41771 2.2819797,-2.426837 l 1.7987515,-1.834779 -0.180416,-1.038637 c -0.160803,-0.925735 -0.180684,-1.319661 -0.182886,-3.623976 -0.002,-2.082515 0.02593,-2.77882 0.143552,-3.580102 L 11.100491,29.449609 9.0366642,27.414662 C 7.5050421,25.904473 6.9326263,25.287565 6.8169034,25.02237 6.6626002,24.668764 6.6626297,24.660735 6.8197249,24.254845 7.2963868,23.023252 11.239804,16.273894 12.005659,15.378857 l 0.257067,-0.300427 0.484759,0.125942 c 0.266618,0.06927 1.585016,0.43706 2.929773,0.817315 l 2.445013,0.691373 0.429771,-0.260466 c 0.236371,-0.143253 0.844892,-0.564341 1.352266,-0.935741 1.30433,-0.954784 2.690014,-1.762213 4.707543,-2.74306 1.87475,-0.911433 1.838916,-0.883043 2.124645,-1.683256 0.06563,-0.1838 0.336217,-1.1703787 0.601305,-2.1923981 0.26509,-1.0220196 0.573575,-2.1360624 0.685518,-2.4756513 0.17614,-0.5343091 0.23295,-0.623873 0.421984,-0.6652627 0.483669,-0.1058996 3.97054,-0.1502609 7.292057,-0.092772 l 3.518704,0.060902 0.430989,1.7479767 c 0.510047,2.0686117 0.909017,3.4804444 1.127722,3.9906574 0.174557,0.407221 0.0081,0.308631 2.593742,1.53554 1.3556,0.643225 2.654323,1.424602 4.307061,2.591347 0.702523,0.495943 1.33877,0.943783 1.413882,0.995202 0.109699,0.0751 0.502152,-0.01615 1.994813,-0.463793 1.022033,-0.306501 2.381778,-0.689488 3.021651,-0.85108 l 1.163411,-0.293805 0.145052,0.19205 c 0.93221,1.234241 5.324678,8.900157 5.324678,9.292846 0,0.333447 -0.488016,0.914807 -2.540796,3.02678 l -1.893181,1.947777 0.15824,0.960735 c 0.227755,1.382822 0.274355,3.126299 0.15827,5.921847 l -0.101763,2.450639 1.510118,1.495377 c 1.549811,1.534681 2.47101,2.550338 2.683271,2.958414 0.115947,0.22291 0.103768,0.264805 -0.328833,1.13109 -1.289906,2.583039 -4.510781,8.106197 -4.924647,8.444791 -0.229142,0.187467 -0.906252,0.05936 -3.361841,-0.636096 -1.264388,-0.358089 -2.427812,-0.66997 -2.585382,-0.693076 -0.254259,-0.03729 -0.377393,0.02128 -1.094426,0.520539 -2.75021,1.914888 -3.396183,2.301016 -5.615132,3.356412 -0.864328,0.4111 -1.586938,0.808234 -1.713456,0.94169 -0.279925,0.295269 -0.499881,1.010417 -1.141053,3.709893 l -0.508517,2.140988 -1.893589,0.04981 c -2.516342,0.0662 -8.338233,0.06367 -8.822539,-0.0038 z m 7.858077,-12.120535 c 2.091378,-0.388455 5.175143,-1.723813 6.867427,-2.973786 1.796481,-1.326945 4.757949,-4.883235 4.97652,-5.976082 0.04707,-0.23538 0.0195,-0.268126 -0.544626,-0.646577 -0.89966,-0.603557 -2.187787,-1.377201 -5.078243,-3.049968 -4.184205,-2.421491 -4.52345,-2.676285 -4.524118,-3.397889 -0.0011,-1.340016 -1.219035,-3.278179 -2.4241,-3.858035 -1.790528,-0.861573 -3.841611,-0.52172 -5.213619,0.863866 -0.315085,0.318202 -0.680808,0.789483 -0.82133,1.058382 -1.355657,2.59418 0.09164,5.558218 3.005202,6.154597 0.886416,0.181439 1.72976,0.07365 2.913276,-0.372328 l 0.879991,-0.331607 2.02184,1.158352 c 2.672299,1.531012 3.61875,2.12207 4.1007,2.560884 0.340094,0.309652 0.391458,0.394601 0.346398,0.57285 -0.0768,0.303803 -0.673843,1.002125 -1.394132,1.630629 -1.608465,1.403495 -3.352982,2.265892 -5.547142,2.742214 -1.178042,0.255735 -3.523379,0.256058 -4.699639,6.79e-4 -1.211182,-0.262989 -1.987409,-0.533958 -3.06492,-1.06991 -3.757271,-1.868855 -6.310115,-5.470633 -6.829909,-9.636234 -0.156607,-1.255046 -0.06748,-3.197221 0.200967,-4.379595 1.024517,-4.512371 4.409288,-7.971423 8.971948,-9.168835 1.368354,-0.359109 1.98948,-0.43042 3.32699,-0.381966 1.261093,0.04568 1.953923,0.167871 3.540434,0.624377 0.565292,0.162659 1.094549,0.260446 1.454278,0.268701 0.495297,0.01136 0.620752,-0.01798 1.009916,-0.236201 1.079693,-0.605431 1.3594,-1.855128 0.602683,-2.692712 -1.317562,-1.458359 -6.682213,-2.214558 -10.373764,-1.462279 -2.483279,0.506053 -5.053495,1.805105 -6.993517,3.534699 -2.575021,2.295712 -4.259712,4.711906 -5.127071,7.353271 -0.924677,2.815913 -1.025226,6.141317 -0.275431,9.109059 0.774038,3.063694 2.549965,5.963534 4.958139,8.095943 2.441521,2.161939 5.76675,3.672334 8.927653,4.055148 1.089179,0.13191 3.734827,0.04956 4.807199,-0.149613 z"
+       style="display:inline;fill:#d75547;fill-opacity:1;fill-rule:evenodd;stroke:#428f29;stroke-width:0.0190659;paint-order:markers fill stroke"
+       d="m 27.943159,67.65302 c -0.253104,-0.03528 -0.521089,-0.127319 -0.595523,-0.204541 -0.170583,-0.176978 -0.388409,-0.932313 -1.064657,-3.69182 -0.296305,-1.209101 -0.60506,-2.364126 -0.686126,-2.566727 -0.178205,-0.445372 -0.574995,-0.700774 -2.557451,-1.646137 -2.211948,-1.054807 -4.622676,-2.516363 -6.734766,-4.083106 l -0.901532,-0.668755 -2.778061,0.81146 c -1.527934,0.446304 -3.1795254,0.898361 -3.6702011,1.004568 l -0.8921367,0.1931 -0.4204017,-0.641919 C 6.503839,54.420798 3.3795946,49.032794 2.1083992,46.61549 L 1.4422899,45.348815 2.0203446,44.640574 C 2.3382746,44.25104 3.566678,42.94466 4.7501303,41.737505 L 6.9018612,39.542677 6.6860413,38.300222 C 6.4936827,37.192826 6.4699004,36.721598 6.4672666,33.965093 c -0.0024,-2.491179 0.031018,-3.324124 0.171722,-4.282646 L 6.8136674,28.492485 4.3448441,26.058209 C 2.512663,24.251667 1.8279188,23.5137 1.6894868,23.196464 1.5049038,22.773468 1.5049391,22.763863 1.692862,22.278323 2.2630621,20.805047 6.9803188,12.731224 7.8964618,11.660549 l 0.3075125,-0.359381 0.5798865,0.150655 c 0.3189377,0.08286 1.8960532,0.522828 3.5047002,0.977702 l 2.924811,0.827045 0.514108,-0.311579 c 0.282756,-0.171364 1.01069,-0.675085 1.617629,-1.119367 1.560286,-1.142146 3.217891,-2.1080228 5.631331,-3.2813469 2.242643,-1.0902889 2.199778,-1.0563282 2.541577,-2.0135714 0.0785,-0.2198676 0.402195,-1.4000482 0.719302,-2.6226247 0.31711,-1.2225764 0.686131,-2.5552343 0.820041,-2.96146271 0.210706,-0.63915956 0.278663,-0.74629918 0.504792,-0.79581102 0.578583,-0.12668086 4.749702,-0.17974745 8.72302,-0.11097715 l 4.209199,0.07285291 0.515565,2.09099227 c 0.610136,2.4745478 1.087398,4.1634318 1.349022,4.7737672 0.20881,0.487132 0.0097,0.3691952 3.102726,1.8368677 1.621618,0.7694493 3.175196,1.7041608 5.15226,3.0998638 0.840384,0.593265 1.601485,1.128986 1.691337,1.190496 0.131226,0.08983 0.600692,-0.01932 2.386266,-0.554806 1.222593,-0.366648 2.849169,-0.82479 3.614607,-1.018092 l 1.391714,-0.351461 0.173517,0.229738 c 1.115143,1.476443 6.36957,10.646686 6.36957,11.116435 0,0.398881 -0.583782,1.094324 -3.039391,3.620742 l -2.264691,2.33 0.189292,1.149266 c 0.272449,1.654181 0.328193,3.739791 0.189329,7.083925 l -0.121733,2.931542 1.806457,1.788824 c 1.85394,1.835839 2.955911,3.050805 3.209825,3.53896 0.138699,0.266653 0.12413,0.316769 -0.393361,1.35305 -1.543033,3.089924 -5.395959,9.696923 -5.89104,10.101962 -0.274108,0.224254 -1.08409,0.071 -4.021554,-0.760921 -1.512507,-0.428359 -2.904235,-0.801442 -3.092726,-0.829082 -0.304154,-0.04461 -0.451452,0.02546 -1.309192,0.622687 -3.2899,2.290657 -4.062636,2.752557 -6.717022,4.01506 -1.033939,0.491772 -1.898352,0.966838 -2.049698,1.126483 -0.334855,0.353211 -0.597975,1.208697 -1.364967,4.437907 l -0.608307,2.561126 -2.265179,0.05959 c -3.010138,0.07919 -9.974492,0.07617 -10.553837,-0.0045 z m 9.400113,-14.499017 c 2.501781,-0.464684 6.190692,-2.062087 8.215062,-3.55735 2.149015,-1.587338 5.691629,-5.8415 5.953092,-7.148802 0.05631,-0.28157 0.02333,-0.320742 -0.651502,-0.773458 -1.076206,-0.721997 -2.617109,-1.647457 -6.074776,-3.648482 -5.005295,-2.896673 -5.411113,-3.201467 -5.411912,-4.064676 -0.0013,-1.602975 -1.458253,-3.921475 -2.899794,-4.615119 -2.141895,-1.030644 -4.595473,-0.6241 -6.236718,1.033387 -0.376916,0.380645 -0.814407,0.944408 -0.982504,1.266075 -1.621686,3.10325 0.109622,6.648939 3.59493,7.362349 1.060362,0.217044 2.0692,0.0881 3.484964,-0.445392 l 1.052677,-0.39668 2.418598,1.385662 c 3.196699,1.831451 4.328878,2.538496 4.905404,3.063421 0.406832,0.370416 0.468276,0.472035 0.414374,0.685263 -0.09187,0.36342 -0.806076,1.198778 -1.667711,1.950617 -1.924104,1.678911 -4.010957,2.710541 -6.63569,3.280334 -1.409216,0.305919 -4.214792,0.306306 -5.621876,8.13e-4 -1.44886,-0.314597 -2.37741,-0.63874 -3.666367,-1.279865 -4.494582,-2.235591 -7.548385,-6.544167 -8.170181,-11.527208 -0.187339,-1.501331 -0.08072,-3.82463 0.240404,-5.239028 1.225563,-5.397859 5.274548,-9.535701 10.732564,-10.968088 1.636875,-0.429579 2.379888,-0.514884 3.979865,-0.456921 1.508564,0.05465 2.337352,0.200813 4.235194,0.746902 0.676222,0.194578 1.309338,0.311554 1.739659,0.321429 0.592492,0.01359 0.742566,-0.02151 1.208098,-0.282552 1.291567,-0.724238 1.626162,-2.21917 0.72095,-3.221118 -1.576114,-1.744541 -7.993501,-2.649134 -12.409467,-1.749231 -2.970586,0.605359 -6.045171,2.159331 -8.365895,4.228334 -3.080333,2.746212 -5.09562,5.63655 -6.133185,8.796246 -1.106132,3.368495 -1.226413,7.346462 -0.329481,10.896582 0.925932,3.6649 3.05036,7.133792 5.931103,9.684656 2.920634,2.586189 6.898393,4.392977 10.679578,4.850913 1.302915,0.157795 4.467734,0.05929 5.750543,-0.178972 z"
        id="path851" />
   </g>
 </svg>
diff --git a/web_src/svg/gitea-pagure.svg b/web_src/svg/gitea-pagure.svg
new file mode 100644
index 0000000000..83be6f327d
--- /dev/null
+++ b/web_src/svg/gitea-pagure.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="39.512001"
+   height="39.512001"
+   viewBox="0 0 10.454224 10.454217"
+   version="1.1">
+  <metadata>
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-48.767028,-31.073165)">
+    <g
+       transform="matrix(0.45619308,0,0,0.45619308,26.519847,-9.145808)">
+      <g
+         transform="matrix(0.92003825,0,0,0.92003825,3.8994993,8.9046582)">
+        <g
+           transform="matrix(0.87505175,-0.54912416,0.54912416,0.87505175,-52.292126,47.022454)">
+          <path
+             transform="matrix(0.53395907,0.33507714,-0.33507714,0.53395907,54.685595,80.121722)"
+             style="clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke:none;stroke-width:0.778374;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 34.519376,21.53842 c 0,-2.343965 -2.092585,-4.220886 -3.635184,-4.220886 -3.133047,0 -4.01491,3.041056 -2.519944,4.376926 1.58157,-1.546962 2.760757,-1.597918 2.42654,0.417442 -7.5641,3.420547 -5.836494,-8.93461 1.820842,-6.077642 3.409837,1.961992 4.364822,7.587748 4.9954,7.077416 l 5.703532,-3.831164 c 0,-3.99985 -5.081938,-11.8671544 -13.661593,-11.8735192 -7.498487,0.1300211 -11.119054,5.1439942 -11.25714,10.3466382 -0.132687,4.999231 2.957988,9.58011 8.533555,9.646318 4.065606,0.05446 7.568536,-1.984508 7.593992,-5.861529 z" />
+          <path
+             d="m 72.29416,106.28894 c -1.478128,0.38759 -3.872069,0.33961 -5.18357,0.27351 -0.528269,1.01876 -0.500512,2.37914 0.332437,3.64196 0.780147,1.18279 2.685594,1.69795 4.034684,2.31241 -1.212021,-1.58997 -1.618278,-2.48974 -1.633317,-4.3115 2.021654,0.76273 2.808437,2.58944 4.212318,3.88473 0.170709,-1.482 -0.334767,-3.52495 -1.191751,-4.98504 -0.181028,-0.30843 -0.372016,-0.57729 -0.570801,-0.81607 z"
+             style="clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.24726;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+          <path
+             style="fill:none;fill-rule:evenodd;stroke:currentColor;stroke-width:1.30185;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             d="m 63.150641,101.29946 c 0.173541,-0.19476 0.372467,0.20616 0.374054,0.3256 0.0082,0.61511 -0.783113,0.79258 -1.258605,0.62518 -1.066654,-0.37551 -1.299961,-1.76928 -0.871913,-2.724294 0.735874,-1.6418 2.75877,-1.976179 4.15323,-1.215089 2.096886,1.144489 2.460901,3.956923 1.297046,5.825233 -1.614278,2.59134 -5.257077,2.84546 -7.816061,1.04742 -3.362364,-2.36252 -3.971391,-7.110608 -1.837672,-10.348328 2.696955,-4.092392 8.399902,-4.654783 12.2875,-1.865518 3.667361,2.631248 5.120332,7.488526 3.748305,11.762766 -1.478319,1.07177 -7.030569,0.59572 -7.030569,0.59572" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/webpack.config.js b/webpack.config.js
index 4662a30db5..8f9949d7b1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,7 +5,7 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
 import {VueLoaderPlugin} from 'vue-loader';
 import EsBuildLoader from 'esbuild-loader';
-import {parse, dirname} from 'node:path';
+import {parse} from 'node:path';
 import webpack from 'webpack';
 import {fileURLToPath} from 'node:url';
 import {readFileSync, writeFileSync} from 'node:fs';
@@ -16,10 +16,10 @@ import tailwindcssNesting from 'tailwindcss/nesting/index.js';
 import postcssNesting from 'postcss-nesting';
 
 const {EsbuildPlugin} = EsBuildLoader;
-const {SourceMapDevToolPlugin, DefinePlugin} = webpack;
+const {SourceMapDevToolPlugin, DefinePlugin, ProgressPlugin} = webpack;
 const formatLicenseText = (licenseText) => wrapAnsi(licenseText || '', 80).trim();
 
-const baseDirectory = dirname(fileURLToPath(new URL(import.meta.url)));
+const baseDirectory = import.meta.dirname;
 const glob = (pattern) => fastGlob.sync(pattern, {
   cwd: baseDirectory,
   absolute: true,
@@ -80,12 +80,13 @@ if ('ENABLE_SOURCEMAP' in env) {
 // define which web components we use for Vue to not interpret them as Vue components
 const webComponents = new Set([
   // our own, in web_src/js/webcomponents
+  'i18n',
   'overflow-menu',
   'origin-url',
   'absolute-date',
+  'relative-time',
   // from dependencies
   'markdown-toolbar',
-  'relative-time',
   'text-expander',
 ]);
 
@@ -233,8 +234,11 @@ export default {
     ],
   },
   plugins: [
+    new ProgressPlugin({
+      activeModules: true,
+    }),
     new webpack.ProvidePlugin({ // for htmx extensions
-      htmx: 'htmx.org',
+      htmx: ['htmx.org', 'default'],
     }),
     new DefinePlugin({
       __VUE_OPTIONS_API__: true, // at the moment, many Vue components still use the Vue Options API