Skip to content

Commit e9502e0

Browse files
authored
Merge branch 'main' into issue-updates
2 parents c6abd32 + 654cfd1 commit e9502e0

File tree

604 files changed

+17418
-19385
lines changed

Some content is hidden

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

604 files changed

+17418
-19385
lines changed

.dockerignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ _test
1414

1515
# MS VSCode
1616
.vscode
17-
__debug_bin
17+
__debug_bin*
1818

1919
# Architecture specific extensions/prefixes
2020
*.[568vq]
@@ -78,7 +78,6 @@ cpu.out
7878
/public/assets/css
7979
/public/assets/fonts
8080
/public/assets/img/avatar
81-
/public/assets/img/webpack
8281
/vendor
8382
/web_src/fomantic/node_modules
8483
/web_src/fomantic/build/*

.eslintrc.yaml

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

44
ignorePatterns:
55
- /web_src/js/vendor
6+
- /web_src/fomantic
67

78
parserOptions:
89
sourceType: module
@@ -119,7 +120,7 @@ rules:
119120
"@stylistic/js/arrow-spacing": [2, {before: true, after: true}]
120121
"@stylistic/js/block-spacing": [0]
121122
"@stylistic/js/brace-style": [2, 1tbs, {allowSingleLine: true}]
122-
"@stylistic/js/comma-dangle": [2, only-multiline]
123+
"@stylistic/js/comma-dangle": [2, always-multiline]
123124
"@stylistic/js/comma-spacing": [2, {before: false, after: true}]
124125
"@stylistic/js/comma-style": [2, last]
125126
"@stylistic/js/computed-property-spacing": [2, never]
@@ -167,7 +168,7 @@ rules:
167168
"@stylistic/js/semi-spacing": [2, {before: false, after: true}]
168169
"@stylistic/js/semi-style": [2, last]
169170
"@stylistic/js/space-before-blocks": [2, always]
170-
"@stylistic/js/space-before-function-paren": [0]
171+
"@stylistic/js/space-before-function-paren": [2, {anonymous: ignore, named: never, asyncArrow: always}]
171172
"@stylistic/js/space-in-parens": [2, never]
172173
"@stylistic/js/space-infix-ops": [2]
173174
"@stylistic/js/space-unary-ops": [2]
@@ -281,7 +282,7 @@ rules:
281282
jquery/no-ajax-events: [2]
282283
jquery/no-ajax: [2]
283284
jquery/no-animate: [2]
284-
jquery/no-attr: [0]
285+
jquery/no-attr: [2]
285286
jquery/no-bind: [2]
286287
jquery/no-class: [0]
287288
jquery/no-clone: [2]
@@ -303,7 +304,7 @@ rules:
303304
jquery/no-in-array: [2]
304305
jquery/no-is-array: [2]
305306
jquery/no-is-function: [2]
306-
jquery/no-is: [0]
307+
jquery/no-is: [2]
307308
jquery/no-load: [2]
308309
jquery/no-map: [2]
309310
jquery/no-merge: [2]
@@ -397,7 +398,7 @@ rules:
397398
no-jquery/no-animate-toggle: [2]
398399
no-jquery/no-animate: [2]
399400
no-jquery/no-append-html: [2]
400-
no-jquery/no-attr: [0]
401+
no-jquery/no-attr: [2]
401402
no-jquery/no-bind: [2]
402403
no-jquery/no-box-model: [2]
403404
no-jquery/no-browser: [2]
@@ -440,7 +441,7 @@ rules:
440441
no-jquery/no-is-numeric: [2]
441442
no-jquery/no-is-plain-object: [2]
442443
no-jquery/no-is-window: [2]
443-
no-jquery/no-is: [0]
444+
no-jquery/no-is: [2]
444445
no-jquery/no-jquery-constructor: [0]
445446
no-jquery/no-live: [2]
446447
no-jquery/no-load-shorthand: [2]

.github/labeler.yml

Lines changed: 1 addition & 8 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:
@@ -53,7 +46,7 @@ modifies/internal:
5346
- ".gitpod.yml"
5447
- ".markdownlint.yaml"
5548
- ".spectral.yaml"
56-
- ".stylelintrc.yaml"
49+
- "stylelint.config.js"
5750
- ".yamllint.yaml"
5851
- ".github/**"
5952
- ".gitea/"

.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/files-changed.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- "package-lock.json"
5959
- "Makefile"
6060
- ".eslintrc.yaml"
61-
- ".stylelintrc.yaml"
61+
- "stylelint.config.js"
6262
- ".npmrc"
6363
6464
docs:
@@ -73,6 +73,7 @@ jobs:
7373
- "Makefile"
7474
7575
templates:
76+
- "tools/lint-templates-*.js"
7677
- "templates/**/*.tmpl"
7778
- "pyproject.toml"
7879
- "poetry.lock"

.github/workflows/pull-compliance.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ jobs:
3535
- uses: actions/setup-python@v5
3636
with:
3737
python-version: "3.12"
38+
- uses: actions/setup-node@v4
39+
with:
40+
node-version: 20
3841
- run: pip install poetry
3942
- run: make deps-py
43+
- run: make deps-frontend
4044
- run: make lint-templates
4145

4246
lint-yaml:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ cpu.out
7777
/public/assets/css
7878
/public/assets/fonts
7979
/public/assets/licenses.txt
80-
/public/assets/img/webpack
8180
/vendor
8281
/web_src/fomantic/node_modules
8382
/web_src/fomantic/build/*

.ignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
/modules/options/bindata.go
55
/modules/public/bindata.go
66
/modules/templates/bindata.go
7-
/vendor
7+
/options/gitignore
8+
/options/license
89
/public/assets
10+
/vendor
911
node_modules

0 commit comments

Comments
 (0)