Skip to content

Commit b4eec88

Browse files
authored
Merge branch 'go-gitea:main' into main
2 parents f98f234 + 5bf8d54 commit b4eec88

File tree

7,003 files changed

+20265
-2563424
lines changed

Some content is hidden

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

7,003 files changed

+20265
-2563424
lines changed

.drone.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ steps:
8888
image: golang:1.16 # this step is kept as the lowest version of golang that we support
8989
environment:
9090
GO111MODULE: on
91-
GOPROXY: off
91+
GOPROXY: https://goproxy.cn
9292
commands:
93-
- go build -mod=vendor -o gitea_no_gcc # test if build succeeds without the sqlite tag
93+
- go build -o gitea_no_gcc # test if build succeeds without the sqlite tag
9494
depends_on: [checks-backend]
9595

9696
- name: build-backend-arm64
9797
image: golang:1.17
9898
environment:
9999
GO111MODULE: on
100-
GOPROXY: off
100+
GOPROXY: https://goproxy.cn
101101
GOOS: linux
102102
GOARCH: arm64
103103
TAGS: bindata gogit
@@ -110,23 +110,23 @@ steps:
110110
image: golang:1.17
111111
environment:
112112
GO111MODULE: on
113-
GOPROXY: off
113+
GOPROXY: https://goproxy.cn
114114
GOOS: windows
115115
GOARCH: amd64
116116
TAGS: bindata gogit
117117
commands:
118-
- go build -mod=vendor -o gitea_windows
118+
- go build -o gitea_windows
119119
depends_on: [checks-backend]
120120

121121
- name: build-backend-386
122122
image: golang:1.17
123123
environment:
124124
GO111MODULE: on
125-
GOPROXY: off
125+
GOPROXY: https://goproxy.cn
126126
GOOS: linux
127127
GOARCH: 386
128128
commands:
129-
- go build -mod=vendor -o gitea_linux_386 # test if compatible with 32 bit
129+
- go build -o gitea_linux_386 # test if compatible with 32 bit
130130
depends_on: [checks-backend]
131131

132132
---
@@ -224,7 +224,7 @@ steps:
224224
commands:
225225
- make unit-test-coverage test-check
226226
environment:
227-
GOPROXY: off
227+
GOPROXY: https://goproxy.cn
228228
TAGS: bindata sqlite sqlite_unlock_notify
229229
RACE_ENABLED: true
230230
GITHUB_READ_TOKEN:
@@ -237,7 +237,7 @@ steps:
237237
commands:
238238
- make unit-test-coverage test-check
239239
environment:
240-
GOPROXY: off
240+
GOPROXY: https://goproxy.cn
241241
TAGS: bindata gogit sqlite sqlite_unlock_notify
242242
RACE_ENABLED: true
243243
GITHUB_READ_TOKEN:
@@ -249,7 +249,7 @@ steps:
249249
commands:
250250
- make test-mysql-migration integration-test-coverage
251251
environment:
252-
GOPROXY: off
252+
GOPROXY: https://goproxy.cn
253253
TAGS: bindata
254254
RACE_ENABLED: true
255255
TEST_LDAP: 1
@@ -264,7 +264,7 @@ steps:
264264
commands:
265265
- timeout -s ABRT 40m make test-mysql8-migration test-mysql8
266266
environment:
267-
GOPROXY: off
267+
GOPROXY: https://goproxy.cn
268268
TAGS: bindata
269269
RACE_ENABLED: true
270270
TEST_LDAP: 1
@@ -278,7 +278,7 @@ steps:
278278
commands:
279279
- make test-mssql-migration test-mssql
280280
environment:
281-
GOPROXY: off
281+
GOPROXY: https://goproxy.cn
282282
TAGS: bindata
283283
RACE_ENABLED: true
284284
TEST_LDAP: 1
@@ -291,7 +291,7 @@ steps:
291291
commands:
292292
- make coverage
293293
environment:
294-
GOPROXY: off
294+
GOPROXY: https://goproxy.cn
295295
TAGS: bindata
296296
depends_on:
297297
- unit-test
@@ -384,7 +384,7 @@ steps:
384384
commands:
385385
- timeout -s ABRT 40m make test-sqlite-migration test-sqlite
386386
environment:
387-
GOPROXY: off
387+
GOPROXY: https://goproxy.cn
388388
TAGS: bindata gogit sqlite sqlite_unlock_notify
389389
RACE_ENABLED: true
390390
TEST_TAGS: gogit sqlite sqlite_unlock_notify
@@ -398,7 +398,7 @@ steps:
398398
commands:
399399
- timeout -s ABRT 40m make test-pgsql-migration test-pgsql
400400
environment:
401-
GOPROXY: off
401+
GOPROXY: https://goproxy.cn
402402
TAGS: bindata gogit
403403
RACE_ENABLED: true
404404
TEST_TAGS: gogit
@@ -760,7 +760,7 @@ steps:
760760
auto_tag_suffix: linux-amd64
761761
repo: gitea/gitea
762762
build_args:
763-
- GOPROXY=off
763+
- GOPROXY=https://goproxy.cn
764764
password:
765765
from_secret: docker_password
766766
username:
@@ -778,7 +778,7 @@ steps:
778778
auto_tag_suffix: linux-amd64-rootless
779779
repo: gitea/gitea
780780
build_args:
781-
- GOPROXY=off
781+
- GOPROXY=https://goproxy.cn
782782
password:
783783
from_secret: docker_password
784784
username:
@@ -822,7 +822,7 @@ steps:
822822
tags: dev-linux-amd64
823823
repo: gitea/gitea
824824
build_args:
825-
- GOPROXY=off
825+
- GOPROXY=https://goproxy.cn
826826
password:
827827
from_secret: docker_password
828828
username:
@@ -840,7 +840,7 @@ steps:
840840
tags: dev-linux-amd64-rootless
841841
repo: gitea/gitea
842842
build_args:
843-
- GOPROXY=off
843+
- GOPROXY=https://goproxy.cn
844844
password:
845845
from_secret: docker_password
846846
username:
@@ -875,7 +875,7 @@ steps:
875875
repo: gitea/gitea
876876
tags: linux-arm64
877877
build_args:
878-
- GOPROXY=off
878+
- GOPROXY=https://goproxy.cn
879879
environment:
880880
PLUGIN_MIRROR:
881881
from_secret: plugin_mirror
@@ -917,7 +917,7 @@ steps:
917917
auto_tag_suffix: linux-arm64
918918
repo: gitea/gitea
919919
build_args:
920-
- GOPROXY=off
920+
- GOPROXY=https://goproxy.cn
921921
password:
922922
from_secret: docker_password
923923
username:
@@ -935,7 +935,7 @@ steps:
935935
auto_tag_suffix: linux-arm64-rootless
936936
repo: gitea/gitea
937937
build_args:
938-
- GOPROXY=off
938+
- GOPROXY=https://goproxy.cn
939939
password:
940940
from_secret: docker_password
941941
username:
@@ -979,7 +979,7 @@ steps:
979979
tags: dev-linux-arm64
980980
repo: gitea/gitea
981981
build_args:
982-
- GOPROXY=off
982+
- GOPROXY=https://goproxy.cn
983983
password:
984984
from_secret: docker_password
985985
username:
@@ -997,7 +997,7 @@ steps:
997997
tags: dev-linux-arm64-rootless
998998
repo: gitea/gitea
999999
build_args:
1000-
- GOPROXY=off
1000+
- GOPROXY=https://goproxy.cn
10011001
password:
10021002
from_secret: docker_password
10031003
username:

.eslintrc

+7-20
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ plugins:
1313
- eslint-plugin-import
1414
- eslint-plugin-vue
1515
- eslint-plugin-html
16-
- eslint-plugin-github
1716

1817
extends:
1918
- plugin:vue/recommended
@@ -27,7 +26,6 @@ globals:
2726
CodeMirror: false
2827
Dropzone: false
2928
SimpleMDE: false
30-
u2fApi: false
3129

3230
settings:
3331
html/html-extensions: [".tmpl"]
@@ -97,23 +95,6 @@ rules:
9795
function-paren-newline: [0]
9896
generator-star-spacing: [0]
9997
getter-return: [2]
100-
github/array-foreach: [2]
101-
github/async-currenttarget: [2]
102-
github/async-preventdefault: [2]
103-
github/authenticity-token: [0]
104-
github/get-attribute: [2]
105-
github/js-class-name: [0]
106-
github/no-blur: [0]
107-
github/no-d-none: [0]
108-
github/no-dataset: [2]
109-
github/no-implicit-buggy-globals: [0]
110-
github/no-inner-html: [0]
111-
github/no-innerText: [2]
112-
github/no-then: [0]
113-
github/no-useless-passive: [2]
114-
github/prefer-observers: [0]
115-
github/require-passive-events: [2]
116-
github/unescaped-html-literal: [0]
11798
grouped-accessor-pairs: [2]
11899
guard-for-in: [0]
119100
id-blacklist: [0]
@@ -302,6 +283,7 @@ rules:
302283
no-unsafe-negation: [2]
303284
no-unused-expressions: [2]
304285
no-unused-labels: [2]
286+
no-unused-private-class-members: [2]
305287
no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, ignoreRestSiblings: false}]
306288
no-use-before-define: [2, nofunc]
307289
no-useless-backreference: [0]
@@ -334,6 +316,7 @@ rules:
334316
prefer-exponentiation-operator: [2]
335317
prefer-named-capture-group: [0]
336318
prefer-numeric-literals: [2]
319+
prefer-object-has-own: [0]
337320
prefer-object-spread: [0]
338321
prefer-promise-reject-errors: [2, {allowEmptyReject: false}]
339322
prefer-regex-literals: [2]
@@ -380,7 +363,7 @@ rules:
380363
unicorn/import-style: [0]
381364
unicorn/new-for-builtins: [2]
382365
unicorn/no-abusive-eslint-disable: [0]
383-
unicorn/no-array-for-each: [0]
366+
unicorn/no-array-for-each: [2]
384367
unicorn/no-array-instanceof: [0]
385368
unicorn/no-array-method-this-argument: [2]
386369
unicorn/no-array-push-push: [2]
@@ -402,12 +385,14 @@ rules:
402385
unicorn/no-process-exit: [0]
403386
unicorn/no-reduce: [2]
404387
unicorn/no-static-only-class: [2]
388+
unicorn/no-thenable: [2]
405389
unicorn/no-this-assignment: [2]
406390
unicorn/no-unreadable-array-destructuring: [0]
407391
unicorn/no-unsafe-regex: [0]
408392
unicorn/no-unused-properties: [2]
409393
unicorn/no-useless-fallback-in-spread: [2]
410394
unicorn/no-useless-length-check: [2]
395+
unicorn/no-useless-promise-resolve-reject: [2]
411396
unicorn/no-useless-spread: [2]
412397
unicorn/no-useless-undefined: [0]
413398
unicorn/no-zero-fractions: [2]
@@ -427,6 +412,7 @@ rules:
427412
unicorn/prefer-event-key: [2]
428413
unicorn/prefer-export-from: [2]
429414
unicorn/prefer-includes: [2]
415+
unicorn/prefer-json-parse-buffer: [0]
430416
unicorn/prefer-math-trunc: [2]
431417
unicorn/prefer-modern-dom-apis: [0]
432418
unicorn/prefer-module: [2]
@@ -454,6 +440,7 @@ rules:
454440
unicorn/prefer-trim-start-end: [2]
455441
unicorn/prefer-type-error: [0]
456442
unicorn/prevent-abbreviations: [0]
443+
unicorn/relative-url-style: [2]
457444
unicorn/require-array-join-separator: [2]
458445
unicorn/require-number-to-fixed-digits-argument: [2]
459446
unicorn/require-post-message-target-origin: [0]

