Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 1 | -8/+8 |
|\ | |||||
| * | Don't force singularization of singleton resource names, e.g. /preferences ↵ | Andrew White | 2010-03-15 | 1 | -8/+8 |
| | | | | | | | | | | | | [#4089 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 22 | -362/+647 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-10 | 3 | -16/+69 |
| |\ | |||||
| | * | skip_relative_url_root url_for option is dead | Joshua Peek | 2010-03-09 | 2 | -3/+1 |
| | | | |||||
| | * | Allow default_url_options to be set on route set | Joshua Peek | 2010-03-09 | 2 | -0/+9 |
| | | | |||||
| | * | RouteSet#rewrite => url_for | Joshua Peek | 2010-03-09 | 2 | -3/+2 |
| | | | |||||
| | * | Unused RouteSet#url_for is hogging a good method name | Joshua Peek | 2010-03-09 | 1 | -13/+4 |
| | | | |||||
| | * | Move AC::UrlRewriter onto route set | Joshua Peek | 2010-03-09 | 2 | -1/+57 |
| | | | |||||
| * | | Remove uneeded methods. | José Valim | 2010-03-10 | 1 | -15/+0 |
| |/ | |||||
| * | Refactor the RouteSet so it uses a Generator object instead of one huge method. | wycats | 2010-03-09 | 1 | -87/+109 |
| | | |||||
| * | Reinstate default_url_options and remove url_options= writer | Jeremy Kemper | 2010-03-08 | 1 | -47/+19 |
| | | |||||
| * | Remove outdated, distracting commented code | Jeremy Kemper | 2010-03-08 | 1 | -25/+0 |
| | | |||||
| * | Now that class_attribute creates an instance method, remove it to avoid ↵ | wycats | 2010-03-08 | 1 | -1/+2 |
| | | | | | | | | deprecation warnings ;) | ||||
| * | Simplify the action endpoint: | Carlhuda | 2010-03-08 | 1 | -1/+5 |
| | | | | | | | | | | | | | | * Remove ActionEndpoint in favor of passing a block to MiddlewareStack * Always create a Request; the performance win of RackDelegation is around the response; the Request object hit is limited to a single object allocation * #dispatch takes a Request | ||||
| * | Add memoizing to AD::Request | Carlhuda | 2010-03-08 | 1 | -0/+8 |
| | | |||||
| * | Require 'active_support/core_ext/hash/except' in the router. | Carl Lerche | 2010-03-08 | 1 | -0/+2 |
| | | |||||
| * | Whoops. We meant to switch from returning to tap, not vice versa | Carlhuda | 2010-03-08 | 1 | -1/+1 |
| | | |||||
| * | Add support for mount RackApp, :at => "/sprockets" with a shorthand of mount ↵ | Carlhuda | 2010-03-08 | 3 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | Sprockets => "/sprockets". This is different from the match syntax in that it cannot be used for controller/action and it does not assume an anchor at the end of the match. For instance, in the above example, if the client asked for "/sprockets/foo.js", the Sprockets app would have a SCRIPT_NAME of "/sprockets" and PATH_INFO of "/foo.js". | ||||
| * | Make sure nested singular resources get the correct name | Jan De Poorter | 2010-03-07 | 1 | -1/+4 |
| | | | | | | | | | | | | [#3911 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | add lazy_load_hooks.rb, which allows us to declare code that should be run at some later time. For instance, this allows us to defer requiring ActiveRecord::Base at boot time purely to apply configuration. Instead, we register a hook that should apply configuration once ActiveRecord::Base is loaded. With these changes, brings down total boot time of a new app to 300ms in production and 400ms in dev. TODO: rename base_hook | ||||
| * | Tweak default_url_options deprecation warning | Jeremy Kemper | 2010-03-05 | 1 | -2/+2 |
| | | |||||
| * | Remove the ability to set the mountpoint when initializing a route set. | Carl Lerche | 2010-03-04 | 1 | -4/+3 |
| | | |||||
| * | Tweak out url_for uses :script_name and add some tests | Carl Lerche | 2010-03-04 | 2 | -10/+11 |
| | | |||||
| * | Have ActionDispatch::Routing::RouteSet.new ready to receive routes as is. | Carl Lerche | 2010-03-04 | 1 | -0/+1 |
| | | |||||
| * | Get rid of relative_url_path in favor of respecting SCRIPT_NAME. Also added ↵ | Carlhuda | 2010-03-04 | 2 | -2/+9 |
| | | | | | | | | a way to specify a default SCRIPT_NAME when generating URLs out of the context of a request. | ||||
| * | Deprecated ActionController::Base.session_options= and ↵ | Carlhuda | 2010-03-04 | 2 | -9/+5 |
| | | | | | | | | ActionController::Base.session_store= in favor of a config.session_store method (which takes params) and a config.cookie_secret variable, which is used in various secret scenarios. The old AC::Base options will continue to work with deprecation warnings. | ||||
| * | Move session and session_store onto ActionDispatch and add deprecation warnings | Carlhuda | 2010-03-04 | 1 | -0/+2 |
| | | |||||
| * | Add caller to request_uri deprecation notice | Carlhuda | 2010-03-03 | 1 | -1/+1 |
| | | |||||
| * | Move remote_ip to a middleware: | Carlhuda | 2010-03-03 | 4 | -55/+53 |
| | | | | | | | | | | * ActionController::Base.ip_spoofing_check deprecated => config.action_dispatch.ip_spoofing_check * ActionController::Base.trusted_proxies deprecated => config.action_dispatch.trusted_proxies | ||||
| * | Add a BlockUntrustedIps middleware | Carl Lerche | 2010-03-03 | 1 | -0/+25 |
| | | |||||
| * | ActionDispatch::Request deprecates #request_uri | Carl Lerche | 2010-03-03 | 1 | -10/+3 |
| | | | | | | | | * Refactored ActionPatch to use fullpath instead | ||||
| * | Rack::Request actually defines #query_string | Carl Lerche | 2010-03-03 | 1 | -5/+0 |
| | | |||||
| * | Tweak the semantic of various URL related methods of ActionDispatch::Request | Carlhuda | 2010-03-03 | 1 | -25/+6 |
| | | |||||
| * | No longer add missing leading / on path args to assert_redirected_to. ↵ | Jeremy Kemper | 2010-03-02 | 1 | -9/+14 |
| | | | | | | | | Deprecated in 2.3.6. | ||||
| * | Request#subdomain returns a string version of Request#subdomains | Joshua Peek | 2010-02-28 | 1 | -0/+4 |
| | | |||||
| * | Remove implicit controller namespacing from new dsl | Joshua Peek | 2010-02-28 | 3 | -23/+27 |
| | | |||||
| * | The instance_reader of default_url_options needs to not exist. | Yehuda Katz | 2010-02-27 | 1 | -0/+1 |
| | | |||||
| * | Remind us that RoutingAssertions should work in an integration context | Yehuda Katz | 2010-02-26 | 1 | -0/+1 |
| | | |||||
| * | Set the body using the accessor for AD::Response introspection mode so it ↵ | Carlhuda | 2010-02-26 | 1 | -1/+2 |
| | | | | | | | | gets wrapped in a [] | ||||
| * | If IntegrationSession is initialized with an objects that responds to ↵ | Carlhuda | 2010-02-26 | 2 | -8/+21 |
| | | | | | | | | #routes, automatically extend the URL helpers from the RouteSet onto it | ||||
| * | Setting UrlFor in with_routing is no longer needed now that it's not global | Carlhuda | 2010-02-26 | 1 | -3/+0 |
| | | |||||
| * | Remove traces of SharedTestRoutes from user code; leave it as a standin for ↵ | Carlhuda | 2010-02-26 | 1 | -12/+0 |
| | | | | | | | | Rails.application.routes in Rails internal tests | ||||
| * | Change the API for setting global options for #url_for to self.url_options = ↵ | Carlhuda | 2010-02-26 | 2 | -12/+24 |
| | | | | | | | | | | | | { ... } This attr_accessor can be set in a before filter or in the action itself. Overwriting default_url_options still works but will output a deprecation notice. | ||||
| * | Remove the :use_defaults check in UrlFor#merge options | Carlhuda | 2010-02-26 | 1 | -1/+1 |
| | | |||||
| * | Rename named_url_helpers to url_helpers and url_helpers to url_for | Carlhuda | 2010-02-26 | 2 | -9/+8 |
| | | |||||
| * | Rename metaclass to singleton_class | Carlhuda | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | Get URL helpers working again in integration tests. | Carlhuda | 2010-02-25 | 1 | -24/+24 |
| | | |||||
| * | Final pass at removing the router from a global constant | Carlhuda | 2010-02-25 | 4 | -9/+1 |
| | | |||||
| * | Continued effort to deglobalize the router | Carlhuda | 2010-02-25 | 2 | -42/+12 |
| | |