From e57da6ba898df025f93bf8d3a896c7c2ba2ab830 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 12 Aug 2023 00:10:38 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitignore | 7 - .gitlab/ci/frontend.gitlab-ci.yml | 1 - Gemfile | 2 - Gemfile.checksum | 3 - Gemfile.lock | 9 - .../components/abuse_report_row.vue | 6 +- .../components/alerts_settings_form.vue | 1 - .../components/alerts_settings_wrapper.vue | 2 +- .../components/stage_table.vue | 15 +- app/assets/javascripts/api/groups_api.js | 17 +- .../badges/components/badge_settings.vue | 6 +- .../boards/components/board_card_inner.vue | 2 +- .../components/editor/ci_editor_header.vue | 1 - .../components/validate/ci_validate.vue | 1 - .../components/pipeline_new_form.vue | 1 - .../ci/reports/components/report_section.vue | 5 +- .../components/metadata/button.vue | 1 - .../remove_cluster_confirmation.vue | 1 - .../commit/components/signature_badge.vue | 4 +- .../crm/contacts/components/contacts_root.vue | 1 - .../components/organizations_root.vue | 1 - .../deploy_keys/components/key.vue | 2 +- .../components/design_notes/design_note.vue | 1 - .../entrypoints/jira_connect_app.js | 1 - app/assets/javascripts/entrypoints/main.js | 6 - app/assets/javascripts/entrypoints/main_ee.js | 5 - app/assets/javascripts/entrypoints/main_jh.js | 5 - .../entrypoints/performance_bar.js | 1 - .../entrypoints/redirect_listbox.js | 1 - .../entrypoints/sandboxed_mermaid.js | 1 - app/assets/javascripts/entrypoints/sentry.js | 1 - .../components/environments_app.vue | 1 - .../components/deployment_actions.vue | 1 - .../components/feature_flags.vue | 7 +- .../settings/components/access_dropdown.vue | 1 - .../incidents/components/incidents_list.vue | 1 - .../components/group_select.vue | 38 +- .../incidents/timeline_events_form.vue | 1 - .../incidents/timeline_events_item.vue | 2 +- .../components/job/manual_variables_form.vue | 2 +- app/assets/javascripts/lib/utils/webpack.js | 5 +- .../components/modals/remove_member_modal.vue | 1 - .../nav/components/new_nav_toggle.vue | 7 +- .../notes/components/attachments_warning.vue | 2 +- .../components/email_participants_warning.vue | 2 +- .../notifications_dropdown_item.vue | 1 - .../dependency_proxy/app.vue | 6 +- .../shared/wikis/components/wiki_form.vue | 2 +- .../components/detailed_metric.vue | 2 +- .../pipeline_wizard/components/commit.vue | 2 - .../components/widgets/text.vue | 2 +- .../legacy_pipeline_mini_graph.vue | 1 - .../pipeline_mini_graph/pipeline_stages.vue | 2 +- .../profile/edit/components/user_avatar.vue | 5 +- .../components/shared/delete_modal.vue | 16 +- .../releases/components/tag_field_new.vue | 1 - .../components/delete_blob_modal.vue | 1 - app/assets/javascripts/run_modules.js | 9 - .../sidebar/components/label_filter/index.vue | 7 +- .../security_configuration/components/app.vue | 2 +- .../components/assignees/assignees.vue | 2 +- .../javascripts/snippets/components/edit.vue | 1 - .../components/global_search.vue | 2 - .../tags/components/sort_dropdown.vue | 1 - .../components/init_command_modal.vue | 1 - .../components/project_storage_app.vue | 1 - .../user_lists/components/add_user_modal.vue | 1 - .../components/deployment/deployment_list.vue | 6 +- .../extensions/code_quality/index.vue | 1 - .../mr_widget_options.vue | 1 - .../components/mr_more_dropdown.vue | 1 - .../components/notes/noteable_warning.vue | 2 +- .../components/registry/title_area.vue | 3 + .../components/manage_via_mr.vue | 1 - app/assets/javascripts/webpack.js | 3 +- .../components/work_item_due_date.vue | 2 - app/assets/stylesheets/pages/labels.scss | 4 +- app/controllers/application_controller.rb | 18 - app/helpers/application_helper.rb | 9 - app/helpers/vite_helper.rb | 29 - app/helpers/webpack_helper.rb | 10 +- .../cancel_redundant_pipelines_service.rb | 2 +- app/views/layouts/_head.html.haml | 10 - app/views/projects/branches/_branch.html.haml | 2 +- app/views/projects/branches/_panel.html.haml | 2 +- app/views/projects/labels/index.html.haml | 6 +- app/views/shared/_label.html.haml | 4 +- app/views/shared/web_hooks/_hook.html.haml | 6 +- app/views/shared/web_hooks/_index.html.haml | 27 +- bin/vite | 27 - config/feature_flags/development/vite.yml | 8 - config/vite.json | 18 - config/webpack.config.js | 27 +- config/webpack.constants.js | 31 -- danger/qa_selector/Dangerfile | 32 +- .../settings/terraform_limits.md | 8 +- package.json | 7 - postcss.config.js | 5 - qa/Gemfile | 2 +- qa/Gemfile.lock | 6 +- qa/qa/page/base.rb | 4 +- qa/qa/resource/clusters/agent.rb | 4 + qa/qa/resource/clusters/agent_token.rb | 4 + qa/qa/runtime/env.rb | 50 ++ qa/qa/runtime/fixtures.rb | 4 + qa/qa/service/cluster_provider/gcloud.rb | 81 ++- qa/qa/service/kubernetes_cluster.rb | 29 +- ...and_terminate_workspace_shared_examples.rb | 38 ++ qa/qa/support/wait_for_requests.rb | 5 +- scripts/remote_development/run-e2e-tests.sh | 4 +- .../groups/container_registry_spec.rb | 1 + .../projects/container_registry_spec.rb | 1 + .../components/group_select_spec.js | 46 +- .../components/registry/title_area_spec.js | 15 +- spec/helpers/application_helper_spec.rb | 34 -- spec/helpers/vite_helper_spec.rb | 59 -- spec/helpers/webpack_helper_spec.rb | 18 - spec/requests/content_security_policy_spec.rb | 28 - spec/spec_helper.rb | 2 - vite.config.js | 100 ---- yarn.lock | 519 ++---------------- 121 files changed, 450 insertions(+), 1166 deletions(-) delete mode 100644 app/assets/javascripts/entrypoints/jira_connect_app.js delete mode 100644 app/assets/javascripts/entrypoints/main.js delete mode 100644 app/assets/javascripts/entrypoints/main_ee.js delete mode 100644 app/assets/javascripts/entrypoints/main_jh.js delete mode 100644 app/assets/javascripts/entrypoints/performance_bar.js delete mode 100644 app/assets/javascripts/entrypoints/redirect_listbox.js delete mode 100644 app/assets/javascripts/entrypoints/sandboxed_mermaid.js delete mode 100644 app/assets/javascripts/entrypoints/sentry.js delete mode 100644 app/assets/javascripts/run_modules.js delete mode 100644 app/helpers/vite_helper.rb delete mode 100755 bin/vite delete mode 100644 config/feature_flags/development/vite.yml delete mode 100644 config/vite.json delete mode 100644 config/webpack.constants.js delete mode 100644 postcss.config.js create mode 100644 qa/qa/specs/features/shared_examples/create_and_terminate_workspace_shared_examples.rb delete mode 100644 spec/helpers/vite_helper_spec.rb delete mode 100644 vite.config.js diff --git a/.gitignore b/.gitignore index 9dd73547646..d6c6d41e3ca 100644 --- a/.gitignore +++ b/.gitignore @@ -106,10 +106,3 @@ tags.lock tags.temp .stylelintcache .solargraph.yml - -# Vite Ruby -/public/vite* -# Vite uses dotenv and suggests to ignore local-only env files. See -# https://vitejs.dev/guide/env-and-mode.html#env-files -*.local - diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 1f1065a9830..f103032ee69 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -11,7 +11,6 @@ # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 BROWSERSLIST_IGNORE_OLD_DATA: "true" WEBPACK_COMPILE_LOG_PATH: "tmp/webpack-output.log" - VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION: "true" stage: prepare needs: [] script: diff --git a/Gemfile b/Gemfile index f55eac0f475..e95dba4cb1b 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,6 @@ gem 'rails', '~> 7.0.6' gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' -gem 'vite_rails' - gem 'bootsnap', '~> 1.16.0', require: false gem 'openssl', '~> 3.0' diff --git a/Gemfile.checksum b/Gemfile.checksum index 748633e2fcc..e7d34d6f626 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -125,7 +125,6 @@ {"name":"doorkeeper","version":"5.6.6","platform":"ruby","checksum":"2344e86c77770526efcda893b5217aa13d1c7eb1b40de840b58b19eb1ff757e0"}, {"name":"doorkeeper-openid_connect","version":"1.8.7","platform":"ruby","checksum":"71edaf33118deefe25674ba3f8280c32835f057351f70e9beb222c0fd6b8e786"}, {"name":"dotenv","version":"2.7.6","platform":"ruby","checksum":"2451ed5e8e43776d7a787e51d6f8903b98e446146c7ad143d5678cc2c409d547"}, -{"name":"dry-cli","version":"1.0.0","platform":"ruby","checksum":"28ead169f872954dd08910eb8ead59cf86cd18b4aab321e8eeefe945749569f0"}, {"name":"dry-core","version":"1.0.0","platform":"ruby","checksum":"7a92099870967f0d2c9997950608cb8bb622dafeea20b2fe1dd49e9ba1d0f305"}, {"name":"dry-inflector","version":"1.0.0","platform":"ruby","checksum":"6ad22361ca2d6f3f001ae3037ffcfea01163f644280d13a9195d3c3a94dd1626"}, {"name":"dry-logic","version":"1.5.0","platform":"ruby","checksum":"99ed2180f1970c3d8247004f277a01dffbe8e82cf6680de9c7209312d86cd416"}, @@ -676,8 +675,6 @@ {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"}, {"name":"view_component","version":"3.2.0","platform":"ruby","checksum":"1dfaa85e13b5393f30b60bd3a03348b5298240a13137985d71eb2b8cc94c4c22"}, {"name":"virtus","version":"2.0.0","platform":"ruby","checksum":"8841dae4eb7fcc097320ba5ea516bf1839e5d056c61ee27138aa4bddd6e3d1c2"}, -{"name":"vite_rails","version":"3.0.15","platform":"ruby","checksum":"b8ec528aedf7e24b54f222b449cd9250810ea2456d5f8dd4ef87f06b475cf860"}, -{"name":"vite_ruby","version":"3.3.4","platform":"ruby","checksum":"025e438385a6dc2320c8c148dff453f5bb1d4f056ce69c3386f47d4c388ad80c"}, {"name":"vmstat","version":"2.3.0","platform":"ruby","checksum":"ab5446a3e3bd0a9cdb9d9ac69a0bbd119c4f161d945a0846a519dd7018af656d"}, {"name":"warden","version":"1.2.9","platform":"ruby","checksum":"46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0"}, {"name":"warning","version":"1.3.0","platform":"ruby","checksum":"23695a5d8e50bd5c46068931b529bee0b28e4982cbcefbe77d867800dde8069e"}, diff --git a/Gemfile.lock b/Gemfile.lock index 7f2f8307779..824dadab308 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -459,7 +459,6 @@ GEM doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) dotenv (2.7.6) - dry-cli (1.0.0) dry-core (1.0.0) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) @@ -1673,13 +1672,6 @@ GEM axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) - vite_rails (3.0.15) - railties (>= 5.1, < 8) - vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.3.4) - dry-cli (>= 0.7, < 2) - rack-proxy (~> 0.6, >= 0.6.1) - zeitwerk (~> 2.2) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) @@ -2037,7 +2029,6 @@ DEPENDENCIES validates_hostname (~> 1.0.11) version_sorter (~> 2.3) view_component (~> 3.2.0) - vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue index 291833959f2..f24e491a745 100644 --- a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue +++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_row.vue @@ -68,11 +68,7 @@ export default { diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue index 1e158baa925..38f9936c7c1 100644 --- a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue +++ b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue @@ -218,11 +218,11 @@ export default { {{ data.label }} diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index 8a997624a36..eabe809fbd2 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -147,7 +147,6 @@ export default { diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index b15c936f1c4..a5b6d6276f8 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -312,7 +312,6 @@ export default { icon="ellipsis_v" category="tertiary" data-qa-selector="design_discussion_actions_ellipsis_dropdown" - data-testid="more-actions-dropdown" text-sr-only :title="$options.i18n.moreActionsLabel" :aria-label="$options.i18n.moreActionsLabel" diff --git a/app/assets/javascripts/entrypoints/jira_connect_app.js b/app/assets/javascripts/entrypoints/jira_connect_app.js deleted file mode 100644 index 90ad39ea487..00000000000 --- a/app/assets/javascripts/entrypoints/jira_connect_app.js +++ /dev/null @@ -1 +0,0 @@ -import '../jira_connect/subscriptions'; diff --git a/app/assets/javascripts/entrypoints/main.js b/app/assets/javascripts/entrypoints/main.js deleted file mode 100644 index 6d59e89cfd0..00000000000 --- a/app/assets/javascripts/entrypoints/main.js +++ /dev/null @@ -1,6 +0,0 @@ -import '../main'; -import { runModules } from '~/run_modules'; - -const modules = import.meta.glob('../pages/**/index.js'); - -runModules(modules, '../pages/'); diff --git a/app/assets/javascripts/entrypoints/main_ee.js b/app/assets/javascripts/entrypoints/main_ee.js deleted file mode 100644 index 4a83be6be94..00000000000 --- a/app/assets/javascripts/entrypoints/main_ee.js +++ /dev/null @@ -1,5 +0,0 @@ -import { runModules } from '~/run_modules'; - -const modules = import.meta.glob('../../../../ee/app/assets/javascripts/pages/**/index.js'); - -runModules(modules, '../../../../ee/app/assets/javascripts/pages/'); diff --git a/app/assets/javascripts/entrypoints/main_jh.js b/app/assets/javascripts/entrypoints/main_jh.js deleted file mode 100644 index 92a42a9ac70..00000000000 --- a/app/assets/javascripts/entrypoints/main_jh.js +++ /dev/null @@ -1,5 +0,0 @@ -import { runModules } from '~/run_modules'; - -const modules = import.meta.glob('../../../../jh/app/assets/javascripts/pages/**/index.js'); - -runModules(modules, '../../../../jh/app/assets/javascripts/pages/'); diff --git a/app/assets/javascripts/entrypoints/performance_bar.js b/app/assets/javascripts/entrypoints/performance_bar.js deleted file mode 100644 index 3f6fc6272d0..00000000000 --- a/app/assets/javascripts/entrypoints/performance_bar.js +++ /dev/null @@ -1 +0,0 @@ -import '../performance_bar'; diff --git a/app/assets/javascripts/entrypoints/redirect_listbox.js b/app/assets/javascripts/entrypoints/redirect_listbox.js deleted file mode 100644 index 811a73fbf2f..00000000000 --- a/app/assets/javascripts/entrypoints/redirect_listbox.js +++ /dev/null @@ -1 +0,0 @@ -import './behaviors/redirect_listbox'; diff --git a/app/assets/javascripts/entrypoints/sandboxed_mermaid.js b/app/assets/javascripts/entrypoints/sandboxed_mermaid.js deleted file mode 100644 index d3dd144ffba..00000000000 --- a/app/assets/javascripts/entrypoints/sandboxed_mermaid.js +++ /dev/null @@ -1 +0,0 @@ -import '../lib/mermaid'; diff --git a/app/assets/javascripts/entrypoints/sentry.js b/app/assets/javascripts/entrypoints/sentry.js deleted file mode 100644 index debafc6fab3..00000000000 --- a/app/assets/javascripts/entrypoints/sentry.js +++ /dev/null @@ -1 +0,0 @@ -import '../sentry/index'; diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index a95b5b273f7..795cbf5327a 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -250,7 +250,6 @@ export default { v-if="canSetupReviewApp" v-model="isReviewAppModalVisible" :modal-id="$options.modalId" - data-testid="enable-review-app-modal" /> {{ s__('FeatureFlags|View user lists') }} @@ -183,10 +182,7 @@ export default { class="gl-display-flex gl-align-items-baseline gl-flex-direction-row gl-justify-content-space-between gl-mt-6" >
-

+

{{ s__('FeatureFlags|Feature flags') }}

{{ count }} @@ -240,7 +236,6 @@ export default { 'FeatureFlags|Feature flags allow you to configure your code into different flavors by dynamically toggling certain functionality.', ) " - data-testid="feature-flags-tab" @dismissAlert="clearAlert" > diff --git a/app/assets/javascripts/groups/settings/components/access_dropdown.vue b/app/assets/javascripts/groups/settings/components/access_dropdown.vue index 8bc5f28ebfb..457a2db174c 100644 --- a/app/assets/javascripts/groups/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/groups/settings/components/access_dropdown.vue @@ -181,7 +181,6 @@ export default { diff --git a/app/assets/javascripts/invite_members/components/group_select.vue b/app/assets/javascripts/invite_members/components/group_select.vue index 1369deae3f9..42257127bbc 100644 --- a/app/assets/javascripts/invite_members/components/group_select.vue +++ b/app/assets/javascripts/invite_members/components/group_select.vue @@ -1,5 +1,6 @@ diff --git a/app/assets/javascripts/notes/components/email_participants_warning.vue b/app/assets/javascripts/notes/components/email_participants_warning.vue index 1875d48e7b2..cf9108992be 100644 --- a/app/assets/javascripts/notes/components/email_participants_warning.vue +++ b/app/assets/javascripts/notes/components/email_participants_warning.vue @@ -55,7 +55,7 @@ export default {