diff --git a/.eslintrc.yml b/.eslintrc.yml index a2acca682ad..8a6f53d7b5a 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -52,8 +52,8 @@ rules: - '^variables$' - 'attrs?$' '@gitlab/vue-no-undef-apollo-properties': error - '@gitlab/tailwind': error - '@gitlab/vue-tailwind': error + '@gitlab/tailwind-no-interpolation': error + '@gitlab/vue-tailwind-no-interpolation': error no-param-reassign: - error - props: true @@ -191,8 +191,8 @@ overrides: rules: '@gitlab/require-i18n-strings': off '@gitlab/no-runtime-template-compiler': off - '@gitlab/tailwind': off - '@gitlab/vue-tailwind': off + '@gitlab/tailwind-no-interpolation': off + '@gitlab/vue-tailwind-no-interpolation': off 'require-await': error 'import/no-dynamic-require': off 'no-import-assign': off diff --git a/.gitlab/ci/database.gitlab-ci.yml b/.gitlab/ci/database.gitlab-ci.yml index 926c1fa8da4..632f0975111 100644 --- a/.gitlab/ci/database.gitlab-ci.yml +++ b/.gitlab/ci/database.gitlab-ci.yml @@ -36,7 +36,7 @@ db:rollback: - .db-job-base - .rails:rules:db-rollback script: - - bundle exec rake db:migrate VERSION=20230728020644 # 16.4 First migration + - bundle exec rake db:migrate VERSION=20230721095222 # First 16-4-stable-ee migration - bundle exec rake db:migrate db:rollback single-db: diff --git a/.rubocop_todo/gitlab/documentation_links/link.yml b/.rubocop_todo/gitlab/documentation_links/link.yml new file mode 100644 index 00000000000..e41a645ac2b --- /dev/null +++ b/.rubocop_todo/gitlab/documentation_links/link.yml @@ -0,0 +1,188 @@ +--- +# Cop supports --autocorrect. +Gitlab/DocumentationLinks/Link: + Details: grace period + Exclude: + - '**/*.haml' # Excluding HAML files so as to not conflict with the DocumentationLinks HAML linter + - 'app/controllers/concerns/enforces_two_factor_authentication.rb' + - 'app/controllers/import/github_controller.rb' + - 'app/controllers/jira_connect/app_descriptor_controller.rb' + - 'app/controllers/jwt_controller.rb' + - 'app/controllers/metrics_controller.rb' + - 'app/controllers/repositories/git_http_client_controller.rb' + - 'app/helpers/ci/jobs_helper.rb' + - 'app/helpers/ci/pipeline_editor_helper.rb' + - 'app/helpers/clusters_helper.rb' + - 'app/helpers/container_registry/container_registry_helper.rb' + - 'app/helpers/environments_helper.rb' + - 'app/helpers/feature_flags_helper.rb' + - 'app/helpers/ide_helper.rb' + - 'app/helpers/import_helper.rb' + - 'app/helpers/integrations_helper.rb' + - 'app/helpers/invite_members_helper.rb' + - 'app/helpers/issuables_helper.rb' + - 'app/helpers/issues_helper.rb' + - 'app/helpers/merge_requests_helper.rb' + - 'app/helpers/mirror_helper.rb' + - 'app/helpers/notes_helper.rb' + - 'app/helpers/operations_helper.rb' + - 'app/helpers/packages_helper.rb' + - 'app/helpers/preferences_helper.rb' + - 'app/helpers/projects/security/configuration_helper.rb' + - 'app/helpers/projects_helper.rb' + - 'app/helpers/releases_helper.rb' + - 'app/helpers/search_helper.rb' + - 'app/helpers/visibility_level_helper.rb' + - 'app/helpers/wiki_helper.rb' + - 'app/mailers/emails/identity_verification.rb' + - 'app/models/concerns/ci/has_completion_reason.rb' + - 'app/models/integration.rb' + - 'app/models/integrations/apple_app_store.rb' + - 'app/models/integrations/beyond_identity.rb' + - 'app/models/integrations/google_play.rb' + - 'app/models/integrations/irker.rb' + - 'app/models/integrations/jira.rb' + - 'app/models/integrations/jira_cloud_app.rb' + - 'app/models/integrations/phorge.rb' + - 'app/models/integrations/zentao.rb' + - 'app/models/key.rb' + - 'app/models/user.rb' + - 'app/presenters/clusters/cluster_presenter.rb' + - 'app/presenters/commit_status_presenter.rb' + - 'app/presenters/dev_ops_report/metric_presenter.rb' + - 'app/presenters/group_clusterable_presenter.rb' + - 'app/presenters/instance_clusterable_presenter.rb' + - 'app/presenters/key_presenter.rb' + - 'app/presenters/project_clusterable_presenter.rb' + - 'app/presenters/projects/security/configuration_presenter.rb' + - 'app/serializers/issue_entity.rb' + - 'app/serializers/merge_request_noteable_entity.rb' + - 'app/serializers/merge_request_widget_entity.rb' + - 'app/services/jira/requests/base.rb' + - 'app/services/merge_requests/refresh_service.rb' + - 'app/services/projects/update_service.rb' + - 'ee/app/components/namespaces/combined_storage_users/base_alert_component.rb' + - 'ee/app/components/namespaces/free_user_cap/enforcement_alert_component.rb' + - 'ee/app/components/namespaces/storage/limit_alert_component.rb' + - 'ee/app/components/namespaces/storage/pre_enforcement_alert_component.rb' + - 'ee/app/components/namespaces/storage/repository_limit_alert_component.rb' + - 'ee/app/controllers/concerns/gitlab_subscriptions/trials/duo_common.rb' + - 'ee/app/helpers/billing_plans_helper.rb' + - 'ee/app/helpers/dependencies_helper.rb' + - 'ee/app/helpers/ee/container_registry/container_registry_helper.rb' + - 'ee/app/helpers/ee/form_helper.rb' + - 'ee/app/helpers/ee/groups/settings_helper.rb' + - 'ee/app/helpers/ee/groups_helper.rb' + - 'ee/app/helpers/ee/import_helper.rb' + - 'ee/app/helpers/ee/projects_helper.rb' + - 'ee/app/helpers/ee/security_orchestration_helper.rb' + - 'ee/app/helpers/epics_helper.rb' + - 'ee/app/helpers/groups/add_ons/discover_duo_pro_helper.rb' + - 'ee/app/helpers/groups/discovers_helper.rb' + - 'ee/app/helpers/member_roles_helper.rb' + - 'ee/app/helpers/namespaces/free_user_cap_helper.rb' + - 'ee/app/helpers/projects/learn_gitlab_helper.rb' + - 'ee/app/helpers/projects/security/api_fuzzing_configuration_helper.rb' + - 'ee/app/helpers/projects/security/sast_configuration_helper.rb' + - 'ee/app/helpers/security_helper.rb' + - 'ee/app/helpers/vulnerabilities_helper.rb' + - 'ee/app/models/ee/member.rb' + - 'ee/app/models/integrations/git_guardian.rb' + - 'ee/app/models/integrations/github.rb' + - 'ee/app/presenters/ee/merge_request_presenter.rb' + - 'ee/app/serializers/epic_entity.rb' + - 'ee/app/services/ee/auth/container_registry_authentication_service.rb' + - 'ee/app/services/incident_management/create_incident_sla_exceeded_label_service.rb' + - 'ee/app/services/merge_requests/update_blocks_service.rb' + - 'ee/app/services/merge_trains/refresh_merge_request_service.rb' + - 'ee/app/services/search/rake_task_executor_service.rb' + - 'ee/app/services/security/security_orchestration_policies/project_create_service.rb' + - 'ee/lib/api/managed_licenses.rb' + - 'ee/lib/api/member_roles.rb' + - 'ee/lib/ee/gitlab/namespace_storage_size_error_message.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/change_failure_rate.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/group/deployment_frequency.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/lead_time.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/lead_time_for_changes.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/time_to_merge.rb' + - 'ee/lib/gitlab/analytics/cycle_analytics/summary/time_to_restore_service.rb' + - 'ee/lib/gitlab/checks/secrets_check.rb' + - 'ee/lib/gitlab/expiring_subscription_message.rb' + - 'ee/lib/gitlab/llm/chain/tools/tool.rb' + - 'ee/lib/gitlab/llm/embeddings/utils/base_content_parser.rb' + - 'ee/lib/gitlab/root_excess_size_error_message.rb' + - 'ee/lib/security/scan_result_policies/policy_violation_comment.rb' + - 'ee/lib/system_check/geo/current_node_check.rb' + - 'ee/spec/components/namespaces/free_user_cap/enforcement_alert_component_spec.rb' + - 'ee/spec/components/namespaces/free_user_cap/non_owner_enforcement_alert_component_spec.rb' + - 'ee/spec/components/namespaces/storage/pre_enforcement_alert_component_spec.rb' + - 'ee/spec/features/admin/admin_show_new_user_signups_cap_alert_spec.rb' + - 'ee/spec/features/groups/group_overview_spec.rb' + - 'ee/spec/features/merge_request/user_edits_multiple_reviewers_mr_spec.rb' + - 'ee/spec/features/projects/show_project_spec.rb' + - 'ee/spec/features/search/elastic/project_search_spec.rb' + - 'ee/spec/features/search/zoekt/search_spec.rb' + - 'ee/spec/features/security/project/discover_spec.rb' + - 'ee/spec/helpers/container_registry/container_registry_helper_spec.rb' + - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb' + - 'ee/spec/helpers/ee/projects/security/sast_configuration_helper_spec.rb' + - 'ee/spec/helpers/epics_helper_spec.rb' + - 'ee/spec/helpers/member_roles_helper_spec.rb' + - 'ee/spec/helpers/projects/learn_gitlab_helper_spec.rb' + - 'ee/spec/helpers/projects_helper_spec.rb' + - 'ee/spec/helpers/security_helper_spec.rb' + - 'ee/spec/lib/ee/gitlab/namespace_storage_size_error_message_spec.rb' + - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/change_failure_rate_spec.rb' + - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/lead_time_for_changes_spec.rb' + - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/lead_time_spec.rb' + - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/time_to_restore_service_spec.rb' + - 'ee/spec/lib/gitlab/llm/embeddings/utils/base_content_parser_spec.rb' + - 'ee/spec/mailers/emails/enterprise_users_spec.rb' + - 'ee/spec/requests/api/internal/base_spec.rb' + - 'ee/spec/requests/api/member_roles_spec.rb' + - 'ee/spec/requests/callout_spec.rb' + - 'ee/spec/services/ee/auth/container_registry_authentication_service_spec.rb' + - 'ee/spec/support/shared_contexts/secrets_check_shared_contexts.rb' + - 'ee/spec/views/admin/application_settings/_ee_package_registry.html.haml_spec.rb' + - 'ee/spec/views/groups/add_ons/discover_duo_pro/show.html.haml_spec.rb' + - 'ee/spec/views/groups/settings/analytics/_analytics_dashboards.html.haml_spec.rb' + - 'ee/spec/views/projects/settings/analytics/_custom_dashboard_projects.html.haml_spec.rb' + - 'ee/spec/views/user_settings/profiles/show.html.haml_spec.rb' + - 'lib/backup/tasks/database.rb' + - 'lib/gitlab/checks/global_file_size_check.rb' + - 'lib/gitlab/cycle_analytics/summary/deployment_frequency.rb' + - 'lib/gitlab/graphql/deprecations.rb' + - 'lib/gitlab/middleware/go.rb' + - 'lib/gitlab/security/features.rb' + - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb' + - 'lib/slack/block_kit/app_home_opened.rb' + - 'lib/system_check/helpers.rb' + - 'lib/users/internal.rb' + - 'lib/web_ide/extensions_marketplace.rb' + - 'spec/controllers/import/github_controller_spec.rb' + - 'spec/features/admin/admin_sees_background_migrations_spec.rb' + - 'spec/features/dashboard/snippets_spec.rb' + - 'spec/features/groups/container_registry_spec.rb' + - 'spec/features/help_dropdown_spec.rb' + - 'spec/features/issues/service_desk_spec.rb' + - 'spec/features/projects/container_registry_spec.rb' + - 'spec/features/projects/settings/branch_rules_callout_spec.rb' + - 'spec/features/projects/settings/registry_settings_spec.rb' + - 'spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb' + - 'spec/helpers/ci/pipeline_editor_helper_spec.rb' + - 'spec/helpers/clusters_helper_spec.rb' + - 'spec/helpers/container_registry/container_registry_helper_spec.rb' + - 'spec/helpers/ide_helper_spec.rb' + - 'spec/helpers/invite_members_helper_spec.rb' + - 'spec/helpers/issues_helper_spec.rb' + - 'spec/helpers/operations_helper_spec.rb' + - 'spec/helpers/projects/security/configuration_helper_spec.rb' + - 'spec/lib/gitlab/security/scan_configuration_spec.rb' + - 'spec/mailers/emails/pages_domains_spec.rb' + - 'spec/mailers/emails/profile_spec.rb' + - 'spec/presenters/clusters/cluster_presenter_spec.rb' + - 'spec/presenters/commit_status_presenter_spec.rb' + - 'spec/presenters/projects/security/configuration_presenter_spec.rb' + - 'spec/requests/api/import_github_spec.rb' + - 'spec/support/shared_examples/services/jira/requests/base_shared_examples.rb' + - 'spec/views/user_settings/profiles/show.html.haml_spec.rb' diff --git a/.rubocop_todo/migration/ensure_factory_for_table.yml b/.rubocop_todo/migration/ensure_factory_for_table.yml index 1d3d02e0cf5..86bcdd7d3db 100644 --- a/.rubocop_todo/migration/ensure_factory_for_table.yml +++ b/.rubocop_todo/migration/ensure_factory_for_table.yml @@ -1,12 +1,6 @@ --- Migration/EnsureFactoryForTable: Exclude: - - 'db/migrate/20230821133549_create_packages_nuget_symbols.rb' - - 'db/migrate/20230823132142_create_instance_google_cloud_logging_configurations.rb' - - 'db/migrate/20230903170000_create_packages_protection_rules.rb' - - 'db/migrate/20230905234948_create_projects_visits_tables.rb' - - 'db/migrate/20230905234949_create_groups_visits_tables.rb' - - 'db/migrate/20230906072349_create_audit_events_amazon_s3_configurations.rb' - 'db/migrate/20230915103259_create_ci_finished_build_ch_sync_events.rb' - 'db/migrate/20230926092914_add_approval_group_rules.rb' - 'db/migrate/20230926092944_add_approval_group_rules_groups.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 87b44886027..e7cdd001db2 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -821,7 +821,6 @@ RSpec/ContextWording: - 'ee/spec/workers/ci/runners/stale_group_runners_prune_cron_worker_spec.rb' - 'ee/spec/workers/ci/upstream_projects_subscriptions_cleanup_worker_spec.rb' - 'ee/spec/workers/ee/repository_check/batch_worker_spec.rb' - - 'ee/spec/workers/elastic_index_bulk_cron_worker_spec.rb' - 'ee/spec/workers/elastic_indexing_control_worker_spec.rb' - 'ee/spec/workers/geo/prune_event_log_worker_spec.rb' - 'ee/spec/workers/geo/verification_timeout_worker_spec.rb' diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml index 7411a614bcf..fd81b7ef95e 100644 --- a/.rubocop_todo/rspec/expect_in_hook.yml +++ b/.rubocop_todo/rspec/expect_in_hook.yml @@ -71,7 +71,6 @@ RSpec/ExpectInHook: - 'ee/spec/tasks/gitlab/license_rake_spec.rb' - 'ee/spec/tasks/gitlab/spdx_rake_spec.rb' - 'ee/spec/workers/analytics/cycle_analytics/consistency_worker_spec.rb' - - 'ee/spec/workers/elastic_index_bulk_cron_worker_spec.rb' - 'ee/spec/workers/elastic_indexing_control_worker_spec.rb' - 'ee/spec/workers/geo/secondary/registry_consistency_worker_spec.rb' - 'ee/spec/workers/geo/verification_state_backfill_worker_spec.rb' diff --git a/.rubocop_todo/style/hash_each_methods.yml b/.rubocop_todo/style/hash_each_methods.yml index e5b5e247e00..55cc2bf0806 100644 --- a/.rubocop_todo/style/hash_each_methods.yml +++ b/.rubocop_todo/style/hash_each_methods.yml @@ -34,7 +34,6 @@ Style/HashEachMethods: - 'app/services/security/merge_reports_service.rb' - 'config/initializers/6_validations.rb' - 'config/initializers/8_gitaly.rb' - - 'db/post_migrate/20230905091059_sync_index_for_ci_stages_pipeline_id_bigint.rb' - 'db/post_migrate/20230906102738_sync_index_for_ci_sources_pipelines_pipeline_id_bigint.rb' - 'db/post_migrate/20240422070036_swap_ci_pipelines_pk_with_bigint_p_ci_builds_p_ci_stages.rb' - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_reason_enum.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index dce29852ef4..d213583b19c 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -1066,18 +1066,13 @@ Style/InlineDisableAnnotation: - 'config/routes/project.rb' - 'danger/ce_ee_vue_templates/Dangerfile' - 'danger/roulette/Dangerfile' - - 'db/migrate/20230822064649_add_organization_id_to_project.rb' - - 'db/migrate/20230906185552_add_markdown_fields_to_review_llm_summary.rb' - - 'db/migrate/20230906204935_restart_self_hosted_sent_notifications_backfill.rb' - 'db/migrate/20230915103259_create_ci_finished_build_ch_sync_events.rb' - 'db/migrate/20230917144717_add_package_name_pattern_query_to_packages_protection_rule.rb' - 'db/migrate/20230921081527_add_queued_migration_version_to_batched_background_migrations.rb' - 'db/migrate/20231017135207_add_fields_to_ml_model.rb' - 'db/migrate/20231019180421_add_name_description_to_catalog_resources.rb' - 'db/migrate/20231024142236_add_fields_to_bulk_import_failures.rb' - - 'db/post_migrate/20230823145126_swap_notes_id_to_bigint_for_self_managed.rb' - 'db/post_migrate/20230908033511_swap_columns_for_ci_pipeline_chat_data_pipeline_id_bigint.rb' - - 'db/post_migrate/20230913130629_index_org_id_on_projects.rb' - 'db/post_migrate/20230924134453_cleanup_uuid_type_migration_on_vulnerability_occurrences.rb' - 'db/post_migrate/20231003045342_migrate_sidekiq_namespaced_jobs.rb' - 'db/post_migrate/20231003142534_add_build_timeout_index.rb' @@ -2605,17 +2600,7 @@ Style/InlineDisableAnnotation: - 'spec/lib/object_storage/pending_direct_upload_spec.rb' - 'spec/lib/omni_auth/strategies/jwt_spec.rb' - 'spec/mailers/notify_spec.rb' - - 'spec/migrations/20230726144458_swap_notes_id_to_bigint_for_self_managed_spec.rb' - - 'spec/migrations/20230809174702_swap_system_note_metadata_note_id_to_bigint_for_self_managed_spec.rb' - - 'spec/migrations/20230809210550_swap_issue_user_mentions_note_id_to_bigint_for_self_managed_spec.rb' - - 'spec/migrations/20230810113227_swap_note_diff_files_note_id_to_bigint_for_self_hosts_spec.rb' - - 'spec/migrations/20230816152639_swap_design_user_mentions_note_id_to_big_int_for_self_managed_spec.rb' - - 'spec/migrations/20230817111938_swap_events_target_id_to_bigint_for_self_hosts_spec.rb' - - 'spec/migrations/20230817143637_swap_award_emoji_note_id_to_bigint_for_self_hosts_spec.rb' - - 'spec/migrations/20230906204934_restart_self_hosted_sent_notifications_bigint_conversion_spec.rb' - - 'spec/migrations/20230906204935_restart_self_hosted_sent_notifications_backfill_spec.rb' - 'spec/migrations/20231016001000_fix_design_user_mentions_design_id_note_id_index_for_self_managed_spec.rb' - - 'spec/migrations/swap_merge_request_user_mentions_note_id_to_bigint_for_self_managed_spec.rb' - 'spec/models/board_spec.rb' - 'spec/models/ci/build_trace_chunk_spec.rb' - 'spec/models/ci/job_token/project_scope_link_spec.rb' diff --git a/Gemfile b/Gemfile index 6b1a0cf5dc4..28c8c2bdf4b 100644 --- a/Gemfile +++ b/Gemfile @@ -83,7 +83,7 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # For source code paths mapping -gem 'coverband', '6.1.2', require: false, feature_category: :shared +gem 'coverband', '6.1.3', require: false, feature_category: :shared # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access diff --git a/Gemfile.checksum b/Gemfile.checksum index dd0d5851e6c..df0f973df85 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -91,7 +91,7 @@ {"name":"cork","version":"0.3.0","platform":"ruby","checksum":"a0a0ac50e262f8514d1abe0a14e95e71c98b24e3378690e5d044daf0013ad4bc"}, {"name":"cose","version":"1.3.0","platform":"ruby","checksum":"63247c66a5bc76e53926756574fe3724cc0a88707e358c90532ae2a320e98601"}, {"name":"countries","version":"4.0.1","platform":"ruby","checksum":"d32e8a3c0b22949f1a41ea6d9005f5168ffce226f8fe077d1d6be785fffa81c5"}, -{"name":"coverband","version":"6.1.2","platform":"ruby","checksum":"979f356b0f1ff63a78b6ffbbbd0dccb3674c83d74d7e6fbdc3ee98f1ef35ba32"}, +{"name":"coverband","version":"6.1.3","platform":"ruby","checksum":"84c988d1d61edfb80d1e0c1f2fd56fd690fe5aad71bd8827867e826360f3b8e3"}, {"name":"crack","version":"0.4.3","platform":"ruby","checksum":"5318ba8cd9cf7e0b5feb38948048503ba4b1fdc1b6ff30a39f0a00feb6036b29"}, {"name":"crass","version":"1.0.6","platform":"ruby","checksum":"dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d"}, {"name":"creole","version":"0.5.0","platform":"ruby","checksum":"951701e2d80760f156b1cb2a93471ca97c076289becc067a33b745133ed32c03"}, diff --git a/Gemfile.lock b/Gemfile.lock index 4ed8d7ec195..3888a3574a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,7 +451,7 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - coverband (6.1.2) + coverband (6.1.3) redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -2002,7 +2002,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) - coverband (= 6.1.2) + coverband (= 6.1.3) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.1) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index dc49d2ae856..2f41e6455c1 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -91,7 +91,7 @@ {"name":"cork","version":"0.3.0","platform":"ruby","checksum":"a0a0ac50e262f8514d1abe0a14e95e71c98b24e3378690e5d044daf0013ad4bc"}, {"name":"cose","version":"1.3.0","platform":"ruby","checksum":"63247c66a5bc76e53926756574fe3724cc0a88707e358c90532ae2a320e98601"}, {"name":"countries","version":"4.0.1","platform":"ruby","checksum":"d32e8a3c0b22949f1a41ea6d9005f5168ffce226f8fe077d1d6be785fffa81c5"}, -{"name":"coverband","version":"6.1.2","platform":"ruby","checksum":"979f356b0f1ff63a78b6ffbbbd0dccb3674c83d74d7e6fbdc3ee98f1ef35ba32"}, +{"name":"coverband","version":"6.1.3","platform":"ruby","checksum":"84c988d1d61edfb80d1e0c1f2fd56fd690fe5aad71bd8827867e826360f3b8e3"}, {"name":"crack","version":"0.4.3","platform":"ruby","checksum":"5318ba8cd9cf7e0b5feb38948048503ba4b1fdc1b6ff30a39f0a00feb6036b29"}, {"name":"crass","version":"1.0.6","platform":"ruby","checksum":"dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d"}, {"name":"creole","version":"0.5.0","platform":"ruby","checksum":"951701e2d80760f156b1cb2a93471ca97c076289becc067a33b745133ed32c03"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 511b963a523..32a076b82bf 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -460,7 +460,7 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - coverband (6.1.2) + coverband (6.1.3) redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -2029,7 +2029,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) - coverband (= 6.1.2) + coverband (= 6.1.3) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.1) diff --git a/app/assets/javascripts/code_navigation/components/popover.vue b/app/assets/javascripts/code_navigation/components/popover.vue index ab6d5936e70..8a00a49328c 100644 --- a/app/assets/javascripts/code_navigation/components/popover.vue +++ b/app/assets/javascripts/code_navigation/components/popover.vue @@ -1,6 +1,7 @@