From 90ab30b74be3b0235db165722272c19248eda2da Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 6 Feb 2014 16:03:32 +0200 Subject: Fix encoding issues after gitlab_git 5.1.0 Signed-off-by: Dmitriy Zaporozhets --- Gemfile | 2 +- Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 446ee73a4b7..6ea97c395c8 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 5.1.0' +gem "gitlab_git", '~> 5.2.0' # 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 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) -- cgit v1.2.1