kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes' into 'master'

Browse source 
Resolve "[Rails5] Found new routes that could cause conflicts with existing namespaced routes"

Closes #48010

See merge request gitlab-org/gitlab-ce!20015
This commit is contained in:
Rémy Coutable 2018-06-20 12:35:41 +00:00
commit c815abbdc0
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: "[Rails5] Fix ActionCable '/cable' mountpoint conflict"
merge_request: 20015
author: "@blackst0ne"
type: fixed

7
config/application.rb
View file

@ -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: