Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated ActionController::Base.asset_host example | retr0h | 2010-03-25 | 1 | -2/+2 |
| | | | | | | | | The example provided contrived. It is not useful when wanting to use 1-based asset hosts (since it would generate a random asset host for the same asset). Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 24 | -124/+119 |
|\ | |||||
| * | with_output_buffer cannot assume there's an output_buffer | Xavier Noria | 2010-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4182 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | to_str works here | Jeremy Kemper | 2010-03-15 | 1 | -1/+1 |
| | | |||||
| * | Don't force singularization of singleton resource names, e.g. /preferences ↵ | Andrew White | 2010-03-15 | 1 | -8/+8 |
| | | | | | | | | | | | | [#4089 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | read_ and write_fragment cache preserve html safety yet cache strings only | Jeremy Kemper | 2010-03-14 | 1 | -6/+6 |
| | | |||||
| * | Making escaped things more readable | Santiago Pastorino | 2010-03-14 | 3 | -3/+3 |
| | | |||||
| * | Optimize DetailsKey generation. | José Valim | 2010-03-14 | 1 | -4/+5 |
| | | |||||
| * | Ensure controller filters are executed before stuff starts to happen. | José Valim | 2010-03-13 | 2 | -3/+7 |
| | | |||||
| * | Remove formats setters from render template, speeding up partial and ↵ | José Valim | 2010-03-13 | 1 | -2/+1 |
| | | | | | | | | collection renderings. | ||||
| * | Made asset_tag_helper use config.perform_caching instead of ↵ | Denis Odorcic | 2010-03-12 | 1 | -14/+14 |
| | | | | | | | | | | | | ActionController::Base.perform_caching Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Finish cleaning up rendering stack from views and move assigns evaluation to ↵ | José Valim | 2010-03-12 | 13 | -72/+66 |
| | | | | | | | | controller (so plugins and/or controllers can overwrite just one method). | ||||
| * | Allow anything that responds to render to be given as :template and use ↵ | José Valim | 2010-03-12 | 6 | -14/+11 |
| | | | | | | | | find_template instead of find in views. | ||||
* | | Update of block helpers examples in form_helper.rb | Jeroen van Dijk | 2010-03-13 | 1 | -32/+32 |
| | | |||||
* | | Updated documentation for block helpers in render/layouts.rb | Jeroen van Dijk | 2010-03-12 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 98 | -1893/+1975 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | %= works for content_tag and does not require parenthesis on method call | José Valim | 2010-03-12 | 1 | -47/+6 |
| | | |||||
| * | Make all AP tests pass for Ruby 1.9.1. | José Valim | 2010-03-12 | 1 | -8/+11 |
| | | |||||
| * | Write strings to fragment cache, not outputbuffers | Jeremy Kemper | 2010-03-11 | 1 | -1/+3 |
| | | |||||
| * | Delegate #encoding to SafeBuffer too | Jeremy Kemper | 2010-03-11 | 1 | -0/+4 |
| | | |||||
| * | simplify alt tag generation for images | Eaden McKee | 2010-03-11 | 1 | -2/+2 |
| | | | | | | | | | | | | [#2837 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | ActionController::Base.request_forgery_protection_token should actually be ↵ | Carl Lerche | 2010-03-11 | 1 | -1/+1 |
| | | | | | | | | the name of the token and not true. | ||||
| * | Add tests for lookup context. | José Valim | 2010-03-11 | 1 | -33/+33 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | wycats | 2010-03-10 | 11 | -104/+101 |
| |\ | |||||
| | * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-10 | 7 | -101/+88 |
| | |\ | |||||
| | * | | Optimize and clean up how details key get expired. | José Valim | 2010-03-10 | 7 | -30/+67 |
| | | | | |||||
| | * | | Remove uneeded methods. | José Valim | 2010-03-10 | 2 | -33/+4 |
| | | | | |||||
| | * | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-09 | 5 | -127/+119 |
| | |\ \ | |||||
| | * | | | Clean up the API required from ActionView::Template. | José Valim | 2010-03-09 | 4 | -41/+30 |
| | | | | | |||||
| * | | | | Make form helpers work with <%= | wycats | 2010-03-09 | 5 | -14/+56 |
| | | | | | |||||
| * | | | | Deprecate block_called_from_erb? pending a solution for getting it into apps | Carlhuda | 2010-03-09 | 6 | -43/+87 |
| | |_|/ | |/| | | |||||
| * | | | skip_relative_url_root url_for option is dead | Joshua Peek | 2010-03-09 | 3 | -6/+4 |
| | | | | |||||
| * | | | Allow default_url_options to be set on route set | Joshua Peek | 2010-03-09 | 2 | -0/+9 |
| | | | | |||||
| * | | | RouteSet#rewrite => url_for | Joshua Peek | 2010-03-09 | 3 | -4/+3 |
| | | | | |||||
| * | | | Unused RouteSet#url_for is hogging a good method name | Joshua Peek | 2010-03-09 | 1 | -13/+4 |
| | | | | |||||
| * | | | Move AC::UrlRewriter onto route set | Joshua Peek | 2010-03-09 | 5 | -83/+73 |
| | |/ | |/| | |||||
| * | | Reinstate dom_id in controllers. | Justin Ko | 2010-03-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | [#3040 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Refactor the RouteSet so it uses a Generator object instead of one huge method. | wycats | 2010-03-09 | 2 | -88/+109 |
| | | | |||||
| * | | Get rid of the instance-level URL rewriter | wycats | 2010-03-09 | 2 | -39/+9 |
| |/ | |||||
| * | Reinstate default_url_options and remove url_options= writer | Jeremy Kemper | 2010-03-08 | 1 | -47/+19 |
| | | |||||
| * | Remove outdated, distracting commented code | Jeremy Kemper | 2010-03-08 | 1 | -25/+0 |
| | | |||||
| * | Now that class_attribute creates an instance method, remove it to avoid ↵ | wycats | 2010-03-08 | 1 | -1/+2 |
| | | | | | | | | deprecation warnings ;) | ||||
| * | Simplify the action endpoint: | Carlhuda | 2010-03-08 | 4 | -31/+17 |
| | | | | | | | | | | | | | | * Remove ActionEndpoint in favor of passing a block to MiddlewareStack * Always create a Request; the performance win of RackDelegation is around the response; the Request object hit is limited to a single object allocation * #dispatch takes a Request | ||||
| * | Add memoizing to AD::Request | Carlhuda | 2010-03-08 | 1 | -0/+8 |
| | | |||||
| * | Require 'active_support/core_ext/hash/except' in the router. | Carl Lerche | 2010-03-08 | 1 | -0/+2 |
| | | |||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 10 | -43/+40 |
| | | |||||
| * | Move request forgery protection configuration to the AC config object | Carl Lerche | 2010-03-08 | 2 | -6/+44 |
| | | | | | | | | This is an interim solution pending revisiting the rails framework configuration situation. | ||||
| * | Whoops. We meant to switch from returning to tap, not vice versa | Carlhuda | 2010-03-08 | 1 | -1/+1 |
| | | |||||
| * | Add support for mount RackApp, :at => "/sprockets" with a shorthand of mount ↵ | Carlhuda | 2010-03-08 | 3 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | Sprockets => "/sprockets". This is different from the match syntax in that it cannot be used for controller/action and it does not assume an anchor at the end of the match. For instance, in the above example, if the client asked for "/sprockets/foo.js", the Sprockets app would have a SCRIPT_NAME of "/sprockets" and PATH_INFO of "/foo.js". | ||||
| * | Merge master. | José Valim | 2010-03-08 | 13 | -25/+43 |
| |\ |