| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Avoid leak into controller's action_methods | printercu | 2013-04-18 | 1 | -0/+1 |
| | | |||||
| * | Provides standard layout lookup behavior for method and proc cases | Chris Nicola | 2013-03-27 | 1 | -5/+9 |
| | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method. | ||||
| * | delegate to :class rather than 'self.class' | Gosha Arinich | 2013-01-06 | 1 | -1/+1 |
| | | |||||
| * | Make conditional_layout? private and update documentation | Andrew White | 2012-12-17 | 1 | -15/+23 |
| | | | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo | ||||
| * | Hash Syntax to 1.9 converison | AvnerCohen | 2012-11-07 | 1 | -3/+3 |
| | | |||||
| * | Add instance_accessor option to class_attribute | Alexey Vakhov | 2012-05-22 | 1 | -2/+1 |
| | | |||||
| * | Add a test case for layout nil. | José Valim | 2012-03-28 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs | Piotr Sarnacki | 2012-03-16 | 1 | -2/+2 |
| |\ | | | | | Fix exceptions messages in AC layouts | ||||
| | * | Fix exceptions messages in AC layouts | Alexey Vakhov | 2012-03-10 | 1 | -2/+2 |
| | | | |||||
| * | | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -4/+11 |
| | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout | ||||
| * | | Merge pull request #5421 from parndt/master | Vijay Dev | 2012-03-14 | 1 | -0/+1 |
| |\ \ | | | | | | | Added missing 'end' to documentation example | ||||
| | * | | Added missing end to example | Philip Arndt | 2012-03-14 | 1 | -0/+1 |
| | |/ | |||||
| * | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-10 | 1 | -2/+1 |
| | | | |||||
| * | | Fix comment about layout folders lookup | Alexey Vakhov | 2012-03-09 | 1 | -2/+2 |
| |/ | |||||
| * | Fix layout lookup for anonymous controller | Alexey Vakhov | 2012-02-28 | 1 | -0/+4 |
| | | |||||
| * | Refactored two methods to use delete with a block | Ruben Fonseca | 2012-02-21 | 1 | -1/+1 |
| | | |||||
| * | Remove deprecated layout lookup. | José Valim | 2011-12-20 | 1 | -48/+24 |
| | | |||||
| * | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 1 | -32/+86 |
| | | |||||
| * | Just use the proc if there is a chance of layout lookup. | José Valim | 2011-12-08 | 1 | -5/+6 |
| | | |||||
| * | Optimize layout lookup to avoid double calls. | José Valim | 2011-12-08 | 1 | -24/+26 |
| | | |||||
| * | Allow layout fallback when using `layout` method | Prem Sichanugrist | 2011-12-06 | 1 | -25/+34 |
| | | | | | | | | | | | | | Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. For example, consider this snippet: class CarsController layout 'single_car', :only => :show end Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions. | ||||
| * | Fixed stale doc in AbstractController::Layouts | Dalibor Nasevic | 2011-11-06 | 1 | -12/+5 |
| | | |||||
| * | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵ | Jon Leighton | 2011-07-18 | 1 | -1/+2 |
| | | | | | warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. | ||||
| * | use present tense on examples | Matt Jankowski | 2011-06-21 | 1 | -5/+5 |
| | | |||||
| * | remove extra space and clarify how an exception is made for controller wide ↵ | Matt Jankowski | 2011-06-21 | 1 | -3/+3 |
| | | | | | layouts | ||||
| * | reorder layout selection examples to occur in the order that the code does, ↵ | Matt Jankowski | 2011-06-21 | 1 | -5/+6 |
| | | | | | and provide more detail on why each selection is made | ||||
| * | More updates to ivars list. | José Valim | 2011-05-06 | 1 | -3/+3 |
| | | |||||
| * | Fixed a comment typo | Eric Hayes | 2011-04-14 | 1 | -1/+1 |
| | | |||||
| * | #948 template_inheritance | artemave | 2010-12-26 | 1 | -2/+2 |
| | | |||||
| * | Rewording existing comment | Neeraj Singh | 2010-11-29 | 1 | -6/+3 |
| | | |||||
| * | no need to call e.class | Aaron Patterson | 2010-09-29 | 1 | -1/+1 |
| | | |||||
| * | Fix a small typo (ht: masterkain) | José Valim | 2010-09-29 | 1 | -1/+1 |
| | | |||||
| * | Avoid (@_var ||= nil) pattern by using initialize methods and ensuring ↵ | José Valim | 2010-09-29 | 1 | -3/+1 |
| | | | | | everyone calls super as expected. | ||||
| * | Define @_layout if it is not defined. | Emilio Tagua | 2010-09-28 | 1 | -0/+1 |
| | | |||||
| * | change rdoc to conform to api guidelines | Joost Baaij | 2010-08-25 | 1 | -10/+12 |
| | | |||||
| * | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 1 | -3/+3 |
| | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | We seem to have removed the URL helpers from ActionView subclasses... | wycats | 2010-03-18 | 1 | -0/+1 |
| | | |||||
| * | Make render :partial, :layout consistent between AC and AV | Carlhuda | 2010-03-18 | 1 | -6/+0 |
| | | |||||
| * | Remove caching's dependency on view_context. Also, make it so that the ↵ | Carlhuda | 2010-03-18 | 1 | -4/+12 |
| | | | | | layout is always rendered the same way (so that layout dependencies on the action actually being rendered aren't masked on the first render) | ||||
| * | Make action_has_layout? non-private | Carlhuda | 2010-03-18 | 1 | -4/+4 |
| | | |||||
| * | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 1 | -0/+4 |
| | | |||||
| * | Finish cleaning up rendering stack from views and move assigns evaluation to ↵ | José Valim | 2010-03-12 | 1 | -0/+6 |
| | | | | | controller (so plugins and/or controllers can overwrite just one method). | ||||
| * | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 1 | -7/+2 |
| | | |||||
| * | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 1 | -3/+4 |
| | | |||||
| * | More refactoring. Split _normalize_args and _normalize_options concerns. | José Valim | 2010-03-08 | 1 | -2/+6 |
| | | |||||
| * | More cleanup on the layouts side. | José Valim | 2010-03-08 | 1 | -53/+28 |
| | | |||||
| * | Move layout lookup to views. | José Valim | 2010-03-08 | 1 | -19/+6 |
| | | |||||
| * | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 1 | -29/+8 |
| | | | | | lookup. | ||||
| * | Fix controller_path returnsing an empty string in Ruby 1.8.7 [#4036 ↵ | José Valim | 2010-02-26 | 1 | -3/+0 |
| | | | | | status:resolved] | ||||
| * | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 1 | -2/+6 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |