From d7fe9575a00f0e734977cc15a5af92e8674bb379 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 31 Jul 2023 14:31:42 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@16-1-stable-ee --- .rubocop_todo/rspec/missing_feature_category.yml | 1 + app/assets/javascripts/diffs/store/mutations.js | 2 +- app/assets/javascripts/diffs/utils/diff_file.js | 6 +- .../notes/components/diff_with_note.vue | 3 +- .../notes/components/noteable_discussion.vue | 2 +- .../projects/pipeline_schedules_controller.rb | 10 +- app/models/project.rb | 11 -- app/models/project_setting.rb | 11 -- app/policies/ci/pipeline_schedule_policy.rb | 24 +-- .../bulk_imports/archive_extraction_service.rb | 6 +- .../bulk_imports/file_decompression_service.rb | 2 +- .../capture_diff_note_positions_service.rb | 2 +- config/application.rb | 2 - lib/banzai/filter/autolink_filter.rb | 15 +- lib/banzai/filter/plantuml_filter.rb | 11 +- .../common/pipelines/lfs_objects_pipeline.rb | 2 +- .../common/pipelines/uploads_pipeline.rb | 2 +- lib/bulk_imports/file_downloads/validations.rb | 2 +- .../projects/pipelines/design_bundle_pipeline.rb | 2 +- .../pipelines/repository_bundle_pipeline.rb | 2 +- lib/gitlab/asciidoc.rb | 11 +- lib/gitlab/ci/decompressed_gzip_size_validator.rb | 2 +- lib/gitlab/import_export/command_line_util.rb | 33 ++-- .../decompressed_archive_size_validator.rb | 2 +- lib/gitlab/import_export/file_importer.rb | 4 +- lib/gitlab/import_export/json/ndjson_reader.rb | 6 +- .../import_export/recursive_merge_folders.rb | 2 +- lib/gitlab/pages/virtual_host_finder.rb | 5 +- lib/gitlab/path_regex.rb | 2 +- lib/gitlab/plantuml.rb | 20 --- lib/gitlab/utils/file_info.rb | 35 ---- locale/gitlab.pot | 6 - package.json | 2 +- .../projects/pipeline_schedules_controller_spec.rb | 69 ++------ spec/factories/diff_position.rb | 4 - .../user_views_comment_on_diff_file_spec.rb | 49 ------ spec/lib/banzai/filter/autolink_filter_spec.rb | 16 -- .../references/project_reference_filter_spec.rb | 1 - .../common/pipelines/lfs_objects_pipeline_spec.rb | 15 +- .../common/pipelines/uploads_pipeline_spec.rb | 14 +- .../pipelines/design_bundle_pipeline_spec.rb | 19 +-- .../pipelines/repository_bundle_pipeline_spec.rb | 19 +-- .../ci/decompressed_gzip_size_validator_spec.rb | 10 -- .../github_import/attachments_downloader_spec.rb | 22 +-- .../gitlab/import_export/command_line_util_spec.rb | 108 +++++------- .../decompressed_archive_size_validator_spec.rb | 17 +- .../lib/gitlab/import_export/file_importer_spec.rb | 57 +------ .../import_export/json/ndjson_reader_spec.rb | 46 ++--- .../import_export/recursive_merge_folders_spec.rb | 4 +- spec/lib/gitlab/pages/virtual_host_finder_spec.rb | 29 +--- spec/lib/gitlab/plantuml_spec.rb | 59 ------- spec/lib/gitlab/utils/file_info_spec.rb | 88 ---------- spec/models/project_setting_spec.rb | 26 +-- spec/models/project_spec.rb | 58 ------- spec/policies/ci/pipeline_schedule_policy_spec.rb | 185 +++++---------------- .../archive_extraction_service_spec.rb | 10 +- .../file_decompression_service_spec.rb | 67 ++------ .../bulk_imports/file_download_service_spec.rb | 32 +--- .../ci/pipeline_schedules/update_service_spec.rb | 4 +- yarn.lock | 8 +- 60 files changed, 234 insertions(+), 1050 deletions(-) delete mode 100644 lib/gitlab/plantuml.rb delete mode 100644 lib/gitlab/utils/file_info.rb delete mode 100644 spec/features/merge_request/user_views_comment_on_diff_file_spec.rb delete mode 100644 spec/lib/gitlab/plantuml_spec.rb delete mode 100644 spec/lib/gitlab/utils/file_info_spec.rb diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml index 1d41cc41315..1f90a4c3ba5 100644 --- a/.rubocop_todo/rspec/missing_feature_category.yml +++ b/.rubocop_todo/rspec/missing_feature_category.yml @@ -5107,6 +5107,7 @@ RSpec/MissingFeatureCategory: - 'spec/policies/ci/bridge_policy_spec.rb' - 'spec/policies/ci/build_policy_spec.rb' - 'spec/policies/ci/pipeline_policy_spec.rb' + - 'spec/policies/ci/pipeline_schedule_policy_spec.rb' - 'spec/policies/ci/trigger_policy_spec.rb' - 'spec/policies/clusters/agent_policy_spec.rb' - 'spec/policies/clusters/agent_token_policy_spec.rb' diff --git a/app/assets/javascripts/diffs/store/mutations.js b/app/assets/javascripts/diffs/store/mutations.js index acdb68bc0e6..2786e971f4b 100644 --- a/app/assets/javascripts/diffs/store/mutations.js +++ b/app/assets/javascripts/diffs/store/mutations.js @@ -175,7 +175,7 @@ export default { originalStartLineCode, ...(discussion.line_codes || []), ]; - const fileHash = discussion.diff_file?.file_hash; + const fileHash = discussion.diff_file.file_hash; const lineCheck = (line) => discussionLineCodes.some( (discussionLineCode) => diff --git a/app/assets/javascripts/diffs/utils/diff_file.js b/app/assets/javascripts/diffs/utils/diff_file.js index 98e1c1cc849..f2a3224d332 100644 --- a/app/assets/javascripts/diffs/utils/diff_file.js +++ b/app/assets/javascripts/diffs/utils/diff_file.js @@ -77,7 +77,7 @@ export function prepareRawDiffFile({ file, allFiles, meta = false, index = -1 }) } export function collapsedType(file) { - const isManual = typeof file?.viewer?.manuallyCollapsed === 'boolean'; + const isManual = typeof file.viewer?.manuallyCollapsed === 'boolean'; return isManual ? DIFF_FILE_MANUAL_COLLAPSE : DIFF_FILE_AUTOMATIC_COLLAPSE; } @@ -85,8 +85,8 @@ export function collapsedType(file) { export function isCollapsed(file) { const type = collapsedType(file); const collapsedStates = { - [DIFF_FILE_AUTOMATIC_COLLAPSE]: file?.viewer?.automaticallyCollapsed || false, - [DIFF_FILE_MANUAL_COLLAPSE]: file?.viewer?.manuallyCollapsed, + [DIFF_FILE_AUTOMATIC_COLLAPSE]: file.viewer?.automaticallyCollapsed || false, + [DIFF_FILE_MANUAL_COLLAPSE]: file.viewer?.manuallyCollapsed, }; return collapsedStates[type]; diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index b1a2ab77fa8..db32079e6b9 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -41,7 +41,7 @@ export default { return getDiffMode(this.discussion.diff_file); }, diffViewerMode() { - return this.discussion.diff_file?.viewer.name; + return this.discussion.diff_file.viewer.name; }, fileDiffRefs() { return this.discussion.diff_file.diff_refs; @@ -96,7 +96,6 @@ export default {