Add latest changes from gitlab-org/gitlab@master

44 files changed, 143 insertions, 143 deletions

diff --git a/spec/services/auto_merge_service_spec.rb b/spec/services/auto_merge_service_spec.rb
index 50dfc49a59c..221cf695331 100644
--- a/spec/services/auto_merge_service_spec.rb
+++ b/spec/services/auto_merge_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe AutoMergeService do
-  set(:project) { create(:project) }
-  set(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
   let(:service) { described_class.new(project, user) }
 
   describe '.all_strategies' do
diff --git a/spec/services/award_emojis/add_service_spec.rb b/spec/services/award_emojis/add_service_spec.rb
index 8364e662735..4bcb5fa039f 100644
--- a/spec/services/award_emojis/add_service_spec.rb
+++ b/spec/services/award_emojis/add_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe AwardEmojis::AddService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
-  set(:awardable) { create(:note, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:awardable) { create(:note, project: project) }
   let(:name) { 'thumbsup' }
 
   subject(:service) { described_class.new(awardable, name, user) }
diff --git a/spec/services/award_emojis/destroy_service_spec.rb b/spec/services/award_emojis/destroy_service_spec.rb
index 6d54c037464..f411345560e 100644
--- a/spec/services/award_emojis/destroy_service_spec.rb
+++ b/spec/services/award_emojis/destroy_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe AwardEmojis::DestroyService do
-  set(:user) { create(:user) }
-  set(:awardable) { create(:note) }
-  set(:project) { awardable.project }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:awardable) { create(:note) }
+  let_it_be(:project) { awardable.project }
   let(:name) { 'thumbsup' }
   let!(:award_from_other_user) do
     create(:award_emoji, name: name, awardable: awardable, user: create(:user))
diff --git a/spec/services/award_emojis/toggle_service_spec.rb b/spec/services/award_emojis/toggle_service_spec.rb
index a8d110d04f7..069bdfcb99f 100644
--- a/spec/services/award_emojis/toggle_service_spec.rb
+++ b/spec/services/award_emojis/toggle_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe AwardEmojis::ToggleService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :public) }
-  set(:awardable) { create(:note, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public) }
+  let_it_be(:awardable) { create(:note, project: project) }
   let(:name) { 'thumbsup' }
 
   subject(:service) { described_class.new(awardable, name, user) }
diff --git a/spec/services/boards/issues/move_service_spec.rb b/spec/services/boards/issues/move_service_spec.rb
index cf84ec8fd4c..b9ebbc30c1a 100644
--- a/spec/services/boards/issues/move_service_spec.rb
+++ b/spec/services/boards/issues/move_service_spec.rb
@@ -54,14 +54,14 @@ describe Boards::Issues::MoveService do
     end
 
     describe '#execute_multiple' do
-      set(:group)  { create(:group) }
-      set(:user)   { create(:user) }
-      set(:project) { create(:project, namespace: group) }
-      set(:board1) { create(:board, group: group) }
-      set(:development) { create(:group_label, group: group, name: 'Development') }
-      set(:testing) { create(:group_label, group: group, name: 'Testing') }
-      set(:list1) { create(:list, board: board1, label: development, position: 0) }
-      set(:list2) { create(:list, board: board1, label: testing, position: 1) }
+      let_it_be(:group)  { create(:group) }
+      let_it_be(:user)   { create(:user) }
+      let_it_be(:project) { create(:project, namespace: group) }
+      let_it_be(:board1) { create(:board, group: group) }
+      let_it_be(:development) { create(:group_label, group: group, name: 'Development') }
+      let_it_be(:testing) { create(:group_label, group: group, name: 'Testing') }
+      let_it_be(:list1) { create(:list, board: board1, label: development, position: 0) }
+      let_it_be(:list2) { create(:list, board: board1, label: testing, position: 1) }
       let(:params) { { board_id: board1.id, from_list_id: list1.id, to_list_id: list2.id } }
 
       before do
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index a4432cbcf5b..c4ce06d9da9 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Ci::CreatePipelineService do
   include ProjectForksHelper
 
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project, reload: true) { create(:project, :repository) }
   let(:user) { create(:admin) }
   let(:ref_name) { 'refs/heads/master' }
 
