aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #115 from habermann24/masterDavid Heinemeier Hansson2015-12-115-4/+57
|\
| * 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.Lachlan Sylvester2015-11-183-8/+14
* | | Merge pull request #126 from mikecarroll/add_allowed_request_origins_to_readmeDavid Heinemeier Hansson2015-12-111-3/+24
|\ \ \
| * | | Add README.md instructions on configuring ActionCable.server.config.allowed_r...Michael Carroll2015-11-201-3/+24
| |/ /
* | | Merge pull request #133 from assimovt/masterDavid Heinemeier Hansson2015-12-091-1/+1
|\ \ \
| * | | 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 typoTakayuki Matsubara2015-12-031-1/+1
|/ /
* | Tune whitespace in README.mdKasper Timm Hansen2015-11-151-5/+5
* | Merge pull request #117 from rails/shared-constantsJavan Makhmali2015-11-068-27/+30
|\ \
| * | 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 versio...Pratik Naik2015-11-052-3/+3
* Merge pull request #102 from rails/subscription-rejectionPratik2015-11-048-17/+102
|\
| * 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 r...Pratik Naik2015-11-042-3/+12
* | Merge pull request #113 from dballona/fix-subscription-callbacksJeremy Daer2015-11-042-3/+9
|\ \
| * | 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]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.Mike A. Owens2015-08-244-33/+34
* | | Merge pull request #84 from alexpeattie/nonstandard-logger-fixRafael França2015-10-231-3/+5
|\ \ \
| * | | 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
|\ \ \ \
| * | | | [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
* | | | Better test namePratik Naik2015-10-191-1/+1
* | | | Make sure the subscription confirmaion is only sent out oncePratik Naik2015-10-192-2/+34
* | | | Merge pull request #98 from rails/subscription-confirmationPratik2015-10-198-18/+76
|\ \ \ \
| * | | | Freeze the SUBSCRIPTION_CONFIRMATION_INTERNAL_MESSAGE valuePratik Naik2015-10-191-1/+1
| * | | | Fix an error message in the subscription testsPratik Naik2015-10-161-1/+1
| * | | | Send subscription confirmation from server to the client to avoid race condit...Pratik Naik2015-10-168-18/+76
|/ / / /
* | | | Fix stream testsPratik Naik2015-10-161-2/+2
* | | | Cover stray deps for the logging convenience requireJeremy Daer2015-10-161-0/+4
* | | | Merge branch 'adjust-reconnect'Jeremy Daer2015-10-162-23/+29
|\ \ \ \
| * | | | Tweak reconnect timingJavan Makhmali2015-10-141-14/+15
| * | | | Remove immediate reconnect to help avoid thundering herd after server restartsJavan Makhmali2015-10-141-4/+0
| * | | | Avoid returning results of loopJavan Makhmali2015-10-141-0/+1