Merge branch 'gitlab_git_gem' into 'master'

Use gitlab_git from rubygems

2 files changed, 7 insertions, 12 deletions

diff --git a/Gemfile b/Gemfile
index 5c2d4c253bb..446ee73a4b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-github'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git'
+gem "gitlab_git", '~> 5.1.0'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe0fa951632..d0004fba159 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,16 +5,6 @@ GIT
   specs:
     github-markup (0.7.6)
 
-GIT
-  remote: https://gitlab.com/gitlab-org/gitlab_git.git
-  revision: 9e833986399f967e535e6559ac8c3d2c66ae046c
-  specs:
-    gitlab_git (5.1.0.pre)
-      activesupport (~> 4.0.0)
-      gitlab-grit (~> 2.6.1)
-      gitlab-linguist (~> 3.0.0)
-      rugged (~> 0.19.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -186,6 +176,11 @@ GEM
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
       mime-types (~> 1.19)
+    gitlab_git (5.1.0)
+      activesupport (~> 4.0.0)
+      gitlab-grit (~> 2.6.1)
+      gitlab-linguist (~> 3.0.0)
+      rugged (~> 0.19.0)
     gitlab_meta (6.0)
     gitlab_omniauth-ldap (1.0.4)
       net-ldap (~> 0.3.1)
@@ -581,7 +576,7 @@ DEPENDENCIES
   gitlab-gollum-lib (~> 1.1.0)
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 3.0.0)
-  gitlab_git!
+  gitlab_git (~> 5.1.0)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.4)
   gon (~> 5.0.0)