aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Rake task for generating Rails documentation updated to support Bundl...Jeremy Kemper2010-03-111-33/+41
* ActionController::Base.request_forgery_protection_token should actually be th...Carl Lerche2010-03-111-1/+1
* Rake task for generating Rails documentation updated to support Bundler.Rizwan Reza2010-03-111-41/+33
* Add tests for lookup context.José Valim2010-03-114-34/+203
* Float arel on latest rails/arelJeremy Kemper2010-03-101-1/+1
* Update scaffold to use <%= form_forJeremy Kemper2010-03-101-1/+1
* Use arel 0.3.1, for srsJeremy Kemper2010-03-101-1/+1
* For rails tests, use latest from rails/arel.gitJeremy Kemper2010-03-101-0/+1
* Bump arel dep to 0.3.0+Jeremy Kemper2010-03-101-1/+1
* Arel now fallback to using Arel::Attribute if the table/column doesn't exists.Emilio Tagua2010-03-101-3/+1
* removing spawn from SpawnMethodsAaron Patterson2010-03-104-13/+13
* Merge branch 'master' of github.com:rails/railswycats2010-03-1020-117/+121
|\
| * 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
| * | 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
| |\ \
| * | | 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
* | | | 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
* | | | Rails requires Rubygems 1.3.6wycats2010-03-091-0/+1
| |_|/ |/| |
* | | 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
| |/ |/|
* | 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
|/
* 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