Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-09 | 2 | -3/+3 |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
| * | Correcting ActiveRecord::Core#encode_with docs | Josef Šimánek | 2012-02-07 | 1 | -1/+1 |
| | | |||||
| * | use appropriate words for docs of Model.none | Rohit Arondekar | 2012-02-07 | 1 | -2/+2 |
| | | |||||
| * | minor tidy up of none relation query method | Rohit Arondekar | 2012-02-06 | 1 | -2/+2 |
| | | |||||
| * | Fix code example in ActiveRecord::Relation#none | Carlos Antonio da Silva | 2012-02-01 | 1 | -3/+3 |
| | | |||||
* | | Fix GH #4909. Dependency on TZInfo move from AR to AS. | kennyj | 2012-02-10 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4965 from raghunadhd/fix_hash | Xavier Noria | 2012-02-09 | 1 | -2/+1 |
|\ \ | | | | | | | Refactored the OrderedHash related stuff | ||||
| * | | Refactored the OrderedHash related stuff | Raghunadh | 2012-02-09 | 1 | -2/+1 |
| | | | |||||
* | | | moving ordered hash to normal hash because ruby 1.9.3 hash defaultly ordered one | Karunakar (Ruby) | 2012-02-09 | 1 | -5/+5 |
|/ / | |||||
* | | PostgreSQL does not work in the same way of the other adapters | Rafael Mendonça França | 2012-02-08 | 1 | -3/+7 |
| | | |||||
* | | AR::Relation#pluck: improve to work with joins | Bogdan Gusiev | 2012-02-08 | 2 | -0/+14 |
| | | |||||
* | | Fix attribute_before_type_cast for serialized attributes. Fixes #4837. | Jon Leighton | 2012-02-07 | 3 | -0/+25 |
| | | |||||
* | | no need to check for this constant | Xavier Noria | 2012-02-07 | 1 | -1/+1 |
| | | |||||
* | | Fixed the documenation for 'to_xml' | Markus Fenske | 2012-02-07 | 1 | -1/+2 |
| | | |||||
* | | adding a comment for myself | Aaron Patterson | 2012-02-06 | 2 | -8/+9 |
| | | |||||
* | | delegate attribute typecasting to the column | Aaron Patterson | 2012-02-06 | 2 | -16/+17 |
| | | |||||
* | | pg supports real booleans, so handle the case when `true` is returned | Aaron Patterson | 2012-02-06 | 1 | -2/+5 |
| | | |||||
* | | let automatic EXPLAIN ignore CACHE notifications | Xavier Noria | 2012-02-03 | 2 | -1/+52 |
| | | |||||
* | | prevents the database.yml template option from being passed to PGConn | Sean Kirby | 2012-02-06 | 1 | -1/+1 |
| | | |||||
* | | allow mass-assign version attribute in AR::SchemaMigration | Sergey Nartimov | 2012-02-06 | 1 | -0/+2 |
| | | |||||
* | | Get ActiveRecord::TestCase back on its feet, despite deprecation. It ↵ | Jeremy Kemper | 2012-02-05 | 3 | -92/+68 |
| | | | | | | | | requires SQLCounter which was moved to AR internal tests only. | ||||
* | | Verbose output for tests. | Arun Agrawal | 2012-02-03 | 1 | -0/+1 |
| | | | | | | | | | | See #3892 | ||||
* | | Merge pull request #4856 from ihid/store_null_bug | Aaron Patterson | 2012-02-02 | 4 | -3/+16 |
|\ \ | | | | | | | Allow store to be a not null column. | ||||
| * | | Allow store to be a not null column. | Jeremy Walker | 2012-02-02 | 4 | -3/+16 |
| | | | |||||
* | | | *args is already an array. :'( | Aaron Patterson | 2012-02-02 | 1 | -1/+1 |
| | | | |||||
* | | | columns method doesn't have name argument | Rafael Mendonça França | 2012-02-02 | 2 | -6/+5 |
| | | | |||||
* | | | removed whitespace errors ↵ | Aaron Patterson | 2012-02-02 | 1 | -4/+4 |
| | | | | | | | | | | | | :yellow_heart::blue_heart::purple_heart::heart::green_heart: | ||||
* | | | Remove useless argument in #columns. | Sebastian Martinez | 2012-02-02 | 6 | -7/+7 |
| | | | |||||
* | | | Merge pull request #3892 from arunagw/verbose_rake_test | José Valim | 2012-02-02 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | No Verbose the output for test. | ||||
| * | | | No verbose the output for tests. | Arun Agrawal | 2012-02-01 | 1 | -1/+0 |
| | | | | |||||
* | | | | use the class method to (un)escape binary values | Aaron Patterson | 2012-02-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #4543 from jdelStrother/find_or_init | Jon Leighton | 2012-02-01 | 2 | -2/+13 |
|\ \ \ \ | |_|/ / |/| | | | Don't instantiate two objects in collection proxy / find_or_instantiate_by | ||||
| * | | | Don't instantiate two objects in collection proxy / find_or_instantiator_by | Jonathan del Strother | 2012-01-19 | 2 | -2/+13 |
| | | | | |||||
* | | | | Fix typo | Rafael Mendonça França | 2012-02-01 | 2 | -3/+3 |
| | | | | |||||
* | | | | Use human attribute name to show the dependent destroy message | Rafael Mendonça França | 2012-02-01 | 3 | -3/+28 |
| | | | | |||||
* | | | | Merge pull request #4828 from railsaholic/fix_error_message | José Valim | 2012-02-01 | 4 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | fix has_one, has_many restrict error message | ||||
| * | | | | fix has_one, has_many restrict error message | Manoj | 2012-02-01 | 4 | -4/+7 |
| | | | | | |||||
* | | | | | Merge pull request #4806 from KL-7/do-not-serialize-nil | Aaron Patterson | 2012-02-01 | 2 | -2/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not serialize nil in serialized attribute. | ||||
| * | | | | | Do not serialize nil in serialized attribute. | Kirill Lashuk | 2012-01-31 | 2 | -2/+15 |
| | | | | | | |||||
* | | | | | | Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption | Aaron Patterson | 2012-02-01 | 3 | -17/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Fix for SQLite binary data corrupter (to master branch) | ||||
| * | | | | | Fixed issue with SQLite adapter corrupting binary data | Chris Feist | 2012-01-31 | 1 | -16/+1 |
| | | | | | | |||||
| * | | | | | Added test to illustrate bad binary blobs. | Chris Feist | 2012-01-31 | 2 | -1/+2 |
| | | | | | | |||||
* | | | | | | document the AR none method [ci skip] | Vijay Dev | 2012-02-01 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | fix a typo [ci skip] | Vijay Dev | 2012-02-01 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-01 | 1 | -4/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Improve readonly examples and optimistic locking docs | Carlos Antonio da Silva | 2012-01-31 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Relation#order can receive order attributes as different arguments, add example; * Readonly does not handle deletion of records, only modification; * locking_version column does not need to default to 0, Rails handles nil values; * Change references from "set_locking_column" to "self.locking_column". | ||||
* | | | | | Merge pull request #4799 from arunagw/warning_fixed_for_indentations | Aaron Patterson | 2012-01-31 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | warning removed: mismatched indentations | ||||
| * | | | | warning removed: mismatched indentations | Arun Agrawal | 2012-01-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Revert "Merge pull request #4746 from jenslukowski/issue4718" | Aaron Patterson | 2012-01-31 | 2 | -16/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5cad7a0dba652f3e942e58087bc88ba5c5390edc, reversing changes made to bb842e8d2111e50b21a14b8bd6d89371a4b9cd68. | ||||
* | | | | | Merge pull request #4805 from xuanxu/none_and_null_object_pattern | Jon Leighton | 2012-01-31 | 6 | -1/+71 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Added `none` query method to return zero records. |