diff options
| author | Chri-s <Chri-s@users.noreply.github.com> | 2018-03-13 04:46:14 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2018-03-13 11:46:14 +0800 |
| commit | a2a49c93c78a81d1eaa6b0eaf84a0c3f4bcd2487 (patch) | |
| tree | c59d836cbbc221d79c8d90c2f62775da680b6fef /templates | |
| parent | c0d41b1b77169553006bd9211d025de4da8bafd8 (diff) | |
| download | gitea-a2a49c93c78a81d1eaa6b0eaf84a0c3f4bcd2487.tar.gz gitea-a2a49c93c78a81d1eaa6b0eaf84a0c3f4bcd2487.zip | |
Added checks for protected branches in pull requests (#3544)
* Added checks for protected branches in pull requests
Signed-off-by: Christian Wulff <NChris@posteo.net>
* Moved check for protected branch into new function CheckUserAllowedToMerge
Signed-off-by: Christian Wulff <NChris@posteo.net>
* Removed merge conflict lines from last commit
Signed-off-by: Christian Wulff <NChris@posteo.net>
* Explicit check for error type in ViewIssue
Signed-off-by: Christian Wulff <NChris@posteo.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 9bd51b7c3e..d4bf5a3277 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -37,7 +37,7 @@ <span class="octicon octicon-check"></span> {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} </div> - {{if .IsRepositoryWriter}} + {{if .AllowMerge}} {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}} {{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowSquash}} <div class="ui divider"></div> |