Merge branch 'rouge-3.2.0' into 'master'

Rouge 3.2.0 See merge request gitlab-org/gitlab-ce!20991

Merge branch 'rouge-3.2.0' into 'master'
Rouge 3.2.0 See merge request gitlab-org/gitlab-ce!20991
f5812296 · Robert Speicher · f6e6b920 · 8fb4b243 · f5812296 · f5812296
Commit f5812296 authored Aug 03, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

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

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -745,7 +745,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/rouge-3-2-0.yml
+++ b/changelogs/unreleased/rouge-3-2-0.yml
+---
+title: Update to Rouge 3.2.0, including Terraform and Crystal lexer and bug fixes
+merge_request: 20991
+author:
+type: changed