Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Remove duplicated url_for code and move methods shared between ActionMailer ↵ | José Valim | 2010-01-07 | 4 | -210/+59 | |
| | | | | and ActionController up to AbstractController. | |||||
* | Remove CGI.escape in function of Rack::Mount.escape | José Valim | 2010-01-06 | 1 | -3/+3 | |
| | ||||||
* | Controller tests should always require view tests since they add behavior ↵ | Jeremy Kemper | 2010-01-04 | 1 | -0/+1 | |
| | | | | controllers expect | |||||
* | Default middleware stack needs to be available at configuration time | Joshua Peek | 2010-01-04 | 1 | -20/+0 | |
| | ||||||
* | Autoload AS test case | Joshua Peek | 2010-01-04 | 1 | -1/+0 | |
| | ||||||
* | Autoload AC and AV test case classes | Joshua Peek | 2010-01-04 | 1 | -1/+0 | |
| | ||||||
* | Merge | David Heinemeier Hansson | 2010-01-03 | 4 | -13/+20 | |
|\ | ||||||
| * | Use underscore in notification namespaces. | José Valim | 2010-01-04 | 4 | -6/+6 | |
| | | ||||||
| * | Use namespaces in notifications. | José Valim | 2010-01-03 | 4 | -13/+20 | |
| | | ||||||
* | | Added that ActionController::Base now does helper :all instead of relying on ↵ | David Heinemeier Hansson | 2010-01-03 | 1 | -0/+2 | |
|/ | | | | the default ApplicationController in Rails to do it [DHH] | |||||
* | Expose a _render_partial hook as thhe _render_template one and make use of it. | José Valim | 2009-12-31 | 1 | -6/+6 | |
| | ||||||
* | ActionController::Logger should include AbstractController::Logger and sort ↵ | José Valim | 2009-12-31 | 2 | -1/+4 | |
| | | | | autoloads for easier readability. | |||||
* | controller_path is required by ActionView, so move it up to ↵ | José Valim | 2009-12-31 | 3 | -187/+1 | |
| | | | | AbstractController and refactor AbstractController::Layouts. | |||||
* | Some railties cleanup: | Carl Lerche | 2009-12-31 | 1 | -1/+1 | |
| | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin | |||||
* | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb | Carl Lerche | 2009-12-31 | 1 | -0/+1 | |
| | ||||||
* | Add a /rails.rb for each framework for consistency | Carl Lerche | 2009-12-31 | 1 | -0/+2 | |
| | ||||||
* | Revert "Add config.action_controller.include behavior to plugins." | Jeremy Kemper | 2009-12-30 | 1 | -2/+1 | |
| | | | | | | | | This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb | |||||
* | Use extlib_inheritable_accessor in request_forgery_protection.rb. | Carl Lerche | 2009-12-29 | 1 | -1/+1 | |
| | | | For some reason the current class_inheritable_accessor does not play nice with included hooks. class_inheritable_accessor will be revised shortly. | |||||
* | Silence some trivial warnings: shadowed local vars, indentation mismatches | Jeremy Kemper | 2009-12-28 | 3 | -182/+181 | |
| | ||||||
* | Remove ActiveRecord runtime logging from ActionPack and place in ↵ | José Valim | 2009-12-27 | 3 | -30/+15 | |
| | | | | ActiveRecord, adding it through config.action_controller.include hook. | |||||
* | Remove ActionView inline logging to ActiveSupport::Notifications and create ↵ | José Valim | 2009-12-26 | 8 | -111/+107 | |
| | | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened. | |||||
* | Finish moving config.frameworks-dependent code to the framework plugin | Carlhuda | 2009-12-23 | 2 | -10/+75 | |
| | ||||||
* | Moving out some framework specific initializers into the framework libraries. | Carlhuda | 2009-12-23 | 1 | -0/+27 | |
| | ||||||
* | Flip deferrable autoload convention | Joshua Peek | 2009-12-22 | 2 | -17/+21 | |
| | ||||||
* | All AD modules are "deferrable" | Joshua Peek | 2009-12-22 | 1 | -0/+3 | |
| | ||||||
* | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 1 | -1/+0 | |
| | | | | middleware stack | |||||
* | AD::StatusCodes support is now part of rack | Joshua Peek | 2009-12-22 | 3 | -6/+6 | |
| | ||||||
* | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 2 | -0/+35 | |
| | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+5 | |
|\ | ||||||
| * | reset_session needs to be a real method so flash can override it | Joshua Peek | 2009-12-21 | 1 | -1/+5 | |
| | | ||||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 17 | -105/+89 | |
|\| | ||||||
| * | AC::Head now doesn't have an unfulfilled Rendering dependency, and instead ↵ | Yehuda Katz | 2009-12-20 | 4 | -12/+14 | |
| | | | | | | | | works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency) | |||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-20 | 11 | -82/+65 | |
| |\ | ||||||
| | * | Rename RackConvenience => RackDelegation | Joshua Peek | 2009-12-20 | 7 | -9/+9 | |
| | | | ||||||
| | * | Merge Session stuff into RackConvenience | Joshua Peek | 2009-12-20 | 6 | -73/+56 | |
| | | | ||||||
| * | | Rename RenderOptions to Renderers | David Heinemeier Hansson | 2009-12-20 | 2 | -5/+4 | |
| |/ | ||||||
| * | Renamed Redirector to Redirecting (its a module, not a class) | David Heinemeier Hansson | 2009-12-20 | 3 | -3/+3 | |
| | | ||||||
| * | Rename the RenderingController module to just plain Rendering | David Heinemeier Hansson | 2009-12-20 | 5 | -6/+6 | |
| | | ||||||
* | | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -38/+130 | |
|/ | | | | accessor for common cookie actions [DHH] | |||||
* | Added alert/notice from 2-3-stable and refactored redirect_to into just ↵ | David Heinemeier Hansson | 2009-12-17 | 3 | -71/+122 | |
| | | | | living in Redirector [DHH] | |||||
* | Move route reloading into railties | Joshua Peek | 2009-12-14 | 1 | -5/+0 | |
| | ||||||
* | Fix warning in AC flash | Joshua Peek | 2009-12-14 | 1 | -0/+1 | |
| | ||||||
* | Allow autoloads to opt out of eager loading | Joshua Peek | 2009-12-12 | 2 | -3/+0 | |
| | ||||||
* | TestProcess belongs in AD | Joshua Peek | 2009-12-12 | 2 | -113/+1 | |
| | ||||||
* | Remove fancy method not allowed resource exceptions since they are | Joshua Peek | 2009-12-11 | 1 | -10/+1 | |
| | | | | too much of a hack | |||||
* | Reduce usage of interpret_status. It should also return a integer | Joshua Peek | 2009-12-10 | 1 | -4/+12 | |
| | | | | not a string. | |||||
* | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-10 | 1 | -56/+45 | |
|\ | ||||||
| * | Simpler RenderOption API -- removes the need for registering the types and ↵ | Carlhuda | 2009-12-09 | 1 | -56/+45 | |
| | | | | | | | | extending a module | |||||
* | | Responder redirects to resource if destroy fails. | José Valim | 2009-12-07 | 1 | -2/+7 | |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
* | | Make controller.flash public to be used in responders. | José Valim | 2009-12-07 | 1 | -12/+12 | |
|/ | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> |