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
Boxiang Sun
gitlab-ce
Commits
3019a567
Commit
3019a567
authored
Dec 21, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes the markdown toolbar buttons
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/55618
parent
c20f0564
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
app/assets/javascripts/lib/utils/text_markdown.js
app/assets/javascripts/lib/utils/text_markdown.js
+2
-2
changelogs/unreleased/markdown-toolbar-btn-fix.yml
changelogs/unreleased/markdown-toolbar-btn-fix.yml
+5
-0
spec/features/issues/user_creates_issue_spec.rb
spec/features/issues/user_creates_issue_spec.rb
+5
-1
No files found.
app/assets/javascripts/lib/utils/text_markdown.js
View file @
3019a567
...
@@ -82,7 +82,7 @@ export function insertMarkdownText({
...
@@ -82,7 +82,7 @@ export function insertMarkdownText({
tag
,
tag
,
cursorOffset
,
cursorOffset
,
blockTag
,
blockTag
,
selected
,
selected
=
''
,
wrap
,
wrap
,
select
,
select
,
})
{
})
{
...
@@ -212,7 +212,7 @@ export function addMarkdownListeners(form) {
...
@@ -212,7 +212,7 @@ export function addMarkdownListeners(form) {
blockTag
:
$this
.
data
(
'
mdBlock
'
),
blockTag
:
$this
.
data
(
'
mdBlock
'
),
wrap
:
!
$this
.
data
(
'
mdPrepend
'
),
wrap
:
!
$this
.
data
(
'
mdPrepend
'
),
select
:
$this
.
data
(
'
mdSelect
'
),
select
:
$this
.
data
(
'
mdSelect
'
),
tagContent
:
$this
.
data
(
'
mdTagContent
'
)
.
toString
()
,
tagContent
:
$this
.
data
(
'
mdTagContent
'
),
});
});
});
});
}
}
...
...
changelogs/unreleased/markdown-toolbar-btn-fix.yml
0 → 100644
View file @
3019a567
---
title
:
Fixed markdown toolbar buttons
merge_request
:
author
:
type
:
fixed
spec/features/issues/user_creates_issue_spec.rb
View file @
3019a567
...
@@ -14,7 +14,7 @@ describe "User creates issue" do
...
@@ -14,7 +14,7 @@ describe "User creates issue" do
visit
(
new_project_issue_path
(
project
))
visit
(
new_project_issue_path
(
project
))
end
end
it
"creates issue"
do
it
"creates issue"
,
:js
do
page
.
within
(
".issue-form"
)
do
page
.
within
(
".issue-form"
)
do
expect
(
page
).
to
have_no_content
(
"Assign to"
)
expect
(
page
).
to
have_no_content
(
"Assign to"
)
.
and
have_no_content
(
"Labels"
)
.
and
have_no_content
(
"Labels"
)
...
@@ -27,11 +27,15 @@ describe "User creates issue" do
...
@@ -27,11 +27,15 @@ describe "User creates issue" do
issue_title
=
"500 error on profile"
issue_title
=
"500 error on profile"
fill_in
(
"Title"
,
with:
issue_title
)
fill_in
(
"Title"
,
with:
issue_title
)
first
(
'.js-md'
).
click
first
(
'.qa-issuable-form-description'
).
native
.
send_keys
(
'Description'
)
click_button
(
"Submit issue"
)
click_button
(
"Submit issue"
)
expect
(
page
).
to
have_content
(
issue_title
)
expect
(
page
).
to
have_content
(
issue_title
)
.
and
have_content
(
user
.
name
)
.
and
have_content
(
user
.
name
)
.
and
have_content
(
project
.
name
)
.
and
have_content
(
project
.
name
)
expect
(
page
).
to
have_selector
(
'strong'
,
text:
'Description'
)
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