aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-1011-110/+99
|\
| * Fix scope loading issue when the table doesn't existPratik Naik2010-03-101-1/+3
| * 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
* | Optimize and clean up how details key get expired.José Valim2010-03-1010-38/+72
* | Remove uneeded methods.José Valim2010-03-102-33/+4
* | Require AP::VERSION in order to install gems.José Valim2010-03-101-0/+1
* | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-03-0910-160/+144
|\|
| * Disprefer JSONGem decoder since it only decodes JSON objectsJeremy Kemper2010-03-091-1/+1
| * Reinstate dom_id in controllers.Justin Ko2010-03-092-0/+9
| * 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
* | Added alert to layouts on scaffold.José Valim2010-03-092-0/+5
* | Clean up the API required from ActionView::Template.José Valim2010-03-096-45/+36
|/
* 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 depre...wycats2010-03-081-1/+2
* Simplify the action endpoint:Carlhuda2010-03-084-31/+17
* Add memoizing to AD::RequestCarlhuda2010-03-081-0/+8
* class_attribute gets instance methods which delegate to but may override thei...Jeremy Kemper2010-03-082-12/+48
* Fix associations to call :destroy or :delete based on the right :dependent op...Carlos Antonio da Silva2010-03-097-40/+39
* 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
* 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
* Merge master.José Valim2010-03-0842-361/+374
|\
| * Move middlewares to the Application level. If you want to modify the middlewa...Carlhuda2010-03-082-4/+4
| * Aliasing class_eval makes JRuby ornery.wycats2010-03-071-1/+4
| * Typo in config.action_dispatchwycats2010-03-071-1/+1
| * Make sure nested singular resources get the correct nameJan De Poorter2010-03-072-1/+14
| * Update generated Gemfile to use http://rubygems.org, unicorn instead of mongr...Jeremy Kemper2010-03-071-4/+4
| * If RAILS_PATH isn't set, make a dummy doc taskJeremy Kemper2010-03-071-32/+40
| * rake doc:rails complains loudly if there's no path to generate docs fromJeremy Kemper2010-03-071-1/+3
| * 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-0734-312/+299
* | Bring AM up to date with new rendering stack.José Valim2010-03-085-8/+21
* | 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-0812-58/+39
* | Added template lookup responsible to hold all information used in template lo...José Valim2010-03-0718-239/+118