Merge branch 'markdown-slash-commands-text' into 'master'

Change wording of MR comment box

See merge request !9193

2 files changed, 2 insertions, 3 deletions

diff --git a/app/views/projects/notes/_hints.html.haml b/app/views/projects/notes/_hints.html.haml
index 6c14f48d41b..81d97eabe65 100644
--- a/app/views/projects/notes/_hints.html.haml
+++ b/app/views/projects/notes/_hints.html.haml
@@ -1,7 +1,6 @@
 - supports_slash_commands = local_assigns.fetch(:supports_slash_commands, false)
 .comment-toolbar.clearfix
   .toolbar-text
-    Styling with
     = link_to 'Markdown', help_page_path('user/markdown'), target: '_blank', tabindex: -1
     - if supports_slash_commands
       and
diff --git a/spec/views/projects/notes/_form.html.haml_spec.rb b/spec/views/projects/notes/_form.html.haml_spec.rb
index b14b1ece2d0..b61f016967f 100644
--- a/spec/views/projects/notes/_form.html.haml_spec.rb
+++ b/spec/views/projects/notes/_form.html.haml_spec.rb
@@ -21,7 +21,7 @@ describe 'projects/notes/_form' do
       let(:note) { build(:"note_on_#{noteable}", project: project) }
 
       it 'says that only markdown is supported, not slash commands' do
-        expect(rendered).to have_content('Styling with Markdown and slash commands are supported')
+        expect(rendered).to have_content('Markdown and slash commands are supported')
       end
     end
   end
@@ -30,7 +30,7 @@ describe 'projects/notes/_form' do
     let(:note) { build(:note_on_commit, project: project) }
 
     it 'says that only markdown is supported, not slash commands' do
-      expect(rendered).to have_content('Styling with Markdown is supported')
+      expect(rendered).to have_content('Markdown is supported')
     end
   end
 end