Commit 66eca7d3 authored by Robert Schilling's avatar Robert Schilling

Merge branch 'fix-extra-slash-in-gitlab-shell-doc' into 'master'

Use File.join to prevent extra slash in help message from appearing. Before:

```
Try fixing it:
sudo -u git -H /opt/gitlab/embedded/service/gitlab-shell//bin/create-hooks
```

See merge request !1252
parents 50f76ae0 fd6eba34
No related merge requests found
...@@ -278,7 +278,7 @@ namespace :gitlab do ...@@ -278,7 +278,7 @@ namespace :gitlab do
fix_and_rerun fix_and_rerun
end end
end end
def check_uploads def check_uploads
print "Uploads directory setup correctly? ... " print "Uploads directory setup correctly? ... "
...@@ -488,7 +488,7 @@ namespace :gitlab do ...@@ -488,7 +488,7 @@ namespace :gitlab do
else else
puts "wrong or missing hooks".red puts "wrong or missing hooks".red
try_fixing_it( try_fixing_it(
sudo_gitlab("#{gitlab_shell_path}/bin/create-hooks"), sudo_gitlab("#{File.join(gitlab_shell_path, 'bin/create-hooks')}"),
'Check the hooks_path in config/gitlab.yml', 'Check the hooks_path in config/gitlab.yml',
'Check your gitlab-shell installation' 'Check your gitlab-shell installation'
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment