Commit da546347 authored by Eric Eastwood's avatar Eric Eastwood

Add period to multi-sentence fast-foward related messages

See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
parent b37069b7
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
v-if="mr.ffOnlyEnabled" v-if="mr.ffOnlyEnabled"
class="bold"> class="bold">
Fast-forward merge is not possible. Fast-forward merge is not possible.
To merge this request, first rebase locally To merge this request, first rebase locally.
</span> </span>
<template v-else> <template v-else>
<span class="bold"> <span class="bold">
......
...@@ -79,7 +79,7 @@ export default { ...@@ -79,7 +79,7 @@ export default {
Fast-forward merge is not possible. Fast-forward merge is not possible.
Rebase the source branch onto Rebase the source branch onto
<span class="label-branch">{{mr.targetBranch}}</span> <span class="label-branch">{{mr.targetBranch}}</span>
to allow this merge request to be merged to allow this merge request to be merged.
</span> </span>
</template> </template>
<template v-if="!mr.rebaseInProgress && mr.canPushToSourceBranch && !isMakingRequest"> <template v-if="!mr.rebaseInProgress && mr.canPushToSourceBranch && !isMakingRequest">
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
<span class="bold"> <span class="bold">
Fast-forward merge is not possible. Fast-forward merge is not possible.
Rebase the source branch onto the target branch or merge target Rebase the source branch onto the target branch or merge target
branch into source branch to allow this merge request to be merged branch into source branch to allow this merge request to be merged.
</span> </span>
</div> </div>
</template> </template>
......
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