summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem V. Navrotskiy <bozaro@users.noreply.github.com>2015-09-01 22:20:55 +0300
committerArtem V. Navrotskiy <navrotskiy@corp.mail.ru>2015-09-09 12:22:24 +0300
commit8449979ff029af51be0c675c5b6262bc4adc8b3d (patch)
tree35afefe00ae626dccd92b8275d01c3d981c284c8
parentc31e6165016e4f12483b4c328a62493adac1bcac (diff)
downloadgitlab-shell-8449979ff029af51be0c675c5b6262bc4adc8b3d.tar.gz
Run git-lfs-authenticate script with original command line arguments
-rw-r--r--CHANGELOG3
-rw-r--r--lib/gitlab_shell.rb2
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f7dc957..5d26084 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.6.5 (unreleased)
+ - Add git-lfs-authenticate command to white list (this command is used by git-lfs for SSO authentication through 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..0055f14 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)