diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-11 14:26:01 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-11 14:26:01 +0300 |
| commit | 83d8af2435034791ac0677d40807b3be4c3130be (patch) | |
| tree | d34e48b64a9676350efe72527bbc5d4e84438d61 /app/controllers | |
| parent | df000f03a98fa8bf21415ffc3babba6ccc11d86e (diff) | |
| parent | ecdc50b198796275b5f0862c5cdb0dca5aac1213 (diff) | |
Merge branch 'prom-api-1' into 'master'
Update server API to enable switch prometheus endpoint
See merge request gitlab-org/gitlab-ce!29186
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/environments/prometheus_api_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/environments/prometheus_api_controller.rb b/app/controllers/projects/environments/prometheus_api_controller.rb index f8ef23cd83e..9c6c6513a78 100644 --- a/app/controllers/projects/environments/prometheus_api_controller.rb +++ b/app/controllers/projects/environments/prometheus_api_controller.rb @@ -13,7 +13,7 @@ class Projects::Environments::PrometheusApiController < Projects::ApplicationCon ).execute if result.nil? - return render status: :accepted, json: { + return render status: :no_content, json: { status: _('processing'), message: _('Not ready yet. Try again later.') } |