Merge remote-tracking branch 'giteaoffical/main'

* giteaoffical/main: (32 commits) Hide file borders on sticky diff box (go-gitea#22217) Test views of LFS files (go-gitea#22196) update docs latest to 1.17.4 Frontport 1.17.4 changelog (go-gitea#22216) Remove test session cache to reduce possible concurrent problem (go-gitea#22199) Upgrade hugo to 0.82 (go-gitea#22209) Fix container layer display overflow (go-gitea#22208) Run hugo via `go run` and lock its version (go-gitea#22206) Update bleve and zapx to fix unaligned atomic (go-gitea#22031) Allow empty assignees on pull request edit (go-gitea#22150) Add Feed for Releases and Tags (go-gitea#21696) fix: update libcurl in docs pipeline (go-gitea#22203) Fixed colour transparency regex matching in project board sorting (go-gitea#22091) (go-gitea#22092) Mobile fix for Project view: Add delay to Sortable.js on mobile, to ensure scrolling is possible. (go-gitea#22152) Normalize NuGet package version on upload (go-gitea#22186) Attempt to fix TestExportUserGPGKeys (go-gitea#22159) Specify ID in `TestAPITeam` (go-gitea#22192) Repair LFS web rendering. (go-gitea#22195) Fix misc whitespace issues in install docs (go-gitea#22189) Update JS dependencies and eslint (go-gitea#22190) ...
zjjhot · Dec 23, 2022 · 7029e14 · 7029e14
2 parents 8dc1017 + 41f0668
commit 7029e14
Show file tree

Hide file tree

Showing 98 changed files with 2,953 additions and 1,519 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -551,7 +551,7 @@ steps:
 
  # TODO: We should probably build all dependencies into a test image
  - name: test-e2e
- image: mcr.microsoft.com/playwright:v1.28.0-focal
+ image: mcr.microsoft.com/playwright:v1.29.0-focal
  commands:
  - curl -sLO https://go.dev/dl/go1.19.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz
  - groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea
@@ -928,10 +928,8 @@ trigger:
 
 steps:
  - name: build-docs
- image: plugins/hugo:latest
- pull: always
+ image: golang:1.19
  commands:
- - apk add --no-cache make bash curl
  - cd docs
  - make trans-copy clean build
 

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -255,7 +255,7 @@ rules:
  no-irregular-whitespace: [2]
  no-iterator: [2]
  no-label-var: [2]
- no-labels: [0]
+ no-labels: [0] # handled by no-restricted-syntax
  no-lone-blocks: [2]
  no-lonely-if: [0]
  no-loop-func: [0]
@@ -335,7 +335,7 @@ rules:
  no-void: [2]
  no-warning-comments: [0]
  no-whitespace-before-property: [2]
- no-with: [0]
+ no-with: [0] # handled by no-restricted-syntax
  nonblock-statement-body-position: [2]
  object-curly-newline: [0]
  object-curly-spacing: [2, never]
@@ -495,7 +495,7 @@ rules:
  unicorn/prefer-native-coercion-functions: [2]
  unicorn/prefer-negative-index: [2]
  unicorn/prefer-node-append: [0]
- unicorn/prefer-node-protocol: [0]
+ unicorn/prefer-node-protocol: [2]
  unicorn/prefer-node-remove: [0]
  unicorn/prefer-number-properties: [0]
  unicorn/prefer-object-from-entries: [2]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,60 @@ 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.17.4](https://github.com/go-gitea/gitea/releases/tag/1.17.4) - 2022-12-21
+
+* SECURITY
+ * Do not allow Ghost access to limited visible user/org (#21849) (#21875)
+ * Fix package access for admins and inactive users (#21580) (#21592)
+* ENHANCEMENTS
+ * Fix button in branch list, avoid unexpected page jump before restore branch actually done (#21562) (#21927)
+ * Fix vertical align of committer avatar rendered by email address (#21884) (#21919)
+ * Fix setting HTTP headers after write (#21833) (#21874)
+ * Ignore line anchor links with leading zeroes (#21728) (#21777)
+ * Enable Monaco automaticLayout (#21516)
+* BUGFIXES
+ * Do not list active repositories as unadopted (#22034) (#22167)
+ * Correctly handle moved files in apply patch (#22118) (#22136)
+ * Fix condition for is_internal (#22095) (#22131)
+ * Fix permission check on issue/pull lock (#22114)
+ * Fix sorting admin user list by last login (#22081) (#22106)
+ * Workaround for container registry push/pull errors (#21862) (#22069)
+ * Fix issue/PR numbers (#22037) (#22045)
+ * Handle empty author names (#21902) (#22028)
+ * Fix ListBranches to handle empty case (#21921) (#22025)
+ * Fix enabling partial clones on 1.17 (#21809)
+ * Prevent panic in doctor command when running default checks (#21791) (#21808)
+ * Upgrade golang.org/x/crypto (#21792) (#21794)
+ * Init git module before database migration (#21764) (#21766)
+ * Set last login when activating account (#21731) (#21754)
+ * Add HEAD fix to gitea doctor (#21352) (#21751)
+ * Fix UI language switching bug (#21597) (#21748)
+ * Remove semver compatible flag and change pypi to an array of test cases (#21708) (#21729)
+ * Allow local package identifiers for PyPI packages (#21690) (#21726)
+ * Fix repository adoption on Windows (#21646) (#21651)
+ * Sync git hooks when config file path changed (#21619) (#21625)
+ * Added check for disabled Packages (#21540) (#21614)
+ * Fix `Timestamp.IsZero` (#21593) (#21604)
+ * Fix issues count bug (#21600)
+ * Support binary deploy in npm packages (#21589)
+ * Update milestone counters when issue is deleted (#21459) (#21586)
+ * SessionUser protection against nil pointer dereference (#21581)
+ * Case-insensitive NuGet symbol file GUID (#21409) (#21575)
+ * Suppress `ExternalLoginUserNotExist` error (#21504) (#21572)
+ * Prevent Authorization header for presigned LFS urls (#21531) (#21569)
+ * Update binding to fix bugs (#21560)
+ * Fix generating compare link (#21519) (#21530)
+ * Ignore error when retrieving changed PR review files (#21487) (#21524)
+ * Fix incorrect notification commit url (#21479) (#21483)
+ * Display total commit count in hook message (#21400) (#21481)
+ * Enforce grouped NuGet search results (#21442) (#21480)
+ * Return 404 when user is not found on avatar (#21476) (#21477)
+ * Normalize NuGet package version on upload (#22186) (#22201)
+* MISC
+ * Check for zero time instant in TimeStamp.IsZero() (#22171) (#22173)
+ * Fix warn in database structs sync (#22111)
+ * Allow for resolution of NPM registry paths that match upstream (#21568) (#21723)
+
 ## [1.17.3](https://github.com/go-gitea/gitea/releases/tag/v1.17.3) - 2022-10-15
 
 * SECURITY

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -190,6 +190,8 @@ To maintain understandable code and avoid circular dependencies it is important
 - **templates:** Golang templates for generating the html output.
 - **tests/e2e:** End to end tests
 - **tests/integration:** Integration tests
+- **tests/gitea-repositories-meta:** Sample repos used in integration tests. Adding a new repo requires editing `models/fixtures/repositories.yml` and `models/fixtures/repo_unit.yml` to match.
+- **tests/gitea-lfs-meta:** Sample LFS objects used in integration tests. Adding a new object requires editing `models/fixtures/lfs_meta_object.yml` to match.
 - **vendor:** External code that Gitea depends on.
 
 ## Documentation

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -45,6 +45,6 @@ Steven Kriegler <sk.bunsenbrenner@gmail.com> (@justusbunsi)
 Jimmy Praet <jimmy.praet@telenet.be> (@jpraet)
 Leon Hofmeister <dev.lh@web.de> (@delvh) 
 Wim <wim@42.be> (@42wim)
-xinyu <xinyu@nerv.org.cn> (@penlinux)
+Xinyu Zhou <i@sourcehut.net> (@xin-u)
 Jason Song <i@wolfogre.com> (@wolfogre)
 Yarden Shoham <hrsi88@gmail.com> (@yardenshoham)
diff --git a/build/generate-images.js b/build/generate-images.js
@@ -2,7 +2,7 @@
 import imageminZopfli from 'imagemin-zopfli';
 import {optimize} from 'svgo';
 import {fabric} from 'fabric';
-import {readFile, writeFile} from 'fs/promises';
+import {readFile, writeFile} from 'node:fs/promises';
 
 function exit(err) {
  if (err) console.error(err);

diff --git a/build/generate-svg.js b/build/generate-svg.js
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import fastGlob from 'fast-glob';
 import {optimize} from 'svgo';
-import {parse} from 'path';
-import {readFile, writeFile, mkdir} from 'fs/promises';
-import {fileURLToPath} from 'url';
+import {parse} from 'node:path';
+import {readFile, writeFile, mkdir} from 'node:fs/promises';
+import {fileURLToPath} from 'node:url';
 
 const glob = (pattern) => fastGlob.sync(pattern, {
  cwd: fileURLToPath(new URL('..', import.meta.url)),

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
@@ -1036,6 +1036,9 @@ ROUTER = console
 ;;
 ;; Add co-authored-by and co-committed-by trailers if committer does not match author
 ;ADD_CO_COMMITTER_TRAILERS = true
+;;
+;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply
+;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

diff --git a/docs/Makefile b/docs/Makefile
@@ -2,6 +2,8 @@ THEME := themes/gitea
 PUBLIC := public
 ARCHIVE := https://dl.gitea.io/theme/master.tar.gz
 
+HUGO_PACKAGE := github.com/gohugoio/hugo@v0.82.0
+
 .PHONY: all
 all: build
 
@@ -11,19 +13,19 @@ clean:
 
 .PHONY: trans-copy
 trans-copy:
- @bash scripts/trans-copy
+ bash scripts/trans-copy.sh
 
 .PHONY: server
 server: $(THEME)
- hugo server
+ go run $(HUGO_PACKAGE) server
 
 .PHONY: build
 build: $(THEME)
- hugo --cleanDestinationDir
+ go run $(HUGO_PACKAGE) --cleanDestinationDir
 
 .PHONY: build-offline
 build-offline: $(THEME)
- hugo --baseURL="/" --cleanDestinationDir
+ go run $(HUGO_PACKAGE) --baseURL="/" --cleanDestinationDir
 
 .PHONY: update
 update: $(THEME)

diff --git a/docs/config.yaml b/docs/config.yaml
@@ -18,7 +18,7 @@ params:
  description: Git with a cup of tea
  author: The Gitea Authors
  website: https://docs.gitea.io
- version: 1.17.3
+ version: 1.17.4
  minGoVersion: 1.18
  goVersion: 1.19
  minNodeVersion: 14

diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -134,6 +134,7 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
 - `DEFAULT_MERGE_MESSAGE_OFFICIAL_APPROVERS_ONLY`: **true**: In default merge messages only include approvers who are officially allowed to review.
 - `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`: **false**: In default squash-merge messages include the commit message of all commits comprising the pull request.
 - `ADD_CO_COMMITTER_TRAILERS`: **true**: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author.
+- `TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY`: **false**: PR patches are tested using a three-way merge method to discover if there are conflicts. If this setting is set to **true**, conflicting patches will be retested using `git apply` - This was the previous behaviour in 1.18 (and earlier) but is somewhat inefficient. Please report if you find that this setting is required.
 
 ### Repository - Issue (`repository.issue`)
 

diff --git a/docs/content/doc/installation/with-docker-rootless.en-us.md b/docs/content/doc/installation/with-docker-rootless.en-us.md
@@ -82,7 +82,7 @@ services:
  restart: always
  volumes:
  - ./data:/var/lib/gitea
- - ./config:/etc/gitea 
+ - ./config:/etc/gitea
  - /etc/timezone:/etc/timezone:ro
  - /etc/localtime:/etc/localtime:ro
  ports:
@@ -112,7 +112,7 @@ services:
  restart: always
  volumes:
  - ./data:/var/lib/gitea
- - ./config:/etc/gitea 
+ - ./config:/etc/gitea
  - /etc/timezone:/etc/timezone:ro
  - /etc/localtime:/etc/localtime:ro
  ports:
@@ -153,7 +153,7 @@ services:
  restart: always
  volumes:
  - ./data:/var/lib/gitea
- - ./config:/etc/gitea 
+ - ./config:/etc/gitea
  - /etc/timezone:/etc/timezone:ro
  - /etc/localtime:/etc/localtime:ro
  ports:
@@ -293,13 +293,13 @@ These environment variables can be passed to the docker container in `docker-com
 services:
  server:
  environment:
- - GITEA__mailer__ENABLED=true
- - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
- - GITEA__mailer__MAILER_TYPE=smtp
- - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
- - GITEA__mailer__IS_TLS_ENABLED=true
- - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
- - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
+  - GITEA__mailer__ENABLED=true
+  - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
+  - GITEA__mailer__MAILER_TYPE=smtp
+  - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
+  - GITEA__mailer__IS_TLS_ENABLED=true
+  - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
+  - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
 ```
 
 To set required TOKEN and SECRET values, consider using Gitea's built-in [generate utility functions](https://docs.gitea.io/en-us/command-line/#generate).

diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md
@@ -117,11 +117,11 @@ services:
  environment:
  - USER_UID=1000
  - USER_GID=1000
-+ - GITEA__database__DB_TYPE=mysql
-+ - GITEA__database__HOST=db:3306
-+ - GITEA__database__NAME=gitea
-+ - GITEA__database__USER=gitea
-+ - GITEA__database__PASSWD=gitea
++  - GITEA__database__DB_TYPE=mysql
++  - GITEA__database__HOST=db:3306
++  - GITEA__database__NAME=gitea
++  - GITEA__database__USER=gitea
++  - GITEA__database__PASSWD=gitea
  restart: always
  networks:
  - gitea
@@ -168,11 +168,11 @@ services:
  environment:
  - USER_UID=1000
  - USER_GID=1000
-+ - GITEA__database__DB_TYPE=postgres
-+ - GITEA__database__HOST=db:5432
-+ - GITEA__database__NAME=gitea
-+ - GITEA__database__USER=gitea
-+ - GITEA__database__PASSWD=gitea
++  - GITEA__database__DB_TYPE=postgres
++  - GITEA__database__HOST=db:5432
++  - GITEA__database__NAME=gitea
++  - GITEA__database__USER=gitea
++  - GITEA__database__PASSWD=gitea
  restart: always
  networks:
  - gitea
@@ -225,8 +225,8 @@ services:
  networks:
  - gitea
  volumes:
-- - ./gitea:/data
-+ - gitea:/data
+-  - ./gitea:/data
++  - gitea:/data
  - /etc/timezone:/etc/timezone:ro
  - /etc/localtime:/etc/localtime:ro
  ports:
@@ -294,13 +294,13 @@ These environment variables can be passed to the docker container in `docker-com
 services:
  server:
  environment:
- - GITEA__mailer__ENABLED=true
- - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
- - GITEA__mailer__MAILER_TYPE=smtp
- - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
- - GITEA__mailer__IS_TLS_ENABLED=true
- - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
- - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
+  - GITEA__mailer__ENABLED=true
+  - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
+  - GITEA__mailer__MAILER_TYPE=smtp
+  - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
+  - GITEA__mailer__IS_TLS_ENABLED=true
+  - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
+  - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
 ```
 
 Gitea will generate new secrets/tokens for every new installation automatically and write them into the app.ini. If you want to set the secrets/tokens manually, you can use the following docker commands to use of Gitea's built-in [generate utility functions](https://docs.gitea.io/en-us/command-line/#generate). Do not lose/change your SECRET_KEY after the installation, otherwise the encrypted data can not be decrypted anymore.

diff --git a/docs/content/doc/installation/with-docker.zh-cn.md b/docs/content/doc/installation/with-docker.zh-cn.md
@@ -103,11 +103,11 @@ services:
  environment:
  - USER_UID=1000
  - USER_GID=1000
-+ - GITEA__database__DB_TYPE=mysql
-+ - GITEA__database__HOST=db:3306
-+ - GITEA__database__NAME=gitea
-+ - GITEA__database__USER=gitea
-+ - GITEA__database__PASSWD=gitea
++  - GITEA__database__DB_TYPE=mysql
++  - GITEA__database__HOST=db:3306
++  - GITEA__database__NAME=gitea
++  - GITEA__database__USER=gitea
++  - GITEA__database__PASSWD=gitea
  restart: always
  networks:
  - gitea
@@ -153,11 +153,11 @@ services:
  environment:
  - USER_UID=1000
  - USER_GID=1000
-+ - GITEA__database__DB_TYPE=postgres
-+ - GITEA__database__HOST=db:5432
-+ - GITEA__database__NAME=gitea
-+ - GITEA__database__USER=gitea
-+ - GITEA__database__PASSWD=gitea
++  - GITEA__database__DB_TYPE=postgres
++  - GITEA__database__HOST=db:5432
++  - GITEA__database__NAME=gitea
++  - GITEA__database__USER=gitea
++  - GITEA__database__PASSWD=gitea
  restart: always
  networks:
  - gitea
@@ -207,8 +207,8 @@ services:
  networks:
  - gitea
  volumes:
-- - ./gitea:/data
-+ - gitea:/data
+-  - ./gitea:/data
++  - gitea:/data
  - /etc/timezone:/etc/timezone:ro
  - /etc/localtime:/etc/localtime:ro
  ports:
@@ -285,13 +285,13 @@ docker-compose up -d
 services:
  server:
  environment:
- - GITEA__mailer__ENABLED=true
- - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
- - GITEA__mailer__MAILER_TYPE=smtp
- - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
- - GITEA__mailer__IS_TLS_ENABLED=true
- - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
- - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
+  - GITEA__mailer__ENABLED=true
+  - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
+  - GITEA__mailer__MAILER_TYPE=smtp
+  - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
+  - GITEA__mailer__IS_TLS_ENABLED=true
+  - GITEA__mailer__USER=${GITEA__mailer__USER:-apikey}
+  - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
 ```
 
 Gitea 将为每次新安装自动生成新的 `SECRET_KEY` 并将它们写入 `app.ini`。 如果您想手动设置 `SECRET_KEY`，您可以使用以下 docker 命令来使用 Gitea 内置的[方法](https://docs.gitea.io/en-us/command-line/#generate)生成 `SECRET_KEY`。 安装后请妥善保管您的 `SECRET_KEY`，如若丢失则无法解密已加密的数据。