Skip to content

Commit cd6cea5

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: (23 commits) [skip ci] Updated translations via Crowdin Fix v220 migration to be compatible for MSSQL 2008 r2 (go-gitea#20702) Rework repo buttons (go-gitea#20602) Switch to building with go1.19 (go-gitea#20695) Update maven deploy docs (go-gitea#20691) Add support for Pub packages (go-gitea#20560) Fix typo overrided -> overridden (go-gitea#20687) [skip ci] Updated licenses and gitignores Update JS dependencies, adjust eslint (go-gitea#20659) Background color of private list-items updated (go-gitea#20630) Use request timeout for git service rpc (go-gitea#20689) Increase default item listing size `ISSUE_PAGING_NUM` to 20 (go-gitea#20547) [skip ci] Updated translations via Crowdin Allow multiple metadata files for Maven packages (go-gitea#20674) docs: update comparison.zh-cn.md (go-gitea#20656) Add a notice for breaking check in upgrade document (go-gitea#20682) move handleGlobalEnterQuickSubmit into a separate file to avoid cycle-import (go-gitea#20679) Use correct field name. (go-gitea#20675) [skip ci] Updated translations via Crowdin Use correct context to get package content (go-gitea#20673) ... # Conflicts: # templates/repo/wiki/view.tmpl
2 parents ff8df2f + 73e9854 commit cd6cea5

File tree

81 files changed

+2813
-983
lines changed

Some content is hidden

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

81 files changed

+2813
-983
lines changed

‎.drone.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
- make deps-frontend
2626

2727
- name: deps-backend
28-
image: golang:1.18
28+
image: golang:1.19
2929
pull: always
3030
commands:
3131
- make deps-backend
@@ -88,7 +88,7 @@ steps:
8888
depends_on: [deps-frontend]
8989

9090
- name: checks-backend
91-
image: golang:1.18
91+
image: golang:1.19
9292
commands:
9393
- make checks-backend
9494
depends_on: [deps-backend]
@@ -122,7 +122,7 @@ steps:
122122
path: /go
123123

124124
- name: build-backend-arm64
125-
image: golang:1.18
125+
image: golang:1.19
126126
environment:
127127
GO111MODULE: on
128128
GOPROXY: https://goproxy.io
@@ -138,7 +138,7 @@ steps:
138138
path: /go
139139

140140
- name: build-backend-windows
141-
image: golang:1.18
141+
image: golang:1.19
142142
environment:
143143
GO111MODULE: on
144144
GOPROXY: https://goproxy.io
@@ -153,7 +153,7 @@ steps:
153153
path: /go
154154

155155
- name: build-backend-386
156-
image: golang:1.18
156+
image: golang:1.19
157157
environment:
158158
GO111MODULE: on
159159
GOPROXY: https://goproxy.io
@@ -243,7 +243,7 @@ steps:
243243
- pull_request
244244

245245
- name: deps-backend
246-
image: golang:1.18
246+
image: golang:1.19
247247
pull: always
248248
commands:
249249
- make deps-backend
@@ -360,7 +360,7 @@ steps:
360360
path: /go
361361

362362
- name: generate-coverage
363-
image: golang:1.18
363+
image: golang:1.19
364364
commands:
365365
- make coverage
366366
environment:
@@ -436,7 +436,7 @@ steps:
436436
- pull_request
437437

438438
- name: deps-backend
439-
image: golang:1.18
439+
image: golang:1.19
440440
pull: always
441441
commands:
442442
- make deps-backend
@@ -578,7 +578,7 @@ trigger:
578578

579579
steps:
580580
- name: download
581-
image: golang:1.18
581+
image: golang:1.19
582582
pull: always
583583
commands:
584584
- timeout -s ABRT 40m make generate-license generate-gitignore
@@ -640,7 +640,7 @@ steps:
640640
- make deps-frontend
641641

642642
- name: deps-backend
643-
image: golang:1.18
643+
image: golang:1.19
644644
pull: always
645645
commands:
646646
- make deps-backend
@@ -649,7 +649,7 @@ steps:
649649
path: /go
650650

651651
- name: static
652-
image: techknowlogick/xgo:go-1.18.x
652+
image: techknowlogick/xgo:go-1.19.x
653653
pull: always
654654
commands:
655655
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved
@@ -760,7 +760,7 @@ steps:
760760
- make deps-frontend
761761

762762
- name: deps-backend
763-
image: golang:1.18
763+
image: golang:1.19
764764
pull: always
765765
commands:
766766
- make deps-backend
@@ -769,7 +769,7 @@ steps:
769769
path: /go
770770

771771
- name: static
772-
image: techknowlogick/xgo:go-1.18.x
772+
image: techknowlogick/xgo:go-1.19.x
773773
pull: always
774774
commands:
775775
# Upgrade to node 18 once https://github.com/techknowlogick/xgo/issues/163 is resolved

‎.eslintrc.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ overrides:
3030
env:
3131
worker: true
3232
rules:
33-
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, 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]
33+
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]
3434
- files: ["build/generate-images.js"]
3535
rules:
3636
import/no-unresolved: [0]
@@ -109,7 +109,7 @@ rules:
109109
import/no-extraneous-dependencies: [2]
110110
import/no-import-module-exports: [0]
111111
import/no-internal-modules: [0]
112-
import/no-mutable-exports: [2]
112+
import/no-mutable-exports: [0]
113113
import/no-named-as-default-member: [0]
114114
import/no-named-as-default: [2]
115115
import/no-named-default: [0]
@@ -121,7 +121,7 @@ rules:
121121
import/no-restricted-paths: [0]
122122
import/no-self-import: [2]
123123
import/no-unassigned-import: [0]
124-
import/no-unresolved: [2, {commonjs: true}]
124+
import/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$"]}]
125125
import/no-unused-modules: [2, {unusedExports: true}]
126126
import/no-useless-path-segments: [2, {commonjs: true}]
127127
import/no-webpack-loader-syntax: [2]
@@ -211,7 +211,7 @@ rules:
211211
no-compare-neg-zero: [2]
212212
no-cond-assign: [2, except-parens]
213213
no-confusing-arrow: [0]
214-
no-console: [1, {allow: [info, warn, error]}]
214+
no-console: [1, {allow: [debug, info, warn, error]}]
215215
no-const-assign: [2]
216216
no-constant-binary-expression: [2]
217217
no-constant-condition: [0]
@@ -287,7 +287,7 @@ rules:
287287
no-redeclare: [2]
288288
no-regex-spaces: [2]
289289
no-restricted-exports: [0]
290-
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, 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, self, status, statusbar, stop, toolbar, top]
290+
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, 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, self, status, statusbar, stop, toolbar, top, __dirname, __filename]
291291
no-restricted-imports: [0]
292292
no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement]
293293
no-return-assign: [0]
@@ -321,7 +321,7 @@ rules:
321321
no-unused-labels: [2]
322322
no-unused-private-class-members: [2]
323323
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, destructuredArrayIgnorePattern: ^_, ignoreRestSiblings: false}]
324-
no-use-before-define: [2, nofunc]
324+
no-use-before-define: [2, {functions: false, classes: true, variables: true, allowNamedExports: true}]
325325
no-useless-backreference: [0]
326326
no-useless-call: [2]
327327
no-useless-catch: [2]
@@ -347,7 +347,7 @@ rules:
347347
padded-blocks: [2, never]
348348
padding-line-between-statements: [0]
349349
prefer-arrow-callback: [2, {allowNamedFunctions: true, allowUnboundThis: true}]
350-
prefer-const: [2, {destructuring: all}]
350+
prefer-const: [2, {destructuring: all, ignoreReadBeforeAssign: true}]
351351
prefer-destructuring: [0]
352352
prefer-exponentiation-operator: [2]
353353
prefer-named-capture-group: [0]
@@ -449,7 +449,7 @@ rules:
449449
unicorn/no-new-array: [0]
450450
unicorn/no-new-buffer: [0]
451451
unicorn/no-null: [0]
452-
unicorn/no-object-as-default-parameter: [2]
452+
unicorn/no-object-as-default-parameter: [0]
453453
unicorn/no-process-exit: [0]
454454
unicorn/no-reduce: [2]
455455
unicorn/no-static-only-class: [2]
@@ -475,7 +475,7 @@ rules:
475475
unicorn/prefer-array-index-of: [2]
476476
unicorn/prefer-array-some: [2]
477477
unicorn/prefer-at: [0]
478-
unicorn/prefer-code-point: [2]
478+
unicorn/prefer-code-point: [0]
479479
unicorn/prefer-dataset: [2]
480480
unicorn/prefer-date-now: [2]
481481
unicorn/prefer-default-parameters: [0]

