Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

5354c293

There was a problem fetching the pipeline summary.

Commit 5354c293 authored 7 years ago by Fatih Acet

Downloads
- Plain Diff

Merge branch '26944-prometheus-memory-sparkline' into 'master'

Add Prometheus memory sparkline to MR widget

Closes #26944

See merge request !11209

parents a3607aa4 f6600616

No related branches found

No related tags found

2 merge requests!12073Add RC2 changes to 9-3-stable,!11209Add Prometheus memory sparkline to MR widget

Pipeline #

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js 0 additions, 2 deletions

...e_merge_request_widget/components/mr_widget_deployment.js
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js 60 additions, 44 deletions

...merge_request_widget/components/mr_widget_memory_usage.js
app/assets/javascripts/vue_shared/components/memory_graph.js 93 additions, 14 deletions

app/assets/javascripts/vue_shared/components/memory_graph.js
app/assets/stylesheets/framework/memory_graph.scss 7 additions, 1 deletion

app/assets/stylesheets/framework/memory_graph.scss
app/assets/stylesheets/pages/merge_requests.scss 15 additions, 9 deletions

app/assets/stylesheets/pages/merge_requests.scss
app/controllers/projects/merge_requests_controller.rb 4 additions, 4 deletions

app/controllers/projects/merge_requests_controller.rb
spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js 4 additions, 0 deletions

...pts/vue_mr_widget/components/mr_widget_deployment_spec.js
spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js 184 additions, 0 deletions

...s/vue_mr_widget/components/mr_widget_memory_usage_spec.js
spec/javascripts/vue_shared/components/memory_graph_spec.js 143 additions, 0 deletions

spec/javascripts/vue_shared/components/memory_graph_spec.js
spec/javascripts/vue_shared/components/mock_data.js 69 additions, 0 deletions

spec/javascripts/vue_shared/components/mock_data.js

with 579 additions and 74 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment