diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-05-03 21:52:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 21:52:19 +0800 |
| commit | e9b39250b285f1b9cbf9739f33c06fc57401f314 (patch) | |
| tree | 8617e742a405493f3174a44b0bba42b0939de315 /options | |
| parent | a9ed87ce4a8a529ce451e11ebbff45a178677a62 (diff) | |
| download | gitea-e9b39250b285f1b9cbf9739f33c06fc57401f314.tar.gz gitea-e9b39250b285f1b9cbf9739f33c06fc57401f314.zip | |
Improve pull request merge box when pull request merged and branch deleted. (#24397)
This PR hide the pull request merge box totally if it's merged and branch deleted.
It's also add a bold for merge base commit id in merged message comment
Before:
<img width="989" alt="图片"
src="https://user-images.githubusercontent.com/81045/235066590-28deb506-e824-4a42-a9a2-791cd136756e.png">
After:
<img width="1030" alt="图片"
src="https://user-images.githubusercontent.com/81045/235080749-11d5efe8-a06e-4528-a75f-f6c6d191db50.png">
---------
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 600f8d6086..b4d5ba00bc 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1414,8 +1414,8 @@ issues.context.edit = Edit issues.context.delete = Delete issues.no_content = There is no content yet. issues.close = Close Issue -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.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s +issues.comment_manually_pull_merged_at = manually merged commit %[1]s into %[2]s %[3]s issues.close_comment_issue = Comment and Close issues.reopen_issue = Reopen issues.reopen_comment_issue = Comment and Reopen |