Add latest changes from gitlab-org/gitlab@master

10 files changed, 10 insertions, 0 deletions

diff --git a/spec/graphql/resolvers/admin/analytics/usage_trends/measurements_resolver_spec.rb b/spec/graphql/resolvers/admin/analytics/usage_trends/measurements_resolver_spec.rb
index 269a1fb1758..b63eca4359d 100644
--- a/spec/graphql/resolvers/admin/analytics/usage_trends/measurements_resolver_spec.rb
+++ b/spec/graphql/resolvers/admin/analytics/usage_trends/measurements_resolver_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Resolvers::Admin::Analytics::UsageTrends::MeasurementsResolver do
   include GraphqlHelpers
 
   let_it_be(:admin_user) { create(:user, :admin) }
+
   let(:current_user) { admin_user }
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/alert_management/alert_status_counts_resolver_spec.rb b/spec/graphql/resolvers/alert_management/alert_status_counts_resolver_spec.rb
index b72e692f2e8..3bc6043a849 100644
--- a/spec/graphql/resolvers/alert_management/alert_status_counts_resolver_spec.rb
+++ b/spec/graphql/resolvers/alert_management/alert_status_counts_resolver_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Resolvers::AlertManagement::AlertStatusCountsResolver do
   describe '#resolve' do
     let_it_be(:current_user) { create(:user) }
     let_it_be(:project) { create(:project) }
+
     let(:args) { {} }
 
     subject { resolve_alert_status_counts(args) }
diff --git a/spec/graphql/resolvers/branch_commit_resolver_spec.rb b/spec/graphql/resolvers/branch_commit_resolver_spec.rb
index 346c9e01088..3d5702539fa 100644
--- a/spec/graphql/resolvers/branch_commit_resolver_spec.rb
+++ b/spec/graphql/resolvers/branch_commit_resolver_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Resolvers::BranchCommitResolver do
   subject(:commit) { resolve(described_class, obj: branch) }
 
   let_it_be(:repository) { create(:project, :repository).repository }
+
   let(:branch) { repository.find_branch('master') }
 
   describe '#resolve' do
diff --git a/spec/graphql/resolvers/design_management/designs_resolver_spec.rb b/spec/graphql/resolvers/design_management/designs_resolver_spec.rb
index 28e963c88a9..b091e58b06f 100644
--- a/spec/graphql/resolvers/design_management/designs_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/designs_resolver_spec.rb
@@ -20,6 +20,7 @@ RSpec.describe Resolvers::DesignManagement::DesignsResolver do
     let_it_be(:first_version) { create(:design_version) }
     let_it_be(:first_design) { create(:design, issue: issue, versions: [first_version]) }
     let_it_be(:current_user) { create(:user) }
+
     let(:gql_context) { { current_user: current_user } }
     let(:args) { {} }
 
diff --git a/spec/graphql/resolvers/design_management/version/designs_at_version_resolver_spec.rb b/spec/graphql/resolvers/design_management/version/designs_at_version_resolver_spec.rb
index c038216ce0b..4e8f5e5fc1d 100644
--- a/spec/graphql/resolvers/design_management/version/designs_at_version_resolver_spec.rb
+++ b/spec/graphql/resolvers/design_management/version/designs_at_version_resolver_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Resolvers::DesignManagement::Version::DesignsAtVersionResolver do
   include_context 'four designs in three versions'
 
   let_it_be(:current_user) { authorized_user }
+
   let(:gql_context) { { current_user: current_user } }
 
   let(:version) { third_version }
diff --git a/spec/graphql/resolvers/group_milestones_resolver_spec.rb b/spec/graphql/resolvers/group_milestones_resolver_spec.rb
index dd3f1676538..78d89054efd 100644
--- a/spec/graphql/resolvers/group_milestones_resolver_spec.rb
+++ b/spec/graphql/resolvers/group_milestones_resolver_spec.rb
@@ -119,6 +119,7 @@ RSpec.describe Resolvers::GroupMilestonesResolver do
 
     context 'when including descendant milestones in a public group' do
       let_it_be(:group) { create(:group, :public) }
+
       let(:args) { { include_descendants: true } }
 
       it 'finds milestones only in accessible projects and groups' do
diff --git a/spec/graphql/resolvers/merge_request_pipelines_resolver_spec.rb b/spec/graphql/resolvers/merge_request_pipelines_resolver_spec.rb
index 84ef906b72f..3aadbc76be8 100644
--- a/spec/graphql/resolvers/merge_request_pipelines_resolver_spec.rb
+++ b/spec/graphql/resolvers/merge_request_pipelines_resolver_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe Resolvers::MergeRequestPipelinesResolver do
 
   let_it_be(:other_project_pipeline) { create(:ci_pipeline, project: merge_request.source_project, ref: 'other-ref') }
   let_it_be(:other_pipeline) { create(:ci_pipeline) }
+
   let(:current_user) { create(:user) }
 
   before do
diff --git a/spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb b/spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb
index f90869c52bc..a83cef40bdf 100644
--- a/spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb
+++ b/spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe Resolvers::Metrics::Dashboards::AnnotationResolver do
       let_it_be(:current_user) { create(:user) }
       let_it_be(:environment) { create(:environment) }
       let_it_be(:path) { 'config/prometheus/common_metrics.yml' }
+
       let(:dashboard) { PerformanceMonitoring::PrometheusDashboard.new(path: path, environment: environment) }
       let(:args) do
         {
diff --git a/spec/graphql/resolvers/project_pipeline_resolver_spec.rb b/spec/graphql/resolvers/project_pipeline_resolver_spec.rb
index 3d33e0b500d..6a8aa39f3b2 100644
--- a/spec/graphql/resolvers/project_pipeline_resolver_spec.rb
+++ b/spec/graphql/resolvers/project_pipeline_resolver_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe Resolvers::ProjectPipelineResolver do
   let_it_be(:pipeline) { create(:ci_pipeline, project: project, iid: '1234', sha: 'sha') }
   let_it_be(:other_project_pipeline) { create(:ci_pipeline, project: project, iid: '1235', sha: 'sha2') }
   let_it_be(:other_pipeline) { create(:ci_pipeline) }
+
   let(:current_user) { create(:user) }
 
   specify do
diff --git a/spec/graphql/resolvers/project_pipelines_resolver_spec.rb b/spec/graphql/resolvers/project_pipelines_resolver_spec.rb
index b2e8fed2441..c7c00f54c0c 100644
--- a/spec/graphql/resolvers/project_pipelines_resolver_spec.rb
+++ b/spec/graphql/resolvers/project_pipelines_resolver_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe Resolvers::ProjectPipelinesResolver do
   let_it_be(:project) { create(:project) }
   let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
   let_it_be(:other_pipeline) { create(:ci_pipeline) }
+
   let(:current_user) { create(:user) }
 
   before do