Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #2011 from amatsuda/with_index | Santiago Pastorino | 2011-07-08 | 2 | -5/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | 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 | |
* | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Using the sum of bytes instead the hash of the path when replacing the wildca... | Albert Callarisa Roca | 2011-07-08 | 2 | -3/+5 | |
* | | | | | | | Merge pull request #1767 from jwarwick/rake_notes_dirs | Santiago Pastorino | 2011-07-07 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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`. | knapo | 2011-07-07 | 2 | -2/+7 | |
* | | | | | | | | | Merge pull request #1999 from dmitriy-kiriyenko/add_require_active_support_de... | Xavier Noria | 2011-07-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | Bogdan Gusiev | 2011-07-07 | 2 | -0/+6 | |
* | | | | | | | | | Merge pull request #1406 from dmathieu/fix_test_warnings | José Valim | 2011-07-07 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix bug in collection_singular_ids on has many through association with condi... | Anatoliy Lysenko | 2011-07-06 | 2 | -1/+6 | |
* | | | | | | | | | | Merge pull request #1989 from simonbaird/master | Santiago Pastorino | 2011-07-06 | 1 | -5/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix charset/collate in mysql recreate_database | Simon Baird | 2011-07-07 | 1 | -5/+8 | |
* | | | | | | | | | | | 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 performan... | Jon Leighton | 2011-07-07 | 2 | -7/+11 | |
* | | | | | | | | | | | Remove stream at the class level. | José Valim | 2011-07-06 | 2 | -39/+6 | |
* | | | | | | | | | | | 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. | 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 handling ... | Jeremy Friesen | 2011-05-24 | 3 | -1/+11 | |
* | | | | | | | | | | | Merge pull request #1463 from psanford/master | Santiago Pastorino | 2011-07-06 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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. | Anil Wadghule | 2011-06-05 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Merge pull request #1926 from tobsch/master | Santiago Pastorino | 2011-07-06 | 2 | -5/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Now accepting css/js files in deeper directory structures by default. | Tobias Schlottke | 2011-07-01 | 2 | -5/+8 | |
* | | | | | | | | | | | | | | 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 | Bogdan Gusiev | 2011-07-05 | 2 | -2/+10 | |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 | Bogdan Gusiev | 2011-07-05 | 2 | -3/+11 | |
* | | | | | | | | | | | | | | | Merge pull request #1963 from jake3030/fix_engine_rake_task | José Valim | 2011-07-05 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix engines rake tasks | Jake Varghese | 2011-07-04 | 2 | -0/+10 | |
* | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-05 | 14 | -99/+370 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | minor edit in 7896ac3 | Vijay Dev | 2011-07-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Edited railties/guides/source/asset_pipeline.textile via GitHub | Mohammad Typaldos | 2011-07-03 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | document meta methods | Vijay Dev | 2011-07-03 | 1 | -8/+8 |