diff options
author | Toon Claes <toon@gitlab.com> | 2017-04-25 14:44:40 +0200 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2017-04-27 13:29:23 +0200 |
commit | 69f584edb4738d4de82f0301bb2ac8f6b3998814 (patch) | |
tree | 88a323c7a85c2b1625d00012d392034c2ccebd11 | |
parent | 025b04f3e7976ac8829e24fcb587d86574b0037d (diff) | |
download | gitlab-ce-69f584edb4738d4de82f0301bb2ac8f6b3998814.tar.gz |
Make namespace owner master of project upon creationtc-make-user-master-project-by-admin
When an admin creates a project in the namespace of a user, that user
automatically gains master access to that project.
-rw-r--r-- | app/services/projects/create_service.rb | 3 | ||||
-rw-r--r-- | changelogs/unreleased/tc-make-user-master-project-by-admin.yml | 4 | ||||
-rw-r--r-- | spec/services/projects/create_service_spec.rb | 16 |
3 files changed, 22 insertions, 1 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 7828c5806b0..535d93385e6 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -97,7 +97,8 @@ module Projects system_hook_service.execute_hooks_for(@project, :create) unless @project.group || @project.gitlab_project_import? - @project.team << [current_user, :master, current_user] + owners = [current_user, @project.namespace.owner].compact.uniq + @project.add_master(owners, current_user: current_user) end @project.group&.refresh_members_authorized_projects diff --git a/changelogs/unreleased/tc-make-user-master-project-by-admin.yml b/changelogs/unreleased/tc-make-user-master-project-by-admin.yml new file mode 100644 index 00000000000..459d6178bdd --- /dev/null +++ b/changelogs/unreleased/tc-make-user-master-project-by-admin.yml @@ -0,0 +1,4 @@ +--- +title: Ensure namespace owner is Master of project upon creation +merge_request: 10910 +author: diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index 7a07ea618c0..033e6ecd18c 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -27,6 +27,22 @@ describe Projects::CreateService, '#execute', services: true do end end + context "admin creates project with other user's namespace_id" do + it 'sets the correct permissions' do + admin = create(:admin) + opts = { + name: 'GitLab', + namespace_id: user.namespace.id + } + project = create_project(admin, opts) + + expect(project).to be_persisted + expect(project.owner).to eq(user) + expect(project.team.masters).to include(user, admin) + expect(project.namespace).to eq(user.namespace) + end + end + context 'group namespace' do let(:group) do create(:group).tap do |group| |