Commit 44b4c9d0 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'patch-1' into 'master'

Consistent rails_socket use.

[ci skip]

See merge request !2596
parents 752468d5 5287da74
...@@ -219,7 +219,7 @@ start_gitlab() { ...@@ -219,7 +219,7 @@ start_gitlab() {
echo "The Unicorn web server already running with pid $wpid, not restarting." echo "The Unicorn web server already running with pid $wpid, not restarting."
else else
# Remove old socket if it exists # 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 # Start the web server
RAILS_ENV=$RAILS_ENV bin/web start RAILS_ENV=$RAILS_ENV bin/web start
fi fi
......
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