Skip to content
Snippets Groups Projects

Add support to configure webhook_timeout in gitlab.yaml

Closed gitlab-qa-bot requested to merge github/fork/wesgurn/master into master
1 file
+ 6
4
Compare changes
  • Side-by-side
  • Inline
@@ -289,7 +289,6 @@ namespace :gitlab do
########################
def check_gitlab_git_config
gitlab_user = Gitlab.config.gitlab.user
print "Git configured for #{gitlab_user} user? ... "
options = {
@@ -646,8 +645,8 @@ namespace :gitlab do
puts "#{sidekiq_match.length}".red
try_fixing_it(
'sudo service gitlab stop',
'sudo pkill -f sidekiq',
'sleep 10 && sudo pkill -9 -f sidekiq',
"sudo pkill -u #{gitlab_user} -f sidekiq",
"sleep 10 && sudo pkill -9 -u #{gitlab_user} -f sidekiq",
'sudo service gitlab start'
)
fix_and_rerun
@@ -691,10 +690,13 @@ namespace :gitlab do
end
def sudo_gitlab(command)
gitlab_user = Gitlab.config.gitlab.user
"sudo -u #{gitlab_user} -H #{command}"
end
def gitlab_user
Gitlab.config.gitlab.user
end
def start_checking(component)
puts "Checking #{component.yellow} ..."
puts ""
Loading