aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Document collection caching better.Kasper Timm Hansen2016-02-211-2/+15
* [ci skip] Clarify collection caching went EXPLICIT.Kasper Timm Hansen2016-02-211-4/+9
* [ci skip] Mention testing fore-runners.Kasper Timm Hansen2016-02-211-0/+2
* Merge pull request #23799 from y-yagi/use_method_provided_by_minitestKasper Timm Hansen2016-02-211-7/+1
|\
| * use method provided by minitestyuuji.yaginuma2016-02-211-7/+1
* | Merge pull request #23801 from chashmeetsingh/patch-2प्रथमेश Sonpatki2016-02-211-1/+1
|\ \
| * | Fixed typoChashmeet Singh2016-02-211-1/+1
|/ /
* | Merge pull request #23791 from prathamesh-sonpatki/fix-changelogRafael França2016-02-201-1/+1
|\ \
| * | Improve CHANGELOG for https://github.com/rails/rails/pull/17043 [ci skip]Prathamesh Sonpatki2016-02-201-1/+1
| |/
* | Merge pull request #23794 from matthewd/mutation-safe-to_aMatthew Draper2016-02-2112-24/+50
|\ \
| * | Mutating the result of Relation#to_a should not affect the relationMatthew Draper2016-02-2111-24/+42
* | | Merge pull request #23695 from kaspth/remove-automatic-collection-cachingKasper Timm Hansen2016-02-2016-252/+127
|\ \ \
| * | | Instrument cached collection renders.Kasper Timm Hansen2016-02-205-20/+55
| * | | Revert "Instrument read_multi".Kasper Timm Hansen2016-02-203-41/+17
| * | | Make collection caching explicit.Kasper Timm Hansen2016-02-2010-191/+55
* | | | Make benchmark('something', silence: true) actually workDavid Heinemeier Hansson2016-02-203-1/+19
* | | | Merge pull request #23793 from qazbnm456/masterEileen M. Uchitelle2016-02-201-1/+1
|\ \ \ \
| * | | | fix typoLobsiinvok2016-02-201-1/+1
| | |_|/ | |/| |
* / | | Always validate record if validating a virtual attributeeileencodes2016-02-207-3/+55
|/ / /
* | | Merge pull request #23788 from gautamsawhney/masterप्रथमेश Sonpatki2016-02-201-1/+1
|\ \ \
| * | | Fixed a typoGautam Sawhney2016-02-201-1/+1
|/ / /
* | | eliminate warnings about multiple primary keys on habtm join tablesAaron Patterson2016-02-194-2/+18
* | | Merge pull request #23733 from bquorning/actioncontroller-parameters-equalityRafael França2016-02-192-12/+59
|\ \ \ | |_|/ |/| |
| * | Deprecate AC::Parameters#== with a HashBenjamin Quorning2016-02-192-11/+18
| * | Fix AC::Parameters#== with other AC::ParametersBenjamin Quorning2016-02-192-3/+37
| * | Tests for AC::Parameters#==Benjamin Quorning2016-02-191-0/+6
* | | Merge pull request #23782 from kdough/add-array-delegation-methods-to-relationRafael França2016-02-191-1/+2
|\ \ \
| * | | Add methods to array delegation from `Relation`Kevin Dougherty2016-02-191-1/+2
* | | | Merge pull request #17043 from jcoleman/fix-nested-params-in-button-toRafael França2016-02-193-4/+86
|\ \ \ \ | |/ / / |/| | |
| * | | Fix button_to's params option to support nested names.James Coleman2016-02-193-4/+86
* | | | Merge pull request #23777 from sruli/activesupport_dependencies_cleanupRafael França2016-02-192-13/+6
|\ \ \ \
| * | | | Dependencies clean upSruli Rapps2016-02-192-13/+6
| | |/ / | |/| |
* | | | Merge pull request #23709 from jankeesvw/set-action-cable-logging-to-debugDavid Heinemeier Hansson2016-02-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Truncate ActionCable broadcast message to 300 charsJankees van Woezik2016-02-181-1/+1
* | | | Merge pull request #23773 from wisetara/wisetara/update-docs-ActiveSupport__T...Rafael França2016-02-191-2/+5
|\ \ \ \
| * | | | better docs for ActiveSupport::TestCase#assert_nothing_raisedTara Scherner de la Fuente2016-02-181-2/+5
|/ / / /
* | | | Merge pull request #23771 from y-yagi/remove_needless_debug_exception_respons...Jon Moss2016-02-181-8/+0
|\ \ \ \
| * | | | remove needless `debug_exception_response_format` config [ci skip]yuuji.yaginuma2016-02-191-8/+0
|/ / / /
* | | | Merge pull request #23525 from kamipo/remove_unused_requireSean Griffin2016-02-181-1/+0
|\ \ \ \
| * | | | Remove unused requireRyuta Kamizono2016-02-061-1/+0
* | | | | Merge pull request #23715 from maclover7/fix-unsubscribeMatthew Draper2016-02-194-6/+28
|\ \ \ \ \
| * | | | | Fix `unsubscribed` server side behaviorJon Moss2016-02-184-6/+28
* | | | | | partial pass over the API guide [ci skip]Xavier Noria2016-02-181-15/+14
* | | | | | Use a semaphore to signal message availabilityMatthew Draper2016-02-191-7/+8
|/ / / / /
* | | | | Merge pull request #23764 from maclover7/fix-master-buildAaron Patterson2016-02-181-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix master buildJon Moss2016-02-181-1/+1
* | | | | Remove github gems from the master bug report templatesRafael Mendonça França2016-02-183-15/+0
* | | | | Merge pull request #23756 from tenderlove/move_digest_cacheAaron Patterson2016-02-184-14/+28
|\ \ \ \ \
| * | | | | move digest cache on to the DetailsKey objectAaron Patterson2016-02-184-14/+28
| |/ / / /
* | | | | Merge pull request #23753 from y-yagi/skip_listen_in_dummy_appRafael França2016-02-182-0/+9
|\ \ \ \ \ | |/ / / / |/| | | |