| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | Get ready to merge into Rails | David Heinemeier Hansson | 2015-12-14 | 62 | -0/+0 | |
| | | | | | | | ||||||
| | | * | | | | Merge pull request #137 from rails/freshen-client-side-examples | David Heinemeier Hansson | 2015-12-13 | 1 | -23/+47 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Freshen up the client-side subscription examples. Fixes #118 | |||||
| | | | * | | | | Associate comments with `perform` | Javan Makhmali | 2015-12-11 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | | | * | | | | Freshen up the client-side subscription examples. Fixes #118 | Javan Makhmali | 2015-12-11 | 1 | -24/+48 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge pull request #135 from gregmolnar/readme | David Heinemeier Hansson | 2015-12-13 | 1 | -0/+1 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | add devise example to readme | |||||
| | | | * | | | | | add devise example to readme | Greg Molnar | 2015-12-11 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge pull request #73 from smellsblue/websocket-url-differentiation | David Heinemeier Hansson | 2015-12-13 | 5 | -1/+60 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Easy websocket url configuration | |||||
| | | | * | | | | | | Easy websocket url configuration | Mike Virata-Stone | 2015-12-11 | 5 | -1/+60 | |
| | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | Thanks to feedback from @ascrazy, @jeremy, and @javan | |||||
| | | * | | | | | | Merge pull request #130 from adamliesko/allow_regexps_allowed_origins | David Heinemeier Hansson | 2015-12-13 | 3 | -4/+18 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Allow regexp for a allowed_request_origins array | |||||
| | | | * | | | | | Remove unused method allowed_origins in Connection::Base | adamliesko | 2015-12-13 | 1 | -5/+0 | |
| | | | | | | | | | ||||||
| | | | * | | | | | Allow regexp for a allowed_request_origins array | adamliesko | 2015-12-12 | 3 | -4/+23 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Merge pull request #57 from lsylvester/log-to-stdout-in-developement-mode | David Heinemeier Hansson | 2015-12-11 | 2 | -0/+10 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add logging to stdout in development mode. | |||||
| | | | * | | | | | log to stdout in development mode. | Lachlan Sylvester | 2015-08-10 | 2 | -0/+10 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge pull request #115 from habermann24/master | David Heinemeier Hansson | 2015-12-11 | 5 | -4/+57 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix an error when using multiple gid identifiers | |||||
| | | | * | | | | | | Use to_gid_param for connection identifiers | Jan Habermann | 2015-11-18 | 2 | -2/+6 | |
| | | | | | | | | | | ||||||
| | | | * | | | | | | Add multiple identifiers test | Jan Habermann | 2015-11-06 | 4 | -2/+51 | |
| | | | | | | | | | | ||||||
| | | | * | | | | | | Fix an error when using multiple gid identifiers | Jan Habermann | 2015-11-05 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge pull request #125 from lsylvester/handle-custom-loggers | David Heinemeier Hansson | 2015-12-11 | 3 | -8/+14 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Handle cases where logger is not a tagged logger. | |||||
| | | | * | | | | | | | Handle cases where logger is not a tagged logger. | Lachlan Sylvester | 2015-11-18 | 3 | -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_readme | David Heinemeier Hansson | 2015-12-11 | 1 | -3/+24 | |
| | | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | README.md instructions for configuring allowed request origins | |||||
| | | | * | | | | | | | Add README.md instructions on configuring ↵ | Michael Carroll | 2015-11-20 | 1 | -3/+24 | |
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionCable.server.config.allowed_request_origins | |||||
| | | * | | | | | | | Merge pull request #133 from assimovt/master | David Heinemeier Hansson | 2015-12-09 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update README find_verified_user example | |||||
| | | | * | | | | | | | Update README find_verified_user example | Tair Assimov | 2015-12-08 | 1 | -1/+1 | |
| | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge pull request #128 from ma2gedev/patch1 | Rafael França | 2015-12-03 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | fix typo | |||||
| | | | * | | | | | | fix typo | Takayuki Matsubara | 2015-12-03 | 1 | -1/+1 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Tune whitespace in README.md | Kasper Timm Hansen | 2015-11-15 | 1 | -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-constants | Javan Makhmali | 2015-11-06 | 8 | -27/+30 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Share internal identifiers and message types with the JavaScript client | |||||
| | | | * | | | | | | Share internal identifiers and message types with the JavaScript client | Javan Makhmali | 2015-11-06 | 8 | -27/+30 | |
| | | |/ / / / / / | ||||||
| | | * / / / / / | Missed updating a method name | Pratik Naik | 2015-11-06 | 1 | -1/+1 | |
| | | |/ / / / / | ||||||
| | | * | | | | | Rename Subscription#reject! to Subscription#reject as there's only one ↵ | Pratik Naik | 2015-11-05 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of the method | |||||
| | | * | | | | | Merge pull request #102 from rails/subscription-rejection | Pratik | 2015-11-04 | 8 | -17/+102 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Allow rejecting subscriptions from the channel | |||||
| | | | * | | | | | Add some documentation explaining subscription rejection | Pratik Naik | 2015-11-04 | 2 | -0/+19 | |
| | | | | | | | | | ||||||
| | | | * | | | | | Fix a merge fail syntax issue | Pratik Naik | 2015-11-04 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | | | * | | | | | Merge branch 'master' into subscription-rejection | Pratik Naik | 2015-11-04 | 10 | -50/+65 | |
| | | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | * | | | | | | Make sure cable closes the connection if open when responding to an invalid ↵ | Pratik Naik | 2015-11-04 | 2 | -3/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request | |||||
| | | * | | | | | | Merge pull request #113 from dballona/fix-subscription-callbacks | Jeremy Daer | 2015-11-04 | 2 | -3/+9 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixing subscription callbacks | |||||
| | | | * | | | | | | Fixing subscription callbacks | Diego Ballona | 2015-11-04 | 2 | -3/+9 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Merge pull request #106 from nobrick/master | Kasper Timm Hansen | 2015-10-24 | 1 | -2/+2 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary space in README [ci skip] | |||||
| | | | * | | | | | | Remove unnecessary space in README [ci skip] | Ming Qu | 2015-10-24 | 1 | -2/+2 | |
| | | |/ / / / / / | ||||||
| | | * | | | | | | Don't ask an yanked celluloid version | Rafael Mendonça França | 2015-10-23 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Use our standard name for the Gemfile | Rafael Mendonça França | 2015-10-23 | 2 | -1/+1 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Fix travis matrix | Rafael Mendonça França | 2015-10-23 | 1 | -1/+2 | |
| | | | | | | | | | ||||||
| | | * | | | | | | Merge pull request #69 from mieko/callbacks | Rafael Mendonça França | 2015-10-23 | 4 | -34/+29 | |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ActiveSupport::Callbacks for Channel subscription callbacks. | |||||
| | | | * | | | | | | Use ActiveSupport::Callbacks for Channel subscription callbacks. | Mike A. Owens | 2015-08-24 | 4 | -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-fix | Rafael França | 2015-10-23 | 1 | -3/+5 | |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix NoMethodError when using a custom Rails.logger class | |||||
| | | | * | | | | | | | Fix NoMethodError when using a custom Rails.logger class | Alex Peattie | 2015-10-06 | 1 | -3/+5 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge pull request #46 from rajcybage/readme_fix | Rafael França | 2015-10-23 | 1 | -0/+2 | |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | small description on readme for identified_by | |||||
| | | | * | | | | | | | | [ci skip] small description on readme for identified_by | Rajarshi Das | 2015-07-30 | 1 | -0/+2 | |
| | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | Better method names in Javascript based on the feedback from @javan | Pratik Naik | 2015-10-22 | 2 | -18/+19 | |
| | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | Allow rejecting subscriptions from the channel | Pratik Naik | 2015-10-21 | 7 | -10/+75 | |
| | | | |_|_|/ / / / / | | |/| | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |