diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-04 10:34:35 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-04 10:34:35 +0300 |
| commit | cc4b9a377a4150265d9efc869601e9675e82ec11 (patch) | |
| tree | 1774876d9fafade9832e4558509f1a8219206853 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | |
| parent | 6d3ab5d8f676962fea5edd7a88b9cfb4ef45d2b5 (diff) | |
Update rendering of merge request in merge request widget
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40246
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue index a3a44dd8e99..83e7d6db9fa 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -35,9 +35,7 @@ export default { <status-icon status="warning" /> <div class="media-body space-children"> <span class="bold"> - <template v-if="mr.mergeError" - >{{ mr.mergeError }}.</template - > + <template v-if="mr.mergeError">{{ mr.mergeError }}</template> {{ s__('mrWidget|This merge request failed to be merged automatically') }} </span> <button |