diff --git a/spec/services/ci/ensure_stage_service_spec.rb b/spec/services/ci/ensure_stage_service_spec.rb
index 43bbd2130a4..de07a1ae238 100644
--- a/spec/services/ci/ensure_stage_service_spec.rb
+++ b/spec/services/ci/ensure_stage_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Ci::EnsureStageService, '#execute' do
-  set(:project) { create(:project) }
-  set(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
 
   let(:stage) { create(:ci_stage_entity) }
   let(:job) { build(:ci_build) }
diff --git a/spec/services/ci/expire_pipeline_cache_service_spec.rb b/spec/services/ci/expire_pipeline_cache_service_spec.rb
index ff2d286465a..c0226654fd9 100644
--- a/spec/services/ci/expire_pipeline_cache_service_spec.rb
+++ b/spec/services/ci/expire_pipeline_cache_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Ci::ExpirePipelineCacheService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
-  set(:pipeline) { create(:ci_pipeline, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
   subject { described_class.new }
 
   describe '#execute' do
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 0339c6cc2d6..0f2d994efd4 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -4,9 +4,9 @@ require 'spec_helper'
 
 module Ci
   describe RegisterJobService do
-    set(:group) { create(:group) }
-    set(:project) { create(:project, group: group, shared_runners_enabled: false, group_runners_enabled: false) }
-    set(:pipeline) { create(:ci_pipeline, project: project) }
+    let_it_be(:group) { create(:group) }
+    let_it_be(:project, reload: true) { create(:project, group: group, shared_runners_enabled: false, group_runners_enabled: false) }
+    let_it_be(:pipeline) { create(:ci_pipeline, project: project) }
     let!(:shared_runner) { create(:ci_runner, :instance) }
     let!(:specific_runner) { create(:ci_runner, :project, projects: [project]) }
     let!(:group_runner) { create(:ci_runner, :group, groups: [group]) }
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb
index b0ba795841d..e5933330de5 100644
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Ci::RetryBuildService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :repository) }
-  set(:pipeline) do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:pipeline) do
     create(:ci_pipeline, project: project,
            sha: 'b83d6e391c22777fca1ed3012fce84f633d7fed0')
   end
diff --git a/spec/services/error_tracking/list_issues_service_spec.rb b/spec/services/error_tracking/list_issues_service_spec.rb
index e0e280591cd..ecb6bcc541b 100644
--- a/spec/services/error_tracking/list_issues_service_spec.rb
+++ b/spec/services/error_tracking/list_issues_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe ErrorTracking::ListIssuesService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
   let(:params) { { search_term: 'something', sort: 'last_seen', cursor: 'some-cursor' } }
   let(:list_sentry_issues_args) do
     {
diff --git a/spec/services/error_tracking/list_projects_service_spec.rb b/spec/services/error_tracking/list_projects_service_spec.rb
index cd4b835e097..ddd369d45f2 100644
--- a/spec/services/error_tracking/list_projects_service_spec.rb
+++ b/spec/services/error_tracking/list_projects_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe ErrorTracking::ListProjectsService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project, reload: true) { create(:project) }
 
   let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' }
   let(:token) { 'test-token' }
diff --git a/spec/services/external_pull_requests/create_pipeline_service_spec.rb b/spec/services/external_pull_requests/create_pipeline_service_spec.rb
index 03481baea87..d1893960960 100644
--- a/spec/services/external_pull_requests/create_pipeline_service_spec.rb
+++ b/spec/services/external_pull_requests/create_pipeline_service_spec.rb
@@ -4,8 +4,8 @@ require 'spec_helper'
 
 describe ExternalPullRequests::CreatePipelineService do
   describe '#execute' do
-    set(:project) { create(:project, :auto_devops, :repository) }
-    set(:user) { create(:user) }
+    let_it_be(:project) { create(:project, :auto_devops, :repository) }
+    let_it_be(:user) { create(:user) }
     let(:pull_request) { create(:external_pull_request, project: project) }
 
     before do
diff --git a/spec/services/git/branch_push_service_spec.rb b/spec/services/git/branch_push_service_spec.rb
index e7f005cff0b..4d7ec7ac1d8 100644
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Git::BranchPushService, services: true do
   include RepoHelpers
 
-  set(:user)     { create(:user) }
-  set(:project)  { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project, reload: true) { create(:project, :repository) }
   let(:blankrev) { Gitlab::Git::BLANK_SHA }
   let(:oldrev)   { sample_commit.parent_id }
   let(:newrev)   { sample_commit.id }
diff --git a/spec/services/groups/auto_devops_service_spec.rb b/spec/services/groups/auto_devops_service_spec.rb
index 7591b2f6f12..63fbdc70c1b 100644
--- a/spec/services/groups/auto_devops_service_spec.rb
+++ b/spec/services/groups/auto_devops_service_spec.rb
@@ -2,8 +2,8 @@
 require 'spec_helper'
 
 describe Groups::AutoDevopsService, '#execute' do
-  set(:group) { create(:group) }
-  set(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:user) { create(:user) }
   let(:group_params) { { auto_devops_enabled: '0' } }
   let(:service) { described_class.new(group, user, group_params) }
 
diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb
index 61d1612829f..2c5af11d2e6 100644
--- a/spec/services/issues/referenced_merge_requests_service_spec.rb
+++ b/spec/services/issues/referenced_merge_requests_service_spec.rb
@@ -15,16 +15,16 @@ describe Issues::ReferencedMergeRequestsService do
     end
   end
 
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :public, :repository) }
-  set(:other_project) { create(:project, :public, :repository) }
-  set(:issue) { create(:issue, author: user, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public, :repository) }
+  let_it_be(:other_project) { create(:project, :public, :repository) }
+  let_it_be(:issue) { create(:issue, author: user, project: project) }
 
-  set(:closing_mr) { create_closing_mr(source_project: project) }
-  set(:closing_mr_other_project) { create_closing_mr(source_project: other_project) }
+  let_it_be(:closing_mr) { create_closing_mr(source_project: project) }
+  let_it_be(:closing_mr_other_project) { create_closing_mr(source_project: other_project) }
 
