From 67e4b506f1c4a32dda1391e9ec50d832ed4907ca Mon Sep 17 00:00:00 2001
From: David BF <burretfresket@gmail.com>
Date: Tue, 23 May 2017 15:27:51 +0200
Subject: [PATCH 1/6] Update nokogiri

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

diff --git a/gemspec.rb b/gemspec.rb
index f7b0aab2b..3212647a9 100644
--- a/gemspec.rb
+++ b/gemspec.rb
@@ -26,7 +26,7 @@ def specification(version, default_adapter, platform = nil)
 
     s.add_dependency *default_adapter
     s.add_dependency 'rouge', '~> 2.0'
-    s.add_dependency 'nokogiri', '~> 1.6.4'
+    s.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1'
     s.add_dependency 'stringex', '~> 2.6'
     s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'

From 635fc2ef3810a182981d1be7fd2683ee4586e5ff Mon Sep 17 00:00:00 2001
From: David BF <burretfresket@gmail.com>
Date: Tue, 23 May 2017 15:51:09 +0200
Subject: [PATCH 2/6] Release 4.2.6

---
 lib/gollum-lib/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gollum-lib/version.rb b/lib/gollum-lib/version.rb
index 0e18ab5c7..1b5b8f09d 100644
--- a/lib/gollum-lib/version.rb
+++ b/lib/gollum-lib/version.rb
@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.5'
+    VERSION = '4.2.6'
   end
-end
\ No newline at end of file
+end

From 516f9b27d97b6fcdead2c79e11380e9aff843b2a Mon Sep 17 00:00:00 2001
From: Jose Luis Salas <josacar@users.noreply.github.com>
Date: Mon, 26 Jun 2017 10:18:39 +0200
Subject: [PATCH 3/6] Use newer markup in test for rouge > 2.1.0

---
 test/test_markup.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_markup.rb b/test/test_markup.rb
index 7679e3277..642b4a3bd 100644
--- a/test/test_markup.rb
+++ b/test/test_markup.rb
@@ -194,7 +194,7 @@
     page = @wiki.page("Bilbo Baggins")
     assert_html_equal "<p>a <a href=\"http://example.com\">http://example.com</a> b</p>", page.formatted_data
   end
-  
+
   test "external page link with different text" do
     @wiki.write_page("Bilbo Baggins", :markdown, "a [[Words|http://example.com]] b", commit_details)
     page = @wiki.page("Bilbo Baggins")
@@ -238,7 +238,7 @@
 org
     @wiki.write_page("Pipe", :org, code, commit_details)
     page = @wiki.page("Pipe")
-    assert_html_equal "<pre class=\"highlight\"><code>sed -i <span class=\"s1\">''</span> <span class=\"s1\">'s/[[:space:]]*$//'</span></code></pre>", page.formatted_data
+    assert_html_equal "<pre class=\"highlight\"><code>sed <span class=\"nt\">-i</span> <span class=\"s1\">''</span> <span class=\"s1\">'s/[[:space:]]*$//'</span></code></pre>", page.formatted_data
   end
 
   test "regexp gsub! backref (#383)" do
@@ -406,7 +406,7 @@
       con:
       /dev/null
       \0
-      \ \ \ 
+      \ \ \
       \\\\\\\\
 
     ).each_with_index do |ugly, n|
@@ -899,7 +899,7 @@ def assert_markup_highlights_code(markup_class, rendered)
         /name="wiki-Header"/
     ]
   end
-  
+
   test "toc with h1_title does not include page title" do
     @wiki.instance_variable_set(:@h1_title, true)
     @wiki.write_page("H1Test", :markdown, "# This is the page title\n\n# Testing\n\nTest", commit_details)

From fa0a511af4a29f96355bca399e992679eef2279c Mon Sep 17 00:00:00 2001
From: Jose Luis Salas <josacar@users.noreply.github.com>
Date: Wed, 28 Jun 2017 17:39:52 +0200
Subject: [PATCH 4/6] Loose nokogiri dependencies

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

diff --git a/gemspec.rb b/gemspec.rb
index 3212647a9..34c919e45 100644
--- a/gemspec.rb
+++ b/gemspec.rb
@@ -26,7 +26,7 @@ def specification(version, default_adapter, platform = nil)
 
     s.add_dependency *default_adapter
     s.add_dependency 'rouge', '~> 2.0'
-    s.add_dependency 'nokogiri', '~> 1.7', '>= 1.7.1'
+    s.add_dependency 'nokogiri', '>= 1.6.1', '< 2.0'
     s.add_dependency 'stringex', '~> 2.6'
     s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'

From 45097d15e3cacc7163761d92d1aa83861f498435 Mon Sep 17 00:00:00 2001
From: Jose Luis Salas <josacar@users.noreply.github.com>
Date: Tue, 18 Jul 2017 09:01:27 +0200
Subject: [PATCH 5/6] Use nokogiri 1.6.x in old rubies

---
 gemspec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gemspec.rb b/gemspec.rb
index 34c919e45..9f63170b5 100644
--- a/gemspec.rb
+++ b/gemspec.rb
@@ -26,7 +26,11 @@ def specification(version, default_adapter, platform = nil)
 
     s.add_dependency *default_adapter
     s.add_dependency 'rouge', '~> 2.0'
-    s.add_dependency 'nokogiri', '>= 1.6.1', '< 2.0'
+    if RUBY_VERSION < '2.1'
+      s.add_dependency 'nokogiri', '~> 1.6.1'
+    else
+      s.add_dependency 'nokogiri', '>= 1.6.1', '< 2.0'
+    end
     s.add_dependency 'stringex', '~> 2.6'
     s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'

From b798232cdfc124810450698880bda6e045adc350 Mon Sep 17 00:00:00 2001
From: Jose Luis Salas <josacar@users.noreply.github.com>
Date: Tue, 18 Jul 2017 15:11:09 +0200
Subject: [PATCH 6/6] Add JDK8

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

diff --git a/.travis.yml b/.travis.yml
index 08c771db0..685795e6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ rvm:
   - 2.3.0
   - 2.4.0
   - jruby-19mode
+jdk:
+  - oraclejdk8
 before_install:
  - sudo apt-get update
  - sudo apt-get install libicu-dev