Skip to content
Snippets Groups Projects
Commit 6e78508c authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch 'protected-branches-no-one-merge' into 'master'

Enabled 'no one' as a merge access level in protected branches

Closes #31541

See merge request !11232
parents 2a868635 4dd21950
No related branches found
No related tags found
2 merge requests!12073Add RC2 changes to 9-3-stable,!11232Enabled 'no one' as a merge access level in protected branches
Pipeline #
Loading
Loading
@@ -7,5 +7,27 @@ module ProtectedBranchAccess
belongs_to :protected_branch
 
delegate :project, to: :protected_branch
validates :access_level, presence: true, inclusion: {
in: [
Gitlab::Access::MASTER,
Gitlab::Access::DEVELOPER,
Gitlab::Access::NO_ACCESS
]
}
def self.human_access_levels
{
Gitlab::Access::MASTER => "Masters",
Gitlab::Access::DEVELOPER => "Developers + Masters",
Gitlab::Access::NO_ACCESS => "No one"
}.with_indifferent_access
end
def check_access(user)
return false if access_level == Gitlab::Access::NO_ACCESS
super
end
end
end
class ProtectedBranch::MergeAccessLevel < ActiveRecord::Base
include ProtectedBranchAccess
validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
Gitlab::Access::DEVELOPER] }
def self.human_access_levels
{
Gitlab::Access::MASTER => "Masters",
Gitlab::Access::DEVELOPER => "Developers + Masters"
}.with_indifferent_access
end
end
class ProtectedBranch::PushAccessLevel < ActiveRecord::Base
include ProtectedBranchAccess
validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
Gitlab::Access::DEVELOPER,
Gitlab::Access::NO_ACCESS] }
def self.human_access_levels
{
Gitlab::Access::MASTER => "Masters",
Gitlab::Access::DEVELOPER => "Developers + Masters",
Gitlab::Access::NO_ACCESS => "No one"
}.with_indifferent_access
end
def check_access(user)
return false if access_level == Gitlab::Access::NO_ACCESS
super
end
end
---
title: Allow 'no one' as an option for allowed to merge on a procted branch
merge_request:
author:
Loading
Loading
@@ -31,7 +31,7 @@ RSpec.shared_examples "protected branches > access control > CE" do
 
within(".protected-branches-list") do
find(".js-allowed-to-push").click
within('.js-allowed-to-push-container') do
expect(first("li")).to have_content("Roles")
click_on access_type_name
Loading
Loading
require 'spec_helper'
describe ProtectedBranch::MergeAccessLevel, :models do
it { is_expected.to validate_inclusion_of(:access_level).in_array([Gitlab::Access::MASTER, Gitlab::Access::DEVELOPER, Gitlab::Access::NO_ACCESS]) }
end
require 'spec_helper'
describe ProtectedBranch::PushAccessLevel, :models do
it { is_expected.to validate_inclusion_of(:access_level).in_array([Gitlab::Access::MASTER, Gitlab::Access::DEVELOPER, Gitlab::Access::NO_ACCESS]) }
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment