| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-04 | 137 | -2493/+2966 |
|\ |
|
| * | fixed missing or incorrect session data error message | Stefan Penner | 2010-01-02 | 1 | -1/+1 |
| * | Silence warnings | Mikel Lindsaar | 2010-01-02 | 1 | -0/+1 |
| * | Do not enforce human_attribute_name as required API. | José Valim | 2010-01-02 | 1 | -3/+6 |
| * | I18n label helper [#745 status:resolved] | Carsten Gehling | 2010-01-02 | 3 | -3/+77 |
| * | Make rendering in ActionView happen through _render_template, as the renderin... | José Valim | 2009-12-31 | 1 | -30/+14 |
| * | Expose a _render_partial hook as thhe _render_template one and make use of it. | José Valim | 2009-12-31 | 2 | -11/+15 |
| * | ActionController::Logger should include AbstractController::Logger and sort a... | José Valim | 2009-12-31 | 3 | -8/+11 |
| * | controller_path is required by ActionView, so move it up to AbstractControlle... | José Valim | 2009-12-31 | 6 | -190/+173 |
| * | Fix new year heisenbug | Jeremy Kemper | 2009-12-31 | 1 | -2/+2 |
| * | Some railties cleanup: | Carl Lerche | 2009-12-31 | 2 | -1/+1 |
| * | 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 |
| * | Partially revert "ActionDispatch should require as little of ActiveSupport as... | Jeremy Kemper | 2009-12-30 | 1 | -0/+2 |
| * | Merge commit 'josevalim/arlog' | Jeremy Kemper | 2009-12-30 | 1 | -0/+39 |
| |\ |
|
| | * | Kick AR logging back to life and move ControllerRuntime inside ActiveRecord::... | José Valim | 2009-12-30 | 1 | -0/+39 |
| * | | 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 |
| * | 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 ActiveRecord... | José Valim | 2009-12-27 | 3 | -30/+15 |
| | * | Remove ActionView inline logging to ActiveSupport::Notifications and create A... | José Valim | 2009-12-26 | 17 | -232/+180 |
| | * | 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 be... | José Valim | 2009-12-26 | 3 | -30/+42 |
| | * | Wrap layout rendering in one method: _render_layout (this should make partial... | José Valim | 2009-12-26 | 2 | -7/+7 |
| * | | Added shorthand for match 'products/overview' that expands to match 'products... | David Heinemeier Hansson | 2009-12-27 | 2 | -7/+31 |
| * | | 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 throu... | Yehuda Katz | 2009-12-24 | 1 | -1/+2 |
| * | 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 |
| | * | Merge remote branch 'origin/master' | Carlhuda | 2009-12-23 | 3 | -5/+9 |
| | |\ |
|
| | | * | Routing: fix that route shorthand shouldn't ignore other options. Raise if :a... | Jeremy Kemper | 2009-12-23 | 2 | -4/+8 |
| | | * | Shift more responsibility from application class to its singleton instance. T... | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | * | | Remove the ActionView::Base autoload because it creates crazy circular autolo... | Carlhuda | 2009-12-23 | 1 | -1/+1 |