7e10504bdeab14ea70a942110a1b1ef6d8467ed3 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/5a45446cff0daf4ca747257a8779dcd5d9cae1d7 5a45446cff0daf4ca747257a8779dcd5d9cae1d7

2009-05-15T17:49:11-07:00

Ported Rescuable to new base 23a7ff81593e1d1060f01f340852fd8477c825c4 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com eb021707f53be46140b55a48e5ef03ed0577a45c Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/7e10504bdeab14ea70a942110a1b1ef6d8467ed3 7e10504bdeab14ea70a942110a1b1ef6d8467ed3

2009-05-15T15:57:12-07:00

Refactored AbstractController to provide better hook points for overriding aspects of action dispatching ee0794eff8073fc91ca5bc38cbba87b92b65a8af Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com b6bac73b282c7e500c43810f2a937fc0047e5979 José Valim jose.valim@gmail.com http://github.com/wycats/rails/commit/eb021707f53be46140b55a48e5ef03ed0577a45c eb021707f53be46140b55a48e5ef03ed0577a45c

2009-05-14T20:30:17-07:00

2009-04-01T03:44:56-07:00

Allow strings to be sent as collection to select. Signed-off-by: Michael Koziarski <michael@koziarski.com> 4967e9120b883ba4872963391499b8ddd4583299 Michael Koziarski michael@koziarski.com da65320433088548bc4cff33758e5acd71fd137a c286952050e8fe16b0f6d64ba0687b52cc8f2ae1 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/b6bac73b282c7e500c43810f2a937fc0047e5979 b6bac73b282c7e500c43810f2a937fc0047e5979

2009-05-14T17:38:30-07:00

Merge commit 'origin/master' Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb b234951c42e4c682ef723320287383ac3fff0cf1 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 8fac2c88cae0f2fd42fad3c2c2c6c860df14d629 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/da65320433088548bc4cff33758e5acd71fd137a da65320433088548bc4cff33758e5acd71fd137a

2009-05-14T17:25:10-07:00

Got new base to pass controller/base_test.rb, implemented method_missing action semantics in compatibility mode, and fixed a few action_missing bugs. 97a5b945c5fece6da744383fda42072b3296988e Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 49a84ff69ca4fc4db821ca3b5a5926d07832c845 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/8fac2c88cae0f2fd42fad3c2c2c6c860df14d629 8fac2c88cae0f2fd42fad3c2c2c6c860df14d629

2009-05-14T15:30:35-07:00

Cleaning up more render tests d959ad5fa6cf72cc8c887cdf1ebdfe2ddea94bc4 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 5dd29c466c38a1bc395da579fd4b22c5e5a8e9fd Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/c286952050e8fe16b0f6d64ba0687b52cc8f2ae1 c286952050e8fe16b0f6d64ba0687b52cc8f2ae1

2009-05-14T02:01:08-07:00

2009-05-14T01:56:07-07:00

Minimal base/new_base comparison 38dc6ad83ca0d4ae2695ca85793baa38ce06ea55 Jeremy Kemper jeremy@bitsweat.net 29bd8f7b8975bc0442f0b63e7da077f9a3f22dc6 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/5dd29c466c38a1bc395da579fd4b22c5e5a8e9fd 5dd29c466c38a1bc395da579fd4b22c5e5a8e9fd

2009-05-14T02:01:08-07:00

2009-05-13T16:15:37-07:00

Cherry-picking Active Support extensions 8a6d7221b7e203ce6a717196509a11930b8f1823 Jeremy Kemper jeremy@bitsweat.net afcbdfc15f919a470e4cfca97fb0084eebd2ab1f Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/29bd8f7b8975bc0442f0b63e7da077f9a3f22dc6 29bd8f7b8975bc0442f0b63e7da077f9a3f22dc6

2009-05-14T02:01:08-07:00

2009-05-13T16:15:18-07:00

Simple example for require profiling ad2eaec9502f433f540c74928b208e87f250b295 Jeremy Kemper jeremy@bitsweat.net 49a84ff69ca4fc4db821ca3b5a5926d07832c845 Peter Marklund peter_marklund@fastmail.fm http://github.com/wycats/rails/commit/afcbdfc15f919a470e4cfca97fb0084eebd2ab1f afcbdfc15f919a470e4cfca97fb0084eebd2ab1f

2009-05-14T01:42:00-07:00

2009-05-14T00:30:16-07:00

