diff --git a/.air.toml b/.air.toml index d13f8c4f99..de97bd8b29 100644 --- a/.air.toml +++ b/.air.toml @@ -8,6 +8,15 @@ delay = 1000 include_ext = ["go", "tmpl"] include_file = ["main.go"] include_dir = ["cmd", "models", "modules", "options", "routers", "services"] -exclude_dir = ["modules/git/tests", "services/gitdiff/testdata", "modules/avatar/testdata", "models/fixtures", "models/migrations/fixtures", "modules/migration/file_format_testdata", "modules/avatar/identicon/testdata"] +exclude_dir = [ + "models/fixtures", + "models/migrations/fixtures", + "modules/avatar/identicon/testdata", + "modules/avatar/testdata", + "modules/git/tests", + "modules/migration/file_format_testdata", + "routers/private/tests", + "services/gitdiff/testdata", +] exclude_regex = ["_test.go$", "_gen.go$"] stop_on_error = true diff --git a/.deadcode-out b/.deadcode-out index 3290e6102a..940551da04 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -84,7 +84,6 @@ package "code.gitea.io/gitea/models/repo" func (*releaseSorter).Swap func SortReleases func FindReposMapByIDs - func RepositoryListOfMap func (SearchOrderBy).String func IsErrTopicNotExist func (ErrTopicNotExist).Error @@ -162,9 +161,6 @@ package "code.gitea.io/gitea/modules/cache" package "code.gitea.io/gitea/modules/charset" func (*BreakWriter).Write -package "code.gitea.io/gitea/modules/context" - func GetPrivateContext - package "code.gitea.io/gitea/modules/emoji" func ReplaceCodes @@ -181,6 +177,7 @@ package "code.gitea.io/gitea/modules/git" func (ErrExecTimeout).Error func (ErrUnsupportedVersion).Error func SetUpdateHook + func GetObjectFormatOfRepo func openRepositoryWithDefaultContext func IsTagExist func ToEntryMode @@ -192,6 +189,7 @@ package "code.gitea.io/gitea/modules/gitgraph" package "code.gitea.io/gitea/modules/gitrepo" func GetBranchCommitID + func GetWikiDefaultBranch package "code.gitea.io/gitea/modules/graceful" func (*Manager).TerminateContext @@ -224,7 +222,6 @@ package "code.gitea.io/gitea/modules/markup/markdown" func IsSummary func IsTaskCheckBoxListItem func IsIcon - func IsColorPreview func RenderRawString package "code.gitea.io/gitea/modules/markup/markdown/math" @@ -274,13 +271,19 @@ package "code.gitea.io/gitea/modules/sync" package "code.gitea.io/gitea/modules/testlogger" func (*testLoggerWriterCloser).pushT - func (*testLoggerWriterCloser).Write + func (*testLoggerWriterCloser).Log + func (*testLoggerWriterCloser).recordError + func (*testLoggerWriterCloser).printMsg func (*testLoggerWriterCloser).popT - func (*testLoggerWriterCloser).Close func (*testLoggerWriterCloser).Reset func PrintCurrentTest func Printf func NewTestLoggerWriter + func (*TestLogEventWriter).Base + func (*TestLogEventWriter).GetLevel + func (*TestLogEventWriter).GetWriterName + func (*TestLogEventWriter).GetWriterType + func (*TestLogEventWriter).Run package "code.gitea.io/gitea/modules/timeutil" func GetExecutableModTime @@ -292,11 +295,9 @@ package "code.gitea.io/gitea/modules/translation" func (MockLocale).TrString func (MockLocale).Tr func (MockLocale).TrN + func (MockLocale).TrSize func (MockLocale).PrettyNumber -package "code.gitea.io/gitea/modules/util" - func UnsafeStringToBytes - package "code.gitea.io/gitea/modules/util/filebuffer" func CreateFromReader @@ -315,6 +316,9 @@ package "code.gitea.io/gitea/routers/web/org" func getActionIssues func UpdateIssueProject +package "code.gitea.io/gitea/services/context" + func GetPrivateContext + package "code.gitea.io/gitea/services/convert" func ToSecret @@ -326,7 +330,6 @@ package "code.gitea.io/gitea/services/pull" package "code.gitea.io/gitea/services/repository" func IsErrForkAlreadyExist - func UpdateRepositoryUnits package "code.gitea.io/gitea/services/repository/archiver" func ArchiveRepository diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9e290fb6a5..1b1b66c7dd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,11 +4,13 @@ "features": { // installs nodejs into container "ghcr.io/devcontainers/features/node:1": { - "version":"20" + "version": "20" }, "ghcr.io/devcontainers/features/git-lfs:1.1.0": {}, "ghcr.io/devcontainers-contrib/features/poetry:2": {}, - "ghcr.io/devcontainers/features/python:1": {} + "ghcr.io/devcontainers/features/python:1": { + "version": "3.12" + } }, "customizations": { "vscode": { @@ -22,7 +24,7 @@ "DavidAnson.vscode-markdownlint", "Vue.volar", "ms-azuretools.vscode-docker", - "zixuanchen.vitest-explorer", + "vitest.explorer", "qwtel.sqlite-viewer", "GitHub.vscode-pull-request-github" ] diff --git a/.dockerignore b/.dockerignore index 80cbeb040c..4c14a94620 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,7 +14,7 @@ _test # MS VSCode .vscode -__debug_bin +__debug_bin* # Architecture specific extensions/prefixes *.[568vq] @@ -62,7 +62,6 @@ cpu.out /data /indexers /log -/public/img/avatar /tests/integration/gitea-integration-* /tests/integration/indexers-* /tests/e2e/gitea-e2e-* @@ -71,13 +70,13 @@ cpu.out /tests/e2e/test-artifacts /tests/e2e/test-snapshots /tests/*.ini -/node_modules /yarn.lock /yarn-error.log /npm-debug.log* /public/assets/js /public/assets/css /public/assets/fonts +/public/assets/img/avatar /public/assets/img/webpack /vendor /web_src/fomantic/node_modules diff --git a/.eslintrc.yaml b/.eslintrc.yaml index ed0309dbea..99ce2e97d6 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -12,6 +12,7 @@ plugins: - "@eslint-community/eslint-plugin-eslint-comments" - "@stylistic/eslint-plugin-js" - eslint-plugin-array-func + - eslint-plugin-github - eslint-plugin-i - eslint-plugin-jquery - eslint-plugin-no-jquery @@ -41,10 +42,6 @@ overrides: worker: true rules: no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top] - - files: ["build/generate-images.js"] - rules: - i/no-unresolved: [0] - i/no-extraneous-dependencies: [0] - files: ["*.config.*"] rules: i/no-unused-modules: [0] @@ -122,7 +119,7 @@ rules: "@stylistic/js/arrow-spacing": [2, {before: true, after: true}] "@stylistic/js/block-spacing": [0] "@stylistic/js/brace-style": [2, 1tbs, {allowSingleLine: true}] - "@stylistic/js/comma-dangle": [2, only-multiline] + "@stylistic/js/comma-dangle": [2, always-multiline] "@stylistic/js/comma-spacing": [2, {before: false, after: true}] "@stylistic/js/comma-style": [2, last] "@stylistic/js/computed-property-spacing": [2, never] @@ -170,7 +167,7 @@ rules: "@stylistic/js/semi-spacing": [2, {before: false, after: true}] "@stylistic/js/semi-style": [2, last] "@stylistic/js/space-before-blocks": [2, always] - "@stylistic/js/space-before-function-paren": [0] + "@stylistic/js/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] @@ -209,6 +206,29 @@ rules: func-names: [0] func-style: [0] getter-return: [2] + github/a11y-aria-label-is-well-formatted: [0] + github/a11y-no-title-attribute: [0] + github/a11y-no-visually-hidden-interactive-element: [0] + github/a11y-role-supports-aria-props: [0] + github/a11y-svg-has-accessible-name: [0] + github/array-foreach: [0] + github/async-currenttarget: [2] + github/async-preventdefault: [2] + github/authenticity-token: [0] + github/get-attribute: [0] + github/js-class-name: [0] + github/no-blur: [0] + github/no-d-none: [0] + github/no-dataset: [2] + github/no-dynamic-script-tag: [2] + github/no-implicit-buggy-globals: [2] + github/no-inner-html: [0] + github/no-innerText: [2] + github/no-then: [2] + github/no-useless-passive: [2] + github/prefer-observers: [2] + github/require-passive-events: [2] + github/unescaped-html-literal: [0] grouped-accessor-pairs: [2] guard-for-in: [0] id-blacklist: [0] @@ -259,20 +279,20 @@ rules: i/unambiguous: [0] init-declarations: [0] jquery/no-ajax-events: [2] - jquery/no-ajax: [0] + jquery/no-ajax: [2] jquery/no-animate: [2] - jquery/no-attr: [0] + jquery/no-attr: [2] jquery/no-bind: [2] jquery/no-class: [0] jquery/no-clone: [2] jquery/no-closest: [0] - jquery/no-css: [0] + jquery/no-css: [2] jquery/no-data: [0] jquery/no-deferred: [2] jquery/no-delegate: [2] jquery/no-each: [0] jquery/no-extend: [2] - jquery/no-fade: [0] + jquery/no-fade: [2] jquery/no-filter: [0] jquery/no-find: [0] jquery/no-global-eval: [2] @@ -283,15 +303,15 @@ rules: jquery/no-in-array: [2] jquery/no-is-array: [2] jquery/no-is-function: [2] - jquery/no-is: [0] + jquery/no-is: [2] jquery/no-load: [2] - jquery/no-map: [0] + jquery/no-map: [2] jquery/no-merge: [2] jquery/no-param: [2] jquery/no-parent: [0] jquery/no-parents: [0] jquery/no-parse-html: [2] - jquery/no-prop: [0] + jquery/no-prop: [2] jquery/no-proxy: [2] jquery/no-ready: [2] jquery/no-serialize: [2] @@ -372,12 +392,12 @@ rules: no-irregular-whitespace: [2] no-iterator: [2] no-jquery/no-ajax-events: [2] - no-jquery/no-ajax: [0] + no-jquery/no-ajax: [2] no-jquery/no-and-self: [2] no-jquery/no-animate-toggle: [2] no-jquery/no-animate: [2] - no-jquery/no-append-html: [0] - no-jquery/no-attr: [0] + no-jquery/no-append-html: [2] + no-jquery/no-attr: [2] no-jquery/no-bind: [2] no-jquery/no-box-model: [2] no-jquery/no-browser: [2] @@ -389,7 +409,7 @@ rules: no-jquery/no-constructor-attributes: [2] no-jquery/no-contains: [2] no-jquery/no-context-prop: [2] - no-jquery/no-css: [0] + no-jquery/no-css: [2] no-jquery/no-data: [0] no-jquery/no-deferred: [2] no-jquery/no-delegate: [2] @@ -420,14 +440,14 @@ rules: no-jquery/no-is-numeric: [2] no-jquery/no-is-plain-object: [2] no-jquery/no-is-window: [2] - no-jquery/no-is: [0] + no-jquery/no-is: [2] no-jquery/no-jquery-constructor: [0] 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-util: [2] - no-jquery/no-map: [0] + no-jquery/no-map: [2] no-jquery/no-merge: [2] no-jquery/no-node-name: [2] no-jquery/no-noop: [2] @@ -442,7 +462,7 @@ rules: no-jquery/no-parse-html: [2] no-jquery/no-parse-json: [2] no-jquery/no-parse-xml: [2] - no-jquery/no-prop: [0] + no-jquery/no-prop: [2] no-jquery/no-proxy: [2] no-jquery/no-ready-shorthand: [2] no-jquery/no-ready: [2] @@ -463,7 +483,7 @@ rules: no-jquery/no-visibility: [2] no-jquery/no-when: [2] no-jquery/no-wrap: [2] - no-jquery/variable-pattern: [0] + no-jquery/variable-pattern: [2] no-label-var: [2] no-labels: [0] # handled by no-restricted-syntax no-lone-blocks: [2] diff --git a/.forgejo/cascading-pr-end-to-end b/.forgejo/cascading-pr-end-to-end index 975888b245..d7a6b46b48 100755 --- a/.forgejo/cascading-pr-end-to-end +++ b/.forgejo/cascading-pr-end-to-end @@ -5,17 +5,29 @@ set -ex end_to_end=$1 end_to_end_pr=$2 forgejo=$3 -forgejo_pr=$4 +forgejo_pr_or_ref=$4 + +cd $forgejo +full_version=$(make show-version-full) +minor_version=$(make show-version-minor) -head_url=$(jq --raw-output .head.repo.html_url < $forgejo_pr) -test "$head_url" != null -branch=$(jq --raw-output .head.ref < $forgejo_pr) -test "$branch" != null cd $end_to_end -echo $head_url $branch 7.0.0+0-gitea-1.22.0 > forgejo/sources/1.22 + +if ! test -f forgejo/sources/$minor_version ; then + echo "FAIL: forgejo/sources/$minor_version does not exist in the end-to-end repository" + false +fi + date > last-upgrade -base_url=$(jq --raw-output .base.repo.html_url < $forgejo_pr) -test "$base_url" != null -test "$GITHUB_RUN_NUMBER" -echo $base_url/actions/runs/$GITHUB_RUN_NUMBER/artifacts/forgejo > forgejo/binary-url +if test -f "$forgejo_pr_or_ref" ; then + forgejo_pr=$forgejo_pr_or_ref + head_url=$(jq --raw-output .head.repo.html_url < $forgejo_pr) + test "$head_url" != null + branch=$(jq --raw-output .head.ref < $forgejo_pr) + test "$branch" != null + echo $head_url $branch $full_version > forgejo/sources/$minor_version +else + forgejo_ref=$forgejo_pr_or_ref + echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY ${forgejo_ref#refs/heads/} $full_version > forgejo/sources/$minor_version +fi diff --git a/.forgejo/cascading-release-end-to-end b/.forgejo/cascading-release-end-to-end index 7b43c89ed8..08ad8a4431 100755 --- a/.forgejo/cascading-release-end-to-end +++ b/.forgejo/cascading-release-end-to-end @@ -9,4 +9,14 @@ forgejo_ref=$4 cd $end_to_end date > last-upgrade -echo $FORGEJO_BINARY > forgejo/binary-url +organizations=lib/ORGANIZATIONS +if ! test -f $organizations ; then + echo "$organizations file not found" + false +fi +# +# do not include forgejo-experimental so that 7.0-test is found +# in forgejo-integration where it was just built instead of +# forgejo-experimental which was published by the previous build +# +echo forgejo forgejo-integration > $organizations diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml new file mode 100644 index 0000000000..da064feff3 --- /dev/null +++ b/.forgejo/workflows/backport.yml @@ -0,0 +1,83 @@ +# Copyright 2024 The Forgejo Authors +# SPDX-License-Identifier: MIT +# +# To modify this workflow: +# +# - change pull_request_target: to pull_request: +# so that it runs from a pull request instead of the default branch +# +# - push it to the wip-ci-backport branch on the forgejo repository +# otherwise it will not have access to the secrets required to push +# the PR +# +# - open a pull request targetting wip-ci-backport that includes a change +# that can be backported without conflict in v1.21 and set the +# `backport/v1.21` label. +# +# - once it works, open a pull request for the sake of keeping track +# of the change even if the PR won't run it because it will use +# whatever is in the default branch instead +# +# - after it is merged, double check it works by setting a +# `backport/v1.21` label on a merged pull request that can be backported +# without conflict. +# +on: + pull_request_target: + types: + - closed + - labeled + +jobs: + backporting: + if: > + !startsWith(vars.ROLE, 'forgejo-') && ( + github.event.pull_request.merged + && + contains(toJSON(github.event.pull_request.labels), 'backport/v') + ) + runs-on: docker + container: + image: 'docker.io/node:20-bookworm' + steps: + - name: event info + run: | + cat <<'EOF' + ${{ toJSON(github) }} + EOF + - name: Fetch labels + id: fetch-labels + shell: bash + run: | + set -x + echo "Labels retrieved below" + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get -q install -qq -y jq + filtered_labels=$(echo "$LABELS" | jq -c 'map(select(.name | startswith("backport/v")))') + echo "FILTERED_LABELS=${filtered_labels}" >> $GITHUB_ENV + env: + LABELS: ${{ toJSON(github.event.pull_request.labels) }} + - name: Extract targets + id: extract-targets + shell: bash + run: | + set -x + targets="$(echo $FILTERED_LABELS | jq -c '[.[] | .name | sub("backport/"; "")]')" + echo "targets=$(echo $targets)" >> $GITHUB_OUTPUT + + - name: Printing info + shell: bash + run: | + echo "targets: ${{ steps.extract-targets.outputs.targets }}" + echo "target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}" + echo "pull-request: ${{ github.event.pull_request.url }}" + + - uses: https://code.forgejo.org/forgejo/git-backporting@b2554a678d5ea2814f0df3abad2ac4fcdee2d81f + with: + target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo + strategy: ort + strategy-option: find-renames + cherry-pick-options: -x + auth: ${{ secrets.BACKPORT_TOKEN }} + pull-request: ${{ github.event.pull_request.url }} diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml index cdcbf32627..610b8f0520 100644 --- a/.forgejo/workflows/build-release-integration.yml +++ b/.forgejo/workflows/build-release-integration.yml @@ -9,6 +9,8 @@ on: - docker/** - .forgejo/workflows/build-release.yml - .forgejo/workflows/build-release-integration.yml + branches-ignore: + - renovate/** pull_request: paths: - Makefile @@ -110,7 +112,7 @@ jobs: # # Push a commit to a branch that triggers the build of a test release # - version=forgejo-test + version=1.2-test ( git clone $url/root/forgejo /tmp/forgejo cd /tmp/forgejo diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index b2f3757980..f8cd69850c 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -14,8 +14,6 @@ # secrets.CASCADE_DESTINATION_TOKEN: scope read:user, write:repository, write:issue # vars.CASCADE_DESTINATION_DOER: forgejo-ci # -name: Build release - on: push: tags: 'v[0-9]+.[0-9]+.*' @@ -30,6 +28,8 @@ jobs: if: vars.ROLE == 'forgejo-integration' || github.repository_owner == 'root' steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Sanitize the name of the repository id: repository @@ -43,7 +43,7 @@ jobs: - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: version from ref @@ -53,8 +53,12 @@ jobs: set -x ref="${{ github.ref }}" if [[ $ref =~ ^refs/heads/ ]] ; then - version=${ref#refs/heads/} - version=${version%/forgejo}-test + if test "$ref" = "refs/heads/forgejo" ; then + version=$(git tag -l --sort=version:refname --merged | grep -v -e '-test$' | tail -1 | sed -E -e 's/^(v[0-9]+\.[0-9]+).*/\1/')-test + else + version=${ref#refs/heads/} + version=${version%/forgejo}-test + fi override=true fi if [[ $ref =~ ^refs/tags/ ]] ; then @@ -66,6 +70,7 @@ jobs: exit 1 fi version=${version#v} + git describe --exclude '*-test' --tags --always echo "sha=${{ github.sha }}" >> "$GITHUB_OUTPUT" echo "version=$version" >> "$GITHUB_OUTPUT" echo "override=$override" >> "$GITHUB_OUTPUT" @@ -81,6 +86,18 @@ jobs: ENDVAR EOF + - name: cache node_modules + id: node + uses: https://code.forgejo.org/actions/cache@v3 + with: + path: | + node_modules + key: node-${{ steps.release-info.outputs.version }} + + - name: skip if node cache hit + if: steps.node.outputs.cache-hit != 'true' + run: echo no hit + - name: Build sources run: | set -x @@ -177,7 +194,7 @@ jobs: - name: end-to-end tests if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' }} - uses: https://code.forgejo.org/actions/cascading-pr@v1 + uses: https://code.forgejo.org/actions/cascading-pr@v2 with: origin-url: ${{ env.GITHUB_SERVER_URL }} origin-repo: ${{ github.repository }} @@ -186,8 +203,28 @@ jobs: destination-url: https://code.forgejo.org destination-fork-repo: ${{ vars.CASCADE_DESTINATION_DOER }}/end-to-end destination-repo: forgejo/end-to-end - destination-branch: forgejo-pr + destination-branch: main destination-token: ${{ secrets.CASCADE_DESTINATION_TOKEN }} update: .forgejo/cascading-release-end-to-end - env: - FORGEJO_BINARY: "${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/releases/download/v${{ steps.release-info.outputs.version }}/forgejo-${{ steps.release-info.outputs.version }}-linux-amd64" + + - name: copy to experimental + if: vars.ROLE == 'forgejo-integration' && secrets.TOKEN != '' + run: | + if test "${{ vars.VERBOSE }}" = true ; then + set -x + fi + tag=v${{ steps.release-info.outputs.version }} + url=https://any:${{ secrets.TOKEN }}@codeberg.org + if test "${{ steps.release-info.outputs.override }}" = "true" ; then + curl -sS -X DELETE $url/api/v1/repos/forgejo-experimental/forgejo/releases/tags/$tag > /dev/null + curl -sS -X DELETE $url/api/v1/repos/forgejo-experimental/forgejo/tags/$tag > /dev/null + fi + # actions/checkout@v3 sets http.https://codeberg.org/.extraheader with the automatic token. + # Get rid of it so it does not prevent using the token that has write permissions + git config --local --unset http.https://codeberg.org/.extraheader + if test -f .git/shallow ; then + echo "unexptected .git/shallow file is present" + echo "it suggests a checkout --depth X was used which may prevent pushing the commit" + echo "it happens when actions/checkout is called without depth: 0" + fi + git push $url/forgejo-experimental/forgejo ${{ steps.release-info.outputs.sha }}:refs/tags/$tag diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml index 235211f18a..dcca2404d9 100644 --- a/.forgejo/workflows/cascade-setup-end-to-end.yml +++ b/.forgejo/workflows/cascade-setup-end-to-end.yml @@ -1,5 +1,23 @@ +# Copyright 2024 The Forgejo Authors # SPDX-License-Identifier: MIT +# +# To modify this workflow: +# +# - push it to the wip-ci-end-to-end branch on the forgejo repository +# otherwise it will not have access to the secrets required to push +# the cascading PR +# +# - once it works, open a pull request for the sake of keeping track +# of the change even if the PR won't run it because it will use +# whatever is in the default branch instead +# +# - after it is merged, double check it works by setting the +# run-end-to-end-test on a pull request (any pull request will doe +# on: + push: + branches: + - 'wip-ci-end-to-end' pull_request_target: types: - labeled @@ -20,58 +38,37 @@ jobs: cat <<'EOF' ${{ toJSON(github.event.pull_request.labels.*.name) }} EOF - - build: - if: ${{ !startsWith(vars.ROLE, 'forgejo-') && github.event.action == 'label_updated' && contains(github.event.pull_request.labels.*.name, 'run-end-to-end-tests') }} - runs-on: docker - container: - image: 'docker.io/node:20-bookworm' - steps: - - uses: https://code.forgejo.org/actions/checkout@v3 - with: - fetch-depth: '0' - show-progress: 'false' - - name: adduser forgejo - run: | - git config --add safe.directory '*' - git config user.email "you@example.com" - git config user.name "Your Name" - adduser --quiet --comment forgejo --disabled-password forgejo - chown -R forgejo:forgejo . - - uses: https://code.forgejo.org/actions/setup-go@v4 - with: - go-version: "1.21" - - name: make deps-backend - run: | - su forgejo -c 'make deps-backend' - - name: make forgejo - run: | - su forgejo -c 'make generate-backend static-executable && ln gitea forgejo' - env: - TAGS: bindata sqlite sqlite_unlock_notify - - uses: actions/upload-artifact@v3 - with: - name: forgejo - path: forgejo + cat <<'EOF' + ${{ toJSON(github.event) }} + EOF cascade: - if: ${{ !startsWith(vars.ROLE, 'forgejo-') && github.event.action == 'label_updated' && contains(github.event.pull_request.labels.*.name, 'run-end-to-end-tests') }} - needs: [build] + if: > + !startsWith(vars.ROLE, 'forgejo-') && ( + github.event_name == 'push' || + ( + github.event.action == 'label_updated' && contains(github.event.pull_request.labels.*.name, 'run-end-to-end-tests') + ) + ) runs-on: docker container: image: node:20-bookworm steps: - uses: actions/checkout@v4 - - uses: actions/cascading-pr@v1 + with: + fetch-depth: '0' + show-progress: 'false' + - uses: actions/cascading-pr@v2 with: origin-url: ${{ env.GITHUB_SERVER_URL }} origin-repo: ${{ github.repository }} origin-token: ${{ secrets.END_TO_END_CASCADING_PR_ORIGIN }} origin-pr: ${{ github.event.pull_request.number }} + origin-ref: ${{ github.event_name == 'push' && github.event.ref || '' }} destination-url: https://code.forgejo.org destination-fork-repo: cascading-pr/end-to-end destination-repo: forgejo/end-to-end - destination-branch: forgejo-pr + destination-branch: main destination-token: ${{ secrets.END_TO_END_CASCADING_PR_DESTINATION }} close-merge: true update: .forgejo/cascading-pr-end-to-end diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml index 2104f6a067..c1321b0a8e 100644 --- a/.forgejo/workflows/e2e.yml +++ b/.forgejo/workflows/e2e.yml @@ -17,7 +17,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v4 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "~1.21" + go-version: "1.22" check-latest: true - run: | apt-get -qq update diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index 1afa941952..674c1c2704 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -42,16 +42,19 @@ jobs: - uses: actions/checkout@v3 - name: copy & sign - uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v1 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v4 with: - forgejo: ${{ vars.FORGEJO }} + from-forgejo: ${{ vars.FORGEJO }} + to-forgejo: ${{ vars.FORGEJO }} from-owner: ${{ vars.FROM_OWNER }} to-owner: ${{ vars.TO_OWNER }} repo: ${{ vars.REPO }} - ref-name: ${{ github.ref_name }} release-notes: "See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#{ANCHOR}" - doer: ${{ vars.DOER }} - token: ${{ secrets.TOKEN }} + ref-name: ${{ github.ref_name }} + sha: ${{ github.sha }} + from-token: ${{ secrets.TOKEN }} + to-doer: ${{ vars.DOER }} + to-token: ${{ secrets.TOKEN }} gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} verbose: ${{ vars.VERBOSE }} @@ -61,7 +64,7 @@ jobs: if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - name: update the _release.experimental DNS record if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml new file mode 100644 index 0000000000..a9687db81a --- /dev/null +++ b/.forgejo/workflows/renovate.yml @@ -0,0 +1,61 @@ +# +# The 2am run will rebase what needs rebasing & trigger the CI +# The 4am run will merge one of them +# +# These times are chosen to minimize the likelyhood that another PR +# is merged at the same time. This would not be necessary if automerge +# worked but as of 30 March 2024 it does not. +# +name: renovate + +on: + push: + branches: + - 'renovate/**' # self-test updates + schedule: + - cron: '0 2,4 * * *' + +env: + RENOVATE_DRY_RUN: ${{ (github.event_name != 'schedule' && github.ref_name != github.event.repository.default_branch) && 'full' || '' }} + RENOVATE_REPOSITORIES: ${{ github.repository }} + +jobs: + renovate: + if: ${{ secrets.RENOVATE_TOKEN != '' }} + + runs-on: docker + container: + image: ghcr.io/visualon/renovate:37.278.0 + + steps: + - uses: https://code.forgejo.org/actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + with: + path: | + .tmp/cache/renovate/repository + key: repo-cache-${{ github.run_id }} + restore-keys: | + repo-cache- + + - run: renovate + env: + GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_COM_TOKEN }} + LOG_LEVEL: debug + RENOVATE_BASE_DIR: ${{ github.workspace }}/.tmp + RENOVATE_ENDPOINT: ${{ github.server_url }} + RENOVATE_PLATFORM: gitea + RENOVATE_REPOSITORY_CACHE: 'enabled' + RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} + RENOVATE_GIT_AUTHOR: 'Renovate Bot ' + + GIT_AUTHOR_NAME: 'Renovate Bot' + GIT_AUTHOR_EMAIL: 'forgejo-renovate-action@forgejo.org' + GIT_COMMITTER_NAME: 'Renovate Bot' + GIT_COMMITTER_EMAIL: 'forgejo-renovate-action@forgejo.org' + + - name: Save renovate repo cache + if: always() && env.RENOVATE_DRY_RUN == 'true' + uses: https://code.forgejo.org/actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + with: + path: | + .tmp/cache/renovate/repository + key: repo-cache-${{ github.run_id }} diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index a4b54c4da5..125cb798dc 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -14,32 +14,50 @@ jobs: container: image: 'docker.io/node:20-bookworm' steps: + - name: event info + run: | + cat <<'EOF' + ${{ toJSON(github) }} + EOF - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" check-latest: true - run: make deps-backend deps-tools - run: make --always-make -j$(nproc) lint-backend checks-backend # ensure the "go-licenses" make target runs - env: - TAGS: bindata sqlite sqlite_unlock_notify + frontend-checks: + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} + runs-on: docker + container: + image: 'docker.io/node:20-bookworm' + steps: + - uses: https://code.forgejo.org/actions/checkout@v3 + - run: make deps-frontend + - run: make lint-frontend + - run: make checks-frontend + - run: make test-frontend + - run: make frontend test-unit: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker - needs: [backend-checks] + needs: [backend-checks, frontend-checks] container: image: 'docker.io/node:20-bookworm' services: minio: - image: 'docker.io/bitnami/minio:2023.8.31' + image: bitnami/minio:2024.2.26 + options: >- + --hostname gitea.minio env: + MINIO_DOMAIN: minio MINIO_ROOT_USER: 123456 MINIO_ROOT_PASSWORD: 12345678 steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - run: | git config --add safe.directory '*' adduser --quiet --comment forgejo --disabled-password forgejo @@ -67,7 +85,7 @@ jobs: test-mysql: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker - needs: [backend-checks] + needs: [backend-checks, frontend-checks] container: image: 'docker.io/node:20-bookworm' services: @@ -84,7 +102,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: install dependencies & git >= 2.42 run: | export DEBIAN_FRONTEND=noninteractive @@ -113,15 +131,15 @@ jobs: test-pgsql: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker - needs: [backend-checks] + needs: [backend-checks, frontend-checks] container: image: 'docker.io/node:20-bookworm' services: minio: - image: bitnami/minio:2021.3.17 + image: bitnami/minio:2024.2.26 env: - MINIO_ACCESS_KEY: 123456 - MINIO_SECRET_KEY: 12345678 + MINIO_ROOT_USER: 123456 + MINIO_ROOT_PASSWORD: 12345678 pgsql: image: 'docker.io/postgres:15' env: @@ -131,7 +149,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: install dependencies & git >= 2.42 run: | export DEBIAN_FRONTEND=noninteractive @@ -161,14 +179,14 @@ jobs: test-sqlite: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker - needs: [backend-checks] + needs: [backend-checks, frontend-checks] container: image: 'docker.io/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.22" - name: install dependencies & git >= 2.42 run: | export DEBIAN_FRONTEND=noninteractive diff --git a/.gitea/issue_template/bug-report-ui.yaml b/.gitea/issue_template/bug-report-ui.yaml index 4d80198399..09513d08e7 100644 --- a/.gitea/issue_template/bug-report-ui.yaml +++ b/.gitea/issue_template/bug-report-ui.yaml @@ -1,7 +1,7 @@ name: 🦋 Bug Report (web interface / frontend) description: Something doesn't look quite as it should? Report it here! title: "[BUG] " -labels: ["bug", "forgejo/ui"] +labels: ["bug/new-report", "forgejo/ui"] body: - type: markdown attributes: diff --git a/.gitea/issue_template/bug-report.yaml b/.gitea/issue_template/bug-report.yaml index ce67378175..6edbca886f 100644 --- a/.gitea/issue_template/bug-report.yaml +++ b/.gitea/issue_template/bug-report.yaml @@ -1,7 +1,7 @@ name: 🐛 Bug Report (server / backend) description: Found something you weren't expecting? Report it here! title: "[BUG] " -labels: bug +labels: bug/new-report body: - type: markdown attributes: diff --git a/.gitea/pull_request_template.md b/.gitea/pull_request_template.md index 385300ddf8..00b874fd5b 100644 --- a/.gitea/pull_request_template.md +++ b/.gitea/pull_request_template.md @@ -1,3 +1,12 @@ +--- + +name: "Pull Request Template" +about: "Template for all Pull Requests" +labels: + +- test/needed + +--- -
+
-
+
@@ -59,7 +59,7 @@
-
+
@@ -82,7 +82,7 @@ {{ctx.Locale.Tr "admin.auths.tips"}}
-
GMail Settings:
+
{{ctx.Locale.Tr "admin.auths.tips.gmail_settings"}}

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

{{ctx.Locale.Tr "admin.auths.tips.oauth2.general"}}:
@@ -99,7 +99,7 @@
  • GitHub
    • {{ctx.Locale.Tr "admin.auths.tip.github"}}
  • GitLab
    • - {{ctx.Locale.Tr "admin.auths.tip.gitlab"}} + {{ctx.Locale.Tr "admin.auths.tip.gitlab_new"}}
  • Google
    • {{ctx.Locale.Tr "admin.auths.tip.google_plus"}}
  • OpenID Connect
    • diff --git a/templates/admin/auth/source/ldap.tmpl b/templates/admin/auth/source/ldap.tmpl index b945a1ab1c..680849c8ea 100644 --- a/templates/admin/auth/source/ldap.tmpl +++ b/templates/admin/auth/source/ldap.tmpl @@ -1,4 +1,4 @@ -
    +
    @@ -20,17 +20,17 @@
    -
    +
    -
    +
    -
    +
    @@ -38,7 +38,7 @@
    -
    +
    @@ -115,13 +115,13 @@
    -
    +
    -
    +
    diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index da3a4f913a..0560cc8256 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/admin/auth/source/smtp.tmpl b/templates/admin/auth/source/smtp.tmpl index c4b0b0e7e4..31195acf65 100644 --- a/templates/admin/auth/source/smtp.tmpl +++ b/templates/admin/auth/source/smtp.tmpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/admin/auth/source/sspi.tmpl b/templates/admin/auth/source/sspi.tmpl index f835e89bdf..6a3f00f9a8 100644 --- a/templates/admin/auth/source/sspi.tmpl +++ b/templates/admin/auth/source/sspi.tmpl @@ -1,4 +1,4 @@ -
    +
    diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl deleted file mode 100644 index 0fecb61d9e..0000000000 --- a/templates/admin/base/search.tmpl +++ /dev/null @@ -1,23 +0,0 @@ -
    -
    -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - -
    -
    - -
    - - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} -
    -
    -
    diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index ce6edf8a97..1e94935a16 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -231,7 +231,7 @@
    {{ctx.Locale.Tr "admin.config.mailer_user"}}
    {{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}
    -
    {{ctx.Locale.Tr "admin.config.send_test_mail"}}
    +
    {{ctx.Locale.Tr "admin.config.send_test_mail"}}
    {{.CsrfTokenHtml}} @@ -285,27 +285,6 @@
    -

    - {{ctx.Locale.Tr "admin.config.picture_config"}} -

    -
    -
    -
    {{ctx.Locale.Tr "admin.config.disable_gravatar"}}
    -
    -
    - -
    -
    -
    -
    {{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}
    -
    -
    - -
    -
    -
    -
    -

    {{ctx.Locale.Tr "admin.config.git_config"}}

    @@ -355,7 +334,7 @@ {{range $loggerName, $loggerDetail := .Loggers}}
    {{ctx.Locale.Tr "admin.config.logger_name_fmt" $loggerName}}
    {{if $loggerDetail.IsEnabled}} - 
    {{$loggerDetail.EventWriters | JsonUtils.EncodeToString | JsonUtils.PrettyIndent}}
    + 
    {{$loggerDetail.EventWriters | JsonUtils.EncodeToString | JsonUtils.PrettyIndent}}
    {{else}}
    {{ctx.Locale.Tr "admin.config.disabled_logger"}}
    {{end}} diff --git a/templates/admin/config_settings.tmpl b/templates/admin/config_settings.tmpl new file mode 100644 index 0000000000..d7fb022274 --- /dev/null +++ b/templates/admin/config_settings.tmpl @@ -0,0 +1,42 @@ +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +

    + {{ctx.Locale.Tr "admin.config.picture_config"}} +

    +
    +
    +
    {{ctx.Locale.Tr "admin.config.disable_gravatar"}}
    +
    +
    + +
    +
    +
    +
    {{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}
    +
    +
    + +
    +
    +
    +
    + +

    + {{ctx.Locale.Tr "repository"}} +

    +
    + +
    +
    + {{ctx.Locale.Tr "admin.config.open_with_editor_app_help"}} + 
    {{.DefaultOpenWithEditorAppsString}}
    +
    +
    +
    + +
    +
    + +
    + +
    +{{template "admin/layout_footer" .}} diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index af30cc06e1..3cb641488c 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -5,7 +5,7 @@
    - +
    diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index f43b4c5385..bfd2ee6670 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -2,7 +2,7 @@
    {{if .NeedUpdate}}
    -

    {{(ctx.Locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}

    +

    {{ctx.Locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer}}

    {{end}}

    @@ -11,7 +11,7 @@
    {{.CsrfTokenHtml}} -

    +
    @@ -75,69 +75,9 @@

    {{ctx.Locale.Tr "admin.dashboard.system_status"}}

    -
    -
    -
    {{ctx.Locale.Tr "admin.dashboard.server_uptime"}}
    -
    {{.SysStatus.StartTime}}
    -
    {{ctx.Locale.Tr "admin.dashboard.current_goroutine"}}
    -
    {{.SysStatus.NumGoroutine}}
    -
    -
    {{ctx.Locale.Tr "admin.dashboard.current_memory_usage"}}
    -
    {{.SysStatus.MemAllocated}}
    -
    {{ctx.Locale.Tr "admin.dashboard.total_memory_allocated"}}
    -
    {{.SysStatus.MemTotal}}
    -
    {{ctx.Locale.Tr "admin.dashboard.memory_obtained"}}
    -
    {{.SysStatus.MemSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.pointer_lookup_times"}}
    -
    {{.SysStatus.Lookups}}
    -
    {{ctx.Locale.Tr "admin.dashboard.memory_allocate_times"}}
    -
    {{.SysStatus.MemMallocs}}
    -
    {{ctx.Locale.Tr "admin.dashboard.memory_free_times"}}
    -
    {{.SysStatus.MemFrees}}
    -
    -
    {{ctx.Locale.Tr "admin.dashboard.current_heap_usage"}}
    -
    {{.SysStatus.HeapAlloc}}
    -
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_obtained"}}
    -
    {{.SysStatus.HeapSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_idle"}}
    -
    {{.SysStatus.HeapIdle}}
    -
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_in_use"}}
    -
    {{.SysStatus.HeapInuse}}
    -
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_released"}}
    -
    {{.SysStatus.HeapReleased}}
    -
    {{ctx.Locale.Tr "admin.dashboard.heap_objects"}}
    -
    {{.SysStatus.HeapObjects}}
    -
    -
    {{ctx.Locale.Tr "admin.dashboard.bootstrap_stack_usage"}}
    -
    {{.SysStatus.StackInuse}}
    -
    {{ctx.Locale.Tr "admin.dashboard.stack_memory_obtained"}}
    -
    {{.SysStatus.StackSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.mspan_structures_usage"}}
    -
    {{.SysStatus.MSpanInuse}}
    -
    {{ctx.Locale.Tr "admin.dashboard.mspan_structures_obtained"}}
    -
    {{.SysStatus.MSpanSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.mcache_structures_usage"}}
    -
    {{.SysStatus.MCacheInuse}}
    -
    {{ctx.Locale.Tr "admin.dashboard.mcache_structures_obtained"}}
    -
    {{.SysStatus.MCacheSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
    -
    {{.SysStatus.BuckHashSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.gc_metadata_obtained"}}
    -
    {{.SysStatus.GCSys}}
    -
    {{ctx.Locale.Tr "admin.dashboard.other_system_allocation_obtained"}}
    -
    {{.SysStatus.OtherSys}}
    -
    -
    {{ctx.Locale.Tr "admin.dashboard.next_gc_recycle"}}
    -
    {{.SysStatus.NextGC}}
    -
    {{ctx.Locale.Tr "admin.dashboard.last_gc_time"}}
    -
    {{.SysStatus.LastGC}}
    -
    {{ctx.Locale.Tr "admin.dashboard.total_gc_pause"}}
    -
    {{.SysStatus.PauseTotalNs}}
    -
    {{ctx.Locale.Tr "admin.dashboard.last_gc_pause"}}
    -
    {{.SysStatus.PauseNs}}
    -
    {{ctx.Locale.Tr "admin.dashboard.gc_times"}}
    -
    {{.SysStatus.NumGC}}
    -
    + {{/* TODO: make these stats work in multi-server deployments, likely needs per-server stats in DB */}} +
    + {{template "admin/system_status" .}}
    {{template "admin/layout_footer" .}} diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index bcd80368e6..388863df9b 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -4,24 +4,21 @@ {{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}})
    -
    - -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - -
    +
    + + {{template "shared/search/combo" dict "Value" .Keyword}} -
    +
    {{ctx.Locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{ctx.Locale.Tr "admin.emails.filter_sort.email"}} - {{ctx.Locale.Tr "admin.emails.filter_sort.email_reverse"}} - {{ctx.Locale.Tr "admin.emails.filter_sort.name"}} - {{ctx.Locale.Tr "admin.emails.filter_sort.name_reverse"}} + {{ctx.Locale.Tr "admin.emails.filter_sort.email"}} + {{ctx.Locale.Tr "admin.emails.filter_sort.email_reverse"}} + {{ctx.Locale.Tr "admin.emails.filter_sort.name"}} + {{ctx.Locale.Tr "admin.emails.filter_sort.name_reverse"}}
    @@ -47,8 +44,8 @@ {{range .Emails}}
    - - + + {{range .Notices}} - + - + @@ -31,7 +31,7 @@ diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 0d79456b47..987ceab1e0 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -7,7 +7,26 @@
    - {{template "admin/base/search" .}} +
    +
    + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} + + +
    + + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} +
    +
    +
    {{ctx.Locale.Tr "admin.dashboard.delete_inactive_accounts"}}
    {{.Name}}{{.FullName}}{{.Email}}{{.FullName}}{{.Email}} {{if .IsPrimary}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .CanChange}} diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 0067f336e0..c1f5fb3314 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .ctxData}}
    -
    +
    {{template "base/alert" .ctxData}}
    -
    +
    {{template "admin/navbar" .ctxData}}
    {{/* block: admin-setting-content */}} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index f23bdee124..16ec1b4b5b 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -77,9 +77,17 @@
    {{end}} - - {{ctx.Locale.Tr "admin.config"}} - +
    + {{ctx.Locale.Tr "admin.config"}} +
    + + {{ctx.Locale.Tr "admin.config_summary"}} + + + {{ctx.Locale.Tr "admin.config_settings"}} + +
    +
    {{ctx.Locale.Tr "admin.notices"}} diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index ed410425b5..5ea003e5ec 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -17,10 +17,10 @@
    		{{.ID}} {{ctx.Locale.Tr .TrStr}}{{.Description}}{{.Description}} {{DateTime "short" .CreatedUnix}} {{svg "octicon-note" 16}}
    -
    + {{.CsrfTokenHtml}}
    @@ -49,8 +49,8 @@ -
    diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 5cfd9ddefa..d111c57378 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -2,8 +2,8 @@

    {{ctx.Locale.Tr "admin.packages.package_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .TotalCount}}, - {{ctx.Locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}}, - {{ctx.Locale.Tr "admin.packages.unreferenced_size" (FileSize .TotalUnreferencedBlobSize)}}) + {{ctx.Locale.Tr "admin.packages.total_size" (ctx.Locale.TrSize .TotalBlobSize)}}, + {{ctx.Locale.Tr "admin.packages.unreferenced_size" (ctx.Locale.TrSize .TotalUnreferencedBlobSize)}})
    {{.CsrfTokenHtml}} @@ -13,16 +13,16 @@

    -
    - {{template "shared/searchinput" dict "Value" .Query}} - {{range $type := .AvailableTypes}} {{$type.Name}} {{end}} - + {{template "shared/search/button"}}
    @@ -62,15 +62,15 @@ {{end}}
    - - + + - + @@ -88,7 +88,7 @@ {{ctx.Locale.Tr "packages.settings.delete"}}
    - {{ctx.Locale.Tr "packages.settings.delete.notice" `` `` | Safe}} + {{ctx.Locale.Tr "packages.settings.delete.notice" (``|SafeHTML) (``|SafeHTML)}}
    {{template "base/modal_actions_confirm" .}} diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index 80214d1021..dc0196fc6a 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -30,7 +30,7 @@ - {{else}} {{$sum}} - + {{$.CsrfTokenHtml}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index fdba0734a2..2c6e1d67a9 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -7,7 +7,7 @@
    - {{template "admin/repo/search" .}} + {{template "shared/repo_search" .}}
    {{.Package.Type.Name}}{{.Package.Name}}{{.Version.Version}}{{.Package.Name}}{{.Version.Version}} {{.Creator.Name}} {{if .Repository}} {{.Repository.Name}} {{end}} {{FileSize .CalculateBlobSize}}{{ctx.Locale.TrSize .CalculateBlobSize}} {{DateTime "short" .Version.CreatedUnix}} {{svg "octicon-trash"}}
    @@ -19,13 +19,13 @@ {{ctx.Locale.Tr "admin.repos.name"}} {{SortArrow "alphabetically" "reversealphabetically" $.SortType false}} - + @@ -80,8 +80,8 @@ - - + + @@ -101,7 +101,7 @@

    {{ctx.Locale.Tr "repo.settings.delete_desc"}}

    - {{ctx.Locale.Tr "repo.settings.delete_notices_2" `` | Safe}}
    + {{ctx.Locale.Tr "repo.settings.delete_notices_2" (``|SafeHTML)}}
    {{ctx.Locale.Tr "repo.settings.delete_notices_fork_1"}}
    {{template "base/modal_actions_confirm" .}} diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl deleted file mode 100644 index 247ec5491a..0000000000 --- a/templates/admin/repo/search.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -
    -
    -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - -
    - - -
    - - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}} -
    -
    -
    diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index fb4f16791d..6a8e203694 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -8,10 +8,10 @@
    -
    - - - +
    + + + {{template "shared/search/button"}}
    @@ -20,10 +20,10 @@ {{if .Dirs}}
    {{range $dirI, $dir := .Dirs}} -
    - {{svg "octicon-file-directory-fill"}} {{$dir}} +
    + {{svg "octicon-file-directory-fill"}} {{$dir}}
    - +
    {{ctx.Locale.Tr "admin.repos.watches"}}{{ctx.Locale.Tr "repo.watchers"}} - {{ctx.Locale.Tr "admin.repos.stars"}} + {{ctx.Locale.Tr "repo.stars"}} {{SortArrow "moststars" "feweststars" $.SortType false}} - {{ctx.Locale.Tr "admin.repos.forks"}} + {{ctx.Locale.Tr "repo.forks"}} {{SortArrow "mostforks" "fewestforks" $.SortType false}} {{ctx.Locale.Tr "admin.repos.issues"}}{{.NumStars}} {{.NumForks}} {{.NumIssues}}{{FileSize .GitSize}}{{FileSize .LFSSize}}{{ctx.Locale.TrSize .GitSize}}{{ctx.Locale.TrSize .LFSSize}} {{DateTime "short" .UpdatedUnix}} {{DateTime "short" .CreatedUnix}} {{svg "octicon-trash"}}
    - {{range $statsKey := .StatsKeys}} + {{range $statsKey, $statsValue := .Stats}} - + {{end}}
    {{$statsKey}}{{index $.StatsCounter $statsKey}}{{$statsValue}}
    diff --git a/templates/admin/system_status.tmpl b/templates/admin/system_status.tmpl new file mode 100644 index 0000000000..7b5c9be6cc --- /dev/null +++ b/templates/admin/system_status.tmpl @@ -0,0 +1,62 @@ +
    +
    {{ctx.Locale.Tr "admin.dashboard.server_uptime"}}
    +
    {{.SysStatus.StartTime}}
    +
    {{ctx.Locale.Tr "admin.dashboard.current_goroutine"}}
    +
    {{.SysStatus.NumGoroutine}}
    +
    +
    {{ctx.Locale.Tr "admin.dashboard.current_memory_usage"}}
    +
    {{.SysStatus.MemAllocated}}
    +
    {{ctx.Locale.Tr "admin.dashboard.total_memory_allocated"}}
    +
    {{.SysStatus.MemTotal}}
    +
    {{ctx.Locale.Tr "admin.dashboard.memory_obtained"}}
    +
    {{.SysStatus.MemSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.pointer_lookup_times"}}
    +
    {{.SysStatus.Lookups}}
    +
    {{ctx.Locale.Tr "admin.dashboard.memory_allocate_times"}}
    +
    {{.SysStatus.MemMallocs}}
    +
    {{ctx.Locale.Tr "admin.dashboard.memory_free_times"}}
    +
    {{.SysStatus.MemFrees}}
    +
    +
    {{ctx.Locale.Tr "admin.dashboard.current_heap_usage"}}
    +
    {{.SysStatus.HeapAlloc}}
    +
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_obtained"}}
    +
    {{.SysStatus.HeapSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_idle"}}
    +
    {{.SysStatus.HeapIdle}}
    +
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_in_use"}}
    +
    {{.SysStatus.HeapInuse}}
    +
    {{ctx.Locale.Tr "admin.dashboard.heap_memory_released"}}
    +
    {{.SysStatus.HeapReleased}}
    +
    {{ctx.Locale.Tr "admin.dashboard.heap_objects"}}
    +
    {{.SysStatus.HeapObjects}}
    +
    +
    {{ctx.Locale.Tr "admin.dashboard.bootstrap_stack_usage"}}
    +
    {{.SysStatus.StackInuse}}
    +
    {{ctx.Locale.Tr "admin.dashboard.stack_memory_obtained"}}
    +
    {{.SysStatus.StackSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.mspan_structures_usage"}}
    +
    {{.SysStatus.MSpanInuse}}
    +
    {{ctx.Locale.Tr "admin.dashboard.mspan_structures_obtained"}}
    +
    {{.SysStatus.MSpanSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.mcache_structures_usage"}}
    +
    {{.SysStatus.MCacheInuse}}
    +
    {{ctx.Locale.Tr "admin.dashboard.mcache_structures_obtained"}}
    +
    {{.SysStatus.MCacheSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
    +
    {{.SysStatus.BuckHashSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.gc_metadata_obtained"}}
    +
    {{.SysStatus.GCSys}}
    +
    {{ctx.Locale.Tr "admin.dashboard.other_system_allocation_obtained"}}
    +
    {{.SysStatus.OtherSys}}
    +
    +
    {{ctx.Locale.Tr "admin.dashboard.next_gc_recycle"}}
    +
    {{.SysStatus.NextGC}}
    +
    {{ctx.Locale.Tr "admin.dashboard.last_gc_time"}}
    +
    {{.SysStatus.LastGCTime}}
    +
    {{ctx.Locale.Tr "admin.dashboard.total_gc_pause"}}
    +
    {{.SysStatus.PauseTotalNs}}
    +
    {{ctx.Locale.Tr "admin.dashboard.last_gc_pause"}}
    +
    {{.SysStatus.PauseNs}}
    +
    {{ctx.Locale.Tr "admin.dashboard.gc_times"}}
    +
    {{.SysStatus.NumGC}}
    +
    diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index fcb8ce0827..41b00defb4 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -53,7 +53,7 @@
    -
    +
    @@ -65,11 +65,26 @@
    -
    +

    {{ctx.Locale.Tr "admin.users.password_helper"}}

    + +
    + +
    + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    {{range .AllLangs}}{{if eq $.User.Language .Lang}}{{.Name}}{{end}}{{end}}
    +
    + {{range .AllLangs}} +
    {{.Name}}
    + {{end}} +
    +
    +
    +
    @@ -113,13 +128,13 @@
    -
    +
    -
    +
    @@ -166,7 +181,7 @@
    -
    +
    @@ -179,7 +194,7 @@
    -
    +
    diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 8fdc80fc70..e5d429952f 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -52,11 +52,7 @@
    - -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - -
    + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}}
    @@ -96,7 +92,7 @@ {{ctx.Locale.Tr "admin.users.remote"}} {{end}} - {{.Email}} + {{.Email}} {{if .IsActive}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .IsRestricted}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if index $.UsersTwoFaStatus .ID}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} @@ -107,7 +103,7 @@ {{ctx.Locale.Tr "admin.users.never_login"}} {{end}} -
    +
    {{svg "octicon-person"}} {{svg "octicon-pencil"}}
    diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 81f70511d0..b04ebc4b60 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -26,7 +26,7 @@
    - +
    {{if .DefaultUserVisibilityMode.IsPublic}}{{ctx.Locale.Tr "settings.visibility.public"}}{{end}} {{if .DefaultUserVisibilityMode.IsLimited}}{{ctx.Locale.Tr "settings.visibility.limited"}}{{end}} @@ -47,7 +47,7 @@
    -
    +
    @@ -59,12 +59,12 @@
    -
    +
    -
    +
    diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index fd3017607c..21943a8382 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -2,7 +2,7 @@
    -
    +

    {{.Title}}
    @@ -13,7 +13,7 @@ {{template "admin/user/view_details" .}}

    -
    +

    {{ctx.Locale.Tr "admin.emails"}}
    diff --git a/templates/admin/user/view_details.tmpl b/templates/admin/user/view_details.tmpl index 21425eecb4..be2f32b5ec 100644 --- a/templates/admin/user/view_details.tmpl +++ b/templates/admin/user/view_details.tmpl @@ -48,6 +48,14 @@ {{svg "octicon-x"}} {{end}}
    + {{if .User.Language}} +
    + + {{ctx.Locale.Tr "settings.language"}}: + {{range .AllLangs}}{{if eq $.User.Language .Lang}}{{.Name}}{{end}}{{end}} + +
    + {{end}} {{if .User.Location}}
    {{svg "octicon-location"}}{{.User.Location}} diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index 160584f769..760d3bfa2c 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,20 +1,20 @@ {{if .Flash.ErrorMsg}}
    -

    {{.Flash.ErrorMsg | Str2html}}

    +

    {{.Flash.ErrorMsg | SanitizeHTML}}

    {{end}} {{if .Flash.SuccessMsg}}
    -

    {{.Flash.SuccessMsg | Str2html}}

    +

    {{.Flash.SuccessMsg | SanitizeHTML}}

    {{end}} {{if .Flash.InfoMsg}}
    -

    {{.Flash.InfoMsg | Str2html}}

    +

    {{.Flash.InfoMsg | SanitizeHTML}}

    {{end}} {{if .Flash.WarningMsg}}
    -

    {{.Flash.WarningMsg | Str2html}}

    +

    {{.Flash.WarningMsg | SanitizeHTML}}

    {{end}} diff --git a/templates/base/alert_details.tmpl b/templates/base/alert_details.tmpl index 1d7ec15dc0..6801c8240f 100644 --- a/templates/base/alert_details.tmpl +++ b/templates/base/alert_details.tmpl @@ -2,6 +2,6 @@
    {{.Summary}} - {{.Details | Str2html}} + {{.Details | SanitizeHTML}}
    diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index d65a3626a4..fed426a469 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -16,6 +16,5 @@ {{template "custom/footer" .}} - {{ctx.DataRaceCheck $.Context}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 21addc7176..ad3419793e 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -3,7 +3,7 @@ {{/* Display `- .Repsository.FullName` only if `.Title` does not already start with that. */}} - {{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if and (.Repository.Name) (not (StringUtils.HasPrefix .Title .Repository.FullName))}}{{.Repository.FullName}} - {{end}}{{AppName}} + {{if .Title}}{{.Title}} - {{end}}{{if and (.Repository.Name) (not (StringUtils.HasPrefix .Title .Repository.FullName))}}{{.Repository.FullName}} - {{end}}{{AppName}} {{if .ManifestData}}{{end}} @@ -30,8 +30,7 @@ {{template "base/head_style" .}} {{template "custom/header" .}} - - {{ctx.DataRaceCheck $.Context}} + {{template "custom/body_outer_pre" .}}
    diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index b4a93688e3..068271bbe9 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -11,16 +11,16 @@ -
    +
    {{if .IsSigned}} - -
    + +
    {{svg "octicon-bell"}} - {{$notificationUnreadCount}} + {{$notificationUnreadCount}}
    {{end}} - +
    @@ -56,9 +56,9 @@
    {{if and .IsSigned .MustChangePassword}}
    - - {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} - {{.SignedUser.Name}} + + {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}} + {{.SignedUser.Name}} {{svg "octicon-triangle-down"}}
    @@ -75,19 +75,19 @@
    {{else if .IsSigned}} {{if EnableTimetracking}} - -
    + +
    {{svg "octicon-stopwatch"}}
    - {{ctx.Locale.Tr "active_stopwatch"}} + {{ctx.Locale.Tr "active_stopwatch"}}     -
    -
    - - {{svg "octicon-issue-opened" 16 "gt-mr-3"}} +
    +
    + + {{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}} - + {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}} @@ -111,18 +111,18 @@
    {{end}} - -
    + +
    {{svg "octicon-bell"}} - {{$notificationUnreadCount}} + {{$notificationUnreadCount}}
    -
    +
    {{svg "octicon-plus"}} {{svg "octicon-triangle-down"}} - {{ctx.Locale.Tr "create_new"}} + {{ctx.Locale.Tr "create_new"}}
    @@ -141,10 +141,10 @@
    -
    - - {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}} - {{.SignedUser.Name}} +
    + + {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}} + {{.SignedUser.Name}} {{svg "octicon-triangle-down"}}
    diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl index 4a723f63b9..22e08e9c8f 100644 --- a/templates/base/head_script.tmpl +++ b/templates/base/head_script.tmpl @@ -41,6 +41,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly. remove_label_str: {{ctx.Locale.Tr "remove_label_str"}}, modal_confirm: {{ctx.Locale.Tr "modal.confirm"}}, modal_cancel: {{ctx.Locale.Tr "modal.cancel"}}, + more_items: {{ctx.Locale.Tr "more_items"}}, }, }; {{/* in case some pages don't render the pageData, we make sure it is an object to prevent null access */}} diff --git a/templates/base/paginate.tmpl b/templates/base/paginate.tmpl index 503817c339..2ca72f6a34 100644 --- a/templates/base/paginate.tmpl +++ b/templates/base/paginate.tmpl @@ -1,30 +1,32 @@ -{{$paginationLink := .Page.GetParams}} +{{$paginationParams := .Page.GetParams}} +{{$paginationLink := $.Link}} +{{if eq $paginationLink AppSubUrl}}{{$paginationLink = print $paginationLink "/"}}{{end}} {{with .Page.Paginater}} {{if gt .TotalPages 1}}
    diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl deleted file mode 100644 index 48dc13b47b..0000000000 --- a/templates/code/searchcombo.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -{{template "code/searchform" .}} -
    -
    - {{if .CodeIndexerUnavailable}} -
    -

    {{ctx.Locale.Tr "explore.code_search_unavailable"}}

    -
    - {{else if .SearchResults}} -

    - {{ctx.Locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

    - {{template "code/searchresults" .}} - {{else if .Keyword}} -
    {{ctx.Locale.Tr "explore.code_no_results"}}
    - {{end}} -
    -{{template "base/paginate" .}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl deleted file mode 100644 index fae1340046..0000000000 --- a/templates/code/searchform.tmpl +++ /dev/null @@ -1,14 +0,0 @@ -
    -
    - {{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}} -
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    {{ctx.Locale.Tr (printf "explore.search.%s" (or .queryType "fuzzy"))}}
    -
    -
    {{ctx.Locale.Tr "explore.search.fuzzy"}}
    -
    {{ctx.Locale.Tr "explore.search.match"}}
    -
    -
    - -
    -
    diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl deleted file mode 100644 index bb21a5e0dc..0000000000 --- a/templates/code/searchresults.tmpl +++ /dev/null @@ -1,43 +0,0 @@ -
    - {{range $term := .SearchResultLanguages}} - - - {{$term.Language}} -
    {{$term.Count}}
    -     - {{end}} -
    -
    - {{range $result := .SearchResults}} - {{$repo := (index $.RepoMaps .RepoID)}} -
    -

    - - {{$repo.FullName}} - {{if $repo.IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} - {{end}} - - {{.Filename}} - - {{ctx.Locale.Tr "repo.diff.view_file"}} -

    -
    -
    - - - - - - - -
    - {{range .LineNumbers}} - {{.}} - {{end}} - {{.FormattedLines}}
    -
    -
    - {{template "shared/searchbottom" dict "root" $ "result" .}} -
    - {{end}} -
    diff --git a/templates/devtest/fetch-action.tmpl b/templates/devtest/fetch-action.tmpl index 70844a8751..7b0bbba554 100644 --- a/templates/devtest/fetch-action.tmpl +++ b/templates/devtest/fetch-action.tmpl @@ -26,7 +26,7 @@
    -
    bad action url
    +
    bad action url
    diff --git a/templates/devtest/flex-list.tmpl b/templates/devtest/flex-list.tmpl index c8584c110b..015ab1e154 100644 --- a/templates/devtest/flex-list.tmpl +++ b/templates/devtest/flex-list.tmpl @@ -25,7 +25,7 @@
    @@ -73,7 +73,7 @@
    - Go + Go {{svg "octicon-star" 16}}45000 {{svg "octicon-git-branch" 16}}1234 @@ -104,7 +104,7 @@

    If parent provides the padding/margin space:

    -
    +
    item 1 (no padding top)
    item 2 (no padding bottom)
    diff --git a/templates/devtest/fomantic-modal.tmpl b/templates/devtest/fomantic-modal.tmpl index eda169a043..5cd36721a7 100644 --- a/templates/devtest/fomantic-modal.tmpl +++ b/templates/devtest/fomantic-modal.tmpl @@ -5,7 +5,7 @@ @@ -14,7 +14,7 @@
    Form dialog (layout 2)
    -
    +
    {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
    @@ -24,7 +24,7 @@
    Form dialog (layout 3)
    -
    +
    {{template "base/modal_actions_confirm" (dict "ModalButtonTypes" "confirm")}}
    @@ -33,7 +33,7 @@ -
    +
    {{template "base/footer" .}} diff --git a/templates/devtest/tmplerr.tmpl b/templates/devtest/tmplerr.tmpl index 2fe3f1effd..dd938c895e 100644 --- a/templates/devtest/tmplerr.tmpl +++ b/templates/devtest/tmplerr.tmpl @@ -1,10 +1,10 @@ {{template "base/head" .}}
    -
    -
    +
    +
    hello hello hello hello hello hello hello hello hello hello
    -
    +
    {{template "devtest/tmplerr-sub" .}}
    diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 2298575887..039933fa2d 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -2,7 +2,7 @@
    {{template "explore/navbar" .}}
    - {{template "code/searchcombo" .}} + {{template "shared/search/code/search" .}}
    {{template "base/footer" .}} diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index 7f2aea497a..8e619fa66f 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -1,5 +1,5 @@ -
    -
    + +
    {{svg "octicon-repo"}} {{ctx.Locale.Tr "explore.repos"}} @@ -17,4 +17,4 @@ {{end}}
    -
    + diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index c51dcaa3ff..a59235abc1 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -30,16 +30,25 @@ {{end}}
    -
    +
    {{if .PrimaryLanguage}} - - {{.PrimaryLanguage.Language}} + + + {{.PrimaryLanguage.Language}} {{end}} {{if not $.DisableStars}} - {{svg "octicon-star" 16}}{{.NumStars}} + + {{svg "octicon-star" 16}} + {{if ge .NumStars 1000}}data-tooltip-content="{{.NumStars}}"{{end}}{{CountFmt .NumStars}} + + {{end}} + {{if not $.DisableForks}} + + {{svg "octicon-git-branch" 16}} + {{if ge .NumForks 1000}}data-tooltip-content="{{.NumForks}}"{{end}}{{CountFmt .NumForks}} + {{end}} - {{svg "octicon-git-branch" 16}}{{.NumForks}}
    {{$description := .DescriptionHTML $.Context}} @@ -58,7 +67,7 @@
    {{else}}
    - {{ctx.Locale.Tr "explore.repo_no_results"}} + {{ctx.Locale.Tr "search.no_results"}}
    {{end}}
    diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl deleted file mode 100644 index eaf2e7a090..0000000000 --- a/templates/explore/repo_search.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -
    - - - -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - {{if .PageIsExploreRepositories}} - - {{else if .TabName}} - - {{end}} - -
    - - -
    - - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{if not .DisableStars}} - {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}} - {{end}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}} -
    -
    -
    -{{if and .PageIsExploreRepositories .OnlyShowRelevant}} -
    - {{ctx.Locale.Tr "explore.relevant_repositories" ((printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))|Escape) | Safe}} -
    -{{end}} -
    diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index dfede2ffcc..53742bf0d9 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -2,7 +2,7 @@
    {{template "explore/navbar" .}}
    - {{template "explore/repo_search" .}} + {{template "shared/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}}
    diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 74b80436dc..1d984a2e37 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,23 +1,22 @@ -
    -
    -
    - {{template "shared/searchinput" dict "Value" .Keyword}} - -
    +
    + + {{if .PageIsExploreUsers}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.user_kind")}} + {{else}} + {{template "shared/search/combo" dict "Value" .Keyword "Placeholder" (ctx.Locale.Tr "search.org_kind")}} + {{end}} -
    +
    {{ctx.Locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} - {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}} + {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}
    diff --git a/templates/explore/user_list.tmpl b/templates/explore/user_list.tmpl index 9abbff6d9c..f2cf939ffb 100644 --- a/templates/explore/user_list.tmpl +++ b/templates/explore/user_list.tmpl @@ -1,6 +1,6 @@
    {{range .Users}} -
    +
    {{ctx.AvatarUtils.Avatar . 48}}
    @@ -21,11 +21,13 @@ {{.Email}} {{end}} - {{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix) | Safe}} + {{svg "octicon-calendar"}}{{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix)}}
    {{else}} -
    {{ctx.Locale.Tr "explore.user_no_results"}}
    +
    + {{ctx.Locale.Tr "search.no_results"}} +
    {{end}}
    diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 7e15ae3d47..e9046125c6 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -3,9 +3,7 @@ {{template "explore/navbar" .}}
    {{template "explore/search" .}} - {{template "explore/user_list" .}} - {{template "base/paginate" .}}
    diff --git a/templates/home.tmpl b/templates/home.tmpl index 78364431e9..e6fd4ef020 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
    -
    +
    @@ -17,7 +17,7 @@ {{svg "octicon-flame"}} {{ctx.Locale.Tr "startpage.install"}}

    - {{ctx.Locale.Tr "startpage.install_desc" | Str2html}} + {{ctx.Locale.Tr "startpage.install_desc"}}

    @@ -25,7 +25,7 @@ {{svg "octicon-device-desktop"}} {{ctx.Locale.Tr "startpage.platform"}}

    - {{ctx.Locale.Tr "startpage.platform_desc" | Str2html}} + {{ctx.Locale.Tr "startpage.platform_desc"}}

    @@ -35,7 +35,7 @@ {{svg "octicon-rocket"}} {{ctx.Locale.Tr "startpage.lightweight"}}

    - {{ctx.Locale.Tr "startpage.lightweight_desc" | Str2html}} + {{ctx.Locale.Tr "startpage.lightweight_desc"}}

    @@ -43,7 +43,7 @@ {{svg "octicon-code"}} {{ctx.Locale.Tr "startpage.license"}}

    - {{ctx.Locale.Tr "startpage.license_desc" | Str2html}} + {{ctx.Locale.Tr "startpage.license_desc"}}

    diff --git a/templates/install.tmpl b/templates/install.tmpl index 42842084b7..6bb37d0a0c 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -8,7 +8,7 @@
    {{template "base/alert" .}} -

    {{ctx.Locale.Tr "install.docker_helper" "https://docs.gitea.com/installation/install-with-docker" | Safe}}

    +

    {{ctx.Locale.Tr "install.docker_helper" "https://forgejo.org/docs/latest/admin/installation-docker/"}}

    @@ -28,7 +28,7 @@
    -
    +
    @@ -47,7 +47,7 @@
    -
    +
    @@ -68,11 +68,11 @@
    -
    +
    - {{ctx.Locale.Tr "install.sqlite_helper" | Safe}} + {{ctx.Locale.Tr "install.sqlite_helper"}}
    @@ -160,7 +160,7 @@
    - + {{ctx.Locale.Tr "install.email_title"}}
    @@ -200,7 +200,7 @@
    - + {{ctx.Locale.Tr "install.server_service_title"}}
    @@ -298,7 +298,7 @@
    - + {{ctx.Locale.Tr "install.admin_title"}}

    {{ctx.Locale.Tr "install.admin_setting_desc"}}

    @@ -327,7 +327,7 @@
    {{ctx.Locale.Tr "install.env_config_keys_prompt"}}
    -
    +
    {{range .EnvConfigKeys}}{{.}}{{end}}
    @@ -336,9 +336,9 @@
    - These configuration options will be written into: {{.CustomConfFile}} + {{ctx.Locale.Tr "install.config_location_hint"}} {{.CustomConfFile}}
    -
    +
    @@ -347,5 +347,5 @@
    - + {{template "base/footer" .}} diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index a15afe3d49..b1bb4cb463 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -8,8 +8,8 @@ {{$activate_url := printf "%suser/activate?code=%s" AppUrl (QueryEscape .Code)}} -

    {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName | Str2html}}


    -

    {{.locale.Tr "mail.activate_account.text_2" .ActiveCodeLives | Str2html}}

    {{$activate_url}}


    +

    {{.locale.Tr "mail.activate_account.text_1" (.DisplayName|DotEscape) AppName}}


    +

    {{.locale.Tr "mail.activate_account.text_2" .ActiveCodeLives}}

    {{$activate_url}}


    {{.locale.Tr "mail.link_not_working_do_paste"}}

    © {{AppName}}

    diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index b15cc2a68a..3d32f80a4e 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -8,8 +8,8 @@ {{$activate_url := printf "%suser/activate_email?code=%s&email=%s" AppUrl (QueryEscape .Code) (QueryEscape .Email)}} -

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}


    -

    {{.locale.Tr "mail.activate_email.text" .ActiveCodeLives | Str2html}}

    {{$activate_url}}


    +

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}


    +

    {{.locale.Tr "mail.activate_email.text" .ActiveCodeLives}}

    {{$activate_url}}


    {{.locale.Tr "mail.link_not_working_do_paste"}}

    © {{AppName}}

    diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 3cdb456fb3..62dbf7d927 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -8,10 +8,10 @@ {{$set_pwd_url := printf "%[1]suser/forgot_password" AppUrl}} -

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}


    +

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}


    {{.locale.Tr "mail.register_notify.text_1" AppName}}


    {{.locale.Tr "mail.register_notify.text_2" .Username}}

    {{AppUrl}}user/login


    -

    {{.locale.Tr "mail.register_notify.text_3" ($set_pwd_url | Escape) | Str2html}}


    +

    {{.locale.Tr "mail.register_notify.text_3" $set_pwd_url}}


    © {{AppName}}

    diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index 172844c954..55b1ecec3f 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -8,8 +8,8 @@ {{$recover_url := printf "%suser/recover_account?code=%s" AppUrl (QueryEscape .Code)}} -

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape) | Str2html}}


    -

    {{.locale.Tr "mail.reset_password.text" .ResetPwdCodeLives | Str2html}}

    {{$recover_url}}


    +

    {{.locale.Tr "mail.hi_user_x" (.DisplayName|DotEscape)}}


    +

    {{.locale.Tr "mail.reset_password.text" .ResetPwdCodeLives}}

    {{$recover_url}}


    {{.locale.Tr "mail.link_not_working_do_paste"}}

    © {{AppName}}

    diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl index e80bd2fc31..5720319ee8 100644 --- a/templates/mail/issue/assigned.tmpl +++ b/templates/mail/issue/assigned.tmpl @@ -8,14 +8,14 @@ {{.Subject}} -{{$repo_url := printf "%s" (Escape .Issue.Repo.HTMLURL) (Escape .Issue.Repo.FullName)}} -{{$link := printf "#%d" (Escape .Link) .Issue.Index}} +{{$repo_url := HTMLFormat "%s" .Issue.Repo.HTMLURL .Issue.Repo.FullName}} +{{$link := HTMLFormat "#%d" .Link .Issue.Index}}

    {{if .IsPull}} - {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name ($link|Safe) ($repo_url|Safe)}} + {{.locale.Tr "mail.issue_assigned.pull" .Doer.Name $link $repo_url}} {{else}} - {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name ($link|Safe) ($repo_url|Safe)}} + {{.locale.Tr "mail.issue_assigned.issue" .Doer.Name $link $repo_url}} {{end}}

    diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index b5a7ab95cf..4e83dbcfdb 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -16,56 +16,56 @@ - {{if .IsMention}}

    {{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name | Str2html}}

    {{end}} + {{if .IsMention}}

    {{.locale.Tr "mail.issue.x_mentioned_you" .Doer.Name}}

    {{end}} {{if eq .ActionName "push"}}

    {{if .Comment.IsForcePush}} {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} {{$oldShortSha := ShortSha .Comment.OldCommit}} - {{$oldCommitLink := printf "%[2]s" (Escape $oldCommitUrl) (Escape $oldShortSha)}} + {{$oldCommitLink := HTMLFormat "%[2]s" $oldCommitUrl $oldShortSha}} {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} {{$newShortSha := ShortSha .Comment.NewCommit}} - {{$newCommitLink := printf "%[2]s" (Escape $newCommitUrl) (Escape $newShortSha)}} + {{$newCommitLink := HTMLFormat "%[2]s" $newCommitUrl $newShortSha}} - {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch ($oldCommitLink|Safe) ($newCommitLink|Safe)}} + {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} {{else}} - {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | Str2html}} + {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | SanitizeHTML}} {{end}}

    {{end}}

    {{if eq .ActionName "close"}} - {{.locale.Tr "mail.issue.action.close" (Escape .Doer.Name) .Issue.Index | Str2html}} + {{.locale.Tr "mail.issue.action.close" .Doer.Name .Issue.Index}} {{else if eq .ActionName "reopen"}} - {{.locale.Tr "mail.issue.action.reopen" (Escape .Doer.Name) .Issue.Index | Str2html}} + {{.locale.Tr "mail.issue.action.reopen" .Doer.Name .Issue.Index}} {{else if eq .ActionName "merge"}} - {{.locale.Tr "mail.issue.action.merge" (Escape .Doer.Name) .Issue.Index (Escape .Issue.PullRequest.BaseBranch) | Str2html}} + {{.locale.Tr "mail.issue.action.merge" .Doer.Name .Issue.Index .Issue.PullRequest.BaseBranch}} {{else if eq .ActionName "approve"}} - {{.locale.Tr "mail.issue.action.approve" (Escape .Doer.Name) | Str2html}} + {{.locale.Tr "mail.issue.action.approve" .Doer.Name}} {{else if eq .ActionName "reject"}} - {{.locale.Tr "mail.issue.action.reject" (Escape .Doer.Name) | Str2html}} + {{.locale.Tr "mail.issue.action.reject" .Doer.Name}} {{else if eq .ActionName "review"}} - {{.locale.Tr "mail.issue.action.review" (Escape .Doer.Name) | Str2html}} + {{.locale.Tr "mail.issue.action.review" .Doer.Name}} {{else if eq .ActionName "review_dismissed"}} - {{.locale.Tr "mail.issue.action.review_dismissed" (Escape .Doer.Name) (Escape .Comment.Review.Reviewer.Name) | Str2html}} + {{.locale.Tr "mail.issue.action.review_dismissed" .Doer.Name .Comment.Review.Reviewer.Name}} {{else if eq .ActionName "ready_for_review"}} - {{.locale.Tr "mail.issue.action.ready_for_review" (Escape .Doer.Name) | Str2html}} + {{.locale.Tr "mail.issue.action.ready_for_review" .Doer.Name}} {{end}} {{- if eq .Body ""}} {{if eq .ActionName "new"}} - {{.locale.Tr "mail.issue.action.new" (Escape .Doer.Name) .Issue.Index | Str2html}} + {{.locale.Tr "mail.issue.action.new" .Doer.Name .Issue.Index}} {{end}} {{else}} - {{.Body | Str2html}} + {{.Body}} {{end -}} {{- range .ReviewComments}}

    {{$.locale.Tr "mail.issue.in_tree_path" .TreePath}} 
    {{.Patch}}
    -
    {{.RenderedContent | Safe}}
    +
    {{.RenderedContent}}
    {{end -}} {{if eq .ActionName "push"}} diff --git a/templates/mail/notify/admin_new_user.tmpl b/templates/mail/notify/admin_new_user.tmpl index 34d1584f60..613c58194a 100644 --- a/templates/mail/notify/admin_new_user.tmpl +++ b/templates/mail/notify/admin_new_user.tmpl @@ -13,9 +13,9 @@
      -

      {{.Locale.Tr "mail.admin.new_user.user_info" | Str2html}}: @{{.NewUser.Name}}

      -
    • {{.Locale.Tr "admin.users.created" | Str2html}}: {{DateTime "full" .NewUser.CreatedUnix}}
      • +

      {{.Locale.Tr "mail.admin.new_user.user_info"}}: @{{.NewUser.Name}}

      +
    • {{.Locale.Tr "admin.users.created"}}: {{DateTime "full" .NewUser.CreatedUnix}}
    -

    {{.Body | Str2html}}

    +

    {{.Body | SanitizeHTML}}

    diff --git a/templates/mail/notify/repo_transfer.tmpl b/templates/mail/notify/repo_transfer.tmpl index 1b23593f6b..8c8b276484 100644 --- a/templates/mail/notify/repo_transfer.tmpl +++ b/templates/mail/notify/repo_transfer.tmpl @@ -5,10 +5,10 @@ {{.Subject}} -{{$url := printf "%[2]s" (Escape .Link) (Escape .Repo)}} +{{$url := HTMLFormat "%[2]s" .Link .Repo}}

    {{.Subject}}. - {{.locale.Tr "mail.repo.transfer.body" ($url|Safe)}} + {{.locale.Tr "mail.repo.transfer.body" $url}}

    --- diff --git a/templates/mail/release.tmpl b/templates/mail/release.tmpl index 96dc769993..92af3216bb 100644 --- a/templates/mail/release.tmpl +++ b/templates/mail/release.tmpl @@ -11,18 +11,18 @@ -{{$release_url := printf "%s" (.Release.HTMLURL | Escape) (.Release.TagName | Escape)}} -{{$repo_url := printf "%s" (.Release.Repo.HTMLURL | Escape) (.Release.Repo.FullName | Escape)}} +{{$release_url := HTMLFormat "%s" .Release.HTMLURL .Release.TagName}} +{{$repo_url := HTMLFormat "%s" .Release.Repo.HTMLURL .Release.Repo.FullName}}

    - {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name ($release_url|Safe) ($repo_url|Safe)}} + {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url}}

    {{.locale.Tr "mail.release.title" .Release.Title}}

    {{.locale.Tr "mail.release.note"}}
    {{- if eq .Release.RenderedNote ""}} {{else}} - {{.Release.RenderedNote | Str2html}} + {{.Release.RenderedNote}} {{end -}}



    @@ -43,7 +43,7 @@ {{range .Release.Attachments}}
  • - {{.Name}} ({{.Size | FileSize}}) + {{.Name}} ({{.Size | $.locale.TrSize}})
    • {{end}} diff --git a/templates/mail/team_invite.tmpl b/templates/mail/team_invite.tmpl index d21b7843ec..cb0c0c0a50 100644 --- a/templates/mail/team_invite.tmpl +++ b/templates/mail/team_invite.tmpl @@ -5,7 +5,7 @@ -

    {{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName) | Str2html}}

    +

    {{.locale.Tr "mail.team_invite.text_1" (DotEscape .Inviter.DisplayName) (DotEscape .Team.Name) (DotEscape .Organization.DisplayName)}}

    {{.locale.Tr "mail.team_invite.text_2"}}

    {{.InviteURL}}

    {{.locale.Tr "mail.link_not_working_do_paste"}}

    {{.locale.Tr "mail.team_invite.text_3" .Invite.Email}}

    diff --git a/templates/org/follow_unfollow.tmpl b/templates/org/follow_unfollow.tmpl new file mode 100644 index 0000000000..ba0bd01efe --- /dev/null +++ b/templates/org/follow_unfollow.tmpl @@ -0,0 +1,7 @@ + diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 7b912c1c56..7361df99ea 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -1,18 +1,32 @@ -{{with .Org}} -
    -
    -
    -
    - {{ctx.AvatarUtils.Avatar . 100}} - {{.DisplayName}} - - {{if .Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} -     -
    -
    +
    + {{ctx.AvatarUtils.Avatar .Org 100 "org-avatar"}} +
    +
    + {{.Org.DisplayName}} + + {{if .Org.Visibility.IsLimited}}{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}{{end}} + {{if .Org.Visibility.IsPrivate}}{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}{{end}} + + + {{if .EnableFeed}} + + {{svg "octicon-rss" 24}} + + {{end}} + {{if .IsSigned}} + {{template "org/follow_unfollow" .}} + {{end}} + +
    + {{if .RenderedDescription}}
    {{.RenderedDescription}}
    {{end}} +
    + {{if .Org.Location}}
    {{svg "octicon-location"}} {{.Org.Location}}
    {{end}} + {{if .Org.Website}}
    {{svg "octicon-link"}} {{.Org.Website}}
    {{end}} + {{if .IsSigned}} + {{if .Org.Email}}
    {{svg "octicon-mail"}} {{.Org.Email}}
    {{end}} + {{end}}
    -{{end}} +
    {{template "org/menu" .}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index c2322b75fb..45697e566c 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,54 +1,19 @@ {{template "base/head" .}}
    {{if .Flash}} -
    +
    {{template "base/alert" .}}
    {{end}} -
    - {{ctx.AvatarUtils.Avatar .Org 140 "org-avatar"}} -
    -
    - {{.Org.DisplayName}} - - {{if .Org.Visibility.IsLimited}}{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}{{end}} - {{if .Org.Visibility.IsPrivate}}{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}{{end}} - -
    - {{if $.RenderedDescription}}
    {{$.RenderedDescription|Str2html}}
    {{end}} -
    - {{if .Org.Location}}
    {{svg "octicon-location"}} {{.Org.Location}}
    {{end}} - {{if .Org.Website}}
    {{svg "octicon-link"}} {{.Org.Website}}
    {{end}} - {{if $.IsSigned}} - {{if .Org.Email}}
    {{svg "octicon-mail"}} {{.Org.Email}}
    {{end}} - {{end}} -
    -
    -
    - {{if .EnableFeed}} - - {{svg "octicon-rss" 24}} - - {{end}} - -
    -
    - - {{template "org/menu" .}} + {{template "org/header" .}}
    {{if .ProfileReadme}} -
    {{.ProfileReadme | Str2html}}
    +
    {{.ProfileReadme}}
    {{end}} - {{template "explore/repo_search" .}} + {{template "shared/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}}
    @@ -56,7 +21,7 @@ {{if .ShowMemberAndTeamTab}}
    {{if .CanCreateOrgRepo}} -
    +
    {{ctx.Locale.Tr "new_repo"}} {{if not .DisableNewPullMirrors}} {{ctx.Locale.Tr "new_migrate"}} @@ -65,9 +30,9 @@
    {{end}} {{if .NumMembers}} -

    - {{ctx.Locale.Tr "org.members"}} - {{.NumMembers}} {{svg "octicon-chevron-right"}} +

    + {{ctx.Locale.Tr "org.members"}} + {{.NumMembers}} {{svg "octicon-chevron-right"}}

    {{$isMember := .IsOrganizationMember}} @@ -79,9 +44,9 @@
    {{end}} {{if .IsOrganizationMember}} -
    - {{ctx.Locale.Tr "org.teams"}} - {{.Org.NumTeams}} {{svg "octicon-chevron-right"}} +
    + {{ctx.Locale.Tr "org.teams"}} + {{.Org.NumTeams}} {{svg "octicon-chevron-right"}}
    {{range .Teams}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index e4ddb69805..4388dc9520 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    {{template "org/header" .}}
    {{template "base/alert" .}} @@ -7,7 +7,7 @@
    {{range .Members}} {{$isPublic := index $.MembersIsPublicMember .ID}} -
    +
    {{ctx.AvatarUtils.Avatar . 48}}
    @@ -73,7 +73,7 @@ {{ctx.Locale.Tr "org.members.leave"}}
    -

    {{ctx.Locale.Tr "org.members.leave.detail" `` | Safe}}

    +

    {{ctx.Locale.Tr "org.members.leave.detail" (``|SafeHTML)}}

    {{template "base/modal_actions_confirm" .}}
    @@ -82,7 +82,7 @@ {{ctx.Locale.Tr "org.members.remove"}}
    -

    {{ctx.Locale.Tr "org.members.remove.detail" `` `` | Safe}}

    +

    {{ctx.Locale.Tr "org.members.remove.detail" (``|SafeHTML) (``|SafeHTML)}}

    {{template "base/modal_actions_confirm" .}}
    diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 8a97711ce2..c519606d1f 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,50 +1,49 @@
    -
    - - {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} - {{if .RepoCount}} -
    {{.RepoCount}}
    + +
    + + {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} + {{if .RepoCount}} +
    {{.RepoCount}}
    + {{end}} +     + {{if .CanReadProjects}} + + {{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}} + {{if .ProjectCount}} +
    {{.ProjectCount}}
    + {{end}} +     {{end}} - - {{if .CanReadProjects}} - - {{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}} - {{if .ProjectCount}} -
    {{.ProjectCount}}
    + {{if and .IsPackageEnabled .CanReadPackages}} +     + {{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}} + {{end}} - - {{end}} - {{if and .IsPackageEnabled .CanReadPackages}} - - {{svg "octicon-package"}} {{ctx.Locale.Tr "packages.title"}} - - {{end}} - {{if and .IsRepoIndexerEnabled .CanReadCode}} - - {{svg "octicon-code"}} {{ctx.Locale.Tr "org.code"}} - - {{end}} - {{if .NumMembers}} + {{if and .IsRepoIndexerEnabled .CanReadCode}} + + {{svg "octicon-code"}} {{ctx.Locale.Tr "org.code"}} + + {{end}} + {{if .NumMembers}} - {{svg "octicon-person"}} {{ctx.Locale.Tr "org.members"}} + {{svg "octicon-person"}} {{ctx.Locale.Tr "org.members"}}
    {{.NumMembers}}
     - {{end}} - {{if .IsOrganizationMember}} + {{end}} + {{if .IsOrganizationMember}} - {{svg "octicon-people"}} {{ctx.Locale.Tr "org.teams"}} + {{svg "octicon-people"}} {{ctx.Locale.Tr "org.teams"}} {{if .NumTeams}}
    {{.NumTeams}}
    {{end}}     - {{end}} - - {{if .IsOrganizationOwner}} -
    - - {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} - -
    - {{end}} -
    + {{end}} + {{if .IsOrganizationOwner}} + + {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} + + {{end}} +
    +
    diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 689091e5e0..ec9cfece9a 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,10 +1,9 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} +
    + {{template "org/header" .}}
    - {{template "user/overview/header" .}} - {{template "projects/list" .}} + {{template "projects/list" .}}
    {{else}} @@ -15,7 +14,7 @@ {{template "shared/user/profile_big_avatar" .}}
    -
    +
    {{template "user/overview/header" .}}
    {{template "projects/list" .}} diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl index d6c16bacef..f685a1b998 100644 --- a/templates/org/settings/blocked_users.tmpl +++ b/templates/org/settings/blocked_users.tmpl @@ -1,13 +1,13 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked-users")}}
    - + {{.CsrfTokenHtml}}
    diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 2cf8238f57..e1ef471e34 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -6,7 +6,7 @@
    -

    {{svg "octicon-alert"}} {{ctx.Locale.Tr "org.settings.delete_prompt" | Str2html}}

    +

    {{svg "octicon-alert"}} {{ctx.Locale.Tr "org.settings.delete_prompt"}}

    {{.CsrfTokenHtml}} diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index b12ea8d9f4..25a562c975 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,8 +1,8 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
    -
    -
    - {{ctx.Locale.Tr "org.settings.labels_desc" | Str2html}} +
    +
    + {{ctx.Locale.Tr "org.settings.labels_desc"}}
    diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 31c0d85d89..62debfc0ae 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -8,7 +8,7 @@ {{.CsrfTokenHtml}}
    diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index e003d14757..1167828d14 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -7,7 +7,7 @@ {{ctx.AvatarUtils.Avatar .Organization 140}}
    -
    {{ctx.Locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}
    +
    {{ctx.Locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name}}
    {{ctx.Locale.Tr "org.teams.invite.by" .Inviter.Name}}
    {{ctx.Locale.Tr "org.teams.invite.description"}}
    diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index da63d82967..5719328a27 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -9,12 +9,12 @@ {{template "org/team/navbar" .}} {{if .IsOrganizationOwner}}
    - + {{.CsrfTokenHtml}} - diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 8a5cdc7cc7..707f670e97 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -70,8 +70,8 @@
    {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
    - - diff --git a/templates/repo/cite/cite_modal.tmpl b/templates/repo/cite/cite_modal.tmpl index c34c77e0c4..fb251442ca 100644 --- a/templates/repo/cite/cite_modal.tmpl +++ b/templates/repo/cite/cite_modal.tmpl @@ -1,16 +1,14 @@ -
    -
    +
    {{end}} diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index 1c3379e629..0e9c2b9d22 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -1,9 +1,8 @@ {{if .EnableCaptcha}}{{if eq .CaptchaType "image"}}
    - {{.Captcha.CreateHTML}}
    -
    +
    @@ -24,7 +23,7 @@
    {{else if eq .CaptchaType "cfturnstile"}} -
    +
    diff --git a/templates/user/auth/change_passwd_inner.tmpl b/templates/user/auth/change_passwd_inner.tmpl index cffc798a64..601f0365f3 100644 --- a/templates/user/auth/change_passwd_inner.tmpl +++ b/templates/user/auth/change_passwd_inner.tmpl @@ -2,22 +2,21 @@ {{template "base/alert" .}} {{end}}

    - {{ctx.Locale.Tr "settings.change_password"}} + {{ctx.Locale.Tr "settings.update_password"}}

    - + {{.CsrfTokenHtml}} -
    +
    -
    +
    - - +
    diff --git a/templates/user/auth/finalize_openid.tmpl b/templates/user/auth/finalize_openid.tmpl index 7449e3beda..1c1dcdb825 100644 --- a/templates/user/auth/finalize_openid.tmpl +++ b/templates/user/auth/finalize_openid.tmpl @@ -35,7 +35,7 @@ {{if .ShowRegistrationButton}}
    - {{ctx.Locale.Tr "auth.sign_up_now" | Str2html}} + {{ctx.Locale.Tr "auth.sign_up_now"}}
    {{end}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index dde4c8f6fe..55bcf63018 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -10,15 +10,14 @@
    {{template "base/alert" .}} {{if .IsResetSent}} -

    {{ctx.Locale.Tr "auth.reset_password_mail_sent_prompt" (Escape .Email) .ResetPwdCodeLives | Str2html}}

    +

    {{ctx.Locale.Tr "auth.reset_password_mail_sent_prompt" .Email .ResetPwdCodeLives}}

    {{else if .IsResetRequest}} -
    +
    -
    {{else if .IsResetDisable}} diff --git a/templates/user/auth/grant.tmpl b/templates/user/auth/grant.tmpl index 9c0bf33e28..cb9bba8749 100644 --- a/templates/user/auth/grant.tmpl +++ b/templates/user/auth/grant.tmpl @@ -9,11 +9,11 @@ {{template "base/alert" .}}

    {{ctx.Locale.Tr "auth.authorize_application_description"}}
    - {{ctx.Locale.Tr "auth.authorize_application_created_by" .ApplicationCreatorLinkHTML | Str2html}} + {{ctx.Locale.Tr "auth.authorize_application_created_by" .ApplicationCreatorLinkHTML}}

    -

    {{ctx.Locale.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML | Str2html}}

    +

    {{ctx.Locale.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML}}

    diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl index 5235cbf69f..8dd49ccd60 100644 --- a/templates/user/auth/link_account.tmpl +++ b/templates/user/auth/link_account.tmpl @@ -1,7 +1,7 @@ {{template "base/head" .}}