Add latest changes from gitlab-org/gitlab@master

12 files changed, 20 insertions, 20 deletions

diff --git a/spec/factories/ci/build_trace_chunks.rb b/spec/factories/ci/build_trace_chunks.rb
index 115eb32111c..64a297932de 100644
--- a/spec/factories/ci/build_trace_chunks.rb
+++ b/spec/factories/ci/build_trace_chunks.rb
@@ -23,7 +23,7 @@ FactoryBot.define do
     end
 
     trait :database_with_data do
-      data_store { :database}
+      data_store { :database }
 
       transient do
         initial_data { 'test data' }
@@ -55,7 +55,7 @@ FactoryBot.define do
     end
 
     trait :persisted do
-      data_store { :database}
+      data_store { :database }
 
       transient do
         initial_data { 'test data' }
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 114ad3a5847..f9a3c176ef2 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -15,7 +15,7 @@ FactoryBot.define do
     end
 
     trait :remote_store do
-      file_store { JobArtifactUploader::Store::REMOTE}
+      file_store { JobArtifactUploader::Store::REMOTE }
     end
 
     after :build do |artifact|
diff --git a/spec/factories/ci/pipeline_artifacts.rb b/spec/factories/ci/pipeline_artifacts.rb
index 85277ce6fbf..d096f149c3a 100644
--- a/spec/factories/ci/pipeline_artifacts.rb
+++ b/spec/factories/ci/pipeline_artifacts.rb
@@ -30,7 +30,7 @@ FactoryBot.define do
     end
 
     trait :remote_store do
-      file_store { ::ObjectStorage::Store::REMOTE}
+      file_store { ::ObjectStorage::Store::REMOTE }
     end
 
     trait :with_coverage_report do
diff --git a/spec/factories/commit_statuses.rb b/spec/factories/commit_statuses.rb
index fa10b37cdbf..b41e30e214c 100644
--- a/spec/factories/commit_statuses.rb
+++ b/spec/factories/commit_statuses.rb
@@ -6,10 +6,10 @@ FactoryBot.define do
     stage { 'test' }
     stage_idx { 0 }
     status { 'success' }
-    description { 'commit status'}
+    description { 'commit status' }
     pipeline factory: :ci_pipeline
-    started_at { 'Tue, 26 Jan 2016 08:21:42 +0100'}
-    finished_at { 'Tue, 26 Jan 2016 08:23:42 +0100'}
+    started_at { 'Tue, 26 Jan 2016 08:21:42 +0100' }
+    finished_at { 'Tue, 26 Jan 2016 08:23:42 +0100' }
 
     trait :success do
       status { 'success' }
diff --git a/spec/factories/emails.rb b/spec/factories/emails.rb
index b30fa8a5896..e51c3358a9b 100644
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
@@ -6,6 +6,6 @@ FactoryBot.define do
     email { generate(:email_alias) }
 
     trait(:confirmed) { confirmed_at { Time.now } }
-    trait(:skip_validate) { to_create {|instance| instance.save!(validate: false) } }
+    trait(:skip_validate) { to_create { |instance| instance.save!(validate: false) } }
   end
 end
diff --git a/spec/factories/external_pull_requests.rb b/spec/factories/external_pull_requests.rb
index 7a6e77f8572..470814f4360 100644
--- a/spec/factories/external_pull_requests.rb
+++ b/spec/factories/external_pull_requests.rb
@@ -12,6 +12,6 @@ FactoryBot.define do
     target_sha { 'a09386439ca39abe575675ffd4b89ae824fec22f' }
     status { :open }
 
-    trait(:closed) { status { 'closed'} }
+    trait(:closed) { status { 'closed' } }
   end
 end
diff --git a/spec/factories/gitlab/database/postgres_index.rb b/spec/factories/gitlab/database/postgres_index.rb
index 54bbb738512..8492b44c404 100644
--- a/spec/factories/gitlab/database/postgres_index.rb
+++ b/spec/factories/gitlab/database/postgres_index.rb
@@ -13,7 +13,7 @@ FactoryBot.define do
     exclusion { false }
     expression { false }
     partial { false }
-    definition { "CREATE INDEX #{identifier} ON #{tablename} (bar)"}
+    definition { "CREATE INDEX #{identifier} ON #{tablename} (bar)" }
     ondisk_size_bytes { 100.megabytes }
   end
 end
