aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ActiveRecord -> Active RecordXavier Noria2013-04-222-1/+2
* applies documentation guidelinesXavier Noria2013-04-221-11/+12
* Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\
| * extract arrays to constants in MapperVipul A M2013-04-221-2/+4
* | Merge pull request #10302 from vipulnsward/remove_redundant_varCarlos Antonio da Silva2013-04-221-2/+0
|\ \
| * | remove redundant variableVipul A M2013-04-221-2/+0
| |/
* | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-224-0/+18
|\ \ | |/ |/|
| * Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-224-0/+18
* | Merge pull request #10285 from wangjohn/subscriber_registryCarlos Antonio da Silva2013-04-221-2/+20
|\ \
| * | Created a registry based on the +PerThreadRegistry+ module forwangjohn2013-04-221-2/+20
|/ /
* | Merge pull request #10295 from senny/10237_dirty_with_nullable_datetimeCarlos Antonio da Silva2013-04-221-3/+5
|\ \
| * | also assign nil in dirty nullable_datetime test. #10237Yves Senn2013-04-221-3/+5
| |/
* | Merge pull request #10292 from matthewrobertson/fix-update-counter-cache-on-pushCarlos Antonio da Silva2013-04-223-3/+22
|\ \
| * | Update counter cache when pushing into associationMatthew Robertson2013-04-213-3/+22
* | | Merge pull request #10297 from vipulnsward/dont_mutate_in_rack_responseAndrew White2013-04-221-1/+2
|\ \ \ | |_|/ |/| |
| * | extract no content response codes to a constantVipul A M2013-04-221-1/+2
* | | Move CHANGELOG entry to topRafael Mendonça França2013-04-221-4/+4
* | | Merge pull request #10096 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-213-2/+43
|\ \ \ | |/ / |/| |
| * | Fixes skipping object callback filtersBen McRedmond2013-04-043-2/+43
* | | Merge pull request #10293 from vipulnsward/dont_mutate_callbackRafael Mendonça França2013-04-211-1/+3
|\ \ \ | |_|/ |/| |
| * | extract array to a constantVipul A M2013-04-221-1/+3
|/ /
* | Merge pull request #10290 from buddhamagnet/masterSantiago Pastorino2013-04-211-1/+3
|\ \
| * | extract path into variablebuddhamagnet2013-04-211-1/+3
|/ /
* | Merge pull request #10289 from maratvmk/readmeSantiago Pastorino2013-04-211-2/+2
|\ \
| * | fix README links in the main README.mdMarat Kazbekov2013-04-221-2/+2
|/ /
* | Merge pull request #10286 from neerajdotname/fix-wrong-test-name-and-failure-...Carlos Antonio da Silva2013-04-211-2/+2
|\ \
| * | fix wrong test description and failure messageNeeraj Singh2013-04-211-2/+2
* | | Merge pull request #10284 from neerajdotname/missing-active-model-testsGuillermo Iguaran2013-04-211-0/+21
|\ \ \
| * | | Added tests for if condition in Active Model callbacksNeeraj Singh2013-04-211-0/+21
| |/ /
* | | Merge pull request #10283 from wangjohn/remove_tests_for_deprecated_optionsSantiago Pastorino2013-04-211-8/+0
|\ \ \
| * | | Removing tests for deprecated options in active support. Thewangjohn2013-04-211-8/+0
|/ / /
* | | Merge pull request #10280 from vipulnsward/fix_typos_tempSteve Klabnik2013-04-212-2/+2
|\ \ \
| * | | fix typosVipul A M2013-04-212-2/+2
* | | | Merge pull request #10275 from buddhamagnet/masterCarlos Antonio da Silva2013-04-201-2/+1
|\ \ \ \
| * | | | Increase readability of ternary statement in build methodbuddhamagnet2013-04-201-2/+1
|/ / / /
* | | | if singletons belong to the contract, test themXavier Noria2013-04-202-2/+5
* | | | Rewrites a CHANGELOG entry.Xavier Noria2013-04-201-16/+6
|/ / /
* | | Merge pull request #10273 from prathamesh-sonpatki/AR-typosXavier Noria2013-04-191-2/+2
|\ \ \ | |/ / |/| |
| * | Typo Fix in AR CHANGELOG [ci skip]Prathamesh Sonpatki2013-04-201-2/+2
|/ /
* | Merge pull request #10211 from neerajdotname/4208Rafael Mendonça França2013-04-193-1/+41
|\ \
| * | fix respond_to? for non selected columnNeeraj Singh2013-04-193-1/+41
|/ /
* | Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-192-2/+2
|\ \
| * | symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-192-2/+2
* | | Merge pull request #10265 from wangjohn/documenting_actionviewRafael Mendonça França2013-04-194-0/+41
|\ \ \
| * | | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-199-15/+66
|\ \ \ \
| * | | | Revert "Merge pull request #10183 from jholton/fix_association_auto_save"Jon Leighton2013-04-193-29/+9
| * | | | Merge pull request #10183 from jholton/fix_association_auto_saveJon Leighton2013-04-193-9/+29
| |\ \ \ \
| | * | | | destroys association records before saving/inserting new association recordsJohnny Holton2013-04-193-9/+29
| |/ / / /
| * | | | Merge pull request #10264 from cconstantine/masterRafael Mendonça França2013-04-192-1/+7
| |\ \ \ \