Commit 57bc5729 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'bozaro/gitlab-shell-git-lfs-authenticate'

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parents b769b4f5 8449979f
v2.6.6 (unreleased) v2.6.6 (unreleased)
- Do not clean LANG environment variable for the git hooks when working through the SSH-protocol - 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 v2.6.5
- Handle broken symlinks in create-hooks - Handle broken symlinks in create-hooks
......
...@@ -111,6 +111,8 @@ class GitlabShell ...@@ -111,6 +111,8 @@ class GitlabShell
$logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}." $logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}."
exec_cmd(*parsed_args) exec_cmd(*parsed_args)
elsif @git_cmd == 'git-lfs-authenticate'
exec_cmd(@origin_cmd)
else else
$logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}." $logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
exec_cmd(@git_cmd, repo_full_path) exec_cmd(@git_cmd, repo_full_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment