Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion custom/options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,6 @@ pulls.merged = Merged
pulls.merged_success = Change request successfully merged and closed
pulls.closed = Change request closed
pulls.manually_merged = Manually merged
pulls.merged_info_text = The branch %s can now be deleted.
pulls.is_closed = The change request has been closed.
pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the change request from being merged accidentally.`
pulls.cannot_merge_work_in_progress = This change request is marked as a work in progress.
Expand Down
5 changes: 1 addition & 4 deletions custom/templates/repo/issue/view_content/pull_merge_box.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@
{{if .Issue.PullRequest.HasMerged}}
<div class="item item-section text tw-flex-1">
<div class="item-section-left">
<h3 class="tw-mb-2">
<h3>
{{ctx.Locale.Tr "repo.pulls.merged_success"}}
</h3>
<div class="merge-section-info">
{{ctx.Locale.Tr "repo.pulls.merged_info_text" (HTMLFormat "<code>%s</code>" .HeadTarget)}}
</div>
</div>
</div>
{{else if .Issue.IsClosed}}
Expand Down
Loading