Don't attempt to close issue if already closed (#9696)

Co-authored-by: Lauris BH <[email protected]>

Author: 2 people

modules/repofiles/action.go

@@ -138,9 +138,11 @@ func UpdateIssuesCommit(doer *models.User, repo *models.Repository, commits []*r
 					continue
 				}
 			}
-
-			if err := changeIssueStatus(refRepo, refIssue, doer, ref.Action == references.XRefActionCloses); err != nil {
-				return err
+			close := (ref.Action == references.XRefActionCloses)
+			if close != refIssue.IsClosed {
+				if err := changeIssueStatus(refRepo, refIssue, doer, close); err != nil {
+					return err
+				}
 			}
 		}
 	}

services/pull/merge.go

@@ -374,8 +374,10 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 			return err
 		}
 		close := (ref.RefAction == references.XRefActionCloses)
-		if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
-			return err
+		if close != ref.Issue.IsClosed {
+			if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
+				return err
+			}
 		}
 	}