Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
950e2986
Commit
950e2986
authored
Feb 13, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change wording of MR comment box
parent
027a4bd2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/views/projects/notes/_hints.html.haml
app/views/projects/notes/_hints.html.haml
+0
-1
spec/views/projects/notes/_form.html.haml_spec.rb
spec/views/projects/notes/_form.html.haml_spec.rb
+2
-2
No files found.
app/views/projects/notes/_hints.html.haml
View file @
950e2986
-
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
...
...
spec/views/projects/notes/_form.html.haml_spec.rb
View file @
950e2986
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment