Skip to content

Commit

Permalink
update to albino v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
technoweenie committed Mar 3, 2011
1 parent f8b25f4 commit 83c0dba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gollum.gemspec
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions lib/gollum/markup.rb
Expand Up @@ -391,8 +391,8 @@ def process_code(data)

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 ||= "<pre><code>#{CGI.escapeHTML(code)}</code></pre>"
update_cache(:code, id, formatted)
Expand Down

0 comments on commit 83c0dba

Please sign in to comment.