From ba6f9576921aff08a295912549ba0fe6edc324a7 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Mon, 6 Apr 2015 00:28:31 +0200
Subject: [PATCH 1/3] Move to Kramdown

---
 gollum.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gollum.gemspec b/gollum.gemspec
index d78fac15..a9796213 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency 'gollum-lib', '~> 4.0', '>= 4.0.1'
-  s.add_dependency 'github-markdown', '~> 0.6.5'
+  s.add_dependency 'kramdown', '~> 1.6.0'
   s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
   s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
   s.add_dependency 'useragent', '~> 0.10.0'

From a27b88249303ef914712abc817ea8b8b5851fc75 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Mon, 6 Apr 2015 00:57:18 +0200
Subject: [PATCH 2/3] Test on jruby

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ff17fd05..506cde10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - jruby-19mode
 before_install:
  - sudo apt-get update
  - sudo apt-get install libicu-dev

From 80854584bb2186bf0f619a731da0c91a9887000e Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Sat, 11 Apr 2015 01:29:08 +0200
Subject: [PATCH 3/3] Make test regex more lenient

---
 test/test_app.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/test_app.rb b/test/test_app.rb
index a98d8b4a..0da1add8 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -77,8 +77,7 @@ context "Frontend" do
                      { :name => 'user1', :email => 'user1' });
 
     get page
-
-    expected = "<h2><a class=\"anchor\" id=\"#{text}\" href=\"##{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
+    expected = "<h2><a class=\"anchor\" (href|id)=\"(#)?#{text}\" (href|id)=\"(#)?#{text}\"><i class=\"fa fa-link\"></i></a>#{text}</h2>"
     actual   = nfd(last_response.body)
 
     assert_match /#{expected}/, actual
@@ -409,7 +408,6 @@ context "Frontend" do
     @wiki = Gollum::Wiki.new(@path)
     Precious::App.set(:gollum_path, @path)
     Precious::App.set(:wiki_options, {})
-
     post "/preview", :content => 'abc', :format => 'markdown'
     assert last_response.ok?
   end