summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:39:41 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-13 10:39:41 +0200
commitc4263dfbaff03711b7f18343d8e8bdc380242501 (patch)
tree7dc32e5d5e6634948d1bf7b17ec07328d6df371b
parentae4ae2b225ffa5883a45d1de4cc79bdc96550cdf (diff)
downloadgitlab-ce-c4263dfbaff03711b7f18343d8e8bdc380242501.tar.gz
Fix BackgroundJobs page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/views/admin/background_jobs/show.html.haml18
1 files changed, 6 insertions, 12 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index e5af56ffc5c..32f77cc1a70 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -14,27 +14,21 @@
%table.table
%thead
%th USER
- %th
%th PID
- %th
%th CPU
- %th
%th MEM
- %th
%th STATE
- %th
%th START
- %th
%th COMMAND
- %th
- - @sidekiq_processes.split("\n").each do |process|
+ %tbody
+ - @sidekiq_processes.each do |process|
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- - data = process.gsub!(/\s+/m, '|').strip.split('|')
+ - data = process.strip.split(' ')
%tr
- - 6.times do
+ %td= Settings.gitlab.user
+ - 5.times do
%td= data.shift
- %td
- %td= data.join(" ")
+ %td= data.join(' ')
.clearfix
%p