Commit de6a44fa authored by Pascal Betz's avatar Pascal Betz

feedback code review

parent 1112b5a2
...@@ -12,6 +12,7 @@ v 8.12.0 (unreleased) ...@@ -12,6 +12,7 @@ v 8.12.0 (unreleased)
- Change merge_error column from string to text type - Change merge_error column from string to text type
- Reduce contributions calendar data payload (ClemMakesApps) - Reduce contributions calendar data payload (ClemMakesApps)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel) - 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) - 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) - 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) - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps)
......
...@@ -6,7 +6,7 @@ module SidekiqHelper ...@@ -6,7 +6,7 @@ module SidekiqHelper
if match if match
match[1..6] match[1..6]
else else
%w{? ? ? ? ? ?} %w[? ? ? ? ? ?]
end end
end end
end end
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%tbody %tbody
- @sidekiq_processes.each do |process| - @sidekiq_processes.each do |process|
%td= gitlab_config.user %td= gitlab_config.user
-parse_sidekiq_ps(process).each do |value| - parse_sidekiq_ps(process).each do |value|
%td= value %td= value
.clearfix .clearfix
%p %p
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment