Merge branch 'tar_version_encoding' into 'master'

Fix tar version string encoding bug

Merge branch 'tar_version_encoding' into 'master'
Fix tar version string encoding bug
Dmitriy Zaporozhets
2 parents 41231862 da347d1b
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
CHANGELOG
lib/backup/manager.rb
@@ -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
@@ -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
...	...	@@ -10,6 +10,7 @@ v 6.9.0
10	10	- Stop refreshing comments when the tab is hidden
11	11	- Improve issue and merge request mobile UI (Drew Blessing)
12	12	- Document how to convert a backup to PostgreSQL
	13	+ - Fix locale bug in backup manager
13	14
14	15	v 6.8.0
15	16	- Ability to at mention users that are participating in issue and merge req. discussion
...	...
...	...	@@ -101,7 +101,7 @@ module Backup
101	101
102	102	def tar_version
103	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	105	end
106	106	end
107	107	end
...	...