Commit b7b7a5d6 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch '290231-warning-message-for-group-migration' into 'master'

Warning message for Group migration

See merge request gitlab-org/gitlab!51214
parents 50fb21a5 a1b4b61e
...@@ -2,9 +2,18 @@ ...@@ -2,9 +2,18 @@
= form_errors(@group) = form_errors(@group)
.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
%h4 %h4.gl-display-flex
= s_('GroupsNew|Import groups from another instance of GitLab') = s_('GroupsNew|Import groups from another instance of GitLab')
%p %span.badge.badge-info.badge-pill.gl-badge.md.gl-ml-3
= _('Beta')
.gl-alert.gl-alert-warning{ role: 'alert' }
= sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title')
.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') }
- feedback_link_start = '<a href="https://gitlab.com/gitlab-org/gitlab/-/issues/284495" target="_blank" rel="noopener noreferrer">'.html_safe
- link_end = '</a>'.html_safe
= 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
= 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
= f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source URL'), for: 'import_gitlab_url' = f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source URL'), for: 'import_gitlab_url'
......
---
title: Add warning message for GitLab group migration
merge_request: 51214
author:
type: changed
...@@ -4436,6 +4436,9 @@ msgstr "" ...@@ -4436,6 +4436,9 @@ 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 ""
...@@ -14255,6 +14258,9 @@ msgstr "" ...@@ -14255,6 +14258,9 @@ 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."
msgstr ""
msgid "GroupsNew|Personal access token" msgid "GroupsNew|Personal access token"
msgstr "" msgstr ""
......
...@@ -37,6 +37,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do ...@@ -37,6 +37,7 @@ RSpec.describe 'Import/Export - Connect to another instance', :js do
) )
expect(page).to have_content 'Import groups from another instance of GitLab' expect(page).to have_content 'Import groups from another instance of GitLab'
expect(page).to have_content 'Not all related objects are migrated'
fill_in :bulk_import_gitlab_url, with: source_url fill_in :bulk_import_gitlab_url, with: source_url
fill_in :bulk_import_gitlab_access_token, with: pat fill_in :bulk_import_gitlab_access_token, with: pat
......
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