New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add protected branch whitelists for merging #3689

Merged
merged 4 commits into from Mar 25, 2018

Conversation

8 participants
@Chri-s
Copy link
Contributor

Chri-s commented Mar 18, 2018

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

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Mar 18, 2018

Codecov Report

Merging #3689 into master will decrease coverage by 0.01%.
The diff coverage is 35%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3689      +/-   ##
==========================================
- Coverage    35.8%   35.79%   -0.02%     
==========================================
  Files         287      288       +1     
  Lines       41496    41578      +82     
==========================================
+ Hits        14857    14881      +24     
- Misses      24453    24501      +48     
- Partials     2186     2196      +10
Impacted Files Coverage Δ
models/migrations/migrations.go 2.58% <ø> (ø) ⬆️
modules/auth/repo_form.go 33.76% <ø> (ø) ⬆️
models/migrations/v59.go 0% <0%> (ø)
models/pull.go 51.2% <0%> (ø) ⬆️
models/branches.go 48.55% <37.8%> (-4.55%) ⬇️
routers/repo/setting_protected_branch.go 45% <66.66%> (+0.55%) ⬆️
modules/process/manager.go 76.81% <0%> (-4.35%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 04b7fd8...891a1cc. Read the comment docs.

@lafriks lafriks added this to the 1.5.0 milestone Mar 18, 2018

@lunny

This comment has been minimized.

Copy link
Member

lunny commented Mar 19, 2018

But I think maybe pull request whitelist the same as push whitelist when push whitelist is checked but pull request whitelist not checked.

@lafriks

This comment has been minimized.

Copy link
Member

lafriks commented Mar 19, 2018

@lunny but that would limit configuration possibilities. This way it is more configurable

@tboerger tboerger added lgtm/need 1 and removed lgtm/need 2 labels Mar 19, 2018

@thehowl

This comment has been minimized.

Copy link
Member

thehowl commented Mar 23, 2018

just to be clear; @thehowI is a copycat, not actually me

@Bwko

Bwko approved these changes Mar 24, 2018

@tboerger tboerger added lgtm/done and removed lgtm/need 1 labels Mar 24, 2018

@lafriks lafriks merged commit 9350ba7 into go-gitea:master Mar 25, 2018

3 checks passed

Codacy/PR Quality Review Good work! A positive pull request.
Details
approvals/lgtm this commit looks good
continuous-integration/drone/pr the build was successful
Details

@lunny lunny referenced this pull request Mar 29, 2018

Closed

Permissions to accept/merge Pull request #2794

2 of 7 tasks complete

@lafriks lafriks added the changelog label Apr 11, 2018

aswild added a commit to aswild/gitea that referenced this pull request Jul 6, 2018

Merge tag 'v1.5.0-rc1' into wild/v1.5
* SECURITY
  * Limit uploaded avatar image-size to 4096x3072 by default (go-gitea#4353)
  * Do not allow to reuse TOTP passcode (go-gitea#3878)
* FEATURE
  * Add cli commands to regen hooks & keys (go-gitea#3979)
  * Add support for FIDO U2F (go-gitea#3971)
  * Added user language setting (go-gitea#3875)
  * LDAP Public SSH Keys synchronization (go-gitea#1844)
  * Add topic support (go-gitea#3711)
  * Multiple assignees (go-gitea#3705)
  * Add protected branch whitelists for merging (go-gitea#3689)
  * Global code search support (go-gitea#3664)
  * Add label descriptions (go-gitea#3662)
  * Add issue search via API (go-gitea#3612)
  * Add repository setting to enable/disable health checks (go-gitea#3607)
  * Emoji Autocomplete (go-gitea#3433)
  * Implements generator cli for secrets (go-gitea#3531)
* ENHANCEMENT
  * Add more webhooks support and refactor webhook templates directory (go-gitea#3929)
  * Add new option to allow only OAuth2/OpenID user registration (go-gitea#3910)
  * Add option to use paged LDAP search when synchronizing users (go-gitea#3895)
  * Symlink icons (go-gitea#1416)
  * Improve release page UI (go-gitea#3693)
  * Add admin dashboard option to run health checks (go-gitea#3606)
  * Add branch link in branch list (go-gitea#3576)
  * Reduce sql query times in retrieveFeeds (go-gitea#3547)
  * Option to enable or disable swagger endpoints (go-gitea#3502)
  * Add missing licenses (go-gitea#3497)
  * Reduce repo indexer disk usage (go-gitea#3452)
  * Enable caching on assets and avatars (go-gitea#3376)
  * Add repository search ordered by stars/forks. Forks column in admin repo list (go-gitea#3969)
  * Add Environment Variables to Docker template (go-gitea#4012)
  * LFS: make HTTP auth period configurable (go-gitea#4035)
  * Add config path as an optionial flag when changing pass via CLI (go-gitea#4184)
  * Refactor User Settings sections (go-gitea#3900)
  * Allow square brackets in external issue patterns (go-gitea#3408)
  * Add Attachment API (go-gitea#3478)
  * Add EnableTimetracking option to app settings (go-gitea#3719)
  * Add config option to enable or disable log executed SQL (go-gitea#3726)
  * Shows total tracked time in issue and milestone list (go-gitea#3341)
* TRANSLATION
  * Improve English grammar and consistency (go-gitea#3614)
* DEPLOYMENT
  * Allow Gitea to run as different USER in Docker (go-gitea#3961)
  * Provide compressed release binaries (go-gitea#3991)
  * Sign release binaries (go-gitea#4188)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment