Use different markdownconfigurable-shared-runners-text

2 files changed, 4 insertions, 3 deletions

diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index ec47ed79e55..b31fcfea763 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -2,7 +2,7 @@
 
 .bs-callout.bs-callout-warning.shared-runners-description
   - if shared_runners_text.present?
-    = markdown(shared_runners_text)
+    = markdown(shared_runners_text, pipeline: 'plain_markdown')
   - else
     GitLab Runners do not offer secure isolation between projects that they do builds for. You are TRUSTING all GitLab users who can push code to project A, B or C to run shell scripts on the machine hosting runner X.
   %hr
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 789b06d7c67..8edeb8d18af 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -81,7 +81,8 @@ describe "Runners" do
   end
 
   describe "shared runners description" do
-    let(:shared_runners_text) { 'custom shared runners description' }
+    let(:shared_runners_text) { 'custom **shared** runners description' }
+    let(:shared_runners_html) { 'custom shared runners description' }
 
     before do
       stub_application_setting(shared_runners_text: shared_runners_text)
@@ -91,7 +92,7 @@ describe "Runners" do
     end
 
     it "sees shared runners description" do
-      expect(page.find(".shared-runners-description")).to have_content(shared_runners_text)
+      expect(page.find(".shared-runners-description")).to have_content(shared_runners_html)
     end
   end