diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-29 18:07:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-29 18:07:33 +0300 |
commit | 762918f04a2ee8f4f7fac3d551c14af8dd30f17c (patch) | |
tree | a5e678bd635aca979707262b98607f7e2b68fd4a /app/views/groups/_import_group_from_another_instance_panel.html.haml | |
parent | fb28ad5316eb794646daf3b222779ed2e08b638e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups/_import_group_from_another_instance_panel.html.haml')
-rw-r--r-- | app/views/groups/_import_group_from_another_instance_panel.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/groups/_import_group_from_another_instance_panel.html.haml b/app/views/groups/_import_group_from_another_instance_panel.html.haml index 6c5a27e68c4..9cf52115f4f 100644 --- a/app/views/groups/_import_group_from_another_instance_panel.html.haml +++ b/app/views/groups/_import_group_from_another_instance_panel.html.haml @@ -27,16 +27,19 @@ - docs_link = link_to('', help_page_path('user/group/import/index', anchor: 'migrated-group-items'), target: '_blank', rel: 'noopener noreferrer') = safe_format(s_('GroupsNew|Not all group items are migrated. %{docs_link_start}What items are migrated%{docs_link_end}?'), tag_pair(docs_link, :docs_link_start, :docs_link_end)) - %p.gl-mt-3 - = s_('GroupsNew|Provide credentials for the source instance to import from. You can provide this instance as a source to move groups in this instance.') - .form-group.gl-display-flex.gl-flex-direction-column - = f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source instance URL'), for: 'import_gitlab_url' + %p.gl-mt-5.gl-mb-3 + - url_link = link_to('', help_page_path('user/group/import/index', anchor: 'connect-the-source-gitlab-instance'), target: '_blank', rel: 'noopener noreferrer') + = safe_format(s_('GroupsNew|Provide credentials for the %{url_link_start}source instance%{url_link_end} to import from. You can provide this instance as a source to move groups within this instance.'), tag_pair(url_link, :url_link_start, :url_link_end)) + .form-group.gl-form-group.gl-display-flex.gl-flex-direction-column + = f.label :bulk_import_gitlab_url, s_('GroupsNew|GitLab source instance base URL'), for: 'import_gitlab_url' = f.text_field :bulk_import_gitlab_url, disabled: bulk_imports_disabled, placeholder: 'https://gitlab.example.com', class: 'gl-form-input col-xs-12 col-sm-8', required: true, title: s_('GroupsNew|Enter the URL for the source instance.'), id: 'import_gitlab_url', data: { testid: 'import-gitlab-url' } - .form-group.gl-display-flex.gl-flex-direction-column + %small.form-text.text-gl-muted + = s_('Import|Must only contain the base URL of the source GitLab instance.') + .form-group.gl-form-group.gl-display-flex.gl-flex-direction-column = f.label :bulk_import_gitlab_access_token, s_('GroupsNew|Personal access token'), for: 'import_gitlab_token', class: 'col-form-label' .gl-font-weight-normal - pat_link = link_to('', help_page_path('user/profile/personal_access_tokens'), target: '_blank') |