Skip to content

Add admin access option to protected branch/tag dropdowns

Joe Woodward requested to merge feat/12776-instance-admin-protected-ref into master

What does this MR do and why?

Previously protected branches and tags could only be configured with admin access on EE installs. We now allow this config in CE installs.

This change also shows the 'Instance Admins' option in the allowed to ... dropdowns on self-hosted installs.

Screenshots or screen recordings

In GDK/non-gitlab.com?

image

In GDK while simulating gitlab.com

image

How to set up and validate locally

This change should show in GDK. To validate:

  1. Visit a projects repository settings e.g. http://gdk.test:3000/gitlab-org/gitlab/-/settings/repository
  2. Create a Protected branch or Protected tag
  3. The "Instance admins" option should be present in the allowed to merge allowed to push and merge and allowed to create dropdowns.

Restart the rails-web server and set GITLAB_SIMULATE_SAAS=true.

gdk stop rails-web && GITLAB_RAILS_RACK_TIMEOUT_ENABLE_LOGGING=false GITLAB_SIMULATE_SAAS=true gdk rails s

Follow the same steps as before, the "Instance admins" option should no longer be displayed

Closes #12776 (closed)

Edited by Joe Woodward

Merge request reports