.github/ISSUE_TEMPLATE/bug-report.yaml

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug Report
2-
description: Found something you weren't expecting? Report it here!
2+
description: Found something you weren't expecting? Report it here!
33
body:
44
- type: markdown
55
attributes:
@@ -11,15 +11,16 @@ body:
1111
1. Please speak English, this is the language all maintainers can speak and write.
1212
2. Please ask questions or configuration/deploy problems on our Discord
1313
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
14-
3. Please take a moment to check that your issue doesn't already exist.
14+
3. Make sure you are using the latest release and
15+
take a moment to check that your issue hasn't been reported before.
1516
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq)
1617
5. Please give all relevant information below for bug reports, because
1718
incomplete details will be handled as an invalid report.
1819
- type: input
1920
id: gitea-ver
2021
attributes:
2122
label: Gitea Version
22-
description: Gitea version (or commit reference) your instance is running
23+
description: Gitea version (or commit reference) of your instance
2324
validations:
2425
required: true
2526
- type: input
@@ -37,8 +38,8 @@ body:
3738
attributes:
3839
label: How are you running Gitea?
3940
description: |
40-
Please include information on whether you built gitea yourself, used one of our downloads, are using https://try.gitea.io or are using some other package
41-
Please also tell us how you are running gitea, e.g. if it is being run from docker, a command-line, systemd etc.
41+
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://try.gitea.io or are using some other package
42+
Please also tell us how you are running Gitea, e.g. if it is being run from docker, a command-line, systemd etc.
4243
If you are using a package or systemd tell us what distribution you are using
4344
validations:
4445
required: true
@@ -67,7 +68,7 @@ body:
6768
- type: markdown
6869
attributes:
6970
value: |
70-
It really is important to provide pertinent logs
71+
It's really important to provide pertinent logs
7172
Please read https://docs.gitea.io/en-us/logging-configuration/#debugging-problems
7273
In addition, if your problem relates to git commands set `RUN_MODE=dev` at the top of app.ini
7374
- type: input
@@ -81,9 +82,9 @@ body:
8182
label: Description
8283
description: |
8384
Please provide a description of your issue here, with a URL if you were able to reproduce the issue (see above)
84-
If using a proxy or a CDN (e.g. CloudFlare) in front of gitea, please disable the proxy/CDN fully and connect to gitea directly to confirm the issue still persists without those services.
85+
If you are using a proxy or a CDN (e.g. Cloudflare) in front of Gitea, please disable the proxy/CDN fully and access Gitea directly to confirm the issue still persists without those services.
8586
- type: textarea
8687
id: screenshots
8788
attributes:
8889
label: Screenshots
89-
description: If this issue involves the Web Interface, please provide a screenshot or multiple screenshots
90+
description: If this issue involves the Web Interface, please provide one or more screenshots

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ cpu.out
8585
/public/css
8686
/public/fonts
8787
/public/img/webpack
88+
/vendor
8889
/web_src/fomantic/node_modules
8990
/web_src/fomantic/build/*
9091
!/web_src/fomantic/build/semantic.js

0 commit comments

Comments
 (0)