-  set(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') }
-  set(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') }
+  let_it_be(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') }
+  let_it_be(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') }
 
   let(:service) { described_class.new(project, user) }
 
diff --git a/spec/services/issues/reorder_service_spec.rb b/spec/services/issues/reorder_service_spec.rb
index b147cdf4e64..6d72d698b1d 100644
--- a/spec/services/issues/reorder_service_spec.rb
+++ b/spec/services/issues/reorder_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Issues::ReorderService do
-  set(:user)    { create(:user) }
-  set(:project) { create(:project) }
-  set(:group)   { create(:group) }
+  let_it_be(:user)    { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:group)   { create(:group) }
 
   shared_examples 'issues reorder service' do
     context 'when reordering issues' do
diff --git a/spec/services/issues/zoom_link_service_spec.rb b/spec/services/issues/zoom_link_service_spec.rb
index f34d2a18552..3fb1eae361a 100644
--- a/spec/services/issues/zoom_link_service_spec.rb
+++ b/spec/services/issues/zoom_link_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Issues::ZoomLinkService do
-  set(:user) { create(:user) }
-  set(:issue) { create(:issue) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:issue) { create(:issue) }
 
   let(:project) { issue.project }
   let(:service) { described_class.new(issue, user) }
diff --git a/spec/services/merge_requests/create_pipeline_service_spec.rb b/spec/services/merge_requests/create_pipeline_service_spec.rb
index 25f5c54a413..9eb28759061 100644
--- a/spec/services/merge_requests/create_pipeline_service_spec.rb
+++ b/spec/services/merge_requests/create_pipeline_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe MergeRequests::CreatePipelineService do
-  set(:project) { create(:project, :repository) }
-  set(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
   let(:service) { described_class.new(project, user, params) }
   let(:params) { {} }
 
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 61c8103353c..fa1a8f60256 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe MergeRequests::MergeService do
-  set(:user) { create(:user) }
-  set(:user2) { create(:user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:user2) { create(:user) }
   let(:merge_request) { create(:merge_request, :simple, author: user2, assignees: [user2]) }
   let(:project) { merge_request.project }
 
diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb
index 77e38f1eb4c..5c26e32bb22 100644
--- a/spec/services/merge_requests/merge_to_ref_service_spec.rb
+++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb
@@ -67,7 +67,7 @@ describe MergeRequests::MergeToRefService do
     end
   end
 
-  set(:user) { create(:user) }
+  let_it_be(:user) { create(:user) }
   let(:merge_request) { create(:merge_request, :simple) }
   let(:project) { merge_request.project }
 
@@ -214,7 +214,7 @@ describe MergeRequests::MergeToRefService do
     end
 
     describe 'cascading merge refs' do
-      set(:project) { create(:project, :repository) }
+      let_it_be(:project) { create(:project, :repository) }
       let(:params) { { commit_message: 'Cascading merge', first_parent_ref: first_parent_ref, target_ref: target_ref, sha: merge_request.diff_head_sha } }
 
       context 'when first merge happens' do
diff --git a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
index 53b7497ae21..744693dad15 100644
--- a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Metrics::Dashboard::CustomMetricEmbedService do
   include MetricsDashboardHelpers
 
-  set(:project) { build(:project) }
-  set(:user) { create(:user) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:project, reload: true) { build(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/services/metrics/dashboard/default_embed_service_spec.rb b/spec/services/metrics/dashboard/default_embed_service_spec.rb
index 803b9a93be7..741a9644905 100644
--- a/spec/services/metrics/dashboard/default_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/default_embed_service_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Metrics::Dashboard::DefaultEmbedService, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
 
-  set(:project) { build(:project) }
-  set(:user) { create(:user) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:project) { build(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
index a0f7315f750..c1ce9818f21 100644
--- a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Metrics::Dashboard::DynamicEmbedService, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
 
-  set(:project) { build(:project) }
-  set(:user) { create(:user) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:project) { build(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/services/metrics/dashboard/project_dashboard_service_spec.rb b/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
index ab7a7b97861..cba8ef2ec98 100644
--- a/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Metrics::Dashboard::ProjectDashboardService, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
 
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
index 95c5a1479a4..cc9f711c611 100644
--- a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Metrics::Dashboard::SystemDashboardService, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
 
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   before do
     project.add_maintainer(user)
diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 8fd03428eb2..c5e2fe8de12 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Notes::CreateService do
-  set(:project) { create(:project, :repository) }
-  set(:issue) { create(:issue, project: project) }
-  set(:user) { create(:user) }
+  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 }
   end
@@ -216,12 +216,12 @@ describe Notes::CreateService do
 
     context 'note with commands' do
       context 'all quick actions' do
-        set(:milestone) { create(:milestone, project: project, title: "sprint") }
-        set(:bug_label) { create(:label, project: project, title: 'bug') }
-        set(:to_be_copied_label) { create(:label, project: project, title: 'to be copied') }
-        set(:feature_label) { create(:label, project: project, title: 'feature') }
-        set(:issue) { create(:issue, project: project, labels: [bug_label], due_date: '2019-01-01') }
-        set(:issue_2) { create(:issue, project: project, labels: [bug_label, to_be_copied_label]) }
+        let_it_be(:milestone) { create(:milestone, project: project, title: "sprint") }
+        let_it_be(:bug_label) { create(:label, project: project, title: 'bug') }
+        let_it_be(:to_be_copied_label) { create(:label, project: project, title: 'to be copied') }
+        let_it_be(:feature_label) { create(:label, project: project, title: 'feature') }
+        let_it_be(:issue, reload: true) { create(:issue, project: project, labels: [bug_label], due_date: '2019-01-01') }
+        let_it_be(:issue_2) { create(:issue, project: project, labels: [bug_label, to_be_copied_label]) }
 
         context 'for issues' do
           let(:issuable) { issue }
@@ -272,7 +272,7 @@ describe Notes::CreateService do
         end
 
         context 'for merge requests' do
-          set(:merge_request) { create(:merge_request, source_project: project, labels: [bug_label]) }
+          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 9faf1299ef2..258e5c68265 100644
--- a/spec/services/notes/destroy_service_spec.rb
+++ b/spec/services/notes/destroy_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Notes::DestroyService do
-  set(:project) { create(:project, :public) }
-  set(:issue) { create(:issue, project: project) }
+  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/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 5440a42348e..80b8d36aa07 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -155,7 +155,7 @@ describe NotificationService, :mailer do
   describe '#async' do
     let(:async) { notification.async }
 
-    set(:key) { create(:personal_key) }
+    let_it_be(:key) { create(:personal_key) }
 
     it 'returns an Async object with the correct parent' do
       expect(async).to be_a(described_class::Async)
@@ -2508,14 +2508,14 @@ describe NotificationService, :mailer do
   end
 
   describe 'Pages domains' do
-    set(:project) { create(:project) }
-    set(:domain) { create(:pages_domain, project: project) }
-    set(:u_blocked) { create(:user, :blocked) }
-    set(:u_silence) { create_user_with_notification(:disabled, 'silent', project) }
-    set(:u_owner)   { project.owner }
-    set(:u_maintainer1) { create(:user) }
-    set(:u_maintainer2) { create(:user) }
-    set(:u_developer) { create(:user) }
+    let_it_be(:project, reload: true) { create(:project) }
+    let_it_be(:domain, reload: true) { create(:pages_domain, project: project) }
+    let_it_be(:u_blocked) { create(:user, :blocked) }
+    let_it_be(:u_silence) { create_user_with_notification(:disabled, 'silent', project) }
+    let_it_be(:u_owner) { project.owner }
+    let_it_be(:u_maintainer1) { create(:user) }
+    let_it_be(:u_maintainer2) { create(:user) }
+    let_it_be(:u_developer) { create(:user) }
 
     before do
       project.add_maintainer(u_blocked)
diff --git a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
index 14772d172e8..78b969c8a0e 100644
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Projects::ContainerRepository::CleanupTagsService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :private) }
-  set(:repository) { create(:container_repository, :root, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :private) }
+  let_it_be(:repository) { create(:container_repository, :root, project: project) }
 
   let(:service) { described_class.new(project, user, params) }
 
diff --git a/spec/services/projects/container_repository/delete_tags_service_spec.rb b/spec/services/projects/container_repository/delete_tags_service_spec.rb
index 7ceb02c9cf8..decbbb7597f 100644
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Projects::ContainerRepository::DeleteTagsService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :private) }
-  set(:repository) { create(:container_repository, :root, project: project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :private) }
+  let_it_be(:repository) { create(:container_repository, :root, project: project) }
 
   let(:params) { { tags: tags } }
   let(:service) { described_class.new(project, user, params) }
diff --git a/spec/services/projects/container_repository/destroy_service_spec.rb b/spec/services/projects/container_repository/destroy_service_spec.rb
index affcc66d2bb..cc8fd2716e1 100644
--- a/spec/services/projects/container_repository/destroy_service_spec.rb
+++ b/spec/services/projects/container_repository/destroy_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Projects::ContainerRepository::DestroyService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project, :private) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :private) }
 
   subject { described_class.new(project, user) }
 
diff --git a/spec/services/projects/detect_repository_languages_service_spec.rb b/spec/services/projects/detect_repository_languages_service_spec.rb
index df5eed18ac0..76600b0e77c 100644
--- a/spec/services/projects/detect_repository_languages_service_spec.rb
+++ b/spec/services/projects/detect_repository_languages_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state do
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project, reload: true) { create(:project, :repository) }
 
   subject { described_class.new(project) }
 
@@ -51,7 +51,7 @@ describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_
     end
 
     context 'when no repository exists' do
-      set(:project) { create(:project) }
+      let_it_be(:project) { create(:project) }
 
       it 'has no languages' do
         expect(subject.execute).to be_empty
diff --git a/spec/services/projects/gitlab_projects_import_service_spec.rb b/spec/services/projects/gitlab_projects_import_service_spec.rb
index 78580bfa604..1662d4577aa 100644
--- a/spec/services/projects/gitlab_projects_import_service_spec.rb
+++ b/spec/services/projects/gitlab_projects_import_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Projects::GitlabProjectsImportService do
-  set(:namespace) { create(:namespace) }
+  let_it_be(:namespace) { create(:namespace) }
   let(:path) { 'test-path' }
   let(:file) { fixture_file_upload('spec/fixtures/project_export.tar.gz') }
   let(:overwrite) { false }
diff --git a/spec/services/projects/housekeeping_service_spec.rb b/spec/services/projects/housekeeping_service_spec.rb
index c99054d9fd5..60804a8dba6 100644
--- a/spec/services/projects/housekeeping_service_spec.rb
+++ b/spec/services/projects/housekeeping_service_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Projects::HousekeepingService do
   subject { described_class.new(project) }
 
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
 
   before do
     project.reset_pushes_since_gc
diff --git a/spec/services/projects/open_merge_requests_count_service_spec.rb b/spec/services/projects/open_merge_requests_count_service_spec.rb
index f9fff4cbd4c..7d848f9f2c3 100644
--- a/spec/services/projects/open_merge_requests_count_service_spec.rb
+++ b/spec/services/projects/open_merge_requests_count_service_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Projects::OpenMergeRequestsCountService, :use_clean_rails_memory_store_caching do
-  set(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
 
   subject { described_class.new(project) }
 
diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb
index 81d59a98b9b..93cd5c43e86 100644
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe Projects::Operations::UpdateService do
-  set(:user) { create(:user) }
-  set(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project, reload: true) { create(:project) }
 
   let(:result) { subject.execute }
 
diff --git a/spec/services/projects/participants_service_spec.rb b/spec/services/projects/participants_service_spec.rb
index 239d28557ee..6eaf7a71b23 100644
--- a/spec/services/projects/participants_service_spec.rb
+++ b/spec/services/projects/participants_service_spec.rb
@@ -4,8 +4,8 @@ require 'spec_helper'
 
 describe Projects::ParticipantsService do
   describe '#groups' do
-    set(:user) { create(:user) }
-    set(:project) { create(:project, :public) }
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project, :public) }
     let(:service) { described_class.new(project, user) }
 
     it 'avoids N+1 queries' do
@@ -62,10 +62,10 @@ describe Projects::ParticipantsService do
     subject(:usernames) { service.project_members.map { |member| member[:username] } }
 
     context 'when there is a project in group namespace' do
-      set(:public_group) { create(:group, :public) }
-      set(:public_project) { create(:project, :public, namespace: public_group)}
+      let_it_be(:public_group) { create(:group, :public) }
+      let_it_be(:public_project) { create(:project, :public, namespace: public_group)}
 
-      set(:public_group_owner) { create(:user) }
+      let_it_be(:public_group_owner) { create(:user) }
 
       let(:service) { described_class.new(public_project, create(:user)) }
 
@@ -79,18 +79,18 @@ describe Projects::ParticipantsService do
     end
 
     context 'when there is a private group and a public project' do
-      set(:public_group) { create(:group, :public) }
-      set(:private_group) { create(:group, :private, :nested) }
-      set(:public_project) { create(:project, :public, namespace: public_group)}
+      let_it_be(:public_group) { create(:group, :public) }
+      let_it_be(:private_group) { create(:group, :private, :nested) }
+      let_it_be(:public_project) { create(:project, :public, namespace: public_group)}
 
-      set(:project_issue) { create(:issue, project: public_project)}
+      let_it_be(:project_issue) { create(:issue, project: public_project)}
 
-      set(:public_group_owner) { create(:user) }
-      set(:private_group_member) { create(:user) }
-      set(:public_project_maintainer) { create(:user) }
-      set(:private_group_owner) { create(:user) }
+      let_it_be(:public_group_owner) { create(:user) }
+      let_it_be(:private_group_member) { create(:user) }
+      let_it_be(:public_project_maintainer) { create(:user) }
+      let_it_be(:private_group_owner) { create(:user) }
 
-      set(:group_ancestor_owner) { create(:user) }
+      let_it_be(:group_ancestor_owner) { create(:user) }
 
       before(:context) do
         public_group.add_owner public_group_owner
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index 9aa8c7f85ca..001c6670f4b 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -3,9 +3,9 @@
 require "spec_helper"
 
 describe Projects::UpdatePagesService do
-  set(:project) { create(:project, :repository) }
-  set(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) }
-  set(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') }
+  let_it_be(:project, refind: true) { create(:project, :repository) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit('HEAD').sha) }
+  let_it_be(:build) { create(:ci_build, pipeline: pipeline, ref: 'HEAD') }
   let(:invalid_file) { fixture_file_upload('spec/fixtures/dk.png') }
 
   let(:file) { fixture_file_upload("spec/fixtures/pages.zip") }
diff --git a/spec/services/prometheus/proxy_service_spec.rb b/spec/services/prometheus/proxy_service_spec.rb
index 0ce08252425..5a036194d01 100644
--- a/spec/services/prometheus/proxy_service_spec.rb
+++ b/spec/services/prometheus/proxy_service_spec.rb
@@ -5,8 +5,8 @@ require 'spec_helper'
 describe Prometheus::ProxyService do
   include ReactiveCachingHelpers
 
-  set(:project) { create(:project) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:environment) { create(:environment, project: project) }
 
   describe 'configuration' do
     it 'ReactiveCaching refresh is not needed' do
diff --git a/spec/services/resource_events/change_labels_service_spec.rb b/spec/services/resource_events/change_labels_service_spec.rb
index 070964eb1ec..2b987b7fec9 100644
--- a/spec/services/resource_events/change_labels_service_spec.rb
+++ b/spec/services/resource_events/change_labels_service_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe ResourceEvents::ChangeLabelsService do
-  set(:project)  { create(:project) }
-  set(:author)   { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:author)  { create(:user) }
   let(:resource) { create(:issue, project: project) }
 
   describe '.change_labels' do
diff --git a/spec/services/resource_events/merge_into_notes_service_spec.rb b/spec/services/resource_events/merge_into_notes_service_spec.rb
index 72467091791..6bad1b86fca 100644
--- a/spec/services/resource_events/merge_into_notes_service_spec.rb
+++ b/spec/services/resource_events/merge_into_notes_service_spec.rb
@@ -16,11 +16,11 @@ describe ResourceEvents::MergeIntoNotesService do
     create(:note_on_issue, opts.merge(params))
   end
 
-  set(:project) { create(:project) }
-  set(:user) { create(:user) }
-  set(:resource) { create(:issue, project: project) }
-  set(:label) { create(:label, project: project) }
-  set(:label2) { create(:label, project: project) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:resource) { create(:issue, project: project) }
+  let_it_be(:label) { create(:label, project: project) }
+  let_it_be(:label2) { create(:label, project: project) }
   let(:time) { Time.now }
 
   describe '#execute' do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index a952e26e338..fa7b1003b8d 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -7,9 +7,9 @@ describe SystemNoteService do
   include RepoHelpers
   include AssetsHelpers
 
-  set(:group)    { create(:group) }
-  set(:project)  { create(:project, :repository, group: group) }
-  set(:author)   { create(:user) }
+  let_it_be(:group)    { create(:group) }
+  let_it_be(:project)  { create(:project, :repository, group: group) }
+  let_it_be(:author)   { create(:user) }
   let(:noteable) { create(:issue, project: project) }
   let(:issue)    { noteable }
 
diff --git a/spec/services/system_notes/commit_service_spec.rb b/spec/services/system_notes/commit_service_spec.rb
index 4d4403be59a..5839a17e4a0 100644
--- a/spec/services/system_notes/commit_service_spec.rb
+++ b/spec/services/system_notes/commit_service_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe SystemNotes::CommitService do
-  set(:group)    { create(:group) }
-  set(:project)  { create(:project, :repository, group: group) }
-  set(:author)   { create(:user) }
+  let_it_be(:group)    { create(:group) }
+  let_it_be(:project)  { create(:project, :repository, group: group) }
+  let_it_be(:author)   { create(:user) }
 
   let(:commit_service) { described_class.new(noteable: noteable, project: project, author: author) }