Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fix warning in AC flash | Joshua Peek | 2009-12-14 | 1 | -0/+1 | |
| | | ||||||
| * | Fix warnings in AD::Response | Joshua Peek | 2009-12-14 | 1 | -0/+3 | |
| | | ||||||
| * | Fix warnings in railties configuration and initializeable | Joshua Peek | 2009-12-14 | 2 | -11/+15 | |
| | | ||||||
| * | Modify backtrace test to take implementations with slightly different ↵ | Yehuda Katz | 2009-12-13 | 1 | -1/+1 | |
| | | | | | | | | backtrace output into consideration. | |||||
| * | Extract descendents a bit so it can take advantage of Rubinius' __subclasses__. | Yehuda Katz | 2009-12-13 | 2 | -34/+45 | |
| | | ||||||
| * | Forgot to revert tests from that last commit | Joshua Peek | 2009-12-12 | 1 | -8/+0 | |
| | | ||||||
| * | Revert "Fix instance_eval calls to association proxies" | Joshua Peek | 2009-12-12 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | I think it may of broke the build. Lets see. This reverts commit 49e943c4f0ac3459bd53023167aaa08fc8e46733. Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | |||||
| * | rendering controller needs base | Joshua Peek | 2009-12-12 | 1 | -0/+1 | |
| | | ||||||
| * | Don't require AD test_case | Joshua Peek | 2009-12-12 | 2 | -2/+0 | |
| | | ||||||
| * | Nearly all AC modules can be deferred | Joshua Peek | 2009-12-12 | 1 | -40/+44 | |
| | | ||||||
| * | All AbstractController modules are deferrable | Joshua Peek | 2009-12-12 | 1 | -7/+9 | |
| | | ||||||
| * | Relocate AbstractController exceptions into their proper parent modules | Joshua Peek | 2009-12-12 | 4 | -26/+17 | |
| | | ||||||
| * | Allow autoloads to opt out of eager loading | Joshua Peek | 2009-12-12 | 7 | -36/+47 | |
| | | ||||||
| * | TestProcess belongs in AD | Joshua Peek | 2009-12-12 | 10 | -129/+109 | |
| | | ||||||
| * | Fix postgresql AR test failure | John Pignata | 2009-12-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Due to the ordering of the returning result set, the test fails under the postgresql adapter. Order results by id prior to checking the first item [#3542 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-12-11 | 99 | -1592/+1833 | |
|\| | ||||||
| * | "new" and "edit" name routes always need to be prepend to the | Joshua Peek | 2009-12-11 | 2 | -6/+37 | |
| | | | | | | | | named_route [#3561 state:resolved] | |||||
| * | Use rackmounts recognize api and don't piggyback recognize_path on | Joshua Peek | 2009-12-11 | 2 | -21/+30 | |
| | | | | | | | | top of rack call | |||||
| * | Remove fancy method not allowed resource exceptions since they are | Joshua Peek | 2009-12-11 | 4 | -43/+9 | |
| | | | | | | | | too much of a hack | |||||
| * | Kill RouteSet#recognize | Joshua Peek | 2009-12-10 | 3 | -140/+72 | |
| | | ||||||
| * | Cleanup generate_extras build/parse mess | Joshua Peek | 2009-12-10 | 1 | -9/+3 | |
| | | ||||||
| * | Reduce usage of interpret_status. It should also return a integer | Joshua Peek | 2009-12-10 | 3 | -24/+13 | |
| | | | | | | | | not a string. | |||||
| * | Add autoloads for ActionView::Template* classes, and an ↵ | Nathan Weizenbaum | 2009-12-10 | 2 | -1/+7 | |
| | | | | | | | | | | | | ActionView::TemplateError alias for ActionView::Template::Error. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
| * | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-10 | 30 | -501/+520 | |
| |\ | ||||||
| | * | Check block arity passed to routes draw so you don't need to use | Joshua Peek | 2009-12-09 | 2 | -2/+9 | |
| | | | | | | | | | | | | |map| | |||||
| | * | Fixed old routing mapper example in generated routes.rb | Joshua Peek | 2009-12-09 | 2 | -2/+2 | |
| | | | ||||||
| | * | Scaffolding generates new routing dsl examples | Joshua Peek | 2009-12-09 | 8 | -30/+47 | |
| | | | ||||||
| | * | Simpler RenderOption API -- removes the need for registering the types and ↵ | Carlhuda | 2009-12-09 | 2 | -56/+59 | |
| | | | | | | | | | | | | extending a module | |||||
| | * | More test porting | Joshua Peek | 2009-12-08 | 3 | -10/+9 | |
| | | | ||||||
| | * | Tack format onto resource routes | Joshua Peek | 2009-12-08 | 2 | -25/+37 | |
| | | | ||||||
| | * | Use new routing dsl in tests | Joshua Peek | 2009-12-08 | 15 | -67/+56 | |
| | | | ||||||
| | * | Fix ambiguous access_token scoping example | Joshua Peek | 2009-12-08 | 1 | -5/+5 | |
| | | | ||||||
| | * | Remove double scoping blocks and just use one | Joshua Peek | 2009-12-08 | 1 | -28/+24 | |
| | | | ||||||
| | * | Seperate scope level for nesting resources | Joshua Peek | 2009-12-08 | 1 | -8/+16 | |
| | | | ||||||
| | * | Don't use name prefix by itself unless as is an empty string | Joshua Peek | 2009-12-08 | 1 | -1/+1 | |
| | | | ||||||
| | * | Routes added under resource collection should be prefixed with | Joshua Peek | 2009-12-08 | 2 | -14/+5 | |
| | | | | | | | | | | | | resource collection name | |||||
| | * | Fixed named prefix scope in resource member and collection actions | Joshua Peek | 2009-12-07 | 2 | -42/+40 | |
| | | | ||||||
| | * | Ignore name_prefix unless there is an explicit name | Joshua Peek | 2009-12-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Move base mapper methods into Base module so plugins can easily | Joshua Peek | 2009-12-07 | 1 | -245/+247 | |
| | | | | | | | | | | | | extend the mapper | |||||
| | * | Move name_prefix merging into Scoping concern | Joshua Peek | 2009-12-07 | 1 | -3/+7 | |
| | | | ||||||
| | * | Cleanup resource scoping by passing down the parent resource object | Joshua Peek | 2009-12-07 | 1 | -11/+20 | |
| | | | | | | | | | | | | in the scope | |||||
| | * | named_prefix doesn't join with "_" | Joshua Peek | 2009-12-07 | 2 | -5/+5 | |
| | | | ||||||
| | * | Allow name_prefix to be pass into scope | Joshua Peek | 2009-12-07 | 2 | -48/+24 | |
| | | | ||||||
| | * | Allow scope to take :path and :controller options | Joshua Peek | 2009-12-07 | 2 | -14/+22 | |
| | | | ||||||
| | * | Pass symbol in as route name when match is used with a symbol | Joshua Peek | 2009-12-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Responder redirects to resource if destroy fails. | José Valim | 2009-12-07 | 2 | -10/+41 | |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
| * | | Make controller.flash public to be used in responders. | José Valim | 2009-12-07 | 1 | -12/+12 | |
| |/ | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | |||||
| * | Deprecate recalling generation params when the defaults are nil | Joshua Peek | 2009-12-06 | 1 | -3/+1 | |
| | | ||||||
| * | Ruby 1.9.2: explicitly raise NoMethodError for explicit coercion attempts | Jeremy Kemper | 2009-12-06 | 1 | -0/+4 | |
| | | ||||||
| * | Ruby 1.9.2: explicitly raise NoMethodError for explicit coercion attempts. ↵ | Jeremy Kemper | 2009-12-06 | 1 | -1/+1 | |
| | | | | | | | | Calling super gives us NameErrors. |