Show fast-forward error message when there is no rebase in progress

parent 79956287
...@@ -116,6 +116,13 @@ ...@@ -116,6 +116,13 @@
<loading-icon v-if="isMakingRequest" /> <loading-icon v-if="isMakingRequest" />
Rebase Rebase
</button> </button>
<span
v-if="!renderError"
class="bold">
Fast-forward merge is not possible.
Rebase the source branch onto the target branch or merge target
branch into source branch to allow this merge request to be merged.
</span>
<span <span
v-if="renderError" v-if="renderError"
class="bold danger"> class="bold danger">
......
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