Commit 1c946496 authored by Filipa Lacerda's avatar Filipa Lacerda

Small changes after review

parent acb64db8
......@@ -41,13 +41,14 @@
showDisabledButton() {
return ['failed', 'loading'].includes(this.status);
},
renderError() {
hasRebasingError() {
return this.rebasingError.length;
},
},
methods: {
rebase() {
this.isMakingRequest = true;
this.rebasingError = '';
this.service.rebase()
.then(() => {
......@@ -117,7 +118,7 @@
Rebase
</button>
<span
v-if="!renderError"
v-if="!hasRebasingError"
class="bold">
Fast-forward merge is not possible.
Rebase the source branch onto the target branch or merge target
......
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