Incorporate review comments56883-add-prometheus-settings-to-gitlab-yml

- Add spec for restricted visibility level.

2 files changed, 10 insertions, 2 deletions

diff --git a/app/services/self_monitoring/project/create_service.rb b/app/services/self_monitoring/project/create_service.rb
index a3b4cb79e5a..e5ef8c15456 100644
--- a/app/services/self_monitoring/project/create_service.rb
+++ b/app/services/self_monitoring/project/create_service.rb
@@ -100,7 +100,7 @@ module SelfMonitoring
 
       def project_maintainers
         # Exclude the first so that the project_owner is not added again as a member.
-        instance_admins.last(instance_admins.size - 1)
+        instance_admins - [project_owner]
       end
 
       def create_project_params
diff --git a/spec/services/self_monitoring/project/create_service_spec.rb b/spec/services/self_monitoring/project/create_service_spec.rb
index 6fb66e98e90..d11e27c6d52 100644
--- a/spec/services/self_monitoring/project/create_service_spec.rb
+++ b/spec/services/self_monitoring/project/create_service_spec.rb
@@ -58,7 +58,15 @@ describe SelfMonitoring::Project::CreateService do
       it 'creates project with internal visibility' do
         expect(result[:status]).to eq(:success)
         expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
-        expect(project.persisted?).to eq(true)
+        expect(project).to be_persisted
+      end
+
+      it 'creates project with internal visibility even when internal visibility is restricted' do
+        stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::INTERNAL])
+
+        expect(result[:status]).to eq(:success)
+        expect(project.visibility_level).to eq(Gitlab::VisibilityLevel::INTERNAL)
+        expect(project).to be_persisted
       end
 
       it 'creates project with correct name and description' do