diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-03-26 12:25:40 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-03-26 12:25:40 +0100 |
commit | ad7cd8fb35869abc884a415fd16057d522a2fd8e (patch) | |
tree | a8ef5586ab4431daffd51159e0ef9b778ae9747c /lib | |
parent | 416f551e70444ccba051c3f5b53f4c0df2b73eaa (diff) | |
parent | 73a987ea6bedd569e24f37d323883a7dbeb3ae56 (diff) | |
download | gitlab-ce-ad7cd8fb35869abc884a415fd16057d522a2fd8e.tar.gz |
Merge pull request #6222 from nickryand/background_init
Removed the backgrounding of the unicorn_rails startup scripts
Diffstat (limited to 'lib')
-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 0308181b86b..0703b3d7064 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -167,7 +167,7 @@ start_gitlab() { # Remove old socket if it exists rm -f "$socket_path"/gitlab.socket 2>/dev/null # Start the web server - RAILS_ENV=$RAILS_ENV script/web start & + RAILS_ENV=$RAILS_ENV script/web start fi # If sidekiq is already running, don't start it again. |