diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-11 18:32:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-11 18:32:40 +0000 |
| commit | 0e1e42885a792145dafc6aa28165d069b1cb5c03 (patch) | |
| tree | 2748dddbf1f499ff9be1eca4ce6a8132f44649a1 /app/helpers | |
| parent | 52f29501be343ed8cb8bfc8ee64014cd3f4c9ba4 (diff) | |
| parent | e840749b84ceb226e46ebdfb489c735e3370cff7 (diff) | |
| download | gitlab-ce-0e1e42885a792145dafc6aa28165d069b1cb5c03.tar.gz | |
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.
## 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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 45a567a1eba..be5e0301a43 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -100,4 +100,8 @@ module ApplicationSettingsHelper options_for_select(options, @application_setting.repository_storages) end + + def sidekiq_queue_options_for_select + options_for_select(Sidekiq::Queue.all.map(&:name), @application_setting.sidekiq_throttling_queues) + end end |