Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make pending commit status yellow again (#25935) (#25968)

Browse source 
Backport #25935 by @silverwind

With the introduction of Actions, the pending commit icon has changed
from yellow to grey for Drone integrations which never set the "running"
status, so it stays in "pending" until completion.

I find it better to have this icon colored like on 1.19. Now both the
"pending" and "running" icons look the same, but I guess we could add an
animation to the "running" state similar to GitHub has to it later.

Before:
<img width="339" alt="Screenshot 2023-07-17 at 19 14 19"
src="https://github.com/go-gitea/gitea/assets/115237/2f4886e4-74fd-42ea-b59e-9af8f141bf1f">

After:
<img width="335" alt="Screenshot 2023-07-17 at 19 14 30"
src="https://github.com/go-gitea/gitea/assets/115237/53189642-e72d-47f6-9cbe-f14eda28f730">

Also, it matches GH's icon:

<img width="466" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/5804ff90-d223-4a3c-8093-7a9abbaacf87">

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: delvh <dev.lh@web.de>
(cherry picked from commit 864bdd0ac8a597eaed5c59b31979a160b776ee2b)
This commit is contained in:
Giteabot 2023-07-19 02:43:41 -04:00 committed by Earl Warren
parent a50dfca667
commit 3d033a3aa7
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
templates/repo/commit_status.tmpl
View file

@ -1,7 +1,4 @@
{{if eq .State "pending"}} {{if or (eq .State "pending") (eq .State "running")}}
{{svg "octicon-dot-fill" 18 "commit-status icon text grey"}}
{{end}}
{{if eq .State "running"}}
{{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}} {{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}}
{{end}} {{end}}
{{if eq .State "success"}} {{if eq .State "success"}}

2
tests/integration/repo_commits_test.go
View file

@ -110,7 +110,7 @@ func testRepoCommitsWithStatus(t *testing.T, resp, respOne *httptest.ResponseRec
} }
func TestRepoCommitsWithStatusPending(t *testing.T) { func TestRepoCommitsWithStatusPending(t *testing.T) {
doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "grey") doTestRepoCommitWithStatus(t, "pending", "octicon-dot-fill", "yellow")
} }
func TestRepoCommitsWithStatusSuccess(t *testing.T) { func TestRepoCommitsWithStatusSuccess(t *testing.T) {