diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-12 17:15:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-12 17:15:31 +0000 |
| commit | bec9ec9a6e8980d4354f2b577cfd2a96a83a73b7 (patch) | |
| tree | 4a5c6ddb0915de712628e48dfdf7c8cbea7a17fa /app/controllers | |
| parent | 4024200314144cd7aa0bda35f38817c8b198142a (diff) | |
| parent | f38779c6f521e0d554303db0619bafb07ffeda29 (diff) | |
| download | gitlab-ce-bec9ec9a6e8980d4354f2b577cfd2a96a83a73b7.tar.gz | |
Merge branch '27439-performance-deltas' into 'master'
Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries
See merge request !10981
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/deployments_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb index f06a4d943f3..6644deb49c9 100644 --- a/app/controllers/projects/deployments_controller.rb +++ b/app/controllers/projects/deployments_controller.rb @@ -11,13 +11,15 @@ class Projects::DeploymentsController < Projects::ApplicationController end def metrics - @metrics = deployment.metrics(1.hour) - + return render_404 unless deployment.has_metrics? + @metrics = deployment.metrics if @metrics&.any? render json: @metrics, status: :ok else head :no_content end + rescue NotImplementedError + render_404 end private |