diff options
| author | Adam Hegyi <ahegyi@gitlab.com> | 2019-09-05 21:12:12 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-09-05 21:12:12 +0000 |
| commit | 5979f9815c4d24bf506adf520f14ee838daafc8a (patch) | |
| tree | 5e2a5ea8f7345ce729d209f4ef7a934005d35ab5 | |
| parent | 71f7bd6b39a2dd9d41d429422561a6b6f4195dd6 (diff) | |
| download | gitlab-ce-5979f9815c4d24bf506adf520f14ee838daafc8a.tar.gz | |
Update text on project import and mirroring forms
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 1 | ||||
| -rw-r--r-- | app/views/shared/_import_form.html.haml | 1 | ||||
| -rw-r--r-- | doc/user/project/import/img/import_projects_from_repo_url.png | bin | 142329 -> 142284 bytes | |||
| -rw-r--r-- | doc/workflow/img/repository_mirroring_push_settings.png | bin | 50526 -> 72515 bytes | |||
| -rw-r--r-- | locale/gitlab.pot | 3 |
5 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 1a163cc4a54..7ff6c0a2019 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -3,6 +3,7 @@ %li = _('The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> or <code>git://</code>.').html_safe + %li= _('When using the <code>http://</code> or <code>https://</code> protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.').html_safe %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe %li - minutes = Gitlab.config.gitlab_shell.git_timeout / 60 diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index d0f9374e832..b2ea45d6f1a 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -27,6 +27,7 @@ %ul %li = _('The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.').html_safe + %li= _('When using the <code>http://</code> or <code>https://</code> protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.').html_safe %li = _('If your HTTP repository is not publicly accessible, add your credentials.') %li diff --git a/doc/user/project/import/img/import_projects_from_repo_url.png b/doc/user/project/import/img/import_projects_from_repo_url.png Binary files differindex c453c7e558a..90bcff5d31b 100644 --- a/doc/user/project/import/img/import_projects_from_repo_url.png +++ b/doc/user/project/import/img/import_projects_from_repo_url.png diff --git a/doc/workflow/img/repository_mirroring_push_settings.png b/doc/workflow/img/repository_mirroring_push_settings.png Binary files differindex 21a6aca4526..3c0eacaa2df 100644 --- a/doc/workflow/img/repository_mirroring_push_settings.png +++ b/doc/workflow/img/repository_mirroring_push_settings.png diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e15000b5184..075c2900b66 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -13023,6 +13023,9 @@ msgid_plural "When these merge requests are accepted" msgstr[0] "" msgstr[1] "" +msgid "When using the <code>http://</code> or <code>https://</code> protocols, please provide the exact URL to the repository. HTTP redirects will not be followed." +msgstr "" + msgid "When:" msgstr "" |
