Merge branch 'rouge-3.3.0' into 'master'

Update to Rouge 3.3.0 including frozen string literals for improved memory usage See merge request gitlab-org/gitlab-ce!22035
2018-10-02 01:40:53 +00:00 · 2018-10-02 01:40:53 +00:00 · 2bb8c1caa5
parent 0ef1060e14 21a5e70bf4
commit 2bb8c1caa5
3 changed files with 8 additions and 2 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -729,7 +729,7 @@ GEM
    retriable (3.1.2)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (3.2.1)
+    rouge (3.3.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@ -738,7 +738,7 @@ GEM
    retriable (3.1.2)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (3.2.1)
+    rouge (3.3.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
--- a/changelogs/unreleased/rouge-3-3-0.yml
+++ b/changelogs/unreleased/rouge-3-3-0.yml
@ -0,0 +1,6 @@
+---
+title: Update to Rouge 3.3.0 including frozen string literals for improved memory
+  usage
+merge_request:
+author:
+type: changed