summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-10 12:24:27 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-10 12:24:27 +0200
commit57bc57298c64f40a0a851e474b3e6de91a551ec5 (patch)
tree6a88cdadb2ccf3186aa50d1afeb6e174e264ddf0
parentb769b4f53cd29b3680b7a3eb5c3ad1cd26f64bc1 (diff)
parent8449979ff029af51be0c675c5b6262bc4adc8b3d (diff)
downloadgitlab-shell-57bc57298c64f40a0a851e474b3e6de91a551ec5.tar.gz
Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG1
-rw-r--r--lib/gitlab_shell.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8944647..0c07901 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
v2.6.6 (unreleased)
- Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
+ - Add git-lfs-authenticate command to white list (this command is used by git-lfs for SSO authentication through SSH-protocol)
v2.6.5
- Handle broken symlinks in create-hooks
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 356c8ee..cae501a 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -111,6 +111,8 @@ class GitlabShell
$logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}."
exec_cmd(*parsed_args)
+ elsif @git_cmd == 'git-lfs-authenticate'
+ exec_cmd(@origin_cmd)
else
$logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
exec_cmd(@git_cmd, repo_full_path)