From 9588d2c6226c3d027bc5eca8cde7f85806dc3633 Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 19 Apr 2020 13:31:56 +0100 Subject: [PATCH] Remove errant third curly brackets from account.tmpl and pull.tmpl and send account ID in account.tmpl (#11129) * Remove errant third } from account.tmpl Fix #11128 Signed-off-by: Andrew Thornton * Remove errant third curly bracket from pull.tmpl Signed-off-by: Andrew Thornton * Update templates/user/settings/account.tmpl --- templates/repo/issue/view_content/pull.tmpl | 2 +- templates/user/settings/account.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index e66c2f6a9a..3aee0773f8 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -69,7 +69,7 @@ {{- else if .IsBlockedByOutdatedBranch}}red {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red {{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow - {{- else if and .RequireSigned (not .WillSign)}}}red + {{- else if and .RequireSigned (not .WillSign)}}red {{- else if .Issue.PullRequest.IsChecking}}yellow {{- else if .Issue.PullRequest.CanAutoMerge}}green {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 67036f66f5..e8b4267a70 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -92,7 +92,7 @@
{{$.CsrfTokenHtml}} - + {{if $.ActivationsPending}} {{else}}