Sync with latest Instiki trunk. Changes:
1) Upgrade Rails to 1.2.3 2) Revert RedCloth to previous version (who %#$@ cares?) 3) Preserve the Rails Security fix to vendor/rails/actionpack/lib/action_controller/caching.rb from Revision 80.
This commit is contained in:
parent
ff3e03a45a
commit
7adac51d6d
68 changed files with 466 additions and 257 deletions
|
@ -2,7 +2,7 @@ require 'optparse'
|
|||
require 'net/http'
|
||||
require 'uri'
|
||||
|
||||
if RUBY_PLATFORM =~ /mswin32/ then abort("Reaper is only for Unix") end
|
||||
if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Reaper is only for Unix") end
|
||||
|
||||
class Killer
|
||||
class << self
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue