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)
zjjhot · May 17, 2022 · 0de497a · 0de497a
2 parents afa2c2a + 9ea9206
commit 0de497a
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.16.8](https://github.com/go-gitea/gitea/releases/tag/v1.16.8) - 2022-05-16
+
+* ENHANCEMENTS
+  * Add doctor check/fix for bogus action rows (#19656) (#19669)
+  * Make .cs highlighting legible on dark themes. (#19604) (#19605)
+* BUGFIXES
+  * Fix oauth setting list bug (#19681)
+  * Delete user related oauth stuff on user deletion too (#19677) (#19680)
+  * Fix new release from tags list UI (#19670) (#19673)
+  * Prevent NPE when checking repo units if the user is nil (#19625) (#19630)
+  * GetFeeds must always discard actions with dangling repo_id (#19598) (#19629)
+  * Call MultipartForm.RemoveAll when request finishes (#19606) (#19607)
+  * Avoid MoreThanOne error when creating a branch whose name conflicts with other ref names (#19557) (#19591)
+  * Fix sending empty notifications (#19589) (#19590)
+  * Ignore DNS error when doing migration allow/block check (#19566) (#19567)
+  * Fix issue overview for teams (#19652) (#19653)
+
 ## [1.16.7](https://github.com/go-gitea/gitea/releases/tag/v1.16.7) - 2022-05-02
 
 * SECURITY

diff --git a/docs/config.yaml b/docs/config.yaml
@@ -18,7 +18,7 @@ params:
   description: Git with a cup of tea
   author: The Gitea Authors
   website: https://docs.gitea.io
-  version: 1.16.7
+  version: 1.16.8
   minGoVersion: 1.17
   goVersion: 1.18
   minNodeVersion: 14

diff --git a/integrations/api_packages_container_test.go b/integrations/api_packages_container_test.go
@@ -66,10 +66,7 @@ func TestPackageContainer(t *testing.T) {
 			Token string `json:"token"`
 		}
 
-		authenticate := []string{
-			`Bearer realm="` + setting.AppURL + `v2/token"`,
-			`Basic`,
-		}
+		authenticate := []string{`Bearer realm="` + setting.AppURL + `v2/token"`}
 
 		t.Run("Anonymous", func(t *testing.T) {
 			defer PrintCurrentTest(t)()

diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -1706,8 +1706,8 @@ activity.title.prs_1=%d pedido de integração
 activity.title.prs_n=%d Pedidos de integração
 activity.title.prs_merged_by=%s executado(s) por %s
 activity.title.prs_opened_by=%s proposto por %s
-activity.merged_prs_label=Integrados
-activity.opened_prs_label=Propostos
+activity.merged_prs_label=Integrado
+activity.opened_prs_label=Proposto
 activity.active_issues_count_1=<strong>%d</strong> questão vigente
 activity.active_issues_count_n=<strong>%d</strong> questões vigentes
 activity.closed_issues_count_1=questão encerrada

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -2967,7 +2967,7 @@ mirror_sync_push=从镜像同步了提交至仓库 <a href="%[1]s">%[4]s</a> 的
 mirror_sync_create=从镜像同步了引用 <a href="%[2]s">%[3]s</a> 至仓库 <a href="%[1]s">%[4]s</a>
 mirror_sync_delete=从镜像同步并从 <a href="%[1]s">%[3]s</a> 删除了引用 <code>%[2]s</code>
 approve_pull_request=`批准了 <a href="%[1]s">%[3]s#%[2]s</a>`
-reject_pull_request=`建议变更 <a href="%s/pulls/%s">%s#%[2]s</a>`
+reject_pull_request=`建议变更 <a href="%[1]s">%[3]s#%[2]s</a>`
 publish_release=`在 <a href="%[1]s">%[3]s</a> 发布了 <a href="%[2]s"> "%[4]s" </a>`
 review_dismissed=`取消了 <b>%[4]s</b> 对 <a href="%[1]s">%[3]s#%[2]s</a> 的变更请求`
 review_dismissed_reason=原因：

diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go
@@ -113,7 +113,6 @@ func apiErrorDefined(ctx *context.Context, err *namedError) {
 func ReqContainerAccess(ctx *context.Context) {
 	if ctx.Doer == nil {
 		ctx.Resp.Header().Add("WWW-Authenticate", `Bearer realm="`+setting.AppURL+`v2/token"`)
-		ctx.Resp.Header().Add("WWW-Authenticate", `Basic`)
 		apiErrorDefined(ctx, errUnauthorized)
 	}
 }

diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
@@ -17,8 +17,8 @@
 				{{$class = (printf "%s%s" $class " isWarning")}}
 			{{end}}
 		{{end}}
-		<div class="ui top attached header clearing segment pr {{$class}}">
-			<div class="df mb-4">
+		<div class="ui top attached header clearing segment pr commit-header {{$class}}">
+			<div class="df mb-4 fw">
 				<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>
 				{{if not $.PageIsWiki}}
 					<div class="ui">
@@ -143,8 +143,8 @@
 				<span class="text grey mr-3">{{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}</span>
 			{{end}}
 		</div>
-		<div class="ui attached segment df ac sb py-2 commit-header-row {{$class}}">
-				<div class="df ac">
+		<div class="ui attached segment df ac sb py-2 commit-header-row fw {{$class}}">
+				<div class="df ac author">
 					{{if .Author}}
 						{{avatar .Author 28 "mr-3"}}
 						{{if .Author.FullName}}
@@ -171,9 +171,7 @@
 				<div class="ui horizontal list df ac">
 					{{if .Parents}}
 						<div class="item">
-							{{.i18n.Tr "repo.diff.parent"}}
-						</div>
-						<div class="item">
+							<span>{{.i18n.Tr "repo.diff.parent"}}</span>
 							{{range .Parents}}
 								{{if $.PageIsWiki}}
 									<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
@@ -183,13 +181,14 @@
 							{{end}}
 						</div>
 					{{end}}
-					<div class="mobile-only"></div>
-					<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div>
-					<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div>
+					<div class="item">
+						<span>{{.i18n.Tr "repo.diff.commit"}}</span>
+						<span class="ui blue sha label">{{ShortSha .CommitID}}</span>
+					</div>
 				</div>
 		</div>
 		{{if .Commit.Signature}}
-			<div class="ui bottom attached message tl df ac sb commit-header-row {{$class}}">
+			<div class="ui bottom attached message tl df ac sb commit-header-row fw {{$class}}">
 				<div class="df ac">
 					{{if .Verification.Verified}}
 						{{if ne .Verification.SigningUser.ID 0}}
@@ -204,8 +203,8 @@
 							{{avatar .Verification.SigningUser 28}}
 							<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
 						{{else}}
-							<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
-							<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
+							<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "mr-3"}}</span>
+							<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
 							{{avatarByEmail .Verification.SigningEmail "" 28}}
 							<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
 						{{end}}

diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
@@ -1,5 +1,5 @@
-<div class="ui attached table segment">
-		<table class="ui very basic striped fixed table single line" id="commits-table">
+<div class="ui attached table segment commit-table">
+		<table class="ui very basic striped table unstackable fixed" id="commits-table">
 			<thead>
 				<tr>
 					<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
@@ -3328,4 +3328,83 @@ td.blob-excerpt {
       }
     }
   }
+  .commit-header-row {
+    .ui.horizontal.list {
+      width: 100%;
+      overflow-x: scroll;
+      margin-top: 2px;
+
+      .item {
+        align-items: center;
+        display: flex;
+      }
+    }
+
+    .author {
+      padding: 3px 0;
+    }
+  }
+
+  .commit-header h3 {
+    flex-basis: auto !important;
+    margin-bottom: .5rem !important;
+  }
+
+  .commits-table {
+    flex-direction: column;
+
+    .commits-table-left {
+      align-items: initial !important;
+      margin-bottom: 6px;
+    }
+
+    .commits-table-right form {
+      display: flex;
+      flex-wrap: wrap;
+
+      > div:nth-child(1) {
+        order: 1;
+      }
+
+      > div:nth-child(2) {
+        order: 3;
+        margin-left: .5rem;
+        margin-top: .5rem;
+      }
+
+      > button:nth-child(3) {
+        order: 2;
+        margin-left: .25rem;
+      }
+    }
+  }
+
+  .commit-table {
+    overflow-x: scroll;
+
+    td.sha,
+    th.sha {
+      display: none !important;
+    }
+
+    .commit-list {
+      span.message-wrapper {
+        max-width: none;
+      }
+
+      tr td:last-child {
+        display: block;
+        width: max-content;
+      }
+
+      td.author {
+        display: block;
+        width: calc(100% + .5rem);
+      }
+
+      .copy-commit-sha {
+        display: none !important;
+      }
+    }
+  }
 }