Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 9 insertions, 9 deletions

diff --git a/app/views/projects/_merge_request_merge_method_settings.html.haml b/app/views/projects/_merge_request_merge_method_settings.html.haml
index 1be7f7bb418..f55d840e14b 100644
--- a/app/views/projects/_merge_request_merge_method_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_method_settings.html.haml
@@ -2,32 +2,32 @@
 
 .form-group
   %b= s_('ProjectSettings|Merge method')
-  %p.text-secondary= s_('ProjectSettings|This will dictate the commit history when you merge a merge request')
+  %p.text-secondary= s_('ProjectSettings|Determine what happens to the commit history when you merge a merge request.')
   .form-check.mb-2
     = form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
     = label_tag :project_merge_method_merge, class: 'form-check-label' do
       = s_('ProjectSettings|Merge commit')
       .text-secondary
-        = s_('ProjectSettings|Every merge creates a merge commit')
+        = s_('ProjectSettings|Every merge creates a merge commit.')
 
   .form-check.mb-2
     = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input"
     = label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do
       = s_('ProjectSettings|Merge commit with semi-linear history')
       .text-secondary
-        = s_('ProjectSettings|Every merge creates a merge commit')
+        = s_('ProjectSettings|Every merge creates a merge commit.')
         %br
-        = s_('ProjectSettings|Fast-forward merges only')
+        = s_('ProjectSettings|Fast-forward merges only.')
         %br
-        = s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
+        = s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')
 
   .form-check.mb-2
-    = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff form-check-input"
+    = form.radio_button :merge_method, :ff, class: "js-merge-method-radio form-check-input", data: { qa_selector: 'merge_ff_radio_button' }
     = label_tag :project_merge_method_ff, class: 'form-check-label' do
       = s_('ProjectSettings|Fast-forward merge')
       .text-secondary
-        = s_('ProjectSettings|No merge commits are created')
+        = s_('ProjectSettings|No merge commits are created.')
         %br
-        = s_('ProjectSettings|Fast-forward merges only')
+        = s_('ProjectSettings|Fast-forward merges only.')
         %br
-        = s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
+        = s_('ProjectSettings|When there is a merge conflict, the user is given the option to rebase.')