summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpbr <pbregener@gmail.com>2017-08-29 11:49:06 +0200
committerpbr <pbregener@gmail.com>2017-08-29 11:56:37 +0200
commit8e0496dca692cae91ffa179924f0b3e989ed550b (patch)
tree40d006dc7e9398cbcab0569b7539c2992c0a86c0
parent9e7e0496ff639d1eec65dcbf1b51edb2262456e2 (diff)
downloadgitlab-ce-8e0496dca692cae91ffa179924f0b3e989ed550b.tar.gz
Bump rouge to 2.2.1
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/rouge-2-2-1.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 404e1ec2df0..f0ebf7cf582 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -722,7 +722,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)
diff --git a/changelogs/unreleased/rouge-2-2-1.yml b/changelogs/unreleased/rouge-2-2-1.yml
new file mode 100644
index 00000000000..2d8879e5574
--- /dev/null
+++ 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