Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiro Santilli <ciro.santilli@gmail.com>2014-10-10 13:06:08 +0400
committerCiro Santilli <ciro.santilli@gmail.com>2014-10-16 01:01:31 +0400
commit39c66c822ec955205aa69a7d38b16669f488e8da (patch)
treefa9d688476bd76df299373d02348ed8f13d21fdd /app/views/admin/background_jobs
parenta0a826ebdcb783c660dd40d8cb217db28a9d4998 (diff)
Use Gitlab.config instead of Settings everywhere
Diffstat (limited to 'app/views/admin/background_jobs')
-rw-r--r--app/views/admin/background_jobs/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 9dcf7b488ee..8db2b2a709c 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -25,7 +25,7 @@
- next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
- data = process.strip.split(' ')
%tr
- %td= Settings.gitlab.user
+ %td= gitlab_config.user
- 5.times do
%td= data.shift
%td= data.join(' ')
@@ -36,7 +36,7 @@
If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'.
%p
%i.fa.fa-exclamation-circle
- If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{Settings.gitlab.user} -f sidekiq) and restart GitLab.
+ 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.