diff options
| author | 6543 <6543@obermui.de> | 2020-01-29 19:54:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 18:54:34 +0000 |
| commit | 169bb55ec68eed40aa2e87d34ff8b38874394c25 (patch) | |
| tree | b4ec4d9f6085e60c45e592351bfcd64fd9ba99b3 | |
| parent | e2c505f5ce6b91709f267aea15f3f4699528ea26 (diff) | |
| download | gitea-169bb55ec68eed40aa2e87d34ff8b38874394c25.tar.gz gitea-169bb55ec68eed40aa2e87d34ff8b38874394c25.zip | |
[UI] Show pull icon on pull (#10061)
* make fmt
* show pull icon on pull
| -rw-r--r-- | modules/graceful/manager_windows.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index cb4475ebb2..d412e94f9a 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -43,7 +43,7 @@ type Manager struct { runningServerWaitGroup sync.WaitGroup createServerWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup - shutdownRequested chan struct{} + shutdownRequested chan struct{} } func newGracefulManager(ctx context.Context) *Manager { diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 635638f325..11bede3713 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -20,6 +20,8 @@ <div class="ui purple large label"><i class="octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls.merged"}}</div> {{else if .Issue.IsClosed}} <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}} <div class="ui green large label"><i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues.open_title"}}</div> {{end}} |