Merge branch 'rouge-2.2.1' into 'master'

Bump rouge to 2.2.1 See merge request !13887
2017-09-01 08:50:33 +00:00 · 2017-09-01 08:50:33 +00:00 · 6f123ebf75
parent fd86a14241 8e0496dca6
commit 6f123ebf75
2 changed files with 6 additions and 1 deletions
--- 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
@ -0,0 +1,5 @@
+---
+title: Bump rouge to v2.2.1
+merge_request: 13887
+author:
+type: other