diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-03 14:00:47 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-06-03 14:00:47 +0000 |
| commit | 4e85538dddf47877cacc65cea6c050e349af0405 (patch) | |
| tree | 302517b50aa4eb1fbccf520b752dffda68807c1a /guides/source/action_cable_overview.md | |
| parent | 082a5158251c6578714132e5c4f71bd39f462d71 (diff) | |
| parent | cf2158cbbf12a3a00c780ef5136f11b77c566713 (diff) | |
| download | rails-4e85538dddf47877cacc65cea6c050e349af0405.tar.gz rails-4e85538dddf47877cacc65cea6c050e349af0405.tar.bz2 rails-4e85538dddf47877cacc65cea6c050e349af0405.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/action_cable_overview.md
Diffstat (limited to 'guides/source/action_cable_overview.md')
| -rw-r--r-- | guides/source/action_cable_overview.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/action_cable_overview.md b/guides/source/action_cable_overview.md index c7770c16ea..16aa9438a2 100644 --- a/guides/source/action_cable_overview.md +++ b/guides/source/action_cable_overview.md @@ -82,7 +82,7 @@ The cookie is then automatically sent to the connection instance when a new conn is attempted, and you use that to set the `current_user`. By identifying the connection by this same current user, you're also ensuring that you can later retrieve all open connections by a given user (and potentially disconnect them all if the user is deleted -or deauthorized). +or unauthorized). ### Channels |