Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
87a36a74
Commit
87a36a74
authored
Dec 22, 2017
by
Ricketts, M (Mike)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove .ssh/environment file that now breaks the gitlab:check rake task
parent
299e04e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
changelogs/unreleased/38540-ssh-env-file.yml
changelogs/unreleased/38540-ssh-env-file.yml
+6
-0
lib/tasks/gitlab/shell.rake
lib/tasks/gitlab/shell.rake
+0
-10
No files found.
changelogs/unreleased/38540-ssh-env-file.yml
0 → 100644
View file @
87a36a74
---
title
:
'
Closes
#38540
-
Remove
.ssh/environment
file
that
now
breaks
the
gitlab:check
rake
task'
merge_request
:
author
:
type
:
fixed
lib/tasks/gitlab/shell.rake
View file @
87a36a74
...
@@ -54,16 +54,6 @@ namespace :gitlab do
...
@@ -54,16 +54,6 @@ namespace :gitlab do
# (Re)create hooks
# (Re)create hooks
Rake
::
Task
[
'gitlab:shell:create_hooks'
].
invoke
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!
Gitlab
::
Shell
.
ensure_secret_token!
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment