Add latest changes from gitlab-org/gitlab@master

6 files changed, 8 insertions, 0 deletions

diff --git a/spec/views/admin/application_settings/_eks.html.haml_spec.rb b/spec/views/admin/application_settings/_eks.html.haml_spec.rb
index 2f45eaadc9f..e407970c7a4 100644
--- a/spec/views/admin/application_settings/_eks.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/_eks.html.haml_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'admin/application_settings/_eks' do
   let_it_be(:admin) { create(:admin) }
+
   let(:page) { Capybara::Node::Simple.new(rendered) }
 
   before do
diff --git a/spec/views/admin/application_settings/_package_registry.html.haml_spec.rb b/spec/views/admin/application_settings/_package_registry.html.haml_spec.rb
index e0aa2fc8d56..72e32643a49 100644
--- a/spec/views/admin/application_settings/_package_registry.html.haml_spec.rb
+++ b/spec/views/admin/application_settings/_package_registry.html.haml_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe 'admin/application_settings/_package_registry' do
   let_it_be(:admin) { create(:admin) }
   let_it_be(:default_plan_limits) { create(:plan_limits, :default_plan, :with_package_file_sizes) }
   let_it_be(:application_setting) { build(:application_setting) }
+
   let(:page) { Capybara::Node::Simple.new(rendered) }
 
   before do
diff --git a/spec/views/projects/pipelines/show.html.haml_spec.rb b/spec/views/projects/pipelines/show.html.haml_spec.rb
index 5b5c05527de..fcae587f8c8 100644
--- a/spec/views/projects/pipelines/show.html.haml_spec.rb
+++ b/spec/views/projects/pipelines/show.html.haml_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe 'projects/pipelines/show' do
   include Devise::Test::ControllerHelpers
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
+
   let(:pipeline) { create(:ci_pipeline, project: project) }
   let(:presented_pipeline) { pipeline.present(current_user: user) }
 
diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb
index 11f2a4082e7..024e4cef9fd 100644
--- a/spec/views/search/_results.html.haml_spec.rb
+++ b/spec/views/search/_results.html.haml_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe 'search/_results' do
     let_it_be(:project) { create(:project) }
     let_it_be(:issue) { create(:issue, project: project, title: '*') }
     let_it_be(:note) { create(:discussion_note_on_issue, noteable: issue, project: issue.project, note: '```"helloworld"```') }
+
     let(:scope) { 'notes' }
     let(:search_objects) { Note.page(1).per(2) }
     let(:term) { 'helloworld' }
diff --git a/spec/views/shared/_label_row.html.haml_spec.rb b/spec/views/shared/_label_row.html.haml_spec.rb
index e9a0bfdcd4e..6fe74b6633b 100644
--- a/spec/views/shared/_label_row.html.haml_spec.rb
+++ b/spec/views/shared/_label_row.html.haml_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 
 RSpec.describe 'shared/_label_row.html.haml' do
   let_it_be(:group) { create(:group) }
+
   let(:label) { build_stubbed(:group_label, group: group).present(issuable_subject: group) }
 
   before do
@@ -11,6 +12,7 @@ RSpec.describe 'shared/_label_row.html.haml' do
 
   context 'with a project context' do
     let_it_be(:project) { create(:project, group: group) }
+
     let(:label) { build_stubbed(:label, project: project).present(issuable_subject: project) }
 
     before do
@@ -42,6 +44,7 @@ RSpec.describe 'shared/_label_row.html.haml' do
 
   context 'with a subgroup context' do
     let_it_be(:subgroup) { create(:group, parent: group) }
+
     let(:label) { build_stubbed(:group_label, group: subgroup).present(issuable_subject: subgroup) }
 
     before do
diff --git a/spec/views/shared/milestones/_top.html.haml_spec.rb b/spec/views/shared/milestones/_top.html.haml_spec.rb
index 1aa971709f1..aa989d3e441 100644
--- a/spec/views/shared/milestones/_top.html.haml_spec.rb
+++ b/spec/views/shared/milestones/_top.html.haml_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'shared/milestones/_top.html.haml' do
   let_it_be(:group) { create(:group) }
+
   let(:project) { create(:project, group: group) }
   let(:milestone) { create(:milestone, project: project) }