Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/markdown/mermaid_spec.rb b/spec/features/markdown/mermaid_spec.rb
index 58314a49c4b..23cdd9d2ce5 100644
--- a/spec/features/markdown/mermaid_spec.rb
+++ b/spec/features/markdown/mermaid_spec.rb
@@ -48,7 +48,7 @@ RSpec.describe 'Mermaid rendering', :js do
     expect(page.html.scan(expected).count).to be(4)
   end
 
-  it 'renders only 2 Mermaid blocks and ', :js, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/234081' } do
+  it 'renders only 2 Mermaid blocks and', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/234081' do
     description = <<~MERMAID
     ```mermaid
     graph LR
@@ -78,7 +78,7 @@ RSpec.describe 'Mermaid rendering', :js do
     end
   end
 
-  it 'correctly sizes mermaid diagram inside <details> block', :js do
+  it 'correctly sizes mermaid diagram inside <details> block' do
     description = <<~MERMAID
       <details>
       <summary>Click to show diagram</summary>
@@ -112,7 +112,7 @@ RSpec.describe 'Mermaid rendering', :js do
     end
   end
 
-  it 'correctly sizes mermaid diagram block', :js do
+  it 'correctly sizes mermaid diagram block' do
     description = <<~MERMAID
       ```mermaid
       graph TD;
@@ -134,7 +134,7 @@ RSpec.describe 'Mermaid rendering', :js do
     expect(page).to have_css('svg.mermaid[style*="max-width"][width="100%"]')
   end
 
-  it 'display button when diagram exceeds length', :js do
+  it 'display button when diagram exceeds length', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/287806' do
     graph_edges = "A-->B;B-->A;" * 420
 
     description = <<~MERMAID