diff --git a/patches/0001-BLENDER-Blender-ID-goth-provider.patch b/patches/0001-BLENDER-Blender-ID-goth-provider.patch index bd0cd775556c8..06436bb24742b 100644 --- a/patches/0001-BLENDER-Blender-ID-goth-provider.patch +++ b/patches/0001-BLENDER-Blender-ID-goth-provider.patch @@ -1,7 +1,7 @@ -From 10205667dc82b937bd956945be551edb4509e3fb Mon Sep 17 00:00:00 2001 +From ab305db7214f442a80ce6df7ed714ae3cae00e0b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 13:28:51 +0200 -Subject: [PATCH 01/19] BLENDER: Blender ID goth provider +Subject: [PATCH 01/22] BLENDER: Blender ID goth provider Provider authored by Matti Ranta and Arnd Marijnissen. --- @@ -25,11 +25,11 @@ 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 e4c0a5a989..120fe31c15 100644 +index a2b35f48e0..8e4601f498 100644 --- a/go.mod +++ b/go.mod -@@ -237,6 +237,7 @@ require ( - github.com/mitchellh/mapstructure v1.5.0 // indirect +@@ -233,6 +233,7 @@ require ( + github.com/minio/minlz v1.1.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 @@ -37,10 +37,10 @@ index e4c0a5a989..120fe31c15 100644 github.com/mschoch/smat v0.2.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect diff --git a/go.sum b/go.sum -index d5ea5f6663..ebb4d17d32 100644 +index 5b228a00f4..41ddeffe56 100644 --- a/go.sum +++ b/go.sum -@@ -599,6 +599,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w +@@ -549,6 +549,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= @@ -593,5 +593,5 @@ index 65cf538ad7..f6f49ada04 100644 + })) } -- -2.51.0 +2.47.3 diff --git a/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch b/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch index 5b31bc82a90f1..6d89ddc9ca8df 100644 --- a/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch +++ b/patches/0002-BLENDER-Show-warning-for-target-branch-switching.patch @@ -1,7 +1,7 @@ -From a9d7f0bcc2c5b0f366c0fb9b7f179ddbb4d52e6b Mon Sep 17 00:00:00 2001 +From c63e94599a05b3d79b4f730295b0914b7c8ef4ae Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 13:31:35 +0200 -Subject: [PATCH 02/19] BLENDER: Show warning for target branch switching +Subject: [PATCH 02/22] BLENDER: Show warning for target branch switching --- templates/repo/issue/view_title.tmpl | 1 + @@ -20,5 +20,5 @@ index 103fa5de53..f67531d055 100644 {{end}} {{else}} -- -2.51.0 +2.47.3 diff --git a/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch b/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch index 58f6df6fcc5e1..91646c5f5f8a5 100644 --- a/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch +++ b/patches/0003-BLENDER-Workaround-LFS-files-not-being-available-in-.patch @@ -1,7 +1,7 @@ -From c167bf3727880b2ea354407127cdad0db68bd903 Mon Sep 17 00:00:00 2001 +From 4b2c9eb6995284aae06962d33beb6a0fe65414ff Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 13:32:53 +0200 -Subject: [PATCH 03/19] BLENDER: Workaround LFS files not being available in +Subject: [PATCH 03/22] BLENDER: Workaround LFS files not being available in pull requests Patch taken from issue number 17715, associating the LFS pointer when the @@ -12,10 +12,10 @@ file is downloaded. 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/models/git/lfs.go b/models/git/lfs.go -index 8bba060ff9..2f2f13254e 100644 +index 1f3d086ac2..3a33c46ae9 100644 --- a/models/git/lfs.go +++ b/models/git/lfs.go -@@ -223,7 +223,7 @@ func CountLFSMetaObjects(ctx context.Context, repoID int64) (int64, error) { +@@ -192,7 +192,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) { @@ -25,10 +25,10 @@ index 8bba060ff9..2f2f13254e 100644 return count > 0, err } diff --git a/services/lfs/server.go b/services/lfs/server.go -index 4a1e0aaf7d..58c05fa760 100644 +index 26eb4878c6..e0b3dd136e 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go -@@ -285,6 +285,26 @@ func BatchHandler(ctx *context.Context) { +@@ -284,6 +284,26 @@ func BatchHandler(ctx *context.Context) { responseObject = buildObjectResponse(rc, p, false, !exists, err) } else { var err *lfs_module.ObjectError @@ -56,5 +56,5 @@ index 4a1e0aaf7d..58c05fa760 100644 err = &lfs_module.ObjectError{ Code: http.StatusNotFound, -- -2.51.0 +2.47.3 diff --git a/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch b/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch index 33f439a3dd0de..fb609804d32f1 100644 --- a/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch +++ b/patches/0004-BLENDER-Don-t-allow-assigning-large-teams-as-reviewe.patch @@ -1,13 +1,13 @@ -From bc9cfc7e3eebf9217902a6931aa6e0e409384706 Mon Sep 17 00:00:00 2001 +From 1a64ab3dc14b7625ce6b7dbe1d829f0bd450414a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 13:33:32 +0200 -Subject: [PATCH 04/19] BLENDER: Don't allow assigning large teams as reviewers +Subject: [PATCH 04/22] BLENDER: Don't allow assigning large teams as reviewers To avoid accidentally spamming hundreds of people. --- - models/organization/team.go | 16 ++++++++++++++++ - routers/web/repo/issue.go | 4 ++-- - services/pull/reviewer.go | 2 +- + models/organization/team.go | 16 ++++++++++++++++ + routers/web/shared/mention/mention.go | 4 ++-- + services/pull/reviewer.go | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/models/organization/team.go b/models/organization/team.go @@ -34,31 +34,27 @@ index 7f3a9b3829..f0717faf2e 100644 + + return smallTeams, nil +} -diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go -index 54b7e5df2a..ec2d9c0131 100644 ---- a/routers/web/repo/issue.go -+++ b/routers/web/repo/issue.go -@@ -673,13 +673,13 @@ func handleMentionableAssigneesAndTeams(ctx *context.Context, assignees []*user_ - } - +diff --git a/routers/web/shared/mention/mention.go b/routers/web/shared/mention/mention.go +index 5f163cb146..e02da20de6 100644 +--- a/routers/web/shared/mention/mention.go ++++ b/routers/web/shared/mention/mention.go +@@ -65,9 +65,9 @@ func (c *Collector) AddMentionableTeams(ctx context.Context, doer, owner *user_m + var teams []*organization.Team + var err error if isAdmin { - teams, err = org.LoadTeams(ctx) + teams, err = organization.FilterLargeTeams(org.LoadTeams(ctx)) - if err != nil { - ctx.ServerError("LoadTeams", err) - return - } } else { -- teams, err = org.GetUserTeams(ctx, ctx.Doer.ID) -+ teams, err = organization.FilterLargeTeams(org.GetUserTeams(ctx, ctx.Doer.ID)) - if err != nil { - ctx.ServerError("GetUserTeams", err) - return +- teams, err = org.GetUserTeams(ctx, doer.ID) ++ teams, err = organization.FilterLargeTeams(org.GetUserTeams(ctx, doer.ID)) + } + if err != nil { + return err diff --git a/services/pull/reviewer.go b/services/pull/reviewer.go -index 52f2f3401c..8794a787fc 100644 +index 139aeeb950..d7f8d3dc9b 100644 --- a/services/pull/reviewer.go +++ b/services/pull/reviewer.go -@@ -85,5 +85,5 @@ func GetReviewerTeams(ctx context.Context, repo *repo_model.Repository) ([]*orga +@@ -78,5 +78,5 @@ func GetReviewerTeams(ctx context.Context, repo *repo_model.Repository) ([]*orga return nil, nil } @@ -66,5 +62,5 @@ index 52f2f3401c..8794a787fc 100644 + return organization.FilterLargeTeams(organization.GetTeamsWithAccessToAnyRepoUnit(ctx, repo.OwnerID, repo.ID, perm.AccessModeRead, unit.TypePullRequests)) } -- -2.51.0 +2.47.3 diff --git a/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch b/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch index faf5402ca7eaa..9320b0d7b8a8d 100644 --- a/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch +++ b/patches/0005-BLENDER-Support-both-exclusive-and-non-exclusive-sco.patch @@ -1,7 +1,7 @@ -From 10b499c2c2ec0f51d45f8d8ee42f9b9ffc455fc3 Mon Sep 17 00:00:00 2001 +From 21188912848b3c302cd401fe5790b75fb55dcb98 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 13:58:05 +0200 -Subject: [PATCH 05/19] BLENDER: Support both exclusive and non-exclusive scope +Subject: [PATCH 05/22] BLENDER: Support both exclusive and non-exclusive scope for labels --- @@ -46,10 +46,10 @@ index 25d6f1303e..951cfdc1a6 100644 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 1056c42643..5b4cabf6d8 100644 +index 081a13fb9e..5757e3e805 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go -@@ -142,7 +142,7 @@ func (ut *RenderUtils) renderLabelWithTag(label *issues_model.Label, tagName, ta +@@ -145,7 +145,7 @@ func (ut *RenderUtils) renderLabelWithTag(label *issues_model.Label, tagName, ta locale := ut.ctx.Value(translation.ContextKey).(translation.Locale) var extraCSSClasses string textColor := util.ContrastColor(label.Color) @@ -113,10 +113,10 @@ index 04c3605a6a..f0bffcd155 100644 {{ctx.RenderUtils.RenderLabel .}}

{{template "repo/issue/labels/label_archived" .}}

diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl -index 15c8760d1a..75a66290b1 100644 +index d30196326b..6339331e0f 100644 --- a/templates/repo/issue/sidebar/label_list.tmpl +++ b/templates/repo/issue/sidebar/label_list.tmpl -@@ -19,23 +19,25 @@ +@@ -20,23 +20,25 @@
{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}
@@ -131,7 +131,7 @@ index 15c8760d1a..75a66290b1 100644 {{end}} - {{$previousExclusiveScope = $exclusiveScope}} + {{$previousScope = $scope}} - {{template "repo/issue/sidebar/label_list_item" dict "Label" .}} + {{template "repo/issue/sidebar/label_list_item" dict "Label" . "LabelLink" (print $listBaseLink "?labels=" .ID)}} {{end}} {{if and $data.RepoLabels $data.OrgLabels}}
{{end}} - {{$previousExclusiveScope = "_no_scope"}} @@ -145,9 +145,9 @@ index 15c8760d1a..75a66290b1 100644 {{end}} - {{$previousExclusiveScope = $exclusiveScope}} + {{$previousScope = $scope}} - {{template "repo/issue/sidebar/label_list_item" dict "Label" .}} + {{template "repo/issue/sidebar/label_list_item" dict "Label" . "LabelLink" (print $listBaseLink "?labels=" .ID)}} {{end}}
-- -2.51.0 +2.47.3 diff --git a/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch b/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch index 5bfe1de70e873..ed9c46c7446bf 100644 --- a/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch +++ b/patches/0006-BLENDER-Projects-button-to-show-hide-issue-details-a.patch @@ -1,7 +1,7 @@ -From f27d18bf6759b707f9430dbae507bd220b0c5cb7 Mon Sep 17 00:00:00 2001 +From f4a59ee77343c1b3e2bb69b3ca8e47c1dfabbf7e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 23 Oct 2025 20:18:11 +0200 -Subject: [PATCH 06/19] BLENDER: Projects: button to show/hide issue details +Subject: [PATCH 06/22] BLENDER: Projects: button to show/hide issue details and closed issue Both are off by default. This is implemented fully on the frontend, so @@ -15,18 +15,18 @@ all issues and their details are still always loaded. 5 files changed, 71 insertions(+), 14 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go -index e454bce4bd..ff3f7cfda1 100644 +index f81be1255a..a11226a75e 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go -@@ -40,6 +40,7 @@ func NewFuncMap() template.FuncMap { +@@ -38,6 +38,7 @@ func newFuncMapWebPage() template.FuncMap { "HTMLFormat": htmlFormat, "QueryEscape": queryEscape, "QueryBuild": QueryBuild, + "JSEscape": jsEscapeSafe, "SanitizeHTML": SanitizeHTML, - "URLJoin": util.URLJoin, - "DotEscape": dotEscape, -@@ -180,6 +181,10 @@ func htmlFormat(s any, args ...any) template.HTML { + + "PathEscape": url.PathEscape, +@@ -165,6 +166,10 @@ func htmlFormat(s any, args ...any) template.HTML { panic(fmt.Sprintf("unexpected type %T", s)) } @@ -38,11 +38,11 @@ index e454bce4bd..ff3f7cfda1 100644 return template.URL(url.QueryEscape(s)) } diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl -index 21bc287643..7972bc298d 100644 +index ac08e56781..5a03bdcfd5 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl -@@ -17,6 +17,16 @@ - "TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") +@@ -23,6 +23,16 @@ + "ClosedMilestones" .ClosedMilestones }} +
@@ -58,7 +58,7 @@ index 21bc287643..7972bc298d 100644 {{if $canWriteProject}}
-@@ -114,7 +124,7 @@ +@@ -122,7 +132,7 @@
{{range (index $.IssuesMap .ID)}} @@ -67,7 +67,7 @@ index 21bc287643..7972bc298d 100644 {{template "repo/issue/card" (dict "Issue" . "Page" $)}}
{{end}} -@@ -124,6 +134,37 @@ +@@ -132,6 +142,37 @@
@@ -106,7 +106,7 @@ index 21bc287643..7972bc298d 100644
-- -+ +- ++ {{if not $.Page.Repository}}{{.Repo.FullName}}{{end}}#{{.Index}} {{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}} {{if .OriginalAuthor}} @@ -149,8 +149,8 @@ index 6dae49c455..f3398cd0fd 100644 -
+
- {{svg "octicon-git-merge" 16 "tw-mr-1 tw-align-middle"}} - {{.Title}} #{{.Index}} + {{svg "octicon-git-merge" 16 "tw-mr-1 tw-align-middle"}} + {{.Title}} #{{.Index}} @@ -54,15 +62,15 @@ {{end}} {{$tasks := .GetTasks}} @@ -215,5 +215,5 @@ index 327919b1fe..1067b5c8f7 100644 + margin-left: 0.5em; } -- -2.51.0 +2.47.3 diff --git a/patches/0007-BLENDER-Remember-login-for-OAuth-Blender-ID.patch b/patches/0007-BLENDER-Remember-login-for-OAuth-Blender-ID.patch index be2d2e0a10e98..3e0ba1ede97bb 100644 --- a/patches/0007-BLENDER-Remember-login-for-OAuth-Blender-ID.patch +++ b/patches/0007-BLENDER-Remember-login-for-OAuth-Blender-ID.patch @@ -1,7 +1,7 @@ -From cc522968972bc3c5df57f2516678976c89fb14a0 Mon Sep 17 00:00:00 2001 +From 1d9fed7574b38782b975690821963474f00a2c20 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 14:04:02 +0200 -Subject: [PATCH 07/19] BLENDER: Remember login for OAuth / Blender ID +Subject: [PATCH 07/22] BLENDER: Remember login for OAuth / Blender ID Otherwise for some browsers, users have to login again for every session. --- @@ -9,20 +9,19 @@ Otherwise for some browsers, users have to login again for every session. 1 file changed, 13 insertions(+) diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go -index f1c155e78f..03457cb260 100644 +index 824de60313..7dbdb0f37f 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go -@@ -21,7 +21,9 @@ import ( +@@ -24,6 +24,8 @@ import ( "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/web/middleware" + auth_service "code.gitea.io/gitea/services/auth" source_service "code.gitea.io/gitea/services/auth/source" "code.gitea.io/gitea/services/auth/source/oauth2" "code.gitea.io/gitea/services/context" -@@ -391,6 +393,17 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m +@@ -413,6 +415,17 @@ func handleOAuth2SignIn(ctx *context.Context, authSource *auth.Source, u *user_m return } @@ -37,9 +36,9 @@ index f1c155e78f..03457cb260 100644 + } + ctx.SetSiteCookie(setting.CookieRememberName, nt.ID+":"+token, setting.LogInRememberDays*timeutil.Day) + - // force to generate a new CSRF token - ctx.Csrf.PrepareForSessionUser(ctx) - + if err := resetLocale(ctx, u); err != nil { + ctx.ServerError("resetLocale", err) + return -- -2.51.0 +2.47.3 diff --git a/patches/0008-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch b/patches/0008-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch index d25d91d933f28..72b3e39d3e5b8 100644 --- a/patches/0008-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch +++ b/patches/0008-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch @@ -1,7 +1,7 @@ -From cd37387f02b0245f0afc1a0c472372c84f01cb8b Mon Sep 17 00:00:00 2001 +From 36abc474b61c8b720f7553d0414032284bd1bf32 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 14:04:49 +0200 -Subject: [PATCH 08/19] BLENDER: Always login with Blender ID, unless +Subject: [PATCH 08/22] BLENDER: Always login with Blender ID, unless noredirect is specified --- @@ -9,11 +9,11 @@ Subject: [PATCH 08/19] BLENDER: Always login with Blender ID, unless 1 file changed, 24 insertions(+) diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go -index 2ccd1c71b5..2fadfc4b12 100644 +index eeda3704a3..866b782c9f 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go -@@ -164,6 +164,26 @@ func CheckAutoLogin(ctx *context.Context) bool { - return false +@@ -243,6 +243,26 @@ type preparedSignInData struct { + enableSSPI bool } +// BLENDER: always use OAuth unless ?noredirect=true is set @@ -36,11 +36,11 @@ index 2ccd1c71b5..2fadfc4b12 100644 + return false +} + - func prepareSignInPageData(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("sign_in") - ctx.Data["OAuth2Providers"], _ = oauth2.GetOAuth2Providers(ctx, optional.Some(true)) -@@ -185,6 +205,10 @@ func SignIn(ctx *context.Context) { - if CheckAutoLogin(ctx) { + func prepareSignInPageData(ctx *context.Context) (ret preparedSignInData) { + var err error + ret.enableSSPI = auth.IsSSPIEnabled(ctx) +@@ -269,6 +289,10 @@ func SignIn(ctx *context.Context) { + if performAutoLogin(ctx) { return } + // BLENDER: Check if authentication is forced to OAuth @@ -48,8 +48,8 @@ index 2ccd1c71b5..2fadfc4b12 100644 + return + } if ctx.IsSigned { - RedirectAfterLogin(ctx) + redirectAfterAuth(ctx) return -- -2.51.0 +2.47.3 diff --git a/patches/0009-BLENDER-Allow-non-local-users-to-be-renamed.patch b/patches/0009-BLENDER-Allow-non-local-users-to-be-renamed.patch index 9b40c0323ec82..daae0b5e47123 100644 --- a/patches/0009-BLENDER-Allow-non-local-users-to-be-renamed.patch +++ b/patches/0009-BLENDER-Allow-non-local-users-to-be-renamed.patch @@ -1,37 +1,35 @@ -From 490ef60df54bb022b6d7ebf546f5a1a44aca6917 Mon Sep 17 00:00:00 2001 +From 4426396a65a447dbd757967d5e23ceb048dad75b Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 14:05:47 +0200 -Subject: [PATCH 09/19] BLENDER: Allow non-local users to be renamed +Subject: [PATCH 09/22] BLENDER: Allow non-local users to be renamed For Blender ID hook to do this. --- - services/user/user.go | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + services/user/user.go | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/user/user.go b/services/user/user.go -index d8abf199c3..d0a7ec64b3 100644 +index 9b8bcf83c0..a877ef0354 100644 --- a/services/user/user.go +++ b/services/user/user.go -@@ -37,12 +37,13 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err +@@ -36,11 +36,12 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string, doe + return nil } - // Non-local users are not allowed to change their username. -- if !u.IsOrganization() && !u.IsLocal() { -- return user_model.ErrUserIsNotLocal{ -- UID: u.ID, -- Name: u.Name, -- } +- // Non-local users are not allowed to change their own username, but admins are +- isExternalUser := !u.IsOrganization() && !u.IsLocal() +- if isExternalUser && !doer.IsAdmin { +- return user_model.ErrUserIsNotLocal{UID: u.ID, Name: u.Name} - } -+ // BLENDER: allow renaming local users. -+ //if !u.IsOrganization() && !u.IsLocal() { -+ // return user_model.ErrUserIsNotLocal{ -+ // UID: u.ID, -+ // Name: u.Name, -+ // } ++ // Non-local users are not allowed to change their own username, but admins are. ++ // BLENDER: allow renaming non-local users. ++ //isExternalUser := !u.IsOrganization() && !u.IsLocal() ++ //if isExternalUser && !doer.IsAdmin { ++ // return user_model.ErrUserIsNotLocal{UID: u.ID, Name: u.Name} + //} if err := user_model.IsUsableUsername(newUserName); err != nil { return err -- -2.51.0 +2.47.3 diff --git a/patches/0010-BLENDER-Workaround-internal-server-error-comparing-b.patch b/patches/0010-BLENDER-Workaround-internal-server-error-comparing-b.patch index 0a6eeed536d0d..c7798e71a4d49 100644 --- a/patches/0010-BLENDER-Workaround-internal-server-error-comparing-b.patch +++ b/patches/0010-BLENDER-Workaround-internal-server-error-comparing-b.patch @@ -1,42 +1,31 @@ -From 202618bf290c3eb539b0e12e28f289c05dfbd16c Mon Sep 17 00:00:00 2001 +From bf924a9085b24967a129800d50b65e9abec1cd75 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 14:07:25 +0200 -Subject: [PATCH 10/19] BLENDER: Workaround internal server error comparing +Subject: [PATCH 10/22] BLENDER: Workaround internal server error comparing branches on some repos https://projects.blender.org/infrastructure/blender-projects-platform/issues/61 And add trace log for investigation. --- - modules/git/repo_compare.go | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + modules/gitrepo/fetch.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go -index 69a7314d5c..2efeb325e8 100644 ---- a/modules/git/repo_compare.go -+++ b/modules/git/repo_compare.go -@@ -18,6 +18,7 @@ import ( - "strings" - - "code.gitea.io/gitea/modules/git/gitcmd" -+ logger "code.gitea.io/gitea/modules/log" - ) - - // GetMergeBase checks and returns merge base of two branches and the reference used as base. -@@ -29,9 +30,12 @@ func (repo *Repository) GetMergeBase(tmpRemote, base, head string) (string, stri - if tmpRemote != "origin" { - tmpBaseName := RemotePrefix + tmpRemote + "/tmp_" + base - // Fetch commit into a temporary branch in order to be able to handle commits and tags -- _, _, err := gitcmd.NewCommand("fetch", "--no-tags").AddDynamicArguments(tmpRemote).AddDashesAndList(base+":"+tmpBaseName).RunStdString(repo.Ctx, &gitcmd.RunOpts{Dir: repo.Path}) -+ // --no-write-commit-graph works around issue with commit-graph-chain.lock files that should not be there. -+ _, _, err := gitcmd.NewCommand("fetch", "--no-write-commit-graph", "--no-tags").AddDynamicArguments(tmpRemote).AddDashesAndList(base+":"+tmpBaseName).RunStdString(repo.Ctx, &gitcmd.RunOpts{Dir: repo.Path}) - if err == nil { - base = tmpBaseName -+ } else { -+ logger.Trace("GetMergeBase failed to git fetch. Error: %v", err) - } - } - +diff --git a/modules/gitrepo/fetch.go b/modules/gitrepo/fetch.go +index 0474d6111e..4b9da54239 100644 +--- a/modules/gitrepo/fetch.go ++++ b/modules/gitrepo/fetch.go +@@ -21,7 +21,9 @@ import ( + // merge base between commits. + func FetchRemoteCommit(ctx context.Context, repo, remoteRepo Repository, commitID string) error { + return globallock.LockAndDo(ctx, getRepoWriteLockKey(repo.RelativePath()), func(ctx context.Context) error { +- return RunCmd(ctx, repo, gitcmd.NewCommand("fetch", "--no-tags"). ++ // BLENDER: --no-write-commit-graph works around internal server errors comparing ++ // branches on some repos, caused by commit-graph-chain.lock files that should not be there. ++ return RunCmd(ctx, repo, gitcmd.NewCommand("fetch", "--no-write-commit-graph", "--no-tags"). + AddDynamicArguments(repoPath(remoteRepo)). + AddDynamicArguments(commitID)) + }) -- -2.51.0 +2.47.3 diff --git a/patches/0011-BLENDER-Add-docs-explaining-merge-strategy.patch b/patches/0011-BLENDER-Add-docs-explaining-merge-strategy.patch index 2c6358e92078a..f264ae9039882 100644 --- a/patches/0011-BLENDER-Add-docs-explaining-merge-strategy.patch +++ b/patches/0011-BLENDER-Add-docs-explaining-merge-strategy.patch @@ -1,7 +1,7 @@ -From f9997b853d493883258d05c929a54de42ec04c52 Mon Sep 17 00:00:00 2001 +From decd1ffe0378817543a39c46098170fc19613409 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 May 2024 14:58:32 +0200 -Subject: [PATCH 11/19] BLENDER: Add docs explaining merge strategy +Subject: [PATCH 11/22] BLENDER: Add docs explaining merge strategy --- BLENDER_README.md | 12 ++++++++++++ @@ -27,5 +27,5 @@ index 0000000000..f5bd495d5e +First do changes in `blender-merged-develop`, and deploy on uatest. Then apply +the changes in `blender-merged` and deploy in production. -- -2.51.0 +2.47.3 diff --git a/patches/0012-BLENDER-Add-Python-for-external-renderering.patch b/patches/0012-BLENDER-Add-Python-for-external-renderering.patch index 4b4a2bf755eab..00fdc8c40db38 100644 --- a/patches/0012-BLENDER-Add-Python-for-external-renderering.patch +++ b/patches/0012-BLENDER-Add-Python-for-external-renderering.patch @@ -1,7 +1,7 @@ -From 4c4111718996dec679437b3d5cdab997e7191c7f Mon Sep 17 00:00:00 2001 +From 022b8f8869c398949eef9d708fab72d278fba3f5 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Wed, 4 Dec 2024 15:29:10 +0100 -Subject: [PATCH 12/19] BLENDER: Add Python for external renderering +Subject: [PATCH 12/22] BLENDER: Add Python for external renderering To be used for RestructuredText rendering using Sphinx to HTML. @@ -11,12 +11,12 @@ See: https://projects.blender.org/infrastructure/gitea-custom/src/branch/main/sp 1 file changed, 5 insertions(+) diff --git a/Dockerfile.rootless b/Dockerfile.rootless -index e83c1af33b..ebca19ca5b 100644 +index 83c69cbd51..116b7adef8 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless -@@ -55,6 +55,11 @@ RUN apk --no-cache add \ - openssh-keygen \ - && rm -rf /var/cache/apk/* +@@ -53,6 +53,11 @@ RUN apk --no-cache add \ + gnupg \ + openssh-keygen +# External renderers +RUN apk --no-cache add \ @@ -27,5 +27,5 @@ index e83c1af33b..ebca19ca5b 100644 -S -g 1000 \ git && \ -- -2.51.0 +2.47.3 diff --git a/patches/0013-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch b/patches/0013-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch deleted file mode 100644 index fa06fd08976ed..0000000000000 --- a/patches/0013-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cb81590f47de39fcf889ad3a89e9816dc9bfdffa Mon Sep 17 00:00:00 2001 -From: Oleg Komarov -Date: Wed, 2 Apr 2025 17:11:01 +0200 -Subject: [PATCH 13/19] BLENDER: Fix RemoveUserBadges incorrect sql - ---- - models/user/badge.go | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/models/user/badge.go b/models/user/badge.go -index e475ceb748..e33819d820 100644 ---- a/models/user/badge.go -+++ b/models/user/badge.go -@@ -105,13 +105,23 @@ func RemoveUserBadge(ctx context.Context, u *User, badge *Badge) error { - // RemoveUserBadges removes badges from a user. - func RemoveUserBadges(ctx context.Context, u *User, badges []*Badge) error { - return db.WithTx(ctx, func(ctx context.Context) error { -+ badgeSlugs := make([]string, 0, len(badges)) - for _, badge := range badges { -- if _, err := db.GetEngine(ctx). -- Join("INNER", "badge", "badge.id = `user_badge`.badge_id"). -- Where("`user_badge`.user_id=? AND `badge`.slug=?", u.ID, badge.Slug). -- Delete(&UserBadge{}); err != nil { -- return err -- } -+ badgeSlugs = append(badgeSlugs, badge.Slug) -+ } -+ var userBadges []UserBadge -+ if err := db.GetEngine(ctx).Table("user_badge"). -+ Join("INNER", "badge", "badge.id = `user_badge`.badge_id"). -+ Where("`user_badge`.user_id = ?", u.ID).In("`badge`.slug", badgeSlugs). -+ Find(&userBadges); err != nil { -+ return err -+ } -+ userBadgeIDs := make([]int64, 0, len(userBadges)) -+ for _, ub := range userBadges { -+ userBadgeIDs = append(userBadgeIDs, ub.ID) -+ } -+ if _, err := db.GetEngine(ctx).Table("user_badge").In("id", userBadgeIDs).Delete(); err != nil { -+ return err - } - return nil - }) --- -2.51.0 - diff --git a/patches/0014-BLENDER-Sync-user-badges-on-sign-in.patch b/patches/0013-BLENDER-Sync-user-badges-on-sign-in.patch similarity index 89% rename from patches/0014-BLENDER-Sync-user-badges-on-sign-in.patch rename to patches/0013-BLENDER-Sync-user-badges-on-sign-in.patch index 53c41b04754dc..4bc9ac40272c8 100644 --- a/patches/0014-BLENDER-Sync-user-badges-on-sign-in.patch +++ b/patches/0013-BLENDER-Sync-user-badges-on-sign-in.patch @@ -1,22 +1,22 @@ -From 122e9fb06447db28a05530261209346635d1e798 Mon Sep 17 00:00:00 2001 +From fe28143968f59a259069e4ac005530349aa7b9c5 Mon Sep 17 00:00:00 2001 From: Oleg Komarov Date: Wed, 2 Apr 2025 17:30:05 +0200 -Subject: [PATCH 14/19] BLENDER: Sync user badges on sign-in +Subject: [PATCH 13/22] BLENDER: Sync user badges on sign-in Don't escalate any errors, only log them, to avoid breaking sign-in. --- routers/web/auth/oauth.go | 26 ++++++++++++ - services/user/badge.go | 55 +++++++++++++++++++++++++ - services/user/badge_test.go | 80 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 161 insertions(+) + services/user/badge.go | 55 ++++++++++++++++++++++++++ + services/user/badge_test.go | 79 +++++++++++++++++++++++++++++++++++++ + 3 files changed, 160 insertions(+) create mode 100644 services/user/badge.go create mode 100644 services/user/badge_test.go diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go -index 03457cb260..954550cb78 100644 +index 7dbdb0f37f..418b45d996 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go -@@ -321,8 +321,34 @@ func oauth2UpdateAvatarIfNeed(ctx *context.Context, url string, u *user_model.Us +@@ -343,8 +343,34 @@ func oauth2UpdateAvatarIfNeed(ctx *context.Context, avatarURL string, u *user_mo } } @@ -114,10 +114,10 @@ index 0000000000..be6124a7fe +} diff --git a/services/user/badge_test.go b/services/user/badge_test.go new file mode 100644 -index 0000000000..41880a9fa9 +index 0000000000..91267d71aa --- /dev/null +++ b/services/user/badge_test.go -@@ -0,0 +1,80 @@ +@@ -0,0 +1,79 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + @@ -131,7 +131,6 @@ index 0000000000..41880a9fa9 + "sync" + "testing" + -+ "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + @@ -151,7 +150,7 @@ index 0000000000..41880a9fa9 + badges := []*user_model.Badge{} + for i := range 5 { + badge := &user_model.Badge{Slug: fmt.Sprintf("update-badges-test-%d", i)} -+ user_model.CreateBadge(db.DefaultContext, badge) ++ user_model.CreateBadge(t.Context(), badge) + badges = append(badges, badge) + } + var wg sync.WaitGroup @@ -159,7 +158,7 @@ index 0000000000..41880a9fa9 + f := func(wg *sync.WaitGroup, badges []*user_model.Badge) { + <-start + defer wg.Done() -+ UpdateBadgesBestEffort(db.DefaultContext, user, badges) ++ UpdateBadgesBestEffort(t.Context(), user, badges) + } + updateSets := [][]*user_model.Badge{ + badges[0:1], @@ -175,7 +174,7 @@ index 0000000000..41880a9fa9 + close(start) + wg.Wait() + -+ result, _, _ := user_model.GetUserBadges(db.DefaultContext, user) ++ result, _, _ := user_model.GetUserBadges(t.Context(), user) + resultSlugs := make([]string, 0, len(result)) + for _, b := range result { + resultSlugs = append(resultSlugs, b.Slug) @@ -199,5 +198,5 @@ index 0000000000..41880a9fa9 + } +} -- -2.51.0 +2.47.3 diff --git a/patches/0015-BLENDER-Add-Spam-Reporting.patch b/patches/0014-BLENDER-Add-Spam-Reporting.patch similarity index 90% rename from patches/0015-BLENDER-Add-Spam-Reporting.patch rename to patches/0014-BLENDER-Add-Spam-Reporting.patch index 01058f04861be..72c969534c681 100644 --- a/patches/0015-BLENDER-Add-Spam-Reporting.patch +++ b/patches/0014-BLENDER-Add-Spam-Reporting.patch @@ -1,7 +1,7 @@ -From 702a1af5155f47bafd6c90a97f82eecf98b3edab Mon Sep 17 00:00:00 2001 +From 2ac66a43550a1ae0e3a5fe23a57944f0037c102c Mon Sep 17 00:00:00 2001 From: Oleg Komarov Date: Fri, 11 Apr 2025 16:57:54 +0200 -Subject: [PATCH] BLENDER: Add Spam Reporting +Subject: [PATCH 14/22] BLENDER: Add Spam Reporting Spam reporting is available for trusted users (org members and admins) via a button on a spammer's profile page; @@ -9,7 +9,7 @@ a new section Site Administration > Identity & Access > Spam Reports; a new "pending spam reports" indicator in the header for admins. --- models/user/spamreport.go | 136 +++++++++++ - options/locale/locale_en-US.ini | 22 ++ + options/locale/locale_en-US.json | 18 ++ routers/common/pagetmpl.go | 19 ++ routers/web/admin/spamreports.go | 135 +++++++++++ routers/web/shared/user/header.go | 20 ++ @@ -23,7 +23,7 @@ a new "pending spam reports" indicator in the header for admins. templates/shared/user/profile_big_avatar.tmpl | 17 ++ .../shared/user/purgespammer_user_dialog.tmpl | 14 ++ .../shared/user/spamreport_user_dialog.tmpl | 14 ++ - 15 files changed, 854 insertions(+), 1 deletion(-) + 15 files changed, 850 insertions(+), 1 deletion(-) create mode 100644 models/user/spamreport.go create mode 100644 routers/web/admin/spamreports.go create mode 100644 routers/web/user/setting/spamreport.go @@ -175,60 +175,56 @@ index 0000000000..a4390c9d4a + } + return nil, err +} -diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini -index 08114f0d5f..07423920ce 100644 ---- a/options/locale/locale_en-US.ini -+++ b/options/locale/locale_en-US.ini -@@ -721,6 +721,18 @@ block.note.edit = Edit note - block.list = Blocked users - block.list.none = You have not blocked any users. - -+purgespammer.modal_title = Purge spam account -+purgespammer.modal_info = All content created by the user will be deleted! This cannot be undone. -+purgespammer.modal_action = Purge spam account -+purgespammer.profile_button = Purge spam account -+ -+spamreport.existing_status = The user has already been reported as a spammer, the report is %s. -+ -+spamreport.modal_title = Report spam -+spamreport.modal_info = Report a user as a spammer to site admins. -+spamreport.modal_action = Report spam -+spamreport.profile_button = Report spam -+ - [settings] - profile = Profile - account = Account -@@ -2998,6 +3010,7 @@ first_page = First - last_page = Last - total = Total: %d - settings = Admin Settings -+spamreports = Spam Reports - - dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check the blog for more details. - dashboard.statistic = Summary -@@ -3085,6 +3098,7 @@ dashboard.sync_branch.started = Branches Sync started - dashboard.sync_tag.started = Tags Sync started - dashboard.rebuild_issue_indexer = Rebuild issue indexer - dashboard.sync_repo_licenses = Sync repo licenses -+dashboard.process_spam_reports = Process spam reports - - users.user_manage_panel = User Account Management - users.new_account = Create User Account -@@ -3161,6 +3175,14 @@ emails.delete_desc = Are you sure you want to delete this email address? - emails.deletion_success = The email address has been deleted. - emails.delete_primary_email_error = You cannot delete the primary email address. - -+spamreports.spamreport_manage_panel = Spam Report Management -+spamreports.user = Reported for spam -+spamreports.user_created = User created -+spamreports.reporter = Reporter -+spamreports.created = Report Created -+spamreports.updated = Report Updated -+spamreports.status = Report Status -+ - orgs.org_manage_panel = Organization Management - orgs.name = Name - orgs.teams = Teams +diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json +index 7c20cdc9f2..d2a84d6332 100644 +--- a/options/locale/locale_en-US.json ++++ b/options/locale/locale_en-US.json +@@ -646,6 +646,15 @@ + "user.block.note.edit": "Edit note", + "user.block.list": "Blocked users", + "user.block.list.none": "You have not blocked any users.", ++ "user.purgespammer.modal_title": "Purge spam account", ++ "user.purgespammer.modal_info": "All content created by the user will be deleted! This cannot be undone.", ++ "user.purgespammer.modal_action": "Purge spam account", ++ "user.purgespammer.profile_button": "Purge spam account", ++ "user.spamreport.existing_status": "The user has already been reported as a spammer, the report is %s.", ++ "user.spamreport.modal_title": "Report spam", ++ "user.spamreport.modal_info": "Report a user as a spammer to site admins.", ++ "user.spamreport.modal_action": "Report spam", ++ "user.spamreport.profile_button": "Report spam", + "settings.general": "General", + "settings.profile": "Profile", + "settings.account": "Account", +@@ -2909,6 +2918,7 @@ + "admin.last_page": "Last", + "admin.total": "Total: %d", + "admin.settings": "Admin Settings", ++ "admin.spamreports": "Spam Reports", + "admin.dashboard.new_version_hint": "Gitea %s is now available, you are running %s. Check the blog for more details.", + "admin.dashboard.statistic": "Summary", + "admin.dashboard.maintenance_operations": "Maintenance Operations", +@@ -2995,6 +3005,7 @@ + "admin.dashboard.sync_tag.started": "Tags Sync started", + "admin.dashboard.rebuild_issue_indexer": "Rebuild issue indexer", + "admin.dashboard.sync_repo_licenses": "Sync repo licenses", ++ "admin.dashboard.process_spam_reports": "Process spam reports", + "admin.users.user_manage_panel": "User Account Management", + "admin.users.new_account": "Create User Account", + "admin.users.name": "Username", +@@ -3068,6 +3079,13 @@ + "admin.emails.delete_desc": "Are you sure you want to delete this email address?", + "admin.emails.deletion_success": "The email address has been deleted.", + "admin.emails.delete_primary_email_error": "You cannot delete the primary email address.", ++ "admin.spamreports.spamreport_manage_panel": "Spam Report Management", ++ "admin.spamreports.user": "Reported for spam", ++ "admin.spamreports.user_created": "User created", ++ "admin.spamreports.reporter": "Reporter", ++ "admin.spamreports.created": "Report Created", ++ "admin.spamreports.updated": "Report Updated", ++ "admin.spamreports.status": "Report Status", + "admin.orgs.org_manage_panel": "Organization Management", + "admin.orgs.name": "Name", + "admin.orgs.teams": "Teams", diff --git a/routers/common/pagetmpl.go b/routers/common/pagetmpl.go index c48596d48b..ef18ac74e7 100644 --- a/routers/common/pagetmpl.go @@ -280,7 +276,7 @@ index c48596d48b..ef18ac74e7 100644 } diff --git a/routers/web/admin/spamreports.go b/routers/web/admin/spamreports.go new file mode 100644 -index 0000000000..8177dbc5f6 +index 0000000000..2b6fac373b --- /dev/null +++ b/routers/web/admin/spamreports.go @@ -0,0 +1,135 @@ @@ -350,10 +346,10 @@ index 0000000000..8177dbc5f6 + } + ctx.Data["StatusCounts"] = statusCounts + -+ var pagerCount int ++ var pagerCount int64 + for _, sc := range statusCounts { + if sc.Status == filterStatus { -+ pagerCount = int(sc.Count) ++ pagerCount = sc.Count + break + } + } @@ -420,7 +416,7 @@ index 0000000000..8177dbc5f6 + ctx.Redirect(setting.AppSubURL + "/" + username) +} diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go -index 2bd0abc4c0..ae6f337066 100644 +index 2ba45fc5a7..7281c45388 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -22,6 +22,7 @@ import ( @@ -507,20 +503,20 @@ index 0000000000..254b54c56f + ctx.Redirect(setting.AppSubURL + "/" + username) +} diff --git a/routers/web/web.go b/routers/web/web.go -index f3f3679caf..478ac9e387 100644 +index 085558c9b2..e0a8e6a9e4 100644 --- a/routers/web/web.go +++ b/routers/web/web.go -@@ -682,6 +682,9 @@ func registerWebRoutes(m *web.Router) { +@@ -721,6 +721,9 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { m.Get("", user_setting.BlockedUsers) m.Post("", web.Bind(forms.BlockUserForm{}), user_setting.BlockedUsersPost) }) + + // BLENDER: spam reporting + m.Post("/spamreport", user_setting.SpamReportUserPost) - }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "EnablePackages", setting.Packages.Enabled, "EnableNotifyMail", setting.Service.EnableNotifyMail)) + }, reqSignIn, user_setting.SettingsCtxData) m.Group("/user", func() { -@@ -755,6 +758,13 @@ func registerWebRoutes(m *web.Router) { +@@ -804,6 +807,13 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { m.Post("/delete", admin.DeleteEmail) }) @@ -771,7 +767,7 @@ index 0000000000..4aabac4054 +} diff --git a/services/user/spamreport_test.go b/services/user/spamreport_test.go new file mode 100644 -index 0000000000..2f4ebcdc86 +index 0000000000..c24b12e817 --- /dev/null +++ b/services/user/spamreport_test.go @@ -0,0 +1,93 @@ @@ -815,7 +811,7 @@ index 0000000000..2f4ebcdc86 +func TestCreateSpamReport(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + // Prevent interaction between tests, for whatever reason db is not reset. -+ db.GetEngine(db.DefaultContext).Exec("delete from user_spamreport") ++ db.GetEngine(t.Context()).Exec("delete from user_spamreport") + + userWithOrgs := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + userWithoutOrgs := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 8}) @@ -843,7 +839,7 @@ index 0000000000..2f4ebcdc86 +func TestProcessSpamReports(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + // Prevent interaction between tests, for whatever reason db is not reset. -+ db.GetEngine(db.DefaultContext).Exec("delete from user_spamreport") ++ db.GetEngine(t.Context()).Exec("delete from user_spamreport") + + userWithOrgs := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // reporter + userWithoutOrgs := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 9}) // spammer, and a different one @@ -869,19 +865,19 @@ index 0000000000..2f4ebcdc86 + assert.NoError(t, err) +} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl -index 72584ec799..6cee23f79c 100644 +index ce3048ed9f..bede52e75c 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -13,7 +13,7 @@
--
-+
+-
++
{{ctx.Locale.Tr "admin.identity_access"}}
-@@ -28,6 +28,9 @@ +@@ -31,6 +31,9 @@ {{ctx.Locale.Tr "admin.emails"}} @@ -986,7 +982,7 @@ index 0000000000..dc8240ba3f + +{{template "admin/layout_footer" .}} diff --git a/templates/base/head_navbar_icons.tmpl b/templates/base/head_navbar_icons.tmpl -index e3bdd27992..b4aa828259 100644 +index 019e78cb60..66c9be0314 100644 --- a/templates/base/head_navbar_icons.tmpl +++ b/templates/base/head_navbar_icons.tmpl @@ -3,6 +3,7 @@ @@ -996,7 +992,7 @@ index e3bdd27992..b4aa828259 100644 + {{- $pendingSpamReportsCount := call $data.GetPendingSpamReportsCount -}} {{if $activeStopwatch}} -
+
@@ -11,6 +12,15 @@
@@ -1011,13 +1007,13 @@ index e3bdd27992..b4aa828259 100644 + {{end}} + -
+
{{svg "octicon-bell"}} diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl -index 1190dc54ec..4a7781bef4 100644 +index 41bcdaccb0..21b02f7bcf 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl -@@ -130,9 +130,26 @@ +@@ -134,9 +134,26 @@ {{ctx.Locale.Tr "user.block.unblock"}} {{end}} @@ -1085,5 +1081,5 @@ index 0000000000..e9015fd16c +
+
-- -2.51.0 +2.47.3 diff --git a/patches/0016-BLENDER-Fine-tune-pages-considered-expensive.patch b/patches/0015-BLENDER-Fine-tune-pages-considered-expensive.patch similarity index 90% rename from patches/0016-BLENDER-Fine-tune-pages-considered-expensive.patch rename to patches/0015-BLENDER-Fine-tune-pages-considered-expensive.patch index 5b8949abf56d9..4d1281eff7d73 100644 --- a/patches/0016-BLENDER-Fine-tune-pages-considered-expensive.patch +++ b/patches/0015-BLENDER-Fine-tune-pages-considered-expensive.patch @@ -1,14 +1,14 @@ -From 368eb51c37cbdbe944a87d6759ab443d8f29f871 Mon Sep 17 00:00:00 2001 +From 8220387ce2fa8e261c93a0a95c9771b4af34c9be Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 12 Jun 2025 14:43:47 +0200 -Subject: [PATCH 16/20] BLENDER: Fine tune pages considered expensive +Subject: [PATCH 15/22] BLENDER: Fine tune pages considered expensive --- routers/common/blockexpensive.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/routers/common/blockexpensive.go b/routers/common/blockexpensive.go -index ebec0a2e5b..33b082cad1 100644 +index fec364351c..f9d05836cd 100644 --- a/routers/common/blockexpensive.go +++ b/routers/common/blockexpensive.go @@ -40,25 +40,26 @@ func isRoutePathExpensive(routePattern string) bool { @@ -51,5 +51,5 @@ index ebec0a2e5b..33b082cad1 100644 // activity "/{username}/{reponame}/activity/", -- -2.49.0 +2.47.3 diff --git a/patches/0016-BLENDER-Custom-locales-for-changing-password-usernam.patch b/patches/0016-BLENDER-Custom-locales-for-changing-password-usernam.patch new file mode 100644 index 0000000000000..bbff5ac2bd631 --- /dev/null +++ b/patches/0016-BLENDER-Custom-locales-for-changing-password-usernam.patch @@ -0,0 +1,204 @@ +From 250b444497316c6dab687da3df15c1ea34cf00db Mon Sep 17 00:00:00 2001 +From: Bart van der Braak +Date: Thu, 17 Jul 2025 11:32:45 +0200 +Subject: [PATCH 16/22] BLENDER: Custom locales for changing password/username + +--- + options/locale/locale_cs-CZ.json | 4 ++-- + options/locale/locale_de-DE.json | 6 +++--- + options/locale/locale_el-GR.json | 4 ++-- + options/locale/locale_en-US.json | 6 +++--- + options/locale/locale_es-ES.json | 4 ++-- + options/locale/locale_fa-IR.json | 4 ++-- + options/locale/locale_fi-FI.json | 4 ++-- + templates/user/settings/account.tmpl | 2 +- + 8 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/options/locale/locale_cs-CZ.json b/options/locale/locale_cs-CZ.json +index 52e9940db1..9b12e26609 100644 +--- a/options/locale/locale_cs-CZ.json ++++ b/options/locale/locale_cs-CZ.json +@@ -344,7 +344,7 @@ + "auth.reset_password_helper": "Obnovit účet", + "auth.reset_password_wrong_user": "Jste přihlášen/a jako %s, ale odkaz pro obnovení účtu je pro %s", + "auth.password_too_short": "Délka hesla musí být minimálně %d znaků.", +- "auth.non_local_account": "Externě ověřovaní uživatelé nemohou aktualizovat své heslo prostřednictvím webového rozhraní Gitea.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Ověřit", + "auth.scratch_code": "Pomocný kód", + "auth.use_scratch_code": "Použijte pomocný kód", +@@ -626,7 +626,7 @@ + "settings.retype_new_password": "Potvrdit nové heslo", + "settings.password_incorrect": "Zadané heslo není správné.", + "settings.change_password_success": "Vaše heslo bylo aktualizováno. Od teď se přihlašujte novým heslem.", +- "settings.password_change_disabled": "Externě ověřovaní uživatelé nemohou aktualizovat své heslo prostřednictvím webového rozhraní Gitea.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "E-mailová adresa", + "settings.manage_emails": "Správa e-mailových adres", + "settings.manage_themes": "Vyberte výchozí motiv vzhledu", +diff --git a/options/locale/locale_de-DE.json b/options/locale/locale_de-DE.json +index 53d7d4d97d..3f44a54b85 100644 +--- a/options/locale/locale_de-DE.json ++++ b/options/locale/locale_de-DE.json +@@ -337,7 +337,7 @@ + "auth.reset_password_helper": "Konto wiederherstellen", + "auth.reset_password_wrong_user": "Du bist angemeldet als %s, aber der Link zur Kontowiederherstellung ist für %s", + "auth.password_too_short": "Das Passwort muss mindestens %d Zeichen lang sein.", +- "auth.non_local_account": "Benutzer, die nicht von Gitea verwaltet werden können ihre Passwörter nicht über das Web Interface ändern.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Verifizieren", + "auth.scratch_code": "Einmalpasswort", + "auth.use_scratch_code": "Einmalpasswort verwenden", +@@ -564,7 +564,7 @@ + "settings.public_profile": "Öffentliches Profil", + "settings.biography_placeholder": "Erzähle uns ein wenig über Dich selbst! (Du kannst Markdown verwenden)", + "settings.location_placeholder": "Teile Deinen ungefähren Standort mit anderen", +- "settings.password_username_disabled": "Du bist nicht berechtigt, den Benutzernamen zu ändern. Bitte kontaktiere Deinen Seitenadministrator für weitere Details.", ++ "settings.password_username_disabled": "You can change your username by changing your Blender ID nickname here.", + "settings.password_full_name_disabled": "Du bist nicht berechtigt, den vollständigen Namen zu ändern. Bitte kontaktiere Deinen Seitenadministrator für weitere Details.", + "settings.full_name": "Vollständiger Name", + "settings.website": "Webseite", +@@ -617,7 +617,7 @@ + "settings.retype_new_password": "Neues Passwort bestätigen", + "settings.password_incorrect": "Das aktuelle Passwort ist falsch.", + "settings.change_password_success": "Dein Passwort wurde aktualisiert. Bitte verwende dieses beim nächsten Einloggen.", +- "settings.password_change_disabled": "Benutzer, die nicht von Gitea verwaltet werden, können ihr Passwort im Web-Interface nicht ändern.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "E-Mail-Adressen", + "settings.manage_emails": "E-Mail-Adressen verwalten", + "settings.manage_themes": "Standard-Theme auswählen", +diff --git a/options/locale/locale_el-GR.json b/options/locale/locale_el-GR.json +index b248c96d3d..0b42a8e6d1 100644 +--- a/options/locale/locale_el-GR.json ++++ b/options/locale/locale_el-GR.json +@@ -309,7 +309,7 @@ + "auth.reset_password_helper": "Ανάκτηση Λογαριασμού", + "auth.reset_password_wrong_user": "Έχετε συνδεθεί ως %s, αλλά ο σύνδεσμος ανάκτησης λογαριασμού προορίζεται για το %s", + "auth.password_too_short": "Το μήκος του κωδικού πρόσβασης δεν μπορεί να είναι μικρότερο από %d χαρακτήρες.", +- "auth.non_local_account": "Οι μη τοπικοί χρήστες δεν μπορούν να ενημερώσουν τον κωδικό πρόσβασής τους μέσω του διεπαφής web του Gitea.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Επαλήθευση", + "auth.scratch_code": "Κωδικός μιας χρήσης", + "auth.use_scratch_code": "Χρήση κωδικού μιας χρήσης", +@@ -556,7 +556,7 @@ + "settings.retype_new_password": "Επιβεβαίωση Νέου Κωδικού Πρόσβασης", + "settings.password_incorrect": "Ο τρέχων κωδικός πρόσβασης είναι λάθος.", + "settings.change_password_success": "Ο κωδικός πρόσβασής σας έχει ενημερωθεί. Από εδώ και τώρα συνδέεστε χρησιμοποιώντας τον νέο κωδικό πρόσβασής σας.", +- "settings.password_change_disabled": "Οι μη τοπικοί χρήστες δεν μπορούν να ενημερώσουν τον κωδικό πρόσβασής τους μέσω του διεπαφής web του Gitea.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "Διευθύνσεις Email", + "settings.manage_emails": "Διαχείριση Διευθύνσεων Email", + "settings.manage_themes": "Επιλέξτε προεπιλεγμένο θέμα διεπαφής", +diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json +index d2a84d6332..d6e362d816 100644 +--- a/options/locale/locale_en-US.json ++++ b/options/locale/locale_en-US.json +@@ -408,7 +408,7 @@ + "auth.reset_password_helper": "Recover Account", + "auth.reset_password_wrong_user": "You are signed in as %s, but the account recovery link is meant for %s", + "auth.password_too_short": "Password length cannot be less than %d characters.", +- "auth.non_local_account": "Non-local users cannot update their password through the Gitea web interface.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Verify", + "auth.scratch_code": "Scratch code", + "auth.use_scratch_code": "Use a scratch code", +@@ -677,7 +677,7 @@ + "settings.biography_placeholder": "Tell us a little bit about yourself! (You can use Markdown)", + "settings.location_placeholder": "Share your approximate location with others", + "settings.profile_desc": "Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations.", +- "settings.password_username_disabled": "You are not allowed to change your username. Please contact your site administrator for more details.", ++ "settings.password_username_disabled": "You can change your username by changing your Blender ID nickname here.", + "settings.password_full_name_disabled": "You are not allowed to change your full name. Please contact your site administrator for more details.", + "settings.full_name": "Full Name", + "settings.website": "Website", +@@ -734,7 +734,7 @@ + "settings.retype_new_password": "Confirm New Password", + "settings.password_incorrect": "The current password is incorrect.", + "settings.change_password_success": "Your password has been updated. Sign in using your new password from now on.", +- "settings.password_change_disabled": "Non-local users cannot update their password through the Gitea web interface.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "Email Addresses", + "settings.manage_emails": "Manage Email Addresses", + "settings.manage_themes": "Select default theme", +diff --git a/options/locale/locale_es-ES.json b/options/locale/locale_es-ES.json +index 04727abb5b..72e83761fb 100644 +--- a/options/locale/locale_es-ES.json ++++ b/options/locale/locale_es-ES.json +@@ -303,7 +303,7 @@ + "auth.reset_password_helper": "Recuperar cuenta", + "auth.reset_password_wrong_user": "Has iniciado sesión como %s, pero el enlace de recuperación de la cuenta está destinado a %s", + "auth.password_too_short": "La longitud de la contraseña no puede ser menor a %d caracteres.", +- "auth.non_local_account": "Los usuarios no locales no pueden actualizar su contraseña a través de la interfaz web de Gitea.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Verificar", + "auth.scratch_code": "Código de respaldo", + "auth.use_scratch_code": "Usar un código de respaldo", +@@ -550,7 +550,7 @@ + "settings.retype_new_password": "Confirme la nueva contraseña", + "settings.password_incorrect": "Contraseña actual incorrecta.", + "settings.change_password_success": "Su contraseña ha sido modificada. Utilice su nueva contraseña la próxima vez que acceda a la cuenta.", +- "settings.password_change_disabled": "Los usuarios no locales no pueden actualizar su contraseña a través de la interfaz web de Gitea.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "Direcciones de correo electrónico", + "settings.manage_emails": "Administrar direcciones de correo electrónico", + "settings.manage_themes": "Selecciona el tema por defecto", +diff --git a/options/locale/locale_fa-IR.json b/options/locale/locale_fa-IR.json +index a00d6dd5ca..f22f6fbfb0 100644 +--- a/options/locale/locale_fa-IR.json ++++ b/options/locale/locale_fa-IR.json +@@ -229,7 +229,7 @@ + "auth.invalid_code": "کد تایید غیرمعتبر بوده و یا منقضی شده است.", + "auth.reset_password_helper": "بازیابی حساب", + "auth.password_too_short": "طول گذرواژه نمی تواند کمتر از %d کاراکتر باشد.", +- "auth.non_local_account": "کاربران غیر محلی نمیتوانند گذرواژه خود را از طریق واسط وب گیتی به روز کنند.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "تایید‌کنید", + "auth.scratch_code": "کد پایه", + "auth.use_scratch_code": "استفاده از کدپایه", +@@ -427,7 +427,7 @@ + "settings.new_password": "گذرواژه جدید", + "settings.password_incorrect": "گذرواژه فعلی شما اشتباه است.", + "settings.change_password_success": "گذرواژه شما تغییر کرد. از این پس با گذرواژه جدید خود وارد شوید.", +- "settings.password_change_disabled": "کاربران غیر محلی نمیتوانند گذرواژه خود را از طریق واسط وب گیتی به روز کنند.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "نشانی‌های ایمیل", + "settings.manage_emails": "مدیریت نشانی‌های ایمیل", + "settings.manage_themes": "تم پیش فرض را انتخاب کنید", +diff --git a/options/locale/locale_fi-FI.json b/options/locale/locale_fi-FI.json +index 2ea42ddd31..33ee758a94 100644 +--- a/options/locale/locale_fi-FI.json ++++ b/options/locale/locale_fi-FI.json +@@ -236,7 +236,7 @@ + "auth.invalid_code": "Vahvistusavain on virheellinen tai vanhentunut.", + "auth.reset_password_helper": "Palauta käyttäjätili", + "auth.password_too_short": "Salasanan pituus ei voi olla vähemmän kuin %d merkkiä.", +- "auth.non_local_account": "Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Gitean web-käyttöliittymän kautta.", ++ "auth.non_local_account": "You can manage your Blender ID password here.", + "auth.verify": "Vahvista", + "auth.scratch_code": "Kertakäyttökoodi", + "auth.use_scratch_code": "Käytä kertakäyttökoodia", +@@ -401,7 +401,7 @@ + "settings.old_password": "Nykyinen salasana", + "settings.new_password": "Uusi salasana", + "settings.password_incorrect": "Nykyinen salasanasi on virheellinen.", +- "settings.password_change_disabled": "Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Gitean web-käyttöliittymän kautta.", ++ "settings.password_change_disabled": "You can manage your Blender ID password here.", + "settings.emails": "Sähköposti osoitteet", + "settings.manage_emails": "Hallitse sähköpostiosoitteita", + "settings.manage_themes": "Valitse oletusteema", +diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl +index aabdbbb8cb..c856cb2251 100644 +--- a/templates/user/settings/account.tmpl ++++ b/templates/user/settings/account.tmpl +@@ -4,7 +4,7 @@ + {{ctx.Locale.Tr "settings.password"}} + +
+- {{if and (not ($.UserDisabledFeatures.Contains "manage_credentials")) (or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2))}} ++ {{if and (not ($.UserDisabledFeatures.Contains "manage_password")) (or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2))}} +
+ {{template "base/disable_form_autofill"}} + {{if .SignedUser.IsPasswordSet}} +-- +2.47.3 + diff --git a/patches/0018-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch b/patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch similarity index 59% rename from patches/0018-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch rename to patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch index 7bb36b3d35208..83fd705a8011b 100644 --- a/patches/0018-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch +++ b/patches/0017-BLENDER-Add-Git-LFS-for-Git-Hook-scripts.patch @@ -1,24 +1,24 @@ -From 8132f09c63d45148e2f752881a1d5145f1307c71 Mon Sep 17 00:00:00 2001 +From 0577b4fec1afec97ffe34178d2d9b1b384f43a86 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Tue, 7 Oct 2025 15:02:05 +0200 -Subject: [PATCH 18/19] BLENDER: Add Git LFS for Git Hook scripts +Subject: [PATCH 17/22] BLENDER: Add Git LFS for Git Hook scripts --- Dockerfile.rootless | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.rootless b/Dockerfile.rootless -index ebca19ca5b..8444b2fd35 100644 +index 116b7adef8..257bed0d98 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless -@@ -50,6 +50,7 @@ RUN apk --no-cache add \ +@@ -49,6 +49,7 @@ RUN apk --no-cache add \ dumb-init \ gettext \ git \ + git-lfs \ curl \ gnupg \ - openssh-keygen \ + openssh-keygen -- -2.51.0 +2.47.3 diff --git a/patches/0017-BLENDER-Custom-locales-for-changing-password-usernam.patch b/patches/0017-BLENDER-Custom-locales-for-changing-password-usernam.patch deleted file mode 100644 index 26bc456dd3414..0000000000000 --- a/patches/0017-BLENDER-Custom-locales-for-changing-password-usernam.patch +++ /dev/null @@ -1,674 +0,0 @@ -From 430201077414e9aa536c6c113d0651f8078ed57b Mon Sep 17 00:00:00 2001 -From: Bart van der Braak -Date: Thu, 17 Jul 2025 11:32:45 +0200 -Subject: [PATCH 17/19] BLENDER: Custom locales for changing password/username - ---- - options/locale/locale_cs-CZ.ini | 4 ++-- - options/locale/locale_de-DE.ini | 4 ++-- - options/locale/locale_el-GR.ini | 4 ++-- - options/locale/locale_en-US.ini | 7 +++---- - options/locale/locale_es-ES.ini | 4 ++-- - options/locale/locale_fa-IR.ini | 4 ++-- - options/locale/locale_fi-FI.ini | 4 ++-- - options/locale/locale_fr-FR.ini | 4 ++-- - options/locale/locale_ga-IE.ini | 4 ++-- - options/locale/locale_hu-HU.ini | 4 ++-- - options/locale/locale_id-ID.ini | 4 ++-- - options/locale/locale_it-IT.ini | 4 ++-- - options/locale/locale_ja-JP.ini | 4 ++-- - options/locale/locale_ko-KR.ini | 4 ++-- - options/locale/locale_lv-LV.ini | 4 ++-- - options/locale/locale_nl-NL.ini | 4 ++-- - options/locale/locale_pl-PL.ini | 4 ++-- - options/locale/locale_pt-BR.ini | 4 ++-- - options/locale/locale_pt-PT.ini | 4 ++-- - options/locale/locale_ru-RU.ini | 4 ++-- - options/locale/locale_si-LK.ini | 8 ++++---- - options/locale/locale_sk-SK.ini | 4 ++-- - options/locale/locale_sv-SE.ini | 4 ++-- - options/locale/locale_tr-TR.ini | 4 ++-- - options/locale/locale_uk-UA.ini | 4 ++-- - options/locale/locale_zh-CN.ini | 4 ++-- - options/locale/locale_zh-TW.ini | 4 ++-- - templates/user/settings/account.tmpl | 2 +- - 28 files changed, 58 insertions(+), 59 deletions(-) - -diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini -index cc92f2e626..303bffe03a 100644 ---- a/options/locale/locale_cs-CZ.ini -+++ b/options/locale/locale_cs-CZ.ini -@@ -401,7 +401,7 @@ invalid_password=Vaše heslo se neshoduje s heslem, které bylo použito k vytvo - reset_password_helper=Obnovit účet - reset_password_wrong_user=Jste přihlášen/a jako %s, ale odkaz pro obnovení účtu je pro %s - password_too_short=Délka hesla musí být minimálně %d znaků. --non_local_account=Externě ověřovaní uživatelé nemohou aktualizovat své heslo prostřednictvím webového rozhraní Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Ověřit - scratch_code=Pomocný kód - use_scratch_code=Použijte pomocný kód -@@ -723,7 +723,7 @@ new_password=Nové heslo - retype_new_password=Potvrdit nové heslo - password_incorrect=Zadané heslo není správné. - change_password_success=Vaše heslo bylo aktualizováno. Od teď se přihlašujte novým heslem. --password_change_disabled=Externě ověřovaní uživatelé nemohou aktualizovat své heslo prostřednictvím webového rozhraní Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-mailová adresa - manage_emails=Správa e-mailových adres -diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini -index dae7275f82..3c46112587 100644 ---- a/options/locale/locale_de-DE.ini -+++ b/options/locale/locale_de-DE.ini -@@ -413,7 +413,7 @@ invalid_password=Ihr Passwort stimmt nicht mit dem Passwort überein, das zur Er - reset_password_helper=Konto wiederherstellen - reset_password_wrong_user=Du bist angemeldet als %s, aber der Link zur Kontowiederherstellung ist für %s - password_too_short=Das Passwort muss mindestens %d Zeichen lang sein. --non_local_account=Benutzer, die nicht von Gitea verwaltet werden können ihre Passwörter nicht über das Web Interface ändern. -+non_local_account = You can manage your Blender ID password here. - verify=Verifizieren - scratch_code=Einmalpasswort - use_scratch_code=Einmalpasswort verwenden -@@ -738,7 +738,7 @@ new_password=Neues Passwort - retype_new_password=Neues Passwort bestätigen - password_incorrect=Das aktuelle Passwort ist falsch. - change_password_success=Dein Passwort wurde aktualisiert. Bitte verwende dieses beim nächsten Einloggen. --password_change_disabled=Benutzer, die nicht von Gitea verwaltet werden, können ihr Passwort im Web-Interface nicht ändern. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-Mail-Adressen - manage_emails=E-Mail-Adressen verwalten -diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini -index 42b23dea05..5b98f9668d 100644 ---- a/options/locale/locale_el-GR.ini -+++ b/options/locale/locale_el-GR.ini -@@ -362,7 +362,7 @@ invalid_password=Ο κωδικός πρόσβασης σας δεν ταιριά - reset_password_helper=Ανάκτηση Λογαριασμού - reset_password_wrong_user=Έχετε συνδεθεί ως %s, αλλά ο σύνδεσμος ανάκτησης λογαριασμού προορίζεται για το %s - password_too_short=Το μήκος του κωδικού πρόσβασης δεν μπορεί να είναι μικρότερο από %d χαρακτήρες. --non_local_account=Οι μη τοπικοί χρήστες δεν μπορούν να ενημερώσουν τον κωδικό πρόσβασής τους μέσω του διεπαφής web του Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Επαλήθευση - scratch_code=Κωδικός μιας χρήσης - use_scratch_code=Χρήση κωδικού μιας χρήσης -@@ -648,7 +648,7 @@ new_password=Νέος Κωδικός Πρόσβασης - retype_new_password=Επιβεβαίωση Νέου Κωδικού Πρόσβασης - password_incorrect=Ο τρέχων κωδικός πρόσβασης είναι λάθος. - change_password_success=Ο κωδικός πρόσβασής σας έχει ενημερωθεί. Από εδώ και τώρα συνδέεστε χρησιμοποιώντας τον νέο κωδικό πρόσβασής σας. --password_change_disabled=Οι μη τοπικοί χρήστες δεν μπορούν να ενημερώσουν τον κωδικό πρόσβασής τους μέσω του διεπαφής web του Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Διευθύνσεις Email - manage_emails=Διαχείριση Διευθύνσεων Email -diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini -index b5cfe83c90..7f787ac74d 100644 ---- a/options/locale/locale_en-US.ini -+++ b/options/locale/locale_en-US.ini -@@ -446,7 +446,7 @@ invalid_password = Your password does not match the password that was used to cr - reset_password_helper = Recover Account - reset_password_wrong_user = You are signed in as %s, but the account recovery link is meant for %s - password_too_short = Password length cannot be less than %d characters. --non_local_account = Non-local users cannot update their password through the Gitea web interface. -+non_local_account = You can manage your Blender ID password here. - verify = Verify - scratch_code = Scratch code - use_scratch_code = Use a scratch code -@@ -755,7 +755,7 @@ public_profile = Public Profile - biography_placeholder = Tell us a little bit about yourself! (You can use Markdown) - location_placeholder = Share your approximate location with others - profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations. --password_username_disabled = You are not allowed to change your username. Please contact your site administrator for more details. -+password_username_disabled = You can change your username by changing your Blender ID nickname here. - password_full_name_disabled = You are not allowed to change your full name. Please contact your site administrator for more details. - full_name = Full Name - website = Website -@@ -814,8 +814,7 @@ new_password = New Password - retype_new_password = Confirm New Password - password_incorrect = The current password is incorrect. - change_password_success = Your password has been updated. Sign in using your new password from now on. --password_change_disabled = Non-local users cannot update their password through the Gitea web interface. -- -+password_change_disabled = You can manage your Blender ID password here. - emails = Email Addresses - manage_emails = Manage Email Addresses - manage_themes = Select default theme -diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini -index ffacb46b19..5f484336d7 100644 ---- a/options/locale/locale_es-ES.ini -+++ b/options/locale/locale_es-ES.ini -@@ -359,7 +359,7 @@ invalid_password=Su contraseña no coincide con la contraseña utilizada para cr - reset_password_helper=Recuperar cuenta - reset_password_wrong_user=Has iniciado sesión como %s, pero el enlace de recuperación de la cuenta está destinado a %s - password_too_short=La longitud de la contraseña no puede ser menor a %d caracteres. --non_local_account=Los usuarios no locales no pueden actualizar su contraseña a través de la interfaz web de Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Verificar - scratch_code=Código de respaldo - use_scratch_code=Usar un código de respaldo -@@ -645,7 +645,7 @@ new_password=Nueva contraseña - retype_new_password=Confirme la nueva contraseña - password_incorrect=Contraseña actual incorrecta. - change_password_success=Su contraseña ha sido modificada. Utilice su nueva contraseña la próxima vez que acceda a la cuenta. --password_change_disabled=Los usuarios no locales no pueden actualizar su contraseña a través de la interfaz web de Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Direcciones de correo electrónico - manage_emails=Administrar direcciones de correo electrónico -diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini -index abeef31988..548df1bb88 100644 ---- a/options/locale/locale_fa-IR.ini -+++ b/options/locale/locale_fa-IR.ini -@@ -278,7 +278,7 @@ reset_password=بازیابی حساب - invalid_code=کد تایید غیرمعتبر بوده و یا منقضی شده است. - reset_password_helper=بازیابی حساب - password_too_short=طول گذرواژه نمی تواند کمتر از %d کاراکتر باشد. --non_local_account=کاربران غیر محلی نمیتوانند گذرواژه خود را از طریق واسط وب گیتی به روز کنند. -+non_local_account = You can manage your Blender ID password here. - verify=تایید‌کنید - scratch_code=کد پایه - use_scratch_code=استفاده از کدپایه -@@ -511,7 +511,7 @@ old_password=گذارواژه فعلی - new_password=گذرواژه جدید - password_incorrect=گذرواژه فعلی شما اشتباه است. - change_password_success=گذرواژه شما تغییر کرد. از این پس با گذرواژه جدید خود وارد شوید. --password_change_disabled=کاربران غیر محلی نمیتوانند گذرواژه خود را از طریق واسط وب گیتی به روز کنند. -+password_change_disabled = You can manage your Blender ID password here. - - emails=نشانی‌های ایمیل - manage_emails=مدیریت نشانی‌های ایمیل -diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini -index 9d7fc033c4..dece68a3f5 100644 ---- a/options/locale/locale_fi-FI.ini -+++ b/options/locale/locale_fi-FI.ini -@@ -288,7 +288,7 @@ reset_password=Tilin palautus - invalid_code=Vahvistusavain on virheellinen tai vanhentunut. - reset_password_helper=Palauta käyttäjätili - password_too_short=Salasanan pituus ei voi olla vähemmän kuin %d merkkiä. --non_local_account=Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Gitean web-käyttöliittymän kautta. -+non_local_account = You can manage your Blender ID password here. - verify=Vahvista - scratch_code=Kertakäyttökoodi - use_scratch_code=Käytä kertakäyttökoodia -@@ -489,7 +489,7 @@ change_password=Päivitä salasana - old_password=Nykyinen salasana - new_password=Uusi salasana - password_incorrect=Nykyinen salasanasi on virheellinen. --password_change_disabled=Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Gitean web-käyttöliittymän kautta. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Sähköposti osoitteet - manage_emails=Hallitse sähköpostiosoitteita -diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini -index 5814de64ca..eacec6ad45 100644 ---- a/options/locale/locale_fr-FR.ini -+++ b/options/locale/locale_fr-FR.ini -@@ -446,7 +446,7 @@ invalid_password=Votre mot de passe ne correspond pas à celui utilisé pour cr - reset_password_helper=Récupérer un compte - reset_password_wrong_user=Vous êtes connecté en tant que %s, mais le lien de récupération est pour %s - password_too_short=Le mot de passe doit contenir %d caractères minimum. --non_local_account=Les mots de passes des comptes utilisateurs externes ne peuvent pas être modifiées depuis l'interface web Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Vérifier - scratch_code=Code de secours - use_scratch_code=Utiliser un code de secours -@@ -802,7 +802,7 @@ new_password=Nouveau mot de passe - retype_new_password=Confirmer le nouveau mot de passe - password_incorrect=Le mot de passe actuel est incorrect. - change_password_success=Votre mot de passe a été mis à jour. Désormais, connectez-vous avec votre nouveau mot de passe. --password_change_disabled=Les mots de passes des comptes utilisateurs externes ne peuvent pas être modifiées depuis l'interface web Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Adresses courriels - manage_emails=Gérer les adresses courriels -diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini -index b5b05209e5..177d774cd5 100644 ---- a/options/locale/locale_ga-IE.ini -+++ b/options/locale/locale_ga-IE.ini -@@ -446,7 +446,7 @@ invalid_password=Ní mheaitseálann do phasfhocal leis an bhfocal faire a úsái - reset_password_helper=Gnóthaigh Cuntas - reset_password_wrong_user=Tá tú sínithe isteach mar %s, ach tá an nasc aisghabhála cuntas i gceist le haghaidh %s - password_too_short=Ní féidir fad pasfhocal a bheith níos lú ná %d carachtair. --non_local_account=Ní féidir le húsáideoirí neamháitiúla a bhfocal faire a nuashonrú trí chomhéadan gréasáin Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Fíoraigh - scratch_code=Cód Scratch - use_scratch_code=Úsáid cód scratch -@@ -802,7 +802,7 @@ new_password=Pasfhocal Nua - retype_new_password=Deimhnigh Pasfhocal Nua - password_incorrect=Tá an pasfhocal reatha mícheart. - change_password_success=Tá do phasfhocal nuashonraithe. Sínigh isteach ag baint úsáide as do phasfhocal nua as seo amach. --password_change_disabled=Ní féidir le húsáideoirí neamháitiúla a bhfocal faire a nuashonrú trí chomhéadan gréasáin Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Seoltaí ríomhphoist - manage_emails=Bainistigh Seoltaí Ríomhphoist -diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini -index 0fc86f0775..caa23e52a2 100644 ---- a/options/locale/locale_hu-HU.ini -+++ b/options/locale/locale_hu-HU.ini -@@ -250,7 +250,7 @@ reset_password=Fiók Visszaállítás - invalid_code=Az ellenőrző kód érvénytelen vagy lejárt. - reset_password_helper=Fiók visszaállítása - password_too_short=A jelszó nem lehet rövidebb, mint %d karakter. --non_local_account=A nem helyi felhasználók nem frissíthetik jelszavukat a webes felületen keresztül. -+non_local_account = You can manage your Blender ID password here. - verify=Ellenőrzés - scratch_code=Kaparós kód - use_scratch_code=Kaparós kód használata -@@ -423,7 +423,7 @@ old_password=Jelenlegi jelszó - new_password=Új jelszó - password_incorrect=A megadott jelenlegi jelszó helytelen. - change_password_success=A jelszava frissítve lett. Mostantól ezzel jelentkezhet be. --password_change_disabled=A nem helyi felhasználók nem frissíthetik jelszavukat a webes felületen keresztül. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-mail címek - manage_emails=E-mail címek kezelése -diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini -index a5640655d2..aed43acd1c 100644 ---- a/options/locale/locale_id-ID.ini -+++ b/options/locale/locale_id-ID.ini -@@ -258,7 +258,7 @@ reset_password=Pemulihan Akun - invalid_code=Kode konfirmasi Anda tidak valid atau sudah kadaluarsa. - reset_password_helper=Pulihkan Akun - password_too_short=Panjang kata sandi tidak boleh kurang dari %d karakter. --non_local_account=Akun non-lokal tidak dapat mengubah kata sandi melalui antarmuka web Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Verifikasi - scratch_code=Kode coretan - use_scratch_code=Gunakan kode coretan -@@ -430,7 +430,7 @@ old_password=Kata Sandi Saat Ini - new_password=Kata Sandi Baru - password_incorrect=Kata sandi saat ini salah. - change_password_success=Sandi Anda telah diperbarui. Mulai dari sekarang gunakan kata sandi yang baru. --password_change_disabled=Pengguna non-lokal tidak dapat mengganti kata sandi mereka melalui antarmuka web Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Alamat Surel - manage_emails=Kelola Alamat Surel -diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini -index 31aebff2d6..8de0032432 100644 ---- a/options/locale/locale_it-IT.ini -+++ b/options/locale/locale_it-IT.ini -@@ -299,7 +299,7 @@ reset_password=Recupero account - invalid_code=Il tuo codice di conferma è invalido oppure è scaduto. - reset_password_helper=Recuperare account - password_too_short=La lunghezza della password non può essere minore di %d caratteri. --non_local_account=Gli utenti non locali non possono cambiare la loro password attraverso l'interfaccia web. -+non_local_account = You can manage your Blender ID password here. - verify=Verifica - scratch_code=Codice Gratta e Vinci - use_scratch_code=Utilizza un codice di zero -@@ -550,7 +550,7 @@ old_password=Password attuale - new_password=Nuova Password - password_incorrect=La password attuale non è corretta. - change_password_success=La password è stata aggiornata. Utilizza la nuova password la prossima volta che effettui il login. --password_change_disabled=Gli utenti non locali non possono cambiare la loro password attraverso l'interfaccia web. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Indirizzi e-mail - manage_emails=Gestisci indirizzi email -diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini -index f2fbce889e..80941d468c 100644 ---- a/options/locale/locale_ja-JP.ini -+++ b/options/locale/locale_ja-JP.ini -@@ -446,7 +446,7 @@ invalid_password=アカウントの作成に使用されたパスワードと一 - reset_password_helper=アカウント回復 - reset_password_wrong_user=あなたは %s でサインイン中ですが、アカウント回復のリンクは %s のものです。 - password_too_short=%d文字未満のパスワードは設定できません。 --non_local_account=ローカルユーザーでない場合はGiteaのWebインターフェースからパスワードを変更することはできません。 -+non_local_account = You can manage your Blender ID password here. - verify=確認 - scratch_code=スクラッチコード - use_scratch_code=スクラッチコードを使う -@@ -802,7 +802,7 @@ new_password=新しいパスワード - retype_new_password=新しいパスワードの確認 - password_incorrect=現在のパスワードが正しくありません。 - change_password_success=パスワードを更新しました。 今後は新しいパスワードを使ってサインインしてください。 --password_change_disabled=ローカルユーザーでない場合は、GiteaのWebインターフェースからパスワードを変更することはできません。 -+password_change_disabled = You can manage your Blender ID password here. - - emails=メールアドレス - manage_emails=メールアドレスの管理 -diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini -index 39df68f126..9f6d839d79 100644 ---- a/options/locale/locale_ko-KR.ini -+++ b/options/locale/locale_ko-KR.ini -@@ -235,7 +235,7 @@ reset_password=비밀번호 재설정 - invalid_code=검증 코드가 유효하지 않거나 만료되었습니다. - reset_password_helper=계정 복구 - password_too_short=비밀번호의 길이는 최소 %d 자가 되어야 합니다. --non_local_account=로컬 유저가 아닌 경우 Gitea 웹 인터페이스를 통해 비밀번호를 변경할 수 없습니다. -+non_local_account = You can manage your Blender ID password here. - verify=확인 - scratch_code=스크래치 코드 - use_scratch_code=스크래치 코드 사용 -@@ -400,7 +400,7 @@ old_password=현재 비밀번호 - new_password=새 비밀번호 - password_incorrect=현재 비밀번호가 올바르지 않습니다. - change_password_success=비밀번호가 업데이트되었습니다. 다음 번 로그인하실 때는 새 비밀번호를 사용해 주십시오. --password_change_disabled=로컬 유저가 아닌 경우 Gitea 웹 인터페이스를 통해 비밀번호를 변경할 수 없습니다. -+password_change_disabled = You can manage your Blender ID password here. - - emails=이메일 주소 - manage_emails=이메일 주소 관리 -diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini -index 9c8f47534b..75e4e9bc27 100644 ---- a/options/locale/locale_lv-LV.ini -+++ b/options/locale/locale_lv-LV.ini -@@ -365,7 +365,7 @@ invalid_password=Jūsu parole neatbilst parolei, kas tika ievadīta veidojot so - reset_password_helper=Atjaunot paroli - reset_password_wrong_user=Jūs esat pieteicies kā %s, bet konta atkopšanas saite ir paredzēta lietotājam %s - password_too_short=Paroles garums nedrīkst būt mazāks par %d simboliem. --non_local_account=Ārējie konti nevar mainīt paroli, izmantojot, Gitea saskarni. -+non_local_account = You can manage your Blender ID password here. - verify=Pārbaudīt - scratch_code=Vienreizējais kods - use_scratch_code=Izmantot vienreizējo kodu -@@ -651,7 +651,7 @@ new_password=Jauna parole - retype_new_password=Apstiprināt jauno paroli - password_incorrect=Ievadīta nepareiza pašreizējā parole. - change_password_success=Parole tika veiksmīgi nomainīta. Tagad varat pieteikties ar jauno paroli. --password_change_disabled=Ārējie konti nevar mainīt paroli, izmantojot, Gitea saskarni. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-pasta adreses - manage_emails=Pārvaldīt e-pasta adreses -diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini -index 326a203c8f..2936766f50 100644 ---- a/options/locale/locale_nl-NL.ini -+++ b/options/locale/locale_nl-NL.ini -@@ -298,7 +298,7 @@ reset_password=Account herstel - invalid_code=Uw bevestigingscode is ongeldig of is verlopen. - reset_password_helper=Account herstellen - password_too_short=De lengte van uw wachtwoord moet tenminste %d karakters zijn. --non_local_account=Non-lokale gebruikers mogen hun wachtwoord niet wijzigen via de webinterface. -+non_local_account = You can manage your Blender ID password here. - verify=Verifiëren - scratch_code=Eenmalige code - use_scratch_code=Gebruik een eenmalige code -@@ -549,7 +549,7 @@ old_password=Huidige wachtwoord - new_password=Nieuw wachtwoord - password_incorrect=Het wachtwoord is niet correct. - change_password_success=Je wachtwoord is bijgewerkt. Log vanaf nu in met je nieuwe wachtwoord. --password_change_disabled=Niet-lokale gebruikers kunnen hun wachtwoord niet in de webinterface van Gitea wijzigen. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-mailadressen - manage_emails=E-mailadressen beheren -diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini -index 872f1104ab..a966a002f5 100644 ---- a/options/locale/locale_pl-PL.ini -+++ b/options/locale/locale_pl-PL.ini -@@ -293,7 +293,7 @@ reset_password=Odzyskiwanie konta - invalid_code=Twój kod potwierdzający jest nieprawidłowy lub wygasł. - reset_password_helper=Odzyskaj konto - password_too_short=Długość hasła nie może być mniejsza niż %d znaków. --non_local_account=Konta niebędące lokalnymi nie mogą zmienić swojego hasła poprzez interfejs przeglądarkowy Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Potwierdź - scratch_code=Kod jednorazowy - use_scratch_code=Użyj kodu jednorazowego -@@ -516,7 +516,7 @@ old_password=Aktualne hasło - new_password=Nowe hasło - password_incorrect=Bieżące hasło nie jest prawidłowe. - change_password_success=Twoje hasło zostało zaktualizowane. Od teraz możesz logować się za pomocą nowego hasła. --password_change_disabled=Konta niebędące lokalnymi nie mogą zmienić swojego hasła poprzez interfejs przeglądarkowy Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Adresy e-mail - manage_emails=Zarządzaj adresami e-mail -diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini -index b457ecc800..213428fe68 100644 ---- a/options/locale/locale_pt-BR.ini -+++ b/options/locale/locale_pt-BR.ini -@@ -440,7 +440,7 @@ invalid_password=Sua senha não coincide com a senha que foi usada para criar a - reset_password_helper=Recuperar Conta - reset_password_wrong_user=Você está conectado como %s, mas o link de recuperação de conta é destinado a %s - password_too_short=A senha deve ter %d ou mais caracteres. --non_local_account=Usuários não-locais não podem atualizar sua senha através da interface web do Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Verificar - scratch_code=Código de backup - use_scratch_code=Use um código de backup -@@ -775,7 +775,7 @@ new_password=Nova Senha - retype_new_password=Confirmar Nova Senha - password_incorrect=A senha atual está incorreta. - change_password_success=Sua senha foi atualizada. Acesse usando sua nova senha de agora em diante. --password_change_disabled=Contas não-locais não podem alterar sua senha através da interface web do Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Endereços de E-mail - manage_emails=Gerenciar Endereços de E-mail -diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini -index 9e648b6602..2e00947612 100644 ---- a/options/locale/locale_pt-PT.ini -+++ b/options/locale/locale_pt-PT.ini -@@ -446,7 +446,7 @@ invalid_password=A sua senha não corresponde à senha que foi usada para criar - reset_password_helper=Recuperar conta - reset_password_wrong_user=Tem conta iniciada como %s, mas a ligação de recuperação de conta é para %s - password_too_short=O tamanho da senha não pode ser inferior a %d caracteres. --non_local_account=Os utilizadores não-locais não podem alterar a sua senha através da interface web do Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Validar - scratch_code=Código de recuperação - use_scratch_code=Usar um código de recuperação -@@ -802,7 +802,7 @@ new_password=Nova senha - retype_new_password=Confirme a nova senha - password_incorrect=A senha corrente está errada. - change_password_success=A sua senha foi substituída. Inicie a sessão com a nova senha a partir de agora. --password_change_disabled=Os utilizadores não-locais não podem alterar a sua senha através da interface web do Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Endereços de email - manage_emails=Gerir endereços de email -diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini -index 6da0eea91c..811938d33e 100644 ---- a/options/locale/locale_ru-RU.ini -+++ b/options/locale/locale_ru-RU.ini -@@ -360,7 +360,7 @@ invalid_password=Ваш пароль не совпадает с паролем, - reset_password_helper=Восстановить аккаунт - reset_password_wrong_user=Вы вошли как %s, но ссылка для восстановления учётной записи предназначена для %s - password_too_short=Пароль не может быть короче %d символов. --non_local_account=Нелокальные аккаунты не могут изменить пароль через Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Проверить - scratch_code=Одноразовый пароль - use_scratch_code=Использовать scratch-код -@@ -646,7 +646,7 @@ new_password=Новый пароль - retype_new_password=Подтвердите новый пароль - password_incorrect=Текущий пароль неправильный. - change_password_success=Ваш пароль был изменён. С этого момента необходимо использовать новый пароль для входа. --password_change_disabled=Нелокальные аккаунты не могут изменить пароль через Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Email адреса - manage_emails=Управление адресами электронной почты -diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini -index e065527bbe..c1ced951b2 100644 ---- a/options/locale/locale_si-LK.ini -+++ b/options/locale/locale_si-LK.ini -@@ -270,7 +270,7 @@ reset_password=ගිණුම ප්‍රතිසාධනය - invalid_code=ඔබගේ තහවුරු කිරීමේ කේතය අවලංගු හෝ කල් ඉකුත් වී ඇත. - reset_password_helper=ගිණුම ප්‍රතිසාධනය - password_too_short=මුරපදයේ දිග %d අක්ෂර වලට වඩා අඩු විය නොහැක. --non_local_account=දේශීය නොවන පරිශීලකයින්ට Gitea වෙබ් අතුරුමුහුණත හරහා ඔවුන්ගේ මුරපදය යාවත්කාලීන කළ නොහැක. -+non_local_account = You can manage your Blender ID password here. - verify=සත්යාපනය කරන්න - scratch_code=සීරීම් කේතය - use_scratch_code=සීරීම් කේතයක් භාවිතා කරන්න -@@ -502,7 +502,7 @@ old_password=වත්මන් මුරපදය - new_password=නව මුරපදය - password_incorrect=වත්මන් මුරපදය වැරදිය. - change_password_success=ඔබගේ මුරපදය යාවත්කාලීන කර ඇත. මෙතැන් සිට ඔබගේ නව මුරපදය භාවිතා කරමින් පුරනය වන්න. --password_change_disabled=දේශීය නොවන පරිශීලකයින්ට Gitea වෙබ් අතුරුමුහුණත හරහා ඔවුන්ගේ මුරපදය යාවත්කාලීන කළ නොහැක. -+password_change_disabled = You can manage your Blender ID password here. - - emails=වි-තැපැල් ලිපින - manage_emails=වි-තැපැල් ලිපින කළමනාකරණය -@@ -1209,7 +1209,7 @@ pulls.cant_reopen_deleted_branch=ශාඛාව මකා දැමූ නි - pulls.merged=සංයුක්ත කෙරිණි - pulls.manually_merged=අතින් සංයුක්ත කර ඇත - pulls.is_closed=අදින්න ඉල්ලීම වසා දමා ඇත. --pulls.title_wip_desc=අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. -+pulls.title_wip_desc=අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. - pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියාත්මක වන කාර්යයක් ලෙස සලකුණු කර ඇත. - pulls.still_in_progress=තවමත් ක්රියාත්මක වෙමින් තිබේද? - pulls.add_prefix=%s උපසර්ගය එකතු කරන්න -@@ -1245,7 +1245,7 @@ pulls.invalid_merge_option=ඔබ මෙම අදින්න ඉල්ලී - pulls.merge_conflict_summary=දෝෂ පණිවිඩය - pulls.rebase_conflict_summary=දෝෂ පණිවිඩය - pulls.push_rejected_summary=පූර්ණ ප්රතික්ෂේප පණිවිඩය --pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. -+pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. - pulls.status_checking=සමහර චෙක්පත් බලා ඇත - pulls.status_checks_success=සියලුම චෙක්පත් සාර්ථක විය - pulls.status_checks_warning=සමහර චෙක්පත් අනතුරු ඇඟවීම් වාර්තා කරයි -diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini -index dc022da24b..22922b171c 100644 ---- a/options/locale/locale_sk-SK.ini -+++ b/options/locale/locale_sk-SK.ini -@@ -350,7 +350,7 @@ invalid_code=Váš potvrdzovací kód je chybný alebo vypršala jeho platnosť. - invalid_password=Vaše heslo sa nezhoduje s heslom, ktoré bolo použité na vytvorenie účtu. - reset_password_helper=Obnoviť účet - password_too_short=Heslo nemôže obsahovať menej ako %d znakov. --non_local_account=Externe overovaní používatelia nemôžu aktualizovať svoje heslo prostredníctvom webového rozhrania Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Overiť - scratch_code=Pomocný kód - use_scratch_code=Použiť pomocný kód -@@ -609,7 +609,7 @@ old_password=Aktuálne heslo - new_password=Nové heslo - password_incorrect=Aktuálne heslo nie je správne. - change_password_success=Vaše heslo bolo aktualizované. Od teraz sa prihlasujte novým heslom. --password_change_disabled=Externe overovaní používatelia nemôžu aktualizovať svoje heslo prostredníctvom webového rozhrania Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-mailové adresy - manage_emails=Správa e-mailových adries -diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini -index e8c13cae0d..d5ad605078 100644 ---- a/options/locale/locale_sv-SE.ini -+++ b/options/locale/locale_sv-SE.ini -@@ -257,7 +257,7 @@ reset_password=Kontoåterställning - invalid_code=Din bekräftelsekod är ogiltig eller har löpt ut. - reset_password_helper=Återställ konto - password_too_short=Lösenordet får ej vara kortare än %d tecken. --non_local_account=Externa användare kan inte ändra sitt lösenord genom Giteas webbgränssnitt. -+non_local_account = You can manage your Blender ID password here. - verify=Verifiera - scratch_code=Skrapkod - use_scratch_code=Använd en skrapkod -@@ -441,7 +441,7 @@ old_password=Nuvarande lösenord - new_password=Nytt lösenord - password_incorrect=Det nuvarande lösenordet är felaktigt. - change_password_success=Ditt lösenord har uppdaterats. Logga in med ditt nya lösenord fortsättningsvis. --password_change_disabled=Externa användare kan inte ändra sitt lösenord genom Giteas webbgränssnitt. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-postadresser - manage_emails=Hantera mejladresser -diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini -index a3ae736f67..109d564d3c 100644 ---- a/options/locale/locale_tr-TR.ini -+++ b/options/locale/locale_tr-TR.ini -@@ -437,7 +437,7 @@ invalid_password=Parolanız hesap oluşturulurken kullanılan parolayla eşleşm - reset_password_helper=Hesabı Kurtar - reset_password_wrong_user=%s olarak oturum açmışsınız, ancak hesap kurtarma bağlantısı %s için - password_too_short=Parolanız en az %d karakter uzunluğunda olmalıdır. --non_local_account=Yerel olmayan kullanıcılar parolalarını Gitea web arayüzünden güncelleyemezler. -+non_local_account = You can manage your Blender ID password here. - verify=Doğrula - scratch_code=Çizgi kodu - use_scratch_code=Bir çizgi kodu kullanınız -@@ -762,7 +762,7 @@ new_password=Yeni Parola - retype_new_password=Yeni Parolayı Onayla - password_incorrect=Mevcut parola hatalı. - change_password_success=Parolanız güncelleştirildi. Şu andan itibaren yeni parolanızı kullanarak oturum açın. --password_change_disabled=Yerel olmayan kullanıcılar parolalarını Gitea web arayüzünden güncelleyemezler. -+password_change_disabled = You can manage your Blender ID password here. - - emails=E-Posta Adresleri - manage_emails=E-posta Adreslerini Yönet -diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini -index 1849d5d378..cbb78b78b4 100644 ---- a/options/locale/locale_uk-UA.ini -+++ b/options/locale/locale_uk-UA.ini -@@ -409,7 +409,7 @@ invalid_password=Ваш пароль не збігається з паролем - reset_password_helper=Відновити обліковий запис - reset_password_wrong_user=Ви увійшли як %s, але посилання для відновлення облікового запису призначене для %s - password_too_short=Довжина пароля не може бути меншою за %d символів. --non_local_account=Нелокальні користувачі не можуть оновити свій пароль через вебінтерфейс Gitea. -+non_local_account = You can manage your Blender ID password here. - verify=Підтвердити - scratch_code=Одноразовий пароль - use_scratch_code=Скористатись одноразовим паролем -@@ -729,7 +729,7 @@ new_password=Новий пароль - retype_new_password=Підтвердити новий пароль - password_incorrect=Поточний пароль неправильний. - change_password_success=Ваш пароль оновлено. Відтепер входьте в систему, використовуючи новий пароль. --password_change_disabled=Нелокальні користувачі не можуть оновити свій пароль через вебінтерфейс Gitea. -+password_change_disabled = You can manage your Blender ID password here. - - emails=Адреса електронної пошти - manage_emails=Керування адресами електронної пошти -diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini -index 496efa46a7..30fa8b9739 100644 ---- a/options/locale/locale_zh-CN.ini -+++ b/options/locale/locale_zh-CN.ini -@@ -446,7 +446,7 @@ invalid_password=您的密码与用于创建账户的密码不匹配。 - reset_password_helper=恢复账户 - reset_password_wrong_user=您以 %s 登录，但恢复账号链接是用于 %s。 - password_too_short=密码长度不能少于 %d 位。 --non_local_account=非本地帐户不能通过 Gitea 的 Web 界面更改密码。 -+non_local_account = You can manage your Blender ID password here. - verify=验证 - scratch_code=验证口令 - use_scratch_code=使用验证口令 -@@ -795,7 +795,7 @@ new_password=新的密码 - retype_new_password=确认新密码 - password_incorrect=当前密码不正确！ - change_password_success=您的密码已更新。从现在开始使用您的新密码登录。 --password_change_disabled=非本地帐户不能通过 Gitea 的 web 界面更改密码。 -+password_change_disabled = You can manage your Blender ID password here. - - emails=邮箱地址 - manage_emails=管理邮箱地址 -diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini -index c1879203f7..ac51cdc69c 100644 ---- a/options/locale/locale_zh-TW.ini -+++ b/options/locale/locale_zh-TW.ini -@@ -400,7 +400,7 @@ invalid_password=您的密碼和用來建立帳戶的不符。 - reset_password_helper=帳戶救援 - reset_password_wrong_user=您已經使用 %s 的帳戶登入，但帳戶救援連結是給 %s 的 - password_too_short=密碼長度不能少於 %d 個字！ --non_local_account=非本地帳戶無法透過 Gitea 的網頁介面更改密碼。 -+non_local_account = You can manage your Blender ID password here. - verify=驗證 - scratch_code=備用驗證碼 - use_scratch_code=使用備用驗證碼 -@@ -720,7 +720,7 @@ new_password=新的密碼 - retype_new_password=確認新密碼 - password_incorrect=輸入的密碼不正確！ - change_password_success=您的密碼已更新。 從現在起使用您的新密碼登入。 --password_change_disabled=非本地帳戶無法透過 Gitea 的網頁介面更改密碼。 -+password_change_disabled = You can manage your Blender ID password here. - - emails=電子信箱 - manage_emails=管理電子信箱 -diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl -index 7dbac0ebd4..5a2c953016 100644 ---- a/templates/user/settings/account.tmpl -+++ b/templates/user/settings/account.tmpl -@@ -4,7 +4,7 @@ - {{ctx.Locale.Tr "settings.password"}} - -
-- {{if and (not ($.UserDisabledFeatures.Contains "manage_credentials")) (or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2))}} -+ {{if and (not ($.UserDisabledFeatures.Contains "manage_password")) (or (.SignedUser.IsLocal) (.SignedUser.IsOAuth2))}} - - {{template "base/disable_form_autofill"}} - {{.CsrfTokenHtml}} --- -2.51.0 - diff --git a/patches/0019-BLENDER-Add-navigation-bar-icons-on-mobile.patch b/patches/0018-BLENDER-Add-navigation-bar-icons-on-mobile.patch similarity index 90% rename from patches/0019-BLENDER-Add-navigation-bar-icons-on-mobile.patch rename to patches/0018-BLENDER-Add-navigation-bar-icons-on-mobile.patch index 5d7afd8d12feb..e63e1950934f0 100644 --- a/patches/0019-BLENDER-Add-navigation-bar-icons-on-mobile.patch +++ b/patches/0018-BLENDER-Add-navigation-bar-icons-on-mobile.patch @@ -1,7 +1,7 @@ -From c0142cf057a88ca46d446be0028561cb3fbe22f5 Mon Sep 17 00:00:00 2001 +From bd774bc32f227f3d9f534cf4555f3990b86df243 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Thu, 13 Nov 2025 15:44:21 +0100 -Subject: [PATCH 19/19] BLENDER: Add navigation bar icons on mobile +Subject: [PATCH 18/22] BLENDER: Add navigation bar icons on mobile --- templates/base/head_navbar.tmpl | 4 ++++ @@ -11,7 +11,7 @@ Subject: [PATCH 19/19] BLENDER: Add navigation bar icons on mobile create mode 100644 templates/base/head_navbar_icons_begin.tmpl diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl -index b721779c95..5a1f5717d7 100644 +index cc7e4e6775..30a2f07916 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -6,6 +6,10 @@ @@ -45,10 +45,10 @@ index 0000000000..96830cea9f + {{svg "octicon-telescope"}} + diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css -index 149766a586..6fcda75236 100644 +index 83d50a9d11..203cbe679f 100644 --- a/web_src/css/modules/navbar.css +++ b/web_src/css/modules/navbar.css -@@ -61,6 +61,15 @@ +@@ -66,6 +66,15 @@ display: flex; justify-content: space-between; } @@ -63,7 +63,7 @@ index 149766a586..6fcda75236 100644 + } #navbar .navbar-mobile-right { display: flex; - margin: 0 0 0 auto; + align-items: center; -- -2.51.0 +2.47.3 diff --git a/patches/0020-BLENDER-contributor-agreement-support.patch b/patches/0019-BLENDER-contributor-agreement-support.patch similarity index 87% rename from patches/0020-BLENDER-contributor-agreement-support.patch rename to patches/0019-BLENDER-contributor-agreement-support.patch index f7343fad397a2..4fc7177dcbc00 100644 --- a/patches/0020-BLENDER-contributor-agreement-support.patch +++ b/patches/0019-BLENDER-contributor-agreement-support.patch @@ -1,7 +1,7 @@ -From 1b5c1160b67d3c345f8cea05eadc86863cc9ed22 Mon Sep 17 00:00:00 2001 +From fda629c1565583fcc0aceb86b9a94d3baebe82b1 Mon Sep 17 00:00:00 2001 From: Oleg Komarov Date: Wed, 28 Jan 2026 12:35:38 +0100 -Subject: [PATCH] BLENDER: contributor agreement support +Subject: [PATCH 19/22] BLENDER: contributor agreement support New models ContributorAgreement and SignedContributorAgreement are introduced. @@ -28,7 +28,7 @@ automatically posts a pull request comment when a check fails: https://projects.blender.org/user/settings/contributor_agreements --- models/user/contributor_agreement.go | 62 ++++++ - options/locale/locale_en-US.ini | 21 ++ + options/locale/locale_en-US.json | 20 +- routers/api/v1/api.go | 2 + routers/api/v1/user/contributor_agreement.go | 83 ++++++++ .../admin/signed_contributor_agreements.go | 201 ++++++++++++++++++ @@ -41,7 +41,7 @@ automatically posts a pull request comment when a check fails: templates/swagger/v1_json.tmpl | 36 ++++ .../user/settings/contributor_agreements.tmpl | 45 ++++ templates/user/settings/navbar.tmpl | 3 + - 14 files changed, 721 insertions(+), 1 deletion(-) + 14 files changed, 719 insertions(+), 2 deletions(-) create mode 100644 models/user/contributor_agreement.go create mode 100644 routers/api/v1/user/contributor_agreement.go create mode 100644 routers/web/admin/signed_contributor_agreements.go @@ -118,61 +118,61 @@ index 0000000000..c2c4f550ff + db.RegisterModel(new(ContributorAgreement)) + db.RegisterModel(new(SignedContributorAgreement)) +} -diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini -index fe1a1df858..b6f8842cf0 100644 ---- a/options/locale/locale_en-US.ini -+++ b/options/locale/locale_en-US.ini -@@ -751,6 +751,7 @@ account_link = Linked Accounts - organization = Organizations - uid = UID - webauthn = Two-Factor Authentication (Security Keys) -+contributor_agreements = Contributor Agreements - - public_profile = Public Profile - biography_placeholder = Tell us a little bit about yourself! (You can use Markdown) -@@ -3010,6 +3011,7 @@ last_page = Last - total = Total: %d - settings = Admin Settings - spamreports = Spam Reports -+signed_contributor_agreements = Signed CLA - - dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check the blog for more details. - dashboard.statistic = Summary -@@ -3182,6 +3184,18 @@ spamreports.created = Report Created - spamreports.updated = Report Updated - spamreports.status = Report Status - -+signed_contributor_agreements.all_option = All -+signed_contributor_agreements.batch_sign = Batch sign contributor agreements -+signed_contributor_agreements.batch_sign_button = Batch sign -+signed_contributor_agreements.comment = Comment -+signed_contributor_agreements.panel = Signed Contributor Agreements -+signed_contributor_agreements.search_button = Search -+signed_contributor_agreements.search_user = Search users -+signed_contributor_agreements.signed_at = Signed At -+signed_contributor_agreements.slug = CLA -+signed_contributor_agreements.user = User -+signed_contributor_agreements.usernames_input = Usernames, one per line -+ - orgs.org_manage_panel = Organization Management - orgs.name = Name - orgs.teams = Teams -@@ -3949,3 +3963,10 @@ normal_file = Normal file - executable_file = Executable file - symbolic_link = Symbolic link - submodule = Submodule -+ -+[contributor_agreements] -+signed_at = Signed by you at %s -+confirm = I agree to the terms of the contributor agreement. -+sign = Sign -+view_and_sign = View text and sign -+view = View text +diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json +index d6e362d816..081b227645 100644 +--- a/options/locale/locale_en-US.json ++++ b/options/locale/locale_en-US.json +@@ -673,6 +673,7 @@ + "settings.organization": "Organizations", + "settings.uid": "UID", + "settings.webauthn": "Two-Factor Authentication (Security Keys)", ++ "settings.contributor_agreements": "Contributor Agreements", + "settings.public_profile": "Public Profile", + "settings.biography_placeholder": "Tell us a little bit about yourself! (You can use Markdown)", + "settings.location_placeholder": "Share your approximate location with others", +@@ -2919,6 +2920,7 @@ + "admin.total": "Total: %d", + "admin.settings": "Admin Settings", + "admin.spamreports": "Spam Reports", ++ "admin.signed_contributor_agreements": "Signed CLA", + "admin.dashboard.new_version_hint": "Gitea %s is now available, you are running %s. Check the blog for more details.", + "admin.dashboard.statistic": "Summary", + "admin.dashboard.maintenance_operations": "Maintenance Operations", +@@ -3086,6 +3088,17 @@ + "admin.spamreports.created": "Report Created", + "admin.spamreports.updated": "Report Updated", + "admin.spamreports.status": "Report Status", ++ "admin.signed_contributor_agreements.all_option": "All", ++ "admin.signed_contributor_agreements.batch_sign": "Batch sign contributor agreements", ++ "admin.signed_contributor_agreements.batch_sign_button": "Batch sign", ++ "admin.signed_contributor_agreements.comment": "Comment", ++ "admin.signed_contributor_agreements.panel": "Signed Contributor Agreements", ++ "admin.signed_contributor_agreements.search_button": "Search", ++ "admin.signed_contributor_agreements.search_user": "Search users", ++ "admin.signed_contributor_agreements.signed_at": "Signed At", ++ "admin.signed_contributor_agreements.slug": "CLA", ++ "admin.signed_contributor_agreements.user": "User", ++ "admin.signed_contributor_agreements.usernames_input": "Usernames, one per line", + "admin.orgs.org_manage_panel": "Organization Management", + "admin.orgs.name": "Name", + "admin.orgs.teams": "Teams", +@@ -3864,5 +3877,10 @@ + "actions.general.cross_repo_desc": "Allow the selected repositories to be accessed (read-only) by all the repositories in this owner with GITEA_TOKEN when running Actions jobs.", + "actions.general.cross_repo_selected": "Selected repositories", + "actions.general.cross_repo_target_repos": "Target Repositories", +- "actions.general.cross_repo_add": "Add Target Repository" ++ "actions.general.cross_repo_add": "Add Target Repository", ++ "contributor_agreements.signed_at": "Signed by you at %s", ++ "contributor_agreements.confirm": "I agree to the terms of the contributor agreement.", ++ "contributor_agreements.sign": "Sign", ++ "contributor_agreements.view_and_sign": "View text and sign", ++ "contributor_agreements.view": "View text" + } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go -index 2e7f057659..28401506f5 100644 +index 35525551cd..070d667cb0 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go -@@ -1025,6 +1025,8 @@ func Routes() *web.Router { +@@ -1009,6 +1009,8 @@ func Routes() *web.Router { }, reqSelfOrAdmin(), reqBasicOrRevProxyAuth()) m.Get("/activities/feeds", user.ListUserActivityFeeds) @@ -183,7 +183,7 @@ index 2e7f057659..28401506f5 100644 diff --git a/routers/api/v1/user/contributor_agreement.go b/routers/api/v1/user/contributor_agreement.go new file mode 100644 -index 0000000000..7744c66e18 +index 0000000000..dc6e111e80 --- /dev/null +++ b/routers/api/v1/user/contributor_agreement.go @@ -0,0 +1,83 @@ @@ -250,7 +250,7 @@ index 0000000000..7744c66e18 + return + } + if !exist { -+ url := httplib.MakeAbsoluteURL(ctx, setting.AppSubURL + "/user/settings/contributor_agreements") ++ url := httplib.MakeAbsoluteURL(ctx, setting.AppSubURL+"/user/settings/contributor_agreements") + message := []string{ + fmt.Sprintf("Contributor agreement <%s> is not signed.", slug), + fmt.Sprintf("Sign at %s", url), @@ -272,7 +272,7 @@ index 0000000000..7744c66e18 +} diff --git a/routers/web/admin/signed_contributor_agreements.go b/routers/web/admin/signed_contributor_agreements.go new file mode 100644 -index 0000000000..c994bd787b +index 0000000000..2cf09e1f59 --- /dev/null +++ b/routers/web/admin/signed_contributor_agreements.go @@ -0,0 +1,201 @@ @@ -345,7 +345,7 @@ index 0000000000..c994bd787b + return + } + ctx.Data["SignedContributorAgreements"] = signedContributorAgreements -+ pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) ++ pager := context.NewPagination(count, opts.PageSize, opts.Page, 5) + pager.AddParamFromRequest(ctx.Req) + ctx.Data["Page"] = pager + @@ -479,7 +479,7 @@ index 0000000000..c994bd787b +} diff --git a/routers/web/user/setting/contributor_agreements.go b/routers/web/user/setting/contributor_agreements.go new file mode 100644 -index 0000000000..17f13adf66 +index 0000000000..19ccea7e42 --- /dev/null +++ b/routers/web/user/setting/contributor_agreements.go @@ -0,0 +1,158 @@ @@ -538,9 +538,9 @@ index 0000000000..17f13adf66 + for i, ca := range contributorAgreements { + var uca UserContributorAgreement + userContributorAgreements[i] = &uca -+ uca.ContributorAgreement = *ca ++ uca.ContributorAgreement = *ca + if sca, has := id2sca[ca.ID]; has { -+ uca.Comment = sca.Comment ++ uca.Comment = sca.Comment + uca.SignedAt = sca.CreatedUnix + } + } @@ -635,27 +635,27 @@ index 0000000000..17f13adf66 + return fmt.Errorf("UpdateRunJob failed for job.ID=%d: %w", job.ID, err) + } + -+ actions_service.CreateCommitStatus(ctx, job) -+ notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) ++ actions_service.CreateCommitStatusForRunJobs(ctx, run, job) ++ notify_service.WorkflowJobStatusUpdate(ctx, run.Repo, run.TriggerUser, job, nil) + } + + return nil +} diff --git a/routers/web/web.go b/routers/web/web.go -index e9f804836c..cc63715275 100644 +index e0a8e6a9e4..b8351f7bc1 100644 --- a/routers/web/web.go +++ b/routers/web/web.go -@@ -687,6 +687,9 @@ func registerWebRoutes(m *web.Router) { +@@ -724,6 +724,9 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { // BLENDER: spam reporting m.Post("/spamreport", user_setting.SpamReportUserPost) + // BLENDER: contributor agreement + m.Get("/contributor_agreements", user_setting.ContributorAgreements) + m.Post("/contributor_agreements/{slug}/sign", user_setting.SignContributorAgreement) - }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "EnablePackages", setting.Packages.Enabled, "EnableNotifyMail", setting.Service.EnableNotifyMail)) + }, reqSignIn, user_setting.SettingsCtxData) m.Group("/user", func() { -@@ -767,6 +770,12 @@ func registerWebRoutes(m *web.Router) { +@@ -814,6 +817,12 @@ func registerWebRoutes(m *web.Router, webAuth *AuthMiddleware) { }) m.Post("/purge_spammer", admin.PurgeSpammerPost) @@ -682,19 +682,19 @@ index 39c6ef052d..f82009c919 100644 return fmt.Errorf("deleteBeans: %w", err) } diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl -index 6cee23f79c..8f1ae3b0e4 100644 +index bede52e75c..dad65b0943 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -13,7 +13,7 @@
--
-+
+-
++
{{ctx.Locale.Tr "admin.identity_access"}}
-@@ -31,6 +31,9 @@ +@@ -34,6 +34,9 @@ {{ctx.Locale.Tr "admin.spamreports"}} @@ -812,10 +812,10 @@ index 0000000000..9c4db6809d + +{{template "admin/layout_footer" .}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl -index ef0d607e3d..92fe29bcdd 100644 +index 355e4519c9..602655136d 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl -@@ -20199,6 +20199,42 @@ +@@ -20703,6 +20703,42 @@ } } }, @@ -910,10 +910,10 @@ index 0000000000..6276dd5b7b +
+{{template "user/settings/layout_footer" .}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl -index 34e089a68a..eba9f16888 100644 +index e2bc72ca5f..6742317dbd 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl -@@ -65,5 +65,8 @@ +@@ -68,5 +68,8 @@ {{ctx.Locale.Tr "settings.repos"}} @@ -923,5 +923,5 @@ index 34e089a68a..eba9f16888 100644
-- -2.51.0 +2.47.3 diff --git a/patches/0022-BLENDER-Add-line-words-and-cursor-indicators.patch b/patches/0020-BLENDER-Add-line-words-and-cursor-indicators.patch similarity index 90% rename from patches/0022-BLENDER-Add-line-words-and-cursor-indicators.patch rename to patches/0020-BLENDER-Add-line-words-and-cursor-indicators.patch index 836aafdc70f34..31fd1a773a90b 100644 --- a/patches/0022-BLENDER-Add-line-words-and-cursor-indicators.patch +++ b/patches/0020-BLENDER-Add-line-words-and-cursor-indicators.patch @@ -1,14 +1,14 @@ -From e1c42d3e2658c0d3980dac8e0f33dc36dfdeab77 Mon Sep 17 00:00:00 2001 +From 82eb680e62325582546ec0073a64d7bf1632ff03 Mon Sep 17 00:00:00 2001 From: Bart van der Braak Date: Fri, 13 Feb 2026 17:13:05 +0100 -Subject: [PATCH] BLENDER: Add line, words and cursor indicators +Subject: [PATCH 20/22] BLENDER: Add line, words and cursor indicators --- .../js/components/PullRequestMergeForm.vue | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue -index b2c28414c0..127212393c 100644 +index 7ae8fbfdaf..e6eabe348d 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -76,6 +76,17 @@ function switchMergeStyle(name: string, autoMerge = false) { @@ -29,7 +29,7 @@ index b2c28414c0..127212393c 100644