summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem V. Navrotskiy <navrotskiy@corp.mail.ru>2015-09-01 19:06:50 +0300
committerArtem V. Navrotskiy <navrotskiy@corp.mail.ru>2015-09-09 12:13:50 +0300
commitaa9ed52ecc28456f37d6fe772064b681362d065f (patch)
treed091d27f43ff4b51026dbd99d01c33cc73ac9e9e
parentc31e6165016e4f12483b4c328a62493adac1bcac (diff)
downloadgitlab-shell-aa9ed52ecc28456f37d6fe772064b681362d065f.tar.gz
Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
When cleaning this environment variable can be problems with the processing of non-ASCII data
-rw-r--r--CHANGELOG3
-rw-r--r--lib/gitlab_shell.rb1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f7dc957..154a006 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.6.5 (unreleased)
+ - Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
+
v2.6.4
- Remove keys from authorized_keys in-place
- Increase batch_add_keys lock timeout to 300 seconds
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 57c319c..356c8ee 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -122,6 +122,7 @@ class GitlabShell
env = {
'PATH' => ENV['PATH'],
'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'],
+ 'LANG' => ENV['LANG'],
'GL_ID' => @key_id
}