Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nokogiri gem to a non-vulnerable version. Fixes #278 #279

Merged
merged 6 commits into from
Jul 31, 2017
Merged

Update Nokogiri gem to a non-vulnerable version. Fixes #278 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67e4b50
Update nokogiri
d2bit May 23, 2017
635fc2e
Release 4.2.6
d2bit May 23, 2017
516f9b2
Use newer markup in test for rouge > 2.1.0
josacar Jun 26, 2017
fa0a511
Loose nokogiri dependencies
josacar Jun 28, 2017
45097d1
Use nokogiri 1.6.x in old rubies
josacar Jul 18, 2017
b798232
Add JDK8
josacar Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion gemspec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4'
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'
Expand Down
4 changes: 2 additions & 2 deletions lib/gollum-lib/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Gollum
module Lib
VERSION = '4.2.5'
VERSION = '4.2.6'
end
end
end
8 changes: 4 additions & 4 deletions test/test_markup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -406,7 +406,7 @@
con:
/dev/null
\0
\ \ \
\ \ \
\\\\\\\\

).each_with_index do |ugly, n|
Expand Down Expand Up @@ -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)
Expand Down