diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-08-01 00:31:11 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-08-01 00:31:11 +0300 |
| commit | 5a741e8d452090a21d53868c307ecdf6f129b999 (patch) | |
| tree | a9eda7c87bc83436aeb89145d759bee4f39c2f90 | |
| parent | ce77d137abcc8e21844fdee54620d95d7b626983 (diff) | |
| parent | e38c683e41b5d280145cc244fa2f3febad2f7c96 (diff) | |
Merge branch 'jramsay/fix-mirroring-help-text-typo' into 'master'
Fix mirroring help text
See merge request gitlab-org/gitlab-ce!31348
| -rw-r--r-- | app/views/projects/mirrors/_instructions.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/jramsay-fix-mirroring-help-text-typo.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 |
3 files changed, 7 insertions, 2 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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f64a9046ecb..4921b3c835b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -10975,7 +10975,7 @@ msgstr "" msgid "The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>." msgstr "" -msgid "The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> and <code>git://</code>." +msgid "The repository must be accessible over <code>http://</code>, <code>https://</code>, <code>ssh://</code> or <code>git://</code>." msgstr "" msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request." |