diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 18:34:35 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 18:34:35 +0000 |
commit | 74c1f3eb7efb59ce8df737d87cfb805331282f47 (patch) | |
tree | 91acd4dd444b4da38cc2e64526c284cec7763e54 /spec/views | |
parent | 87f4767e604a556291c531f8889b654d824245aa (diff) | |
parent | 950e2986656e17948ef227985d786ee22fb92fb2 (diff) | |
download | gitlab-ce-74c1f3eb7efb59ce8df737d87cfb805331282f47.tar.gz |
Merge branch 'markdown-slash-commands-text' into 'master'
Change wording of MR comment box
See merge request !9193
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/notes/_form.html.haml_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |