Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
9c65c3cf
Commit
9c65c3cf
authored
Apr 13, 2018
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the metrics link being not rendering the html
parent
3a1b961d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue
...ipts/vue_merge_request_widget/components/memory_usage.vue
+2
-2
spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js
...s/vue_mr_widget/components/mr_widget_memory_usage_spec.js
+1
-2
No files found.
app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue
View file @
9c65c3cf
...
@@ -146,8 +146,8 @@ export default {
...
@@ -146,8 +146,8 @@ export default {
</p>
</p>
<p
<p
v-if=
"shouldShowMemoryGraph"
v-if=
"shouldShowMemoryGraph"
class=
"usage-info js-usage-info"
>
class=
"usage-info js-usage-info"
{{
memoryChangeMessage
}}
v-html=
"memoryChangeMessage"
>
</p>
</p>
<p
<p
v-if=
"shouldShowLoadFailure"
v-if=
"shouldShowLoadFailure"
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js
View file @
9c65c3cf
...
@@ -51,8 +51,7 @@ const createComponent = () => {
...
@@ -51,8 +51,7 @@ const createComponent = () => {
const
messages
=
{
const
messages
=
{
loadingMetrics
:
'
Loading deployment statistics
'
,
loadingMetrics
:
'
Loading deployment statistics
'
,
hasMetrics
:
hasMetrics
:
'
Memory usage is unchanged at 0MB
'
,
'
<a href="/root/acets-review-apps/environments/15/metrics"> Memory </a> usage is <b> unchanged </b> at 0MB
'
,
loadFailed
:
'
Failed to load deployment statistics
'
,
loadFailed
:
'
Failed to load deployment statistics
'
,
metricsUnavailable
:
'
Deployment statistics are not available currently
'
,
metricsUnavailable
:
'
Deployment statistics are not available currently
'
,
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment