Skip to content

Commit 0de497a

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: ContainerRegistry - removed Basic Auth header (go-gitea#19735) [skip ci] Updated translations via Crowdin Add changelog for v1.16.8 (go-gitea#19724) (go-gitea#19730) Improve commit list/view on mobile (go-gitea#19712)
2 parents afa2c2a + 9ea9206 commit 0de497a

File tree

9 files changed

+115
-24
lines changed

9 files changed

+115
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7+
## [1.16.8](https://github.com/go-gitea/gitea/releases/tag/v1.16.8) - 2022-05-16
8+
9+
* ENHANCEMENTS
10+
* Add doctor check/fix for bogus action rows (#19656) (#19669)
11+
* Make .cs highlighting legible on dark themes. (#19604) (#19605)
12+
* BUGFIXES
13+
* Fix oauth setting list bug (#19681)
14+
* Delete user related oauth stuff on user deletion too (#19677) (#19680)
15+
* Fix new release from tags list UI (#19670) (#19673)
16+
* Prevent NPE when checking repo units if the user is nil (#19625) (#19630)
17+
* GetFeeds must always discard actions with dangling repo_id (#19598) (#19629)
18+
* Call MultipartForm.RemoveAll when request finishes (#19606) (#19607)
19+
* Avoid MoreThanOne error when creating a branch whose name conflicts with other ref names (#19557) (#19591)
20+
* Fix sending empty notifications (#19589) (#19590)
21+
* Ignore DNS error when doing migration allow/block check (#19566) (#19567)
22+
* Fix issue overview for teams (#19652) (#19653)
23+
724
## [1.16.7](https://github.com/go-gitea/gitea/releases/tag/v1.16.7) - 2022-05-02
825

926
* SECURITY

‎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.16.7
21+
version: 1.16.8
2222
minGoVersion: 1.17
2323
goVersion: 1.18
2424
minNodeVersion: 14

‎integrations/api_packages_container_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ func TestPackageContainer(t *testing.T) {
6666
Token string `json:"token"`
6767
}
6868

69-
authenticate := []string{
70-
`Bearer realm="` + setting.AppURL + `v2/token"`,
71-
`Basic`,
72-
}
69+
authenticate := []string{`Bearer realm="` + setting.AppURL + `v2/token"`}
7370

7471
t.Run("Anonymous", func(t *testing.T) {
7572
defer PrintCurrentTest(t)()

‎options/locale/locale_pt-PT.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,8 +1706,8 @@ activity.title.prs_1=%d pedido de integração
17061706
activity.title.prs_n=%d Pedidos de integração
17071707
activity.title.prs_merged_by=%s executado(s) por %s
17081708
activity.title.prs_opened_by=%s proposto por %s
1709-
activity.merged_prs_label=Integrados
1710-
activity.opened_prs_label=Propostos
1709+
activity.merged_prs_label=Integrado
1710+
activity.opened_prs_label=Proposto
17111711
activity.active_issues_count_1=<strong>%d</strong> questão vigente
17121712
activity.active_issues_count_n=<strong>%d</strong> questões vigentes
17131713
activity.closed_issues_count_1=questão encerrada

‎options/locale/locale_zh-CN.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2967,7 +2967,7 @@ mirror_sync_push=从镜像同步了提交至仓库 <a href="%[1]s">%[4]s</a> 的
29672967
mirror_sync_create=从镜像同步了引用 <a href="%[2]s">%[3]s</a> 至仓库 <a href="%[1]s">%[4]s</a>
29682968
mirror_sync_delete=从镜像同步并从 <a href="%[1]s">%[3]s</a> 删除了引用 <code>%[2]s</code>
29692969
approve_pull_request=`批准了 <a href="%[1]s">%[3]s#%[2]s</a>`
2970-
reject_pull_request=`建议变更 <a href="%s/pulls/%s">%s#%[2]s</a>`
2970+
reject_pull_request=`建议变更 <a href="%[1]s">%[3]s#%[2]s</a>`
29712971
publish_release=`在 <a href="%[1]s">%[3]s</a> 发布了 <a href="%[2]s"> "%[4]s" </a>`
29722972
review_dismissed=`取消了 <b>%[4]s</b> 对 <a href="%[1]s">%[3]s#%[2]s</a> 的变更请求`
29732973
review_dismissed_reason=原因：

‎routers/api/packages/container/container.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ func apiErrorDefined(ctx *context.Context, err *namedError) {
113113
func ReqContainerAccess(ctx *context.Context) {
114114
if ctx.Doer == nil {
115115
ctx.Resp.Header().Add("WWW-Authenticate", `Bearer realm="`+setting.AppURL+`v2/token"`)
116-
ctx.Resp.Header().Add("WWW-Authenticate", `Basic`)
117116
apiErrorDefined(ctx, errUnauthorized)
118117
}
119118
}

‎templates/repo/commit_page.tmpl‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
{{$class = (printf "%s%s" $class " isWarning")}}
1818
{{end}}
1919
{{end}}
20-
<div class="ui top attached header clearing segment pr {{$class}}">
21-
<div class="df mb-4">
20+
<div class="ui top attached header clearing segment pr commit-header {{$class}}">
21+
<div class="df mb-4 fw">
2222
<h3 class="mb-0 f1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses "root" $}}</h3>
2323
{{if not $.PageIsWiki}}
2424
<div class="ui">
@@ -143,8 +143,8 @@
143143
<span class="text grey mr-3">{{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}</span>
144144
{{end}}
145145
</div>
146-
<div class="ui attached segment df ac sb py-2 commit-header-row {{$class}}">
147-
<div class="df ac">
146+
<div class="ui attached segment df ac sb py-2 commit-header-row fw {{$class}}">
147+
<div class="df ac author">
148148
{{if .Author}}
149149
{{avatar .Author 28 "mr-3"}}
150150
{{if .Author.FullName}}
@@ -171,9 +171,7 @@
171171
<div class="ui horizontal list df ac">
172172
{{if .Parents}}
173173
<div class="item">
174-
{{.i18n.Tr "repo.diff.parent"}}
175-
</div>
176-
<div class="item">
174+
<span>{{.i18n.Tr "repo.diff.parent"}}</span>
177175
{{range .Parents}}
178176
{{if $.PageIsWiki}}
179177
<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
@@ -183,13 +181,14 @@
183181
{{end}}
184182
</div>
185183
{{end}}
186-
<div class="mobile-only"></div>
187-
<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div>
188-
<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div>
184+
<div class="item">
185+
<span>{{.i18n.Tr "repo.diff.commit"}}</span>
186+
<span class="ui blue sha label">{{ShortSha .CommitID}}</span>
187+
</div>
189188
</div>
190189
</div>
191190
{{if .Commit.Signature}}
192-
<div class="ui bottom attached message tl df ac sb commit-header-row {{$class}}">
191+
<div class="ui bottom attached message tl df ac sb commit-header-row fw {{$class}}">
193192
<div class="df ac">
194193
{{if .Verification.Verified}}
195194
{{if ne .Verification.SigningUser.ID 0}}
@@ -204,8 +203,8 @@
204203
{{avatar .Verification.SigningUser 28}}
205204
<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
206205
{{else}}
207-
<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
208-
<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
206+
<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "mr-3"}}</span>
207+
<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
209208
{{avatarByEmail .Verification.SigningEmail "" 28}}
210209
<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
211210
{{end}}

‎templates/repo/commits_list.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="ui attached table segment">
2-
<table class="ui very basic striped fixed table single line" id="commits-table">
1+
<div class="ui attached table segment commit-table">
2+
<table class="ui very basic striped table unstackable fixed" id="commits-table">
33
<thead>
44
<tr>
55
<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>

‎web_src/less/_repository.less‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3328,4 +3328,83 @@ td.blob-excerpt {
33283328
}
33293329
}
33303330
}
3331+
.commit-header-row {
3332+
.ui.horizontal.list {
3333+
width: 100%;
3334+
overflow-x: scroll;
3335+
margin-top: 2px;
3336+
3337+
.item {
3338+
align-items: center;
3339+
display: flex;
3340+
}
3341+
}
3342+
3343+
.author {
3344+
padding: 3px 0;
3345+
}
3346+
}
3347+
3348+
.commit-header h3 {
3349+
flex-basis: auto !important;
3350+
margin-bottom: .5rem !important;
3351+
}
3352+
3353+
.commits-table {
3354+
flex-direction: column;
3355+
3356+
.commits-table-left {
3357+
align-items: initial !important;
3358+
margin-bottom: 6px;
3359+
}
3360+
3361+
.commits-table-right form {
3362+
display: flex;
3363+
flex-wrap: wrap;
3364+
3365+
> div:nth-child(1) {
3366+
order: 1;
3367+
}
3368+
3369+
> div:nth-child(2) {
3370+
order: 3;
3371+
margin-left: .5rem;
3372+
margin-top: .5rem;
3373+
}
3374+
3375+
> button:nth-child(3) {
3376+
order: 2;
3377+
margin-left: .25rem;
3378+
}
3379+
}
3380+
}
3381+
3382+
.commit-table {
3383+
overflow-x: scroll;
3384+
3385+
td.sha,
3386+
th.sha {
3387+
display: none !important;
3388+
}
3389+
3390+
.commit-list {
3391+
span.message-wrapper {
3392+
max-width: none;
3393+
}
3394+
3395+
tr td:last-child {
3396+
display: block;
3397+
width: max-content;
3398+
}
3399+
3400+
td.author {
3401+
display: block;
3402+
width: calc(100% + .5rem);
3403+
}
3404+
3405+
.copy-commit-sha {
3406+
display: none !important;
3407+
}
3408+
}
3409+
}
33313410
}

0 commit comments

Comments
 (0)