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
74e4ace8
Commit
74e4ace8
authored
Apr 12, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
94176d60
ed7a558c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
1 deletion
+44
-1
app/assets/javascripts/mr_popover/index.js
app/assets/javascripts/mr_popover/index.js
+5
-1
changelogs/unreleased/60241-merge-request-popover-doesn-t-go-away-on-mouse-leave.yml
...-merge-request-popover-doesn-t-go-away-on-mouse-leave.yml
+5
-0
doc/administration/pages/index.md
doc/administration/pages/index.md
+4
-0
spec/frontend/mr_popover/index_spec.js
spec/frontend/mr_popover/index_spec.js
+30
-0
No files found.
app/assets/javascripts/mr_popover/index.js
View file @
74e4ace8
...
@@ -54,9 +54,13 @@ export default elements => {
...
@@ -54,9 +54,13 @@ export default elements => {
const
apolloProvider
=
new
VueApollo
({
const
apolloProvider
=
new
VueApollo
({
defaultClient
:
createDefaultClient
(),
defaultClient
:
createDefaultClient
(),
});
});
const
listenerAddedAttr
=
'
data-mr-listener-added
'
;
mrLinks
.
forEach
(
el
=>
{
mrLinks
.
forEach
(
el
=>
{
el
.
addEventListener
(
'
mouseenter
'
,
handleMRPopoverMount
(
apolloProvider
));
if
(
!
el
.
getAttribute
(
listenerAddedAttr
))
{
el
.
addEventListener
(
'
mouseenter
'
,
handleMRPopoverMount
(
apolloProvider
));
el
.
setAttribute
(
listenerAddedAttr
,
true
);
}
});
});
}
}
};
};
changelogs/unreleased/60241-merge-request-popover-doesn-t-go-away-on-mouse-leave.yml
0 → 100644
View file @
74e4ace8
---
title
:
Fix bug where MR popover doesn't go away on mouse leave
merge_request
:
author
:
type
:
fixed
doc/administration/pages/index.md
View file @
74e4ace8
...
@@ -174,6 +174,10 @@ behavior:
...
@@ -174,6 +174,10 @@ behavior:
1.
[
Reconfigure GitLab
][
reconfigure
]
.
1.
[
Reconfigure GitLab
][
reconfigure
]
.
NOTE:
**Note:**
`inplace_chroot`
option might not work with the other features, such as
[
Pages Access Control
](
#access-control
)
.
The
[
GitLab Pages README
](
https://gitlab.com/gitlab-org/gitlab-pages#caveats
)
has more information about caveats and workarounds.
## Advanced configuration
## Advanced configuration
In addition to the wildcard domains, you can also have the option to configure
In addition to the wildcard domains, you can also have the option to configure
...
...
spec/frontend/mr_popover/index_spec.js
0 → 100644
View file @
74e4ace8
import
*
as
createDefaultClient
from
'
~/lib/graphql
'
;
import
{
setHTMLFixture
}
from
'
../helpers/fixtures
'
;
import
initMRPopovers
from
'
~/mr_popover/index
'
;
createDefaultClient
.
default
=
jest
.
fn
();
describe
(
'
initMRPopovers
'
,
()
=>
{
let
mr1
;
let
mr2
;
beforeEach
(()
=>
{
setHTMLFixture
(
`
<div id="one" class="gfm-merge_request">MR1</div>
<div id="two" class="gfm-merge_request">MR2</div>
`
);
mr1
=
document
.
querySelector
(
'
#one
'
);
mr2
=
document
.
querySelector
(
'
#two
'
);
mr1
.
addEventListener
=
jest
.
fn
();
mr2
.
addEventListener
=
jest
.
fn
();
});
it
(
'
does not add the same event listener twice
'
,
()
=>
{
initMRPopovers
([
mr1
,
mr1
,
mr2
]);
expect
(
mr1
.
addEventListener
).
toHaveBeenCalledTimes
(
1
);
expect
(
mr2
.
addEventListener
).
toHaveBeenCalledTimes
(
1
);
});
});
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