Commit 4062ba66 authored by Ben Bodenmiller's avatar Ben Bodenmiller Committed by Phil Hughes

Apply suggestion to...

Apply suggestion to app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
parent 14822a68
......@@ -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>
......
---
title: Improve fast-forward merge is not possible message
merge_request: 22834
author: Ben Bodenmiller
type: other
......@@ -9270,7 +9270,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"
......
......@@ -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 => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment