From fba4ee7efcd0baead1611c0885468c15916cc7e1 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 25 Oct 2023 00:47:17 +0200
Subject: [PATCH 1/7] Add gap between diff boxes (#27776)

Before (almost no gap between files):
<img width="1240" alt="Screenshot 2023-10-24 at 19 43 32"
src="https://github.com/go-gitea/gitea/assets/115237/30cdbdbc-d102-479c-89ce-3f68837ae0cd">

After (with 8px gap):
<img width="1241" alt="Screenshot 2023-10-24 at 19 43 22"
src="https://github.com/go-gitea/gitea/assets/115237/72b26a30-8730-4a36-8de9-be143b684b98">
---
 web_src/css/repo.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index c3e230f8e1389..7d76dd8b3ffdd 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2734,6 +2734,9 @@ tbody.commit-list {
 #diff-file-boxes {
   flex: 1;
   max-width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
 }
 
 #diff-file-tree {

From 572f0963edc71239634ee782a3c69213479f34ba Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 25 Oct 2023 05:09:18 +0200
Subject: [PATCH 2/7] Only show diff file tree when more than one file changed
 (#27775)

When 0 or 1 files changed in a diff, we don't need to show a file tree.
This behaviour matches GitHub. Single-file diff after this change, note
absence of button:

<img width="1234" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/3618438b-e655-42a3-989f-f299267b2b8b">

Co-authored-by: Giteabot <teabot@gitea.io>
---
 templates/repo/diff/box.tmpl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 289ed90d3fd3f..c037c3b365238 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -1,7 +1,8 @@
+{{$showFileTree := (and (not .DiffNotAvailable) (gt .Diff.NumFiles 1))}}
 <div>
 	<div class="diff-detail-box diff-box">
 		<div class="gt-df gt-ac gt-fw">
-			{{if not .DiffNotAvailable}}
+			{{if $showFileTree}}
 				<button class="diff-toggle-file-tree-button gt-df gt-ac not-mobile" data-show-text="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}" data-hide-text="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
 					{{/* the icon meaning is reversed here, "octicon-sidebar-collapse" means show the file tree */}}
 					{{svg "octicon-sidebar-collapse" 20 "icon gt-hidden"}}
@@ -15,6 +16,8 @@
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('gt-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
 				</script>
+			{{end}}
+			{{if not .DiffNotAvailable}}
 				<div class="diff-detail-stats gt-df gt-ac gt-fw">
 					{{svg "octicon-diff" 16 "gt-mr-2"}}{{ctx.Locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
 				</div>
@@ -85,13 +88,15 @@
 		<div id="diff-file-list"></div>
 	{{end}}
 	<div id="diff-container">
-		{{if .DiffNotAvailable}}
-			<h4>{{ctx.Locale.Tr "repo.diff.data_not_available"}}</h4>
-		{{else}}
+		{{if $showFileTree}}
 			<div id="diff-file-tree" class="gt-hidden"></div>
 			<script>
 				if (diffTreeVisible) document.getElementById('diff-file-tree').classList.remove('gt-hidden');
 			</script>
+		{{end}}
+		{{if .DiffNotAvailable}}
+			<h4>{{ctx.Locale.Tr "repo.diff.data_not_available"}}</h4>
+		{{else}}
 			<div id="diff-file-boxes" class="sixteen wide column">
 				{{range $i, $file := .Diff.Files}}
 					{{/*notice: the index of Diff.Files should not be used for element ID, because the index will be restarted from 0 when doing load-more for PRs with a lot of files*/}}

From e544a277fe261aa5671a20751d6f83126579334a Mon Sep 17 00:00:00 2001
From: 853 <sonic853@qq.com>
Date: Wed, 25 Oct 2023 13:55:56 +0800
Subject: [PATCH 3/7] Fix the missing repo count in new team page and edit team
 page (#27743)

Follow #26942
Before:

![image](https://github.com/go-gitea/gitea/assets/8389962/ffe3e914-c71c-493f-965b-369f27c70b4b)


![image](https://github.com/go-gitea/gitea/assets/8389962/eaad4f07-b8ce-4564-b883-97938de5ed79)

After:


![image](https://github.com/go-gitea/gitea/assets/8389962/353aeabe-caf4-4449-8330-d3a29f9bd326)


![image](https://github.com/go-gitea/gitea/assets/8389962/baf59bb6-2c74-4a56-a28c-1519bc3d2594)
---
 routers/web/org/teams.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index 183b7dd26648d..9e65c8ba9cd95 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -276,6 +276,10 @@ func NewTeam(ctx *context.Context) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Team"] = &org_model.Team{}
 	ctx.Data["Units"] = unit_model.Units
+	if err := shared_user.LoadHeaderCount(ctx); err != nil {
+		ctx.ServerError("LoadHeaderCount", err)
+		return
+	}
 	ctx.HTML(http.StatusOK, tplTeamNew)
 }
 
@@ -463,6 +467,10 @@ func EditTeam(ctx *context.Context) {
 		ctx.ServerError("LoadUnits", err)
 		return
 	}
+	if err := shared_user.LoadHeaderCount(ctx); err != nil {
+		ctx.ServerError("LoadHeaderCount", err)
+		return
+	}
 	ctx.Data["Team"] = ctx.Org.Team
 	ctx.Data["Units"] = unit_model.Units
 	ctx.HTML(http.StatusOK, tplTeamNew)

From 3602a1987db58da13ee2baa33bb0c36a60e27608 Mon Sep 17 00:00:00 2001
From: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:00:53 +0800
Subject: [PATCH 4/7] Add border to file tree 'sub-items' and add padding to
 'item-file' (#27593)

## Add border to file tree 'sub-items'
close #24766
view in `gitea-light`
<img width="275" alt="image"
src="https://github.com/go-gitea/gitea/assets/70063547/f1bf8736-2db3-454f-86f5-d050a2fae3eb">
view in `gitea-dark`
<img width="296" alt="image"
src="https://github.com/go-gitea/gitea/assets/70063547/053e2e6e-28f7-41d2-a139-1dae4df45929">
## Change the 'item-file' padding
Before that the 'item-file' only have padding when they in
'item-directory', which is too compact when 'item-file' after
'item-directory'
<details>

![)RW`SDJ_UQL@$}0
PL(3DS7](https://github.com/go-gitea/gitea/assets/70063547/5fa523a4-44c3-4cb9-a882-a3ea6d944673)

---------

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/components/DiffFileTreeItem.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue
index 22c23f3ca0c1d..9d7ab4afc5dad 100644
--- a/web_src/js/components/DiffFileTreeItem.vue
+++ b/web_src/js/components/DiffFileTreeItem.vue
@@ -61,11 +61,12 @@ a, a:hover {
   display: flex;
   flex-direction: column;
   gap: 1px;
-  padding-left: 8px;
+  margin-left: 13px;
+  border-left: 1px solid var(--color-secondary);
 }
 
 .sub-items .item-file {
-  padding-left: 24px;
+  padding-left: 18px;
 }
 
 .item-file.selected {

From f39256f035a561fbd10955ac40ef5ad4b794f47d Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Wed, 25 Oct 2023 19:40:39 +0900
Subject: [PATCH 5/7] Add word-break to organization name and description
 (#26624)

Fix #24318

Before:

![image](https://github.com/go-gitea/gitea/assets/18380374/38282e5e-0b4d-4568-a853-59352798e826)

![image](https://github.com/go-gitea/gitea/assets/18380374/79d89ee6-61f6-45a7-af0b-d1c23fead25a)

![image](https://github.com/go-gitea/gitea/assets/18380374/39b45fae-52e2-4697-b83a-7cd10f76ac43)

After:

![image](https://github.com/go-gitea/gitea/assets/18380374/09e8cfcf-0150-494e-9f63-0868f529da65)

![image](https://github.com/go-gitea/gitea/assets/18380374/d2c348d3-fe03-466a-a5f4-878b7a93a318)

![image](https://github.com/go-gitea/gitea/assets/18380374/7f75b807-300c-42d5-b2c3-bae9e45e3c08)

![image](https://github.com/go-gitea/gitea/assets/18380374/06eca901-f5cf-4100-bb65-92457ad106e3)
---
 templates/org/header.tmpl                     | 2 +-
 templates/org/home.tmpl                       | 2 +-
 templates/shared/user/org_profile_avatar.tmpl | 2 +-
 web_src/css/base.css                          | 1 +
 web_src/css/org.css                           | 1 +
 web_src/css/repo.css                          | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 72adf6d9b5ad4..7b912c1c56946 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -2,7 +2,7 @@
 	<div class="ui container">
 		<div class="ui vertically grid head">
 			<div class="column">
-				<div class="ui header">
+				<div class="ui header gt-df gt-ac gt-word-break">
 					{{ctx.AvatarUtils.Avatar . 100}}
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					<span class="org-visibility">
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index ff4f3a8b1af2b..ee3237d45b02d 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -3,7 +3,7 @@
 	<div class="ui container gt-df">
 		{{ctx.AvatarUtils.Avatar .Org 140 "org-avatar"}}
 		<div id="org-info">
-			<div class="ui header gt-df gt-fw">
+			<div class="ui header">
 				{{.Org.DisplayName}}
 				<span class="org-visibility">
 					{{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl
index b9ade23d050d6..a8846b0abd68e 100644
--- a/templates/shared/user/org_profile_avatar.tmpl
+++ b/templates/shared/user/org_profile_avatar.tmpl
@@ -2,7 +2,7 @@
 	<div class="ui container">
 		<div class="ui vertically grid head">
 			<div class="column">
-				<div class="ui header">
+				<div class="ui header gt-df gt-ac gt-word-break">
 					{{ctx.AvatarUtils.Avatar . 100}}
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					<span class="org-visibility">
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 0cfd311158cf6..ae8eb057090e2 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1411,6 +1411,7 @@ img.ui.avatar,
 .ui.label {
   padding: 0.3em 0.5em;
   transition: none;
+  white-space: nowrap;
 }
 
 .ui.label,
diff --git a/web_src/css/org.css b/web_src/css/org.css
index 061d30bef2c91..d2bf0ff6066ad 100644
--- a/web_src/css/org.css
+++ b/web_src/css/org.css
@@ -102,6 +102,7 @@
 .organization.profile #org-info {
   overflow-wrap: anywhere;
   flex: 1;
+  word-break: break-all;
 }
 
 .organization.profile #org-info .ui.header {
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 7d76dd8b3ffdd..5b532aa495cb7 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2606,6 +2606,7 @@ tbody.commit-list {
   justify-content: space-between;
   flex-wrap: wrap;
   word-break: break-word;
+  gap: 0.5rem;
 }
 
 @media (max-width: 767.98px) {

From 31f8880bc252a25075f8752e2722b316c6e46ec7 Mon Sep 17 00:00:00 2001
From: Gerd Katzenbeisser <hakito@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:12:36 +0200
Subject: [PATCH 6/7] Show placeholder email in privacy popup (#27770)

This PR will show the _noreply_ address in the privacy popup
_keep_email_private_popup_.

I had to look into the source code to figure out which E-Mail Adress I
had to use on gitea.com to hide it from public access.

According to the contribution guidelines I only updated the en-US
translation file.

Co-authored-by: Hakito <hakito@git.example.com>
---
 options/locale/locale_en-US.ini      | 2 +-
 templates/user/settings/profile.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b0c21816ae936..e3f2fcdd839b0 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -729,7 +729,7 @@ add_email_success = The new email address has been added.
 email_preference_set_success = Email preference has been set successfully.
 add_openid_success = The new OpenID address has been added.
 keep_email_private = Hide Email Address
-keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified.
+keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified. Use %s in commits to associate them with your account.
 openid_desc = OpenID lets you delegate authentication to an external provider.
 
 manage_ssh_keys = Manage SSH Keys
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index a508a5e835a57..1f32aed0e88ac 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -73,7 +73,7 @@
 
 				<div class="field">
 					<div class="ui checkbox">
-						<label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup"}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
+						<label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup" .SignedUser.GetPlaceholderEmail}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
 						<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
 					</div>
 				</div>

From 1eae2aadae0583ab092d6ed857bb727829aa52b7 Mon Sep 17 00:00:00 2001
From: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:51:49 +0800
Subject: [PATCH 7/7] Fix issue not showing on default board and add test
 (#27720)

See https://github.com/go-gitea/gitea/pull/27718#issuecomment-1773743014
. Add a test to ensure its behavior.
Why this test uses `ProjectBoardID=0`? Because in `SearchOptions`,
`ProjectBoardID=0` means what it is. But in `IssueOptions`,
`ProjectBoardID=0` means there is no condition, and
`ProjectBoardID=db.NoConditionID` means the board ID = 0.
It's really confusing. Probably it's better to separate the db search
engine and the other issue search code. It's really two different
systems. As far as I can see, `IssueOptions` is not necessary for most
of the code, which has very simple issue search conditions.
---
 models/issues/issue_search.go          | 2 +-
 modules/indexer/issues/indexer_test.go | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
index 9b6bf117b1f84..0bea1fed143b0 100644
--- a/models/issues/issue_search.go
+++ b/models/issues/issue_search.go
@@ -186,7 +186,7 @@ func applyProjectBoardCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.S
 	if opts.ProjectBoardID > 0 {
 		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": opts.ProjectBoardID}))
 	} else if opts.ProjectBoardID == db.NoConditionID {
-		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Neq{"project_board_id": 0}))
+		sess.In("issue.id", builder.Select("issue_id").From("project_issue").Where(builder.Eq{"project_board_id": 0}))
 	}
 	return sess
 }
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index 0ec23164c2808..da4fc9b878999 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -382,6 +382,12 @@ func searchIssueInProject(t *testing.T) {
 			},
 			[]int64{1},
 		},
+		{
+			SearchOptions{
+				ProjectBoardID: int64Pointer(0), // issue with in default board
+			},
+			[]int64{2},
+		},
 	}
 	for _, test := range tests {
 		issueIDs, _, err := SearchIssues(context.TODO(), &test.opts)