diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 12:09:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 12:09:06 +0300 |
commit | d87918510a866a5fcbbc2f899ad65c6938ebf5f5 (patch) | |
tree | 3c864a44f28dc17bcba2bcea30e49e0c08bd0582 /app | |
parent | fa478f189009649b115136957e2da30d760fe391 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/pages/projects/graphs/charts/index.js | 4 | ||||
-rw-r--r-- | app/services/metrics/dashboard/base_service.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/graphs/charts/index.js b/app/assets/javascripts/pages/projects/graphs/charts/index.js index 314519ee442..1b94fb06107 100644 --- a/app/assets/javascripts/pages/projects/graphs/charts/index.js +++ b/app/assets/javascripts/pages/projects/graphs/charts/index.js @@ -1,7 +1,5 @@ import $ from 'jquery'; import Chart from 'chart.js'; -import _ from 'underscore'; - import { barChartOptions, pieChartOptions } from '~/lib/utils/chart_utils'; document.addEventListener('DOMContentLoaded', () => { @@ -40,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => { backgroundColor: 'rgba(220,220,220,0.5)', borderColor: 'rgba(220,220,220,1)', borderWidth: 1, - data: _.values(data), + data: Object.values(data), }, ], }); diff --git a/app/services/metrics/dashboard/base_service.rb b/app/services/metrics/dashboard/base_service.rb index 40c015dff9c..3cd7d8437b1 100644 --- a/app/services/metrics/dashboard/base_service.rb +++ b/app/services/metrics/dashboard/base_service.rb @@ -46,10 +46,14 @@ module Metrics # Returns a new dashboard Hash, supplemented with DB info def process_dashboard ::Gitlab::Metrics::Dashboard::Processor - .new(project, raw_dashboard, sequence, params) + .new(project, raw_dashboard, sequence, process_params) .process end + def process_params + params + end + # @return [String] Relative filepath of the dashboard yml def dashboard_path params[:dashboard_path] |