diff options
| author | luzpaz <luzpaz@users.noreply.github.com> | 2022-07-12 17:32:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-12 23:32:37 +0200 |
| commit | d29d6d1991496cc688e9418db4960ca945fd9d6b (patch) | |
| tree | 878dcc8a2c8621f9328d5093c6003d664d6fe9ed /templates/repo/issue/view_content | |
| parent | 966e7bdc9b875abb7192cd572beec40123a815da (diff) | |
| download | gitea-d29d6d1991496cc688e9418db4960ca945fd9d6b.tar.gz gitea-d29d6d1991496cc688e9418db4960ca945fd9d6b.zip | |
Fix various typos (#20338)
* Fix various typos
Found via `codespell -q 3 -S ./options/locale,./options/license,./public/vendor -L actived,allways,attachements,ba,befores,commiter,pullrequest,pullrequests,readby,splitted,te,unknwon`
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'templates/repo/issue/view_content')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 7ed73e1176..179f857ba6 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -254,7 +254,7 @@ {{$notAllOverridableChecksOk := or .IsBlockedByApprovals .IsBlockedByRejection .IsBlockedByOfficialReviewRequests .IsBlockedByOutdatedBranch .IsBlockedByChangedProtectedFiles (and .EnableStatusCheck (not .RequiredStatusCheckState.IsSuccess))}} - {{/* admin can merge without checks, writer can merge when checkes succeed */}} + {{/* admin can merge without checks, writer can merge when checks succeed */}} {{$canMergeNow := and (or $.IsRepoAdmin (not $notAllOverridableChecksOk)) (or (not .AllowMerge) (not .RequireSigned) .WillSign)}} {{/* admin and writer both can make an auto merge schedule */}} |