Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 11 | -251/+473 | |
|\ | ||||||
| * | Rename unsignificant to insignificant. | José Valim | 2010-03-23 | 1 | -13/+13 | |
| | | ||||||
| * | NumberHelper methods should now return html_safe strings (when the inputs ↵ | Bernardo de Pádua | 2010-03-22 | 1 | -29/+86 | |
| | | | | | | | | | | | | are valid numbers or are html_safe). Also adds :raise => true (used internaly) to make the number helpers throw InvalidNumberError when the given number is invalid. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Adds number_to_human and several improvements in NumberHelper. [#4239 ↵ | Bernardo de Pádua | 2010-03-22 | 1 | -92/+229 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Remove data-url support from url_helper [#4236 state:resolved] | Denis Odorcic | 2010-03-21 | 1 | -2/+0 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-19 | 1 | -26/+23 | |
| |\ | ||||||
| | * | cleans a bit #compute_public_path | Xavier Noria | 2010-03-19 | 1 | -26/+23 | |
| | | | | | | | | | | | | | | | | | | [#4232 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | Improve performance of the rendering stack by freezing formats as a sign ↵ | José Valim | 2010-03-19 | 1 | -5/+3 | |
| |/ | | | | | | | that they shouldn't be further modified. | |||||
| * | All tests pass without memoizing view_context | Carlhuda | 2010-03-18 | 1 | -1/+21 | |
| | | ||||||
| * | Modify assert_template to use notifications. Also, remove ↵ | Carlhuda | 2010-03-17 | 1 | -1/+1 | |
| | | | | | | | | ActionController::Base#template since it is no longer needed. | |||||
| * | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 4 | -7/+4 | |
| | | | | | | | | warnings are in dependencies. | |||||
| * | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 1 | -1/+1 | |
| | | ||||||
| * | link_to_function is here to stay | Joshua Peek | 2010-03-16 | 2 | -33/+87 | |
| | | ||||||
| * | Fix missing require | wycats | 2010-03-16 | 1 | -0/+1 | |
| | | ||||||
| * | scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 ↵ | Santiago Pastorino | 2010-03-16 | 1 | -2/+3 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Do not always include the named URL helpers into AC::Base and AV::Base. | Carl Lerche | 2010-03-16 | 1 | -0/+7 | |
| | | ||||||
| * | translation method of TranslationHelper module returns always SafeBuffer ↵ | Santiago Pastorino | 2010-03-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Some more tweaks on <% %>. | Carlhuda | 2010-03-16 | 2 | -2/+3 | |
| | | | | | | | | * The cache helper is now semantically "mark this region for caching" * As a result, <% x = cache do %> no longer works | |||||
| * | Change array entries to safe doesn't worth then the array is joined as a ↵ | Santiago Pastorino | 2010-03-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | string losing the safe property of his entries [#4134 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Fix link_to with block | Jeremy Kemper | 2010-03-15 | 1 | -1/+1 | |
| | | ||||||
| * | link_to_remote -> link_to :remote => true | Jeremy Kemper | 2010-03-15 | 1 | -1/+1 | |
| | | ||||||
| * | Add deprecation notices for <% %>. | Carlhuda | 2010-03-15 | 4 | -66/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The approach is to compile <% %> into a method call that checks whether the value returned from a block is a String. If it is, it concats to the buffer and prints a deprecation warning. * <%= %> uses exactly the same logic to compile the template, which first checks to see whether it's compiling a block. * This should have no impact on other uses of block in templates. For instance, in <% [1,2,3].each do |i| %><%= i %><% end %>, the call to each returns an Array, not a String, so the result is not concatenated * In two cases (#capture and #cache), a String can be returned that should *never* be concatenated. We have temporarily created a String subclass called NonConcattingString which behaves (and is serialized) identically to String, but is not concatenated by the code that handles deprecated <% %> block helpers. Once we remove support for <% %> block helpers, we can remove NonConcattingString. | |||||
* | | 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 | 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. |