Fix mistakes in patches for v1.23.7

Author: brechtvl

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

@@ -17,7 +17,8 @@ diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl
 index 966d3bf604..7f97b13c7d 100644
 --- a/templates/projects/view.tmpl
 +++ b/templates/projects/view.tmpl
-@@ -20,6 +20,16 @@
+@@ -19,6 +19,16 @@
+ 						"TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee")
  					}}
  				</div>
 +			<div class="ui compact mini menu" style="margin-left: auto; margin-right: 1em;">
@@ -33,7 +34,7 @@ index 966d3bf604..7f97b13c7d 100644
  		{{if $canWriteProject}}
  			<div class="ui compact mini menu">
  				<a class="item" href="{{.Link}}/edit?redirect=project">
-@@ -169,7 +179,7 @@
+@@ -168,7 +178,7 @@
  				<div class="divider"{{if .Color}} style="color: {{ContrastColor .Color}} !important"{{end}}></div>
  				<div class="ui cards" data-url="{{$.Link}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
  					{{range (index $.IssuesMap .ID)}}
@@ -42,10 +43,10 @@ index 966d3bf604..7f97b13c7d 100644
  							{{template "repo/issue/card" (dict "Issue" . "Page" $)}}
  						</div>
  					{{end}}
-@@ -179,6 +189,37 @@
+@@ -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}}';
@@ -137,7 +138,7 @@ index 2e19e86d7a..e27cf1cbb7 100644
  			</div>
  		{{end}}
  	</div>
- 
+
 -	{{if or .Labels .Assignees}}
 +	{{if or .Labels}}
  	<div class="issue-card-bottom">

patches/0017-BLENDER-spam-reporting.patch

@@ -474,9 +474,9 @@ index ae5f51d403..4bf65eb065 100644
 +	// BLENDER: spam reporting
 +	mid = append(mid, admin.GetPendingSpamReports)
 
- 	others := web.NewRouter()
- 	others.Use(mid...)
-@@ -676,6 +678,9 @@ func registerRoutes(m *web.Router) {
+ 	webRoutes := web.NewRouter()
+ 	webRoutes.Use(mid...)
+@@ -676,6 +678,9 @@ func registerWebRoutes(m *web.Router) {
  			m.Get("", user_setting.BlockedUsers)
  			m.Post("", web.Bind(forms.BlockUserForm{}), user_setting.BlockedUsersPost)
  		})
@@ -486,7 +486,7 @@ index ae5f51d403..4bf65eb065 100644
  	}, reqSignIn, ctxDataSet("PageIsUserSettings", true, "EnablePackages", setting.Packages.Enabled))
 
  	m.Group("/user", func() {
-@@ -748,6 +753,13 @@ func registerRoutes(m *web.Router) {
+@@ -748,6 +753,13 @@ func registerWebRoutes(m *web.Router) {
  			m.Post("/delete", admin.DeleteEmail)
  		})