diff options
author | Eric Eastwood <contact@ericeastwood.com> | 2018-02-21 05:23:49 +0300 |
---|---|---|
committer | Eric Eastwood <contact@ericeastwood.com> | 2018-03-05 22:26:34 +0300 |
commit | 32d121343d91eea44d1de344b398d30014180da0 (patch) | |
tree | e2a873db36cf497e23ce29fb7136ad96dd868293 /app/views/shared/_import_form.html.haml | |
parent | 8ae57909a1ac5f398098f9d1c4581b3cf3d61674 (diff) |
CI/CD-only projects FE
See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839
Conflicts:
app/assets/javascripts/projects/project_new.js
app/views/shared/_import_form.html.haml
ee/app/controllers/ee/projects_controller.rb
ee/spec/features/projects/new_project_spec.rb
locale/gitlab.pot
Diffstat (limited to 'app/views/shared/_import_form.html.haml')
-rw-r--r-- | app/views/shared/_import_form.html.haml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 736afa085e8..5eaaa1448d5 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -1,17 +1,22 @@ +- ci_cd_only = local_assigns.fetch(:ci_cd_only, false) + .form-group.import-url-data = f.label :import_url, class: 'label-light' do - %span Git repository URL + %span + = _('Git repository URL') - = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git' + = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git', required: true .well.prepend-top-20 %ul %li - The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>. + = _('The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.').html_safe %li - If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>. + = _('If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.').html_safe %li - The import will time out after #{time_interval_in_words(Gitlab.config.gitlab_shell.git_timeout)}. - For repositories that take longer, use a clone/push combination. + = import_will_timeout_message(ci_cd_only) %li - To migrate an SVN repository, check out #{link_to "this document", help_page_path('user/project/import/svn')}. + = import_svn_message(ci_cd_only) + +-# EE-specific start +-# EE-specific end |