Commit c4263dfbaff03711b7f18343d8e8bdc380242501
1 parent
ae4ae2b2
Exists in
spb-stable
and in
3 other branches
Fix BackgroundJobs page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
6 additions
and
12 deletions
Show diff stats
app/views/admin/background_jobs/show.html.haml
| @@ -14,27 +14,21 @@ | @@ -14,27 +14,21 @@ | ||
| 14 | %table.table | 14 | %table.table |
| 15 | %thead | 15 | %thead |
| 16 | %th USER | 16 | %th USER |
| 17 | - %th | ||
| 18 | %th PID | 17 | %th PID |
| 19 | - %th | ||
| 20 | %th CPU | 18 | %th CPU |
| 21 | - %th | ||
| 22 | %th MEM | 19 | %th MEM |
| 23 | - %th | ||
| 24 | %th STATE | 20 | %th STATE |
| 25 | - %th | ||
| 26 | %th START | 21 | %th START |
| 27 | - %th | ||
| 28 | %th COMMAND | 22 | %th COMMAND |
| 29 | - %th | ||
| 30 | - - @sidekiq_processes.split("\n").each do |process| | 23 | + %tbody |
| 24 | + - @sidekiq_processes.each do |process| | ||
| 31 | - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/) | 25 | - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/) |
| 32 | - - data = process.gsub!(/\s+/m, '|').strip.split('|') | 26 | + - data = process.strip.split(' ') |
| 33 | %tr | 27 | %tr |
| 34 | - - 6.times do | 28 | + %td= Settings.gitlab.user |
| 29 | + - 5.times do | ||
| 35 | %td= data.shift | 30 | %td= data.shift |
| 36 | - %td | ||
| 37 | - %td= data.join(" ") | 31 | + %td= data.join(' ') |
| 38 | 32 | ||
| 39 | .clearfix | 33 | .clearfix |
| 40 | %p | 34 | %p |