Merge branch '282422-pb-add-new-ff-merge-copy' into 'master'

Add merge trains copy to fast-forward merge settings option

See merge request gitlab-org/gitlab!77904

app/views/projects/_merge_request_merge_method_settings.html.haml

@@ -31,3 +31,6 @@
         = s_('ProjectSettings|Fast-forward merges only.')
         %br
         = s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
+        %div
+          = s_('ProjectSettings|If merge trains are enabled, merging is only possible if the branch can be rebased without conflicts.')
+          = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/merge_trains.md', anchor: 'enable-merge-trains'), target: '_blank', rel: 'noopener noreferrer'

locale/gitlab.pot

@@ -27958,6 +27958,9 @@ msgstr ""
 msgid "ProjectSettings|Highlight the usage of hidden unicode characters. These have innocent uses for right-to-left languages, but can also be used in potential exploits."
 msgstr ""
 
+msgid "ProjectSettings|If merge trains are enabled, merging is only possible if the branch can be rebased without conflicts."
+msgstr ""
+
 msgid "ProjectSettings|Internal"
 msgstr ""