Merge branch 'patch-29' into 'master'

Fix help text in Admin Area > Background Jobs

See merge request gitlab-org/gitlab-ce!19208
This commit is contained in:
Phil Hughes 2018-11-13 09:21:35 +00:00
commit 91f117274e

View file

@ -34,10 +34,13 @@
.clearfix
%p
%i.fa.fa-exclamation-circle
If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab.
= link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')
%p
%i.fa.fa-exclamation-circle
If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab.
= link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')