| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | 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 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [asset pipeline] expand section on configuration | Richard Hulse | 2011-07-03 | 1 | -10/+19 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [asset pipeline] More updates | Richard Hulse | 2011-07-03 | 1 | -9/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources for fingerprinting, grammar,CSS | |||||
| | * | | | | | | | | | | | [asset pipeline] Add resources to fingerprinting | Richard Hulse | 2011-07-03 | 1 | -3/+2 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [asset pipeline] what is fingerprinting section | Richard Hulse | 2011-07-03 | 1 | -6/+13 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [asset pipeline] spelling ! | Richard Hulse | 2011-07-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [asset pipeline] Add new rationale section | Richard Hulse | 2011-07-03 | 1 | -1/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will contain details about fingerprinting. | |||||
| | * | | | | | | | | | | | Merge pull request #50 from wader/master | Vijay Dev | 2011-07-02 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix arguments to get plugin help | |||||
| | | * | | | | | | | | | | | Fix arguments to get plugin help. Otherwise a plugin named "new" is created. | Mattias Wadman | 2011-07-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | document handle_unverified_request method | Vijay Dev | 2011-07-02 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Revert "fix a typo" | Vijay Dev | 2011-07-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Changelogs are not to be changed in docrails. This reverts commit 0b8cdc16e0b7c3404a0e3470b580235023c53542. | |||||
| | * | | | | | | | | | | | | fix a typo | Ray Baxter | 2011-07-01 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | general grammar cleanup of cache docs | Matt Jankowski | 2011-07-01 | 1 | -24/+26 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | general formatting cleanup, and clarify that passing true as third option ↵ | Matt Jankowski | 2011-07-01 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for benchmarking will stop output OTHER THAN the timing output itself | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |