diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 067908af3fb..25a176da8fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -282,6 +282,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) + gitlab-markup (1.5.0) gitlab_git (10.6.8) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -864,8 +865,8 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) + gitlab-markup (~> 1.5.0) gitlab_git (~> 10.6.8) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) |