summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
index f4ab2d9fa58..b31a9b808a9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
@@ -3,6 +3,12 @@ export default {
props: {
mr: { type: Object, required: true },
},
+ computed: {
+ text() {
+ const sep = this.mr.createIssueToResolveDiscussionsPath ? ' or' : '.';
+ return `There are unresolved discussions. Please resolve these discussions${sep}`;
+ },
+ },
template: `
<div class="mr-widget-body">
<button
@@ -11,11 +17,9 @@ export default {
disabled="true">
Merge
</button>
- <span class="bold">
- There are unresolved discussions. Please resolve these discussions
- <span v-if="mr.canCreateIssue">or</span>
- <span v-else>.</span>
- </span>
+ <strong>
+ {{text}}
+ </strong>
<a
v-if="mr.createIssueToResolveDiscussionsPath"
:href="mr.createIssueToResolveDiscussionsPath"