Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/bin/mail_room b/bin/mail_room
index 2539e3d388e..be608be4229 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -9,7 +9,8 @@ mail_room_config="$app_root/config/mail_room.yml"
 
 get_mail_room_pid()
 {
-  local pid=$(cat $mail_room_pidfile)
+  local pid
+  pid=$(cat $mail_room_pidfile)
   if [ -z "$pid" ] ; then
     echo "Could not find a PID in $mail_room_pidfile"
     exit 1
diff --git a/bin/web_unicorn b/bin/web_unicorn
index ecd0bbd10b0..41e2ac44351 100755
--- a/bin/web_unicorn
+++ b/bin/web_unicorn
@@ -9,7 +9,8 @@ unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
 
 get_unicorn_pid()
 {
-  local pid=$(cat $unicorn_pidfile)
+  local pid
+  pid=$(cat $unicorn_pidfile)
   if [ -z "$pid" ] ; then
     echo "Could not find a PID in $unicorn_pidfile"
     exit 1