diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-26 19:24:47 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 23:50:09 +0300 |
| commit | c5da65b9e33e711b5ccaf55ceec52523a97dc89f (patch) | |
| tree | 5a62bf7160a7f3340994cbee08d1eae23c8ca618 /app/models | |
| parent | 10549d36f0de64b5b94fbe9fad238ed7da64a70e (diff) | |
Merge branch '33933-fix-deployment-indicator-date' into 'master'
Fix bug where Service `created_at` time was used instead of deployment time.
Closes #33933
See merge request !12395
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 110b8bc209b..3e95cbe7a68 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -70,7 +70,7 @@ class PrometheusService < MonitoringService def deployment_metrics(deployment) metrics = with_reactive_cache(Gitlab::Prometheus::Queries::DeploymentQuery.name, deployment.id, &:itself) - metrics&.merge(deployment_time: created_at.to_i) || {} + metrics&.merge(deployment_time: deployment.created_at.to_i) || {} end # Cache metrics for specific environment |