aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add autoloads for ActionView::Template* classes, and an ↵Nathan Weizenbaum2009-12-102-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/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
| | | | | | | | |map|
| * 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 ↵Carlhuda2009-12-092-56/+59
| | | | | | | | extending a module
| * 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
| | | | | | | | resource collection name
| * 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
| | | | | | | | extend the mapper
| * 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
| | | | | | | | in the scope
| * 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
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* | Make controller.flash public to be used in responders.José Valim2009-12-071-12/+12
|/ | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* 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. ↵Jeremy Kemper2009-12-061-1/+1
| | | | Calling super gives us NameErrors.
* Remove assert_raises usage that only test-unit 1 supports. Breaks minitest ↵Jeremy Kemper2009-12-061-2/+2
| | | | and test-unit 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 ↵Gabe da Silveira2009-12-033-11/+16
| | | | | | | | existing update_counters method [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add support for Mysql column positioning via #add_column and #change_columnBen Marini2009-12-033-0/+64
| | | | | | | | | | | | | | add_column and change_column in the Mysql adapter now accept some additional options: :first => true # Put the column in front of all the columns :after => column_name # Put the colmn after 'column_name' add_column :new_col, :string, :first => true add_column :another_col, :integer, :default => 0, :after => :new_col [#3286 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Should fix a few Sam Ruby fails.Yehuda Katz2009-12-034-44/+45
|
* Reorganize autoloads:Carlhuda2009-12-0252-793/+989
| | | | | | | | | | | | | | | | | | | | | * A new module (ActiveSupport::Autoload) is provide that extends autoloading with new behavior. * All autoloads in modules that have extended ActiveSupport::Autoload will be eagerly required in threadsafe environments * Autoloads can optionally leave off the path if the path is the same as full_constant_name.underscore * It is possible to specify that a group of autoloads live under an additional path. For instance, all of ActionDispatch's middlewares are ActionDispatch::MiddlewareName, but they live under "action_dispatch/middlewares/middleware_name" * It is possible to specify that a group of autoloads are all found at the same path. For instance, a number of exceptions might all be declared there. * One consequence of this is that testing-related constants are not autoloaded. To get the testing helpers for a given component, require "component_name/test_case". For instance, "action_controller/test_case". * test_help.rb, which is automatically required by a Rails application's test helper, requires the test_case.rb for all active components, so this change will not be disruptive in existing or new applications.
* 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
| | | | | | | | In the current stable, ActiveRecord::Associations::AssociationProxy#method_missing calls yield() if a block is given, causing the block to always be evaluated in its calling context. However, in the case of instance_eval, correct behavior requires that the block be passed directly to the @target, rather than being evaluated inside a different block. Incidentally, this also simplifies the code slightly. [#3412 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Implement ActiveRecord#reset_counter_cacheMike Breen2009-12-023-0/+30
| | | | | | [#1211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* 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 ↵Carlhuda2009-12-021-18/+17
| | | | | | | | Kernel#config. This will fix the bug where reopening classes caused them to be overwritten.
| * Add support for bare ActiveSupport via config.active_support.bareCarlhuda2009-12-024-16/+18
| |
| * Break up rails and railties:Carlhuda2009-12-026-13/+49
| | | | | | | | | | | | | | * rails is now a metagem (gem install rails works as it does now) * railties includes the glue layer, so you can easily declare dependencies on railties, actionpack, and actionmailer and not get ActiveRecord's rake tasks, initializers, etc.
| * Remove global Rails initializersCarlhuda2009-12-027-59/+35
| |
* | Move controller namespace tracking into route set so it getsJoshua Peek2009-12-025-46/+37
|/ | | | reloaded in dev mode
* 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
|