Skip to content

Commit 3901076

Browse files
authored
Merge branch 'main' into azure-blob-storage-support
2 parents 48d98e7 + d0bdfbc commit 3901076

File tree

1,347 files changed

+19008
-11063
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,347 files changed

+19008
-11063
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"ms-azuretools.vscode-docker",
2525
"zixuanchen.vitest-explorer",
2626
"qwtel.sqlite-viewer",
27+
"GitHub.vscode-pull-request-github",
2728
"Azurite.azurite"
2829
]
2930
}

.dockerignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ cpu.out
7575
/yarn.lock
7676
/yarn-error.log
7777
/npm-debug.log*
78-
/public/js
79-
/public/css
80-
/public/fonts
81-
/public/img/webpack
78+
/public/assets/js
79+
/public/assets/css
80+
/public/assets/fonts
81+
/public/assets/img/webpack
8282
/vendor
8383
/web_src/fomantic/node_modules
8484
/web_src/fomantic/build/*

.eslintrc.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ plugins:
2222
- eslint-plugin-wc
2323

2424
env:
25-
es2022: true
25+
es2024: true
2626
node: true
2727

28-
globals:
29-
__webpack_public_path__: true
30-
3128
overrides:
29+
- files: ["web_src/**/*"]
30+
globals:
31+
__webpack_public_path__: true
32+
process: false # https://github.com/webpack/webpack/issues/15833
3233
- files: ["web_src/**/*", "docs/**/*"]
3334
env:
3435
browser: true
@@ -155,7 +156,7 @@ rules:
155156
import/no-restricted-paths: [0]
156157
import/no-self-import: [2]
157158
import/no-unassigned-import: [0]
158-
import/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$"]}]
159+
import/no-unresolved: [2, {commonjs: true, ignore: [\?.+$, ^vitest/]}]
159160
import/no-unused-modules: [2, {unusedExports: true}]
160161
import/no-useless-path-segments: [2, {commonjs: true}]
161162
import/no-webpack-loader-syntax: [2]
@@ -419,7 +420,7 @@ rules:
419420
no-restricted-exports: [0]
420421
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, self, status, statusbar, stop, toolbar, top, __dirname, __filename]
421422
no-restricted-imports: [0]
422-
no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement]
423+
no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression]
423424
no-return-assign: [0]
424425
no-return-await: [0]
425426
no-script-url: [2]
@@ -665,7 +666,6 @@ rules:
665666
unicorn/no-unnecessary-await: [2]
666667
unicorn/no-unreadable-array-destructuring: [0]
667668
unicorn/no-unreadable-iife: [2]
668-
unicorn/no-unsafe-regex: [0]
669669
unicorn/no-unused-properties: [2]
670670
unicorn/no-useless-fallback-in-spread: [2]
671671
unicorn/no-useless-length-check: [2]
@@ -692,7 +692,7 @@ rules:
692692
unicorn/prefer-dom-node-remove: [2]
693693
unicorn/prefer-dom-node-text-content: [2]
694694
unicorn/prefer-event-target: [2]
695-
unicorn/prefer-export-from: [2, {ignoreUsedVariables: true}]
695+
unicorn/prefer-export-from: [0]
696696
unicorn/prefer-includes: [2]
697697
unicorn/prefer-json-parse-buffer: [0]
698698
unicorn/prefer-keyboard-event-key: [2]

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
* text=auto eol=lf
22
*.tmpl linguist-language=Handlebars
33
/assets/*.json linguist-generated
4-
/public/img/svg/*.svg linguist-generated
4+
/public/assets/img/svg/*.svg linguist-generated
55
/templates/swagger/v1_json.tmpl linguist-generated
66
/vendor/** -text -eol linguist-vendored
77
/web_src/fomantic/build/** linguist-generated

.github/ISSUE_TEMPLATE/feature-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature Request
22
description: Got an idea for a feature that Gitea doesn't have currently? Submit your idea here!
3-
labels: ["kind/feature", "kind/proposal"]
3+
labels: ["kind/proposal"]
44
body:
55
- type: markdown
66
attributes:

.github/workflows/files-changed.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ on:
1515
value: ${{ jobs.detect.outputs.templates }}
1616
docker:
1717
value: ${{ jobs.detect.outputs.docker }}
18+
swagger:
19+
value: ${{ jobs.detect.outputs.swagger }}
1820

1921
jobs:
2022
detect:
2123
runs-on: ubuntu-latest
2224
timeout-minutes: 3
23-
# Map a step output to a job output
2425
outputs:
2526
backend: ${{ steps.changes.outputs.backend }}
2627
frontend: ${{ steps.changes.outputs.frontend }}
2728
docs: ${{ steps.changes.outputs.docs }}
2829
actions: ${{ steps.changes.outputs.actions }}
2930
templates: ${{ steps.changes.outputs.templates }}
3031
docker: ${{ steps.changes.outputs.docker }}
32+
swagger: ${{ steps.changes.outputs.swagger }}
3133
steps:
3234
- uses: actions/checkout@v3
3335
- uses: dorny/paths-filter@v2
@@ -37,14 +39,18 @@ jobs:
3739
backend:
3840
- "**/*.go"
3941
- "templates/**/*.tmpl"
42+
- "assets/emoji.json"
4043
- "go.mod"
4144
- "go.sum"
45+
- "Makefile"
4246
4347
frontend:
4448
- "**/*.js"
4549
- "web_src/**"
50+
- "assets/emoji.json"
4651
- "package.json"
4752
- "package-lock.json"
53+
- "Makefile"
4854
4955
docs:
5056
- "**/*.md"
@@ -56,7 +62,12 @@ jobs:
5662
templates:
5763
- "templates/**/*.tmpl"
5864
- "poetry.lock"
65+
5966
docker:
6067
- "Dockerfile"
6168
- "Dockerfile.rootless"
6269
- "docker/**"
70+
- "Makefile"
71+
72+
swagger:
73+
- "templates/swagger/v1_json.tmpl"

.github/workflows/pull-compliance.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ jobs:
3939
- run: make deps-py
4040
- run: make lint-templates
4141

42+
lint-swagger:
43+
if: needs.files-changed.outputs.swagger == 'true'
44+
needs: files-changed
45+
runs-on: ubuntu-latest
46+
steps:
47+
- uses: actions/checkout@v3
48+
- uses: actions/setup-node@v3
49+
with:
50+
node-version: 20
51+
- run: make deps-frontend
52+
- run: make lint-swagger
53+
4254
lint-go-windows:
4355
if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.actions == 'true'
4456
needs: files-changed

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ cpu.out
7272
/yarn.lock
7373
/yarn-error.log
7474
/npm-debug.log*
75-
/public/js
76-
/public/css
77-
/public/fonts
78-
/public/img/webpack
75+
/public/assets/js
76+
/public/assets/css
77+
/public/assets/fonts
78+
/public/assets/img/webpack
7979
/vendor
8080
/web_src/fomantic/node_modules
8181
/web_src/fomantic/build/*

.gitpod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ vscode:
3535
- ms-azuretools.vscode-docker
3636
- zixuanchen.vitest-explorer
3737
- qwtel.sqlite-viewer
38+
- GitHub.vscode-pull-request-github
3839

3940
ports:
4041
- name: Gitea

.golangci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,21 @@ linters-settings:
7777
extra-rules: true
7878
lang-version: "1.20"
7979
depguard:
80-
list-type: denylist
81-
# Check the list against standard lib.
82-
include-go-root: true
83-
packages-with-error-message:
84-
- encoding/json: "use gitea's modules/json instead of encoding/json"
85-
- github.com/unknwon/com: "use gitea's util and replacements"
86-
- io/ioutil: "use os or io instead"
87-
- golang.org/x/exp: "it's experimental and unreliable."
88-
- code.gitea.io/gitea/modules/git/internal: "do not use the internal package, use AddXxx function instead"
89-
- gopkg.in/ini.v1: "do not use the ini package, use gitea's config system instead"
80+
rules:
81+
main:
82+
deny:
83+
- pkg: encoding/json
84+
desc: use gitea's modules/json instead of encoding/json
85+
- pkg: github.com/unknwon/com
86+
desc: use gitea's util and replacements
87+
- pkg: io/ioutil
88+
desc: use os or io instead
89+
- pkg: golang.org/x/exp
90+
desc: it's experimental and unreliable
91+
- pkg: code.gitea.io/gitea/modules/git/internal
92+
desc: do not use the internal package, use AddXxx function instead
93+
- pkg: gopkg.in/ini.v1
94+
desc: do not use the ini package, use gitea's config system instead
9095

9196
issues:
9297
max-issues-per-linter: 0

.stylelintrc.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rules:
5050
declaration-no-important: null
5151
declaration-property-max-values: null
5252
declaration-property-unit-allowed-list: null
53-
declaration-property-unit-disallowed-list: null
53+
declaration-property-unit-disallowed-list: {line-height: [em]}
5454
declaration-property-value-allowed-list: null
5555
declaration-property-value-disallowed-list: null
5656
declaration-property-value-no-unknown: true
@@ -84,6 +84,7 @@ rules:
8484
media-feature-name-value-allowed-list: null
8585
media-feature-name-value-no-unknown: true
8686
media-feature-range-notation: null
87+
media-query-no-invalid: true
8788
named-grid-areas-no-invalid: true
8889
no-descending-specificity: null
8990
no-duplicate-at-import-rules: true

0 commit comments

Comments
 (0)