Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-08-06 13:31:25 +0300
committerPhil Hughes <me@iamphill.com>2018-08-06 13:31:25 +0300
commitbc1f851fdfaf9cc2bba5b67fd762e8802023bf5c (patch)
tree4145853ac9cbb6d7a94ca25ccd0f1f3d2814f183
parent80c47f8eb44d04f6b4f57d58859fbab3a40485a6 (diff)
parent4f4290ffed217af2187c6b0ecc14de6090fda983 (diff)
Merge branch '49375-move-help-popover' into 'master'
Moves help_popover.vue to a common location See merge request gitlab-org/gitlab-ce!21011
-rw-r--r--app/assets/javascripts/vue_shared/components/help_popover.vue (renamed from app/assets/javascripts/vue_shared/components/reports/help_popover.vue)9
-rw-r--r--app/assets/javascripts/vue_shared/components/reports/report_section.vue2
-rw-r--r--app/assets/javascripts/vue_shared/components/reports/summary_row.vue2
-rw-r--r--changelogs/unreleased/49375-move-help-popover.yml5
4 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/reports/help_popover.vue b/app/assets/javascripts/vue_shared/components/help_popover.vue
index c5faa29fd2a..540df392e4e 100644
--- a/app/assets/javascripts/vue_shared/components/reports/help_popover.vue
+++ b/app/assets/javascripts/vue_shared/components/help_popover.vue
@@ -4,15 +4,20 @@ import Icon from '~/vue_shared/components/icon.vue';
import { inserted } from '~/feature_highlight/feature_highlight_helper';
import { mouseenter, debouncedMouseleave, togglePopover } from '~/shared/popover';
+/**
+ * Render a button with a question mark icon
+ * On hover shows a popover. The popover will be dismissed on mouseleave
+ */
export default {
- name: 'ReportsHelpPopover',
+ name: 'HelpPopover',
components: {
Icon,
},
props: {
options: {
type: Object,
- required: true,
+ required: false,
+ default: () => ({}),
},
},
mounted() {
diff --git a/app/assets/javascripts/vue_shared/components/reports/report_section.vue b/app/assets/javascripts/vue_shared/components/reports/report_section.vue
index 0124d8b5bcc..a6dbf21092b 100644
--- a/app/assets/javascripts/vue_shared/components/reports/report_section.vue
+++ b/app/assets/javascripts/vue_shared/components/reports/report_section.vue
@@ -2,7 +2,7 @@
import { __ } from '~/locale';
import StatusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
import IssuesList from './issues_list.vue';
-import Popover from './help_popover.vue';
+import Popover from '../help_popover.vue';
const LOADING = 'LOADING';
const ERROR = 'ERROR';
diff --git a/app/assets/javascripts/vue_shared/components/reports/summary_row.vue b/app/assets/javascripts/vue_shared/components/reports/summary_row.vue
index 28156d7c983..063beab58fc 100644
--- a/app/assets/javascripts/vue_shared/components/reports/summary_row.vue
+++ b/app/assets/javascripts/vue_shared/components/reports/summary_row.vue
@@ -1,7 +1,7 @@
<script>
import CiIcon from '~/vue_shared/components/ci_icon.vue';
import LoadingIcon from '~/vue_shared/components/loading_icon.vue';
-import Popover from './help_popover.vue';
+import Popover from '../help_popover.vue';
/**
* Renders the summary row for each report
diff --git a/changelogs/unreleased/49375-move-help-popover.yml b/changelogs/unreleased/49375-move-help-popover.yml
new file mode 100644
index 00000000000..2547d5768bf
--- /dev/null
+++ b/changelogs/unreleased/49375-move-help-popover.yml
@@ -0,0 +1,5 @@
+---
+title: Moves help_popover component to a common location
+merge_request:
+author:
+type: other