@@ -89,24 +89,25 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr
89
89
vars ["HeadRepoOwnerName" ] = pr .HeadRepo .OwnerName
90
90
vars ["HeadRepoName" ] = pr .HeadRepo .Name
91
91
}
92
- refs , err := pr .ResolveCrossReferences (ctx )
93
- if err == nil {
94
- closeIssueIndexes := make ([]string , 0 , len (refs ))
95
- closeWord := "close"
96
- if len (setting .Repository .PullRequest .CloseKeywords ) > 0 {
97
- closeWord = setting .Repository .PullRequest .CloseKeywords [0 ]
98
- }
99
- for _ , ref := range refs {
100
- if ref .RefAction == references .XRefActionCloses {
101
- closeIssueIndexes = append (closeIssueIndexes , fmt .Sprintf ("%s %s%d" , closeWord , issueReference , ref .Issue .Index ))
102
- }
103
- }
104
- if len (closeIssueIndexes ) > 0 {
105
- vars ["ClosingIssues" ] = strings .Join (closeIssueIndexes , ", " )
106
- } else {
107
- vars ["ClosingIssues" ] = ""
108
- }
109
- }
92
+ // Blender: disabled because it causes crashes in pull requests
93
+ // refs, err := pr.ResolveCrossReferences(ctx)
94
+ // if err == nil {
95
+ // closeIssueIndexes := make([]string, 0, len(refs))
96
+ // closeWord := "close"
97
+ // if len(setting.Repository.PullRequest.CloseKeywords) > 0 {
98
+ // closeWord = setting.Repository.PullRequest.CloseKeywords[0]
99
+ // }
100
+ // for _, ref := range refs {
101
+ // if ref.RefAction == references.XRefActionCloses {
102
+ // closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index))
103
+ // }
104
+ // }
105
+ // if len(closeIssueIndexes) > 0 {
106
+ // vars["ClosingIssues"] = strings.Join(closeIssueIndexes, ", ")
107
+ // } else {
108
+ // vars["ClosingIssues"] = ""
109
+ // }
110
+ // }
110
111
message , body = expandDefaultMergeMessage (templateContent , vars )
111
112
return message , body , nil
112
113
}
0 commit comments