Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | | | | [asset pipeline] refactor docs and add new content | Richard Hulse | 2011-07-01 | 1 | -25/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the document around and adds more details about the rationale behind the pipeline. Still a WIP. | ||||
| * | | | | | | | update doc about resetting the session in case of authenticity token mismatch | Vijay Dev | 2011-07-01 | 1 | -6/+5 |
| | | | | | | | | |||||
| * | | | | | | | Revert "Included w3c_validators gem and modified Migrations file" | Vijay Dev | 2011-06-30 | 2 | -28/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1028226b00a3671a465b510880bd186ae26b2e3d. Reason: No code changes can be done in docrails. | ||||
| * | | | | | | | Merge pull request #49 from dyba/master | Daniel Dyba | 2011-06-29 | 2 | -12/+28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Separated the ActiveRecord Supported Types in a separate section | ||||
| | * | | | | | | | Included w3c_validators gem and modified Migrations file | Daniel Dyba | 2011-06-29 | 2 | -12/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | correct invalid HAVING query | Akira Matsuda | 2011-06-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * GROUP BY value must appear in SELECT clause * ("created_at < ?", 1.month.ago) wasn't a very good example for HAVING. you'd better use WHERE for such a simple condition | ||||
| * | | | | | | | | correct invalid GROUP BY query | Akira Matsuda | 2011-06-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GROUP BY value must appear in SELECT clause | ||||
| * | | | | | | | | [asset pipeline] Add production assets section | Ryan Bigg | 2011-06-28 | 1 | -1/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | [asset pipeline] Add examples of javascript_include_tag and stylesheet_link_tag | Ryan Bigg | 2011-06-28 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | [Asset pipeline] Move external assets section down to 'Adding assets to your ↵ | Ryan Bigg | 2011-06-28 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gems' section | ||||
| * | | | | | | | | [asset pipeline] production assets covered later in the guide | Ryan Bigg | 2011-06-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [asset pipeline] sections at the bottom of the asset pipeline guide should ↵ | Ryan Bigg | 2011-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all be toplevel | ||||
| * | | | | | | | | [asset pipeline] Mention that hashed files are also picked up by Sprockets | Ryan Bigg | 2011-06-28 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | [asset pipeline] Cascade -> Cascading | Ryan Bigg | 2011-06-28 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix javascript case | Vijay Dev | 2011-06-28 | 1 | -1/+1 |
| | | | | | | | | |