TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix merge conflict in Action Cable guide [ci skip]

Browse Source
This commit is contained in:
Prathamesh Sonpatki 2016-02-28 20:16:56 +05:30
parent 2b5d784583
commit 4213825a9a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guides/source/action_cable_overview.md
View File

@ -546,7 +546,6 @@ You can change that in `config/database.yml` through the `pool` attribute.
## Running standalone cable servers
<<<<<<< HEAD
### In App
Action Cable can run alongside your Rails application. For example, to
@ -569,10 +568,8 @@ your server spawns, you will also have a new instance of ActionCable,
but the use of Redis keeps messages synced across connections.
### Standalone
The cable server(s) can be separated from your normal application server.
=======
The cable servers can be separated from your normal application server.
>>>>>>> Further cleanup of the cable guide
The cable servers can be separated from your normal application server.
It's still a Rack application, but it is its own Rack application.
The recommended basic setup is as follows: