Merge branch 'axil-okr-mirror-repo-ui-text' into 'master'

Update repository mirroring UI text

See merge request gitlab-org/gitlab!51311

app/views/projects/mirrors/_instructions.html.haml

@@ -3,12 +3,12 @@
     %li
       = html_escape(_('The repository must be accessible over %{code_open}http://%{code_close},
       %{code_open}https://%{code_close}, %{code_open}ssh://%{code_close} or %{code_open}git://%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
-    %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
+    %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
     %li= html_escape(_('Include the username in the URL if required: %{code_open}https://username@gitlab.company.com/group/project.git%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
     %li
       - minutes = Gitlab.config.gitlab_shell.git_timeout / 60
       = _("The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination.") % { number_of_minutes: minutes }
     %li= mirror_lfs_sync_message
     %li
-      = _('This user will be the author of all events in the activity feed that are the result of an update,
+      = _('In case of pull mirroring, your 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.')

app/views/projects/mirrors/_mirror_repos.html.haml

@@ -10,7 +10,7 @@
       = expanded ? _('Collapse') : _('Expand')
     %p
       = _('Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically.')
-      = link_to _('Read more'), help_page_path('user/project/repository/repository_mirroring.md'), target: '_blank'
+      = link_to _('How do I mirror repositories?'), help_page_path('user/project/repository/repository_mirroring'), target: '_blank', rel: 'noopener noreferrer'
 
   .settings-content
     - if mirror_settings_enabled
@@ -21,7 +21,7 @@
 
             .form-group.has-feedback
               = label_tag :url, _('Git repository URL'), class: 'label-light'
-              = text_field_tag :url, nil, class: 'form-control js-mirror-url js-repo-url qa-mirror-repository-url-input', placeholder: _('Input your repository URL'), required: true, pattern: "(#{protocols}):\/\/.+", autocomplete: 'new-password'
+              = text_field_tag :url, nil, class: 'form-control js-mirror-url js-repo-url qa-mirror-repository-url-input', placeholder: _('Input the remote repository URL'), required: true, pattern: "(#{protocols}):\/\/.+", autocomplete: 'new-password'
 
             = render 'projects/mirrors/instructions'
 
@@ -29,8 +29,10 @@
 
             .form-check.gl-mb-3
               = check_box_tag :only_protected_branches, '1', false, class: 'js-mirror-protected form-check-input'
-              = label_tag :only_protected_branches, _('Only mirror protected branches'), class: 'form-check-label'
-              = link_to sprite_icon('question-o'), help_page_path('user/project/protected_branches'), target: '_blank'
+              = label_tag :only_protected_branches, _('Mirror only protected branches'), class: 'form-check-label'
+              .form-text.text-muted
+                = _('If enabled, only protected branches will be mirrored.')
+                = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'mirror-only-protected-branches'), target: '_blank', rel: 'noopener noreferrer'
 
           .panel-footer
             = f.submit _('Mirror repository'), class: 'gl-button btn btn-success js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror

app/views/projects/mirrors/_mirror_repos_push.html.haml

@@ -10,4 +10,6 @@
   .form-check.gl-mb-3
     = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input'
     = label_tag :keep_divergent_refs, _('Keep divergent refs'), class: 'form-check-label'
-    = link_to sprite_icon('question-o'), help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs'), target: '_blank'
+    .form-text.text-muted
+      = _('By default, if any ref (branch, tag, or commit) on the remote mirror has diverged from the local repository, the entire push will fail, and nothing will be updated. Choose this option to override this behavior. After the mirror is created, this can only be modified via the API.')
+      = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs'), target: '_blank', rel: 'noopener noreferrer'

doc/user/project/repository/repository_mirroring.md

@@ -8,19 +8,16 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/repository_mirroring.htm
 # Repository mirroring
 
 Repository mirroring allows for mirroring of repositories to and from external sources. It can be
-used to mirror branches, tags, and commits between repositories.
+used to mirror branches, tags, and commits between repositories. It is useful when you want to use
+a repository outside of GitLab.
 
 A repository mirror at GitLab will be updated automatically. You can also manually trigger an update
 at most once every 5 minutes on GitLab.com with [the limit set by the administrator on self-managed instances](../../../administration/instance_limits.md#pull-mirroring-interval).
 
-## Overview
-
-Repository mirroring is useful when you want to use a repository outside of GitLab.
-
 There are two kinds of repository mirroring supported by GitLab:
 
-- Push: for mirroring a GitLab repository to another location.
-- Pull: for mirroring a repository from another location to GitLab. **(STARTER)**
+- [Push](#pushing-to-a-remote-repository): for mirroring a GitLab repository to another location. **(CORE)**
+- [Pull](#pulling-from-a-remote-repository): for mirroring a repository from another location to GitLab. **(STARTER)**
 
 When the mirror repository is updated, all new branches, tags, and commits will be visible in the
 project's activity feed.
@@ -31,8 +28,7 @@ immediate update, unless:
 - The mirror is already being updated.
 - The [limit for pull mirroring interval seconds](../../../administration/instance_limits.md#pull-mirroring-interval) has not elapsed since its last update.
 
-For security reasons, in [GitLab 12.10 and later](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27166),
-the URL to the original repository is only displayed to users with
+For security reasons, the URL to the original repository is only displayed to users with
 Maintainer or Owner permissions to the mirrored project.
 
 ## Use cases
@@ -62,7 +58,8 @@ For an existing project, you can set up push mirroring as follows:
 1. Navigate to your project's **Settings > Repository** and expand the **Mirroring repositories** section.
 1. Enter a repository URL.
 1. Select **Push** from the **Mirror direction** dropdown.
-1. Select an authentication method from the **Authentication method** dropdown, if necessary.
+1. Select an authentication method from the **Authentication method** dropdown.
+   You can authenticate with either a password or an [SSH key](#ssh-authentication).
 1. Check the **Only mirror protected branches** box, if necessary.
 1. Check the **Keep divergent refs** box, if desired.
 1. Click the **Mirror repository** button to save the configuration.
@@ -88,17 +85,7 @@ section.
 You can also create and modify project push mirrors through the
 [remote mirrors API](../../../api/remote_mirrors.md).
 
-### Push only protected branches **(CORE)**
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3350) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.3.
-> - [Moved to GitLab Core](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18715) in 10.8.
-
-You can choose to only push your protected branches from GitLab to your remote repository.
-
-To use this option, check the **Only mirror protected branches** box when creating a repository
-mirror.
-
-### Keep divergent refs **(CORE)**
+### Keep divergent refs
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208828) in GitLab 13.0.
 
@@ -119,7 +106,7 @@ update.
 NOTE:
 After the mirror is created, this option can currently only be modified via the [API](../../../api/remote_mirrors.md).
 
-## Setting up a push mirror from GitLab to GitHub **(CORE)**
+### Setting up a push mirror from GitLab to GitHub
 
 To set up a mirror from GitLab to GitHub, you need to follow these steps:
 
@@ -132,7 +119,7 @@ The mirrored repository will be listed. For example, `https://*****:*****@github
 
 The repository will push soon. To force a push, click the **Update now** (**{retry}**) button.
 
-## Setting up a push mirror from GitLab to AWS CodeCommit
+### Setting up a push mirror from GitLab to AWS CodeCommit
 
 AWS CodeCommit push mirroring is currently the best way to connect GitLab repositories to AWS CodePipeline, as GitLab is not yet supported as one of their Source Code Management (SCM) providers.
 
@@ -210,7 +197,7 @@ To test mirroring by forcing a push, click the half-circle arrows button (hover
 If **Last successful update** shows a date, you have configured mirroring correctly.
 If it is not working correctly a red `error` tag appears and shows the error message as hover text.
 
-## Setting up a push mirror to another GitLab instance with 2FA activated
+### Setting up a push mirror to another GitLab instance with 2FA activated
 
 1. On the destination GitLab instance, create a [personal access token](../../profile/personal_access_tokens.md) with `write_repository` scope.
 1. On the source GitLab instance:
@@ -249,8 +236,8 @@ To configure mirror pulling for an existing project:
 ![Repository mirroring pull settings screen - lower part](img/repository_mirroring_pull_settings_lower.png)
 
 Because GitLab is now set to pull changes from the upstream repository, you should not push commits
-directly to the repository on GitLab. Instead, any commits should be pushed to the upstream repository.
-Changes pushed to the upstream repository will be pulled into the GitLab repository, either:
+directly to the repository on GitLab. Instead, any commits should be pushed to the remote repository.
+Changes pushed to the remote repository will be pulled into the GitLab repository, either:
 
 - Automatically within a certain period of time.
 - When a [forced update](#forcing-an-update) is initiated.
@@ -275,10 +262,62 @@ Repository mirrors are updated as Sidekiq becomes available to process them. If
 - Fails (for example, a branch diverged from upstream), it will be attempted again later. Mirrors can fail
   up to 14 times before they will not be enqueued for update again.
 
-### SSH authentication
+### Overwrite diverged branches **(STARTER)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4559) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.6.
+
+You can choose to always update your local branches with remote versions, even if they have
+diverged from the remote.
+
+WARNING:
+For mirrored branches, enabling this option results in the loss of local changes.
+
+To use this option, check the **Overwrite diverged branches** box when creating a repository mirror.
+
+### Trigger pipelines for mirror updates **(STARTER)**
+
+If this option is enabled, pipelines will be triggered when branches or tags are
+updated from the remote repository. Depending on the activity of the remote
+repository, this may greatly increase the load on your CI runners. Only enable
+this if you know they can handle the load. CI will run using the credentials
+assigned when you set up pull mirroring.
+
+### Hard failure **(STARTER)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3117) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.2.
+
+Once the mirroring process is unsuccessfully retried 14 times in a row, it will get marked as hard
+failed. This will become visible in either the:
+
+- Project's main dashboard.
+- Pull mirror settings page.
+
+When a project is hard failed, it will no longer get picked up for mirroring.
+You can resume the project mirroring again by [forcing an update](#forcing-an-update).
+
+### Trigger an update using the API **(STARTER)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3453) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.3.
+
+Pull mirroring uses polling to detect new branches and commits added upstream, often minutes
+afterwards. If you notify GitLab by [API](../../../api/projects.md#start-the-pull-mirroring-process-for-a-project),
+updates will be pulled immediately.
+
+For more information, see [Start the pull mirroring process for a Project](../../../api/projects.md#start-the-pull-mirroring-process-for-a-project).
+
+## Mirror only protected branches **(STARTER)**
+
+Based on the mirror direction that you choose, you can opt to mirror only the
+[protected branches](../protected_branches.md) from/to your remote repository.
+For pull mirroring, non-protected branches are not mirrored and can diverge.
+
+To use this option, check the **Only mirror protected branches** box when
+creating a repository mirror.
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2551) for Pull mirroring in [GitLab Starter](https://about.gitlab.com/pricing/) 9.5.
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22982) for Push mirroring in [GitLab Core](https://about.gitlab.com/pricing/) 11.6
+## SSH authentication
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/2551) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.5 for Pull mirroring.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22982) in [GitLab Core](https://about.gitlab.com/pricing/) 11.6 for Push mirroring.
 
 SSH authentication is mutual:
 
@@ -367,50 +406,6 @@ NOTE:
 The generated keys are stored in the GitLab database, not in the filesystem. Therefore,
 SSH public key authentication for mirrors cannot be used in a pre-receive hook.
 
-### Overwrite diverged branches **(STARTER)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/4559) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.6.
-
-You can choose to always update your local branches with remote versions, even if they have
-diverged from the remote.
-
-WARNING:
-For mirrored branches, enabling this option results in the loss of local changes.
-
-To use this option, check the **Overwrite diverged branches** box when creating a repository mirror.
-
-### Only mirror protected branches **(STARTER)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3326) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.3.
-
-You can choose to pull mirror only the protected branches from your remote repository to GitLab.
-Non-protected branches are not mirrored and can diverge.
-
-To use this option, check the **Only mirror protected branches** box when creating a repository mirror.
-
-### Hard failure **(STARTER)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3117) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.2.
-
-Once the mirroring process is unsuccessfully retried 14 times in a row, it will get marked as hard
-failed. This will become visible in either the:
-
-- Project's main dashboard.
-- Pull mirror settings page.
-
-When a project is hard failed, it will no longer get picked up for mirroring. A user can resume the
-project mirroring again by [Forcing an update](#forcing-an-update).
-
-### Trigger update using API **(STARTER)**
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/3453) in [GitLab Starter](https://about.gitlab.com/pricing/) 10.3.
-
-Pull mirroring uses polling to detect new branches and commits added upstream, often minutes
-afterwards. If you notify GitLab by [API](../../../api/projects.md#start-the-pull-mirroring-process-for-a-project),
-updates will be pulled immediately.
-
-For more information, see [Start the pull mirroring process for a Project](../../../api/projects.md#start-the-pull-mirroring-process-for-a-project).
-
 ## Forcing an update **(CORE)**
 
 While mirrors are scheduled to update automatically, you can always force an update by using the
@@ -429,10 +424,7 @@ bidirectional mirroring, you should prepare for the likely conflicts by deciding
 them and how they will be resolved.
 
 Rewriting any mirrored commit on either remote will cause conflicts and mirroring to fail. This can
-be prevented by:
-
-- [Pulling only protected branches](#only-mirror-protected-branches).
-- [Pushing only protected branches](#push-only-protected-branches).
+be prevented by [mirroring only protected branches](#mirror-only-protected-branches).
 
 You should [protect the branches](../protected_branches.md) you wish to mirror on both
 remotes to prevent conflicts caused by rewriting history.

ee/app/views/projects/mirrors/_mirror_repos_form.html.haml

@@ -38,6 +38,7 @@
     = f.label :mirror_overwrites_diverged_branches, _('Overwrite diverged branches'), class: 'form-check-label'
     .form-text.text-muted
       = _("If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored.") % { default_branch: @project.default_branch }
+      = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'overwrite-diverged-branches'), target: '_blank', rel: 'noopener noreferrer'
 
   - if @project.builds_enabled?
     = render 'shared/mirror_trigger_builds_setting', f: f, checked: false

ee/app/views/shared/_mirror_status.html.haml

@@ -9,7 +9,7 @@
 
   - if @project.mirror_hard_failed?
     %br
-    Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project maintainer.
+    Repository mirroring has been paused due to too many failed attempts. It can be resumed by a project maintainer.
 
   - if @project.mirror_ever_updated_successfully?
     %br

ee/app/views/shared/_mirror_trigger_builds_setting.html.haml

@@ -6,5 +6,6 @@
   = f.check_box :mirror_trigger_builds, check_box_options.merge(class: "form-check-input")
   = f.label :mirror_trigger_builds, _("Trigger pipelines for mirror updates"), class: "form-check-label"
   .form-text.text-muted
-    = _('Trigger pipelines when branches or tags are updated from the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load.')
+    = _('Trigger pipelines when branches or tags are updated in the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load.')
     %strong= _('CI will run using the credentials assigned above.')
+    = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'trigger-pipelines-for-mirror-updates'), target: '_blank', rel: 'noopener noreferrer'

ee/changelogs/unreleased/axil-okr-mirror-repo-ui-text.yml

+---
+title: Update repository mirroring UI text
+merge_request: 51311
+author:
+type: other

ee/spec/views/shared/_mirror_status.html.haml_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe 'shared/_mirror_status.html.haml' do
       it 'renders hard failed message' do
         render 'shared/mirror_status', raw_message: true
 
-        expect(rendered).to have_content("Repository mirroring has been paused due to too many failed attempts, and can be resumed by a project maintainer.")
+        expect(rendered).to have_content("Repository mirroring has been paused due to too many failed attempts. It can be resumed by a project maintainer.")
       end
     end
   end

locale/gitlab.pot

@@ -4915,6 +4915,9 @@ msgstr ""
 msgid "By default, all projects and groups will use the global notifications setting."
 msgstr ""
 
+msgid "By default, if any ref (branch, tag, or commit) on the remote mirror has diverged from the local repository, the entire push will fail, and nothing will be updated. Choose this option to override this behavior. After the mirror is created, this can only be modified via the API."
+msgstr ""
+
 msgid "ByAuthor|by"
 msgstr ""
 
@@ -14454,6 +14457,9 @@ msgstr ""
 msgid "How do I configure runners?"
 msgstr ""
 
+msgid "How do I mirror repositories?"
+msgstr ""
+
 msgid "How does cleanup work?"
 msgstr ""
 
@@ -14595,6 +14601,9 @@ msgstr ""
 msgid "If enabled, access to projects will be validated on an external service using their classification label."
 msgstr ""
 
+msgid "If enabled, only protected branches will be mirrored."
+msgstr ""
+
 msgid "If the YouTube URL is https://www.youtube.com/watch?v=0t1DgySidms then the video ID is %{id}"
 msgstr ""
 
@@ -14841,6 +14850,9 @@ msgstr ""
 msgid "In %{time_to_now}"
 msgstr ""
 
+msgid "In case of pull mirroring, your 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."
+msgstr ""
+
 msgid "In order to enable Service Desk for your instance, you must first set up incoming email."
 msgstr ""
 
@@ -15090,7 +15102,7 @@ msgstr ""
 msgid "Input host keys manually"
 msgstr ""
 
-msgid "Input your repository URL"
+msgid "Input the remote repository URL"
 msgstr ""
 
 msgid "Insert a code block"
@@ -18325,6 +18337,9 @@ msgstr ""
 msgid "Mirror direction"
 msgstr ""
 
+msgid "Mirror only protected branches"
+msgstr ""
+
 msgid "Mirror repository"
 msgstr ""
 
@@ -19890,9 +19905,6 @@ msgstr ""
 msgid "Only admins can delete project"
 msgstr ""
 
-msgid "Only mirror protected branches"
-msgstr ""
-
 msgid "Only policy:"
 msgstr ""
 
@@ -29081,9 +29093,6 @@ msgstr ""
 msgid "This user is the author of this %{noteable}."
 msgstr ""
 
-msgid "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."
-msgstr ""
-
 msgid "This variable can not be masked."
 msgstr ""
 
@@ -29912,7 +29921,7 @@ msgstr ""
 msgid "Trigger pipelines for mirror updates"
 msgstr ""
 
-msgid "Trigger pipelines when branches or tags are updated from the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load."
+msgid "Trigger pipelines when branches or tags are updated in the upstream repository. Depending on the activity of the upstream repository, this may greatly increase the load on your CI runners. Only enable this if you know they can handle the load."
 msgstr ""
 
 msgid "Trigger removed."
@@ -31775,6 +31784,9 @@ msgstr[1] ""
 msgid "When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed."
 msgstr ""
 
+msgid "When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, provide the exact URL to the repository. HTTP redirects will not be followed."
+msgstr ""
+
 msgid "When:"
 msgstr ""