diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 20:38:46 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 20:38:46 +0000 |
| commit | 8d131eb85ddc1ee6cd4a27830b2607617d767f28 (patch) | |
| tree | ec42e6d1ea049de36c21de8b3017988963bd5289 /app/controllers/projects | |
| parent | b92e3d746466667642fd99d1ed72b481488d1a9f (diff) | |
| parent | 696b0395116f9f973c919b281a1a5df023f22084 (diff) | |
| download | gitlab-ce-8d131eb85ddc1ee6cd4a27830b2607617d767f28.tar.gz | |
Merge branch 'zj-realtime-env-list' into 'master'
Realtime env list
Closes #31701
See merge request !11333
Diffstat (limited to 'app/controllers/projects')
| -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 efe83776834..4630f451445 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) |