diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-05 21:51:41 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-05 21:51:41 +0000 |
| commit | 95cb0195b09baca51fd317e7ff6325019d1dd1a0 (patch) | |
| tree | a891d8f419afda86691ebc1ca8b7a16373f5640e /Gemfile.lock | |
| parent | 6d12878d5a32988cb7ee27bc750b21ecf1fca44b (diff) | |
| parent | 00aac15c6f7f7f30b09ae6bc5de423d6413452d1 (diff) | |
| download | gitlab-ce-95cb0195b09baca51fd317e7ff6325019d1dd1a0.tar.gz | |
Merge branch '18593-update-rinku' into 'master'
Bump Rinku to 2.0.0
## What does this MR do?
Update Rinku gem to last stable version.
## What are the relevant issue numbers?
#18593
## Does this MR meet the acceptance criteria?
- [x] [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~~
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5064
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 22363e3e2d2..af8fbedc127 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,7 +576,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) |