diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/repo_form.go | 1 | ||||
| -rw-r--r-- | modules/convert/convert.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 28615ebbc4..0086419b65 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -448,6 +448,7 @@ type MergePullRequestForm struct { Do string `binding:"Required;In(merge,rebase,rebase-merge,squash)"` MergeTitleField string MergeMessageField string + ForceMerge *bool `json:"force_merge,omitempty"` } // Validate validates the fields diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 4479653174..a69b09a2b7 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -51,7 +51,7 @@ func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models. EnableStatusCheck: bp.EnableStatusCheck, StatusCheckContexts: bp.StatusCheckContexts, UserCanPush: bp.CanUserPush(user.ID), - UserCanMerge: bp.CanUserMerge(user.ID), + UserCanMerge: bp.IsUserMergeWhitelisted(user.ID), } } |