From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Oct 2020 07:08:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- .../vue_shared/components/actions_button.vue | 23 +- .../vue_shared/components/alert_details_table.vue | 49 +++- .../vue_shared/components/awards_list.vue | 8 +- .../vue_shared/components/blob_viewers/mixins.js | 16 +- .../vue_shared/components/ci_badge_link.vue | 16 +- .../vue_shared/components/clipboard_button.vue | 27 +- .../javascripts/vue_shared/components/commit.vue | 2 +- .../vue_shared/components/confirm_modal.vue | 11 +- .../components/content_viewer/content_viewer.vue | 37 ++- .../content_viewer/viewers/download_viewer.vue | 13 +- .../vue_shared/components/deprecated_modal_2.vue | 33 ++- .../components/dismissible_feedback_alert.vue | 14 +- .../components/dropdown/dropdown_search_input.vue | 6 +- .../components/droplab_dropdown_button.vue | 92 ------ .../vue_shared/components/editor_lite.vue | 99 +++++++ .../vue_shared/components/file_finder/index.vue | 11 +- .../components/file_icon/file_icon_map.js | 6 + .../store/modules/filters/actions.js | 121 ++++++++ .../store/modules/filters/index.js | 10 + .../store/modules/filters/mutation_types.js | 26 ++ .../store/modules/filters/mutations.js | 109 +++++++ .../store/modules/filters/state.js | 47 ++++ .../vue_shared/components/gl_mentions.vue | 55 ++-- .../vue_shared/components/header_ci_component.vue | 62 +++- .../vue_shared/components/local_storage_sync.vue | 48 +++- .../vue_shared/components/markdown/field.vue | 59 ++-- .../components/markdown/suggestion_diff.vue | 6 + .../components/markdown/suggestion_diff_header.vue | 7 +- .../vue_shared/components/markdown/suggestions.vue | 9 +- .../access_request_action_buttons.vue | 59 ++++ .../members/action_buttons/action_button_group.vue | 11 + .../approve_access_request_button.vue | 42 +++ .../action_buttons/group_action_buttons.vue | 27 ++ .../action_buttons/invite_action_buttons.vue | 48 ++++ .../members/action_buttons/leave_button.vue | 40 +++ .../action_buttons/remove_group_link_button.vue | 36 +++ .../action_buttons/remove_member_button.vue | 57 ++++ .../action_buttons/resend_invite_button.vue | 41 +++ .../members/action_buttons/user_action_buttons.vue | 61 ++++ .../components/members/avatars/group_avatar.vue | 34 +++ .../components/members/avatars/invite_avatar.vue | 32 +++ .../components/members/avatars/user_avatar.vue | 91 ++++++ .../vue_shared/components/members/constants.js | 70 +++++ .../components/members/modals/leave_modal.vue | 70 +++++ .../members/modals/remove_group_link_modal.vue | 69 +++++ .../components/members/table/created_at.vue | 40 +++ .../components/members/table/expires_at.vue | 66 +++++ .../members/table/member_action_buttons.vue | 57 ++++ .../components/members/table/member_avatar.vue | 35 +++ .../components/members/table/member_source.vue | 27 ++ .../components/members/table/members_table.vue | 110 ++++++++ .../members/table/members_table_cell.vue | 64 +++++ .../components/members/table/role_dropdown.vue | 70 +++++ .../vue_shared/components/members/utils.js | 19 ++ .../vue_shared/components/modal_copy_button.vue | 21 +- .../vue_shared/components/navigation_tabs.vue | 7 +- .../vue_shared/components/notes/skeleton_note.vue | 2 +- .../constants.js | 21 ++ .../paginated_table_with_search_and_tabs.vue | 313 +++++++++++++++++++++ .../paginated_table_with_search_and_tabs/utils.js | 11 + .../vue_shared/components/registry/list_item.vue | 2 +- .../vue_shared/components/registry/title_area.vue | 78 +++-- .../components/rich_content_editor/constants.js | 15 + .../modals/add_image/add_image_modal.vue | 4 +- .../modals/insert_video_modal.vue | 91 ++++++ .../rich_content_editor/rich_content_editor.vue | 28 +- .../rich_content_editor/services/editor_service.js | 31 +- .../services/renderers/render_html_block.js | 18 +- .../rich_content_editor/services/sanitize_html.js | 22 ++ .../components/sidebar/collapsed_calendar_icon.vue | 16 +- .../labels_select_vue/dropdown_contents.vue | 1 + .../dropdown_contents_labels_view.vue | 14 +- .../sidebar/labels_select_vue/dropdown_value.vue | 19 +- .../labels_select_vue/labels_select_root.vue | 11 +- .../sidebar/labels_select_vue/store/actions.js | 3 - .../labels_select_vue/store/mutation_types.js | 1 - .../sidebar/labels_select_vue/store/mutations.js | 4 - .../sidebar/labels_select_vue/store/state.js | 1 + .../components/sidebar/toggle_sidebar.vue | 41 ++- .../vue_shared/components/split_button.vue | 30 +- .../vue_shared/components/stacked_progress_bar.vue | 10 +- .../vue_shared/components/timezone_dropdown.vue | 35 +-- .../vue_shared/components/todo_button.vue | 2 +- .../vue_shared/components/toggle_button.vue | 2 +- .../components/user_popover/user_popover.vue | 28 +- .../vue_shared/components/web_ide_link.vue | 92 +++++- .../javascripts/vue_shared/directives/tooltip.js | 5 + .../vue_shared/mixins/ci_pagination_api_mixin.js | 4 + .../vue_shared/mixins/related_issuable_mixin.js | 2 +- .../security_reports/security_reports_app.vue | 107 +++++++ 90 files changed, 2956 insertions(+), 434 deletions(-) delete mode 100644 app/assets/javascripts/vue_shared/components/droplab_dropdown_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/editor_lite.vue create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/mutation_types.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/mutations.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/state.js create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/access_request_action_buttons.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/action_button_group.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/approve_access_request_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/group_action_buttons.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/invite_action_buttons.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/leave_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/remove_group_link_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/remove_member_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/resend_invite_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/action_buttons/user_action_buttons.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/avatars/group_avatar.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/avatars/invite_avatar.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/avatars/user_avatar.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/constants.js create mode 100644 app/assets/javascripts/vue_shared/components/members/modals/leave_modal.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/modals/remove_group_link_modal.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/created_at.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/expires_at.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/member_action_buttons.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/member_avatar.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/member_source.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/members_table.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/members_table_cell.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/table/role_dropdown.vue create mode 100644 app/assets/javascripts/vue_shared/components/members/utils.js create mode 100644 app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/constants.js create mode 100644 app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue create mode 100644 app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/utils.js create mode 100644 app/assets/javascripts/vue_shared/components/rich_content_editor/modals/insert_video_modal.vue create mode 100644 app/assets/javascripts/vue_shared/components/rich_content_editor/services/sanitize_html.js create mode 100644 app/assets/javascripts/vue_shared/security_reports/security_reports_app.vue (limited to 'app/assets/javascripts/vue_shared') diff --git a/app/assets/javascripts/vue_shared/components/actions_button.vue b/app/assets/javascripts/vue_shared/components/actions_button.vue index f333ab49ead..9b21de19185 100644 --- a/app/assets/javascripts/vue_shared/components/actions_button.vue +++ b/app/assets/javascripts/vue_shared/components/actions_button.vue @@ -3,7 +3,7 @@ import { GlDropdown, GlDropdownItem, GlDropdownDivider, - GlLink, + GlButton, GlTooltipDirective, } from '@gitlab/ui'; @@ -12,7 +12,7 @@ export default { GlDropdown, GlDropdownItem, GlDropdownDivider, - GlLink, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -27,6 +27,16 @@ export default { required: false, default: '', }, + category: { + type: String, + required: false, + default: 'secondary', + }, + variant: { + type: String, + required: false, + default: 'default', + }, }, computed: { hasMultipleActions() { @@ -54,6 +64,8 @@ export default { class="gl-button-deprecated-adapter" :text="selectedAction.text" :split-href="selectedAction.href" + :variant="variant" + :category="category" split @click="handleClick(selectedAction, $event)" > @@ -77,14 +89,15 @@ export default { - {{ selectedAction.text }} - + diff --git a/app/assets/javascripts/vue_shared/components/alert_details_table.vue b/app/assets/javascripts/vue_shared/components/alert_details_table.vue index c94e784c01e..34f6d384f7b 100644 --- a/app/assets/javascripts/vue_shared/components/alert_details_table.vue +++ b/app/assets/javascripts/vue_shared/components/alert_details_table.vue @@ -1,20 +1,38 @@