Skip to content

Commit cf5e259

Browse files
committed
Fix failure on creating pull request with assignees (#4419)
1 parent 6e68b61 commit cf5e259

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

models/issue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
964964

965965
// Insert the assignees
966966
for _, assigneeID := range opts.AssigneeIDs {
967-
err = opts.Issue.changeAssignee(e, doer, assigneeID)
967+
err = opts.Issue.changeAssignee(e, doer, assigneeID, true)
968968
if err != nil {
969969
return err
970970
}

models/issue_assignees.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,14 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) {
134134
return err
135135
}
136136

137-
if err := issue.changeAssignee(sess, doer, assigneeID); err != nil {
137+
if err := issue.changeAssignee(sess, doer, assigneeID, false); err != nil {
138138
return err
139139
}
140140

141141
return sess.Commit()
142142
}
143143

144-
func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64) (err error) {
144+
func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID int64, isCreate bool) (err error) {
145145

146146
// Update the assignee
147147
removed, err := updateIssueAssignee(sess, issue, assigneeID)
@@ -161,6 +161,10 @@ func (issue *Issue) changeAssignee(sess *xorm.Session, doer *User, assigneeID in
161161

162162
mode, _ := accessLevel(sess, doer.ID, issue.Repo)
163163
if issue.IsPull {
164+
// if pull request is in the middle of creation - don't call webhook
165+
if isCreate {
166+
return nil
167+
}
164168
if err = issue.loadPullRequest(sess); err != nil {
165169
return fmt.Errorf("loadPullRequest: %v", err)
166170
}

0 commit comments

Comments
 (0)