Commit 246314e0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve spelling: Rebase from -> Rebase onto

parent adbb4f13
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- else - else
.accept-action .accept-action
= f.button class: "btn btn-reopen rebase-mr" do = f.button class: "btn btn-reopen rebase-mr" do
Rebase from #{@merge_request.target_branch} Rebase onto #{@merge_request.target_branch}
.accept-control .accept-control
Fast-forward merge is not possible. Branch must be rebased first Fast-forward merge is not possible. Branch must be rebased first
...@@ -32,4 +32,4 @@ ...@@ -32,4 +32,4 @@
$('.rebase-mr-form').on 'ajax:before', -> $('.rebase-mr-form').on 'ajax:before', ->
btn = $('.rebase-mr') btn = $('.rebase-mr')
btn.disable() 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
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