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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
c8596aa9
Commit
c8596aa9
authored
Sep 28, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add period to multi-sentence rebase locally message
See
https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
parent
6f9a6d37
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
...e_request_widget/components/states/mr_widget_conflicts.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @
c8596aa9
...
@@ -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">
...
...
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