Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -18/+102 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | ||||
| * | update abstract_controller callbacks to document meta-programmed filters | geemus | 2011-08-13 | 1 | -18/+102 |
| | | |||||
| * | Remove unused use_sprockets config | Santiago Pastorino | 2011-08-13 | 1 | -1/+1 |
| | | |||||
* | | adding missing require to fist railties tests | Aaron Patterson | 2011-08-09 | 1 | -0/+2 |
| | | |||||
* | | deprecating process_view_paths | Aaron Patterson | 2011-08-09 | 1 | -1/+1 |
| | | |||||
* | | avoid object creation via useless duping and freezing | Aaron Patterson | 2011-08-09 | 1 | -3/+2 |
| | | |||||
* | | Array#+ automatically dups, no double duping | Aaron Patterson | 2011-08-09 | 1 | -2/+2 |
| | | |||||
* | | Remove unused use_sprockets config | Santiago Pastorino | 2011-07-25 | 1 | -1/+1 |
|/ | |||||
* | 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 | ||||
* | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -0/+6 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | minor edits after going through what's new in docrails | Xavier Noria | 2011-05-14 | 1 | -4/+4 |
| | | |||||
| * | added docs for AbC::UrlFor and AC::UrlFor. | Nick Sutterer | 2011-05-12 | 1 | -0/+6 |
| | | |||||
* | | better styling on #available_action? docs | Sebastian Martinez | 2011-05-06 | 1 | -2/+2 |
| | | |||||
* | | Revert to old semantics, use available_action? instead of action_method?. | José Valim | 2011-05-06 | 2 | -15/+27 |
| | | |||||
* | | More updates to ivars list. | José Valim | 2011-05-06 | 2 | -4/+4 |
| | | |||||
* | | Move variables to underscore format, update protected instance variables list. | José Valim | 2011-05-06 | 2 | -7/+23 |
|/ | |||||
* | More AV::Base cleanup. | José Valim | 2011-05-04 | 1 | -15/+3 |
| | |||||
* | Move prefixes to view paths as they are now a lookup context dependency. | José Valim | 2011-05-04 | 3 | -23/+24 |
| | |||||
* | Also allow prefixes as third argument to lookup context. | José Valim | 2011-05-04 | 1 | -3/+1 |
| | |||||
* | no @controller dependency in Renderers. | Nick Sutterer | 2011-05-04 | 1 | -1/+1 |
| | |||||
* | controller's prefixes are now added to LookupContext. | Nick Sutterer | 2011-05-03 | 1 | -2/+5 |
| | |||||
* | Add a shared entry point for AV and AC render which can be used as extension ↵ | José Valim | 2011-05-03 | 1 | -5/+1 |
| | | | | in the future. | ||||
* | Introduce view renderer. | José Valim | 2011-05-01 | 1 | -2/+11 |
| | |||||
* | Make ActionController::Base.modules_for_helpers and ↵ | Piotr Sarnacki | 2011-04-25 | 1 | -11/+11 |
| | | | | ActionController::Base.all_helpers_from_path public methods | ||||
* | Do not inherit from Rack::Response, remove a shit-ton of unused code. | José Valim | 2011-04-19 | 1 | -7/+1 |
| | |||||
* | Slightly reorganize rendering stack. | José Valim | 2011-04-18 | 1 | -6/+25 |
| | |||||
* | render :once, YAGNI. | José Valim | 2011-04-15 | 1 | -1/+1 |
| | |||||
* | Fixed a comment typo | Eric Hayes | 2011-04-14 | 1 | -1/+1 |
| | |||||
* | Fix missing requires in Action Mailer | Prem Sichanugrist | 2011-04-13 | 1 | -0/+1 |
| | | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Merge branch 'master' into sprockets | Joshua Peek | 2011-04-12 | 2 | -1/+3 |
|\ | |||||
| * | Added missing </tt> | Oge Nnadi | 2011-04-11 | 1 | -1/+1 |
| | | |||||
| * | Implicit actions named not_implemented can be rendered | Santiago Pastorino | 2011-04-02 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 2 | -16/+19 |
|\| | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | ||||
| * | Make action_method? public and change implicit rendering to override it instead. | José Valim | 2011-03-30 | 1 | -15/+18 |
| | | |||||
| * | Pass the proper method_name instead of hardcoding to action_name. | José Valim | 2011-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb | ||||
* | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Fix filter :only and :except with implicit actions | Andrew White | 2011-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved] | ||||
* | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 1 | -2/+2 |
|/ | |||||
* | Change ActionView::ViewPathSet to ActionView::PathSet | Manuel Meurer | 2011-03-13 | 1 | -4/+4 |
| | |||||
* | render_to_string must ensure that response_body | Neeraj Singh | 2011-01-25 | 1 | -1/+1 |
| | | | | | | | | is nil [ #5875 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵ | José Valim | 2011-01-19 | 1 | -4/+5 |
| | | | | state:resolved] | ||||
* | process_action accepts multiple args, even with Callbacks. | Nick Sutterer | 2010-12-29 | 1 | -1/+1 |
| | |||||
* | Speed up template inheritance and remove template inheritance option | wycats | 2010-12-26 | 1 | -16/+17 |
| | |||||
* | #948 make template inheritance optional | artemave | 2010-12-26 | 1 | -4/+12 |
| | |||||
* | #948 template_inheritance | artemave | 2010-12-26 | 2 | -6/+14 |
| | |||||
* | Rewording existing comment | Neeraj Singh | 2010-11-30 | 1 | -4/+3 |
| |