diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
| commit | 6c3eea0db04be446a1daebf629b6ddf9e0f18d18 (patch) | |
| tree | 7de3db2d1addf9ea8e018817c1b8de378d33fb9d /config/application.rb | |
| parent | 24ba0989878a363c37d86758844a17a99fc7ae0c (diff) | |
| parent | 2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff) | |
| download | gitlab-ce-6c3eea0db04be446a1daebf629b6ddf9e0f18d18.tar.gz | |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 95f6d2c9af1..202e5d5e327 100644 --- a/config/application.rb +++ b/config/application.rb @@ -57,6 +57,13 @@ module Gitlab # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" + # ActionCable mount point. + # The default Rails' mount point is `/cable` which may conflict with existing + # 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 = "/-/cable" if rails5? + # Configure sensitive parameters which will be filtered from the log file. # # Parameters filtered: |