Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | Make sure a namespaced <%= render form %> still renders the _form partial ↵ | Jan De Poorter | 2010-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Final touches and fixes. | Rizwan Reza | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Added title to some other files in actionpack/lib/action_view | Rizwan Reza | 2010-06-16 | 3 | -0/+4 |
| | | |||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -1/+1 |
| | | |||||
* | | render(:inline) in a layout before yield replaces original content | Neeraj Singh | 2010-06-13 | 1 | -1/+1 |
|/ | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Make AP test suite green once again and speed up performance in layouts ↵ | José Valim | 2010-06-07 | 1 | -12/+3 |
| | | | | lookup for some cases. | ||||
* | Formats should always be an array. | Jeremy Kemper | 2010-06-06 | 1 | -1/+1 |
| | |||||
* | Optimize the code added in fa99de0bd054576336c9 | José Valim | 2010-05-15 | 1 | -9/+19 |
| | |||||
* | make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵ | Jeff Kreeftmeijer | 2010-05-15 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | partial counters with :as [#2804 state:resolved] | Jeff Kreeftmeijer | 2010-05-15 | 1 | -0/+1 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Change event namespace ordering to most-significant first [#4504 state:resolved] | Justin George | 2010-05-02 | 2 | -3/+3 |
| | | | | | | | | | More work still needs to be done on some of these names (render_template.action_view and render_template!.action_view particularly) but this allows (for example) /^sql/ to subscribe to all the various ORMs without further modification Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Layout contents are html-safe | Jeremy Kemper | 2010-04-09 | 1 | -1/+1 |
| | |||||
* | <% yield to <%= yield in rdoc of _layout_for, and copy-edits it now that we ↵ | Xavier Noria | 2010-04-05 | 1 | -17/+31 |
| | | | | are on it | ||||
* | Key partial name cache on controller and object class *names* to avoid ↵ | Jeremy Kemper | 2010-04-02 | 1 | -2/+2 |
| | | | | memory leaks in dev mode | ||||
* | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+2 |
| | |||||
* | Ensure details are frozen after @details_keys lookup. The implementation ↵ | José Valim | 2010-03-27 | 1 | -10/+1 |
| | | | | waits to freeze until the last required moment, to avoid duping hashes. | ||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 2 | -12/+27 |
|\ | |||||
| * | Improve performance of the rendering stack by freezing formats as a sign ↵ | José Valim | 2010-03-19 | 2 | -6/+12 |
| | | | | | | | | that they shouldn't be further modified. | ||||
| * | Modify assert_template to use notifications. Also, remove ↵ | Carlhuda | 2010-03-17 | 1 | -2/+1 |
| | | | | | | | | ActionController::Base#template since it is no longer needed. | ||||
| * | Fix rendering of HTML partials inside JS templates [#4197 status:resolved] | José Valim | 2010-03-16 | 1 | -3/+14 |
| | | |||||
| * | Add deprecation notices for <% %>. | Carlhuda | 2010-03-15 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 3 | -41/+15 |
|\| | |||||
| * | Remove formats setters from render template, speeding up partial and ↵ | José Valim | 2010-03-13 | 1 | -2/+1 |
| | | | | | | | | collection renderings. | ||||
| * | Finish cleaning up rendering stack from views and move assigns evaluation to ↵ | José Valim | 2010-03-12 | 2 | -33/+9 |
| | | | | | | | | 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 | 3 | -8/+7 |
| | | | | | | | | find_template instead of find in views. | ||||
* | | 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 | 3 | -107/+121 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 3 | -8/+6 |
| | | |||||
| * | Bring AM up to date with new rendering stack. | José Valim | 2010-03-08 | 1 | -0/+2 |
| | | |||||
| * | Speed up performance in resolvers by adding fallbacks just when required. | José Valim | 2010-03-08 | 2 | -2/+3 |
| | | |||||
| * | Rename Template::Lookup to LookupContext. | José Valim | 2010-03-08 | 3 | -5/+5 |
| | | |||||
| * | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 3 | -95/+97 |
| | | |||||
| * | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 1 | -16/+24 |
| | | |||||
| * | More cleanup on the layouts side. | José Valim | 2010-03-08 | 2 | -17/+6 |
| | | |||||
| * | Move layout lookup to views. | José Valim | 2010-03-08 | 2 | -2/+16 |
| | | |||||
| * | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 2 | -8/+4 |
| | | | | | | | | lookup. | ||||
| * | Solved a problem that prevented render :file => work in layouts | Jose Fernandez | 2010-03-05 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Change AV formats so they can delegate to the controller. Now users (or ↵ | Carlhuda | 2010-03-01 | 1 | -2/+6 |
| | | | | | | | | plugins) can override details_for_render in their controllers and add appropriate additional details. Now if only they could *do* something with those details... | ||||
* | | Updated documentation for block helpers in render/partials.rb | Jeroen van Dijk | 2010-03-12 | 1 | -3/+3 |
|/ | |||||
* | More html_safe strings now use the safe_concat method | Santiago Pastorino and José Ignacio Costa | 2010-02-05 | 1 | -1/+1 |
| | | | | | | [#3856 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe. | ||||
* | Add missing require for Object#try [#3771 state:resolved] | Xavier Noria | 2010-01-22 | 1 | -0/+2 |
| | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | In heterogeneous collections, neither the @path nor the @template are ↵ | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | | | available, so we need to tell that we are simply rendering a collection. | ||||
* | Remove URI object from ActiveResource notification, send the :mailer class ↵ | José Valim | 2010-01-15 | 1 | -4/+1 |
| | | | | in AM (like in AP#process_action) and remove locale instrumentation. | ||||
* | Template rendering should include layout time. | José Valim | 2010-01-15 | 1 | -10/+10 |
| | |||||
* | Provide useful information when instrumenting partials. | José Valim | 2010-01-11 | 1 | -8/+6 |
| | |||||
* | Use underscore in notification namespaces. | José Valim | 2010-01-04 | 2 | -4/+4 |
| | |||||
* | Use namespaces in notifications. | José Valim | 2010-01-03 | 2 | -5/+7 |
| |