diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-06 17:27:12 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-06 17:27:12 +0100 |
| commit | e5183d907e9db2bdf87dae83708b35a970a829ba (patch) | |
| tree | edc05f30dd515cbe7ef3966a2b7aab7e835c4286 /app/views/groups | |
| parent | c85df8105e3b8982ecf6a16f8ae9f3af2f130030 (diff) | |
| parent | e1a64f0c6d769c38918c50fdbd9b72b0f6fcfa4a (diff) | |
| download | gitlab-ce-e5183d907e9db2bdf87dae83708b35a970a829ba.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/edit.html.haml | 15 | ||||
| -rw-r--r-- | app/views/groups/projects.html.haml | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 2d32d5299b7..5cb4d05960d 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -46,10 +46,13 @@ .panel.panel-danger .panel-heading Remove group .panel-body - %p - Removing group will cause all child projects and resources to be removed. - %br - %strong Removed group can not be restored! + = form_tag(@group, method: :delete) do + %p + Removing group will cause all child projects and resources to be removed. + %br + %strong Removed group can not be restored! - .form-actions - = link_to 'Remove group', @group, data: {confirm: 'Removed group can not be restored! Are you sure?'}, method: :delete, class: "btn btn-remove" + .form-actions + = button_to 'Remove group', '#', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => remove_group_message(@group) } + += render 'shared/confirm_modal', phrase: @group.path diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml index 62ad47972b9..7a2e688a114 100644 --- a/app/views/groups/projects.html.haml +++ b/app/views/groups/projects.html.haml @@ -20,8 +20,8 @@ %span.label.label-warning archived %span.badge = storage_counter(project.statistics.storage_size) - = link_to 'Members', namespace_project_project_members_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm" - = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm" + = link_to 'Members', project_project_members_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-sm" + = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-sm" = link_to 'Remove', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-sm btn-remove" - if @projects.blank? .nothing-here-block This group has no projects yet |