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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1c4a8e
SHA in merged commit comment should be rendered ui sha
zeripath Apr 9, 2021
1754aa3
issues.force_push_codes needs this too.
zeripath Apr 9, 2021
929ac4d
Merge branch 'master' into fix-15049-change-merge-commit-locale-strings
techknowlogick Apr 9, 2021
7b40da8
Merge branch 'master' into fix-15049-change-merge-commit-locale-strings
techknowlogick Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,8 +1123,8 @@ issues.context.edit = Edit
issues.context.delete = Delete
issues.no_content = There is no content yet.
issues.close_issue = Close
issues.pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s`
issues.manually_pull_merged_at = `merged commit <a href="%[1]s">%[2]s</a> into <b>%[3]s</b> %[4]s manually`
issues.pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> %[4]s`
issues.manually_pull_merged_at = `merged commit <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> into <b>%[3]s</b> manually %[4]s`
issues.close_comment_issue = Comment and Close
issues.reopen_issue = Reopen
issues.reopen_comment_issue = Comment and Reopen
Expand Down