Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #9847 from vipulnsward/fix_sqlite_test | Rafael Mendonça França | 2013-03-21 | 2 | -3/+3 | |
|\ \ | | | | | | | Fix copy table index test; Change == to ! on false in travis.rb | |||||
| * | | Fix copy table index test; Change == to ! on false in travis.rb | Vipul A M | 2013-03-21 | 2 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #7706 from iangreenleaf/multiple_counter_caches | Jeremy Kemper | 2013-03-20 | 11 | -9/+45 | |
|\ \ \ | | | | | | | | | Update other counter caches on destroy | |||||
| * | | | Update other counter caches on destroy | Ian Young | 2013-03-20 | 11 | -9/+45 | |
| |/ / | ||||||
* | | | Merge pull request #9802 from newsline/fix-broken-action-missing | Rafael Mendonça França | 2013-03-20 | 2 | -1/+13 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md | |||||
| * | | | Fix broken ActionController#action_missing | Janko Luin | 2013-03-20 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing. | |||||
* | | | | Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets | Guillermo Iguaran | 2013-03-20 | 3 | -1/+6 | |
|\ \ \ \ | |_|/ / |/| | | | Don't generate a scaffold.css when --no-assets is specified | |||||
| * | | | Don't generate a scaffold.css if no-assets | Kevin Glowacz | 2013-03-20 | 3 | -1/+6 | |
|/ / / | ||||||
* | | | use `connect_poll` on pg so that reaping does not hurt the connection | Aaron Patterson | 2013-03-20 | 2 | -3/+4 | |
| | | | ||||||
* | | | Revert "default the reaping frequency to 10 seconds" | Aaron Patterson | 2013-03-20 | 1 | -1/+1 | |
| |/ |/| | | | | | | | | | | | mysql can't handle a parallel thread pinging the connection, so we can get wrong results or segvs This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2. | |||||
* | | Merge pull request #9833 from choudhuryanupam/fix_active_schema_test | Carlos Antonio da Silva | 2013-03-20 | 1 | -2/+1 | |
|\ \ | | | | | | | Removed unnecessary block | |||||
| * | | Removed unnecessary block | Anupam Choudhury | 2013-03-20 | 1 | -2/+1 | |
| | | | ||||||
* | | | Properly named variable inside block | Anupam Choudhury | 2013-03-20 | 1 | -2/+2 | |
|/ / | | | | | | | Closes #9824. | |||||
* | | Merge pull request #9821 from vipulnsward/fix_typos_in_AR | Vijay Dev | 2013-03-20 | 5 | -6/+6 | |
|\ \ | | | | | | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | |||||
| * | | Fix some typos in AR- CHANGELOG, tests, method doc. fixed | Vipul A M | 2013-03-20 | 5 | -6/+6 | |
| | | | ||||||
* | | | Merge pull request #9825 from rShetty/patch-1 | Vijay Dev | 2013-03-20 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Fix a typo | |||||
| * | | Fix a typo | Rajeev N Bharshetty | 2013-03-20 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #9818 from wangjohn/sort_last_to_max_in_migration_version | Carlos Antonio da Silva | 2013-03-19 | 1 | -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. You | wangjohn | 2013-03-19 | 1 | -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-ar | Carlos Antonio da Silva | 2013-03-19 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | Commas aren't comas. | |||||
| * | | Commas aren't comas. | Josh Adams | 2013-03-19 | 1 | -2/+2 | |
|/ / | | | | | | | Type a fixo. | |||||
* | | Merge pull request #9794 from schneems/schneems/email-host | Andrew White | 2013-03-19 | 3 | -1/+26 | |
|\ \ | | | | | | | Fix improperly configured host in generated urls | |||||
| * | | Fix improperly configured host in generated urls | schneems | 2013-03-19 | 3 | -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 Silva | 2013-03-19 | 1 | -12/+10 | |
| | | | ||||||
* | | | Merge pull request #9816 from sebasoga/strong_parameters_guide_fix | Guillermo Iguaran | 2013-03-19 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix guides error on error class name | |||||
| * | | | Fix guides error on error class name | Sebastian Sogamoso | 2013-03-19 | 1 | -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_9470 | Jeremy Kemper | 2013-03-19 | 3 | -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 see | wangjohn | 2013-03-19 | 3 | -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_payloads | Jeremy Kemper | 2013-03-19 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | remove unused payloads in blocks in caching instrumentation | |||||
| * | | | remove unused payloads in blocks in caching instrumentation | Vipul A M | 2013-03-19 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #9811 from neerajdotname/fix-secret-token-sentence | Rafael Mendonça França | 2013-03-19 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | fix sentence [ci skip] | |||||
| * | | | fix sentence [ci skip] | Neeraj Singh | 2013-03-19 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #9363 from wangjohn/fix_repair_validations | Aaron Patterson | 2013-03-19 | 3 | -2/+66 | |
|\ \ \ | |/ / |/| | | Fixed the repair_validations helper method. | |||||
| * | | The repair_validations helper was not working correctly before because | wangjohn | 2013-03-19 | 3 | -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_20130319 | Santiago Pastorino | 2013-03-19 | 1 | -1/+1 | |
|\ \ | |/ |/| | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' | |||||
| * | Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' | kennyj | 2013-03-19 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #9792 from vipulnsward/drop_unused_hash | Steve Klabnik | 2013-03-18 | 2 | -3/+3 | |
|\ | | | | | drop an unused hash; change slang to SPECIAL | |||||
| * | drop an unused hash; change slang to SPECIAL | Vipul A M | 2013-03-19 | 2 | -3/+3 | |
|/ | ||||||
* | Initialize @app_env_config now that the var name has changed | Carlos Antonio da Silva | 2013-03-19 | 1 | -1/+1 | |
| | | | | Check 862389c9537dbb6f65fd26c4325e07607ed437b5 for more background. | |||||
* | Use @app_env_config instead of @env_config | José Valim | 2013-03-18 | 1 | -1/+1 | |
| | | | | Check pull request #9789 for more information. | |||||
* | Revert "Merge pull request #9784 from ↵ | Carlos Antonio da Silva | 2013-03-18 | 1 | -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_string | Carlos Antonio da Silva | 2013-03-18 | 1 | -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 M | 2013-03-19 | 1 | -4/+4 | |
| | | | | | | | | calls | |||||
* | | Fix failing tests related to where values change to strings | Carlos Antonio da Silva | 2013-03-18 | 1 | -7/+7 | |
| | | | | | | | | Introduced in 5dc2e3531babcbdc165884d1a47cbcd13455522d. | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 6 | -6/+6 | |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | |||||
* | | Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm | Rafael Mendonça França | 2013-03-18 | 2 | -3/+3 | |
|\ \ | | | | | | | Change from each to each_value;drop assignment in habtm | |||||
| * | | 1. Change from each to each_value since we did not use key | Vipul A M | 2013-03-19 | 2 | -3/+3 | |
| |/ | | | | | | | 2. drop assignment of value to sum in test | |||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 6 | -6/+6 | |
| | | ||||||
* | | Merge pull request #9022 from braddunbar/digest-basic-auth | Steve Klabnik | 2013-03-18 | 3 | -0/+14 | |
|\ \ | | | | | | | Digest auth should not 500 when given a basic header. | |||||
| * | | Digest auth should not 500 when given a basic header. | Brad Dunbar | 2013-03-18 | 3 | -0/+14 | |
|/ / |