diff options
| author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
| commit | fb80347dc00657ba36576f1f23bd42fdbcf9520a (patch) | |
| tree | 2642ac39cda31e29ea80defdc71e00c89ac8979e /app/controllers/projects/deployments_controller.rb | |
| parent | 73924cc51495f5f497114ed9f9de02f8b9c4205b (diff) | |
| parent | 6eb96b2019d392d906a64108dbe83b3ce7cce758 (diff) | |
| download | gitlab-ce-additional-metrics-dashboard.tar.gz | |
Merge branch '28717-additional-metrics-review-branch' into 'additional-metrics-dashboard'additional-metrics-dashboard
# Conflicts:
# app/assets/stylesheets/pages/environments.scss
Diffstat (limited to 'app/controllers/projects/deployments_controller.rb')
| -rw-r--r-- | app/controllers/projects/deployments_controller.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb index 29d94e2760a..e7d95e46b06 100644 --- a/app/controllers/projects/deployments_controller.rb +++ b/app/controllers/projects/deployments_controller.rb @@ -23,11 +23,12 @@ class Projects::DeploymentsController < Projects::ApplicationController end def additional_metrics - return render_404 unless deployment.has_additional_metrics? + return render_404 unless deployment.prometheus_service.present? + metrics = deployment.additional_metrics - if metrics&.any? - render json: metrics, status: :ok + if metrics.any? + render json: metrics else head :no_content end |