diff options
Diffstat (limited to 'services/pull')
| -rw-r--r-- | services/pull/merge.go | 4 | ||||
| -rw-r--r-- | services/pull/review.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index e8bb3a1cdd..4cd4e3bd7e 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -358,7 +358,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode committer := sig // Determine if we should sign - signArg := "" + var signArg string sign, keyID, signer, _ := asymkey_service.SignMerge(ctx, pr, doer, tmpBasePath, "HEAD", trackingBranch) if sign { signArg = "-S" + keyID @@ -858,7 +858,7 @@ func MergedManually(pr *issues_model.PullRequest, doer *user_model.User, baseGit pr.Merger = doer pr.MergerID = doer.ID - merged := false + var merged bool if merged, err = pr.SetMerged(ctx); err != nil { return err } else if !merged { diff --git a/services/pull/review.go b/services/pull/review.go index 9cb58fa3a1..6bb8877b0f 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -318,5 +318,5 @@ func DismissReview(ctx context.Context, reviewID int64, message string, doer *us notification.NotifyPullRevieweDismiss(doer, review, comment) - return + return comment, err } |