summaryrefslogtreecommitdiff
path: root/lib/gitlab_shell.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-11-25 12:06:23 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-11-25 12:06:23 +0000
commit1a75d086b53d799ac10f77acfb198f2c5ea95621 (patch)
tree7aede82678e3ead1c23bc9c6f0cb11508fe0294c /lib/gitlab_shell.rb
parent827a11c26c8b2ffa6c2af15a626762141f54784a (diff)
parentd951ded1beae99bc5fb66455178a08da72dc08a5 (diff)
downloadgitlab-shell-ui-dev-kit.tar.gz
Merge branch 'revert-lfs-authenticate' into 'master' v2.6.8ui-dev-kit
Revert "Run git-lfs-authenticate script with original command line arguments" This reverts commit 8449979ff029af51be0c675c5b6262bc4adc8b3d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Related to: #35, gitlab/gitlabhq#2635 See merge request !68
Diffstat (limited to 'lib/gitlab_shell.rb')
-rw-r--r--lib/gitlab_shell.rb2
1 files changed, 0 insertions, 2 deletions
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)