Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 4 deletions

diff --git a/spec/lib/gitlab/ci/build/policy/changes_spec.rb b/spec/lib/gitlab/ci/build/policy/changes_spec.rb
index 48ac2e4e657..07f52605929 100644
--- a/spec/lib/gitlab/ci/build/policy/changes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/changes_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Ci::Build::Policy::Changes do
-  set(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
 
   describe '#satisfied_by?' do
     describe 'paths matching' do
@@ -89,7 +89,7 @@ describe Gitlab::Ci::Build::Policy::Changes do
     end
 
     describe 'gitaly integration' do
-      set(:project) { create(:project, :repository) }
+      let_it_be(:project) { create(:project, :repository) }
 
       let(:pipeline) do
         create(:ci_empty_pipeline, project: project,
@@ -119,6 +119,7 @@ describe Gitlab::Ci::Build::Policy::Changes do
     end
 
     context 'when branch is created' do
+      let_it_be(:project) { create(:project, :repository) }
       let(:pipeline) do
         create(:ci_empty_pipeline, project: project,
                                    ref: 'feature',
diff --git a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
index bc2e6fe6b8d..6d96bdc30c7 100644
--- a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
@@ -18,7 +18,7 @@ describe Gitlab::Ci::Build::Policy::Kubernetes do
   end
 
   context 'when kubernetes service is inactive' do
-    set(:project) { create(:project) }
+    let_it_be(:project) { create(:project) }
 
     it 'is not satisfied by a pipeline without kubernetes available' do
       expect(described_class.new('active'))
diff --git a/spec/lib/gitlab/ci/build/policy/variables_spec.rb b/spec/lib/gitlab/ci/build/policy/variables_spec.rb
index 66f2cb640b9..0e75726b81c 100644
--- a/spec/lib/gitlab/ci/build/policy/variables_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/variables_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Ci::Build::Policy::Variables do
-  set(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
 
   let(:pipeline) do
     build(:ci_empty_pipeline, project: project, ref: 'master', source: :push)