Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Keep ActionController::Base.helpers_dir around for a bit longer | Joshua Peek | 2010-01-26 | 1 | -37/+33 |
| | |||||
* | Merge remote branch 'mikel/master' | José Valim | 2010-01-26 | 6 | -30/+95 |
|\ | |||||
| * | Merge branch 'master' of git://github.com/rails/rails | José Valim and Mikel Lindsaar | 2010-01-25 | 11 | -68/+35 |
| |\ | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb | ||||
| * | | Move double render check out of AbstractController. | José Valim and Mikel Lindsaar | 2010-01-23 | 2 | -4/+4 |
| | | | |||||
| * | | Added AbstractController::Collector. | José Valim and Mikel Lindsaar | 2010-01-23 | 4 | -26/+91 |
| | | | |||||
* | | | Ensure root routes inside optional scopes works as expected. | José Valim | 2010-01-26 | 2 | -9/+17 |
| | | | |||||
* | | | Add a deprecation for helpers_dir. | José Valim | 2010-01-25 | 2 | -2/+25 |
| | | | |||||
* | | | As first step setup the load path and lazy compare middlewares. | José Valim | 2010-01-25 | 2 | -1/+19 |
| | | | |||||
* | | | Add active_model/railtie back to generated boot.rb, add models back to ↵ | José Valim | 2010-01-25 | 2 | -5/+5 |
| |/ |/| | | | | | paths, load active_support/railtie since we need it and ensure default logger is set before config. | ||||
* | | Fix failing tests after merge. | José Valim | 2010-01-24 | 5 | -7/+12 |
| | | |||||
* | | Ensure metals and initializers in plugins are loaded. | José Valim | 2010-01-24 | 1 | -3/+0 |
| | | |||||
* | | Rename plugin_name to railtie_name and engine_name. | José Valim | 2010-01-24 | 3 | -3/+3 |
| | | |||||
* | | Ensure helpers work from configured path. | José Valim | 2010-01-24 | 2 | -9/+11 |
| | | |||||
* | | Ensure namespaced controllers in engines work. | José Valim | 2010-01-24 | 1 | -21/+7 |
| | | |||||
* | | Solve some pendencies. | José Valim | 2010-01-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into app | José Valim | 2010-01-23 | 9 | -71/+98 |
|\| | | | | | | | | | Conflicts: railties/lib/rails/application.rb | ||||
| * | Ensure strings given to render with slash are rendered relative to the ↵ | José Valim | 2010-01-22 | 4 | -52/+79 |
| | | | | | | | | configured _prefix. | ||||
| * | 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> | ||||
| * | Make @controller an internal ivar in the view | Joshua Peek | 2010-01-22 | 4 | -19/+17 |
| | | |||||
* | | Extract routes reloading responsibilities from application and load them ↵ | José Valim | 2010-01-23 | 2 | -13/+5 |
| | | | | | | | | just upon a request. | ||||
* | | Get rid of initializers global and create i18n railtie. | José Valim | 2010-01-23 | 1 | -0/+2 |
| | | |||||
* | | Moved more configuration away from bootstrap. | José Valim | 2010-01-22 | 1 | -10/+0 |
| | | |||||
* | | Add view paths to Engine setup. | José Valim | 2010-01-22 | 1 | -2/+1 |
| | | |||||
* | | Massive cleanup in Railties and load stack. | José Valim | 2010-01-21 | 1 | -6/+0 |
|/ | |||||
* | Make filter parameters based on request, so they can be modified for ↵ | José Valim | 2010-01-21 | 6 | -96/+109 |
| | | | | anything in the middleware stack. | ||||
* | Default to sync instrumentation. | José Valim | 2010-01-21 | 8 | -205/+9 |
| | |||||
* | Add shortcut test to abstract/render_test.rb | José Valim | 2010-01-21 | 1 | -0/+9 |
| | |||||
* | Tidy up new filter_parameters implementation. | José Valim | 2010-01-21 | 10 | -120/+147 |
| | |||||
* | Add deprecation warning for calling filter_parameter_logging ↵ | Prem Sichanugrist | 2010-01-21 | 2 | -78/+2 |
| | | | | | | ActionController::Base, and allow it to be configured in config.filter_parameters Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move filter_parameter_logging logic out of the controller and create ↵ | Prem Sichanugrist | 2010-01-21 | 8 | -57/+130 |
| | | | | | | ActionDispatch::ParametersFilter to handle parameter filteration instead. This will make filteration not depending on controller anymore. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add AD::Route#to_s | Sam Ruby | 2010-01-20 | 1 | -0/+6 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Only send filtered_env for notifications | Joshua Peek | 2010-01-20 | 1 | -8/+9 |
| | |||||
* | Request#filter_parameters and filter_env | Joshua Peek | 2010-01-20 | 1 | -2/+24 |
| | |||||
* | Expose last controller in rack env["action_controller.instance"] | Joshua Peek | 2010-01-20 | 2 | -32/+7 |
| | |||||
* | Move ActionController::Translation to AbstractController::Translation. | José Valim | 2010-01-20 | 6 | -4/+4 |
| | |||||
* | Bring normalize behavior to AbstractController::Rendering | José Valim | 2010-01-20 | 5 | -39/+37 |
| | |||||
* | Stop overriding LoadError.new to return a MissingSourceError (and sometimes ↵ | Yehuda Katz | 2010-01-19 | 2 | -2/+2 |
| | | | | nil!) | ||||
* | Revert streaming params parser support. | Joshua Peek | 2010-01-19 | 1 | -3/+3 |
| | | | | | | | | | | AS Xml and Json parsers expect the request body to be a real IO object supporting methods like getc or ungetc which are not specified by the Rack spec and aren't supported by Passenger or the Rewindable input wrapper. We can restore functionality if the AS parsers are rewritten to support Racks subset of supported IO methods. | ||||
* | Cleanup middleware introspection output | Joshua Peek | 2010-01-19 | 1 | -3/+1 |
| | |||||
* | Disable ShowExceptions during integration tests | Joshua Peek | 2010-01-19 | 4 | -14/+16 |
| | |||||
* | Move parameters to the top on logging. | José Valim | 2010-01-19 | 6 | -41/+52 |
| | |||||
* | Fix failing test. | José Valim | 2010-01-19 | 1 | -2/+2 |
| | |||||
* | Do not send rack.input or any other rack information to AD listeners. | José Valim | 2010-01-19 | 3 | -11/+17 |
| | |||||
* | Define named routes for other non-GET REST actions | Joshua Peek | 2010-01-19 | 1 | -4/+32 |
| | |||||
* | Fix DoubleRenderError error message | Pratik Naik | 2010-01-19 | 1 | -1/+1 |
| | |||||
* | Prettier hash dump | Joshua Peek | 2010-01-18 | 1 | -3/+7 |
| | |||||
* | Show Rack env dump on exception page | Joshua Peek | 2010-01-18 | 1 | -1/+4 |
| | |||||
* | Cleanup deprecation notices. | Joshua Peek | 2010-01-18 | 1 | -1/+1 |
| | |||||
* | Missing rename from named_scope to scope [#3735 status:resolved] | Damien Mathieu | 2010-01-18 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Clear out AS callback method pollution in AC::Base.action_methods | Joshua Peek | 2010-01-17 | 2 | -9/+39 |
| |