Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2012 from dasch/refactor_postgres_adapter | Aaron Patterson | 2011-07-08 | 2 | -18/+20 |
|\ | | | | | Refactor PostgreSQLAdapter a bit | ||||
| * | Refactor PostgreSQLAdapter a bit | Daniel Schierbeck | 2011-07-08 | 2 | -18/+20 |
|/ | | | | | Move the private method #extract_schema_and_table into a separate Utils module so that it can be tested without resorting to #send. | ||||
* | Merge pull request #2010 from hasclass/cache_false_values | Santiago Pastorino | 2011-07-08 | 2 | -2/+7 |
|\ | | | | | Properly cache value when it is "false" | ||||
| * | Properly cache value when it is "false" | Sebi Burkhard | 2011-07-08 | 2 | -2/+7 |
| | | |||||
* | | Merge pull request #2011 from amatsuda/with_index | Santiago Pastorino | 2011-07-08 | 2 | -5/+2 |
|\ \ | |/ |/| | replaced some "i += 1" sort of codes with Enumerable#with_index | ||||
| * | Use Enumerable#with_index. We're on Ruby > 1.8.7 (part II) | Akira Matsuda | 2011-07-08 | 1 | -3/+1 |
| | | |||||
| * | Use Enumerable#with_index. We're on Ruby > 1.8.7 | Akira Matsuda | 2011-07-08 | 1 | -2/+1 |
|/ | |||||
* | use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestion | Xavier Noria | 2011-07-08 | 2 | -3/+4 |
| | | | | | | That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that. | ||||
* | Move config.default_asset_host_protocol to the railtie. | José Valim | 2011-07-07 | 2 | -6/+3 |
| | |||||
* | Don't raise on mass assignment for test | José Valim | 2011-07-07 | 3 | -11/+16 |
| | |||||
* | removing brittle assertion | Aaron Patterson | 2011-07-07 | 1 | -1/+0 |
| | |||||
* | Merge pull request #2005 from acroca/master | José Valim | 2011-07-07 | 2 | -3/+5 |
|\ | | | | | Fixing asset number for asset_path with %d to be consistent in ruby 1.9 | ||||
| * | Using the sum of bytes instead the hash of the path when replacing the ↵ | Albert Callarisa Roca | 2011-07-08 | 2 | -3/+5 |
| | | | | | | | | wildcard of the assets path because in ruby 1.9 is not consistent | ||||
* | | Merge pull request #1767 from jwarwick/rake_notes_dirs | Santiago Pastorino | 2011-07-07 | 1 | -4/+4 |
|\ \ | | | | | | | Updated rake:notes to search additional directories | ||||
| * | | Updated rake:notes to search app, config, lib, script and test dirs | jwarwick | 2011-07-06 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #1997 from knapo/master | Santiago Pastorino | 2011-07-07 | 2 | -2/+7 |
|\ \ \ | | | | | | | | | Make `ActiveRecord::Batches#find_each` to not return `self`. | ||||
| * | | | Make `ActiveRecord::Batches#find_each` to not return `self`. | knapo | 2011-07-07 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | This caused that `find_each` was producing extra db call taking all the records from db, and was less efficient than `ActiveRecord::Base#all`. | ||||
* | | | | Merge pull request #1999 from ↵ | Xavier Noria | 2011-07-07 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | dmitriy-kiriyenko/add_require_active_support_delegation_to_relation Add require ActiveSupport delegation to ActiveRecord::Relation class. | ||||
| * | | | Add require ActiveSupport delegation to ActiveRecord::Relation class. | Dmitriy Kiriyenko | 2011-07-07 | 1 | -0/+1 |
| | | | | |||||
* | | | | Just generate AR options if AR is enabled | José Valim | 2011-07-07 | 2 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #1996 from bogdan/default_sanitizer_squashed | José Valim | 2011-07-07 | 2 | -0/+6 |
|\ \ \ | | | | | | | | | Rails app template: setup different mass assignment sanitizer for envs | ||||
| * | | | Rails app template: setup different mass assignment sanitizer for envs | Bogdan Gusiev | 2011-07-07 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | For production - leave the default For test and dev: :strict. | ||||
* | | | | Merge pull request #1406 from dmathieu/fix_test_warnings | José Valim | 2011-07-07 | 1 | -2/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix test warnings | ||||
| * | | | remove the warning when testing whiny_nil | dmathieu | 2011-07-07 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #1120 from lysenko/collection_singular_ids | Santiago Pastorino | 2011-07-06 | 2 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | collection_singular_ids ignores association :include option | ||||
| * | | | | Fix bug in collection_singular_ids on has many through association with ↵ | Anatoliy Lysenko | 2011-07-06 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions and includes, when condtions references tables from includes. Test fail because of invalid sql: ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column: comments.id: SELECT "posts".id FROM "posts" INNER JOIN "readers" ON "posts"."id" = "readers"."post_id" WHERE "readers"."person_id" = 1 AND (comments.id is null) Bug described in github#925 This commit will revert fix from https://github.com/rails/rails/commit/3436fdfc12d58925e3d981e0afa61084ea34736c , but tests is ok. Bug described in #6569 ticket. | ||||
* | | | | | Merge pull request #1989 from simonbaird/master | Santiago Pastorino | 2011-07-06 | 1 | -5/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | rake db:test:purge creates mysql database with wrong charset & collation (master branch) | ||||
| * | | | | | Fix charset/collate in mysql recreate_database | Simon Baird | 2011-07-07 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See new method mysql_creation_options. It is used by both create_database and recreate_database so they are consistent. (Cherry pick of 3ba3125b24b532876c95c8d9d00c9b69faab5a60) | ||||
* | | | | | | Ensure the engine_path is there (it may make CI happy). | José Valim | 2011-07-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Give higher priority to assets.cache_store. | José Valim | 2011-07-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Make compressors lazily load. | José Valim | 2011-07-06 | 4 | -3/+40 |
| | | | | | | |||||
* | | | | | | Don't construct association scope in initializer. This yields a big ↵ | Jon Leighton | 2011-07-07 | 2 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | performance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873. | ||||
* | | | | | | Remove stream at the class level. | José Valim | 2011-07-06 | 2 | -39/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because only template rendering works with streaming. Setting it at the class level was also changing the behavior of JSON and XML responses, closes #1337. | ||||
* | | | | | | Merge pull request #1987 from ernie/fix_fix_to_reverse_sql_order | Jon Leighton | 2011-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW. | ||||
| * | | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW. | Ernie Miller | 2011-07-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #1273 from jeremyf/feature-association-proxy-send | Santiago Pastorino | 2011-07-06 | 3 | -1/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handl | ||||
| * | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ↵ | Jeremy Friesen | 2011-05-24 | 3 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | of dynamic finder methods and the passing of the &block parameter for :find_by_attributes. | ||||
* | | | | | | Merge pull request #1463 from psanford/master | Santiago Pastorino | 2011-07-06 | 2 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix timezone handling in String.to_time | ||||
| * | | | | | | Make String.to_time respect timezones | Nate Mueller | 2011-06-02 | 2 | -2/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1494 from anildigital/master | Santiago Pastorino | 2011-07-06 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix failing test because of Timezone difference. | ||||
| * | | | | | | | Fix failing test because of Timezone difference. | Anil Wadghule | 2011-06-05 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1926 from tobsch/master | Santiago Pastorino | 2011-07-06 | 2 | -5/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Accept application.js/.css to exist in a deeper directory depth by default | ||||
| * | | | | | | | | Now accepting css/js files in deeper directory structures by default. | Tobias Schlottke | 2011-07-01 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for engines with own application.{js|css}-files. See: https://github.com/rails/rails/issues/1520 | ||||
* | | | | | | | | | Merge pull request #1979 from bogdan/association_sum_array_compatibility | Jon Leighton | 2011-07-06 | 2 | -2/+10 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum | ||||
| * | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum | Bogdan Gusiev | 2011-07-05 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order make Relation behavior closer to Array Made Relation#sum to accept block and delegate it to Array#sum | ||||
* | | | | | | | | | | updating pg supported versions docco. fixes #1959 | Aaron Patterson | 2011-07-05 | 3 | -3/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1968 from bogdan/associations_find_array_compatibility2 | Santiago Pastorino | 2011-07-05 | 2 | -3/+11 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed CollectionAssociation#find to be compatible with Array#find | ||||
| * | | | | | | | | | | Fixed CollectionAssociation#find to be compatible with Array#find | Bogdan Gusiev | 2011-07-05 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make CollectionAssociation behave closer to Array Add the ability to pass block to #find method just like Array#find does. | ||||
* | | | | | | | | | | | Merge pull request #1963 from jake3030/fix_engine_rake_task | José Valim | 2011-07-05 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Fix engine rake task | ||||
| * | | | | | | | | | | fix engines rake tasks | Jake Varghese | 2011-07-04 | 2 | -0/+10 |
| | | | | | | | | | | |