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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
028b58a9
Commit
028b58a9
authored
Feb 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8449 from choppsv1/ipv6_addr_fix
Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
parents
72db0c4d
0ed4ae72
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+5
-1
No files found.
config/initializers/1_settings.rb
View file @
028b58a9
...
@@ -12,10 +12,14 @@ class Settings < Settingslogic
...
@@ -12,10 +12,14 @@ class Settings < Settingslogic
def
build_gitlab_shell_ssh_path_prefix
def
build_gitlab_shell_ssh_path_prefix
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://
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh_host
}
:
#{
gitlab_shell
.
ssh_port
}
/"
else
if
gitlab_shell
.
ssh_host
.
include?
':'
"[
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh_host
}
]:"
else
else
"
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh_host
}
:"
"
#{
gitlab_shell
.
ssh_user
}
@
#{
gitlab_shell
.
ssh_host
}
:"
end
end
end
end
end
def
build_gitlab_url
def
build_gitlab_url
custom_port
=
gitlab_on_standard_port?
?
nil
:
":
#{
gitlab
.
port
}
"
custom_port
=
gitlab_on_standard_port?
?
nil
:
":
#{
gitlab
.
port
}
"
...
...
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