aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't kill the consoleJon Leighton2013-03-221-10/+2
| | | | | Use the "quit" command instead. This seems to prevents some weirdness on OS X. See #9761.
* Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_resetJon Leighton2013-03-221-0/+7
|\ | | | | test-case to prevent resetting associations when preloading twice.
| * test-case to prevent resetting associations when preloading twice.Yves Senn2013-03-221-0/+7
|/ | | | | | | Conflicts: activerecord/lib/active_record/associations/preloader/through_association.rb activerecord/test/cases/associations/eager_test.rb
* Merge pull request #9707 from route/updates_another_recordJon Leighton2013-03-224-2/+18
|\ | | | | When strong_parameters had been included, this case of update became possible
| * When we pass id to update_attributes it will try to set new id for that recordDmitry Vorotilin2013-03-224-2/+18
|/
* Send SIGTERM, not SIGQUIT.Jon Leighton2013-03-221-1/+1
| | | | | | SIGTERM is the correct signal for a graceful exit. This will hopefully resolve #9761.
* Delete failing testJon Leighton2013-03-221-36/+0
| | | | | | | | | | | | I don't think this is testing anything useful, and the test code is exceedingly brittle. It is broken since 34c7e73c1def1312e59ef1f334586ff2f668246e because the test code makes assumptions about the implementation of PostgreSQLAdapter#active? which are incorrect after the commit. I could fix this test but it would be even more brittle (by stubbing the underlying @connection.connect_poll) and it doesn't test any complex logic. I conclude that it's not worth it.
* Merge pull request #9863 from robertomiranda/require-bcrypt-rubyGuillermo Iguaran2013-03-211-2/+7
|\ | | | | Change Standard error when is required bcrypt-ruby and fails
| * Change Standard error when is required bcrypt-ruby and failsrobertomiranda2013-03-211-2/+7
| |
* | Merge pull request #9861 from pivotalcommon/masterJeremy Kemper2013-03-212-1/+10
|\ \ | |/ |/| Allow fixture_path to be a Pathname
| * Allows setting fixture_path to a PathnameAlexander Murmann and Can Berk Güder2013-03-212-1/+10
|/
* Merge pull request #9853 from wangjohn/adding_bang_to_raise_methodRafael Mendonça França2013-03-216-8/+8
|\ | | | | Adding a bang to method name of raise_on_type_mismatch.
| * Adding a bang to method name of raise_on_type_mismatch.wangjohn2013-03-216-8/+8
|/
* Merge pull request #9836 from Intrepidd/tidy-requireCarlos Antonio da Silva2013-03-212-6/+3
|\ | | | | Tidying up some require and removing overhead caused by sorting
| * Tidying up some require : removing useless sort and homogenizing with the ↵Intrepidd2013-03-202-6/+3
| | | | | | | | rest of the code the wat the includes are done
* | Merge pull request #9847 from vipulnsward/fix_sqlite_testRafael Mendonça França2013-03-212-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.rbVipul A M2013-03-212-3/+3
| | |
* | | Merge pull request #7706 from iangreenleaf/multiple_counter_cachesJeremy Kemper2013-03-2011-9/+45
|\ \ \ | | | | | | | | Update other counter caches on destroy
| * | | 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 missing action_missing Conflicts: actionpack/CHANGELOG.md
| * | | Fix broken ActionController#action_missingJanko Luin2013-03-203-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_assetsGuillermo Iguaran2013-03-203-1/+6
|\ \ \ \ | |_|/ / |/| | | Don't generate a scaffold.css when --no-assets is specified
| * | | 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
| |/ |/| | | | | | | | | | | 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_testCarlos Antonio da Silva2013-03-201-2/+1
|\ \ | | | | | | Removed unnecessary block
| * | Removed unnecessary blockAnupam Choudhury2013-03-201-2/+1
| | |
* | | Properly named variable inside blockAnupam Choudhury2013-03-201-2/+2
|/ / | | | | | | Closes #9824.
* | 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'
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 23:18:53 +0000