diff options
author | Murat Dogan <muratdogan@yahoo.com> | 2018-06-12 13:04:01 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-12 13:04:01 +0000 |
commit | 423fcb476e64c96d7945af8d9fca65aa6db20314 (patch) | |
tree | d91864ba51fc74d8a306c870552e253eee66d3ac /app | |
parent | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (diff) | |
download | gitlab-ce-423fcb476e64c96d7945af8d9fca65aa6db20314.tar.gz |
mergeError message has been binded using v-html directive
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue index 05fecd4de35..df866ed5706 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue @@ -1,5 +1,6 @@ <script> import { n__ } from '~/locale'; +import { stripHtml } from '~/lib/utils/text_utility'; import statusIcon from '../mr_widget_status_icon.vue'; import eventHub from '../../event_hub'; @@ -27,6 +28,9 @@ export default { }, computed: { + mergeError() { + return this.mr.mergeError ? stripHtml(this.mr.mergeError, ' ').trim() : ''; + }, timerText() { return n__( 'Refreshing in a second to show the updated status...', @@ -83,9 +87,9 @@ export default { <span class="bold"> <span class="has-error-message" - v-if="mr.mergeError" + v-if="mergeError" > - {{ mr.mergeError }}. + {{ mergeError }}. </span> <span v-else> {{ s__("mrWidget|Merge failed.") }} |