summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-06 16:03:32 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-06 16:03:32 +0200
commit90ab30b74be3b0235db165722272c19248eda2da (patch)
tree9afe8620cc622f51ea2150b6408e5d862c380d47 /Gemfile.lock
parentf99ee99f6530cfab85c67d01832eb76ba5f85fa3 (diff)
downloadgitlab-ce-90ab30b74be3b0235db165722272c19248eda2da.tar.gz
Fix encoding issues after gitlab_git 5.1.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0428a9df483..5998c5d759a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,8 +176,9 @@ GEM
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
- gitlab_git (5.1.0)
+ gitlab_git (5.2.0)
activesupport (~> 4.0.0)
+ charlock_holmes (~> 0.6.9)
gitlab-grit (~> 2.6.1)
gitlab-linguist (~> 3.0.0)
rugged (~> 0.19.0)
@@ -576,7 +577,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.1.0)
gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 3.0.0)
- gitlab_git (~> 5.1.0)
+ gitlab_git (~> 5.2.0)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.4)
gon (~> 5.0.0)