Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Modify assert_template to use instrumentation | Carlhuda | 2010-03-17 | 2 | -2/+7 | |
| | | ||||||
| * | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 6 | -8/+5 | |
| | | | | | | | | 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 | 3 | -1/+13 | |
| | | ||||||
| * | Fix rendering of HTML partials inside JS templates [#4197 status:resolved] | José Valim | 2010-03-16 | 2 | -3/+16 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | Move more normalization up to the lookup context, so it does not have to ↵ | José Valim | 2010-03-16 | 2 | -29/+31 | |
| | | | | | | | | repeat in every resolver. | |||||
| * | Add deprecation notices for <% %>. | Carlhuda | 2010-03-15 | 7 | -69/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 13 | -84/+48 | |
|\| | ||||||
| * | 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 | |
| | | ||||||
| * | Optimize DetailsKey generation. | José Valim | 2010-03-14 | 1 | -4/+5 | |
| | | ||||||
| * | 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 | 6 | -53/+16 | |
| | | | | | | | | 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 | 5 | -9/+10 | |
| | | | | | | | | 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 | 29 | -533/+637 | |
|\| | | | | | | | | | | | | | 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 | |
| | | ||||||
| * | 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> | |||||
| * | 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 | 5 | -69/+64 | |
| |\ | ||||||
| | * | Optimize and clean up how details key get expired. | José Valim | 2010-03-10 | 3 | -29/+35 | |
| | | | ||||||
| | * | Clean up the API required from ActionView::Template. | José Valim | 2010-03-09 | 3 | -40/+29 | |
| | | | ||||||
| * | | 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 | |
| |/ | ||||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 7 | -39/+32 | |
| | | ||||||
| * | Merge master. | José Valim | 2010-03-08 | 5 | -7/+16 | |
| |\ | ||||||
| | * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 5 | -7/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Bring AM up to date with new rendering stack. | José Valim | 2010-03-08 | 3 | -0/+15 | |
| | | | ||||||
| * | | Move details to lookup_context and make resolvers use the cache key. | José Valim | 2010-03-08 | 3 | -90/+117 | |
| | | | ||||||
| * | | Speed up performance in resolvers by adding fallbacks just when required. | José Valim | 2010-03-08 | 6 | -55/+45 | |
| | | | ||||||
| * | | Rename Template::Lookup to LookupContext. | José Valim | 2010-03-08 | 7 | -81/+93 | |
| | | | ||||||
| * | | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 4 | -96/+98 | |
| | | | ||||||
| * | | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 2 | -20/+27 | |
| | | | ||||||
| * | | More cleanup on the layouts side. | José Valim | 2010-03-08 | 2 | -17/+6 | |
| | | | ||||||
| * | | Move layout lookup to views. | José Valim | 2010-03-08 | 4 | -7/+25 | |
| | | | ||||||
| * | | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 7 | -65/+82 | |
| | | | | | | | | | | | | lookup. | |||||
| * | | First take on ViewPaths clean up. | José Valim | 2010-03-07 | 2 | -67/+30 | |
| |/ |