diff --git a/spec/factories/packages/dependencies.rb b/spec/factories/packages/dependencies.rb
index a62d48c2e73..c99f11d6db3 100644
--- a/spec/factories/packages/dependencies.rb
+++ b/spec/factories/packages/dependencies.rb
@@ -2,11 +2,11 @@
 
 FactoryBot.define do
   factory :packages_dependency, class: 'Packages::Dependency' do
-    sequence(:name) { |n| "@test/package-#{n}"}
+    sequence(:name) { |n| "@test/package-#{n}" }
     sequence(:version_pattern) { |n| "~6.2.#{n}" }
 
     trait(:rubygems) do
-      sequence(:name) { |n| "gem-dependency-#{n}"}
+      sequence(:name) { |n| "gem-dependency-#{n}" }
     end
   end
 end
diff --git a/spec/factories/packages/package_tags.rb b/spec/factories/packages/package_tags.rb
index 3d2eea4a73b..1a40d5d600f 100644
--- a/spec/factories/packages/package_tags.rb
+++ b/spec/factories/packages/package_tags.rb
@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :packages_tag, class: 'Packages::Tag' do
     package
-    sequence(:name) { |n| "tag-#{n}"}
+    sequence(:name) { |n| "tag-#{n}" }
   end
 end
diff --git a/spec/factories/packages/packages.rb b/spec/factories/packages/packages.rb
index 90c68074a3b..3d5bdc95722 100644
--- a/spec/factories/packages/packages.rb
+++ b/spec/factories/packages/packages.rb
@@ -115,7 +115,7 @@ FactoryBot.define do
     end
 
     factory :npm_package do
-      sequence(:name) { |n| "@#{project.root_namespace.path}/package-#{n}"}
+      sequence(:name) { |n| "@#{project.root_namespace.path}/package-#{n}" }
       sequence(:version) { |n| "1.0.#{n}" }
       package_type { :npm }
 
@@ -153,7 +153,7 @@ FactoryBot.define do
     end
 
     factory :nuget_package do
-      sequence(:name) { |n| "NugetPackage#{n}"}
+      sequence(:name) { |n| "NugetPackage#{n}" }
       sequence(:version) { |n| "1.0.#{n}" }
       package_type { :nuget }
 
@@ -175,7 +175,7 @@ FactoryBot.define do
     end
 
     factory :pypi_package do
-      sequence(:name) { |n| "pypi-package-#{n}"}
+      sequence(:name) { |n| "pypi-package-#{n}" }
       sequence(:version) { |n| "1.0.#{n}" }
       package_type { :pypi }
 
@@ -193,7 +193,7 @@ FactoryBot.define do
     end
 
     factory :composer_package do
-      sequence(:name) { |n| "composer-package-#{n}"}
+      sequence(:name) { |n| "composer-package-#{n}" }
       sequence(:version) { |n| "1.0.#{n}" }
       package_type { :composer }
 
@@ -210,7 +210,7 @@ FactoryBot.define do
     end
 
     factory :golang_package do
-      sequence(:name) { |n| "golang.org/x/pkg-#{n}"}
+      sequence(:name) { |n| "golang.org/x/pkg-#{n}" }
       sequence(:version) { |n| "v1.0.#{n}" }
       package_type { :golang }
     end
diff --git a/spec/factories/prometheus_alert.rb b/spec/factories/prometheus_alert.rb
index ad3868c38ed..14fdd993c7a 100644
--- a/spec/factories/prometheus_alert.rb
+++ b/spec/factories/prometheus_alert.rb
@@ -15,7 +15,7 @@ FactoryBot.define do
     end
 
     trait :with_runbook_url do
-      runbook_url { 'https://runbooks.gitlab.com/metric_gt_1'}
+      runbook_url { 'https://runbooks.gitlab.com/metric_gt_1' }
     end
   end
 end
diff --git a/spec/factories/prometheus_metrics.rb b/spec/factories/prometheus_metrics.rb
index 503d392a524..e785bf2ac9d 100644
--- a/spec/factories/prometheus_metrics.rb
+++ b/spec/factories/prometheus_metrics.rb
@@ -9,7 +9,7 @@ FactoryBot.define do
     group { :business }
     project
     legend { 'legend' }
-    dashboard_path { '.gitlab/dashboards/dashboard_path.yml'}
+    dashboard_path { '.gitlab/dashboards/dashboard_path.yml' }
 
     trait :common do
       common { true }