Skip to content

Commit bb995be

Browse files
committed
Merge branch 'main' into main_improve_paste_upload
# Conflicts: # web_src/js/features/common-global.js # web_src/js/features/comp/Paste.js # web_src/js/features/repo-issue-edit.js # web_src/js/features/repo-issue.js
2 parents c552d09 + 0c4ff01 commit bb995be

File tree

1,078 files changed

+26311
-17549
lines changed

Some content is hidden

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

1,078 files changed

+26311
-17549
lines changed

.air.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ exclude_dir = [
2121
]
2222
exclude_regex = ["_test.go$", "_gen.go$"]
2323
stop_on_error = true
24+
25+
[log]
26+
main_only = true

.devcontainer/devcontainer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version": "3.12"
13-
}
13+
},
14+
"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {}
1415
},
1516
"customizations": {
1617
"vscode": {
@@ -25,8 +26,9 @@
2526
"Vue.volar",
2627
"ms-azuretools.vscode-docker",
2728
"vitest.explorer",
28-
"qwtel.sqlite-viewer",
29-
"GitHub.vscode-pull-request-github"
29+
"cweijan.vscode-database-client2",
30+
"GitHub.vscode-pull-request-github",
31+
"Azurite.azurite"
3032
]
3133
}
3234
},

.eslintrc.yaml

Lines changed: 14 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ reportUnusedDisableDirectives: true
44
ignorePatterns:
55
- /web_src/js/vendor
66
- /web_src/fomantic
7+
- /public/assets/js
78

