Commit 8647b0ba authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '354583-migrate-to-shared-alert-haml-partial-in-app-views-groups-settings-_export-html-haml' into 'master'

Migrate export group alerts to be Pajamas compliant

See merge request gitlab-org/gitlab!83471
parents 1e71e11f cd47a4aa
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
.sub-section .sub-section
%h4= s_('GroupSettings|Export group') %h4= s_('GroupSettings|Export group')
%p= _('Export this group with all related data.') %p= _('Export this group with all related data.')
.gl-alert.gl-alert-warning.gl-mb-4{ role: 'alert' } = render 'shared/global_alert', variant: :warning, dismissible: false, alert_class: 'gl-mb-4' do
= sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
- docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') } - docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/group/import/index.md') }
- docs_link_end = '</a>'.html_safe - docs_link_end = '</a>'.html_safe
...@@ -15,17 +14,18 @@ ...@@ -15,17 +14,18 @@
- export_information = _('After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance.') % { strong_text_start: '<strong>'.html_safe, strong_text_end: '</strong>'.html_safe} - export_information = _('After the export is complete, download the data file from a notification email or from this page. You can then import the data file from the %{strong_text_start}Create new group%{strong_text_end} page of another GitLab instance.') % { strong_text_start: '<strong>'.html_safe, strong_text_end: '</strong>'.html_safe}
= export_information.html_safe = export_information.html_safe
= link_to _('Learn more.'), help_page_path('user/group/settings/import_export.md'), target: '_blank', rel: 'noopener noreferrer' = link_to _('Learn more.'), help_page_path('user/group/settings/import_export.md'), target: '_blank', rel: 'noopener noreferrer'
.bs-callout.bs-callout-info = render 'shared/global_alert', dismissible: false, alert_class: 'gl-mb-5' do
%p.gl-mb-0 .gl-alert-body
%p= _('The following items will be exported:') %p.gl-mb-0
%ul %p= _('The following items will be exported:')
- group_export_descriptions.each do |description| %ul
%li= description - group_export_descriptions.each do |description|
%p= _('The following items will NOT be exported:') %li= description
%ul %p= _('The following items will NOT be exported:')
%li= _('Projects') %ul
%li= _('Runner tokens') %li= _('Projects')
%li= _('SAML discovery tokens') %li= _('Runner tokens')
%li= _('SAML discovery tokens')
- if group.export_file_exists? - if group.export_file_exists?
= link_to _('Download export'), download_export_group_path(group), = link_to _('Download export'), download_export_group_path(group),
rel: 'nofollow', method: :get, class: 'btn gl-button btn-default', data: { qa_selector: 'download_export_link' } rel: 'nofollow', method: :get, class: 'btn gl-button btn-default', data: { qa_selector: 'download_export_link' }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment