diff options
Diffstat (limited to 'app/views/shared/_import_form.html.haml')
| -rw-r--r-- | app/views/shared/_import_form.html.haml | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 850d58920db..7248403d6c9 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -2,6 +2,19 @@ - import_url = Gitlab::UrlSanitizer.new(f.object.import_url) .import-url-data + .info-well.prepend-top-20 + .well-segment + %ul + %li + = html_escape(_('The repository must be accessible over %{code_open}http://%{code_close}, %{code_open}https://%{code_close} or %{code_open}git://%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } + %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } + %li + = _('If your HTTP repository is not publicly accessible, add your credentials.') + %li + = import_will_timeout_message(ci_cd_only) + %li + = import_svn_message(ci_cd_only) + = render_if_exists 'shared/ci_cd_only_link', ci_cd_only: ci_cd_only .form-group = f.label :import_url, class: 'label-bold' do %span @@ -11,9 +24,10 @@ = render Pajamas::AlertComponent.new(variant: :danger, alert_class: 'gl-mt-3 js-import-url-error hide', dismissible: false, - close_button_class: 'js-close-2fa-enabled-success-alert') do - .gl-alert-body + close_button_class: 'js-close-2fa-enabled-success-alert') do |c| + = c.body do = s_('Import|There is not a valid Git repository at this URL. If your HTTP repository is not publicly accessible, verify your credentials.') + = render_if_exists 'shared/ee/import_form', f: f, ci_cd_only: ci_cd_only .row .form-group.col-md-6 = f.label :import_url_user, class: 'label-bold' do @@ -26,19 +40,3 @@ %span = _('Password (optional)') = f.password_field :import_url_password, class: 'form-control gl-form-input', required: false, autocomplete: 'new-password' - - .info-well.prepend-top-20 - .well-segment - %ul - %li - = html_escape(_('The repository must be accessible over %{code_open}http://%{code_close}, %{code_open}https://%{code_close} or %{code_open}git://%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } - %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe } - %li - = _('If your HTTP repository is not publicly accessible, add your credentials.') - %li - = import_will_timeout_message(ci_cd_only) - %li - = import_svn_message(ci_cd_only) - = render_if_exists 'shared/ci_cd_only_link', ci_cd_only: ci_cd_only - -= render_if_exists 'shared/ee/import_form', f: f, ci_cd_only: ci_cd_only |