Merge branch 'rouge-2.2.0' into 'master'

Bump rouge to 2.2.0 Closes #36554 See merge request !13633

Merge branch 'rouge-2.2.0' into 'master'
Bump rouge to 2.2.0 Closes #36554 See merge request !13633
6509833c · Sean McGivern · 2166f9f5 · 0ab2186b · 6509833c · 6509833c
Commit 6509833c authored Aug 21, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/rouge-2-2-0.yml changelogs/unreleased/rouge-2-2-0.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -722,7 +722,7 @@ GEM
    retriable (1.4.1)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (2.1.0)
+    rouge (2.2.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)

--- a/changelogs/unreleased/rouge-2-2-0.yml
+++ b/changelogs/unreleased/rouge-2-2-0.yml
+---
+title: Bump rouge to v2.2.0
+merge_request: 13633
+author:
+type: other