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
Jérome Perrin
gitlab-ce
Commits
e1522ec8
Commit
e1522ec8
authored
Nov 29, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify `build_gitlab_shell_ssh_path_prefix`
parent
15291c89
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+5
-3
No files found.
config/initializers/1_settings.rb
View file @
e1522ec8
...
@@ -33,13 +33,15 @@ class Settings < Settingslogic
...
@@ -33,13 +33,15 @@ class Settings < Settingslogic
end
end
def
build_gitlab_shell_ssh_path_prefix
def
build_gitlab_shell_ssh_path_prefix
user_host
=
"
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh_host
}
"
if
gitlab_shell
.
ssh_port
!=
22
if
gitlab_shell
.
ssh_port
!=
22
"ssh://
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh
_host
}
:
#{
gitlab_shell
.
ssh_port
}
/"
"ssh://
#{
user
_host
}
:
#{
gitlab_shell
.
ssh_port
}
/"
else
else
if
gitlab_shell
.
ssh_host
.
include?
':'
if
gitlab_shell
.
ssh_host
.
include?
':'
"[
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh
_host
}
]:"
"[
#{
user
_host
}
]:"
else
else
"
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh
_host
}
:"
"
#{
user
_host
}
:"
end
end
end
end
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