Skip to content

Commit 5d78be4

Browse files
committed
Merge branch 'main' into lunny/project_workflow
2 parents 95cecbb + cd7d131 commit 5d78be4

File tree

937 files changed

+28636
-26917
lines changed

Some content is hidden

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

937 files changed

+28636
-26917
lines changed

.air.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ root = "."
22
tmp_dir = ".air"
33

44
[build]
5+
pre_cmd = ["killall -9 gitea 2>/dev/null || true"] # kill off potential zombie processes from previous runs
56
cmd = "make --no-print-directory backend"
67
bin = "gitea"
7-
delay = 1000
8+
delay = 2000
89
include_ext = ["go", "tmpl"]
910
include_file = ["main.go"]
1011
include_dir = ["cmd", "models", "modules", "options", "routers", "services"]

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ cpu.out
9595
/.air
9696
/.go-licenses
9797

98+
# Files and folders that were previously generated
99+
/public/assets/img/webpack
100+
98101
# Snapcraft
99102
snap/.snapcraft/
100103
parts/

.eslintrc.yaml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ reportUnusedDisableDirectives: true
33

44
ignorePatterns:
55
- /web_src/js/vendor
6+
- /web_src/fomantic
7+
- /public/assets/js
68

79
parserOptions:
810
sourceType: module
@@ -125,19 +127,21 @@ rules:
125127
"@stylistic/js/computed-property-spacing": [2, never]
126128
"@stylistic/js/dot-location": [2, property]
127129
"@stylistic/js/eol-last": [2]
128-
"@stylistic/js/function-call-spacing": [2, never]
129130
"@stylistic/js/function-call-argument-newline": [0]
131+
"@stylistic/js/function-call-spacing": [2, never]
130132
"@stylistic/js/function-paren-newline": [0]
131133
"@stylistic/js/generator-star-spacing": [0]
132134
"@stylistic/js/implicit-arrow-linebreak": [0]
133135
"@stylistic/js/indent": [2, 2, {ignoreComments: true, SwitchCase: 1}]
134136
"@stylistic/js/key-spacing": [2]
135137
"@stylistic/js/keyword-spacing": [2]
138+
"@stylistic/js/line-comment-position": [0]
136139
"@stylistic/js/linebreak-style": [2, unix]
137140
"@stylistic/js/lines-around-comment": [0]
138141
"@stylistic/js/lines-between-class-members": [0]
139142
"@stylistic/js/max-len": [0]
140143
"@stylistic/js/max-statements-per-line": [0]
144+
"@stylistic/js/multiline-comment-style": [0]
141145
"@stylistic/js/multiline-ternary": [0]
142146
"@stylistic/js/new-parens": [2]
143147
"@stylistic/js/newline-per-chained-call": [0]
@@ -309,17 +313,17 @@ rules:
309313
jquery/no-merge: [2]
310314
jquery/no-param: [2]
311315
jquery/no-parent: [0]
312-
jquery/no-parents: [0]
316+
jquery/no-parents: [2]
313317
jquery/no-parse-html: [2]
314318
jquery/no-prop: [2]
315319
jquery/no-proxy: [2]
316320
jquery/no-ready: [2]
317321
jquery/no-serialize: [2]
318322
jquery/no-show: [2]
319323
jquery/no-size: [2]
320-
jquery/no-sizzle: [0]
321-
jquery/no-slide: [0]
322-
jquery/no-submit: [0]
324+
jquery/no-sizzle: [2]
325+
jquery/no-slide: [2]
326+
jquery/no-submit: [2]
323327
jquery/no-text: [0]
324328
jquery/no-toggle: [2]
325329
jquery/no-trigger: [0]
@@ -457,7 +461,7 @@ rules:
457461
no-jquery/no-other-utils: [2]
458462
no-jquery/no-param: [2]
459463
no-jquery/no-parent: [0]
460-
no-jquery/no-parents: [0]
464+
no-jquery/no-parents: [2]
461465
no-jquery/no-parse-html-literal: [0]
462466
no-jquery/no-parse-html: [2]
463467
no-jquery/no-parse-json: [2]
@@ -469,7 +473,7 @@ rules:
469473
no-jquery/no-selector-prop: [2]
470474
no-jquery/no-serialize: [2]
471475
no-jquery/no-size: [2]
472-
no-jquery/no-sizzle: [0]
476+
no-jquery/no-sizzle: [2]
473477
no-jquery/no-slide: [2]
474478
no-jquery/no-sub: [2]
475479
no-jquery/no-support: [2]
@@ -536,7 +540,7 @@ rules:
536540
no-underscore-dangle: [0]
537541
no-unexpected-multiline: [2]
538542
no-unmodified-loop-condition: [2]
539-
no-unneeded-ternary: [0]
543+
no-unneeded-ternary: [2]
540544
no-unreachable-loop: [2]
541545
no-unreachable: [2]
542546
no-unsafe-finally: [2]
@@ -703,6 +707,7 @@ rules:
703707
unicorn/better-regex: [0]
704708
unicorn/catch-error-name: [0]
705709
unicorn/consistent-destructuring: [2]
710+
unicorn/consistent-empty-array-spread: [2]
706711
unicorn/consistent-function-scoping: [2]
707712
unicorn/custom-error-definition: [0]
708713
unicorn/empty-brace-spaces: [2]
@@ -715,28 +720,33 @@ rules:
715720
unicorn/import-style: [0]
716721
unicorn/new-for-builtins: [2]
717722
unicorn/no-abusive-eslint-disable: [0]
723+
unicorn/no-anonymous-default-export: [0]
718724
unicorn/no-array-callback-reference: [0]
719725
unicorn/no-array-for-each: [2]
720726
unicorn/no-array-method-this-argument: [2]
721727
unicorn/no-array-push-push: [2]
722728
unicorn/no-array-reduce: [2]
723729
unicorn/no-await-expression-member: [0]
730+
unicorn/no-await-in-promise-methods: [2]
724731
unicorn/no-console-spaces: [0]
725732
unicorn/no-document-cookie: [2]
726733
unicorn/no-empty-file: [2]
727734
unicorn/no-for-loop: [0]
728735
unicorn/no-hex-escape: [0]
729736
unicorn/no-instanceof-array: [0]
737+
unicorn/no-invalid-fetch-options: [2]
730738
unicorn/no-invalid-remove-event-listener: [2]
731739
unicorn/no-keyword-prefix: [0]
732740
unicorn/no-lonely-if: [2]
741+
unicorn/no-magic-array-flat-depth: [0]
733742
unicorn/no-negated-condition: [0]
734743
unicorn/no-nested-ternary: [0]
735744
unicorn/no-new-array: [0]
736745
unicorn/no-new-buffer: [0]
737746
unicorn/no-null: [0]
738747
unicorn/no-object-as-default-parameter: [0]
739748
unicorn/no-process-exit: [0]
749+
unicorn/no-single-promise-in-promise-methods: [2]
740750
unicorn/no-static-only-class: [2]
741751
unicorn/no-thenable: [2]
742752
unicorn/no-this-assignment: [2]
@@ -794,10 +804,12 @@ rules:
794804
unicorn/prefer-set-has: [0]
795805
unicorn/prefer-set-size: [2]
796806
unicorn/prefer-spread: [0]
807+
unicorn/prefer-string-raw: [0]
797808
unicorn/prefer-string-replace-all: [0]
798809
unicorn/prefer-string-slice: [0]
799810
unicorn/prefer-string-starts-ends-with: [2]
800811
unicorn/prefer-string-trim-start-end: [2]
812+
unicorn/prefer-structured-clone: [2]
801813
unicorn/prefer-switch: [0]
802814
unicorn/prefer-ternary: [0]
803815
unicorn/prefer-text-content: [2]

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
* text=auto eol=lf
22
*.tmpl linguist-language=Handlebars
3+
*.pb.go linguist-generated
34
/assets/*.json linguist-generated
45
/public/assets/img/svg/*.svg linguist-generated
56
/templates/swagger/v1_json.tmpl linguist-generated

.gitea/issue_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--
44
1. Please speak English, this is the language all maintainers can speak and write.
55
2. Please ask questions or configuration/deploy problems on our Discord
6-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
6+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
77
3. Please take a moment to check that your issue doesn't already exist.
88
4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
99
5. Please give all relevant information below for bug reports, because
@@ -21,7 +21,7 @@
2121
- [ ] MySQL
2222
- [ ] MSSQL
2323
- [ ] SQLite
24-
- Can you reproduce the bug at https://try.gitea.io:
24+
- Can you reproduce the bug at https://demo.gitea.com:
2525
- [ ] Yes (provide example URL)
2626
- [ ] No
2727
- Log gist:

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ body:
3737
label: Can you reproduce the bug on the Gitea demo site?
3838
description: |
3939
If so, please provide a URL in the Description field
40-
URL of Gitea demo: https://try.gitea.io
40+
URL of Gitea demo: https://demo.gitea.com
4141
options:
4242
- "Yes"
4343
- "No"
@@ -74,7 +74,7 @@ body:
7474
attributes:
7575
label: How are you running Gitea?
7676
description: |
77-
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
77+
Please include information on whether you built Gitea yourself, used one of our downloads, are using https://demo.gitea.com or are using some other package
7878
Please also tell us how you are running Gitea, e.g. if it is being run from docker, a command-line, systemd etc.
7979
If you are using a package or systemd tell us what distribution you are using
8080
validations:

.github/ISSUE_TEMPLATE/ui.bug-report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ body:
4646
label: Can you reproduce the bug on the Gitea demo site?
4747
description: |
4848
If so, please provide a URL in the Description field
49-
URL of Gitea demo: https://try.gitea.io
49+
URL of Gitea demo: https://demo.gitea.com
5050
options:
5151
- "Yes"
5252
- "No"

.github/labeler.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@ modifies/docs:
44
- "**/*.md"
55
- "docs/**"
66

