From 3e68d3848770b492d314f8e2967c37f7fdd5d143 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Mar 2022 12:07:27 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../admin/users/components/actions/delete.vue | 39 ++-- .../actions/delete_with_contributions.vue | 39 ++-- .../actions/shared/shared_delete_action.vue | 52 ------ .../components/modals/delete_user_modal.vue | 112 +++++------ .../modals/delete_user_modal_event_hub.js | 5 + .../components/modals/user_modal_manager.vue | 77 -------- .../javascripts/admin/users/constants.js | 6 - app/assets/javascripts/admin/users/index.js | 47 +---- .../components/loading_indicator.vue | 1 + .../extensions/code_block_highlight.js | 42 ++++- .../services/code_block_language_loader.js | 35 ++++ .../content_editor/services/content_editor.js | 19 +- .../services/create_content_editor.js | 9 +- app/assets/javascripts/contextual_sidebar.js | 25 ++- .../ide/stores/plugins/terminal.js | 8 +- .../javascripts/integrations/edit/index.js | 3 + .../components/invite_members_modal.vue | 6 + .../init_invite_members_modal.js | 73 ++++---- .../issues/create_merge_request_dropdown.js | 6 +- .../issues/show/components/description.vue | 4 - .../projects/learn_gitlab/index/index.js | 5 +- .../work_items/components/item_title.vue | 5 - .../components/work_item_detail_modal.vue | 37 ++-- .../work_items/components/work_item_title.vue | 73 ++++++++ .../javascripts/work_items/constants.js | 9 +- .../graphql/create_work_item.mutation.graphql | 13 +- .../work_items/graphql/provider.js | 10 +- .../graphql/update_work_item.mutation.graphql | 13 +- .../graphql/work_item.fragment.graphql | 8 + .../graphql/work_item.query.graphql | 15 +- .../work_items/pages/work_item_root.vue | 81 +++----- .../stylesheets/framework/dropdowns.scss | 1 + app/helpers/ide_helper.rb | 8 +- app/helpers/invite_members_helper.rb | 1 + app/models/clusters/applications/runner.rb | 2 +- app/views/admin/identities/index.html.haml | 2 - .../impersonation_tokens/index.html.haml | 2 - app/views/admin/users/_modals.html.haml | 20 -- app/views/admin/users/_users.html.haml | 2 - app/views/admin/users/keys.html.haml | 1 - app/views/admin/users/projects.html.haml | 2 - app/views/admin/users/show.html.haml | 1 - app/views/projects/blob/_upload.html.haml | 5 +- .../projects/issues/_new_branch.html.haml | 4 +- .../img/merge_request_reports_v14_7.png | Bin 66876 -> 21202 bytes doc/development/img/merge_widget_v14_7.png | Bin 56335 -> 16526 bytes ...dent_metrics_tab_text_link_modal_v14_9.png | Bin 53167 -> 20989 bytes .../epics/img/related_epic_block_v14_9.png | Bin 31319 -> 11800 bytes .../epics/img/related_epics_add_v14_9.png | Bin 27785 -> 9862 bytes .../integrations/img/failed_badges.png | Bin 46485 -> 15999 bytes .../integrations/img/failed_banner.png | Bin 17440 -> 6783 bytes .../img/ff_merge_rebase_v14_9.png | Bin 17903 -> 6552 bytes .../img/code_search_git_blame_v14_9.png | Bin 40505 -> 13872 bytes locale/gitlab.pot | 6 +- qa/qa/support/loglinking.rb | 2 +- qa/spec/resource/api_fabricator_spec.rb | 2 +- qa/spec/support/loglinking_spec.rb | 2 +- scripts/static-analysis | 1 + .../users/components/actions/actions_spec.js | 42 ++--- .../delete_user_modal_spec.js.snap | 174 +++--------------- .../modals/delete_user_modal_spec.js | 104 ++++++----- .../modals/user_modal_manager_spec.js | 126 ------------- .../extensions/code_block_highlight_spec.js | 74 ++++++-- .../code_block_language_loader_spec.js | 70 +++++++ .../services/content_editor_spec.js | 24 ++- .../ide/stores/plugins/terminal_spec.js | 16 +- .../invite_members/mock_data/member_modal.js | 1 + .../create_merge_request_dropdown_spec.js | 2 +- .../show/components/description_spec.js | 10 - ...spec.js => work_item_detail_modal_spec.js} | 45 +++-- .../components/work_item_title_spec.js | 111 +++++++++++ spec/frontend/work_items/mock_data.js | 3 + .../work_items/pages/work_item_root_spec.js | 114 +++++------- .../content_editor_integration_spec.js | 63 +++++++ spec/helpers/invite_members_helper_spec.rb | 1 + 75 files changed, 954 insertions(+), 967 deletions(-) delete mode 100644 app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue create mode 100644 app/assets/javascripts/admin/users/components/modals/delete_user_modal_event_hub.js delete mode 100644 app/assets/javascripts/admin/users/components/modals/user_modal_manager.vue create mode 100644 app/assets/javascripts/content_editor/services/code_block_language_loader.js create mode 100644 app/assets/javascripts/work_items/components/work_item_title.vue create mode 100644 app/assets/javascripts/work_items/graphql/work_item.fragment.graphql delete mode 100644 app/views/admin/users/_modals.html.haml delete mode 100644 spec/frontend/admin/users/components/modals/user_modal_manager_spec.js create mode 100644 spec/frontend/content_editor/services/code_block_language_loader_spec.js rename spec/frontend/work_items/components/{work_item_detail_spec.js => work_item_detail_modal_spec.js} (64%) create mode 100644 spec/frontend/work_items/components/work_item_title_spec.js create mode 100644 spec/frontend_integration/content_editor/content_editor_integration_spec.js diff --git a/app/assets/javascripts/admin/users/components/actions/delete.vue b/app/assets/javascripts/admin/users/components/actions/delete.vue index e6dde5898e7..ae0c6731271 100644 --- a/app/assets/javascripts/admin/users/components/actions/delete.vue +++ b/app/assets/javascripts/admin/users/components/actions/delete.vue @@ -1,9 +1,11 @@ diff --git a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue index bd920a91516..a39df1cbfb6 100644 --- a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue +++ b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue @@ -1,9 +1,11 @@ diff --git a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue b/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue deleted file mode 100644 index c9f29b55dbf..00000000000 --- a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/app/assets/javascripts/admin/users/components/modals/delete_user_modal.vue b/app/assets/javascripts/admin/users/components/modals/delete_user_modal.vue index d7c08096376..31fe86775ee 100644 --- a/app/assets/javascripts/admin/users/components/modals/delete_user_modal.vue +++ b/app/assets/javascripts/admin/users/components/modals/delete_user_modal.vue @@ -1,8 +1,8 @@ -