diff --git a/.drone.yml b/.drone.yml index 4e7789ef92..5d4e13038b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,138 +1,3 @@ ---- -kind: pipeline -type: docker -name: release-latest - -platform: - os: linux - arch: amd64 - -workspace: - base: /source - path: / - -trigger: - branch: - - main - - "release/*" - event: - - push - paths: - exclude: - - "docs/**" - -volumes: - - name: deps - temp: {} - -steps: - - name: fetch-tags - image: docker:git - pull: always - commands: - - git fetch --tags --force - - - name: deps-frontend - image: node:20 - pull: always - commands: - - make deps-frontend - - - name: deps-backend - image: gitea/test_env:linux-1.20-amd64 - pull: always - commands: - - make deps-backend - volumes: - - name: deps - path: /go - - - name: static - image: techknowlogick/xgo:go-1.20.x - pull: always - commands: - # Upgrade to node 20 once https://github.com/techknowlogick/xgo/issues/163 is resolved - - curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get -qqy install nodejs - - export PATH=$PATH:$GOPATH/bin - - make release - environment: - GOPROXY: https://goproxy.io # proxy.golang.org is blocked in China, this proxy is not - TAGS: bindata sqlite sqlite_unlock_notify - DEBIAN_FRONTEND: noninteractive - volumes: - - name: deps - path: /go - - - name: gpg-sign - image: plugins/gpgsign:1 - pull: always - settings: - detach_sign: true - excludes: - - "dist/release/*.sha256" - files: - - "dist/release/*" - environment: - GPGSIGN_KEY: - from_secret: gpgsign_key - GPGSIGN_PASSPHRASE: - from_secret: gpgsign_passphrase - - - name: release-branch - image: woodpeckerci/plugin-s3:latest - pull: always - settings: - acl: - from_secret: aws_s3_acl - region: - from_secret: aws_s3_region - bucket: - from_secret: aws_s3_bucket - endpoint: - from_secret: aws_s3_endpoint - path_style: - from_secret: aws_s3_path_style - source: "dist/release/*" - strip_prefix: dist/release/ - target: "/gitea/${DRONE_BRANCH##release/v}" - environment: - AWS_ACCESS_KEY_ID: - from_secret: aws_access_key_id - AWS_SECRET_ACCESS_KEY: - from_secret: aws_secret_access_key - when: - branch: - - "release/*" - event: - - push - - - name: release-main - image: woodpeckerci/plugin-s3:latest - settings: - acl: - from_secret: aws_s3_acl - region: - from_secret: aws_s3_region - bucket: - from_secret: aws_s3_bucket - endpoint: - from_secret: aws_s3_endpoint - path_style: - from_secret: aws_s3_path_style - source: "dist/release/*" - strip_prefix: dist/release/ - target: /gitea/main - environment: - AWS_ACCESS_KEY_ID: - from_secret: aws_access_key_id - AWS_SECRET_ACCESS_KEY: - from_secret: aws_secret_access_key - when: - branch: - - main - event: - - push - --- kind: pipeline name: release-version @@ -379,133 +244,6 @@ steps: exclude: - pull_request ---- -kind: pipeline -type: docker -name: docker-linux-amd64-release - -platform: - os: linux - arch: amd64 - -trigger: - ref: - - refs/heads/main - -steps: - - name: fetch-tags - image: docker:git - pull: always - commands: - - git fetch --tags --force - - - name: publish - image: plugins/docker:latest - pull: always - settings: - auto_tag: false - tags: nightly-linux-amd64 - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - - - name: publish-rootless - image: plugins/docker:latest - settings: - dockerfile: Dockerfile.rootless - auto_tag: false - tags: nightly-linux-amd64-rootless - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - ---- -kind: pipeline -name: docker-linux-amd64-release-branch - -platform: - os: linux - arch: amd64 - -trigger: - ref: - - "refs/heads/release/v*" - -steps: - - name: fetch-tags - image: docker:git - pull: always - commands: - - git fetch --tags --force - - - name: publish - image: plugins/docker:latest - pull: always - settings: - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-nightly-linux-amd64 - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - - - name: publish-rootless - image: plugins/docker:latest - settings: - dockerfile: Dockerfile.rootless - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-nightly-linux-amd64-rootless - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - --- kind: pipeline type: docker @@ -641,136 +379,6 @@ steps: exclude: - pull_request ---- -kind: pipeline -type: docker -name: docker-linux-arm64-release - -platform: - os: linux - arch: arm64 - -trigger: - ref: - - refs/heads/main - paths: - exclude: - - "docs/**" - -steps: - - name: fetch-tags - image: docker:git - pull: always - commands: - - git fetch --tags --force - - - name: publish - image: plugins/docker:latest - pull: always - settings: - auto_tag: false - tags: nightly-linux-arm64 - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - - - name: publish-rootless - image: plugins/docker:latest - settings: - dockerfile: Dockerfile.rootless - auto_tag: false - tags: nightly-linux-arm64-rootless - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - ---- -kind: pipeline -name: docker-linux-arm64-release-branch - -platform: - os: linux - arch: arm64 - -trigger: - ref: - - "refs/heads/release/v*" - -steps: - - name: fetch-tags - image: docker:git - pull: always - commands: - - git fetch --tags --force - - - name: publish - image: plugins/docker:latest - pull: always - settings: - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-nightly-linux-arm64 - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - - - name: publish-rootless - image: plugins/docker:latest - settings: - dockerfile: Dockerfile.rootless - auto_tag: false - tags: ${DRONE_BRANCH##release/v}-nightly-linux-arm64-rootless - repo: gitea/gitea - build_args: - - GOPROXY=https://goproxy.io - password: - from_secret: docker_password - username: - from_secret: docker_username - environment: - PLUGIN_MIRROR: - from_secret: plugin_mirror - DOCKER_BUILDKIT: 1 - when: - event: - exclude: - - pull_request - --- kind: pipeline type: docker @@ -816,50 +424,3 @@ depends_on: - docker-linux-amd64-release-candidate-version - docker-linux-arm64-release-version - docker-linux-arm64-release-candidate-version - ---- -kind: pipeline -type: docker -name: docker-manifest - -platform: - os: linux - arch: amd64 - -steps: - - name: manifest-rootless - image: plugins/manifest - pull: always - settings: - auto_tag: false - ignore_missing: true - spec: docker/manifest.rootless.tmpl - password: - from_secret: docker_password - username: - from_secret: docker_username - - - name: manifest - image: plugins/manifest - settings: - auto_tag: false - ignore_missing: true - spec: docker/manifest.tmpl - password: - from_secret: docker_password - username: - from_secret: docker_username - -trigger: - ref: - - refs/heads/main - - "refs/heads/release/v*" - paths: - exclude: - - "docs/**" - -depends_on: - - docker-linux-amd64-release - - docker-linux-arm64-release - - docker-linux-amd64-release-branch - - docker-linux-arm64-release-branch diff --git a/.eslintrc.yaml b/.eslintrc.yaml index f4b1e67534..ea85ab1298 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -29,11 +29,11 @@ globals: __webpack_public_path__: true overrides: - - files: ["web_src/**/*.js", "docs/**/*.js"] + - files: ["web_src/**/*", "docs/**/*"] env: browser: true node: false - - files: ["web_src/**/*worker.js"] + - files: ["web_src/**/*worker.*"] env: worker: true rules: @@ -42,7 +42,7 @@ overrides: rules: import/no-unresolved: [0] import/no-extraneous-dependencies: [0] - - files: ["*.config.js"] + - files: ["*.config.*"] rules: import/no-unused-modules: [0] diff --git a/.gitattributes b/.gitattributes index 6d4698d6a8..7e7a139c9a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,5 +5,6 @@ /templates/swagger/v1_json.tmpl linguist-generated /vendor/** -text -eol linguist-vendored /web_src/fomantic/build/** linguist-generated +/web_src/fomantic/_site/globals/site.variables linguist-language=Less /web_src/js/vendor/** -text -eol linguist-vendored Dockerfile.* linguist-language=Dockerfile diff --git a/.github/workflows/cron-licenses.yml b/.github/workflows/cron-licenses.yml index 17b0d686d8..4fa4016168 100644 --- a/.github/workflows/cron-licenses.yml +++ b/.github/workflows/cron-licenses.yml @@ -3,6 +3,7 @@ name: cron-licenses on: schedule: - cron: "7 0 * * 1" # every Monday at 00:07 UTC + workflow_dispatch: jobs: cron-licenses: diff --git a/.github/workflows/cron-translations.yml b/.github/workflows/cron-translations.yml index a7c9ceabd3..3f147c685d 100644 --- a/.github/workflows/cron-translations.yml +++ b/.github/workflows/cron-translations.yml @@ -3,6 +3,7 @@ name: cron-translations on: schedule: - cron: "7 0 * * *" # every day at 00:07 UTC + workflow_dispatch: jobs: crowdin-pull: diff --git a/.github/workflows/pull-compliance.yml b/.github/workflows/pull-compliance.yml index b7c1ab8a33..daee522c27 100644 --- a/.github/workflows/pull-compliance.yml +++ b/.github/workflows/pull-compliance.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/files-changed.yml lint-backend: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -27,7 +27,7 @@ jobs: TAGS: bindata sqlite sqlite_unlock_notify lint-go-windows: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -44,7 +44,7 @@ jobs: GOARCH: amd64 lint-go-gogit: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -59,7 +59,7 @@ jobs: TAGS: bindata gogit sqlite sqlite_unlock_notify checks-backend: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -72,7 +72,7 @@ jobs: - run: make --always-make checks-backend # ensure the "go-licenses" make target runs frontend: - if: needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -83,9 +83,10 @@ jobs: - run: make deps-frontend - run: make lint-frontend - run: make checks-frontend + - run: make frontend backend: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -94,12 +95,9 @@ jobs: with: go-version: ">=1.20" check-latest: true - - uses: actions/setup-node@v3 - with: - node-version: 20 + # no frontend build here as backend should be able to build + # even without any frontend files - run: make deps-backend deps-tools - - run: make deps-frontend - - run: make frontend - run: go build -o gitea_no_gcc # test if build succeeds without the sqlite tag - name: build-backend-arm64 run: make backend # test cross compile @@ -120,7 +118,7 @@ jobs: GOARCH: 386 docs: - if: needs.files-changed.outputs.docs == 'true' + if: needs.files-changed.outputs.docs == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -133,7 +131,7 @@ jobs: - run: make docs # test if build could succeed actions: - if: needs.files-changed.outputs.actions == 'true' + if: needs.files-changed.outputs.actions == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pull-db-tests.yml b/.github/workflows/pull-db-tests.yml index cf08da1512..3b9768a74b 100644 --- a/.github/workflows/pull-db-tests.yml +++ b/.github/workflows/pull-db-tests.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/files-changed.yml test-pgsql: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest services: @@ -58,7 +58,7 @@ jobs: USE_REPO_TEST_DIR: 1 test-sqlite: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -79,7 +79,7 @@ jobs: USE_REPO_TEST_DIR: 1 test-unit: - if: needs.files-changed.outputs.backend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest services: @@ -144,7 +144,7 @@ jobs: GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }} test-mysql5: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest services: @@ -188,7 +188,7 @@ jobs: TEST_INDEXER_CODE_ES_URL: "http://elastic:changeme@elasticsearch:9200" test-mysql8: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest services: @@ -217,7 +217,7 @@ jobs: USE_REPO_TEST_DIR: 1 test-mssql: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest services: diff --git a/.github/workflows/pull-docker-dryrun.yml b/.github/workflows/pull-docker-dryrun.yml index 89b0c5253c..916de6b27d 100644 --- a/.github/workflows/pull-docker-dryrun.yml +++ b/.github/workflows/pull-docker-dryrun.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/files-changed.yml docker-dryrun: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pull-e2e-tests.yml b/.github/workflows/pull-e2e-tests.yml index cf6af401f5..6577cfd240 100644 --- a/.github/workflows/pull-e2e-tests.yml +++ b/.github/workflows/pull-e2e-tests.yml @@ -12,7 +12,7 @@ jobs: uses: ./.github/workflows/files-changed.yml test-e2e: - if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' + if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.frontend == 'true' || needs.files-changed.outputs.actions == 'true' needs: files-changed runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml new file mode 100644 index 0000000000..0e94f5217c --- /dev/null +++ b/.github/workflows/release-nightly.yml @@ -0,0 +1,92 @@ +name: release-nightly-assets + +on: + push: + branches: [ main, release/v* ] + +jobs: + nightly-binary: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + # fetch all commits instead of only the last as some branches are long lived and could have many between versions + # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 + - run: git fetch --unshallow --quiet --tags --force + - uses: actions/setup-go@v4 + with: + go-version: ">=1.20" + check-latest: true + - uses: actions/setup-node@v3 + with: + node-version: 20 + - run: make deps-frontend deps-backend + # xgo build + - run: make release + env: + TAGS: bindata sqlite sqlite_unlock_notify + - name: import gpg key + id: import_gpg + uses: crazy-max/ghaction-import-gpg@v5 + with: + gpg_private_key: ${{ secrets.GPGSIGN_KEY }} + passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }} + - name: sign binaries + run: | + for f in dist/release/*; do + echo '${{ secrets.GPGSIGN_PASSPHRASE }}' | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u ${{ steps.import_gpg.outputs.fingerprint }} --output "$f.asc" "$f" + done + # clean branch name to get the folder name in S3 + - name: Get cleaned branch name + id: clean_name + run: | + REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//') + echo "Cleaned name is ${REF_NAME}" + echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT" + - name: upload binaries to s3 + uses: jakejarvis/s3-sync-action@master + env: + AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ${{ secrets.AWS_REGION }} + SOURCE_DIR: dist/release + DEST_DIR: gitea/${{ steps.clean_name.outputs.branch }} + nightly-docker: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + # fetch all commits instead of only the last as some branches are long lived and could have many between versions + # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567 + - run: git fetch --unshallow --quiet --tags --force + - uses: docker/setup-qemu-action@v2 + - uses: docker/setup-buildx-action@v2 + - name: Get cleaned branch name + id: clean_name + run: | + # if main then say nightly otherwise cleanup name + if [ "${{ github.ref }}" = "refs/heads/main" ]; then + echo "branch=nightly" >> "$GITHUB_OUTPUT" + exit 0 + fi + REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//') + echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT" + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: build rootful docker image + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: gitea/gitea:${{ steps.clean_name.outputs.branch }} + - name: build rootless docker image + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + file: Dockerfile.rootless + tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}-rootless diff --git a/.gitignore b/.gitignore index c53caa9806..2760a0ad58 100644 --- a/.gitignore +++ b/.gitignore @@ -16,10 +16,6 @@ _test .vscode __debug_bin -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - *.cgo1.go *.cgo2.c _cgo_defun.c @@ -57,8 +53,6 @@ cpu.out /bin /dist /custom/* -!/custom/conf -/custom/conf/* !/custom/conf/app.example.ini /data /indexers diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index 4e2315ac95..b3d90bf96d 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -80,6 +80,7 @@ rules: media-feature-name-no-vendor-prefix: true media-feature-name-unit-allowed-list: null media-feature-name-value-allowed-list: null + media-feature-name-value-no-unknown: true media-feature-range-notation: null named-grid-areas-no-invalid: true no-descending-specificity: null diff --git a/CHANGELOG.md b/CHANGELOG.md index e4e5c9368a..d57845776f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,1226 @@ This changelog goes through all the changes that have been made in each release without substantial changes to our git log; to see the highlights of what has been added to each release, please refer to the [blog](https://blog.gitea.io). +## [1.20.2](https://github.com/go-gitea/gitea/releases/tag/1.20.2) - 2023-07-29 + +* ENHANCEMENTS + * Calculate MAX_WORKERS default value by CPU number (#26177) (#26183) + * Display deprecated warning in admin panel pages as well as in the log file (#26094) (#26154) +* BUGFIXES + * Fix allowed user types setting problem (#26200) (#26206) + * Fix handling of plenty Nuget package versions (#26075) (#26173) + * Fix UI regression of asciinema player (#26159) (#26162) + * Fix LFS object list style (#26133) (#26147) + * Fix allowed user types setting problem (#26200) (#26206) + * Prevent primary key update on migration (#26192) (#26199) + * Fix bug when pushing to a pull request which enabled dismiss approval automatically (#25882) (#26158) + * Fix bugs in LFS meta garbage collection (#26122) (#26157) + * Update xorm version (#26128) (#26150) + * Remove "misc" scope check from public API endpoints (#26134) (#26149) + * Fix CLI allowing creation of access tokens with existing name (#26071) (#26144) + * Fix incorrect router logger (#26137) (#26143) + * Improve commit graph alignment and truncating (#26112) (#26127) + * Avoid writing config file if not installed (#26107) (#26113) + * Fix escape problems in the branch selector (#25875) (#26103) + * Fix handling of Debian files with trailing slash (#26087) (#26098) + * Fix Missing 404 swagger response docs for /admin/users/{username} (#26086) (#26089) + * Use stderr as fallback if the log file can't be opened (#26074) (#26083) + * Increase table cell horizontal padding (#26140) (#26142) + * Fix wrong workflow status when rerun a job in an already finished workflow (#26119) (#26124) + * Fix duplicated url prefix on issue context menu (#26066) (#26067) + +## [1.20.1](https://github.com/go-gitea/gitea/releases/tag/1.20.1) - 2023-07-22 + +* SECURITY + * Disallow dangerous URL schemes (#25960) (#25964) +* ENHANCEMENTS + * Show the mismatched ROOT_URL warning on the sign-in page if OAuth2 is enabled (#25947) (#25972) + * Make pending commit status yellow again (#25935) (#25968) +* BUGFIXES + * Fix version in rpm repodata/primary.xml.gz (#26009) (#26048) + * Fix env config parsing for "GITEA____APP_NAME" (#26001) (#26013) + * ParseScope with owner/repo always sets owner to zero (#25987) (#25989) + * Fix SSPI auth panic (#25955) (#25969) + * Avoid creating directories when loading config (#25944) (#25957) + * Make environment-to-ini work with INSTALL_LOCK=true (#25926) (#25937) + * Ignore `runs-on` with expressions when warning no matched runners (#25917) (#25933) + * Avoid opening/closing PRs which are already merged (#25883) (#25903) +* DOCS + * RPM Registry: Show zypper commands for SUSE based distros as well (#25981) (#26020) + * Correctly refer to dev tags as nightly in the docker docs (#26004) (#26019) + * Update path related documents (#25417) (#25982) +* MISC + * Adding remaining enum for migration repo model type. (#26021) (#26034) + * Fix the route for pull-request's authors (#26016) (#26018) + * Fix commit status color on dashboard repolist (#25993) (#25998) + * Avoid hard-coding height in language dropdown menu (#25986) (#25997) + * Add shutting down notice (#25920) (#25922) + * Fix incorrect milestone count when provide a keyword (#25880) (#25904) + +## [1.20.0](https://github.com/go-gitea/gitea/releases/tag/v1.20.0) - 2023-07-16 + +* BREAKING + * Fix WORK_DIR for docker (root) image (#25738) (#25811) + * Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (#25581) (#25604) + * Refactor path & config system (#25330) (#25416) + * Fix all possible setting error related storages and added some tests (#23911) (#25244) + * Use a separate admin page to show global stats, remove `actions` stat (#25062) + * Remove the service worker (#25010) + * Remove meta tags `theme-color` and `default-theme` (#24960) + * Use `[git.config]` for reflog cleaning up (#24958) + * Allow all URL schemes in Markdown links by default (#24805) + * Redesign Scoped Access Tokens (#24767) + * Fix team members API endpoint pagination (#24754) + * Rewrite logger system (#24726) + * Increase default LFS auth timeout from 20m to 24h (#24628) + * Rewrite queue (#24505) + * Remove unused setting `time.FORMAT` (#24430) + * Refactor `setting.Other` and remove unused `SHOW_FOOTER_BRANDING` (#24270) + * Correct the access log format (#24085) + * Reserve ".png" suffix for user/org names (#23992) + * Prefer native parser for SSH public key parsing (#23798) + * Editor preview support for external renderers (#23333) + * Add Gitea Profile Readmes (#23260) + * Refactor `ctx` in templates (#23105) +* SECURITY + * Test if container blob is accessible before mounting (#22759) (#25784) + * Set type="password" on all auth_token fields (#22175) +* FEATURES + * Add button on diff header to copy file name, misc diff header tweaks (#24986) + * API endpoint for changing/creating/deleting multiple files (#24887) + * Support changing git config through `app.ini`, use `diff.algorithm=histogram` by default (#24860) + * Add up and down arrows to selected lookup repositories (#24727) + * Add Go package registry (#24687) + * Add status indicator on main home screen for each repo (#24638) + * Support for status check pattern (#24633) + * Implement Cargo HTTP index (#24452) + * Add Debian package registry (#24426) + * Add the ability to pin Issues (#24406) + * Add follow organization and fix the logic of following page (#24345) + * Allow `webp` images as avatars (#24248) + * Support upload `outputs` and use `needs` context on Actions (#24230) + * Allow adding new files to an empty repo (#24164) + * Make wiki title supports dashes and improve wiki name related features (#24143) + * Add monospace toggle button to textarea (#24034) + * Use auto-updating, natively hoverable, localized time elements (#23988) + * Add ntlm authentication support for mail (#23811) + * Add CLI command to register runner tokens (#23762) + * Add Alpine package registry (#23714) + * Expand/Collapse all changed files (#23639) + * Add unset default project column (#23531) + * Add activity feeds API (#23494) + * Add RPM registry (#23380) + * Add meilisearch support (#23136) + * Add API for License templates (#23009) + * Add admin API email endpoints (#22792) + * Add user rename endpoint to admin api (#22789) + * Add API for gitignore templates (#22783) + * Implement actions artifacts (#22738) + * Add RSS Feeds for branches and files (#22719) + * Display when a repo was archived (#22664) + * Add Swift package registry (#22404) + * Add CRAN package registry (#22331) + * Add user webhooks (#21563) + * Implement systemd-notify protocol (#21151) + * Implement Issue Config (#20956) + * Add API to manage issue dependencies (#17935) +* API + * Use correct response code in push mirror creation response in v1_json.tmpl (#25476) (#25571) + * Fix `Permission` in API returned repository struct (#25388) (#25441) + * Add API for Label templates (#24602) + * Filters for GetAllCommits (#24568) + * Add ability to specify '--not' from GetAllCommits (#24409) + * Support uploading file to empty repo by API (#24357) + * Add absent repounits to create/edit repo API (#23500) + * Add login name and source id for admin user searching API (#23376) + * Create a branch directly from commit on the create branch API (#22956) +* ENHANCEMENTS + * Make `add line comment` buttons focusable (#25894) (#25896) + * Always pass 6-digit hex color to monaco (#25780) (#25782) + * Clarify "text-align" CSS helpers, fix clone button padding (#25763) (#25764) + * Hide `add file` button for pull mirrors (#25748) (#25751) + * Allow/fix review (approve/reject) of empty PRs (#25690) (#25732) + * Fix tags header and pretty format numbers (#25624) (#25694) + * Actions list enhancements (#25601) (#25678) + * Fix show more for image on diff page (#25672) (#25673) + * Prevent SVG shrinking (#25652) (#25669) + * Fix UI misalignment on user setting page (#25629) (#25656) + * Use css on labels (#25626) (#25636) + * Read-only checkboxes don't appear and don't entirely act the way one might expect (#25573) (#25602) + * Redirect to package after version deletion (#25594) (#25599) + * Reduce table padding globally (#25568) (#25577) + * Change `Regenerate Secret` button display (#25534) (#25541) + * Fix rerun icon on action view component (#25531) (#25536) + * Move some regexp out of functions (#25430) (#25445) + * Diff page enhancements (#25398) (#25437) + * Various UI fixes (#25264) (#25431) + * Fix label list divider (#25312) (#25372) + * Fix UI on mobile view (#25315) (#25340) + * When viewing a file, hide the add button (#25320) (#25339) + * Show if File is Executable (#25287) (#25300) + * Fix edit OAuth application width (#25262) (#25263) + * Use flex to align SVG and text (#25163) (#25260) + * Revert overflow: overlay (revert #21850) (#25231) (#25239) + * Use inline SVG for built-in OAuth providers (#25171) (#25234) + * Change access token UI to select dropdowns (#25109) (#25230) + * Remove hacky patch for "safari emoji glitch fix" (#25208) (#25211) + * Minor arc-green color tweaks (#25175) (#25205) + * Button and color enhancements (#24989) (#25176) + * Fix mobile navbar and misc cleanups (#25134) (#25169) + * Modify OAuth login ui and fix display name, iconurl related logic (#25030) (#25161) + * Improve notification icon and navbar (#25111) (#25124) + * Add details summary for vertical menus in settings to allow toggling (#25098) + * Don't display `select all issues` checkbox when no issues are available (#25086) + * Use RepositoryList instead of []*Repository (#25074) + * Add ability to set multiple redirect URIs in OAuth application UI (#25072) + * Use git command instead of the ini package to remove the `origin` remote (#25066) + * Remove cancel button from branch protection form (#25063) + * Show file tree by default (#25052) + * Add Progressbar to Milestone Page (#25050) + * Minor UI improvements: logo alignment, auth map editor, auth name display (#25043) + * Allow for PKCE flow without client secret + add docs (#25033) + * Refactor INI package (first step) (#25024) + * Various style fixes (#25008) + * Fix delete user account modal (#25004) + * Refactor diffFileInfo / DiffTreeStore (#24998) + * Add user level action runners (#24995) + * Rename NotifyPullReviewRequest to NotifyPullRequestReviewRequest (#24988) + * Add step start time to `ViewStepLog` (#24980) + * Add dark mode to API Docs (#24971) + * Display file mode for new file and file mode changes (#24966) + * Make the 500 page load themes (#24953) + * Show `bot` label next to username when rendering autor link if the user is a bot (#24943) + * Repo list improvements, fix bold helper classes (#24935) + * Improve queue and logger context (#24924) + * Improve RunMode / dev mode (#24886) + * Improve some Forms (#24878) + * Add show timestamp/seconds and fullscreen options to action page (#24876) + * Fix double border and adjust width for user profile page (#24870) + * Improve Actions CSS (#24864) + * Fix `@font-face` overrides (#24855) + * Remove `In your repositories` link in milestones dashboard (#24853) + * Fix missing yes/no in delete time log modal (#24851) + * Show new pull request button also on subdirectories and files (#24842) + * Make environment-to-ini support loading key value from file (#24832) + * Support wildcard in email domain allow/block list (#24831) + * Use `CommentList` instead of `[]*Comment` (#24828) + * Add RTL rendering support to Markdown (#24816) + * Rework notifications list (#24812) + * Mute repo names in dashboard repo list (#24811) + * Fix max width and margin of comment box on conversation page (#24809) + * Some refactors for issues stats (#24793) + * Rework label colors (#24790) + * Fix OAuth login loading state (#24788) + * Remove duplicated issues options and some more refactors (#24787) + * Decouple the different contexts from each other (#24786) + * Remove background on user dashboard filter bar (#24779) + * Improve and fix bugs surrounding reactions (#24760) + * Make the color of zero-contribution-squares in the activity heatmap more subtle (#24758) + * Fix WEBP image copying (#24743) + * Rework OAuth login buttons, swap github logo to monocolor (#24740) + * Consolidate the two review boxes into one (#24738) + * Unification of registration fields order (#24737) + * Refactor Pull Mirror and fix out-of-sync bugs (#24732) + * Improvements for action detail page (#24718) + * Fix flash of unstyled content in action view page (#24712) + * Don't filter action runs based on state (#24711) + * Optimize actions list by removing an unnecessary `git` call (#24710) + * Support no label/assignee filter and batch clearing labels/assignees (#24707) + * Add icon support for safari (#24697) + * Use standard HTTP library to serve files (#24693) + * Improve button-ghost, remove tertiary button (#24692) + * Only hide tooltip tippy instances (#24688) + * Support migrating storage for actions log via command line (#24679) + * Remove highlight in repo list (#24675) + * Add markdown preview to Submit Review Textarea (#24672) + * Update pin and add pin-slash (#24669) + * Improve empty notifications display (#24668) + * Support SSH for go get (#24664) + * Improve avatar uploading / resizing / compressing, remove Fomantic card module (#24653) + * Only show one tippy at a time (#24648) + * Notification list enhancements, fix striped tables on dark theme (#24639) + * Improve queue & process & stacktrace (#24636) + * Use the type RefName for all the needed places and fix pull mirror sync bugs (#24634) + * Remove fluid on compare diff page (#24627) + * Add a tooltip to the job rerun button (#24617) + * Attach a tooltip to the action status icon (#24614) + * Make the actions control button look like an actual button (#24611) + * Remove unnecessary code (#24610) + * Make repo migration cancelable and fix various bugs (#24605) + * Improve updating Actions tasks (#24600) + * Attach a tooltip to the action control button (#24595) + * Make repository response support HTTP range request (#24592) + * Improve Gitea's web context, decouple "issue template" code into service package (#24590) + * Modify luminance calculation and extract related functions into single files (#24586) + * Simplify template helper functions (#24570) + * Split "modules/context.go" to separate files (#24569) + * Add org visibility label to non-organization's dashboard (#24558) + * Update LDAP filters to include both username and email address (#24547) + * Review fixes and enhancements (#24526) + * Display warning when user try to rename default branch (#24512) + * Fix color for transfer related buttons when having no permission to act (#24510) + * Rework button coloring, add focus and active colors (#24507) + * New webhook trigger for receiving Pull Request review requests (#24481) + * Add goto issue id function (#24479) + * Fix incorrect webhook time and use relative-time to display it (#24477) + * RSS icon fixes (#24476) + * Replace `N/A` with `-` everywhere (#24474) + * Pass 'not' to commit count (#24473) + * Enhance stylelint rule config, remove dead CSS (#24472) + * Remove `font-awesome` and fomantic `icon` module (#24471) + * Improve "new-menu" (#24465) + * Remove fomantic breadcrumb module (#24463) + * Improve template system and panic recovery (#24461) + * Make Issue/PR/projects more compact, misc CSS tweaks (#24459) + * Replace remaining fontawesome dropdown icons with SVG (#24455) + * Remove all direct references to font-awesome (#24448) + * Move links out of translation (#24446) + * Add `ui-monospace` and `SF Mono` to `--fonts-monospace` (#24442) + * Hide 'Mirror Settings' when unneeded, improve hints (#24433) + * Add "Updated" column for admin repositories list (#24429) + * Improve issue list filter (#24425) + * Rework header bar on issue, pull requests and milestone (#24420) + * Improve template helper (#24417) + * Make repo size style matches others (commits/branches/tags) (#24408) + * Support markdown editor for issue template (#24400) + * Improve commit date in commit graph (#24399) + * Start cleaning the messy ".ui.left / .ui.right", improve label list page, fix stackable menu (#24393) + * Merge setting.InitXXX into one function with options (#24389) + * Move `Rename branch` from repo settings page to the page of branches list (#24380) + * Improve protected branch setting page (#24379) + * Display 'Unknown' when runner.version is empty (#24378) + * Display owner of a runner as a tooltip instead of static text (#24377) + * Fix incorrect last online time in runner_edit.tmpl (#24376) + * Fix unclear `IsRepositoryExist` logic (#24374) + * Add custom helm repo name generated from url (#24363) + * Replace placeholders in licenses (#24354) + * Add rerun workflow button and refactor to use SVG octicons (#24350) + * Fix runner button height (#24338) + * Restore bold on repolist (#24337) + * Improve RSS (#24335) + * Refactor "route" related code, fix Safari cookie bug (#24330) + * Alert error message if open dependencies are included in the issues that try to batch close (#24329) + * Add missed column title in runner management page (#24328) + * Automatically select the org when click create repo from org dashboard (#24325) + * Modify width of ui container, fine tune css for settings pages and org header (#24315) + * Fix config list overflow and layout (#24312) + * Improve some modal action buttons (#24289) + * Move code from module to service (#24287) + * Sort users and orgs on explore by recency by default (#24279) + * Allow using localized absolute date times within phrases with place holders and localize issue due date events (#24275) + * Show workflow config error on file view also (#24267) + * Improve template helper functions: string/slice (#24266) + * Use more specific test methods (#24265) + * Add `DumpVar` helper function to help debugging templates (#24262) + * Limit avatar upload to valid image files (#24258) + * Improve emoji and mention matching (#24255) + * Change to vertical navbar layout for secondary navbar for repo/user/admin settings (#24246) + * Refactor config provider (#24245) + * Improve test logger (#24235) + * Default show closed actions list if all actions was closed (#24234) + * Add missing badges in user profile for /projects and /packages (#24232) + * Add repository counter badge to repository tab (#24205) + * Move secrets and runners settings to actions settings (#24200) + * Require at least one unit to be enabled (#24189) + * Use same action status svg icons on actions list as on action page (#24178) + * Use secondary pointing menu for tabs on user/organization home page (#24162) + * Improve Wiki TOC (#24137) + * Refactor locale number (#24134) + * Localize activity heatmap (except tooltip) (#24131) + * Fix duplicate modals when clicking on "remove all" repository button (#24129) + * Add runner check in repo action page (#24124) + * Support triggering workflows by wiki related events (#24119) + * Refactor cookie (#24107) + * Remove untranslatable `on_date` key (#24106) + * Refactor delete_modal_actions template and use it for project column related actions (#24097) + * Improve git log for debugging (#24095) + * Add option to search for users is active join a team (#24093) + * Add PDF rendering via PDFObject (#24086) + * Refactor web route (#24080) + * Make more functions use ctx instead of db.DefaultContext (#24068) + * Make HTML template functions support context (#24056) + * Refactor rename user and rename organization (#24052) + * Localize milestone related time strings (#24051) + * Expand selected file when clicking file tree (#24041) + * Add popup to hashed comments/pull requests/issues in file editing/adding preview tab (#24040) + * Add placeholder and aria attributes to release and wiki edit page (#24031) + * Add new user types `reserved`, `bot`, and `remote` (#24026) + * Allow adding SSH keys even if SSH server is disabled (#24025) + * Use a general approach to access custom/static/builtin assets (#24022) + * Update github.com/google/go-github to v52 (#24004) + * Replace tribute with text-expander-element for textarea (#23985) + * Group template helper functions, remove `Printf`, improve template error messages (#23982) + * Drop "unrolled/render" package (#23965) + * Add job.duration in web ui (#23963) + * Tweak pull request branch delete ui (#23951) + * Merge template functions "dict/Dict/mergeinto" (#23932) + * Use a general Eval function for expressions in templates. (#23927) + * Clean template/helper.go (#23922) + * Actions: Use default branch as ref when a branch/tag delete occurs (#23910) + * Add tooltips for MD editor buttons and add `muted` class for buttons (#23896) + * Improve markdown editor: width, height, preferred (#23895) + * Make Release Download URLs predictable (#23891) + * Remove fomantic ".link" selector and styles (#23888) + * Added close/open button to details page of milestone (#23877) + * Introduce GitHub markdown editor, keep EasyMDE as fallback (#23876) + * Introduce GiteaLocaleNumber custom element to handle number localization on pages. (#23861) + * Make first section on home page full width (#23854) + * Use different SVG for pending and running actions (#23836) + * Display image size for multiarch container images (#23821) + * Improve action log display with control chars (#23820) + * Fix dropdown direction behavior (#23806) + * Fix incorrect/Improve error handle in edit user page (#23805) + * Use clippie module to copy to clipboard (#23801) + * Make minio package support legacy MD5 checksum (#23768) + * Add ONLY_SHOW_RELEVANT_REPOS back, fix explore page bug, make code more strict (#23766) + * Refactor docs (#23752) + * Fix markup background, improve wiki rendering (#23750) + * Make label templates have consistent behavior and priority (#23749) + * Improve LoadUnitConfig to handle invalid or duplicate units (#23736) + * Append `(comment)` when a link points at a comment rather than the whole issue (#23734) + * Clean some legacy files and move some build files (#23699) + * Refactor repo commit list (#23690) + * Refactor internal API for git commands, use meaningful messages instead of "Internal Server Error" (#23687) + * Add aria attributes to interactive time tooltips. (#23661) + * Fix long project name display in issue list and in related dropdown (#23653) + * Use data-tooltip-content for tippy tooltip (#23649) + * Fix new issue/pull request btn margin when it is next to sort (#23647) + * Fine tune more downdrop settings, use SVG for labels, improve Repo Topic Edit form (#23626) + * Allow new file and edit file preview if it has editable extension (#23624) + * Replace a few fontawesome icons with svg (#23602) + * `Publish Review` buttons should indicate why they are disabled (#23598) + * Convert issue list checkboxes to native (#23596) + * Set opaque background on markup and images (#23578) + * Use a general approach to show tooltip, fix temporary tooltip bug (#23574) + * Improve `` to make it output `svg` node and optimize performance (#23570) + * Enable color for consistency checks diffs (#23563) + * Fix dropdown icon misalignment when using fomantic icon (#23558) + * Decouple the issue-template code from comment_tab.tmpl (#23556) + * Remove `id="comment-form"` dead code, fix tag (#23555) + * Diff improvements (#23553) + * Sort Python package descriptors by version to mimic PyPI format (#23550) + * Use a general approch to improve a11y for all checkboxes and dropdowns. (#23542) + * Fix long name ui issues and label ui issue (#23541) + * Return `repository` in npm package metadata endpoint (#23539) + * Use `project.IconName` instead of repeated unreadable `if-else` chains (#23538) + * Remove stars in dashboard repo list (#23530) + * Update mini-css-extract-plugin, remove postcss (#23520) + * Change `Close` to either `Close issue` or `Close pull request` (#23506) + * Fix theme-auto loading (#23504) + * Fix tags sort by creation time (descending) on branch/tag dropdowns (#23491) + * Display the version of runner in the runner list (#23490) + * Replace Less with CSS (#23481) + * Fix `.locale.Tr` function not found in delete modal (#23468) + * Allow both fullname and username search when `DEFAULT_SHOW_FULL_NAME` is true (#23463) + * Add project type descriptions in issue badge and improve project icons (#23437) + * Use context for `RepositoryList.LoadAttributes` (#23435) + * Refactor branch/tag selector to Vue SFC (#23421) + * Keep (add if not existing) xmlns attribute for generated SVG images (#23410) + * Refactor dashboard repo list to Vue SFC (#23405) + * Add workflow error notification in ui (#23404) + * Refactor branch/tag selector dropdown (first step) (#23394) + * Reduce duplicate and useless code in options (#23369) + * Convert `
` to `
- - + +
@@ -434,6 +434,17 @@ + +

