From 9350ba7947d8caa6e7338d7c9e54df2f3aef2146 Mon Sep 17 00:00:00 2001
From: Chri-s <Chri-s@users.noreply.github.com>
Date: Sun, 25 Mar 2018 12:01:32 +0200
Subject: Add protected branch whitelists for merging (#3689)

* Add database migrations for merge whitelist

* Add merge whitelist settings for protected branches

* Add checks for merge whitelists
---
 modules/auth/repo_form.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index abe25866b6..565428c350 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -129,10 +129,13 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
 
 // ProtectBranchForm form for changing protected branch settings
 type ProtectBranchForm struct {
-	Protected       bool
-	EnableWhitelist bool
-	WhitelistUsers  string
-	WhitelistTeams  string
+	Protected            bool
+	EnableWhitelist      bool
+	WhitelistUsers       string
+	WhitelistTeams       string
+	EnableMergeWhitelist bool
+	MergeWhitelistUsers  string
+	MergeWhitelistTeams  string
 }
 
 // Validate validates the fields
-- 
cgit v1.2.3