diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-08 16:42:59 +0000 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-08 16:42:59 +0000 |
| commit | 4667c169e7d7e3ad2f5cf6803e5747c088bbed17 (patch) | |
| tree | 9b490e23e7c6de8464823105ce23c191ca88de46 | |
| parent | 9fdd605fd2e4550170e5ef088bec7c6d2585c4a5 (diff) | |
| parent | 2694513cfe174858aa257da3db24cb848b2ddb8e (diff) | |
| download | gitlab-ce-4667c169e7d7e3ad2f5cf6803e5747c088bbed17.tar.gz | |
Merge branch 'issues_12693' into 'master'
suppress error in init-script while determining canonical path of gitlab_workhorse_dir
fixes #12693
fixes #12954
See merge request !2697
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 9e90a99f15b..1981297ecd3 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -38,7 +38,7 @@ web_server_pid_path="$pid_path/unicorn.pid" sidekiq_pid_path="$pid_path/sidekiq.pid" mail_room_enabled=false mail_room_pid_path="$pid_path/mail_room.pid" -gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) +gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd) gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public" gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" |