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
3141b800
Commit
3141b800
authored
May 21, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dropdown position when loading remote data
Also fixes flaky spec
parent
e59c3f8e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+4
-0
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-2
changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml
...roject-label-spec-features-boards-sidebar_spec-rb-350.yml
+5
-0
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+4
-0
No files found.
app/assets/javascripts/gl_dropdown.js
View file @
3141b800
...
@@ -335,6 +335,10 @@ GitLabDropdown = (function() {
...
@@ -335,6 +335,10 @@ GitLabDropdown = (function() {
_this
.
fullData
=
data
;
_this
.
fullData
=
data
;
_this
.
parseData
(
_this
.
fullData
);
_this
.
parseData
(
_this
.
fullData
);
_this
.
focusTextInput
();
_this
.
focusTextInput
();
// Update dropdown position since remote data may have changed dropdown size
_this
.
dropdown
.
find
(
'
.dropdown-menu-toggle
'
).
dropdown
(
'
update
'
);
if
(
if
(
_this
.
options
.
filterable
&&
_this
.
options
.
filterable
&&
_this
.
filter
&&
_this
.
filter
&&
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
3141b800
...
@@ -570,10 +570,10 @@
...
@@ -570,10 +570,10 @@
}
}
.dropdown-menu-close
{
.dropdown-menu-close
{
right
:
5px
;
top
:
$gl-padding-4
;
right
:
$gl-padding-8
;
width
:
20px
;
width
:
20px
;
height
:
20px
;
height
:
20px
;
top
:
-1px
;
}
}
.dropdown-menu-close-icon
{
.dropdown-menu-close-icon
{
...
...
changelogs/unreleased/61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350.yml
0 → 100644
View file @
3141b800
---
title
:
Fix dropdown position when loading remote data
merge_request
:
28526
author
:
type
:
fixed
spec/features/boards/sidebar_spec.rb
View file @
3141b800
...
@@ -352,6 +352,8 @@ describe 'Issue Boards', :js do
...
@@ -352,6 +352,8 @@ describe 'Issue Boards', :js do
page
.
within
(
'.labels'
)
do
page
.
within
(
'.labels'
)
do
click_link
'Edit'
click_link
'Edit'
wait_for_requests
click_link
'Create project label'
click_link
'Create project label'
fill_in
'new_label_name'
,
with:
'test label'
fill_in
'new_label_name'
,
with:
'test label'
first
(
'.suggest-colors-dropdown a'
).
click
first
(
'.suggest-colors-dropdown a'
).
click
...
@@ -368,6 +370,8 @@ describe 'Issue Boards', :js do
...
@@ -368,6 +370,8 @@ describe 'Issue Boards', :js do
page
.
within
(
'.labels'
)
do
page
.
within
(
'.labels'
)
do
click_link
'Edit'
click_link
'Edit'
wait_for_requests
click_link
'Create project label'
click_link
'Create project label'
fill_in
'new_label_name'
,
with:
'test label'
fill_in
'new_label_name'
,
with:
'test label'
first
(
'.suggest-colors-dropdown a'
).
click
first
(
'.suggest-colors-dropdown a'
).
click
...
...
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