summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-04 11:57:55 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2013-11-04 11:57:55 +0100
commit6c067380fcdda6013498dafbc441691d4c20796a (patch)
tree9f5029e1427aa5ab4d553a0e9a04bbcb24521f3a
parent38cf6281a7b1c0e5c0c943383b62b88f962b0a12 (diff)
downloadgitlab-ce-6c067380fcdda6013498dafbc441691d4c20796a.tar.gz
Update gitlab_git (CVE-2013-4489)
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 03d3f5c1c23..538b17fd0d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem 'gitlab_git', '~> 1.3.0'
+gem 'gitlab_git', '~> 1.3.1'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index c64bd426540..b1ff643b878 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -167,7 +167,7 @@ GEM
stringex (~> 1.5.1)
gitlab-grack (1.0.1)
rack (~> 1.4.1)
- gitlab-grit (2.5.1)
+ gitlab-grit (2.5.2)
charlock_holmes (~> 0.6.9)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
@@ -175,10 +175,10 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (1.3.0)
+ gitlab_git (1.3.1)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
- gitlab-grit (~> 2.5.1)
+ gitlab-grit (~> 2.5.2)
gitlab_meta (5.0)
gitlab_omniauth-ldap (1.0.3)
net-ldap (~> 0.3.1)
@@ -566,7 +566,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.0.0)
gitlab-grack (~> 1.0.1)
gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (~> 1.3.0)
+ gitlab_git (~> 1.3.1)
gitlab_meta (= 5.0)
gitlab_omniauth-ldap (= 1.0.3)
gon