From c8cc2fe990c52cabcb9912b2b01b5bf16b33d88f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Jun 2021 15:10:16 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_manual_todo.yml | 3 - .../components/status_select.vue | 58 +++ .../issuable_bulk_update_sidebar/constants.js | 17 + .../init_issue_status_select.js | 17 + .../issuable_bulk_update_actions.js | 6 +- .../issuable_bulk_update_sidebar.js | 13 +- .../issuable_init_bulk_update_sidebar.js | 0 .../subscription_select.js | 2 +- app/assets/javascripts/issuable_index.js | 2 +- app/assets/javascripts/issue_status_select.js | 27 -- .../components/issues_list_app.vue | 4 +- app/assets/javascripts/labels_select.js | 2 +- .../javascripts/pages/groups/issues/index.js | 2 +- .../pages/groups/merge_requests/index.js | 2 +- .../merge_request_artifact_download.vue | 1 + .../security_report_download_dropdown.vue | 13 +- .../security_reports/security_reports_app.vue | 2 + app/controllers/chaos_controller.rb | 2 +- .../metrics/dashboard/prometheus_api_proxy.rb | 2 +- app/controllers/metrics_controller.rb | 2 +- .../environments/prometheus_api_controller.rb | 2 +- .../projects/import/jira_controller.rb | 6 +- .../projects/prometheus/metrics_controller.rb | 6 +- .../projects/runners_controller.rb | 14 +- .../projects/services_controller.rb | 4 +- .../prometheus_integration_base.rb | 2 +- .../prometheus_integration/reset_token.rb | 2 +- .../prometheus_integration/update.rb | 2 +- .../alert_management/integrations_resolver.rb | 2 +- .../projects/jira_projects_resolver.rb | 6 +- .../alert_management/integration_type.rb | 2 +- app/helpers/custom_metrics_helper.rb | 2 +- app/helpers/operations_helper.rb | 2 +- .../clusters/integrations/prometheus.rb | 4 +- app/models/integration.rb | 4 + app/models/integrations/base_monitoring.rb | 23 ++ app/models/integrations/jira.rb | 4 + app/models/integrations/mock_monitoring.rb | 25 ++ app/models/integrations/prometheus.rb | 205 +++++++++ app/models/project.rb | 18 +- .../mock_monitoring_service.rb | 23 -- .../project_services/monitoring_service.rb | 21 - .../project_services/prometheus_service.rb | 203 --------- app/serializers/merge_request_diff_entity.rb | 1 + .../calculate_next_run_service.rb | 9 +- app/services/jira/requests/base.rb | 12 +- .../jira/requests/projects/list_service.rb | 4 +- app/services/jira_import/users_importer.rb | 4 +- .../jira_import/users_mapper_service.rb | 6 +- app/services/metrics_service.rb | 2 +- app/services/projects/create_service.rb | 2 +- .../projects/operations/update_service.rb | 2 +- app/views/admin/dashboard/index.html.haml | 5 +- .../clusters/clusters/aws/_new.html.haml | 4 +- app/views/groups/show.html.haml | 2 + app/views/layouts/_page.html.haml | 1 + app/views/projects/import/jira/show.html.haml | 2 +- app/views/projects/issues/index.html.haml | 2 +- .../prometheus/metrics/edit.html.haml | 2 +- .../projects/prometheus/metrics/new.html.haml | 2 +- .../issuable/_bulk_update_sidebar.html.haml | 12 +- app/workers/projects/post_creation_worker.rb | 2 +- .../create_default_alerts_worker.rb | 2 +- .../security_ci_lint_authorization.yml | 8 - config/initializers/7_prometheus_metrics.rb | 8 +- ...1_add_devops_adoption_sast_dast_indexes.rb | 0 doc/administration/auditor_users.md | 17 +- .../background_verification.md | 53 ++- .../checksum-differences-admin-projects.png | Bin 28817 -> 0 bytes .../geo/disaster_recovery/planned_failover.md | 75 ++-- .../runbooks/planned_failover_multi_node.md | 64 +-- .../runbooks/planned_failover_single_node.md | 49 ++- .../geo/replication/configuration.md | 26 +- .../geo/replication/disable_geo.md | 9 +- .../geo/replication/docker_registry.md | 9 +- .../geo/replication/object_storage.md | 9 +- .../geo/replication/remove_geo_site.md | 3 +- .../geo/replication/troubleshooting.md | 18 +- doc/administration/geo/replication/tuning.md | 28 +- doc/administration/housekeeping.md | 24 +- .../img/auditor_access_form.png | Bin 11910 -> 0 bytes doc/administration/maintenance_mode/index.md | 20 +- .../operations/extra_sidekiq_processes.md | 6 +- .../operations/fast_ssh_key_lookup.md | 10 +- .../operations/img/sidekiq-cluster.png | Bin 22576 -> 0 bytes .../img/write_to_authorized_keys_setting.png | Bin 29192 -> 0 bytes doc/administration/pages/index.md | 2 +- doc/administration/polling.md | 39 +- doc/administration/raketasks/check.md | 3 +- .../raketasks/project_import_export.md | 11 +- doc/administration/raketasks/storage.md | 15 +- .../gitlab_rails_cheat_sheet.md | 8 +- doc/api/graphql/reference/index.md | 17 +- doc/api/group_clusters.md | 2 +- doc/development/i18n/externalization.md | 4 +- doc/install/azure/index.md | 8 +- doc/user/admin_area/geo_nodes.md | 14 +- doc/user/clusters/management_project.md | 2 +- doc/user/group/clusters/index.md | 2 +- doc/user/project/clusters/add_eks_clusters.md | 370 ++++++++--------- .../project/clusters/add_existing_cluster.md | 224 ++++++++++ doc/user/project/clusters/add_gke_clusters.md | 28 +- .../project/clusters/add_remove_clusters.md | 391 +++--------------- doc/user/project/clusters/cluster_access.md | 88 ++++ doc/user/project/clusters/index.md | 91 ++-- lib/api/helpers/services_helpers.rb | 6 +- lib/api/lint.rb | 6 +- .../self_monitoring/project/create_service.rb | 8 +- lib/gitlab/global_id/deprecations.rb | 5 +- lib/gitlab/integrations/sti_type.rb | 6 +- lib/gitlab/jira_import.rb | 6 +- lib/gitlab/jira_import/base_importer.rb | 2 +- lib/gitlab/usage_data.rb | 12 +- lib/gitlab/usage_data_non_sql_metrics.rb | 2 +- lib/gitlab/usage_data_queries.rb | 2 +- lib/gitlab/utils/usage_data.rb | 2 +- locale/gitlab.pot | 13 +- .../admin/integrations_controller_spec.rb | 8 +- .../admin/services_controller_spec.rb | 4 +- .../settings/integrations_controller_spec.rb | 8 +- .../projects/import/jira_controller_spec.rb | 12 +- .../projects/issues_controller_spec.rb | 2 +- .../prometheus/metrics_controller_spec.rb | 4 +- .../projects/runners_controller_spec.rb | 2 +- .../projects/services_controller_spec.rb | 18 +- spec/factories/integration_data.rb | 2 +- spec/factories/integrations.rb | 11 +- spec/factories/projects.rb | 4 +- spec/factories/usage_data.rb | 8 +- .../admin_visits_service_templates_spec.rb | 14 +- .../markdown_references/jira_spec.rb | 8 +- .../issues/user_bulk_edits_issues_spec.rb | 8 +- .../merge_requests/user_mass_updates_spec.rb | 6 +- .../integrations/user_activates_jira_spec.rb | 12 +- ...user_activates_slack_notifications_spec.rb | 10 +- .../components/status_select_spec.js | 77 ++++ spec/frontend/issuable_spec.js | 2 +- .../merge_request_artifact_download_spec.js | 4 +- .../security_report_download_dropdown_spec.js | 37 +- .../vue_shared/security_reports/mock_data.js | 11 +- .../security_reports_app_spec.js | 10 +- .../prometheus_integration/create_spec.rb | 2 +- .../projects/jira_projects_resolver_spec.rb | 6 +- .../projects/services_resolver_spec.rb | 2 +- .../types/projects/service_type_spec.rb | 2 +- spec/helpers/operations_helper_spec.rb | 2 +- spec/helpers/services_helper_spec.rb | 10 +- .../external_issue_reference_filter_spec.rb | 4 +- ...fill_jira_tracker_deployment_type2_spec.rb | 6 +- ...rate_issue_trackers_sensitive_data_spec.rb | 22 +- .../project/create_service_spec.rb | 2 +- spec/lib/gitlab/import_export/all_models.yml | 12 +- .../gitlab/jira_import/base_importer_spec.rb | 4 +- .../jira_import/issues_importer_spec.rb | 4 +- .../jira_import/labels_importer_spec.rb | 4 +- spec/lib/gitlab/jira_import_spec.rb | 16 +- spec/lib/gitlab/reference_extractor_spec.rb | 2 +- spec/lib/gitlab/usage_data_spec.rb | 4 +- ...152703_migrate_issue_trackers_data_spec.rb | 6 +- ...hedule_migrate_issue_trackers_data_spec.rb | 6 +- ...mplate_services_duplicated_by_type_spec.rb | 6 +- spec/models/ci/pipeline_schedule_spec.rb | 9 +- spec/models/concerns/has_integrations_spec.rb | 12 +- .../integrations/has_data_fields_spec.rb | 43 +- spec/models/deployment_metrics_spec.rb | 8 +- spec/models/group_spec.rb | 6 +- spec/models/integration_spec.rb | 91 ++-- spec/models/integrations/jenkins_spec.rb | 82 ++-- spec/models/integrations/jira_spec.rb | 126 ++++-- .../prometheus_spec.rb} | 2 +- .../integrations/slack_slash_commands_spec.rb | 2 +- spec/models/integrations/slack_spec.rb | 8 +- spec/models/integrations/teamcity_spec.rb | 79 ++-- spec/models/merge_request_spec.rb | 4 +- spec/models/project_spec.rb | 32 +- spec/policies/project_policy_spec.rb | 2 +- .../prometheus_integration/create_spec.rb | 2 +- .../mutations/jira_import/start_spec.rb | 8 +- .../api/graphql/project/base_service_spec.rb | 4 +- .../api/graphql/project/jira_service_spec.rb | 2 +- spec/requests/api/projects_spec.rb | 2 +- spec/requests/api/services_spec.rb | 6 +- .../merge_request_diff_entity_spec.rb | 2 +- spec/serializers/service_event_entity_spec.rb | 6 +- spec/serializers/service_field_entity_spec.rb | 19 +- .../propagate_integration_service_spec.rb | 14 +- .../bulk_create_integration_service_spec.rb | 16 +- .../bulk_update_integration_service_spec.rb | 2 +- spec/services/git/branch_push_service_spec.rb | 8 +- spec/services/groups/transfer_service_spec.rb | 8 +- .../integrations/test/project_service_spec.rb | 5 +- spec/services/issues/close_service_spec.rb | 4 +- .../requests/projects/list_service_spec.rb | 16 +- .../jira_import/start_import_service_spec.rb | 4 +- .../jira_import/users_importer_spec.rb | 12 +- .../merge_requests/build_service_spec.rb | 12 +- .../merge_requests/merge_service_spec.rb | 6 +- spec/services/projects/create_service_spec.rb | 8 +- .../projects/transfer_service_spec.rb | 12 +- spec/services/projects/update_service_spec.rb | 4 +- .../services/prometheus/proxy_service_spec.rb | 2 +- spec/services/system_note_service_spec.rb | 6 +- .../system_notes/issuables_service_spec.rb | 2 +- spec/support/helpers/jira_service_helper.rb | 4 +- .../integrations_shared_context.rb | 2 +- .../jira_import/jira_projects_context.rb | 4 +- ...ack_mattermost_notifier_shared_examples.rb | 2 +- .../issue_tracker_service_shared_examples.rb | 8 +- .../user_mapper_services_shared_examples.rb | 2 +- .../nav/sidebar/_project.html.haml_spec.rb | 2 +- .../projects/services/_form.haml_spec.rb | 2 +- .../stage/import_issues_worker_spec.rb | 4 +- .../stage/import_labels_worker_spec.rb | 4 +- .../projects/post_creation_worker_spec.rb | 8 +- ...propagate_integration_group_worker_spec.rb | 4 +- ...egration_inherit_descendant_worker_spec.rb | 4 +- ...opagate_integration_inherit_worker_spec.rb | 6 +- ...opagate_integration_project_worker_spec.rb | 4 +- 218 files changed, 2093 insertions(+), 1731 deletions(-) create mode 100644 app/assets/javascripts/issuable_bulk_update_sidebar/components/status_select.vue create mode 100644 app/assets/javascripts/issuable_bulk_update_sidebar/constants.js create mode 100644 app/assets/javascripts/issuable_bulk_update_sidebar/init_issue_status_select.js rename app/assets/javascripts/{ => issuable_bulk_update_sidebar}/issuable_bulk_update_actions.js (97%) rename app/assets/javascripts/{ => issuable_bulk_update_sidebar}/issuable_bulk_update_sidebar.js (94%) rename app/assets/javascripts/{ => issuable_bulk_update_sidebar}/issuable_init_bulk_update_sidebar.js (100%) rename app/assets/javascripts/{ => issuable_bulk_update_sidebar}/subscription_select.js (96%) delete mode 100644 app/assets/javascripts/issue_status_select.js create mode 100644 app/models/integrations/base_monitoring.rb create mode 100644 app/models/integrations/mock_monitoring.rb create mode 100644 app/models/integrations/prometheus.rb delete mode 100644 app/models/project_services/mock_monitoring_service.rb delete mode 100644 app/models/project_services/monitoring_service.rb delete mode 100644 app/models/project_services/prometheus_service.rb delete mode 100644 config/feature_flags/development/security_ci_lint_authorization.yml rename db/{migrate => post_migrate}/20210614124111_add_devops_adoption_sast_dast_indexes.rb (100%) delete mode 100644 doc/administration/geo/disaster_recovery/img/checksum-differences-admin-projects.png delete mode 100644 doc/administration/img/auditor_access_form.png delete mode 100644 doc/administration/operations/img/sidekiq-cluster.png delete mode 100644 doc/administration/operations/img/write_to_authorized_keys_setting.png create mode 100644 doc/user/project/clusters/add_existing_cluster.md create mode 100644 doc/user/project/clusters/cluster_access.md create mode 100644 spec/frontend/issuable_bulk_update_sidebar/components/status_select_spec.js rename spec/models/{project_services/prometheus_service_spec.rb => integrations/prometheus_spec.rb} (99%) diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 0541a788c67..d0079ae650e 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -1640,9 +1640,6 @@ Gitlab/NamespacedClass: - 'app/models/project_pages_metadatum.rb' - 'app/models/project_repository.rb' - 'app/models/project_repository_storage_move.rb' - - 'app/models/project_services/mock_monitoring_service.rb' - - 'app/models/project_services/monitoring_service.rb' - - 'app/models/project_services/prometheus_service.rb' - 'app/models/project_setting.rb' - 'app/models/project_snippet.rb' - 'app/models/project_statistics.rb' diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar/components/status_select.vue b/app/assets/javascripts/issuable_bulk_update_sidebar/components/status_select.vue new file mode 100644 index 00000000000..9509399e91d --- /dev/null +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/components/status_select.vue @@ -0,0 +1,58 @@ + + diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar/constants.js b/app/assets/javascripts/issuable_bulk_update_sidebar/constants.js new file mode 100644 index 00000000000..ad15b25f9cf --- /dev/null +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/constants.js @@ -0,0 +1,17 @@ +import { __ } from '~/locale'; + +export const ISSUE_STATUS_MODIFIERS = { + REOPEN: 'reopen', + CLOSE: 'close', +}; + +export const ISSUE_STATUS_SELECT_OPTIONS = [ + { + value: ISSUE_STATUS_MODIFIERS.REOPEN, + text: __('Open'), + }, + { + value: ISSUE_STATUS_MODIFIERS.CLOSE, + text: __('Closed'), + }, +]; diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar/init_issue_status_select.js b/app/assets/javascripts/issuable_bulk_update_sidebar/init_issue_status_select.js new file mode 100644 index 00000000000..43179a86d70 --- /dev/null +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/init_issue_status_select.js @@ -0,0 +1,17 @@ +import Vue from 'vue'; +import StatusSelect from './components/status_select.vue'; + +export default function initIssueStatusSelect() { + const el = document.querySelector('.js-issue-status'); + + if (!el) { + return null; + } + + return new Vue({ + el, + render(h) { + return h(StatusSelect); + }, + }); +} diff --git a/app/assets/javascripts/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_actions.js similarity index 97% rename from app/assets/javascripts/issuable_bulk_update_actions.js rename to app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_actions.js index 911533457ac..463e0e5837e 100644 --- a/app/assets/javascripts/issuable_bulk_update_actions.js +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_actions.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { difference, intersection, union } from 'lodash'; -import createFlash from './flash'; -import axios from './lib/utils/axios_utils'; -import { __ } from './locale'; +import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { __ } from '~/locale'; export default { init({ form, issues, prefixId } = {}) { diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar.js b/app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js similarity index 94% rename from app/assets/javascripts/issuable_bulk_update_sidebar.js rename to app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js index 97d50dde9f7..a9d4548f8cf 100644 --- a/app/assets/javascripts/issuable_bulk_update_sidebar.js +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/issuable_bulk_update_sidebar.js @@ -2,11 +2,12 @@ import $ from 'jquery'; import { property } from 'lodash'; + +import issueableEventHub from '~/issues_list/eventhub'; +import LabelsSelect from '~/labels_select'; +import MilestoneSelect from '~/milestone_select'; +import initIssueStatusSelect from './init_issue_status_select'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; -import issueStatusSelect from './issue_status_select'; -import issueableEventHub from './issues_list/eventhub'; -import LabelsSelect from './labels_select'; -import MilestoneSelect from './milestone_select'; import subscriptionSelect from './subscription_select'; const HIDDEN_CLASS = 'hidden'; @@ -29,7 +30,7 @@ export default class IssuableBulkUpdateSidebar { this.$sidebar = $('.right-sidebar'); this.$sidebarInnerContainer = this.$sidebar.find('.issuable-sidebar'); this.$bulkEditCancelBtn = $('.js-bulk-update-menu-hide'); - this.$bulkEditSubmitBtn = $('.update-selected-issues'); + this.$bulkEditSubmitBtn = $('.js-update-selected-issues'); this.$bulkUpdateEnableBtn = $('.js-bulk-update-toggle'); this.$otherFilters = $('.issues-other-filters'); this.$checkAllContainer = $('.check-all-holder'); @@ -56,7 +57,7 @@ export default class IssuableBulkUpdateSidebar { initDropdowns() { new LabelsSelect(); new MilestoneSelect(); - issueStatusSelect(); + initIssueStatusSelect(); subscriptionSelect(); if (IS_EE) { diff --git a/app/assets/javascripts/issuable_init_bulk_update_sidebar.js b/app/assets/javascripts/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar.js similarity index 100% rename from app/assets/javascripts/issuable_init_bulk_update_sidebar.js rename to app/assets/javascripts/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar.js diff --git a/app/assets/javascripts/subscription_select.js b/app/assets/javascripts/issuable_bulk_update_sidebar/subscription_select.js similarity index 96% rename from app/assets/javascripts/subscription_select.js rename to app/assets/javascripts/issuable_bulk_update_sidebar/subscription_select.js index 4a688d819b0..b12ac776b4f 100644 --- a/app/assets/javascripts/subscription_select.js +++ b/app/assets/javascripts/issuable_bulk_update_sidebar/subscription_select.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { __ } from './locale'; +import { __ } from '~/locale'; export default function subscriptionSelect() { $('.js-subscription-event').each((i, element) => { diff --git a/app/assets/javascripts/issuable_index.js b/app/assets/javascripts/issuable_index.js index cdeee68b762..5a57da292a0 100644 --- a/app/assets/javascripts/issuable_index.js +++ b/app/assets/javascripts/issuable_index.js @@ -1,4 +1,4 @@ -import issuableInitBulkUpdateSidebar from './issuable_init_bulk_update_sidebar'; +import issuableInitBulkUpdateSidebar from '~/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar'; export default class IssuableIndex { constructor(pagePrefix = 'issuable_') { diff --git a/app/assets/javascripts/issue_status_select.js b/app/assets/javascripts/issue_status_select.js deleted file mode 100644 index 2ede0837930..00000000000 --- a/app/assets/javascripts/issue_status_select.js +++ /dev/null @@ -1,27 +0,0 @@ -import $ from 'jquery'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; -import { __ } from './locale'; - -export default function issueStatusSelect() { - $('.js-issue-status').each((i, el) => { - const fieldName = $(el).data('fieldName'); - initDeprecatedJQueryDropdown($(el), { - selectable: true, - fieldName, - toggleLabel(selected, element, instance) { - let label = __('Author'); - const $item = instance.dropdown.find('.is-active'); - if ($item.length) { - label = $item.text(); - } - return label; - }, - clicked(options) { - return options.e.preventDefault(); - }, - id(obj, element) { - return $(element).data('id'); - }, - }); - }); -} diff --git a/app/assets/javascripts/issues_list/components/issues_list_app.vue b/app/assets/javascripts/issues_list/components/issues_list_app.vue index dbf7717b248..921af766796 100644 --- a/app/assets/javascripts/issues_list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues_list/components/issues_list_app.vue @@ -450,7 +450,9 @@ export default { }, async handleBulkUpdateClick() { if (!this.hasInitBulkEdit) { - const initBulkUpdateSidebar = await import('~/issuable_init_bulk_update_sidebar'); + const initBulkUpdateSidebar = await import( + '~/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar' + ); initBulkUpdateSidebar.default.init('issuable_'); const usersSelect = await import('~/users_select'); diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 3df806161f7..a62ab301227 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -5,11 +5,11 @@ import $ from 'jquery'; import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import IssuableBulkUpdateActions from '~/issuable_bulk_update_sidebar/issuable_bulk_update_actions'; import { isScopedLabel } from '~/lib/utils/common_utils'; import boardsStore from './boards/stores/boards_store'; import CreateLabelDropdown from './create_label'; import createFlash from './flash'; -import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; import axios from './lib/utils/axios_utils'; import { sprintf, __ } from './locale'; diff --git a/app/assets/javascripts/pages/groups/issues/index.js b/app/assets/javascripts/pages/groups/issues/index.js index 76db578f6f9..342c054471d 100644 --- a/app/assets/javascripts/pages/groups/issues/index.js +++ b/app/assets/javascripts/pages/groups/issues/index.js @@ -1,5 +1,5 @@ import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; -import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; +import issuableInitBulkUpdateSidebar from '~/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar'; import { mountIssuablesListApp } from '~/issues_list'; import initManualOrdering from '~/manual_ordering'; import { FILTERED_SEARCH } from '~/pages/constants'; diff --git a/app/assets/javascripts/pages/groups/merge_requests/index.js b/app/assets/javascripts/pages/groups/merge_requests/index.js index 2f6f9bb16e1..02a0a50f984 100644 --- a/app/assets/javascripts/pages/groups/merge_requests/index.js +++ b/app/assets/javascripts/pages/groups/merge_requests/index.js @@ -1,6 +1,6 @@ import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; -import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; +import issuableInitBulkUpdateSidebar from '~/issuable_bulk_update_sidebar/issuable_init_bulk_update_sidebar'; import { FILTERED_SEARCH } from '~/pages/constants'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import projectSelect from '~/project_select'; diff --git a/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue b/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue index 8fdc5ca78db..f3dd26b02cb 100644 --- a/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue +++ b/app/assets/javascripts/vue_shared/security_reports/components/artifact_downloads/merge_request_artifact_download.vue @@ -76,6 +76,7 @@ export default {