diff options
| author | James Ramsay <james@jramsay.com.au> | 2019-07-31 13:09:48 -0400 |
|---|---|---|
| committer | James Ramsay <james@jramsay.com.au> | 2019-07-31 13:14:14 -0400 |
| commit | ca9d8bb952d01547be62326b0b51185c500e0e6d (patch) | |
| tree | a1fb4ae08e001f310b1b2fcd34a2096379c439b8 | |
| parent | 3e63fe70ccff3dc477a1740c0a7f164b7caada1f (diff) | |
| download | gitlab-ce-ca9d8bb952d01547be62326b0b51185c500e0e6d.tar.gz | |
Fix mirroring help text
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/mirrors/_instructions.html.haml b/app/views/projects/mirrors/_instructions.html.haml index 33e5a6e67c3..1a163cc4a54 100644 --- a/app/views/projects/mirrors/_instructions.html.haml +++ b/app/views/projects/mirrors/_instructions.html.haml @@ -2,7 +2,7 @@ %ul %li = _('The repository must be accessible over <code>http://</code>, - <code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe + <code>https://</code>, <code>ssh://</code> or <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 - minutes = Gitlab.config.gitlab_shell.git_timeout / 60 diff --git a/changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml b/changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml new file mode 100644 index 00000000000..4c049dffc58 --- /dev/null +++ b/changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml @@ -0,0 +1,5 @@ +--- +title: Fix mirroring help text +merge_request: 31348 +author: jramsay +type: other |