Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6665 from schneems/schneems/raise-migration-error | José Valim | 2012-06-10 | 3 | -0/+54 |
|\ | | | | | Notify A User they Have Pending Migrations | ||||
| * | raise error for pending migration | schneems | 2012-06-09 | 3 | -4/+35 |
| | | | | | | can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications. | ||||
| * | add convenience methods for checking migrations | schneems | 2012-06-03 | 2 | -0/+23 |
| | | | | | | if a rails project needs to be migrated ActiveRecord::Migrator.needs_migration? will be true or false if the current version matches the last version. | ||||
* | | Merge pull request #6683 from stevecj/fix-fragile-assert-queries | Rafael Mendonça França | 2012-06-09 | 5 | -25/+37 |
|\ \ | | | | | | | Fix fragile #assert_queries implementation and usages. | ||||
| * | | Fix fragile #assert_queries implementation and usages. | Steve Jorgensen | 2012-06-09 | 5 | -25/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests that passed when run in the order they are loaded by rake test were failing when run in different sequences due to problems with the implementation of assert_queries and assert_no_queries as well as incorrect assumptions made about how many queries might be executed by a database adapter in various cases. | ||||
* | | | Remove conditional committed by accident | Santiago Pastorino | 2012-06-09 | 1 | -1/+1 |
| | | | |||||
* | | | Use each_with_object instead of each here | Santiago Pastorino | 2012-06-09 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #6687 from tiegz/3-2-optimizations | José Valim | 2012-06-09 | 1 | -1/+3 |
|/ / | | | | | | | ActiveRecord#attributes optimization: minimize objects created | ||||
* | | Skip two tests with polymorphic if current adapter is Oracle Adapter. | Yasuo Honda | 2012-06-08 | 1 | -0/+3 |
| | | | | | | | | because Oracle Adapter does not support foreign keys if :polymorphic => true is used. | ||||
* | | Merge pull request #6629 from marcandre/destroy | Carlos Antonio da Silva | 2012-06-06 | 5 | -0/+34 |
|\ \ | | | | | | | Add ActiveRecord::Base#destroy! | ||||
| * | | + ActiveRecord::Base#destroy! | Marc-Andre Lafortune | 2012-06-06 | 5 | -0/+34 |
| | | | |||||
* | | | reduce number of Strings | Akira Matsuda | 2012-06-06 | 1 | -1/+1 |
| | | | |||||
* | | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9 | Akira Matsuda | 2012-06-06 | 1 | -1/+1 |
| | | | |||||
* | | | stop `to_s`ing method names | Akira Matsuda | 2012-06-06 | 2 | -3/+2 |
| | | | | | | | | | | | | Module#methods are Symbols in Ruby >= 1.9 | ||||
* | | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3 | Carlos Antonio da Silva | 2012-06-05 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | Resolver tests fail if mysql adapter not installed | ||||
| * | | The resolver tests fail if the mysql gem is not installed; this breaks | David Paschich | 2012-06-03 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | being able to run the sqlite3 tests without that gem. This fix ensures the tests will only run if the mysql gem is installed. A better solution might be to move these tests into the per-adapter tests, and test each adapter's resolver. | ||||
* | | | Fix #6591. If a field with timezone isn't changed, we don't call will_change!. | kennyj | 2012-06-04 | 1 | -1/+2 |
| | | | |||||
* | | | Add failing test for 3.2.5 datetime attribute regression | Evan Arnold | 2012-06-04 | 1 | -0/+11 |
|/ / | |||||
* | | a test case that ensures AR::Relation#merge can merge associations | Akira Matsuda | 2012-06-03 | 1 | -0/+8 |
| | | |||||
* | | minor comment revision | Xavier Noria | 2012-06-01 | 1 | -1/+1 |
| | | |||||
* | | Sync CHANGLOG with the 3-2-stable branch | Rafael Mendonça França | 2012-06-01 | 1 | -0/+27 |
| | | |||||
* | | improve readability of AR explain result | Akira Matsuda | 2012-06-01 | 1 | -1/+7 |
| | | |||||
* | | unused method arguments | Akira Matsuda | 2012-06-01 | 1 | -7/+6 |
| | | |||||
* | | modulize AR::NullRelation | Akira Matsuda | 2012-06-01 | 3 | -4/+9 |
| | | | | | | | | now we can invoke previously added scope extension methods | ||||
* | | 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 |
| | | | | | |