Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 361 | -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é Valim | 2010-03-12 | 2 | -11/+6 |
| | | | | | | | | status:resolved] | ||||
| * | %= works for content_tag and does not require parenthesis on method call | José Valim | 2010-03-12 | 2 | -49/+8 |
| | | |||||
| * | Make all AP tests pass for Ruby 1.9.1. | José Valim | 2010-03-12 | 4 | -17/+19 |
| | | |||||
| * | Be sure to pass through args to to_yaml | Jeremy Kemper | 2010-03-11 | 2 | -3/+3 |
| | | |||||
| * | Fix test | Jeremy Kemper | 2010-03-11 | 1 | -1/+1 |
| | | |||||
| * | Write strings to fragment cache, not outputbuffers | Jeremy Kemper | 2010-03-11 | 2 | -2/+8 |
| | | |||||
| * | OutputBuffer#to_yaml should return string yaml, not some custom class dump | Jeremy Kemper | 2010-03-11 | 2 | -0/+8 |
| | | |||||
| * | Delegate #encoding to SafeBuffer too | Jeremy Kemper | 2010-03-11 | 1 | -0/+4 |
| | | |||||
| * | simplify alt tag generation for images | Eaden McKee | 2010-03-11 | 2 | -3/+6 |
| | | | | | | | | | | | | [#2837 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Revert "Rake task for generating Rails documentation updated to support ↵ | Jeremy Kemper | 2010-03-11 | 1 | -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 Lerche | 2010-03-11 | 1 | -1/+1 |
| | | | | | | | | the name of the token and not true. | ||||
| * | Rake task for generating Rails documentation updated to support Bundler. | Rizwan Reza | 2010-03-11 | 1 | -41/+33 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add tests for lookup context. | José Valim | 2010-03-11 | 4 | -34/+203 |
| | | |||||
| * | Float arel on latest rails/arel | Jeremy Kemper | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | Update scaffold to use <%= form_for | Jeremy Kemper | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | Use arel 0.3.1, for srs | Jeremy Kemper | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | For rails tests, use latest from rails/arel.git | Jeremy Kemper | 2010-03-10 | 1 | -0/+1 |
| | | |||||
| * | Bump arel dep to 0.3.0+ | Jeremy Kemper | 2010-03-10 | 1 | -1/+1 |
| | | |||||
| * | Arel now fallback to using Arel::Attribute if the table/column doesn't exists. | Emilio Tagua | 2010-03-10 | 1 | -3/+1 |
| | | | | | | | | | | | | [#4142 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | removing spawn from SpawnMethods | Aaron Patterson | 2010-03-10 | 4 | -13/+13 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Merge branch 'master' of github.com:rails/rails | wycats | 2010-03-10 | 20 | -117/+121 |
| |\ | |||||
| | * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-10 | 11 | -110/+99 |
| | |\ | |||||
| | | * | Fix scope loading issue when the table doesn't exist | Pratik Naik | 2010-03-10 | 1 | -1/+3 |
| | | | | |||||
| | * | | Optimize and clean up how details key get expired. | José Valim | 2010-03-10 | 10 | -38/+72 |
| | | | | |||||
| | * | | Remove uneeded methods. | José Valim | 2010-03-10 | 2 | -33/+4 |
| | | | | |||||
| | * | | Require AP::VERSION in order to install gems. | José Valim | 2010-03-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-09 | 10 | -160/+144 |
| | |\ \ | |||||
| | * | | | Added alert to layouts on scaffold. | José Valim | 2010-03-09 | 2 | -0/+5 |
| | | | | | |||||
| | * | | | Clean up the API required from ActionView::Template. | José Valim | 2010-03-09 | 6 | -45/+36 |
| | | | | | |||||
| * | | | | Make form helpers work with <%= | wycats | 2010-03-09 | 10 | -126/+188 |
| | | | | | |||||
| * | | | | Deprecate block_called_from_erb? pending a solution for getting it into apps | Carlhuda | 2010-03-09 | 9 | -64/+154 |
| | | | | | |||||
| * | | | | Rails requires Rubygems 1.3.6 | wycats | 2010-03-09 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
| * | | | skip_relative_url_root url_for option is dead | Joshua Peek | 2010-03-09 | 4 | -7/+5 |
| | | | | |||||
| * | | | Allow default_url_options to be set on route set | Joshua Peek | 2010-03-09 | 3 | -0/+13 |
| | | | | |||||
| * | | | RouteSet#rewrite => url_for | Joshua Peek | 2010-03-09 | 5 | -7/+6 |
| | | | | |||||
| * | | | 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 | 7 | -90/+76 |
| | |/ | |/| | |||||
| * | | Disprefer JSONGem decoder since it only decodes JSON objects | Jeremy Kemper | 2010-03-09 | 1 | -1/+1 |
| | | | |||||
| * | | Reinstate dom_id in controllers. | Justin Ko | 2010-03-09 | 2 | -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. | wycats | 2010-03-09 | 2 | -88/+109 |
| | | | |||||
| * | | Get rid of the instance-level URL rewriter | wycats | 2010-03-09 | 5 | -71/+25 |
| |/ | |||||
| * | Reinstate default_url_options and remove url_options= writer | Jeremy Kemper | 2010-03-08 | 3 | -71/+39 |
| | | |||||
| * | 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 | 4 | -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::Request | Carlhuda | 2010-03-08 | 1 | -0/+8 |
| | | |||||
| * | class_attribute gets instance methods which delegate to but may override ↵ | Jeremy Kemper | 2010-03-08 | 2 | -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 Silva | 2010-03-09 | 7 | -40/+39 |
| | | | | | | | | | | | | option Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Require 'active_support/core_ext/hash/except' in the router. | Carl Lerche | 2010-03-08 | 1 | -0/+2 |
| | |