Bladeren bron

[UI] Show pull icon on pull (#10061)

* make fmt
* show pull icon on pull
tags/v1.10.5
6543 4 jaren geleden
bovenliggende
commit
169bb55ec6
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1
    1
      modules/graceful/manager_windows.go
  2. 2
    0
      templates/repo/issue/view_title.tmpl

+ 1
- 1
modules/graceful/manager_windows.go Bestand weergeven

runningServerWaitGroup sync.WaitGroup runningServerWaitGroup sync.WaitGroup
createServerWaitGroup sync.WaitGroup createServerWaitGroup sync.WaitGroup
terminateWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup
shutdownRequested chan struct{}
shutdownRequested chan struct{}
} }


func newGracefulManager(ctx context.Context) *Manager { func newGracefulManager(ctx context.Context) *Manager {

+ 2
- 0
templates/repo/issue/view_title.tmpl Bestand weergeven

<div class="ui purple large label"><i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls.merged"}}</div> <div class="ui purple large label"><i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls.merged"}}</div>
{{else if .Issue.IsClosed}} {{else if .Issue.IsClosed}}
<div class="ui red large label"><i class="octicon octicon-issue-closed"></i> {{.i18n.Tr "repo.issues.closed_title"}}</div> <div class="ui red large label"><i class="octicon octicon-issue-closed"></i> {{.i18n.Tr "repo.issues.closed_title"}}</div>
{{else if .Issue.IsPull}}
<div class="ui green large label"><i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.issues.open_title"}}</div>
{{else}} {{else}}
<div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div> <div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div>
{{end}} {{end}}

Laden…
Annuleren
Opslaan