Merge branch 'gitlab_git_5-7' into 'master'

Update gitlab_git to 5.7
gitlabhq · Mar 5, 2014 · 4c132ed · 4c132ed
2 parents d02e129 + 1445f42
commit 4c132ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,7 +32,7 @@ gem 'omniauth-github'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 5.6.0'
+gem "gitlab_git", '~> 5.7.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
@@ -181,7 +181,7 @@ GEM
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
       mime-types (~> 1.19)
-    gitlab_git (5.6.0)
+    gitlab_git (5.7.0)
       activesupport (~> 4.0.0)
       charlock_holmes (~> 0.6.9)
       gitlab-grit (~> 2.6.1)
@@ -590,7 +590,7 @@ DEPENDENCIES
   gitlab-gollum-lib (~> 1.1.0)
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 3.0.0)
-  gitlab_git (~> 5.6.0)
+  gitlab_git (~> 5.7.0)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.4)
   gon (~> 5.0.0)