diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 13:33:33 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 13:33:33 +0000 |
| commit | 78ee24ba53a4a44d829613495ec0d5f1bbb5a9ee (patch) | |
| tree | b5f3dbe19e469dce34589c86d82be6658eada3af | |
| parent | cf3cdd48bb4959cb277752a16a4b98b7f4a4f3c4 (diff) | |
| parent | 91a550f583dbc6b6e6ad8780d9d9b6a7debb0b88 (diff) | |
| download | gitlab-ce-78ee24ba53a4a44d829613495ec0d5f1bbb5a9ee.tar.gz | |
Merge branch 'disable-environment-list-polling' into 'master'
Disable environment list polling as it breaks deployboard
See merge request !12347
3 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 4630f451445..efe83776834 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -15,8 +15,6 @@ 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/disable-environment-list-refresh.yml b/changelogs/unreleased/disable-environment-list-refresh.yml new file mode 100644 index 00000000000..62fd71496a0 --- /dev/null +++ b/changelogs/unreleased/disable-environment-list-refresh.yml @@ -0,0 +1,4 @@ +--- +title: Disable environment list refresh due to bug https://gitlab.com/gitlab-org/gitlab-ee/issues/2677 +merge_request: 12347 +author: diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb index f6840578145..fcc79902a3c 100644 --- a/spec/controllers/projects/environments_controller_spec.rb +++ b/spec/controllers/projects/environments_controller_spec.rb @@ -58,9 +58,11 @@ describe Projects::EnvironmentsController do expect(json_response['stopped_count']).to eq 1 end - it 'sets the polling interval header' do + 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 expect(response).to have_http_status(:ok) - expect(response.headers['Poll-Interval']).to eq("3000") + expect(response.headers['Poll-Interval']).to be_nil end end |