Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 6 | -19/+18 |
|\ | |||||
| * | 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> | ||||
| * | Making escaped things more readable | Santiago Pastorino | 2010-03-14 | 3 | -3/+3 |
| | | |||||
| * | 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 | 1 | -1/+0 |
| | | | | | | | | controller (so plugins and/or controllers can overwrite just one method). | ||||
* | | Update of block helpers examples in form_helper.rb | Jeroen van Dijk | 2010-03-13 | 1 | -32/+32 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 15 | -172/+211 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | 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> | ||||
| * | Make form helpers work with <%= | wycats | 2010-03-09 | 4 | -14/+48 |
| | | |||||
| * | Deprecate block_called_from_erb? pending a solution for getting it into apps | Carlhuda | 2010-03-09 | 4 | -38/+45 |
| | | |||||
| * | Merge master. | José Valim | 2010-03-08 | 2 | -6/+10 |
| |\ | |||||
| | * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 2 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add lazy_load_hooks.rb, which allows us to declare code that should be run at some later time. For instance, this allows us to defer requiring ActiveRecord::Base at boot time purely to apply configuration. Instead, we register a hook that should apply configuration once ActiveRecord::Base is loaded. With these changes, brings down total boot time of a new app to 300ms in production and 400ms in dev. TODO: rename base_hook | ||||
| * | | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 1 | -2/+2 |
| |/ | | | | | | | lookup. | ||||
| * | Adds disable option to date_helpers generated hidden fields when ↵ | Santiago Pastorino | 2010-03-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | html_options specifies it. ht by Marc Schütz [#3807 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Remove some of the blank rescues from number helper. This makes the code ↵ | Xavier Shay | 2010-03-05 | 1 | -44/+42 |
| | | | | | | | | | | | | easier to understand, as you're not left wondering what the rescue is actually doing. This does not change documented/tested behaviour. Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Fix a bunch of failing AP / AM specs created from the previous ↵ | Carl Lerche | 2010-03-04 | 1 | -1/+1 |
| | | | | | | | | AbstractController configuration refactor. | ||||
| * | Start refactoring the method of configuring ActionView | Carlhuda | 2010-03-03 | 1 | -7/+0 |
| | | |||||
| * | ActionDispatch::Request deprecates #request_uri | Carl Lerche | 2010-03-03 | 1 | -1/+1 |
| | | | | | | | | * Refactored ActionPatch to use fullpath instead | ||||
| * | Tweak the semantic of various URL related methods of ActionDispatch::Request | Carlhuda | 2010-03-03 | 1 | -2/+3 |
| | | |||||
| * | Work on deprecating ActionController::Base.relative_url_root | Carlhuda | 2010-03-03 | 1 | -2/+2 |
| | | |||||
| * | Change AV formats so they can delegate to the controller. Now users (or ↵ | Carlhuda | 2010-03-01 | 1 | -15/+17 |
| | | | | | | | | plugins) can override details_for_render in their controllers and add appropriate additional details. Now if only they could *do* something with those details... | ||||
| * | Delegate formats to the controller | Carlhuda | 2010-03-01 | 1 | -0/+4 |
| | | |||||
| * | Final pass at removing the router from a global constant | Carlhuda | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | Bump i18n for new public I18n.normalize_keys | Jeremy Kemper | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | add time_separator for minutes only if minutes aren't hidden | Santiago Pastorino | 2010-02-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Use ActionDispatch::Routing everywhere | Martin Schürrer | 2010-02-21 | 2 | -2/+2 |
| | | |||||
| * | Require persisted? in ActiveModel::Lint and remove new_record? and ↵ | José Valim | 2010-02-21 | 3 | -12/+11 |
| | | | | | | | | destroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not. | ||||
| * | Remove empty line and trailing hash, breaks documentation generation | Dirkjan Bussink | 2010-02-19 | 1 | -2/+0 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | ruby 1.9 array.to_s returns a string representing an escaped array | Santiago Pastorino | 2010-02-18 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | i18n translate with arrays issue solved | Santiago Pastorino | 2010-02-18 | 1 | -2/+3 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | Explicit html_escape removed when not needed | Santiago Pastorino and José Ignacio Costa | 2010-02-14 | 3 | -4/+4 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | html_escape mail_to when encode javascript and not hex | Santiago Pastorino and José Ignacio Costa | 2010-02-14 | 1 | -5/+3 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
| * | content_tag should escape its input | Bruno Michel | 2010-02-14 | 7 | -15/+14 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> | ||||
* | | Updated documentation for block helpers in form_tag_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -5/+5 |
| | | |||||
* | | Updated documentation for block helpers in javascript_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -1/+1 |
| | | |||||
* | | Updated documentation for block helpers in prototype_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -1/+1 |
| | | |||||
* | | Updated documentation for block helpers in record_tag_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -4/+4 |
| | | |||||
* | | Updated documentation for block helpers in tag_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -1/+1 |
| | | |||||
* | | Updated documentation for block helpers in url_helper.rb | Jeroen van Dijk | 2010-03-12 | 1 | -1/+1 |
| | | |||||
* | | Nitpick: the first value should be odd, second is even. | Ryan Bigg | 2010-02-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 6 | -16/+32 |
|\| | | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README | ||||
| * | simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino] | David Heinemeier Hansson | 2010-02-12 | 1 | -1/+1 |
| | | |||||
| * | Safely concat the ending tag to simple_format or it will be escaped | David Heinemeier Hansson | 2010-02-12 | 1 | -1/+1 |
| | | |||||
| * | Fix pluralization for numbers formatted like '1.00' | Gabriel Mansour | 2010-02-07 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fix nested attributes with specified collection. | José Valim | 2010-02-07 | 1 | -7/+11 |
| | | |||||
| * | More html_safe strings now use the safe_concat method | Santiago Pastorino and José Ignacio Costa | 2010-02-05 | 4 | -6/+6 |
| | | | | | | | | | | | | [#3856 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | HTML-escape csrf meta contents | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | |||||
| * | Expose CSRF param name also | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | |||||
| * | Expose CSRF tag for UJS adapters | Jeremy Kemper | 2010-02-04 | 1 | -0/+12 |
| | | |||||
* | | revises an example in the rdoc of TextHelper#concat | Xavier Noria | 2010-02-06 | 1 | -1/+1 |
| | |