aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
|\ \
| * | fix typos in AR. lots of them.Vipul A M2013-03-199-10/+10
| |/
* | Merge pull request #9202 from gkop/more_helpful_message_when_starting_serverSteve Klabnik2013-03-182-2/+2
|\ \
| * | More helpful message when starting serverGabe Kopley2013-03-182-2/+2
|/ /
* | Merge branch 'master-sec'Aaron Patterson2013-03-189-18/+81
|\ \
| * | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-152-2/+12
| * | JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-2/+45
| * | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-152-3/+8
| * | stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-152-11/+16
* | | Merge pull request #9669 from senny/rails_method_missing_callJeremy Kemper2013-03-182-1/+2
|\ \ \
| * | | config.ru uses the effective Rack appYves Senn2013-03-152-1/+2
* | | | Merge pull request #9774 from senny/9772_reraise_no_method_error_in_proper_co...Andrew White2013-03-183-0/+15
|\ \ \ \
| * | | | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-183-0/+15
* | | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-183-1/+21
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-163-1/+21
* | | | | Merge pull request #9763 from vipulnsward/fix_transliterate_testCarlos Antonio da Silva2013-03-182-2/+2
|\ \ \ \ \
| * | | | | fix repeat of test; remove unused variable by use of each_keyVipul A M2013-03-182-2/+2
* | | | | | Merge pull request #9766 from senny/remove_ancient_todosCarlos Antonio da Silva2013-03-183-6/+0
|\ \ \ \ \ \