Commit c61f8805 authored by Mike Greiling's avatar Mike Greiling

Merge branch '45353-raw-html-is-being-shown-on-the-mr-page-from-performance-widget' into 'master'

Resolve "Raw HTML is being shown on the MR page from Performance widget"

Closes #45353

See merge request gitlab-org/gitlab-ce!18370
parents 3a1b961d 9c65c3cf
......@@ -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"
......
......@@ -51,8 +51,7 @@ const createComponent = () => {
const messages = {
loadingMetrics: 'Loading deployment statistics',
hasMetrics:
'<a href="/root/acets-review-apps/environments/15/metrics"> Memory </a> usage is <b> unchanged </b> at 0MB',
hasMetrics: 'Memory usage is unchanged at 0MB',
loadFailed: 'Failed to load deployment statistics',
metricsUnavailable: 'Deployment statistics are not available currently',
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment