aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9821 from vipulnsward/fix_typos_in_ARVijay Dev2013-03-205-6/+6
|\ | | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed
| * 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 typo
| * 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
| * Changed the call to .sort.last to .max when computing the migration version. Youwangjohn2013-03-191-1/+1
| | | | | | | | | | do not actually need to sort everything (incurs more cost than just a simple max).
* | Merge pull request #9817 from knewter/fix-test-case-name-typo-in-arCarlos Antonio da Silva2013-03-191-2/+2
|\ \ | |/ |/| Commas aren't comas.
| * Commas aren't comas.Josh Adams2013-03-191-2/+2
|/ | | | Type a fixo.
* Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ | | | | Fix improperly configured host in generated urls
| * Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack
* | 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 name
| * | Fix guides error on error class nameSebastian Sogamoso2013-03-191-1/+1
|/ / | | | | The error that's raised in case the required key is missing it's actually `ActionController::ParameterMissing` not `ActionController::MissingParameter`. It's important to fix so that people reading the guides knows what error to rescue from when needed.
* | Merge pull request #9529 from wangjohn/find_on_inverse_of_bugfix_9470Jeremy Kemper2013-03-193-2/+38
|\ \ | | | | | | Find() on an association with an inverse will now scan existing in-memory records
| * | Calling find() on an association with an inverse will now check to seewangjohn2013-03-193-2/+38
| | | | | | | | | | | | | | | if the association already holds that record in memory before checking the database for the specified ids.
* | | Merge pull request #9807 from vipulnsward/remove_unused_payloadsJeremy Kemper2013-03-191-3/+3
|\ \ \ | |/ / |/| | remove unused payloads in blocks in caching instrumentation
| * | 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]
| * | fix sentence [ci skip]Neeraj Singh2013-03-191-1/+1
|/ /
* | Merge pull request #9363 from wangjohn/fix_repair_validationsAaron Patterson2013-03-193-2/+66
|\ \ | |/ |/| Fixed the repair_validations helper method.
| * The repair_validations helper was not working correctly before becausewangjohn2013-03-193-2/+66
|/ | | | | | it only cleared the validations that created :validate callbacks. This didn't include the validates created by validates_with, so I've added a method to clear all validations.
* Merge pull request #9800 from kennyj/fix_warning_20130319Santiago Pastorino2013-03-191-1/+1
|\ | | | | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def'
| * 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 SPECIAL
| * 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
| | | | Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background.
* Use @app_env_config instead of @env_configJosé Valim2013-03-181-1/+1
| | | | Check pull request #9789 for more information.
* Revert "Merge pull request #9784 from ↵Carlos Antonio da Silva2013-03-181-4/+4
| | | | | | | | | | vipulnsward/change_from_blank_to_empty_on_string" This reverts commit 9c4c05fc82e997b722dec4068c3aa27eaee69eb8, reversing changes made to 4620bdcefd0c88905a005f191496df887877b8f3. Reason: They're not completely interchangeable, since blank? will also check for strings containing spaces.
* 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 calls
| * change from blank? to empty? on obvious string values to save extra method ↵Vipul A M2013-03-191-4/+4
| | | | | | | | calls
* | Fix failing tests related to where values change to stringsCarlos Antonio da Silva2013-03-181-7/+7
| | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d.
* | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-186-6/+6
| | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtmRafael Mendonça França2013-03-182-3/+3
|\ \ | | | | | | Change from each to each_value;drop assignment in habtm
| * | 1. Change from each to each_value since we did not use keyVipul A M2013-03-192-3/+3
| |/ | | | | | | 2. drop assignment of value to sum in test
* | 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.
| * | 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.
| * | 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 server
| * | More helpful message when starting serverGabe Kopley2013-03-182-2/+2
|/ / | | | | | | v2 of pull request based on feedback from @rafaelfranca, @schneems, and @carlosantoniodasilva
* | Merge branch 'master-sec'Aaron Patterson2013-03-189-18/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * | 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 app
| * | | config.ru uses the effective Rack appYves Senn2013-03-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to pass the Rails::Application subclass to #run. The Rails server then called #to_app to convert that class to the actual Rack application. if you surround `#run` with a call to `#map` the server no longer convertes the class to the instance and we end up with unnecessary delegation calls on every request.
* | | | Merge pull request #9774 from ↵Andrew White2013-03-183-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | senny/9772_reraise_no_method_error_in_proper_context `TimeWithZone` raises `NoMethodError` in proper context.
| * | | | `TimeWithZone` raises `NoMethodError` in proper context.Yves Senn2013-03-183-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9772. `TimeWithZone` delegates everything to the wrapped `Time` object using `method_missing`. The result is that `NoMethodError` error will be raised in the context of `Time` which leads to a misleading debug output.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:07:46 +0000