diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-20 12:35:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-20 12:35:41 +0000 |
| commit | c815abbdc06fd37463b1383160a2aa1812729f4d (patch) | |
| tree | a524c74f1387ca9d0db9f435a2792a9151f6dcf8 | |
| parent | c6c7f972f27a19d9d2ffcc1c2a3304fee4565369 (diff) | |
| parent | d4f6e1f21c40c729d5ed3a3f02d6a84777a40163 (diff) | |
| download | gitlab-ce-c815abbdc06fd37463b1383160a2aa1812729f4d.tar.gz | |
Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master'
Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes"
Closes #48010
See merge request gitlab-org/gitlab-ce!20015
| -rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/changelogs/unreleased/blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes.yml b/changelogs/unreleased/blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes.yml new file mode 100644 index 00000000000..c8d916af824 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Fix ActionCable '/cable' mountpoint conflict" +merge_request: 20015 +author: "@blackst0ne" +type: fixed diff --git a/config/application.rb b/config/application.rb index 95f6d2c9af1..385eb65e7f4 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 = "-" if rails5? + # Configure sensitive parameters which will be filtered from the log file. # # Parameters filtered: |