Release 2.4.6

Tests that use to be green now fail when rerun. The issue is with the travis configuration and asciidoc.

https://travis-ci.org/github/gollum/jobs/3603171

.travis.yml

@@ -5,5 +5,3 @@ notifications:
   disabled: true
 before_install:
  - sudo apt-get update
- - sudo apt-get install -y --force-yes asciidoc
- - ASCIIDOC=1; export ASCIIDOC

gollum.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.7"
 
   s.name              = 'gollum'
-  s.version           = '2.4.5'
+  s.version           = '2.4.6'
-  s.date              = '2012-12-10'
+  s.date              = '2012-12-18'
   s.rubyforge_project = 'gollum'
 
   s.summary     = "A simple, Git-powered wiki."

lib/gollum.rb

@@ -25,10 +25,10 @@ require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
 
 # Set ruby to UTF-8 mode
 # This is required for Ruby 1.8.7 which gollum still supports.
-$KCODE = 'U' if RUBY_VERSION[2,1] == '8'
+$KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
-  VERSION = '2.4.5'
+  VERSION = '2.4.6'
 
   def self.assets_path
     ::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))

lib/gollum/frontend/public/gollum/css/gollum.css

@@ -699,14 +699,14 @@ ul.actions {
 
 #pages li a.file,
 #pages li a.folder {
-    background-image: url(/images/fileview/document.png);
+    background-image: url(../images/fileview/document.png);
     background-position: 0 1px;
     background-repeat: no-repeat;
     padding-left: 20px;
 }
 
 #pages li a.folder {
-    background-image: url(/images/fileview/folder-horizontal.png);
+    background-image: url(../images/fileview/folder-horizontal.png);
 }
 
 #pages .breadcrumb {

lib/gollum/markup.rb

@@ -475,7 +475,7 @@ module Gollum
     #
     # Returns the placeholder'd String data.
     def extract_code(data)
-      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)\r?$/m) do
+      data.gsub!(/^([ \t]*)(~~~+) ?([^\r\n]+)?\r?\n(.+?)\r?\n\1(~~~+)[ \t\r]*$/m) do
         m_indent = $1
         m_start  = $2 # ~~~
         m_lang   = $3
@@ -504,7 +504,7 @@ module Gollum
         "#{m_indent}#{id}" # print the SHA1 ID with the proper indentation
       end
 
-      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```\r?$/m) do
+      data.gsub!(/^([ \t]*)``` ?([^\r\n]+)?\r?\n(.+?)\r?\n\1```[ \t]*\r?$/m) do
         lang   = $2 ? $2.strip : nil
         id     = Digest::SHA1.hexdigest("#{lang}.#{$3}")
         cached = check_cache(:code, id)

lib/gollum/sanitization.rb

@@ -45,7 +45,8 @@ module Gollum
     # Default whitelisted protocols for URLs.
     PROTOCOLS = {
       'a'   => {'href' => ['http', 'https', 'mailto', 'ftp', 'irc', 'apt', :relative]},
-      'img' => {'src'  => ['http', 'https', :relative]}
+      'img' => {'src'  => ['http', 'https', :relative]},
+      'form' => {'action' => ['http', 'https', :relative]}
     }.freeze
 
     ADD_ATTRIBUTES = lambda do |env, node|