summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-10 12:22:18 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-10 12:22:18 +0200
commitb769b4f53cd29b3680b7a3eb5c3ad1cd26f64bc1 (patch)
treea1d6fee1d7b6f3a3075ac3759313e1c92cdbc5d9
parentebbb9d80811c23d49a7d1b75d7a7d2b8ffe7437b (diff)
parentaa9ed52ecc28456f37d6fe772064b681362d065f (diff)
downloadgitlab-shell-b769b4f53cd29b3680b7a3eb5c3ad1cd26f64bc1.tar.gz
Merge branch 'bozaro/gitlab-shell-lang'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-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 c3b02b0..8944647 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.6.6 (unreleased)
+ - Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
+
v2.6.5
- Handle broken symlinks in create-hooks
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
}