Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix new year heisenbug | Jeremy Kemper | 2009-12-31 | 1 | -2/+2 |
| | |||||
* | Some railties cleanup: | Carl Lerche | 2009-12-31 | 2 | -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 | 2 | -1/+3 |
| | |||||
* | Add a /rails.rb for each framework for consistency | Carl Lerche | 2009-12-31 | 2 | -0/+3 |
| | |||||
* | Fix controller runtime test | Jeremy Kemper | 2009-12-30 | 1 | -2/+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 | ||||
* | Partially revert "ActionDispatch should require as little of ActiveSupport ↵ | Jeremy Kemper | 2009-12-30 | 1 | -0/+2 |
| | | | | | | as possible" Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70. | ||||
* | Merge commit 'josevalim/arlog' | Jeremy Kemper | 2009-12-30 | 1 | -0/+39 |
|\ | |||||
| * | Kick AR logging back to life and move ControllerRuntime inside ↵ | José Valim | 2009-12-30 | 1 | -0/+39 |
| | | | | | | | | ActiveRecord::Rails. | ||||
* | | ActionDispatch should require as little of ActiveSupport as possible | Carl Lerche | 2009-12-30 | 1 | -3/+1 |
|/ | |||||
* | 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. | ||||
* | Make sure evalled method knows where it came from | Yehuda Katz | 2009-12-29 | 1 | -2/+2 |
| | |||||
* | Complain if there's no such middleware | Jeremy Kemper | 2009-12-28 | 1 | -2/+3 |
| | |||||
* | Require active_support/dependencies/autoload in action_dispatch | Carl Lerche | 2009-12-28 | 1 | -0/+1 |
| | |||||
* | Silence some trivial warnings: shadowed local vars, indentation mismatches | Jeremy Kemper | 2009-12-28 | 9 | -202/+197 |
| | |||||
* | Ruby 1.9: string is not enumerable, so #exclude? is not available | Jeremy Kemper | 2009-12-27 | 1 | -5/+3 |
| | |||||
* | Typo | Jeremy Kemper | 2009-12-27 | 1 | -1/+1 |
| | |||||
* | Require the enumberable extension from active support because we use #exclude? | David Heinemeier Hansson | 2009-12-27 | 1 | -0/+2 |
| | |||||
* | Merge remote branch 'jose/perf' | Yehuda Katz | 2009-12-27 | 18 | -281/+232 |
|\ | |||||
| * | 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 | 17 | -232/+180 |
| | | | | | | | | 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. | ||||
| * | More <%= render(@posts) %> optimization. | José Valim | 2009-12-26 | 1 | -24/+20 |
| | | |||||
| * | Optimize <%= render(@posts) %>. | José Valim | 2009-12-26 | 1 | -4/+14 |
| | | |||||
| * | Break instrumentation into several end-points so rendering of partials can ↵ | José Valim | 2009-12-26 | 3 | -30/+42 |
| | | | | | | | | be optimized. | ||||
| * | Wrap layout rendering in one method: _render_layout (this should make ↵ | José Valim | 2009-12-26 | 2 | -7/+7 |
| | | | | | | | | partial instrumentation easier). | ||||
* | | Added shorthand for match 'products/overview' that expands to match ↵ | David Heinemeier Hansson | 2009-12-27 | 2 | -7/+31 |
| | | | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview' | ||||
* | | AD::Cascade that supports X-Cascade | Joshua Peek | 2009-12-26 | 2 | -0/+30 |
| | | |||||
* | | rack-mount 0.4 | Joshua Peek | 2009-12-26 | 3 | -21/+21 |
| | | |||||
* | | Expect Rack 1.1 | Joshua Peek | 2009-12-26 | 1 | -1/+1 |
|/ | |||||
* | The controller key shouldnt be part of the mapping if its not used | David Heinemeier Hansson | 2009-12-25 | 1 | -2/+2 |
| | |||||
* | Fix tests | David Heinemeier Hansson | 2009-12-25 | 1 | -2/+2 |
| | |||||
* | Instead of marking raw text in templates as safe, and then putting them ↵ | Yehuda Katz | 2009-12-24 | 1 | -1/+2 |
| | | | | through String#<< which checks if the String is safe, use safe_concat, which uses the original (internal) String#<< and leaves the safe flag as is. Results in a significant performance improvement. | ||||
* | Dead code | Yehuda Katz | 2009-12-24 | 1 | -15/+0 |
| | |||||
* | Translated strings in the view are assumed html_safe (Closes #3401) | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| | |||||
* | Stray carrier return | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+0 |
| | |||||
* | Merge | David Heinemeier Hansson | 2009-12-24 | 6 | -15/+116 |
|\ | |||||
| * | Allow named_routes to be used with root, and with new DSL short-form. | Sam Ruby | 2009-12-23 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Merge remote branch 'origin/master' | Carlhuda | 2009-12-23 | 3 | -5/+9 |
| |\ | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb | ||||
| | * | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵ | Jeremy Kemper | 2009-12-23 | 2 | -4/+8 |
| | | | | | | | | | | | | :as option is given to root method since its name is always 'root' | ||||
| | * | Shift more responsibility from application class to its singleton instance. ↵ | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. | ||||
| * | | Remove the ActionView::Base autoload because it creates crazy circular ↵ | Carlhuda | 2009-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | autoload insanity | ||||
| * | | 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 |
| |/ | |||||
| * | Fix bare string Rack response bodies | Jeremy Kemper | 2009-12-23 | 1 | -2/+2 |
| | | |||||
* | | Extract Mapping class from monster match method | David Heinemeier Hansson | 2009-12-24 | 2 | -91/+149 |
|/ | |||||
* | Require rack-mount 0.3.3 | Joshua Peek | 2009-12-22 | 1 | -1/+1 |
| | | | | Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved] | ||||
* | Merge | David Heinemeier Hansson | 2009-12-22 | 29 | -233/+221 |
|\ | |||||
| * | Flip deferrable autoload convention | Joshua Peek | 2009-12-22 | 7 | -139/+142 |
| | | |||||
| * | All AD modules are "deferrable" | Joshua Peek | 2009-12-22 | 10 | -23/+35 |
| | | |||||
| * | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 1 | -1/+0 |
| | | | | | | | | middleware stack |