aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #137 from rails/freshen-client-side-examplesDavid Heinemeier Hansson2015-12-131-23/+47
|\ | | | | Freshen up the client-side subscription examples. Fixes #118
| * Associate comments with `perform`Javan Makhmali2015-12-111-2/+2
| |
| * Freshen up the client-side subscription examples. Fixes #118Javan Makhmali2015-12-111-24/+48
| |
* | Merge pull request #135 from gregmolnar/readmeDavid Heinemeier Hansson2015-12-131-0/+1
|\ \ | | | | | | add devise example to readme
| * | add devise example to readmeGreg Molnar2015-12-111-0/+1
| | |
* | | Merge pull request #73 from smellsblue/websocket-url-differentiationDavid Heinemeier Hansson2015-12-135-1/+60
|\ \ \ | | | | | | | | Easy websocket url configuration
| * | | Easy websocket url configurationMike Virata-Stone2015-12-115-1/+60
| | |/ | |/| | | | | | | Thanks to feedback from @ascrazy, @jeremy, and @javan
* | | Merge pull request #130 from adamliesko/allow_regexps_allowed_originsDavid Heinemeier Hansson2015-12-133-4/+18
|\ \ \ | |/ / |/| | Allow regexp for a allowed_request_origins array
| * | Remove unused method allowed_origins in Connection::Baseadamliesko2015-12-131-5/+0
| | |
| * | Allow regexp for a allowed_request_origins arrayadamliesko2015-12-123-4/+23
|/ /
* | Merge pull request #57 from lsylvester/log-to-stdout-in-developement-modeDavid Heinemeier Hansson2015-12-112-0/+10
|\ \ | | | | | | Add logging to stdout in development mode.
| * | log to stdout in development mode.Lachlan Sylvester2015-08-102-0/+10
| | |
* | | Merge pull request #115 from habermann24/masterDavid Heinemeier Hansson2015-12-115-4/+57
|\ \ \ | | | | | | | | Fix an error when using multiple gid identifiers
| * | | Use to_gid_param for connection identifiersJan Habermann2015-11-182-2/+6
| | | |
| * | | Add multiple identifiers testJan Habermann2015-11-064-2/+51
| | | |
| * | | Fix an error when using multiple gid identifiersJan Habermann2015-11-051-1/+1
| | | |
* | | | Merge pull request #125 from lsylvester/handle-custom-loggersDavid Heinemeier Hansson2015-12-113-8/+14
|\ \ \ \ | | | | | | | | | | Handle cases where logger is not a tagged logger.
| * | | | Handle cases where logger is not a tagged logger.Lachlan Sylvester2015-11-183-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, a TaggedLoggerProxy was only created if the logger responded to :tagged, but was still used as if it was a TaggedLoggerProxy elsewhere in the code, causing undefined method errors. This moved the check for tagging abilities inside the TaggedLoggerProxy so the code can always tread the logger like a tagged logger, and if it is not a tagged logger the tags will just be ignored. This prevents needing to check if the logger is tagged every time we use it.
* | | | | Merge pull request #126 from mikecarroll/add_allowed_request_origins_to_readmeDavid Heinemeier Hansson2015-12-111-3/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | | README.md instructions for configuring allowed request origins
| * | | | Add README.md instructions on configuring ↵Michael Carroll2015-11-201-3/+24
| |/ / / | | | | | | | | | | | | ActionCable.server.config.allowed_request_origins
* | | | Merge pull request #133 from assimovt/masterDavid Heinemeier Hansson2015-12-091-1/+1
|\ \ \ \ | | | | | | | | | | Update README find_verified_user example
| * | | | Update README find_verified_user exampleTair Assimov2015-12-081-1/+1
|/ / / /
* | | | Merge pull request #128 from ma2gedev/patch1Rafael França2015-12-031-1/+1
|\ \ \ \ | |/ / / |/| | | fix typo
| * | | fix typoTakayuki Matsubara2015-12-031-1/+1
|/ / /
* | | Tune whitespace in README.mdKasper Timm Hansen2015-11-151-5/+5
| | | | | | | | | | | | * Realign `end` statements with the opening `class` statement. * Pad JavaScript objects with spaces to match Rails styleguide and for consistency with other examples.
* | | Merge pull request #117 from rails/shared-constantsJavan Makhmali2015-11-068-27/+30
|\ \ \ | | | | | | | | Share internal identifiers and message types with the JavaScript client
| * | | Share internal identifiers and message types with the JavaScript clientJavan Makhmali2015-11-068-27/+30
|/ / /
* / / Missed updating a method namePratik Naik2015-11-061-1/+1
|/ /
* | Rename Subscription#reject! to Subscription#reject as there's only one ↵Pratik Naik2015-11-052-3/+3
| | | | | | | | version of the method
* | Merge pull request #102 from rails/subscription-rejectionPratik2015-11-048-17/+102
|\ \ | | | | | | Allow rejecting subscriptions from the channel
| * | Add some documentation explaining subscription rejectionPratik Naik2015-11-042-0/+19
| | |
| * | Fix a merge fail syntax issuePratik Naik2015-11-041-1/+1
| | |
| * | Merge branch 'master' into subscription-rejectionPratik Naik2015-11-0410-50/+65
| |\ \ | |/ / |/| |
* | | Make sure cable closes the connection if open when responding to an invalid ↵Pratik Naik2015-11-042-3/+12
| | | | | | | | | | | | request
* | | Merge pull request #113 from dballona/fix-subscription-callbacksJeremy Daer2015-11-042-3/+9
|\ \ \ | | | | | | | | Fixing subscription callbacks
| * | | Fixing subscription callbacksDiego Ballona2015-11-042-3/+9
| | | |
* | | | Merge pull request #106 from nobrick/masterKasper Timm Hansen2015-10-241-2/+2
|\| | | | | | | | | | | Remove unnecessary space in README [ci skip]
| * | | Remove unnecessary space in README [ci skip]Ming Qu2015-10-241-2/+2
|/ / /
* | | Don't ask an yanked celluloid versionRafael Mendonça França2015-10-231-4/+4
| | |
* | | Use our standard name for the GemfileRafael Mendonça França2015-10-232-1/+1
| | |
* | | Fix travis matrixRafael Mendonça França2015-10-231-1/+2
| | |
* | | Merge pull request #69 from mieko/callbacksRafael Mendonça França2015-10-234-34/+29
|\ \ \ | | | | | | | | | | | | Use ActiveSupport::Callbacks for Channel subscription callbacks.
| * | | Use ActiveSupport::Callbacks for Channel subscription callbacks.Mike A. Owens2015-08-244-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rely on AS::Callbacks for callback handling. * Add before_subscribe, after_subscribe, before_unsubscribe and after_unsubscribe convenience methods * alias on_subscribe and on_unsubscribe to after_subscribe and after_unsubscribe, respectively. * Remove `subscribed` and `unsubscribed` from the callback chain: these methods are now executed as the subject of the callbacks. * Update portions of ActionCable to use the more specific callback names.
* | | | Merge pull request #84 from alexpeattie/nonstandard-logger-fixRafael França2015-10-231-3/+5
|\ \ \ \ | | | | | | | | | | Fix NoMethodError when using a custom Rails.logger class
| * | | | Fix NoMethodError when using a custom Rails.logger classAlex Peattie2015-10-061-3/+5
| | | | |
* | | | | Merge pull request #46 from rajcybage/readme_fixRafael França2015-10-231-0/+2
|\ \ \ \ \ | | | | | | | | | | | | small description on readme for identified_by
| * | | | | [ci skip] small description on readme for identified_byRajarshi Das2015-07-301-0/+2
| | | | | |
| | | | * | Better method names in Javascript based on the feedback from @javanPratik Naik2015-10-222-18/+19
| | | | | |
| | | | * | Allow rejecting subscriptions from the channelPratik Naik2015-10-217-10/+75
| |_|_|/ / |/| | | |
* | | | | Fix the error message in testsPratik Naik2015-10-191-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 08:55:46 +0000