Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 29 | -533/+637 |
|\ | | | | | | | | | | | | | 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 | 1 | -47/+6 |
| | | |||||
| * | Make all AP tests pass for Ruby 1.9.1. | José Valim | 2010-03-12 | 1 | -8/+11 |
| | | |||||
| * | Delegate #encoding to SafeBuffer too | Jeremy Kemper | 2010-03-11 | 1 | -0/+4 |
| | | |||||
| * | simplify alt tag generation for images | Eaden McKee | 2010-03-11 | 1 | -2/+2 |
| | | | | | | | | | | | | [#2837 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Add tests for lookup context. | José Valim | 2010-03-11 | 1 | -33/+33 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | wycats | 2010-03-10 | 5 | -69/+64 |
| |\ | |||||
| | * | Optimize and clean up how details key get expired. | José Valim | 2010-03-10 | 3 | -29/+35 |
| | | | |||||
| | * | Clean up the API required from ActionView::Template. | José Valim | 2010-03-09 | 3 | -40/+29 |
| | | | |||||
| * | | Make form helpers work with <%= | wycats | 2010-03-09 | 5 | -14/+56 |
| | | | |||||
| * | | Deprecate block_called_from_erb? pending a solution for getting it into apps | Carlhuda | 2010-03-09 | 6 | -43/+87 |
| |/ | |||||
| * | Clean LookupContext API. | José Valim | 2010-03-08 | 7 | -39/+32 |
| | | |||||
| * | Merge master. | José Valim | 2010-03-08 | 5 | -7/+16 |
| |\ | |||||
| | * | Make many parts of Rails lazy. In order to facilitate this, | wycats | 2010-03-07 | 5 | -7/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -90/+117 |
| | | | |||||
| * | | Speed up performance in resolvers by adding fallbacks just when required. | José Valim | 2010-03-08 | 6 | -55/+45 |
| | | | |||||
| * | | Rename Template::Lookup to LookupContext. | José Valim | 2010-03-08 | 7 | -81/+93 |
| | | | |||||
| * | | More refactoring on the views side of rendering. | José Valim | 2010-03-08 | 4 | -96/+98 |
| | | | |||||
| * | | Finally moved the find template logic to the views. | José Valim | 2010-03-08 | 2 | -20/+27 |
| | | | |||||
| * | | More cleanup on the layouts side. | José Valim | 2010-03-08 | 2 | -17/+6 |
| | | | |||||
| * | | Move layout lookup to views. | José Valim | 2010-03-08 | 4 | -7/+25 |
| | | | |||||
| * | | Added template lookup responsible to hold all information used in template ↵ | José Valim | 2010-03-07 | 7 | -65/+82 |
| | | | | | | | | | | | | lookup. | ||||
| * | | First take on ViewPaths clean up. | José Valim | 2010-03-07 | 2 | -67/+30 |
| |/ | |||||
| * | Adds disable option to date_helpers generated hidden fields when ↵ | Santiago Pastorino | 2010-03-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | html_options specifies it. ht by Marc Schütz [#3807 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Solved a problem that prevented render :file => work in layouts | Jose Fernandez | 2010-03-05 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Remove some of the blank rescues from number helper. This makes the code ↵ | Xavier Shay | 2010-03-05 | 1 | -44/+42 |
| | | | | | | | | | | | | easier to understand, as you're not left wondering what the rescue is actually doing. This does not change documented/tested behaviour. Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Actually, revert previous commit. Having a lot of information is better than ↵ | José Valim | 2010-03-05 | 1 | -9/+3 |
| | | | | | | | | having no information at all. | ||||
| * | Define to_s method in ActionView::Resolver, so I'm not required to write it ↵ | José Valim | 2010-03-05 | 1 | -1/+5 |
| | | | | | | | | in inherited classes. | ||||
| * | Fix a bunch of failing AP / AM specs created from the previous ↵ | Carl Lerche | 2010-03-04 | 1 | -1/+1 |
| | | | | | | | | AbstractController configuration refactor. | ||||
| * | Tweak how ActionPack handles InheritableOptions | Carl Lerche | 2010-03-03 | 1 | -1/+1 |
| | | |||||
| * | Start refactoring the method of configuring ActionView | Carlhuda | 2010-03-03 | 3 | -17/+6 |
| | | |||||
| * | ActionDispatch::Request deprecates #request_uri | Carl Lerche | 2010-03-03 | 1 | -1/+1 |
| | | | | | | | | * Refactored ActionPatch to use fullpath instead | ||||
| * | Tweak the semantic of various URL related methods of ActionDispatch::Request | Carlhuda | 2010-03-03 | 2 | -2/+5 |
| | | |||||
| * | Work on deprecating ActionController::Base.relative_url_root | Carlhuda | 2010-03-03 | 1 | -2/+2 |
| | | |||||
| * | Fix failing Action Pack tests | Carlhuda | 2010-03-02 | 1 | -1/+1 |
| | | |||||
| * | Revert orphaned SharedTestRoutes | Jeremy Kemper | 2010-03-01 | 1 | -2/+1 |
| | | |||||
| * | Change AV formats so they can delegate to the controller. Now users (or ↵ | Carlhuda | 2010-03-01 | 2 | -17/+23 |
| | | | | | | | | plugins) can override details_for_render in their controllers and add appropriate additional details. Now if only they could *do* something with those details... | ||||
| * | Delegate formats to the controller | Carlhuda | 2010-03-01 | 2 | -2/+27 |
| | | |||||
| * | Final pass at removing the router from a global constant | Carlhuda | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | WIP: Remove the global router | Carlhuda | 2010-02-25 | 1 | -1/+2 |
| | | |||||
| * | Bump i18n for new public I18n.normalize_keys | Jeremy Kemper | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | add time_separator for minutes only if minutes aren't hidden | Santiago Pastorino | 2010-02-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Renamed LocalizedCache to DetailsCache. | José Valim | 2010-02-24 | 1 | -1/+1 |
| | | |||||
| * | Fix render :file => "#{Rails.root}/public/404.html", :status => :not_found. ↵ | Yehuda Katz | 2010-02-23 | 1 | -1/+1 |
| | | | | | | | | Closes #8994 | ||||
| * | Rename erubis_implementation to erb_implementation. | José Valim | 2010-02-22 | 1 | -3/+3 |
| | | |||||
| * | Include missing modules. | José Valim | 2010-02-22 | 1 | -2/+2 |
| | | |||||
| * | Use ActionDispatch::Routing everywhere | Martin Schürrer | 2010-02-21 | 3 | -3/+3 |
| | | |||||
| * | Require persisted? in ActiveModel::Lint and remove new_record? and ↵ | José Valim | 2010-02-21 | 3 | -12/+11 |
| | | | | | | | | destroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not. | ||||
| * | Remove empty line and trailing hash, breaks documentation generation | Dirkjan Bussink | 2010-02-19 | 1 | -2/+0 |
| | | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local> |