diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 14:21:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 14:21:56 +0000 |
| commit | 65eb469990d7eb6cb974e438e8c782da9c20db8d (patch) | |
| tree | dedb404455f5b1f8b0b69cd592c6eac51572d3e1 /config | |
| parent | d949826fef468bd4cae3c473e7924d2f2e5b11ec (diff) | |
| download | gitlab-ce-65eb469990d7eb6cb974e438e8c782da9c20db8d.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/action_cable.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/action_cable.rb b/config/initializers/action_cable.rb index 79a6ca5e18a..eb44ff00d09 100644 --- a/config/initializers/action_cable.rb +++ b/config/initializers/action_cable.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true Rails.application.configure do - # Prevents the default engine from being mounted because - # we're running ActionCable as a standalone server - config.action_cable.mount_path = nil + # We only mount the ActionCable engine in tests where we run it in-app + # For other environments, we run it on a standalone Puma server + config.action_cable.mount_path = Rails.env.test? ? '/-/cable' : nil config.action_cable.url = Gitlab::Utils.append_path(Gitlab.config.gitlab.relative_url_root, '/-/cable') config.action_cable.worker_pool_size = Gitlab.config.action_cable.worker_pool_size end |