Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 160 | -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 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 |
| | | |||||
| * | Fix test | Jeremy Kemper | 2010-03-11 | 1 | -1/+1 |
| | | |||||
| * | Write strings to fragment cache, not outputbuffers | Jeremy Kemper | 2010-03-11 | 1 | -1/+3 |
| | | |||||
| * | 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> | ||||
| * | 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. | ||||
| * | Add tests for lookup context. | José Valim | 2010-03-11 | 4 | -34/+203 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | wycats | 2010-03-10 | 14 | -114/+110 |
| |\ | |||||
| | * | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-10 | 10 | -109/+96 |
| | |\ | |||||
| | * | | Optimize and clean up how details key get expired. | José Valim | 2010-03-10 | 9 | -37/+71 |
| | | | | |||||
| | * | | Remove uneeded methods. | José Valim | 2010-03-10 | 2 | -33/+4 |
| | | | | |||||
| | * | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-03-09 | 9 | -159/+143 |
| | |\ \ | |||||
| | * | | | Clean up the API required from ActionView::Template. | José Valim | 2010-03-09 | 5 | -44/+35 |
| | | | | | |||||
| * | | | | 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 |
| | |_|/ | |/| | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
| * | | 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 |
| | | |||||
| * | Require 'active_support/core_ext/hash/except' in the router. | Carl Lerche | 2010-03-08 | 1 | -0/+2 |
| | | |||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 11 | -46/+43 |
| | | |||||
| * | Move request forgery protection configuration to the AC config object | Carl Lerche | 2010-03-08 | 2 | -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 versa | Carlhuda | 2010-03-08 | 1 | -1/+1 |
| | | |||||
| * | Add support for mount RackApp, :at => "/sprockets" with a shorthand of mount ↵ | Carlhuda | 2010-03-08 | 4 | -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é Valim | 2010-03-08 | 16 | -27/+54 |
| |\ | |||||
| | * | Typo in config.action_dispatch | wycats | 2010-03-07 | 1 | -1/+1 |
| | | | |||||
| | * | Make sure nested singular resources get the correct name | Jan De Poorter | 2010-03-07 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | [#3911 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Bump rack-mount requirement to 0.6 | Joshua Peek | 2010-03-07 | 1 | -1/+1 |
| | | | |||||
| | * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 13 | -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é Valim | 2010-03-08 | 3 | -0/+15 |
| | | | |||||
| * | | Move details to lookup_context and make resolvers use the cache key. | José Valim | 2010-03-08 | 5 | -141/+118 |
| | | | |||||
| * | | Move ViewPaths module to its own file. | José Valim | 2010-03-08 | 3 | -70/+71 |
| | | | |||||
| * | | Speed up performance in resolvers by adding fallbacks just when required. | José Valim | 2010-03-08 | 9 | -69/+53 |
| | | | |||||
| * | | Rename Template::Lookup to LookupContext. | José Valim | 2010-03-08 | 9 | -105/+105 |
| | | | |||||
| * | | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 8 | -154/+185 |
| | | | |||||
| * | | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 8 | -192/+152 |
| | | | |||||
| * | | More refactoring. Split _normalize_args and _normalize_options concerns. | José Valim | 2010-03-08 | 3 | -12/+27 |
| | | | |||||
| * | | More cleanup on the layouts side. | José Valim | 2010-03-08 | 5 | -74/+34 |
| | | | |||||
| * | | Move layout lookup to views. | José Valim | 2010-03-08 | 11 | -57/+39 |
| | | |