diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2019-12-04 02:08:56 +0100 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-03 20:08:56 -0500 |
| commit | bac4b78e0908c0cb01a3842436950c7bcf793cf9 (patch) | |
| tree | a3c80aebb1ca69bf6e518b881229158dccf4ddd7 /templates/repo/issue | |
| parent | 6460284085b0b416d61c57d729d47e932ac05efe (diff) | |
| download | gitea-bac4b78e0908c0cb01a3842436950c7bcf793cf9.tar.gz gitea-bac4b78e0908c0cb01a3842436950c7bcf793cf9.zip | |
Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055)
* Possibility to not use whitelist but allow anyone with write access
* fix existing test
* rename migration function
* Try to give a better name for migration step
* Clear settings if higher level setting is not set
* Move official reviews to db instead of counting approvals each time
* migration
* fix
* fix migration
* fix migration
* Remove NOT NULL from EnableWhitelist as migration isn't possible
* Fix migration, reviews are connected to issues.
* Fix SQL query issues in GetReviewersByPullID.
* Simplify function GetReviewersByIssueID
* Handle reviewers that has been deleted
* Ensure reviews for test is in a well defined order
* Only clear and set official reviews when it is an approve or reject.
Diffstat (limited to 'templates/repo/issue')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index f5ce8e0886..04f8a86cad 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -1,10 +1,10 @@ -{{if gt (len .PullReviewersWithType) 0}} +{{if gt (len .PullReviewers) 0}} <div class="comment box"> <div class="content"> <div class="ui segment"> <h4>{{$.i18n.Tr "repo.issues.review.reviewers"}}</h4> - {{range .PullReviewersWithType}} - {{ $createdStr:= TimeSinceUnix .ReviewUpdatedUnix $.Lang }} + {{range .PullReviewers}} + {{ $createdStr:= TimeSinceUnix .UpdatedUnix $.Lang }} <div class="ui divider"></div> <div class="review-item"> <span class="type-icon text {{if eq .Type 1}}green @@ -13,10 +13,10 @@ {{else}}grey{{end}}"> <span class="octicon octicon-{{.Type.Icon}}"></span> </span> - <a class="ui avatar image" href="{{.HomeLink}}"> - <img src="{{.RelAvatarLink}}"> + <a class="ui avatar image" href="{{.Reviewer.HomeLink}}"> + <img src="{{.Reviewer.RelAvatarLink}}"> </a> - <span class="text grey"><a href="{{.HomeLink}}">{{.Name}}</a> + <span class="text grey"><a href="{{.Reviewer.HomeLink}}">{{.Reviewer.Name}}</a> {{if eq .Type 1}} {{$.i18n.Tr "repo.issues.review.approve" $createdStr | Safe}} {{else if eq .Type 2}} |