Commit 1eee0c41 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '221259-move-package-services-to-core' into 'master'

Move package services and finders to core [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!36249
parents 67558190 d1fe61c1
......@@ -934,7 +934,6 @@ Rails/SaveBang:
- 'ee/spec/services/merge_requests/remove_approval_service_spec.rb'
- 'ee/spec/services/merge_requests/update_blocks_service_spec.rb'
- 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb'
- 'ee/spec/services/packages/conan/create_package_file_service_spec.rb'
- 'ee/spec/services/projects/after_rename_service_spec.rb'
- 'ee/spec/services/projects/import_export/export_service_spec.rb'
- 'ee/spec/services/projects/update_mirror_service_spec.rb'
......@@ -1411,6 +1410,7 @@ Rails/SaveBang:
- 'spec/services/notes/create_service_spec.rb'
- 'spec/services/notification_recipients/build_service_spec.rb'
- 'spec/services/notification_service_spec.rb'
- 'spec/services/packages/conan/create_package_file_service_spec.rb'
- 'spec/services/projects/after_rename_service_spec.rb'
- 'spec/services/projects/autocomplete_service_spec.rb'
- 'spec/services/projects/create_service_spec.rb'
......
......@@ -259,6 +259,7 @@ class ProjectPolicy < BasePolicy
enable :read_metrics_dashboard_annotation
enable :metrics_dashboard
enable :read_confidential_issues
enable :read_package
end
# We define `:public_user_access` separately because there are cases in gitlab-ee
......@@ -475,6 +476,7 @@ class ProjectPolicy < BasePolicy
end
rule { can?(:public_access) }.policy do
enable :read_package
enable :read_project
enable :read_board
enable :read_list
......
......@@ -227,7 +227,6 @@ module EE
enable :read_deploy_board
enable :admin_issue_link
enable :admin_epic_issue
enable :read_package
enable :read_group_timelogs
end
......@@ -253,8 +252,6 @@ module EE
enable :admin_iteration
end
rule { can?(:public_access) }.enable :read_package
rule { can?(:read_project) & iterations_available }.enable :read_iteration
rule { security_dashboard_enabled & can?(:developer_access) }.policy do
......
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