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
|
@ -1,4 +1,4 @@
|
|||
irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
|
||||
irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
|
||||
|
||||
require 'optparse'
|
||||
options = { :sandbox => false, :irb => irb }
|
||||
|
|
11
vendor/rails/railties/lib/commands/plugin.rb
vendored
11
vendor/rails/railties/lib/commands/plugin.rb
vendored
|
@ -240,11 +240,12 @@ class Plugin
|
|||
def install_using_http(options = {})
|
||||
root = rails_env.root
|
||||
mkdir_p "#{root}/vendor/plugins"
|
||||
Dir.chdir "#{root}/vendor/plugins"
|
||||
puts "fetching from '#{uri}'" if $verbose
|
||||
fetcher = RecursiveHTTPFetcher.new(uri)
|
||||
fetcher.quiet = true if options[:quiet]
|
||||
fetcher.fetch
|
||||
Dir.chdir "#{root}/vendor/plugins" do
|
||||
puts "fetching from '#{uri}'" if $verbose
|
||||
fetcher = RecursiveHTTPFetcher.new(uri)
|
||||
fetcher.quiet = true if options[:quiet]
|
||||
fetcher.fetch
|
||||
end
|
||||
end
|
||||
|
||||
def svn_command(cmd, options = {})
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -92,7 +92,7 @@ server = case ARGV.first
|
|||
else
|
||||
if defined?(Mongrel)
|
||||
"mongrel"
|
||||
elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
|
||||
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `spawn-fcgi -version` }.blank? && defined?(FCGI)
|
||||
"fcgi"
|
||||
end
|
||||
end
|
||||
|
@ -206,4 +206,4 @@ if OPTIONS[:repeat]
|
|||
end
|
||||
else
|
||||
spawner_class.spawn_all
|
||||
end
|
||||
end
|
||||
|
|
2
vendor/rails/railties/lib/commands/server.rb
vendored
2
vendor/rails/railties/lib/commands/server.rb
vendored
|
@ -19,7 +19,7 @@ server = case ARGV.first
|
|||
else
|
||||
if defined?(Mongrel)
|
||||
"mongrel"
|
||||
elsif RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
|
||||
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
|
||||
"lighttpd"
|
||||
else
|
||||
"webrick"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue