From 514826f50b618e881f418c1756dfbf5d895713e7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 31 Jan 2018 12:23:48 +0000
Subject: Fix broken test

---
 .../vue_merge_request_widget/components/mr_widget_related_links.vue    | 3 ++-
 app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js   | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
index 080ec1c579c..88d0fcd70f5 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
@@ -7,6 +7,7 @@
       relatedLinks: {
         type: Object,
         required: true,
+        default: () => ({}),
       },
       state: {
         type: String,
@@ -33,7 +34,7 @@
       {{ closesText }} <span v-html="relatedLinks.closing"></span>
     </p>
     <p v-if="relatedLinks.mentioned">
-      Mentions <span v-html="relatedLinks.mentioned"></span>
+      {{ s__("mrWidget|Mentions") }} <span v-html="relatedLinks.mentioned"></span>
     </p>
     <p v-if="relatedLinks.assignToMe">
       <span v-html="relatedLinks.assignToMe"></span>
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 6d3573de76c..edf67fcd0a7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -63,8 +63,7 @@ export default {
       return this.mr.hasCI;
     },
     shouldRenderRelatedLinks() {
-      const { closing, mentioned, assignToMe } = this.mr.relatedLinks;
-      return (closing || mentioned || assignToMe) && !this.mr.isNothingToMergeState;
+      return !!this.mr.relatedLinks && !this.mr.isNothingToMergeState;
     },
     shouldRenderDeployments() {
       return this.mr.deployments.length;
-- 
cgit v1.2.1