diff --git a/patches/0001-BLENDER-Blender-ID-goth-provider.patch b/patches/0001-BLENDER-Blender-ID-goth-provider.patch
index fd4a758a4e527..7864f9aca784b 100644
--- a/patches/0001-BLENDER-Blender-ID-goth-provider.patch
+++ b/patches/0001-BLENDER-Blender-ID-goth-provider.patch
@@ -1,7 +1,7 @@
-From 15a25804e98da3c122082c62d16b2d1ce4374eb9 Mon Sep 17 00:00:00 2001
+From e9a48aadbffbb3002311cc6e947053030ee9ecc5 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:28:51 +0200
-Subject: [PATCH 01/14] BLENDER: Blender ID goth provider
+Subject: [PATCH 01/18] BLENDER: Blender ID goth provider
 
 Provider authored by Matti Ranta and Arnd Marijnissen.
 ---
@@ -25,7 +25,7 @@ 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 422952af9e..98a7954b3c 100644
+index 1ca481e073..086701b536 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -257,6 +257,7 @@ require (
@@ -37,10 +37,10 @@ index 422952af9e..98a7954b3c 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 e7f6b7c6d9..4b8b54d3fc 100644
+index ebf40cb628..aed57d8836 100644
 --- a/go.sum
 +++ b/go.sum
-@@ -588,6 +588,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
+@@ -589,6 +589,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=
@@ -242,7 +242,7 @@ index 0000000000..671e5e4f54
 +}
 diff --git a/services/auth/source/oauth2/blenderid/blenderid_test.go b/services/auth/source/oauth2/blenderid/blenderid_test.go
 new file mode 100644
-index 0000000000..2bf4c443d8
+index 0000000000..283ba0898a
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/blenderid_test.go
 @@ -0,0 +1,70 @@
@@ -510,7 +510,7 @@ index 0000000000..52a2d21745
 +}
 diff --git a/services/auth/source/oauth2/blenderid/session_test.go b/services/auth/source/oauth2/blenderid/session_test.go
 new file mode 100644
-index 0000000000..ab7fb974a5
+index 0000000000..7f5b619873
 --- /dev/null
 +++ b/services/auth/source/oauth2/blenderid/session_test.go
 @@ -0,0 +1,51 @@
@@ -593,5 +593,5 @@ index 65cf538ad7..f6f49ada04 100644
 +		}))
  }
 -- 
-2.47.1
+2.49.0
 
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 14c2283e9ef92..a231920b2b302 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 1b1e8781449eef734dbd5addd81be079436db600 Mon Sep 17 00:00:00 2001
+From 928a045c583cc4f0c631925e848a81446728f52b Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:31:35 +0200
-Subject: [PATCH 02/14] BLENDER: Show warning for target branch switching
+Subject: [PATCH 02/18] BLENDER: Show warning for target branch switching
 
 ---
  templates/repo/issue/view_title.tmpl | 1 +
@@ -20,5 +20,5 @@ index 7bb00ff9a9..19a4331883 100644
  				{{end}}
  			{{else}}
 -- 
-2.47.1
+2.49.0
 
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 db0fb066f49d9..55a1bdb60ef98 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 4cf49edf4de94065e9ad6e24c4482c2054d6eece Mon Sep 17 00:00:00 2001
+From e19c11cbfe0e7f278aae17cd512560cfc237c00d Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:32:53 +0200
-Subject: [PATCH 03/14] BLENDER: Workaround LFS files not being available in
+Subject: [PATCH 03/18] BLENDER: Workaround LFS files not being available in
  pull requests
 
 Patch taken from issue number 17715, associating the LFS pointer when the
@@ -56,5 +56,5 @@ index c4866edaab..1fa2b7a67f 100644
  				err = &lfs_module.ObjectError{
  					Code:    http.StatusNotFound,
 -- 
-2.47.1
+2.49.0
 
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 f12e45de605b0..badb1348c9eff 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,7 +1,7 @@
-From f30536bba66c393e59822cbd9c194017d174a3b5 Mon Sep 17 00:00:00 2001
+From a0a9521bb42deea2ca46a65f64ddc95a5db795f3 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:33:32 +0200
-Subject: [PATCH 04/14] BLENDER: Don't allow assigning large teams as reviewers
+Subject: [PATCH 04/18] BLENDER: Don't allow assigning large teams as reviewers
 
 To avoid accidentally spamming hundreds of people.
 ---
@@ -66,5 +66,5 @@ index bf0d8cb298..c3b0858aa3 100644
 +	return organization.FilterLargeTeams(organization.GetTeamsWithAccessToRepoUnit(ctx, repo.OwnerID, repo.ID, perm.AccessModeRead, unit.TypePullRequests))
  }
 -- 
