Merge branch 'patch-1' into 'master'

Consistent rails_socket use. [ci skip] See merge request !2596

Merge branch 'patch-1' into 'master'
Consistent rails_socket use. [ci skip] See merge request !2596
44b4c9d0 · Robert Speicher · 752468d5 · 5287da74 · 44b4c9d0
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -219,7 +219,7 @@ start_gitlab() {
    echo "The Unicorn web server already running with pid $wpid, not restarting."
  else
    # Remove old socket if it exists
-    rm -f "$socket_path"/gitlab.socket 2>/dev/null
+    rm -f "$rails_socket" 2>/dev/null
    # Start the web server
    RAILS_ENV=$RAILS_ENV bin/web start
  fi