Merge branch 'bump-gitlab_git'

1302dc8f · Dmitriy Zaporozhets · fabe2828 · aaaf2bd9 · 1302dc8f · 1302dc8f
Commit 1302dc8f authored Sep 26, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ gem 'omniauth-shibboleth'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '7.0.0.rc1'
+gem "gitlab_git", '7.0.0.rc2'
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
      mime-types (~> 1.19)
    gitlab_emoji (0.0.1.1)
      emoji (~> 1.0.1)
-    gitlab_git (7.0.0.rc1)
+    gitlab_git (7.0.0.rc2)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.6)
      gitlab-linguist (~> 3.0)
@@ -618,7 +618,7 @@ DEPENDENCIES
  gitlab-grack (~> 2.0.0.pre)
  gitlab-linguist (~> 3.0.0)
  gitlab_emoji (~> 0.0.1.1)
-  gitlab_git (= 7.0.0.rc1)
+  gitlab_git (= 7.0.0.rc2)
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (= 1.1.0)
  gollum-lib (~> 3.0.0)