4ae03b2d5a7b81a8b8d330c12de40f970525a67a Chris Hapgood cch1@hapgoods.com http://github.com/rails/rails/commit/c3ef028b818779996472e018486446a216657251 c3ef028b818779996472e018486446a216657251 2009-11-05T00:16:06-08:00 2009-11-04T07:13:59-08:00 Fix OrderedHash#replace Signed-off-by: Michael Koziarski <michael@koziarski.com> e48654d29cde5306ccac4ba5f10d3ae25b59d0ad Michael Koziarski michael@koziarski.com 7ba80252a5a6bd94c8445347caee663b12c1a526 Matias Flores mflores@atlanware.com http://github.com/rails/rails/commit/4ae03b2d5a7b81a8b8d330c12de40f970525a67a 4ae03b2d5a7b81a8b8d330c12de40f970525a67a 2009-11-02T17:59:40-08:00 2009-09-26T17:32:21-07:00 Fix chars.reverse for multibyte decomposed strings [#597 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 6e7f8c4dcd83e8d4ad6b54a85fc7f89f1e489186 Jeremy Kemper jeremy@bitsweat.net f5f7c40f3aedf88b2aef4e83602a4f41ffa5d0ab José Valim jose.valim@gmail.com http://github.com/rails/rails/commit/7ba80252a5a6bd94c8445347caee663b12c1a526 7ba80252a5a6bd94c8445347caee663b12c1a526 2009-10-28T12:15:16-07:00 2009-10-28T12:15:16-07:00 Make polymorphic_url work with symbols again and refactor it [#1384 status:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> bab1c1e1f6c8dd46c20414bb3ee123b2c70ad51f Joshua Peek josh@joshpeek.com fdf356d74b9054d44f23356051dd3a85ee9a83b3 José Valim jose.valim@gmail.com http://github.com/rails/rails/commit/f5f7c40f3aedf88b2aef4e83602a4f41ffa5d0ab f5f7c40f3aedf88b2aef4e83602a4f41ffa5d0ab 2009-10-28T11:44:24-07:00 2009-10-28T11:44:24-07:00 Fix nested attributes error messages which is broken in 2.3.4. It still copies the message from child to parent, but does the lookup in the child, not in the parent, avoiding error messages duplication (as happened in 2.3.3). [#3147 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> 771cadf62b8f729f9388a27470105d6f9bb4eadd Joshua Peek josh@joshpeek.com 9edfdef2a7c0c36b84b0f0bcd591e0c123351866 Yehuda Katz wycats@gmail.com http://github.com/rails/rails/commit/fdf356d74b9054d44f23356051dd3a85ee9a83b3 fdf356d74b9054d44f23356051dd3a85ee9a83b3 2009-10-21T12:04:59-07:00 2009-10-21T12:04:59-07:00 Fixed HTTP digest to properly return 401 when the Authorization header has no nonce specified, or the Authorization header specifies Basic auth [#2968 state:resolved] 6f54416fa32b5005e38b117678b193656ca55de6 Yehuda Katz wycats@gmail.com eb30c695444b904d7937c8c12c59da9a8c4d60e5 Mike Gunderloy MikeG1@larkfarm.com http://github.com/rails/rails/commit/9edfdef2a7c0c36b84b0f0bcd591e0c123351866 9edfdef2a7c0c36b84b0f0bcd591e0c123351866 2009-10-18T12:23:28-07:00 2009-09-23T04:41:22-07:00 Fix bad assumption in BacktraceCleaner test [#3249 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 5565db9ecefd45e33381533a268b34885c981a17 Pratik Naik pratiknaik@gmail.com 459749c30c48cc536fe81ed1ff66da0c96cca8be Travis Briggs briggs.travis@gmail.com http://github.com/rails/rails/commit/eb30c695444b904d7937c8c12c59da9a8c4d60e5 eb30c695444b904d7937c8c12c59da9a8c4d60e5 2009-10-16T17:37:46-07:00 2009-03-18T18:51:26-07:00 Ensure number_to_human_size does not strip zeros from the end [#1763 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> 0bda0004ee3d09f0a65633bd2eba65a4bbc8fa6a Michael Koziarski michael@koziarski.com e10b0ddc7b52f903e8a0898d8907fc0357deb974 Michael Koziarski michael@koziarski.com http://github.com/rails/rails/commit/459749c30c48cc536fe81ed1ff66da0c96cca8be 459749c30c48cc536fe81ed1ff66da0c96cca8be 2009-10-14T21:19:24-07:00 2009-10-14T21:19:24-07:00 Backport the xss_safe? method for plugin authors targetting 2.3 and master b49b0f9015fc179e58d48d22db468090742da4c9 Michael Koziarski michael@koziarski.com bbaf3a04f50347b54fd74777a1c3c8e9411eb11b George Ogata george.ogata@gmail.com http://github.com/rails/rails/commit/e10b0ddc7b52f903e8a0898d8907fc0357deb974 e10b0ddc7b52f903e8a0898d8907fc0357deb974 2009-10-14T15:02:02-07:00 2009-08-30T20:46:48-07:00 Make IntegrationTest::Runner propagate method_missing to ancestors. Fixes RSpec integration example groups, which mixes its Matchers module into ActiveSupport::TestCase. Signed-off-by: Michael Koziarski <michael@koziarski.com> 6d71ce24d72dc569890a7066c156a5b7a898f7da Michael Koziarski michael@koziarski.com 7454d1874cbfacb871a4dac2bfed690aa6949524 Jeffrey Hardy packagethief@gmail.com http://github.com/rails/rails/commit/bbaf3a04f50347b54fd74777a1c3c8e9411eb11b bbaf3a04f50347b54fd74777a1c3c8e9411eb11b 2009-10-14T11:51:11-07:00 2009-10-13T20:57:00-07:00 CookieJar#delete should return the key's value, consistent with a Hash Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> 59285567ddcd39365b2c9312b78cb0458ca98dfb Jeremy Kemper jeremy@bitsweat.net c23706b787234ca720d5f5b120f3332d3851fb8f Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/7454d1874cbfacb871a4dac2bfed690aa6949524 7454d1874cbfacb871a4dac2bfed690aa6949524 2009-10-09T18:37:38-07:00 2009-10-09T18:36:58-07:00 Mark html safety 6ac45d213e270363c90053a2979720c3ff5e0553 Jeremy Kemper jeremy@bitsweat.net 4010b49de89fc1639fd7e6e14e3be829e08edf95 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/c23706b787234ca720d5f5b120f3332d3851fb8f c23706b787234ca720d5f5b120f3332d3851fb8f 2009-10-09T08:11:22-07:00 2009-10-09T08:11:22-07:00 Add a :limit option to specify the maximum number of records that can be processed by accepts_nested_attributes_for Conflicts: activerecord/lib/active_record/nested_attributes.rb 25a1ef9c55c34ccb9d7b9baf10e66d6d0b9035f9 Pratik Naik pratiknaik@gmail.com c47c5af1c89a85dede432d1539ddcab5dac4e10a Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/4010b49de89fc1639fd7e6e14e3be829e08edf95 4010b49de89fc1639fd7e6e14e3be829e08edf95 2009-10-09T07:47:31-07:00 2009-10-09T07:44:39-07:00 Store entire options hash in the class var rather than just the reject_if proc for the nested attributes Conflicts: activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/nested_attributes_test.rb 036ffb0843bacbaf3e674626ade4b0a0d57d8a3a Pratik Naik pratiknaik@gmail.com 48b30608a43afa0c2801f98a141e09a912d5dc0d Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/c47c5af1c89a85dede432d1539ddcab5dac4e10a c47c5af1c89a85dede432d1539ddcab5dac4e10a 2009-10-09T07:12:01-07:00 2009-10-09T07:12:01-07:00 Mute log info coming from the local_cache strategy 7b88e02ad26eb2f436a5f873a90444888c750ea5 Pratik Naik pratiknaik@gmail.com 95b7e4f7d76928765a2392bf21d8f0644822c6d0 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/48b30608a43afa0c2801f98a141e09a912d5dc0d 48b30608a43afa0c2801f98a141e09a912d5dc0d 2009-10-08T18:26:37-07:00 2009-10-08T18:26:08-07:00 Ensure MessageVerifier raises appropriate exception on tampered data c8ab08e96cfac8bb559feb2d3ddf4978fc492f76 Pratik Naik pratiknaik@gmail.com 80da8eb43dfabb4ca9f0adcb431882d03e6388bb Michael Koziarski michael@koziarski.com http://github.com/rails/rails/commit/95b7e4f7d76928765a2392bf21d8f0644822c6d0 95b7e4f7d76928765a2392bf21d8f0644822c6d0 2009-10-07T18:02:12-07:00 2009-10-07T18:02:12-07:00 field_error_proc needs to return a safe string 14f494ac4357ec412f8edfb70fdc87a3e0d8b5fa Michael Koziarski michael@koziarski.com a69316b293e26031de4fcabc481331180608098a Michael Koziarski michael@koziarski.com http://github.com/rails/rails/commit/80da8eb43dfabb4ca9f0adcb431882d03e6388bb 80da8eb43dfabb4ca9f0adcb431882d03e6388bb 2009-10-07T17:59:21-07:00 2009-10-05T20:03:03-07:00 Merge the prerequisites for on-by-default XSS escaping into rails. This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) Note, this does *not* give you on-by-default XSS escaping in 2.3 applications. To get that you'll need to install a plugin: http://github.com/nzkoz/rails_xss d4a6004daa4b97b96e3435c37295cdc1639f7bc9 Michael Koziarski michael@koziarski.com e2127991a188393b0188cffd57227e33f0a513ae Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/a69316b293e26031de4fcabc481331180608098a a69316b293e26031de4fcabc481331180608098a 2009-10-07T16:14:52-07:00 2009-10-07T16:14:37-07:00 Use indifferent access attributes instead of stringifying them d3c6e65fa07df64196efefb98b99fcf9b3a5e74e Pratik Naik pratiknaik@gmail.com 6f2c4991efbbc5f567a6df36ca78de4f3ca24ee2 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/e2127991a188393b0188cffd57227e33f0a513ae e2127991a188393b0188cffd57227e33f0a513ae 2009-10-07T15:45:40-07:00 2009-10-07T15:45:40-07:00 Allow accepts_nested_attributes_for :reject_if option accept symbols for using a method 8b42c1a3531a3352594bf5ad3c6ddc7d7e371a75 Pratik Naik pratiknaik@gmail.com 0f14d7b6d37940a93c12c373e6e92e88f2dc96d7 pivotal pivotal@camp.flood.pivotallabs.com http://github.com/rails/rails/commit/6f2c4991efbbc5f567a6df36ca78de4f3ca24ee2 6f2c4991efbbc5f567a6df36ca78de4f3ca24ee2 2009-10-07T13:56:23-07:00 2009-08-05T18:36:34-07:00 Explicitly require ActionController's CGI extensions so they're properly loaded before the first request. Signed-off-by: Michael Koziarski <michael@koziarski.com> b632b66b24678da155cce4f991bf9d7e8ab743f3 Michael Koziarski michael@koziarski.com 58f14438a957997dd8aca4101f6204b08cf19747 Bryan Helmkamp bryan@brynary.com http://github.com/rails/rails/commit/0f14d7b6d37940a93c12c373e6e92e88f2dc96d7 0f14d7b6d37940a93c12c373e6e92e88f2dc96d7 2009-10-07T13:53:33-07:00 2009-08-24T14:16:13-07:00 Only load rake tasks from tasks/**/*.rake and lib/tasks/**/*.rake in plugins Previously, it was **/tasks/**/*.rake, and that loaded some paths that shouldn't be like: * vendor/plugins/admin_assistant/test_rails_app/lib/tasks/rspec.rake * vendor/plugins/will_paginate/test/tasks.rake Signed-off-by: Michael Koziarski <michael@koziarski.com> 43368d70be9b3803cbe5d9ce8ebdd1f6eb037178 Michael Koziarski michael@koziarski.com 91b61a8d1622d5e03c59d801a96fc26f4cb02ed8 Jesse Proudman jesse.proudman@blueboxgrp.com http://github.com/rails/rails/commit/58f14438a957997dd8aca4101f6204b08cf19747 58f14438a957997dd8aca4101f6204b08cf19747 2009-10-06T12:44:59-07:00 2009-09-26T14:53:27-07:00 Running rake dev leaves ERB in environment.rb. The existing Rake task was just copying the file across. This patch modifies the Rake task to use the same ERB processing string used on database.yml, which cleans up the environment.rb file. Signed-off-by: Michael Koziarski <michael@koziarski.com> ffc419fdcd340b095ac5ee3596186d5be54329d8 Michael Koziarski michael@koziarski.com f98302e46b66a8e4ce7038944901c8066130b083 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/91b61a8d1622d5e03c59d801a96fc26f4cb02ed8 91b61a8d1622d5e03c59d801a96fc26f4cb02ed8 2009-10-06T07:55:56-07:00 2009-10-06T07:55:56-07:00 Monkey patch Rack::Lint to allow string subclass body afe8447d1a61c30a54e8effa5e4f342bc9183d24 Pratik Naik pratiknaik@gmail.com 11cce5bde9872da95b83ce627f95c2444d1442df Jeffrey Hardy packagethief@gmail.com http://github.com/rails/rails/commit/f98302e46b66a8e4ce7038944901c8066130b083 f98302e46b66a8e4ce7038944901c8066130b083 2009-10-05T13:39:10-07:00 2009-10-05T06:06:57-07:00 MessageVerifier#verify raises InvalidSignature if the signature is blank Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> bcf036b87b960299c92351f6913a32512b145e10 Jeremy Kemper jeremy@bitsweat.net 1d7412b135cac39a6693cc1efa328e6c7707698d Joshua Peek josh@joshpeek.com http://github.com/rails/rails/commit/11cce5bde9872da95b83ce627f95c2444d1442df 11cce5bde9872da95b83ce627f95c2444d1442df 2009-10-05T12:21:57-07:00 2009-10-05T12:21:57-07:00 Coerce all out going body parts to Strings 4e7cf49dc2f34c569f2a7dd3af113a0fd596e65e Joshua Peek josh@joshpeek.com 1901747001676a24e77b95dc61d81d9201111f5a Bryan Helmkamp bryan@brynary.com http://github.com/rails/rails/commit/1d7412b135cac39a6693cc1efa328e6c7707698d 1d7412b135cac39a6693cc1efa328e6c7707698d 2009-09-29T17:10:01-07:00 2009-09-29T17:06:46-07:00 Reduce specificity of logging test to avoid dependency on the system clock Signed-off-by: Yehuda Katz <wycats@gmail.com> 00cf8eda8f41100f077a07345e4a798983a37f81 Yehuda Katz wycats@gmail.com f95a7f896e42bed994a843e0ea8073d0373f59fe Chad Woolley thewoolleyman@gmail.com http://github.com/rails/rails/commit/1901747001676a24e77b95dc61d81d9201111f5a 1901747001676a24e77b95dc61d81d9201111f5a 2009-09-29T02:53:45-07:00 2009-09-29T02:28:07-07:00 reduce max size of fixture IDs to fix sqlite2 tests, because sqlite2 was getting negative and changing values for ID field. See http://www.sqlite.org/datatypes.html Signed-off-by: Yehuda Katz <wycats@gmail.com> f13d0b1ba9b28680cd3fb59f773e3b245817dbea Yehuda Katz wycats@gmail.com 26f22a28e9d17261241607d44f3ce5c6f64a4726 Chad Woolley thewoolleyman@gmail.com http://github.com/rails/rails/commit/f95a7f896e42bed994a843e0ea8073d0373f59fe f95a7f896e42bed994a843e0ea8073d0373f59fe 2009-09-27T21:57:41-07:00 2009-08-11T22:53:55-07:00 make mysql and postgresql rebuild databases on every CI build, to prevent breakages such as collation and character set changing Signed-off-by: Yehuda Katz <wycats@gmail.com> 938594f78ff6eabe23c3e3f6d79bab9542f07cb4 Yehuda Katz wycats@gmail.com 5f6e788e27d495af3fa76d0286af8814cd2652b9 f489b3341c6f5488eadeea0544ce0decc22e351e Yehuda Katz wycats@gmail.com http://github.com/rails/rails/commit/26f22a28e9d17261241607d44f3ce5c6f64a4726 26f22a28e9d17261241607d44f3ce5c6f64a4726 2009-09-27T21:57:30-07:00 2009-09-27T21:57:30-07:00 Merge branch '2-3-stable' of git@github.com:rails/rails into 2-3-stable dc0582c932b815f6dda16698b139b16cbe1ee0b9 Yehuda Katz wycats@gmail.com b372b4c87515ab84e64028b437da1e047a128e4d John Trupiano jtrupiano@gmail.com http://github.com/rails/rails/commit/f489b3341c6f5488eadeea0544ce0decc22e351e f489b3341c6f5488eadeea0544ce0decc22e351e 2009-09-27T18:56:19-07:00 2009-09-26T12:42:18-07:00 Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 days return '2 days'. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3266 state:committed] 4e8a945cace011d5b90d18598f7750ef778225e3 Michael Koziarski michael@koziarski.com