Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6089 from frodsan/delete_all_limit | Aaron Patterson | 2012-05-01 | 2 | -0/+6 |
|\ | | | | | delete_all raise an error if a limit is provided - fixes #4979 | ||||
| * | delete_all raise an error if a limit is provided - fixes #4979 | Francesco Rodriguez | 2012-04-30 | 2 | -0/+6 |
| | | |||||
* | | Merge pull request #6092 from ↵ | Aaron Patterson | 2012-05-01 | 2 | -1/+25 |
|\ \ | | | | | | | | | | | | | jsanders/issue_4001_error_typecasting_non_integer_castable Don't type cast values that don't respond to to_i to 1 | ||||
| * | | Don't type cast values that don't respond to to_i to 1 | James Sanders & Jason Noble | 2012-04-30 | 2 | -1/+25 |
| |/ | |||||
* | | changelog fixes. Closes #3911 | Vijay Dev | 2012-05-01 | 1 | -13/+0 |
| | | |||||
* | | more edits [ci skip] | Vijay Dev | 2012-05-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 2 | -10/+11 |
|\ \ | |||||
| * | | add ActiveRecord::RecordInvalid to exceptions | Hrvoje Šimić | 2012-04-30 | 1 | -9/+10 |
| | | | | | | | | | | | | sort the exception names alphabetically | ||||
| * | | More using <tt>x</tt> instead of +x+ when the latter renders improperly. | Mark Rushakoff | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
* | | | remove useless assertions | Aaron Patterson | 2012-04-30 | 1 | -10/+3 |
| | | | |||||
* | | | return value of block is returned | Aaron Patterson | 2012-04-30 | 2 | -3/+14 |
| | | | |||||
* | | | only yield to finder block if something is found | Aaron Patterson | 2012-04-30 | 2 | -1/+11 |
| | | | |||||
* | | | Fix PR #6091 | Andrew White | 2012-04-30 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | 1. ActiveRecord::Base is not ActiveRecord::Relation 2. The order of records from an SQL query is uncertain without an ORDER clause 3. Run your own tests when submitting a pull request | ||||
* | | | Add ActiveRecord::Base#ids | twinturbo | 2012-04-30 | 2 | -0/+14 |
| |/ |/| | |||||
* | | Build fix for observed_classes | Arun Agrawal | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | introduced here bad44e4f8f690039bd0db92ac25f10af536c6e71 | ||||
* | | Merge pull request #6074 from mark-rushakoff/unused-variables | Jeremy Kemper | 2012-04-29 | 5 | -11/+5 |
|\ \ | | | | | | | Remove some unused variable assignments | ||||
| * | | Remove unused assignments | Mark Rushakoff | 2012-04-29 | 1 | -5/+3 |
| | | | |||||
| * | | Remove unused assignments from activerecord tests | Mark Rushakoff | 2012-04-29 | 4 | -6/+2 |
| | | | |||||
* | | | Removed extraneous .present? check for AR::Base#reload | Jeremy Friesen | 2012-04-29 | 1 | -1/+1 |
| | | | |||||
* | | | Removed deprecation warning for #find as a result of AR::Base#reload | Jeremy Friesen | 2012-04-29 | 1 | -1/+7 |
|/ / | | | | | | | | | Cleaned up "DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it." | ||||
* | | Merge pull request #6028 from sikachu/master-fix_plpgsql | Aaron Patterson | 2012-04-28 | 1 | -21/+29 |
|\ \ | | | | | | | Create plpgsql language if not available | ||||
| * | | Create plpgsql language if not available | Prem Sichanugrist | 2012-04-27 | 1 | -21/+29 |
| |/ | | | | | | | | | This should fix the problem in Travis CI server. (http://travis-ci.org/#!/rails/rails/jobs/1194988) | ||||
* / | removed deprecation warnings | Andrey Deryabin | 2012-04-28 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #5698 from dougcole/support_postgresql_partitioning | Aaron Patterson | 2012-04-27 | 5 | -11/+102 |
|\ | | | | | Support postgresql partitioning by making INSERT RETURNING optional | ||||
| * | refactor configuration of insert_returning | Doug Cole | 2012-04-07 | 2 | -33/+19 |
| | | |||||
| * | pick better names and add a little documentation | Doug Cole | 2012-04-01 | 2 | -16/+24 |
| | | |||||
| * | improve test coverage | Doug Cole | 2012-03-31 | 1 | -0/+26 |
| | | |||||
| * | refactor | Doug Cole | 2012-03-31 | 1 | -13/+8 |
| | | |||||
| * | update mysql for new exec_insert signature | Doug Cole | 2012-03-31 | 1 | -1/+1 |
| | | |||||
| * | add use_returning as a postgresql connection config | Doug Cole | 2012-03-31 | 4 | -8/+84 |
| | | |||||
* | | remove deprecated calls | Jon Leighton | 2012-04-27 | 12 | -94/+93 |
| | | |||||
* | | Revert "Merge pull request #5995 from kennyj/fix_5847-3" | José Valim | 2012-04-27 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | Active Record should be lazy loaded and this pull request forced Active Record to always be loaded after initialization. This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2. | ||||
* | | more deprecations manually fixed | Jon Leighton | 2012-04-27 | 3 | -58/+53 |
| | | |||||
* | | find and replace deprecated keys | Jon Leighton | 2012-04-27 | 21 | -220/+220 |
| | | |||||
* | | allow AssociationProxy#scoped to take options so that API is the same as ↵ | Jon Leighton | 2012-04-27 | 2 | -2/+10 |
| | | | | | | | | Base#scoped | ||||
* | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵ | Jon Leighton | 2012-04-27 | 30 | -415/+333 |
| | | | | | | | | things | ||||
* | | remove unnecessary test code | Jon Leighton | 2012-04-27 | 2 | -9/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:rails/rails | Jon Leighton | 2012-04-27 | 7 | -552/+543 |
|\ \ | |||||
| * | | fix tests for SQLite3Adapter | Andrey Deryabin | 2012-04-27 | 4 | -4/+3 |
| | | | |||||
| * | | renamed class SQLiteColumn to SQLite3Column | Andrey Deryabin | 2012-04-27 | 1 | -3/+3 |
| | | | |||||
| * | | removed tail of old sqlite versions | Andrey Deryabin | 2012-04-27 | 1 | -9/+9 |
| | | | |||||
| * | | fix SQLite3Adapter doc | Andrey Deryabin | 2012-04-27 | 1 | -2/+2 |
| | | | |||||
| * | | Upgrade sqlite3 version to 1.3.6 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | fix tests for sqlite3 | Andrey Deryabin | 2012-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | merged sqlite and sqlite3 adapters | Andrey Deryabin | 2012-04-27 | 2 | -546/+538 |
| | | | |||||
* | | | don't need this test | Jon Leighton | 2012-04-26 | 1 | -5/+0 |
|/ / | |||||
* | | remove calls to find(:first), find(:last) and find(:all) | Jon Leighton | 2012-04-26 | 27 | -119/+114 |
| | | |||||
* | | remove deprecate #all usage | Jon Leighton | 2012-04-26 | 4 | -7/+3 |
| | | |||||
* | | remove deprecated #first calls | Jon Leighton | 2012-04-26 | 3 | -28/+3 |
| | | |||||
* | | remove deprecate #calculate calls | Jon Leighton | 2012-04-26 | 11 | -146/+72 |
| | |