Commit ce5d5767 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '338983-remove-beta-badge-and-warning-from-group-migration-page' into 'master'

Remove Beta badge and warning from Group Migration page

See merge request gitlab-org/gitlab!71643
parents b7856c7f b7fb1e66
= form_with url: configure_import_bulk_imports_path, class: 'group-form gl-show-field-errors' do |f| = form_with url: configure_import_bulk_imports_path, class: 'group-form gl-show-field-errors' do |f|
.gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5 .gl-border-l-solid.gl-border-r-solid.gl-border-gray-100.gl-border-1.gl-p-5
.gl-display-flex.gl-align-items-center .gl-display-flex.gl-align-items-center
%h4.gl-display-inline-flex %h4.gl-display-flex
= s_('GroupsNew|Import groups from another instance of GitLab') = s_('GroupsNew|Import groups from another instance of GitLab')
%span.badge.badge-info.badge-pill.gl-badge.md.gl-ml-3
= _('Beta')
= link_to _('History'), history_import_bulk_imports_path, class: 'gl-link gl-ml-auto' = link_to _('History'), history_import_bulk_imports_path, class: 'gl-link gl-ml-auto'
.gl-alert.gl-alert-warning{ role: 'alert' } .gl-alert.gl-alert-warning{ role: 'alert' }
= sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title') = 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') }
- feedback_link_start = '<a href="https://gitlab.com/gitlab-org/gitlab/-/issues/284495" target="_blank" rel="noopener noreferrer">'.html_safe - docs_link_end = '</a>'.html_safe
- link_end = '</a>'.html_safe = s_('GroupsNew|Not all related objects are migrated. %{docs_link_start}More info%{docs_link_end}.').html_safe % { docs_link_start: docs_link_start, docs_link_end: docs_link_end }
= s_('GroupsNew|Not all related objects are migrated, as %{docs_link_start}described here%{docs_link_end}. Please %{feedback_link_start}leave feedback%{feedback_link_end} on this feature.').html_safe % { docs_link_start: docs_link_start, docs_link_end: link_end, feedback_link_start: feedback_link_start, feedback_link_end: link_end }
%p.gl-mt-3 %p.gl-mt-3
= s_('GroupsNew|Provide credentials for another instance of GitLab to import your groups directly.') = s_('GroupsNew|Provide credentials for another instance of GitLab to import your groups directly.')
.form-group.gl-display-flex.gl-flex-direction-column .form-group.gl-display-flex.gl-flex-direction-column
......
...@@ -5179,9 +5179,6 @@ msgstr "" ...@@ -5179,9 +5179,6 @@ msgstr ""
msgid "Below you will find all the groups that are public." msgid "Below you will find all the groups that are public."
msgstr "" msgstr ""
msgid "Beta"
msgstr ""
msgid "Bi-weekly code coverage" msgid "Bi-weekly code coverage"
msgstr "" msgstr ""
...@@ -16618,7 +16615,7 @@ msgstr "" ...@@ -16618,7 +16615,7 @@ msgstr ""
msgid "GroupsNew|No import options available" msgid "GroupsNew|No import options available"
msgstr "" msgstr ""
msgid "GroupsNew|Not all related objects are migrated, as %{docs_link_start}described here%{docs_link_end}. Please %{feedback_link_start}leave feedback%{feedback_link_end} on this feature." msgid "GroupsNew|Not all related objects are migrated. %{docs_link_start}More info%{docs_link_end}."
msgstr "" msgstr ""
msgid "GroupsNew|Personal access token" msgid "GroupsNew|Personal access token"
......
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