Merge pull request #6222 from nickryand/background_init

Removed the backgrounding of the unicorn_rails startup scripts

Merge pull request #6222 from nickryand/background_init
ad7cd8fb · Jacob Vosmaer · 416f551e · 73a987ea · ad7cd8fb
Commit ad7cd8fb authored Mar 26, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gitlab lib/support/init.d/gitlab +1 -1

No files found.
--- 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.