Add rebased patches done by Brecht for 1.23.x

I removed the renaming utility script and left the default patch names
for easier lookup.

Author: bartvdbraak

patches/2024-05-10_13-28-51_d4a41bc0eb.patch renamed to patches/0001-BLENDER-Blender-ID-goth-provider.patch

@@ -1,12 +1,12 @@
-From d4a41bc0ebbb015e97e076e6040a3349ee0dab33 Mon Sep 17 00:00:00 2001
+From 8b5a296990a67b35b5fcd9047d79418e31b37f60 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:28:51 +0200
-Subject: [PATCH] BLENDER: Blender ID goth provider
+Subject: [PATCH 01/14] BLENDER: Blender ID goth provider
 
 Provider authored by Matti Ranta and Arnd Marijnissen.
 ---
  go.mod                                        |   1 +
- go.sum                                        |   2 +
+ go.sum                                        |   3 +
  public/assets/img/blenderid.png               |   0
  .../auth/source/oauth2/blenderid/blenderid.go | 181 ++++++++++++++++++
  .../source/oauth2/blenderid/blenderid_test.go |  70 +++++++
@@ -15,7 +15,7 @@ Provider authored by Matti Ranta and Arnd Marijnissen.
  .../auth/source/oauth2/blenderid/session.go   |  66 +++++++
  .../source/oauth2/blenderid/session_test.go   |  51 +++++
  .../auth/source/oauth2/providers_custom.go    |  11 ++
- 10 files changed, 490 insertions(+)
+ 10 files changed, 491 insertions(+)
  create mode 100644 public/assets/img/blenderid.png
  create mode 100644 services/auth/source/oauth2/blenderid/blenderid.go
  create mode 100644 services/auth/source/oauth2/blenderid/blenderid_test.go
@@ -25,36 +25,37 @@ Provider authored by Matti Ranta and Arnd Marijnissen.
  create mode 100644 services/auth/source/oauth2/blenderid/session_test.go
 
 diff --git a/go.mod b/go.mod
-index 8752e6d196a8b..0bfd9342c7fe8 100644
+index d8e7e37152..af00e05199 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -235,6 +235,7 @@ require (
- 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+@@ -258,6 +258,7 @@ require (
+ 	github.com/mmcloughlin/avo v0.6.0 // indirect
  	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  	github.com/modern-go/reflect2 v1.0.2 // indirect
 +	github.com/mozillazg/go-unidecode v0.2.0 // indirect
  	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
  	github.com/mschoch/smat v0.2.0 // indirect
- 	github.com/nwaples/rardecode v1.1.3 // indirect
+ 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 diff --git a/go.sum b/go.sum
-index 6a3e6dc7f645c..d59c282ce0411 100644
+index 968001e7f9..bce9ba2fd7 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -586,6 +586,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
+@@ -590,6 +590,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
  github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
  github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
- github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
++github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 +github.com/mozillazg/go-unidecode v0.2.0 h1:vFGEzAH9KSwyWmXCOblazEWDh7fOkpmy/Z4ArmamSUc=
 +github.com/mozillazg/go-unidecode v0.2.0/go.mod h1:zB48+/Z5toiRolOZy9ksLryJ976VIwmDmpQ2quyt1aA=
  github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUllUJF9mWUESr9TWKS7iEKsQ/IipM=
  github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM=
  github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 diff --git a/public/assets/img/blenderid.png b/public/assets/img/blenderid.png
 new file mode 100644
-index 0000000000000..e69de29bb2d1d
+index 0000000000..e69de29bb2
 diff --git a/services/auth/source/oauth2/blenderid/blenderid.go b/services/auth/source/oauth2/blenderid/blenderid.go
 new file mode 100644
-index 0000000000000..671e5e4f541a5
+index 0000000000..671e5e4f54
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/blenderid.go
 @@ -0,0 +1,181 @@
@@ -241,7 +242,7 @@ index 0000000000000..671e5e4f541a5
 +}
 diff --git a/services/auth/source/oauth2/blenderid/blenderid_test.go b/services/auth/source/oauth2/blenderid/blenderid_test.go
 new file mode 100644
-index 0000000000000..2bf4c443d86ff
+index 0000000000..2bf4c443d8
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/blenderid_test.go
 @@ -0,0 +1,70 @@
@@ -317,7 +318,7 @@ index 0000000000000..2bf4c443d86ff
 +}
 diff --git a/services/auth/source/oauth2/blenderid/gitealize_usernames.go b/services/auth/source/oauth2/blenderid/gitealize_usernames.go
 new file mode 100644
