From 3822e951cb0ced8b24d79949339684312c8bb2e1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 7 Sep 2023 09:11:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../merge_request_templates/Stable Branch.md | 2 +- .../layout/empty_line_after_magic_comment.yml | 2 - .rubocop_todo/rspec/context_wording.yml | 1 - .rubocop_todo/rspec/expect_in_hook.yml | 1 - .../rspec/missing_feature_category.yml | 1 - Gemfile | 2 +- Gemfile.checksum | 2 +- Gemfile.lock | 4 +- .../empty_state_with_any_issues.vue | 0 .../empty_state_without_any_issues.vue | 0 .../service_desk/components/info_banner.vue | 0 .../components/service_desk_list_app.vue | 4 +- .../{ => issues}/service_desk/constants.js | 0 .../{ => issues}/service_desk/graphql.js | 0 .../{ => issues}/service_desk/index.js | 2 +- .../get_service_desk_issues.query.graphql | 0 ...t_service_desk_issues_counts.query.graphql | 0 .../queries/issue.fragment.graphql | 0 .../queries/label.fragment.graphql | 0 .../queries/milestone.fragment.graphql | 0 ...order_service_desk_issues.mutation.graphql | 0 .../search_project_labels.query.graphql | 0 .../search_project_milestones.query.graphql | 0 .../set_sorting_preference.mutation.graphql | 0 .../service_desk/search_tokens.js | 0 .../{ => issues}/service_desk/utils.js | 0 .../job/sidebar/artifacts_block.vue | 7 +- .../components/job/sidebar/sidebar_header.vue | 1 - .../job/sidebar/stages_dropdown.vue | 1 - .../javascripts/jobs/components/log/log.vue | 2 +- .../projects/issues/service_desk/index.js | 2 +- app/assets/javascripts/profile/profile.js | 1 - .../tracking/dispatch_snowplow_event.js | 8 +- .../javascripts/tracking/internal_events.js | 27 +- .../profiles/notifications_controller.rb | 2 +- app/models/application_setting.rb | 2 +- .../application_setting_implementation.rb | 1 - app/models/user.rb | 8 + ...oduct_marketing_campaign_emails_service.rb | 6 +- .../devise/shared/_email_opted_in.html.haml | 6 - .../notifications/_email_settings.html.haml | 3 - .../profiles/notifications/show.html.haml | 4 +- .../artifacts/_tree_directory.html.haml | 2 +- .../merge_requests/_merge_request.html.haml | 4 +- .../registrations/welcome/show.html.haml | 1 - doc/.vale/gitlab/spelling-exceptions.txt | 2 + .../audit_event_types.md | 1 + .../geo/replication/troubleshooting.md | 2 +- doc/administration/gitaly/index.md | 4 +- doc/administration/gitaly/recovery.md | 6 +- doc/administration/raketasks/storage.md | 6 +- doc/administration/repository_checks.md | 2 +- .../repository_storage_paths.md | 179 +++++++++++++ .../repository_storage_types.md | 202 +------------- doc/administration/server_hooks.md | 12 +- doc/api/graphql/reference/index.md | 12 + doc/ci/docker/buildah_rootless_tutorial.md | 149 +++++++++++ doc/ci/docker/using_docker_build.md | 38 ++- .../database/multiple_databases.md | 24 ++ doc/development/fe_guide/architecture.md | 18 +- doc/development/fe_guide/axios.md | 4 +- .../fe_guide/design_anti_patterns.md | 220 +-------------- doc/development/fe_guide/design_patterns.md | 222 +++++++++++++++- doc/development/fe_guide/tech_stack.md | 11 + doc/development/file_storage.md | 2 +- doc/development/git_object_deduplication.md | 4 +- .../testing_guide/best_practices.md | 2 +- doc/operations/img/tracing_details_v16_3.png | Bin 0 -> 128734 bytes doc/operations/img/tracing_list_v16_3.png | Bin 0 -> 59957 bytes doc/operations/tracing.md | 79 ++++++ doc/tutorials/build_application.md | 1 + doc/update/index.md | 28 -- doc/update/versions/gitlab_14_changes.md | 113 ++++++-- doc/update/versions/gitlab_15_changes.md | 19 +- doc/user/group/saml_sso/troubleshooting.md | 15 ++ .../project/repository/forking_workflow.md | 2 +- .../reducing_the_repo_size_using_git.md | 2 +- lib/gitlab/hook_data/user_builder.rb | 2 - locale/gitlab.pot | 40 +-- package.json | 2 +- qa/gdk/Dockerfile.gdk | 2 +- qa/qa/page/project/artifact/show.rb | 4 +- qa/qa/page/project/job/show.rb | 40 +-- qa/qa/page/project/web_ide/vscode.rb | 2 +- .../saas/container_registry_spec.rb | 2 +- .../generic_repository_spec.rb | 2 +- .../maven_gradle_repository_spec.rb | 2 +- .../create_project_with_auto_devops_spec.rb | 2 +- .../profiles/notifications_controller_spec.rb | 3 +- .../user_visits_notifications_tab_spec.rb | 8 - .../empty_state_with_any_issues_spec.js | 4 +- .../empty_state_without_any_issues_spec.js | 8 +- .../components/info_banner_spec.js | 4 +- .../components/service_desk_list_app_spec.js | 16 +- .../{ => issues}/service_desk/mock_data.js | 0 .../components/job/artifacts_block_spec.js | 4 +- .../tracking/dispatch_snowplow_event_spec.js | 76 ++++++ .../frontend/tracking/internal_events_spec.js | 62 +++-- spec/frontend/tracking/mock_data.js | 17 ++ spec/lib/unnested_in_filters/rewriter_spec.rb | 251 +++++++++--------- ..._marketing_campaign_emails_service_spec.rb | 54 ++-- spec/support/rspec_order_todo.yml | 2 - .../general.html.haml_spec.rb | 1 - .../welcome/show.html.haml_spec.rb | 1 - yarn.lock | 8 +- 105 files changed, 1289 insertions(+), 820 deletions(-) rename app/assets/javascripts/{ => issues}/service_desk/components/empty_state_with_any_issues.vue (100%) rename app/assets/javascripts/{ => issues}/service_desk/components/empty_state_without_any_issues.vue (100%) rename app/assets/javascripts/{ => issues}/service_desk/components/info_banner.vue (100%) rename app/assets/javascripts/{ => issues}/service_desk/components/service_desk_list_app.vue (98%) rename app/assets/javascripts/{ => issues}/service_desk/constants.js (100%) rename app/assets/javascripts/{ => issues}/service_desk/graphql.js (100%) rename app/assets/javascripts/{ => issues}/service_desk/index.js (96%) rename app/assets/javascripts/{ => issues}/service_desk/queries/get_service_desk_issues.query.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/get_service_desk_issues_counts.query.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/issue.fragment.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/label.fragment.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/milestone.fragment.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/reorder_service_desk_issues.mutation.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/search_project_labels.query.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/search_project_milestones.query.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/queries/set_sorting_preference.mutation.graphql (100%) rename app/assets/javascripts/{ => issues}/service_desk/search_tokens.js (100%) rename app/assets/javascripts/{ => issues}/service_desk/utils.js (100%) delete mode 100644 app/views/devise/shared/_email_opted_in.html.haml create mode 100644 doc/ci/docker/buildah_rootless_tutorial.md create mode 100644 doc/development/fe_guide/tech_stack.md create mode 100644 doc/operations/img/tracing_details_v16_3.png create mode 100644 doc/operations/img/tracing_list_v16_3.png create mode 100644 doc/operations/tracing.md rename spec/frontend/{ => issues}/service_desk/components/empty_state_with_any_issues_spec.js (92%) rename spec/frontend/{ => issues}/service_desk/components/empty_state_without_any_issues_spec.js (92%) rename spec/frontend/{ => issues}/service_desk/components/info_banner_spec.js (93%) rename spec/frontend/{ => issues}/service_desk/components/service_desk_list_app_spec.js (96%) rename spec/frontend/{ => issues}/service_desk/mock_data.js (100%) create mode 100644 spec/frontend/tracking/dispatch_snowplow_event_spec.js create mode 100644 spec/frontend/tracking/mock_data.js diff --git a/.gitlab/merge_request_templates/Stable Branch.md b/.gitlab/merge_request_templates/Stable Branch.md index f8fc85f5bd2..4ad8e6fc8a2 100644 --- a/.gitlab/merge_request_templates/Stable Branch.md +++ b/.gitlab/merge_request_templates/Stable Branch.md @@ -16,7 +16,7 @@ _Describe in detail what merge request is being backported and why_ This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability. * [ ] This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch. -* [ ] The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes). +* [ ] The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes). * [ ] This MR has a [severity label] assigned (if applicable). * [ ] This MR has been approved by a maintainer (only one approval is required). * [ ] Ensure the `e2e:package-and-test-ee` job has either succeeded or been approved by a Software Engineer in Test. diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml index e723cc788c1..52ffc77b00a 100644 --- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml +++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml @@ -256,7 +256,6 @@ Layout/EmptyLineAfterMagicComment: - 'ee/lib/ee/gitlab/ci/parsers/security/validators/schema_validator.rb' - 'ee/lib/ee/gitlab/hook_data/group_member_builder.rb' - 'ee/lib/ee/gitlab/hook_data/issue_builder.rb' - - 'ee/lib/ee/gitlab/hook_data/user_builder.rb' - 'ee/lib/ee/gitlab/scim/base_deprovisioning_service.rb' - 'ee/lib/ee/gitlab/scim/base_provisioning_service.rb' - 'ee/lib/ee/gitlab/scim/provisioning_service.rb' @@ -331,7 +330,6 @@ Layout/EmptyLineAfterMagicComment: - 'ee/spec/lib/ee/gitlab/git_access_snippet_spec.rb' - 'ee/spec/lib/ee/gitlab/hook_data/group_member_builder_spec.rb' - 'ee/spec/lib/ee/gitlab/hook_data/issue_builder_spec.rb' - - 'ee/spec/lib/ee/gitlab/hook_data/user_builder_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/project/tree_restorer_spec.rb' - 'ee/spec/lib/ee/gitlab/snippet_search_results_spec.rb' - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_summary_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index b1b6c13c9f7..5a2735ae19c 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -311,7 +311,6 @@ RSpec/ContextWording: - 'ee/spec/lib/ee/gitlab/gon_helper_spec.rb' - 'ee/spec/lib/ee/gitlab/group_search_results_spec.rb' - 'ee/spec/lib/ee/gitlab/hook_data/group_member_builder_spec.rb' - - 'ee/spec/lib/ee/gitlab/hook_data/user_builder_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/tree_restorer_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/project/tree_saver_spec.rb' diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml index b48ded6b070..86f2a5abd41 100644 --- a/.rubocop_todo/rspec/expect_in_hook.yml +++ b/.rubocop_todo/rspec/expect_in_hook.yml @@ -28,7 +28,6 @@ RSpec/ExpectInHook: - 'ee/spec/lib/ee/api/helpers/members_helpers_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb' - 'ee/spec/lib/ee/gitlab/gon_helper_spec.rb' - - 'ee/spec/lib/ee/gitlab/hook_data/user_builder_spec.rb' - 'ee/spec/lib/gitlab/auth/smartcard/certificate_spec.rb' - 'ee/spec/lib/gitlab/checks/diff_check_spec.rb' - 'ee/spec/lib/gitlab/ci/minutes/cost_factor_spec.rb' diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml index aca2f838efa..cee4f644e29 100644 --- a/.rubocop_todo/rspec/missing_feature_category.yml +++ b/.rubocop_todo/rspec/missing_feature_category.yml @@ -659,7 +659,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/lib/ee/gitlab/group_search_results_spec.rb' - 'ee/spec/lib/ee/gitlab/hook_data/group_member_builder_spec.rb' - 'ee/spec/lib/ee/gitlab/hook_data/issue_builder_spec.rb' - - 'ee/spec/lib/ee/gitlab/hook_data/user_builder_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/tree_restorer_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/project/tree_saver_spec.rb' diff --git a/Gemfile b/Gemfile index 0a83dc69e97..b5de1790873 100644 --- a/Gemfile +++ b/Gemfile @@ -304,7 +304,7 @@ gem 'ruby-openai', '~> 3.7' gem 'circuitbox', '2.0.0' # Sanitize user input -gem 'sanitize', '~> 6.0' +gem 'sanitize', '~> 6.0.2' gem 'babosa', '~> 2.0' # Sanitizes SVG input diff --git a/Gemfile.checksum b/Gemfile.checksum index 583a2a26ec6..af1f01be1a8 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -553,7 +553,7 @@ {"name":"rugged","version":"1.6.3","platform":"ruby","checksum":"362631de8dc6f1074242f21e01148ac70b7fe8cdb17f85eee91d4ea83457cb04"}, {"name":"safe_yaml","version":"1.0.4","platform":"ruby","checksum":"248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2"}, {"name":"safety_net_attestation","version":"0.4.0","platform":"ruby","checksum":"96be2d74e7ed26453a51894913449bea0e072f44490021545ac2d1c38b0718ce"}, -{"name":"sanitize","version":"6.0.0","platform":"ruby","checksum":"81795f985873f3bacee2eaaededeaafc3a29aafeaa9aff51e04b85a66bbf08ff"}, +{"name":"sanitize","version":"6.0.2","platform":"ruby","checksum":"48c4eb8e92bb1699056b6000986ac50fc9df82f458a941abf2c4d6759bccd5cf"}, {"name":"sass","version":"3.5.5","platform":"ruby","checksum":"1bb5431bc620ce29076728a4c8f7b4acb55066ed9df8cf5d57db6cda450d8080"}, {"name":"sass-listen","version":"4.0.0","platform":"ruby","checksum":"ae9dcb76dd3e234329e5ba6e213f48e532c5a3e7b0b4d8a87f13aaca0cc18377"}, {"name":"sassc","version":"2.4.0","platform":"ruby","checksum":"4c60a2b0a3b36685c83b80d5789401c2f678c1652e3288315a1551d811d9f83e"}, diff --git a/Gemfile.lock b/Gemfile.lock index 795baf146d8..ee8806dbc28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1436,7 +1436,7 @@ GEM safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (6.0.0) + sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass (3.5.5) @@ -1991,7 +1991,7 @@ DEPENDENCIES ruby_parser (~> 3.20.3) rubyzip (~> 2.3.2) rugged (~> 1.6) - sanitize (~> 6.0) + sanitize (~> 6.0.2) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) diff --git a/app/assets/javascripts/service_desk/components/empty_state_with_any_issues.vue b/app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue similarity index 100% rename from app/assets/javascripts/service_desk/components/empty_state_with_any_issues.vue rename to app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue diff --git a/app/assets/javascripts/service_desk/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue similarity index 100% rename from app/assets/javascripts/service_desk/components/empty_state_without_any_issues.vue rename to app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue diff --git a/app/assets/javascripts/service_desk/components/info_banner.vue b/app/assets/javascripts/issues/service_desk/components/info_banner.vue similarity index 100% rename from app/assets/javascripts/service_desk/components/info_banner.vue rename to app/assets/javascripts/issues/service_desk/components/info_banner.vue diff --git a/app/assets/javascripts/service_desk/components/service_desk_list_app.vue b/app/assets/javascripts/issues/service_desk/components/service_desk_list_app.vue similarity index 98% rename from app/assets/javascripts/service_desk/components/service_desk_list_app.vue rename to app/assets/javascripts/issues/service_desk/components/service_desk_list_app.vue index 8e3f70d8d18..4b59672428b 100644 --- a/app/assets/javascripts/service_desk/components/service_desk_list_app.vue +++ b/app/assets/javascripts/issues/service_desk/components/service_desk_list_app.vue @@ -41,8 +41,8 @@ import { createAlert, VARIANT_INFO } from '~/alert'; import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils'; import { TYPENAME_USER } from '~/graphql_shared/constants'; import searchProjectMembers from '~/graphql_shared/queries/project_user_members_search.query.graphql'; -import getServiceDeskIssuesQuery from 'ee_else_ce/service_desk/queries/get_service_desk_issues.query.graphql'; -import getServiceDeskIssuesCounts from 'ee_else_ce/service_desk/queries/get_service_desk_issues_counts.query.graphql'; +import getServiceDeskIssuesQuery from 'ee_else_ce/issues/service_desk/queries/get_service_desk_issues.query.graphql'; +import getServiceDeskIssuesCounts from 'ee_else_ce/issues/service_desk/queries/get_service_desk_issues_counts.query.graphql'; import searchProjectLabelsQuery from '../queries/search_project_labels.query.graphql'; import searchProjectMilestonesQuery from '../queries/search_project_milestones.query.graphql'; import setSortingPreferenceMutation from '../queries/set_sorting_preference.mutation.graphql'; diff --git a/app/assets/javascripts/service_desk/constants.js b/app/assets/javascripts/issues/service_desk/constants.js similarity index 100% rename from app/assets/javascripts/service_desk/constants.js rename to app/assets/javascripts/issues/service_desk/constants.js diff --git a/app/assets/javascripts/service_desk/graphql.js b/app/assets/javascripts/issues/service_desk/graphql.js similarity index 100% rename from app/assets/javascripts/service_desk/graphql.js rename to app/assets/javascripts/issues/service_desk/graphql.js diff --git a/app/assets/javascripts/service_desk/index.js b/app/assets/javascripts/issues/service_desk/index.js similarity index 96% rename from app/assets/javascripts/service_desk/index.js rename to app/assets/javascripts/issues/service_desk/index.js index 69bb55be055..579cf343477 100644 --- a/app/assets/javascripts/service_desk/index.js +++ b/app/assets/javascripts/issues/service_desk/index.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import VueRouter from 'vue-router'; import { parseBoolean } from '~/lib/utils/common_utils'; -import ServiceDeskListApp from 'ee_else_ce/service_desk/components/service_desk_list_app.vue'; +import ServiceDeskListApp from 'ee_else_ce/issues/service_desk/components/service_desk_list_app.vue'; import { gqlClient } from './graphql'; export async function mountServiceDeskListApp() { diff --git a/app/assets/javascripts/service_desk/queries/get_service_desk_issues.query.graphql b/app/assets/javascripts/issues/service_desk/queries/get_service_desk_issues.query.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/get_service_desk_issues.query.graphql rename to app/assets/javascripts/issues/service_desk/queries/get_service_desk_issues.query.graphql diff --git a/app/assets/javascripts/service_desk/queries/get_service_desk_issues_counts.query.graphql b/app/assets/javascripts/issues/service_desk/queries/get_service_desk_issues_counts.query.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/get_service_desk_issues_counts.query.graphql rename to app/assets/javascripts/issues/service_desk/queries/get_service_desk_issues_counts.query.graphql diff --git a/app/assets/javascripts/service_desk/queries/issue.fragment.graphql b/app/assets/javascripts/issues/service_desk/queries/issue.fragment.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/issue.fragment.graphql rename to app/assets/javascripts/issues/service_desk/queries/issue.fragment.graphql diff --git a/app/assets/javascripts/service_desk/queries/label.fragment.graphql b/app/assets/javascripts/issues/service_desk/queries/label.fragment.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/label.fragment.graphql rename to app/assets/javascripts/issues/service_desk/queries/label.fragment.graphql diff --git a/app/assets/javascripts/service_desk/queries/milestone.fragment.graphql b/app/assets/javascripts/issues/service_desk/queries/milestone.fragment.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/milestone.fragment.graphql rename to app/assets/javascripts/issues/service_desk/queries/milestone.fragment.graphql diff --git a/app/assets/javascripts/service_desk/queries/reorder_service_desk_issues.mutation.graphql b/app/assets/javascripts/issues/service_desk/queries/reorder_service_desk_issues.mutation.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/reorder_service_desk_issues.mutation.graphql rename to app/assets/javascripts/issues/service_desk/queries/reorder_service_desk_issues.mutation.graphql diff --git a/app/assets/javascripts/service_desk/queries/search_project_labels.query.graphql b/app/assets/javascripts/issues/service_desk/queries/search_project_labels.query.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/search_project_labels.query.graphql rename to app/assets/javascripts/issues/service_desk/queries/search_project_labels.query.graphql diff --git a/app/assets/javascripts/service_desk/queries/search_project_milestones.query.graphql b/app/assets/javascripts/issues/service_desk/queries/search_project_milestones.query.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/search_project_milestones.query.graphql rename to app/assets/javascripts/issues/service_desk/queries/search_project_milestones.query.graphql diff --git a/app/assets/javascripts/service_desk/queries/set_sorting_preference.mutation.graphql b/app/assets/javascripts/issues/service_desk/queries/set_sorting_preference.mutation.graphql similarity index 100% rename from app/assets/javascripts/service_desk/queries/set_sorting_preference.mutation.graphql rename to app/assets/javascripts/issues/service_desk/queries/set_sorting_preference.mutation.graphql diff --git a/app/assets/javascripts/service_desk/search_tokens.js b/app/assets/javascripts/issues/service_desk/search_tokens.js similarity index 100% rename from app/assets/javascripts/service_desk/search_tokens.js rename to app/assets/javascripts/issues/service_desk/search_tokens.js diff --git a/app/assets/javascripts/service_desk/utils.js b/app/assets/javascripts/issues/service_desk/utils.js similarity index 100% rename from app/assets/javascripts/service_desk/utils.js rename to app/assets/javascripts/issues/service_desk/utils.js diff --git a/app/assets/javascripts/jobs/components/job/sidebar/artifacts_block.vue b/app/assets/javascripts/jobs/components/job/sidebar/artifacts_block.vue index a78cacf110f..4c81a9bd033 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/artifacts_block.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/artifacts_block.vue @@ -75,7 +75,7 @@ export default { data-testid="artifacts-remove-timeline" > {{ $options.i18n.expiredText }} - + {{ $options.i18n.willExpireText }} @@ -89,7 +89,7 @@ export default {

- + {{ $options.i18n.lockedText }}

@@ -112,8 +112,7 @@ export default { {{ $options.i18n.browseText }} diff --git a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue index 778c0cd6d65..4ffb8ded8ba 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/sidebar_header.vue @@ -138,7 +138,6 @@ export default { :href="restJob.retry_path" :modal-id="$options.forwardDeploymentFailureModalId" variant="confirm" - data-qa-selector="retry_button" data-testid="retry-button" @updateVariablesClicked="$emit('updateVariables')" /> diff --git a/app/assets/javascripts/jobs/components/job/sidebar/stages_dropdown.vue b/app/assets/javascripts/jobs/components/job/sidebar/stages_dropdown.vue index c1f84adf664..220b13277d2 100644 --- a/app/assets/javascripts/jobs/components/job/sidebar/stages_dropdown.vue +++ b/app/assets/javascripts/jobs/components/job/sidebar/stages_dropdown.vue @@ -102,7 +102,6 @@ export default { :href="pipeline.path" class="js-pipeline-path link-commit" data-testid="pipeline-path" - data-qa-selector="pipeline_path" >#{{ pipeline.id }} diff --git a/app/assets/javascripts/jobs/components/log/log.vue b/app/assets/javascripts/jobs/components/log/log.vue index feefb663ba2..fb6a6a58074 100644 --- a/app/assets/javascripts/jobs/components/log/log.vue +++ b/app/assets/javascripts/jobs/components/log/log.vue @@ -78,7 +78,7 @@ export default { };