diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 18:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-04 18:08:46 +0300 |
| commit | adf76f8f1d6da3ecbd8aa5d2da68dc8456283e8f (patch) | |
| tree | 8f422d83a2690d0fdb3fd0ee55cf225e40fd976a /config | |
| parent | 6724a6ee6b0898470e20f294f1328cc01891756a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/security_on_demand_scans_site_validation.yml (renamed from config/feature_flags/development/security-on-demand-scans-site-validation.yml) | 2 | ||||
| -rw-r--r-- | config/initializers/carrierwave_patch.rb | 6 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/config/feature_flags/development/security-on-demand-scans-site-validation.yml b/config/feature_flags/development/security_on_demand_scans_site_validation.yml index 381c173b1bf..27ec926d9ac 100644 --- a/config/feature_flags/development/security-on-demand-scans-site-validation.yml +++ b/config/feature_flags/development/security_on_demand_scans_site_validation.yml @@ -1,5 +1,5 @@ --- -name: security-on-demand-scans-site-validation +name: security_on_demand_scans_site_validation introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40685 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/241815 group: group::dynamic analysis diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb index 53fba307926..ad3ff36138f 100644 --- a/config/initializers/carrierwave_patch.rb +++ b/config/initializers/carrierwave_patch.rb @@ -7,7 +7,9 @@ require "carrierwave/storage/fog" # # This patch also incorporates # https://github.com/carrierwaveuploader/carrierwave/pull/2375 to -# provide Azure support. This is already in CarrierWave v2.1.x, but +# provide Azure support +# and https://github.com/carrierwaveuploader/carrierwave/pull/2397 to +# support custom expire_at. This is already in CarrierWave v2.1.x, but # upgrading this gem is a significant task: # https://gitlab.com/gitlab-org/gitlab/-/issues/216067 module CarrierWave @@ -28,7 +30,7 @@ module CarrierWave # avoid a get by using local references local_directory = connection.directories.new(key: @uploader.fog_directory) local_file = local_directory.files.new(key: path) - expire_at = ::Fog::Time.now + @uploader.fog_authenticated_url_expiration + expire_at = options[:expire_at] || ::Fog::Time.now + @uploader.fog_authenticated_url_expiration case @uploader.fog_credentials[:provider] when 'AWS', 'Google' # Older versions of fog-google do not support options as a parameter diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 0452a9b6621..bb43e61775b 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -138,6 +138,8 @@ - 2 - - irker - 1 +- - issue_placement + - 2 - - issue_rebalancing - 1 - - jira_connect |