aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-03-12160-2848/+3245
|\ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb
| * %= works for content_tag and does not require parenthesis on method callJosé Valim2010-03-122-49/+8
| |
| * Make all AP tests pass for Ruby 1.9.1.José Valim2010-03-124-17/+19
| |
| * Fix testJeremy Kemper2010-03-111-1/+1
| |
| * Write strings to fragment cache, not outputbuffersJeremy Kemper2010-03-111-1/+3
| |
| * Delegate #encoding to SafeBuffer tooJeremy Kemper2010-03-111-0/+4
| |
| * simplify alt tag generation for imagesEaden McKee2010-03-112-3/+6
| | | | | | | | | | | | [#2837 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * ActionController::Base.request_forgery_protection_token should actually be ↵Carl Lerche2010-03-111-1/+1
| | | | | | | | the name of the token and not true.
| * Add tests for lookup context.José Valim2010-03-114-34/+203
| |
| * Merge branch 'master' of github.com:rails/railswycats2010-03-1014-114/+110
| |\
| | * Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-1010-109/+96
| | |\
| | * | Optimize and clean up how details key get expired.José Valim2010-03-109-37/+71
| | | |
| | * | Remove uneeded methods.José Valim2010-03-102-33/+4
| | | |
| | * | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-099-159/+143
| | |\ \
| | * | | Clean up the API required from ActionView::Template.José Valim2010-03-095-44/+35
| | | | |
| * | | | Make form helpers work with <%= wycats2010-03-0910-126/+188
| | | | |
| * | | | Deprecate block_called_from_erb? pending a solution for getting it into appsCarlhuda2010-03-099-64/+154
| | |_|/ | |/| |
| * | | skip_relative_url_root url_for option is deadJoshua Peek2010-03-094-7/+5
| | | |
| * | | Allow default_url_options to be set on route setJoshua Peek2010-03-093-0/+13
| | | |
| * | | RouteSet#rewrite => url_forJoshua Peek2010-03-095-7/+6
| | | |
| * | | Unused RouteSet#url_for is hogging a good method nameJoshua Peek2010-03-091-13/+4
| | | |
| * | | Move AC::UrlRewriter onto route setJoshua Peek2010-03-097-90/+76
| | |/ | |/|
| * | Reinstate dom_id in controllers.Justin Ko2010-03-092-0/+9
| | | | | | | | | | | | | | | | | | | | | [#3040 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Refactor the RouteSet so it uses a Generator object instead of one huge method.wycats2010-03-092-88/+109
| | |
| * | Get rid of the instance-level URL rewriterwycats2010-03-095-71/+25
| |/
| * Reinstate default_url_options and remove url_options= writerJeremy Kemper2010-03-083-71/+39
| |
| * Remove outdated, distracting commented codeJeremy Kemper2010-03-081-25/+0
| |
| * Now that class_attribute creates an instance method, remove it to avoid ↵wycats2010-03-081-1/+2
| | | | | | | | deprecation warnings ;)
| * Simplify the action endpoint:Carlhuda2010-03-084-31/+17
| | | | | | | | | | | | | | * 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::RequestCarlhuda2010-03-081-0/+8
| |
| * Require 'active_support/core_ext/hash/except' in the router.Carl Lerche2010-03-081-0/+2
| |
| * Clean LookupContext API.José Valim2010-03-0811-46/+43
| |
| * Move request forgery protection configuration to the AC config objectCarl Lerche2010-03-082-6/+44
| | | | | | | | This is an interim solution pending revisiting the rails framework configuration situation.
| * 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-084-10/+61
| | | | | | | | | | | | | | | | | | | | 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".
| * Merge master.José Valim2010-03-0816-27/+54
| |\
| | * Typo in config.action_dispatchwycats2010-03-071-1/+1
| | |
| | * Make sure nested singular resources get the correct nameJan De Poorter2010-03-072-1/+14
| | | | | | | | | | | | | | | | | | [#3911 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| | * Bump rack-mount requirement to 0.6Joshua Peek2010-03-071-1/+1
| | |
| | * Make many parts of Rails lazy. In order to facilitate this,wycats2010-03-0713-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Bring AM up to date with new rendering stack.José Valim2010-03-083-0/+15
| | |
| * | Move details to lookup_context and make resolvers use the cache key.José Valim2010-03-085-141/+118
| | |
| * | Move ViewPaths module to its own file.José Valim2010-03-083-70/+71
| | |
| * | Speed up performance in resolvers by adding fallbacks just when required.José Valim2010-03-089-69/+53
| | |
| * | Rename Template::Lookup to LookupContext.José Valim2010-03-089-105/+105
| | |
| * | More refactoring on the views side of rendering.José Valim2010-03-088-154/+185
| | |
| * | Finally moved the find template logic to the views.José Valim2010-03-088-192/+152
| | |
| * | More refactoring. Split _normalize_args and _normalize_options concerns.José Valim2010-03-083-12/+27
| | |
| * | More cleanup on the layouts side.José Valim2010-03-085-74/+34
| | |
| * | Move layout lookup to views.José Valim2010-03-0811-57/+39
| | |