diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-08-09 10:17:24 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-08-09 10:17:24 +0000 |
| commit | 07294d8157e78826f87b97f9c62db9d3ee973a04 (patch) | |
| tree | 8b8125109ab7f20e5f7526c9fe7b0748dbf07857 | |
| parent | 981fbc21b05638fa14911ee8fe8bc3fb39c025b8 (diff) | |
| download | gitlab-ce-07294d8157e78826f87b97f9c62db9d3ee973a04.tar.gz | |
Port EE changes
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 64f0fde30cf..e051f9e6331 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -1,10 +1,11 @@ .account-well.prepend-top-default.append-bottom-default %ul %li - The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> or <code>git://</code>. - %li - Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>. - %li - The update action will time out after 10 minutes. For big repositories, use a clone/push combination. - %li - The Git LFS objects will <strong>not</strong> be synced. + = _('The repository must be accessible over <code>http://</code>, + <code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe + %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe + %li= _("The update action will time out after #{import_will_timeout_message(Gitlab.config.gitlab_shell.git_timeout)} minutes. For big repositories, use a clone/push combination.") + %li= _('The Git LFS objects will <strong>not</strong> be synced.').html_safe + %li + = _('This user will be the author of all events in the activity feed that are the result of an update, + like new branches being created or new commits being pushed to existing branches.') |