]> source.dussan.org Git - gitea.git/commit
Added checks for protected branches in pull requests (#3544)
authorChri-s <Chri-s@users.noreply.github.com>
Tue, 13 Mar 2018 03:46:14 +0000 (04:46 +0100)
committerLunny Xiao <xiaolunwen@gmail.com>
Tue, 13 Mar 2018 03:46:14 +0000 (11:46 +0800)
commita2a49c93c78a81d1eaa6b0eaf84a0c3f4bcd2487
treec59d836cbbc221d79c8d90c2f62775da680b6fef
parentc0d41b1b77169553006bd9211d025de4da8bafd8
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>
models/error.go
models/pull.go
routers/repo/issue.go
templates/repo/issue/view_content/pull.tmpl