Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
da546347
Commit
da546347
authored
Sep 28, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add period to multi-sentence fast-foward related messages
See
https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
parent
b37069b7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
...e_request_widget/components/states/mr_widget_conflicts.js
+1
-1
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.js
...erge_request_widget/components/states/mr_widget_rebase.js
+2
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @
da546347
...
@@ -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">
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.js
View file @
da546347
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment