summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-15 15:37:31 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-15 15:37:31 +0000
commitb7ce0ac24162d9fa14749b0adf1020668ad45c22 (patch)
tree2c9610a4b48c70c2d835678381aee20067687896 /lib/tasks
parentd7f70b77a8a63e003742b5d3fe3d4e8841a76c9f (diff)
parent87a36a74ff0e011a69d49f4b2411cae17f975ca9 (diff)
downloadgitlab-ce-b7ce0ac24162d9fa14749b0adf1020668ad45c22.tar.gz
Merge branch '38540-ssh-env-file' into 'master'
Resolve "rake gitlab:shell:install creates ~git/.ssh/environment which gitlab:check complains about" Closes #38540 See merge request gitlab-org/gitlab-ce!16114
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/shell.rake10
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake
index 0e6aed32c52..12ae4199b69 100644
--- a/lib/tasks/gitlab/shell.rake
+++ b/lib/tasks/gitlab/shell.rake
@@ -54,16 +54,6 @@ namespace :gitlab do
# (Re)create hooks
Rake::Task['gitlab:shell:create_hooks'].invoke
- # Required for debian packaging with PKGR: Setup .ssh/environment with
- # the current PATH, so that the correct ruby version gets loaded
- # Requires to set "PermitUserEnvironment yes" in sshd config (should not
- # be an issue since it is more than likely that there are no "normal"
- # user accounts on a gitlab server). The alternative is for the admin to
- # install a ruby (1.9.3+) in the global path.
- File.open(File.join(user_home, ".ssh", "environment"), "w+") do |f|
- f.puts "PATH=#{ENV['PATH']}"
- end
-
Gitlab::Shell.ensure_secret_token!
end