Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a4a7dce

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: (33 commits) Bump webpack from 5.75.0 to 5.76.0 (go-gitea#23484) Replace Less with CSS (go-gitea#23481) Fix 'View File' button in code search (go-gitea#23478) Use `gitea/test_env` image instead of `golang` (go-gitea#23455) Skip DB tests duplicate runs on push to branches (go-gitea#23476) Update app.example.ini (go-gitea#23480) [skip ci] Updated translations via Crowdin Fix due date being wrong on issue list (go-gitea#23475) test_env: hardcode major go version in use (go-gitea#23464) Push option bonus for PTC docs (go-gitea#23473) Lint Markdown pass Push to create docs (go-gitea#23458) Convert GitHub event on actions and fix some pull_request events. (go-gitea#23037) Remove wrongly added column on migration test fixtures (go-gitea#23456) Refactor branch/tag selector to Vue SFC (go-gitea#23421) add admin API email endpoints (go-gitea#22792) add user rename endpoint to admin api (go-gitea#22789) Add workflow error notification in ui (go-gitea#23404) Make branches list page operations remember current page (go-gitea#23420) fix markdown lint issue (go-gitea#23457) ...
2 parents 41d6ad0 + e7e6250 commit a4a7dce

File tree

231 files changed

+11841
-9299
lines changed

Some content is hidden

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

231 files changed

+11841
-9299
lines changed

‎.drone.yml‎

Lines changed: 40 additions & 67 deletions
Large diffs are not rendered by default.

‎.stylelintrc.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ ignoreFiles:
55
- "**/*.go"
66

77
overrides:
8-
- files: ["**/*.less"]
9-
customSyntax: postcss-less
108
- files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console/*"]
119
rules:
1210
scale-unlimited/declaration-strict-value: null

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ AIR_PACKAGE ?= github.com/cosmtrek/[email protected]
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/[email protected]
3030
ERRCHECK_PACKAGE ?= github.com/kisielk/[email protected]
3131
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
32-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].0
32+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected].2
3333
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3434
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
3535
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
@@ -105,7 +105,7 @@ GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/m
105105

106106
FOMANTIC_WORK_DIR := web_src/fomantic
107107

108-
WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f)
108+
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
109109
WEBPACK_CONFIGS := webpack.config.js
110110
WEBPACK_DEST := public/js/index.js public/css/index.css
111111
WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack public/serviceworker.js
@@ -131,7 +131,7 @@ TEST_TAGS ?= sqlite sqlite_unlock_notify
131131
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
132132

133133
GO_DIRS := cmd tests models modules routers build services tools
134-
WEB_DIRS := web_src/js web_src/less
134+
WEB_DIRS := web_src/js web_src/css
135135

136136
GO_SOURCES := $(wildcard *.go)
137137
GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go)
@@ -342,7 +342,7 @@ lint: lint-frontend lint-backend
342342
.PHONY: lint-frontend
343343
lint-frontend: node_modules
344344
npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js docs/assets/js tests/e2e
345-
npx stylelint --color --max-warnings=0 web_src/less
345+
npx stylelint --color --max-warnings=0 web_src/css
346346
npx spectral lint -q -F hint $(SWAGGER_SPEC)
347347
npx markdownlint docs *.md
348348

‎cmd/dump.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ func runDump(ctx *cli.Context) error {
250250

251251
if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") {
252252
log.Info("Skip dumping LFS data")
253-
} else if err := storage.LFS.IterateObjects(func(objPath string, object storage.Object) error {
253+
} else if err := storage.LFS.IterateObjects("", func(objPath string, object storage.Object) error {
254254
info, err := object.Stat()
255255
if err != nil {
256256
return err
@@ -351,7 +351,7 @@ func runDump(ctx *cli.Context) error {
351351

352352
if ctx.IsSet("skip-attachment-data") && ctx.Bool("skip-attachment-data") {
353353
log.Info("Skip dumping attachment data")
354-
} else if err := storage.Attachments.IterateObjects(func(objPath string, object storage.Object) error {
354+
} else if err := storage.Attachments.IterateObjects("", func(objPath string, object storage.Object) error {
355355
info, err := object.Stat()
356356
if err != nil {
357357
return err
@@ -364,7 +364,7 @@ func runDump(ctx *cli.Context) error {
364364

365365
if ctx.IsSet("skip-package-data") && ctx.Bool("skip-package-data") {
366366
log.Info("Skip dumping package data")
367-
} else if err := storage.Packages.IterateObjects(func(objPath string, object storage.Object) error {
367+
} else if err := storage.Packages.IterateObjects("", func(objPath string, object storage.Object) error {
368368
info, err := object.Stat()
369369
if err != nil {
370370
return err

‎custom/conf/app.example.ini‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
;; - The environment variable `$GITEA_WORK_DIR`
2121
;; - A built-in value set at build time (see building from source)
2222
;; - Otherwise it defaults to the directory of the _`AppPath`_
23-
;; - If any of the above are relative paths then they are made absolute against the
23+
;; - If any of the above are relative paths then they are made absolute against
2424
;; the directory of the _`AppPath`_
2525
;; - _`CustomPath`_: This is the base directory for custom templates and other options.
2626
;; It is determined by using the first set thing in the following hierarchy:
@@ -2272,6 +2272,17 @@ ROUTER = console
22722272
;PULL = 300
22732273
;GC = 60
22742274

2275+
2276+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2277+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2278+
;; Git Reflog timeout in days
2279+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2280+
;[git.reflog]
2281+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2282+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2283+
;ENABLED = true
2284+
;EXPIRATION = 90
2285+
22752286
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
22762287
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
22772288
;[mirror]
@@ -2505,6 +2516,8 @@ ROUTER = console
25052516
;LIMIT_SIZE_PYPI = -1
25062517
;; Maximum size of a RubyGems upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
25072518
;LIMIT_SIZE_RUBYGEMS = -1
2519+
;; Maximum size of a Swift upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
2520+
;LIMIT_SIZE_SWIFT = -1
25082521
;; Maximum size of a Vagrant upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
25092522
;LIMIT_SIZE_VAGRANT = -1
25102523

‎docs/content/doc/advanced/config-cheat-sheet.en-us.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ reported as part of the default configuration when running `gitea --help` or on
4646
- The environment variable `$GITEA_WORK_DIR`
4747
- A built-in value set at build time (see building from source)
4848
- Otherwise it defaults to the directory of the _`AppPath`_
49-
- If any of the above are relative paths then they are made absolute against the
49+
- If any of the above are relative paths then they are made absolute against
5050
the directory of the _`AppPath`_
5151
- _`CustomPath`_: This is the base directory for custom templates and other options.
5252
It is determined by using the first set thing in the following hierarchy:
@@ -1093,6 +1093,11 @@ Default templates for project boards:
10931093
- `DISABLE_CORE_PROTECT_NTFS`: **false** Set to true to forcibly set `core.protectNTFS` to false.
10941094
- `DISABLE_PARTIAL_CLONE`: **false** Disable the usage of using partial clones for git.
10951095

1096+
## Git - Reflog settings (`git.reflog`)
1097+
1098+
- `ENABLED`: **true** Set to true to enable Git to write changes to reflogs in each repo.
1099+
- `EXPIRATION`: **90** Reflog entry lifetime, in days. Entries are removed opportunistically by Git.
1100+
10961101
## Git - Timeout settings (`git.timeout`)
10971102

10981103
- `DEFAULT`: **360**: Git operations default timeout seconds.
@@ -1249,6 +1254,7 @@ Task queue configuration has been moved to `queue.task`. However, the below conf
12491254
- `LIMIT_SIZE_PUB`: **-1**: Maximum size of a Pub upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12501255
- `LIMIT_SIZE_PYPI`: **-1**: Maximum size of a PyPI upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12511256
- `LIMIT_SIZE_RUBYGEMS`: **-1**: Maximum size of a RubyGems upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
1257+
- `LIMIT_SIZE_SWIFT`: **-1**: Maximum size of a Swift upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12521258
- `LIMIT_SIZE_VAGRANT`: **-1**: Maximum size of a Vagrant upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12531259

12541260
## Mirror (`mirror`)

‎docs/content/doc/advanced/customizing-gitea.en-us.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ To make a custom theme available to all users:
354354
355355
Community themes are listed in [gitea/awesome-gitea#themes](https://gitea.com/gitea/awesome-gitea#themes).
356356
357-
The `arc-green` theme source can be found [here](https://github.com/go-gitea/gitea/blob/main/web_src/less/themes/theme-arc-green.less).
357+
The `arc-green` theme source can be found [here](https://github.com/go-gitea/gitea/blob/main/web_src/css/themes/theme-arc-green.css).
358358
359359
If your custom theme is considered a dark theme, set the global css variable `--is-dark-theme` to `true`.
360360
This allows Gitea to adjust the Monaco code editor's theme accordingly.

‎docs/content/doc/developers/guidelines-frontend.en-us.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ menu:
2121

2222
## Background
2323

24-
Gitea uses [Less CSS](https://lesscss.org), [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue3](https://vuejs.org/) for its frontend.
24+
Gitea uses [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue3](https://vuejs.org/) for its frontend.
2525

2626
The HTML pages are rendered by [Go HTML Template](https://pkg.go.dev/html/template).
2727

2828
The source files can be found in the following directories:
2929

30-
* **Less styles:** `web_src/less/`
30+
* **CSS styles:** `web_src/css/`
3131
* **JavaScript files:** `web_src/js/`
3232
* **Vue components:** `web_src/js/components/`
3333
* **Go HTML templates:** `templates/`

‎docs/content/doc/features/localization.zh-cn.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,18 @@ menu:
1515

1616
# 本地化
1717

18-
## TBD
18+
Gitea的本地化是通过我们的[Crowdin项目](https://crowdin.com/project/gitea)进行的。
19+
20+
对于对**英语翻译**的更改，可以发出pull-request，来更改[英语语言环境](https://github.com/go-gitea/gitea/blob/master/options/locale/locale_en-US.ini)中合适的关键字。
21+
22+
有关对**非英语**翻译的更改，请参阅上面的 Crowdin 项目。
23+
24+
## 支持的语言
25+
26+
上述 Crowdin 项目中列出的任何语言一旦翻译了 25% 或更多都将得到支持。
27+
28+
翻译被接受后，它将在下一次 Crowdin 同步后反映在主存储库中，这通常是在任何 PR 合并之后。
29+
30+
在撰写本文时，这意味着更改后的翻译可能要到 Gitea 的下一个版本才会出现。
31+
32+
如果使用开发版本，则在同步更改内容后，它应该会在更新后立即显示。

‎docs/content/doc/packages/overview.en-us.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ The following package managers are currently supported:
4040
| [Pub]({{< relref "doc/packages/pub.en-us.md" >}}) | Dart | `dart`, `flutter` |
4141
| [PyPI]({{< relref "doc/packages/pypi.en-us.md" >}}) | Python | `pip`, `twine` |
4242
| [RubyGems]({{< relref "doc/packages/rubygems.en-us.md" >}}) | Ruby | `gem`, `Bundler` |
43+
| [Swift]({{< relref "doc/packages/rubygems.en-us.md" >}}) | Swift | `swift` |
4344
| [Vagrant]({{< relref "doc/packages/vagrant.en-us.md" >}}) | - | `vagrant` |
4445

4546
**The following paragraphs only apply if Packages are not globally disabled!**

0 commit comments

Comments
 (0)