‎.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ linters:
2929
fast: false
3030

3131
run:
32-
go: 1.18
32+
go: 1.19
3333
timeout: 10m
3434
skip-dirs:
3535
- node_modules
@@ -75,7 +75,7 @@ linters-settings:
7575
- name: modifies-value-receiver
7676
gofumpt:
7777
extra-rules: true
78-
lang-version: "1.18"
78+
lang-version: "1.19"
7979
depguard:
8080
# TODO: use depguard to replace import checks in gitea-vet
8181
list-type: denylist

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.18-alpine3.16 AS build-env
2+
FROM golang:1.19-alpine3.16 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}

‎Dockerfile.rootless

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.18-alpine3.16 AS build-env
2+
FROM golang:1.19-alpine3.16 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SHASUM ?= shasum -a 256
2323
HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
2424
COMMA := ,
2525

26-
XGO_VERSION := go-1.18.x
26+
XGO_VERSION := go-1.19.x
2727

2828
AIR_PACKAGE ?= github.com/cosmtrek/[email protected]
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/[email protected]

‎custom/conf/app.example.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ ROUTER = console
10831083
;EXPLORE_PAGING_NUM = 20
10841084
;;
10851085
;; Number of issues that are displayed on one page
1086-
;ISSUE_PAGING_NUM = 10
1086+
;ISSUE_PAGING_NUM = 20
10871087
;;
10881088
;; Number of maximum commits displayed in one activity feed
10891089
;FEED_MAX_COMMIT_NUM = 5

