Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-11-18 08:07:40 +0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-11-19 00:33:22 +0300
commitf929a63b4adf082e313b0a6be07476ad4c2ef2f2 (patch)
treef33d36efdbe0ae91364e0c49813a12778d677bc0
parent872d0bfde89b89c647ed3ca390f9380bbb502c92 (diff)
Merge branch 'feature/rouge-2.0.7' into 'master'
bump rouge to 2.0.7 ## What does this MR do? Upgrades Rouge to 2.0.7 for various bugfixes. ## Are there points in the code the reviewer needs to double check? See the Rouge changelog here: https://github.com/jneen/rouge/blob/v2.0.7/CHANGELOG.md See merge request !7549
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a496ee425cd..bdc60552480 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -593,7 +593,7 @@ GEM
railties (>= 4.2.0, < 5.1)
rinku (2.0.0)
rotp (2.1.2)
- rouge (2.0.6)
+ rouge (2.0.7)
rqrcode (0.7.0)
chunky_png
rqrcode-rails3 (0.1.7)