diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-07-06 15:14:16 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-07-06 15:14:16 +0000 |
| commit | e1a64f0c6d769c38918c50fdbd9b72b0f6fcfa4a (patch) | |
| tree | 9b258352d7fc46bcbd1f38312fbf97a7891cbd78 /app | |
| parent | dfd3178c13f88cee5e5ba03f91c85b78ca05e22b (diff) | |
| parent | 03976c8f626863b7fa2a15211595774ab8f45360 (diff) | |
| download | gitlab-ce-e1a64f0c6d769c38918c50fdbd9b72b0f6fcfa4a.tar.gz | |
Merge branch 'enable-polling-env' into 'master'
Re-enable polling for environments
See merge request !12678
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 |
1 files changed, 2 insertions, 0 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) |