diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 18:05:01 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 18:05:01 +0300 |
commit | 6384aedace16fff336ff2a29d526ad8fcdfc2b84 (patch) | |
tree | f8699aff6fb0d4e1a646d76ff2720520cd7c0652 /app/assets/javascripts/vue_merge_request_widget | |
parent | b3d8b85f6520c8f89690a8f0e3ab96f5e6740cb2 (diff) | |
parent | 5d6fb753ef3288c3da7e63470b7acd3694d86137 (diff) |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/admin/application_settings/_signin.html.haml
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue index 95c8b0a4c55..f012f9c6772 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue @@ -146,8 +146,8 @@ export default { </p> <p v-if="shouldShowMemoryGraph" - class="usage-info js-usage-info"> - {{ memoryChangeMessage }} + class="usage-info js-usage-info" + v-html="memoryChangeMessage"> </p> <p v-if="shouldShowLoadFailure" |