From f3da46effae9f23f6ea473f7296e9c0c9bb49fce Mon Sep 17 00:00:00 2001
From: miloops <miloops@gmail.com>
Date: Thu, 31 Jul 2008 16:09:18 -0300
Subject: In javascript helpers option[:type] = :synchronous should work as
 described in docs.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 actionpack/lib/action_view/helpers/prototype_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index 5194f00382..4c3a8311a5 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -111,7 +111,7 @@ module ActionView
                          (100..599).to_a)
         AJAX_OPTIONS = Set.new([ :before, :after, :condition, :url,
                          :asynchronous, :method, :insertion, :position,
-                         :form, :with, :update, :script ]).merge(CALLBACKS)
+                         :form, :with, :update, :script, :type ]).merge(CALLBACKS)
       end
 
       # Returns a link to a remote action defined by <tt>options[:url]</tt>
-- 
cgit v1.2.3


From 656f0e7c6c9a305abaf9f9b7fb80479b6f94efce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Thu, 31 Jul 2008 16:36:23 -0500
Subject: Fix file permissions

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 actionpack/lib/action_controller.rb                    | 0
 actionpack/lib/action_controller/base.rb               | 0
 actionpack/lib/action_controller/request.rb            | 0
 actionpack/lib/action_controller/request_profiler.rb   | 0
 actionpack/lib/action_controller/response.rb           | 0
 actionpack/lib/action_controller/session/drb_server.rb | 0
 actionpack/lib/action_view/helpers/date_helper.rb      | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 actionpack/lib/action_controller.rb
 mode change 100755 => 100644 actionpack/lib/action_controller/base.rb
 mode change 100755 => 100644 actionpack/lib/action_controller/request.rb
 mode change 100755 => 100644 actionpack/lib/action_controller/request_profiler.rb
 mode change 100755 => 100644 actionpack/lib/action_controller/response.rb
 mode change 100644 => 100755 actionpack/lib/action_controller/session/drb_server.rb
 mode change 100755 => 100644 actionpack/lib/action_view/helpers/date_helper.rb

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
old mode 100755
new mode 100644
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
old mode 100755
new mode 100644
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
old mode 100755
new mode 100644
diff --git a/actionpack/lib/action_controller/request_profiler.rb b/actionpack/lib/action_controller/request_profiler.rb
old mode 100755
new mode 100644
diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb
old mode 100755
new mode 100644
diff --git a/actionpack/lib/action_controller/session/drb_server.rb b/actionpack/lib/action_controller/session/drb_server.rb
old mode 100644
new mode 100755
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 0b9bfbdebf402f4a149359a069dbeb05ea989b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarmo=20T=C3=A4nav?= <tarmo@itech.ee>
Date: Thu, 31 Jul 2008 16:39:48 -0500
Subject: Use "/usr/bin/env ruby" instead of "/usr/local/bin/ruby"

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 actionpack/lib/action_controller/session/drb_server.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/session/drb_server.rb b/actionpack/lib/action_controller/session/drb_server.rb
index 6f90db6747..2caa27f62a 100755
--- a/actionpack/lib/action_controller/session/drb_server.rb
+++ b/actionpack/lib/action_controller/session/drb_server.rb
@@ -1,8 +1,8 @@
-#!/usr/local/bin/ruby -w
-                                                                                
-# This is a really simple session storage daemon, basically just a hash, 
+#!/usr/bin/env ruby
+
+# This is a really simple session storage daemon, basically just a hash,
 # which is enabled for DRb access.
-                                                                                
+
 require 'drb'
 
 session_hash = Hash.new
@@ -14,13 +14,13 @@ class <<session_hash
       super(key, value)
     end
   end
-  
+
   def [](key)
     @mutex.synchronize do
       super(key)
     end
   end
-  
+
   def delete(key)
     @mutex.synchronize do
       super(key)
@@ -29,4 +29,4 @@ class <<session_hash
 end
 
 DRb.start_service('druby://127.0.0.1:9192', session_hash)
-DRb.thread.join
\ No newline at end of file
+DRb.thread.join
-- 
cgit v1.2.3