-2.47.1
+2.49.0
 
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 288e6573a20f1..22d641ccf9ab3 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 b7ab7d82754fd5d7ea154d31f991a5da206d96a1 Mon Sep 17 00:00:00 2001
+From 21206ca6201d4b510cffc0068aabd785f5864850 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 13:58:05 +0200
-Subject: [PATCH 05/14] BLENDER: Support both exclusive and non-exclusive scope
+Subject: [PATCH 05/18] BLENDER: Support both exclusive and non-exclusive scope
  for labels
 
 ---
@@ -149,5 +149,5 @@ index 9b6195a8f4..c8310203c4 100644
  					{{end}}
  				</div>
 -- 
-2.47.1
+2.49.0
 
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 c17572f193fa0..a0809893eaffb 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 fd09d4851658310327e2e110e16963226fdd5954 Mon Sep 17 00:00:00 2001
+From dc145e6f21466387dde81ce41664c4100ee271bb Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:00:36 +0200
-Subject: [PATCH 06/14] BLENDER: Projects: button to show/hide issue details
+Subject: [PATCH 06/18] BLENDER: Projects: button to show/hide issue details
  and closed issue
 
 Both are off by default. This is implemented fully on the frontend, so
@@ -14,7 +14,7 @@ all issues and their details are still always loaded.
  4 files changed, 59 insertions(+), 13 deletions(-)
 
 diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
-index 966d3bf604..7f97b13c7d 100644
+index 217ffe6355..9640deee94 100644
 --- a/templates/projects/view.tmpl
 +++ b/templates/projects/view.tmpl
 @@ -19,6 +19,16 @@
@@ -46,7 +46,7 @@ index 966d3bf604..7f97b13c7d 100644
 @@ -178,6 +188,37 @@
  	</div>
  </div>
-
+ 
 +<script>
 +	keyDetails = 'project-show-issue-details:{{.Repository.FullName | JSEscape}}:{{.Project.ID}}';
 +	keyClosed = 'project-show-issue-closed:{{.Repository.FullName | JSEscape}}:{{.Project.ID}}';
@@ -138,7 +138,7 @@ index 2e19e86d7a..e27cf1cbb7 100644
  			</div>
  		{{end}}
  	</div>
-
+ 
 -	{{if or .Labels .Assignees}}
 +	{{if or .Labels}}
  	<div class="issue-card-bottom">
@@ -157,10 +157,10 @@ index 2e19e86d7a..e27cf1cbb7 100644
  	{{end}}
  {{end}}
 diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css
-index 9d462c4c4a..1eafbed75e 100644
+index ef3b036217..ca5057118f 100644
 --- a/web_src/css/features/projects.css
 +++ b/web_src/css/features/projects.css
-@@ -28,7 +28,7 @@
+@@ -16,7 +16,7 @@
    padding: 0.5rem !important;
    width: 320px;
    height: initial;
@@ -181,5 +181,5 @@ index fb832bd05a..4fb9b42f46 100644
 +  margin-left: 0.5em;
  }
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0007-BLENDER-Lazy-pull-request-checking.patch b/patches/0007-BLENDER-Lazy-pull-request-checking.patch
index 0c86545a7d7d6..73dd71a6d133d 100644
--- a/patches/0007-BLENDER-Lazy-pull-request-checking.patch
+++ b/patches/0007-BLENDER-Lazy-pull-request-checking.patch
@@ -1,7 +1,7 @@
-From b22cd3a41db335712186cb1bf4c57b9e96ac0dee Mon Sep 17 00:00:00 2001
+From c7ff5bb517d85240efd8915ac065021329e38a7a Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:02:04 +0200
-Subject: [PATCH 07/14] BLENDER: Lazy pull request checking
+Subject: [PATCH 07/18] BLENDER: Lazy pull request checking
 
 Delay conflict checking of PRs that had no update in last 24h until page load.
 This solves the problem where after every commit to main, it takes a long time
@@ -118,10 +118,10 @@ index baca1511a2..af19214412 100644
  			if err := prPatchCheckerQueue.Push(strconv.FormatInt(prID, 10)); err != nil {
  				log.Error("Error adding PR[%d] to the pull requests patch checking queue %v", prID, err)
 diff --git a/services/pull/pull.go b/services/pull/pull.go
-index 98bd28a4a5..87a5d40f7c 100644
+index 11718c2f87..d856e505ef 100644
 --- a/services/pull/pull.go
 +++ b/services/pull/pull.go
-@@ -455,7 +455,7 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string,
+@@ -479,7 +479,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
  					log.Error("UpdateCommitDivergence: %v", err)
  				}
  			}
