summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-07-04 12:25:09 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-07-04 12:25:09 +0200
commit00aac15c6f7f7f30b09ae6bc5de423d6413452d1 (patch)
treeb151844e0b355cabc2e5c3e6a62f2c81454fb1d4
parent021b6aef94b3398ab5603b4c11afd4c6d8432795 (diff)
downloadgitlab-ce-18593-update-rinku.tar.gz
Bump Rinku to 2.0.018593-update-rinku
-rw-r--r--CHANGELOG1
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5f593336895..08b076d20de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.10.0 (unreleased)
- PipelinesFinder uses git cache data
- Check for conflicts with existing Project's wiki path when creating a new project.
- Don't instantiate a git tree on Projects show default view
+ - Bump Rinku to 2.0.0
- Remove unused front-end variable -> default_issues_tracker
- Better caching of git calls on ProjectsController#show.
- Add API endpoint for a group issues !4520 (mahcsig)
diff --git a/Gemfile.lock b/Gemfile.lock
index 238af158838..e7070a555fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -578,7 +578,7 @@ GEM
listen (~> 3.0)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
- rinku (1.7.3)
+ rinku (2.0.0)
rotp (2.1.2)
rouge (1.11.0)
rqrcode (0.7.0)