diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-18 12:21:17 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-18 12:21:17 +0000 |
| commit | 52f73187516ebd2c6aa1f0df7df4d4f233dc17d2 (patch) | |
| tree | 13c5f00c6fa8ec2ab658d023e89d93f77c4927b4 /lib | |
| parent | 22b36aec8b8e0a49b4b33a11ac5f972e50cbd000 (diff) | |
| parent | 55210648ef259e6ac167bb877decc919b292c0fd (diff) | |
| download | gitlab-shell-52f73187516ebd2c6aa1f0df7df4d4f233dc17d2.tar.gz | |
Merge branch 'fix/git-annex-ssh' into 'master'
v2.6.12
Fix git-annex issue when using SSH on a custom port
Easiest thing here is to use the full repo path on the server side.
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/166
See merge request !45
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab_shell.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 96ee1b7..365c543 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -101,9 +101,8 @@ class GitlabShell parsed_args = args.map do |arg| - # Convert /~/group/project.git to group/project.git - # to make git annex path compatible with gitlab-shell - if arg =~ /\A\/~\/.*\.git\Z/ + # use full repo path + if arg =~ /\A\/.*\.git\Z/ repo_full_path else arg |