aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #1406 from dmathieu/fix_test_warningsJosé Valim2011-07-071-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bug in collection_singular_ids on has many through association with condi...Anatoliy Lysenko2011-07-062-1/+6
* | | | | | | | | | | Merge pull request #1989 from simonbaird/masterSantiago Pastorino2011-07-061-5/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix charset/collate in mysql recreate_databaseSimon Baird2011-07-071-5/+8
* | | | | | | | | | | | 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 performan...Jon Leighton2011-07-072-7/+11
* | | | | | | | | | | | Remove stream at the class level.José Valim2011-07-062-39/+6
* | | | | | | | | | | | 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.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 handling ...Jeremy Friesen2011-05-243-1/+11
* | | | | | | | | | | | Merge pull request #1463 from psanford/masterSantiago Pastorino2011-07-062-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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.Anil Wadghule2011-06-051-2/+2
* | | | | | | | | | | | | | Merge pull request #1926 from tobsch/masterSantiago Pastorino2011-07-062-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Now accepting css/js files in deeper directory structures by default.Tobias Schlottke2011-07-012-5/+8
* | | | | | | | | | | | | | | Merge pull request #1979 from bogdan/association_sum_array_compatibilityJon Leighton2011-07-062-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed AR::Relation#sum compatibility with Array#sumBogdan Gusiev2011-07-052-2/+10
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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#findBogdan Gusiev2011-07-052-3/+11
* | | | | | | | | | | | | | | | Merge pull request #1963 from jake3030/fix_engine_rake_taskJosé Valim2011-07-052-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix engines rake tasksJake Varghese2011-07-042-0/+10
* | | | | | | | | | | | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-0514-99/+370
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | minor edit in 7896ac3Vijay Dev2011-07-051-1/+1
| * | | | | | | | | | | | | | | | Edited railties/guides/source/asset_pipeline.textile via GitHubMohammad Typaldos2011-07-031-3/+3
| * | | | | | | | | | | | | | | | document meta methodsVijay Dev2011-07-031-8/+8
| * | | | | | | | | | | | | | | | [asset pipeline] expand section on configurationRichard Hulse2011-07-031-10/+19
| * | | | | | | | | | | | | | | | [asset pipeline] More updatesRichard Hulse2011-07-031-9/+13
| * | | | | | | | | | | | | | | | [asset pipeline] Add resources to fingerprintingRichard Hulse2011-07-031-3/+2
| * | | | | | | | | | | | | | | | [asset pipeline] what is fingerprinting sectionRichard Hulse2011-07-031-6/+13
| * | | | | | | | | | | | | | | | [asset pipeline] spelling !Richard Hulse2011-07-031-3/+3
| * | | | | | | | | | | | | | | | [asset pipeline] Add new rationale sectionRichard Hulse2011-07-031-1/+31
| * | | | | | | | | | | | | | | | Merge pull request #50 from wader/masterVijay Dev2011-07-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fix arguments to get plugin help. Otherwise a plugin named "new" is created.Mattias Wadman2011-07-011-1/+1
| * | | | | | | | | | | | | | | | | document handle_unverified_request methodVijay Dev2011-07-021-0/+2
| * | | | | | | | | | | | | | | | | Revert "fix a typo"Vijay Dev2011-07-021-1/+1
| * | | | | | | | | | | | | | | | | fix a typoRay Baxter2011-07-011-1/+1
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | general grammar cleanup of cache docsMatt Jankowski2011-07-011-24/+26
| * | | | | | | | | | | | | | | | general formatting cleanup, and clarify that passing true as third option for...Matt Jankowski2011-07-011-11/+11
| * | | | | | | | | | | | | | | | [asset pipeline] refactor docs and add new contentRichard Hulse2011-07-011-25/+162
| * | | | | | | | | | | | | | | | update doc about resetting the session in case of authenticity token mismatchVijay Dev2011-07-011-6/+5
| * | | | | | | | | | | | | | | | Revert "Included w3c_validators gem and modified Migrations file"Vijay Dev2011-06-302-28/+12
| * | | | | | | | | | | | | | | | Merge pull request #49 from dyba/masterDaniel Dyba2011-06-292-12/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Included w3c_validators gem and modified Migrations fileDaniel Dyba2011-06-292-12/+28