Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 3 deletions

diff --git a/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb b/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
index f91927412cb..b1d56b57596 100644
--- a/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
+++ b/spec/lib/banzai/filter/inline_metrics_redactor_filter_spec.rb
@@ -5,8 +5,7 @@ require 'spec_helper'
 describe Banzai::Filter::InlineMetricsRedactorFilter do
   include FilterSpecHelper
 
-  set(:project) { create(:project) }
-
+  let_it_be(:project) { create(:project) }
   let(:url) { urls.metrics_dashboard_project_environment_url(project, 1, embedded: true) }
   let(:input) { %(<a href="#{url}">example</a>) }
   let(:doc) { filter(input) }
diff --git a/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb b/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
index 47ea273ef3a..448422b15e3 100644
--- a/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/gfm_pipeline_spec.rb
@@ -121,7 +121,7 @@ describe Banzai::Pipeline::GfmPipeline do
   end
 
   describe 'emoji in references' do
-    set(:project) { create(:project, :public) }
+    let_it_be(:project) { create(:project, :public) }
     let(:emoji) { '💯' }
 
     it 'renders a label reference with emoji inside' do