diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-21 08:54:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-21 08:54:30 +0000 |
| commit | 069c95e13ff626b5975f50846e4496ac7ff5463c (patch) | |
| tree | ca4b689c89975498f8ebcdcc336573b77ad2edb9 | |
| parent | f163ad59f9f8e8daa0c396f57d45165507e03c6b (diff) | |
| parent | b56b1009b7a0833c1021c718e996d2ae3e73672a (diff) | |
| download | gitlab-ce-069c95e13ff626b5975f50846e4496ac7ff5463c.tar.gz | |
Merge branch 'blackst0ne-rails5-fix-action-cable-mount-path' into 'master'
[Rails5] Fix ActionCable's mount_path configuration
See merge request gitlab-org/gitlab-ce!20051
| -rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 385eb65e7f4..202e5d5e327 100644 --- a/config/application.rb +++ b/config/application.rb @@ -62,7 +62,7 @@ module Gitlab # namespaces/users. # https://github.com/rails/rails/blob/5-0-stable/actioncable/lib/action_cable.rb#L38 # Please change this value when configuring ActionCable for real usage. - config.action_cable.mount_path = "-" if rails5? + config.action_cable.mount_path = "/-/cable" if rails5? # Configure sensitive parameters which will be filtered from the log file. # |