Commit 68712610 authored by Imre Farkas's avatar Imre Farkas

Merge branch '232507-change-name-of-readonly-ability-license_management' into 'master'

Resolve "Change name of readonly ability `license_management`"

See merge request gitlab-org/gitlab!38228
parents f1321c8a dbd6d74a
...@@ -5,6 +5,7 @@ module EE ...@@ -5,6 +5,7 @@ module EE
extend ActiveSupport::Concern extend ActiveSupport::Concern
READONLY_ABILITIES_EE = %i[ READONLY_ABILITIES_EE = %i[
admin_software_license_policy
modify_auto_fix_setting modify_auto_fix_setting
].freeze ].freeze
...@@ -14,7 +15,6 @@ module EE ...@@ -14,7 +15,6 @@ module EE
approvers approvers
vulnerability_feedback vulnerability_feedback
vulnerability vulnerability
license_management
feature_flag feature_flag
feature_flags_client feature_flags_client
iteration iteration
......
...@@ -674,7 +674,7 @@ RSpec.describe ProjectPolicy do ...@@ -674,7 +674,7 @@ RSpec.describe ProjectPolicy do
end end
end end
describe 'admin_license_management' do describe 'admin_software_license_policy' do
context 'without license scanning feature available' do context 'without license scanning feature available' do
before do before do
stub_licensed_features(license_scanning: false) stub_licensed_features(license_scanning: false)
...@@ -1388,8 +1388,7 @@ RSpec.describe ProjectPolicy do ...@@ -1388,8 +1388,7 @@ RSpec.describe ProjectPolicy do
update_pipeline_schedule admin_pipeline_schedule create_trigger update_trigger update_pipeline_schedule admin_pipeline_schedule create_trigger update_trigger
admin_trigger create_pages admin_release request_access create_board update_board admin_trigger create_pages admin_release request_access create_board update_board
create_issue_link update_issue_link create_approvers admin_approvers create_issue_link update_issue_link create_approvers admin_approvers
admin_vulnerability_feedback update_vulnerability create_license_management admin_vulnerability_feedback update_vulnerability create_feature_flags_client
update_license_management admin_license_management create_feature_flags_client
update_feature_flags_client update_iteration] update_feature_flags_client update_iteration]
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