From e03f4cf1c4c43c5ead9412e1c4c6dafcc3bf7706 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 12:18:19 +0200
Subject: [PATCH 01/38] Add the abillity to pin Issues

---
 models/issues/issue.go                        | 125 +++++++++
 modules/structs/issue.go                      |   2 +
 modules/structs/pull.go                       |   2 +
 options/locale/locale_en-US.ini               |   2 +
 routers/api/v1/api.go                         |   8 +
 routers/api/v1/repo/issue_pin.go              | 250 ++++++++++++++++++
 routers/web/repo/issue.go                     |   8 +
 routers/web/repo/issue_pin.go                 |  52 ++++
 routers/web/web.go                            |   2 +
 services/convert/issue.go                     |   1 +
 services/convert/pull.go                      |   1 +
 templates/repo/issue/list.tmpl                |  80 ++++++
 .../repo/issue/view_content/sidebar.tmpl      |  19 ++
 templates/swagger/v1_json.tmpl                | 214 +++++++++++++++
 web_src/css/repository.css                    |  11 +
 web_src/js/features/repo-issue-list.js        |  39 +++
 16 files changed, 816 insertions(+)
 create mode 100644 routers/api/v1/repo/issue_pin.go
 create mode 100644 routers/web/repo/issue_pin.go

diff --git a/models/issues/issue.go b/models/issues/issue.go
index 4f8e9e161d29f..cfb06f9da9252 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -127,6 +127,7 @@ type Issue struct {
 	PullRequest      *PullRequest     `xorm:"-"`
 	NumComments      int
 	Ref              string
+	Pin              int `xorm:"DEFAULT 0"`
 
 	DeadlineUnix timeutil.TimeStamp `xorm:"INDEX"`
 
@@ -2503,3 +2504,127 @@ func DeleteOrphanedIssues(ctx context.Context) error {
 func (issue *Issue) HasOriginalAuthor() bool {
 	return issue.OriginalAuthor != "" && issue.OriginalAuthorID != 0
 }
+
+// PinIssue pins a Issue
+func (issue *Issue) PinIssue() error {
+	// If the Issue is already pinned, we don't need to pin it twice
+	if issue.Pin > 0 {
+		return nil
+	}
+
+	var maxPin int
+	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+	if err != nil {
+		return err
+	}
+
+	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+		Where("id = ?", issue.ID).
+		Update(map[string]interface{}{
+			"pin": maxPin + 1,
+		})
+
+	return err
+}
+
+// UnpinIssue unpins a Issue
+func (issue *Issue) UnpinIssue() error {
+	// If the Issue is not pinned, we don't need to unpin it
+	if issue.Pin == 0 {
+		return nil
+	}
+
+	// This sets the Pin for all Issues that come after the unpined Issue to the correct value
+	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.Pin)
+	if err != nil {
+		return err
+	}
+
+	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+		Where("id = ?", issue.ID).
+		Update(map[string]interface{}{
+			"pin": 0,
+		})
+
+	return err
+}
+
+// PinOrUnpin pins or unpins a Issue
+func (issue *Issue) PinOrUnpin() error {
+	if issue.Pin == 0 {
+		return issue.PinIssue()
+	} else {
+		return issue.UnpinIssue()
+	}
+}
+
+// MovePin moves a Pinned Issue to a new Position
+func (issue *Issue) MovePin(newPosition int) error {
+	// If the Issue is not pinned, we can't move them
+	if issue.Pin == 0 {
+		return nil
+	}
+
+	if newPosition < 1 {
+		return fmt.Errorf("The Position can't be lower than 1")
+	}
+
+	var (
+		err    error
+		maxPin int
+	)
+
+	_, err = db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+
+	if err != nil {
+		return err
+	}
+
+	// If the new Position bigger than the current Maximum, set it to the Maximum
+	if newPosition > maxPin+1 {
+		newPosition = maxPin + 1
+	}
+
+	// TODO: Run the follwoing commands in a Transaction and Rollback, if one fails
+
+	// Lower the Position of all Pinned Issue that came after the current Position
+	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.Pin)
+	log.Error("Hallo %d", issue.Pin)
+	if err != nil {
+		return err
+	}
+
+	// Higher the Position of all Pinned Issues that comes after the new Position
+	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin + 1 WHERE repo_id = ? AND is_pull = ? AND pin >= ?", issue.RepoID, issue.IsPull, newPosition)
+	if err != nil {
+		return err
+	}
+
+	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+		Where("id = ?", issue.ID).
+		Update(map[string]interface{}{
+			"pin": newPosition,
+		})
+
+	return err
+}
+
+// GetPinnedIssues returns the pinned Issues for the given Repo and type
+func GetPinnedIssues(RepoID int64, isPull bool) ([]*Issue, error) {
+	issues := make([]*Issue, 0)
+
+	err := db.GetEngine(db.DefaultContext).
+		Table("issue").
+		Where("repo_id = ?", RepoID).
+		And("is_pull = ?", isPull).
+		And("pin > 0").
+		OrderBy("pin").
+		Find(&issues)
+	if err != nil {
+		return nil, err
+	}
+
+	IssueList(issues).LoadAttributes()
+
+	return issues, nil
+}
diff --git a/modules/structs/issue.go b/modules/structs/issue.go
index 04e169df84197..04a904a69253e 100644
--- a/modules/structs/issue.go
+++ b/modules/structs/issue.go
@@ -75,6 +75,8 @@ type Issue struct {
 
 	PullRequest *PullRequestMeta `json:"pull_request"`
 	Repo        *RepositoryMeta  `json:"repository"`
+
+	Pin int `json:"pin"`
 }
 
 // CreateIssueOption options to create one issue
diff --git a/modules/structs/pull.go b/modules/structs/pull.go
index f64bb83af9bac..37436e37f1976 100644
--- a/modules/structs/pull.go
+++ b/modules/structs/pull.go
@@ -48,6 +48,8 @@ type PullRequest struct {
 	Updated *time.Time `json:"updated_at"`
 	// swagger:strfmt date-time
 	Closed *time.Time `json:"closed_at"`
+
+	Pin int `json:"pin"`
 }
 
 // PRBranchInfo information about a branch
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ef9990d265879..26a2b814c987f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1461,6 +1461,8 @@ issues.attachment.open_tab = `Click to see "%s" in a new tab`
 issues.attachment.download = `Click to download "%s"`
 issues.subscribe = Subscribe
 issues.unsubscribe = Unsubscribe
+issues.pin = Pin
+issues.unpin = Unpin
 issues.lock = Lock conversation
 issues.unlock = Unlock conversation
 issues.lock.unknown_reason = Cannot lock an issue with an unknown reason.
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index ad68a33d6be11..ef1e3cd65c4bc 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -961,6 +961,7 @@ func Routes(ctx gocontext.Context) *web.Route {
 				m.Group("/issues", func() {
 					m.Combo("").Get(repo.ListIssues).
 						Post(reqToken(auth_model.AccessTokenScopeRepo), mustNotBeArchived, bind(api.CreateIssueOption{}), repo.CreateIssue)
+					m.Get("/pinned", repo.ListPinnedIssues)
 					m.Group("/comments", func() {
 						m.Get("", repo.ListRepoIssueComments)
 						m.Group("/{id}", func() {
@@ -1041,6 +1042,12 @@ func Routes(ctx gocontext.Context) *web.Route {
 							Get(repo.GetIssueBlocks).
 							Post(reqToken(auth_model.AccessTokenScopeRepo), bind(api.IssueMeta{}), repo.CreateIssueBlocking).
 							Delete(reqToken(auth_model.AccessTokenScopeRepo), bind(api.IssueMeta{}), repo.RemoveIssueBlocking)
+						m.Group("/pin", func() {
+							m.Combo("").
+								Post(reqToken(auth_model.AccessTokenScopeRepo), reqAdmin(), repo.PinIssue).
+								Delete(reqToken(auth_model.AccessTokenScopeRepo), reqAdmin(), repo.UnpinIssue)
+							m.Patch("/{position}", reqToken(auth_model.AccessTokenScopeRepo), reqAdmin(), repo.MoveIssuePin)
+						})
 					})
 				}, mustEnableIssuesOrPulls)
 				m.Group("/labels", func() {
@@ -1103,6 +1110,7 @@ func Routes(ctx gocontext.Context) *web.Route {
 				m.Group("/pulls", func() {
 					m.Combo("").Get(repo.ListPullRequests).
 						Post(reqToken(auth_model.AccessTokenScopeRepo), mustNotBeArchived, bind(api.CreatePullRequestOption{}), repo.CreatePullRequest)
+					m.Get("/pinned", repo.ListPinnedPullRequests)
 					m.Group("/{index}", func() {
 						m.Combo("").Get(repo.GetPullRequest).
 							Patch(reqToken(auth_model.AccessTokenScopeRepo), bind(api.EditPullRequestOption{}), repo.EditPullRequest)
diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
new file mode 100644
index 0000000000000..06b2a2249334c
--- /dev/null
+++ b/routers/api/v1/repo/issue_pin.go
@@ -0,0 +1,250 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"net/http"
+
+	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/modules/context"
+	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/services/convert"
+)
+
+// PinIssue pins a issue
+func PinIssue(ctx *context.APIContext) {
+	// swagger:operation POST /repos/{owner}/{repo}/issues/{index}/pin issue pinIssue
+	// ---
+	// summary: Pin an Issue
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: index
+	//   in: path
+	//   description: index of issue to pin
+	//   type: integer
+	//   format: int64
+	//   required: true
+	// responses:
+	//   "204":
+	//     "$ref": "#/responses/empty"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+	if err != nil {
+		if issues_model.IsErrIssueNotExist(err) {
+			ctx.NotFound()
+		} else {
+			ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err)
+		}
+		return
+	}
+
+	err = issue.PinIssue()
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "PinIssue", err)
+	}
+
+	ctx.Status(http.StatusNoContent)
+}
+
+// UnpinIssue unpins a Issue
+func UnpinIssue(ctx *context.APIContext) {
+	// swagger:operation DELETE /repos/{owner}/{repo}/issues/{index}/pin issue unpinIssue
+	// ---
+	// summary: Unpin an Issue
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: index
+	//   in: path
+	//   description: index of issue to unpin
+	//   type: integer
+	//   format: int64
+	//   required: true
+	// responses:
+	//   "204":
+	//     "$ref": "#/responses/empty"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+	if err != nil {
+		if issues_model.IsErrIssueNotExist(err) {
+			ctx.NotFound()
+		} else {
+			ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err)
+		}
+		return
+	}
+
+	err = issue.UnpinIssue()
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "UnpinIssue", err)
+	}
+
+	ctx.Status(http.StatusNoContent)
+}
+
+// MoveIssuePin moves a pinned Issue to a new Position
+func MoveIssuePin(ctx *context.APIContext) {
+	// swagger:operation PATCH /repos/{owner}/{repo}/issues/{index}/pin/{position} issue moveIssuePin
+	// ---
+	// summary: Moves the Pin to the given Position
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: index
+	//   in: path
+	//   description: index of issue
+	//   type: integer
+	//   format: int64
+	//   required: true
+	// - name: position
+	//   in: path
+	//   description: the new position
+	//   type: integer
+	//   format: int64
+	//   required: true
+	// responses:
+	//   "204":
+	//     "$ref": "#/responses/empty"
+	//   "403":
+	//     "$ref": "#/responses/forbidden"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+	if err != nil {
+		if issues_model.IsErrIssueNotExist(err) {
+			ctx.NotFound()
+		} else {
+			ctx.Error(http.StatusInternalServerError, "GetIssueByIndex", err)
+		}
+		return
+	}
+
+	err = issue.MovePin(int(ctx.ParamsInt64(":position")))
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "MovePin", err)
+	}
+
+	ctx.Status(http.StatusNoContent)
+}
+
+// ListPinnedIssues returns a list of all pinned Issues
+func ListPinnedIssues(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/issues/pinned repository repoListPinnedIssues
+	// ---
+	// summary: List a repo's pinned issues
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/IssueList"
+	issues, err := issues_model.GetPinnedIssues(ctx.Repo.Repository.ID, false)
+
+	if err == nil {
+		ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
+	} else {
+		ctx.Error(http.StatusInternalServerError, "LoadPinnedIssues", err)
+	}
+}
+
+// ListPinnedPullRequests returns a list of all pinned PRs
+func ListPinnedPullRequests(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/pulls/pinned repository repoListPinnedPullRequests
+	// ---
+	// summary: List a repo's pinned pull requests
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/PullRequestList"
+	issues, err := issues_model.GetPinnedIssues(ctx.Repo.Repository.ID, true)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "LoadPinnedPullRequests", err)
+	}
+
+	apiPrs := make([]*api.PullRequest, len(issues))
+	for i, currentIssue := range issues {
+		pr, err := currentIssue.GetPullRequest()
+		if err != nil {
+			ctx.Error(http.StatusInternalServerError, "GetPullRequest", err)
+			return
+		}
+
+		if err = pr.LoadIssue(ctx); err != nil {
+			ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
+			return
+		}
+
+		if err = pr.LoadAttributes(ctx); err != nil {
+			ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
+			return
+		}
+
+		if err = pr.LoadBaseRepo(ctx); err != nil {
+			ctx.Error(http.StatusInternalServerError, "LoadBaseRepo", err)
+			return
+		}
+
+		if err = pr.LoadHeadRepo(ctx); err != nil {
+			ctx.Error(http.StatusInternalServerError, "LoadHeadRepo", err)
+			return
+		}
+
+		apiPrs[i] = convert.ToAPIPullRequest(ctx, pr, ctx.Doer)
+	}
+
+	ctx.JSON(http.StatusOK, &apiPrs)
+}
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index bea35785bbe01..7b0cf6949a3e3 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -384,6 +384,14 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
 		return
 	}
 
+	pinned, err := issues_model.GetPinnedIssues(repo.ID, isPullOption.IsTrue())
+	if err != nil {
+		ctx.ServerError("GetPinnedIssues", err)
+		return
+	}
+
+	ctx.Data["PinnedIssues"] = pinned
+	ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin)
 	ctx.Data["IssueStats"] = issueStats
 	ctx.Data["SelLabelIDs"] = labelIDs
 	ctx.Data["SelectLabels"] = selectLabels
diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
new file mode 100644
index 0000000000000..dba7976645096
--- /dev/null
+++ b/routers/web/repo/issue_pin.go
@@ -0,0 +1,52 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+	"net/http"
+
+	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/json"
+)
+
+// IssuePin pin or unpin a Issue
+func IssuePin(ctx *context.Context) {
+	issue := GetActionIssue(ctx)
+	err := issue.PinOrUnpin()
+	if err != nil {
+		ctx.ServerError("PinOrUnpinIssue", err)
+		return
+	}
+
+	ctx.Redirect(issue.Link())
+}
+
+// IssuePinMove moves a pinned Issue
+func IssuePinMove(ctx *context.Context) {
+	if ctx.Doer == nil {
+		ctx.JSON(http.StatusForbidden, "Only signed in users are allowed to perform this action.")
+		return
+	}
+
+	type movePinIssueForm struct {
+		ID       int64 `json:"id"`
+		Position int   `json:"position"`
+	}
+
+	form := &movePinIssueForm{}
+	if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+	}
+
+	issue, err := issues_model.GetIssueByID(ctx, form.ID)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err.Error())
+	}
+
+	err = issue.MovePin(form.Position)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err.Error())
+	}
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index 88b6777d738b7..92f59edbc11c8 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1099,6 +1099,7 @@ func RegisterRoutes(m *web.Route) {
 				m.Post("/deadline", web.Bind(structs.EditDeadlineOption{}), repo.UpdateIssueDeadline)
 				m.Post("/watch", repo.IssueWatch)
 				m.Post("/ref", repo.UpdateIssueRef)
+				m.Post("/pin", reqRepoAdmin, repo.IssuePin)
 				m.Post("/viewed-files", repo.UpdateViewedFiles)
 				m.Group("/dependency", func() {
 					m.Post("/add", repo.AddDependency)
@@ -1136,6 +1137,7 @@ func RegisterRoutes(m *web.Route) {
 			m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation)
 			m.Post("/attachments", repo.UploadIssueAttachment)
 			m.Post("/attachments/remove", repo.DeleteAttachment)
+			m.Post("/pin_move", reqRepoAdmin, repo.IssuePinMove)
 		}, context.RepoMustNotBeArchived())
 		m.Group("/comments/{id}", func() {
 			m.Post("", repo.UpdateCommentContent)
diff --git a/services/convert/issue.go b/services/convert/issue.go
index 6d31a123bd9fc..9a5bd2edbb8a7 100644
--- a/services/convert/issue.go
+++ b/services/convert/issue.go
@@ -46,6 +46,7 @@ func ToAPIIssue(ctx context.Context, issue *issues_model.Issue) *api.Issue {
 		Comments:    issue.NumComments,
 		Created:     issue.CreatedUnix.AsTime(),
 		Updated:     issue.UpdatedUnix.AsTime(),
+		Pin:         issue.Pin,
 	}
 
 	if issue.Repo != nil {
diff --git a/services/convert/pull.go b/services/convert/pull.go
index 4989e82cd46b9..99bc9b04d6d6b 100644
--- a/services/convert/pull.go
+++ b/services/convert/pull.go
@@ -72,6 +72,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		Deadline:  apiIssue.Deadline,
 		Created:   pr.Issue.CreatedUnix.AsTimePtr(),
 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
+		Pin:       apiIssue.Pin,
 
 		AllowMaintainerEdit: pr.AllowMaintainerEdit,
 
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 9c31262355be5..af07dd3628ae0 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -2,6 +2,85 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository issue-list">
 	{{template "repo/header" .}}
 	<div class="ui container">
+
+	{{if .PinnedIssues}}
+		<div id="issue-pin-div" {{if .IsRepoAdmin}}data-is-repo-admin{{end}} style="display: flex; flex-grow: 1; flex-wrap: wrap;">
+			{{range .PinnedIssues}}
+		<!-- start issue card -->
+				<div class="card pinned-issue-card" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
+					{{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
+						<div class="card-attachment-images">
+							{{range (index $.issuesAttachmentMap .ID)}}
+								<img src="{{.DownloadURL}}" alt="{{.Name}}">
+							{{end}}
+						</div>
+					{{end}}
+					<div class="content gt-p-0">
+						<div class="header">
+							<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}">
+								{{if .IsPull}}
+									{{if .PullRequest.HasMerged}}
+										{{svg "octicon-git-merge" 16 "text purple"}}
+									{{else}}
+										{{if .IsClosed}}
+											{{svg "octicon-git-pull-request" 16 "text red"}}
+										{{else}}
+											{{svg "octicon-git-pull-request" 16 "text green"}}
+										{{end}}
+									{{end}}
+								{{else}}
+									{{if .IsClosed}}
+										{{svg "octicon-issue-closed" 16 "text red"}}
+									{{else}}
+										{{svg "octicon-issue-opened" 16 "text green"}}
+									{{end}}
+								{{end}}
+							</span>
+							<a class="project-board-title gt-vm" href="{{.Link}}">
+								{{.Title}}
+							</a>
+						</div>
+						<div class="meta gt-my-2">
+							<span class="text light grey">
+								#{{.Index}}
+								{{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
+								{{if .OriginalAuthor}}
+									{{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
+								{{else if gt .Poster.ID 0}}
+									{{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
+								{{else}}
+									{{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
+								{{end}}
+							</span>
+						</div>
+						{{- if .MilestoneID}}
+						<div class="meta gt-my-2">
+							<a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}">
+								{{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}}
+								<span class="gt-vm">{{.Milestone.Name}}</span>
+							</a>
+						</div>
+						{{- end}}
+					</div>
+
+					{{if or .Labels .Assignees}}
+					<div class="extra content labels-list gt-p-0 gt-pt-2">
+						{{range .Labels}}
+							<a target="_blank" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a>
+						{{end}}
+						<div class="right floated">
+							{{range .Assignees}}
+								<a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a>
+							{{end}}
+						</div>
+					</div>
+					{{end}}
+				</div>
+		<!-- stop issue card -->
+			{{end}}
+		</div>
+	{{end}}
+
 		<div class="ui three column grid issue-list-headers">
 			<div class="column">
 				{{template "repo/issue/navbar" .}}
@@ -25,6 +104,7 @@
 				{{end}}
 			{{end}}
 		</div>
+
 		<div class="ui divider"></div>
 		<div id="issue-filters" class="ui stackable grid">
 			<div class="six wide column">
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 248fc71b06167..88019d3d4c0e3 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -577,6 +577,25 @@
 
 		{{if and .IsRepoAdmin (not .Repository.IsArchived)}}
 			<div class="ui divider"></div>
+
+			{{if not .Repository.IsArchived}}
+				<div class="ui watching">
+					<div class="gt-mt-3">
+						<form method="POST" action="{{.Issue.Link}}/pin">
+							{{$.CsrfTokenHtml}}
+							<button class="fluid ui button gt-df gt-jc">
+								{{svg "octicon-pin" 16 "gt-mr-3"}}
+								{{if eq .Issue.Pin 0}}
+									{{.locale.Tr "repo.issues.pin"}}
+								{{else}}
+									{{.locale.Tr "repo.issues.unpin"}}
+								{{end}}
+							</button>
+						</form>
+					</div>
+				</div>
+			{{end}}
+
 			<div class="ui watching">
 				<button class="fluid ui show-modal button {{if .Issue.IsLocked}} negative {{end}}" data-modal="#lock">
 					{{if .Issue.IsLocked}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index e3f87d703e4f4..2a5268c2a3f22 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -6012,6 +6012,39 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/issues/pinned": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "List a repo's pinned issues",
+        "operationId": "repoListPinnedIssues",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/IssueList"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/issues/{index}": {
       "get": {
         "produces": [
@@ -7240,6 +7273,144 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/issues/{index}/pin": {
+      "post": {
+        "tags": [
+          "issue"
+        ],
+        "summary": "Pin an Issue",
+        "operationId": "pinIssue",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "index of issue to pin",
+            "name": "index",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "issue"
+        ],
+        "summary": "Unpin an Issue",
+        "operationId": "unpinIssue",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "index of issue to unpin",
+            "name": "index",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
+    "/repos/{owner}/{repo}/issues/{index}/pin/{position}": {
+      "patch": {
+        "tags": [
+          "issue"
+        ],
+        "summary": "Moves the Pin to the given Position",
+        "operationId": "moveIssuePin",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "index of issue",
+            "name": "index",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "the new position",
+            "name": "position",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          },
+          "403": {
+            "$ref": "#/responses/forbidden"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/issues/{index}/reactions": {
       "get": {
         "consumes": [
@@ -9123,6 +9294,39 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/pulls/pinned": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "List a repo's pinned pull requests",
+        "operationId": "repoListPinnedPullRequests",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/PullRequestList"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/pulls/{index}": {
       "get": {
         "produces": [
@@ -18464,6 +18668,11 @@
           "format": "int64",
           "x-go-name": "OriginalAuthorID"
         },
+        "pin": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Pin"
+        },
         "pull_request": {
           "$ref": "#/definitions/PullRequestMeta"
         },
@@ -19663,6 +19872,11 @@
           "type": "string",
           "x-go-name": "PatchURL"
         },
+        "pin": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Pin"
+        },
         "state": {
           "$ref": "#/definitions/StateType"
         },
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index 496e517bc87a3..b662e60fc1817 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3636,3 +3636,14 @@ td.blob-excerpt {
 .search-fullname {
   color: var(--color-text-light-2);
 }
+
+.pinned-issue-card {
+  margin: 4px 2px !important;
+  border-radius: 5px !important;
+  width: calc(100% - 4px) !important;
+  padding: 0.5rem !important;
+  min-height: auto !important;
+  max-width: calc(100% * (1/3) - 10px - 1px);
+  border-style: solid;
+  border-color: var(--color-input-border);
+}
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index 6c5d1244fd7ed..f6184e765f9a6 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import {updateIssuesMeta} from './repo-issue.js';
 import {toggleElem} from '../utils/dom.js';
 import {htmlEscape} from 'escape-goat';
+import {Sortable} from 'sortablejs';
 
 function initRepoIssueListCheckboxes() {
   const $issueSelectAll = $('.issue-checkbox-all');
@@ -117,8 +118,46 @@ function initRepoIssueListAuthorDropdown() {
   };
 }
 
+function pinMoveEnd(event) {
+  const url = event.item.getAttribute('data-move-url');
+  const id = Number(event.item.getAttribute('data-issue-id'));
+  $.ajax({
+    url: url,
+    data: JSON.stringify({"id": id, "position": event.newIndex + 1}),
+    headers: {
+      'X-Csrf-Token': window.config.csrfToken,
+    },
+    contentType: 'application/json',
+    type: 'POST',
+    error: function(xhr) {
+      throw new Error(xhr.responseText);
+    }
+  });
+}
+
+function initIssuePinSort() {
+  const pinDiv = document.getElementById("issue-pin-div");
+
+  if (pinDiv === null) {
+    return;
+  }
+
+  // If the User is not a Repo Admin or only one issue pinned, we don't need to make this Sortable
+  if (!pinDiv.hasAttribute("data-is-repo-admin") || pinDiv.children.length < 2) {
+    return;
+  }
+
+  new Sortable(pinDiv, {
+    group: 'shared',
+    animation: 150,
+    ghostClass: 'card-ghost',
+    onEnd: pinMoveEnd
+  });
+}
+
 export function initRepoIssueList() {
   if (!document.querySelectorAll('.page-content.repository.issue-list, .page-content.repository.milestone-issue-list').length) return;
   initRepoIssueListCheckboxes();
   initRepoIssueListAuthorDropdown();
+  initIssuePinSort();
 }

From 4d1d1d888a695bdce33c678441ea8e38ab2c3733 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 12:43:21 +0200
Subject: [PATCH 02/38] Fix eslint errors

---
 web_src/js/features/repo-issue-list.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index 7d2cd78a16ce2..588dfbbbf1f2e 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -124,28 +124,28 @@ function pinMoveEnd(event) {
   const url = event.item.getAttribute('data-move-url');
   const id = Number(event.item.getAttribute('data-issue-id'));
   $.ajax({
-    url: url,
-    data: JSON.stringify({"id": id, "position": event.newIndex + 1}),
+    url,
+    data: JSON.stringify({id, position: event.newIndex + 1}),
     headers: {
       'X-Csrf-Token': window.config.csrfToken,
     },
     contentType: 'application/json',
     type: 'POST',
-    error: function(xhr) {
+    error: (xhr) => {
       throw new Error(xhr.responseText);
     }
   });
 }
 
 function initIssuePinSort() {
-  const pinDiv = document.getElementById("issue-pin-div");
+  const pinDiv = document.getElementById('issue-pin-div');
 
   if (pinDiv === null) {
     return;
   }
 
   // If the User is not a Repo Admin or only one issue pinned, we don't need to make this Sortable
-  if (!pinDiv.hasAttribute("data-is-repo-admin") || pinDiv.children.length < 2) {
+  if (!pinDiv.hasAttribute('data-is-repo-admin') || pinDiv.children.length < 2) {
     return;
   }
 

From 7aea9d6812a6a378db559b67339e3378e38e572d Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 13:32:12 +0200
Subject: [PATCH 03/38] Rename Pin to PinOrder

---
 assets/go-licenses.json                       | 11 +++-
 models/issues/issue.go                        | 55 +++++++++++--------
 modules/structs/issue.go                      |  2 +-
 modules/structs/pull.go                       |  2 +-
 routers/api/v1/repo/issue_pin.go              |  4 +-
 services/convert/issue.go                     |  2 +-
 services/convert/pull.go                      |  2 +-
 .../repo/issue/view_content/sidebar.tmpl      |  2 +-
 templates/swagger/v1_json.tmpl                |  8 +--
 9 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/assets/go-licenses.json b/assets/go-licenses.json
index 1b6ead5df654b..f4fc648056a61 100644
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
@@ -69,6 +69,11 @@
     "path": "github.com/Azure/go-ntlmssp/LICENSE",
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2016 Microsoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
+  {
+    "name": "github.com/Microsoft/go-winio",
+    "path": "github.com/Microsoft/go-winio/LICENSE",
+    "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Microsoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n"
+  },
   {
     "name": "github.com/NYTimes/gziphandler",
     "path": "github.com/NYTimes/gziphandler/LICENSE",
@@ -840,9 +845,9 @@
     "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
   {
-    "name": "github.com/prometheus/procfs",
-    "path": "github.com/prometheus/procfs/LICENSE",
-    "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
+    "name": "github.com/quasoft/websspi",
+    "path": "github.com/quasoft/websspi/LICENSE",
+    "licenseText": "MIT License\n\nCopyright (c) 2019 QuaSoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
   {
     "name": "github.com/redis/go-redis/v9",
diff --git a/models/issues/issue.go b/models/issues/issue.go
index cfb06f9da9252..4794a6408a08c 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -127,7 +127,7 @@ type Issue struct {
 	PullRequest      *PullRequest     `xorm:"-"`
 	NumComments      int
 	Ref              string
-	Pin              int `xorm:"DEFAULT 0"`
+	PinOrder         int `xorm:"DEFAULT 0"`
 
 	DeadlineUnix timeutil.TimeStamp `xorm:"INDEX"`
 
@@ -2505,15 +2505,20 @@ func (issue *Issue) HasOriginalAuthor() bool {
 	return issue.OriginalAuthor != "" && issue.OriginalAuthorID != 0
 }
 
-// PinIssue pins a Issue
-func (issue *Issue) PinIssue() error {
+// IsPinned returns if a Issue is pinned
+func (issue *Issue) IsPinned() bool {
+	return issue.PinOrder != 0
+}
+
+// Pin pins a Issue
+func (issue *Issue) Pin() error {
 	// If the Issue is already pinned, we don't need to pin it twice
-	if issue.Pin > 0 {
+	if issue.IsPinned() {
 		return nil
 	}
 
 	var maxPin int
-	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
 	if err != nil {
 		return err
 	}
@@ -2521,21 +2526,21 @@ func (issue *Issue) PinIssue() error {
 	_, err = db.GetEngine(db.DefaultContext).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
-			"pin": maxPin + 1,
+			"pin_order": maxPin + 1,
 		})
 
 	return err
 }
 
 // UnpinIssue unpins a Issue
-func (issue *Issue) UnpinIssue() error {
+func (issue *Issue) Unpin() error {
 	// If the Issue is not pinned, we don't need to unpin it
-	if issue.Pin == 0 {
+	if !issue.IsPinned() {
 		return nil
 	}
 
 	// This sets the Pin for all Issues that come after the unpined Issue to the correct value
-	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.Pin)
+	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {
 		return err
 	}
@@ -2551,17 +2556,17 @@ func (issue *Issue) UnpinIssue() error {
 
 // PinOrUnpin pins or unpins a Issue
 func (issue *Issue) PinOrUnpin() error {
-	if issue.Pin == 0 {
-		return issue.PinIssue()
-	} else {
-		return issue.UnpinIssue()
+	if !issue.IsPinned() {
+		return issue.Pin()
 	}
+
+	return issue.Unpin()
 }
 
 // MovePin moves a Pinned Issue to a new Position
 func (issue *Issue) MovePin(newPosition int) error {
 	// If the Issue is not pinned, we can't move them
-	if issue.Pin == 0 {
+	if !issue.IsPinned() {
 		return nil
 	}
 
@@ -2574,7 +2579,7 @@ func (issue *Issue) MovePin(newPosition int) error {
 		maxPin int
 	)
 
-	_, err = db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+	_, err = db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
 
 	if err != nil {
 		return err
@@ -2588,14 +2593,13 @@ func (issue *Issue) MovePin(newPosition int) error {
 	// TODO: Run the follwoing commands in a Transaction and Rollback, if one fails
 
 	// Lower the Position of all Pinned Issue that came after the current Position
-	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.Pin)
-	log.Error("Hallo %d", issue.Pin)
+	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {
 		return err
 	}
 
 	// Higher the Position of all Pinned Issues that comes after the new Position
-	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin + 1 WHERE repo_id = ? AND is_pull = ? AND pin >= ?", issue.RepoID, issue.IsPull, newPosition)
+	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order + 1 WHERE repo_id = ? AND is_pull = ? AND pin_order >= ?", issue.RepoID, issue.IsPull, newPosition)
 	if err != nil {
 		return err
 	}
@@ -2603,28 +2607,31 @@ func (issue *Issue) MovePin(newPosition int) error {
 	_, err = db.GetEngine(db.DefaultContext).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
-			"pin": newPosition,
+			"pin_order": newPosition,
 		})
 
 	return err
 }
 
 // GetPinnedIssues returns the pinned Issues for the given Repo and type
-func GetPinnedIssues(RepoID int64, isPull bool) ([]*Issue, error) {
+func GetPinnedIssues(repoID int64, isPull bool) ([]*Issue, error) {
 	issues := make([]*Issue, 0)
 
 	err := db.GetEngine(db.DefaultContext).
 		Table("issue").
-		Where("repo_id = ?", RepoID).
+		Where("repo_id = ?", repoID).
 		And("is_pull = ?", isPull).
-		And("pin > 0").
-		OrderBy("pin").
+		And("pin_order > 0").
+		OrderBy("pin_order").
 		Find(&issues)
 	if err != nil {
 		return nil, err
 	}
 
-	IssueList(issues).LoadAttributes()
+	err = IssueList(issues).LoadAttributes()
+	if err != nil {
+		return nil, err
+	}
 
 	return issues, nil
 }
diff --git a/modules/structs/issue.go b/modules/structs/issue.go
index 04a904a69253e..a9fb6c6e797b2 100644
--- a/modules/structs/issue.go
+++ b/modules/structs/issue.go
@@ -76,7 +76,7 @@ type Issue struct {
 	PullRequest *PullRequestMeta `json:"pull_request"`
 	Repo        *RepositoryMeta  `json:"repository"`
 
-	Pin int `json:"pin"`
+	PinOrder int `json:"pin_order"`
 }
 
 // CreateIssueOption options to create one issue
diff --git a/modules/structs/pull.go b/modules/structs/pull.go
index 37436e37f1976..f665e037f6171 100644
--- a/modules/structs/pull.go
+++ b/modules/structs/pull.go
@@ -49,7 +49,7 @@ type PullRequest struct {
 	// swagger:strfmt date-time
 	Closed *time.Time `json:"closed_at"`
 
-	Pin int `json:"pin"`
+	PinOrder int `json:"pin_order"`
 }
 
 // PRBranchInfo information about a branch
diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
index 06b2a2249334c..841a8597e1958 100644
--- a/routers/api/v1/repo/issue_pin.go
+++ b/routers/api/v1/repo/issue_pin.go
@@ -51,7 +51,7 @@ func PinIssue(ctx *context.APIContext) {
 		return
 	}
 
-	err = issue.PinIssue()
+	err = issue.Pin()
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "PinIssue", err)
 	}
@@ -98,7 +98,7 @@ func UnpinIssue(ctx *context.APIContext) {
 		return
 	}
 
-	err = issue.UnpinIssue()
+	err = issue.Unpin()
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "UnpinIssue", err)
 	}
diff --git a/services/convert/issue.go b/services/convert/issue.go
index 9a5bd2edbb8a7..c952c4c5f4a82 100644
--- a/services/convert/issue.go
+++ b/services/convert/issue.go
@@ -46,7 +46,7 @@ func ToAPIIssue(ctx context.Context, issue *issues_model.Issue) *api.Issue {
 		Comments:    issue.NumComments,
 		Created:     issue.CreatedUnix.AsTime(),
 		Updated:     issue.UpdatedUnix.AsTime(),
-		Pin:         issue.Pin,
+		PinOrder:    issue.PinOrder,
 	}
 
 	if issue.Repo != nil {
diff --git a/services/convert/pull.go b/services/convert/pull.go
index 99bc9b04d6d6b..da6a6ae0f03ef 100644
--- a/services/convert/pull.go
+++ b/services/convert/pull.go
@@ -72,7 +72,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		Deadline:  apiIssue.Deadline,
 		Created:   pr.Issue.CreatedUnix.AsTimePtr(),
 		Updated:   pr.Issue.UpdatedUnix.AsTimePtr(),
-		Pin:       apiIssue.Pin,
+		PinOrder:  apiIssue.PinOrder,
 
 		AllowMaintainerEdit: pr.AllowMaintainerEdit,
 
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 15af557383f9f..136ea15a861da 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -585,7 +585,7 @@
 							{{$.CsrfTokenHtml}}
 							<button class="fluid ui button gt-df gt-jc">
 								{{svg "octicon-pin" 16 "gt-mr-3"}}
-								{{if eq .Issue.Pin 0}}
+								{{if not .Issue.IsPinned}}
 									{{.locale.Tr "repo.issues.pin"}}
 								{{else}}
 									{{.locale.Tr "repo.issues.unpin"}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index e63a2921b9b40..fe412f739ddee 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -18775,10 +18775,10 @@
           "format": "int64",
           "x-go-name": "OriginalAuthorID"
         },
-        "pin": {
+        "pin_order": {
           "type": "integer",
           "format": "int64",
-          "x-go-name": "Pin"
+          "x-go-name": "PinOrder"
         },
         "pull_request": {
           "$ref": "#/definitions/PullRequestMeta"
@@ -20025,10 +20025,10 @@
           "type": "string",
           "x-go-name": "PatchURL"
         },
-        "pin": {
+        "pin_order": {
           "type": "integer",
           "format": "int64",
-          "x-go-name": "Pin"
+          "x-go-name": "PinOrder"
         },
         "state": {
           "$ref": "#/definitions/StateType"

From 22c0687697133d16ed832942c0c5088906a94152 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 15:58:25 +0200
Subject: [PATCH 04/38] Add X Button

---
 assets/go-licenses.json                | 13 +++------
 models/issues/issue.go                 |  4 +--
 options/locale/locale_en-US.ini        |  1 +
 routers/web/repo/issue_pin.go          | 21 ++++++++++++--
 routers/web/web.go                     |  3 +-
 templates/repo/issue/list.tmpl         |  9 ++++--
 web_src/css/repository.css             |  1 +
 web_src/js/features/repo-issue-list.js | 38 ++++++++++++++++++++++++--
 8 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/assets/go-licenses.json b/assets/go-licenses.json
index f4fc648056a61..090f595e740ae 100644
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
@@ -69,11 +69,6 @@
     "path": "github.com/Azure/go-ntlmssp/LICENSE",
     "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2016 Microsoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
   },
-  {
-    "name": "github.com/Microsoft/go-winio",
-    "path": "github.com/Microsoft/go-winio/LICENSE",
-    "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2015 Microsoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n"
-  },
   {
     "name": "github.com/NYTimes/gziphandler",
     "path": "github.com/NYTimes/gziphandler/LICENSE",
@@ -845,9 +840,9 @@
     "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
   {
-    "name": "github.com/quasoft/websspi",
-    "path": "github.com/quasoft/websspi/LICENSE",
-    "licenseText": "MIT License\n\nCopyright (c) 2019 QuaSoft\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+    "name": "github.com/prometheus/procfs",
+    "path": "github.com/prometheus/procfs/LICENSE",
+    "licenseText": "                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n   1. Definitions.\n\n      \"License\" shall mean the terms and conditions for use, reproduction,\n      and distribution as defined by Sections 1 through 9 of this document.\n\n      \"Licensor\" shall mean the copyright owner or entity authorized by\n      the copyright owner that is granting the License.\n\n      \"Legal Entity\" shall mean the union of the acting entity and all\n      other entities that control, are controlled by, or are under common\n      control with that entity. For the purposes of this definition,\n      \"control\" means (i) the power, direct or indirect, to cause the\n      direction or management of such entity, whether by contract or\n      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n      outstanding shares, or (iii) beneficial ownership of such entity.\n\n      \"You\" (or \"Your\") shall mean an individual or Legal Entity\n      exercising permissions granted by this License.\n\n      \"Source\" form shall mean the preferred form for making modifications,\n      including but not limited to software source code, documentation\n      source, and configuration files.\n\n      \"Object\" form shall mean any form resulting from mechanical\n      transformation or translation of a Source form, including but\n      not limited to compiled object code, generated documentation,\n      and conversions to other media types.\n\n      \"Work\" shall mean the work of authorship, whether in Source or\n      Object form, made available under the License, as indicated by a\n      copyright notice that is included in or attached to the work\n      (an example is provided in the Appendix below).\n\n      \"Derivative Works\" shall mean any work, whether in Source or Object\n      form, that is based on (or derived from) the Work and for which the\n      editorial revisions, annotations, elaborations, or other modifications\n      represent, as a whole, an original work of authorship. For the purposes\n      of this License, Derivative Works shall not include works that remain\n      separable from, or merely link (or bind by name) to the interfaces of,\n      the Work and Derivative Works thereof.\n\n      \"Contribution\" shall mean any work of authorship, including\n      the original version of the Work and any modifications or additions\n      to that Work or Derivative Works thereof, that is intentionally\n      submitted to Licensor for inclusion in the Work by the copyright owner\n      or by an individual or Legal Entity authorized to submit on behalf of\n      the copyright owner. For the purposes of this definition, \"submitted\"\n      means any form of electronic, verbal, or written communication sent\n      to the Licensor or its representatives, including but not limited to\n      communication on electronic mailing lists, source code control systems,\n      and issue tracking systems that are managed by, or on behalf of, the\n      Licensor for the purpose of discussing and improving the Work, but\n      excluding communication that is conspicuously marked or otherwise\n      designated in writing by the copyright owner as \"Not a Contribution.\"\n\n      \"Contributor\" shall mean Licensor and any individual or Legal Entity\n      on behalf of whom a Contribution has been received by Licensor and\n      subsequently incorporated within the Work.\n\n   2. Grant of Copyright License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      copyright license to reproduce, prepare Derivative Works of,\n      publicly display, publicly perform, sublicense, and distribute the\n      Work and such Derivative Works in Source or Object form.\n\n   3. Grant of Patent License. Subject to the terms and conditions of\n      this License, each Contributor hereby grants to You a perpetual,\n      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n      (except as stated in this section) patent license to make, have made,\n      use, offer to sell, sell, import, and otherwise transfer the Work,\n      where such license applies only to those patent claims licensable\n      by such Contributor that are necessarily infringed by their\n      Contribution(s) alone or by combination of their Contribution(s)\n      with the Work to which such Contribution(s) was submitted. If You\n      institute patent litigation against any entity (including a\n      cross-claim or counterclaim in a lawsuit) alleging that the Work\n      or a Contribution incorporated within the Work constitutes direct\n      or contributory patent infringement, then any patent licenses\n      granted to You under this License for that Work shall terminate\n      as of the date such litigation is filed.\n\n   4. Redistribution. You may reproduce and distribute copies of the\n      Work or Derivative Works thereof in any medium, with or without\n      modifications, and in Source or Object form, provided that You\n      meet the following conditions:\n\n      (a) You must give any other recipients of the Work or\n          Derivative Works a copy of this License; and\n\n      (b) You must cause any modified files to carry prominent notices\n          stating that You changed the files; and\n\n      (c) You must retain, in the Source form of any Derivative Works\n          that You distribute, all copyright, patent, trademark, and\n          attribution notices from the Source form of the Work,\n          excluding those notices that do not pertain to any part of\n          the Derivative Works; and\n\n      (d) If the Work includes a \"NOTICE\" text file as part of its\n          distribution, then any Derivative Works that You distribute must\n          include a readable copy of the attribution notices contained\n          within such NOTICE file, excluding those notices that do not\n          pertain to any part of the Derivative Works, in at least one\n          of the following places: within a NOTICE text file distributed\n          as part of the Derivative Works; within the Source form or\n          documentation, if provided along with the Derivative Works; or,\n          within a display generated by the Derivative Works, if and\n          wherever such third-party notices normally appear. The contents\n          of the NOTICE file are for informational purposes only and\n          do not modify the License. You may add Your own attribution\n          notices within Derivative Works that You distribute, alongside\n          or as an addendum to the NOTICE text from the Work, provided\n          that such additional attribution notices cannot be construed\n          as modifying the License.\n\n      You may add Your own copyright statement to Your modifications and\n      may provide additional or different license terms and conditions\n      for use, reproduction, or distribution of Your modifications, or\n      for any such Derivative Works as a whole, provided Your use,\n      reproduction, and distribution of the Work otherwise complies with\n      the conditions stated in this License.\n\n   5. Submission of Contributions. Unless You explicitly state otherwise,\n      any Contribution intentionally submitted for inclusion in the Work\n      by You to the Licensor shall be under the terms and conditions of\n      this License, without any additional terms or conditions.\n      Notwithstanding the above, nothing herein shall supersede or modify\n      the terms of any separate license agreement you may have executed\n      with Licensor regarding such Contributions.\n\n   6. Trademarks. This License does not grant permission to use the trade\n      names, trademarks, service marks, or product names of the Licensor,\n      except as required for reasonable and customary use in describing the\n      origin of the Work and reproducing the content of the NOTICE file.\n\n   7. Disclaimer of Warranty. Unless required by applicable law or\n      agreed to in writing, Licensor provides the Work (and each\n      Contributor provides its Contributions) on an \"AS IS\" BASIS,\n      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n      implied, including, without limitation, any warranties or conditions\n      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n      PARTICULAR PURPOSE. You are solely responsible for determining the\n      appropriateness of using or redistributing the Work and assume any\n      risks associated with Your exercise of permissions under this License.\n\n   8. Limitation of Liability. In no event and under no legal theory,\n      whether in tort (including negligence), contract, or otherwise,\n      unless required by applicable law (such as deliberate and grossly\n      negligent acts) or agreed to in writing, shall any Contributor be\n      liable to You for damages, including any direct, indirect, special,\n      incidental, or consequential damages of any character arising as a\n      result of this License or out of the use or inability to use the\n      Work (including but not limited to damages for loss of goodwill,\n      work stoppage, computer failure or malfunction, or any and all\n      other commercial damages or losses), even if such Contributor\n      has been advised of the possibility of such damages.\n\n   9. Accepting Warranty or Additional Liability. While redistributing\n      the Work or Derivative Works thereof, You may choose to offer,\n      and charge a fee for, acceptance of support, warranty, indemnity,\n      or other liability obligations and/or rights consistent with this\n      License. However, in accepting such obligations, You may act only\n      on Your own behalf and on Your sole responsibility, not on behalf\n      of any other Contributor, and only if You agree to indemnify,\n      defend, and hold each Contributor harmless for any liability\n      incurred by, or claims asserted against, such Contributor by reason\n      of your accepting any such warranty or additional liability.\n\n   END OF TERMS AND CONDITIONS\n\n   APPENDIX: How to apply the Apache License to your work.\n\n      To apply the Apache License to your work, attach the following\n      boilerplate notice, with the fields enclosed by brackets \"[]\"\n      replaced with your own identifying information. (Don't include\n      the brackets!)  The text should be enclosed in the appropriate\n      comment syntax for the file format. We also recommend that a\n      file or class name and description of purpose be included on the\n      same \"printed page\" as the copyright notice for easier\n      identification within third-party archives.\n\n   Copyright [yyyy] [name of copyright owner]\n\n   Licensed under the Apache License, Version 2.0 (the \"License\");\n   you may not use this file except in compliance with the License.\n   You may obtain a copy of the License at\n\n       http://www.apache.org/licenses/LICENSE-2.0\n\n   Unless required by applicable law or agreed to in writing, software\n   distributed under the License is distributed on an \"AS IS\" BASIS,\n   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n   See the License for the specific language governing permissions and\n   limitations under the License.\n"
   },
   {
     "name": "github.com/redis/go-redis/v9",
@@ -1109,4 +1104,4 @@
     "path": "xorm.io/xorm/LICENSE",
     "licenseText": "Copyright (c) 2013 - 2015 The Xorm Authors\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* Neither the name of the {organization} nor the names of its\n  contributors may be used to endorse or promote products derived from\n  this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   }
-]
\ No newline at end of file
+]
diff --git a/models/issues/issue.go b/models/issues/issue.go
index 4794a6408a08c..5080f1489f43f 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -2540,7 +2540,7 @@ func (issue *Issue) Unpin() error {
 	}
 
 	// This sets the Pin for all Issues that come after the unpined Issue to the correct value
-	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin = pin - 1 WHERE repo_id = ? AND is_pull = ? AND pin > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
+	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {
 		return err
 	}
@@ -2548,7 +2548,7 @@ func (issue *Issue) Unpin() error {
 	_, err = db.GetEngine(db.DefaultContext).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
-			"pin": 0,
+			"pin_order": 0,
 		})
 
 	return err
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 4d928594a435a..271439a257347 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1465,6 +1465,7 @@ issues.subscribe = Subscribe
 issues.unsubscribe = Unsubscribe
 issues.pin = Pin
 issues.unpin = Unpin
+issues.unpin_issue = Unpin Issue
 issues.lock = Lock conversation
 issues.unlock = Unlock conversation
 issues.lock.unknown_reason = Cannot lock an issue with an unknown reason.
diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
index dba7976645096..1a51b79c820af 100644
--- a/routers/web/repo/issue_pin.go
+++ b/routers/web/repo/issue_pin.go
@@ -11,8 +11,8 @@ import (
 	"code.gitea.io/gitea/modules/json"
 )
 
-// IssuePin pin or unpin a Issue
-func IssuePin(ctx *context.Context) {
+// IssuePinOrUnpin pin or unpin a Issue
+func IssuePinOrUnpin(ctx *context.Context) {
 	issue := GetActionIssue(ctx)
 	err := issue.PinOrUnpin()
 	if err != nil {
@@ -23,6 +23,21 @@ func IssuePin(ctx *context.Context) {
 	ctx.Redirect(issue.Link())
 }
 
+// IssueUnpin unpins a Issue
+func IssueUnpin(ctx *context.Context) {
+	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err.Error())
+	}
+
+	err = issue.Unpin()
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err.Error())
+	}
+
+	ctx.Status(http.StatusNoContent)
+}
+
 // IssuePinMove moves a pinned Issue
 func IssuePinMove(ctx *context.Context) {
 	if ctx.Doer == nil {
@@ -37,7 +52,7 @@ func IssuePinMove(ctx *context.Context) {
 
 	form := &movePinIssueForm{}
 	if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
-		ctx.JSON(http.StatusInternalServerError, err)
+		ctx.JSON(http.StatusInternalServerError, err.Error())
 	}
 
 	issue, err := issues_model.GetIssueByID(ctx, form.ID)
diff --git a/routers/web/web.go b/routers/web/web.go
index 51da28079551b..426d9080ff466 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -984,7 +984,7 @@ func registerRoutes(m *web.Route) {
 				m.Post("/deadline", web.Bind(structs.EditDeadlineOption{}), repo.UpdateIssueDeadline)
 				m.Post("/watch", repo.IssueWatch)
 				m.Post("/ref", repo.UpdateIssueRef)
-				m.Post("/pin", reqRepoAdmin, repo.IssuePin)
+				m.Post("/pin", reqRepoAdmin, repo.IssuePinOrUnpin)
 				m.Post("/viewed-files", repo.UpdateViewedFiles)
 				m.Group("/dependency", func() {
 					m.Post("/add", repo.AddDependency)
@@ -1022,6 +1022,7 @@ func registerRoutes(m *web.Route) {
 			m.Post("/resolve_conversation", reqRepoIssuesOrPullsReader, repo.UpdateResolveConversation)
 			m.Post("/attachments", repo.UploadIssueAttachment)
 			m.Post("/attachments/remove", repo.DeleteAttachment)
+			m.Delete("/unpin/{id}", reqRepoAdmin, repo.IssueUnpin)
 			m.Post("/pin_move", reqRepoAdmin, repo.IssuePinMove)
 		}, context.RepoMustNotBeArchived())
 		m.Group("/comments/{id}", func() {
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index af07dd3628ae0..046e53a928d33 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -6,9 +6,8 @@
 	{{if .PinnedIssues}}
 		<div id="issue-pin-div" {{if .IsRepoAdmin}}data-is-repo-admin{{end}} style="display: flex; flex-grow: 1; flex-wrap: wrap;">
 			{{range .PinnedIssues}}
-		<!-- start issue card -->
 				<div class="card pinned-issue-card" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
-					{{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
+					{{if eq $.Project.CardType 1}}
 						<div class="card-attachment-images">
 							{{range (index $.issuesAttachmentMap .ID)}}
 								<img src="{{.DownloadURL}}" alt="{{.Name}}">
@@ -39,6 +38,11 @@
 							<a class="project-board-title gt-vm" href="{{.Link}}">
 								{{.Title}}
 							</a>
+							{{if $.IsRepoAdmin}}
+								<span name="issue-unpin-button" style="float: right;" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
+									{{svg "octicon-x" 16 "gt-mr-3"}}
+								</span>
+							{{end}}
 						</div>
 						<div class="meta gt-my-2">
 							<span class="text light grey">
@@ -76,7 +80,6 @@
 					</div>
 					{{end}}
 				</div>
-		<!-- stop issue card -->
 			{{end}}
 		</div>
 	{{end}}
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index b2e1121271273..40528e6896e92 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3495,4 +3495,5 @@ td.blob-excerpt {
   max-width: calc(100% * (1/3) - 10px - 1px);
   border-style: solid;
   border-color: var(--color-input-border);
+  border-width: 1px;
 }
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index 588dfbbbf1f2e..656f1ac2cde74 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -120,6 +120,32 @@ function initRepoIssueListAuthorDropdown() {
   };
 }
 
+function initPinRemoveButton() {
+  for (const button of document.getElementsByName('issue-unpin-button')) {
+    button.addEventListener('click', (event) => {
+      const elem = event.currentTarget;
+      const id = Number(elem.getAttribute('data-issue-id'));
+
+      // Send the unpin request
+      $.ajax({
+        url: elem.getAttribute('data-unpin-url'),
+        headers: {
+          'X-Csrf-Token': window.config.csrfToken,
+        },
+        contentType: 'application/json',
+        type: 'DELETE',
+        error: (xhr) => {
+          throw new Error(xhr.responseText);
+        },
+        success: () => {
+          // Remove the Card
+          document.querySelector(`div[data-issue-id="${id}"]`).remove();
+        }
+      });
+    });
+  }
+}
+
 function pinMoveEnd(event) {
   const url = event.item.getAttribute('data-move-url');
   const id = Number(event.item.getAttribute('data-issue-id'));
@@ -135,6 +161,7 @@ function pinMoveEnd(event) {
       throw new Error(xhr.responseText);
     }
   });
+  initPinRemoveButton();
 }
 
 function initIssuePinSort() {
@@ -144,8 +171,15 @@ function initIssuePinSort() {
     return;
   }
 
-  // If the User is not a Repo Admin or only one issue pinned, we don't need to make this Sortable
-  if (!pinDiv.hasAttribute('data-is-repo-admin') || pinDiv.children.length < 2) {
+  // If the User is not a Repo Admin, we don't need to proceed
+  if (!pinDiv.hasAttribute('data-is-repo-admin')) {
+    return;
+  }
+
+  initPinRemoveButton();
+
+  // If only one issue pinned, we don't need to make this Sortable
+  if (pinDiv.children.length < 2) {
     return;
   }
 

From 31804ab9fc612f95ee642e21eb49e669e6881e69 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 16:28:36 +0200
Subject: [PATCH 05/38] Remove newline

---
 assets/go-licenses.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/go-licenses.json b/assets/go-licenses.json
index 090f595e740ae..1b6ead5df654b 100644
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
@@ -1104,4 +1104,4 @@
     "path": "xorm.io/xorm/LICENSE",
     "licenseText": "Copyright (c) 2013 - 2015 The Xorm Authors\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n  list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n  this list of conditions and the following disclaimer in the documentation\n  and/or other materials provided with the distribution.\n\n* Neither the name of the {organization} nor the names of its\n  contributors may be used to endorse or promote products derived from\n  this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
   }
-]
+]
\ No newline at end of file

From 65dd702b60e462a50b3b8aff1411791a14451e5e Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 28 Apr 2023 16:40:18 +0200
Subject: [PATCH 06/38] Fix typo

---
 models/issues/issue.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/issues/issue.go b/models/issues/issue.go
index 5080f1489f43f..2ab707f4fabc7 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -2590,7 +2590,7 @@ func (issue *Issue) MovePin(newPosition int) error {
 		newPosition = maxPin + 1
 	}
 
-	// TODO: Run the follwoing commands in a Transaction and Rollback, if one fails
+	// TODO: Run the following commands in a Transaction and Rollback, if one fails
 
 	// Lower the Position of all Pinned Issue that came after the current Position
 	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)

From dfacb3f45c8437208e7e8ed5365c376f37d14ff2 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 29 Apr 2023 23:27:35 +0200
Subject: [PATCH 07/38] Update templates/repo/issue/list.tmpl

---
 templates/repo/issue/list.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 046e53a928d33..f66e8419308e2 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -107,7 +107,6 @@
 				{{end}}
 			{{end}}
 		</div>
-
 		<div class="ui divider"></div>
 		<div id="issue-filters" class="ui stackable grid">
 			<div class="six wide column">

From 8b84877fe1d2752c3639b0e244dc380a8c47f48b Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 10:18:17 +0200
Subject: [PATCH 08/38] Changes requested by silverwind

---
 options/locale/locale_en-US.ini               |  5 +-
 templates/repo/issue/list.tmpl                | 28 +++-------
 .../repo/issue/view_content/sidebar.tmpl      |  4 +-
 templates/shared/issueicon.tmpl               | 18 +++++++
 templates/shared/issuelist.tmpl               | 22 +-------
 web_src/css/repository.css                    | 14 +++++
 web_src/js/features/repo-issue-list.js        | 51 ++++++++-----------
 7 files changed, 64 insertions(+), 78 deletions(-)
 create mode 100644 templates/shared/issueicon.tmpl

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 3b2448f0e9fb1..c1275efea0eaa 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -113,6 +113,9 @@ unknown = Unknown
 
 rss_feed = RSS Feed
 
+pin = Pin
+unpin = Unpin
+
 [aria]
 navbar = Navigation Bar
 footer = Footer
@@ -1466,8 +1469,6 @@ issues.attachment.open_tab = `Click to see "%s" in a new tab`
 issues.attachment.download = `Click to download "%s"`
 issues.subscribe = Subscribe
 issues.unsubscribe = Unsubscribe
-issues.pin = Pin
-issues.unpin = Unpin
 issues.unpin_issue = Unpin Issue
 issues.lock = Lock conversation
 issues.unlock = Unlock conversation
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 6410526a591dd..df3d88d7e402a 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 
 	{{if .PinnedIssues}}
-		<div id="issue-pin-div" {{if .IsRepoAdmin}}data-is-repo-admin{{end}} style="display: flex; flex-grow: 1; flex-wrap: wrap;">
+		<div id="issue-pin-div" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}>
 			{{range .PinnedIssues}}
 				<div class="card pinned-issue-card" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
 					{{if eq $.Project.CardType 1}}
@@ -17,29 +17,13 @@
 					<div class="content gt-p-0">
 						<div class="header">
 							<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}">
-								{{if .IsPull}}
-									{{if .PullRequest.HasMerged}}
-										{{svg "octicon-git-merge" 16 "text purple"}}
-									{{else}}
-										{{if .IsClosed}}
-											{{svg "octicon-git-pull-request" 16 "text red"}}
-										{{else}}
-											{{svg "octicon-git-pull-request" 16 "text green"}}
-										{{end}}
-									{{end}}
-								{{else}}
-									{{if .IsClosed}}
-										{{svg "octicon-issue-closed" 16 "text red"}}
-									{{else}}
-										{{svg "octicon-issue-opened" 16 "text green"}}
-									{{end}}
-								{{end}}
+								{{template "shared/issueicon" .}}
 							</span>
-							<a class="project-board-title gt-vm" href="{{.Link}}">
+							<a class="pinned-issue-title gt-vm" href="{{.Link}}">
 								{{.Title}}
 							</a>
 							{{if $.IsRepoAdmin}}
-								<span name="issue-unpin-button" style="float: right;" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
+								<span name="issue-unpin-button" class="pinned-issue-unpin-icon" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
 									{{svg "octicon-x" 16 "gt-mr-3"}}
 								</span>
 							{{end}}
@@ -70,11 +54,11 @@
 					{{if or .Labels .Assignees}}
 					<div class="extra content labels-list gt-p-0 gt-pt-2">
 						{{range .Labels}}
-							<a target="_blank" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a>
+							<a href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a>
 						{{end}}
 						<div class="right floated">
 							{{range .Assignees}}
-								<a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a>
+								<a href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{avatar $.Context . 28 "mini gt-mr-3"}}</a>
 							{{end}}
 						</div>
 					</div>
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 1ef01f9bf386a..41a016aa85c67 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -549,9 +549,9 @@
 							<button class="fluid ui button gt-df gt-jc">
 								{{svg "octicon-pin" 16 "gt-mr-3"}}
 								{{if not .Issue.IsPinned}}
-									{{.locale.Tr "repo.issues.pin"}}
+									{{.locale.Tr "pin"}}
 								{{else}}
-									{{.locale.Tr "repo.issues.unpin"}}
+									{{.locale.Tr "unpin"}}
 								{{end}}
 							</button>
 						</form>
diff --git a/templates/shared/issueicon.tmpl b/templates/shared/issueicon.tmpl
new file mode 100644
index 0000000000000..5f6ac4673288e
--- /dev/null
+++ b/templates/shared/issueicon.tmpl
@@ -0,0 +1,18 @@
+
+{{if .IsPull}}
+	{{if .PullRequest.HasMerged}}
+		{{svg "octicon-git-merge" 16 "text purple"}}
+	{{else}}
+		{{if .IsClosed}}
+			{{svg "octicon-git-pull-request" 16 "text red"}}
+		{{else}}
+			{{svg "octicon-git-pull-request" 16 "text green"}}
+		{{end}}
+	{{end}}
+{{else}}
+	{{if .IsClosed}}
+		{{svg "octicon-issue-closed" 16 "text red"}}
+	{{else}}
+		{{svg "octicon-issue-opened" 16 "text green"}}
+	{{end}}
+{{end}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 3b354710817c8..af9eb70fe83c1 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -7,27 +7,7 @@
 					<input type="checkbox" autocomplete="off" class="issue-checkbox gt-mt-2 gt-mr-4" data-issue-id={{.ID}} aria-label="{{$.locale.Tr "repo.issues.action_check"}} &quot;{{.Title}}&quot;">
 				{{end}}
 				<div class="issue-item-icon">
-					{{if .IsPull}}
-						{{if .PullRequest.HasMerged}}
-							{{svg "octicon-git-merge" 16 "text purple"}}
-						{{else}}
-							{{if .IsClosed}}
-								{{svg "octicon-git-pull-request" 16 "text red"}}
-							{{else}}
-								{{if .PullRequest.IsWorkInProgress}}
-									{{svg "octicon-git-pull-request-draft" 16 "text grey"}}
-								{{else}}
-									{{svg "octicon-git-pull-request" 16 "text green"}}
-								{{end}}
-							{{end}}
-						{{end}}
-					{{else}}
-						{{if .IsClosed}}
-							{{svg "octicon-issue-closed" 16 "text red"}}
-						{{else}}
-							{{svg "octicon-issue-opened" 16 "text green"}}
-						{{end}}
-					{{end}}
+					{{template "shared/issueicon" .}}
 				</div>
 			</div>
 			<div class="issue-item-main gt-f1 gt-fc gt-df">
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index 9d77cac952526..52374b017b23c 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3446,6 +3446,12 @@ td.blob-excerpt {
   color: var(--color-text-light-2);
 }
 
+#issue-pin-div {
+  display: flex;
+  flex-grow: 1;
+  flex-wrap: wrap;
+}
+
 .pinned-issue-card {
   margin: 4px 2px !important;
   border-radius: 5px !important;
@@ -3457,3 +3463,11 @@ td.blob-excerpt {
   border-color: var(--color-input-border);
   border-width: 1px;
 }
+
+.pinned-issue-title {
+  word-break: break-word;
+}
+
+.pinned-issue-unpin-icon {
+  float: right;
+}
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index d6fe9a52f3669..b371dde1842bc 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -123,21 +123,20 @@ function initRepoIssueListAuthorDropdown() {
 function initPinRemoveButton() {
   for (const button of document.getElementsByName('issue-unpin-button')) {
     button.addEventListener('click', (event) => {
-      const elem = event.currentTarget;
-      const id = Number(elem.getAttribute('data-issue-id'));
+      const el = event.currentTarget;
+      const id = Number(el.getAttribute('data-issue-id'));
 
       // Send the unpin request
-      $.ajax({
-        url: elem.getAttribute('data-unpin-url'),
+      fetch(el.getAttribute('data-unpin-url'), {
+        method: 'delete',
         headers: {
           'X-Csrf-Token': window.config.csrfToken,
+          'Content-Type': 'application/json',
         },
-        contentType: 'application/json',
-        type: 'DELETE',
-        error: (xhr) => {
-          throw new Error(xhr.responseText);
-        },
-        success: () => {
+      }).then((response) => {
+        if (response.ok) {
+          // Delete the tooltip
+          el._tippy.destroy();
           // Remove the Card
           document.querySelector(`div[data-issue-id="${id}"]`).remove();
         }
@@ -146,20 +145,16 @@ function initPinRemoveButton() {
   }
 }
 
-function pinMoveEnd(event) {
-  const url = event.item.getAttribute('data-move-url');
-  const id = Number(event.item.getAttribute('data-issue-id'));
-  $.ajax({
-    url,
-    data: JSON.stringify({id, position: event.newIndex + 1}),
+function pinMoveEnd(e) {
+  const url = e.item.getAttribute('data-move-url');
+  const id = Number(e.item.getAttribute('data-issue-id'));
+  fetch(url, {
+    method: 'post',
+    body: JSON.stringify({id, position: e.newIndex + 1}),
     headers: {
       'X-Csrf-Token': window.config.csrfToken,
+      'Content-Type': 'application/json',
     },
-    contentType: 'application/json',
-    type: 'POST',
-    error: (xhr) => {
-      throw new Error(xhr.responseText);
-    }
   });
   initPinRemoveButton();
 }
@@ -167,27 +162,21 @@ function pinMoveEnd(event) {
 function initIssuePinSort() {
   const pinDiv = document.getElementById('issue-pin-div');
 
-  if (pinDiv === null) {
-    return;
-  }
+  if (pinDiv === null) return;
 
   // If the User is not a Repo Admin, we don't need to proceed
-  if (!pinDiv.hasAttribute('data-is-repo-admin')) {
-    return;
-  }
+  if (!pinDiv.hasAttribute('data-is-repo-admin')) return;
 
   initPinRemoveButton();
 
   // If only one issue pinned, we don't need to make this Sortable
-  if (pinDiv.children.length < 2) {
-    return;
-  }
+  if (pinDiv.children.length < 2) return;
 
   new Sortable(pinDiv, {
     group: 'shared',
     animation: 150,
     ghostClass: 'card-ghost',
-    onEnd: pinMoveEnd
+    onEnd: pinMoveEnd,
   });
 }
 

From 8c941789f9744c55ee6e333f272424a956b115d6 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 11:35:18 +0200
Subject: [PATCH 09/38] Add limit for pinned Issues

---
 custom/conf/app.example.ini                   |  2 +
 models/issues/issue.go                        | 17 ++++++
 modules/setting/repository.go                 |  3 ++
 modules/structs/repo.go                       |  6 +++
 options/locale/locale_en-US.ini               |  1 +
 routers/api/v1/api.go                         |  1 +
 routers/api/v1/repo/issue_pin.go              | 39 ++++++++++++++
 routers/api/v1/swagger/repo.go                |  7 +++
 routers/web/repo/issue.go                     | 12 +++++
 .../repo/issue/view_content/sidebar.tmpl      |  4 +-
 templates/swagger/v1_json.tmpl                | 54 +++++++++++++++++++
 11 files changed, 144 insertions(+), 2 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index f22d555704bc0..8d876519d60ba 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1070,6 +1070,8 @@ ROUTER = console
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; List of reasons why a Pull Request or Issue can be locked
 ;LOCK_REASONS = Too heated,Off-topic,Resolved,Spam
+;; Maximum number of pinned Issues
+;MaxPinned = 6
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/models/issues/issue.go b/models/issues/issue.go
index afca81adb55f7..32b77840df8a5 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -24,6 +24,7 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/references"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
@@ -2527,6 +2528,11 @@ func (issue *Issue) Pin() error {
 		return err
 	}
 
+	// Check if the maximum allowed Pins reached
+	if maxPin >= setting.Repository.Issue.MaxPinned {
+		return fmt.Errorf("You have reached the max number of pinned Issues")
+	}
+
 	_, err = db.GetEngine(db.DefaultContext).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
@@ -2639,3 +2645,14 @@ func GetPinnedIssues(repoID int64, isPull bool) ([]*Issue, error) {
 
 	return issues, nil
 }
+
+// IsNewPinnedAllowed returns if a new Issue or Pull request can be pinned
+func IsNewPinAllowed(repoID int64, isPull bool) (bool, error) {
+	var maxPin int
+	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", repoID, isPull).Get(&maxPin)
+	if err != nil {
+		return false, err
+	}
+
+	return maxPin < setting.Repository.Issue.MaxPinned, nil
+}
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index 20ed6d0dcd559..8c5821dc2b439 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -89,6 +89,7 @@ var (
 		// Issue Setting
 		Issue struct {
 			LockReasons []string
+			MaxPinned   int
 		} `ini:"repository.issue"`
 
 		Release struct {
@@ -226,8 +227,10 @@ var (
 		// Issue settings
 		Issue: struct {
 			LockReasons []string
+			MaxPinned   int
 		}{
 			LockReasons: strings.Split("Too heated,Off-topic,Spam,Resolved", ","),
+			MaxPinned:   6,
 		},
 
 		Release: struct {
diff --git a/modules/structs/repo.go b/modules/structs/repo.go
index 259c230571573..d619ae3975705 100644
--- a/modules/structs/repo.go
+++ b/modules/structs/repo.go
@@ -368,3 +368,9 @@ type RepoTransfer struct {
 	Recipient *User   `json:"recipient"`
 	Teams     []*Team `json:"teams"`
 }
+
+// NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed
+type NewIssuePinsAllowed struct {
+	Issues       bool `json:"issues"`
+	PullRequests bool `json:"pull_requests"`
+}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index c1275efea0eaa..58291c6072581 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1470,6 +1470,7 @@ issues.attachment.download = `Click to download "%s"`
 issues.subscribe = Subscribe
 issues.unsubscribe = Unsubscribe
 issues.unpin_issue = Unpin Issue
+issues.max_pinned = "You can't pin more issues"
 issues.lock = Lock conversation
 issues.unlock = Unlock conversation
 issues.lock.unknown_reason = Cannot lock an issue with an unknown reason.
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index bf86cf7af617b..b3fc428f3251b 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1192,6 +1192,7 @@ func Routes(ctx gocontext.Context) *web.Route {
 				m.Get("/issue_config/validate", context.ReferencesGitRepo(), repo.ValidateIssueConfig)
 				m.Get("/languages", reqRepoReader(unit.TypeCode), repo.GetLanguages)
 				m.Get("/activities/feeds", repo.ListRepoActivityFeeds)
+				m.Get("/new_pin_allowed", repo.AreNewIssuePinsAllowed)
 			}, repoAssignment())
 		})
 
diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
index 841a8597e1958..d669bc8c7ce4c 100644
--- a/routers/api/v1/repo/issue_pin.go
+++ b/routers/api/v1/repo/issue_pin.go
@@ -248,3 +248,42 @@ func ListPinnedPullRequests(ctx *context.APIContext) {
 
 	ctx.JSON(http.StatusOK, &apiPrs)
 }
+
+// AreNewIssuePinsAllowed returns if new issues pins are allowed
+func AreNewIssuePinsAllowed(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/new_pin_allowed repository repoNewPinAllowed
+	// ---
+	// summary: Returns if new Issue Pins are allowed
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/RepoNewIssuePinsAllowed"
+	pinsAllowed := api.NewIssuePinsAllowed{}
+	var err error
+
+	pinsAllowed.Issues, err = issues_model.IsNewPinAllowed(ctx.Repo.Repository.ID, false)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "IsNewIssuePinAllowed", err)
+		return
+	}
+
+	pinsAllowed.PullRequests, err = issues_model.IsNewPinAllowed(ctx.Repo.Repository.ID, true)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "IsNewPullRequestPinAllowed", err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, pinsAllowed)
+}
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index e0418e99dc44f..10056ac8cbb89 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -400,3 +400,10 @@ type swaggerRepoIssueConfigValidation struct {
 	// in:body
 	Body api.IssueConfigValidation `json:"body"`
 }
+
+// RepoNewIssuePinsAllowed
+// swagger:response RepoNewIssuePinsAllowed
+type swaggerRepoNewIssuePinsAllowed struct {
+	// in:body
+	Body api.NewIssuePinsAllowed `json:"body"`
+}
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index f189fe3930138..31d60c6f15f4a 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -1858,6 +1858,17 @@ func ViewIssue(ctx *context.Context) {
 		return
 	}
 
+	var pinAllowed bool
+	if !issue.IsPinned() {
+		pinAllowed, err = issues_model.IsNewPinAllowed(issue.RepoID, issue.IsPull)
+		if err != nil {
+			ctx.ServerError("IsNewPinAllowed", err)
+			return
+		}
+	} else {
+		pinAllowed = true
+	}
+
 	ctx.Data["Participants"] = participants
 	ctx.Data["NumParticipants"] = len(participants)
 	ctx.Data["Issue"] = issue
@@ -1869,6 +1880,7 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin)
 	ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons
 	ctx.Data["RefEndName"] = git.RefEndName(issue.Ref)
+	ctx.Data["NewPinAllowed"] = pinAllowed
 
 	var hiddenCommentTypes *big.Int
 	if ctx.IsSigned {
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 41a016aa85c67..cad4f2398ead2 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -544,9 +544,9 @@
 			{{if not .Repository.IsArchived}}
 				<div class="ui watching">
 					<div class="gt-mt-3">
-						<form method="POST" action="{{.Issue.Link}}/pin">
+						<form method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
 							{{$.CsrfTokenHtml}}
-							<button class="fluid ui button gt-df gt-jc">
+							<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">
 								{{svg "octicon-pin" 16 "gt-mr-3"}}
 								{{if not .Issue.IsPinned}}
 									{{.locale.Tr "pin"}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index e35f4756b6d1c..9b24b9757400d 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -9100,6 +9100,39 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/new_pin_allowed": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Returns if new Issue Pins are allowed",
+        "operationId": "repoNewPinAllowed",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/RepoNewIssuePinsAllowed"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/notifications": {
       "get": {
         "consumes": [
@@ -19321,6 +19354,21 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "NewIssuePinsAllowed": {
+      "description": "NewIssuePinsAllowed represents an API response that says if new Issue Pins are allowed",
+      "type": "object",
+      "properties": {
+        "issues": {
+          "type": "boolean",
+          "x-go-name": "Issues"
+        },
+        "pull_requests": {
+          "type": "boolean",
+          "x-go-name": "PullRequests"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "NodeInfo": {
       "description": "NodeInfo contains standardized way of exposing metadata about a server running one of the distributed social networks",
       "type": "object",
@@ -22253,6 +22301,12 @@
         "$ref": "#/definitions/IssueConfigValidation"
       }
     },
+    "RepoNewIssuePinsAllowed": {
+      "description": "RepoNewIssuePinsAllowed",
+      "schema": {
+        "$ref": "#/definitions/NewIssuePinsAllowed"
+      }
+    },
     "Repository": {
       "description": "Repository",
       "schema": {

From 023820f4f557e10ae46ae202bb33d86f9a1ad805 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 12:14:21 +0200
Subject: [PATCH 10/38] Add pin and unpin events to history

---
 models/issues/comment.go                      |  4 ++
 models/issues/issue.go                        | 40 ++++++++++++++-----
 options/locale/locale_en-US.ini               |  2 +
 routers/api/v1/repo/issue_pin.go              |  4 +-
 routers/web/repo/issue_pin.go                 |  4 +-
 .../repo/issue/view_content/comments.tmpl     | 13 +++++-
 6 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/models/issues/comment.go b/models/issues/comment.go
index c7e815c8b6fca..f43ba18db881b 100644
--- a/models/issues/comment.go
+++ b/models/issues/comment.go
@@ -107,6 +107,8 @@ const (
 	CommentTypePRScheduledToAutoMerge   // 34 pr was scheduled to auto merge when checks succeed
 	CommentTypePRUnScheduledToAutoMerge // 35 pr was un scheduled to auto merge when checks succeed
 
+	CommentTypePin   // 36 pin Issue
+	CommentTypeUnpin // 37 unpin Issue
 )
 
 var commentStrings = []string{
@@ -146,6 +148,8 @@ var commentStrings = []string{
 	"change_issue_ref",
 	"pull_scheduled_merge",
 	"pull_cancel_scheduled_merge",
+	"pin",
+	"unpin",
 }
 
 func (t CommentType) String() string {
diff --git a/models/issues/issue.go b/models/issues/issue.go
index 32b77840df8a5..dfe01b95c2c13 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -2516,14 +2516,14 @@ func (issue *Issue) IsPinned() bool {
 }
 
 // Pin pins a Issue
-func (issue *Issue) Pin() error {
+func (issue *Issue) Pin(ctx context.Context, user *user_model.User) error {
 	// If the Issue is already pinned, we don't need to pin it twice
 	if issue.IsPinned() {
 		return nil
 	}
 
 	var maxPin int
-	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+	_, err := db.GetEngine(ctx).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
 	if err != nil {
 		return err
 	}
@@ -2533,44 +2533,66 @@ func (issue *Issue) Pin() error {
 		return fmt.Errorf("You have reached the max number of pinned Issues")
 	}
 
-	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+	_, err = db.GetEngine(ctx).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
 			"pin_order": maxPin + 1,
 		})
 
+	// Add the pin event to the history
+	opts := &CreateCommentOptions{
+		Type:  CommentTypePin,
+		Doer:  user,
+		Repo:  issue.Repo,
+		Issue: issue,
+	}
+	if _, err = CreateComment(ctx, opts); err != nil {
+		return err
+	}
+
 	return err
 }
 
 // UnpinIssue unpins a Issue
-func (issue *Issue) Unpin() error {
+func (issue *Issue) Unpin(ctx context.Context, user *user_model.User) error {
 	// If the Issue is not pinned, we don't need to unpin it
 	if !issue.IsPinned() {
 		return nil
 	}
 
 	// This sets the Pin for all Issues that come after the unpined Issue to the correct value
-	_, err := db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
+	_, err := db.GetEngine(ctx).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {
 		return err
 	}
 
-	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+	_, err = db.GetEngine(ctx).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
 			"pin_order": 0,
 		})
 
+	// Add the unpin event to the history
+	opts := &CreateCommentOptions{
+		Type:  CommentTypeUnpin,
+		Doer:  user,
+		Repo:  issue.Repo,
+		Issue: issue,
+	}
+	if _, err = CreateComment(ctx, opts); err != nil {
+		return err
+	}
+
 	return err
 }
 
 // PinOrUnpin pins or unpins a Issue
-func (issue *Issue) PinOrUnpin() error {
+func (issue *Issue) PinOrUnpin(ctx context.Context, user *user_model.User) error {
 	if !issue.IsPinned() {
-		return issue.Pin()
+		return issue.Pin(ctx, user)
 	}
 
-	return issue.Unpin()
+	return issue.Unpin(ctx, user)
 }
 
 // MovePin moves a Pinned Issue to a new Position
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 58291c6072581..be1a761e0c71c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1471,6 +1471,8 @@ issues.subscribe = Subscribe
 issues.unsubscribe = Unsubscribe
 issues.unpin_issue = Unpin Issue
 issues.max_pinned = "You can't pin more issues"
+issues.pin_comment = "pinned this %s"
+issues.unpin_comment = "unpinned this %s"
 issues.lock = Lock conversation
 issues.unlock = Unlock conversation
 issues.lock.unknown_reason = Cannot lock an issue with an unknown reason.
diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
index d669bc8c7ce4c..ab6b5eb1ae109 100644
--- a/routers/api/v1/repo/issue_pin.go
+++ b/routers/api/v1/repo/issue_pin.go
@@ -51,7 +51,7 @@ func PinIssue(ctx *context.APIContext) {
 		return
 	}
 
-	err = issue.Pin()
+	err = issue.Pin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "PinIssue", err)
 	}
@@ -98,7 +98,7 @@ func UnpinIssue(ctx *context.APIContext) {
 		return
 	}
 
-	err = issue.Unpin()
+	err = issue.Unpin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "UnpinIssue", err)
 	}
diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
index 1a51b79c820af..56b5890d8ecca 100644
--- a/routers/web/repo/issue_pin.go
+++ b/routers/web/repo/issue_pin.go
@@ -14,7 +14,7 @@ import (
 // IssuePinOrUnpin pin or unpin a Issue
 func IssuePinOrUnpin(ctx *context.Context) {
 	issue := GetActionIssue(ctx)
-	err := issue.PinOrUnpin()
+	err := issue.PinOrUnpin(ctx, ctx.ContextUser)
 	if err != nil {
 		ctx.ServerError("PinOrUnpinIssue", err)
 		return
@@ -30,7 +30,7 @@ func IssueUnpin(ctx *context.Context) {
 		ctx.JSON(http.StatusInternalServerError, err.Error())
 	}
 
-	err = issue.Unpin()
+	err = issue.Unpin(ctx, ctx.ContextUser)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err.Error())
 	}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 464f41be1a465..671e3ae2f398e 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -11,7 +11,8 @@
 		26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
 		29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
 		32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
-		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR -->
+		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR,
+		36 = Pin, 37 = Unpin -->
 		{{if eq .Type 0}}
 			<div class="timeline-item comment" id="{{.HashTag}}">
 			{{if .OriginalAuthor}}
@@ -819,6 +820,16 @@
 					{{else}}{{$.locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr | Safe}}{{end}}
 				</span>
 			</div>
+		{{else if or (eq .Type 36) (eq .Type 37)}}
+			<div class="timeline-item event" id="{{.HashTag}}">
+				<span class="badge">{{svg "octicon-pin" 16}}</span>
+				{{template "shared/user/avatarlink" dict "Context" $.Context "user" .Poster}}
+				<span class="text grey muted-links">
+					{{template "shared/user/authorlink" .Poster}}
+					{{if eq .Type 36}}{{$.locale.Tr "repo.issues.pin_comment" $createdStr | Safe}}
+					{{else}}{{$.locale.Tr "repo.issues.unpin_comment" $createdStr | Safe}}{{end}}
+				</span>
+			</div>
 		{{end}}
 	{{end}}
 {{end}}

From a31a96aad4544f58303a35287ace2c3a27b5a9ff Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 15:02:00 +0200
Subject: [PATCH 11/38] Fix backend lint

---
 models/issues/issue.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/models/issues/issue.go b/models/issues/issue.go
index dfe01b95c2c13..0006d7a9ae555 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -2538,6 +2538,9 @@ func (issue *Issue) Pin(ctx context.Context, user *user_model.User) error {
 		Update(map[string]interface{}{
 			"pin_order": maxPin + 1,
 		})
+	if err != nil {
+		return err
+	}
 
 	// Add the pin event to the history
 	opts := &CreateCommentOptions{
@@ -2550,7 +2553,7 @@ func (issue *Issue) Pin(ctx context.Context, user *user_model.User) error {
 		return err
 	}
 
-	return err
+	return nil
 }
 
 // UnpinIssue unpins a Issue
@@ -2571,6 +2574,9 @@ func (issue *Issue) Unpin(ctx context.Context, user *user_model.User) error {
 		Update(map[string]interface{}{
 			"pin_order": 0,
 		})
+	if err != nil {
+		return err
+	}
 
 	// Add the unpin event to the history
 	opts := &CreateCommentOptions{
@@ -2583,7 +2589,7 @@ func (issue *Issue) Unpin(ctx context.Context, user *user_model.User) error {
 		return err
 	}
 
-	return err
+	return nil
 }
 
 // PinOrUnpin pins or unpins a Issue

From c0ffcdb63b1b6fc38688aa07681235e0901b7fbd Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 15:16:32 +0200
Subject: [PATCH 12/38] Add Migration

---
 models/migrations/migrations.go |  2 ++
 models/migrations/v1_20/v256.go | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 models/migrations/v1_20/v256.go

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 1f1f43796cf4a..a17c2330181fb 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -489,6 +489,8 @@ var migrations = []Migration{
 	NewMigration("Add ActionTaskOutput table", v1_20.AddActionTaskOutputTable),
 	// v255 -> v256
 	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
+	// v256 -> 257
+	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 }
 
 // GetCurrentDBVersion returns the current db version
diff --git a/models/migrations/v1_20/v256.go b/models/migrations/v1_20/v256.go
new file mode 100644
index 0000000000000..47174ce8051a9
--- /dev/null
+++ b/models/migrations/v1_20/v256.go
@@ -0,0 +1,16 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"xorm.io/xorm"
+)
+
+func AddPinOrderToIssue(x *xorm.Engine) error {
+	type Issue struct {
+		PinOrder int `xorm:"DEFAULT 0"`
+	}
+
+	return x.Sync(new(Issue))
+}

From f74d57355b2135b0029e0afc5d706cc012104f7b Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 2 May 2023 16:47:26 +0200
Subject: [PATCH 13/38] Add tests

---
 routers/api/v1/repo/issue_pin.go        |  12 ++
 tests/integration/api_issue_pin_test.go | 205 ++++++++++++++++++++++++
 2 files changed, 217 insertions(+)
 create mode 100644 tests/integration/api_issue_pin_test.go

diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
index ab6b5eb1ae109..5570a3a9f93ff 100644
--- a/routers/api/v1/repo/issue_pin.go
+++ b/routers/api/v1/repo/issue_pin.go
@@ -51,6 +51,12 @@ func PinIssue(ctx *context.APIContext) {
 		return
 	}
 
+	// If we don't do this, it will crash when trying to add the pin event to the comment history
+	err = issue.LoadRepo(ctx)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "LoadRepo", err)
+	}
+
 	err = issue.Pin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "PinIssue", err)
@@ -98,6 +104,12 @@ func UnpinIssue(ctx *context.APIContext) {
 		return
 	}
 
+	// If we don't do this, it will crash when trying to add the unpin event to the comment history
+	err = issue.LoadRepo(ctx)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "LoadRepo", err)
+	}
+
 	err = issue.Unpin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "UnpinIssue", err)
diff --git a/tests/integration/api_issue_pin_test.go b/tests/integration/api_issue_pin_test.go
new file mode 100644
index 0000000000000..65be1d74f2d33
--- /dev/null
+++ b/tests/integration/api_issue_pin_test.go
@@ -0,0 +1,205 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package integration
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+
+	auth_model "code.gitea.io/gitea/models/auth"
+	issues_model "code.gitea.io/gitea/models/issues"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unittest"
+	user_model "code.gitea.io/gitea/models/user"
+	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/tests"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAPIPinIssue(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	assert.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	session := loginUser(t, owner.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo)
+
+	// Pin the Issue
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req := NewRequest(t, "POST", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the Issue is pinned
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var issueAPI api.Issue
+	DecodeJSON(t, resp, &issueAPI)
+	assert.Equal(t, 1, issueAPI.PinOrder)
+}
+
+func TestAPIUnpinIssue(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	assert.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	session := loginUser(t, owner.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo)
+
+	// Pin the Issue
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req := NewRequest(t, "POST", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the Issue is pinned
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var issueAPI api.Issue
+	DecodeJSON(t, resp, &issueAPI)
+	assert.Equal(t, 1, issueAPI.PinOrder)
+
+	// Unpin the Issue
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req = NewRequest(t, "DELETE", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the Issue is no longer pinned
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp = MakeRequest(t, req, http.StatusOK)
+	DecodeJSON(t, resp, &issueAPI)
+	assert.Equal(t, 0, issueAPI.PinOrder)
+}
+
+func TestAPIMoveIssuePin(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	assert.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	issue2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2, RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	session := loginUser(t, owner.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo)
+
+	// Pin the first Issue
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req := NewRequest(t, "POST", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the first Issue is pinned at position 1
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var issueAPI api.Issue
+	DecodeJSON(t, resp, &issueAPI)
+	assert.Equal(t, 1, issueAPI.PinOrder)
+
+	// Pin the second Issue
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue2.Index, token)
+	req = NewRequest(t, "POST", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Move the first Issue to position 2
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin/2?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req = NewRequest(t, "PATCH", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the first Issue is pinned at position 2
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp = MakeRequest(t, req, http.StatusOK)
+	var issueAPI3 api.Issue
+	DecodeJSON(t, resp, &issueAPI3)
+	assert.Equal(t, 2, issueAPI3.PinOrder)
+
+	// Check if the second Issue is pinned at position 1
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d", repo.OwnerName, repo.Name, issue2.Index)
+	req = NewRequest(t, "GET", urlStr)
+	resp = MakeRequest(t, req, http.StatusOK)
+	var issueAPI4 api.Issue
+	DecodeJSON(t, resp, &issueAPI4)
+	assert.Equal(t, 1, issueAPI4.PinOrder)
+}
+
+func TestAPIListPinnedIssues(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	assert.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{RepoID: repo.ID})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	session := loginUser(t, owner.Name)
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeRepo)
+
+	// Pin the Issue
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/pin?token=%s",
+		repo.OwnerName, repo.Name, issue.Index, token)
+	req := NewRequest(t, "POST", urlStr)
+	MakeRequest(t, req, http.StatusNoContent)
+
+	// Check if the Issue is in the List
+	urlStr = fmt.Sprintf("/api/v1/repos/%s/%s/issues/pinned", repo.OwnerName, repo.Name)
+	req = NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var issueList []api.Issue
+	DecodeJSON(t, resp, &issueList)
+
+	assert.Equal(t, 1, len(issueList))
+	assert.Equal(t, issue.ID, issueList[0].ID)
+}
+
+func TestAPIListPinnedPullrequests(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	assert.NoError(t, unittest.LoadFixtures())
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/pinned", repo.OwnerName, repo.Name)
+	req := NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+	var prList []api.PullRequest
+	DecodeJSON(t, resp, &prList)
+
+	assert.Equal(t, 0, len(prList))
+}
+
+func TestAPINewPinAllowed(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+	owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID})
+
+	urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/new_pin_allowed", owner.Name, repo.Name)
+	req := NewRequest(t, "GET", urlStr)
+	resp := MakeRequest(t, req, http.StatusOK)
+
+	var newPinsAllowed api.NewIssuePinsAllowed
+	DecodeJSON(t, resp, &newPinsAllowed)
+
+	assert.True(t, newPinsAllowed.Issues)
+	assert.True(t, newPinsAllowed.PullRequests)
+}

From 034c8a64e1b68d08074cdba7e2899f87a961edf9 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Wed, 3 May 2023 18:10:19 +0200
Subject: [PATCH 14/38] Rename v256.go to v257.go

---
 models/migrations/v1_20/{v256.go => v257.go} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename models/migrations/v1_20/{v256.go => v257.go} (100%)

diff --git a/models/migrations/v1_20/v256.go b/models/migrations/v1_20/v257.go
similarity index 100%
rename from models/migrations/v1_20/v256.go
rename to models/migrations/v1_20/v257.go

From 0d1ccaa98fa95fdb3b8187d66805451cfd7b605b Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Wed, 3 May 2023 18:16:44 +0200
Subject: [PATCH 15/38] Do requested changes

---
 custom/conf/app.example.ini            |  2 +-
 routers/web/repo/issue_pin.go          | 18 +++++++++++++++++-
 web_src/js/features/repo-issue-list.js |  1 -
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 6eb77e7f072f0..6e8e0bf0b6b49 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1071,7 +1071,7 @@ ROUTER = console
 ;; List of reasons why a Pull Request or Issue can be locked
 ;LOCK_REASONS = Too heated,Off-topic,Resolved,Spam
 ;; Maximum number of pinned Issues
-;MaxPinned = 6
+;MAX_PINNED = 6
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
index 56b5890d8ecca..bba4885a3b46b 100644
--- a/routers/web/repo/issue_pin.go
+++ b/routers/web/repo/issue_pin.go
@@ -14,7 +14,15 @@ import (
 // IssuePinOrUnpin pin or unpin a Issue
 func IssuePinOrUnpin(ctx *context.Context) {
 	issue := GetActionIssue(ctx)
-	err := issue.PinOrUnpin(ctx, ctx.ContextUser)
+
+	// If we don't do this, it will crash when trying to add the pin event to the comment history
+	err := issue.LoadRepo(ctx)
+	if err != nil {
+		ctx.ServerError("LoadRepo", err)
+		return
+	}
+
+	err = issue.PinOrUnpin(ctx, ctx.ContextUser)
 	if err != nil {
 		ctx.ServerError("PinOrUnpinIssue", err)
 		return
@@ -28,6 +36,14 @@ func IssueUnpin(ctx *context.Context) {
 	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	// If we don't do this, it will crash when trying to add the pin event to the comment history
+	err = issue.LoadRepo(ctx)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err.Error())
+		return
 	}
 
 	err = issue.Unpin(ctx, ctx.ContextUser)
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index b371dde1842bc..fb252796708d9 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -156,7 +156,6 @@ function pinMoveEnd(e) {
       'Content-Type': 'application/json',
     },
   });
-  initPinRemoveButton();
 }
 
 function initIssuePinSort() {

From 1704b6f8141e3943fe137b1f9533dab31fea04de Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 8 May 2023 08:44:27 +0200
Subject: [PATCH 16/38] Changes requested by  wxiaoguang

---
 models/migrations/migrations.go        |  6 +++---
 web_src/js/features/repo-issue-list.js | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 05c12e9c13eaf..2d7488641082c 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -489,10 +489,10 @@ var migrations = []Migration{
 	NewMigration("Add ActionTaskOutput table", v1_20.AddActionTaskOutputTable),
 	// v255 -> v256
 	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
-	// v256 -> 257
-	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
-	// v257 -> v258
+	// v256 -> v257
 	NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
+	// v257 -> 258
+	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 }
 
 // GetCurrentDBVersion returns the current db version
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index fb252796708d9..7e94ad52b22a8 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -122,33 +122,32 @@ function initRepoIssueListAuthorDropdown() {
 
 function initPinRemoveButton() {
   for (const button of document.getElementsByName('issue-unpin-button')) {
-    button.addEventListener('click', (event) => {
+    button.addEventListener('click', async (event) => {
       const el = event.currentTarget;
       const id = Number(el.getAttribute('data-issue-id'));
 
       // Send the unpin request
-      fetch(el.getAttribute('data-unpin-url'), {
+      const response = await fetch(el.getAttribute('data-unpin-url'), {
         method: 'delete',
         headers: {
           'X-Csrf-Token': window.config.csrfToken,
           'Content-Type': 'application/json',
         },
-      }).then((response) => {
-        if (response.ok) {
-          // Delete the tooltip
-          el._tippy.destroy();
-          // Remove the Card
-          document.querySelector(`div[data-issue-id="${id}"]`).remove();
-        }
       });
+      if (response.ok) {
+        // Delete the tooltip
+        el._tippy.destroy();
+        // Remove the Card
+        el.closest(`div[data-issue-id="${id}"]`).remove();
+      }
     });
   }
 }
 
-function pinMoveEnd(e) {
+async function pinMoveEnd(e) {
   const url = e.item.getAttribute('data-move-url');
   const id = Number(e.item.getAttribute('data-issue-id'));
-  fetch(url, {
+  await fetch(url, {
     method: 'post',
     body: JSON.stringify({id, position: e.newIndex + 1}),
     headers: {

From 4735026b59de3d60d526ae708edd8a1a99d8f37d Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 8 May 2023 08:51:24 +0200
Subject: [PATCH 17/38] Unpin Issue before deletion

---
 services/issue/issue.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/issue/issue.go b/services/issue/issue.go
index d4f827e99af56..06da47152c7d0 100644
--- a/services/issue/issue.go
+++ b/services/issue/issue.go
@@ -153,6 +153,13 @@ func DeleteIssue(ctx context.Context, doer *user_model.User, gitRepo *git.Reposi
 		}
 	}
 
+	// If the Issue is pinned, we should unpin it before deletion to avoid problems with other pinned Issues
+	if issue.IsPinned() {
+		if err := issue.Unpin(ctx, doer); err != nil {
+			return err
+		}
+	}
+
 	notification.NotifyDeleteIssue(ctx, doer, issue)
 
 	return nil

From 8f25b3ad8292f45b26690dc081eb82caa0772a6f Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Tue, 9 May 2023 08:44:21 +0200
Subject: [PATCH 18/38] Change Layout

---
 templates/repo/issue/list.tmpl         | 28 ++++++++++++++++----------
 web_src/css/repository.css             |  5 +----
 web_src/js/features/repo-issue-list.js |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 0b8b702e09c19..5a9c0ffaa8724 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -16,17 +16,23 @@
 					{{end}}
 					<div class="content gt-p-0">
 						<div class="header">
-							<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}">
-								{{template "shared/issueicon" .}}
-							</span>
-							<a class="pinned-issue-title gt-vm" href="{{.Link}}">
-								{{.Title}}
-							</a>
-							{{if $.IsRepoAdmin}}
-								<span name="issue-unpin-button" class="pinned-issue-unpin-icon" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
-									{{svg "octicon-x" 16 "gt-mr-3"}}
-								</span>
-							{{end}}
+							<div class="gt-df gt-ac">
+								<div class="gt-df gt-ac gt-f1">
+									<div class="gt-ellipsis">
+										<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}">
+											{{template "shared/issueicon" .}}
+										</span>
+										<a class="pinned-issue-title" href="{{.Link}}">
+											{{.Title}}
+										</a>
+									</div>
+								</div>
+								{{if $.IsRepoAdmin}}
+									<div name="issue-unpin-button" class="gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
+										{{svg "octicon-x" 16 "gt-mr-3"}}
+									</div>
+								{{end}}
+							</div>
 						</div>
 						<div class="meta gt-my-2">
 							<span class="text light grey">
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index c36fbf156afb1..cf17d98e783d3 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3431,8 +3431,5 @@ td.blob-excerpt {
 
 .pinned-issue-title {
   word-break: break-word;
-}
-
-.pinned-issue-unpin-icon {
-  float: right;
+  vertical-align: middle;
 }
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index 7e94ad52b22a8..2d4301b30fd8f 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -138,7 +138,7 @@ function initPinRemoveButton() {
         // Delete the tooltip
         el._tippy.destroy();
         // Remove the Card
-        el.closest(`div[data-issue-id="${id}"]`).remove();
+        el.closest(`div.pinned-issue-card[data-issue-id="${id}"]`).remove();
       }
     });
   }

From 9afc05e6f1b6fa6087940e4da25363a23965c3b9 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 9 May 2023 22:40:30 +0200
Subject: [PATCH 19/38] issue sidebar button fixes

---
 .../repo/issue/view_content/sidebar.tmpl      | 48 ++++++++-----------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index c0cb0c7787b69..c4d1e4f2a19da 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -542,34 +542,28 @@
 			<div class="ui divider"></div>
 
 			{{if not .Repository.IsArchived}}
-				<div class="ui watching">
-					<div class="gt-mt-3">
-						<form method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
-							{{$.CsrfTokenHtml}}
-							<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">
-								{{svg "octicon-pin" 16 "gt-mr-3"}}
-								{{if not .Issue.IsPinned}}
-									{{.locale.Tr "pin"}}
-								{{else}}
-									{{.locale.Tr "unpin"}}
-								{{end}}
-							</button>
-						</form>
-					</div>
-				</div>
+				<form class="gt-mt-2" method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
+					{{$.CsrfTokenHtml}}
+					<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">
+						{{svg "octicon-pin" 16 "gt-mr-3"}}
+						{{if not .Issue.IsPinned}}
+							{{.locale.Tr "pin"}}
+						{{else}}
+							{{.locale.Tr "unpin"}}
+						{{end}}
+					</button>
+				</form>
 			{{end}}
 
-			<div class="ui watching">
-				<button class="fluid ui show-modal button {{if .Issue.IsLocked}} negative {{end}}" data-modal="#lock">
-					{{if .Issue.IsLocked}}
-						{{svg "octicon-key"}}
-						{{.locale.Tr "repo.issues.unlock"}}
-					{{else}}
-						{{svg "octicon-lock"}}
-						{{.locale.Tr "repo.issues.lock"}}
-					{{end}}
-				</button>
-			</div>
+			<button class="gt-mt-2 fluid ui show-modal button {{if .Issue.IsLocked}} negative {{end}}" data-modal="#lock">
+				{{if .Issue.IsLocked}}
+					{{svg "octicon-key"}}
+					{{.locale.Tr "repo.issues.unlock"}}
+				{{else}}
+					{{svg "octicon-lock"}}
+					{{.locale.Tr "repo.issues.lock"}}
+				{{end}}
+			</button>
 			<div class="ui tiny modal" id="lock">
 				<div class="header">
 					{{if .Issue.IsLocked}}
@@ -634,7 +628,7 @@
 					</form>
 				</div>
 			</div>
-			<button class="fluid ui show-modal button negative gt-mt-3" data-modal="#delete">
+			<button class="gt-mt-2 fluid ui show-modal button negative" data-modal="#delete">
 				{{svg "octicon-trash"}}
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>

From 688ace168634c32e137a8632c1acd0336a6b8d05 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 9 May 2023 23:20:04 +0200
Subject: [PATCH 20/38] various display and html layout tweaks

---
 templates/repo/issue/list.tmpl         | 30 ++++++++-------------
 web_src/css/repository.css             | 37 +++++++++++++++-----------
 web_src/js/features/repo-issue-list.js |  4 +--
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 5a9c0ffaa8724..8c7c7f2d01ba0 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -4,9 +4,9 @@
 	<div class="ui container">
 
 	{{if .PinnedIssues}}
-		<div id="issue-pin-div" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}>
+		<div id="issue-pins" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}>
 			{{range .PinnedIssues}}
-				<div class="card pinned-issue-card" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
+				<div class="pinned-issue-card gt-word-break" data-move-url="{{$.Link}}/pin_move" data-issue-id="{{.ID}}">
 					{{if eq $.Project.CardType 1}}
 						<div class="card-attachment-images">
 							{{range (index $.issuesAttachmentMap .ID)}}
@@ -15,24 +15,16 @@
 						</div>
 					{{end}}
 					<div class="content gt-p-0">
-						<div class="header">
-							<div class="gt-df gt-ac">
-								<div class="gt-df gt-ac gt-f1">
-									<div class="gt-ellipsis">
-										<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}">
-											{{template "shared/issueicon" .}}
-										</span>
-										<a class="pinned-issue-title" href="{{.Link}}">
-											{{.Title}}
-										</a>
-									</div>
-								</div>
-								{{if $.IsRepoAdmin}}
-									<div name="issue-unpin-button" class="gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
-										{{svg "octicon-x" 16 "gt-mr-3"}}
-									</div>
-								{{end}}
+						<div class="header gt-df gt-items-start">
+							<div class="pinned-issue-icon">
+								{{template "shared/issueicon" .}}
 							</div>
+							<a class="pinned-issue-title muted" href="{{.Link}}">{{.Title}}</a>
+							{{if $.IsRepoAdmin}}
+								<a role="button" class="pinned-issue-unpin muted gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
+									{{svg "octicon-x" 16}}
+								</a>
+							{{end}}
 						</div>
 						<div class="meta gt-my-2">
 							<span class="text light grey">
diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index cf17d98e783d3..fb84a096ca3fe 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3411,25 +3411,32 @@ td.blob-excerpt {
   color: var(--color-text-light-2);
 }
 
-#issue-pin-div {
-  display: flex;
-  flex-grow: 1;
-  flex-wrap: wrap;
+#issue-pins {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 8px;
+  margin-bottom: 8px;
 }
 
 .pinned-issue-card {
-  margin: 4px 2px !important;
-  border-radius: 5px !important;
-  width: calc(100% - 4px) !important;
-  padding: 0.5rem !important;
-  min-height: auto !important;
-  max-width: calc(100% * (1/3) - 10px - 1px);
-  border-style: solid;
-  border-color: var(--color-input-border);
-  border-width: 1px;
+  border-radius: var(--border-radius);
+  padding: 7px 12px;
+  border: 1px solid var(--color-secondary);
+  background: var(--color-card);
+}
+
+.pinned-issue-card .meta a {
+  color: inherit;
+}
+
+.pinned-issue-icon,
+.pinned-issue-unpin {
+  margin-top: 1px;
+  flex-shrink: 0;
 }
 
 .pinned-issue-title {
-  word-break: break-word;
-  vertical-align: middle;
+  flex: 1;
+  font-size: 18px;
+  margin-left: 4px;
 }
diff --git a/web_src/js/features/repo-issue-list.js b/web_src/js/features/repo-issue-list.js
index 2d4301b30fd8f..cc50ec5f88178 100644
--- a/web_src/js/features/repo-issue-list.js
+++ b/web_src/js/features/repo-issue-list.js
@@ -121,7 +121,7 @@ function initRepoIssueListAuthorDropdown() {
 }
 
 function initPinRemoveButton() {
-  for (const button of document.getElementsByName('issue-unpin-button')) {
+  for (const button of document.getElementsByClassName('pinned-issue-unpin')) {
     button.addEventListener('click', async (event) => {
       const el = event.currentTarget;
       const id = Number(el.getAttribute('data-issue-id'));
@@ -158,7 +158,7 @@ async function pinMoveEnd(e) {
 }
 
 function initIssuePinSort() {
-  const pinDiv = document.getElementById('issue-pin-div');
+  const pinDiv = document.getElementById('issue-pins');
 
   if (pinDiv === null) return;
 

From 61a2dc1d38c9498aea775d2d4192d2037136c141 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 9 May 2023 23:36:09 +0200
Subject: [PATCH 21/38] misc fixes

---
 web_src/css/repository.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web_src/css/repository.css b/web_src/css/repository.css
index fb84a096ca3fe..68d5752c4be61 100644
--- a/web_src/css/repository.css
+++ b/web_src/css/repository.css
@@ -3420,7 +3420,7 @@ td.blob-excerpt {
 
 .pinned-issue-card {
   border-radius: var(--border-radius);
-  padding: 7px 12px;
+  padding: 8px 10px;
   border: 1px solid var(--color-secondary);
   background: var(--color-card);
 }
@@ -3429,6 +3429,10 @@ td.blob-excerpt {
   color: inherit;
 }
 
+.pinned-issue-card .meta a:hover {
+  color: var(--color-primary);
+}
+
 .pinned-issue-icon,
 .pinned-issue-unpin {
   margin-top: 1px;

From 59a569146dd5d59fda9d95f2dacac3216a6599c3 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 10 May 2023 15:09:47 +0200
Subject: [PATCH 22/38] Update templates/shared/issueicon.tmpl

---
 templates/shared/issueicon.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/shared/issueicon.tmpl b/templates/shared/issueicon.tmpl
index 5f6ac4673288e..7cfe5745db4ce 100644
--- a/templates/shared/issueicon.tmpl
+++ b/templates/shared/issueicon.tmpl
@@ -1,4 +1,3 @@
-
 {{if .IsPull}}
 	{{if .PullRequest.HasMerged}}
 		{{svg "octicon-git-merge" 16 "text purple"}}

From 706c6cc3571e1ce1ae058886d9aeeb3b8aeec6d3 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 12 May 2023 08:16:14 +0200
Subject: [PATCH 23/38] Do requested changes

---
 routers/web/repo/issue_pin.go                   | 4 ++--
 templates/repo/issue/view_content/comments.tmpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
index bba4885a3b46b..edd01c016263e 100644
--- a/routers/web/repo/issue_pin.go
+++ b/routers/web/repo/issue_pin.go
@@ -22,7 +22,7 @@ func IssuePinOrUnpin(ctx *context.Context) {
 		return
 	}
 
-	err = issue.PinOrUnpin(ctx, ctx.ContextUser)
+	err = issue.PinOrUnpin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.ServerError("PinOrUnpinIssue", err)
 		return
@@ -46,7 +46,7 @@ func IssueUnpin(ctx *context.Context) {
 		return
 	}
 
-	err = issue.Unpin(ctx, ctx.ContextUser)
+	err = issue.Unpin(ctx, ctx.Doer)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err.Error())
 	}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index 60762c930ae38..d95afe747232c 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -12,7 +12,7 @@
 		29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
 		32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
 		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR,
-		36 = Pin, 37 = Unpin -->
+		36 = PIN, 37 = UNPIN -->
 		{{if eq .Type 0}}
 			<div class="timeline-item comment" id="{{.HashTag}}">
 			{{if .OriginalAuthor}}

From 9d38fadda4ed3a5ae821f51de3ed6b73d77d14b6 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 12 May 2023 09:11:29 +0200
Subject: [PATCH 24/38] Use new Unpin Icon

---
 templates/repo/issue/view_content/sidebar.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index bad575c3083a8..6412f415132c8 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -535,10 +535,11 @@
 				<form class="gt-mt-2" method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
 					{{$.CsrfTokenHtml}}
 					<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">
-						{{svg "octicon-pin" 16 "gt-mr-3"}}
 						{{if not .Issue.IsPinned}}
+							{{svg "octicon-pin" 16 "gt-mr-3"}}
 							{{.locale.Tr "pin"}}
 						{{else}}
+							{{svg "octicon-pin-slash"}}
 							{{.locale.Tr "unpin"}}
 						{{end}}
 					</button>

From 03761ea44a579915ea53cccd1ee21297fe806265 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Fri, 12 May 2023 09:12:28 +0200
Subject: [PATCH 25/38] Fix Style of new Icon

---
 templates/repo/issue/view_content/sidebar.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 6412f415132c8..e77c91b61528b 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -539,7 +539,7 @@
 							{{svg "octicon-pin" 16 "gt-mr-3"}}
 							{{.locale.Tr "pin"}}
 						{{else}}
-							{{svg "octicon-pin-slash"}}
+							{{svg "octicon-pin-slash" 16 "gt-mr-3"}}
 							{{.locale.Tr "unpin"}}
 						{{end}}
 					</button>

From 20356cfd8ee79de898243e59ef6ca63cd3516c64 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 15 May 2023 10:32:11 +0200
Subject: [PATCH 26/38] Do requested changes

---
 custom/conf/app.example.ini                    | 1 +
 routers/web/repo/issue.go                      | 1 +
 templates/repo/issue/list.tmpl                 | 2 +-
 templates/repo/issue/view_content/sidebar.tmpl | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 6ad8fca64bb7b..7d7f97b62e19d 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1068,6 +1068,7 @@ ROUTER = console
 ;; List of reasons why a Pull Request or Issue can be locked
 ;LOCK_REASONS = Too heated,Off-topic,Resolved,Spam
 ;; Maximum number of pinned Issues
+;; Set to 0 to disable pinning Issues
 ;MAX_PINNED = 6
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index bdd95a11f11ef..774774457698b 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -1882,6 +1882,7 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons
 	ctx.Data["RefEndName"] = git.RefEndName(issue.Ref)
 	ctx.Data["NewPinAllowed"] = pinAllowed
+	ctx.Data["PinEnabled"] = setting.Repository.Issue.MaxPinned != 0
 
 	var hiddenCommentTypes *big.Int
 	if ctx.IsSigned {
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 2af062b733d48..55651716502cc 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -19,7 +19,7 @@
 							<div class="pinned-issue-icon">
 								{{template "shared/issueicon" .}}
 							</div>
-							<a class="pinned-issue-title muted" href="{{.Link}}">{{.Title}}</a>
+							<a class="pinned-issue-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji $.Context | RenderCodeBlock}}</a>
 							{{if $.IsRepoAdmin}}
 								<a role="button" class="pinned-issue-unpin muted gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.ID}}">
 									{{svg "octicon-x" 16}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index e77c91b61528b..15e7ff4c6f032 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -531,7 +531,7 @@
 		{{if and .IsRepoAdmin (not .Repository.IsArchived)}}
 			<div class="ui divider"></div>
 
-			{{if not .Repository.IsArchived}}
+			{{if .PinEnabled}}
 				<form class="gt-mt-2" method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
 					{{$.CsrfTokenHtml}}
 					<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">

From cac50e0b5af079cbc5b1f5900b3f6dba781f5c1d Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 10:03:14 +0200
Subject: [PATCH 27/38] Rename files for resolving conflicts

---
 models/migrations/migrations.go              | 2 +-
 models/migrations/v1_20/{v257.go => v258.go} | 0
 web_src/css/{repository.css => repo.css}     | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename models/migrations/v1_20/{v257.go => v258.go} (100%)
 rename web_src/css/{repository.css => repo.css} (100%)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 2d7488641082c..42a12e471648c 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -491,7 +491,7 @@ var migrations = []Migration{
 	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
 	// v256 -> v257
 	NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
-	// v257 -> 258
+	// v258 -> 259
 	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 }
 
diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v258.go
similarity index 100%
rename from models/migrations/v1_20/v257.go
rename to models/migrations/v1_20/v258.go
diff --git a/web_src/css/repository.css b/web_src/css/repo.css
similarity index 100%
rename from web_src/css/repository.css
rename to web_src/css/repo.css

From d5edde7bcb4c3d7f8baeda5457d23f21e7873b50 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 10:08:54 +0200
Subject: [PATCH 28/38] Fix misstage from resolving conflicts

---
 web_src/css/repo.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index aec992dc8e9e8..069bf014b8729 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -1990,6 +1990,11 @@
   padding-left: 26px;
 }
 
+.repository.settings.branches .branch-protection .status-check-matched-mark {
+  font-weight: var(--font-weight-semibold);
+  font-style: italic;
+}
+
 .repository.settings.webhook .events .column {
   padding-bottom: 0;
 }

From cd194a1218a355909555a50405bf3064a2b77852 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 10:37:49 +0200
Subject: [PATCH 29/38] Do requested changes

---
 models/issues/issue.go           | 32 ++++++++++++++++----------------
 models/migrations/migrations.go  |  2 +-
 routers/api/v1/repo/issue_pin.go | 10 +++++-----
 routers/web/repo/issue.go        |  4 ++--
 routers/web/repo/issue_pin.go    | 23 ++++++++++++++---------
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/models/issues/issue.go b/models/issues/issue.go
index 357ea42ae6d8f..26acceeb698ae 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -14,7 +14,6 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/references"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
@@ -780,7 +779,7 @@ func (issue *Issue) PinOrUnpin(ctx context.Context, user *user_model.User) error
 }
 
 // MovePin moves a Pinned Issue to a new Position
-func (issue *Issue) MovePin(newPosition int) error {
+func (issue *Issue) MovePin(ctx context.Context, newPosition int) error {
 	// If the Issue is not pinned, we can't move them
 	if !issue.IsPinned() {
 		return nil
@@ -790,13 +789,14 @@ func (issue *Issue) MovePin(newPosition int) error {
 		return fmt.Errorf("The Position can't be lower than 1")
 	}
 
-	var (
-		err    error
-		maxPin int
-	)
-
-	_, err = db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
+	dbctx, committer, err := db.TxContext(ctx)
+	if err != nil {
+		return err
+	}
+	defer committer.Close()
 
+	var maxPin int
+	_, err = db.GetEngine(dbctx).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", issue.RepoID, issue.IsPull).Get(&maxPin)
 	if err != nil {
 		return err
 	}
@@ -809,31 +809,31 @@ func (issue *Issue) MovePin(newPosition int) error {
 	// TODO: Run the following commands in a Transaction and Rollback, if one fails
 
 	// Lower the Position of all Pinned Issue that came after the current Position
-	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
+	_, err = db.GetEngine(dbctx).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {
 		return err
 	}
 
 	// Higher the Position of all Pinned Issues that comes after the new Position
-	_, err = db.GetEngine(db.DefaultContext).Exec("UPDATE issue SET pin_order = pin_order + 1 WHERE repo_id = ? AND is_pull = ? AND pin_order >= ?", issue.RepoID, issue.IsPull, newPosition)
+	_, err = db.GetEngine(dbctx).Exec("UPDATE issue SET pin_order = pin_order + 1 WHERE repo_id = ? AND is_pull = ? AND pin_order >= ?", issue.RepoID, issue.IsPull, newPosition)
 	if err != nil {
 		return err
 	}
 
-	_, err = db.GetEngine(db.DefaultContext).Table("issue").
+	_, err = db.GetEngine(dbctx).Table("issue").
 		Where("id = ?", issue.ID).
 		Update(map[string]interface{}{
 			"pin_order": newPosition,
 		})
 
-	return err
+	return committer.Commit()
 }
 
 // GetPinnedIssues returns the pinned Issues for the given Repo and type
-func GetPinnedIssues(repoID int64, isPull bool) ([]*Issue, error) {
+func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) ([]*Issue, error) {
 	issues := make([]*Issue, 0)
 
-	err := db.GetEngine(db.DefaultContext).
+	err := db.GetEngine(ctx).
 		Table("issue").
 		Where("repo_id = ?", repoID).
 		And("is_pull = ?", isPull).
@@ -853,9 +853,9 @@ func GetPinnedIssues(repoID int64, isPull bool) ([]*Issue, error) {
 }
 
 // IsNewPinnedAllowed returns if a new Issue or Pull request can be pinned
-func IsNewPinAllowed(repoID int64, isPull bool) (bool, error) {
+func IsNewPinAllowed(ctx context.Context, repoID int64, isPull bool) (bool, error) {
 	var maxPin int
-	_, err := db.GetEngine(db.DefaultContext).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", repoID, isPull).Get(&maxPin)
+	_, err := db.GetEngine(ctx).SQL("SELECT MAX(pin_order) FROM issue WHERE repo_id = ? AND is_pull = ?", repoID, isPull).Get(&maxPin)
 	if err != nil {
 		return false, err
 	}
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index dacb179013926..043afd0294486 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -495,7 +495,7 @@ var migrations = []Migration{
 	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 	// v257 -> v258
 	NewMigration("Add Actions Artifact table", v1_20.CreateActionArtifactTable),
-  // v258 -> 259
+	// v258 -> 259
 	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 }
 
diff --git a/routers/api/v1/repo/issue_pin.go b/routers/api/v1/repo/issue_pin.go
index 5570a3a9f93ff..c96ede45f51b4 100644
--- a/routers/api/v1/repo/issue_pin.go
+++ b/routers/api/v1/repo/issue_pin.go
@@ -163,7 +163,7 @@ func MoveIssuePin(ctx *context.APIContext) {
 		return
 	}
 
-	err = issue.MovePin(int(ctx.ParamsInt64(":position")))
+	err = issue.MovePin(ctx, int(ctx.ParamsInt64(":position")))
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "MovePin", err)
 	}
@@ -192,7 +192,7 @@ func ListPinnedIssues(ctx *context.APIContext) {
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/IssueList"
-	issues, err := issues_model.GetPinnedIssues(ctx.Repo.Repository.ID, false)
+	issues, err := issues_model.GetPinnedIssues(ctx, ctx.Repo.Repository.ID, false)
 
 	if err == nil {
 		ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
@@ -222,7 +222,7 @@ func ListPinnedPullRequests(ctx *context.APIContext) {
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/PullRequestList"
-	issues, err := issues_model.GetPinnedIssues(ctx.Repo.Repository.ID, true)
+	issues, err := issues_model.GetPinnedIssues(ctx, ctx.Repo.Repository.ID, true)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "LoadPinnedPullRequests", err)
 	}
@@ -285,13 +285,13 @@ func AreNewIssuePinsAllowed(ctx *context.APIContext) {
 	pinsAllowed := api.NewIssuePinsAllowed{}
 	var err error
 
-	pinsAllowed.Issues, err = issues_model.IsNewPinAllowed(ctx.Repo.Repository.ID, false)
+	pinsAllowed.Issues, err = issues_model.IsNewPinAllowed(ctx, ctx.Repo.Repository.ID, false)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "IsNewIssuePinAllowed", err)
 		return
 	}
 
-	pinsAllowed.PullRequests, err = issues_model.IsNewPinAllowed(ctx.Repo.Repository.ID, true)
+	pinsAllowed.PullRequests, err = issues_model.IsNewPinAllowed(ctx, ctx.Repo.Repository.ID, true)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "IsNewPullRequestPinAllowed", err)
 		return
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 78921a114c480..4a0c48f0273de 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -388,7 +388,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
 		return
 	}
 
-	pinned, err := issues_model.GetPinnedIssues(repo.ID, isPullOption.IsTrue())
+	pinned, err := issues_model.GetPinnedIssues(ctx, repo.ID, isPullOption.IsTrue())
 	if err != nil {
 		ctx.ServerError("GetPinnedIssues", err)
 		return
@@ -1864,7 +1864,7 @@ func ViewIssue(ctx *context.Context) {
 
 	var pinAllowed bool
 	if !issue.IsPinned() {
-		pinAllowed, err = issues_model.IsNewPinAllowed(issue.RepoID, issue.IsPull)
+		pinAllowed, err = issues_model.IsNewPinAllowed(ctx, issue.RepoID, issue.IsPull)
 		if err != nil {
 			ctx.ServerError("IsNewPinAllowed", err)
 			return
diff --git a/routers/web/repo/issue_pin.go b/routers/web/repo/issue_pin.go
index edd01c016263e..13f2d02fe8450 100644
--- a/routers/web/repo/issue_pin.go
+++ b/routers/web/repo/issue_pin.go
@@ -18,13 +18,13 @@ func IssuePinOrUnpin(ctx *context.Context) {
 	// If we don't do this, it will crash when trying to add the pin event to the comment history
 	err := issue.LoadRepo(ctx)
 	if err != nil {
-		ctx.ServerError("LoadRepo", err)
+		ctx.Status(http.StatusInternalServerError)
 		return
 	}
 
 	err = issue.PinOrUnpin(ctx, ctx.Doer)
 	if err != nil {
-		ctx.ServerError("PinOrUnpinIssue", err)
+		ctx.Status(http.StatusInternalServerError)
 		return
 	}
 
@@ -35,20 +35,20 @@ func IssuePinOrUnpin(ctx *context.Context) {
 func IssueUnpin(ctx *context.Context) {
 	issue, err := issues_model.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusNoContent)
 		return
 	}
 
 	// If we don't do this, it will crash when trying to add the pin event to the comment history
 	err = issue.LoadRepo(ctx)
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusInternalServerError)
 		return
 	}
 
 	err = issue.Unpin(ctx, ctx.Doer)
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusInternalServerError)
 	}
 
 	ctx.Status(http.StatusNoContent)
@@ -68,16 +68,21 @@ func IssuePinMove(ctx *context.Context) {
 
 	form := &movePinIssueForm{}
 	if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusInternalServerError)
+		return
 	}
 
 	issue, err := issues_model.GetIssueByID(ctx, form.ID)
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusInternalServerError)
+		return
 	}
 
-	err = issue.MovePin(form.Position)
+	err = issue.MovePin(ctx, form.Position)
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err.Error())
+		ctx.Status(http.StatusInternalServerError)
+		return
 	}
+
+	ctx.Status(http.StatusNoContent)
 }

From cadaa48f12bb276199763b4318f3448e6b174edf Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 14:59:33 +0200
Subject: [PATCH 30/38] Use err

---
 models/issues/issue.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/models/issues/issue.go b/models/issues/issue.go
index 26acceeb698ae..9d877f21c9632 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -825,6 +825,9 @@ func (issue *Issue) MovePin(ctx context.Context, newPosition int) error {
 		Update(map[string]interface{}{
 			"pin_order": newPosition,
 		})
+	if err != nil {
+		return err
+	}
 
 	return committer.Commit()
 }

From 08c59de81beb14a7703db485e56d6ffe26f226cc Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 16:42:38 +0200
Subject: [PATCH 31/38] Change default config to 3 and add Documentation

---
 custom/conf/app.example.ini                                 | 2 +-
 docs/content/doc/administration/config-cheat-sheet.en-us.md | 1 +
 modules/setting/repository.go                               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 6ce8290fbd28e..028a580ca0a70 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1027,7 +1027,7 @@ LEVEL = Info
 ;LOCK_REASONS = Too heated,Off-topic,Resolved,Spam
 ;; Maximum number of pinned Issues
 ;; Set to 0 to disable pinning Issues
-;MAX_PINNED = 6
+;MAX_PINNED = 3
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md
index 349c480ae6b91..4242c221d74fd 100644
--- a/docs/content/doc/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md
@@ -141,6 +141,7 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
 ### Repository - Issue (`repository.issue`)
 
 - `LOCK_REASONS`: **Too heated,Off-topic,Resolved,Spam**: A list of reasons why a Pull Request or Issue can be locked
+- `MAX_PINNED`: **3**: Maximum number of pinned Issues. Set to 0 to disable pinning Issues.
 
 ### Repository - Upload (`repository.upload`)
 
diff --git a/modules/setting/repository.go b/modules/setting/repository.go
index eb42965fef792..406068b59dd5d 100644
--- a/modules/setting/repository.go
+++ b/modules/setting/repository.go
@@ -231,7 +231,7 @@ var (
 			MaxPinned   int
 		}{
 			LockReasons: strings.Split("Too heated,Off-topic,Spam,Resolved", ","),
-			MaxPinned:   6,
+			MaxPinned:   3,
 		},
 
 		Release: struct {

From ab35b5ee631e94eb8435c57a778a40d54c97f92b Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 16:53:39 +0200
Subject: [PATCH 32/38] Fix merge problem

---
 models/migrations/migrations.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 043afd0294486..231c93cc74bb4 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -491,8 +491,6 @@ var migrations = []Migration{
 	NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
 	// v256 -> v257
 	NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
-	// v258 -> 259
-	NewMigration("Add PinOrder Column", v1_20.AddPinOrderToIssue),
 	// v257 -> v258
 	NewMigration("Add Actions Artifact table", v1_20.CreateActionArtifactTable),
 	// v258 -> 259

From 3f32853ac228ab945b4d99c5566565127883dd6f Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 22 May 2023 17:07:10 +0200
Subject: [PATCH 33/38] Update templates/repo/issue/view_content/comments.tmpl

---
 templates/repo/issue/view_content/comments.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index f4c92c38d5135..e6a474e3d342b 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -11,8 +11,7 @@
 		26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
 		29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
 		32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
-		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR,
-		36 = PIN, 37 = UNPIN -->
+		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR, 36 = PIN, 37 = UNPIN -->
 		{{if eq .Type 0}}
 			<div class="timeline-item comment" id="{{.HashTag}}">
 			{{if .OriginalAuthor}}

From 1d098d5e7a922c4bb29869f7a38736c4ce253081 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 17:30:14 +0200
Subject: [PATCH 34/38] Update templates/repo/issue/view_content/comments.tmpl

Co-authored-by: silverwind <me@silverwind.io>
---
 templates/repo/issue/view_content/comments.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index e6a474e3d342b..5091201ddecc2 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -11,7 +11,7 @@
 		26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST,
 		29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED
 		32 = DISMISSED_REVIEW, 33 = COMMENT_TYPE_CHANGE_ISSUE_REF, 34 = PR_SCHEDULE_TO_AUTO_MERGE,
-		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR, 36 = PIN, 37 = UNPIN -->
+		35 = CANCEL_SCHEDULED_AUTO_MERGE_PR, 36 = PIN_ISSUE, 37 = UNPIN_ISSUE -->
 		{{if eq .Type 0}}
 			<div class="timeline-item comment" id="{{.HashTag}}">
 			{{if .OriginalAuthor}}

From d3e365a39ee109b98d9e1f168f56aad0dd6389db Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Mon, 22 May 2023 17:32:32 +0200
Subject: [PATCH 35/38] Allow unpining even if Pins are disabled

---
 templates/repo/issue/view_content/sidebar.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 15e7ff4c6f032..60d2f4a5613d5 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -531,7 +531,7 @@
 		{{if and .IsRepoAdmin (not .Repository.IsArchived)}}
 			<div class="ui divider"></div>
 
-			{{if .PinEnabled}}
+			{{if or .PinEnabled .Issue.IsPinned}}
 				<form class="gt-mt-2" method="POST" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
 					{{$.CsrfTokenHtml}}
 					<button class="fluid ui button gt-df gt-jc {{if not $.NewPinAllowed}}disabled{{end}}">

From caeae1b8febdd1a411d8db53b295b45ee0cadd9e Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Thu, 25 May 2023 13:57:54 +0200
Subject: [PATCH 36/38] Delete issueicon.tmpl

---
 templates/shared/issueicon.tmpl | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 templates/shared/issueicon.tmpl

diff --git a/templates/shared/issueicon.tmpl b/templates/shared/issueicon.tmpl
deleted file mode 100644
index 7cfe5745db4ce..0000000000000
--- a/templates/shared/issueicon.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{if .IsPull}}
-	{{if .PullRequest.HasMerged}}
-		{{svg "octicon-git-merge" 16 "text purple"}}
-	{{else}}
-		{{if .IsClosed}}
-			{{svg "octicon-git-pull-request" 16 "text red"}}
-		{{else}}
-			{{svg "octicon-git-pull-request" 16 "text green"}}
-		{{end}}
-	{{end}}
-{{else}}
-	{{if .IsClosed}}
-		{{svg "octicon-issue-closed" 16 "text red"}}
-	{{else}}
-		{{svg "octicon-issue-opened" 16 "text green"}}
-	{{end}}
-{{end}}

From a4114f00499e71918cd988658832c4e723aa3158 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Thu, 25 May 2023 14:03:25 +0200
Subject: [PATCH 37/38] Run make generate-swagger

---
 templates/swagger/v1_json.tmpl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 2bc195a74c853..15043e465f90e 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -20191,7 +20191,17 @@
           "type": "string",
           "x-go-name": "PatchURL"
         },
-
+        "pin_order": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "PinOrder"
+        },
+        "requested_reviewers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/User"
+          },
+          "x-go-name": "RequestedReviewers"
         },
         "state": {
           "$ref": "#/definitions/StateType"

From 36a5478cc44da90562c216cc561d61f6715a123f Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Thu, 25 May 2023 14:28:11 +0200
Subject: [PATCH 38/38] Remove outdated comment

---
 models/issues/issue.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/models/issues/issue.go b/models/issues/issue.go
index 9d877f21c9632..5015824e9b34b 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -806,8 +806,6 @@ func (issue *Issue) MovePin(ctx context.Context, newPosition int) error {
 		newPosition = maxPin + 1
 	}
 
-	// TODO: Run the following commands in a Transaction and Rollback, if one fails
-
 	// Lower the Position of all Pinned Issue that came after the current Position
 	_, err = db.GetEngine(dbctx).Exec("UPDATE issue SET pin_order = pin_order - 1 WHERE repo_id = ? AND is_pull = ? AND pin_order > ?", issue.RepoID, issue.IsPull, issue.PinOrder)
 	if err != nil {