diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-25 12:55:05 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-25 12:55:05 +0100 |
| commit | dacb8ec07645f254c3a2cf7d6f1d6c26b4f33dce (patch) | |
| tree | b5f98f510774242ae6c7c91b27824e6d0c6893fd | |
| parent | 827a11c26c8b2ffa6c2af15a626762141f54784a (diff) | |
| download | gitlab-shell-dacb8ec07645f254c3a2cf7d6f1d6c26b4f33dce.tar.gz | |
Revert "Run git-lfs-authenticate script with original command line arguments"
This reverts commit 8449979ff029af51be0c675c5b6262bc4adc8b3d.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/gitlab_shell.rb | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,5 @@ v2.6.8 (unreleased) + - Revert git-lfs-authenticate command from white list v2.6.7 - Exit with non-zero status when import-repository fails @@ -6,7 +7,6 @@ v2.6.7 v2.6.6 - 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) - Handle git-annex and gcryptsetup v2.6.5 diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 4bc1cd7..a33e2e3 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -111,8 +111,6 @@ 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) |