@@ -131,5 +131,5 @@ index 98bd28a4a5..87a5d40f7c 100644
  	})
  }
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch b/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch
index 9280eb2dd8f2a..7770c18364e07 100644
--- a/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch
+++ b/patches/0008-BLENDER-Remember-login-for-OAuth-Blender-ID.patch
@@ -1,7 +1,7 @@
-From 91fecdeb64112cfbf99eea85a9c87739863a476c Mon Sep 17 00:00:00 2001
+From 619f7a041405989c2e1b7fec3cdff6783384f26d Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:04:02 +0200
-Subject: [PATCH 08/14] BLENDER: Remember login for OAuth / Blender ID
+Subject: [PATCH 08/18] BLENDER: Remember login for OAuth / Blender ID
 
 Otherwise for some browsers, users have to login again for every session.
 ---
@@ -41,5 +41,5 @@ index 75f94de0ed..5b58bc6337 100644
  		ctx.Csrf.PrepareForSessionUser(ctx)
  
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch b/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch
index 18a4e0253eb06..fdc3455bfc67b 100644
--- a/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch
+++ b/patches/0009-BLENDER-Always-login-with-Blender-ID-unless-noredire.patch
@@ -1,7 +1,7 @@
-From c91d42fa91177ce42cd01aee0e1d09d26f8dda47 Mon Sep 17 00:00:00 2001
+From d5dd5fed65a963e7564f00f9ec4bc80cd6b00519 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:04:49 +0200
-Subject: [PATCH 09/14] BLENDER: Always login with Blender ID, unless
+Subject: [PATCH 09/18] BLENDER: Always login with Blender ID, unless
  noredirect is specified
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 09/14] 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 8ddb9730c3..99c423e782 100644
+index ee70889a53..2910d7bc39 100644
 --- a/routers/web/auth/auth.go
 +++ b/routers/web/auth/auth.go
 @@ -160,6 +160,26 @@ func CheckAutoLogin(ctx *context.Context) bool {
@@ -39,7 +39,7 @@ index 8ddb9730c3..99c423e782 100644
  func prepareSignInPageData(ctx *context.Context) {
  	ctx.Data["Title"] = ctx.Tr("sign_in")
  	ctx.Data["OAuth2Providers"], _ = oauth2.GetOAuth2Providers(ctx, optional.Some(true))
-@@ -180,6 +200,10 @@ func SignIn(ctx *context.Context) {
+@@ -181,6 +201,10 @@ func SignIn(ctx *context.Context) {
  	if CheckAutoLogin(ctx) {
  		return
  	}
@@ -51,5 +51,5 @@ index 8ddb9730c3..99c423e782 100644
  		RedirectAfterLogin(ctx)
  		return
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch b/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch
index e4f16c718178b..8eb4d50f146d5 100644
--- a/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch
+++ b/patches/0010-BLENDER-Allow-non-local-users-to-be-renamed.patch
@@ -1,7 +1,7 @@
-From 285a38894bb72c74881bf66cf5ecc75d634fa280 Mon Sep 17 00:00:00 2001
+From 3a7478dce8bd171b9537ab8ba827a3366f932a54 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:05:47 +0200
-Subject: [PATCH 10/14] BLENDER: Allow non-local users to be renamed
+Subject: [PATCH 10/18] BLENDER: Allow non-local users to be renamed
 
 For Blender ID hook to do this.
 ---
@@ -33,5 +33,5 @@ index 7bde642412..5dda32f708 100644
  	if err := user_model.IsUsableUsername(newUserName); err != nil {
  		return err
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch b/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch
index 01107a972fb87..a7695158e202f 100644
--- a/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch
+++ b/patches/0011-BLENDER-Workaround-internal-server-error-comparing-b.patch
@@ -1,7 +1,7 @@
-From f0298ae745baf28da6fa2c7904709547eacaacfa Mon Sep 17 00:00:00 2001
+From ffc6d64f27593ca7bf8c080401a787532f4848eb Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:07:25 +0200
-Subject: [PATCH 11/14] BLENDER: Workaround internal server error comparing
+Subject: [PATCH 11/18] BLENDER: Workaround internal server error comparing
  branches on some repos
 
 https://projects.blender.org/infrastructure/blender-projects-platform/issues/61
@@ -30,5 +30,5 @@ index 16fcdcf4c8..91d61d2158 100644
  	}
  
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0012-BLENDER-Edit-file-workflow-for-creating-a-fork-and-p.patch b/patches/0012-BLENDER-Edit-file-workflow-for-creating-a-fork-and-p.patch
index 7661aa4419d59..228d61ca25ce7 100644
--- a/patches/0012-BLENDER-Edit-file-workflow-for-creating-a-fork-and-p.patch
+++ b/patches/0012-BLENDER-Edit-file-workflow-for-creating-a-fork-and-p.patch
@@ -1,8 +1,8 @@
-From fb83158d7e28aa8059cbb42575f19f06ca23bda6 Mon Sep 17 00:00:00 2001
+From 5843b4bdb51b90c22777f49d7c730cf2429b9a7f Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 18 Apr 2025 03:26:24 +0200
-Subject: [PATCH] BLENDER: Edit file workflow for creating a fork and proposing
- changes
+Subject: [PATCH 12/18] BLENDER: Edit file workflow for creating a fork and
+ proposing changes
 
 When viewing a file that the user can't edit because they can't write to
 the branch, the new, upload, patch, edit and delete functionality is no
@@ -29,15 +29,15 @@ the base repository that does the right thing.
  routers/api/v1/api.go                   |   2 +-
  routers/api/v1/repo/file.go             |   2 +-
  routers/web/repo/cherry_pick.go         |   6 +-
- routers/web/repo/editor.go              | 179 +++++++-----
+ routers/web/repo/editor.go              | 170 ++++++----
  routers/web/repo/editor_test.go         |   2 +-
- routers/web/repo/fork.go                |  68 +++--
- routers/web/repo/fork_to_edit.go        | 240 +++++++++++++++
+ routers/web/repo/fork.go                |  68 ++--
+ routers/web/repo/fork_to_edit.go        | 241 ++++++++++++++
  routers/web/repo/patch.go               |  36 ++-
  routers/web/repo/repo.go                |  15 -
  routers/web/repo/view_file.go           |   8 +-
  routers/web/repo/view_readme.go         |   6 +-
- routers/web/web.go                      |  26 +-
+ routers/web/web.go                      |  20 +-
  services/context/permission.go          |   6 +-
  services/context/repo.go                |  47 ++-
  services/forms/repo_form.go             |  12 +
@@ -48,14 +48,14 @@ the base repository that does the right thing.
  templates/repo/editor/upload.tmpl       |   5 +
  templates/repo/empty.tmpl               |   2 +-
  templates/repo/view_content.tmpl        | 111 +++++++
- tests/integration/editor_test.go        | 371 +++++++++++++++++++++++-
+ tests/integration/editor_test.go        | 408 ++++++++++++++++++++----
  tests/integration/pull_compare_test.go  |   2 +-
  tests/integration/pull_merge_test.go    |  24 +-
  tests/integration/pull_review_test.go   |   2 +-
  tests/integration/pull_status_test.go   |   6 +-
  tests/integration/repo_activity_test.go |   4 +-
  tests/integration/repo_webhook_test.go  |   4 +-
- 31 files changed, 1048 insertions(+), 207 deletions(-)
+ 31 files changed, 1034 insertions(+), 244 deletions(-)
  create mode 100644 routers/web/repo/fork_to_edit.go
  create mode 100644 templates/repo/editor/fork.tmpl
  create mode 100644 templates/repo/view_content.tmpl
@@ -1557,7 +1557,7 @@ index f0f71b80d1..b9ed72c196 100644
  	req := NewRequest(t, "GET", newURL)
  	resp := session.MakeRequest(t, req, http.StatusOK)
  
-@@ -36,74 +51,101 @@ func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, file
+@@ -36,72 +51,99 @@ func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, file
  
  	// Save new file to master branch
  	req = NewRequestWithValues(t, "POST", newURL, map[string]string{
@@ -1594,7 +1594,10 @@ index f0f71b80d1..b9ed72c196 100644
  func TestCreateFileOnProtectedBranch(t *testing.T) {
  	onGiteaRun(t, func(t *testing.T, u *url.URL) {
  		session := loginUser(t, "user2")
--
++		testCreateFileOnProtectedBranch(t, session, "user2", "user2", "repo1", "master", "master", "direct")
++	})
++}
+ 
 -		csrf := GetUserCSRFToken(t, session)
 -		// Change master branch to protected
 -		req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{
@@ -1615,7 +1618,14 @@ index f0f71b80d1..b9ed72c196 100644
 -		doc := NewHTMLParser(t, resp.Body)
 -		lastCommit := doc.GetInputValueByName("last_commit")
 -		assert.NotEmpty(t, lastCommit)
--
++func TestCreateFileOnProtectedBranchFork(t *testing.T) {
++	onGiteaRun(t, func(t *testing.T, u *url.URL) {
++		session := loginUser(t, "user4")
++		forkToEdit(t, session, "user2", "repo1", "_new", "master", "test.txt")
++		testCreateFileOnProtectedBranch(t, session, "user4", "user2", "repo1", "master", "feature/test", "commit-to-new-branch")
++	})
++}
+ 
 -		// Save new file to master branch
 -		req = NewRequestWithValues(t, "POST", "/user2/repo1/_new/master/", map[string]string{
 -			"_csrf":         doc.GetCSRF(),
@@ -1624,41 +1634,6 @@ index f0f71b80d1..b9ed72c196 100644
 -			"content":       "Content",
 -			"commit_choice": "direct",
 -		})
--
--		resp = session.MakeRequest(t, req, http.StatusOK)
--		// Check body for error message
--		assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch &#34;master&#34;.")
--
--		// remove the protected branch
--		csrf = GetUserCSRFToken(t, session)
--
--		// Change master branch to protected
--		req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/1/delete", map[string]string{
--			"_csrf": csrf,
--		})
--
--		resp = session.MakeRequest(t, req, http.StatusOK)
--
--		res := make(map[string]string)
--		assert.NoError(t, json.NewDecoder(resp.Body).Decode(&res))
--		assert.EqualValues(t, "/user2/repo1/settings/branches", res["redirect"])
--
--		// Check if master branch has been locked successfully
--		flashCookie = session.GetCookie(gitea_context.CookieNameFlash)
--		assert.NotNil(t, flashCookie)
--		assert.EqualValues(t, "error%3DRemoving%2Bbranch%2Bprotection%2Brule%2B%25221%2522%2Bfailed.", flashCookie.Value)
-+		testCreateFileOnProtectedBranch(t, session, "user2", "user2", "repo1", "master", "master", "direct")
- 	})
- }
- 
-+func TestCreateFileOnProtectedBranchFork(t *testing.T) {
-+	onGiteaRun(t, func(t *testing.T, u *url.URL) {
-+		session := loginUser(t, "user4")
-+		forkToEdit(t, session, "user2", "repo1", "_new", "master", "test.txt")
-+		testCreateFileOnProtectedBranch(t, session, "user4", "user2", "repo1", "master", "feature/test", "commit-to-new-branch")
-+	})
-+}
-+
 +func testCreateFileOnProtectedBranch(t *testing.T, session *TestSession, user, owner, repo, branch, targetBranch, commitChoice string) {
 +	csrf := GetUserCSRFToken(t, session)
 +	// Change target branch to protected
@@ -1672,15 +1647,24 @@ index f0f71b80d1..b9ed72c196 100644
 +	flashCookie := session.GetCookie(gitea_context.CookieNameFlash)
 +	assert.NotNil(t, flashCookie)
 +	assert.Equal(t, "success%3DBranch%2Bprotection%2Bfor%2Brule%2B%2522"+strings.ReplaceAll(targetBranch, "/", "%252F")+"%2522%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
-+
+ 
+-		resp = session.MakeRequest(t, req, http.StatusOK)
+-		// Check body for error message
+-		assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch &#34;master&#34;.")
 +	// Request editor page
 +	req = NewRequest(t, "GET", path.Join(owner, repo, "_new", branch))
 +	resp := session.MakeRequest(t, req, http.StatusOK)
-+
+ 
+-		// remove the protected branch
+-		csrf = GetUserCSRFToken(t, session)
 +	doc := NewHTMLParser(t, resp.Body)
 +	lastCommit := doc.GetInputValueByName("last_commit")
 +	assert.NotEmpty(t, lastCommit)
-+
+ 
+-		// Change master branch to protected
+-		req = NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/1/delete", map[string]string{
+-			"_csrf": csrf,
+-		})
 +	// Save new file to target branch
 +	req = NewRequestWithValues(t, "POST", path.Join(owner, repo, "_new", branch), map[string]string{
 +		"_csrf":           doc.GetCSRF(),
@@ -1690,18 +1674,26 @@ index f0f71b80d1..b9ed72c196 100644
 +		"commit_choice":   commitChoice,
 +		"new_branch_name": targetBranch,
 +	})
-+
+ 
+-		resp = session.MakeRequest(t, req, http.StatusOK)
 +	resp = session.MakeRequest(t, req, http.StatusOK)
 +	// Check body for error message
 +	assert.Contains(t, resp.Body.String(), fmt.Sprintf("Cannot commit to protected branch &#34;%s&#34;.", targetBranch))
-+
+ 
+-		res := make(map[string]string)
+-		assert.NoError(t, json.NewDecoder(resp.Body).Decode(&res))
+-		assert.EqualValues(t, "/user2/repo1/settings/branches", res["redirect"])
 +	// remove the protected branch
 +	csrf = GetUserCSRFToken(t, session)
-+
+ 
+-		// Check if master branch has been locked successfully
+-		flashCookie = session.GetCookie(gitea_context.CookieNameFlash)
+-		assert.NotNil(t, flashCookie)
+-		assert.EqualValues(t, "error%3DRemoving%2Bbranch%2Bprotection%2Brule%2B%25221%2522%2Bfailed.", flashCookie.Value)
 +	// Change target branch to protected
 +	req = NewRequestWithValues(t, "POST", path.Join(user, repo, "settings", "branches", "1", "delete"), map[string]string{
 +		"_csrf": csrf,
-+	})
+ 	})
 +
 +	resp = session.MakeRequest(t, req, http.StatusOK)
 +
