Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 1 | -1/+15 | |
| | | | | | | | | '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 | 2 | -20/+20 | |
|/ | ||||||
* | The controller key shouldnt be part of the mapping if its not used | 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 | 4 | -12/+104 | |
|\ | ||||||
| * | Allow named_routes to be used with root, and with new DSL short-form. | Sam Ruby | 2009-12-23 | 1 | -8/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+5 | |
| |\ | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb | |||||
| | * | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵ | Jeremy Kemper | 2009-12-23 | 1 | -2/+4 | |
| | | | | | | | | | | | | :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 | |
| |/ | ||||||
* / | Extract Mapping class from monster match method | David Heinemeier Hansson | 2009-12-24 | 1 | -90/+137 | |
|/ | ||||||
* | Merge | David Heinemeier Hansson | 2009-12-22 | 27 | -230/+218 | |
|\ | ||||||
| * | 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 | |||||
| * | Referer and user agent are in Rack::Request | Joshua Peek | 2009-12-22 | 1 | -1/+1 | |
| | | ||||||
| * | AD::StatusCodes support is now part of rack | Joshua Peek | 2009-12-22 | 8 | -44/+10 | |
| | | ||||||
| * | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 5 | -32/+40 | |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
* | | Dont encourage __FILE__ bullshit | David Heinemeier Hansson | 2009-12-22 | 1 | -2/+2 | |
|/ | ||||||
* | Dont introspect inline templates for the logger and cleanup a few styling issues | David Heinemeier Hansson | 2009-12-21 | 2 | -18/+13 | |
| | ||||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-21 | 2 | -3/+7 | |
|\ | ||||||
| * | Less annoying RoutingError message | Joshua Peek | 2009-12-21 | 1 | -2/+2 | |
| | | ||||||
| * | 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 | 31 | -173/+160 | |
|\| | ||||||
| * | Its now possible to use match 'stuff' => 'what#stuff' instead of using the ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -3/+7 | |
| | | | | | | | | :to for simple routes | |||||
| * | We don't need AD parse_config | Joshua Peek | 2009-12-20 | 2 | -21/+0 | |
| | | ||||||
| * | AC::Head now doesn't have an unfulfilled Rendering dependency, and instead ↵ | Yehuda Katz | 2009-12-20 | 8 | -14/+24 | |
| | | | | | | | | works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency) | |||||
| * | Just a little tidying | David Heinemeier Hansson | 2009-12-20 | 1 | -24/+22 | |
| | | ||||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2009-12-20 | 12 | -84/+66 | |
| |\ | ||||||
| | * | Rename RackConvenience => RackDelegation | Joshua Peek | 2009-12-20 | 8 | -10/+10 | |
| | | | ||||||
| | * | Merge Session stuff into RackConvenience | Joshua Peek | 2009-12-20 | 7 | -74/+56 | |
| | | | ||||||
| * | | Added ActionDispatch::Request#authorization to access the http ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -0/+9 | |
| | | | | | | | | | | | | authentication header regardless of its proxy hiding [DHH] | |||||
| * | | Rename RenderOptions to Renderers | David Heinemeier Hansson | 2009-12-20 | 3 | -6/+5 | |
| |/ | ||||||
| * | Renamed Redirector to Redirecting (its a module, not a class) | David Heinemeier Hansson | 2009-12-20 | 4 | -4/+4 | |
| | | ||||||
| * | Rename the RenderingController module to just plain Rendering | David Heinemeier Hansson | 2009-12-20 | 10 | -12/+12 | |
| | | ||||||
| * | :to => redirect() can take a String using 1.9-style interpolation or proc ↵ | Yehuda Katz | 2009-12-20 | 1 | -4/+10 | |
| | | | | | | | | that takes the path parameters as a Hash | |||||
| * | Add active_support/ruby/shim to the default requirements for AP components | Yehuda Katz | 2009-12-20 | 4 | -4/+4 | |
| | | ||||||
* | | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵ | David Heinemeier Hansson | 2009-12-20 | 1 | -38/+130 | |
|/ | | | | accessor for common cookie actions [DHH] | |||||
* | Pending tests for AD Response | Joshua Peek | 2009-12-17 | 1 | -13/+12 | |
| | ||||||
* | 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] | |||||
* | Use AbstractController error constants | Joshua Peek | 2009-12-16 | 1 | -3/+2 | |
| | ||||||
* | Fully expand relative rails framework paths and make sure we aren't | Joshua Peek | 2009-12-16 | 4 | -14/+19 | |
| | | | | adding any to the load path more than once. |