diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 16:33:33 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-21 19:30:04 +0300 |
| commit | ee917c0a7c97c4b144705c01ba35440bc03e11cf (patch) | |
| tree | 72d3a15f72119186e60d5392d71eac200aa17d4d /app | |
| parent | 3d5526a0e84d3efa208c98339a14690b51a1827d (diff) | |
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) |