diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 15:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-26 15:09:15 +0300 |
| commit | c0dd450008c1cee260905e54bbed202891158697 (patch) | |
| tree | 0b034d5e4568303b77302325fc8656bb040b90b4 /app/views | |
| parent | 26bba9525deb5e9d05fd29cf5b286e7a65d1c791 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/settings/_permanent_deletion.html.haml | 3 | ||||
| -rw-r--r-- | app/views/groups/settings/_remove_button.html.haml | 7 | ||||
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml index 8bd47fbea44..125a20060ed 100644 --- a/app/views/groups/settings/_permanent_deletion.html.haml +++ b/app/views/groups/settings/_permanent_deletion.html.haml @@ -5,4 +5,5 @@ = _('Removing this group also removes all child projects, including archived projects, and their resources.') %br %strong= _('Removed group can not be restored!') - = button_to _('Remove group'), '#', class: 'btn gl-button btn-danger js-confirm-danger', data: { 'confirm-danger-message' => remove_group_message(group) } + + = render 'groups/settings/remove_button', group: group diff --git a/app/views/groups/settings/_remove_button.html.haml b/app/views/groups/settings/_remove_button.html.haml new file mode 100644 index 00000000000..a04dba68b92 --- /dev/null +++ b/app/views/groups/settings/_remove_button.html.haml @@ -0,0 +1,7 @@ +- if group.paid? + .gl-alert.gl-alert-info.gl-mb-5{ data: { testid: 'group-has-linked-subscription-alert' } } + = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') + .gl-alert-body + = html_escape(_("This group can't be removed because it is linked to a subscription. To remove this group, %{linkStart}link the subscription%{linkEnd} with a different group.")) % { linkStart: "<a href=\"#{help_page_path('subscriptions/index', anchor: 'change-the-linked-namespace')}\">".html_safe, linkEnd: '</a>'.html_safe } + += button_to _('Remove group'), '#', class: ['btn gl-button btn-danger js-confirm-danger', ('disabled' if group.paid?)], data: { 'confirm-danger-message' => remove_group_message(group), 'testid' => 'remove-group-button' } diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index aeeffb6f4b6..81373a81f80 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -9,7 +9,7 @@ = button_tag class: 'toggle-mobile-nav', type: 'button' do %span.sr-only= _("Open sidebar") = sprite_icon('hamburger', size: 18) - .breadcrumbs-links.js-title-container{ data: { qa_selector: 'breadcrumb_links_content' } } + .breadcrumbs-links{ data: { testid: 'breadcrumb-links', qa_selector: 'breadcrumb_links_content' } } %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list - unless hide_top_links = header_title |