summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpbr <pbregener@gmail.com>2017-08-17 10:53:23 +0000
committerpbr <pbregener@gmail.com>2017-08-19 15:20:30 +0200
commit0ab2186bb1c0f177f0bbf1259bb6f29523be2ca5 (patch)
tree9d140e0d27fa3d24e8bf02ff6f0943ab576dc199
parent3a3955731b5fa0e558b6907544b748b6647a6099 (diff)
downloadgitlab-ce-0ab2186bb1c0f177f0bbf1259bb6f29523be2ca5.tar.gz
Bump rouge to v2.2.0
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/rouge-2-2-0.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1554f314d1e..caa5bc6f4fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -724,7 +724,7 @@ GEM
retriable (1.4.1)
rinku (2.0.0)
rotp (2.1.2)
- rouge (2.1.0)
+ rouge (2.2.0)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)
diff --git a/changelogs/unreleased/rouge-2-2-0.yml b/changelogs/unreleased/rouge-2-2-0.yml
new file mode 100644
index 00000000000..0b53cd14628
--- /dev/null
+++ b/changelogs/unreleased/rouge-2-2-0.yml
@@ -0,0 +1,5 @@
+---
+title: Bump rouge to v2.2.0
+merge_request: 13633
+author:
+type: other