Changed ActiveRecord::Base#exists? to invoke find_initial so that it is compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] 2a05aa38fb247d8c1abc92a3c5926d9a3fdacc79 Michael Koziarski michael@koziarski.com 4f291fa528e5faad03def69ae7ac98224ab859db Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/49a84ff69ca4fc4db821ca3b5a5926d07832c845 49a84ff69ca4fc4db821ca3b5a5926d07832c845

2009-05-13T17:00:59-07:00

2009-05-13T17:00:36-07:00

Ported over render :file tests. 9161f1f963afaacd7cae93e8226dfc7644ce2721 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com e8550ee0329586b32de425e905c7af7e65bc78a8 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/4f291fa528e5faad03def69ae7ac98224ab859db 4f291fa528e5faad03def69ae7ac98224ab859db

2009-05-13T12:00:49-07:00

2009-05-13T11:55:19-07:00

Simple examples for require profiling 3a9bc62fd9bfb6913b5899f6b86c953d4aa78c1d Jeremy Kemper jeremy@bitsweat.net fa5da8ad54d68ea0484825845eb6f6a8e8bca361 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/e8550ee0329586b32de425e905c7af7e65bc78a8 e8550ee0329586b32de425e905c7af7e65bc78a8

2009-05-13T12:00:15-07:00

2009-05-13T01:10:37-07:00

Cherry-pick core extensions 0cdfe0f9f0d3fb010280ff0453fc553ab6ff2d92 Jeremy Kemper jeremy@bitsweat.net a7ccc7c79fa69cea3b7d19bcaa4df3c2932238d8 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/fa5da8ad54d68ea0484825845eb6f6a8e8bca361 fa5da8ad54d68ea0484825845eb6f6a8e8bca361

2009-05-13T11:43:03-07:00

2009-05-13T01:06:53-07:00

isolated_test task 3542a3bad41218803a29da6ee0741b3a5a3acc45 Jeremy Kemper jeremy@bitsweat.net e9c5750bd1bb15b2d551ee014f06bd5019f2357d Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/a7ccc7c79fa69cea3b7d19bcaa4df3c2932238d8 a7ccc7c79fa69cea3b7d19bcaa4df3c2932238d8

2009-05-13T11:43:03-07:00

2009-05-12T17:58:37-07:00

Remove support for deprecated validation message interpolation format 6c438a9d0a89e22c6fcd5a22ebfc6fe74149c4bb Jeremy Kemper jeremy@bitsweat.net 4c963972fd0fb696e857540351f7558f027ec962 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/e9c5750bd1bb15b2d551ee014f06bd5019f2357d e9c5750bd1bb15b2d551ee014f06bd5019f2357d

2009-05-13T11:43:03-07:00

2009-05-12T17:55:45-07:00

Preserve ordering 10360fb32dd0f312265a355b7dcfc5c9e0c79126 Jeremy Kemper jeremy@bitsweat.net 216309c16519d94a9e0aebf758029a78696ab8d6 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/4c963972fd0fb696e857540351f7558f027ec962 4c963972fd0fb696e857540351f7558f027ec962

2009-05-13T11:43:03-07:00

2009-05-12T14:21:29-07:00

Defer rake/contrib requires so we can use the stdlib rake instead of the full gem aaed54b7381ddc2d52017e2325ef1dad48ed7f08 Jeremy Kemper jeremy@bitsweat.net 72ca7c591c9eace150c0ebab1633d691a1ef12cf Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/216309c16519d94a9e0aebf758029a78696ab8d6 216309c16519d94a9e0aebf758029a78696ab8d6

2009-05-12T16:21:34-07:00

Implemented redirects and partial rendering in new base. db271a9f9cb8ddf9aed72e125fe867d0e10d40e0 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 22c5667c2ef46d6723c1805d3adc52dc8e92429b Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/72ca7c591c9eace150c0ebab1633d691a1ef12cf 72ca7c591c9eace150c0ebab1633d691a1ef12cf

2009-05-12T10:53:00-07:00

Fixed new callbacks to not call the action when a callback sets the response body 5df30ffd42a00ef6ab38824bdee6e335e0b6d140 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com a2875bec9a31702a385d2f34e66843ddbe4e9db2 Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/22c5667c2ef46d6723c1805d3adc52dc8e92429b 22c5667c2ef46d6723c1805d3adc52dc8e92429b

2009-05-11T19:49:11-07:00

Defer rake/contrib/sshpublisher require so we can use the stdlib rake instead of the full gem 6dda3152456f9dca9f1eb1c75487a893fe564552 Jeremy Kemper jeremy@bitsweat.net 00a9d4b91cccdd88146cbe716eca844dcdfa08e7 Bryan Helmkamp bryan@brynary.com http://github.com/wycats/rails/commit/a2875bec9a31702a385d2f34e66843ddbe4e9db2 a2875bec9a31702a385d2f34e66843ddbe4e9db2

