summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <patricio@gitlab.com>2015-01-05 10:13:48 -0500
committerPatricio Cano <patricio@gitlab.com>2015-01-05 10:13:48 -0500
commitf495f5a9070d6e3501716f401af7d09d40f63582 (patch)
treeb59995f356221a1218023ad99c92eb95a2515d44
parente8c2c624c3eb394c45c431cf8e3c107231f2b8b5 (diff)
downloadgitlab-ce-f495f5a9070d6e3501716f401af7d09d40f63582.tar.gz
Updated gitlab_git to 6.2.2 to include rugged 0.21.2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index e28ffcfc2d7..801e91b369d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 6.0'
+gem "gitlab_git", '~> 6.2.2'
# 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 205599e898c..76755faa14d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,12 +179,12 @@ GEM
mime-types (~> 1.19)
gitlab_emoji (0.0.1.1)
emoji (~> 1.0.1)
- gitlab_git (6.2.1)
+ gitlab_git (6.2.2)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-grit (~> 2.6)
gitlab-linguist (~> 3.0)
- rugged (~> 0.21.0)
+ rugged (~> 0.21.2)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.0.4)
net-ldap (~> 0.3.1)
@@ -436,7 +436,7 @@ GEM
ruby-progressbar (1.2.0)
rubyntlm (0.1.1)
rubypants (0.2.0)
- rugged (0.21.0)
+ rugged (0.21.2)
safe_yaml (0.9.7)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
@@ -613,7 +613,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 3.0.0)
gitlab_emoji (~> 0.0.1.1)
- gitlab_git (~> 6.0)
+ gitlab_git (~> 6.2.2)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.0.4)
gollum-lib (~> 3.0.0)