diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-06 14:31:24 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-06 14:31:24 +0100 |
commit | 03976c8f626863b7fa2a15211595774ab8f45360 (patch) | |
tree | 296505069bd553ea2aee5ea57d42ae32e757953d | |
parent | bb918a2fd98136c232baa34104c357f3716f8842 (diff) | |
download | gitlab-ce-enable-polling-env.tar.gz |
Re-enable polling for environmentsenable-polling-env
-rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/enable-polling-env.yml | 4 | ||||
-rw-r--r-- | spec/controllers/projects/environments_controller_spec.rb | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 919d021b59c..29e223a5273 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -15,6 +15,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController respond_to do |format| format.html format.json do + Gitlab::PollingInterval.set_header(response, interval: 3_000) + render json: { environments: EnvironmentSerializer .new(project: @project, current_user: @current_user) diff --git a/changelogs/unreleased/enable-polling-env.yml b/changelogs/unreleased/enable-polling-env.yml new file mode 100644 index 00000000000..b3f65f02574 --- /dev/null +++ b/changelogs/unreleased/enable-polling-env.yml @@ -0,0 +1,4 @@ +--- +title: Re-enable realtime for environments table +merge_request: +author: diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index 9db8ff5bbaa..f88f50c3cc6 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -58,11 +58,9 @@ describe Projects::EnvironmentsController do expect(json_response['stopped_count']).to eq 1 end - it 'does not set the polling interval header' do - # TODO, this is a temporary fix, see follow up issue: - # https://gitlab.com/gitlab-org/gitlab-ee/issues/2677 + it 'sets the polling interval header' do expect(response).to have_http_status(:ok) - expect(response.headers['Poll-Interval']).to be_nil + expect(response.headers['Poll-Interval']).to eq("3000") end end |