aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ActiveRecord::Base should pass ActiveModel::Lint.Grant Hutchins & Peter Jaros2011-07-082-0/+12
|
* Merge pull request #2010 from hasclass/cache_false_valuesSantiago Pastorino2011-07-082-2/+7
|\ | | | | Properly cache value when it is "false"
| * Properly cache value when it is "false"Sebi Burkhard2011-07-082-2/+7
| |
* | Merge pull request #2011 from amatsuda/with_indexSantiago Pastorino2011-07-082-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 Matsuda2011-07-081-3/+1
| |
| * Use Enumerable#with_index. We're on Ruby > 1.8.7Akira Matsuda2011-07-081-2/+1
|/
* use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestionXavier Noria2011-07-082-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é Valim2011-07-072-6/+3
|
* Don't raise on mass assignment for testJosé Valim2011-07-073-11/+16
|
* removing brittle assertionAaron Patterson2011-07-071-1/+0
|
* Merge pull request #2005 from acroca/masterJosé Valim2011-07-072-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 Roca2011-07-082-3/+5
| | | | | | | | wildcard of the assets path because in ruby 1.9 is not consistent
* | Merge pull request #1767 from jwarwick/rake_notes_dirsSantiago Pastorino2011-07-071-4/+4
|\ \ | | | | | | Updated rake:notes to search additional directories
| * | Updated rake:notes to search app, config, lib, script and test dirsjwarwick2011-07-061-4/+4
| | |
* | | Merge pull request #1997 from knapo/masterSantiago Pastorino2011-07-072-2/+7
|\ \ \ | | | | | | | | Make `ActiveRecord::Batches#find_each` to not return `self`.
| * | | Make `ActiveRecord::Batches#find_each` to not return `self`.knapo2011-07-072-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 Noria2011-07-071-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 Kiriyenko2011-07-071-0/+1
| | | |
* | | | Just generate AR options if AR is enabledJosé Valim2011-07-072-0/+4
|/ / /
* | | Merge pull request #1996 from bogdan/default_sanitizer_squashedJosé Valim2011-07-072-0/+6
|\ \ \ | | | | | | | | Rails app template: setup different mass assignment sanitizer for envs
| * | | Rails app template: setup different mass assignment sanitizer for envsBogdan Gusiev2011-07-072-0/+6
| | | | | | | | | | | | | | | | | | | | For production - leave the default For test and dev: :strict.
* | | | Merge pull request #1406 from dmathieu/fix_test_warningsJosé Valim2011-07-071-2/+1
|\ \ \ \ | |_|/ / |/| | | Fix test warnings
| * | | remove the warning when testing whiny_nildmathieu2011-07-071-2/+1
| | | |
* | | | Merge pull request #1120 from lysenko/collection_singular_idsSantiago Pastorino2011-07-062-1/+6
|\ \ \ \ | | | | | | | | | | collection_singular_ids ignores association :include option
| * | | | Fix bug in collection_singular_ids on has many through association with ↵Anatoliy Lysenko2011-07-062-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/masterSantiago Pastorino2011-07-061-5/+8
|\ \ \ \ \ | | | | | | | | | | | | rake db:test:purge creates mysql database with wrong charset & collation (master branch)
| * | | | | Fix charset/collate in mysql recreate_databaseSimon Baird2011-07-071-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é Valim2011-07-061-1/+1
| | | | | |
* | | | | | Give higher priority to assets.cache_store.José Valim2011-07-061-1/+1
| | | | | |
* | | | | | Make compressors lazily load.José Valim2011-07-064-3/+40
| | | | | |
* | | | | | Don't construct association scope in initializer. This yields a big ↵Jon Leighton2011-07-072-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é Valim2011-07-062-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_orderJon Leighton2011-07-061-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.
| * | | | | Remove case statement changes from 2e0840d and 56ac32a. Inheritance FTW.Ernie Miller2011-07-061-1/+1
|/ / / / /
* | | | | Merge pull request #1273 from jeremyf/feature-association-proxy-sendSantiago Pastorino2011-07-063-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handl
| * | | | | Addresses an inconsistency in the ActiveRecord::Base.method_missing handling ↵Jeremy Friesen2011-05-243-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | of dynamic finder methods and the passing of the &block parameter for :find_by_attributes.
* | | | | | Merge pull request #1463 from psanford/masterSantiago Pastorino2011-07-062-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix timezone handling in String.to_time
| * | | | | | Make String.to_time respect timezonesNate Mueller2011-06-022-2/+3
| | | | | | |
* | | | | | | Merge pull request #1494 from anildigital/masterSantiago Pastorino2011-07-061-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix failing test because of Timezone difference.
| * | | | | | | Fix failing test because of Timezone difference.Anil Wadghule2011-06-051-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #1926 from tobsch/masterSantiago Pastorino2011-07-062-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 Schlottke2011-07-012-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_compatibilityJon Leighton2011-07-062-2/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sum
| * | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sumBogdan Gusiev2011-07-052-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 #1959Aaron Patterson2011-07-053-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1968 from bogdan/associations_find_array_compatibility2Santiago Pastorino2011-07-052-3/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed CollectionAssociation#find to be compatible with Array#find
| * | | | | | | | | | Fixed CollectionAssociation#find to be compatible with Array#findBogdan Gusiev2011-07-052-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_taskJosé Valim2011-07-052-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Fix engine rake task
| * | | | | | | | | | fix engines rake tasksJake Varghese2011-07-042-0/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-0514-99/+370
|\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:50:01 +0000