89
parserOptions:
910
sourceType: module
@@ -15,7 +16,6 @@ plugins:
1516
- eslint-plugin-array-func
1617
- eslint-plugin-github
1718
- eslint-plugin-i
18-
- eslint-plugin-jquery
1919
- eslint-plugin-no-jquery
2020
- eslint-plugin-no-use-extend-native
2121
- eslint-plugin-regexp
@@ -33,6 +33,7 @@ overrides:
3333
- files: ["web_src/**/*"]
3434
globals:
3535
__webpack_public_path__: true
36+
htmx: true
3637
process: false # https://github.com/webpack/webpack/issues/15833
3738
- files: ["web_src/**/*", "docs/**/*"]
3839
env:
@@ -126,19 +127,21 @@ rules:
126127
"@stylistic/js/computed-property-spacing": [2, never]
127128
"@stylistic/js/dot-location": [2, property]
128129
"@stylistic/js/eol-last": [2]
129-
"@stylistic/js/function-call-spacing": [2, never]
130130
"@stylistic/js/function-call-argument-newline": [0]
131+
"@stylistic/js/function-call-spacing": [2, never]
131132
"@stylistic/js/function-paren-newline": [0]
132133
"@stylistic/js/generator-star-spacing": [0]
133134
"@stylistic/js/implicit-arrow-linebreak": [0]
134135
"@stylistic/js/indent": [2, 2, {ignoreComments: true, SwitchCase: 1}]
135136
"@stylistic/js/key-spacing": [2]
136137
"@stylistic/js/keyword-spacing": [2]
138+
"@stylistic/js/line-comment-position": [0]
137139
"@stylistic/js/linebreak-style": [2, unix]
138140
"@stylistic/js/lines-around-comment": [0]
139141
"@stylistic/js/lines-between-class-members": [0]
140142
"@stylistic/js/max-len": [0]
141143
"@stylistic/js/max-statements-per-line": [0]
144+
"@stylistic/js/multiline-comment-style": [0]
142145
"@stylistic/js/multiline-ternary": [0]
143146
"@stylistic/js/new-parens": [2]
144147
"@stylistic/js/newline-per-chained-call": [0]
@@ -279,55 +282,6 @@ rules:
279282
i/prefer-default-export: [0]
280283
i/unambiguous: [0]
281284
init-declarations: [0]
282-
jquery/no-ajax-events: [2]
283-
jquery/no-ajax: [2]
284-
jquery/no-animate: [2]
285-
jquery/no-attr: [2]
286-
jquery/no-bind: [2]
287-
jquery/no-class: [0]
288-
jquery/no-clone: [2]
289-
jquery/no-closest: [0]
290-
jquery/no-css: [2]
291-
jquery/no-data: [0]
292-
jquery/no-deferred: [2]
293-
jquery/no-delegate: [2]
294-
jquery/no-each: [0]
295-
jquery/no-extend: [2]
296-
jquery/no-fade: [2]
297-
jquery/no-filter: [0]
298-
jquery/no-find: [0]
299-
jquery/no-global-eval: [2]
300-
jquery/no-grep: [2]
301-
jquery/no-has: [2]
302-
jquery/no-hide: [2]
303-
jquery/no-html: [0]
304-
jquery/no-in-array: [2]
305-
jquery/no-is-array: [2]
306-
jquery/no-is-function: [2]
307-
jquery/no-is: [2]
308-
jquery/no-load: [2]
309-
jquery/no-map: [2]
310-
jquery/no-merge: [2]
311-
jquery/no-param: [2]
312-
jquery/no-parent: [0]
313-
jquery/no-parents: [0]
314-
jquery/no-parse-html: [2]
315-
jquery/no-prop: [2]
316-
jquery/no-proxy: [2]
317-
jquery/no-ready: [2]
318-
jquery/no-serialize: [2]
319-
jquery/no-show: [2]
320-
jquery/no-size: [2]
321-
jquery/no-sizzle: [2]
322-
jquery/no-slide: [0]
323-
jquery/no-submit: [0]
324-
jquery/no-text: [0]
325-
jquery/no-toggle: [2]
326-
jquery/no-trigger: [0]
327-
jquery/no-trim: [2]
328-
jquery/no-val: [0]
329-
jquery/no-when: [2]
330-
jquery/no-wrap: [2]
331285
line-comment-position: [0]
332286
logical-assignment-operators: [0]
333287
max-classes-per-file: [0]
@@ -458,7 +412,7 @@ rules:
458412
no-jquery/no-other-utils: [2]
459413
no-jquery/no-param: [2]
460414
no-jquery/no-parent: [0]
461-
no-jquery/no-parents: [0]
415+
no-jquery/no-parents: [2]
462416
no-jquery/no-parse-html-literal: [0]
463417
no-jquery/no-parse-html: [2]
464418
no-jquery/no-parse-json: [2]
@@ -474,7 +428,7 @@ rules:
474428
no-jquery/no-slide: [2]
475429
no-jquery/no-sub: [2]
476430
no-jquery/no-support: [2]
477-
no-jquery/no-text: [0]
431+
no-jquery/no-text: [2]
478432
no-jquery/no-trigger: [0]
479433
no-jquery/no-trim: [2]
480434
no-jquery/no-type: [2]
@@ -704,6 +658,7 @@ rules:
704658
unicorn/better-regex: [0]
705659
unicorn/catch-error-name: [0]
706660
unicorn/consistent-destructuring: [2]
661+
unicorn/consistent-empty-array-spread: [2]
707662
unicorn/consistent-function-scoping: [2]
708663
unicorn/custom-error-definition: [0]
709664
unicorn/empty-brace-spaces: [2]
@@ -730,10 +685,13 @@ rules:
730685
unicorn/no-for-loop: [0]
731686
unicorn/no-hex-escape: [0]
732687
unicorn/no-instanceof-array: [0]
688+
unicorn/no-invalid-fetch-options: [2]
733689
unicorn/no-invalid-remove-event-listener: [2]
734690
unicorn/no-keyword-prefix: [0]
735691
unicorn/no-lonely-if: [2]
692+
unicorn/no-magic-array-flat-depth: [0]
736693
unicorn/no-negated-condition: [0]
694+
unicorn/no-negation-in-equality-check: [2]
737695
unicorn/no-nested-ternary: [0]
738696
unicorn/no-new-array: [0]
739697
unicorn/no-new-buffer: [0]
@@ -792,16 +750,18 @@ rules:
792750
unicorn/prefer-object-has-own: [0]
793751
unicorn/prefer-optional-catch-binding: [2]
794752
unicorn/prefer-prototype-methods: [0]
795-
unicorn/prefer-query-selector: [0]
753+
unicorn/prefer-query-selector: [2]
796754
unicorn/prefer-reflect-apply: [0]
797755
unicorn/prefer-regexp-test: [2]
798756
unicorn/prefer-set-has: [0]
799757
unicorn/prefer-set-size: [2]
800758
unicorn/prefer-spread: [0]
759+
unicorn/prefer-string-raw: [0]
801760
unicorn/prefer-string-replace-all: [0]
802761
unicorn/prefer-string-slice: [0]
803762
unicorn/prefer-string-starts-ends-with: [2]
804763
unicorn/prefer-string-trim-start-end: [2]
764+
unicorn/prefer-structured-clone: [2]
805765
unicorn/prefer-switch: [0]
806766
unicorn/prefer-ternary: [0]
807767
unicorn/prefer-text-content: [2]

