From e4569b50d1d20f52633a3fe036014acd5117fa73 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sat, 25 Feb 2012 01:29:00 +0400
Subject: Add instance_accessor option to class_attribute

---
 actionpack/lib/abstract_controller/layouts.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack/lib/abstract_controller')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index bc9f6fc3e8..c1b3994035 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -203,8 +203,7 @@ module AbstractController
     include Rendering
 
     included do
-      class_attribute :_layout, :_layout_conditions,
-        :instance_reader => false, :instance_writer => false
+      class_attribute :_layout, :_layout_conditions, :instance_accessor => false
       self._layout = nil
       self._layout_conditions = {}
       _write_layout_method
-- 
cgit v1.2.3


From 2642c2961cda2074cc1495a4635898ca8ab33adf Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 23 May 2012 22:42:49 +0530
Subject: copy edit[ci skip]

---
 actionpack/lib/abstract_controller/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/abstract_controller')

diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 32ec7ced0f..9c3960961b 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -141,7 +141,7 @@ module AbstractController
     #
     # Notice that <tt>action_methods.include?("foo")</tt> may return
     # false and <tt>available_action?("foo")</tt> returns true because
-    # available action consider actions that are also available
+    # this method considers actions that are also available
     # through other means, for example, implicit render ones.
     #
     # ==== Parameters
-- 
cgit v1.2.3


From 1ad0b378cc081937c117577ab628f2160fcc448d Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 23 May 2012 22:43:08 +0530
Subject: Revert "Remove blank trailing comments"

This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.

Reason: Not a fan of such massive changes. We usually close such changes
if made to Rails master as a pull request. Following the same principle
here and reverting.

[ci skip]
---
 actionpack/lib/abstract_controller/helpers.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack/lib/abstract_controller')

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 529f920e6c..4e0672d590 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -90,6 +90,7 @@ module AbstractController
       # +symbols+, +strings+, +modules+ and blocks.
       #
       #   helper(:three, BlindHelper) { def mice() 'mice' end }
+      #
       def helper(*args, &block)
         modules_for_helpers(args).each do |mod|
           add_template_helper(mod)
-- 
cgit v1.2.3