diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-07 12:10:22 +0300 |
| commit | d51d5adf94ad965af8433ce6f74a81cfef5669e1 (patch) | |
| tree | 171c2e9a4de27337783677a60e5dd9e24fef5bf2 /spec/lib/gitlab/git_access_spec.rb | |
| parent | 2475461aa28c110fbfd24aed73354865ffdb6a48 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/git_access_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/git_access_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb index 42b64687fc1..a0cafe3d763 100644 --- a/spec/lib/gitlab/git_access_spec.rb +++ b/spec/lib/gitlab/git_access_spec.rb @@ -891,6 +891,10 @@ RSpec.describe Gitlab::GitAccess do # Expectations are given a custom failure message proc so that it's # easier to identify which check(s) failed. it "has the correct permissions for #{role}s" do + if role == :admin_without_admin_mode + skip("All admins are allowed to perform actions https://gitlab.com/gitlab-org/gitlab/-/issues/296509") + end + if [:admin_with_admin_mode, :admin_without_admin_mode].include?(role) user.update_attribute(:admin, true) enable_admin_mode!(user) if role == :admin_with_admin_mode |