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.

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

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

Merged
merged 4 commits into from
Apr 10, 2021
Merged

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

merged 4 commits into from
Apr 10, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 9, 2021 •
edited
Loading

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 art27@cantab.net

@zeripath
SHA in merged commit comment should be rendered ui sha
d1c4a8e 
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 <art27@cantab.net>
@zeripath zeripath added the topic/ui Change the appearance of the Gitea UI label Apr 9, 2021
@zeripath zeripath added this to the 1.15.0 milestone Apr 9, 2021
@zeripath
Copy link
Contributor Author

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.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 9, 2021
@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 9, 2021
@silverwind
Copy link
Member

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

@silverwind
Copy link
Member

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
Contributor Author

zeripath commented Apr 9, 2021 •
edited
Loading

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
Member

issues.force_push_codes should be a affected one.

@zeripath
issues.force_push_codes needs this too.
1754aa3 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Copy link
Contributor Author

zeripath commented Apr 9, 2021

yup agreed

@silverwind
Copy link
Member

Can't find any more.

@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 9, 2021
@techknowlogick techknowlogick merged commit 9a0858c into go-gitea:master Apr 10, 2021
@zeripath zeripath deleted the fix-15049-change-merge-commit-locale-strings branch April 10, 2021 06:03
@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.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.15.0
Development

Successfully merging this pull request may close these issues.

[UI] SHA links in timeline (sub)events may look better in monospace
5 participants
@zeripath @silverwind @lunny @techknowlogick @GiteaBot