Skip to content

Commit f1e3b38

Browse files
committed
Merge remote-tracking branch 'origin/main' into stream-repo-archive
* origin/main: Clean up npm dependencies (go-gitea#35484) Update eslint to v9 (go-gitea#35485) Revert the rspack change (go-gitea#35482) Replace gobwas/glob package (go-gitea#35478) Fix various typos in codebase (go-gitea#35480) Fix different behavior in status check pattern matching with double stars (go-gitea#35474) Replace webpack with rspack (go-gitea#35460) Don't store repo archives on `gitea dump` (go-gitea#35467)
2 parents 3545ba0 + 8c8eb4b commit f1e3b38

File tree

89 files changed

+2265
-1605
lines changed

Some content is hidden

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

89 files changed

+2265
-1605
lines changed

.eslintrc.cjs

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

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(DIST)
162162
GO_DIRS := build cmd models modules routers services tests
163163
WEB_DIRS := web_src/js web_src/css
164164

165-
ESLINT_FILES := web_src/js tools *.ts *.cjs tests/e2e
165+
ESLINT_FILES := web_src/js tools *.ts tests/e2e
166166
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
167167
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
168168
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
@@ -346,12 +346,12 @@ lint-backend-fix: lint-go-fix lint-go-gitea-vet lint-editorconfig ## lint backen
346346

347347
.PHONY: lint-js
348348
lint-js: node_modules ## lint js files
349-
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES)
349+
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --flag unstable_native_nodejs_ts_config $(ESLINT_FILES)
350350
$(NODE_VARS) pnpm exec vue-tsc
351351

352352
.PHONY: lint-js-fix
353353
lint-js-fix: node_modules ## lint js files and fix issues
354-
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES) --fix
354+
$(NODE_VARS) pnpm exec eslint --color --max-warnings=0 --flag unstable_native_nodejs_ts_config $(ESLINT_FILES) --fix
355355
$(NODE_VARS) pnpm exec vue-tsc
356356

357357
.PHONY: lint-css

assets/go-licenses.json

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dump.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
265265
excludes = append(excludes, setting.LFS.Storage.Path)
266266
excludes = append(excludes, setting.Attachment.Storage.Path)
267267
excludes = append(excludes, setting.Packages.Storage.Path)
268+
excludes = append(excludes, setting.RepoArchive.Storage.Path)
268269
excludes = append(excludes, setting.Log.RootPath)
269270
if err := dumper.AddRecursiveExclude("data", setting.AppDataPath, excludes); err != nil {
270271
fatal("Failed to include data directory: %v", err)

cmd/embedded.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"strings"
1313

1414
"code.gitea.io/gitea/modules/assetfs"
15+
"code.gitea.io/gitea/modules/glob"
1516
"code.gitea.io/gitea/modules/log"
1617
"code.gitea.io/gitea/modules/options"
1718
"code.gitea.io/gitea/modules/public"
1819
"code.gitea.io/gitea/modules/setting"
1920
"code.gitea.io/gitea/modules/templates"
2021
"code.gitea.io/gitea/modules/util"
2122

22-
"github.com/gobwas/glob"
2323
"github.com/urfave/cli/v3"
2424
)
2525

contrib/backport/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The default version will read from `docs/config.yml`. You can override this
1111
using the option `--version`.
1212

1313
The upstream branches will be fetched, using the remote `origin`. This can
14-
be overrided using `--upstream`, and fetching can be avoided using
14+
be overridden using `--upstream`, and fetching can be avoided using
1515
`--no-fetch`.
1616

1717
By default the branch created will be called `backport-$PR-$VERSION`. You

contrib/legal/privacy.html.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150

151151
<p>In general, Your Gitea Instance retains User Personal Information for as long as your account is active, or as needed to provide you service.</p>
152152

153-
<p>If you would like to cancel your account or delete your User Personal Information, you may do so in your user profile. We retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile (within reason) within 90 days of your request. Feel free to contact our support to request erasure of the data we process on the bassis of consent within 30 days.</p>
153+
<p>If you would like to cancel your account or delete your User Personal Information, you may do so in your user profile. We retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile (within reason) within 90 days of your request. Feel free to contact our support to request erasure of the data we process on the basis of consent within 30 days.</p>
154154

155155
<p>After an account has been deleted, certain data, such as contributions to other Users' repositories and comments in others' issues, will remain. However, we will delete or de-identify your User Personal Information, including your username and email address, from the author field of issues, pull requests, and comments by associating them with a ghost user.</p>
156156

0 commit comments

Comments
 (0)