‎docs/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ params:
2020
website: https://docs.gitea.io
2121
version: 1.16.9
2222
minGoVersion: 1.18
23-
goVersion: 1.18
23+
goVersion: 1.19
2424
minNodeVersion: 14
2525

2626
outputs:

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
172172
## UI (`ui`)
173173

174174
- `EXPLORE_PAGING_NUM`: **20**: Number of repositories that are shown in one explore page.
175-
- `ISSUE_PAGING_NUM`: **10**: Number of issues that are shown in one page (for all pages that list issues).
175+
- `ISSUE_PAGING_NUM`: **20**: Number of issues that are shown in one page (for all pages that list issues, milestones, projects).
176176
- `MEMBERS_PAGING_NUM`: **20**: Number of members that are shown in organization members.
177177
- `FEED_MAX_COMMIT_NUM`: **5**: Number of maximum commits shown in one activity feed.
178178
- `FEED_PAGING_NUM`: **20**: Number of items that are displayed in home feed.

‎docs/content/doc/features/comparison.zh-cn.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _表格中的符号含义:_
4646
| Git 驱动的集成化 wiki | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ |
4747
| 部署令牌 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
4848
| 仓库写权限令牌 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✓ |
49-
| 内置容器 Registry | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
49+
| 内置容器 Registry | ✓ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
5050
| 外部 Git 镜像 | ✓ | ✓ | ✘ | ✘ | ✓ | ✓ | ✓ |
5151
| WebAuthn (2FA) | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ? |
5252
| 内置 CI/CD | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
@@ -62,7 +62,7 @@ _表格中的符号含义:_
6262
| Git LFS 2.0 | ✓ | ✘ | ✓ | ✓ | ✓ | ⁄ | ✓ |
6363
| 组织里程碑 | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
6464
| 细粒度用户角色 (例如 Code, Issues, Wiki) | ✓ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
65-
| 提交人的身份验证 | ✘ | ✘ | ? | ✓ | ✓ | ✓ | ✘ |
65+
| 提交人的身份验证 | ⁄ | ✘ | ? | ✓ | ✓ | ✓ | ✘ |
6666
| GPG 签名的提交 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
6767
| SSH 签名的提交 | ✓ | ✘ | ✘ | ✘ | ✘ | ? | ? |
6868
| 拒绝未用通过验证的提交 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✓ |
@@ -71,6 +71,7 @@ _表格中的符号含义:_
7171
| 建立新分支 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
7272
| 在线代码编辑 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
7373
| 提交的统计图表 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |
74+
| 模板仓库 | ✓ | ✘ | ✓ | ✘ | ✓ | ✓ | ✘ |
7475

