deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sync with latest Instiki trunk. Changes:

Browse source 
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:
Jacques Distler 2007-03-18 11:56:12 -05:00
parent ff3e03a45a
commit 7adac51d6d
68 changed files with 466 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/rails/railties/lib/commands/process/inspector.rb vendored
View file

@ -1,6 +1,6 @@
require 'optparse'
if RUBY_PLATFORM =~ /mswin32/ then abort("Inspector is only for Unix") end
if RUBY_PLATFORM =~ /(:?mswin|mingw)/ then abort("Inspector is only for Unix") end
OPTIONS = {
:pid_path => File.expand_path(RAILS_ROOT + '/tmp/pids'),
@ -65,4 +65,4 @@ ARGV.options do |opts|
opts.parse!
end
Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])
Inspector.inspect(OPTIONS[:pid_path], OPTIONS[:pattern])