The Wayback Machine - https://web.archive.org/web/20220506205659/https://github.com/go-gitea/gitea/pull/15376
Skip to content
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.

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

SHA in merged commit comment should be rendered ui sha #15376

Conversation

Copy link
Contributor

@zeripath zeripath commented Apr 9, 2021

On a PR page the sha of the merge commit should be rendered in monospace
as a SHA. Also fixes an issue with the manually merged string and issues.force_push_codes

Fix #15049

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

On a PR page the sha of the merge commit should be rendered in monospace
as a SHA. Also fixes an issue with the manually merged string.

Fix go-gitea#15049

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added this to the 1.15.0 milestone Apr 9, 2021
@zeripath
Copy link
Author

@zeripath zeripath commented Apr 9, 2021

This is a difficult one. Ideally it would be backported but then we'd need to change the locale strings too.

@silverwind
Copy link

@silverwind silverwind commented Apr 9, 2021

Hmm it might be possible to fix all translations with some sed action.

@silverwind
Copy link

@silverwind silverwind commented Apr 9, 2021

There might be more similar cases, I'm not sure.

issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`

@zeripath
Copy link
Author

@zeripath zeripath commented Apr 9, 2021

There might be more similar cases, I'm not sure.

issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`

ugh let me look again. - No this one is not a SHA

@silverwind
Copy link

@silverwind silverwind commented Apr 9, 2021

issues.force_push_codes should be a affected one.

@zeripath
Copy link
Author

@zeripath zeripath commented Apr 9, 2021

yup agreed

@silverwind
Copy link

@silverwind silverwind commented Apr 9, 2021

Can't find any more.

@techknowlogick techknowlogick merged commit 9a0858c into go-gitea:master Apr 10, 2021
2 checks passed
@zeripath zeripath deleted the fix-15049-change-merge-commit-locale-strings branch Apr 10, 2021
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Development

Successfully merging this pull request may close these issues.

5 participants