From 11f46b459e9d97900cb71f7f6bd313b5e18fbaa6 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Wed, 13 Apr 2016 15:28:10 -0300 Subject: [PATCH 1/3] Setup visibility level for project when transfering for a group --- app/services/projects/transfer_service.rb | 21 +++++++++++++---- app/views/projects/edit.html.haml | 1 + .../projects/transfer_service_spec.rb | 23 +++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 2e73465446..0d8f8c6fbe 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -34,9 +34,12 @@ module Projects raise TransferError.new("Project with same path in target namespace already exists") end - # Apply new namespace id - project.namespace = new_namespace - project.save! + # Apply new namespace id and visibility level + project.tap do |p| + p.namespace = new_namespace + setup_visibility_level(p, new_namespace) + p.save! + end # Notifications project.send_move_instructions(old_path) @@ -56,7 +59,7 @@ module Projects Gitlab::UploadsTransfer.new.move_project(project.path, old_namespace.path, new_namespace.path) project.old_path_with_namespace = old_path - + SystemHooksService.new.execute_hooks_for(project, :transfer) true end @@ -68,5 +71,15 @@ module Projects namespace.id != project.namespace_id && current_user.can?(:create_projects, namespace) end + + private + + def setup_visibility_level(project, new_namespace) + return unless new_namespace.is_a?(Group) + + if project.visibility_level > new_namespace.visibility_level + project.visibility_level = new_namespace.visibility_level + end + end end end diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 6d872cd0b2..76a4f41193 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -210,6 +210,7 @@ %li Be careful. Changing the project's namespace can have unintended side effects. %li You can only transfer the project to namespaces you manage. %li You will need to update your local repositories to point to the new location. + %li Project visibility level will be changed to match namespace rules when transfering to a group. .form-actions = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) } - else diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index c46259431a..0601731733 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -38,4 +38,27 @@ describe Projects::TransferService, services: true do def transfer_project(project, user, new_namespace) Projects::TransferService.new(project, user).execute(new_namespace) end + + context 'visibility level' do + let(:internal_group) { create(:group, :internal) } + + before { internal_group.add_owner(user) } + + context 'when namespace visibility level < project visibility level' do + let(:public_project) { create(:project, :public, namespace: user.namespace) } + + before { transfer_project(public_project, user, internal_group) } + + it { expect(public_project.visibility_level).to eq(internal_group.visibility_level) } + end + + context 'when namespace visibility level > project visibility level' do + let(:private_project) { create(:project, :private, namespace: user.namespace) } + + before { transfer_project(private_project, user, internal_group) } + + it { expect(private_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE) } + end + end + end From 6b3a53848c68c8fd0931de9b7c6ab15b53b9475b Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Wed, 13 Apr 2016 15:30:50 -0300 Subject: [PATCH 2/3] Add changelog entry --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 5399e3e5b8..416fffece6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.7.0 (unreleased) - All images in discussions and wikis now link to their source files !3464 (Connor Shea). - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu) - Add setting for customizing the list of trusted proxies !3524 + - Allow projects to be transfered to a lower visibility level group - Fix `signed_in_ip` being set to 127.0.0.1 when using a reverse proxy !3524 - Improved Markdown rendering performance !3389 (Yorick Peterse) - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu) From a8ea2c18959c700913132d8a2d7ce3a211303c10 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 14 Apr 2016 11:34:42 -0300 Subject: [PATCH 3/3] Change transfer service to use existing methods --- app/services/projects/transfer_service.rb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 0d8f8c6fbe..79a27f4af7 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -35,11 +35,9 @@ module Projects end # Apply new namespace id and visibility level - project.tap do |p| - p.namespace = new_namespace - setup_visibility_level(p, new_namespace) - p.save! - end + project.namespace = new_namespace + project.visibility_level = new_namespace.visibility_level unless project.visibility_level_allowed_by_group? + project.save! # Notifications project.send_move_instructions(old_path) @@ -71,15 +69,5 @@ module Projects namespace.id != project.namespace_id && current_user.can?(:create_projects, namespace) end - - private - - def setup_visibility_level(project, new_namespace) - return unless new_namespace.is_a?(Group) - - if project.visibility_level > new_namespace.visibility_level - project.visibility_level = new_namespace.visibility_level - end - end end end