troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 06:39:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix typos in PullRequestMergeForm.vue header comment (#21378)

Browse source 
Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
This commit is contained in:
Yarden Shoham 2022-10-09 10:17:01 +03:00 committed by GitHub
parent 768e16dad1
commit 97f3f1988b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web_src/js/components/PullRequestMergeForm.vue
View file

@ -1,7 +1,7 @@
<template> <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 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 merge now (canMergeNow==false), then only show the Auto Merge for them 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: How to test the UI manually:
* Method 1: manually set some variables in pull.tmpl, eg: {{$notAllOverridableChecksOk = true}} {{$canMergeNow = false}} * 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 : * Method 2: make a protected branch, then set state=pending/success :