diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-05-05 18:25:25 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-05 19:25:25 +0300 |
| commit | 55a8e12d85bd59314416bb026e84d258004a5071 (patch) | |
| tree | 8735a97000a66f013b5da8407501995e63ec16f8 /templates/repo | |
| parent | c1da790cee96f1e2d15dded7748da5bc81022042 (diff) | |
| download | gitea-55a8e12d85bd59314416bb026e84d258004a5071.tar.gz gitea-55a8e12d85bd59314416bb026e84d258004a5071.zip | |
Number of commits ahead/behind in branch overview (#6695)
* Call Git API to determine divergence of a branch and its base branch
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Show commit divergance in branch list
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adds missing comment
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adds test for diverging commits
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Try comparing commits instead of branches
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Removes test as CI can't run it
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Adjusts signature of percentage function to allow providing multiple integers as numerator
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Moves CountDivergingCommits function into repofiles module
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/branch/list.tmpl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 0242d1d107..58e77f2c11 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -26,7 +26,8 @@ <table class="ui very basic striped fixed table single line"> <thead> <tr> - <th class="nine wide">{{.i18n.Tr "repo.branch.name"}}</th> + <th class="seven wide">{{.i18n.Tr "repo.branch.name"}}</th> + <th class="two wide"></th> {{if and $.IsWriter (not $.IsMirror)}} <th class="one wide right aligned">{{.i18n.Tr "repo.branch.delete_head"}}</th> {{end}} @@ -45,6 +46,18 @@ <p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p> </td> {{end}} + <td class="ui"> + <div class="commit-divergence"> + <div class="bar-group"> + <div class="count count-behind">{{.CommitsBehind}}</div> + <div class="bar bar-behind" style="width: {{percentage .CommitsBehind .CommitsBehind .CommitsAhead}}%"></div> + </div> + <div class="bar-group"> + <div class="count count-ahead">{{.CommitsAhead}}</div> + <div class="bar bar-ahead" style="width: {{percentage .CommitsAhead .CommitsBehind .CommitsAhead}}%"></div> + </div> + </div> + </td> {{if and $.IsWriter (not $.IsMirror)}} <td class="right aligned"> {{if .IsProtected}} |