Add latest changes from gitlab-org/gitlab@master

4 files changed, 16 insertions, 16 deletions

diff --git a/spec/migrations/20210804150320_create_base_work_item_types_spec.rb b/spec/migrations/20210804150320_create_base_work_item_types_spec.rb
index 6df8e1b2ebf..ae510826fe1 100644
--- a/spec/migrations/20210804150320_create_base_work_item_types_spec.rb
+++ b/spec/migrations/20210804150320_create_base_work_item_types_spec.rb
@@ -10,9 +10,9 @@ RSpec.describe CreateBaseWorkItemTypes, :migration do
 
   let(:base_types) do
     {
-      issue:       0,
-      incident:    1,
-      test_case:   2,
+      issue: 0,
+      incident: 1,
+      test_case: 2,
       requirement: 3
     }
   end
diff --git a/spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb b/spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb
index 1957a973ee1..552602983d9 100644
--- a/spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb
+++ b/spec/migrations/20210831203408_upsert_base_work_item_types_spec.rb
@@ -10,9 +10,9 @@ RSpec.describe UpsertBaseWorkItemTypes, :migration do
 
   let(:base_types) do
     {
-      issue:       0,
-      incident:    1,
-      test_case:   2,
+      issue: 0,
+      incident: 1,
+      test_case: 2,
       requirement: 3
     }
   end
diff --git a/spec/migrations/20211117084814_migrate_remaining_u2f_registrations_spec.rb b/spec/migrations/20211117084814_migrate_remaining_u2f_registrations_spec.rb
index 6a82ed016af..ef6dd94d9e3 100644
--- a/spec/migrations/20211117084814_migrate_remaining_u2f_registrations_spec.rb
+++ b/spec/migrations/20211117084814_migrate_remaining_u2f_registrations_spec.rb
@@ -33,11 +33,11 @@ RSpec.describe MigrateRemainingU2fRegistrations, :migration do
     device = U2F::FakeU2F.new(FFaker::BaconIpsum.characters(5), { key_handle: SecureRandom.random_bytes(255) })
     public_key ||= Base64.strict_encode64(device.origin_public_key_raw)
     u2f_registrations.create!({ id: id,
-                               certificate: Base64.strict_encode64(device.cert_raw),
-                               key_handle: U2F.urlsafe_encode64(device.key_handle_raw),
-                               public_key: public_key,
-                               counter: 5,
-                               name: name,
-                               user_id: user.id })
+                                certificate: Base64.strict_encode64(device.cert_raw),
+                                key_handle: U2F.urlsafe_encode64(device.key_handle_raw),
+                                public_key: public_key,
+                                counter: 5,
+                                name: name,
+                                user_id: user.id })
   end
 end
diff --git a/spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb b/spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb
index b80e4703f07..34a6e2fdd12 100644
--- a/spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb
+++ b/spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb
@@ -10,11 +10,11 @@ RSpec.describe AddTaskToWorkItemTypes, :migration do
 
   let(:base_types) do
     {
-      issue:       0,
-      incident:    1,
-      test_case:   2,
+      issue: 0,
+      incident: 1,
+      test_case: 2,
       requirement: 3,
-      task:        4
+      task: 4
     }
   end