summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-12 12:54:49 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-12 12:54:49 +0200
commit0bcabdaf8330d0a260d95ee8435170fa7258eb98 (patch)
tree4f7174e73150e65b6d45c0793ccc97d217c4abd6 /Gemfile.lock
parentbb44a7a25d5c9efbf50ebb47b3b6a29adc97a1bc (diff)
downloadgitlab-ce-0bcabdaf8330d0a260d95ee8435170fa7258eb98.tar.gz
Use gitlab_git 5.4.0 without BROKEN_DIFF constant
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 59bdac20d98..2c99063726e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,7 +177,7 @@ GEM
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
- gitlab_git (5.3.0)
+ gitlab_git (5.4.0)
activesupport (~> 4.0.0)
charlock_holmes (~> 0.6.9)
gitlab-grit (~> 2.6.1)
@@ -579,7 +579,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.1.0)
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 3.0.0)
- gitlab_git (~> 5.3.0)
+ gitlab_git (~> 5.4.0)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.4)
gon (~> 5.0.0)