Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show dropdown with all statuses for commit #13977

Merged
merged 19 commits into from
Dec 20, 2020
Merged

Show dropdown with all statuses for commit #13977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
794fcf3
Show dropdown with all statuses for commit
CirnoT Dec 14, 2020
300e676
Merge branch 'master' into commit-statuses
CirnoT Dec 17, 2020
48adb50
Use popups
CirnoT Dec 17, 2020
a3e2bad
Remove unnecessary change
CirnoT Dec 17, 2020
998addf
Style popup
CirnoT Dec 17, 2020
c005361
Use divided list
CirnoT Dec 17, 2020
1fa713b
As per @silverwind
CirnoT Dec 18, 2020
51d9795
Refactor GetLastCommitStatus
CirnoT Dec 18, 2020
de2581f
Missing dropdown on repo home and commit page
CirnoT Dec 18, 2020
6321034
Fix tests
CirnoT Dec 18, 2020
84e632e
Merge branch 'master' into commit-statuses
lunny Dec 18, 2020
6491626
Merge branch 'master' into commit-statuses
CirnoT Dec 18, 2020
428f29e
Make status icon be a part of a link on PR list
CirnoT Dec 18, 2020
445cbf7
Fix missing translation call
CirnoT Dec 18, 2020
9ef38ab
Indent fix
CirnoT Dec 18, 2020
ed6e38b
Merge branch 'master' into commit-statuses
techknowlogick Dec 19, 2020
692424b
Merge branch 'master' into commit-statuses
CirnoT Dec 20, 2020
7d1f2ef
Merge branch 'master' into commit-statuses
techknowlogick Dec 20, 2020
cc4868d
Merge branch 'master' into commit-statuses
techknowlogick Dec 20, 2020
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
4 changes: 3 additions & 1 deletion models/commit_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@ func NewCommitStatus(opts NewCommitStatusOptions) error {

// SignCommitWithStatuses represents a commit with validation of signature and status state.
type SignCommitWithStatuses struct {
Status *CommitStatus
Status *CommitStatus
Statuses []*CommitStatus
*SignCommit
}

Expand All @@ -265,6 +266,7 @@ func ParseCommitsWithStatus(oldCommits *list.List, repo *Repository) *list.List
if err != nil {
log.Error("GetLatestCommitStatus: %v", err)
} else {
commit.Statuses = statuses
commit.Status = CalcCommitStatus(statuses)
}

Expand Down
10 changes: 5 additions & 5 deletions templates/repo/commit_status.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{{if eq .State "pending"}}
<a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status circle icon yellow"></i></a>
<i class="commit-status circle icon yellow"></i>
{{end}}
{{if eq .State "success"}}
<a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status check icon green"></i></a>
<i class="commit-status check icon green"></i>
{{end}}
{{if eq .State "error"}}
<a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning icon red"></i></a>
<i class="commit-status warning icon red"></i>
{{end}}
{{if eq .State "failure"}}
<a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status remove icon red"></i></a>
<i class="commit-status remove icon red"></i>
{{end}}
{{if eq .State "warning"}}
<a class="commit-status-link" href="{{.TargetURL}}" target="_blank" rel="noopener noreferrer"><i class="commit-status warning sign icon yellow"></i></a>
<i class="commit-status warning sign icon yellow"></i>
{{end}}
17 changes: 15 additions & 2 deletions templates/repo/commits_list_small.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,21 @@

<span class="ui float right shabox">
{{if eq (CommitType .) "SignCommitWithStatuses"}}
{{template "repo/commit_status" .Status}}
{{end}}
<div class="ui dropdown">
<span class="commit-status">{{template "repo/commit_status" .Status}}</span>
<div class="menu commit-statuses">
{{range .Statuses}}
<div class="ui item">
<span>{{template "repo/commit_status" .}}</span>
<span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span>
<div class="ui right">
<span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">Details</a>{{end}}</span>
CirnoT marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
{{end}}
</div>
</div>
{{end}}
{{$class := "ui sha label"}}
{{if .Signature}}
{{$class = (printf "%s%s" $class " isSigned")}}
Expand Down
2 changes: 1 addition & 1 deletion web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ table th[data-sortt-desc] {

/* limit width of all direct dropdown menu children */
/* https://github.com/go-gitea/gitea/pull/10835 */
.dropdown:not(.selection) > .menu:not(.review-box) > *:not(.header) {
.dropdown:not(.selection) > .menu:not(.review-box):not(.commit-statuses) > *:not(.header) {
max-width: 300px;
overflow-x: hidden;
text-overflow: ellipsis;
Expand Down