summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-08-25 16:21:27 +0100
committerNick Thomas <nick@gitlab.com>2017-08-25 16:21:27 +0100
commit66e18a128498d6f3fab193a80c6b4f45f2c3d7fc (patch)
tree12642133cd8ec63b7c9e81a822fa577e81f246fb
parent8b73df0cf534797bff9ce0f5b95af5347ea59ca6 (diff)
downloadgitlab-ce-66e18a128498d6f3fab193a80c6b4f45f2c3d7fc.tar.gz
Don't add admins as masters to projects created in another user's namespace
Only admins have the ability to create a project in another user's personal namespace. Prior to this commit, we were explicitly adding them as masters to the project. However, admins already have access (by virture of being admins), so this is unnecessary.
-rw-r--r--app/services/projects/create_service.rb3
-rw-r--r--spec/services/projects/create_service_spec.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 0d6066b70c7..68e592d79c3 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -112,8 +112,7 @@ module Projects
if group || @project.gitlab_project_import?
current_user.refresh_authorized_projects
else
- owners = [current_user, @project.namespace.owner].compact.uniq
- @project.add_master(owners, current_user: current_user)
+ @project.add_master(@project.namespace.owner, current_user: current_user)
end
end
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index b0dc7488b5f..088b7b4fc04 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -38,7 +38,7 @@ describe Projects::CreateService, '#execute' do
expect(project).to be_persisted
expect(project.owner).to eq(user)
- expect(project.team.masters).to include(user, admin)
+ expect(project.team.masters).to contain_exactly(user)
expect(project.namespace).to eq(user.namespace)
end
end