diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 09:06:14 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 09:06:14 +0000 |
commit | 76923eae4bc63d796c7a956a2931bd58f70fd324 (patch) | |
tree | 3adf726a7bd37a3bb29d8d17b8e421ae8cb31aff /app | |
parent | fbeeb1478c77a36c8e1f4e1e157539136e4ac4e2 (diff) | |
download | gitlab-ce-76923eae4bc63d796c7a956a2931bd58f70fd324.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/services/metrics/dashboard/grafana_metric_embed_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/metrics/dashboard/grafana_metric_embed_service.rb b/app/services/metrics/dashboard/grafana_metric_embed_service.rb index f302a786ba8..60591e9a6f3 100644 --- a/app/services/metrics/dashboard/grafana_metric_embed_service.rb +++ b/app/services/metrics/dashboard/grafana_metric_embed_service.rb @@ -44,6 +44,9 @@ module Metrics # Inherits the primary logic from the parent class and # maintains the service's API while including ReactiveCache def calculate_reactive_cache(*) + # This is called with explicit parentheses to prevent + # the params passed to #calculate_reactive_cache from + # being passed to #get_dashboard (which accepts none) ::Metrics::Dashboard::BaseService .instance_method(:get_dashboard) .bind(self) |