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
c4602241
Commit
c4602241
authored
Dec 23, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed error with GFM autocomplete when no data exists
parent
358a2d8b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
app/assets/javascripts/gfm_auto_complete.js.es6
app/assets/javascripts/gfm_auto_complete.js.es6
+1
-1
changelogs/unreleased/label-gfm-error-fix.yml
changelogs/unreleased/label-gfm-error-fix.yml
+4
-0
spec/features/issues/gfm_autocomplete_spec.rb
spec/features/issues/gfm_autocomplete_spec.rb
+12
-1
No files found.
app/assets/javascripts/gfm_auto_complete.js.es6
View file @
c4602241
...
...
@@ -367,7 +367,7 @@
return $input.trigger('keyup');
},
isLoading(data) {
if (!data) return false;
if (!data
|| !data.length
) return false;
if (Array.isArray(data)) data = data[0];
return data === this.defaultLoadingData[0] || data.name === this.defaultLoadingData[0];
},
...
...
changelogs/unreleased/label-gfm-error-fix.yml
0 → 100644
View file @
c4602241
---
title
:
Fixed GFM autocomplete error when no data exists
merge_request
:
author
:
spec/features/issues/gfm_autocomplete_spec.rb
View file @
c4602241
...
...
@@ -47,7 +47,7 @@ feature 'GFM autocomplete', feature: true, js: true do
expect_to_wrap
(
true
,
label_item
,
note
,
label
.
title
)
end
it
"does not show drpdown when preceded with a special character"
do
it
"does not show dr
o
pdown when preceded with a special character"
do
note
=
find
(
'#note_note'
)
page
.
within
'.timeline-content-form'
do
note
.
native
.
send_keys
(
''
)
...
...
@@ -65,6 +65,17 @@ feature 'GFM autocomplete', feature: true, js: true do
expect
(
page
).
to
have_selector
(
'.atwho-container'
,
visible:
false
)
end
it
"does not throw an error if no labels exist"
do
note
=
find
(
'#note_note'
)
page
.
within
'.timeline-content-form'
do
note
.
native
.
send_keys
(
''
)
note
.
native
.
send_keys
(
'~'
)
note
.
click
end
expect
(
page
).
to
have_selector
(
'.atwho-container'
,
visible:
false
)
end
it
'doesn\'t wrap for assignee values'
do
note
=
find
(
'#note_note'
)
page
.
within
'.timeline-content-form'
do
...
...
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