summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-10-13 04:44:23 +0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-10-13 13:49:11 +0200
commit2549db7aaed7cad60d5ddf129a70da25b09aded2 (patch)
tree75dc0d676f60f53adf41a0f88996ae1ebddcb45d /Gemfile.lock
parent0eb5b0a08af7ebe68d515a68e2a94b3d0213393f (diff)
downloadgitlab-ce-2549db7aaed7cad60d5ddf129a70da25b09aded2.tar.gz
Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gem
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock11
1 files changed, 3 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dde92fff044..25a176da8fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
- remote: https://github.com/brodock/github-markup.git
- revision: 62ff5993081920ad75016f2b87019dd14e3af137
- branch: python3-fix
- specs:
- github-markup (1.4.0)
-
GEM
remote: https://rubygems.org/
specs:
@@ -279,6 +272,7 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
+ github-markup (1.4.0)
gitlab-flowdock-git-hook (1.0.1)
flowdock (~> 0.7)
gitlab-grit (>= 2.4.1)
@@ -288,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)
@@ -870,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)