From 83c0dbaaf2b3ad07cb45837b6b1f43839e915e9b Mon Sep 17 00:00:00 2001 From: rick Date: Thu, 3 Mar 2011 15:22:46 -0800 Subject: [PATCH] update to albino v1.3.0 --- gollum.gemspec | 2 +- lib/gollum/markup.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gollum.gemspec b/gollum.gemspec index bcea6b4f..450667b5 100644 --- a/gollum.gemspec +++ b/gollum.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency('grit', "~> 2.4.1") s.add_dependency('github-markup', [">= 0.4.0", "< 1.0.0"]) - s.add_dependency('albino', "~> 1.2.3") + s.add_dependency('albino', "~> 1.3.0") s.add_dependency('sinatra', "~> 1.0") s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"]) s.add_dependency('sanitize', "~> 2.0.0") diff --git a/lib/gollum/markup.rb b/lib/gollum/markup.rb index dbb6f4b8..2c52d1f2 100644 --- a/lib/gollum/markup.rb +++ b/lib/gollum/markup.rb @@ -391,8 +391,8 @@ module Gollum formatted = begin lang && Gollum::Albino.colorize(code, lang) - rescue ::Albino::ShellArgumentError, ::Albino::Process::TimeoutExceeded, - ::Albino::Process::MaximumOutputExceeded + rescue ::Albino::ShellArgumentError, ::POSIX::Spawn::TimeoutExceeded, + ::POSIX::Spawn::MaximumOutputExceeded end formatted ||= "
#{CGI.escapeHTML(code)}
" update_cache(:code, id, formatted)