summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-09 09:08:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-09 09:08:20 +0000
commitd9f331328ab89d8423cb43ee9103f2a39b473d7f (patch)
tree15133b6f3388df1df271a8c64b74d5ce53baa466 /config/gitlab.yml.example
parent828858774207747860f4914e523a7864b5e56ccb (diff)
downloadgitlab-ce-d9f331328ab89d8423cb43ee9103f2a39b473d7f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 36d333f3164..03a45353465 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1070,6 +1070,9 @@ production: &base
## ActionCable settings
action_cable:
+ # Enables handling of ActionCable requests on the Puma web workers
+ # When this is disabled, a standalone ActionCable server must be started
+ in_app: true
# Number of threads used to process ActionCable connection callbacks and channel actions
# worker_pool_size: 4