summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock4
2 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 787a3813f81..2bc55bfa1cd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# Extracting information from a git repository
-gem 'gitlab_git', '~> 1.2.0'
+# Provide access to Gitlab::Git library
+gem 'gitlab_git', '~> 1.2.1'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index 279c14dbb47..93798439d8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (1.2.0)
+ gitlab_git (1.2.1)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
gitlab-grit (~> 2.5.1)
@@ -512,7 +512,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.0.0)
gitlab-grack (~> 1.0.0)
gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (~> 1.2.0)
+ gitlab_git (~> 1.2.1)
gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.2)
gon