aboutsummaryrefslogtreecommitdiffstats
path: root/models/pull.go
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-10-14 02:50:57 +0800
committerGitHub <noreply@github.com>2020-10-13 14:50:57 -0400
commitdfa7291f8fafd2aac032ef73a78b588e4d0e9a36 (patch)
treefb05581a7b1b15bc4dd5e84bb0a0eb009e6850f9 /models/pull.go
parentda32d0e72a00892553e4e9a09da19761d792ab84 (diff)
downloadgitea-dfa7291f8fafd2aac032ef73a78b588e4d0e9a36.tar.gz
gitea-dfa7291f8fafd2aac032ef73a78b588e4d0e9a36.zip
[Enhancement] Allow admin to merge pr with protected file changes (#12078)
* [Enhancement] Allow admin to merge pr with protected file changes As tilte, show protected message in diff page and merge box. Signed-off-by: a1012112796 <1012112796@qq.com> * remove unused ver * Update options/locale/locale_en-US.ini Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> * Add TrN * Apply suggestions from code review * fix lint * Update options/locale/locale_en-US.ini Co-authored-by: zeripath <art27@cantab.net> * Apply suggestions from code review * move pr proteced files check to TestPatch * Call TestPatch when protected branches settings changed * Apply review suggestion @CirnoT * move to service @lunny * slightly restructure routers/private/hook.go Adds a lot of comments and simplifies the logic Signed-off-by: Andrew Thornton <art27@cantab.net> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net> * skip duplicate protected files check * fix check logic * slight refactor of TestPatch Signed-off-by: Andrew Thornton <art27@cantab.net> * When checking for protected files changes in TestPatch use the temporary repository Signed-off-by: Andrew Thornton <art27@cantab.net> * fix introduced issue with hook Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove the check on PR index being greater than 0 as it unnecessary Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'models/pull.go')
-rw-r--r--models/pull.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/models/pull.go b/models/pull.go
index 9f1f485266..9b6f0830d7 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -45,6 +45,8 @@ type PullRequest struct {
CommitsAhead int
CommitsBehind int
+ ChangedProtectedFiles []string `xorm:"TEXT JSON"`
+
IssueID int64 `xorm:"INDEX"`
Issue *Issue `xorm:"-"`
Index int64