Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 5 deletions

diff --git a/spec/features/markdown/sandboxed_mermaid_spec.rb b/spec/features/markdown/sandboxed_mermaid_spec.rb
index 05fe83b3107..056a6b86f46 100644
--- a/spec/features/markdown/sandboxed_mermaid_spec.rb
+++ b/spec/features/markdown/sandboxed_mermaid_spec.rb
@@ -5,10 +5,6 @@ require 'spec_helper'
 RSpec.describe 'Sandboxed Mermaid rendering', :js do
   let_it_be(:project) { create(:project, :public) }
 
-  before do
-    stub_feature_flags(sandboxed_mermaid: true)
-  end
-
   it 'includes mermaid frame correctly' do
     description = <<~MERMAID
       ```mermaid
diff --git a/spec/features/projects/pipelines/legacy_pipelines_spec.rb b/spec/features/projects/pipelines/legacy_pipelines_spec.rb
index 2e0ea695ab3..9d3ac71a875 100644
--- a/spec/features/projects/pipelines/legacy_pipelines_spec.rb
+++ b/spec/features/projects/pipelines/legacy_pipelines_spec.rb
@@ -316,7 +316,6 @@ RSpec.describe 'Pipelines', :js do
         end
 
         before do
-          stub_feature_flags(bootstrap_confirmation_modals: false)
           visit_project_pipelines
         end