Skip to content

Commit acaeefb

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Use full width for project boards (go-gitea#28225) Increase "version" when update the setting value to a same value as before (go-gitea#28243) Fix issue will be detected as pull request when checking `First-time contributor` (go-gitea#28237) Fix link to `Code` tab on wiki commits (go-gitea#28041) Fix links in docs (go-gitea#28234)
2 parents b5c792f + 4d7c063 commit acaeefb

File tree

10 files changed

+77
-59
lines changed

10 files changed

+77
-59
lines changed

‎docs/content/administration/email-setup.zh-cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ PASSWD = `password`
5555

5656
要发送测试邮件以验证设置，请转到 Gitea > 站点管理 > 配置 > SMTP 邮件配置。
5757

58-
有关所有选项的完整列表，请查看[配置速查表](doc/administration/config-cheat-sheet.md)。
58+
有关所有选项的完整列表，请查看[配置速查表](administration/config-cheat-sheet.md)。
5959

6060
请注意：只有在使用 TLS 或 `HOST=localhost` 加密 SMTP 服务器通信时才支持身份验证。TLS 加密可以通过以下方式进行：
6161

‎docs/content/usage/actions/act-runner.en-us.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ If you cannot see the settings page, please make sure that you have the right pe
114114

115115
The format of the registration token is a random string `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`.
116116

117-
A registration token can also be obtained from the gitea [command-line interface](../../administration/command-line.md#actions-generate-runner-token):
117+
A registration token can also be obtained from the gitea [command-line interface](administration/command-line.md#actions-generate-runner-token):
118118

119119
```
120120
gitea --config /etc/gitea/app.ini actions generate-runner-token

‎docs/content/usage/actions/act-runner.zh-cn.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Runner级别决定了从哪里获取注册令牌。
113113

114114
注册令牌的格式是一个随机字符串 `D0gvfu2iHfUjNqCYVljVyRV14fISpJxxxxxxxxxx`。
115115

116-
注册令牌也可以通过 Gitea 的 [命令行](../../administration/command-line.md#actions-generate-runner-token) 获得:
116+
注册令牌也可以通过 Gitea 的 [命令行](administration/command-line.md#actions-generate-runner-token) 获得:
117117

118118
### 注册Runner
119119

‎models/system/setting.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func SetSettings(ctx context.Context, settings map[string]string) error {
8181
return err
8282
}
8383
for k, v := range settings {
84-
res, err := e.Exec("UPDATE system_setting SET setting_value=? WHERE setting_key=?", v, k)
84+
res, err := e.Exec("UPDATE system_setting SET version=version+1, setting_value=? WHERE setting_key=?", v, k)
8585
if err != nil {
8686
return err
8787
}

‎models/system/setting_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,16 @@ func TestSettings(t *testing.T) {
3939
assert.EqualValues(t, 3, rev)
4040
assert.Len(t, settings, 2)
4141
assert.EqualValues(t, "false", settings[keyName])
42+
43+
// setting the same value should not trigger DuplicateKey error, and the "version" should be increased
44+
setting := &system.Setting{SettingKey: keyName}
45+
_, err = db.GetByBean(db.DefaultContext, setting)
46+
assert.NoError(t, err)
47+
assert.EqualValues(t, 2, setting.Version)
48+
err = system.SetSettings(db.DefaultContext, map[string]string{keyName: "false"})
49+
assert.NoError(t, err)
50+
setting = &system.Setting{SettingKey: keyName}
51+
_, err = db.GetByBean(db.DefaultContext, setting)
52+
assert.NoError(t, err)
53+
assert.EqualValues(t, 3, setting.Version)
4254
}

‎routers/web/repo/issue.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1319,7 +1319,7 @@ func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *use
13191319
return roleDescriptor, err
13201320
} else if hasMergedPR {
13211321
roleDescriptor.RoleInRepo = issues_model.RoleRepoContributor
1322-
} else {
1322+
} else if issue.IsPull {
13231323
// only display first time contributor in the first opening pull request
13241324
roleDescriptor.RoleInRepo = issues_model.RoleRepoFirstTimeContributor
13251325
}

‎templates/org/projects/view.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
33
{{template "shared/user/org_profile_avatar" .}}
44
<div class="ui container">
5-
{{template "user/overview/header" .}}
6-
{{template "projects/view" .}}
5+
{{template "user/overview/header" .}}
6+
</div>
7+
<div class="ui container fluid padded">
8+
{{template "projects/view" .}}
79
</div>
810
</div>
911
{{template "base/footer" .}}

‎templates/projects/view.tmpl‎

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,67 @@
11
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
22

3-
<div class="gt-df gt-sb gt-ac gt-mb-4">
4-
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
5-
{{if $canWriteProject}}
6-
<div class="ui compact mini menu">
7-
<a class="item" href="{{.Link}}/edit?redirect=project">
8-
{{svg "octicon-pencil"}}
9-
{{ctx.Locale.Tr "repo.issues.label_edit"}}
10-
</a>
11-
{{if .Project.IsClosed}}
12-
<button class="item btn link-action" data-url="{{.Link}}/open">
13-
{{svg "octicon-check"}}
14-
{{ctx.Locale.Tr "repo.projects.open"}}
3+
<div class="ui container">
4+
<div class="gt-df gt-sb gt-ac gt-mb-4">
5+
<h2 class="gt-mb-0">{{.Project.Title}}</h2>
6+
{{if $canWriteProject}}
7+
<div class="ui compact mini menu">
8+
<a class="item" href="{{.Link}}/edit?redirect=project">
9+
{{svg "octicon-pencil"}}
10+
{{ctx.Locale.Tr "repo.issues.label_edit"}}
11+
</a>
12+
{{if .Project.IsClosed}}
13+
<button class="item btn link-action" data-url="{{.Link}}/open">
14+
{{svg "octicon-check"}}
15+
{{ctx.Locale.Tr "repo.projects.open"}}
16+
</button>
17+
{{else}}
18+
<button class="item btn link-action" data-url="{{.Link}}/close">
19+
{{svg "octicon-skip"}}
20+
{{ctx.Locale.Tr "repo.projects.close"}}
21+
</button>
22+
{{end}}
23+
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
24+
{{svg "octicon-trash"}}
25+
{{ctx.Locale.Tr "repo.issues.label_delete"}}
1526
</button>
16-
{{else}}
17-
<button class="item btn link-action" data-url="{{.Link}}/close">
18-
{{svg "octicon-skip"}}
19-
{{ctx.Locale.Tr "repo.projects.close"}}
27+
<button class="item btn show-modal" data-modal="#new-project-column-item">
28+
{{svg "octicon-plus"}}
29+
{{ctx.Locale.Tr "new_project_column"}}
2030
</button>
21-
{{end}}
22-
<button class="item btn delete-button" data-url="{{.Link}}/delete" data-id="{{.Project.ID}}">
23-
{{svg "octicon-trash"}}
24-
{{ctx.Locale.Tr "repo.issues.label_delete"}}
25-
</button>
26-
<button class="item btn show-modal" data-modal="#new-project-column-item">
27-
{{svg "octicon-plus"}}
28-
{{ctx.Locale.Tr "new_project_column"}}
29-
</button>
30-
</div>
31-
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
32-
<div class="header">
33-
{{ctx.Locale.Tr "repo.projects.column.new"}}
3431
</div>
35-
<div class="content">
36-
<form class="ui form">
37-
<div class="required field">
38-
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
39-
<input class="new-project-column" id="new_project_column" name="title" required>
40-
</div>
32+
<div class="ui small modal new-project-column-modal" id="new-project-column-item">
33+
<div class="header">
34+
{{ctx.Locale.Tr "repo.projects.column.new"}}
35+
</div>
36+
<div class="content">
37+
<form class="ui form">
38+
<div class="required field">
39+
<label for="new_project_column">{{ctx.Locale.Tr "repo.projects.column.new_title"}}</label>
40+
<input class="new-project-column" id="new_project_column" name="title" required>
41+
</div>
4142

42-
<div class="field color-field">
43-
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
44-
<div class="color picker column">
45-
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
46-
{{template "repo/issue/label_precolors"}}
43+
<div class="field color-field">
44+
<label for="new_project_column_color">{{ctx.Locale.Tr "repo.projects.column.color"}}</label>
45+
<div class="color picker column">
46+
<input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_project_column_color_picker" name="color">
47+
{{template "repo/issue/label_precolors"}}
48+
</div>
4749
</div>
48-
</div>
4950

50-
<div class="text right actions">
51-
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
52-
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
53-
</div>
54-
</form>
51+
<div class="text right actions">
52+
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
53+
<button data-url="{{$.Link}}" class="ui primary button" id="new_project_column_submit">{{ctx.Locale.Tr "repo.projects.column.new_submit"}}</button>
54+
</div>
55+
</form>
56+
</div>
5557
</div>
56-
</div>
57-
{{end}}
58-
</div>
58+
{{end}}
59+
</div>
5960

60-
<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
61+
<div class="content">{{$.Project.RenderedContent|Str2html}}</div>
6162

62-
<div class="divider"></div>
63+
<div class="divider"></div>
64+
</div>
6365

6466
<div id="project-board">
6567
<div class="board {{if .CanWriteProjects}}sortable{{end}}">

‎templates/repo/header.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
{{if not (or .Repository.IsBeingCreated .Repository.IsBroken)}}
143143
<div class="ui tabular menu navbar gt-overflow-x-auto gt-overflow-y-hidden">
144144
{{if .Permission.CanRead $.UnitTypeCode}}
145-
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL}}{{end}}">
145+
<a class="{{if .PageIsViewCode}}active {{end}}item" href="{{.RepoLink}}{{if and (ne .BranchName .Repository.DefaultBranch) (not $.PageIsWiki)}}/src/{{.BranchNameSubURL}}{{end}}">
146146
{{svg "octicon-code"}} {{ctx.Locale.Tr "repo.code"}}
147147
</a>
148148
{{end}}

‎templates/repo/projects/view.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
{{template "repo/issue/navbar" .}}
77
<a class="ui small primary button" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>
88
</div>
9+
</div>
10+
<div class="ui container fluid padded">
911
{{template "projects/view" .}}
1012
</div>
1113
</div>

0 commit comments

Comments
 (0)