@@ -1713,11 +1705,9 @@ index f0f71b80d1..b9ed72c196 100644
 +	flashCookie = session.GetCookie(gitea_context.CookieNameFlash)
 +	assert.NotNil(t, flashCookie)
 +	assert.Equal(t, "error%3DRemoving%2Bbranch%2Bprotection%2Brule%2B%25221%2522%2Bfailed.", flashCookie.Value)
-+}
-+
+ }
+ 
  func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath, newContent string) *httptest.ResponseRecorder {
- 	// Get to the 'edit this file' page
- 	req := NewRequest(t, "GET", path.Join(user, repo, "_edit", branch, filePath))
 @@ -133,9 +175,9 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
  	return resp
  }
@@ -2179,5 +2169,5 @@ index 0952263968..a31c5f67f7 100644
  		// 3. validate the webhook is triggered with right event
  		assert.EqualValues(t, "push", trigger)
 -- 
-2.45.2
+2.49.0
 
diff --git a/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch b/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch
index 75aaf4f7826bb..ac53f1c963f3b 100644
--- a/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch
+++ b/patches/0013-BLENDER-Add-docs-explaining-merge-strategy.patch
@@ -1,7 +1,7 @@
-From 7aa2069c44ea862ddb68b4dce4ed52fcf866b486 Mon Sep 17 00:00:00 2001
+From c7ce8c9d1bb65b13201e5c10c629a4ba38c7e493 Mon Sep 17 00:00:00 2001
 From: Brecht Van Lommel <brecht@blender.org>
 Date: Fri, 10 May 2024 14:58:32 +0200
-Subject: [PATCH 13/14] BLENDER: Add docs explaining merge strategy
+Subject: [PATCH 13/18] 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.47.1
+2.49.0
 
diff --git a/patches/0014-BLENDER-Add-Python-for-external-renderering.patch b/patches/0014-BLENDER-Add-Python-for-external-renderering.patch
index 47fdf3570d308..b7804c488eb3a 100644
--- a/patches/0014-BLENDER-Add-Python-for-external-renderering.patch
+++ b/patches/0014-BLENDER-Add-Python-for-external-renderering.patch
@@ -1,7 +1,7 @@
-From e1e63508813a2a4d67e029a5c07b32a9442fed20 Mon Sep 17 00:00:00 2001
+From baddc7d7cbccc3dbbd2fcdb74594fa62a3964a13 Mon Sep 17 00:00:00 2001
 From: Bart van der Braak <bart@blender.org>
 Date: Wed, 4 Dec 2024 15:29:10 +0100
-Subject: [PATCH 14/14] BLENDER: Add Python for external renderering
+Subject: [PATCH 14/18] BLENDER: Add Python for external renderering
 
 To be used for RestructuredText rendering using Sphinx to HTML.
 
@@ -27,5 +27,5 @@ index be6f125104..1032790dd0 100644
      -S -g 1000 \
      git && \
 -- 
-2.47.1
+2.49.0
 
diff --git a/patches/0015-BLENDER-Fix-RemoveUserBadges.patch b/patches/0015-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch
similarity index 91%
rename from patches/0015-BLENDER-Fix-RemoveUserBadges.patch
rename to patches/0015-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch
index 655ea38f9bbb2..36f4114b6c73b 100644
--- a/patches/0015-BLENDER-Fix-RemoveUserBadges.patch
+++ b/patches/0015-BLENDER-Fix-RemoveUserBadges-incorrect-sql.patch
@@ -1,7 +1,7 @@
-From 8c336e59e1b28a100f9dfc8209bfc700057fc957 Mon Sep 17 00:00:00 2001
+From 9dbe882b8d5ad70237296bf2a3eb28094184b58e Mon Sep 17 00:00:00 2001
 From: Oleg Komarov <oleg@blender.org>
 Date: Wed, 2 Apr 2025 17:11:01 +0200
-Subject: [PATCH] Fix RemoveUserBadges incorrect sql
+Subject: [PATCH 15/18] BLENDER: Fix RemoveUserBadges incorrect sql
 
 ---
  models/user/badge.go | 22 ++++++++++++++++------
@@ -42,5 +42,5 @@ index 3ff3530a36..9f030c7019 100644
  		return nil
  	})
 -- 
-2.43.0
+2.49.0
 
diff --git a/patches/0016-BLENDER-Sync-badges-on-sign-in.patch b/patches/0016-BLENDER-Sync-user-badges-on-sign-in.patch
similarity index 96%
rename from patches/0016-BLENDER-Sync-badges-on-sign-in.patch
rename to patches/0016-BLENDER-Sync-user-badges-on-sign-in.patch
index a1b84a7adde64..50d0dda783186 100644
--- a/patches/0016-BLENDER-Sync-badges-on-sign-in.patch
+++ b/patches/0016-BLENDER-Sync-user-badges-on-sign-in.patch
@@ -1,7 +1,7 @@
-From e8630b784df196e5082e14160295cdbc48e4fc3b Mon Sep 17 00:00:00 2001
+From 5f7b162ec379635b6ece4bc7aa545ccf9f65fe6e Mon Sep 17 00:00:00 2001
 From: Oleg Komarov <oleg@blender.org>
 Date: Wed, 2 Apr 2025 17:30:05 +0200
