Skip to content

Commit 2c0144e

Browse files
bartvdbraakbartvdbraak
committed
Changes and omissions for supporting upstream version v1.24.0
1 parent bdbdf73 commit 2c0144e

19 files changed

+133
-2437
lines changed

‎patches/0001-BLENDER-Blender-ID-goth-provider.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From e9a48aadbffbb3002311cc6e947053030ee9ecc5 Mon Sep 17 00:00:00 2001
1+
From 2a38c0ff763476a3bfbabe2a9b0431a13bde947e Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 13:28:51 +0200
4-
Subject: [PATCH 01/18] BLENDER: Blender ID goth provider
4+
Subject: [PATCH 01/17] BLENDER: Blender ID goth provider
55

66
Provider authored by Matti Ranta and Arnd Marijnissen.
77
---
@@ -25,22 +25,22 @@ Provider authored by Matti Ranta and Arnd Marijnissen.
2525
create mode 100644 services/auth/source/oauth2/blenderid/session_test.go
2626

2727
diff --git a/go.mod b/go.mod
28-
index 1ca481e073..086701b536 100644
28+
index f6d079dbbb..683ce90aa8 100644
2929
--- a/go.mod
3030
+++ b/go.mod
3131
@@ -257,6 +257,7 @@ require (
32-
github.com/mmcloughlin/avo v0.6.0 // indirect
32+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3333
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3434
github.com/modern-go/reflect2 v1.0.2 // indirect
3535
+ github.com/mozillazg/go-unidecode v0.2.0 // indirect
3636
github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
3737
github.com/mschoch/smat v0.2.0 // indirect
3838
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3939
diff --git a/go.sum b/go.sum
40-
index ebf40cb628..aed57d8836 100644
40+
index 9b200cc2d9..2bc60270c1 100644
4141
--- a/go.sum
4242
+++ b/go.sum
43-
@@ -589,6 +589,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
43+
@@ -590,6 +590,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
4444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
4545
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
4646
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 928a045c583cc4f0c631925e848a81446728f52b Mon Sep 17 00:00:00 2001
1+
From f7e10e1b5bf2cb41fa9423ddfff56ab11431a102 Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 13:31:35 +0200
4-
Subject: [PATCH 02/18] BLENDER: Show warning for target branch switching
4+
Subject: [PATCH 02/17] BLENDER: Show warning for target branch switching
55

66
---
77
templates/repo/issue/view_title.tmpl | 1 +
88
1 file changed, 1 insertion(+)
99

1010
diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
11-
index 7bb00ff9a9..19a4331883 100644
11+
index b8f28dfd9b..27be7ed334 100644
1212
--- a/templates/repo/issue/view_title.tmpl
1313
+++ b/templates/repo/issue/view_title.tmpl
1414
@@ -118,6 +118,7 @@

‎patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From e19c11cbfe0e7f278aae17cd512560cfc237c00d Mon Sep 17 00:00:00 2001
1+
From 8d9d04e240a0c42a20c5d96c4f20d15e620f966c Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 13:32:53 +0200
4-
Subject: [PATCH 03/18] BLENDER: Workaround LFS files not being available in
4+
Subject: [PATCH 03/17] BLENDER: Workaround LFS files not being available in
55
pull requests
66

77
Patch taken from issue number 17715, associating the LFS pointer when the
@@ -25,10 +25,10 @@ index bb6361050a..83a2e7883d 100644
2525
return count > 0, err
2626
}
2727
diff --git a/services/lfs/server.go b/services/lfs/server.go
28-
index c4866edaab..1fa2b7a67f 100644
28+
index 0a99287ed9..40456cbbbb 100644
2929
--- a/services/lfs/server.go
3030
+++ b/services/lfs/server.go
31-
@@ -253,6 +253,26 @@ func BatchHandler(ctx *context.Context) {
31+
@@ -254,6 +254,26 @@ func BatchHandler(ctx *context.Context) {
3232
responseObject = buildObjectResponse(rc, p, false, !exists, err)
3333
} else {
3434
var err *lfs_module.ObjectError

‎patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From a0a9521bb42deea2ca46a65f64ddc95a5db795f3 Mon Sep 17 00:00:00 2001
1+
From 7893019d4203913b0e75b0e4debc599054969125 Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 13:33:32 +0200
4-
Subject: [PATCH 04/18] BLENDER: Don't allow assigning large teams as reviewers
4+
Subject: [PATCH 04/17] BLENDER: Don't allow assigning large teams as reviewers
55

66
To avoid accidentally spamming hundreds of people.
77
---
@@ -11,10 +11,10 @@ To avoid accidentally spamming hundreds of people.
1111
3 files changed, 19 insertions(+), 3 deletions(-)
1212

1313
diff --git a/models/organization/team.go b/models/organization/team.go
14-
index fb7f0c0493..be56a0428e 100644
14+
index 7f3a9b3829..f0717faf2e 100644
1515
--- a/models/organization/team.go
1616
+++ b/models/organization/team.go
17-
@@ -272,3 +272,19 @@ func IncrTeamRepoNum(ctx context.Context, teamID int64) error {
17+
@@ -247,3 +247,19 @@ func IncrTeamRepoNum(ctx context.Context, teamID int64) error {
1818
_, err := db.GetEngine(ctx).Incr("num_repos").ID(teamID).Update(new(Team))
1919
return err
2020
}
@@ -35,10 +35,10 @@ index fb7f0c0493..be56a0428e 100644
3535
+ return smallTeams, nil
3636
+}
3737
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
38-
index 5397411b59..abf7f457e9 100644
38+
index a4747964c6..97086a363b 100644
3939
--- a/routers/web/repo/issue.go
4040
+++ b/routers/web/repo/issue.go
41-
@@ -661,13 +661,13 @@ func handleMentionableAssigneesAndTeams(ctx *context.Context, assignees []*user_
41+
@@ -673,13 +673,13 @@ func handleMentionableAssigneesAndTeams(ctx *context.Context, assignees []*user_
4242
}
4343

4444
if isAdmin {

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 21206ca6201d4b510cffc0068aabd785f5864850 Mon Sep 17 00:00:00 2001
1+
From a6b1b4b3516ec833c4ebf737b60ab8ff45562921 Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 13:58:05 +0200
4-
Subject: [PATCH 05/18] BLENDER: Support both exclusive and non-exclusive scope
4+
Subject: [PATCH 05/17] BLENDER: Support both exclusive and non-exclusive scope
55
for labels
66

77
---
@@ -13,10 +13,10 @@ Subject: [PATCH 05/18] BLENDER: Support both exclusive and non-exclusive scope
1313
5 files changed, 29 insertions(+), 22 deletions(-)
1414

1515
diff --git a/models/issues/label.go b/models/issues/label.go
16-
index b9d24bbe99..6eb8a888e9 100644
16+
index cfbe100926..cb7726aa71 100644
1717
--- a/models/issues/label.go
1818
+++ b/models/issues/label.go
19-
@@ -183,11 +183,8 @@ func (l *Label) BelongsToRepo() bool {
19+
@@ -184,11 +184,8 @@ func (l *Label) BelongsToRepo() bool {
2020
return l.RepoID > 0
2121
}
2222

@@ -30,7 +30,7 @@ index b9d24bbe99..6eb8a888e9 100644
3030
lastIndex := strings.LastIndex(l.Name, "/")
3131
if lastIndex == -1 || lastIndex == 0 || lastIndex == len(l.Name)-1 {
3232
return ""
33-
@@ -195,6 +192,14 @@ func (l *Label) ExclusiveScope() string {
33+
@@ -196,6 +193,14 @@ func (l *Label) ExclusiveScope() string {
3434
return l.Name[:lastIndex]
3535
}
3636

@@ -46,10 +46,10 @@ index b9d24bbe99..6eb8a888e9 100644
4646
func NewLabel(ctx context.Context, l *Label) error {
4747
color, err := label.NormalizeColor(l.Color)
4848
diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go
49-
index 1800747f48..ee1b231f2b 100644
49+
index 8d9ba1000c..53a16944af 100644
5050
--- a/modules/templates/util_render.go
5151
+++ b/modules/templates/util_render.go
52-
@@ -126,7 +126,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
52+
@@ -127,7 +127,7 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
5353
locale := ut.ctx.Value(translation.ContextKey).(translation.Locale)
5454
var extraCSSClasses string
5555
textColor := util.ContrastColor(label.Color)
@@ -84,7 +84,7 @@ index 8e2410393d..0d196d1f87 100644
8484
</div>
8585
{{end}}
8686
diff --git a/templates/repo/issue/filter_item_label.tmpl b/templates/repo/issue/filter_item_label.tmpl
87-
index 88e2e43120..ee569b4fd0 100644
87+
index 0883d93804..11a3ddcc6f 100644
8888
--- a/templates/repo/issue/filter_item_label.tmpl
8989
+++ b/templates/repo/issue/filter_item_label.tmpl
9090
@@ -26,19 +26,19 @@
@@ -113,12 +113,12 @@ index 88e2e43120..ee569b4fd0 100644
113113
{{ctx.RenderUtils.RenderLabel .}}
114114
<p class="tw-ml-auto">{{template "repo/issue/labels/label_archived" .}}</p>
115115
diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl
116-
index 9b6195a8f4..c8310203c4 100644
116+
index ed514f6725..2b3255371a 100644
117117
--- a/templates/repo/issue/sidebar/label_list.tmpl
118118
+++ b/templates/repo/issue/sidebar/label_list.tmpl
119119
@@ -19,23 +19,25 @@
120120
<div class="scrolling menu">
121-
<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
121+
<a class="item clear-selection" data-text="" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
122122
<div class="divider"></div>
123123
- {{$previousExclusiveScope := "_no_scope"}}
124124
+ {{$previousScope := "_no_scope"}}

‎patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
From dc145e6f21466387dde81ce41664c4100ee271bb Mon Sep 17 00:00:00 2001
1+
From d424d073fb21437c7ab2b47716e52ccca1af1ef4 Mon Sep 17 00:00:00 2001
22
From: Brecht Van Lommel <[email protected]>
33
Date: Fri, 10 May 2024 14:00:36 +0200
4-
Subject: [PATCH 06/18] BLENDER: Projects: button to show/hide issue details
4+
Subject: [PATCH 06/17] BLENDER: Projects: button to show/hide issue details
55
and closed issue
66

77
Both are off by default. This is implemented fully on the frontend, so
88
all issues and their details are still always loaded.
99
---
1010
templates/projects/view.tmpl | 43 ++++++++++++++++++++++++++++++-
1111
templates/repo/issue/card.tmpl | 25 ++++++++++--------
12-
web_src/css/features/projects.css | 2 +-
12+
web_src/css/features/projects.css | 8 ++++++
1313
web_src/css/repo/issue-card.css | 2 ++
14-
4 files changed, 59 insertions(+), 13 deletions(-)
14+
4 files changed, 66 insertions(+), 12 deletions(-)
1515

1616
diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
17-
index 217ffe6355..9640deee94 100644
17+
index 7e89db0005..413f306585 100644
1818
--- a/templates/projects/view.tmpl
1919
+++ b/templates/projects/view.tmpl
20-
@@ -19,6 +19,16 @@
21-
"TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee")
22-
}}
23-
</div>
20+
@@ -17,6 +17,16 @@
21+
"TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee")
22+
}}
23+
</div>
2424
+ <div class="ui compact mini menu" style="margin-left: auto; margin-right: 1em;">
2525
+ <button class="item btn" onclick="clickDetailsView()">
2626
+ <span class="issue-card-details">Show Details</span>
@@ -33,8 +33,8 @@ index 217ffe6355..9640deee94 100644
3333
+ </div>
3434
{{if $canWriteProject}}
3535
<div class="ui compact mini menu">
36-
<a class="item" href="{{.Link}}/edit?redirect=project">
37-
@@ -168,7 +178,7 @@
36+
<a class="item screen-full">
37+
@@ -112,7 +122,7 @@
3838
<div class="divider"{{if .Color}} style="color: {{ContrastColor .Color}} !important"{{end}}></div>
3939
<div class="ui cards" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
4040
{{range (index $.IssuesMap .ID)}}
@@ -43,7 +43,7 @@ index 217ffe6355..9640deee94 100644
4343
{{template "repo/issue/card" (dict "Issue" . "Page" $)}}
4444
</div>
4545
{{end}}
46-
@@ -178,6 +188,37 @@
46+
@@ -122,6 +132,37 @@
4747
</div>
4848
</div>
4949

@@ -78,11 +78,11 @@ index 217ffe6355..9640deee94 100644
7878
+ }
7979
+</script>
8080
+
81-
{{if .CanWriteProjects}}
82-
<div class="ui g-modal-confirm delete modal">
83-
<div class="header">
81+
{{if $canWriteProject}}
82+
<div class="ui small modal" id="project-column-modal-edit">
83+
<div class="header">edit</div>
8484
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl
85-
index 2e19e86d7a..e27cf1cbb7 100644
85+
index 41fe6cea8f..99d77f4adf 100644
8686
--- a/templates/repo/issue/card.tmpl
8787
+++ b/templates/repo/issue/card.tmpl
8888
@@ -10,6 +10,14 @@
@@ -124,7 +124,7 @@ index 2e19e86d7a..e27cf1cbb7 100644
124124
{{range index $.Page.LinkedPRs .ID}}
125125
- <div class="meta tw-my-1">
126126
+ <div class="meta tw-my-1 issue-card-details tw-hidden">
127-
<a href="{{$.Issue.Repo.Link}}/pulls/{{.Index}}">
127+
<a href="{{.Repo.Link}}/pulls/{{.Index}}">
128128
<span class="tw-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "tw-mr-1 tw-align-middle"}}</span>
129129
<span class="tw-align-middle">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
130130
@@ -54,25 +62,20 @@
@@ -157,18 +157,24 @@ index 2e19e86d7a..e27cf1cbb7 100644
157157
{{end}}
158158
{{end}}
159159
diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css
160-
index ef3b036217..ca5057118f 100644
160+
index 1d09e9c7ea..b6bd1d250d 100644
161161
--- a/web_src/css/features/projects.css
162162
+++ b/web_src/css/features/projects.css
163-
@@ -16,7 +16,7 @@
164-
padding: 0.5rem !important;
165-
width: 320px;
166-
height: initial;
167-
- min-height: max(calc(100vh - 400px), 300px);
163+
@@ -19,6 +19,14 @@
164+
}
165+
166+
.project-column {
167+
+ background-color: var(--color-project-column-bg) !important;
168+
+ border: 1px solid var(--color-secondary) !important;
169+
+ border-radius: var(--border-radius);
170+
+ margin: 0 0.5rem !important;
171+
+ padding: 0.5rem !important;
172+
+ width: 320px;
173+
+ height: initial;
168174
+ min-height: max(calc(100vh - 225px), 300px);
169175
flex: 0 0 auto;
170-
overflow: visible;
171176
display: flex;
177+
flex-direction: column;
172178
diff --git a/web_src/css/repo/issue-card.css b/web_src/css/repo/issue-card.css
173179
index fb832bd05a..4fb9b42f46 100644
174180
--- a/web_src/css/repo/issue-card.css

0 commit comments

Comments
 (0)