Merge branch '6785-change-sidekiq-warning-to-error' into 'master'
Change the sidekiq warning to raise an error instead Closes #6785 See merge request gitlab-org/omnibus-gitlab!6065
Showing
- files/gitlab-config-template/gitlab.rb.template 1 addition, 2 deletionsfiles/gitlab-config-template/gitlab.rb.template
- files/gitlab-cookbooks/gitlab/attributes/default.rb 3 additions, 4 deletionsfiles/gitlab-cookbooks/gitlab/attributes/default.rb
- files/gitlab-cookbooks/gitlab/libraries/sidekiq.rb 13 additions, 4 deletionsfiles/gitlab-cookbooks/gitlab/libraries/sidekiq.rb
- files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb 3 additions, 4 deletions.../gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
- spec/chef/cookbooks/gitlab/recipes/default_spec.rb 26 additions, 13 deletionsspec/chef/cookbooks/gitlab/recipes/default_spec.rb
- spec/chef/cookbooks/gitlab/recipes/gitlab-rails/gitlab_yml/monitoring_spec.rb 5 additions, 9 deletions...gitlab/recipes/gitlab-rails/gitlab_yml/monitoring_spec.rb
Loading
Please register or sign in to comment