<video> and x-sendfile

Using <object> and <embed> were forbidden for obvious
security reasons. Instiki now permits embedding video
via the HTML5 <video> element (Ogg/Theora encoded videos
only, with .ogg or .ogv extensions). You can even upload
videos with

    [[foo.ogg:video]]

Instiki now support x-sendfile. See the Proxying page for
configuring Apache (with the x-sendfile module). Lighttpd
should work similarly.

Update Rails to latest Edge (hopefully converging on RC2!).
This commit is contained in:
Jacques Distler 2009-03-02 02:32:25 -06:00
parent 133c21b801
commit 8ea8b6a8f7
45 changed files with 872 additions and 751 deletions

View file

@ -72,13 +72,14 @@ module Rails
rescue Gem::LoadError
end
def dependencies
return [] if framework_gem?
return [] if specification.nil?
def dependencies(options = {})
return [] if framework_gem? || specification.nil?
all_dependencies = specification.dependencies.map do |dependency|
GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
end
all_dependencies += all_dependencies.map(&:dependencies).flatten
all_dependencies += all_dependencies.map { |d| d.dependencies(options) }.flatten if options[:flatten]
all_dependencies.uniq
end
@ -149,6 +150,8 @@ module Rails
end
def unpack_to(directory)
return if specification.nil? || File.directory?(gem_dir(directory)) || framework_gem?
FileUtils.mkdir_p directory
Dir.chdir directory do
Gem::GemRunner.new.run(unpack_command)