diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index eecfaa8eb64..d2922613a72 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -595,7 +595,6 @@ Layout/ArgumentAlignment: - 'ee/app/graphql/ee/types/ci/runner_countable_connection_type.rb' - 'ee/app/graphql/ee/types/deployment_type.rb' - 'ee/app/graphql/ee/types/environment_type.rb' - - 'ee/app/graphql/ee/types/group_type.rb' - 'ee/app/graphql/ee/types/issues/negated_issue_filter_input_type.rb' - 'ee/app/graphql/ee/types/namespace_type.rb' - 'ee/app/graphql/ee/types/permission_types/deployment.rb' diff --git a/.rubocop_todo/lint/unused_block_argument.yml b/.rubocop_todo/lint/unused_block_argument.yml index 70c836e28ac..ea9cd78bcd8 100644 --- a/.rubocop_todo/lint/unused_block_argument.yml +++ b/.rubocop_todo/lint/unused_block_argument.yml @@ -235,7 +235,6 @@ Lint/UnusedBlockArgument: - 'lib/google_api/cloud_platform/client.rb' - 'lib/peek/views/gitaly.rb' - 'lib/security/ci_configuration/sast_build_action.rb' - - 'lib/tasks/cleanup.rake' - 'lib/tasks/contracts/merge_requests.rake' - 'lib/tasks/contracts/pipeline_schedules.rake' - 'lib/tasks/contracts/pipelines.rake' diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml index 5ab492b4a29..7f4eeeb3d00 100644 --- a/.rubocop_todo/rspec/before_all_role_assignment.yml +++ b/.rubocop_todo/rspec/before_all_role_assignment.yml @@ -1098,6 +1098,7 @@ RSpec/BeforeAllRoleAssignment: - 'spec/lib/bulk_imports/projects/pipelines/ci_pipelines_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/commit_notes_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/issues_pipeline_spec.rb' + - 'spec/lib/bulk_imports/projects/pipelines/legacy_references_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/merge_requests_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/pipeline_schedules_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 9e78a8821e1..d4646f82db1 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -2688,7 +2688,6 @@ RSpec/FeatureCategory: - 'spec/lib/bulk_imports/projects/pipelines/service_desk_setting_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/snippets_pipeline_spec.rb' - 'spec/lib/bulk_imports/projects/pipelines/snippets_repository_pipeline_spec.rb' - - 'spec/lib/bulk_imports/projects/stage_spec.rb' - 'spec/lib/bulk_imports/retry_pipeline_error_spec.rb' - 'spec/lib/bulk_imports/users_mapper_spec.rb' - 'spec/lib/constraints/admin_constrainer_spec.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index 3527c4afcb5..c4f06597625 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -905,7 +905,6 @@ Style/IfUnlessModifier: - 'lib/sidebars/projects/menus/settings_menu.rb' - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb' - 'lib/system_check/init_helpers.rb' - - 'lib/tasks/cleanup.rake' - 'lib/tasks/eslint.rake' - 'lib/tasks/gitlab/assets.rake' - 'lib/tasks/gitlab/cleanup.rake' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 1072cf397cb..37c6c6b93b4 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -3257,7 +3257,6 @@ Style/InlineDisableAnnotation: - 'spec/support/helpers/stub_snowplow.rb' - 'spec/support/helpers/wait_for_requests.rb' - 'spec/support/matchers/event_store.rb' - - 'spec/support/rspec_order.rb' - 'spec/support/shared_contexts/controllers/ambiguous_ref_controller_shared_context.rb' - 'spec/support/shared_contexts/disable_user_tracking.rb' - 'spec/support/shared_contexts/policies/project_policy_table_shared_context.rb' diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index f269bd38a5b..a742d263162 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -14.30.0 +14.30.1 diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 8c1cab20ece..c9fd25171aa 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -419,6 +419,7 @@ export default {