summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--lib/gitlab_shell.rb2
3 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dfe7dd5..76ffc8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
-v2.6.8 (unreleased)
+v2.6.8
+ - Revert git-lfs-authenticate command from white list
v2.6.7
- Exit with non-zero status when import-repository fails
diff --git a/VERSION b/VERSION
index e261122..743af5e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.7
+2.6.8
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)