diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2016-10-26 10:53:59 +0300 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2016-10-26 10:53:59 +0300 |
| commit | b9c7ed53b8cd90050a9ae1adeae8b9785dfff8a2 (patch) | |
| tree | c320defa57f5d09b7949f6e46c8dde6edb3fe532 | |
| parent | d6e72f617237274f38f7e59fac9889d796692008 (diff) | |
Fix sidekiq stats in admin area
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/helpers/sidekiq_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0989345d230..cf9b8ef0076 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix extra space on Build sidebar on Firefox !7060 - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Add hover to trash icon in notes !7008 (blackst0ne) + - Fix sidekiq stats in admin area (blackst0ne) - Escape ref and path for relative links !6050 (winniehell) - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache diff --git a/app/helpers/sidekiq_helper.rb b/app/helpers/sidekiq_helper.rb index d440edc55ba..56749d80bd3 100644 --- a/app/helpers/sidekiq_helper.rb +++ b/app/helpers/sidekiq_helper.rb @@ -5,7 +5,7 @@ module SidekiqHelper (?<mem>[\d\.,]+)\s+ (?<state>[DRSTWXZNLsl\+<]+)\s+ (?<start>.+)\s+ - (?<command>sidekiq.*\])\s+ + (?<command>sidekiq.*\])\s* \z/x def parse_sidekiq_ps(line) |