Download as
Browse Code »

Commit e5de006845647ab1e0b9fa614f1f3313fabfec0d

Authored by Dmitriy Zaporozhets
2 parents 41231862 da347d1b
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'tar_version_encoding' into 'master' 

Fix tar version string encoding bug
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
@@ -10,6 +10,7 @@ v 6.9.0 @@ -10,6 +10,7 @@ v 6.9.0
10 - Stop refreshing comments when the tab is hidden 10 - Stop refreshing comments when the tab is hidden
11 - Improve issue and merge request mobile UI (Drew Blessing) 11 - Improve issue and merge request mobile UI (Drew Blessing)
12 - Document how to convert a backup to PostgreSQL 12 - Document how to convert a backup to PostgreSQL
  13 + - Fix locale bug in backup manager
13 14
14 v 6.8.0 15 v 6.8.0
15 - Ability to at mention users that are participating in issue and merge req. discussion 16 - Ability to at mention users that are participating in issue and merge req. discussion
lib/backup/manager.rb
  Diff comments   View file @e5de006
@@ -101,7 +101,7 @@ module Backup @@ -101,7 +101,7 @@ module Backup
101 101
102 def tar_version 102 def tar_version
103 tar_version, _ = Gitlab::Popen.popen(%W(tar --version)) 103 tar_version, _ = Gitlab::Popen.popen(%W(tar --version))
104 - tar_version.split("\n").first 104 + tar_version.force_encoding('locale').split("\n").first
105 end 105 end
106 end 106 end
107 end 107 end