Skip to content

Remove errant third closing curly-bracket from account.tmpl and send account ID in account.tmpl #11130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
lunny merged 2 commits into from
Apr 19, 2020
Merged

Remove errant third closing curly-bracket from account.tmpl and send account ID in account.tmpl #11130

lunny merged 2 commits into from
Apr 19, 2020

Conversation

@zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 19, 2020

Backport #11129

(The change to pull.tmpl is not required)

Fix #11128

Signed-off-by: Andrew Thornton [email protected]

@zeripath zeripath added this to the 1.11.5 milestone Apr 19, 2020
@stbuehler
Copy link

stbuehler commented Apr 19, 2020

I'm not familiar with the template syntax, but my guess is that this would still print .ID in the html, where as we actually want the ID be inserted, right? Shouldn't it look like this?

<input name="id" type="hidden" value="{{if .IsPrimary}}PRIMARY{{else .ID end}}">

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 19, 2020
@zeripath
Copy link
Contributor Author

zeripath commented Apr 19, 2020

Damn you're right!

zeripath
zeripath commented Apr 19, 2020
View reviewed changes
@zeripath zeripath changed the title Remove errant third closing curly-bracket from account.tmpl Remove errant third closing curly-bracket from account.tmpl and send account ID in account.tmpl Apr 19, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 19, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 19, 2020
@lunny
Copy link
Member

lunny commented Apr 19, 2020

make L-G-T-M work

@lunny lunny merged commit cebef5c into go-gitea:release/v1.11 Apr 19, 2020
@zeripath zeripath deleted the backport-11129 branch April 19, 2020 13:09
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@lunny lunny lunny approved these changes

@6543 6543 6543 approved these changes

+1 more reviewer

@stbuehler stbuehler stbuehler approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Milestone

1.11.5

Development

Successfully merging this pull request may close these issues.

5 participants

@zeripath @stbuehler @lunny @6543 @GiteaBot