+ {{.locale.Tr "admin.auths.tips"}} +

+
+
GMail Settings:
+

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

+ +
{{.locale.Tr "admin.auths.tips.oauth2.general"}}:
+

{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}

+
- - + +
@@ -85,8 +85,8 @@
GMail Settings:

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

-
{{.locale.Tr "admin.auths.tips.oauth2.general"}}:
-

{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}

+
{{.locale.Tr "admin.auths.tips.oauth2.general"}}:
+

{{.locale.Tr "admin.auths.tips.oauth2.general.tip"}}

{{.locale.Tr "admin.auths.tip.oauth2_provider"}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 0c52830ab0..6c21c646bf 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -4,7 +4,7 @@ {{.locale.Tr "admin.config.server_config"}}
-
+
{{.locale.Tr "admin.config.app_name"}}
{{AppName}}
{{.locale.Tr "admin.config.app_ver"}}
@@ -34,10 +34,10 @@
+
{{.locale.Tr "admin.config.app_data_path"}}
+
{{.AppDataPath}}
{{.locale.Tr "admin.config.repo_root_path"}}
{{.RepoRootPath}}
-
{{.locale.Tr "admin.config.static_file_root_path"}}
-
{{.StaticRootPath}}
{{.locale.Tr "admin.config.custom_file_root_path"}}
{{.CustomRootPath}}
{{.locale.Tr "admin.config.log_file_root_path"}}
@@ -46,15 +46,6 @@
{{.ScriptType}}
{{.locale.Tr "admin.config.reverse_auth_user"}}
{{.ReverseProxyAuthUser}}
- - {{if .EnvVars}} -
- {{range .EnvVars}} -
{{.Name}}
-
{{.Value}}
- {{end}} - {{end}} -
@@ -62,7 +53,7 @@ {{.locale.Tr "admin.config.ssh_config"}}
-
+
{{.locale.Tr "admin.config.ssh_enabled"}}
{{if not .SSH.Disabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if not .SSH.Disabled}} @@ -97,12 +88,12 @@ {{.locale.Tr "admin.config.lfs_config"}}
-
+
{{.locale.Tr "admin.config.lfs_enabled"}}
{{if .LFS.StartServer}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .LFS.StartServer}}
{{.locale.Tr "admin.config.lfs_content_path"}}
-
{{.LFS.Path}}
+
{{JsonUtils.EncodeToString .LFS.Storage.ToShadowCopy}}
{{.locale.Tr "admin.config.lfs_http_auth_expiry"}}
{{.LFS.HTTPAuthExpiry}}
{{end}} @@ -113,7 +104,7 @@ {{.locale.Tr "admin.config.db_config"}}
-
+
{{.locale.Tr "admin.config.db_type"}}
{{.DbCfg.Type}}
{{if not (eq .DbCfg.Type "sqlite3")}} @@ -141,7 +132,7 @@ {{.locale.Tr "admin.config.service_config"}}
-
+
{{.locale.Tr "admin.config.register_email_confirm"}}
{{if .Service.RegisterEmailConfirm}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{.locale.Tr "admin.config.disable_register"}}
@@ -195,7 +186,7 @@ {{.locale.Tr "admin.config.webhook_config"}}
-
+
{{.locale.Tr "admin.config.queue_length"}}
{{.Webhook.QueueLength}}
{{.locale.Tr "admin.config.deliver_timeout"}}
@@ -209,7 +200,7 @@ {{.locale.Tr "admin.config.mailer_config"}}
-
+
{{.locale.Tr "admin.config.mailer_enabled"}}
{{if .MailerEnabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{if .MailerEnabled}} @@ -258,7 +249,7 @@ {{.locale.Tr "admin.config.cache_config"}}
-
+
{{.locale.Tr "admin.config.cache_adapter"}}
{{.CacheAdapter}}
{{if eq .CacheAdapter "memory"}} @@ -278,7 +269,7 @@ {{.locale.Tr "admin.config.session_config"}}
-
+
{{.locale.Tr "admin.config.session_provider"}}
{{.SessionConfig.Provider}}
{{.locale.Tr "admin.config.provider_config"}}
@@ -298,7 +289,7 @@ {{.locale.Tr "admin.config.picture_config"}}
-
+
{{.locale.Tr "admin.config.disable_gravatar"}}
@@ -319,7 +310,7 @@ {{.locale.Tr "admin.config.git_config"}}
-
+
{{.locale.Tr "admin.config.git_disable_diff_highlight"}}
{{if .Git.DisableDiffHighlight}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
{{.locale.Tr "admin.config.git_max_diff_lines"}}
@@ -350,7 +341,7 @@ {{.locale.Tr "admin.config.log_config"}}
-
+
{{if .Loggers.xorm.IsEnabled}}
{{$.locale.Tr "admin.config.xorm_log_sql"}}
{{if $.LogSQL}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 20cf3ba7f4..9d503a19b0 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -70,7 +70,7 @@ {{.locale.Tr "admin.dashboard.system_status"}}
-
+
{{.locale.Tr "admin.dashboard.server_uptime"}}
{{.SysStatus.StartTime}}
{{.locale.Tr "admin.dashboard.current_goroutine"}}
diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 6d84f8f359..0974c5fbed 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -1,9 +1,11 @@ {{template "base/head" .ctxData}}
-
+
+ {{template "base/alert" .ctxData}} +
+
{{template "admin/navbar" .ctxData}} -
- {{template "base/alert" .ctxData}} +
{{/* block: admin-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 641d3fad81..a96e5c9367 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -1,4 +1,4 @@ -
+