Skip to content

Commit

Permalink
Merge pull request #1529 from github/bump-commonmarker
Browse files Browse the repository at this point in the history
Bump commonmark version
  • Loading branch information
aharpole authored May 10, 2022
2 parents 4690850 + 4dc7c56 commit b2230a2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ gem "posix-spawn", :platforms => :ruby
gem "redcarpet", :platforms => :ruby
gem "kramdown", :platforms => :jruby
gem "RedCloth"
gem "commonmarker", "~> 0.18.1"
# using a tag version here because 0.18.3 was not published by the author to encourage users to upgrade.
# however we want to bump up to this version since this has a security patch
gem "commonmarker", git: "https://github.com/gjtorikian/commonmarker.git", tag: "v0.18.3"
gem "rdoc", "~>3.6"
gem "org-ruby", "= 0.9.9"
gem "creole", "~>0.3.6"
Expand Down
3 changes: 3 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 4.0.1 - 2022-03-07
* Update to commonmarker 0.18.3; There isn't a version on RubyGems for this, so this is pointing to a [tag version on GitHub](https://github.com/gjtorikian/commonmarker/blob/v0.18.3/commonmarker.gemspec)

## 4.0.0 - 2021-03-31

* Drop support for Python 2 in RST rendering [#1456](https://github.com/github/markup/pull/1456)
Expand Down
2 changes: 1 addition & 1 deletion lib/github-markup.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module GitHub
module Markup
VERSION = '4.0.0'
VERSION = '4.0.1'
Version = VERSION
end
end
8 changes: 3 additions & 5 deletions test/markups/README.rst.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2>Subtitle</h2>
</ul>
</div>
<a name="header-2"></a>
<h2><a href="#id1">Header 2</a></h2>
<h2><a href="#toc-entry-1">Header 2</a></h2>
<ol>
<li>Blah blah <code>code</code> blah</li>
<li>More <code>code</code>, hooray</li>
Expand Down Expand Up @@ -106,7 +106,7 @@ <h2><a href="#id1">Header 2</a></h2>
</a>
<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
<a name="field-list"></a>
<h2><a href="#id2">Field list</a></h2>
<h2><a href="#toc-entry-2">Field list</a></h2>
<table frame="void" rules="none">


Expand All @@ -131,9 +131,7 @@ <h2><a href="#id2">Field list</a></h2>
</tr>
</tbody>
</table>

<p><a href="mailto:someone@somewhere.org">someone@somewhere.org</a></p>

<p>Press <kbd>Ctrl+C</kbd> to quit</p>

<p><strong>RAW HTML!</strong></p> p {color:blue;}
<p><strong>RAW HTML!</strong></p> p {color:blue;}

2 comments on commit b2230a2

@Dcjones36
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[echo "# Dcjones36" >> README.md git init git add README.md git commit -m "first commit" git branch -M main git remote add origin git@github.com:Dcjones36/Dcjones36.git git push -u origin main](echo "# Dcjones36" >> README.md git init git add README.md git commit -m "first commit" git branch -M main git remote add origin git@github.com:Dcjones36/Dcjones36.git git push -u origin main)

@Deawkung11
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.