Skip to content

TrimSpace when reading InternalToken from a file (#11502) - #11524

Merged
techknowlogick merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-11502
May 20, 2020
Merged

techknowlogick merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-11502

Conversation

@zeripath

Copy link
Copy Markdown
Contributor

Backport #11502

InternalTokens are fixed as alphanum strings therefore TrimSpace from these.
Also use isatty to not add a terminal newline when redirecting generate.

Fix #11498

Signed-off-by: Andrew Thornton art27@cantab.net

InternalTokens are fixed as alphanum strings therefore TrimSpace from these.
Also use isatty to not add a terminal newline when redirecting generate.

Fix go-gitea#11498

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
@zeripath zeripath added this to the 1.12.0 milestone May 20, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 20, 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 May 20, 2020
@techknowlogick
techknowlogick merged commit c83bc55 into go-gitea:release/v1.12 May 20, 2020
@zeripath
zeripath deleted the backport-11502 branch May 20, 2020 20:07
@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.

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants