Merge branch 'rouge-2.2.1' into 'master'

Bump rouge to 2.2.1 See merge request !13887

Merge branch 'rouge-2.2.1' into 'master'
Bump rouge to 2.2.1 See merge request !13887
6f123ebf · Sean McGivern · fd86a142 · 8e0496dc · 6f123ebf · 6f123ebf
Commit 6f123ebf authored Sep 01, 2017 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

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

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

--- a/changelogs/unreleased/rouge-2-2-1.yml
+++ b/changelogs/unreleased/rouge-2-2-1.yml
+---
+title: Bump rouge to v2.2.1
+merge_request: 13887
+author:
+type: other