[PR #3689] [MERGED] Add protected branch whitelists for merging #17043

New Issue

GiteaMirror · 2025-11-02T12:24:57-06:00

GiteaMirror commented

2025-11-02 12:24:57 -06:00

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/3689
Author: @Chri-s
Created: 3/18/2018
Status: ✅ Merged
Merged: 3/25/2018
Merged by: @lafriks

Base: master ← Head: master

📝 Commits (4)

ee784f4 Add database migrations for merge whitelist
4f00573 Add merge whitelist settings for protected branches
5f34424 Add checks for merge whitelists
891a1cc Merge branch 'master' into master

📊 Changes

8 files changed (+209 additions, -41 deletions)

View changed files

📝 models/branches.go (+122 -35)
📝 models/migrations/migrations.go (+2 -0)
➕ models/migrations/v59.go (+24 -0)
📝 models/pull.go (+1 -1)
📝 modules/auth/repo_form.go (+7 -4)
📝 options/locale/locale_en-US.ini (+4 -0)
📝 routers/repo/setting_protected_branch.go (+6 -1)
📝 templates/repo/settings/protected_branch.tmpl (+43 -0)

📄 Description

Fixes #3668. This pull request adds a second whitelist to protected branches. When the second whitelist is not used (not checked in the settings for a protected branch), everyone with write access to a repository can merge a pull request, just like before #3544. This is the default.

If the second whitelist is used, only users (or team members) in the second white list are allowed to merge pull requests to a protected branch.

I am not sure if I described this clearly on the settings page for protected branches. Here is a screenshot:

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/3689 **Author:** [@Chri-s](https://github.com/Chri-s) **Created:** 3/18/2018 **Status:** ✅ Merged **Merged:** 3/25/2018 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `master` --- ### 📝 Commits (4) - [`ee784f4`](https://github.com/go-gitea/gitea/commit/ee784f4dc44e82bbb02b7604e13ed1f2b9a3495e) Add database migrations for merge whitelist - [`4f00573`](https://github.com/go-gitea/gitea/commit/4f0057341ac18fd656b762af9aa9646f2cae8a52) Add merge whitelist settings for protected branches - [`5f34424`](https://github.com/go-gitea/gitea/commit/5f3442401a7354010c6a16547d814652b7098889) Add checks for merge whitelists - [`891a1cc`](https://github.com/go-gitea/gitea/commit/891a1ccb53d1757f60fa76687a43adc3ff352bf0) Merge branch 'master' into master ### 📊 Changes **8 files changed** (+209 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `models/branches.go` (+122 -35) 📝 `models/migrations/migrations.go` (+2 -0) ➕ `models/migrations/v59.go` (+24 -0) 📝 `models/pull.go` (+1 -1) 📝 `modules/auth/repo_form.go` (+7 -4) 📝 `options/locale/locale_en-US.ini` (+4 -0) 📝 `routers/repo/setting_protected_branch.go` (+6 -1) 📝 `templates/repo/settings/protected_branch.tmpl` (+43 -0) </details> ### 📄 Description Fixes #3668. This pull request adds a second whitelist to protected branches. When the second whitelist is not used (not checked in the settings for a protected branch), everyone with write access to a repository can merge a pull request, just like before #3544. This is the default. If the second whitelist is used, only users (or team members) in the second white list are allowed to merge pull requests to a protected branch. I am not sure if I described this clearly on the settings page for protected branches. Here is a screenshot: ![image](https://user-images.githubusercontent.com/5181475/37571246-776c7bfa-2afa-11e8-8864-86f1f70dde9e.png) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2025-11-02 12:24:57 -06:00

GiteaMirror closed this issue

2025-11-02 12:24:57 -06:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#17043