Merge branch 'patch-53' into 'master'

Don't suggest creating merge commit when using FF merge

See merge request gitlab-org/gitlab!22834

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue

@@ -127,7 +127,7 @@ export default {
           </button>
           <span v-if="!rebasingError" class="bold">{{
             __(
-              'Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged.',
+              'Fast-forward merge is not possible. Rebase the source branch onto the target branch.',
             )
           }}</span>
           <span v-else class="bold danger">{{ rebasingError }}</span>

changelogs/unreleased/22834-ff-merge-msg.yml

+---
+title: Improve fast-forward merge is not possible message
+merge_request: 22834
+author: Ben Bodenmiller
+type: other

locale/gitlab.pot

@@ -9291,7 +9291,7 @@ msgstr ""
 msgid "Fast-forward merge is not possible. Rebase the source branch onto %{targetBranch} to allow this merge request to be merged."
 msgstr ""
 
-msgid "Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged."
+msgid "Fast-forward merge is not possible. Rebase the source branch onto the target branch."
 msgstr ""
 
 msgid "Fast-forward merge without a merge commit"

spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js

@@ -45,10 +45,8 @@ describe('Merge request widget rebase component', () => {
 
       expect(text).toContain('Fast-forward merge is not possible.');
       expect(text.replace(/\s\s+/g, ' ')).toContain(
-        'Rebase the source branch onto the target branch or merge target',
+        'Rebase the source branch onto the target branch.',
       );
-
-      expect(text).toContain('branch into source branch to allow this merge request to be merged.');
     });
 
     it('it should render error message when it fails', done => {