Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 21 | -125/+111 | |
| | ||||||
* | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 125 | -930/+1539 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb | |||||
| * | Revert "Whitespace!" | Yehuda Katz + Carl Lerche | 2009-05-11 | 14 | -84/+95 | |
| | | | | | | | | This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716. | |||||
| * | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 6 | -21/+5 | |
| | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. | |||||
| * | ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash. | Douglas F Shearer | 2009-05-11 | 2 | -0/+16 | |
| | | | | | | | | | | | | [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-11 | 17 | -13/+173 | |
| |\ | ||||||
| | * | Added db/seeds.rb as a default file for storing seed data for the database. ↵ | David Heinemeier Hansson | 2009-05-11 | 5 | -2/+31 | |
| | | | | | | | | | | | | Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH] | |||||
| | * | Change spelling of Kyev timezone to Kyiv [#2613 state:resolved] | Alexander Dymo | 2009-05-10 | 2 | -2/+4 | |
| | | | ||||||
| | * | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 4 | -2/+30 | |
| | | | | | | | | | | | | Proc that will reject any record with blank attributes. | |||||
| | * | Fixed eager load error on find with include => [:table_name] and hash ↵ | Anthony Crumley | 2009-05-10 | 2 | -4/+28 | |
| | | | | | | | | | | | | | | | | | | conditions like {:table_name => {:column => 'value'}} Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| | * | ActiveSupport::OrderedHash#to_a method returns an ordered set of arrays. ↵ | Ken Collins | 2009-05-10 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | Matches ruby1.9's Hash#to_a. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2629 state:committed] | |||||
| | * | honour :inverse_of for joins based include | Frederick Cheung | 2009-05-10 | 2 | -2/+36 | |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| | * | honour inverse_of when preloading associations | Frederick Cheung | 2009-05-10 | 2 | -1/+36 | |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | | Check for date/time methods that moved upstream in 1.9 | Jeremy Kemper | 2009-05-07 | 3 | -6/+6 | |
| | | | ||||||
| * | | Defer rake/contrib/sshpublisher require so basic tasks don't need the full ↵ | Jeremy Kemper | 2009-05-07 | 1 | -1/+2 | |
| |/ | | | | | | | rake gem | |||||
| * | Tool for profiling resource usage in each require call. | Jeremy Kemper | 2009-05-07 | 1 | -0/+75 | |
| | | | | | | | | | | | | | | | | | | $ ruby -Iactiveresource/lib tools/profile_requires.rb active_resource 91.84 KB 3220 obj 4.0 ms active_resource 83.86 KB 3108 obj 3.3 ms active_support 69.32 KB 2682 obj 2.6 ms active_support/vendor 33.98 KB 651 obj 0.6 ms i18n 94.40 KB 315 obj 4.0 ms 44 KB RSS | |||||
| * | Whitespace! | Joshua Peek | 2009-05-07 | 14 | -95/+84 | |
| | | ||||||
| * | Prefer "included" language over "setup" | Joshua Peek | 2009-05-07 | 7 | -30/+33 | |
| | | ||||||
| * | Make module dependency DSL opt in | Joshua Peek | 2009-05-07 | 14 | -52/+64 | |
| | | ||||||
| * | Add test coverage to module setup extensions | Joshua Peek | 2009-05-07 | 1 | -0/+74 | |
| | | ||||||
| * | Remove stray call to gems:unpack in gems:build:force | Matt Jones | 2009-05-06 | 1 | -2/+1 | |
| | | | | | | | | | | | | [#2266 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix tests on 1.8.6 | Jeremy Kemper | 2009-05-06 | 2 | -0/+2 | |
| | | ||||||
| * | Fix old reference to ActionController::Failsafe | Jeremy Kemper | 2009-05-06 | 1 | -1/+1 | |
| | | ||||||
| * | Cherry pick Active Support dependencies. Autoload. | Jeremy Kemper | 2009-05-06 | 11 | -81/+100 | |
| | | ||||||
| * | Remove superfluous CGI require | Jeremy Kemper | 2009-05-05 | 1 | -1/+0 | |
| | | ||||||
| * | Prefer sibling Active Support | Jeremy Kemper | 2009-05-05 | 1 | -9/+3 | |
| | | ||||||
| * | Cherry-pick the inflector only | Jeremy Kemper | 2009-05-05 | 1 | -11/+2 | |
| | | ||||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 | |
| | | | | | | | | 7f1f16c01 | |||||
| * | fix problems with requires in metal choking under development reloading ↵ | Tim Connor | 2009-05-04 | 1 | -1/+2 | |
| | | | | | | | | | | | | [#2579 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | Fix console | Joshua Peek | 2009-05-04 | 1 | -2/+3 | |
| | | ||||||
| * | Providing support for :inverse_of as an option to associations. | Murray Steele | 2009-05-04 | 18 | -12/+418 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now add an :inverse_of option to has_one, has_many and belongs_to associations. This is best described with an example: class Man < ActiveRecord::Base has_one :face, :inverse_of => :man end class Face < ActiveRecord::Base belongs_to :man, :inverse_of => :face end m = Man.first f = m.face Without :inverse_of m and f.man would be different instances of the same object (f.man being pulled from the database again). With these new :inverse_of options m and f.man are the same in memory instance. Currently :inverse_of supports has_one and has_many (but not the :through variants) associations. It also supplies inverse support for belongs_to associations where the inverse is a has_one and it's not a polymorphic. Signed-off-by: Murray Steele <muz@h-lame.com> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fixed Hash#from_xml with keys that are all caps. | codebrulee | 2009-05-04 | 2 | -1/+17 | |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-04 | 30 | -592/+422 | |
| |\ | ||||||
| | * | Wrap dispatcher callbacks around the whole middleware chain. Kill ↵ | Joshua Peek | 2009-05-03 | 3 | -38/+22 | |
| | | | | | | | | | | | | unnecessary Reloader middleware. | |||||
| | * | Show lazy middleware args in pretty print | Joshua Peek | 2009-05-03 | 1 | -2/+1 | |
| | | | ||||||
| | * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 28 | -556/+403 | |
| | | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public. | |||||
| * | | Don't use #tap before Active Support is available, since older versions of ↵ | Chris Kampmeier | 2009-05-04 | 1 | -3/+2 | |
| |/ | | | | | | | | | | | | | | | ruby don't have native implementations [#2603 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-02 | 21 | -105/+132 | |
| |\ | ||||||
| | * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 3 | -10/+13 | |
| | | | ||||||
| | * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 7 | -10/+28 | |
| | | | ||||||
| | * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 9 | -58/+66 | |
| | | | | | | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response. | |||||
| | * | Deprecate assert_redirect_to's partial hash matching | Joshua Peek | 2009-05-02 | 8 | -28/+26 | |
| | | | ||||||
| * | | Check for sibling Active Support first | Jeremy Kemper | 2009-05-02 | 1 | -8/+3 | |
| |/ | ||||||
* | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -66/+12 | |
| | | ||||||
* | | Aliased AbstractController::ActionNotFound to ActionController::UnknownAction | Yehuda Katz + Carl Lerche | 2009-05-11 | 4 | -10/+12 | |
| | | ||||||
* | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 7 | -5/+102 | |
| | | ||||||
* | | Don't run the action if callbacks are halted. | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -5/+13 | |
| | | | | | | In AbstractController, this means that response_body is not empty | |||||
* | | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 0 | -0/+0 | |
|\ \ | ||||||
| * | | Makes new callbacks support keys with special characters | Yehuda Katz + Carl Lerche | 2009-04-27 | 2 | -0/+29 | |
| | | |