Skip to content

Commit ea2609e

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix missing error check of bufio.Scanner (go-gitea#29882) Remove unused error in graceful manager (go-gitea#29871) Migrate border and margin classes to Tailwind (go-gitea#29828) Only do counting when count_only=true for repo dashboard (go-gitea#29884) Editor error message misleading due to re-used key. (go-gitea#29859) [skip ci] Updated licenses and gitignores move some scripts from 'build' to 'tools' directory, misc refactors (go-gitea#29844) Fix missing code in the user profile (go-gitea#29865) Upgrade Go 1.22 and upgrade dependency (go-gitea#29869) Fix the wrong locale key of searching users (go-gitea#29868) fix telegram webhook (go-gitea#29864) Fix user id column case (go-gitea#29863) Avoid JS error on issue/pr list when logged out (go-gitea#29854) Refactor clone-panel styles (go-gitea#29861) Simplify README (go-gitea#29827) Load citation JS only when needed (go-gitea#29855) Fix semantic.json (go-gitea#29860) # Conflicts: # templates/repo/wiki/revision.tmpl # templates/repo/wiki/view.tmpl
2 parents 28b16f6 + 0e183d8 commit ea2609e

Some content is hidden

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

66 files changed

+496
-841
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ cpu.out
6262
/data
6363
/indexers
6464
/log
65-
/public/img/avatar
6665
/tests/integration/gitea-integration-*
6766
/tests/integration/indexers-*
6867
/tests/e2e/gitea-e2e-*
@@ -78,6 +77,7 @@ cpu.out
7877
/public/assets/js
7978
/public/assets/css
8079
/public/assets/fonts
80+
/public/assets/img/avatar
8181
/public/assets/img/webpack
8282
/vendor
8383
/web_src/fomantic/node_modules

‎.eslintrc.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ overrides:
4242
worker: true
4343
rules:
4444
no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, 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, status, statusbar, stop, toolbar, top]
45-
- files: ["build/generate-images.js"]
46-
rules:
47-
i/no-unresolved: [0]
48-
i/no-extraneous-dependencies: [0]
4945
- files: ["*.config.*"]
5046
rules:
5147
i/no-unused-modules: [0]

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ cpu.out
5858
/data
5959
/indexers
6060
/log
61-
/public/img/avatar
61+
/public/assets/img/avatar
6262
/tests/integration/gitea-integration-*
6363
/tests/integration/indexers-*
6464
/tests/e2e/gitea-e2e-*

‎Makefile‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN
147147
GO_DIRS := build cmd models modules routers services tests
148148
WEB_DIRS := web_src/js web_src/css
149149

150+
ESLINT_FILES := web_src/js tools *.config.js tests/e2e
151+
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
150152
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github
151153
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
152154

@@ -375,19 +377,19 @@ lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig
375377

376378
.PHONY: lint-js
377379
lint-js: node_modules
378-
npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js tests/e2e
380+
npx eslint --color --max-warnings=0 --ext js,vue $(ESLINT_FILES)
379381

380382
.PHONY: lint-js-fix
381383
lint-js-fix: node_modules
382-
npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js tests/e2e --fix
384+
npx eslint --color --max-warnings=0 --ext js,vue $(ESLINT_FILES) --fix
383385

384386
.PHONY: lint-css
385387
lint-css: node_modules
386-
npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue
388+
npx stylelint --color --max-warnings=0 $(STYLELINT_FILES)
387389

388390
.PHONY: lint-css-fix
389391
lint-css-fix: node_modules
390-
npx stylelint --color --max-warnings=0 web_src/css web_src/js/components/*.vue --fix
392+
npx stylelint --color --max-warnings=0 $(STYLELINT_FILES) --fix
391393

392394
.PHONY: lint-swagger
393395
lint-swagger: node_modules
@@ -444,7 +446,7 @@ lint-yaml: .venv
444446

445447
.PHONY: watch
446448
watch:
447-
@bash build/watch.sh
449+
@bash tools/watch.sh
448450

449451
.PHONY: watch-frontend
450452
watch-frontend: node-check node_modules
@@ -916,7 +918,7 @@ $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json
916918
.PHONY: svg
917919
svg: node-check | node_modules
918920
rm -rf $(SVG_DEST_DIR)
919-
node build/generate-svg.js
921+
node tools/generate-svg.js
920922

921923
.PHONY: svg-check
922924
svg-check: svg
@@ -960,7 +962,7 @@ generate-gitignore:
960962
.PHONY: generate-images
961963
generate-images: | node_modules
962964
npm install --no-save [email protected] imagemin-zopfli@7
963-
node build/generate-images.js $(TAGS)
965+
node tools/generate-images.js $(TAGS)
964966

965967
.PHONY: generate-manpage
966968
generate-manpage:

‎README.md‎

Lines changed: 16 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,19 @@
1-
<p align="center">
2-
<a href="https://gitea.io/">
3-
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/assets/img/gitea.svg" width="220"/>
4-
</a>
5-
</p>
6-
<h1 align="center">Gitea - Git with a cup of tea</h1>
7-
8-
<p align="center">
9-
<a href="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain" title="Release Nightly">
10-
<img src="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main">
11-
</a>
12-
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
13-
<img src="https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2">
14-
</a>
15-
<a href="https://app.codecov.io/gh/go-gitea/gitea" title="Codecov">
16-
<img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
17-
</a>
18-
<a href="https://goreportcard.com/report/code.gitea.io/gitea" title="Go Report Card">
19-
<img src="https://goreportcard.com/badge/code.gitea.io/gitea">
20-
</a>
21-
<a href="https://pkg.go.dev/code.gitea.io/gitea" title="GoDoc">
22-
<img src="https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg">
23-
</a>
24-
<a href="https://github.com/go-gitea/gitea/releases/latest" title="GitHub release">
25-
<img src="https://img.shields.io/github/release/go-gitea/gitea.svg">
26-
</a>
27-
<a href="https://www.codetriage.com/go-gitea/gitea" title="Help Contribute to Open Source">
28-
<img src="https://www.codetriage.com/go-gitea/gitea/badges/users.svg">
29-
</a>
30-
<a href="https://opencollective.com/gitea" title="Become a backer/sponsor of gitea">
31-
<img src="https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen">
32-
</a>
33-
<a href="https://opensource.org/licenses/MIT" title="License: MIT">
34-
<img src="https://img.shields.io/badge/License-MIT-blue.svg">
35-
</a>
36-
<a href="https://gitpod.io/#https://github.com/go-gitea/gitea">
37-
<img
38-
src="https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod"
39-
alt="Contribute with Gitpod"
40-
/>
41-
</a>
42-
<a href="https://crowdin.com/project/gitea" title="Crowdin">
43-
<img src="https://badges.crowdin.net/gitea/localized.svg">
44-
</a>
45-
<a href="https://www.tickgit.com/browse?repo=github.com/go-gitea/gitea&branch=main" title="TODOs">
46-
<img src="https://badgen.net/https/api.tickgit.com/badgen/github.com/go-gitea/gitea/main">
47-
</a>
48-
</p>
49-
50-
<p align="center">
51-
<a href="README_ZH.md">View this document in Chinese</a>
52-
</p>
1+
# Gitea
2+
3+
[![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly")
4+
[![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea")
5+
[![](https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg)](https://app.codecov.io/gh/go-gitea/gitea "Codecov")
6+
[![](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea "Go Report Card")
7+
[![](https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg)](https://pkg.go.dev/code.gitea.io/gitea "GoDoc")
8+
[![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release")
9+
[![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source")
10+
[![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea")
11+
[![](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT "License: MIT")
12+
[![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/go-gitea/gitea)
13+
[![](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea "Crowdin")
14+
[![](https://badgen.net/https/api.tickgit.com/badgen/github.com/go-gitea/gitea/main)](https://www.tickgit.com/browse?repo=github.com/go-gitea/gitea&branch=main "TODOs")
15+
16+
[View this document in Chinese](./README_ZH.md)
5317

5418
## Purpose
5519

‎README_ZH.md‎

Lines changed: 16 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,19 @@
1-
<p align="center">
2-
<a href="https://gitea.io/">
3-
<img alt="Gitea" src="https://raw.githubusercontent.com/go-gitea/gitea/main/public/assets/img/gitea.svg" width="220"/>
4-
</a>
5-
</p>
6-
<h1 align="center">Gitea - Git with a cup of tea</h1>
7-
8-
<p align="center">
9-
<a href="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain" title="Release Nightly">
10-
<img src="https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main">
11-
</a>
12-
<a href="https://discord.gg/Gitea" title="Join the Discord chat at https://discord.gg/Gitea">
13-
<img src="https://img.shields.io/discord/322538954119184384.svg">
14-
</a>
15-
<a href="https://app.codecov.io/gh/go-gitea/gitea" title="Codecov">
16-
<img src="https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg">
17-
</a>
18-
<a href="https://goreportcard.com/report/code.gitea.io/gitea" title="Go Report Card">
19-
<img src="https://goreportcard.com/badge/code.gitea.io/gitea">
20-
</a>
21-
<a href="https://pkg.go.dev/code.gitea.io/gitea" title="GoDoc">
22-
<img src="https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg">
23-
</a>
24-
<a href="https://github.com/go-gitea/gitea/releases/latest" title="GitHub release">
25-
<img src="https://img.shields.io/github/release/go-gitea/gitea.svg">
26-
</a>
27-
<a href="https://www.codetriage.com/go-gitea/gitea" title="Help Contribute to Open Source">
28-
<img src="https://www.codetriage.com/go-gitea/gitea/badges/users.svg">
29-
</a>
30-
<a href="https://opencollective.com/gitea" title="Become a backer/sponsor of gitea">
31-
<img src="https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen">
32-
</a>
33-
<a href="https://opensource.org/licenses/MIT" title="License: MIT">
34-
<img src="https://img.shields.io/badge/License-MIT-blue.svg">
35-
</a>
36-
<a href="https://gitpod.io/#https://github.com/go-gitea/gitea">
37-
<img
38-
src="https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod"
39-
alt="Contribute with Gitpod"
40-
/>
41-
</a>
42-
<a href="https://crowdin.com/project/gitea" title="Crowdin">
43-
<img src="https://badges.crowdin.net/gitea/localized.svg">
44-
</a>
45-
<a href="https://www.tickgit.com/browse?repo=github.com/go-gitea/gitea&branch=main" title="TODOs">
46-
<img src="https://badgen.net/https/api.tickgit.com/badgen/github.com/go-gitea/gitea/main">
47-
</a>
48-
</p>
49-
50-
<p align="center">
51-
<a href="README.md">View this document in English</a>
52-
</p>
1+
# Gitea
2+
3+
[![](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml/badge.svg?branch=main)](https://github.com/go-gitea/gitea/actions/workflows/release-nightly.yml?query=branch%3Amain "Release Nightly")
4+
[![](https://img.shields.io/discord/322538954119184384.svg?logo=discord&logoColor=white&label=Discord&color=5865F2)](https://discord.gg/Gitea "Join the Discord chat at https://discord.gg/Gitea")
5+
[![](https://codecov.io/gh/go-gitea/gitea/branch/main/graph/badge.svg)](https://app.codecov.io/gh/go-gitea/gitea "Codecov")
6+
[![](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea "Go Report Card")
7+
[![](https://pkg.go.dev/badge/code.gitea.io/gitea?status.svg)](https://pkg.go.dev/code.gitea.io/gitea "GoDoc")
8+
[![](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest "GitHub release")
9+
[![](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea "Help Contribute to Open Source")
10+
[![](https://opencollective.com/gitea/tiers/backers/badge.svg?label=backers&color=brightgreen)](https://opencollective.com/gitea "Become a backer/sponsor of gitea")
11+
[![](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT "License: MIT")
12+
[![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/go-gitea/gitea)
13+
[![](https://badges.crowdin.net/gitea/localized.svg)](https://crowdin.com/project/gitea "Crowdin")
14+
[![](https://badgen.net/https/api.tickgit.com/badgen/github.com/go-gitea/gitea/main)](https://www.tickgit.com/browse?repo=github.com/go-gitea/gitea&branch=main "TODOs")
15+
16+
[View this document in English](./README.md)
5317

5418
## 目标
5519

0 commit comments

Comments
 (0)