BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ee917c0a
Commit
ee917c0a
authored
Jun 21, 2017
by
Grzegorz Bizon
Committed by
kushalpandya
Jun 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'disable-environment-list-polling' into 'master'
Disable environment list polling as it breaks deployboard See merge request !12347
parent
3d5526a0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
environments_controller.rb
app/controllers/projects/environments_controller.rb
+0
-2
disable-environment-list-refresh.yml
changelogs/unreleased/disable-environment-list-refresh.yml
+4
-0
environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+4
-2
No files found.
app/controllers/projects/environments_controller.rb
View file @
ee917c0a
...
@@ -15,8 +15,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -15,8 +15,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
json
do
format
.
json
do
Gitlab
::
PollingInterval
.
set_header
(
response
,
interval:
3_000
)
render
json:
{
render
json:
{
environments:
EnvironmentSerializer
environments:
EnvironmentSerializer
.
new
(
project:
@project
,
current_user:
@current_user
)
.
new
(
project:
@project
,
current_user:
@current_user
)
...
...
changelogs/unreleased/disable-environment-list-refresh.yml
0 → 100644
View file @
ee917c0a
---
title
:
Disable environment list refresh due to bug https://gitlab.com/gitlab-org/gitlab-ee/issues/2677
merge_request
:
12347
author
:
spec/controllers/projects/environments_controller_spec.rb
View file @
ee917c0a
...
@@ -58,9 +58,11 @@ describe Projects::EnvironmentsController do
...
@@ -58,9 +58,11 @@ describe Projects::EnvironmentsController do
expect
(
json_response
[
'stopped_count'
]).
to
eq
1
expect
(
json_response
[
'stopped_count'
]).
to
eq
1
end
end
it
'sets the polling interval header'
do
it
'does not set the polling interval header'
do
# TODO, this is a temporary fix, see follow up issue:
# https://gitlab.com/gitlab-org/gitlab-ee/issues/2677
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
).
to
have_http_status
(
:ok
)
expect
(
response
.
headers
[
'Poll-Interval'
]).
to
eq
(
"3000"
)
expect
(
response
.
headers
[
'Poll-Interval'
]).
to
be_nil
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment