aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Added shorthand for match 'products/overview' that expands to match ↵David Heinemeier Hansson2009-12-272-7/+31
| | | | 'products/overview', :to => 'products#overview', :as => 'products_overview'
* AD::Cascade that supports X-CascadeJoshua Peek2009-12-262-0/+30
|
* rack-mount 0.4Joshua Peek2009-12-263-21/+21
|
* Expect Rack 1.1Joshua Peek2009-12-261-1/+1
|
* The controller key shouldnt be part of the mapping if its not usedDavid Heinemeier Hansson2009-12-251-2/+2
|
* Fix testsDavid Heinemeier Hansson2009-12-251-2/+2
|
* Instead of marking raw text in templates as safe, and then putting them ↵Yehuda Katz2009-12-241-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 codeYehuda Katz2009-12-241-15/+0
|
* Translated strings in the view are assumed html_safe (Closes #3401)David Heinemeier Hansson2009-12-241-1/+1
|
* Stray carrier returnDavid Heinemeier Hansson2009-12-241-1/+0
|
* MergeDavid Heinemeier Hansson2009-12-246-15/+116
|\
| * Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-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'Carlhuda2009-12-233-5/+9
| |\ | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb
| | * Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵Jeremy Kemper2009-12-232-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 Kemper2009-12-231-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 ↵Carlhuda2009-12-231-1/+1
| | | | | | | | | | | | autoload insanity
| * | Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-232-10/+75
| | |
| * | Moving out some framework specific initializers into the framework libraries.Carlhuda2009-12-231-0/+27
| |/
| * Fix bare string Rack response bodiesJeremy Kemper2009-12-231-2/+2
| |
* | Extract Mapping class from monster match methodDavid Heinemeier Hansson2009-12-242-91/+149
|/
* Require rack-mount 0.3.3Joshua Peek2009-12-221-1/+1
| | | | Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved]
* MergeDavid Heinemeier Hansson2009-12-2229-233/+221
|\
| * Flip deferrable autoload conventionJoshua Peek2009-12-227-139/+142
| |
| * All AD modules are "deferrable"Joshua Peek2009-12-2210-23/+35
| |
| * Use Rack::Runtime middleware so the reported time includes the entire ↵Joshua Peek2009-12-221-1/+0
| | | | | | | | middleware stack
| * Referer and user agent are in Rack::RequestJoshua Peek2009-12-221-1/+1
| |
| * AD::StatusCodes support is now part of rackJoshua Peek2009-12-229-46/+12
| |
| * Float on rack/master in preparation for rack 1.1 gem releaseJoshua Peek2009-12-221-1/+1
| |
| * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-225-32/+40
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* | Dont encourage __FILE__ bullshitDavid Heinemeier Hansson2009-12-221-2/+2
|/
* Add test for rootDavid Heinemeier Hansson2009-12-211-0/+9
|
* Dont introspect inline templates for the logger and cleanup a few styling issuesDavid Heinemeier Hansson2009-12-212-18/+13
|
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-213-15/+19
|\
| * Less annoying RoutingError messageJoshua Peek2009-12-211-2/+2
| |
| * reset_session needs to be a real method so flash can override itJoshua Peek2009-12-212-13/+17
| |
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2138-181/+201
|\|
| * Its now possible to use match 'stuff' => 'what#stuff' instead of using the ↵David Heinemeier Hansson2009-12-202-6/+20
| | | | | | | | :to for simple routes
| * We don't need AD parse_configJoshua Peek2009-12-202-21/+0
| |
| * AC::Head now doesn't have an unfulfilled Rendering dependency, and instead ↵Yehuda Katz2009-12-208-14/+24
| | | | | | | | works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency)
| * Just a little tidyingDavid Heinemeier Hansson2009-12-201-24/+22
| |
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2009-12-2012-84/+66
| |\
| | * Rename RackConvenience => RackDelegationJoshua Peek2009-12-208-10/+10
| | |
| | * Merge Session stuff into RackConvenienceJoshua Peek2009-12-207-74/+56
| | |
| * | Added ActionDispatch::Request#authorization to access the http ↵David Heinemeier Hansson2009-12-202-0/+11
| | | | | | | | | | | | authentication header regardless of its proxy hiding [DHH]
| * | Rename RenderOptions to RenderersDavid Heinemeier Hansson2009-12-203-6/+5
| |/
| * Renamed Redirector to Redirecting (its a module, not a class)David Heinemeier Hansson2009-12-204-4/+4
| |
| * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-2015-17/+17
| |
| * :to => redirect() can take a String using 1.9-style interpolation or proc ↵Yehuda Katz2009-12-202-4/+31
| | | | | | | | that takes the path parameters as a Hash
| * Add active_support/ruby/shim to the default requirements for AP componentsYehuda Katz2009-12-204-4/+4
| |
* | Added cookies.permanent, cookies.signed, and cookies.permanent.signed ↵David Heinemeier Hansson2009-12-202-38/+165
|/ | | | accessor for common cookie actions [DHH]