root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2025-03-15 06:16:52 +00:00
parent 569894644e
commit 31543436d5
23 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.rubocop_todo/gitlab/bounded_contexts.yml
View File

@ -3553,18 +3553,18 @@ Gitlab/BoundedContexts:
- 'ee/lib/ee/sidebars/explore/menus/dependencies_menu.rb'
- 'ee/lib/ee/sidebars/explore/panel.rb'
- 'ee/lib/ee/sidebars/groups/menus/issues_menu.rb'
- 'ee/lib/ee/sidebars/groups/menus/work_items_menu.rb'
- 'ee/lib/ee/sidebars/groups/menus/settings_menu.rb'
- 'ee/lib/ee/sidebars/groups/menus/work_items_menu.rb'
- 'ee/lib/ee/sidebars/groups/panel.rb'
- 'ee/lib/ee/sidebars/projects/menus/analytics_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/ci_cd_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/issues_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/work_items_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/monitor_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/packages_registries_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/repository_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/security_compliance_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/settings_menu.rb'
- 'ee/lib/ee/sidebars/projects/menus/work_items_menu.rb'
- 'ee/lib/ee/sidebars/projects/panel.rb'
- 'ee/lib/ee/sidebars/user_settings/menus/access_tokens_menu.rb'
- 'ee/lib/ee/sidebars/user_settings/panel.rb'
@ -3650,9 +3650,9 @@ Gitlab/BoundedContexts:
- 'ee/lib/sidebars/admin/menus/subscription_menu.rb'
- 'ee/lib/sidebars/groups/menus/analytics_menu.rb'
- 'ee/lib/sidebars/groups/menus/epics_menu.rb'
- 'ee/lib/sidebars/groups/menus/work_item_epics_menu.rb'
- 'ee/lib/sidebars/groups/menus/security_compliance_menu.rb'
- 'ee/lib/sidebars/groups/menus/wiki_menu.rb'
- 'ee/lib/sidebars/groups/menus/work_item_epics_menu.rb'
- 'ee/lib/sidebars/projects/menus/learn_gitlab_menu.rb'
- 'ee/lib/sidebars/user_settings/menus/profile_billing_menu.rb'
- 'ee/lib/sidebars/your_work/menus/environments_dashboard_menu.rb'
@ -3961,12 +3961,12 @@ Gitlab/BoundedContexts:
- 'lib/sidebars/groups/menus/customer_relations_menu.rb'
- 'lib/sidebars/groups/menus/group_information_menu.rb'
- 'lib/sidebars/groups/menus/issues_menu.rb'
- 'lib/sidebars/groups/menus/work_items_menu.rb'
- 'lib/sidebars/groups/menus/kubernetes_menu.rb'
- 'lib/sidebars/groups/menus/merge_requests_menu.rb'
- 'lib/sidebars/groups/menus/packages_registries_menu.rb'
- 'lib/sidebars/groups/menus/scope_menu.rb'
- 'lib/sidebars/groups/menus/settings_menu.rb'
- 'lib/sidebars/groups/menus/work_items_menu.rb'
- 'lib/sidebars/groups/panel.rb'
- 'lib/sidebars/groups/super_sidebar_menus/analyze_menu.rb'
- 'lib/sidebars/groups/super_sidebar_menus/build_menu.rb'
@ -3996,7 +3996,6 @@ Gitlab/BoundedContexts:
- 'lib/sidebars/projects/menus/hidden_menu.rb'
- 'lib/sidebars/projects/menus/infrastructure_menu.rb'
- 'lib/sidebars/projects/menus/issues_menu.rb'
- 'lib/sidebars/projects/menus/work_items_menu.rb'
- 'lib/sidebars/projects/menus/merge_requests_menu.rb'
- 'lib/sidebars/projects/menus/monitor_menu.rb'
- 'lib/sidebars/projects/menus/packages_registries_menu.rb'
@ -4007,6 +4006,7 @@ Gitlab/BoundedContexts:
- 'lib/sidebars/projects/menus/settings_menu.rb'
- 'lib/sidebars/projects/menus/snippets_menu.rb'
- 'lib/sidebars/projects/menus/wiki_menu.rb'
- 'lib/sidebars/projects/menus/work_items_menu.rb'
- 'lib/sidebars/projects/menus/zentao_menu.rb'
- 'lib/sidebars/projects/panel.rb'
- 'lib/sidebars/projects/super_sidebar_menus/analyze_menu.rb'

1
.rubocop_todo/gitlab/feature_flag_without_actor.yml
View File

@ -108,7 +108,6 @@ Gitlab/FeatureFlagWithoutActor:
- 'ee/lib/ee/api/settings.rb'
- 'ee/lib/ee/gitlab/geo_git_access.rb'
- 'ee/lib/ee/gitlab/git_access.rb'
- 'ee/lib/gitlab/elastic/client.rb'
- 'ee/lib/gitlab/geo/replication/blob_downloader.rb'
- 'ee/lib/gitlab/geo/replicator.rb'
- 'ee/lib/gitlab/llm/tanuki_bot.rb'

1
.rubocop_todo/gitlab/strong_memoize_attr.yml
View File

@ -563,6 +563,5 @@ Gitlab/StrongMemoizeAttr:
- 'lib/safe_zip/extract_params.rb'
- 'lib/sidebars/projects/menus/analytics_menu.rb'
- 'lib/sidebars/projects/menus/issues_menu.rb'
- 'lib/sidebars/projects/menus/work_items_menu.rb'
- 'lib/unnested_in_filters/rewriter.rb'
- 'tooling/graphql/docs/helper.rb'

1
.rubocop_todo/layout/line_length.yml
View File

@ -2836,7 +2836,6 @@ Layout/LineLength:
- 'spec/graphql/types/packages/package_sort_enum_spec.rb'
- 'spec/graphql/types/packages/package_type_enum_spec.rb'
- 'spec/graphql/types/projects/service_type_spec.rb'
- 'spec/graphql/types/query_type_spec.rb'
- 'spec/graphql/types/snippets/blob_viewer_type_spec.rb'
- 'spec/graphql/types/terraform/state_version_type_spec.rb'
- 'spec/graphql/types/tree/blob_type_spec.rb'

2
.rubocop_todo/lint/unused_block_argument.yml
View File

@ -355,6 +355,4 @@ Lint/UnusedBlockArgument:
- 'spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb'
- 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb'
- 'spec/support/shared_examples/workers/concerns/reenqueuer_shared_examples.rb'
- 'spec/tooling/lib/tooling/find_codeowners_spec.rb'
- 'spec/workers/projects/git_garbage_collect_worker_spec.rb'
- 'tooling/lib/tooling/find_codeowners.rb'

1
.rubocop_todo/lint/unused_method_argument.yml
View File

@ -284,7 +284,6 @@ Lint/UnusedMethodArgument:
- 'lib/banzai/reference_parser/project_parser.rb'
- 'lib/banzai/reference_parser/user_parser.rb'
- 'lib/bitbucket_server/client.rb'
- 'lib/bulk_imports/clients/graphql.rb'
- 'lib/bulk_imports/projects/pipelines/snippets_repository_pipeline.rb'
- 'lib/declarative_enum.rb'
- 'lib/gitlab/analytics/cycle_analytics/stage_events/stage_event.rb'

2
.rubocop_todo/migration/ensure_factory_for_table.yml
View File

@ -7,5 +7,3 @@ Migration/EnsureFactoryForTable:
- 'db/migrate/20240304184128_create_ci_build_names_table.rb'
- 'db/migrate/20240306121653_create_relation_import_tracker.rb'
- 'db/migrate/20240404192955_create_early_access_program_tracking_events.rb'
- 'db/migrate/20241216070908_create_compliance_requirements_controls.rb'
- 'db/migrate/20241227065733_create_project_control_compliance_statuses.rb'

