summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-05 21:06:59 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-05 21:06:59 +0000
commit5c687e233bb9e28424f2723980bdf1ef2a475b6e (patch)
treea7bf58618d42f26ee387d34868dd1d76f7b11376 /lib
parent271ab5152955d95b3d7e2d4c7825a9b9f952ae4e (diff)
parent35bafb3797505f576934203fa29340239f26a80c (diff)
downloadgitlab-ce-5c687e233bb9e28424f2723980bdf1ef2a475b6e.tar.gz
Merge branch 'convert-poll-interval-to-string' into 'master'
Convert value to string before setting Poll-Interval header See merge request !10477
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/polling_interval.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/polling_interval.rb b/lib/gitlab/polling_interval.rb
index c44bb1cd14d..f0c50584f07 100644
--- a/lib/gitlab/polling_interval.rb
+++ b/lib/gitlab/polling_interval.rb
@@ -12,7 +12,7 @@ module Gitlab
value = -1
end
- response.headers[HEADER_NAME] = value
+ response.headers[HEADER_NAME] = value.to_s
end
def self.polling_enabled?