summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rwxr-xr-xbin/background_jobs2
-rwxr-xr-xbin/web2
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5dd865e474e..fbbce0fcda0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 7.3.0
- Support Unix domain sockets for Redis
- Store session Redis keys in 'session:gitlab:' namespace
- Deprecate LDAP account takeover based on partial LDAP email / GitLab username match
+ - Use /bin/sh instead of Bash in bin/web, bin/background_jobs (Pavel Novitskiy)
- Keyboard shortcuts for productivity (Robert Schilling)
- API: filter issues by state (Julien Bianchi)
- API: filter issues by labels (Julien Bianchi)
diff --git a/bin/background_jobs b/bin/background_jobs
index b58cdce4f9f..d6576291609 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -43,7 +43,7 @@ start_sidekiq()
load_ok()
{
sidekiq_pid=$(cat $sidekiq_pidfile)
- if [ -z $sidekiq_pid ] ; then
+ if [ -z "$sidekiq_pid" ] ; then
warn "Could not find a PID in $sidekiq_pidfile"
exit 0
fi
diff --git a/bin/web b/bin/web
index f6bacd6d784..67f236eb0bb 100755
--- a/bin/web
+++ b/bin/web
@@ -9,7 +9,7 @@ unicorn_config="$app_root/config/unicorn.rb"
get_unicorn_pid()
{
local pid=$(cat $unicorn_pidfile)
- if [ -z $pid ] ; then
+ if [ -z "$pid" ] ; then
echo "Could not find a PID in $unicorn_pidfile"
exit 1
fi