From de6a44fae6273c44ef27ff55d13799efc9756acd Mon Sep 17 00:00:00 2001 From: Pascal Betz Date: Wed, 7 Sep 2016 21:59:29 +0200 Subject: [PATCH] feedback code review --- CHANGELOG | 1 + app/helpers/sidekiq_helper.rb | 2 +- app/views/admin/background_jobs/show.html.haml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d06b782f850..21d3cc1435f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.12.0 (unreleased) - Change merge_error column from string to text type - Reduce contributions calendar data payload (ClemMakesApps) - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel) + - Move parsing of sidekiq ps into helper !6245 (pascalbetz) - Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel) - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling) - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps) diff --git a/app/helpers/sidekiq_helper.rb b/app/helpers/sidekiq_helper.rb index 3644039d38e..82ab26408df 100644 --- a/app/helpers/sidekiq_helper.rb +++ b/app/helpers/sidekiq_helper.rb @@ -6,7 +6,7 @@ module SidekiqHelper if match match[1..6] else - %w{? ? ? ? ? ?} + %w[? ? ? ? ? ?] end end end diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index c2a312b2196..058919635da 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -29,7 +29,7 @@ %tbody - @sidekiq_processes.each do |process| %td= gitlab_config.user - -parse_sidekiq_ps(process).each do |value| + - parse_sidekiq_ps(process).each do |value| %td= value .clearfix %p