Skip to content

Commit 3dc959a

Browse files
KN4CK3RKN4CK3R
committed
Merge branch 'main' of https://github.com/go-gitea/gitea into feature-cran
2 parents 49aca08 + f401337 commit 3dc959a

Some content is hidden

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

64 files changed

+199
-200
lines changed

‎docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ params:
1818
description: Git with a cup of tea
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
21-
version: 1.18.5
21+
version: 1.19.0
2222
minGoVersion: 1.19
2323
goVersion: 1.20
2424
minNodeVersion: 16

‎options/locale/locale_en-US.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,7 @@ release = Release
10681068
releases = Releases
10691069
tag = Tag
10701070
released_this = released this
1071+
tagged_this = tagged this
10711072
file.title = %s at %s
10721073
file_raw = Raw
10731074
file_history = History
@@ -2287,6 +2288,7 @@ release.compare = Compare
22872288
release.edit = edit
22882289
release.ahead.commits = <strong>%d</strong> commits
22892290
release.ahead.target = to %s since this release
2291+
tag.ahead.target = to %s since this tag
22902292
release.source_code = Source Code
22912293
release.new_subheader = Releases organize project versions.
22922294
release.edit_subheader = Releases organize project versions.

‎routers/web/repo/release.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ func releasesOrTagsFeed(ctx *context.Context, isReleasesOnly bool, formatType st
226226

227227
// SingleRelease renders a single release's page
228228
func SingleRelease(ctx *context.Context) {
229-
ctx.Data["Title"] = ctx.Tr("repo.release.releases")
230229
ctx.Data["PageIsReleaseList"] = true
230+
ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch
231231

232232
writeAccess := ctx.Repo.CanWrite(unit.TypeReleases)
233233
ctx.Data["CanCreateRelease"] = writeAccess && !ctx.Repo.Repository.IsArchived
@@ -241,6 +241,12 @@ func SingleRelease(ctx *context.Context) {
241241
ctx.ServerError("GetReleasesByRepoID", err)
242242
return
243243
}
244+
ctx.Data["PageIsSingleTag"] = release.IsTag
245+
if release.IsTag {
246+
ctx.Data["Title"] = release.TagName
247+
} else {
248+
ctx.Data["Title"] = release.Title
249+
}
244250

245251
err = repo_model.GetReleaseAttachments(ctx, release)
246252
if err != nil {

‎routers/web/user/profile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func Profile(ctx *context.Context) {
308308
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
309309
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
310310

311-
ctx.Data["ShowUserEmail"] = len(ctx.ContextUser.Email) > 0 && ctx.IsSigned && (!ctx.ContextUser.KeepEmailPrivate || ctx.ContextUser.ID == ctx.Doer.ID)
311+
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate
312312

313313
ctx.HTML(http.StatusOK, tplProfile)
314314
}

‎services/repository/push.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,15 +374,20 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo
374374
rel, has := relMap[lowerTag]
375375

376376
if !has {
377+
parts := strings.SplitN(tag.Message, "\n", 2)
378+
note := ""
379+
if len(parts) > 1 {
380+
note = parts[1]
381+
}
377382
rel = &repo_model.Release{
378383
RepoID: repo.ID,
379-
Title: "",
384+
Title: parts[0],
380385
TagName: tags[i],
381386
LowerTagName: lowerTag,
382387
Target: "",
383388
Sha1: commit.ID.String(),
384389
NumCommits: commitsCount,
385-
Note: "",
390+
Note: note,
386391
IsDraft: false,
387392
IsPrerelease: false,
388393
IsTag: true,

‎templates/admin/auth/edit.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,11 @@
328328

329329
{{range .OAuth2Providers}}{{if .CustomURLSettings}}
330330
<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
331-
<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden" />
332-
<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden" />
333-
<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden" />
334-
<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden" />
335-
<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden" />
331+
<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
332+
<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
333+
<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
334+
<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
335+
<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
336336
{{end}}{{end}}
337337

338338
<div class="field">

‎templates/admin/auth/new.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- PAM -->
3939
<div class="pam required field {{if not (eq .type 4)}}gt-hidden{{end}}">
4040
<label for="pam_service_name">{{.locale.Tr "admin.auths.pam_service_name"}}</label>
41-
<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}" />
41+
<input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}">
4242
<label for="pam_email_domain">{{.locale.Tr "admin.auths.pam_email_domain"}}</label>
4343
<input id="pam_email_domain" name="pam_email_domain" value="{{.pam_email_domain}}">
4444
</div>

‎templates/admin/auth/source/oauth.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565

6666
{{range .OAuth2Providers}}{{if .CustomURLSettings}}
6767
<input id="{{.Name}}_customURLSettings" type="hidden" data-required="{{.CustomURLSettings.Required}}" data-available="true">
68-
<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden" />
69-
<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden" />
70-
<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden" />
71-
<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden" />
72-
<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden" />
68+
<input id="{{.Name}}_token_url" value="{{.CustomURLSettings.TokenURL.Value}}" data-available="{{.CustomURLSettings.TokenURL.Available}}" data-required="{{.CustomURLSettings.TokenURL.Required}}" type="hidden">
69+
<input id="{{.Name}}_auth_url" value="{{.CustomURLSettings.AuthURL.Value}}" data-available="{{.CustomURLSettings.AuthURL.Available}}" data-required="{{.CustomURLSettings.AuthURL.Required}}" type="hidden">
70+
<input id="{{.Name}}_profile_url" value="{{.CustomURLSettings.ProfileURL.Value}}" data-available="{{.CustomURLSettings.ProfileURL.Available}}" data-required="{{.CustomURLSettings.ProfileURL.Required}}" type="hidden">
71+
<input id="{{.Name}}_email_url" value="{{.CustomURLSettings.EmailURL.Value}}" data-available="{{.CustomURLSettings.EmailURL.Available}}" data-required="{{.CustomURLSettings.EmailURL.Required}}" type="hidden">
72+
<input id="{{.Name}}_tenant" value="{{.CustomURLSettings.Tenant.Value}}" data-available="{{.CustomURLSettings.Tenant.Available}}" data-required="{{.CustomURLSettings.Tenant.Required}}" type="hidden">
7373
{{end}}{{end}}
7474

7575
<div class="field">

‎templates/admin/cron.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
{{end}}
3030
</tbody>
3131
</table>
32-
<input type="hidden" name="from" value="monitor"/>
32+
<input type="hidden" name="from" value="monitor">
3333
{{.CsrfTokenHtml}}
3434
</form>
3535
</div>

‎templates/admin/dashboard.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
</tr>
4343
{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
4444
<tr>
45-
<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br/>
45+
<td>{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}<br>
4646
{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
4747
<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
4848
</tr>
4949
<tr>
50-
<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br/>
50+
<td>{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}<br>
5151
{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
5252
<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.locale.Tr "admin.dashboard.operation_run"}}</button></td>
5353
</tr>

0 commit comments

Comments
 (0)