7576
#### Issue 管理
7677

@@ -84,9 +85,9 @@ _表格中的符号含义:_
8485
| 关联的 issues | ✘ | ✘ | ⁄ | ✘ | ✓ | ✘ | ✘ |
8586
| 私密 issues | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
8687
| 评论反馈 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
87-
| 锁定讨论 | ✘ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
88+
| 锁定讨论 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
8889
| Issue 批量处理 | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ |
89-
| Issue 看板 | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
90+
| Issue 看板 | ✓ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
9091
| 从 issues 创建分支 | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
9192
| Issue 搜索 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ |
9293
| 全局 Issue 搜索 | ✘ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ |
@@ -108,6 +109,7 @@ _表格中的符号含义:_
108109
| 回退某些 commits 或 merge request | ✘ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ |
109110
| Pull/Merge requests 模板 | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ |
110111
| 查看 Cherry-picking 的更改 | ✘ | ✘ | ✘ | ✓ | ✓ | ✘ | ✘ |
112+
| 下载 Patch | ✓ | ✘ | ✓ | ✓ | ✓ | / | ✘ |
111113

112114
#### 第三方集成
113115

@@ -124,4 +126,5 @@ _表格中的符号含义:_
124126
| 二次验证 (2FA) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ |
125127
| 集成 Mattermost/Slack | ✓ | ✓ | ⁄ | ✓ | ✓ | ⁄ | ✓ |
126128
| 集成 Discord | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ |
129+
| 集成 Microsoft Teams | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ |
127130
| 显示外部 CI/CD 的状态 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ |

‎docs/content/doc/packages/maven.en-us.md

+10
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ To publish a package simply run:
8181
mvn deploy
8282
```
8383

84+
If you want to publish a prebuild package to the registry, you can use [`mvn deploy:deploy-file`](https://maven.apache.org/plugins/maven-deploy-plugin/deploy-file-mojo.html):
85+
86+
```shell
87+
mvn deploy:deploy-file -Durl=https://gitea.example.com/api/packages/{owner}/maven -DrepositoryId=gitea -Dfile=/path/to/package.jar
88+
```
89+
90+
| Parameter | Description |
91+
| -------------- | ----------- |
92+
| `owner` | The owner of the package. |
93+
8494
You cannot publish a package if a package of the same name and version already exists. You must delete the existing package first.
8595

8696
## Install a package

‎docs/content/doc/packages/overview.en-us.md

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The following package managers are currently supported:
3434
| [Maven]({{< relref "doc/packages/maven.en-us.md" >}}) | Java | `mvn`, `gradle` |
3535
| [npm]({{< relref "doc/packages/npm.en-us.md" >}}) | JavaScript | `npm`, `yarn` |
3636
| [NuGet]({{< relref "doc/packages/nuget.en-us.md" >}}) | .NET | `nuget` |
37+
| [Pub]({{< relref "doc/packages/pub.en-us.md" >}}) | Dart | `dart`, `flutter` |
3738
| [PyPI]({{< relref "doc/packages/pypi.en-us.md" >}}) | Python | `pip`, `twine` |
3839
| [RubyGems]({{< relref "doc/packages/rubygems.en-us.md" >}}) | Ruby | `gem`, `Bundler` |
3940

0 commit comments

Comments
 (0)