-Subject: [PATCH] Sync user badges on sign-in
+Subject: [PATCH 16/18] BLENDER: Sync user badges on sign-in
 
 Don't escalate any errors, only log them, to avoid breaking sign-in.
 ---
@@ -13,10 +13,10 @@ Don't escalate any errors, only log them, to avoid breaking sign-in.
  create mode 100644 services/user/badge_test.go
 
 diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
-index 94a8bec565..73bc5bf877 100644
+index 5b58bc6337..08bd10b830 100644
 --- a/routers/web/auth/oauth.go
 +++ b/routers/web/auth/oauth.go
-@@ -298,8 +298,32 @@ func updateAvatarIfNeed(ctx *context.Context, url string, u *user_model.User) {
+@@ -299,8 +299,32 @@ func updateAvatarIfNeed(ctx *context.Context, url string, u *user_model.User) {
  	}
  }
  
@@ -197,5 +197,5 @@ index 0000000000..9744355390
 +	}
 +}
 -- 
-2.43.0
+2.49.0
 
diff --git a/patches/0017-BLENDER-spam-reporting.patch b/patches/0017-BLENDER-Add-Spam-Reporting.patch
similarity index 99%
rename from patches/0017-BLENDER-spam-reporting.patch
rename to patches/0017-BLENDER-Add-Spam-Reporting.patch
index 835a93b946411..be33303dcb5b4 100644
--- a/patches/0017-BLENDER-spam-reporting.patch
+++ b/patches/0017-BLENDER-Add-Spam-Reporting.patch
@@ -1,7 +1,7 @@
-From 06041a4e57aec40f53204cf151aafee4f84a168e Mon Sep 17 00:00:00 2001
+From 4470d5e4ec3482d1534d8e17d25ff59cd6ed730b Mon Sep 17 00:00:00 2001
 From: Oleg Komarov <oleg@blender.org>
 Date: Fri, 11 Apr 2025 16:57:54 +0200
-Subject: [PATCH] BLENDER: spam reporting
+Subject: [PATCH 17/18] BLENDER: Add Spam Reporting
 
 Spam reporting is available for trusted users (org members and admins) via a
 button on a spammer's profile page;
@@ -175,7 +175,7 @@ index 0000000000..a4390c9d4a
 +	return nil, err
 +}
 diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
-index 9d71ccb6d5..be52d8f9c3 100644
+index 6b6f83a64b..7d6bc40a3d 100644
 --- a/options/locale/locale_en-US.ini
 +++ b/options/locale/locale_en-US.ini
 @@ -692,6 +692,18 @@ block.note.edit = Edit note
@@ -197,7 +197,7 @@ index 9d71ccb6d5..be52d8f9c3 100644
  [settings]
  profile = Profile
  account = Account
-@@ -2889,6 +2901,7 @@ first_page = First
+@@ -2899,6 +2911,7 @@ first_page = First
  last_page = Last
  total = Total: %d
  settings = Admin Settings
@@ -205,7 +205,7 @@ index 9d71ccb6d5..be52d8f9c3 100644
  
  dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check <a target="_blank" rel="noreferrer" href="%s">the blog</a> for more details.
  dashboard.statistic = Summary
-@@ -2976,6 +2989,7 @@ dashboard.sync_branch.started = Branches Sync started
+@@ -2986,6 +2999,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
@@ -213,7 +213,7 @@ index 9d71ccb6d5..be52d8f9c3 100644
  
  users.user_manage_panel = User Account Management
  users.new_account = Create User Account
-@@ -3052,6 +3066,14 @@ emails.delete_desc = Are you sure you want to delete this email address?
+@@ -3062,6 +3076,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 can not delete the primary email.
  
@@ -464,7 +464,7 @@ index 0000000000..254b54c56f
 +	ctx.Redirect(setting.AppSubURL + "/" + username)
 +}
 diff --git a/routers/web/web.go b/routers/web/web.go