7-
modifies/frontend:
8-
- changed-files:
9-
- any-glob-to-any-file:
10-
- "web_src/**"
11-
- "tailwind.config.js"
12-
- "webpack.config.js"
13-
147
modifies/templates:
158
- changed-files:
169
- all-globs-to-any-file:

.github/workflows/cron-translations.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ jobs:
1111
if: github.repository == 'go-gitea/gitea'
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: download from crowdin
15-
uses: docker://jonasfranz/crowdin
14+
- uses: crowdin/github-action@v1
15+
with:
16+
upload_sources: true
17+
upload_translations: false
18+
download_sources: false
19+
download_translations: true
20+
push_translations: false
21+
push_sources: false
22+
create_pull_request: false
23+
config: crowdin.yml
1624
env:
25+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
1726
CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
18-
PLUGIN_DOWNLOAD: true
19-
PLUGIN_EXPORT_DIR: options/locale/
20-
PLUGIN_IGNORE_BRANCH: true
21-
PLUGIN_PROJECT_IDENTIFIER: gitea
2227
- name: update locales
2328
run: ./build/update-locales.sh
2429
- name: push translations to repo
@@ -31,19 +36,3 @@ jobs:
3136
commit_message: "[skip ci] Updated translations via Crowdin"
3237
remote: "[email protected]:go-gitea/gitea.git"
3338
ssh_key: ${{ secrets.DEPLOY_KEY }}
34-
crowdin-push:
35-
runs-on: ubuntu-latest
36-
if: github.repository == 'go-gitea/gitea'
37-
steps:
38-
- uses: actions/checkout@v4
39-
- name: push translations to crowdin
40-
uses: docker://jonasfranz/crowdin
41-
env:
42-
CROWDIN_KEY: ${{ secrets.CROWDIN_KEY }}
43-
PLUGIN_UPLOAD: true
44-
PLUGIN_EXPORT_DIR: options/locale/
45-
PLUGIN_IGNORE_BRANCH: true
46-
PLUGIN_PROJECT_IDENTIFIER: gitea
47-
PLUGIN_FILES: |
48-
locale_en-US.ini: options/locale/locale_en-US.ini
49-
PLUGIN_BRANCH: main

.github/workflows/disk-clean.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)