diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-08 16:24:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-08 16:24:16 +0000 |
| commit | e5de006845647ab1e0b9fa614f1f3313fabfec0d (patch) | |
| tree | b5e1738b3f013e722a4e08eb6146c66d5cb03c17 | |
| parent | 41231862baeb01dc6ed49f68488e863bca6dbfb2 (diff) | |
| parent | da347d1bb45ad3b08b2aa0b40041c67dac0df3c5 (diff) | |
| download | gitlab-ce-e5de006845647ab1e0b9fa614f1f3313fabfec0d.tar.gz | |
Merge branch 'tar_version_encoding' into 'master'
Fix tar version string encoding bug
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/backup/manager.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index cc271f5e2cd..61eb24f1c53 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 6.9.0 - Stop refreshing comments when the tab is hidden - Improve issue and merge request mobile UI (Drew Blessing) - Document how to convert a backup to PostgreSQL + - Fix locale bug in backup manager v 6.8.0 - Ability to at mention users that are participating in issue and merge req. discussion diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 05814fc78f6..28e323fe30d 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -101,7 +101,7 @@ module Backup def tar_version tar_version, _ = Gitlab::Popen.popen(%W(tar --version)) - tar_version.split("\n").first + tar_version.force_encoding('locale').split("\n").first end end end |