Commit 555b1a62 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-init' into 'master'

Fixed init.d script not working on OS X

-s flag of su doesn't work correctly on OS X, logging in as the user
and not running the requested command. By moving the bash shell init
inside the su command we avoid the issue

Fixes Issue #3309 

See merge request !1728
parents 4667c169 1fab3979
...@@ -36,6 +36,7 @@ v 8.5.0 (unreleased) ...@@ -36,6 +36,7 @@ v 8.5.0 (unreleased)
- Fixed logo animation on Safari (Roman Rott) - Fixed logo animation on Safari (Roman Rott)
- Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg) - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
- In seach autocomplete show only groups and projects you are member of - In seach autocomplete show only groups and projects you are member of
- Fix: init.d script not working on OS X
v 8.4.4 v 8.4.4
- Update omniauth-saml gem to 1.4.2 - Update omniauth-saml gem to 1.4.2
......
...@@ -49,7 +49,7 @@ test -f /etc/default/gitlab && . /etc/default/gitlab ...@@ -49,7 +49,7 @@ test -f /etc/default/gitlab && . /etc/default/gitlab
# Switch to the app_user if it is not he/she who is running the script. # Switch to the app_user if it is not he/she who is running the script.
if [ `whoami` != "$app_user" ]; then if [ `whoami` != "$app_user" ]; then
eval su - "$app_user" -s $shell_path -c $(echo \")$0 "$@"$(echo \"); exit; eval su - "$app_user" -c $(echo \")$shell_path -l -c \'$0 "$@"\'$(echo \"); exit;
fi fi
# Switch to the gitlab path, exit on failure. # Switch to the gitlab path, exit on failure.
......
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