Merge branch 'tar_version_encoding' into 'master'

Fix tar version string encoding bug
This commit is contained in:
Dmitriy Zaporozhets 2014-05-08 16:24:16 +00:00
commit e5de006845
2 changed files with 2 additions and 1 deletions

View file

@ -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

View file

@ -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