From ceb09fba0c179f4828c88b7cdba4fb5bee2b3c84 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Mon, 28 Apr 2025 21:04:49 +0200
Subject: [PATCH] Updates patches for Gitea v1.23.7

---
 ...-button-to-show-hide-issue-details-a.patch |  1 -
 ...e-workflow-for-creating-a-fork-and-p.patch | 23 -------------------
 2 files changed, 24 deletions(-)

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 271393c090dbe..8fa400337a34f 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
@@ -20,7 +20,6 @@ index 966d3bf604..7f97b13c7d 100644
 @@ -20,6 +20,16 @@
  					}}
  				</div>
- 			</div>
 +			<div class="ui compact mini menu" style="margin-left: auto; margin-right: 1em;">
 +				<button class="item btn" onclick="clickDetailsView()">
 +					<span class="issue-card-details">Show Details</span>
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 f22ff04e6b732..7661aa4419d59 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
@@ -60,29 +60,6 @@ the base repository that does the right thing.
  create mode 100644 templates/repo/editor/fork.tmpl
  create mode 100644 templates/repo/view_content.tmpl
 
-diff --git a/models/git/branch.go b/models/git/branch.go
-index d1caa35947..9ac6c45578 100644
---- a/models/git/branch.go
-+++ b/models/git/branch.go
-@@ -173,6 +173,18 @@ func GetBranch(ctx context.Context, repoID int64, branchName string) (*Branch, e
- 	return &branch, nil
- }
- 
-+// IsBranchExist returns true if the branch exists in the repository.
-+func IsBranchExist(ctx context.Context, repoID int64, branchName string) (bool, error) {
-+	var branch Branch
-+	has, err := db.GetEngine(ctx).Where("repo_id=?", repoID).And("name=?", branchName).Get(&branch)
-+	if err != nil {
-+		return false, err
-+	} else if !has {
-+		return false, nil
-+	}
-+	return !branch.IsDeleted, nil
-+}
-+
- func GetBranches(ctx context.Context, repoID int64, branchNames []string, includeDeleted bool) ([]*Branch, error) {
- 	branches := make([]*Branch, 0, len(branchNames))
- 
 diff --git a/models/repo/repo.go b/models/repo/repo.go
 index c5060a419f..e581c1a18d 100644
 --- a/models/repo/repo.go