| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select | Aaron Patterson | 2012-03-30 | 2 | -10/+23 |
|\ |
|
| * | refactor instantiate method in base, so we remove nesting if's which make the... | Arturo Pie | 2012-03-29 | 2 | -12/+19 |
| * | refactor the checking of the attributes of the record in IdentityMap#add, so ... | Arturo Pie | 2012-03-29 | 1 | -1/+7 |
| * | Do not add record to identity map if the record doesn't have values for all t... | Arturo Pie | 2012-03-29 | 1 | -1/+1 |
* | | Merge branch '3-2-3' into 3-2-stable | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
|\ \ |
|
| * | | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| * | | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
* | | | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 1 | -2/+3 |
| |/
|/| |
|
* | | Fix #5549. | Jon Leighton | 2012-03-28 | 2 | -3/+7 |
* | | Merge pull request #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
* | | Merge pull request #5618 from lest/patch-1 | Piotr Sarnacki | 2012-03-27 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | force datetime attributes to be changed | Sergey Nartimov | 2012-03-27 | 1 | -0/+1 |
* | | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
* | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 1 | -6/+22 |
|\ |
|
| * | migrate(:down) method with table_name_prefix | kennyj | 2012-03-21 | 1 | -6/+22 |
* | | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating... | Marcelo Silveira | 2012-03-21 | 1 | -0/+3 |
* | | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 1 | -1/+1 |
|/ |
|
* | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 1 | -0/+1 |
* | Merge pull request #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
* | ConnectionPool.checkout takes account of ruby using 'non-blocking condition v... | Jonathan Rochkind | 2012-03-13 | 1 | -9/+18 |
* | [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Co... | kennyj | 2012-03-14 | 1 | -1/+1 |
* | fix activerecord query_method regression with offset into Fixnum | Denis Jean | 2012-03-13 | 1 | -1/+1 |
* | make sure connections returned after close are marked as in_use | Aaron Patterson | 2012-03-12 | 1 | -0/+16 |
* | Merge pull request #5391 from jrochkind/connection_pool_doc | Aaron Patterson | 2012-03-12 | 1 | -3/+1 |
|\ |
|
| * | inline docs for clear_active_connections! no longer says it cleans dead threa... | Jonathan Rochkind | 2012-03-12 | 1 | -3/+1 |
* | | Add documentation for find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 1 | -0/+3 |
|/ |
|
* | Add dynamic find_or_create_by_{attribute}! method. | Andrew White | 2012-03-12 | 2 | -1/+13 |
* | Not need to pass join attributes to association build | Rafael Mendonça França | 2012-03-08 | 2 | -4/+10 |
* | make active_connection? return true only if there is an open connection in us... | Aaron Patterson | 2012-03-08 | 1 | -3/+4 |
* | Fix doc examples for has_and_belongs_to_many association | Braden Schaeffer | 2012-03-09 | 1 | -2/+2 |
* | Merge pull request #5316 from Jacobkg/master | José Valim | 2012-03-07 | 1 | -1/+1 |
* | Fix #5069 - Protect foreign key from mass assignment throught association bui... | Jean Boussier | 2012-03-05 | 1 | -1/+2 |
* | Whitelist all attribute assignment by default. | Michael Koziarski | 2012-03-05 | 2 | -0/+9 |
* | fix associations when using per class databases | Lars Kanis | 2012-03-04 | 3 | -8/+5 |
* | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 2 | -2/+2 |
* | revert setting NOT NULL constraints in add_timestamps | Xavier Noria | 2012-03-01 | 1 | -2/+2 |
* | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
|\ |
|
| * | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
| * | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
| * | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
* | | Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. | kennyj | 2012-02-29 | 1 | -9/+20 |
* | | Revert "No need to pass options which is never used" | Rafael Mendonça França | 2012-02-26 | 1 | -2/+2 |
* | | Fixed typo in composed_of example with Money#<=>, was comparing amount itself... | Noah Hendrix | 2012-02-25 | 1 | -1/+1 |
* | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 |
|/ |
|
* | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 |
* | tag bind params with a bind param object | Aaron Patterson | 2012-02-21 | 3 | -3/+3 |
* | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
* | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 1 | -16/+36 |
* | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 1 | -1/+1 |