-index ae5f51d403..4bf65eb065 100644
+index cf9959ecfe..b0cec470f2 100644
 --- a/routers/web/web.go
 +++ b/routers/web/web.go
 @@ -284,6 +284,8 @@ func Routes() *web.Router {
@@ -1038,5 +1038,5 @@ index 0000000000..e9015fd16c
 +	</div>
 +</div>
 -- 
-2.43.0
+2.49.0
 
diff --git a/patches/0018-BLENDER-Add-Line-Length-indicator-for-cursor.patch b/patches/0018-BLENDER-Add-Line-Length-indicator-for-cursor.patch
new file mode 100644
index 0000000000000..c72d6e9d7948f
--- /dev/null
+++ b/patches/0018-BLENDER-Add-Line-Length-indicator-for-cursor.patch
@@ -0,0 +1,101 @@
+From b16e4d99ebb8519b4d8abf5a1d7b4beb3356aa59 Mon Sep 17 00:00:00 2001
+From: Bart van der Braak <bart@blender.org>
+Date: Wed, 30 Apr 2025 18:09:40 +0200
+Subject: [PATCH 18/18] BLENDER: Add Line Length indicator for cursor
+
+---
+ .../js/components/PullRequestMergeForm.vue    | 31 ++++++++++++++++++-
+ .../js/features/comp/ComboMarkdownEditor.ts   | 21 +++++++++++++
+ 2 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
+index bafeec6c97..c409c12c6f 100644
+--- a/web_src/js/components/PullRequestMergeForm.vue
++++ b/web_src/js/components/PullRequestMergeForm.vue
+@@ -26,6 +26,10 @@ const mergeStyleAllowedCount = ref(0);
+ const showMergeStyleMenu = ref(false);
+ const showActionForm = ref(false);
+ 
++const mergeMessageTextarea = ref<HTMLTextAreaElement | null>(null);
++const cursorLine = ref(1);
++const cursorColumn = ref(1);
++
+ const mergeButtonStyleClass = computed(() => {
+   if (mergeForm.value.allOverridableChecksOk) return 'primary';
+   return autoMergeWhenSucceed.value ? 'primary' : 'red';
+@@ -76,6 +80,19 @@ function switchMergeStyle(name, autoMerge = false) {
+ function clearMergeMessage() {
+   mergeMessageFieldValue.value = mergeForm.value.defaultMergeMessage;
+ }
++
++function updateCursorPosition() {
++  const textarea = mergeMessageTextarea.value;
++  if (!textarea) return;
++
++  const pos = textarea.selectionStart ?? 0;
++  const value = textarea.value;
++
++  const lines = value.substring(0, pos).split('\n');
++  cursorLine.value = lines.length;
++  cursorColumn.value = lines[lines.length - 1].length + 1;
++}
++
+ </script>
+ 
+ <template>
+@@ -105,7 +122,19 @@ function clearMergeMessage() {
+           <input type="text" name="merge_title_field" v-model="mergeTitleFieldValue">
+         </div>
+         <div class="field">
+-          <textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
++          <textarea
++            ref="mergeMessageTextarea"
++            name="merge_message_field"
++            rows="5"
++            :placeholder="mergeForm.mergeMessageFieldPlaceHolder"
++            v-model="mergeMessageFieldValue"
++            @click="updateCursorPosition"
++            @keyup="updateCursorPosition"
++            @input="updateCursorPosition"
++          />
++          <div class="tw-mt-2 tw-text-sm tw-text-gray-500">
++            Line: {{ cursorLine }}, Column: {{ cursorColumn }}
++          </div>
+           <template v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage">
+             <button @click.prevent="clearMergeMessage" class="btn tw-mt-1 tw-p-1 interact-fg" :data-tooltip-content="mergeForm.textClearMergeMessageHint">
+               {{ mergeForm.textClearMergeMessage }}
+diff --git a/web_src/js/features/comp/ComboMarkdownEditor.ts b/web_src/js/features/comp/ComboMarkdownEditor.ts
+index bba50a1296..0df15ca1b4 100644
+--- a/web_src/js/features/comp/ComboMarkdownEditor.ts
++++ b/web_src/js/features/comp/ComboMarkdownEditor.ts
+@@ -161,6 +161,27 @@ export class ComboMarkdownEditor {
+ 
+     initTextareaMarkdown(this.textarea);
+     initTextareaEvents(this.textarea, this.dropzone);
++
++    // Cursor Position Tracker
++    const positionDisplay = document.createElement('div');
++    positionDisplay.className = 'tw-mt-2 tw-text-sm tw-text-gray-500';
++    this.container.appendChild(positionDisplay);
++
++    const updateCursorPosition = () => {
++      const value = this.textarea.value;
++      const pos = this.textarea.selectionStart;
++
++      const lines = value.substr(0, pos).split('\n');
++      const line = lines.length;
++      const column = lines[lines.length - 1].length + 1;
++
++      positionDisplay.textContent = `Line: ${line}, Column: ${column}`;
++    };
++
++    this.textarea.addEventListener('input', updateCursorPosition);
++    this.textarea.addEventListener('click', updateCursorPosition);
++    this.textarea.addEventListener('keyup', updateCursorPosition);
++    updateCursorPosition();
+   }
+ 
+   async setupDropzone() {
+-- 
+2.49.0
+