.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/pull_request_template.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<!-- start tips -->
1+
<!-- start tips -->
22
Please check the following:
33
1. Make sure you are targeting the `main` branch, pull requests on release branches are only allowed for backports.
44
2. Make sure you have read contributing guidelines: https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md .
5-
3. Describe what your pull request does and which issue you're targeting (if any).
6-
4. It is recommended to enable "Allow edits by maintainers", so maintainers can help more easily.
7-
5. Your input here will be included in the commit message when this PR has been merged. If you don't want some content to be included, please separate them with a line like `---`.
8-
6. Delete all these tips before posting.
5+
3. For documentations contribution, please go to https://gitea.com/gitea/docs
6+
4. Describe what your pull request does and which issue you're targeting (if any).
7+
5. It is recommended to enable "Allow edits by maintainers", so maintainers can help more easily.
8+
6. Your input here will be included in the commit message when this PR has been merged. If you don't want some content to be included, please separate them with a line like `---`.
9+
7. Delete all these tips before posting.
910
<!-- end tips -->

.github/workflows/disk-clean.yml

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

.github/workflows/pull-compliance.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
- uses: actions/setup-node@v4
3939
with:
4040
node-version: 20
41+
cache: npm
42+
cache-dependency-path: package-lock.json
4143
- run: pip install poetry
4244
- run: make deps-py
4345
- run: make deps-frontend
@@ -65,6 +67,8 @@ jobs:
6567
- uses: actions/setup-node@v4
6668
with:
6769
node-version: 20
70+
cache: npm
71+
cache-dependency-path: package-lock.json
6872
- run: make deps-frontend
6973
- run: make lint-swagger
7074

@@ -134,6 +138,8 @@ jobs:
134138
- uses: actions/setup-node@v4
135139
with:
136140
node-version: 20
141+
cache: npm
142+
cache-dependency-path: package-lock.json
137143
- run: make deps-frontend
138144
- run: make lint-frontend
139145
- run: make checks-frontend
@@ -181,6 +187,8 @@ jobs:
181187
- uses: actions/setup-node@v4
182188
with:
183189
node-version: 20
190+
cache: npm
191+
cache-dependency-path: package-lock.json
184192
- run: make deps-frontend
185193
- run: make lint-md
186194
- run: make docs

.github/workflows/pull-db-tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,18 @@ jobs:
119119
MINIO_SECRET_KEY: 12345678
120120
ports:
121121
- "9000:9000"
122+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
123+
image: mcr.microsoft.com/azure-storage/azurite:latest
124+
ports:
125+
- 10000:10000
122126
steps:
123127
- uses: actions/checkout@v4
124128
- uses: actions/setup-go@v5
125129
with:
126130
go-version-file: go.mod
127131
check-latest: true
128132
- name: Add hosts to /etc/hosts
129-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
133+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 minio devstoreaccount1.azurite.local mysql elasticsearch meilisearch smtpimap" | sudo tee -a /etc/hosts'
130134
- run: make deps-backend
131135
- run: make backend
132136
env:
@@ -204,14 +208,18 @@ jobs:
204208
SA_PASSWORD: MwantsaSecurePassword1
205209
ports:
206210
- "1433:1433"
211+
devstoreaccount1.azurite.local: # https://github.com/Azure/Azurite/issues/1583
212+
image: mcr.microsoft.com/azure-storage/azurite:latest
213+
ports:
214+
- 10000:10000
207215
steps:
208216
- uses: actions/checkout@v4
209217
- uses: actions/setup-go@v5
210218
with:
211219
go-version-file: go.mod
212220
check-latest: true
213221
- name: Add hosts to /etc/hosts
214-
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql" | sudo tee -a /etc/hosts'
222+
run: '[ -e "/.dockerenv" ] || [ -e "/run/.containerenv" ] || echo "127.0.0.1 mssql devstoreaccount1.azurite.local" | sudo tee -a /etc/hosts'
215223
- run: make deps-backend
216224
- run: make backend
217225
env:

0 commit comments

Comments
 (0)