d4a817c066ec66ab6f44958a3e10619f952b77e8 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/d6b9f8410c990b3d68d1970f1461a1d385d098d7 d6b9f8410c990b3d68d1970f1461a1d385d098d7 2009-02-03T08:04:14-08:00 2009-02-03T08:04:14-08:00 Remove errant debug code 6ef5d5460b3b3828cba76ad5dd8723b4cacaed60 Yehuda Katz wycats@gmail.com ff68430077bc534c03dfe9b2fd7faad3b720a433 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/d4a817c066ec66ab6f44958a3e10619f952b77e8 d4a817c066ec66ab6f44958a3e10619f952b77e8 2009-02-02T14:01:29-08:00 2009-02-02T14:01:29-08:00 Make tests pass 26cdd17d44659e833c7c720d21a6e20418ab1ebb Yehuda Katz wycats@gmail.com 9744f687ccfe83bde52696985030225919c2e681 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/ff68430077bc534c03dfe9b2fd7faad3b720a433 ff68430077bc534c03dfe9b2fd7faad3b720a433 2009-02-02T12:03:35-08:00 2009-02-02T12:03:35-08:00 Whoops. 914849effc49a58c29fb1cd773ee1295020f7d22 Yehuda Katz wycats@gmail.com 6faff0223b4470a6c1c66664f1b3df94de206841 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/9744f687ccfe83bde52696985030225919c2e681 9744f687ccfe83bde52696985030225919c2e681 2009-02-02T11:49:32-08:00 2009-02-02T11:49:32-08:00 Add support for pending 36a37f0dd469a33e4ee8638a03906aaf0c9cc3fc Yehuda Katz wycats@gmail.com 44cdf0c5fe080d470429ab0640af25e927244907 4945d92b03e7cd26e5307c8683eac47e4a90026d Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/6faff0223b4470a6c1c66664f1b3df94de206841 6faff0223b4470a6c1c66664f1b3df94de206841 2009-02-02T09:54:27-08:00 2009-02-02T09:54:27-08:00 Merge commit 'rails/3-0-unstable' e0a794c053a428e3f73301c90ffc2fe934d08b06 Yehuda Katz wycats@gmail.com 3030bc90c95e335d726f06fd7a61ed96055e9109 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/44cdf0c5fe080d470429ab0640af25e927244907 44cdf0c5fe080d470429ab0640af25e927244907 2009-02-02T09:54:23-08:00 2009-02-02T09:54:23-08:00 Some merge cleanup 0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 Yehuda Katz wycats@gmail.com 8da52b13b5a565d4c41c3e3b3f2562f3f1852a56 Jeremy Kemper jeremy@bitsweat.net http://github.com/technoweenie/rails/commit/4945d92b03e7cd26e5307c8683eac47e4a90026d 4945d92b03e7cd26e5307c8683eac47e4a90026d 2009-01-31T14:46:02-08:00 2009-01-31T14:46:02-08:00 Remove dead cgi_ext require ff7e6ab7540d76f579a107f54968821b4fdf3adb Jeremy Kemper jeremy@bitsweat.net 85750f22c90c914a429116fb908990c5a2c68379 Jeremy Kemper jeremy@bitsweat.net http://github.com/technoweenie/rails/commit/8da52b13b5a565d4c41c3e3b3f2562f3f1852a56 8da52b13b5a565d4c41c3e3b3f2562f3f1852a56 2009-01-31T14:44:04-08:00 2009-01-31T14:44:04-08:00 Remove duplicate ConcurrentHash bd815154ee1dc63719b6e5f50a6aaae6cd5c56d5 Jeremy Kemper jeremy@bitsweat.net ae42163bf5497849e4fcbb736505910c17640459 85750f22c90c914a429116fb908990c5a2c68379 Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/3030bc90c95e335d726f06fd7a61ed96055e9109 3030bc90c95e335d726f06fd7a61ed96055e9109 2009-01-30T11:30:27-08:00 2009-01-30T11:30:27-08:00 Merge commit 'rails/3-0-unstable' Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb 5b079250b368f0e8af6d2f72a4278fdab3382b26 Yehuda Katz wycats@gmail.com da10673e32718d6a0619bd0f4b4d3d796db86a1a 19f8bb2808316dfca1f009538c3505ba144f614b Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/ae42163bf5497849e4fcbb736505910c17640459 ae42163bf5497849e4fcbb736505910c17640459 2009-01-30T11:01:11-08:00 2009-01-30T11:01:11-08:00 Merge branch 'master' of git@github.com:wycats/rails 7bdb7868b0be65daec06ba729f68deccfe61a8bb Yehuda Katz wycats@gmail.com b8fadd708b9850a77e1f64038763fffcff502499 ed0e5640879fd42c00fc5900e0355a0ea1dcf2ad Yehuda Katz wycats@gmail.com http://github.com/technoweenie/rails/commit/da10673e32718d6a0619bd0f4b4d3d796db86a1a da10673e32718d6a0619bd0f4b4d3d796db86a1a 2009-01-30T10:53:19-08:00 2009-01-30T10:53:14-08:00 Sync 'rails/rails/master' 7bdb7868b0be65daec06ba729f68deccfe61a8bb Yehuda Katz wycats@gmail.com 2dedb5b03ab88a1c31068f71c8d4cad7c5a5d9ae Charles Nutter charles.nutter@sun.com http://github.com/technoweenie/rails/commit/ed0e5640879fd42c00fc5900e0355a0ea1dcf2ad ed0e5640879fd42c00fc5900e0355a0ea1dcf2ad 2009-01-30T08:27:03-08:00 2009-01-28T22:31:07-08:00 Ensure constant_watch_stack is protected by a mutex, so concurrent requires do not corrupt it. [#1816 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 9e54f95eb28a1473483cfe9c2734a8ff2132ed66 Jeremy Kemper jeremy@bitsweat.net 1b79683171eeb0f5eb07928aeace890dafe773fc Scott Taylor scott@railsnewbie.com http://github.com/technoweenie/rails/commit/2dedb5b03ab88a1c31068f71c8d4cad7c5a5d9ae 2dedb5b03ab88a1c31068f71c8d4cad7c5a5d9ae 2009-01-29T17:39:48-08:00 2009-01-29T17:39:48-08:00 Controller, response, and request should all refer to same session, even after a call to session_reset [#1823 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> 7429cf580c86e7c306216cf5f5f2287daab8564d Joshua Peek josh@joshpeek.com b3bc4fa5e02e71a992f8a432757548c762f0aad8 Mike Gaffney mike.gaffney@asolutions.com http://github.com/technoweenie/rails/commit/1b79683171eeb0f5eb07928aeace890dafe773fc 1b79683171eeb0f5eb07928aeace890dafe773fc 2009-01-29T17:37:38-08:00 2009-01-29T17:37:38-08:00 Deprecation tests for f17c876 [#1801 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> 9c1541d98f653356b5206a7c6f808b843e264f33 Joshua Peek josh@joshpeek.com 8761663a68bd7ddd918f78fb3def4697784024f2 Pratik Naik pratiknaik@gmail.com http://github.com/technoweenie/rails/commit/b3bc4fa5e02e71a992f8a432757548c762f0aad8 b3bc4fa5e02e71a992f8a432757548c762f0aad8 2009-01-29T14:06:03-08:00 2009-01-29T14:06:03-08:00 Digest#validate_digest_response should accept request instead of controller f9e8a2caa94130d917fdf5163f21cb28d5f347e6 Pratik Naik pratiknaik@gmail.com 306cc2b920203cfa51cee82d2fc452484efc72f8 Jon Crawford mail@joncrawford.com http://github.com/technoweenie/rails/commit/8761663a68bd7ddd918f78fb3def4697784024f2 8761663a68bd7ddd918f78fb3def4697784024f2 2009-01-29T10:00:18-08:00 2009-01-29T09:59:44-08:00 Added grouped_options_for_select helper method for wrapping option tags in optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> f09b465c194d3848fe353551bc11a7269487857e Pratik Naik pratiknaik@gmail.com e6493eb9b76de73afef2706493efd090dfff4ecc Gregg Kellogg gregg@Gregg-Kelloggs-MacBook-Pro-24.local http://github.com/technoweenie/rails/commit/306cc2b920203cfa51cee82d2fc452484efc72f8 306cc2b920203cfa51cee82d2fc452484efc72f8 2009-01-29T08:01:59-08:00 2009-01-29T08:00:07-08:00 Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> f7bcc99b43765b6299c797dc44c9c7b0263d6394 Pratik Naik pratiknaik@gmail.com 319ae4628f4e0058de3e40e4ca7791b17e45e70c Joshua Peek josh@joshpeek.com http://github.com/technoweenie/rails/commit/85750f22c90c914a429116fb908990c5a2c68379 85750f22c90c914a429116fb908990c5a2c68379 2009-01-28T20:50:46-08:00 2009-01-28T20:50:46-08:00 Move dispatch related tests into test/dispatch 4a7653cd1463d1bcc053dca17c98096d4718b653 Joshua Peek josh@joshpeek.com feed7b4cfd860bdc9f5b4efc2ca2af76cb01d55d Jacob Dunphy jacob.dunphy@gmail.com http://github.com/technoweenie/rails/commit/e6493eb9b76de73afef2706493efd090dfff4ecc e6493eb9b76de73afef2706493efd090dfff4ecc 2009-01-28T20:34:33-08:00 2009-01-15T13:30:44-08:00 Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key. This fix sets :id => false if there is an :id column, but it's not the primary_key. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1766 state:committed] bd2fb28d979c63f3a87e79f7c319ef86cf236fb4 Michael Koziarski michael@koziarski.com 2e69db18ce2815c25eee64fc2978e7f6b57f6e1f Michael Koziarski michael@koziarski.com http://github.com/technoweenie/rails/commit/feed7b4cfd860bdc9f5b4efc2ca2af76cb01d55d feed7b4cfd860bdc9f5b4efc2ca2af76cb01d55d 2009-01-28T20:07:29-08:00 2009-01-28T20:07:29-08:00 Move to use pg instead of postgres on the CI server 356f0f2da1e35cc543212d8a4b400bca1603ea09 Michael Koziarski michael@koziarski.com a1a9889b06faf5e994fc29d462c7063b5ff37a3a Joshua Peek josh@joshpeek.com http://github.com/technoweenie/rails/commit/2e69db18ce2815c25eee64fc2978e7f6b57f6e1f 2e69db18ce2815c25eee64fc2978e7f6b57f6e1f 2009-01-28T19:20:46-08:00 2009-01-28T19:20:46-08:00 Only dup local cache values if duplicable [#1653 state:resolved] 1acecec2f34325ebf5e2b839e8a6d0095c8f5ef1 Joshua Peek josh@joshpeek.com 166c63818e901e64786a76029febf7c9cdb40f2d Pratik Naik pratiknaik@gmail.com http://github.com/technoweenie/rails/commit/a1a9889b06faf5e994fc29d462c7063b5ff37a3a a1a9889b06faf5e994fc29d462c7063b5ff37a3a 2009-01-28T17:59:55-08:00 2009-01-28T17:59:55-08:00 Move basic auth test controller inside the test class 9ce94665dcba8e21e567605e0a0f0c41b99851cd Pratik Naik pratiknaik@gmail.com 91eeb0ff119d34d0fcdb44d3d7fcbb7924208e05 Bob Aman bob@sporkmonger.com http://github.com/technoweenie/rails/commit/166c63818e901e64786a76029febf7c9cdb40f2d 166c63818e901e64786a76029febf7c9cdb40f2d 2009-01-28T12:56:46-08:00 2009-01-28T12:56:02-08:00 Improve exception handling when Location header is invalid. [#1192 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> f0398c5cfea0d55f32a5f3136d09fa428d1a2140 Pratik Naik pratiknaik@gmail.com a0d8202bb9fa55c328a3170836b0cddb40631e83 Dan Weinand dweinand@gmail.com http://github.com/technoweenie/rails/commit/91eeb0ff119d34d0fcdb44d3d7fcbb7924208e05 91eeb0ff119d34d0fcdb44d3d7fcbb7924208e05 2009-01-28T11:53:59-08:00 2008-10-30T10:52:12-07:00 Using the highlight helper on text with html shouldn't highlight text inside html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> df8b8ee4fa6c601160d42aad35076540bf01899e Pratik Naik pratiknaik@gmail.com f725b1971072a2203d6d433149730289cbb80128 Filip H.F. "FiXato" Slagter fixato@gmail.com http://github.com/technoweenie/rails/commit/a0d8202bb9fa55c328a3170836b0cddb40631e83 a0d8202bb9fa55c328a3170836b0cddb40631e83 2009-01-28T11:50:55-08:00 2008-10-30T03:40:09-07:00 Ensure whitespaces are stripped when merging string joins. [#1297 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> f3f7da237b473f7408780550c31b4d47c7463316 Pratik Naik pratiknaik@gmail.com 6079ec1f77daf364a2b25cf651e9b3c9e1b95a16 Bryan Ray bryansray@gmail.com http://github.com/technoweenie/rails/commit/f725b1971072a2203d6d433149730289cbb80128 f725b1971072a2203d6d433149730289cbb80128 2009-01-28T11:47:45-08:00 2009-01-28T11:47:45-08:00 Added options to script/dbconsole to sqlite3 console in various different modes. [#607 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> fefbdb41f6e120756a3893d169f9d58cb45ccb4f Pratik Naik pratiknaik@gmail.com 9a8e2a059c823498e0fb318f25b926a6d015ef87 Rasik Pandey rbpandey@gmail.com http://github.com/technoweenie/rails/commit/6079ec1f77daf364a2b25cf651e9b3c9e1b95a16 6079ec1f77daf364a2b25cf651e9b3c9e1b95a16 2009-01-28T11:39:06-08:00 2009-01-28T11:39:06-08:00 ActiveResource#eqls? and == should not take into account object identity and prefix options should be considered. [#1098 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 229921115599ceaf9fe33e17228ee2541f18970a Pratik Naik pratiknaik@gmail.com 32eeb3e5211a4a7bfc7a1d0aa0cab1486bed3581 Daniel Rodríguez Troitiño drodrigueztroitino@yahoo.es http://github.com/technoweenie/rails/commit/9a8e2a059c823498e0fb318f25b926a6d015ef87 9a8e2a059c823498e0fb318f25b926a6d015ef87 2009-01-28T11:35:18-08:00 2008-09-12T14:56:56-07:00 Ensure selected option is not ignored for collection_select. [#1037 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> bae72e71d9e754500f56688aef61e27ba88dc52d Pratik Naik pratiknaik@gmail.com 74871961eccdb455f18e8ef66716041f2f828ba8 Nathan de Vries nathan@atnan.com http://github.com/technoweenie/rails/commit/32eeb3e5211a4a7bfc7a1d0aa0cab1486bed3581 32eeb3e5211a4a7bfc7a1d0aa0cab1486bed3581 2009-01-28T11:31:48-08:00 2009-01-28T11:31:48-08:00 Ensure that when UrlWriter is included in multiple classes, the default_url_options of one don't affect the other. [#1277 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 541f742c2d89e8a90346723ea43d969a70c7c832 Pratik Naik pratiknaik@gmail.com 2ae8d3079b96d343f8cea8513929d656013f880e Pratik Naik pratiknaik@gmail.com http://github.com/technoweenie/rails/commit/74871961eccdb455f18e8ef66716041f2f828ba8 74871961eccdb455f18e8ef66716041f2f828ba8 2009-01-28T11:20:55-08:00 2009-01-28T11:20:50-08:00 Add array id support to Model.update_counters. [#1254 state:resolved] [Carlos Júnior] 4cbeb7933b293057899b35e3476a40cbf0b935fb Pratik Naik pratiknaik@gmail.com