diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-09-18 13:39:45 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-18 08:39:45 +0300 |
| commit | 04ca7f004710de2b408f558f6f148894aa61ba57 (patch) | |
| tree | 57fea3b9853127897676faaf9e70abace2565878 /templates/repo/pulls/status.tmpl | |
| parent | 29454733b4eeea33e6c94c50b32855066c203988 (diff) | |
| download | gitea-04ca7f004710de2b408f558f6f148894aa61ba57.tar.gz gitea-04ca7f004710de2b408f558f6f148894aa61ba57.zip | |
Refuse merge until all required status checks success (#7481)
* refuse merge until ci successfully
* deny merge request when required status checkes not succeed on merge Post and API
* add database migration for added columns on protected_branch
* fix migration
* fix protected branch check bug
* fix protected branch settings
* remove duplicated code on check pull request's required commit statuses pass
* remove unused codes
* fix migration
* add newline for template file
* fix go mod
* rename function name and some other fixes
* fix template
* fix bug pull view
* remove go1.12 wrong dependencies
* add administrator bypass when protected branch status check enabled
* fix bug
* improve the codes
Diffstat (limited to 'templates/repo/pulls/status.tmpl')
| -rw-r--r-- | templates/repo/pulls/status.tmpl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl index e1401aa8bb..76a4eb5423 100644 --- a/templates/repo/pulls/status.tmpl +++ b/templates/repo/pulls/status.tmpl @@ -15,7 +15,12 @@ <div class="ui attached segment"> <span>{{template "repo/commit_status" .}}</span> <span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span> - <div class="ui right">{{if .TargetURL}}<a href="{{.TargetURL}}">Details</a>{{end}}</div> + <div class="ui right"> + {{if $.is_context_required}} + {{if (call $.is_context_required .Context)}}<div class="ui label">Required</div>{{end}} + {{end}} + <span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">Details</a>{{end}}</span> + </div> </div> {{end}} -{{end}}
\ No newline at end of file +{{end}} |