aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:rails/railsYehuda Katz2009-12-1030-501/+520
|\
| * Check block arity passed to routes draw so you don't need to useJoshua Peek2009-12-092-2/+9
| * Fixed old routing mapper example in generated routes.rbJoshua Peek2009-12-092-2/+2
| * Scaffolding generates new routing dsl examplesJoshua Peek2009-12-098-30/+47
| * Simpler RenderOption API -- removes the need for registering the types and ex...Carlhuda2009-12-092-56/+59
| * More test portingJoshua Peek2009-12-083-10/+9
| * Tack format onto resource routesJoshua Peek2009-12-082-25/+37
| * Use new routing dsl in testsJoshua Peek2009-12-0815-67/+56
| * Fix ambiguous access_token scoping exampleJoshua Peek2009-12-081-5/+5
| * Remove double scoping blocks and just use oneJoshua Peek2009-12-081-28/+24
| * Seperate scope level for nesting resourcesJoshua Peek2009-12-081-8/+16
| * Don't use name prefix by itself unless as is an empty stringJoshua Peek2009-12-081-1/+1
| * Routes added under resource collection should be prefixed withJoshua Peek2009-12-082-14/+5
| * Fixed named prefix scope in resource member and collection actionsJoshua Peek2009-12-072-42/+40
| * Ignore name_prefix unless there is an explicit nameJoshua Peek2009-12-071-1/+1
| * Move base mapper methods into Base module so plugins can easilyJoshua Peek2009-12-071-245/+247
| * Move name_prefix merging into Scoping concernJoshua Peek2009-12-071-3/+7
| * Cleanup resource scoping by passing down the parent resource objectJoshua Peek2009-12-071-11/+20
| * named_prefix doesn't join with "_"Joshua Peek2009-12-072-5/+5
| * Allow name_prefix to be pass into scopeJoshua Peek2009-12-072-48/+24
| * Allow scope to take :path and :controller optionsJoshua Peek2009-12-072-14/+22
| * Pass symbol in as route name when match is used with a symbolJoshua Peek2009-12-071-1/+1
* | Responder redirects to resource if destroy fails.José Valim2009-12-072-10/+41
* | Make controller.flash public to be used in responders.José Valim2009-12-071-12/+12
|/
* Deprecate recalling generation params when the defaults are nilJoshua Peek2009-12-061-3/+1
* Ruby 1.9.2: explicitly raise NoMethodError for explicit coercion attemptsJeremy Kemper2009-12-061-0/+4
* Ruby 1.9.2: explicitly raise NoMethodError for explicit coercion attempts. Ca...Jeremy Kemper2009-12-061-1/+1
* Remove assert_raises usage that only test-unit 1 supports. Breaks minitest an...Jeremy Kemper2009-12-061-2/+2
* Update rackmount to fix some pending testsJoshua Peek2009-12-052-14/+10
* Replace reset_counter_cache with reset_counters that has API inline with exis...Gabe da Silveira2009-12-033-11/+16
* Add support for Mysql column positioning via #add_column and #change_columnBen Marini2009-12-033-0/+64
* Should fix a few Sam Ruby fails.Yehuda Katz2009-12-034-44/+45
* Reorganize autoloads:Carlhuda2009-12-0252-793/+989
* Use to_query in route query string generationJoshua Peek2009-12-021-24/+1
* Quick fix for not escaping []s (not ideal)Joshua Peek2009-12-021-1/+1
* Failing tests for to_param/to_query not escaping "[]"Joshua Peek2009-12-023-6/+6
* Fix instance_eval calls to association proxiesMat Brown2009-12-022-6/+10
* Implement ActiveRecord#reset_counter_cacheMike Breen2009-12-023-0/+30
* Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-0216-116/+123
|\
| * Ignore all pkg filesCarlhuda2009-12-021-7/+1
| * Fix an ivar name conflict in Rails::ServerCarlhuda2009-12-021-5/+5
| * Stop evalling the environment file in favor of require + setting a Kernel#con...Carlhuda2009-12-021-18/+17
| * Add support for bare ActiveSupport via config.active_support.bareCarlhuda2009-12-024-16/+18
| * Break up rails and railties:Carlhuda2009-12-026-13/+49
| * Remove global Rails initializersCarlhuda2009-12-027-59/+35
* | Move controller namespace tracking into route set so it getsJoshua Peek2009-12-025-46/+37
|/
* Stop escaping "[]" in query stringJoshua Peek2009-12-022-6/+4
* Rackmount 0.3.0Joshua Peek2009-12-021-1/+1
* Fork rack build nested query to support to_paramJoshua Peek2009-12-021-2/+43
* Ensure Cache-Control max-age is an integerJeremy Kemper2009-12-022-2/+2