summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-14 13:07:39 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-05-14 13:07:39 +0300
commit58796f38c9fa0bfce2021a0e3a740bec54d718ac (patch)
treef20e991db459ec90da233d73e09844f050ac9742 /Gemfile.lock
parent5075520fd82d1af83afa77d5eca0ff2fc942d43b (diff)
downloadgitlab-ce-58796f38c9fa0bfce2021a0e3a740bec54d718ac.tar.gz
gitlab_git up to 1.2.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
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