Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 3 | -3/+37 |
|\ | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this | ||||
| * | predicate builder should not recurse for determining where columns. | Aaron Patterson | 2012-05-30 | 3 | -3/+37 |
| | | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661 | ||||
* | | Psych is always available on 1.9 | Jeremy Kemper | 2012-05-31 | 2 | -29/+23 |
| | | |||||
* | | Fix changelog example for count method with block [ci skip] | Carlos Antonio da Silva | 2012-05-31 | 1 | -1/+1 |
| | | | | | | | | Missed that too, thanks again @splattael. | ||||
* | | Fix wrong example for count method with block [ci skip] | Carlos Antonio da Silva | 2012-05-31 | 1 | -1/+1 |
| | | | | | | | | Thanks @splattael. | ||||
* | | Work around undiagnosed bug that's draining a relation's bind_values | Jeremy Kemper | 2012-05-31 | 1 | -0/+1 |
| | | |||||
* | | Fix backward compatibility with stored Hash values. Wrap coders to convert ↵ | Jeremy Kemper | 2012-05-30 | 3 | -15/+51 |
| | | | | | | | | serialized values to indifferent access. | ||||
* | | Merge pull request #6477 from steveklabnik/close_discovered_pg_connection | Rafael Mendonça França | 2012-05-30 | 1 | -1/+2 |
|\ \ | | | | | | | Properly discover a connection is closed in postgresql_adapter | ||||
| * | | Properly discover a connection is closed in postgresql_adapter | Steve Klabnik | 2012-05-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PQstatus doesn't properly test if future operations will succeed. A PQping function is added to libpq in PostgreSQL 9.1, but if we rely on it, everyone on earlier versions of Postgres is out of luck, and the pg gem wouldn't have the 'fix' until the next release. Thanks to @cbrecabarren and @ged for handling all the dirty details. Closes #3392. | ||||
* | | | Merge pull request #5810 from kennyj/fix_5797 | Aaron Patterson | 2012-05-30 | 4 | -5/+15 |
|\ \ \ | | | | | | | | | Fix #5797. Error calling dup method on AR model with serialized field | ||||
| * | | | Fix #5797. Error calling dup method on AR model with serialized field | kennyj | 2012-05-30 | 4 | -5/+15 |
| | | | | |||||
* | | | | Merge pull request #6386 from kennyj/fix_logs_name_consistency | Aaron Patterson | 2012-05-30 | 7 | -33/+123 |
|\ \ \ \ | | | | | | | | | | | Fix logs name consistency. | ||||
| * | | | | Fix logs name consistency. | kennyj | 2012-05-19 | 7 | -33/+123 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 5 | -27/+37 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | copy edit the batches docs [ci skip] | Vijay Dev | 2012-05-30 | 1 | -9/+7 |
| | | | | | |||||
| * | | | | change example on CollectionProxy#delete to accept multiple values | Francesco Rodriguez | 2012-05-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adds to Batch processing documentation [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -9/+20 |
| | | | | | |||||
| * | | | | fix typo and remove 'examples' noise [ci skip] | Francesco Rodriguez | 2012-05-28 | 1 | -18/+6 |
| | | | | | |||||
| * | | | | Updates examples for FinderMethods [ci skip] | Alvaro Pereyra | 2012-05-28 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Alvaro Pereyra | 2012-05-28 | 40 | -99/+798 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #102 from xenda/master | Xenda | 2012-05-27 | 1 | -4/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Small fix to update the README using more up to date conventions. | ||||
| | * | | | | | "a sql" -> "an SQL" per API documentation guidelines | Mark Rushakoff | 2012-05-27 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | 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 |
| | | | | | | |||||
* | | | | | | Fix #5847 and #4045 on master. | kennyj | 2012-05-30 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Use runner hook to load ActiveRecord::Base. | kennyj | 2012-05-30 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | SchemaMigration should be loaded lazily. | kennyj | 2012-05-29 | 3 | -2/+1 |
| | | | | | | |||||
* | | | | | | Add tests to delete by fixnum or string id with has many through associations | Francesco Rodriguez | 2012-05-28 | 1 | -0/+20 |
| | | | | | | |||||
* | | | | | | Fix failing build related to change in CollectionAssociation#delete | Carlos Antonio da Silva | 2012-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e | ||||
* | | | | | | Yield only one argument instead of splatting. | Carlos Antonio da Silva | 2012-05-28 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add Changelog entry. Closes #4003 | ||||
* | | | | | | Allow blocks for count with ActiveRecord::Relation. Document and test that ↵ | chrisfinne | 2012-05-28 | 2 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | sum allows blocks | ||||
* | | | | | | Add support for CollectionAssociation#delete by Fixnum or String | Francesco Rodriguez | 2012-05-28 | 4 | -3/+57 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found the next issue between CollectionAssociation `delete` and `destroy`. class Person < ActiveRecord::Base has_many :pets end person.pets.destroy(1) # => OK, returns the destroyed object person.pets.destroy("2") # => OK, returns the destroyed object person.pets.delete(1) # => ActiveRecord::AssociationTypeMismatch person.pets.delete("2") # => ActiveRecord::AssociationTypeMismatch Adding support for deleting with a fixnum or string like `destroy` method. | ||||
* | | | | | remove unnecessary ruby 1.8 reference from active_record/core [ci skip] | Francesco Rodriguez | 2012-05-26 | 1 | -3/+4 |
| | | | | | |||||
* | | | | | add CollectionProxy#uniq documentation | Francesco Rodriguez | 2012-05-26 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -2/+188 |
|\ \ \ \ \ | |||||
| * | | | | | add :nodoc: to CollectionProxy#initialize | Francesco Rodriguez | 2012-05-25 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add CollectionProxy#== documentation | Francesco Rodriguez | 2012-05-25 | 1 | -0/+24 |
| | | | | | | |||||
| * | | | | | add CollectionProxy#count documentation | Francesco Rodriguez | 2012-05-25 | 1 | -0/+26 |
| | | | | | | |||||
| * | | | | | add CollectionProxy#to_ary documentation | Francesco Rodriguez | 2012-05-25 | 1 | -2/+35 |
| | | | | | | |||||
| * | | | | | add CollectionProxy#delete documentation | Francesco Rodriguez | 2012-05-25 | 1 | -1/+104 |
| | | | | | | |||||
* | | | | | | Merge pull request #4132 from Juanmcuello/clone_structure | Aaron Patterson | 2012-05-25 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Reset postgreSQL search path in db:test:clone_structure. | ||||
| * | | | | | | Reset postgreSQL search path in db:test:clone_structure. | Juan M. Cuello | 2011-12-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945 | ||||
* | | | | | | | Merge pull request #5872 from evtuhovich/prepared_statement_fix | Aaron Patterson | 2012-05-25 | 1 | -10/+10 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter | ||||
| * | | | | | | | Remove prepared statement from system query in postgresql adapter | Ivan Evtukhovich | 2012-05-12 | 1 | -10/+10 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5244 from fotos/myqsl2_wait_timeout | Rafael Mendonça França | 2012-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maximum wait_timeout on Windows is 2147483 | ||||
| * | | | | | | | | Maximum wait_timeout on Windows is 2147483 | Fotos Georgiadis | 2012-03-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dump | Carlos Antonio da Silva | 2012-05-24 | 1 | -2/+2 |
| |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL. | ||||
* | | | | | | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-05-23 | 2 | -7/+7 |
| | | | | | | | | |||||
* | | | | | | | | PGconn doesn't accepts :checkout_timeout option. | Rafael Mendonça França | 2012-05-23 | 1 | -1/+1 |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405 | ||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 3 | -34/+463 |
|\ \ \ \ \ \ \ |