Skip to content

Commit 3d1e916

Browse files
authored
Merge branch 'main' into main_multiple_projects
2 parents 2ba5b9d + 53b5522 commit 3d1e916

File tree

698 files changed

+19183
-21335
lines changed

Some content is hidden

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

698 files changed

+19183
-21335
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: 11 additions & 7 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
@@ -310,17 +311,17 @@ rules:
310311
jquery/no-merge: [2]
311312
jquery/no-param: [2]
312313
jquery/no-parent: [0]
313-
jquery/no-parents: [0]
314+
jquery/no-parents: [2]
314315
jquery/no-parse-html: [2]
315316
jquery/no-prop: [2]
316317
jquery/no-proxy: [2]
317318
jquery/no-ready: [2]
318319
jquery/no-serialize: [2]
319320
jquery/no-show: [2]
320321
jquery/no-size: [2]
321-
jquery/no-sizzle: [0]
322-
jquery/no-slide: [0]
323-
jquery/no-submit: [0]
322+
jquery/no-sizzle: [2]
323+
jquery/no-slide: [2]
324+
jquery/no-submit: [2]
324325
jquery/no-text: [0]
325326
jquery/no-toggle: [2]
326327
jquery/no-trigger: [0]
@@ -458,7 +459,7 @@ rules:
458459
no-jquery/no-other-utils: [2]
459460
no-jquery/no-param: [2]
460461
no-jquery/no-parent: [0]
461-
no-jquery/no-parents: [0]
462+
no-jquery/no-parents: [2]
462463
no-jquery/no-parse-html-literal: [0]
463464
no-jquery/no-parse-html: [2]
464465
no-jquery/no-parse-json: [2]
@@ -470,7 +471,7 @@ rules:
470471
no-jquery/no-selector-prop: [2]
471472
no-jquery/no-serialize: [2]
472473
no-jquery/no-size: [2]
473-
no-jquery/no-sizzle: [0]
474+
no-jquery/no-sizzle: [2]
474475
no-jquery/no-slide: [2]
475476
no-jquery/no-sub: [2]
476477
no-jquery/no-support: [2]
@@ -537,7 +538,7 @@ rules:
537538
no-underscore-dangle: [0]
538539
no-unexpected-multiline: [2]
539540
no-unmodified-loop-condition: [2]
540-
no-unneeded-ternary: [0]
541+
no-unneeded-ternary: [2]
541542
no-unreachable-loop: [2]
542543
no-unreachable: [2]
543544
no-unsafe-finally: [2]
@@ -716,12 +717,14 @@ rules:
716717
unicorn/import-style: [0]
717718
unicorn/new-for-builtins: [2]
718719
unicorn/no-abusive-eslint-disable: [0]
720+
unicorn/no-anonymous-default-export: [0]
719721
unicorn/no-array-callback-reference: [0]
720722
unicorn/no-array-for-each: [2]
721723
unicorn/no-array-method-this-argument: [2]
722724
unicorn/no-array-push-push: [2]
723725
unicorn/no-array-reduce: [2]
724726
unicorn/no-await-expression-member: [0]
727+
unicorn/no-await-in-promise-methods: [2]
725728
unicorn/no-console-spaces: [0]
726729
unicorn/no-document-cookie: [2]
727730
unicorn/no-empty-file: [2]
@@ -738,6 +741,7 @@ rules:
738741
unicorn/no-null: [0]
739742
unicorn/no-object-as-default-parameter: [0]
740743
unicorn/no-process-exit: [0]
744+
unicorn/no-single-promise-in-promise-methods: [2]
741745
unicorn/no-static-only-class: [2]
742746
unicorn/no-thenable: [2]
743747
unicorn/no-this-assignment: [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

.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-e2e-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
27+
cache: npm
28+
cache-dependency-path: package-lock.json
2729
- run: make deps-frontend frontend deps-backend
2830
- run: npx playwright install --with-deps
2931
- run: make test-e2e-sqlite

.github/workflows/release-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ concurrency:
99
cancel-in-progress: true
1010

1111
jobs:
12-
disk-clean:
13-
uses: ./.github/workflows/disk-clean.yml
1412
nightly-binary:
1513
runs-on: nscloud
1614
steps:
@@ -25,6 +23,8 @@ jobs:
2523
- uses: actions/setup-node@v4
2624
with:
2725
node-version: 20
26+
cache: npm
27+
cache-dependency-path: package-lock.json
2828
- run: make deps-frontend deps-backend
2929
# xgo build
3030
- run: make release

.github/workflows/release-tag-rc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
- uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
27+
cache: npm
28+
cache-dependency-path: package-lock.json
2729
- run: make deps-frontend deps-backend
2830
# xgo build
2931
- run: make release

.github/workflows/release-tag-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
29+
cache: npm
30+
cache-dependency-path: package-lock.json
2931
- run: make deps-frontend deps-backend
3032
# xgo build
3133
- run: make release

0 commit comments

Comments
 (0)