Commit 0b5b3ec3 authored by Rémy Coutable's avatar Rémy Coutable

Remove useless permission checks in Gitlab::Checks::ChangeAccess

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent bf073583
...@@ -30,9 +30,9 @@ module Gitlab ...@@ -30,9 +30,9 @@ module Gitlab
return unless @branch_name return unless @branch_name
return unless project.protected_branch?(@branch_name) return unless project.protected_branch?(@branch_name)
if forced_push? && user_access.cannot_do_action?(:force_push_code_to_protected_branches) if forced_push?
return "You are not allowed to force push code to a protected branch on this project." return "You are not allowed to force push code to a protected branch on this project."
elsif Gitlab::Git.blank_ref?(@newrev) && user_access.cannot_do_action?(:remove_protected_branches) elsif Gitlab::Git.blank_ref?(@newrev)
return "You are not allowed to delete protected branches from this project." return "You are not allowed to delete protected branches from this project."
end end
......
...@@ -56,7 +56,6 @@ describe Gitlab::Checks::ChangeAccess, lib: true do ...@@ -56,7 +56,6 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
it 'returns an error if the user is not allowed to do forced pushes to protected branches' do it 'returns an error if the user is not allowed to do forced pushes to protected branches' do
expect(Gitlab::Checks::ForcePush).to receive(:force_push?).and_return(true) expect(Gitlab::Checks::ForcePush).to receive(:force_push?).and_return(true)
expect(user_access).to receive(:can_do_action?).with(:force_push_code_to_protected_branches).and_return(false)
expect(subject.status).to be(false) expect(subject.status).to be(false)
expect(subject.message).to eq('You are not allowed to force push code to a protected branch on this project.') expect(subject.message).to eq('You are not allowed to force push code to a protected branch on this project.')
...@@ -88,8 +87,6 @@ describe Gitlab::Checks::ChangeAccess, lib: true do ...@@ -88,8 +87,6 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
end end
it 'returns an error if the user is not allowed to delete protected branches' do it 'returns an error if the user is not allowed to delete protected branches' do
expect(user_access).to receive(:can_do_action?).with(:remove_protected_branches).and_return(false)
expect(subject.status).to be(false) expect(subject.status).to be(false)
expect(subject.message).to eq('You are not allowed to delete protected branches from this project.') expect(subject.message).to eq('You are not allowed to delete protected branches from this project.')
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment