aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Simpler directory structureDavid Heinemeier Hansson2015-12-161-2/+2
* Note that changes to the cable setup requires restarting the serverDavid Heinemeier Hansson2015-12-163-0/+3
* @App could have been set elsewhereDavid Heinemeier Hansson2015-12-161-1/+1
* Another stab at only mounting redis if the config is thereDavid Heinemeier Hansson2015-12-161-2/+2
* Assume that the cable server is running in-process by default, offer option t...David Heinemeier Hansson2015-12-162-0/+5
* Fix parent classDavid Heinemeier Hansson2015-12-161-1/+1
* Fix the engine referenceRafael Mendonça França2015-12-161-1/+1
* Doh, should have read ff370ee61754b00f864f3ddd0af62be4dfa0de67David Heinemeier Hansson2015-12-162-2/+2
* Only initialize redis if the config file is thereDavid Heinemeier Hansson2015-12-161-5/+5
* Another bad reference to engine instead of railtieDavid Heinemeier Hansson2015-12-161-1/+1
* Include changes made to the engineDavid Heinemeier Hansson2015-12-161-0/+5
* Move Cable to ActionCable for client-side constant to avoid conflictsDavid Heinemeier Hansson2015-12-168-49/+49
* We are using railtie, not engineDavid Heinemeier Hansson2015-12-163-37/+2
* Basic channel generatorDavid Heinemeier Hansson2015-12-157-0/+101
* Move the require to the right placeRafael Mendonça França2015-12-152-2/+1
* Remove the default loggerRafael Mendonça França2015-12-151-1/+0
* Configure the Action Cable's redis in the engineRafael Mendonça França2015-12-153-23/+7
* Accept a Pathname in Application#config_forRafael Mendonça França2015-12-152-1/+20
* Add Action Cable to README.md of Railsclaudiob2015-12-151-1/+3
* Remove rails/actioncable Travis badgeclaudiob2015-12-151-2/+1
* Merge remote-tracking branch 'origin/master' into merge-action-cableRafael Mendonça França2015-12-1575-165/+419
|\
| * Merge pull request #22596 from y-yagi/remove_extra_space_from_deprecation_msgEileen M. Uchitelle2015-12-152-2/+5
| |\
| | * remove extra spaces from deprecation messageyuuji.yaginuma2015-12-152-2/+5
| * | Merge pull request #22595 from sstephenson/fragment_cache_keyDavid Heinemeier Hansson2015-12-154-11/+77
| |\ \
| | * | Add fragment_cache_key macro for controller-wide fragment cache key prefixesSam Stephenson2015-12-142-3/+67
| | * | Remove ActionView::Helpers::CacheHelper#fragment_cache_keySam Stephenson2015-12-143-8/+10
| | |/
| * | Merge pull request #21538 from matthewd/migration-versionMatthew Draper2015-12-1557-136/+226
| |\ \
| | * | Use a real migration version number in docsMatthew Draper2015-12-159-54/+54
| | * | Schema uses current migration APIMatthew Draper2015-12-151-1/+1
| | * | In 4.2 migrations, `timestamps` defaulted to `null: true`Matthew Draper2015-12-151-0/+24
| | * | Find the delegate, even in a deeper inheritance treeMatthew Draper2015-12-151-1/+5
| | * | Internal test migrations use the private 'Current' versionMatthew Draper2015-12-1540-64/+64
| | * | Ensure generated migrations include a version numberMatthew Draper2015-12-153-14/+14
| | * | Use a deliberately-invalid migration version in all doc examplesMatthew Draper2015-12-159-54/+54
| | * | Add migration versioning via Migration subclassesMatthew Draper2015-12-155-2/+64
| |/ /
| * | Ensure uuid-ossp extension is present before we rely on itMatthew Draper2015-12-151-0/+2
| * | Fix travis matrixRafael Mendonça França2015-12-141-1/+1
| * | Add ruby-head back in the allow failures groupRafael Mendonça França2015-12-141-0/+1
| |/
| * Do now allow failures with Ruby 2.3 anymoreRafael Mendonça França2015-12-141-2/+0
| * Test with Ruby 2.3.0Rafael Mendonça França2015-12-141-0/+1
| * Merge pull request #22564 from maximeg/legit_name_errorsSean Griffin2015-12-142-2/+45
| |\
| | * Don't catch all NameError to reraise as ActionController::RoutingError #22368Maxime Garcia2015-12-122-2/+45
| * | Revert "Perform a more efficient query in `Relation#any?`"Sean Griffin2015-12-143-8/+15
| * | Merge pull request #22561 from Cleggameg/patch-2Rafael Mendonça França2015-12-141-2/+2
| |\ \
| | * | Update seeds.rb.ttPaul Clegg2015-12-141-2/+2
| |/ /
| * | Merge pull request #22395 from avokhmin/becomes-errors-base-2Sean Griffin2015-12-144-2/+43
| |\ \
| | * | `ActiveRecord::Base#becomes` should copy the errorsVokhmin Alexey V2015-12-144-2/+43
| * | | Perform a more efficient query in `Relation#any?`Sean Griffin2015-12-142-8/+8
| * | | Merge pull request #22582 from sikachu/hwia-to_hKasper Timm Hansen2015-12-142-9/+11
| |\ \ \
| | * | | Make Parameters#to_h and #to_unsafe_h return HWIAPrem Sichanugrist2015-12-142-9/+11