summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-05-12 14:47:58 +0300
committerFatih Acet <acetfatih@gmail.com>2017-05-16 15:11:55 +0300
commit9f8000790426e6c013dcb828c997a7dd72f5e3e1 (patch)
treee5848a4afcbcd80b88e745dc531a6f68e5449a64 /app/assets/javascripts/vue_merge_request_widget
parenta2dbb69331ad13c77986bc2c4ed64298d5bc1388 (diff)
downloadgitlab-ce-9f8000790426e6c013dcb828c997a7dd72f5e3e1.tar.gz
MRWidget: Fix specs and address WIP comments.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
index 1d9c30389e5..c314776d9bb 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
@@ -5,20 +5,17 @@ export default {
props: {
mr: {
type: Object,
- default: false,
+ required: true,
},
},
data() {
- return {
- canCreateNewFile: true,
- emptyStateSVG,
- };
+ return { emptyStateSVG };
},
template: `
<div class="mr-widget-body empty-state">
<div class="row">
<div class="artwork col-sm-5 col-sm-push-7 col-xs-12 text-center">
- <span v-html="emptyStateSVG" />
+ <span v-html="emptyStateSVG"></span>
</div>
<div class="text col-sm-7 col-sm-pull-5 col-xs-12">
<span>
@@ -33,7 +30,7 @@ export default {
Please push new commits or use a different branch.
</p>
<a
- v-if="canCreateNewFile"
+ v-if="mr.newBlobPath"
:href="mr.newBlobPath"
role="button"
class="btn btn-inverted btn-save">