Add latest changes from gitlab-org/gitlab@master

6 files changed, 74 insertions, 18 deletions

diff --git a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
index 243cc9d891d..be736184e60 100644
--- a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
@@ -45,7 +45,7 @@ exports[`Design management index page designs renders loading icon 1`] = `
     <gl-loading-icon-stub
       color="dark"
       label="Loading"
-      size="md"
+      size="lg"
     />
   </div>
    
diff --git a/spec/lib/container_registry/migration_spec.rb b/spec/lib/container_registry/migration_spec.rb
index 81dac354b8b..e70e2175774 100644
--- a/spec/lib/container_registry/migration_spec.rb
+++ b/spec/lib/container_registry/migration_spec.rb
@@ -58,17 +58,20 @@ RSpec.describe ContainerRegistry::Migration do
   describe '.capacity' do
     subject { described_class.capacity }
 
-    where(:ff_1_enabled, :ff_2_enabled, :ff_5_enabled, :ff_10_enabled, :ff_25_enabled, :expected_result) do
-      false | false | false | false | false | 0
-      true  | false | false | false | false | 1
-      false | true  | false | false | false | 2
-      true  | true  | false | false | false | 2
-      false | false | true  | false | false | 5
-      true  | true  | true  | false | false | 5
-      false | false | false | true  | false | 10
-      true  | true  | true  | true  | false | 10
-      false | false | false | false | true  | 25
-      true  | true  | true  | true  | true  | 25
+    where(:ff_1_enabled, :ff_2_enabled, :ff_5_enabled,
+          :ff_10_enabled, :ff_25_enabled, :ff_40_enabled, :expected_result) do
+      false | false | false | false | false | false | 0
+      true  | false | false | false | false | false | 1
+      false | true  | false | false | false | false | 2
+      true  | true  | false | false | false | false | 2
+      false | false | true  | false | false | false | 5
+      true  | true  | true  | false | false | false | 5
+      false | false | false | true  | false | false | 10
+      true  | true  | true  | true  | false | false | 10
+      false | false | false | false | true  | false | 25
+      true  | true  | true  | true  | true  | false | 25
+      false | false | false | false | false | true  | 40
+      true  | true  | true  | true  | true  | true  | 40
     end
 
     with_them do
@@ -78,7 +81,8 @@ RSpec.describe ContainerRegistry::Migration do
           container_registry_migration_phase2_capacity_2: ff_2_enabled,
           container_registry_migration_phase2_capacity_5: ff_5_enabled,
           container_registry_migration_phase2_capacity_10: ff_10_enabled,
-          container_registry_migration_phase2_capacity_25: ff_25_enabled
+          container_registry_migration_phase2_capacity_25: ff_25_enabled,
+          container_registry_migration_phase2_capacity_40: ff_40_enabled
         )
       end
 
diff --git a/spec/lib/gitlab/sidekiq_middleware/worker_context/client_spec.rb b/spec/lib/gitlab/sidekiq_middleware/worker_context/client_spec.rb
index 3baa0c6f967..821d8b8fe7b 100644
--- a/spec/lib/gitlab/sidekiq_middleware/worker_context/client_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/worker_context/client_spec.rb
@@ -50,6 +50,26 @@ RSpec.describe Gitlab::SidekiqMiddleware::WorkerContext::Client do
   end
 
   describe "#call" do
+    context 'root_caller_id' do
+      it 'uses caller_id of the current context' do
+        Gitlab::ApplicationContext.with_context(caller_id: 'CALLER') do
+          TestWithContextWorker.perform_async
+        end
+
+        job = TestWithContextWorker.jobs.last
+        expect(job['meta.root_caller_id']).to eq('CALLER')
+      end
+
+      it 'uses root_caller_id instead of caller_id of the current context' do
+        Gitlab::ApplicationContext.with_context(caller_id: 'CALLER', root_caller_id: 'ROOT_CALLER') do
+          TestWithContextWorker.perform_async
+        end
+
+        job = TestWithContextWorker.jobs.last
+        expect(job['meta.root_caller_id']).to eq('ROOT_CALLER')
+      end
+    end
+
     it 'applies a context for jobs scheduled in batch' do
       user_per_job = { 'job1' => build_stubbed(:user, username: 'user-1'),
                        'job2' => build_stubbed(:user, username: 'user-2') }
@@ -97,7 +117,7 @@ RSpec.describe Gitlab::SidekiqMiddleware::WorkerContext::Client do
       end
 
       it 'does not set any explicit feature category for mailers', :sidekiq_mailers do
-        expect(Gitlab::ApplicationContext).not_to receive(:with_context)
+        expect(Gitlab::ApplicationContext).to receive(:with_context).with(hash_excluding(feature_category: anything))
 
         TestMailer.test_mail.deliver_later
       end
diff --git a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
index c4a84445a01..0d45c4a4352 100644
--- a/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/code_review_events_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Code review events' do
 
     code_review_events = Gitlab::UsageDataCounters::HLLRedisCounter.events_for_category("code_review")
 
-    exceptions = %w[i_code_review_mr_diffs i_code_review_mr_single_file_diffs i_code_review_total_suggestions_applied i_code_review_total_suggestions_added]
+    exceptions = %w[i_code_review_mr_diffs i_code_review_mr_single_file_diffs i_code_review_total_suggestions_applied i_code_review_total_suggestions_added i_code_review_create_note_in_ipynb_diff i_code_review_create_note_in_ipynb_diff_mr i_code_review_create_note_in_ipynb_diff_commit]
     code_review_aggregated_events += exceptions
 
     expect(code_review_events - code_review_aggregated_events).to be_empty
diff --git a/spec/workers/concerns/cronjob_queue_spec.rb b/spec/workers/concerns/cronjob_queue_spec.rb
index d1ad5c65ea3..0244535051f 100644
--- a/spec/workers/concerns/cronjob_queue_spec.rb
+++ b/spec/workers/concerns/cronjob_queue_spec.rb
@@ -11,11 +11,33 @@ RSpec.describe CronjobQueue do
 
       include ApplicationWorker
       include CronjobQueue # rubocop:disable Scalability/CronWorkerContext
+
+      def perform
+        AnotherWorker.perform_async('identifier')
+      end
+    end
+  end
+
+  let(:another_worker) do
+    Class.new do
+      def self.name
+        'AnotherWorker'
+      end
+
+      include ApplicationWorker
+
+      # To keep track of the context that was active for certain arguments
+      cattr_accessor(:contexts) { {} }
+
+      def perform(identifier, *args)
+        self.class.contexts.merge!(identifier => Gitlab::ApplicationContext.current)
+      end
     end
   end
 
   before do
     stub_const("DummyWorker", worker)
+    stub_const("AnotherWorker", another_worker)
   end
 
   it 'sets the queue name of a worker' do
@@ -27,7 +49,7 @@ RSpec.describe CronjobQueue do
   end
 
   it 'automatically clears project, user and namespace from the context', :aggregate_failues do
-    worker_context = worker.get_worker_context.to_lazy_hash.transform_values(&:call)
+    worker_context = worker.get_worker_context.to_lazy_hash.transform_values { |v| v.try(:call) }
 
     expect(worker_context[:user]).to be_nil
     expect(worker_context[:root_namespace]).to be_nil
@@ -42,6 +64,14 @@ RSpec.describe CronjobQueue do
     expect(job).to include('meta.caller_id' => 'Cronjob')
   end
 
+  it 'gets root_caller_id from the cronjob' do
+    Sidekiq::Testing.inline! do
+      worker.perform_async
+    end
+
+    expect(AnotherWorker.contexts['identifier']).to include('meta.root_caller_id' => 'Cronjob')
+  end
+
   it 'does not set the caller_id if there was already one in the context' do
     Gitlab::ApplicationContext.with_context(caller_id: 'already set') do
       worker.perform_async
diff --git a/spec/workers/container_registry/migration/enqueuer_worker_spec.rb b/spec/workers/container_registry/migration/enqueuer_worker_spec.rb
index a57a9e3b2e8..d13d08da69b 100644
--- a/spec/workers/container_registry/migration/enqueuer_worker_spec.rb
+++ b/spec/workers/container_registry/migration/enqueuer_worker_spec.rb
@@ -106,7 +106,8 @@ RSpec.describe ContainerRegistry::Migration::EnqueuerWorker, :aggregate_failures
           before do
             # set capacity to 10
             stub_feature_flags(
-              container_registry_migration_phase2_capacity_25: false
+              container_registry_migration_phase2_capacity_25: false,
+              container_registry_migration_phase2_capacity_40: false
             )
 
             # Plus 2 created above gives 9 importing repositories
@@ -475,7 +476,8 @@ RSpec.describe ContainerRegistry::Migration::EnqueuerWorker, :aggregate_failures
           before do
             # set capacity to 10
             stub_feature_flags(
-              container_registry_migration_phase2_capacity_25: false
+              container_registry_migration_phase2_capacity_25: false,
+              container_registry_migration_phase2_capacity_40: false
             )
 
             # Plus 2 created above gives 9 importing repositories