Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
de6a44fa
Commit
de6a44fa
authored
Sep 07, 2016
by
Pascal Betz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feedback code review
parent
1112b5a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/helpers/sidekiq_helper.rb
app/helpers/sidekiq_helper.rb
+1
-1
app/views/admin/background_jobs/show.html.haml
app/views/admin/background_jobs/show.html.haml
+1
-1
No files found.
CHANGELOG
View file @
de6a44fa
...
@@ -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)
...
...
app/helpers/sidekiq_helper.rb
View file @
de6a44fa
...
@@ -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
app/views/admin/background_jobs/show.html.haml
View file @
de6a44fa
...
@@ -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
...
...
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