diff options
author | Markus Koller <markus-koller@gmx.ch> | 2017-09-20 17:41:38 +0200 |
---|---|---|
committer | Markus Koller <markus-koller@gmx.ch> | 2017-09-20 17:48:04 +0200 |
commit | 0c46598a899e813484a28c8ab726fb043d778af8 (patch) | |
tree | 147fa3d7d8c79a27aff6ad333e567e8d432e0705 /Gemfile.lock | |
parent | 70dc7e9a9959997b72219ab4b48046e347b00938 (diff) | |
download | gitlab-ce-0c46598a899e813484a28c8ab726fb043d778af8.tar.gz |
Upgrade gitlab-markup gem
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 90154d98c9c..a19d681b6c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.1) + gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -1028,7 +1028,7 @@ DEPENDENCIES gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.1) + gitlab-markup (~> 1.6.2) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) |