summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-19 18:50:33 +0000
committerStan Hu <stanhu@gmail.com>2016-07-19 18:50:33 +0000
commit4915105cab73b6a9c419c1ab025301c27eb127fa (patch)
treebe7b3018772ef18ee70e9a925a1c21124f66d517
parent16f60fc74f353ca575a765d3c210c06a9233327c (diff)
parent5b124fc328e5981e36a60b7e0f0ab17c0ddd037b (diff)
downloadgitlab-ce-4915105cab73b6a9c419c1ab025301c27eb127fa.tar.gz
Merge branch 'feature/rouge-2.0.4' into 'master'
upgrade rouge to 2.0.5 ## What does this MR do? Upgrades Rouge to 2.0.5 ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? New lexers and bugfixes from upstream. ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5351
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bb7a8d0604..363904a4baa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -578,7 +578,7 @@ GEM
railties (>= 4.2.0, < 5.1)
rinku (2.0.0)
rotp (2.1.2)
- rouge (2.0.3)
+ rouge (2.0.5)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)