Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 0 deletions

diff --git a/spec/services/notes/copy_service_spec.rb b/spec/services/notes/copy_service_spec.rb
index d9b6bafd7ff..dd11fa15ea8 100644
--- a/spec/services/notes/copy_service_spec.rb
+++ b/spec/services/notes/copy_service_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Notes::CopyService do
     let_it_be(:group) { create(:group) }
     let_it_be(:from_project) { create(:project, :public, group: group) }
     let_it_be(:to_project) { create(:project, :public, group: group) }
+
     let(:from_noteable) { create(:issue, project: from_project) }
     let(:to_noteable) { create(:issue, project: to_project) }
 
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 5b4d6188b66..6621ad1f294 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Notes::CreateService do
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:issue) { create(:issue, project: project) }
   let_it_be(:user) { create(:user) }
+
   let(:opts) do
     { note: 'Awesome comment', noteable_type: 'Issue', noteable_id: issue.id, confidential: true }
   end
@@ -295,6 +296,7 @@ RSpec.describe Notes::CreateService do
 
         context 'for merge requests' do
           let_it_be(:merge_request) { create(:merge_request, source_project: project, labels: [bug_label]) }
+
           let(:issuable) { merge_request }
           let(:note_params) { opts.merge(noteable_type: 'MergeRequest', noteable_id: merge_request.id) }
           let(:merge_request_quick_actions) do
diff --git a/spec/services/notes/destroy_service_spec.rb b/spec/services/notes/destroy_service_spec.rb
index eebbdcc33b8..55acdabef82 100644
--- a/spec/services/notes/destroy_service_spec.rb
+++ b/spec/services/notes/destroy_service_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe Notes::DestroyService do
   let_it_be(:project) { create(:project, :public) }
   let_it_be(:issue) { create(:issue, project: project) }
+
   let(:user) { issue.author }
 
   describe '#execute' do
diff --git a/spec/services/notes/quick_actions_service_spec.rb b/spec/services/notes/quick_actions_service_spec.rb
index cb7d0163cac..0a56f01ebba 100644
--- a/spec/services/notes/quick_actions_service_spec.rb
+++ b/spec/services/notes/quick_actions_service_spec.rb
@@ -43,6 +43,7 @@ RSpec.describe Notes::QuickActionsService do
       context '/relate' do
         let_it_be(:issue) { create(:issue, project: project) }
         let_it_be(:other_issue) { create(:issue, project: project) }
+
         let(:note_text) { "/relate #{other_issue.to_reference}" }
         let(:note) { create(:note_on_issue, noteable: issue, project: project, note: note_text) }
 
diff --git a/spec/services/notes/update_service_spec.rb b/spec/services/notes/update_service_spec.rb
index 000f3d26efa..71ac1641ca5 100644
--- a/spec/services/notes/update_service_spec.rb
+++ b/spec/services/notes/update_service_spec.rb
@@ -273,6 +273,7 @@ RSpec.describe Notes::UpdateService do
 
     context 'for a personal snippet' do
       let_it_be(:snippet) { create(:personal_snippet, :public) }
+
       let(:note) { create(:note, project: nil, noteable: snippet, author: user, note: "Note on a snippet with reference #{issue.to_reference}" ) }
 
       it 'does not create todos' do