summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-06-21 09:15:26 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-06-21 09:15:26 +1100
commitb56b1009b7a0833c1021c718e996d2ae3e73672a (patch)
tree29fda856c00119f634f9b5b1eeb1f93771718220
parente40aa397700f997b320d9e6299ab3b15b75c77a8 (diff)
downloadgitlab-ce-blackst0ne-rails5-fix-action-cable-mount-path.tar.gz
[Rails5] Fix ActionCable's mount_path configurationblackst0ne-rails5-fix-action-cable-mount-path
The original MR [1] fixed red specs for Rails 5. But while the failed specs were fixed, that changes brought new failed specs which weren't caught up in [1]. This commit just fixes the fix. :) New errors are like these: ``` Failed to upgrade to WebSocket (REQUEST_METHOD: GET, HTTP_CONNECTION: keep-alive, HTTP_UPGRADE: ) Finished "/-/boards/1/lists"[non-WebSocket] for 127.0.0.1 at 2018-06-20 18:09:26 +0200 ``` [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20015
-rw-r--r--config/application.rb2
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.
#