wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update to albino v1.3.0

Browse Source
This commit is contained in:
rick
2011-03-03 15:22:46 -08:00
parent f8b25f44f7
commit 83c0dbaaf2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gollum.gemspec
+1 -1
View File
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
s.add_dependency('grit', "~> 2.4.1") s.add_dependency('grit', "~> 2.4.1")
s.add_dependency('github-markup', [">= 0.4.0", "< 1.0.0"]) 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('sinatra', "~> 1.0")
s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"]) s.add_dependency('mustache', [">= 0.11.2", "< 1.0.0"])
s.add_dependency('sanitize', "~> 2.0.0") s.add_dependency('sanitize', "~> 2.0.0")
lib/gollum/markup.rb
+2 -2
View File
@@ -391,8 +391,8 @@ module Gollum
formatted = begin formatted = begin
lang && Gollum::Albino.colorize(code, lang) lang && Gollum::Albino.colorize(code, lang)
rescue ::Albino::ShellArgumentError, ::Albino::Process::TimeoutExceeded, rescue ::Albino::ShellArgumentError, ::POSIX::Spawn::TimeoutExceeded,
::Albino::Process::MaximumOutputExceeded ::POSIX::Spawn::MaximumOutputExceeded
end end
formatted ||= "<pre><code>#{CGI.escapeHTML(code)}</code></pre>" formatted ||= "<pre><code>#{CGI.escapeHTML(code)}</code></pre>"
update_cache(:code, id, formatted) update_cache(:code, id, formatted)