diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2015-09-06 15:41:19 +0000 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-09-06 15:41:19 +0000 |
commit | 66eca7d3ba90d88c7214c1ac305788919708f688 (patch) | |
tree | ba347b86ce96cbf37aea0bb40c14fcfcbb0048bd | |
parent | 50f76ae0eae29f7362702da274055f76a350ee6f (diff) | |
parent | fd6eba34eba76ea348b8e1d65f2c1ccb901095f9 (diff) | |
download | gitlab-ce-66eca7d3ba90d88c7214c1ac305788919708f688.tar.gz |
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
-rw-r--r-- | lib/tasks/gitlab/check.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 2b9688c1b40..504823f3e12 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -278,7 +278,7 @@ namespace :gitlab do fix_and_rerun end end - + def check_uploads print "Uploads directory setup correctly? ... " @@ -488,7 +488,7 @@ namespace :gitlab do else puts "wrong or missing hooks".red 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 your gitlab-shell installation' ) |