diff options
| -rw-r--r-- | web_src/js/components/PullRequestMergeForm.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 64ba98728e..bfe05628e8 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -1,7 +1,7 @@ <template> <!-- - if this component is shown, either the user is admin (can do merge without checks), or they is a writer who has the permission to do merge - if the user is a writer and can't do merge now (canMergeNow==false), then only show the Auto Merge for them + if this component is shown, either the user is an admin (can do a merge without checks), or they are a writer who has the permission to do a merge + if the user is a writer and can't do a merge now (canMergeNow==false), then only show the Auto Merge for them How to test the UI manually: * Method 1: manually set some variables in pull.tmpl, eg: {{$notAllOverridableChecksOk = true}} {{$canMergeNow = false}} * Method 2: make a protected branch, then set state=pending/success : |