From e9eb30fae4f0a9645bcc258fa515182a29e72998 Mon Sep 17 00:00:00 2001
From: Rncrtr <me@rncrtr.in>
Date: Thu, 18 Apr 2013 14:25:27 -0600
Subject: fixed typo in select_tag docs

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 8abd5d6e9c..c10566a87d 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -81,7 +81,7 @@ module ActionView
       # ==== Options
       # * <tt>:multiple</tt> - If set to true the selection will allow multiple choices.
       # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
-      # * <tt>:include_blank</tt> - If set to true, an empty option will be create
+      # * <tt>:include_blank</tt> - If set to true, an empty option will be created.
       # * <tt>:prompt</tt> - Create a prompt option with blank value and the text asking user to select something
       # * Any other key creates standard HTML attributes for the tag.
       #
-- 
cgit v1.2.3


From 47bf072330f4b62a125d7e93b8a11c8d92c84387 Mon Sep 17 00:00:00 2001
From: Junya Ogura <junyaogura@gmail.com>
Date: Mon, 6 May 2013 06:15:08 +0900
Subject: Fix typo in documentation comment

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 693b6bdfcc..3a6f449eb8 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -155,7 +155,7 @@ module ActionView
       # ==== Examples
       #
       #   favicon_link_tag '/myicon.ico'
-      #   # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   # => <link href="/assets/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # Mobile Safari looks for a different <link> tag, pointing to an image that
       # will be used if you add the page to the home screen of an iPod Touch, iPhone, or iPad.
-- 
cgit v1.2.3


From 584ebed482907abb3b18c65495cd62fe5f643a89 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Mon, 6 May 2013 23:25:05 +0530
Subject: remove unused variable

---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 719c9c09b5..ad26505086 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -515,7 +515,6 @@ module ActionView
           divider = options[:divider]
         else
           prompt  = options
-          options = {}
           message = "Passing the prompt to grouped_options_for_select as an argument is deprecated. " \
                     "Please use an options hash like `{ prompt: #{prompt.inspect} }`."
           ActiveSupport::Deprecation.warn message
-- 
cgit v1.2.3


From 690fd221c56bfec04cee9c94e8406b93203215ac Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Fri, 10 May 2013 11:21:58 +0530
Subject: sort => sort! on new array

---
 actionpack/lib/action_view/helpers/tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 8c7524e795..3939e4737b 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -148,7 +148,7 @@ module ActionView
               attrs << tag_option(key, value, escape)
             end
           end
-          " #{attrs.sort * ' '}".html_safe unless attrs.empty?
+          " #{attrs.sort! * ' '}".html_safe unless attrs.empty?
         end
 
         def data_tag_option(key, value, escape)
-- 
cgit v1.2.3


From 122ac9fd46d7c9ac198bf980df4f038247eb0ba5 Mon Sep 17 00:00:00 2001
From: Sean Walbran <swalbran@socialcast.com>
Date: Wed, 15 May 2013 09:07:46 -0500
Subject: restore ability to return nil from asset_host proc, add test

---
 actionpack/lib/action_view/helpers/asset_url_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/asset_url_helper.rb b/actionpack/lib/action_view/helpers/asset_url_helper.rb
index 71b78cf0b5..b5f2df76ab 100644
--- a/actionpack/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_url_helper.rb
@@ -193,7 +193,6 @@ module ActionView
         request = self.request if respond_to?(:request)
         host = config.asset_host if defined? config.asset_host
         host ||= request.base_url if request && options[:protocol] == :request
-        return unless host
 
         if host.respond_to?(:call)
           arity = host.respond_to?(:arity) ? host.arity : host.method(:call).arity
@@ -204,6 +203,8 @@ module ActionView
           host = host % (Zlib.crc32(source) % 4)
         end
 
+        return unless host
+
         if host =~ URI_REGEXP
           host
         else
-- 
cgit v1.2.3