From ee917c0a7c97c4b144705c01ba35440bc03e11cf Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 21 Jun 2017 13:33:33 +0000 Subject: Merge branch 'disable-environment-list-polling' into 'master' Disable environment list polling as it breaks deployboard See merge request !12347 --- app/controllers/projects/environments_controller.rb | 2 -- 1 file changed, 2 deletions(-) (limited to 'app') 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) -- cgit v1.2.3