diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 7f608e49..a126f845 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -63,6 +63,7 @@ class ApplicationController < ActionController::Base def send_file(file, options = {}) options[:type] ||= (FILE_TYPES[File.extname(file)] || 'application/octet-stream') + options[:stream] = false super(file, options) end diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 81624733..d0b825bf 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -1,6 +1,7 @@ require 'fileutils' require 'redcloth_for_tex' require 'parsedate' +require 'zip/zip' class WikiController < ApplicationController