summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock18
1 files changed, 12 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2244c20203b..54dde2b92d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+ remote: https://gitlab.com/gitlab-org/gitlab_git.git
+ revision: fc0ea05f8accd50b94cb954870852f5dcd2866fa
+ ref: fix/remove-unneeded-root-ref-call
+ specs:
+ gitlab_git (10.4.6)
+ activesupport (~> 4.0)
+ charlock_holmes (~> 0.7.3)
+ github-linguist (~> 4.7.0)
+ rugged (~> 0.24.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -278,11 +289,6 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
- gitlab_git (10.4.5)
- activesupport (~> 4.0)
- charlock_holmes (~> 0.7.3)
- github-linguist (~> 4.7.0)
- rugged (~> 0.24.0)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
@@ -855,7 +861,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
github-markup (~> 1.4)
gitlab-flowdock-git-hook (~> 1.0.1)
- gitlab_git (~> 10.4.5)
+ gitlab_git!
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)