aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-03-12361-4154/+5293
|\ | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb
| * Always load the environment before executing any command. [#3905 ↵José Valim2010-03-122-11/+6
| | | | | | | | status:resolved]
| * %= 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
| |
| * Be sure to pass through args to to_yamlJeremy Kemper2010-03-112-3/+3
| |
| * Fix testJeremy Kemper2010-03-111-1/+1
| |
| * Write strings to fragment cache, not outputbuffersJeremy Kemper2010-03-112-2/+8
| |
| * OutputBuffer#to_yaml should return string yaml, not some custom class dumpJeremy Kemper2010-03-112-0/+8
| |
| * 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>
| * Revert "Rake task for generating Rails documentation updated to support ↵Jeremy Kemper2010-03-111-33/+41
| | | | | | | | | | | | | | | | Bundler." Incredibly slow. Fix gem_path to not load the bundle fresh each call. This reverts commit 58796dcfc0d74fa3def752fa8b779f725f0747f0.
| * ActionController::Base.request_forgery_protection_token should actually be ↵Carl Lerche2010-03-111-1/+1
| | | | | | | | the name of the token and not true.
| * Rake task for generating Rails documentation updated to support Bundler.Rizwan Reza2010-03-111-41/+33
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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
| | | | | | | | | | | | [#4142 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * removing spawn from SpawnMethodsAaron Patterson2010-03-104-13/+13
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * 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
| | | | | | | | | | | | | | | | | | | | | [#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
| |
| * class_attribute gets instance methods which delegate to but may override ↵Jeremy Kemper2010-03-082-12/+48
| | | | | | | | their class values as you'd expect. Disable instance writer methods with :instance_writer => false.
| * Fix associations to call :destroy or :delete based on the right :dependent ↵Carlos Antonio da Silva2010-03-097-40/+39
| | | | | | | | | | | | option Signed-off-by: José Valim <jose.valim@gmail.com>
| * Require 'active_support/core_ext/hash/except' in the router.Carl Lerche2010-03-081-0/+2
| |