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 /app | |
| 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
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 |
1 files changed, 0 insertions, 2 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) |