Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
a63bce1a
Commit
a63bce1a
authored
Jul 11, 2018
by
Mark Chao
Committed by
Dmitriy Zaporozhets
Jul 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Rename the `Master` role to `Maintainer`" Backend
parent
1bf54e09
Changes
495
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
495 changed files
with
1631 additions
and
1596 deletions
+1631
-1596
app/models/concerns/protected_ref_access.rb
app/models/concerns/protected_ref_access.rb
+4
-3
app/models/concerns/select_for_project_authorization.rb
app/models/concerns/select_for_project_authorization.rb
+5
-2
app/models/group.rb
app/models/group.rb
+10
-4
app/models/member.rb
app/models/member.rb
+4
-2
app/models/members/project_member.rb
app/models/members/project_member.rb
+3
-3
app/models/project.rb
app/models/project.rb
+4
-3
app/models/project_group_link.rb
app/models/project_group_link.rb
+2
-1
app/models/project_team.rb
app/models/project_team.rb
+15
-6
app/models/user.rb
app/models/user.rb
+13
-9
app/policies/clusters/cluster_policy.rb
app/policies/clusters/cluster_policy.rb
+1
-1
app/policies/deploy_token_policy.rb
app/policies/deploy_token_policy.rb
+2
-2
app/policies/group_policy.rb
app/policies/group_policy.rb
+2
-2
app/policies/project_policy.rb
app/policies/project_policy.rb
+4
-4
app/services/notification_service.rb
app/services/notification_service.rb
+5
-5
app/services/projects/create_service.rb
app/services/projects/create_service.rb
+1
-1
app/services/protected_branches/access_level_params.rb
app/services/protected_branches/access_level_params.rb
+1
-1
app/services/protected_branches/legacy_api_create_service.rb
app/services/protected_branches/legacy_api_create_service.rb
+2
-2
app/services/protected_branches/legacy_api_update_service.rb
app/services/protected_branches/legacy_api_update_service.rb
+2
-2
db/fixtures/development/12_snippets.rb
db/fixtures/development/12_snippets.rb
+1
-1
db/migrate/20160705054938_add_protected_branches_push_access.rb
...rate/20160705054938_add_protected_branches_push_access.rb
+1
-1
db/migrate/20160705054952_add_protected_branches_merge_access.rb
...ate/20160705054952_add_protected_branches_merge_access.rb
+1
-1
doc/raketasks/user_management.md
doc/raketasks/user_management.md
+1
-1
lib/gitlab/access.rb
lib/gitlab/access.rb
+13
-11
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+1
-1
lib/gitlab/project_authorizations/with_nested_groups.rb
lib/gitlab/project_authorizations/with_nested_groups.rb
+1
-1
lib/gitlab/project_authorizations/without_nested_groups.rb
lib/gitlab/project_authorizations/without_nested_groups.rb
+1
-1
lib/tasks/gitlab/bulk_add_permission.rake
lib/tasks/gitlab/bulk_add_permission.rake
+2
-2
qa/qa/page/project/settings/protected_branches.rb
qa/qa/page/project/settings/protected_branches.rb
+6
-0
spec/controllers/autocomplete_controller_spec.rb
spec/controllers/autocomplete_controller_spec.rb
+10
-10
spec/controllers/boards/issues_controller_spec.rb
spec/controllers/boards/issues_controller_spec.rb
+1
-1
spec/controllers/boards/lists_controller_spec.rb
spec/controllers/boards/lists_controller_spec.rb
+1
-1
spec/controllers/dashboard/groups_controller_spec.rb
spec/controllers/dashboard/groups_controller_spec.rb
+2
-2
spec/controllers/dashboard/milestones_controller_spec.rb
spec/controllers/dashboard/milestones_controller_spec.rb
+1
-1
spec/controllers/dashboard_controller_spec.rb
spec/controllers/dashboard_controller_spec.rb
+1
-1
spec/controllers/groups/boards_controller_spec.rb
spec/controllers/groups/boards_controller_spec.rb
+1
-1
spec/controllers/groups/milestones_controller_spec.rb
spec/controllers/groups/milestones_controller_spec.rb
+1
-1
spec/controllers/groups/runners_controller_spec.rb
spec/controllers/groups/runners_controller_spec.rb
+1
-1
spec/controllers/groups/settings/ci_cd_controller_spec.rb
spec/controllers/groups/settings/ci_cd_controller_spec.rb
+1
-1
spec/controllers/groups/variables_controller_spec.rb
spec/controllers/groups/variables_controller_spec.rb
+1
-1
spec/controllers/groups_controller_spec.rb
spec/controllers/groups_controller_spec.rb
+3
-3
spec/controllers/projects/avatars_controller_spec.rb
spec/controllers/projects/avatars_controller_spec.rb
+1
-1
spec/controllers/projects/badges_controller_spec.rb
spec/controllers/projects/badges_controller_spec.rb
+1
-1
spec/controllers/projects/blame_controller_spec.rb
spec/controllers/projects/blame_controller_spec.rb
+1
-1
spec/controllers/projects/blob_controller_spec.rb
spec/controllers/projects/blob_controller_spec.rb
+6
-6
spec/controllers/projects/boards_controller_spec.rb
spec/controllers/projects/boards_controller_spec.rb
+1
-1
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+1
-1
spec/controllers/projects/clusters/applications_controller_spec.rb
...rollers/projects/clusters/applications_controller_spec.rb
+2
-2
spec/controllers/projects/clusters_controller_spec.rb
spec/controllers/projects/clusters_controller_spec.rb
+18
-18
spec/controllers/projects/commit_controller_spec.rb
spec/controllers/projects/commit_controller_spec.rb
+1
-1
spec/controllers/projects/commits_controller_spec.rb
spec/controllers/projects/commits_controller_spec.rb
+1
-1
spec/controllers/projects/compare_controller_spec.rb
spec/controllers/projects/compare_controller_spec.rb
+1
-1
spec/controllers/projects/cycle_analytics_controller_spec.rb
spec/controllers/projects/cycle_analytics_controller_spec.rb
+1
-1
spec/controllers/projects/deploy_keys_controller_spec.rb
spec/controllers/projects/deploy_keys_controller_spec.rb
+1
-1
spec/controllers/projects/deployments_controller_spec.rb
spec/controllers/projects/deployments_controller_spec.rb
+1
-1
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+1
-1
spec/controllers/projects/find_file_controller_spec.rb
spec/controllers/projects/find_file_controller_spec.rb
+1
-1
spec/controllers/projects/graphs_controller_spec.rb
spec/controllers/projects/graphs_controller_spec.rb
+1
-1
spec/controllers/projects/group_links_controller_spec.rb
spec/controllers/projects/group_links_controller_spec.rb
+1
-1
spec/controllers/projects/hooks_controller_spec.rb
spec/controllers/projects/hooks_controller_spec.rb
+1
-1
spec/controllers/projects/imports_controller_spec.rb
spec/controllers/projects/imports_controller_spec.rb
+1
-1
spec/controllers/projects/issues_controller_spec.rb
spec/controllers/projects/issues_controller_spec.rb
+2
-2
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+1
-1
spec/controllers/projects/labels_controller_spec.rb
spec/controllers/projects/labels_controller_spec.rb
+1
-1
spec/controllers/projects/mattermosts_controller_spec.rb
spec/controllers/projects/mattermosts_controller_spec.rb
+1
-1
spec/controllers/projects/merge_requests/creations_controller_spec.rb
...lers/projects/merge_requests/creations_controller_spec.rb
+2
-2
spec/controllers/projects/merge_requests/diffs_controller_spec.rb
...trollers/projects/merge_requests/diffs_controller_spec.rb
+1
-1
spec/controllers/projects/milestones_controller_spec.rb
spec/controllers/projects/milestones_controller_spec.rb
+1
-1
spec/controllers/projects/pages_controller_spec.rb
spec/controllers/projects/pages_controller_spec.rb
+1
-1
spec/controllers/projects/pages_domains_controller_spec.rb
spec/controllers/projects/pages_domains_controller_spec.rb
+1
-1
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+14
-14
spec/controllers/projects/pipelines_settings_controller_spec.rb
...ontrollers/projects/pipelines_settings_controller_spec.rb
+1
-1
spec/controllers/projects/project_members_controller_spec.rb
spec/controllers/projects/project_members_controller_spec.rb
+10
-10
spec/controllers/projects/prometheus/metrics_controller_spec.rb
...ontrollers/projects/prometheus/metrics_controller_spec.rb
+1
-1
spec/controllers/projects/protected_branches_controller_spec.rb
...ontrollers/projects/protected_branches_controller_spec.rb
+4
-4
spec/controllers/projects/protected_tags_controller_spec.rb
spec/controllers/projects/protected_tags_controller_spec.rb
+1
-1
spec/controllers/projects/runners_controller_spec.rb
spec/controllers/projects/runners_controller_spec.rb
+1
-1
spec/controllers/projects/services_controller_spec.rb
spec/controllers/projects/services_controller_spec.rb
+1
-1
spec/controllers/projects/settings/ci_cd_controller_spec.rb
spec/controllers/projects/settings/ci_cd_controller_spec.rb
+3
-3
spec/controllers/projects/settings/integrations_controller_spec.rb
...rollers/projects/settings/integrations_controller_spec.rb
+1
-1
spec/controllers/projects/settings/repository_controller_spec.rb
...ntrollers/projects/settings/repository_controller_spec.rb
+1
-1
spec/controllers/projects/snippets_controller_spec.rb
spec/controllers/projects/snippets_controller_spec.rb
+3
-3
spec/controllers/projects/templates_controller_spec.rb
spec/controllers/projects/templates_controller_spec.rb
+1
-1
spec/controllers/projects/tree_controller_spec.rb
spec/controllers/projects/tree_controller_spec.rb
+1
-1
spec/controllers/projects/variables_controller_spec.rb
spec/controllers/projects/variables_controller_spec.rb
+1
-1
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+4
-4
spec/controllers/uploads_controller_spec.rb
spec/controllers/uploads_controller_spec.rb
+4
-4
spec/factories/group_members.rb
spec/factories/group_members.rb
+1
-1
spec/factories/project_members.rb
spec/factories/project_members.rb
+2
-2
spec/factories/projects.rb
spec/factories/projects.rb
+1
-1
spec/factories/protected_branches.rb
spec/factories/protected_branches.rb
+4
-4
spec/factories/protected_tags.rb
spec/factories/protected_tags.rb
+3
-3
spec/features/admin/admin_groups_spec.rb
spec/features/admin/admin_groups_spec.rb
+1
-1
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_projects_spec.rb
+2
-2
spec/features/atom/dashboard_issues_spec.rb
spec/features/atom/dashboard_issues_spec.rb
+2
-2
spec/features/atom/dashboard_spec.rb
spec/features/atom/dashboard_spec.rb
+1
-1
spec/features/atom/users_spec.rb
spec/features/atom/users_spec.rb
+1
-1
spec/features/boards/add_issues_modal_spec.rb
spec/features/boards/add_issues_modal_spec.rb
+1
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+2
-2
spec/features/boards/issue_ordering_spec.rb
spec/features/boards/issue_ordering_spec.rb
+1
-1
spec/features/boards/modal_filter_spec.rb
spec/features/boards/modal_filter_spec.rb
+1
-1
spec/features/boards/new_issue_spec.rb
spec/features/boards/new_issue_spec.rb
+1
-1
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+1
-1
spec/features/boards/sub_group_project_spec.rb
spec/features/boards/sub_group_project_spec.rb
+1
-1
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+1
-1
spec/features/cycle_analytics_spec.rb
spec/features/cycle_analytics_spec.rb
+3
-3
spec/features/dashboard/activity_spec.rb
spec/features/dashboard/activity_spec.rb
+1
-1
spec/features/dashboard/archived_projects_spec.rb
spec/features/dashboard/archived_projects_spec.rb
+2
-2
spec/features/dashboard/datetime_on_tooltips_spec.rb
spec/features/dashboard/datetime_on_tooltips_spec.rb
+2
-2
spec/features/dashboard/issues_filter_spec.rb
spec/features/dashboard/issues_filter_spec.rb
+1
-1
spec/features/dashboard/issues_spec.rb
spec/features/dashboard/issues_spec.rb
+1
-1
spec/features/dashboard/merge_requests_spec.rb
spec/features/dashboard/merge_requests_spec.rb
+2
-2
spec/features/dashboard/milestone_tabs_spec.rb
spec/features/dashboard/milestone_tabs_spec.rb
+1
-1
spec/features/dashboard/milestones_spec.rb
spec/features/dashboard/milestones_spec.rb
+1
-1
spec/features/dashboard/project_member_activity_index_spec.rb
.../features/dashboard/project_member_activity_index_spec.rb
+1
-1
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+1
-1
spec/features/discussion_comments/commit_spec.rb
spec/features/discussion_comments/commit_spec.rb
+1
-1
spec/features/discussion_comments/issue_spec.rb
spec/features/discussion_comments/issue_spec.rb
+1
-1
spec/features/discussion_comments/merge_request_spec.rb
spec/features/discussion_comments/merge_request_spec.rb
+1
-1
spec/features/discussion_comments/snippets_spec.rb
spec/features/discussion_comments/snippets_spec.rb
+1
-1
spec/features/global_search_spec.rb
spec/features/global_search_spec.rb
+1
-1
spec/features/group_variables_spec.rb
spec/features/group_variables_spec.rb
+1
-1
spec/features/groups/activity_spec.rb
spec/features/groups/activity_spec.rb
+1
-1
spec/features/groups/empty_states_spec.rb
spec/features/groups/empty_states_spec.rb
+1
-1
spec/features/groups/issues_spec.rb
spec/features/groups/issues_spec.rb
+2
-2
spec/features/groups/members/filter_members_spec.rb
spec/features/groups/members/filter_members_spec.rb
+1
-1
spec/features/groups/members/master_manages_access_requests_spec.rb
...res/groups/members/master_manages_access_requests_spec.rb
+2
-2
spec/features/groups/milestone_spec.rb
spec/features/groups/milestone_spec.rb
+1
-1
spec/features/groups/milestones_sorting_spec.rb
spec/features/groups/milestones_sorting_spec.rb
+1
-1
spec/features/ics/dashboard_issues_spec.rb
spec/features/ics/dashboard_issues_spec.rb
+1
-1
spec/features/ide_spec.rb
spec/features/ide_spec.rb
+1
-1
spec/features/invites_spec.rb
spec/features/invites_spec.rb
+1
-1
spec/features/issuables/close_reopen_report_toggle_spec.rb
spec/features/issuables/close_reopen_report_toggle_spec.rb
+2
-2
spec/features/issues/award_emoji_spec.rb
spec/features/issues/award_emoji_spec.rb
+1
-1
spec/features/issues/bulk_assignment_labels_spec.rb
spec/features/issues/bulk_assignment_labels_spec.rb
+1
-1
spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rb
...ues/create_issue_for_discussions_in_merge_request_spec.rb
+1
-1
spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
...eate_issue_for_single_discussion_in_merge_request_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_assignee_spec.rb
...features/issues/filtered_search/dropdown_assignee_spec.rb
+4
-4
spec/features/issues/filtered_search/dropdown_author_spec.rb
spec/features/issues/filtered_search/dropdown_author_spec.rb
+4
-4
spec/features/issues/filtered_search/dropdown_emoji_spec.rb
spec/features/issues/filtered_search/dropdown_emoji_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_hint_spec.rb
spec/features/issues/filtered_search/dropdown_hint_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_label_spec.rb
spec/features/issues/filtered_search/dropdown_label_spec.rb
+1
-1
spec/features/issues/filtered_search/dropdown_milestone_spec.rb
...eatures/issues/filtered_search/dropdown_milestone_spec.rb
+1
-1
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+1
-1
spec/features/issues/filtered_search/search_bar_spec.rb
spec/features/issues/filtered_search/search_bar_spec.rb
+1
-1
spec/features/issues/filtered_search/visual_tokens_spec.rb
spec/features/issues/filtered_search/visual_tokens_spec.rb
+2
-2
spec/features/issues/form_spec.rb
spec/features/issues/form_spec.rb
+3
-3
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+1
-1
spec/features/issues/spam_issues_spec.rb
spec/features/issues/spam_issues_spec.rb
+1
-1
spec/features/issues/todo_spec.rb
spec/features/issues/todo_spec.rb
+1
-1
spec/features/issues/update_issues_spec.rb
spec/features/issues/update_issues_spec.rb
+1
-1
spec/features/issues/user_uses_slash_commands_spec.rb
spec/features/issues/user_uses_slash_commands_spec.rb
+3
-3
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+1
-1
spec/features/markdown/gitlab_flavored_markdown_spec.rb
spec/features/markdown/gitlab_flavored_markdown_spec.rb
+1
-1
spec/features/merge_request/maintainer_edits_fork_spec.rb
spec/features/merge_request/maintainer_edits_fork_spec.rb
+1
-1
spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
...t/user_allows_commits_from_memebers_who_can_merge_spec.rb
+1
-1
spec/features/merge_request/user_cherry_picks_spec.rb
spec/features/merge_request/user_cherry_picks_spec.rb
+1
-1
spec/features/merge_request/user_customizes_merge_commit_message_spec.rb
...erge_request/user_customizes_merge_commit_message_spec.rb
+1
-1
spec/features/merge_request/user_merges_immediately_spec.rb
spec/features/merge_request/user_merges_immediately_spec.rb
+1
-1
spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb
...rge_request/user_merges_only_if_pipeline_succeeds_spec.rb
+1
-1
spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb
.../merge_request/user_merges_when_pipeline_succeeds_spec.rb
+1
-1
spec/features/merge_request/user_posts_notes_spec.rb
spec/features/merge_request/user_posts_notes_spec.rb
+1
-1
spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb
.../user_resolves_diff_notes_and_discussions_resolve_spec.rb
+2
-2
spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb
...ures/merge_request/user_sees_avatar_on_diff_notes_spec.rb
+1
-1
spec/features/merge_request/user_sees_closing_issues_message_spec.rb
...es/merge_request/user_sees_closing_issues_message_spec.rb
+1
-1
spec/features/merge_request/user_sees_deleted_target_branch_spec.rb
...res/merge_request/user_sees_deleted_target_branch_spec.rb
+1
-1
spec/features/merge_request/user_sees_discussions_spec.rb
spec/features/merge_request/user_sees_discussions_spec.rb
+1
-1
spec/features/merge_request/user_sees_empty_state_spec.rb
spec/features/merge_request/user_sees_empty_state_spec.rb
+1
-1
spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb
..._merge_button_depending_on_unresolved_discussions_spec.rb
+1
-1
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+3
-3
spec/features/merge_request/user_sees_pipelines_spec.rb
spec/features/merge_request/user_sees_pipelines_spec.rb
+2
-2
spec/features/merge_request/user_sees_versions_spec.rb
spec/features/merge_request/user_sees_versions_spec.rb
+1
-1
spec/features/merge_request/user_sees_wip_help_message_spec.rb
...features/merge_request/user_sees_wip_help_message_spec.rb
+1
-1
spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
...es/merge_request/user_selects_branches_for_new_mr_spec.rb
+1
-1
spec/features/merge_request/user_toggles_whitespace_changes_spec.rb
...res/merge_request/user_toggles_whitespace_changes_spec.rb
+1
-1
spec/features/merge_request/user_uses_slash_commands_spec.rb
spec/features/merge_request/user_uses_slash_commands_spec.rb
+2
-2
spec/features/merge_requests/user_mass_updates_spec.rb
spec/features/merge_requests/user_mass_updates_spec.rb
+1
-1
spec/features/merge_requests/user_squashes_merge_request_spec.rb
...atures/merge_requests/user_squashes_merge_request_spec.rb
+1
-1
spec/features/milestone_spec.rb
spec/features/milestone_spec.rb
+1
-1
spec/features/profiles/user_visits_notifications_tab_spec.rb
spec/features/profiles/user_visits_notifications_tab_spec.rb
+1
-1
spec/features/profiles/user_visits_profile_spec.rb
spec/features/profiles/user_visits_profile_spec.rb
+1
-1
spec/features/project_variables_spec.rb
spec/features/project_variables_spec.rb
+1
-1
spec/features/projects/actve_tabs_spec.rb
spec/features/projects/actve_tabs_spec.rb
+1
-1
spec/features/projects/awards/user_interacts_with_awards_in_issue_spec.rb
...ojects/awards/user_interacts_with_awards_in_issue_spec.rb
+1
-1
spec/features/projects/badges/list_spec.rb
spec/features/projects/badges/list_spec.rb
+1
-1
spec/features/projects/blobs/blob_show_spec.rb
spec/features/projects/blobs/blob_show_spec.rb
+6
-6
spec/features/projects/blobs/edit_spec.rb
spec/features/projects/blobs/edit_spec.rb
+2
-2
spec/features/projects/blobs/user_creates_new_blob_in_new_project_spec.rb
...ojects/blobs/user_creates_new_blob_in_new_project_spec.rb
+2
-2
spec/features/projects/branches/new_branch_ref_dropdown_spec.rb
...eatures/projects/branches/new_branch_ref_dropdown_spec.rb
+1
-1
spec/features/projects/branches_spec.rb
spec/features/projects/branches_spec.rb
+2
-2
spec/features/projects/clusters/applications_spec.rb
spec/features/projects/clusters/applications_spec.rb
+1
-1
spec/features/projects/clusters/gcp_spec.rb
spec/features/projects/clusters/gcp_spec.rb
+1
-1
spec/features/projects/clusters/user_spec.rb
spec/features/projects/clusters/user_spec.rb
+1
-1
spec/features/projects/clusters_spec.rb
spec/features/projects/clusters_spec.rb
+1
-1
spec/features/projects/commit/builds_spec.rb
spec/features/projects/commit/builds_spec.rb
+1
-1
spec/features/projects/commit/cherry_pick_spec.rb
spec/features/projects/commit/cherry_pick_spec.rb
+1
-1
spec/features/projects/commit/diff_notes_spec.rb
spec/features/projects/commit/diff_notes_spec.rb
+1
-1
spec/features/projects/commits/user_browses_commits_spec.rb
spec/features/projects/commits/user_browses_commits_spec.rb
+1
-1
spec/features/projects/compare_spec.rb
spec/features/projects/compare_spec.rb
+1
-1
spec/features/projects/deploy_keys_spec.rb
spec/features/projects/deploy_keys_spec.rb
+1
-1
spec/features/projects/diffs/diff_show_spec.rb
spec/features/projects/diffs/diff_show_spec.rb
+1
-1
spec/features/projects/environments/environment_spec.rb
spec/features/projects/environments/environment_spec.rb
+2
-2
spec/features/projects/environments/environments_spec.rb
spec/features/projects/environments/environments_spec.rb
+2
-2
spec/features/projects/features_visibility_spec.rb
spec/features/projects/features_visibility_spec.rb
+2
-2
spec/features/projects/files/project_owner_creates_license_file_spec.rb
...projects/files/project_owner_creates_license_file_spec.rb
+5
-5
spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
...sees_link_to_create_license_file_in_empty_project_spec.rb
+3
-3
spec/features/projects/files/template_selector_menu_spec.rb
spec/features/projects/files/template_selector_menu_spec.rb
+1
-1
spec/features/projects/files/user_creates_files_spec.rb
spec/features/projects/files/user_creates_files_spec.rb
+1
-1
spec/features/projects/files/user_deletes_files_spec.rb
spec/features/projects/files/user_deletes_files_spec.rb
+1
-1
spec/features/projects/files/user_edits_files_spec.rb
spec/features/projects/files/user_edits_files_spec.rb
+1
-1
spec/features/projects/files/user_find_file_spec.rb
spec/features/projects/files/user_find_file_spec.rb
+1
-1
spec/features/projects/files/user_reads_pipeline_status_spec.rb
...eatures/projects/files/user_reads_pipeline_status_spec.rb
+1
-1
spec/features/projects/files/user_replaces_files_spec.rb
spec/features/projects/files/user_replaces_files_spec.rb
+1
-1
spec/features/projects/files/user_uploads_files_spec.rb
spec/features/projects/files/user_uploads_files_spec.rb
+1
-1
spec/features/projects/fork_spec.rb
spec/features/projects/fork_spec.rb
+2
-2
spec/features/projects/graph_spec.rb
spec/features/projects/graph_spec.rb
+1
-1
spec/features/projects/hook_logs/user_reads_log_spec.rb
spec/features/projects/hook_logs/user_reads_log_spec.rb
+1
-1
spec/features/projects/issuable_templates_spec.rb
spec/features/projects/issuable_templates_spec.rb
+1
-1
spec/features/projects/jobs/user_browses_job_spec.rb
spec/features/projects/jobs/user_browses_job_spec.rb
+1
-1
spec/features/projects/jobs/user_browses_jobs_spec.rb
spec/features/projects/jobs/user_browses_jobs_spec.rb
+1
-1
spec/features/projects/labels/user_creates_labels_spec.rb
spec/features/projects/labels/user_creates_labels_spec.rb
+2
-2
spec/features/projects/labels/user_edits_labels_spec.rb
spec/features/projects/labels/user_edits_labels_spec.rb
+1
-1
spec/features/projects/labels/user_removes_labels_spec.rb
spec/features/projects/labels/user_removes_labels_spec.rb
+1
-1
spec/features/projects/members/anonymous_user_sees_members_spec.rb
...ures/projects/members/anonymous_user_sees_members_spec.rb
+1
-1
spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
...member_cannot_request_access_to_his_group_project_spec.rb
+2
-2
spec/features/projects/members/groups_with_access_list_spec.rb
...features/projects/members/groups_with_access_list_spec.rb
+1
-1
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
...s/members/master_adds_member_with_expiration_date_spec.rb
+4
-4
spec/features/projects/members/master_manages_access_requests_spec.rb
...s/projects/members/master_manages_access_requests_spec.rb
+2
-2
spec/features/projects/members/share_with_group_spec.rb
spec/features/projects/members/share_with_group_spec.rb
+15
-15
spec/features/projects/members/sorting_spec.rb
spec/features/projects/members/sorting_spec.rb
+12
-12
spec/features/projects/members/user_requests_access_spec.rb
spec/features/projects/members/user_requests_access_spec.rb
+2
-2
spec/features/projects/merge_requests/user_closes_merge_request_spec.rb
...projects/merge_requests/user_closes_merge_request_spec.rb
+1
-1
spec/features/projects/merge_requests/user_comments_on_commit_spec.rb
...s/projects/merge_requests/user_comments_on_commit_spec.rb
+1
-1
spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
...res/projects/merge_requests/user_comments_on_diff_spec.rb
+1
-1
spec/features/projects/merge_requests/user_comments_on_merge_request_spec.rb
...cts/merge_requests/user_comments_on_merge_request_spec.rb
+1
-1
spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
...rojects/merge_requests/user_creates_merge_request_spec.rb
+1
-1
spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
.../projects/merge_requests/user_edits_merge_request_spec.rb
+1
-1
spec/features/projects/merge_requests/user_manages_subscription_spec.rb
...projects/merge_requests/user_manages_subscription_spec.rb
+1
-1
spec/features/projects/merge_requests/user_reopens_merge_request_spec.rb
...rojects/merge_requests/user_reopens_merge_request_spec.rb
+1
-1
spec/features/projects/merge_requests/user_sorts_merge_requests_spec.rb
...projects/merge_requests/user_sorts_merge_requests_spec.rb
+1
-1
spec/features/projects/merge_requests/user_views_open_merge_request_spec.rb
...ects/merge_requests/user_views_open_merge_request_spec.rb
+1
-1
spec/features/projects/milestones/user_interacts_with_labels_spec.rb
...es/projects/milestones/user_interacts_with_labels_spec.rb
+1
-1
spec/features/projects/new_project_spec.rb
spec/features/projects/new_project_spec.rb
+1
-1
spec/features/projects/pages_spec.rb
spec/features/projects/pages_spec.rb
+1
-1
spec/features/projects/pipeline_schedules_spec.rb
spec/features/projects/pipeline_schedules_spec.rb
+2
-2
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+1
-1
spec/features/projects/remote_mirror_spec.rb
spec/features/projects/remote_mirror_spec.rb
+1
-1
spec/features/projects/services/user_activates_asana_spec.rb
spec/features/projects/services/user_activates_asana_spec.rb
+1
-1
spec/features/projects/services/user_activates_assembla_spec.rb
...eatures/projects/services/user_activates_assembla_spec.rb
+1
-1
spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
...jects/services/user_activates_atlassian_bamboo_ci_spec.rb
+1
-1
spec/features/projects/services/user_activates_emails_on_push_spec.rb
...s/projects/services/user_activates_emails_on_push_spec.rb
+1
-1
spec/features/projects/services/user_activates_flowdock_spec.rb
...eatures/projects/services/user_activates_flowdock_spec.rb
+1
-1
spec/features/projects/services/user_activates_hipchat_spec.rb
...features/projects/services/user_activates_hipchat_spec.rb
+1
-1
spec/features/projects/services/user_activates_irker_spec.rb
spec/features/projects/services/user_activates_irker_spec.rb
+1
-1
spec/features/projects/services/user_activates_issue_tracker_spec.rb
...es/projects/services/user_activates_issue_tracker_spec.rb
+1
-1
spec/features/projects/services/user_activates_jetbrains_teamcity_ci_spec.rb
...cts/services/user_activates_jetbrains_teamcity_ci_spec.rb
+1
-1
spec/features/projects/services/user_activates_jira_spec.rb
spec/features/projects/services/user_activates_jira_spec.rb
+1
-1
spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
.../services/user_activates_mattermost_slash_command_spec.rb
+1
-1
spec/features/projects/services/user_activates_packagist_spec.rb
...atures/projects/services/user_activates_packagist_spec.rb
+1
-1
spec/features/projects/services/user_activates_pivotaltracker_spec.rb
...s/projects/services/user_activates_pivotaltracker_spec.rb
+1
-1
spec/features/projects/services/user_activates_prometheus_spec.rb
...tures/projects/services/user_activates_prometheus_spec.rb
+1
-1
spec/features/projects/services/user_activates_pushover_spec.rb
...eatures/projects/services/user_activates_pushover_spec.rb
+1
-1
spec/features/projects/services/user_activates_slack_notifications_spec.rb
...jects/services/user_activates_slack_notifications_spec.rb
+1
-1
spec/features/projects/services/user_activates_slack_slash_command_spec.rb
...jects/services/user_activates_slack_slash_command_spec.rb
+1
-1
spec/features/projects/services/user_views_services_spec.rb
spec/features/projects/services/user_views_services_spec.rb
+1
-1
spec/features/projects/settings/forked_project_settings_spec.rb
...eatures/projects/settings/forked_project_settings_spec.rb
+2
-2
spec/features/projects/settings/integration_settings_spec.rb
spec/features/projects/settings/integration_settings_spec.rb
+2
-2
spec/features/projects/settings/lfs_settings_spec.rb
spec/features/projects/settings/lfs_settings_spec.rb
+3
-3
spec/features/projects/settings/pipelines_settings_spec.rb
spec/features/projects/settings/pipelines_settings_spec.rb
+2
-2
spec/features/projects/settings/project_badges_spec.rb
spec/features/projects/settings/project_badges_spec.rb
+1
-1
spec/features/projects/settings/repository_settings_spec.rb
spec/features/projects/settings/repository_settings_spec.rb
+3
-3
spec/features/projects/settings/user_archives_project_spec.rb
.../features/projects/settings/user_archives_project_spec.rb
+1
-1
spec/features/projects/settings/user_changes_avatar_spec.rb
spec/features/projects/settings/user_changes_avatar_spec.rb
+1
-1
spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb
...projects/settings/user_interacts_with_deploy_keys_spec.rb
+2
-2
spec/features/projects/settings/user_manages_group_links_spec.rb
...atures/projects/settings/user_manages_group_links_spec.rb
+2
-2
spec/features/projects/settings/user_manages_project_members_spec.rb
...es/projects/settings/user_manages_project_members_spec.rb
+3
-3
spec/features/projects/settings/visibility_settings_spec.rb
spec/features/projects/settings/visibility_settings_spec.rb
+4
-4
spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
...es/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+4
-4
spec/features/projects/snippets/create_snippet_spec.rb
spec/features/projects/snippets/create_snippet_spec.rb
+1
-1
spec/features/projects/snippets/show_spec.rb
spec/features/projects/snippets/show_spec.rb
+1
-1
spec/features/projects/snippets/user_comments_on_snippet_spec.rb
...atures/projects/snippets/user_comments_on_snippet_spec.rb
+1
-1
spec/features/projects/snippets/user_deletes_snippet_spec.rb
spec/features/projects/snippets/user_deletes_snippet_spec.rb
+1
-1
spec/features/projects/snippets/user_updates_snippet_spec.rb
spec/features/projects/snippets/user_updates_snippet_spec.rb
+1
-1
spec/features/projects/snippets/user_views_snippets_spec.rb
spec/features/projects/snippets/user_views_snippets_spec.rb
+1
-1
spec/features/projects/sub_group_issuables_spec.rb
spec/features/projects/sub_group_issuables_spec.rb
+1
-1
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+1
-1
spec/features/projects/tree/create_file_spec.rb
spec/features/projects/tree/create_file_spec.rb
+1
-1
spec/features/projects/tree/tree_show_spec.rb
spec/features/projects/tree/tree_show_spec.rb
+1
-1
spec/features/projects/tree/upload_file_spec.rb
spec/features/projects/tree/upload_file_spec.rb
+1
-1
spec/features/projects/user_uses_shortcuts_spec.rb
spec/features/projects/user_uses_shortcuts_spec.rb
+1
-1
spec/features/projects/user_views_empty_project_spec.rb
spec/features/projects/user_views_empty_project_spec.rb
+2
-2
spec/features/projects/view_on_env_spec.rb
spec/features/projects/view_on_env_spec.rb
+1
-1
spec/features/projects/wiki/markdown_preview_spec.rb
spec/features/projects/wiki/markdown_preview_spec.rb
+1
-1
spec/features/projects/wiki/user_creates_wiki_page_spec.rb
spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+1
-1
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+1
-1
spec/features/projects/wiki/user_views_wiki_in_project_page_spec.rb
...res/projects/wiki/user_views_wiki_in_project_page_spec.rb
+1
-1
spec/features/projects/wiki/user_views_wiki_page_spec.rb
spec/features/projects/wiki/user_views_wiki_page_spec.rb
+1
-1
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+3
-3
spec/features/protected_branches_spec.rb
spec/features/protected_branches_spec.rb
+2
-2
spec/features/reportable_note/commit_spec.rb
spec/features/reportable_note/commit_spec.rb
+1
-1
spec/features/reportable_note/issue_spec.rb
spec/features/reportable_note/issue_spec.rb
+1
-1
spec/features/reportable_note/merge_request_spec.rb
spec/features/reportable_note/merge_request_spec.rb
+1
-1
spec/features/reportable_note/snippets_spec.rb
spec/features/reportable_note/snippets_spec.rb
+1
-1
spec/features/runners_spec.rb
spec/features/runners_spec.rb
+7
-7
spec/features/search/user_searches_for_code_spec.rb
spec/features/search/user_searches_for_code_spec.rb
+1
-1
spec/features/search/user_searches_for_issues_spec.rb
spec/features/search/user_searches_for_issues_spec.rb
+1
-1
spec/features/search/user_searches_for_merge_requests_spec.rb
.../features/search/user_searches_for_merge_requests_spec.rb
+1
-1
spec/features/search/user_searches_for_milestones_spec.rb
spec/features/search/user_searches_for_milestones_spec.rb
+1
-1
spec/features/search/user_searches_for_wiki_pages_spec.rb
spec/features/search/user_searches_for_wiki_pages_spec.rb
+1
-1
spec/features/security/group/internal_access_spec.rb
spec/features/security/group/internal_access_spec.rb
+5
-5
spec/features/security/group/private_access_spec.rb
spec/features/security/group/private_access_spec.rb
+5
-5
spec/features/security/group/public_access_spec.rb
spec/features/security/group/public_access_spec.rb
+5
-5
spec/features/security/project/internal_access_spec.rb
spec/features/security/project/internal_access_spec.rb
+34
-34
spec/features/security/project/private_access_spec.rb
spec/features/security/project/private_access_spec.rb
+31
-31
spec/features/security/project/public_access_spec.rb
spec/features/security/project/public_access_spec.rb
+34
-34
spec/features/security/project/snippet/internal_access_spec.rb
...features/security/project/snippet/internal_access_spec.rb
+6
-6
spec/features/security/project/snippet/private_access_spec.rb
.../features/security/project/snippet/private_access_spec.rb
+4
-4
spec/features/security/project/snippet/public_access_spec.rb
spec/features/security/project/snippet/public_access_spec.rb
+8
-8
spec/features/signed_commits_spec.rb
spec/features/signed_commits_spec.rb
+3
-3
spec/features/tags/master_creates_tag_spec.rb
spec/features/tags/master_creates_tag_spec.rb
+2
-2
spec/features/tags/master_deletes_tag_spec.rb
spec/features/tags/master_deletes_tag_spec.rb
+2
-2
spec/features/tags/master_updates_tag_spec.rb
spec/features/tags/master_updates_tag_spec.rb
+2
-2
spec/features/tags/master_views_tags_spec.rb
spec/features/tags/master_views_tags_spec.rb
+2
-2
spec/features/task_lists_spec.rb
spec/features/task_lists_spec.rb
+1
-1
spec/features/triggers_spec.rb
spec/features/triggers_spec.rb
+2
-2
spec/features/users/user_browses_projects_on_user_page_spec.rb
...features/users/user_browses_projects_on_user_page_spec.rb
+3
-3
spec/finders/access_requests_finder_spec.rb
spec/finders/access_requests_finder_spec.rb
+2
-2
spec/finders/admin/projects_finder_spec.rb
spec/finders/admin/projects_finder_spec.rb
+1
-1
spec/finders/concerns/finder_with_cross_project_access_spec.rb
...finders/concerns/finder_with_cross_project_access_spec.rb
+1
-1
spec/finders/contributed_projects_finder_spec.rb
spec/finders/contributed_projects_finder_spec.rb
+2
-2
spec/finders/environments_finder_spec.rb
spec/finders/environments_finder_spec.rb
+1
-1
spec/finders/group_members_finder_spec.rb
spec/finders/group_members_finder_spec.rb
+12
-12
spec/finders/group_projects_finder_spec.rb
spec/finders/group_projects_finder_spec.rb
+7
-7
spec/finders/issues_finder_spec.rb
spec/finders/issues_finder_spec.rb
+1
-1
spec/finders/joined_groups_finder_spec.rb
spec/finders/joined_groups_finder_spec.rb
+5
-5
spec/finders/members_finder_spec.rb
spec/finders/members_finder_spec.rb
+6
-6
spec/finders/merge_requests_finder_spec.rb
spec/finders/merge_requests_finder_spec.rb
+2
-2
spec/finders/move_to_project_finder_spec.rb
spec/finders/move_to_project_finder_spec.rb
+9
-9
spec/finders/notes_finder_spec.rb
spec/finders/notes_finder_spec.rb
+1
-1
spec/finders/projects_finder_spec.rb
spec/finders/projects_finder_spec.rb
+2
-2
spec/fixtures/trace/sample_trace
spec/fixtures/trace/sample_trace
+16
-16
spec/helpers/markup_helper_spec.rb
spec/helpers/markup_helper_spec.rb
+1
-1
spec/helpers/notes_helper_spec.rb
spec/helpers/notes_helper_spec.rb
+8
-8
spec/javascripts/fixtures/commit.rb
spec/javascripts/fixtures/commit.rb
+1
-1
spec/javascripts/fixtures/groups.rb
spec/javascripts/fixtures/groups.rb
+1
-1
spec/javascripts/fixtures/projects.rb
spec/javascripts/fixtures/projects.rb
+1
-1
spec/lib/banzai/filter/redactor_filter_spec.rb
spec/lib/banzai/filter/redactor_filter_spec.rb
+1
-1
spec/lib/gitlab/checks/change_access_spec.rb
spec/lib/gitlab/checks/change_access_spec.rb
+2
-2
spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
+2
-2
spec/lib/gitlab/ci/status/build/play_spec.rb
spec/lib/gitlab/ci/status/build/play_spec.rb
+1
-1
spec/lib/gitlab/ci/status/stage/common_spec.rb
spec/lib/gitlab/ci/status/stage/common_spec.rb
+1
-1
spec/lib/gitlab/closing_issue_extractor_spec.rb
spec/lib/gitlab/closing_issue_extractor_spec.rb
+2
-2
spec/lib/gitlab/cycle_analytics/permissions_spec.rb
spec/lib/gitlab/cycle_analytics/permissions_spec.rb
+2
-2
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+14
-14
spec/lib/gitlab/google_code_import/importer_spec.rb
spec/lib/gitlab/google_code_import/importer_spec.rb
+1
-1
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+1
-1
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+3
-3
spec/lib/gitlab/import_export/repo_saver_spec.rb
spec/lib/gitlab/import_export/repo_saver_spec.rb
+1
-1
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb
+1
-1
spec/lib/gitlab/middleware/go_spec.rb
spec/lib/gitlab/middleware/go_spec.rb
+1
-1
spec/lib/gitlab/project_authorizations_spec.rb
spec/lib/gitlab/project_authorizations_spec.rb
+3
-3
spec/lib/gitlab/project_search_results_spec.rb
spec/lib/gitlab/project_search_results_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_move_spec.rb
spec/lib/gitlab/slash_commands/issue_move_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_new_spec.rb
spec/lib/gitlab/slash_commands/issue_new_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_search_spec.rb
spec/lib/gitlab/slash_commands/issue_search_spec.rb
+1
-1
spec/lib/gitlab/slash_commands/issue_show_spec.rb
spec/lib/gitlab/slash_commands/issue_show_spec.rb
+1
-1
spec/lib/gitlab/user_access_spec.rb
spec/lib/gitlab/user_access_spec.rb
+20
-20
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+8
-8
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+4
-4
spec/models/concerns/protected_ref_access_spec.rb
spec/models/concerns/protected_ref_access_spec.rb
+5
-5
spec/models/concerns/resolvable_discussion_spec.rb
spec/models/concerns/resolvable_discussion_spec.rb
+1
-1
spec/models/group_spec.rb
spec/models/group_spec.rb
+24
-24
spec/models/hooks/system_hook_spec.rb
spec/models/hooks/system_hook_spec.rb
+4
-4
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+1
-1
spec/models/lfs_file_lock_spec.rb
spec/models/lfs_file_lock_spec.rb
+6
-6
spec/models/member_spec.rb
spec/models/member_spec.rb
+43
-43
spec/models/members/group_member_spec.rb
spec/models/members/group_member_spec.rb
+1
-1
spec/models/members/project_member_spec.rb
spec/models/members/project_member_spec.rb
+5
-5
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+4
-4
spec/models/note_spec.rb
spec/models/note_spec.rb
+3
-3
spec/models/project_authorization_spec.rb
spec/models/project_authorization_spec.rb
+3
-3
spec/models/project_spec.rb
spec/models/project_spec.rb
+5
-5
spec/models/project_team_spec.rb
spec/models/project_team_spec.rb
+54
-54
spec/models/protected_branch/merge_access_level_spec.rb
spec/models/protected_branch/merge_access_level_spec.rb
+1
-1
spec/models/protected_branch/push_access_level_spec.rb
spec/models/protected_branch/push_access_level_spec.rb
+1
-1
spec/models/user_spec.rb
spec/models/user_spec.rb
+33
-33
spec/policies/ci/build_policy_spec.rb
spec/policies/ci/build_policy_spec.rb
+5
-5
spec/policies/ci/pipeline_schedule_policy_spec.rb
spec/policies/ci/pipeline_schedule_policy_spec.rb
+4
-4
spec/policies/ci/trigger_policy_spec.rb
spec/policies/ci/trigger_policy_spec.rb
+6
-6
spec/policies/clusters/cluster_policy_spec.rb
spec/policies/clusters/cluster_policy_spec.rb
+2
-2
spec/policies/deploy_key_policy_spec.rb
spec/policies/deploy_key_policy_spec.rb
+1
-1
spec/policies/deploy_token_policy_spec.rb
spec/policies/deploy_token_policy_spec.rb
+6
-6
spec/policies/environment_policy_spec.rb
spec/policies/environment_policy_spec.rb
+10
-10
spec/policies/global_policy_spec.rb
spec/policies/global_policy_spec.rb
+2
-2
spec/policies/group_policy_spec.rb
spec/policies/group_policy_spec.rb
+21
-21
spec/policies/project_policy_spec.rb
spec/policies/project_policy_spec.rb
+15
-15
spec/policies/protected_branch_policy_spec.rb
spec/policies/protected_branch_policy_spec.rb
+2
-2
spec/presenters/merge_request_presenter_spec.rb
spec/presenters/merge_request_presenter_spec.rb
+3
-3
spec/presenters/project_presenter_spec.rb
spec/presenters/project_presenter_spec.rb
+4
-4
spec/requests/api/access_requests_spec.rb
spec/requests/api/access_requests_spec.rb
+19
-19
spec/requests/api/award_emoji_spec.rb
spec/requests/api/award_emoji_spec.rb
+1
-1
spec/requests/api/badges_spec.rb
spec/requests/api/badges_spec.rb
+27
-27
spec/requests/api/branches_spec.rb
spec/requests/api/branches_spec.rb
+8
-8
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+5
-5
spec/requests/api/deployments_spec.rb
spec/requests/api/deployments_spec.rb
+1
-1
spec/requests/api/environments_spec.rb
spec/requests/api/environments_spec.rb
+3
-3
spec/requests/api/group_variables_spec.rb
spec/requests/api/group_variables_spec.rb
+5
-5
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+4
-4
spec/requests/api/issues_spec.rb
spec/requests/api/issues_spec.rb
+1
-1
spec/requests/api/jobs_spec.rb
spec/requests/api/jobs_spec.rb
+1
-1
spec/requests/api/labels_spec.rb
spec/requests/api/labels_spec.rb
+1
-1
spec/requests/api/members_spec.rb
spec/requests/api/members_spec.rb
+42
-42
spec/requests/api/merge_request_diffs_spec.rb
spec/requests/api/merge_request_diffs_spec.rb
+1
-1
spec/requests/api/notes_spec.rb
spec/requests/api/notes_spec.rb
+1
-1
spec/requests/api/pages_domains_spec.rb
spec/requests/api/pages_domains_spec.rb
+14
-14
spec/requests/api/pipeline_schedules_spec.rb
spec/requests/api/pipeline_schedules_spec.rb
+11
-11
spec/requests/api/pipelines_spec.rb
spec/requests/api/pipelines_spec.rb
+1
-1
spec/requests/api/project_export_spec.rb
spec/requests/api/project_export_spec.rb
+19
-19
spec/requests/api/project_hooks_spec.rb
spec/requests/api/project_hooks_spec.rb
+2
-2
spec/requests/api/project_import_spec.rb
spec/requests/api/project_import_spec.rb
+2
-2
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+7
-7
spec/requests/api/protected_branches_spec.rb
spec/requests/api/protected_branches_spec.rb
+17
-17
spec/requests/api/repositories_spec.rb
spec/requests/api/repositories_spec.rb
+1
-1
spec/requests/api/runners_spec.rb
spec/requests/api/runners_spec.rb
+4
-4
spec/requests/api/tags_spec.rb
spec/requests/api/tags_spec.rb
+7
-7
spec/requests/api/triggers_spec.rb
spec/requests/api/triggers_spec.rb
+1
-1
spec/requests/api/variables_spec.rb
spec/requests/api/variables_spec.rb
+1
-1
spec/requests/api/wikis_spec.rb
spec/requests/api/wikis_spec.rb
+31
-31
spec/requests/git_http_spec.rb
spec/requests/git_http_spec.rb
+6
-6
spec/requests/lfs_http_spec.rb
spec/requests/lfs_http_spec.rb
+7
-7
spec/requests/lfs_locks_api_spec.rb
spec/requests/lfs_locks_api_spec.rb
+3
-3
spec/serializers/deploy_key_entity_spec.rb
spec/serializers/deploy_key_entity_spec.rb
+2
-2
spec/serializers/group_child_entity_spec.rb
spec/serializers/group_child_entity_spec.rb
+1
-1
spec/services/auth/container_registry_authentication_service_spec.rb
...es/auth/container_registry_authentication_service_spec.rb
+2
-2
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+4
-4
spec/services/ci/retry_pipeline_service_spec.rb
spec/services/ci/retry_pipeline_service_spec.rb
+2
-2
spec/services/ci/stop_environments_service_spec.rb
spec/services/ci/stop_environments_service_spec.rb
+1
-1
spec/services/discussions/resolve_service_spec.rb
spec/services/discussions/resolve_service_spec.rb
+1
-1
spec/services/files/create_service_spec.rb
spec/services/files/create_service_spec.rb
+1
-1
spec/services/files/delete_service_spec.rb
spec/services/files/delete_service_spec.rb
+1
-1
spec/services/files/multi_service_spec.rb
spec/services/files/multi_service_spec.rb
+1
-1
spec/services/files/update_service_spec.rb
spec/services/files/update_service_spec.rb
+1
-1
spec/services/git_push_service_spec.rb
spec/services/git_push_service_spec.rb
+6
-6
spec/services/groups/update_service_spec.rb
spec/services/groups/update_service_spec.rb
+4
-4
spec/services/issues/close_service_spec.rb
spec/services/issues/close_service_spec.rb
+1
-1
spec/services/issues/create_service_spec.rb
spec/services/issues/create_service_spec.rb
+8
-8
spec/services/issues/reopen_service_spec.rb
spec/services/issues/reopen_service_spec.rb
+1
-1
spec/services/issues/update_service_spec.rb
spec/services/issues/update_service_spec.rb
+2
-2
spec/services/lfs/unlock_file_service_spec.rb
spec/services/lfs/unlock_file_service_spec.rb
+3
-3
spec/services/members/approve_access_request_service_spec.rb
spec/services/members/approve_access_request_service_spec.rb
+3
-3
spec/services/members/create_service_spec.rb
spec/services/members/create_service_spec.rb
+1
-1
spec/services/members/destroy_service_spec.rb
spec/services/members/destroy_service_spec.rb
+3
-3
spec/services/members/update_service_spec.rb
spec/services/members/update_service_spec.rb
+3
-3
spec/services/merge_requests/close_service_spec.rb
spec/services/merge_requests/close_service_spec.rb
+1
-1
spec/services/merge_requests/create_service_spec.rb
spec/services/merge_requests/create_service_spec.rb
+10
-10
spec/services/merge_requests/ff_merge_service_spec.rb
spec/services/merge_requests/ff_merge_service_spec.rb
+1
-1
spec/services/merge_requests/merge_service_spec.rb
spec/services/merge_requests/merge_service_spec.rb
+1
-1
spec/services/merge_requests/post_merge_service_spec.rb
spec/services/merge_requests/post_merge_service_spec.rb
+1
-1
spec/services/merge_requests/rebase_service_spec.rb
spec/services/merge_requests/rebase_service_spec.rb
+1
-1
spec/services/merge_requests/reopen_service_spec.rb
spec/services/merge_requests/reopen_service_spec.rb
+1
-1
spec/services/merge_requests/update_service_spec.rb
spec/services/merge_requests/update_service_spec.rb
+1
-1
spec/services/milestones/close_service_spec.rb
spec/services/milestones/close_service_spec.rb
+1
-1
spec/services/milestones/create_service_spec.rb
spec/services/milestones/create_service_spec.rb
+1
-1
spec/services/milestones/destroy_service_spec.rb
spec/services/milestones/destroy_service_spec.rb
+1
-1
spec/services/milestones/promote_service_spec.rb
spec/services/milestones/promote_service_spec.rb
+1
-1
spec/services/notes/create_service_spec.rb
spec/services/notes/create_service_spec.rb
+1
-1
spec/services/notes/post_process_service_spec.rb
spec/services/notes/post_process_service_spec.rb
+1
-1
spec/services/notes/quick_actions_service_spec.rb
spec/services/notes/quick_actions_service_spec.rb
+10
-10
spec/services/notes/update_service_spec.rb
spec/services/notes/update_service_spec.rb
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+53
-53
spec/services/projects/create_service_spec.rb
spec/services/projects/create_service_spec.rb
+2
-2
spec/services/projects/move_access_service_spec.rb
spec/services/projects/move_access_service_spec.rb
+6
-6
spec/services/projects/move_project_authorizations_service_spec.rb
...ices/projects/move_project_authorizations_service_spec.rb
+4
-4
spec/services/projects/move_project_group_links_service_spec.rb
...ervices/projects/move_project_group_links_service_spec.rb
+4
-4
spec/services/projects/move_project_members_service_spec.rb
spec/services/projects/move_project_members_service_spec.rb
+4
-4
spec/services/projects/overwrite_project_service_spec.rb
spec/services/projects/overwrite_project_service_spec.rb
+4
-4
spec/services/projects/transfer_service_spec.rb
spec/services/projects/transfer_service_spec.rb
+1
-1
spec/services/protected_branches/create_service_spec.rb
spec/services/protected_branches/create_service_spec.rb
+4
-4
spec/services/protected_tags/create_service_spec.rb
spec/services/protected_tags/create_service_spec.rb
+2
-2
spec/services/search/global_service_spec.rb
spec/services/search/global_service_spec.rb
+1
-1
spec/services/search_service_spec.rb
spec/services/search_service_spec.rb
+1
-1
spec/services/users/refresh_authorized_projects_service_spec.rb
...ervices/users/refresh_authorized_projects_service_spec.rb
+15
-15
spec/support/features/issuable_slash_commands_shared_examples.rb
...pport/features/issuable_slash_commands_shared_examples.rb
+16
-16
spec/support/helpers/markdown_feature.rb
spec/support/helpers/markdown_feature.rb
+1
-1
spec/support/import_export/export_file_helper.rb
spec/support/import_export/export_file_helper.rb
+1
-1
spec/support/matchers/access_matchers_for_controller.rb
spec/support/matchers/access_matchers_for_controller.rb
+1
-1
spec/support/services/issuable_create_service_slash_commands_shared_examples.rb
...issuable_create_service_slash_commands_shared_examples.rb
+2
-2
spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb
...mples/features/creatable_merge_request_shared_examples.rb
+3
-3
spec/support/shared_examples/features/editable_merge_request_shared_examples.rb
...amples/features/editable_merge_request_shared_examples.rb
+3
-3
spec/support/shared_examples/features/master_manages_access_requests_shared_example.rb
...features/master_manages_access_requests_shared_example.rb
+7
-7
spec/support/shared_examples/models/members_notifications_shared_example.rb
...d_examples/models/members_notifications_shared_example.rb
+1
-1
spec/views/projects/imports/new.html.haml_spec.rb
spec/views/projects/imports/new.html.haml_spec.rb
+1
-1
spec/views/projects/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb
...s/pipeline_schedules/_pipeline_schedule.html.haml_spec.rb
+3
-3
spec/views/shared/notes/_form.html.haml_spec.rb
spec/views/shared/notes/_form.html.haml_spec.rb
+1
-1
spec/workers/merge_worker_spec.rb
spec/workers/merge_worker_spec.rb
+1
-1
spec/workers/pipeline_schedule_worker_spec.rb
spec/workers/pipeline_schedule_worker_spec.rb
+1
-1
No files found.
app/models/concerns/protected_ref_access.rb
View file @
a63bce1a
...
...
@@ -2,19 +2,20 @@ module ProtectedRefAccess
extend
ActiveSupport
::
Concern
ALLOWED_ACCESS_LEVELS
=
[
Gitlab
::
Access
::
MA
ST
ER
,
Gitlab
::
Access
::
MA
INTAIN
ER
,
Gitlab
::
Access
::
DEVELOPER
,
Gitlab
::
Access
::
NO_ACCESS
].
freeze
HUMAN_ACCESS_LEVELS
=
{
Gitlab
::
Access
::
MA
ST
ER
=>
"Maintainers"
.
freeze
,
Gitlab
::
Access
::
MA
INTAIN
ER
=>
"Maintainers"
.
freeze
,
Gitlab
::
Access
::
DEVELOPER
=>
"Developers + Maintainers"
.
freeze
,
Gitlab
::
Access
::
NO_ACCESS
=>
"No one"
.
freeze
}.
freeze
included
do
scope
:master
,
->
{
where
(
access_level:
Gitlab
::
Access
::
MASTER
)
}
scope
:master
,
->
{
maintainer
}
# @deprecated
scope
:maintainer
,
->
{
where
(
access_level:
Gitlab
::
Access
::
MAINTAINER
)
}
scope
:developer
,
->
{
where
(
access_level:
Gitlab
::
Access
::
DEVELOPER
)
}
validates
:access_level
,
presence:
true
,
if: :role?
,
inclusion:
{
...
...
app/models/concerns/select_for_project_authorization.rb
View file @
a63bce1a
...
...
@@ -6,8 +6,11 @@ def select_for_project_authorization
select
(
"projects.id AS project_id, members.access_level"
)
end
def
select_as_ma
st
er_for_project_authorization
select
([
"projects.id AS project_id"
,
"
#{
Gitlab
::
Access
::
MA
ST
ER
}
AS access_level"
])
def
select_as_ma
intain
er_for_project_authorization
select
([
"projects.id AS project_id"
,
"
#{
Gitlab
::
Access
::
MA
INTAIN
ER
}
AS access_level"
])
end
# @deprecated
alias_method
:select_as_master_for_project_authorization
,
:select_as_maintainer_for_project_authorization
end
end
app/models/group.rb
View file @
a63bce1a
...
...
@@ -186,10 +186,13 @@ def add_developer(user, current_user = nil)
add_user
(
user
,
:developer
,
current_user:
current_user
)
end
def
add_ma
st
er
(
user
,
current_user
=
nil
)
add_user
(
user
,
:ma
st
er
,
current_user:
current_user
)
def
add_ma
intain
er
(
user
,
current_user
=
nil
)
add_user
(
user
,
:ma
intain
er
,
current_user:
current_user
)
end
# @deprecated
alias_method
:add_master
,
:add_maintainer
def
add_owner
(
user
,
current_user
=
nil
)
add_user
(
user
,
:owner
,
current_user:
current_user
)
end
...
...
@@ -206,12 +209,15 @@ def has_owner?(user)
members_with_parents
.
owners
.
where
(
user_id:
user
).
any?
end
def
has_ma
st
er?
(
user
)
def
has_ma
intain
er?
(
user
)
return
false
unless
user
members_with_parents
.
ma
st
ers
.
where
(
user_id:
user
).
any?
members_with_parents
.
ma
intain
ers
.
where
(
user_id:
user
).
any?
end
# @deprecated
alias_method
:has_master?
,
:has_maintainer?
# Check if user is a last owner of the group.
# Parent owners are ignored for nested groups.
def
last_owner?
(
user
)
...
...
app/models/member.rb
View file @
a63bce1a
...
...
@@ -69,9 +69,11 @@ class Member < ActiveRecord::Base
scope
:guests
,
->
{
active
.
where
(
access_level:
GUEST
)
}
scope
:reporters
,
->
{
active
.
where
(
access_level:
REPORTER
)
}
scope
:developers
,
->
{
active
.
where
(
access_level:
DEVELOPER
)
}
scope
:masters
,
->
{
active
.
where
(
access_level:
MASTER
)
}
scope
:maintainers
,
->
{
active
.
where
(
access_level:
MAINTAINER
)
}
scope
:masters
,
->
{
maintainers
}
# @deprecated
scope
:owners
,
->
{
active
.
where
(
access_level:
OWNER
)
}
scope
:owners_and_masters
,
->
{
active
.
where
(
access_level:
[
OWNER
,
MASTER
])
}
scope
:owners_and_maintainers
,
->
{
active
.
where
(
access_level:
[
OWNER
,
MAINTAINER
])
}
scope
:owners_and_masters
,
->
{
owners_and_maintainers
}
# @deprecated
scope
:order_name_asc
,
->
{
left_join_users
.
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
'users.name'
,
'ASC'
))
}
scope
:order_name_desc
,
->
{
left_join_users
.
reorder
(
Gitlab
::
Database
.
nulls_last_order
(
'users.name'
,
'DESC'
))
}
...
...
app/models/members/project_member.rb
View file @
a63bce1a
...
...
@@ -17,19 +17,19 @@ class << self
# Add users to projects with passed access option
#
# access can be an integer representing a access code
# or symbol like :ma
st
er representing role
# or symbol like :ma
intain
er representing role
#
# Ex.
# add_users_to_projects(
# project_ids,
# user_ids,
# ProjectMember::MA
ST
ER
# ProjectMember::MA
INTAIN
ER
# )
#
# add_users_to_projects(
# project_ids,
# user_ids,
# :ma
st
er
# :ma
intain
er
# )
#
def
add_users_to_projects
(
project_ids
,
users
,
access_level
,
current_user:
nil
,
expires_at:
nil
)
...
...
app/models/project.rb
View file @
a63bce1a
...
...
@@ -269,7 +269,8 @@ class Project < ActiveRecord::Base
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
delegate
:members
,
to: :team
,
prefix:
true
delegate
:add_user
,
:add_users
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_master
,
:add_role
,
to: :team
delegate
:add_guest
,
:add_reporter
,
:add_developer
,
:add_maintainer
,
:add_role
,
to: :team
delegate
:add_master
,
to: :team
# @deprecated
delegate
:group_runners_enabled
,
:group_runners_enabled
=
,
:group_runners_enabled?
,
to: :ci_cd_settings
# Validations
...
...
@@ -1647,10 +1648,10 @@ def after_create_default_branch
params
=
{
name:
default_branch
,
push_access_levels_attributes:
[{
access_level:
Gitlab
::
CurrentSettings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_PUSH
?
Gitlab
::
Access
::
DEVELOPER
:
Gitlab
::
Access
::
MA
ST
ER
access_level:
Gitlab
::
CurrentSettings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_PUSH
?
Gitlab
::
Access
::
DEVELOPER
:
Gitlab
::
Access
::
MA
INTAIN
ER
}],
merge_access_levels_attributes:
[{
access_level:
Gitlab
::
CurrentSettings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_MERGE
?
Gitlab
::
Access
::
DEVELOPER
:
Gitlab
::
Access
::
MA
ST
ER
access_level:
Gitlab
::
CurrentSettings
.
default_branch_protection
==
Gitlab
::
Access
::
PROTECTION_DEV_CAN_MERGE
?
Gitlab
::
Access
::
DEVELOPER
:
Gitlab
::
Access
::
MA
INTAIN
ER
}]
}
...
...
app/models/project_group_link.rb
View file @
a63bce1a
...
...
@@ -4,7 +4,8 @@ class ProjectGroupLink < ActiveRecord::Base
GUEST
=
10
REPORTER
=
20
DEVELOPER
=
30
MASTER
=
40
MAINTAINER
=
40
MASTER
=
MAINTAINER
# @deprecated
belongs_to
:project
belongs_to
:group
...
...
app/models/project_team.rb
View file @
a63bce1a
...
...
@@ -19,10 +19,13 @@ def add_developer(user, current_user: nil)
add_user
(
user
,
:developer
,
current_user:
current_user
)
end
def
add_ma
st
er
(
user
,
current_user:
nil
)
add_user
(
user
,
:ma
st
er
,
current_user:
current_user
)
def
add_ma
intain
er
(
user
,
current_user:
nil
)
add_user
(
user
,
:ma
intain
er
,
current_user:
current_user
)
end
# @deprecated
alias_method
:add_master
,
:add_maintainer
def
add_role
(
user
,
role
,
current_user:
nil
)
public_send
(
:"add_
#{
role
}
"
,
user
,
current_user:
current_user
)
# rubocop:disable GitlabSecurity/PublicSend
end
...
...
@@ -81,10 +84,13 @@ def developers
@developers
||=
fetch_members
(
Gitlab
::
Access
::
DEVELOPER
)
end
def
ma
st
ers
@ma
sters
||=
fetch_members
(
Gitlab
::
Access
::
MAST
ER
)
def
ma
intain
ers
@ma
intainers
||=
fetch_members
(
Gitlab
::
Access
::
MAINTAIN
ER
)
end
# @deprecated
alias_method
:masters
,
:maintainers
def
owners
@owners
||=
if
group
...
...
@@ -136,10 +142,13 @@ def developer?(user)
max_member_access
(
user
.
id
)
==
Gitlab
::
Access
::
DEVELOPER
end
def
ma
st
er?
(
user
)
max_member_access
(
user
.
id
)
==
Gitlab
::
Access
::
MA
ST
ER
def
ma
intain
er?
(
user
)
max_member_access
(
user
.
id
)
==
Gitlab
::
Access
::
MA
INTAIN
ER
end
# @deprecated
alias_method
:master?
,
:maintainer?
# Checks if `user` is authorized for this project, with at least the
# `min_access_level` (if given).
def
member?
(
user
,
min_access_level
=
Gitlab
::
Access
::
GUEST
)
...
...
app/models/user.rb
View file @
a63bce1a
...
...
@@ -99,7 +99,8 @@ def update_tracked_fields!(request)
has_many
:group_members
,
->
{
where
(
requested_at:
nil
)
},
source:
'GroupMember'
has_many
:groups
,
through: :group_members
has_many
:owned_groups
,
->
{
where
(
members:
{
access_level:
Gitlab
::
Access
::
OWNER
})
},
through: :group_members
,
source: :group
has_many
:masters_groups
,
->
{
where
(
members:
{
access_level:
Gitlab
::
Access
::
MASTER
})
},
through: :group_members
,
source: :group
has_many
:maintainers_groups
,
->
{
where
(
members:
{
access_level:
Gitlab
::
Access
::
MAINTAINER
})
},
through: :group_members
,
source: :group
alias_attribute
:masters_groups
,
:maintainers_groups
# Projects
has_many
:groups_projects
,
through: :groups
,
source: :projects
...
...
@@ -728,7 +729,7 @@ def recent_push(project = nil)
end
def
several_namespaces?
owned_groups
.
any?
||
ma
st
ers_groups
.
any?
owned_groups
.
any?
||
ma
intain
ers_groups
.
any?
end
def
namespace_id
...
...
@@ -974,15 +975,15 @@ def manageable_namespaces
end
def
manageable_groups
union_sql
=
Gitlab
::
SQL
::
Union
.
new
([
owned_groups
.
select
(
:id
),
ma
st
ers_groups
.
select
(
:id
)]).
to_sql
union_sql
=
Gitlab
::
SQL
::
Union
.
new
([
owned_groups
.
select
(
:id
),
ma
intain
ers_groups
.
select
(
:id
)]).
to_sql
# Update this line to not use raw SQL when migrated to Rails 5.2.
# Either ActiveRecord or Arel constructions are fine.
# This was replaced with the raw SQL construction because of bugs in the arel gem.
# Bugs were fixed in arel 9.0.0 (Rails 5.2).
owned_and_ma
st
er_groups
=
Group
.
where
(
"namespaces.id IN (
#{
union_sql
}
)"
)
# rubocop:disable GitlabSecurity/SqlInjection
owned_and_ma
intain
er_groups
=
Group
.
where
(
"namespaces.id IN (
#{
union_sql
}
)"
)
# rubocop:disable GitlabSecurity/SqlInjection
Gitlab
::
GroupHierarchy
.
new
(
owned_and_ma
st
er_groups
).
base_and_descendants
Gitlab
::
GroupHierarchy
.
new
(
owned_and_ma
intain
er_groups
).
base_and_descendants
end
def
namespaces
...
...
@@ -1023,11 +1024,11 @@ def can_be_removed?
def
ci_owned_runners
@ci_owned_runners
||=
begin
project_runner_ids
=
Ci
::
RunnerProject
.
where
(
project:
authorized_projects
(
Gitlab
::
Access
::
MA
ST
ER
))
.
where
(
project:
authorized_projects
(
Gitlab
::
Access
::
MA
INTAIN
ER
))
.
select
(
:runner_id
)
group_runner_ids
=
Ci
::
RunnerNamespace
.
where
(
namespace_id:
owned_or_ma
st
ers_groups
.
select
(
:id
))
.
where
(
namespace_id:
owned_or_ma
intain
ers_groups
.
select
(
:id
))
.
select
(
:runner_id
)
union
=
Gitlab
::
SQL
::
Union
.
new
([
project_runner_ids
,
group_runner_ids
])
...
...
@@ -1236,11 +1237,14 @@ def required_terms_not_accepted?
!
terms_accepted?
end
def
owned_or_ma
st
ers_groups
union
=
Gitlab
::
SQL
::
Union
.
new
([
owned_groups
,
ma
st
ers_groups
])
def
owned_or_ma
intain
ers_groups
union
=
Gitlab
::
SQL
::
Union
.
new
([
owned_groups
,
ma
intain
ers_groups
])
Group
.
from
(
"(
#{
union
.
to_sql
}
) namespaces"
)
end
# @deprecated
alias_method
:owned_or_masters_groups
,
:owned_or_maintainers_groups
protected
# override, from Devise::Validatable
...
...
app/policies/clusters/cluster_policy.rb
View file @
a63bce1a
...
...
@@ -4,7 +4,7 @@ class ClusterPolicy < BasePolicy
delegate
{
cluster
.
project
}
rule
{
can?
(
:ma
st
er_access
)
}.
policy
do
rule
{
can?
(
:ma
intain
er_access
)
}.
policy
do
enable
:update_cluster
enable
:admin_cluster
end
...
...
app/policies/deploy_token_policy.rb
View file @
a63bce1a
class
DeployTokenPolicy
<
BasePolicy
with_options
scope: :subject
,
score:
0
condition
(
:ma
ster
)
{
@subject
.
project
.
team
.
mast
er?
(
@user
)
}
condition
(
:ma
intainer
)
{
@subject
.
project
.
team
.
maintain
er?
(
@user
)
}
rule
{
anonymous
}.
prevent_all
rule
{
ma
st
er
}.
policy
do
rule
{
ma
intain
er
}.
policy
do
enable
:create_deploy_token
enable
:update_deploy_token
end
...
...
app/policies/group_policy.rb
View file @
a63bce1a
...
...
@@ -11,7 +11,7 @@ class GroupPolicy < BasePolicy
condition
(
:guest
)
{
access_level
>=
GroupMember
::
GUEST
}
condition
(
:developer
)
{
access_level
>=
GroupMember
::
DEVELOPER
}
condition
(
:owner
)
{
access_level
>=
GroupMember
::
OWNER
}
condition
(
:ma
ster
)
{
access_level
>=
GroupMember
::
MAST
ER
}
condition
(
:ma
intainer
)
{
access_level
>=
GroupMember
::
MAINTAIN
ER
}
condition
(
:reporter
)
{
access_level
>=
GroupMember
::
REPORTER
}
condition
(
:nested_groups_supported
,
scope: :global
)
{
Group
.
supports_nested_groups?
}
...
...
@@ -59,7 +59,7 @@ class GroupPolicy < BasePolicy
enable
:admin_issue
end
rule
{
ma
st
er
}.
policy
do
rule
{
ma
intain
er
}.
policy
do
enable
:create_projects
enable
:admin_pipeline
enable
:admin_build
...
...
app/policies/project_policy.rb
View file @
a63bce1a
...
...
@@ -46,7 +46,7 @@ class ProjectPolicy < BasePolicy
condition
(
:developer
)
{
team_access_level
>=
Gitlab
::
Access
::
DEVELOPER
}
desc
"User has maintainer access"
condition
(
:ma
ster
)
{
team_access_level
>=
Gitlab
::
Access
::
MAST
ER
}
condition
(
:ma
intainer
)
{
team_access_level
>=
Gitlab
::
Access
::
MAINTAIN
ER
}
desc
"Project is public"
condition
(
:public_project
,
scope: :subject
,
score:
0
)
{
project
.
public?
}
...
...
@@ -123,14 +123,14 @@ class ProjectPolicy < BasePolicy
rule
{
guest
}.
enable
:guest_access
rule
{
reporter
}.
enable
:reporter_access
rule
{
developer
}.
enable
:developer_access
rule
{
ma
ster
}.
enable
:mast
er_access
rule
{
ma
intainer
}.
enable
:maintain
er_access
rule
{
owner
|
admin
}.
enable
:owner_access
rule
{
can?
(
:owner_access
)
}.
policy
do
enable
:guest_access
enable
:reporter_access
enable
:developer_access
enable
:ma
st
er_access
enable
:ma
intain
er_access
enable
:change_namespace
enable
:change_visibility_level
...
...
@@ -228,7 +228,7 @@ class ProjectPolicy < BasePolicy
enable
:create_deployment
end
rule
{
can?
(
:ma
st
er_access
)
}.
policy
do
rule
{
can?
(
:ma
intain
er_access
)
}.
policy
do
enable
:push_to_delete_protected_branch
enable
:update_project_snippet
enable
:update_environment
...
...
app/services/notification_service.rb
View file @
a63bce1a
...
...
@@ -274,9 +274,9 @@ def send_new_note_notifications(note)
def
new_access_request
(
member
)
return
true
unless
member
.
notifiable?
(
:subscription
)
recipients
=
member
.
source
.
members
.
active_without_invites_and_requests
.
owners_and_ma
st
ers
if
fallback_to_group_owners_ma
st
ers?
(
recipients
,
member
)
recipients
=
member
.
source
.
group
.
members
.
active_without_invites_and_requests
.
owners_and_ma
st
ers
recipients
=
member
.
source
.
members
.
active_without_invites_and_requests
.
owners_and_ma
intain
ers
if
fallback_to_group_owners_ma
intain
ers?
(
recipients
,
member
)
recipients
=
member
.
source
.
group
.
members
.
active_without_invites_and_requests
.
owners_and_ma
intain
ers
end
recipients
.
each
{
|
recipient
|
deliver_access_request_email
(
recipient
,
member
)
}
...
...
@@ -519,7 +519,7 @@ def recipients_for_pages_domain(domain)
return
[]
unless
project
notifiable_users
(
project
.
team
.
ma
st
ers
,
:watch
,
target:
project
)
notifiable_users
(
project
.
team
.
ma
intain
ers
,
:watch
,
target:
project
)
end
def
notifiable?
(
*
args
)
...
...
@@ -534,7 +534,7 @@ def deliver_access_request_email(recipient, member)
mailer
.
member_access_requested_email
(
member
.
real_source_type
,
member
.
id
,
recipient
.
user
.
notification_email
).
deliver_later
end
def
fallback_to_group_owners_ma
st
ers?
(
recipients
,
member
)
def
fallback_to_group_owners_ma
intain
ers?
(
recipients
,
member
)
return
false
if
recipients
.
present?
member
.
source
.
respond_to?
(
:group
)
&&
member
.
source
.
group
...
...
app/services/projects/create_service.rb
View file @
a63bce1a
...
...
@@ -115,7 +115,7 @@ def setup_authorizations
@project
.
group
.
refresh_members_authorized_projects
(
blocking:
false
)
current_user
.
refresh_authorized_projects
else
@project
.
add_ma
st
er
(
@project
.
namespace
.
owner
,
current_user:
current_user
)
@project
.
add_ma
intain
er
(
@project
.
namespace
.
owner
,
current_user:
current_user
)
end
end
...
...
app/services/protected_branches/access_level_params.rb
View file @
a63bce1a
...
...
@@ -14,7 +14,7 @@ def access_levels
private
def
params_with_default
(
params
)
params
[
:"
#{
type
}
_access_level"
]
||=
Gitlab
::
Access
::
MA
ST
ER
if
use_default_access_level?
(
params
)
params
[
:"
#{
type
}
_access_level"
]
||=
Gitlab
::
Access
::
MA
INTAIN
ER
if
use_default_access_level?
(
params
)
params
end
...
...
app/services/protected_branches/legacy_api_create_service.rb
View file @
a63bce1a
...
...
@@ -9,14 +9,14 @@ def execute
if
params
.
delete
(
:developers_can_push
)
Gitlab
::
Access
::
DEVELOPER
else
Gitlab
::
Access
::
MA
ST
ER
Gitlab
::
Access
::
MA
INTAIN
ER
end
merge_access_level
=
if
params
.
delete
(
:developers_can_merge
)
Gitlab
::
Access
::
DEVELOPER
else
Gitlab
::
Access
::
MA
ST
ER
Gitlab
::
Access
::
MA
INTAIN
ER
end
@params
.
merge!
(
push_access_levels_attributes:
[{
access_level:
push_access_level
}],
...
...
app/services/protected_branches/legacy_api_update_service.rb
View file @
a63bce1a
...
...
@@ -17,14 +17,14 @@ def execute(protected_branch)