Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 1 deletions

diff --git a/spec/views/profiles/preferences/show.html.haml_spec.rb b/spec/views/profiles/preferences/show.html.haml_spec.rb
index 9a177ba0394..c20b4424129 100644
--- a/spec/views/profiles/preferences/show.html.haml_spec.rb
+++ b/spec/views/profiles/preferences/show.html.haml_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'profiles/preferences/show' do
   using RSpec::Parameterized::TableSyntax
 
-  let_it_be(:user) { build(:user) }
+  let_it_be(:user) { create_default(:user) }
 
   before do
     assign(:user, user)
diff --git a/spec/views/projects/pipelines/show.html.haml_spec.rb b/spec/views/projects/pipelines/show.html.haml_spec.rb
index 81a11874886..3c15d5846e9 100644
--- a/spec/views/projects/pipelines/show.html.haml_spec.rb
+++ b/spec/views/projects/pipelines/show.html.haml_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe 'projects/pipelines/show', feature_category: :pipeline_compositio
   let(:presented_pipeline) { pipeline.present(current_user: user) }
 
   before do
+    stub_feature_flags(pipeline_details_header_vue: false)
     assign(:project, project)
     assign(:pipeline, presented_pipeline)
     allow(view).to receive(:current_user) { user }