tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-27 04:38:36 +00:00
Code Releases Activity

Always show the command line instructions button even if there are conflicts (#22909)

Browse Source 
Always show the `command line instructions` button even if there are
conflicts.
This commit is contained in:
wxiaoguang
2023-02-15 23:31:35 +08:00
committed by GitHub
parent 4d306325c1
commit 2c04595762
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/repo/issue/view_content/pull_merge_instruction.tmpl
View File

@@ -1,6 +1,6 @@
<div class="instruct-toggle gt-mt-3"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
<div class="instruct-content" style="display:none">
<div class="ui divider"></div>
<div class="ui divider"></div>
<div class="instruct-toggle"> {{$.locale.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
<div class="instruct-content gt-mt-3" style="display:none">
<div><h3 class="gt-di">{{$.locale.Tr "step1"}} </h3>{{$.locale.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>
<div class="ui secondary segment">
{{if eq $.Issue.PullRequest.Flow 0}}