BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b9c7ed53
Commit
b9c7ed53
authored
Oct 26, 2016
by
blackst0ne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sidekiq stats in admin area
parent
d6e72f61
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
sidekiq_helper.rb
app/helpers/sidekiq_helper.rb
+1
-1
No files found.
CHANGELOG.md
View file @
b9c7ed53
...
...
@@ -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
...
...
app/helpers/sidekiq_helper.rb
View file @
b9c7ed53
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment