Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool" | Rafael Mendonça França | 2012-05-22 | 3 | -202/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request. | |||||
| * | | | | | | Fix the build | Santiago Pastorino | 2012-05-22 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | require active_support/lazy_load_hooks where is needed | Santiago Pastorino | 2012-05-22 | 1 | -0/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #6368 from Antiarchitect/store-indifferent-access | Jeremy Kemper | 2012-05-22 | 2 | -10/+61 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes. | |||||
| | * | | | | | | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store. | Andrey Voronkov | 2012-05-22 | 2 | -10/+61 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043. | |||||
| * | | | | | | | Restore the frozen state on rollback. Fixes #6417. | Godfrey Chan | 2012-05-21 | 2 | -1/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when saving a frozen record, an exception would be thrown which causes a rollback. However, there is a bug in active record that "defrost" the record as a side effect: >> t = Topic.new => #<Topic id: nil, ...> >> t.freeze => #<Topic id: nil, ...> >> t.save RuntimeError: can't modify a frozen Hash >> t.frozen? => false >> t.save => true This patch fixes the bug by explictly restoring the frozen state on the attributes Hash after every rollback. | |||||
| * | | | | | | | Remove not used variables from connection poll test | Carlos Antonio da Silva | 2012-05-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These variables were issuing some "not used" warnings. | |||||
| * | | | | | | | Refactor aggregation writer method | Carlos Antonio da Silva | 2012-05-21 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only constantize class_name once. | |||||
| * | | | | | | | Merge pull request #6416 from pmahoney/threadsafe-connection-pool | Aaron Patterson | 2012-05-21 | 3 | -35/+202 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make connection pool fair with respect to waiting threads. | |||||
| | * | | | | | | | Make connection pool fair with respect to waiting threads. | Patrick Mahoney | 2012-05-20 | 3 | -35/+202 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6143 from senny/composed_of_converter_returns_nil | Aaron Patterson | 2012-05-21 | 3 | -7/+31 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | allow the :converter Proc form composed_of to return nil | |||||
| | * | | | | | | | allow the :converter Proc form composed_of to return nil | Yves Senn | 2012-05-03 | 3 | -7/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to filter invalid input values before they are passed into the value-object (like empty strings). This behaviour is only relevant if the :allow_nil options is set to true. Otherwise you will get the resulting NoMethodError. | |||||
| * | | | | | | | | fixed typo in word finiding | Ivan Kukobko | 2012-05-20 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #6397 from kennyj/fix_translate_exception | Aaron Patterson | 2012-05-19 | 1 | -3/+7 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix a problem of translate_exception method in a Japanese (non English) environment. | |||||
| | * | | | | | | | | Fix a problem of translate_exception method in Japanese. | kennyj | 2012-05-20 | 1 | -3/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Synchronize read and modification of @reserved_connections hash to avoid ↵ | Patrick Mahoney | 2012-05-19 | 1 | -4/+8 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrency error. | |||||
* | | | | | | | / | Adds examples to FinderMethods#first [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -0/+1 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Updates validations examples to be more attuned on the new Rails 3.0 conventions | Alvaro Pereyra | 2012-05-28 | 1 | -4/+4 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Remove blank trailing comments | Henrik Hodne | 2012-05-20 | 21 | -31/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed. | |||||
* | | | | | | | add CollectionProxy#select documentation | Francesco Rodriguez | 2012-05-19 | 1 | -2/+55 | |
| | | | | | | | ||||||
* | | | | | | | add CollectionProxy#find documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+20 | |
| | | | | | | | ||||||
* | | | | | | | Revert typo | Oscar Del Ben | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Typo | Oscar Del Ben | 2012-05-19 | 1 | -4/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 4 | -23/+305 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | copy edits [ci skip] | Vijay Dev | 2012-05-19 | 1 | -17/+20 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionProxy#last documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionProxy#first documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+27 | |
| | | | | | | | ||||||
| * | | | | | | Revert "You can add a custom primary key to a table" | Vijay Dev | 2012-05-19 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 23a98ffbd9b39ee70094ded1671cf1879d0d3591. [ci skip] | |||||
| * | | | | | | improve CollectionProxy#concat documentation | Francesco Rodriguez | 2012-05-19 | 1 | -7/+18 | |
| | | | | | | | ||||||
| * | | | | | | fix CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionProxy#<< documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+20 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionProxy#clear documentation | Francesco Rodriguez | 2012-05-19 | 1 | -0/+26 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionProxy#include? documentation | Francesco Rodriguez | 2012-05-18 | 1 | -0/+13 | |
| | | | | | | | ||||||
| * | | | | | | You can add a custom primary key to a table | Avi Tzurel | 2012-05-19 | 1 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | move docs from CollectionAssociation to CollectionProxy | Francesco Rodriguez | 2012-05-18 | 2 | -114/+143 | |
| | | | | | | | ||||||
| * | | | | | | add explanation of raising errors when a limit scope is supplied in ↵ | Francesco Rodriguez | 2012-05-18 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relation#delete_all | |||||
| * | | | | | | Fix typo. | Peter Suschlik | 2012-05-18 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | remove incorrect example of CollectionAssociation#empty? | Francesco Rodriguez | 2012-05-18 | 1 | -17/+0 | |
| | | | | | | | ||||||
| * | | | | | | add docs to CollectionAssociation#empty? | Francesco Rodriguez | 2012-05-18 | 1 | -3/+32 | |
| | | | | | | | ||||||
| * | | | | | | add docs to CollectionAssociation#any? | Francesco Rodriguez | 2012-05-18 | 1 | -0/+30 | |
| | | | | | | | ||||||
| * | | | | | | add examples to CollectionAssociation#concat | Francesco Rodriguez | 2012-05-18 | 1 | -3/+14 | |
| | | | | | | | ||||||
| * | | | | | | fix CollectionAssociation docs | Francesco Rodriguez | 2012-05-17 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | add example to CollectionAssociation#destroy_all | Francesco Rodriguez | 2012-05-17 | 1 | -3/+14 | |
| | | | | | | | ||||||
| * | | | | | | add more explanation to CollectionAssociation docs | Francesco Rodriguez | 2012-05-17 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | add CollectionAssociation hierarchy | Francesco Rodriguez | 2012-05-17 | 1 | -2/+7 | |
| | | | | | | | ||||||
| * | | | | | | add docs to CollectionAssociation#many? | Francesco Rodriguez | 2012-05-17 | 1 | -1/+34 | |
| | | | | | | | ||||||
| * | | | | | | fix CollectionAssociation#replace docs | Francesco Rodriguez | 2012-05-17 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Add docs to CollectionAssociation#replace | Francesco Rodriguez | 2012-05-17 | 1 | -3/+23 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #4835 from ↵ | Carlos Antonio da Silva | 2012-05-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pacoguzman/refactor_define_restrict_dependency_method Refactor define_restrict_dependency_method using reflection | |||||
| * | | | | | | | Refactor define_restrict_dependency_method using reflection | Paco Guzman | 2012-02-01 | 1 | -3/+3 | |
| | | | | | | | |