From 777ef5e9b2cb049db6c25867d8321a191cec8f72 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Dec 2023 03:15:41 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/gitlab-gems.gitlab-ci.yml | 3 + .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 3 - .rubocop_todo/layout/argument_alignment.yml | 1 - .rubocop_todo/layout/array_alignment.yml | 1 - .../layout/first_hash_element_indentation.yml | 1 - .rubocop_todo/layout/line_length.yml | 2 - .../lint/redundant_cop_disable_directive.yml | 1 - .rubocop_todo/lint/unused_method_argument.yml | 1 - .rubocop_todo/rails/time_zone.yml | 1 - .rubocop_todo/rspec/context_wording.yml | 1 - .rubocop_todo/rspec/instance_variable.yml | 1 - .rubocop_todo/rspec/named_subject.yml | 1 - .rubocop_todo/rspec/return_from_stub.yml | 1 - .rubocop_todo/rspec/verified_doubles.yml | 1 - .rubocop_todo/style/guard_clause.yml | 1 - .../style/inline_disable_annotation.yml | 1 - .../store/actions.js | 10 +- .../javascripts/drawio/drawio_editor.js | 4 +- .../import_projects/store/actions.js | 4 +- app/assets/javascripts/merge_request_tabs.js | 6 +- .../components/participants/participants.vue | 4 +- .../components/sidebar_editable_item.vue | 2 +- app/assets/stylesheets/framework/common.scss | 14 - .../framework/contextual_sidebar.scss | 26 - .../page_bundles/merge_requests.scss | 4 - app/graphql/types/ml/candidate_links_type.rb | 20 + app/graphql/types/ml/candidate_type.rb | 23 + app/graphql/types/ml/model_type.rb | 3 + app/helpers/application_helper.rb | 4 - app/helpers/groups_helper.rb | 2 +- app/helpers/nav_helper.rb | 21 +- app/models/label_note.rb | 16 +- app/models/ml/candidate.rb | 2 + app/models/ml/model.rb | 1 + app/presenters/ml/candidate_presenter.rb | 20 + app/views/layouts/_page.html.haml | 2 - app/views/layouts/admin.html.haml | 1 - app/views/layouts/dashboard.html.haml | 1 - app/views/layouts/explore.html.haml | 1 - app/views/layouts/group.html.haml | 1 - app/views/layouts/organization.html.haml | 1 - app/views/layouts/profile.html.haml | 1 - app/views/layouts/project.html.haml | 1 - app/views/layouts/snippets.html.haml | 1 - app/views/users/show.html.haml | 6 +- .../bitbucket_parallel_importer.yml | 8 - .../migrate_human_user_type.yml | 1 + doc/api/graphql/reference/index.md | 68 +++ doc/development/bitbucket_cloud_importer.md | 5 - .../policies/scan-result-policies.md | 2 +- doc/user/project/import/bitbucket.md | 7 - .../repository/monorepos/troubleshooting.md | 98 +++ gems/gitlab-database-lock_retries/.gitignore | 11 + .../.gitlab-ci.yml | 4 + gems/gitlab-database-lock_retries/.rspec | 3 + .../gitlab-database-lock_retries/.rubocop.yml | 2 + .../gitlab-database-lock_retries/CHANGELOG.md | 5 + gems/gitlab-database-lock_retries/Gemfile | 6 + .../gitlab-database-lock_retries/Gemfile.lock | 105 ++++ gems/gitlab-database-lock_retries/README.md | 29 + gems/gitlab-database-lock_retries/Rakefile | 12 + .../gitlab-database-lock_retries.gemspec | 23 + .../lib/gitlab/database/lock_retries.rb | 11 + .../gitlab/database/lock_retries/version.rb | 9 + .../spec/gitlab/database/lock_retries_spec.rb | 9 + .../spec/spec_helper.rb | 15 + lib/gitlab/bitbucket_import/importer.rb | 339 ----------- .../importers/repository_importer.rb | 10 +- ...batched_background_migration_dictionary.rb | 43 ++ lib/gitlab/import_sources.rb | 12 +- .../show_ml_model_version_component_spec.rb | 13 +- spec/factories/ml/candidates.rb | 17 +- spec/factories/ml/models.rb | 4 +- spec/features/boards/boards_spec.rb | 2 - .../boards/user_adds_lists_to_board_spec.rb | 2 - .../user_posts_diff_notes_spec.rb | 2 - .../user_sees_avatar_on_diff_notes_spec.rb | 2 - .../ide/components/ide_status_bar_spec.js | 6 +- .../types/ml/candidate_links_type_spec.rb | 11 + spec/graphql/types/ml/candidate_type_spec.rb | 13 + spec/graphql/types/ml/model_type_spec.rb | 2 +- .../migrate_human_user_type_spec.rb | 2 +- .../gitlab/bitbucket_import/importer_spec.rb | 559 ------------------ ...ed_background_migration_dictionary_spec.rb | 13 + spec/lib/gitlab/import_sources_spec.rb | 32 - spec/models/ml/candidate_spec.rb | 15 +- spec/models/ml/model_spec.rb | 13 + .../ml/candidate_details_presenter_spec.rb | 9 +- .../presenters/ml/candidate_presenter_spec.rb | 21 + spec/services/projects/import_service_spec.rb | 75 --- spec/spec_helper.rb | 5 - spec/support/helpers/migrations_helpers.rb | 7 + spec/support/rspec_order_todo.yml | 1 - workhorse/go.mod | 4 +- workhorse/go.sum | 8 +- 95 files changed, 683 insertions(+), 1215 deletions(-) create mode 100644 app/graphql/types/ml/candidate_links_type.rb create mode 100644 app/graphql/types/ml/candidate_type.rb create mode 100644 app/presenters/ml/candidate_presenter.rb delete mode 100644 config/feature_flags/development/bitbucket_parallel_importer.yml create mode 100644 doc/user/project/repository/monorepos/troubleshooting.md create mode 100644 gems/gitlab-database-lock_retries/.gitignore create mode 100644 gems/gitlab-database-lock_retries/.gitlab-ci.yml create mode 100644 gems/gitlab-database-lock_retries/.rspec create mode 100644 gems/gitlab-database-lock_retries/.rubocop.yml create mode 100644 gems/gitlab-database-lock_retries/CHANGELOG.md create mode 100644 gems/gitlab-database-lock_retries/Gemfile create mode 100644 gems/gitlab-database-lock_retries/Gemfile.lock create mode 100644 gems/gitlab-database-lock_retries/README.md create mode 100644 gems/gitlab-database-lock_retries/Rakefile create mode 100644 gems/gitlab-database-lock_retries/gitlab-database-lock_retries.gemspec create mode 100644 gems/gitlab-database-lock_retries/lib/gitlab/database/lock_retries.rb create mode 100644 gems/gitlab-database-lock_retries/lib/gitlab/database/lock_retries/version.rb create mode 100644 gems/gitlab-database-lock_retries/spec/gitlab/database/lock_retries_spec.rb create mode 100644 gems/gitlab-database-lock_retries/spec/spec_helper.rb delete mode 100644 lib/gitlab/bitbucket_import/importer.rb create mode 100644 lib/gitlab/database/background_migration/batched_background_migration_dictionary.rb create mode 100644 spec/graphql/types/ml/candidate_links_type_spec.rb create mode 100644 spec/graphql/types/ml/candidate_type_spec.rb delete mode 100644 spec/lib/gitlab/bitbucket_import/importer_spec.rb create mode 100644 spec/lib/gitlab/database/background_migration/batched_background_migration_dictionary_spec.rb create mode 100644 spec/presenters/ml/candidate_presenter_spec.rb diff --git a/.gitlab/ci/gitlab-gems.gitlab-ci.yml b/.gitlab/ci/gitlab-gems.gitlab-ci.yml index 650a5cb572a..3ac8374d908 100644 --- a/.gitlab/ci/gitlab-gems.gitlab-ci.yml +++ b/.gitlab/ci/gitlab-gems.gitlab-ci.yml @@ -38,3 +38,6 @@ include: - local: .gitlab/ci/templates/gem.gitlab-ci.yml inputs: gem_name: "gitlab-database-load_balancing" + - local: .gitlab/ci/templates/gem.gitlab-ci.yml + inputs: + gem_name: "gitlab-database-lock_retries" diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 73bd2838182..5493391971f 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -62,9 +62,6 @@ include: GDK_URL: http://gdk.test:3000 KNAPSACK_TEST_FILE_PATTERN: "qa/specs/features/**/*_spec.rb" QA_SUITE_STATUS_ENV_FILE: "$CI_PROJECT_DIR/suite_status.env" - # Workaround to avoid enabling feature flags unintentionally - # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137890#note_1681217315 - QA_FEATURE_FLAGS: "" before_script: - echo "SUITE_RAN=true" > "$QA_SUITE_STATUS_ENV_FILE" - echo -e "\e[0Ksection_start:`date +%s`:pull_image[collapsed=true]\r\e[0KPull GDK QA image" diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 585997fdbbe..4a743a3393b 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -1350,7 +1350,6 @@ Layout/ArgumentAlignment: - 'spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb' - 'spec/lib/gitlab/auth/saml/auth_hash_spec.rb' - 'spec/lib/gitlab/auth/saml/user_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/bitbucket_import/project_creator_spec.rb' - 'spec/lib/gitlab/bitbucket_import/wiki_formatter_spec.rb' - 'spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb' diff --git a/.rubocop_todo/layout/array_alignment.yml b/.rubocop_todo/layout/array_alignment.yml index 0ca9129e17b..e8860e75d67 100644 --- a/.rubocop_todo/layout/array_alignment.yml +++ b/.rubocop_todo/layout/array_alignment.yml @@ -146,7 +146,6 @@ Layout/ArrayAlignment: - 'lib/api/internal/base.rb' - 'lib/api/statistics.rb' - 'lib/gitlab/alert_management/payload/prometheus.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/chat/command.rb' - 'lib/gitlab/checks/single_change_access.rb' - 'lib/gitlab/ci/config/entry/default.rb' diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml index e5ae116f1cf..83ce52272b7 100644 --- a/.rubocop_todo/layout/first_hash_element_indentation.yml +++ b/.rubocop_todo/layout/first_hash_element_indentation.yml @@ -184,7 +184,6 @@ Layout/FirstHashElementIndentation: - 'spec/lib/container_registry/client_spec.rb' - 'spec/lib/gitlab/application_rate_limiter_spec.rb' - 'spec/lib/gitlab/asciidoc_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/ci/config_spec.rb' - 'spec/lib/gitlab/ci/parsers/codequality/code_climate_spec.rb' - 'spec/lib/gitlab/ci/parsers/coverage/sax_document_spec.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index c568dce5138..13afd370937 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -2511,7 +2511,6 @@ Layout/LineLength: - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb' - 'lib/gitlab/background_migration/populate_resolved_on_default_branch_column.rb' - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/buffered_io.rb' - 'lib/gitlab/bullet/exclusions.rb' - 'lib/gitlab/cache/helpers.rb' @@ -3595,7 +3594,6 @@ Layout/LineLength: - 'spec/lib/gitlab/background_migration/job_coordinator_spec.rb' - 'spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb' - 'spec/lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/buffered_io_spec.rb' - 'spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb' - 'spec/lib/gitlab/chat/output_spec.rb' diff --git a/.rubocop_todo/lint/redundant_cop_disable_directive.yml b/.rubocop_todo/lint/redundant_cop_disable_directive.yml index 1f452c24c15..a369c527104 100644 --- a/.rubocop_todo/lint/redundant_cop_disable_directive.yml +++ b/.rubocop_todo/lint/redundant_cop_disable_directive.yml @@ -169,7 +169,6 @@ Lint/RedundantCopDisableDirective: - 'lib/gitlab/background_migration/re_expire_o_auth_tokens.rb' - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb' - 'lib/gitlab/background_migration/update_jira_tracker_data_deployment_type_based_on_url.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/buffered_io.rb' - 'lib/gitlab/cache/request_cache.rb' - 'lib/gitlab/ci/build/artifacts/metadata/entry.rb' diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml index e23fca97b15..7e5714ef918 100644 --- a/.rubocop_todo/lint/unused_method_argument.yml +++ b/.rubocop_todo/lint/unused_method_argument.yml @@ -375,7 +375,6 @@ Lint/UnusedMethodArgument: - 'lib/gitlab/background_migration/cleanup_orphaned_routes.rb' - 'lib/gitlab/background_migration/job_coordinator.rb' - 'lib/gitlab/background_migration/project_namespaces/backfill_project_namespaces.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/cache/helpers.rb' - 'lib/gitlab/cache/metrics.rb' - 'lib/gitlab/ci/ansi2html.rb' diff --git a/.rubocop_todo/rails/time_zone.yml b/.rubocop_todo/rails/time_zone.yml index faa3cb5ecfb..afe92cc4ad7 100644 --- a/.rubocop_todo/rails/time_zone.yml +++ b/.rubocop_todo/rails/time_zone.yml @@ -48,7 +48,6 @@ Rails/TimeZone: - 'spec/lib/gitlab/app_json_logger_spec.rb' - 'spec/lib/gitlab/app_text_logger_spec.rb' - 'spec/lib/gitlab/auth/current_user_mode_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/checks/timed_logger_spec.rb' - 'spec/lib/gitlab/ci/cron_parser_spec.rb' - 'spec/lib/gitlab/cycle_analytics/stage_summary_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 8026dfc4357..b87720fa9cd 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -1575,7 +1575,6 @@ RSpec/ContextWording: - 'spec/lib/gitlab/avatar_cache_spec.rb' - 'spec/lib/gitlab/background_migration/backfill_imported_issue_search_data_spec.rb' - 'spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/blame_spec.rb' - 'spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb' - 'spec/lib/gitlab/cache/helpers_spec.rb' diff --git a/.rubocop_todo/rspec/instance_variable.yml b/.rubocop_todo/rspec/instance_variable.yml index 6bf78d3c5ef..a4d4c2119c0 100644 --- a/.rubocop_todo/rspec/instance_variable.yml +++ b/.rubocop_todo/rspec/instance_variable.yml @@ -86,7 +86,6 @@ RSpec/InstanceVariable: - 'spec/lib/extracts_ref_spec.rb' - 'spec/lib/gitlab/auth/auth_finders_spec.rb' - 'spec/lib/gitlab/auth/ldap/person_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/chat_name_token_spec.rb' - 'spec/lib/gitlab/ci/lint_spec.rb' - 'spec/lib/gitlab/ci/status/composite_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index bcb59ffbcb7..655ef2bbc2d 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -1855,7 +1855,6 @@ RSpec/NamedSubject: - 'spec/lib/gitlab/background_migration/truncate_overlong_vulnerability_html_titles_spec.rb' - 'spec/lib/gitlab/background_migration/update_ci_pipeline_artifacts_unknown_locked_status_spec.rb' - 'spec/lib/gitlab/background_task_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/bitbucket_import/parallel_importer_spec.rb' - 'spec/lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer_spec.rb' - 'spec/lib/gitlab/blame_spec.rb' diff --git a/.rubocop_todo/rspec/return_from_stub.yml b/.rubocop_todo/rspec/return_from_stub.yml index 034d4fe4b09..897d15c72ed 100644 --- a/.rubocop_todo/rspec/return_from_stub.yml +++ b/.rubocop_todo/rspec/return_from_stub.yml @@ -114,7 +114,6 @@ RSpec/ReturnFromStub: - 'spec/lib/gitlab/auth/o_auth/user_spec.rb' - 'spec/lib/gitlab/auth/saml/user_spec.rb' - 'spec/lib/gitlab/auth_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/ci/build/policy/changes_spec.rb' - 'spec/lib/gitlab/ci/pipeline/seed/stage_spec.rb' - 'spec/lib/gitlab/ci/status/build/failed_spec.rb' diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml index 8feedc2c4f9..24b70629ae4 100644 --- a/.rubocop_todo/rspec/verified_doubles.yml +++ b/.rubocop_todo/rspec/verified_doubles.yml @@ -357,7 +357,6 @@ RSpec/VerifiedDoubles: - 'spec/lib/gitlab/background_migration/batching_strategies/base_strategy_spec.rb' - 'spec/lib/gitlab/background_migration/job_coordinator_spec.rb' - 'spec/lib/gitlab/background_migration_spec.rb' - - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' - 'spec/lib/gitlab/bitbucket_import/project_creator_spec.rb' - 'spec/lib/gitlab/cache/import/caching_spec.rb' - 'spec/lib/gitlab/changelog/committer_spec.rb' diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml index 05f3afd6232..429eeff3787 100644 --- a/.rubocop_todo/style/guard_clause.yml +++ b/.rubocop_todo/style/guard_clause.yml @@ -427,7 +427,6 @@ Style/GuardClause: - 'lib/gitlab/auth/o_auth/user.rb' - 'lib/gitlab/auth/unique_ips_limiter.rb' - 'lib/gitlab/background_migration/fix_projects_without_project_feature.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/blob_helper.rb' - 'lib/gitlab/cache/ci/project_pipeline_status.rb' - 'lib/gitlab/changelog/config.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index f3d93810758..e666571d113 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -2377,7 +2377,6 @@ Style/InlineDisableAnnotation: - 'lib/gitlab/background_migration/update_workspaces_config_version.rb' - 'lib/gitlab/background_task.rb' - 'lib/gitlab/base_doorkeeper_controller.rb' - - 'lib/gitlab/bitbucket_import/importer.rb' - 'lib/gitlab/bitbucket_import/importers/issue_importer.rb' - 'lib/gitlab/bitbucket_import/importers/issue_notes_importer.rb' - 'lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb' diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js index 890db374160..b2d8791ee54 100644 --- a/app/assets/javascripts/add_context_commits_modal/store/actions.js +++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import { uniqBy, orderBy } from 'lodash'; import * as Sentry from '~/sentry/sentry_browser_wrapper'; import Api from '~/api'; import { createAlert } from '~/alert'; @@ -52,8 +52,8 @@ export const searchCommits = ({ dispatch, commit, state }, search = {}) => { }; export const setCommits = ({ commit }, { commits: data, silentAddition = false }) => { - let commits = _.uniqBy(data, 'short_id'); - commits = _.orderBy(data, (c) => new Date(c.committed_date), ['desc']); + let commits = uniqBy(data, 'short_id'); + commits = orderBy(data, (c) => new Date(c.committed_date), ['desc']); if (silentAddition) { commit(types.SET_COMMITS_SILENT, commits); } else { @@ -125,8 +125,8 @@ export const removeContextCommits = ({ state }, forceReload = false) => }); export const setSelectedCommits = ({ commit }, selected) => { - let selectedCommits = _.uniqBy(selected, 'short_id'); - selectedCommits = _.orderBy( + let selectedCommits = uniqBy(selected, 'short_id'); + selectedCommits = orderBy( selectedCommits, (selectedCommit) => new Date(selectedCommit.committed_date), ['desc'], diff --git a/app/assets/javascripts/drawio/drawio_editor.js b/app/assets/javascripts/drawio/drawio_editor.js index 37bfde0ed9f..63cc90b5db2 100644 --- a/app/assets/javascripts/drawio/drawio_editor.js +++ b/app/assets/javascripts/drawio/drawio_editor.js @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import { isNil } from 'lodash'; import { createAlert, VARIANT_SUCCESS } from '~/alert'; import { darkModeEnabled } from '~/lib/utils/color_utils'; import { base64DecodeUnicode } from '~/lib/utils/text_utility'; @@ -181,7 +181,7 @@ function configureDrawIOEditor(drawIOEditorState) { } function onDrawIOEditorMessage(drawIOEditorState, editorFacade, evt) { - if (_.isNil(evt) || evt.source !== drawIOEditorState.iframe.contentWindow) { + if (isNil(evt) || evt.source !== drawIOEditorState.iframe.contentWindow) { return; } diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js index e5cbac71ce0..3c51fec32ae 100644 --- a/app/assets/javascripts/import_entities/import_projects/store/actions.js +++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js @@ -1,5 +1,5 @@ import Visibility from 'visibilityjs'; -import _ from 'lodash'; +import { isEmpty } from 'lodash'; import { createAlert } from '~/alert'; import axios from '~/lib/utils/axios_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; @@ -25,7 +25,7 @@ const pathWithParams = ({ path, ...params }) => { return queryString ? `${path}?${queryString}` : path; }; const commitPaginationData = ({ state, commit, data }) => { - const cursorsGitHubResponse = !_.isEmpty(data.pageInfo || {}); + const cursorsGitHubResponse = !isEmpty(data.pageInfo || {}); if (state.provider === PROVIDERS.GITHUB && cursorsGitHubResponse) { commit(types.SET_PAGE_CURSORS, data.pageInfo); diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 76be0a40ca0..1290a5a17b9 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -604,11 +604,7 @@ export default class MergeRequestTabs { if (!isInVueNoteablePage() || this.cachedPageLayoutClasses) return; this.cachedPageLayoutClasses = this.pageLayout.className; - this.pageLayout.classList.remove( - 'right-sidebar-collapsed', - 'right-sidebar-expanded', - 'page-with-icon-sidebar', - ); + this.pageLayout.classList.remove('right-sidebar-collapsed', 'right-sidebar-expanded'); this.sidebar.style.width = '0px'; } diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue index 99d36a61632..251a038f7ee 100644 --- a/app/assets/javascripts/sidebar/components/participants/participants.vue +++ b/app/assets/javascripts/sidebar/components/participants/participants.vue @@ -110,12 +110,12 @@ export default {
{{ participantLabel }}
-
+