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
246314e0
Commit
246314e0
authored
Sep 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve spelling: Rebase from -> Rebase onto
parent
adbb4f13
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/views/projects/merge_requests/widget/open/_ff_accept.html.haml
.../projects/merge_requests/widget/open/_ff_accept.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/widget/open/_ff_accept.html.haml
View file @
246314e0
...
...
@@ -19,7 +19,7 @@
-
else
.accept-action
=
f
.
button
class:
"btn btn-reopen rebase-mr"
do
Rebase
from
#{
@merge_request
.
target_branch
}
Rebase
onto
#{
@merge_request
.
target_branch
}
.accept-control
Fast-forward merge is not possible. Branch must be rebased first
...
...
@@ -32,4 +32,4 @@
$('.rebase-mr-form').on 'ajax:before', ->
btn = $('.rebase-mr')
btn.disable()
btn.html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress. It could take some time")
btn.html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress. It could take some time")
\ No newline at end of file
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