diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-23 01:48:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-23 01:48:03 +0000 |
| commit | ad47f2094bf61867d2b5e4c24540c7c5b8a6358d (patch) | |
| tree | 20c61d1fe47a44dc150d5356f547b12c0ff6bfee /app/views | |
| parent | 3cfcbcf35badfdb21244f7f16c8640cd83b49205 (diff) | |
| parent | ad80238507fd5e1efb205c9f72efcbe909821be5 (diff) | |
| download | gitlab-ce-ad47f2094bf61867d2b5e4c24540c7c5b8a6358d.tar.gz | |
Merge branch 'prevent-project-transfer' into 'master'
Prevent project transfer if a new group is not selected
Closes #25455
See merge request !11214
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/edit.html.haml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index dd27e0866de..f5549d7f4cd 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -246,14 +246,16 @@ .row.prepend-top-default .col-lg-3 %h4.prepend-top-0.danger-title - Transfer project + Transfer project to new group + %p.append-bottom-0 + Please select the group you want to transfer this project to in the dropdown to the right. .col-lg-9 - = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true) do |f| + = form_for([@project.namespace.becomes(Namespace), @project], url: transfer_namespace_project_path(@project.namespace, @project), method: :put, remote: true, html: { class: 'js-project-transfer-form' } ) do |f| .form-group = label_tag :new_namespace_id, nil, class: 'label-light' do - %span Namespace + %span Select a new namespace .form-group - = select_tag :new_namespace_id, namespaces_options(@project.namespace_id), { prompt: 'Choose a project namespace', class: 'select2' } + = select_tag :new_namespace_id, namespaces_options(nil), include_blank: true, class: 'select2' %ul %li Be careful. Changing the project's namespace can have unintended side effects. %li You can only transfer the project to namespaces you manage. |