From 78cfc7cf4afe0c7ffb72b8a9522b07873cd36820 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 15 Feb 2022 15:15:04 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/gitlab/access.rb | 8 +------- lib/gitlab/project_authorizations.rb | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/gitlab') diff --git a/lib/gitlab/access.rb b/lib/gitlab/access.rb index d0b426aeb60..3e09d488bc3 100644 --- a/lib/gitlab/access.rb +++ b/lib/gitlab/access.rb @@ -33,13 +33,7 @@ module Gitlab MAINTAINER_SUBGROUP_ACCESS = 1 class << self - def values - if ::Feature.enabled?(:personal_project_owner_with_owner_access, default_enabled: :yaml) - options_with_owner.values - else - options.values - end - end + delegate :values, to: :options def all_values options_with_owner.values diff --git a/lib/gitlab/project_authorizations.rb b/lib/gitlab/project_authorizations.rb index 1d7b179baf0..121626ced56 100644 --- a/lib/gitlab/project_authorizations.rb +++ b/lib/gitlab/project_authorizations.rb @@ -22,7 +22,7 @@ module Gitlab user.projects_with_active_memberships.select_for_project_authorization, # The personal projects of the user. - user.personal_projects.select_project_owner_for_project_authorization, + user.personal_projects.select_as_maintainer_for_project_authorization, # Projects that belong directly to any of the groups the user has # access to. -- cgit v1.2.1