From 246314e0dd3ca19c29e01c6f2abc4f944e287bf6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 8 Sep 2015 13:27:35 +0000 Subject: [PATCH] Improve spelling: Rebase from -> Rebase onto --- .../projects/merge_requests/widget/open/_ff_accept.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/merge_requests/widget/open/_ff_accept.html.haml b/app/views/projects/merge_requests/widget/open/_ff_accept.html.haml index b6dcc55425..edfb8e8091 100644 --- a/app/views/projects/merge_requests/widget/open/_ff_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_ff_accept.html.haml @@ -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(" Rebase in progress. It could take some time") + btn.html(" Rebase in progress. It could take some time") \ No newline at end of file