Skip to content

Commit b4c0b86

Browse files
committed
Merge branch 'main' into lunny/fix_reviewrequest_API
2 parents 2dd7a58 + 3ee5ee2 commit b4c0b86

File tree

219 files changed

+2818
-2038
lines changed

Some content is hidden

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

219 files changed

+2818
-2038
lines changed

.golangci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ linters:
1919
- revive
2020
- staticcheck
2121
- stylecheck
22-
- tenv
2322
- testifylint
2423
- typecheck
2524
- unconvert
2625
- unused
2726
- unparam
27+
- usetesting
2828
- wastedassign
2929

3030
run:
@@ -102,6 +102,8 @@ linters-settings:
102102
desc: do not use the ini package, use gitea's config system instead
103103
- pkg: gitea.com/go-chi/cache
104104
desc: do not use the go-chi cache package, use gitea's cache system
105+
usetesting:
106+
os-temp-dir: true
105107

106108
issues:
107109
max-issues-per-linter: 0

CHANGELOG.md

Lines changed: 511 additions & 0 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ XGO_VERSION := go-1.24.x
2828
AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/[email protected]
3030
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
31-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
31+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
3232
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
3434
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
@@ -146,7 +146,7 @@ WEB_DIRS := web_src/js web_src/css
146146

147147
ESLINT_FILES := web_src/js tools *.js *.ts *.cjs tests/e2e
148148
STYLELINT_FILES := web_src/css web_src/js/components/*.vue
149-
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml))
149+
SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) templates options/locale/locale_en-US.ini .github $(filter-out CHANGELOG.md, $(wildcard *.go *.js *.md *.yml *.yaml *.toml)) $(filter-out tools/misspellings.csv, $(wildcard tools/*))
150150
EDITORCONFIG_FILES := templates .github/workflows options/locale/locale_en-US.ini
151151

152152
GO_SOURCES := $(wildcard *.go)
@@ -255,7 +255,7 @@ fmt-check: fmt
255255
@diff=$$(git diff --color=always $(GO_SOURCES) templates $(WEB_DIRS)); \
256256
if [ -n "$$diff" ]; then \
257257
echo "Please run 'make fmt' and commit the result:"; \
258-
echo "$${diff}"; \
258+
printf "%s" "$${diff}"; \
259259
exit 1; \
260260
fi
261261

@@ -281,7 +281,7 @@ swagger-check: generate-swagger
281281
@diff=$$(git diff --color=always '$(SWAGGER_SPEC)'); \
282282
if [ -n "$$diff" ]; then \
283283
echo "Please run 'make generate-swagger' and commit the result:"; \
284-
echo "$${diff}"; \
284+
printf "%s" "$${diff}"; \
285285
exit 1; \
286286
fi
287287

@@ -426,7 +426,7 @@ test-check:
426426
@diff=$$(git status -s); \
427427
if [ -n "$$diff" ]; then \
428428
echo "make test-backend has changed files in the source tree:"; \
429-
echo "$${diff}"; \
429+
printf "%s" "$${diff}"; \
430430
echo "You should change the tests to create these files in a temporary directory."; \
431431
echo "Do not simply add these files to .gitignore"; \
432432
exit 1; \
@@ -463,7 +463,7 @@ tidy-check: tidy
463463
@diff=$$(git diff --color=always go.mod go.sum $(GO_LICENSE_FILE)); \
464464
if [ -n "$$diff" ]; then \
465465
echo "Please run 'make tidy' and commit the result:"; \
466-
echo "$${diff}"; \
466+
printf "%s" "$${diff}"; \
467467
exit 1; \
468468
fi
469469

@@ -879,7 +879,7 @@ svg-check: svg
879879
@diff=$$(git diff --color=always --cached $(SVG_DEST_DIR)); \
880880
if [ -n "$$diff" ]; then \
881881
echo "Please run 'make svg' and 'git add $(SVG_DEST_DIR)' and commit the result:"; \
882-
echo "$${diff}"; \
882+
printf "%s" "$${diff}"; \
883883
exit 1; \
884884
fi
885885

@@ -890,7 +890,7 @@ lockfile-check:
890890
if [ -n "$$diff" ]; then \
891891
echo "package-lock.json is inconsistent with package.json"; \
892892
echo "Please run 'npm install --package-lock-only' and commit the result:"; \
893-
echo "$${diff}"; \
893+
printf "%s" "$${diff}"; \
894894
exit 1; \
895895
fi
896896

README.md

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,64 @@ for the full license text.
150150
<details>
151151
<summary>Looking for an overview of the interface? Check it out!</summary>
152152

153-
|![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
154-
|:---:|:---:|:---:|
155-
|![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
156-
|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
157-
|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
153+
### Login/Register Page
154+
155+
![Login](https://dl.gitea.com/screenshots/login.png)
156+
![Register](https://dl.gitea.com/screenshots/register.png)
157+
158+
### User Dashboard
159+
160+
![Home](https://dl.gitea.com/screenshots/home.png)
161+
![Issues](https://dl.gitea.com/screenshots/issues.png)
162+
![Pull Requests](https://dl.gitea.com/screenshots/pull_requests.png)
163+
![Milestones](https://dl.gitea.com/screenshots/milestones.png)
164+
165+
### User Profile
166+
167+
![Profile](https://dl.gitea.com/screenshots/user_profile.png)
168+
169+
### Explore
170+
171+
![Repos](https://dl.gitea.com/screenshots/explore_repos.png)
172+
![Users](https://dl.gitea.com/screenshots/explore_users.png)
173+
![Orgs](https://dl.gitea.com/screenshots/explore_orgs.png)
174+
175+
### Repository
176+
177+
![Home](https://dl.gitea.com/screenshots/repo_home.png)
178+
![Commits](https://dl.gitea.com/screenshots/repo_commits.png)
179+
![Branches](https://dl.gitea.com/screenshots/repo_branches.png)
180+
![Labels](https://dl.gitea.com/screenshots/repo_labels.png)
181+
![Milestones](https://dl.gitea.com/screenshots/repo_milestones.png)
182+
![Releases](https://dl.gitea.com/screenshots/repo_releases.png)
183+
![Tags](https://dl.gitea.com/screenshots/repo_tags.png)
184+
185+
#### Repository Issue
186+
187+
![List](https://dl.gitea.com/screenshots/repo_issues.png)
188+
![Issue](https://dl.gitea.com/screenshots/repo_issue.png)
189+
190+
#### Repository Pull Requests
191+
192+
![List](https://dl.gitea.com/screenshots/repo_pull_requests.png)
193+
![Pull Request](https://dl.gitea.com/screenshots/repo_pull_request.png)
194+
![File](https://dl.gitea.com/screenshots/repo_pull_request_file.png)
195+
![Commits](https://dl.gitea.com/screenshots/repo_pull_request_commits.png)
196+
197+
#### Repository Actions
198+
199+
![List](https://dl.gitea.com/screenshots/repo_actions.png)
200+
![Details](https://dl.gitea.com/screenshots/repo_actions_run.png)
201+
202+
#### Repository Activity
203+
204+
![Activity](https://dl.gitea.com/screenshots/repo_activity.png)
205+
![Contributors](https://dl.gitea.com/screenshots/repo_contributors.png)
206+
![Code Frequency](https://dl.gitea.com/screenshots/repo_code_frequency.png)
207+
![Recent Commits](https://dl.gitea.com/screenshots/repo_recent_commits.png)
208+
209+
### Organization
210+
211+
![Home](https://dl.gitea.com/screenshots/org_home.png)
158212

159213
</details>

README_ZH.md

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,64 @@ Gitea 提供官方的 [go-sdk](https://gitea.com/gitea/go-sdk),以及名为 [t
9393
<details>
9494
<summary>截图</summary>
9595

96-
|![Dashboard](https://dl.gitea.com/screenshots/home_timeline.png)|![User Profile](https://dl.gitea.com/screenshots/user_profile.png)|![Global Issues](https://dl.gitea.com/screenshots/global_issues.png)|
97-
|:---:|:---:|:---:|
98-
|![Branches](https://dl.gitea.com/screenshots/branches.png)|![Web Editor](https://dl.gitea.com/screenshots/web_editor.png)|![Activity](https://dl.gitea.com/screenshots/activity.png)|
99-
|![New Migration](https://dl.gitea.com/screenshots/migration.png)|![Migrating](https://dl.gitea.com/screenshots/migration.gif)|![Pull Request View](https://image.ibb.co/e02dSb/6.png)|
100-
|![Pull Request Dark](https://dl.gitea.com/screenshots/pull_requests_dark.png)|![Diff Review Dark](https://dl.gitea.com/screenshots/review_dark.png)|![Diff Dark](https://dl.gitea.com/screenshots/diff_dark.png)|
96+
### 登录界面
97+
98+
![登录](https://dl.gitea.com/screenshots/login.png)
99+
![注册](https://dl.gitea.com/screenshots/register.png)
100+
101+
### 用户首页
102+
103+
![首页](https://dl.gitea.com/screenshots/home.png)
104+
![工单列表](https://dl.gitea.com/screenshots/issues.png)
105+
![合并请求列表](https://dl.gitea.com/screenshots/pull_requests.png)
106+
![里程碑列表](https://dl.gitea.com/screenshots/milestones.png)
107+
108+
### 用户资料
109+
110+
![用户资料](https://dl.gitea.com/screenshots/user_profile.png)
111+
112+
### 探索
113+
114+
![仓库列表](https://dl.gitea.com/screenshots/explore_repos.png)
115+
![用户列表](https://dl.gitea.com/screenshots/explore_users.png)
116+
![组织列表](https://dl.gitea.com/screenshots/explore_orgs.png)
117+
118+
### 仓库
119+
120+
![首页](https://dl.gitea.com/screenshots/repo_home.png)
121+
![提交列表](https://dl.gitea.com/screenshots/repo_commits.png)
122+
![分支列表](https://dl.gitea.com/screenshots/repo_branches.png)
123+
![标签列表](https://dl.gitea.com/screenshots/repo_labels.png)
124+
![里程碑列表](https://dl.gitea.com/screenshots/repo_milestones.png)
125+
![版本发布](https://dl.gitea.com/screenshots/repo_releases.png)
126+
![标签列表](https://dl.gitea.com/screenshots/repo_tags.png)
127+
128+
#### 仓库工单
129+
130+
![列表](https://dl.gitea.com/screenshots/repo_issues.png)
131+
![工单](https://dl.gitea.com/screenshots/repo_issue.png)
132+
133+
#### 仓库合并请求
134+
135+
![列表](https://dl.gitea.com/screenshots/repo_pull_requests.png)
136+
![合并请求](https://dl.gitea.com/screenshots/repo_pull_request.png)
137+
![文件](https://dl.gitea.com/screenshots/repo_pull_request_file.png)
138+
![提交列表](https://dl.gitea.com/screenshots/repo_pull_request_commits.png)
139+
140+
#### 仓库 Actions
141+
142+
![列表](https://dl.gitea.com/screenshots/repo_actions.png)
143+
![Run](https://dl.gitea.com/screenshots/repo_actions_run.png)
144+
145+
#### 仓库动态
146+
147+
![动态](https://dl.gitea.com/screenshots/repo_activity.png)
148+
![贡献者](https://dl.gitea.com/screenshots/repo_contributors.png)
149+
![代码频率](https://dl.gitea.com/screenshots/repo_code_frequency.png)
150+
![最近的提交](https://dl.gitea.com/screenshots/repo_recent_commits.png)
151+
152+
### 组织
153+
154+
![首页](https://dl.gitea.com/screenshots/org_home.png)
101155

102156
</details>

0 commit comments

Comments
 (0)