aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add version method to top level modulesCharlie Somerville2013-03-217-42/+48
* Merge pull request #7706 from iangreenleaf/multiple_counter_cachesJeremy Kemper2013-03-2011-9/+45
|\
| * Update other counter caches on destroyIan Young2013-03-2011-9/+45
* | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \
| * | Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
* | | Merge pull request #9837 from kjg/no_scaffold_css_when_no_assetsGuillermo Iguaran2013-03-203-1/+6
|\ \ \ | |_|/ |/| |
| * | Don't generate a scaffold.css if no-assetsKevin Glowacz2013-03-203-1/+6
|/ /
* | use `connect_poll` on pg so that reaping does not hurt the connectionAaron Patterson2013-03-202-3/+4
* | Revert "default the reaping frequency to 10 seconds"Aaron Patterson2013-03-201-1/+1
* | Merge pull request #9833 from choudhuryanupam/fix_active_schema_testCarlos Antonio da Silva2013-03-201-2/+1
|\ \
| * | Removed unnecessary blockAnupam Choudhury2013-03-201-2/+1
* | | Properly named variable inside blockAnupam Choudhury2013-03-201-2/+2
|/ /
* | Merge pull request #9821 from vipulnsward/fix_typos_in_ARVijay Dev2013-03-205-6/+6
|\ \
| * | Fix some typos in AR- CHANGELOG, tests, method doc. fixedVipul A M2013-03-205-6/+6
* | | Merge pull request #9825 from rShetty/patch-1Vijay Dev2013-03-201-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a typoRajeev N Bharshetty2013-03-201-1/+1
|/ /
* | Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_versionCarlos Antonio da Silva2013-03-191-1/+1
|\ \
| * | Changed the call to .sort.last to .max when computing the migration version. Youwangjohn2013-03-191-1/+1
* | | Merge pull request #9817 from knewter/fix-test-case-name-typo-in-arCarlos Antonio da Silva2013-03-191-2/+2
|\ \ \ | |/ / |/| |
| * | Commas aren't comas.Josh Adams2013-03-191-2/+2
|/ /
* | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ \
| * | Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
* | | Remove mentions of "app" from http request docs [ci skip]Carlos Antonio da Silva2013-03-191-12/+10
* | | Merge pull request #9816 from sebasoga/strong_parameters_guide_fixGuillermo Iguaran2013-03-191-1/+1
|\ \ \
| * | | Fix guides error on error class nameSebastian Sogamoso2013-03-191-1/+1
|/ / /
* | | Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470Jeremy Kemper2013-03-193-2/+38
|\ \ \
| * | | Calling find() on an association with an inverse will now check to seewangjohn2013-03-193-2/+38
* | | | Merge pull request #9807 from vipulnsward/remove_unused_payloadsJeremy Kemper2013-03-191-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | remove unused payloads in blocks in caching instrumentationVipul A M2013-03-191-3/+3
* | | | Merge pull request #9811 from neerajdotname/fix-secret-token-sentenceRafael Mendonça França2013-03-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix sentence [ci skip]Neeraj Singh2013-03-191-1/+1
|/ / /
* | | Merge pull request #9363 from wangjohn/fix_repair_validationsAaron Patterson2013-03-193-2/+66
|\ \ \ | |/ / |/| |
| * | The repair_validations helper was not working correctly before becausewangjohn2013-03-193-2/+66
|/ /
* | Merge pull request #9800 from kennyj/fix_warning_20130319Santiago Pastorino2013-03-191-1/+1
|\ \ | |/ |/|
| * Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'kennyj2013-03-191-1/+1
|/
* Merge pull request #9792 from vipulnsward/drop_unused_hashSteve Klabnik2013-03-182-3/+3
|\
| * drop an unused hash; change slang to SPECIALVipul A M2013-03-192-3/+3
|/
* Initialize @app_env_config now that the var name has changedCarlos Antonio da Silva2013-03-191-1/+1
* Use @app_env_config instead of @env_configJosé Valim2013-03-181-1/+1
* Revert "Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_...Carlos Antonio da Silva2013-03-181-4/+4
* Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_stringCarlos Antonio da Silva2013-03-181-4/+4
|\
| * change from blank? to empty? on obvious string values to save extra method c...Vipul A M2013-03-191-4/+4
* | Fix failing tests related to where values change to stringsCarlos Antonio da Silva2013-03-181-7/+7
* | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-186-6/+6
* | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtmRafael Mendonça França2013-03-182-3/+3
|\ \
| * | 1. Change from each to each_value since we did not use keyVipul A M2013-03-192-3/+3
| |/
* | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-186-6/+6
* | Merge pull request #9022 from braddunbar/digest-basic-authSteve Klabnik2013-03-183-0/+14
|\ \
| * | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-183-0/+14
|/ /
* | Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1Steve Klabnik2013-03-189-10/+10
|\ \