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
f21a812a
Commit
f21a812a
authored
Mar 16, 2021
by
Jarek Ostrowski
Committed by
Paul Gascou-Vaillancourt
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prettify and fix jest errors
parent
4a7d9b6d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
16 deletions
+2
-16
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
..._request_widget/components/states/mr_widget_conflicts.vue
+1
-5
ee/app/assets/javascripts/oncall_schedules/components/rotations/components/rotation_assignee.vue
...les/components/rotations/components/rotation_assignee.vue
+1
-5
ee/spec/frontend/contextual_sidebar/__snapshots__/group_trial_status_popover_spec.js.snap
...bar/__snapshots__/group_trial_status_popover_spec.js.snap
+0
-1
spec/frontend/feature_highlight/feature_highlight_popover_spec.js
...ntend/feature_highlight/feature_highlight_popover_spec.js
+0
-1
spec/frontend/vue_shared/components/help_popover_spec.js
spec/frontend/vue_shared/components/help_popover_spec.js
+0
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
View file @
f21a812a
...
...
@@ -149,11 +149,7 @@ export default {
>
{{
s__
(
'
mrWidget|Resolve conflicts
'
)
}}
</gl-button>
<gl-popover
v-if=
"showPopover"
:target=
"() => $refs.popover"
placement=
"top"
>
<gl-popover
v-if=
"showPopover"
:target=
"() => $refs.popover"
placement=
"top"
>
<template
#title
>
<div
class=
"gl-font-weight-normal gl-font-base"
>
{{
$options
.
i18n
.
title
}}
...
...
ee/app/assets/javascripts/oncall_schedules/components/rotations/components/rotation_assignee.vue
View file @
f21a812a
...
...
@@ -94,11 +94,7 @@ export default {
>
</div>
</div>
<gl-popover
:target=
"rotationAssigneeUniqueID"
:title=
"assignee.user.username"
placement=
"top"
>
<gl-popover
:target=
"rotationAssigneeUniqueID"
:title=
"assignee.user.username"
placement=
"top"
>
<p
class=
"gl-m-0"
data-testid=
"rotation-assignee-starts-at"
>
{{
startsAt
}}
</p>
...
...
ee/spec/frontend/contextual_sidebar/__snapshots__/group_trial_status_popover_spec.js.snap
View file @
f21a812a
...
...
@@ -7,7 +7,6 @@ exports[`TrialStatusPopover component matches the snapshot 1`] = `
delay="[object Object]"
placement="rightbottom"
target="target-element-identifier"
triggers="hover focus"
>
<gl-sprintf-stub
...
...
spec/frontend/feature_highlight/feature_highlight_popover_spec.js
View file @
f21a812a
...
...
@@ -41,7 +41,6 @@ describe('feature_highlight/feature_highlight_popover', () => {
expect
(
findPopover
().
props
()).
toMatchObject
({
target
:
POPOVER_TARGET_ID
,
cssClasses
:
[
'
feature-highlight-popover
'
],
triggers
:
'
hover
'
,
container
:
'
body
'
,
placement
:
'
right
'
,
boundary
:
'
viewport
'
,
...
...
spec/frontend/vue_shared/components/help_popover_spec.js
View file @
f21a812a
...
...
@@ -41,10 +41,6 @@ describe('HelpPopover', () => {
expect
(
findPopover
().
props
().
target
()).
toBe
(
findQuestionButton
().
vm
.
$el
);
});
it
(
'
triggers popover on hover and focus
'
,
()
=>
{
expect
(
findPopover
().
props
().
triggers
).
toBe
(
'
hover focus
'
);
});
it
(
'
allows rendering title with HTML tags
'
,
()
=>
{
expect
(
findPopover
().
find
(
'
strong
'
).
exists
()).
toBe
(
true
);
});
...
...
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