summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-02-18 21:52:09 +0000
committerRobert Speicher <robert@gitlab.com>2016-02-18 21:52:09 +0000
commitea4d2741a2b574407b0bd387ccd6a8202c014fc5 (patch)
tree9b64e5683b0a368ce9e54ce94f685f0db97b42c2
parentca324c2fe4ecbe16c4314ea12d88053dea5abe2b (diff)
parent5d2530f06957678d4f959e4c1d059fd8ee6d7463 (diff)
downloadgitlab-ce-ea4d2741a2b574407b0bd387ccd6a8202c014fc5.tar.gz
Merge branch 'patch-1' into 'master'
Bug found by Charles Sibbald at Sky. Calls with patricio and Jacob confirmed this. [ci skip] See merge request !2877
-rw-r--r--config/sidekiq.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/sidekiq.yml.example b/config/sidekiq.yml.example
index c691db67c6c..714bc06cb24 100644
--- a/config/sidekiq.yml.example
+++ b/config/sidekiq.yml.example
@@ -1,2 +1,2 @@
---
+---
:concurrency: 5 \ No newline at end of file