| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-21 | 36 | -763/+374 |
|\ |
|
| * | Use NewCallbacks on ActionDispatch::Callbacks. | José Valim | 2009-09-20 | 3 | -25/+41 |
| * | Add Orchestra instrumentation to fragment and page caching. | José Valim | 2009-09-20 | 6 | -66/+57 |
| * | Instrument process_action, render and sql. | José Valim | 2009-09-20 | 2 | -6/+11 |
| * | 1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved] | Yehuda Katz | 2009-09-18 | 1 | -2/+2 |
| * | Forward all methods to delayed log | Joshua Peek | 2009-09-16 | 1 | -6/+8 |
| * | Remove unused code in ActionView. | José Valim | 2009-09-15 | 4 | -133/+0 |
| * | Beef up AD::Rescue to replace global exception handling lost in ApplicationCo... | Joshua Peek | 2009-09-15 | 1 | -4/+16 |
| * | Remove global exception catching from ApplicationController. | Joshua Peek | 2009-09-15 | 2 | -48/+7 |
| * | Require active_support after autoload setup | Jeremy Kemper | 2009-09-14 | 2 | -9/+9 |
| * | Uses extlib_inheritable_accessor | Jeremy Kemper | 2009-09-14 | 1 | -0/+2 |
| * | Rollback AS bundler work and improve activation of vendored dependencies | Joshua Peek | 2009-09-13 | 1 | -1/+1 |
| * | AV::UrlHelper depends on Array#second | Joshua Peek | 2009-09-13 | 1 | -0/+1 |
| * | Omit PATH_INFO in integration test so rack mock will properly override it | Joshua Peek | 2009-09-13 | 1 | -1/+0 |
| * | Lazy require memcache for session middleware | Joshua Peek | 2009-09-13 | 1 | -40/+35 |
| * | Don't force test suite to use bundler | Joshua Peek | 2009-09-13 | 1 | -0/+1 |
| * | Merge commit 'alloy/master-nested_attributes_and_autosave' | Michael Koziarski | 2009-09-13 | 1 | -7/+19 |
| |\ |
|
| | * | Allow fields_for on a nested_attributes association to accept an explicit col... | Andrew France | 2009-09-12 | 1 | -7/+19 |
| * | | Memoize in the endpoint. | Yehuda Katz | 2009-09-12 | 1 | -5/+10 |
| * | | Add per-controller middleware | Yehuda Katz | 2009-09-12 | 1 | -1/+14 |
| |/ |
|
| * | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 1 | -1/+0 |
| * | Fix filtering parameters when there are Fixnum or other un-dupable values. | Nathaniel Talbott | 2009-09-10 | 1 | -1/+1 |
| * | Fix callbacks on ActionPack. | José Valim | 2009-09-08 | 1 | -1/+1 |
| * | Cleanup hacky routing with controller_path in url helper tests. This doesn't ... | Joshua Peek | 2009-09-06 | 1 | -1/+1 |
| * | Clean tag attributes before passing through the escape_once logic. | Michael Koziarski | 2009-09-04 | 1 | -1/+1 |
| * | CookieStore should not be derived from Hash - reverting [#2268 state:resolved] | Jay Pignata | 2009-09-03 | 1 | -1/+1 |
| * | Replace :formats => ["*/*"] with the default formats set | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+2 |
| * | Refactor ActionController to use find_template and template_exists? | Yehuda Katz + Carl Lerche | 2009-09-03 | 4 | -8/+12 |
| * | Don't raise exceptions for missing javascript_include_tag or stylesheet_link_... | Sam Pohlenz | 2009-09-03 | 1 | -2/+6 |
| * | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 3 | -78/+97 |
| * | Extract finding the template in AC to it's own method | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -3/+5 |
| * | If session_options[:id] is requested when using CookieStore, unmarshal the se... | Jay Pignata | 2009-09-03 | 1 | -3/+14 |
| * | Fix the */* with Net::HTTP bug [#3100 state:resolved] | Yehuda Katz + Carl Lerche | 2009-09-01 | 1 | -22/+9 |
| * | rack-test 0.4.2 has rack 1.1.pre goodies, we'll use it instead | Joshua Peek | 2009-08-31 | 3 | -306/+9 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-08-31 | 102 | -6471/+1016 |
|\| |
|
| * | Back off rack 1.1-pre and bundle in the new testing goodies | Joshua Peek | 2009-08-31 | 55 | -5422/+300 |
| * | action_dispatch and action_view are just more autoloads, so its okay to requi... | Joshua Peek | 2009-08-31 | 1 | -3/+2 |
| * | Switch over to rack-test gem | Joshua Peek | 2009-08-31 | 8 | -642/+3 |
| * | SessionHash#update and SessionHash#delete are missing a call to load! [#3056 ... | Joshua Peek | 2009-08-31 | 1 | -0/+2 |
| * | Ensure that blocks are also handled inside the responder. | José Valim | 2009-08-29 | 2 | -23/+36 |
| * | Attempt to render the template inside the responder, so it can be used for ca... | José Valim | 2009-08-29 | 2 | -26/+37 |
| * | Reset session in integration tests after changing routes to reload the middle... | Joshua Peek | 2009-08-27 | 1 | -1/+3 |
| * | Remove some old cruft | Yehuda Katz | 2009-08-27 | 1 | -3/+0 |
| * | Require necessary active_support files in cookie store | Carl Lerche | 2009-08-26 | 1 | -0/+2 |
| * | Fixed stupid mistake... nothing to see here. | Carl Lerche | 2009-08-26 | 1 | -1/+1 |
| * | Add a default parameter for Resolver#initialize | Carl Lerche | 2009-08-26 | 1 | -1/+1 |
| * | Set the request and response in ActionController::Middleware | Carl Lerche | 2009-08-26 | 1 | -0/+4 |
| * | Have AbstractController::Logger#process_action return super's value | Carl Lerche | 2009-08-26 | 1 | -1/+3 |
| * | UrlRewriter#rewrite_url should call #to_param on the value given in :anchor o... | Jeffrey Hardy | 2009-08-26 | 1 | -1/+1 |
| * | I18n: use I18n for select helpers' prompt text | Akira Matsuda | 2009-08-26 | 2 | -1/+6 |