Add latest changes from gitlab-org/gitlab@master

3 files changed, 46 insertions, 40 deletions

diff --git a/spec/migrations/add_premium_and_ultimate_plan_limits_spec.rb b/spec/migrations/add_premium_and_ultimate_plan_limits_spec.rb
index fb62fc3ca02..0ae4559ca9f 100644
--- a/spec/migrations/add_premium_and_ultimate_plan_limits_spec.rb
+++ b/spec/migrations/add_premium_and_ultimate_plan_limits_spec.rb
@@ -72,12 +72,14 @@ RSpec.describe AddPremiumAndUltimatePlanLimits, :migration do
           it 'creates plan limits from the source plan' do
             migrate!
 
-            expect(AddPremiumAndUltimatePlanLimits::PlanLimits.pluck(:plan_id, :storage_size_limit)).to match_array([
-              [silver.id, silver_limits.storage_size_limit],
-              [gold.id, gold_limits.storage_size_limit],
-              [premium.id, silver_limits.storage_size_limit],
-              [ultimate.id, gold_limits.storage_size_limit]
-            ])
+            expect(AddPremiumAndUltimatePlanLimits::PlanLimits.pluck(:plan_id, :storage_size_limit))
+              .to match_array(
+                [
+                  [silver.id, silver_limits.storage_size_limit],
+                  [gold.id, gold_limits.storage_size_limit],
+                  [premium.id, silver_limits.storage_size_limit],
+                  [ultimate.id, gold_limits.storage_size_limit]
+                ])
           end
         end
       end
diff --git a/spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb b/spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb
index da32e92ebb0..87855285203 100644
--- a/spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb
+++ b/spec/migrations/backfill_escalation_policies_for_oncall_schedules_spec.rb
@@ -57,36 +57,39 @@ RSpec.describe BackfillEscalationPoliciesForOncallSchedules do
       expect(new_polices).to all have_attributes(name: 'On-call Escalation Policy')
       expect(new_policy_b1.description).to eq('Immediately notify Schedule B1')
       expect(new_policy_c1.description).to eq('Immediately notify Schedule C1')
-      expect(policies.pluck(:project_id)).to eq([
-        project_d.id,
-        project_e.id,
-        project_f.id,
-        project_f.id,
-        project_b.id,
-        project_c.id
-      ])
+      expect(policies.pluck(:project_id)).to eq(
+        [
+          project_d.id,
+          project_e.id,
+          project_f.id,
+          project_f.id,
+          project_b.id,
+          project_c.id
+        ])
 
       expect(new_rules).to all have_attributes(status: 1, elapsed_time_seconds: 0)
-      expect(rules.pluck(:policy_id)).to eq([
-        rule_d1.policy_id,
-        rule_e1.policy_id,
-        rule_f1.policy_id,
-        rule_f2.policy_id,
-        rule_f3.policy_id,
-        new_policy_b1.id,
-        new_policy_c1.id,
-        new_policy_c1.id
-      ])
-      expect(rules.pluck(:oncall_schedule_id)).to eq([
-        rule_d1.oncall_schedule_id,
-        rule_e1.oncall_schedule_id,
-        rule_f1.oncall_schedule_id,
-        rule_f2.oncall_schedule_id,
-        rule_f3.oncall_schedule_id,
-        schedule_b1.id,
-        schedule_c1.id,
-        schedule_c2.id
-      ])
+      expect(rules.pluck(:policy_id)).to eq(
+        [
+          rule_d1.policy_id,
+          rule_e1.policy_id,
+          rule_f1.policy_id,
+          rule_f2.policy_id,
+          rule_f3.policy_id,
+          new_policy_b1.id,
+          new_policy_c1.id,
+          new_policy_c1.id
+        ])
+      expect(rules.pluck(:oncall_schedule_id)).to eq(
+        [
+          rule_d1.oncall_schedule_id,
+          rule_e1.oncall_schedule_id,
+          rule_f1.oncall_schedule_id,
+          rule_f2.oncall_schedule_id,
+          rule_f3.oncall_schedule_id,
+          schedule_b1.id,
+          schedule_c1.id,
+          schedule_c2.id
+        ])
     end
   end
 
diff --git a/spec/migrations/slice_merge_request_diff_commit_migrations_spec.rb b/spec/migrations/slice_merge_request_diff_commit_migrations_spec.rb
index e03dd73ec8b..b03a5c41a11 100644
--- a/spec/migrations/slice_merge_request_diff_commit_migrations_spec.rb
+++ b/spec/migrations/slice_merge_request_diff_commit_migrations_spec.rb
@@ -49,12 +49,13 @@ RSpec.describe SliceMergeRequestDiffCommitMigrations, :migration do
           .pending
           .to_a
 
-        expect(new_jobs.map(&:arguments)).to eq([
-          [1, 5_001],
-          [5_001, 10_001],
-          [10_001, 15_001],
-          [15_001, 20_001]
-        ])
+        expect(new_jobs.map(&:arguments)).to eq(
+          [
+            [1, 5_001],
+            [5_001, 10_001],
+            [10_001, 15_001],
+            [15_001, 20_001]
+          ])
       end
 
       it 'schedules a background migration for the first job' do