-index 0000000000000..880516c8e28f1
+index 0000000000..880516c8e2
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/gitealize_usernames.go
 @@ -0,0 +1,65 @@
@@ -388,7 +389,7 @@ index 0000000000000..880516c8e28f1
 +}
 diff --git a/services/auth/source/oauth2/blenderid/gitealize_usernames_test.go b/services/auth/source/oauth2/blenderid/gitealize_usernames_test.go
 new file mode 100644
-index 0000000000000..7d633198e8886
+index 0000000000..7d633198e8
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/gitealize_usernames_test.go
 @@ -0,0 +1,43 @@
@@ -437,7 +438,7 @@ index 0000000000000..7d633198e8886
 +}
 diff --git a/services/auth/source/oauth2/blenderid/session.go b/services/auth/source/oauth2/blenderid/session.go
 new file mode 100644
-index 0000000000000..52a2d2174584c
+index 0000000000..52a2d21745
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/session.go
 @@ -0,0 +1,66 @@
@@ -509,7 +510,7 @@ index 0000000000000..52a2d2174584c
 +}
 diff --git a/services/auth/source/oauth2/blenderid/session_test.go b/services/auth/source/oauth2/blenderid/session_test.go
 new file mode 100644
-index 0000000000000..ab7fb974a5772
+index 0000000000..ab7fb974a5
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/session_test.go
 @@ -0,0 +1,51 @@
@@ -565,15 +566,15 @@ index 0000000000000..ab7fb974a5772
 +	a.Equal(s.String(), s.Marshal())
 +}
 diff --git a/services/auth/source/oauth2/providers_custom.go b/services/auth/source/oauth2/providers_custom.go
-index 65cf538ad7386..f6f49ada048aa 100644
+index 65cf538ad7..f6f49ada04 100644
 --- a/services/auth/source/oauth2/providers_custom.go
 +++ b/services/auth/source/oauth2/providers_custom.go
 @@ -5,6 +5,7 @@ package oauth2
-
+ 
  import (
  	"code.gitea.io/gitea/modules/setting"
 +	"code.gitea.io/gitea/services/auth/source/oauth2/blenderid"
-
+ 
  	"github.com/markbates/goth"
  	"github.com/markbates/goth/providers/azureadv2"
 @@ -120,4 +121,14 @@ func init() {
@@ -591,3 +592,6 @@ index 65cf538ad7386..f6f49ada048aa 100644
 +			return blenderid.NewCustomisedURL(clientID, secret, callbackURL, custom.AuthURL, custom.TokenURL, custom.ProfileURL, scopes...), nil
 +		}))
  }
+-- 
+2.45.2
+

patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch

@@ -0,0 +1,25 @@
+From d29a40511fe4390c5d846eb2be28d1e5791c0aae Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel <[email protected]>
+Date: Fri, 10 May 2024 13:31:35 +0200
+Subject: [PATCH 02/14] BLENDER: Show warning for target branch switching
+
+---
+ templates/repo/issue/view_title.tmpl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
+index bf2ede58e4..610a4e4a3e 100644
+--- a/templates/repo/issue/view_title.tmpl
++++ b/templates/repo/issue/view_title.tmpl
+@@ -118,6 +118,8 @@
+ 								</div>
+ 							</div>
+ 						</div>
++						<br/>
++						<div class="desc" style="display: flex;"><br/>Remember to rebase the branch in your fork, see&nbsp;<a href="https://wiki.blender.org/wiki/Tools/Pull_Requests">documentation</a>.</div>
+ 					</span>
+ 				{{end}}
+ 			{{else}}
+-- 
+2.45.2
+

