Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -174,6 +174,7 @@ gem 'acts-as-taggable-on', '~> 5.0'
 gem 'sidekiq', '~> 5.2.1'
 gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.6.0'
+gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'
 
 # Cron Parser
 gem 'rufus-scheduler', '~> 3.4'
@@ -306,7 +307,6 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 gem 'peek-pg', '~> 1.3.0', group: :postgres
 gem 'peek-rblineprof', '~> 0.2.0'
 gem 'peek-redis', '~> 1.2.0'
-gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'
 
 # Metrics
 group :metrics do

Gemfile.lock

@@ -305,7 +305,7 @@ GEM
       activerecord (>= 3.2.0, < 6.0)
     gitlab-license (1.0.0)
     gitlab-markup (1.6.5)
-    gitlab-sidekiq-fetcher (0.3.0)
+    gitlab-sidekiq-fetcher (0.1.0)
       sidekiq (~> 5)
     gitlab-styles (2.4.1)
       rubocop (~> 0.54.0)
@@ -1046,7 +1046,7 @@ DEPENDENCIES
   gitlab-default_value_for (~> 3.1.1)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.6.5)
-  gitlab-sidekiq-fetcher
+  gitlab-sidekiq-fetcher (~> 0.1.0)
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)

config/initializers/sidekiq.rb

@@ -42,7 +42,9 @@ Sidekiq.configure_server do |config|
   end
 
   if Feature::FlipperFeature.table_exists? && Feature.enabled?(:gitlab_sidekiq_reliable_fetcher)
-    Sidekiq::ReliableFetcher.setup_reliable_fetch!(config)
+    # By default we're going to use Semi Reliable Fetch
+    config.options[:semi_reliable_fetch] = Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, default_enabled: true)
+    Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
   end
 
   # Sidekiq-cron: load recurring jobs from gitlab.yml