diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-21 15:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-21 15:09:07 +0300 |
| commit | fbc1f4ffc29ae99f438b07872c3c00fbe7651caa (patch) | |
| tree | 8d82cc8f4037880ebd6fedee1952b48784a634ee /app/assets/javascripts/vue_merge_request_widget | |
| parent | ff2606426b46aa3c5ea9fb18a6d0ce7c38aed183 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue index 81f0823e333..d4562f48806 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget.vue @@ -253,6 +253,7 @@ export default { <div class="gl-display-flex"> <help-popover v-if="helpPopover" + icon="information-o" :options="helpPopover.options" :class="{ 'gl-mr-3': actionButtons.length > 0 }" > diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue index 84633b12e32..0bca89ffc1d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/widget_content_row.vue @@ -96,7 +96,7 @@ export default { v-if="shouldShowHeaderActions" class="gl-ml-auto gl-display-flex gl-align-items-baseline" > - <help-popover v-if="helpPopover" :options="helpPopover.options"> + <help-popover v-if="helpPopover" :options="helpPopover.options" icon="information-o"> <template v-if="helpPopover.content"> <p v-if="helpPopover.content.text" |