patches/2024-05-10_13-32-53_f9da0329b6.patch renamed to patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch

@@ -1,8 +1,8 @@
-From f9da0329b6346178355e6337215882e1a0cc0369 Mon Sep 17 00:00:00 2001
+From 37d72a57067e955cdc886ddd527a55c371b01bde Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:32:53 +0200
-Subject: [PATCH] BLENDER: Workaround LFS files not being available in pull
- requests
+Subject: [PATCH 03/14] BLENDER: Workaround LFS files not being available in
+ pull requests
 
 Patch taken from issue number 17715, associating the LFS pointer when the
 file is downloaded.
@@ -12,11 +12,11 @@ file is downloaded.
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/models/git/lfs.go b/models/git/lfs.go
-index 837dc9fd312f5..b52208a77f5d8 100644
+index bb6361050a..83a2e7883d 100644
 --- a/models/git/lfs.go
 +++ b/models/git/lfs.go
-@@ -238,7 +238,7 @@ func CountLFSMetaObjects(ctx context.Context, repoID int64) (int64, error) {
-
+@@ -236,7 +236,7 @@ func CountLFSMetaObjects(ctx context.Context, repoID int64) (int64, error) {
+ 
  // LFSObjectAccessible checks if a provided Oid is accessible to the user
  func LFSObjectAccessible(ctx context.Context, user *user_model.User, oid string) (bool, error) {
 -	if user.IsAdmin {
@@ -25,10 +25,10 @@ index 837dc9fd312f5..b52208a77f5d8 100644
  		return count > 0, err
  	}
 diff --git a/services/lfs/server.go b/services/lfs/server.go
-index ace501e15f0df..e5873e8c38a86 100644
+index a77623fdc1..c45c1937ec 100644
 --- a/services/lfs/server.go
 +++ b/services/lfs/server.go
-@@ -246,6 +246,26 @@ func BatchHandler(ctx *context.Context) {
+@@ -251,6 +251,26 @@ func BatchHandler(ctx *context.Context) {
  			responseObject = buildObjectResponse(rc, p, false, !exists, err)
  		} else {
  			var err *lfs_module.ObjectError
@@ -55,3 +55,6 @@ index ace501e15f0df..e5873e8c38a86 100644
  			if !exists || meta == nil {
  				err = &lfs_module.ObjectError{
  					Code:    http.StatusNotFound,
+-- 
+2.45.2
+

patches/2024-05-10_13-33-32_8d0600f7eb.patch renamed to patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch

@@ -1,7 +1,7 @@
-From 8d0600f7eb914d9629e78b8f5250fb9307d2dd43 Mon Sep 17 00:00:00 2001
+From ff4fd9166ac3c8cc099ab35968e23096ec0525a4 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <[email protected]>
 Date: Fri, 10 May 2024 13:33:32 +0200
-Subject: [PATCH] BLENDER: Don't allow assigning large teams as reviewers
+Subject: [PATCH 04/14] BLENDER: Don't allow assigning large teams as reviewers
 
 To avoid accidentally spamming hundreds of people.
 ---
@@ -35,10 +35,10 @@ index fb7f0c0493..be56a0428e 100644
 +	return smallTeams, nil
 +}
 diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
-index 3fdf594045..2f3660178c 100644
+index 5397411b59..abf7f457e9 100644
 --- a/routers/web/repo/issue.go
 +++ b/routers/web/repo/issue.go
-@@ -3670,13 +3670,13 @@ func handleTeamMentions(ctx *context.Context) {
+@@ -661,13 +661,13 @@ func handleMentionableAssigneesAndTeams(ctx *context.Context, assignees []*user_
  	}
 
  	if isAdmin {

patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch

@@ -0,0 +1,153 @@
+From 6d833f20e2bff71d1a7bce47a934700fdfc15738 Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel <[email protected]>
+Date: Fri, 10 May 2024 13:58:05 +0200
+Subject: [PATCH 05/14] BLENDER: Support both exclusive and non-exclusive scope
+ for labels
+
+---
+ models/issues/label.go                       | 15 ++++++++++-----
+ modules/templates/util_render.go             |  2 +-
+ templates/repo/issue/filter_actions.tmpl     | 10 +++++-----
+ templates/repo/issue/filter_item_label.tmpl  | 10 +++++-----
+ templates/repo/issue/sidebar/label_list.tmpl | 14 ++++++++------
+ 5 files changed, 29 insertions(+), 22 deletions(-)
+
+diff --git a/models/issues/label.go b/models/issues/label.go
+index b9d24bbe99..6eb8a888e9 100644
+--- a/models/issues/label.go
++++ b/models/issues/label.go
+@@ -183,11 +183,8 @@ func (l *Label) BelongsToRepo() bool {
+ 	return l.RepoID > 0
+ }
+ 
+-// ExclusiveScope returns scope substring of label name, or empty string if none exists
+-func (l *Label) ExclusiveScope() string {
+-	if !l.Exclusive {
+-		return ""
+-	}
++// Return scope substring of label name, or empty string if none exists
++func (l *Label) Scope() string {
+ 	lastIndex := strings.LastIndex(l.Name, "/")
+ 	if lastIndex == -1 || lastIndex == 0 || lastIndex == len(l.Name)-1 {
+ 		return ""
+@@ -195,6 +192,14 @@ func (l *Label) ExclusiveScope() string {
+ 	return l.Name[:lastIndex]
+ }
+ 
++// ExclusiveScope returns scope substring of label name, or empty string if none exists
++func (l *Label) ExclusiveScope() string {
++	if !l.Exclusive {
++		return ""
++	}
++	return l.Scope()
++}
++
+ // NewLabel creates a new label
+ func NewLabel(ctx context.Context, l *Label) error {
+ 	color, err := label.NormalizeColor(l.Color)
+diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
+index 1800747f48..ee1b231f2b 100644
+--- a/modules/templates/util_render.go
++++ b/modules/templates/util_render.go
+@@ -126,7 +126,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
+ 	locale := ut.ctx.Value(translation.ContextKey).(translation.Locale)
+ 	var extraCSSClasses string
+ 	textColor := util.ContrastColor(label.Color)
+-	labelScope := label.ExclusiveScope()
++	labelScope := label.Scope()
+ 	descriptionText := emoji.ReplaceAliases(label.Description)
+ 
+ 	if label.IsArchived() {
+diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl
+index 8e2410393d..0d196d1f87 100644
+--- a/templates/repo/issue/filter_actions.tmpl
++++ b/templates/repo/issue/filter_actions.tmpl
+@@ -22,15 +22,15 @@
+ 				<div class="item issue-action" data-action="clear" data-url="{{$.RepoLink}}/issues/labels">
+ 					{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}
+ 				</div>
+-				{{$previousExclusiveScope := "_no_scope"}}
++				{{$previousScope := "_no_scope"}}
+ 				{{range .Labels}}
+-					{{$exclusiveScope := .ExclusiveScope}}
+-					{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
++					{{$scope := .Scope}}
++					{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
+ 						<div class="divider"></div>
+ 					{{end}}
+-					{{$previousExclusiveScope = $exclusiveScope}}
++					{{$previousScope = $scope}}
+ 					<div class="item issue-action tw-flex tw-justify-between" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
+-						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg (Iif $exclusiveScope "octicon-dot-fill" "octicon-check")}}{{end}} {{ctx.RenderUtils.RenderLabel .}}
++						{{if SliceUtils.Contains $.SelLabelIDs .ID}}{{svg (Iif .ExclusiveScope "octicon-dot-fill" "octicon-check")}}{{end}} {{ctx.RenderUtils.RenderLabel .}}
+ 						{{template "repo/issue/labels/label_archived" .}}
+ 					</div>
+ 				{{end}}
+diff --git a/templates/repo/issue/filter_item_label.tmpl b/templates/repo/issue/filter_item_label.tmpl
+index 88e2e43120..ee569b4fd0 100644
+--- a/templates/repo/issue/filter_item_label.tmpl
++++ b/templates/repo/issue/filter_item_label.tmpl
+@@ -26,19 +26,19 @@
+ 		{{/* The logic here is not the same as the label selector in the issue sidebar.
+ 		The one in the issue sidebar renders "repo labels | divider | org labels".
+ 		Maybe the logic should be updated to be consistent.*/}}
+-		{{$previousExclusiveScope := "_no_scope"}}
++		{{$previousScope := "_no_scope"}}
+ 		{{range .Labels}}
+-			{{$exclusiveScope := .ExclusiveScope}}
+-			{{if and (ne $previousExclusiveScope $exclusiveScope)}}
++			{{$scope := .Scope}}
++			{{if and (ne $previousScope $scope)}}
+ 				<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
+ 			{{end}}
+-			{{$previousExclusiveScope = $exclusiveScope}}
++			{{$previousScope = $scope}}
+ 			<a class="item label-filter-query-item" data-label-id="{{.ID}}" data-scope="{{.ExclusiveScope}}" {{if .IsArchived}}data-is-archived{{end}}
+ 				href="{{QueryBuild $queryLink "labels" .QueryString}}">
+ 				{{if .IsExcluded}}
+ 					{{svg "octicon-circle-slash"}}
+ 				{{else if .IsSelected}}
+-					{{Iif $exclusiveScope (svg "octicon-dot-fill") (svg "octicon-check")}}
++					{{Iif .ExclusiveScope (svg "octicon-dot-fill") (svg "octicon-check")}}
+ 				{{end}}
+ 				{{ctx.RenderUtils.RenderLabel .}}
+ 				<p class="tw-ml-auto">{{template "repo/issue/labels/label_archived" .}}</p>
+diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl
+index 9dd83ba188..124e3a1bc6 100644
+--- a/templates/repo/issue/sidebar/label_list.tmpl
++++ b/templates/repo/issue/sidebar/label_list.tmpl
+@@ -18,23 +18,25 @@
+ 				</div>
+ 				<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
+ 				<div class="scrolling menu">
+-					{{$previousExclusiveScope := "_no_scope"}}
++					{{$previousScope := "_no_scope"}}
+ 					{{range $data.RepoLabels}}
++						{{$scope := .Scope}}
+ 						{{$exclusiveScope := .ExclusiveScope}}
+-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
++						{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
+ 							<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
+ 						{{end}}
+-						{{$previousExclusiveScope = $exclusiveScope}}
++						{{$previousScope = $scope}}
+ 						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
+ 					{{end}}
+ 					{{if and $data.RepoLabels $data.OrgLabels}}<div class="divider"></div>{{end}}
+-					{{$previousExclusiveScope = "_no_scope"}}
++					{{$previousScope = "_no_scope"}}
+ 					{{range $data.OrgLabels}}
++						{{$scope := .Scope}}
+ 						{{$exclusiveScope := .ExclusiveScope}}
+-						{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
++						{{if and (ne $previousScope "_no_scope") (ne $previousScope $scope)}}
+ 							<div class="divider" data-scope="{{.ExclusiveScope}}"></div>
+ 						{{end}}
+-						{{$previousExclusiveScope = $exclusiveScope}}
++						{{$previousScope = $scope}}
+ 						{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
+ 					{{end}}
+ 				</div>
+-- 
+2.45.2
+