<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>94a1758f8202eee65f167337541d102d1faeaad2</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/4874df1d674bccbe2fa41a12bb93fa63a5d489ee</url>
    <id>4874df1d674bccbe2fa41a12bb93fa63a5d489ee</id>
    <committed-date>2006-08-08T16:37:59-07:00</committed-date>
    <authored-date>2006-08-08T16:37:59-07:00</authored-date>
    <message>backport of ActionMailer documentation enhancements from trunk

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4732 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>5fcb781d109af8ea509a7da2f3e0ef31cd38a888</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>140e85c7246bf21613f6af1cee6d113dddfa552f</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/henrik/rails/commit/94a1758f8202eee65f167337541d102d1faeaad2</url>
    <id>94a1758f8202eee65f167337541d102d1faeaad2</id>
    <committed-date>2006-08-07T02:25:21-07:00</committed-date>
    <authored-date>2006-08-07T02:25:21-07:00</authored-date>
    <message> r3022@ks:  jeremy | 2005-11-12 18:40:42 -0800
 merge to stable
 r3024@ks:  jeremy | 2005-11-12 19:00:49 -0800
 Apply [2992] to stable.  SQLite: the clone_structure_to_test and purge_test_database Rake tasks should always use the test environment.  References #2846.
 r3027@ks:  jeremy | 2005-11-12 22:37:45 -0800
 Apply [2994] to stable.  PostgreSQL: correct the sequence discovery fallback query.  References #2594.
 r3033@ks:  jeremy | 2005-11-12 23:27:13 -0800
 Apply [2996] to stable.  Much faster Oracle column reflection.  Closes #2848.
 r3037@ks:  jeremy | 2005-11-13 00:11:26 -0800
 Apply [2998] to stable.  PostgreSQL: last_insert_id uses select_value rather than using @connection.exec directly.
 r3053@ks:  jeremy | 2005-11-13 14:37:39 -0800
 Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  Closes #2855.
 r3055@ks:  jeremy | 2005-11-13 14:48:48 -0800
 Apply [3009] to stable:  Reapply [2942] which was elided by [2997].  References #2788.
 r3058@ks:  jeremy | 2005-11-13 16:09:17 -0800
 Apply [3013] to stable.  Note that the ruby-memcache bindings are required to use the memcache store.  Closes #2857.
 r3063@ks:  jeremy | 2005-11-13 16:13:51 -0800
 Apply [3015] to stable.  Update documentation for render :file.  Closes #2858.
 r3066@ks:  jeremy | 2005-11-13 20:24:18 -0800
 Apply [3017] to stable.  Update documentation for Migrations.  Closes #2861.
 r3070@ks:  jeremy | 2005-11-13 20:54:50 -0800
 Apply [3019] to stable.  Oracle: test case for column default parsing.  Closes #2788.
 r3073@ks:  jeremy | 2005-11-13 23:42:32 -0800
 Apply [3021] to stable.  Correct documentation for Base.delete_all.  Closes #1568.
 r3077@ks:  jeremy | 2005-11-14 14:28:21 -0800
 Apply [3035] to stable.  SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  Closes #2866.
 r3120@ks:  jeremy | 2005-11-16 13:34:45 -0800
 Apply [3060] to stable.  Remove the unused, slow response_dump and session_dump variables from error pages.  Closes #1222.
 r3130@ks:  jeremy | 2005-11-16 14:37:47 -0800
 Apply [3063] to stable.  Remove CHANGELOG from apidoc Rake task since it isn't included with new apps anymore.
 r3148@ks:  jeremy | 2005-11-17 12:45:44 -0800
 Apply [3074] to stable.  Don't add the same conditions twice in has_one finder sql.  Closes #2916.
 r3149@ks:  jeremy | 2005-11-17 12:47:36 -0800
 Apply [3075] to stable.  Document :force option to create_table.  Closes #2921.
 r3157@ks:  jeremy | 2005-11-17 21:27:39 -0800
 Apply [3081] to stable.  Eliminate nil from newly generated logfiles.  Closes #2927.
 r3167@ks:  jeremy | 2005-11-18 22:47:31 -0800
 Apply [3089] to stable.  Don't generate read methods for columns whose names are not valid ruby method names.  Closes #2946.
 r3174@ks:  jeremy | 2005-11-19 01:53:00 -0800
 Apply [3092] to stable.  Correct boolean handling in generated reader methods.  Closes #2945.
 r3178@ks:  jeremy | 2005-11-19 01:59:47 -0800
 Apply [3094] to stable.  Use query methods rather than readers in boolean tests for [3092].  References #2949.
 r3190@ks:  jeremy | 2005-11-19 20:20:48 -0800
 Apply [3098] to stable.  Introducing the session_migration generator.  Creates an add_session_table migration.  Closes #2958.
 r3199@ks:  jeremy | 2005-11-19 21:13:22 -0800
 Apply [3101] to stable.  Allows generator to specify migrations directory.  Closes #2960.
 r3201@ks:  jeremy | 2005-11-19 21:31:47 -0800
 Apply [3103] to stable.  Document request.env and request.host.  Strip trailing whitespace.
 r3258@ks:  jeremy | 2005-11-21 00:33:59 -0800
 Apply [3139] to stable.  Use Kernel.binding rather than binding to allow columns of that name.  Closes #2973.
 r3269@ks:  jeremy | 2005-11-21 04:46:40 -0800
 Apply [3148] to stable.  Simpler Mysql load test.
 r3285@ks:  jeremy | 2005-11-22 13:33:04 -0800
 Apply [3162] to stable.  Model generator: correct relative path to test_helper in unit test.
 r3296@ks:  jeremy | 2005-11-23 13:38:56 -0800
 Apply [3170] to stable.  Credit ticket author.  References #2888.
 r3303@ks:  jeremy | 2005-11-23 17:14:31 -0800
 Apply [3051], [3052], [3053], [3059] to stable.  Brings the Firebird adapter to 1.0.  References #1874.
 r3305@ks:  jeremy | 2005-11-23 17:33:51 -0800
 Apply [3151] to stable.  Don't put flash in session if sessions are disabled.
 r3306@ks:  jeremy | 2005-11-23 17:39:24 -0800
 Apply [3100], [3108] to stable.  Makes new ActiveRecordStore sessions work correctly with components.
 r3307@ks:  jeremy | 2005-11-23 17:52:14 -0800
 Apply [3110] to stable.  PostgreSQL: the purge_test_database Rake task shouldn't explicitly specify the template0 template when creating a fresh test database.  References #2964.
 r3313@ks:  jeremy | 2005-11-23 23:03:36 -0800
 Apply [3182] to stable.  Reloading a model doesn't lose track of its connection.  Closes #2996.
 r3315@ks:  jeremy | 2005-11-23 23:13:48 -0800
 Apply [3184] to stable.  SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find.  Closes #2974.
 r3339@ks:  jeremy | 2005-12-01 17:03:16 -0800
 Apply [3202] to stable.  Firebird: updated for FireRuby 0.4.0.  Closes #3009.
 r3363@ks:  jeremy | 2005-12-06 22:26:27 -0800
 Apply #428 changesets to stable: r3000, r3001, r3002, r3025, r3045, r3096, r3148, r3152, r3165, r3189, r3195, r3205, r3216, r3219, r3221, r3222.  Closes #428.
 r3372@ks:  jeremy | 2005-12-07 20:25:20 -0800
 Apply [3233] to stable.  Oracle: use syntax compatible with Oracle 8.  Closes #3131.
 r3375@ks:  jeremy | 2005-12-07 20:36:13 -0800
 Apply [3235] to stable.  PostgreSQL: more robust sequence name discovery.  Closes #3087.
 r3378@ks:  jeremy | 2005-12-07 20:41:47 -0800
 Apply [3237] to stable.  More robust relative url root discovery for SCGI compatibility.  This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint.  Closes #3070.
 r3379@ks:  jeremy | 2005-12-07 20:42:31 -0800
 Don't warn on keep_flash in test.
 r3387@ks:  jeremy | 2005-12-07 20:48:42 -0800
 Apply [3242] to stable.  Reloading an instance refreshes its aggregations as well as its associations.  Closes #3024.
 r3389@ks:  jeremy | 2005-12-07 20:52:39 -0800
 Apply [3244] to stable.  SQLite: find database file when RAILS_ROOT is a symlink.  Closes #3116.
 r3392@ks:  jeremy | 2005-12-07 21:10:42 -0800
 Apply [3246] to stable.  MySQL: more robust test for nullified result hashes.  Closes #3124.
 r3401@ks:  jeremy | 2005-12-07 23:30:11 -0800
 Apply [3252] to stable.  Oracle: active? performs a select instead of a commit.  Closes #3133.
 r3404@ks:  jeremy | 2005-12-08 15:24:44 -0800
 Apply [3254] to stable.  Fix some test failures due to MySQL assumptions.  References #3149.
 r3407@ks:  jeremy | 2005-12-09 10:39:00 -0800
 Apply [3256] to stable.  Generator copies files in binary mode.  Closes #3156.
 r3410@ks:  jeremy | 2005-12-09 10:48:32 -0800
 Apply [3258] to stable.  Fix shebang handling for empty files.  Closes #2927.
 r3413@ks:  jeremy | 2005-12-09 15:03:42 -0800
 Apply [3260] to stable.  Fix bundled mysql.rb to correctly check for PROTO_41.  Fixed scramble41 with nil password.  Fixed change_user with PROTO_41.
 r3416@ks:  jeremy | 2005-12-09 15:07:21 -0800
 Apply [3262] to stable.  Generator looks in vendor/generators also.
 r3419@ks:  jeremy | 2005-12-09 15:36:50 -0800
 Apply [3165] to stable. MySQL, PostgreSQL: reconnect! also reconfigures the connection. Otherwise, the connection 'loses' its settings if it times out and is reconnected. References #2978.
 r3420@ks:  jeremy | 2005-12-09 15:38:30 -0800
 Apply [3264] to stable.  MySQL: ensure that @config is set.
 r3421@ks:  jeremy | 2005-12-09 15:42:40 -0800
 Apply [3265] to stable.  Name vendor/generators source differently from lib/generators source.
 r3429@ks:  jeremy | 2005-12-09 16:55:16 -0800
 Apply [3270] SQLServer rollup to stable.
 r3435@ks:  jeremy | 2005-12-10 13:40:43 -0800
 Apply [3274] to stable.  MySQL: fixes for the bundled mysql.rb driver.  Closes #3160.
 r3457@ks:  jeremy | 2005-12-13 08:52:39 -0800
 Apply [3293] to stable.  MySQL: allow encoding option for mysql.rb driver.
 r3458@ks:  jeremy | 2005-12-13 09:33:50 -0800
 Roll back [3245] on stable.  References #3116.
 r3465@ks:  jeremy | 2005-12-13 10:15:33 -0800
 Apply [3298] to stable.  Don't used defined? on a scoped constant since it results in a const_missing call.
 r3724@ks:  jeremy | 2006-02-09 10:13:41 -0800
 Apply [3554] to stable. PostgreSQL: correctly parse negative integer column defaults. Closes #3776.
 r3730@ks:  jeremy | 2006-02-09 11:42:57 -0800
 Apply [3559] to stable. Closes #3581.
 r3846@ks:  jeremy | 2006-02-26 15:24:58 -0800
 silence test/unit whining DefaultsTest is empty
 r3847@ks:  jeremy | 2006-02-26 15:26:53 -0800
 Apply [3674] to stable. Closes #3591.
 r4960@ks:  jeremy | 2006-08-06 23:56:18 -0700
 Merged to stable: change the request.env example in AC::Base docs to a var that exists (REMOTE_IP doesn't) and isn't already wrapped by a request method (i.e. request.remote_ip). References #5113.
 r4961@ks:  jeremy | 2006-08-07 00:11:59 -0700
 Merged to stable: add :status option to send_data and send_file. Defaults to '200 OK'. References #5243.
 r4962@ks:  jeremy | 2006-08-07 00:18:42 -0700
 Merged to stable: real files and symlinks should be treated the same when compiling templates. References #5438.
 r4963@ks:  jeremy | 2006-08-07 00:26:42 -0700
 Merged to stable: Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled. References #1897.
 r4964@ks:  jeremy | 2006-08-07 00:33:32 -0700
 Merged to stable: correct spurious documentation example code which results in a SyntaxError. References [4210].
 r4965@ks:  jeremy | 2006-08-07 00:38:04 -0700
 Merged to stable: remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for. References [4215].
 r4966@ks:  jeremy | 2006-08-07 00:48:40 -0700
 Merged to stable: update inconsistent migrations documentation. References #4683.
 r4967@ks:  jeremy | 2006-08-07 00:52:34 -0700
 Merge to stable: cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. References [4256].
 r4968@ks:  jeremy | 2006-08-07 00:55:51 -0700
 Merge to stable: only require redcloth/bluecloth if they are not already loaded. References [4257].
 r4977@ks:  jeremy | 2006-08-07 01:08:02 -0700
 Merge to stable: skip silence stderr test if we can't STDERR.tell
 r4978@ks:  jeremy | 2006-08-07 01:13:00 -0700
 Merge to stable: update layout and content_for documentation to use yield rather than magic @content_for_layout instance variables. References [4263].
 r4979@ks:  jeremy | 2006-08-07 01:16:43 -0700
 Merge to stable: add documentation for redirect_to :back's RedirectBackError exception; remove all remaining references to @params in the documentation. References [4267], [4268].
 r4980@ks:  jeremy | 2006-08-07 01:18:04 -0700
 Merge to stable: fix documentation indentation.
 r4981@ks:  jeremy | 2006-08-07 01:28:34 -0700
 Merge to stable: mention in docs that config.frameworks doesn't work when getting Rails via Gems; documentation for AbstractRequest.  References #4857, #4895.
 r4982@ks:  jeremy | 2006-08-07 01:45:26 -0700
 Merge to stable: fix syntax error in documentation. References #4679.
 r4983@ks:  jeremy | 2006-08-07 01:50:47 -0700
 Merge to stable: Enhance documentation for setting headers in integration tests. Skip auto HTTP prepending when its already there. References #4079.  Add warning about the proper way to validate the presence of a foreign key. References #4147.
 r4984@ks:  jeremy | 2006-08-07 02:08:00 -0700
 Merge to stable: ActionController::Base Summary documentation rewrite; Fix text_helper.rb documentation rendering; Fixes bad rendering of JavaScriptMacrosHelper rdoc.  References #4725, #4900, #4910.
 r4985@ks:  jeremy | 2006-08-07 02:14:18 -0700
 Merge to stable: documentation fix: integration test scripts don't require integration_test. References #4914.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4708 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>76269e6f71a8e4b2bc1be9821fc795f191ba96e0</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>817ace4d103a0c9e0d87f92584fbe209800ba80f</id>
      </parent>
    </parents>
    <author>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </author>
    <url>http://github.com/henrik/rails/commit/140e85c7246bf21613f6af1cee6d113dddfa552f</url>
    <id>140e85c7246bf21613f6af1cee6d113dddfa552f</id>
    <committed-date>2006-08-06T23:26:39-07:00</committed-date>
    <authored-date>2006-08-06T23:26:39-07:00</authored-date>
    <message>Fix generate usage argument order. Backported from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4704 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b201b20be7a68930a87566cd91dd00bdf9ff793c</tree>
    <committer>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>171aa5c4c1ede63335902b073a22d56ae9cbbf97</id>
      </parent>
    </parents>
    <author>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </author>
    <url>http://github.com/henrik/rails/commit/817ace4d103a0c9e0d87f92584fbe209800ba80f</url>
    <id>817ace4d103a0c9e0d87f92584fbe209800ba80f</id>
    <committed-date>2006-08-06T23:25:01-07:00</committed-date>
    <authored-date>2006-08-06T23:25:01-07:00</authored-date>
    <message>Fix announcement of very long migration names.  #5722 [blake@near-time.com] Backported from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>89af27d35a76f476993706fdfecc8bc48645ef1f</tree>
    <committer>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fc1ded46e7e9665cc130681e3a9214295043225d</id>
      </parent>
    </parents>
    <author>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </author>
    <url>http://github.com/henrik/rails/commit/171aa5c4c1ede63335902b073a22d56ae9cbbf97</url>
    <id>171aa5c4c1ede63335902b073a22d56ae9cbbf97</id>
    <committed-date>2006-08-06T23:21:32-07:00</committed-date>
    <authored-date>2006-08-06T23:21:32-07:00</authored-date>
    <message>Update callbacks documentation. #3970 [Robby Russell &lt;robby@planetargon.com&gt;]  Merge doc patches with stable.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4702 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>5e6eec7899993c1422dca5173ad1a37f0082cd6e</tree>
    <committer>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>33bc251ede4f77c4343af83d8996a37af646ccd1</id>
      </parent>
    </parents>
    <author>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </author>
    <url>http://github.com/henrik/rails/commit/fc1ded46e7e9665cc130681e3a9214295043225d</url>
    <id>fc1ded46e7e9665cc130681e3a9214295043225d</id>
    <committed-date>2006-08-06T23:18:33-07:00</committed-date>
    <authored-date>2006-08-06T23:18:33-07:00</authored-date>
    <message>Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net] Merge doc patches with stable.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>0505999e90059736a599fe96b33cff80ee6799fc</tree>
    <committer>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e7e464a97fe52d5ac0712c29d38637bab644ca2d</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/33bc251ede4f77c4343af83d8996a37af646ccd1</url>
    <id>33bc251ede4f77c4343af83d8996a37af646ccd1</id>
    <committed-date>2006-08-06T23:09:18-07:00</committed-date>
    <authored-date>2006-08-06T23:09:18-07:00</authored-date>
    <message>that wasnt me

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e5895e074c4c33072bf629dea58b8389fe711530</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4fd92b6fc376fb29198544316b47dacfe09581a5</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/e7e464a97fe52d5ac0712c29d38637bab644ca2d</url>
    <id>e7e464a97fe52d5ac0712c29d38637bab644ca2d</id>
    <committed-date>2006-08-06T23:02:41-07:00</committed-date>
    <authored-date>2006-08-06T23:02:41-07:00</authored-date>
    <message>cleanup comments

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4696 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>425766d463812ad41f81194bb8088694cf5f43e4</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>14ed31db219dd9ed6bc11fab181c8e1b42700c30</id>
      </parent>
    </parents>
    <author>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </author>
    <url>http://github.com/henrik/rails/commit/4fd92b6fc376fb29198544316b47dacfe09581a5</url>
    <id>4fd92b6fc376fb29198544316b47dacfe09581a5</id>
    <committed-date>2006-08-06T22:50:26-07:00</committed-date>
    <authored-date>2006-08-06T22:50:26-07:00</authored-date>
    <message>Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]. Merge doc patches with stable.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4695 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>d89fc87cb184bd45259f10c08fe1040706b06ad6</tree>
    <committer>
      <name>Marcel Molina</name>
      <email>marcel@vernix.org</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2699e58eb53956059a17d932dbd37f01447931c5</id>
      </parent>
    </parents>
    <author>
      <name>Tobias L&#252;tke</name>
      <email>tobias.luetke@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/14ed31db219dd9ed6bc11fab181c8e1b42700c30</url>
    <id>14ed31db219dd9ed6bc11fab181c8e1b42700c30</id>
    <committed-date>2006-08-06T22:34:21-07:00</committed-date>
    <authored-date>2006-08-06T22:34:21-07:00</authored-date>
    <message>Mailer template root applies to a class and its subclasses rather than acting globally.

