Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
a14db81b79
16 changed files with 30 additions and 20 deletions
|
@ -10,7 +10,7 @@ require 'wiki_controller'
|
|||
require 'rexml/document'
|
||||
require 'tempfile'
|
||||
require 'zip/zipfilesystem'
|
||||
require 'stringsupport'
|
||||
require 'instiki_stringsupport'
|
||||
|
||||
# Raise errors beyond the default web-based presentation
|
||||
class WikiController; def rescue_action(e) logger.error(e); raise e end; end
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
require File.expand_path(File.join(File.dirname(__FILE__), '/../test_helper'))
|
||||
require 'sanitizer'
|
||||
require 'json'
|
||||
require 'stringsupport'
|
||||
require 'instiki_stringsupport'
|
||||
|
||||
class SanitizerTest < Test::Unit::TestCase
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue