diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-21 08:57:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-21 08:57:03 +0000 |
| commit | 6509833cfa211804048ec4711572e3b44a5be21c (patch) | |
| tree | 6723a11f7e928012bd45c0ccf69cff8c288ab274 | |
| parent | 2166f9f548773bd4ee26d8c24b298f5913a4ad5f (diff) | |
| parent | 0ab2186bb1c0f177f0bbf1259bb6f29523be2ca5 (diff) | |
| download | gitlab-ce-6509833cfa211804048ec4711572e3b44a5be21c.tar.gz | |
Merge branch 'rouge-2.2.0' into 'master'
Bump rouge to 2.2.0
Closes #36554
See merge request !13633
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/rouge-2-2-0.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5118f9764d5..ec8349cd1df 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.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 |