Merge branch 'update-text-on-import-and-mirroring-forms' into 'master'

Update text on project import and mirroring forms

See merge request gitlab-org/gitlab-ce!32567

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

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

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 ""