aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bring latest changes over from actioncable/masterJavan Makhmali2015-12-152-4/+15
|
* Switch from engine to railtieDavid Heinemeier Hansson2015-12-152-6/+6
|
* Use a bind param for `LIMIT` and `OFFSET`Sean Griffin2015-12-155-13/+47
| | | | | | | | | | | | | | | We currently generate an unbounded number of prepared statements when `limit` or `offset` are called with a dynamic argument. This changes `LIMIT` and `OFFSET` to use bind params, eliminating the problem. `Type::Value#hash` needed to be implemented, as it turns out we busted the query cache if the type object used wasn't exactly the same object. This drops support for passing an `Arel::Nodes::SqlLiteral` to `limit`. Doing this relied on AR internals, and was never officially supported usage. Fixes #22250.
* Deprecate limit strings with commasSean Griffin2015-12-152-3/+13
| | | | | | | | | | Some backends allow `LIMIT 1,2` as a shorthand for `LIMIT 1 OFFSET 2`. Supporting this in Active Record massively complicates using bind parameters for limit and offset, and it's trivially easy to build an invalid SQL query by also calling `offset` on the same `Relation`. This is a niche syntax that is only supported by a few adapters, and can be trivially worked around by calling offset explicitly.
* Add specific bug reporting guidelines to contributing.md. [ci skip]Tim2015-12-151-7/+33
| | | | | | | | Add boldface and bullets to make more readable. Make sentences declarative. Remove "you"s.
* Add option to skip Action CableRafael Mendonça França2015-12-143-2/+10
|
* Do not run action cable tests in isolationRafael Mendonça França2015-12-141-0/+1
| | | | We don't have isolation tests for it yet.
* Hook in ActionView::Base, not in ApplicationControllerRafael Mendonça França2015-12-141-2/+4
| | | | | | The application can have more than one ApplicationController and we want Action Cable helpers in all controllers and their views so we should hook in the same place that others helpers.
* Require the top level file in the engineRafael Mendonça França2015-12-141-0/+1
|
* Add Action Cable tests to travis matrixRafael Mendonça França2015-12-142-0/+2
|
* Update Gemfile.lockRafael Mendonça França2015-12-141-5/+0
|
* Add action_cable to rails/all and application.rbRafael Mendonça França2015-12-142-9/+11
|
* Remove action cable gems that are already in the gemspecRafael Mendonça França2015-12-141-6/+0
|
* Remove Alpha disclaimer from ActionCableclaudiob2015-12-141-21/+0
| | | | [ci skip] Getting to ready to merge into rails/rails
* Initial stab at adding Action Cable to rails/masterDavid Heinemeier Hansson2015-12-1464-1/+3547
|\
| * Get ready to merge into RailsDavid Heinemeier Hansson2015-12-1462-0/+0
| |
| * 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