Merge branch 'rails5-update-rouge' into 'master'

Rails5: update Rails5 lock for forgotten gem rouge See merge request gitlab-org/gitlab-ce!21010

Merge branch 'rails5-update-rouge' into 'master'
53ecd2e1 · Rémy Coutable · 85ecb959 · 5c4a9320 · 53ecd2e1 · 53ecd2e1
Commit 53ecd2e1 authored 6 years ago by Rémy Coutable
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -754,7 +754,7 @@ GEM
    retriable (3.1.1)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (3.1.1)
+    rouge (3.2.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)

--- a/changelogs/unreleased/rails5-update-rouge.yml
+++ b/changelogs/unreleased/rails5-update-rouge.yml
+---
+title: 'Rails5: update Rails5 lock for forgotten gem rouge'
+merge_request: 21010
+author: Jasper Maes
+type: fixed