Skip to content

Commit 30f4e35

Browse files
65436543
authored
Merge branch 'main' into lunny/find_comments
2 parents 72807c1 + 2b0b563 commit 30f4e35

File tree

148 files changed

+3309
-1853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+3309
-1853
lines changed

‎.drone.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ steps:
551551

552552
# TODO: We should probably build all dependencies into a test image
553553
- name: test-e2e
554-
image: mcr.microsoft.com/playwright:v1.28.0-focal
554+
image: mcr.microsoft.com/playwright:v1.29.0-focal
555555
commands:
556556
- curl -sLO https://go.dev/dl/go1.19.linux-amd64.tar.gz && tar -C /usr/local -xzf go1.19.linux-amd64.tar.gz
557557
- groupadd --gid 1001 gitea && useradd -m --gid 1001 --uid 1001 gitea
@@ -928,10 +928,8 @@ trigger:
928928

929929
steps:
930930
- name: build-docs
931-
image: plugins/hugo:latest
932-
pull: always
931+
image: golang:1.19
933932
commands:
934-
- apk add --no-cache make bash curl
935933
- cd docs
936934
- make trans-copy clean build
937935

‎.eslintrc.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ rules:
255255
no-irregular-whitespace: [2]
256256
no-iterator: [2]
257257
no-label-var: [2]
258-
no-labels: [0]
258+
no-labels: [0] # handled by no-restricted-syntax
259259
no-lone-blocks: [2]
260260
no-lonely-if: [0]
261261
no-loop-func: [0]
@@ -335,7 +335,7 @@ rules:
335335
no-void: [2]
336336
no-warning-comments: [0]
337337
no-whitespace-before-property: [2]
338-
no-with: [0]
338+
no-with: [0] # handled by no-restricted-syntax
339339
nonblock-statement-body-position: [2]
340340
object-curly-newline: [0]
341341
object-curly-spacing: [2, never]
@@ -495,7 +495,7 @@ rules:
495495
unicorn/prefer-native-coercion-functions: [2]
496496
unicorn/prefer-negative-index: [2]
497497
unicorn/prefer-node-append: [0]
498-
unicorn/prefer-node-protocol: [0]
498+
unicorn/prefer-node-protocol: [2]
499499
unicorn/prefer-node-remove: [0]
500500
unicorn/prefer-number-properties: [0]
501501
unicorn/prefer-object-from-entries: [2]

‎CHANGELOG.md‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,60 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

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

963
* SECURITY

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ To maintain understandable code and avoid circular dependencies it is important
190190
- **templates:** Golang templates for generating the html output.
191191
- **tests/e2e:** End to end tests
192192
- **tests/integration:** Integration tests
193+
- **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.
194+
- **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.
193195
- **vendor:** External code that Gitea depends on.
194196

195197
## Documentation

‎MAINTAINERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ Janis Estelmann <[email protected]> (@KN4CK3R)
4444
Steven Kriegler <[email protected]> (@justusbunsi)
4545
Jimmy Praet <[email protected]> (@jpraet)
4646
Leon Hofmeister <[email protected]> (@delvh)
47-
silentcode <[email protected]> (@silentcodeg)
4847
Wim <[email protected]> (@42wim)
49-
xinyu <[email protected]> (@penlinux)
48+
Xinyu Zhou <[email protected]> (@xin-u)
5049
Jason Song <[email protected]> (@wolfogre)
5150
Yarden Shoham <[email protected]> (@yardenshoham)

‎build/generate-images.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import imageminZopfli from 'imagemin-zopfli';
33
import {optimize} from 'svgo';
44
import {fabric} from 'fabric';
5-
import {readFile, writeFile} from 'fs/promises';
5+
import {readFile, writeFile} from 'node:fs/promises';
66

77
function exit(err) {
88
if (err) console.error(err);

‎build/generate-svg.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env node
22
import fastGlob from 'fast-glob';
33
import {optimize} from 'svgo';
4-
import {parse} from 'path';
5-
import {readFile, writeFile, mkdir} from 'fs/promises';
6-
import {fileURLToPath} from 'url';
4+
import {parse} from 'node:path';
5+
import {readFile, writeFile, mkdir} from 'node:fs/promises';
6+
import {fileURLToPath} from 'node:url';
77

88
const glob = (pattern) => fastGlob.sync(pattern, {
99
cwd: fileURLToPath(new URL('..', import.meta.url)),

‎custom/conf/app.example.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,9 @@ ROUTER = console
10361036
;;
10371037
;; Add co-authored-by and co-committed-by trailers if committer does not match author
10381038
;ADD_CO_COMMITTER_TRAILERS = true
1039+
;;
1040+
;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply
1041+
;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false
10391042

10401043
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
10411044
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

‎docs/Makefile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ THEME := themes/gitea
22
PUBLIC := public
33
ARCHIVE := https://dl.gitea.io/theme/master.tar.gz
44

5+
HUGO_PACKAGE := github.com/gohugoio/[email protected]
6+
57
.PHONY: all
68
all: build
79

@@ -11,19 +13,19 @@ clean:
1113

1214
.PHONY: trans-copy
1315
trans-copy:
14-
@bash scripts/trans-copy
16+
bash scripts/trans-copy.sh
1517

1618
.PHONY: server
1719
server: $(THEME)
18-
hugo server
20+
go run $(HUGO_PACKAGE) server
1921

2022
.PHONY: build
2123
build: $(THEME)
22-
hugo --cleanDestinationDir
24+
go run $(HUGO_PACKAGE) --cleanDestinationDir
2325

2426
.PHONY: build-offline
2527
build-offline: $(THEME)
26-
hugo --baseURL="/" --cleanDestinationDir
28+
go run $(HUGO_PACKAGE) --baseURL="/" --cleanDestinationDir
2729

2830
.PHONY: update
2931
update: $(THEME)

‎docs/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.17.3
21+
version: 1.17.4
2222
minGoVersion: 1.18
2323
goVersion: 1.19
2424
minNodeVersion: 14

0 commit comments

Comments
 (0)