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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
74c1f3eb
Commit
74c1f3eb
authored
Feb 15, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'markdown-slash-commands-text' into 'master'
Change wording of MR comment box See merge request !9193
parents
87f4767e
950e2986
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 @
74c1f3eb
-
supports_slash_commands
=
local_assigns
.
fetch
(
:supports_slash_commands
,
false
)
-
supports_slash_commands
=
local_assigns
.
fetch
(
:supports_slash_commands
,
false
)
.comment-toolbar.clearfix
.comment-toolbar.clearfix
.toolbar-text
.toolbar-text
Styling with
=
link_to
'Markdown'
,
help_page_path
(
'user/markdown'
),
target:
'_blank'
,
tabindex:
-
1
=
link_to
'Markdown'
,
help_page_path
(
'user/markdown'
),
target:
'_blank'
,
tabindex:
-
1
-
if
supports_slash_commands
-
if
supports_slash_commands
and
and
...
...
spec/views/projects/notes/_form.html.haml_spec.rb
View file @
74c1f3eb
...
@@ -21,7 +21,7 @@ describe 'projects/notes/_form' do
...
@@ -21,7 +21,7 @@ describe 'projects/notes/_form' do
let
(
:note
)
{
build
(
:"note_on_
#{
noteable
}
"
,
project:
project
)
}
let
(
:note
)
{
build
(
:"note_on_
#{
noteable
}
"
,
project:
project
)
}
it
'says that only markdown is supported, not slash commands'
do
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
end
end
end
...
@@ -30,7 +30,7 @@ describe 'projects/notes/_form' do
...
@@ -30,7 +30,7 @@ describe 'projects/notes/_form' do
let
(
:note
)
{
build
(
:note_on_commit
,
project:
project
)
}
let
(
:note
)
{
build
(
:note_on_commit
,
project:
project
)
}
it
'says that only markdown is supported, not slash commands'
do
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
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