Add latest changes from gitlab-org/gitlab@12-4-stable-ee

2 files changed, 3 insertions, 3 deletions

diff --git a/bin/background_jobs b/bin/background_jobs
index 9d12422b81a..06f26df5409 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -28,7 +28,7 @@ restart()
     stop
   fi
   killall
-  start_sidekiq -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
+  start_sidekiq -P $sidekiq_pidfile -d -L $sidekiq_logfile >> $sidekiq_logfile 2>&1
 }
 
 start_no_deamonize()
@@ -45,7 +45,7 @@ start_sidekiq()
     cmd="${cmd} ${chpst} -P"
   fi
 
-  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV -P $sidekiq_pidfile "$@"
+  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
 }
 
 load_ok()
diff --git a/bin/secpick b/bin/secpick
index 8a61356a088..a44867846d0 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -20,7 +20,7 @@ module Secpick
     end
 
     def ee?
-      File.exist?('./CHANGELOG-EE.md')
+      File.exist?('./ee/app/models/license.rb')
     end
 
     def dry_run?