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

Change wording of MR comment box

See merge request !9193
This commit is contained in:
Annabel Dunstone Gray 2017-02-15 18:34:35 +00:00
commit 74c1f3eb7e
2 changed files with 2 additions and 3 deletions

View file

@ -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

View file

@ -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