diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-26 11:32:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-26 11:32:47 +0000 |
| commit | c2325d3fa6ca2842d8059f377322abca18825ef4 (patch) | |
| tree | aa03328a95eb7df11ef546e9ffa07538284498eb | |
| parent | d49c05d9c6d9b00de51ea176e5d3fc54e623bda2 (diff) | |
| parent | b9c7ed53b8cd90050a9ae1adeae8b9785dfff8a2 (diff) | |
| download | gitlab-ce-c2325d3fa6ca2842d8059f377322abca18825ef4.tar.gz | |
Merge branch 'bugfix/fix_sidekiq_stats' into 'master'
Fix Sidekiq process stats in admin area
Closes #23825
See merge request !7116
| -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 e289a990629..2c19c3cec55 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) - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose) - Fix filtering of milestones with quotes in title (airatshigapov) 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) |