aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make per form token work when method is not providedRafael Mendonça França2016-02-222-3/+18
* Do not pass more options that are needed.Rafael Mendonça França2016-02-221-1/+1
* Merge pull request #23752 from vipulnsward/23524-fix-button_to_deleteRafael Mendonça França2016-02-222-49/+61
|\
| * Refactored Request Forgery CSRF PerFormTokensController tests and DRY'ed them...Vipul A M2016-02-222-71/+39
| * Fixed passing of delete method on button_to tag, creating wrong form csrf tokenVipul A M2016-02-212-2/+46
* | Merge pull request #23521 from kamipo/fix_assert_in_delta_failureRafael França2016-02-221-3/+8
|\ \
| * | Fix `assert_in_delta` test failureRyuta Kamizono2016-02-061-3/+8
* | | Merge pull request #22748 from Azzurrio/masterMatthew Draper2016-02-222-1/+23
|\ \ \
| * | | Fix NoMethodError preparable for Arel::Visitors in case prepared statements i...Azzurrio2016-02-222-1/+23
* | | | Merge pull request #23751 from chezou/add-test-case-order-by-fieldAndrew White2016-02-221-0/+6
|\ \ \ \
| * | | | Add assertions order by field with empty dataMichiaki Ariga2016-02-181-0/+6
* | | | | Merge pull request #23808 from gfvcastro/typographical-errorप्रथमेश Sonpatki2016-02-221-1/+1
|\ \ \ \ \
| * | | | | Fix typographical errorGustavo Villa2016-02-221-1/+1
|/ / / / /
* | | | | Merge pull request #23769 from kamipo/remove_alias_exec_without_stmt_exec_querySantiago Pastorino2016-02-211-2/+0
|\ \ \ \ \
| * | | | | Remove `alias exec_without_stmt exec_query`Ryuta Kamizono2016-02-191-2/+0
* | | | | | Merge pull request #23682 from ShikChen/fast_strxorSantiago Pastorino2016-02-211-1/+2
|\ \ \ \ \ \
| * | | | | | Improve the performance of string xor operationshik2016-02-151-1/+2
* | | | | | | Merge pull request #23776 from chi6rag/masterSantiago Pastorino2016-02-211-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Adding test to verify the last week when the year is leapChirag Aggarwal2016-02-201-0/+4
* | | | | | | | Merge pull request #23803 from kamipo/reduce_attribute_to_sSantiago Pastorino2016-02-211-6/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce `attribute.to_s`Ryuta Kamizono2016-02-221-6/+5
* | | | | | | | | Merge pull request #23743 from maclover7/rm-unused-parameterSantiago Pastorino2016-02-211-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused parameter from methodJon Moss2016-02-171-2/+2
* | | | | | | | | | Merge pull request #23805 from ianfleeton/validates-length-of-virtualSantiago Pastorino2016-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Match test name to test (typo)Ian Fleeton2016-02-211-1/+1
* | | | | | | | | | | Merge pull request #23806 from sgringwe/patch-1Santiago Pastorino2016-02-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add a note about downcasing submit tagScott Ringwelski2016-02-211-0/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23785 from eval/correct-types-examplesVipul A M2016-02-222-108/+108
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show correct return types for examples [ci skip]Gert Goet2016-02-202-108/+108
* | | | | | | | | | | [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
|/ / / / / / / / / /