Commit ad7cd8fb authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge pull request #6222 from nickryand/background_init

Removed the backgrounding of the unicorn_rails startup scripts
parents 416f551e 73a987ea
...@@ -167,7 +167,7 @@ start_gitlab() { ...@@ -167,7 +167,7 @@ start_gitlab() {
# Remove old socket if it exists # Remove old socket if it exists
rm -f "$socket_path"/gitlab.socket 2>/dev/null rm -f "$socket_path"/gitlab.socket 2>/dev/null
# Start the web server # Start the web server
RAILS_ENV=$RAILS_ENV script/web start & RAILS_ENV=$RAILS_ENV script/web start
fi fi
# If sidekiq is already running, don't start it again. # If sidekiq is already running, don't start it again.
......
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