2
.rubocop_todo/rspec/be_eq.yml
View File

@ -1003,11 +1003,11 @@ RSpec/BeEq:
- 'spec/lib/sidebars/projects/menus/ci_cd_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/confluence_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/issues_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/repository_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/snippets_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/search/panel_spec.rb'
- 'spec/lib/sidebars/your_work/menus/merge_requests_menu_spec.rb'
- 'spec/lib/sidebars/your_work/menus/organizations_menu_spec.rb'

1
.rubocop_todo/rspec/change_by_zero.yml
View File

@ -33,7 +33,6 @@ RSpec/ChangeByZero:
- 'ee/spec/services/registrations/import_namespace_create_service_spec.rb'
- 'ee/spec/services/registrations/standard_namespace_create_service_spec.rb'
- 'ee/spec/services/sbom/ingestion/tasks/ingest_sources_spec.rb'
- 'ee/spec/services/search/zoekt/indexing_task_service_spec.rb'
- 'ee/spec/services/security/ingestion/tasks/ingest_cvs_security_scanners_spec.rb'
- 'ee/spec/services/security/orchestration/create_bot_service_spec.rb'
- 'ee/spec/services/vulnerabilities/manually_create_service_spec.rb'

1
.rubocop_todo/rspec/context_wording.yml
View File

@ -331,7 +331,6 @@ RSpec/ContextWording:
- 'ee/spec/lib/gitlab/code_owners/loader_spec.rb'
- 'ee/spec/lib/gitlab/code_owners/users_loader_spec.rb'
- 'ee/spec/lib/gitlab/custom_file_templates_spec.rb'
- 'ee/spec/lib/gitlab/elastic/client_spec.rb'
- 'ee/spec/lib/gitlab/elastic/group_search_results_spec.rb'
- 'ee/spec/lib/gitlab/elastic/snippet_search_results_spec.rb'
- 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb'

4
.rubocop_todo/rspec/factory_bot/avoid_create.yml
View File

@ -74,9 +74,9 @@ RSpec/FactoryBot/AvoidCreate:
- 'ee/spec/helpers/vulnerabilities_helper_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/analytics_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/epics_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/security_compliance_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/wiki_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/menus/work_item_epics_menu_spec.rb'
- 'ee/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb'
- 'ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb'
- 'ee/spec/mailers/ci_minutes_usage_mailer_spec.rb'
@ -312,11 +312,11 @@ RSpec/FactoryBot/AvoidCreate:
- 'spec/lib/sidebars/groups/menus/ci_cd_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/group_information_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/issues_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/merge_requests_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/settings_menu_spec.rb'
- 'spec/lib/sidebars/groups/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/groups/super_sidebar_panel_spec.rb'
- 'spec/lib/sidebars/projects/menus/analytics_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/confluence_menu_spec.rb'

9
.rubocop_todo/rspec/feature_category.yml
View File

@ -800,7 +800,6 @@ RSpec/FeatureCategory:
- 'ee/spec/models/merge_request/blocking_spec.rb'
- 'ee/spec/models/merge_requests/external_status_check_spec.rb'
- 'ee/spec/models/milestone_release_spec.rb'
- 'ee/spec/models/path_lock_spec.rb'
- 'ee/spec/models/preloaders/environments/protected_environment_preloader_spec.rb'
- 'ee/spec/models/productivity_analytics_spec.rb'
- 'ee/spec/models/project_alias_spec.rb'
@ -836,7 +835,6 @@ RSpec/FeatureCategory:
- 'ee/spec/policies/incident_management/oncall_shift_policy_spec.rb'
- 'ee/spec/policies/instance_security_dashboard_policy_spec.rb'
- 'ee/spec/policies/note_policy_spec.rb'
- 'ee/spec/policies/path_lock_policy_spec.rb'
- 'ee/spec/policies/project_snippet_policy_spec.rb'
- 'ee/spec/policies/requirements_management/requirement_policy_spec.rb'
- 'ee/spec/policies/saml_provider_policy_spec.rb'
@ -1677,7 +1675,6 @@ RSpec/FeatureCategory:
- 'spec/graphql/types/release_links_type_spec.rb'
- 'spec/graphql/types/release_source_type_spec.rb'
- 'spec/graphql/types/release_type_spec.rb'
- 'spec/graphql/types/repository_type_spec.rb'
- 'spec/graphql/types/resolvable_interface_spec.rb'
- 'spec/graphql/types/saved_reply_type_spec.rb'
- 'spec/graphql/types/security/report_types_enum_spec.rb'
@ -1890,7 +1887,6 @@ RSpec/FeatureCategory:
- 'spec/lib/bitbucket_server/page_spec.rb'
- 'spec/lib/bitbucket_server/paginator_spec.rb'
- 'spec/lib/bitbucket_server/representation/repo_spec.rb'
- 'spec/lib/bulk_imports/common/extractors/graphql_extractor_spec.rb'
- 'spec/lib/bulk_imports/common/extractors/json_extractor_spec.rb'
- 'spec/lib/bulk_imports/common/extractors/ndjson_extractor_spec.rb'
- 'spec/lib/bulk_imports/common/extractors/rest_extractor_spec.rb'
@ -2598,7 +2594,6 @@ RSpec/FeatureCategory:
- 'spec/lib/gitlab/import_export/group/tree_saver_spec.rb'
- 'spec/lib/gitlab/import_export/hash_util_spec.rb'
- 'spec/lib/gitlab/import_export/import_export_spec.rb'
- 'spec/lib/gitlab/import_export/importer_spec.rb'
- 'spec/lib/gitlab/import_export/lfs_restorer_spec.rb'
- 'spec/lib/gitlab/import_export/lfs_saver_spec.rb'
- 'spec/lib/gitlab/import_export/log_util_spec.rb'
@ -2895,7 +2890,6 @@ RSpec/FeatureCategory:
- 'spec/lib/gitlab/slash_commands/application_help_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_close_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_comment_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_move_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_new_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_search_spec.rb'
- 'spec/lib/gitlab/slash_commands/issue_show_spec.rb'
@ -2918,7 +2912,6 @@ RSpec/FeatureCategory:
- 'spec/lib/gitlab/sql/intersect_spec.rb'
- 'spec/lib/gitlab/sql/recursive_cte_spec.rb'
- 'spec/lib/gitlab/sql/union_spec.rb'
- 'spec/lib/gitlab/ssh_public_key_spec.rb'
- 'spec/lib/gitlab/string_placeholder_replacer_spec.rb'
- 'spec/lib/gitlab/string_range_marker_spec.rb'
- 'spec/lib/gitlab/string_regex_marker_spec.rb'
@ -3281,7 +3274,6 @@ RSpec/FeatureCategory:
- 'spec/models/groups/feature_setting_spec.rb'
- 'spec/models/hooks/active_hook_filter_spec.rb'
- 'spec/models/identity_spec.rb'
- 'spec/models/import_export_upload_spec.rb'
- 'spec/models/import_failure_spec.rb'
- 'spec/models/incident_management/issuable_escalation_status_spec.rb'
- 'spec/models/incident_management/project_incident_management_setting_spec.rb'
@ -3304,7 +3296,6 @@ RSpec/FeatureCategory:
- 'spec/models/issues/csv_import_spec.rb'
- 'spec/models/jira_connect/public_key_spec.rb'
- 'spec/models/jira_connect_subscription_spec.rb'
- 'spec/models/key_spec.rb'
- 'spec/models/label_link_spec.rb'
- 'spec/models/label_priority_spec.rb'
- 'spec/models/legacy_diff_discussion_spec.rb'

2
.rubocop_todo/rspec/named_subject.yml
View File

@ -2269,7 +2269,6 @@ RSpec/NamedSubject:
- 'spec/lib/sidebars/projects/menus/hidden_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/infrastructure_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/issues_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/merge_requests_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/monitor_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb'
@ -2277,6 +2276,7 @@ RSpec/NamedSubject:
- 'spec/lib/sidebars/projects/menus/settings_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/snippets_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/wiki_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/work_items_menu_spec.rb'
- 'spec/lib/sidebars/projects/panel_spec.rb'
- 'spec/lib/sidebars/projects/super_sidebar_menus/analyze_menu_spec.rb'
- 'spec/lib/sidebars/projects/super_sidebar_menus/build_menu_spec.rb'

1
.rubocop_todo/rspec/receive_messages.yml
View File

@ -26,7 +26,6 @@ RSpec/ReceiveMessages:
- 'ee/spec/helpers/ee/issuables_helper_spec.rb'
- 'ee/spec/helpers/ee/issues_helper_spec.rb'
- 'ee/spec/helpers/ee/lock_helper_spec.rb'
- 'ee/spec/helpers/ee/namespaces_helper_spec.rb'
- 'ee/spec/helpers/ee/registrations_helper_spec.rb'
- 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb'
- 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'

1
.rubocop_todo/style/guard_clause.yml
View File

@ -374,7 +374,6 @@ Style/GuardClause:
- 'lib/gitlab/ci/reports/codequality_reports_comparer.rb'
- 'lib/gitlab/ci/runner/backoff.rb'
- 'lib/gitlab/ci/runner_upgrade_check.rb'
- 'lib/gitlab/ci/trace.rb'
- 'lib/gitlab/ci/trace/archive.rb'
- 'lib/gitlab/ci/trace/stream.rb'
- 'lib/gitlab/ci/yaml_processor.rb'

2
.rubocop_todo/style/hash_each_methods.yml
View File

@ -123,7 +123,5 @@ Style/HashEachMethods:
- 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb'
- 'spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb'
- 'spec/support/shared_examples/services/packages_shared_examples.rb'
- 'spec/tooling/lib/tooling/find_codeowners_spec.rb'
- 'tooling/danger/analytics_instrumentation.rb'
- 'tooling/graphql/docs/helper.rb'
- 'tooling/lib/tooling/find_codeowners.rb'

1
.rubocop_todo/style/if_unless_modifier.yml
View File

@ -509,7 +509,6 @@ Style/IfUnlessModifier:
- 'lib/gitlab/ci/runner_releases.rb'
- 'lib/gitlab/ci/runner_upgrade_check.rb'
- 'lib/gitlab/ci/status/composite.rb'
- 'lib/gitlab/ci/trace.rb'
- 'lib/gitlab/ci/trace/chunked_io.rb'
- 'lib/gitlab/ci/trace/metrics.rb'
- 'lib/gitlab/ci/variables/builder.rb'

3
.rubocop_todo/style/inline_disable_annotation.yml
View File

@ -574,7 +574,6 @@ Style/InlineDisableAnnotation:
- 'app/services/lfs/file_transformer.rb'
- 'app/services/lfs/lock_file_service.rb'
- 'app/services/lfs/locks_finder_service.rb'
- 'app/services/lfs/unlock_file_service.rb'
- 'app/services/loose_foreign_keys/cleaner_service.rb'
- 'app/services/merge_requests/base_service.rb'
- 'app/services/merge_requests/create_from_issue_service.rb'
@ -640,7 +639,6 @@ Style/InlineDisableAnnotation:
- 'app/services/resource_events/synthetic_milestone_notes_builder_service.rb'
- 'app/services/resource_events/synthetic_state_notes_builder_service.rb'
- 'app/services/search/global_service.rb'
- 'app/services/search_service.rb'
- 'app/services/service_ping/submit_service.rb'
- 'app/services/snippets/bulk_destroy_service.rb'
- 'app/services/snippets/count_service.rb'
@ -1016,7 +1014,6 @@ Style/InlineDisableAnnotation:
- 'ee/app/controllers/groups/scim_oauth_controller.rb'
- 'ee/app/controllers/projects/approver_groups_controller.rb'
- 'ee/app/controllers/projects/approvers_controller.rb'
- 'ee/app/controllers/projects/path_locks_controller.rb'
- 'ee/app/controllers/projects/quality/test_cases_controller.rb'
- 'ee/app/controllers/sitemap_controller.rb'
- 'ee/app/finders/approval_rules/group_finder.rb'

1
.rubocop_todo/style/redundant_self.yml
View File

@ -195,6 +195,7 @@ Style/RedundantSelf:
- 'ee/lib/gitlab/auth/smartcard.rb'
- 'ee/lib/gitlab/ci/reports/license_scanning/report.rb'
- 'ee/lib/gitlab/elastic/client.rb'
- 'ee/lib/gitlab/elastic/helper.rb'
- 'ee/lib/gitlab/geo.rb'
- 'ee/lib/gitlab/geo/oauth/login_state.rb'
- 'ee/lib/gitlab/geo/oauth/logout_state.rb'

2
app/assets/javascripts/behaviors/markdown/render_gfm.js
View File

@ -36,7 +36,7 @@ export function renderGFM(element) {
'.js-render-kroki[hidden]',
'.js-render-math',
'.js-render-mermaid',
'[data-canonical-lang="json"][data-lang-params="table"]',
'[data-canonical-lang="json"][data-lang-params~="table"]',
'table[data-table-fields]',
'[data-canonical-lang="glql"]',
'.gfm-project_member',

2
lib/banzai/filter/json_table_filter.rb
View File

@ -18,7 +18,7 @@ module Banzai
class JsonTableFilter < HTML::Pipeline::Filter
include Concerns::OutputSafety
CSS = '[data-canonical-lang="json"][data-lang-params="table"] > code:only-child'
CSS = '[data-canonical-lang="json"][data-lang-params~="table"] > code:only-child'
XPATH = Gitlab::Utils::Nokogiri.css_to_xpath(CSS).freeze
def call

24
spec/frontend/behaviors/markdown/render_gfm_spec.js
View File

@ -1,10 +1,16 @@
import { renderGFM } from '~/behaviors/markdown/render_gfm';
import { renderGlql } from '~/behaviors/markdown/render_glql';
import { renderJSONTable } from '~/behaviors/markdown/render_json_table';
jest.mock('~/behaviors/markdown/render_glql', () => ({
renderGlql: jest.fn(),
}));
jest.mock('~/behaviors/markdown/render_json_table', () => ({
renderJSONTable: jest.fn(),
renderJSONTableHTML: jest.fn(),
}));
describe('renderGFM', () => {
it('handles a missing element', () => {
expect(() => {
@ -45,4 +51,22 @@ describe('renderGFM', () => {
});
});
});
describe('rendering a json table', () => {
let element;
beforeEach(() => {
element = document.createElement('div');
element.innerHTML =
'<div class="gl-relative markdown-code-block"><pre data-canonical-lang="json" data-lang-params="table"><code>{"items": [{"description": "foo"}]}</code></pre></div>';
});
describe('when a json table is detected', () => {
it('calls renderJSONTable', () => {
renderGFM(element);
expect(renderJSONTable).toHaveBeenCalledWith([element.firstElementChild]);
});
});
});
});

2
spec/lib/banzai/filter/json_table_filter_spec.rb
View File

@ -7,7 +7,7 @@ RSpec.describe Banzai::Filter::JsonTableFilter, feature_category: :markdown do
let_it_be(:table_with_fields) do
<<~TEXT
<pre data-canonical-lang="json" data-lang-params="table">
<pre data-canonical-lang="json" data-lang-params="table another_param">
<code>
{
"fields": [