Commit 65cb88f3ba48d0f446df167c2f707e9b464f2036
1 parent
2a7da96a
Exists in
spb-stable
and in
3 other branches
Correct BackgroundJobs page for both OSX and linux
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/controllers/admin/background_jobs_controller.rb
| 1 | class Admin::BackgroundJobsController < Admin::ApplicationController | 1 | class Admin::BackgroundJobsController < Admin::ApplicationController |
| 2 | def show | 2 | def show |
| 3 | - ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Settings.gitlab.user} -o euser,pid,pcpu,pmem,stat,start,command)) | 3 | + ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Settings.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) |
| 4 | @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) | 4 | @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) |
| 5 | end | 5 | end |
| 6 | end | 6 | end |