aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [close #23009] Limit key lengthschneems2016-01-212-9/+36
* Merge pull request #23156 from plentz/patch-1Guillermo Iguaran2016-01-211-1/+1
|\
| * updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
|/
* Merge pull request #23154 from sealocal/improve-docs-for-respond-toप्रथमेश Sonpatki2016-01-211-4/+9
|\
| * remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
| * document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
|/
* Merge pull request #23149 from maclover7/fix-23142Santiago Pastorino2016-01-214-1/+39
|\
| * Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
* | Merge pull request #23150 from alxndr/guides-tweakJon Moss2016-01-201-3/+5
|\ \ | |/ |/|
| * insert newlines into code samplesAlexander2016-01-201-3/+5
|/
* Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\
| * Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
* | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \
| * | Response etags to always be weak: Prefixed W/ to value returned by ActionDisp...abhishek2016-01-205-10/+18
* | | Merge pull request #23147 from maclover7/update-rf-commentRafael França2016-01-201-4/+5
|\ \ \
| * | | Small doc update per RF [ci skip]Jon Moss2016-01-201-4/+5
|/ / /
* | | Merge pull request #23135 from maclover7/add-22950-changelogJon Moss2016-01-201-0/+8
|\ \ \
| * | | Add CHANGELOG.md entry for #22950Jon Moss2016-01-201-0/+8
* | | | Merge pull request #23139 from gsamokovarov/after-create-update-destroy-commi...Rafael França2016-01-201-3/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix the API documentation layout of after_*_commitGenadi Samokovarov2016-01-201-3/+3
|/ / /
* / / Revert "Remove literal? check to fix issue with prefixed optionals"eileencodes2016-01-202-13/+1
|/ /
* | Merge pull request #23130 from vipulnsward/html_safe_to_rawRafael França2016-01-2012-43/+43
|\ \
| * | html_safe is not supposed to be public API for AV. This change removes usage ...Vipul A M2016-01-2012-43/+43
* | | Merge pull request #23129 from Amit-Thawait/masterप्रथमेश Sonpatki2016-01-201-4/+4
|\ \ \ | |/ / |/| |
| * | Pluralize counter_cache column name in example [ci skip]Amit Thawait2016-01-201-4/+4
|/ /
* | Merge pull request #22950 from maclover7/adapterize-storage-actioncableMatthew Draper2016-01-2028-74/+347
|\ \
| * | Fix code review commentsJon Moss2016-01-1815-55/+53
| * | Add em-hiredis and redis as default Gems for new applicationsJon Moss2016-01-182-0/+20
| * | Small PostgreSQL adapter refactors / cleanupJon Moss2016-01-182-15/+16
| * | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapterJon Moss2016-01-1811-21/+23
| * | All Redis deps are now optional, Postgres --> PostgreSQL adapterJon Moss2016-01-187-15/+17
| * | config_opts => cable, per @kaspthJon Moss2016-01-183-6/+7
| * | Listener no longer needs to be a singletonMatthew Draper2016-01-181-52/+58
| * | Tests passing and small refactoringJon Moss2016-01-187-37/+65
| * | Blanket unsubscribe doesn't appear to be usedMatthew Draper2016-01-181-6/+2
| * | Don't execute callbacks on our main listener threadMatthew Draper2016-01-181-1/+1
| * | Pull the action methods directly onto the adapterMatthew Draper2016-01-188-56/+51
| * | Add Postgres adapterJon Moss2016-01-183-0/+111
| * | Refactor storage_adapterJon Moss2016-01-181-11/+3
| * | Adapterize ActionCable storage and extract behaviorJon Moss2016-01-1817-50/+173
* | | Merge pull request #23111 from prathamesh-sonpatki/fix-changelogRafael França2016-01-201-1/+5
|\ \ \ | |_|/ |/| |
| * | Update CHANEGLOG for https://github.com/rails/rails/pull/20005 [ci skip]Prathamesh Sonpatki2016-01-201-1/+5
|/ /
* | Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipp...schneems2016-01-192-2/+2
* | Add `ModelSchema::type_for_attribute` to the public APISean Griffin2016-01-191-1/+12
* | Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assetsRichard Schneeman2016-01-192-2/+2
|\ \
| * | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped versi...Vipul A M2016-01-192-2/+2
* | | Merge pull request #23125 from Gaurav2728/update_puma_as_webserverRafael França2016-01-194-17/+14
|\ \ \
| * | | [ci skip] update guide for Puma web server instead of WebrickGaurav Sharma2016-01-204-17/+14
* | | | Merge pull request #23124 from vipulnsward/rake-railsYves Senn2016-01-193-5/+5
|\ \ \ \
| * | | | - Changed from bin/rake to bin/rails at more application places.Vipul A M2016-01-203-5/+5
| |/ / /