Commit 0ec3e8c6 authored by Douwe Maan's avatar Douwe Maan

Textual change

parent c356fae5
......@@ -14,9 +14,9 @@
= icon("exclamation-triangle")
Fast-forward merge is not possible
%p
Please rebase this branch on
Rebase the source branch onto
%span.label-branch= @merge_request.target_branch
and try again.
to allow this merge request to be merged.
- else
= form_for [:rebase, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'rebase-mr-form js-requires-input' } do |f|
= hidden_field_tag :authenticity_token, form_authenticity_token
......
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