AquaGeek

From db27581f30e07ab3ccce8609a9fc31e174ab2fd5 Mon Sep 17 00:00:00 2001
From: Brian Durand <[email protected]>
Date: Mon, 18 Apr 2011 10:22:53 -0500
Subject: [PATCH] Disambiguate attributes with similar names when deserializing errors from an array. [#6713 state:resolved]

---
 activeresource/lib/active_resource/validations.rb |    2 +-
 activeresource/test/cases/base_errors_test.rb     |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

AquaGeek

From a8ed46bfb13928a8d73350746cb96aa6b1438346 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <[email protected]>
Date: Sun, 17 Apr 2011 21:09:42 -0300
Subject: [PATCH] Class and Module are dupicable

---
 .../active_support/core_ext/object/duplicable.rb   |   12 ------------
 activesupport/test/core_ext/duplicable_test.rb     |    8 +++-----
 2 files changed, 3 insertions(+), 17 deletions(-)

AquaGeek

From b9460e17454e00ae688e7a80300cac80930bc509 Mon Sep 17 00:00:00 2001
From: Adam Holt <[email protected]>
Date: Sun, 17 Apr 2011 13:36:32 +0100
Subject: [PATCH] rake assets:compile should fail gracefully when asset pipelining not enabled

---
 railties/lib/rails/tasks/assets.rake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/railties/lib/rails/tasks/assets.rake b/railties/lib/rails/tasks/assets.rake

AquaGeek

From af612dcf8450d304551aebeb53a6835ac3951a7d Mon Sep 17 00:00:00 2001
From: jbbarth <[email protected]>
Date: Sun, 17 Apr 2011 04:03:32 +0200
Subject: [PATCH] Use the correct syntax for comment in coffeescript templates (# instead of //)

---
 .../rails/assets/templates/javascript.js.coffee    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee b/railties/lib/rails/generators/rails/assets/templates/javascript.js.coffee

AquaGeek

From ad150a73c424b9f942cc32d98c67324785b6d041 Mon Sep 17 00:00:00 2001
From: Daniel Lopes <[email protected]>
Date: Fri, 15 Apr 2011 22:35:27 -0300
Subject: [PATCH] fix select_tag to have the same behavior of select

---
 .../lib/action_view/helpers/form_tag_helper.rb     |   22 ++++++++++++++-----
 actionpack/test/template/form_tag_helper_test.rb   |   10 +++++++-
 2 files changed, 24 insertions(+), 8 deletions(-)

AquaGeek

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 3e4e7d1..80a70f9 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -720,7 +720,7 @@ module ActionMailer #:nodoc:
 
       def perform_delivery_sendmail(mail)
         sendmail_args = sendmail_settings[:arguments]
-        sendmail_args += " -f \"#{mail['return-path']}\"" if mail['return-path']
+        sendmail_args += " -f \"#{mail['return-path'].spec}\"" if mail['return-path']

AquaGeek

From 941114ae34e01d3688f840d9497017ee91e7e21f Mon Sep 17 00:00:00 2001
From: James Prior <[email protected]>
Date: Wed, 13 Apr 2011 22:17:25 -0500
Subject: [PATCH] Updating Dirty to no longer mark STI classes as changed when instantiated

---
 activerecord/lib/active_record/dirty.rb |   18 +++++++++++++-----
 activerecord/test/cases/dirty_test.rb   |   16 ++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

AquaGeek

diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 68ba1a8..8eaa085 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -15,10 +15,6 @@ module ActionDispatch
         end
       end
 
-      def content_type
-        content_mime_type && content_mime_type.to_s

AquaGeek

From 0b5a91673ee74ca6e1acbbfd53362a05de0b5907 Mon Sep 17 00:00:00 2001
From: Ryan Aipperspach <[email protected]>
Date: Thu, 7 Apr 2011 13:39:12 -0700
Subject: [PATCH] Put conditions for polymorphic joins in the ON instead of WHERE clause, in order to support OUTER JOINs

---
 .../associations/association_scope.rb              |    4 +++-
 .../join_dependency/join_association.rb            |    1 +
 .../lib/active_record/associations/join_helper.rb  |   15 +++++++++++++++
 activerecord/lib/active_record/reflection.rb       |    4 ----

AquaGeek

From a7d19910ee869ec08eeff029ef1f082e41c1ab78 Mon Sep 17 00:00:00 2001
From: Ben Orenstein <[email protected]>
Date: Thu, 7 Apr 2011 12:22:37 -0400
Subject: [PATCH] Use ActiveSupport::Concern

---
 railties/lib/rails/generators/migration.rb |    7 +++----
 railties/lib/rails/initializable.rb        |    5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)