Allows to have two mailers in the application which have the same action names. 


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4694 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>97be7f5423ded7b855433c4c07f1891f664c3b24</tree>
    <committer>
      <name>Tobias L&#252;tke</name>
      <email>tobias.luetke@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f21bfe917cad2fecd6195b2bfe058a00da3d8769</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/2699e58eb53956059a17d932dbd37f01447931c5</url>
    <id>2699e58eb53956059a17d932dbd37f01447931c5</id>
    <committed-date>2006-08-06T22:26:11-07:00</committed-date>
    <authored-date>2006-08-06T22:26:11-07:00</authored-date>
    <message>Mention Reload when talking about console. Merging docs patches to stable

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4693 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>1c31d7b8b29271452a0ed2712e5d0870ba8f0af8</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>14f11a73ed8cd50fa9075e3f068feaf3b89686ba</id>
      </parent>
    </parents>
    <author>
      <name>Jamis Buck</name>
      <email>jamis@37signals.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/f21bfe917cad2fecd6195b2bfe058a00da3d8769</url>
    <id>f21bfe917cad2fecd6195b2bfe058a00da3d8769</id>
    <committed-date>2006-07-27T12:05:58-07:00</committed-date>
    <authored-date>2006-07-27T12:05:58-07:00</authored-date>
    <message>Add a test to stable to show that the sql injection vulnerability does not apply


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>7948cc61231cc2ab4c46853e695aeb0cfa1a54e0</tree>
    <committer>
      <name>Jamis Buck</name>
      <email>jamis@37signals.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bd01d408a641c0ab3aec440dc26077abfeba164f</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/14f11a73ed8cd50fa9075e3f068feaf3b89686ba</url>
    <id>14f11a73ed8cd50fa9075e3f068feaf3b89686ba</id>
    <committed-date>2006-06-29T20:15:42-07:00</committed-date>
    <authored-date>2006-06-29T20:15:42-07:00</authored-date>
    <message>Allow Rails controllers in too

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4520 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>098b279414d47e111dd4d828517e454ec2157bb3</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c53ae000bf9574bfc4eceaed2f42f8b2418ddbc5</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/bd01d408a641c0ab3aec440dc26077abfeba164f</url>
    <id>bd01d408a641c0ab3aec440dc26077abfeba164f</id>
    <committed-date>2006-06-29T19:38:31-07:00</committed-date>
    <authored-date>2006-06-29T19:38:31-07:00</authored-date>
    <message>Prepare for 1.1.4 release

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>8a845087260fe9b7b913aac70941c80a7d166ee9</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>51f3283ef317f7a8e2e52a816703b2e1d61106c8</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/c53ae000bf9574bfc4eceaed2f42f8b2418ddbc5</url>
    <id>c53ae000bf9574bfc4eceaed2f42f8b2418ddbc5</id>
    <committed-date>2006-06-29T13:35:26-07:00</committed-date>
    <authored-date>2006-06-29T13:35:26-07:00</authored-date>
    <message>Remove use of opts.on { |options[:name] } hash assignment. References #4440.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4513 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>c1c7a852606482ce46d061eaed7e688bd09b0b1f</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0c516b370b08e3e095fe24cc0e2b8d52fdecf9e0</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/51f3283ef317f7a8e2e52a816703b2e1d61106c8</url>
    <id>51f3283ef317f7a8e2e52a816703b2e1d61106c8</id>
    <committed-date>2006-06-28T11:11:35-07:00</committed-date>
    <authored-date>2006-06-28T11:11:35-07:00</authored-date>
    <message>Fix broken traverse_to_controller

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4501 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>2a0ded09a408cbf167b3169f16038b39e433fac5</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>755ff58d568276c194d92c110873040d558a2f2d</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/0c516b370b08e3e095fe24cc0e2b8d52fdecf9e0</url>
    <id>0c516b370b08e3e095fe24cc0e2b8d52fdecf9e0</id>
    <committed-date>2006-06-27T12:01:06-07:00</committed-date>
    <authored-date>2006-06-27T12:01:06-07:00</authored-date>
    <message>Use real date

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4496 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>39348ebf8914ac740cb5af8c2c26a28ae6134f69</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>83af5feefa1edf4bcbf54fda6a396e41f259f14f</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/755ff58d568276c194d92c110873040d558a2f2d</url>
    <id>755ff58d568276c194d92c110873040d558a2f2d</id>
    <committed-date>2006-06-24T08:28:56-07:00</committed-date>
    <authored-date>2006-06-24T08:28:56-07:00</authored-date>
    <message>Made ready for release

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4488 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>88c029a66b2c8c9a982c08460f06f69fe98c8106</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5b8b77e07e505ea380dffe660b7c6193818acab0</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/83af5feefa1edf4bcbf54fda6a396e41f259f14f</url>
    <id>83af5feefa1edf4bcbf54fda6a396e41f259f14f</id>
    <committed-date>2006-06-23T17:56:26-07:00</committed-date>
    <authored-date>2006-06-23T17:56:26-07:00</authored-date>
    <message>Add test file that should never be loaded

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4487 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>3369b51713e5a8a0e56cdbdbcd6c228752880c22</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4e2dcbfb150d8eda0c379946c1c0dbb5b7af714d</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/5b8b77e07e505ea380dffe660b7c6193818acab0</url>
    <id>5b8b77e07e505ea380dffe660b7c6193818acab0</id>
    <committed-date>2006-06-18T14:42:56-07:00</committed-date>
    <authored-date>2006-06-18T14:42:56-07:00</authored-date>
    <message>...

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e98cf0668aeba8c83d2f1b784e4d80b18d9f6a12</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a12aabc450a0ff19dfc2238b6fec9fdb09f868be</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/4e2dcbfb150d8eda0c379946c1c0dbb5b7af714d</url>
    <id>4e2dcbfb150d8eda0c379946c1c0dbb5b7af714d</id>
    <committed-date>2006-06-17T22:25:17-07:00</committed-date>
    <authored-date>2006-06-17T22:25:17-07:00</authored-date>
    <message>Refinement to avoid exceptions in traverse_to_controller

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4457 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>a1ed7ac8a4d9d7fd581e6bc290b85625fcff33db</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bf150f0c3a250c1e1cc1f275b6ae98bb76827065</id>
      </parent>
    </parents>
    <author>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/a12aabc450a0ff19dfc2238b6fec9fdb09f868be</url>
    <id>a12aabc450a0ff19dfc2238b6fec9fdb09f868be</id>
    <committed-date>2006-06-17T21:39:42-07:00</committed-date>
    <authored-date>2006-06-17T21:39:42-07:00</authored-date>
    <message>Fix loading of arbitrary files in ruby's load path by traverse_to_controller.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4456 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>f4539f95660ca71146b7c1cb3322a85d9892faca</tree>
    <committer>
      <name>Nicholas Seckar</name>
      <email>nseckar@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a9ad634dbc7b2810dffa98079b0d7193be7a4f4f</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/bf150f0c3a250c1e1cc1f275b6ae98bb76827065</url>
    <id>bf150f0c3a250c1e1cc1f275b6ae98bb76827065</id>
    <committed-date>2006-04-19T19:48:53-07:00</committed-date>
    <authored-date>2006-04-19T19:48:53-07:00</authored-date>
    <message>applying to stable: Properly quote index names in migrations (closes #4764) [John Long]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>2e566fd04307a706e2170ff6b7a2c13f799de4cf</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>982d187691a894f6432ed258d5334c6e4f799c36</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/a9ad634dbc7b2810dffa98079b0d7193be7a4f4f</url>
    <id>a9ad634dbc7b2810dffa98079b0d7193be7a4f4f</id>
    <committed-date>2006-04-19T10:34:49-07:00</committed-date>
    <authored-date>2006-04-19T10:34:49-07:00</authored-date>
    <message>applying to stable: Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>dabdfc5a77f567dbca94a75fefadb1ef37015211</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8118c486bc1bd061c19c95e9d6b5fa721c9c81f6</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/982d187691a894f6432ed258d5334c6e4f799c36</url>
    <id>982d187691a894f6432ed258d5334c6e4f799c36</id>
    <committed-date>2006-04-19T10:28:05-07:00</committed-date>
    <authored-date>2006-04-19T10:28:05-07:00</authored-date>
    <message>applying to stable: Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4233 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>530010b6e3b72552646e23cef060a257fa493dd5</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4363bd02391cf43bfd48faaebff5486209b7f93b</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/8118c486bc1bd061c19c95e9d6b5fa721c9c81f6</url>
    <id>8118c486bc1bd061c19c95e9d6b5fa721c9c81f6</id>
    <committed-date>2006-04-14T07:14:27-07:00</committed-date>
    <authored-date>2006-04-14T07:14:27-07:00</authored-date>
    <message>Modify ActiveRecord::Base.count so it shares the same signature as #calculate, but maintains backwards compatibility.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>a5c192d12ca1fa3746483f1a1b343ff5004f1cd2</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ebad525e0e62bb8f0d7ebe38e4c9b1760a38216</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/4363bd02391cf43bfd48faaebff5486209b7f93b</url>
    <id>4363bd02391cf43bfd48faaebff5486209b7f93b</id>
    <committed-date>2006-04-09T15:14:08-07:00</committed-date>
    <authored-date>2006-04-09T15:14:08-07:00</authored-date>
    <message>Use Aras RubyForge uploader

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4204 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>1706ddd7961c1002181c26f5c1482f9b16b13bc9</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b5c3570ff1b6ec14ac9a29ccd6f99e7536dff6e8</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/2ebad525e0e62bb8f0d7ebe38e4c9b1760a38216</url>
    <id>2ebad525e0e62bb8f0d7ebe38e4c9b1760a38216</id>
    <committed-date>2006-04-09T14:27:32-07:00</committed-date>
    <authored-date>2006-04-09T14:27:32-07:00</authored-date>
    <message>Include the calculations fix for a new release of AR

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b50d4b7eed0ff35a1bd8af9ee631d92661b0dcc8</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>83824935518f62cee9cc1c120b125085072f583c</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/b5c3570ff1b6ec14ac9a29ccd6f99e7536dff6e8</url>
    <id>b5c3570ff1b6ec14ac9a29ccd6f99e7536dff6e8</id>
    <committed-date>2006-04-09T14:09:45-07:00</committed-date>
    <authored-date>2006-04-09T14:09:45-07:00</authored-date>
    <message>Prepare for tiny release of 1.1.2

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4202 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>be64b9c3f5d13fc6fbbf3e97df6d2a7edcc30e0d</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a60ecc15713fe52576f6cfdec4d72990e0afe681</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/henrik/rails/commit/83824935518f62cee9cc1c120b125085072f583c</url>
    <id>83824935518f62cee9cc1c120b125085072f583c</id>
    <committed-date>2006-04-07T11:29:43-07:00</committed-date>
    <authored-date>2006-04-07T11:29:43-07:00</authored-date>
    <message>RAILS_ROOT, please

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>f343e131567d92891cef1d352a91a1bdda0b61df</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
</commits>
