Merge branch 'sidekiq-job-throttling' into 'master'
Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
Showing
... | ... | @@ -137,6 +137,7 @@ gem 'acts-as-taggable-on', '~> 4.0' |
gem 'sidekiq', '~> 4.2' | ||
gem 'sidekiq-cron', '~> 0.4.0' | ||
gem 'redis-namespace', '~> 1.5.2' | ||
gem 'sidekiq-limit_fetch', '~> 3.4' | ||
# HTTP requests | ||
gem 'httparty', '~> 0.13.3' | ||
... | ... |
112.1 KB
lib/gitlab/sidekiq_throttler.rb
0 → 100644