2009-05-11T19:23:47-07:00

Use DependencyModule for included hooks in ActiveRecord 18e221e8a08f041efd7cb751d5114cf6430272f6 Bryan Helmkamp bryan@brynary.com 0f6e764e4060b75ea8a335e6971209a08bf8b40a 0cac68d3bed3e6bf8ec2eb994858e4a179046941 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/00a9d4b91cccdd88146cbe716eca844dcdfa08e7 00a9d4b91cccdd88146cbe716eca844dcdfa08e7

2009-05-11T17:07:05-07:00

Merge branch 'master' into wip_abstract_controller 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 77398a4e98eb391258813fef47f1ecf57ae58972 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com ddbeb15a5e7e0c3c5f316ccf65b557bc5311a6c4 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/0cac68d3bed3e6bf8ec2eb994858e4a179046941 0cac68d3bed3e6bf8ec2eb994858e4a179046941

2009-05-11T15:03:24-07:00

Revert "Whitespace!" This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716. 6f6d89a9bf66064e4acb8392d54648b4bf37f9f0 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 6694bd46f59eb9b9b23afbd0d9484fd87e8fe350 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/0f6e764e4060b75ea8a335e6971209a08bf8b40a 0f6e764e4060b75ea8a335e6971209a08bf8b40a

2009-05-11T14:48:58-07:00

Fixed a bug with handling render options 8907c891ac1b067036f636fa23948fcec0383800 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 94ee9d245289a36207847a684b51dbd1c7a6a4eb Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/6694bd46f59eb9b9b23afbd0d9484fd87e8fe350 6694bd46f59eb9b9b23afbd0d9484fd87e8fe350

2009-05-11T12:45:26-07:00

Aliased AbstractController::ActionNotFound to ActionController::UnknownAction 1ddeef04f0a15bd0d8957646f6d4b441df13bec8 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com e1854e0b199fba352ddcaa58a3af168e8cc70e3a Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/ddbeb15a5e7e0c3c5f316ccf65b557bc5311a6c4 ddbeb15a5e7e0c3c5f316ccf65b557bc5311a6c4

2009-05-11T12:20:54-07:00

2009-05-11T12:01:08-07:00

Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. 96af79cc6a1fbf6be739102bd2afeec1f2df7ef6 Jeremy Kemper jeremy@bitsweat.net c1d120a71e74aa3ccab6dc28a5406b87a51a69c1 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/94ee9d245289a36207847a684b51dbd1c7a6a4eb 94ee9d245289a36207847a684b51dbd1c7a6a4eb

2009-05-11T12:04:43-07:00

Ported ConditionalGet to new Base 41b320c5e27e584704d745a22cffdf099ebfbf15 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com 34caf4f5521897c5d656f8edcb3c4ae535d8e6d8 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com http://github.com/wycats/rails/commit/c1d120a71e74aa3ccab6dc28a5406b87a51a69c1 c1d120a71e74aa3ccab6dc28a5406b87a51a69c1

2009-05-11T11:48:38-07:00

Don't run the action if callbacks are halted. In AbstractController, this means that response_body is not empty 4a4935e3fe6c6479a85bb6f12fceb9ca76ca0865 Yehuda Katz + Carl Lerche ykatz+clerche@engineyard.com d45d0a18647e906223b2859d1ce2a83be00095b1 Douglas F Shearer dougal.s@gmail.com http://github.com/wycats/rails/commit/e1854e0b199fba352ddcaa58a3af168e8cc70e3a e1854e0b199fba352ddcaa58a3af168e8cc70e3a

2009-05-11T11:45:57-07:00

2009-05-07T15:58:07-07:00

ActiveSupport::OrderedHash[1,2,3,4] creates an OrderedHash instead of a Hash. [#2615 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> f9d528ae07f6ccdb5b469ad35fb2ffbfcf4a5a24 Jeremy Kemper jeremy@bitsweat.net 4817bf94d135c44ddfae1a30acb15de989e3c86c 4932f7b38f72104819022abca0c952ba6f9888cb Jeremy Kemper jeremy@bitsweat.net http://github.com/wycats/rails/commit/d45d0a18647e906223b2859d1ce2a83be00095b1 d45d0a18647e906223b2859d1ce2a83be00095b1

2009-05-11T11:43:30-07:00

Merge branch 'master' of git@github.com:rails/rails fb7c8afe4cf0c368da13893dfef338e46d988a66 Jeremy Kemper jeremy@bitsweat.net