aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-03-151-8/+8
|\
| * Don't force singularization of singleton resource names, e.g. /preferences [#...Andrew White2010-03-151-8/+8
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-1222-362/+647
|\|
| * Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-103-16/+69
| |\
| | * skip_relative_url_root url_for option is deadJoshua Peek2010-03-092-3/+1
| | * Allow default_url_options to be set on route setJoshua Peek2010-03-092-0/+9
| | * RouteSet#rewrite => url_forJoshua Peek2010-03-092-3/+2
| | * Unused RouteSet#url_for is hogging a good method nameJoshua Peek2010-03-091-13/+4
| | * Move AC::UrlRewriter onto route setJoshua Peek2010-03-092-1/+57
| * | Remove uneeded methods.José Valim2010-03-101-15/+0
| |/
| * Refactor the RouteSet so it uses a Generator object instead of one huge method.wycats2010-03-091-87/+109
| * Reinstate default_url_options and remove url_options= writerJeremy Kemper2010-03-081-47/+19
| * Remove outdated, distracting commented codeJeremy Kemper2010-03-081-25/+0
| * Now that class_attribute creates an instance method, remove it to avoid depre...wycats2010-03-081-1/+2
| * Simplify the action endpoint:Carlhuda2010-03-081-1/+5
| * Add memoizing to AD::RequestCarlhuda2010-03-081-0/+8
| * Require 'active_support/core_ext/hash/except' in the router.Carl Lerche2010-03-081-0/+2
| * Whoops. We meant to switch from returning to tap, not vice versaCarlhuda2010-03-081-1/+1
| * Add support for mount RackApp, :at => "/sprockets" with a shorthand of mount ...Carlhuda2010-03-083-10/+25
| * Make sure nested singular resources get the correct nameJan De Poorter2010-03-071-1/+4
| * Make many parts of Rails lazy. In order to facilitate this,wycats2010-03-074-4/+4
| * Tweak default_url_options deprecation warningJeremy Kemper2010-03-051-2/+2
| * Remove the ability to set the mountpoint when initializing a route set.Carl Lerche2010-03-041-4/+3
| * Tweak out url_for uses :script_name and add some testsCarl Lerche2010-03-042-10/+11
| * Have ActionDispatch::Routing::RouteSet.new ready to receive routes as is.Carl Lerche2010-03-041-0/+1
| * Get rid of relative_url_path in favor of respecting SCRIPT_NAME. Also added a...Carlhuda2010-03-042-2/+9
| * Deprecated ActionController::Base.session_options= and ActionController::Base...Carlhuda2010-03-042-9/+5
| * Move session and session_store onto ActionDispatch and add deprecation warningsCarlhuda2010-03-041-0/+2
| * Add caller to request_uri deprecation noticeCarlhuda2010-03-031-1/+1
| * Move remote_ip to a middleware:Carlhuda2010-03-034-55/+53
| * Add a BlockUntrustedIps middlewareCarl Lerche2010-03-031-0/+25
| * ActionDispatch::Request deprecates #request_uriCarl Lerche2010-03-031-10/+3
| * Rack::Request actually defines #query_stringCarl Lerche2010-03-031-5/+0
| * Tweak the semantic of various URL related methods of ActionDispatch::RequestCarlhuda2010-03-031-25/+6
| * No longer add missing leading / on path args to assert_redirected_to. Depreca...Jeremy Kemper2010-03-021-9/+14
| * Request#subdomain returns a string version of Request#subdomainsJoshua Peek2010-02-281-0/+4
| * Remove implicit controller namespacing from new dslJoshua Peek2010-02-283-23/+27
| * The instance_reader of default_url_options needs to not exist.Yehuda Katz2010-02-271-0/+1
| * Remind us that RoutingAssertions should work in an integration contextYehuda Katz2010-02-261-0/+1
| * Set the body using the accessor for AD::Response introspection mode so it get...Carlhuda2010-02-261-1/+2
| * If IntegrationSession is initialized with an objects that responds to #routes...Carlhuda2010-02-262-8/+21
| * Setting UrlFor in with_routing is no longer needed now that it's not globalCarlhuda2010-02-261-3/+0
| * Remove traces of SharedTestRoutes from user code; leave it as a standin for R...Carlhuda2010-02-261-12/+0
| * Change the API for setting global options for #url_for to self.url_options = ...Carlhuda2010-02-262-12/+24
| * Remove the :use_defaults check in UrlFor#merge optionsCarlhuda2010-02-261-1/+1
| * Rename named_url_helpers to url_helpers and url_helpers to url_forCarlhuda2010-02-262-9/+8
| * Rename metaclass to singleton_classCarlhuda2010-02-251-1/+1
| * Get URL helpers working again in integration tests.Carlhuda2010-02-251-24/+24
| * Final pass at removing the router from a global constantCarlhuda2010-02-254-9/+1
| * Continued effort to deglobalize the routerCarlhuda2010-02-252-42/+12