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'

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