Skip to content

Commit 5c59989

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 03bea06 commit 5c59989

File tree

78 files changed

+3460
-560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3460
-560
lines changed

.haml-lint.yml

+3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,12 @@ linters:
120120
- Layout/SpaceInsideHashLiteralBraces
121121
- Layout/SpaceInsideStringInterpolation
122122
- Layout/TrailingEmptyLines
123+
- Lint/AmbiguousOperatorPrecedence
123124
- Lint/LiteralInInterpolation
124125
- Lint/ParenthesesAsGroupedExpression
125126
- Lint/SafeNavigationConsistency
127+
- Lint/SymbolConversion
128+
- Lint/UnusedBlockArgument
126129
- Metrics/BlockNesting
127130
- Naming/VariableName
128131
- Performance/RedundantMatch

.rubocop_todo/rspec/capybara/visibility_matcher.yml .rubocop_todo/capybara/visibility_matcher.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
RSpec/Capybara/VisibilityMatcher:
2+
Capybara/VisibilityMatcher:
33
Exclude:
44
- 'ee/spec/features/boards/sidebar_spec.rb'
55
- 'ee/spec/features/epics/epic_show_spec.rb'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
Cop/RedirectWithStatus:
3+
Details: grace period
4+
Exclude:
5+
- 'app/controllers/concerns/issuable_actions.rb'
6+
- 'app/controllers/concerns/membership_actions.rb'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
GitlabSecurity/PublicSend:
3+
Details: grace period
4+
Exclude:
5+
- 'ee/app/helpers/push_rules_helper.rb'
6+
- 'ee/app/models/ee/namespace_setting.rb'
7+
- 'ee/app/models/ee/project.rb'
8+
- 'ee/app/models/push_rule.rb'
9+
- 'lib/gitlab/diff/file.rb'

.rubocop_todo/layout/empty_line_after_magic_comment.yml

+892
Large diffs are not rendered by default.

.rubocop_todo/layout/line_length.yml

-140
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
# Cop supports --autocorrect.
3+
Layout/SpaceInsidePercentLiteralDelimiters:
4+
Details: grace period
5+
Exclude:
6+
- 'spec/deprecation_toolkit_env.rb'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
---
2+
# Cop supports --autocorrect.
3+
Lint/AmbiguousOperatorPrecedence:
4+
Details: grace period
5+
Exclude:
6+
- 'app/controllers/explore/projects_controller.rb'
7+
- 'app/controllers/omniauth_callbacks_controller.rb'
8+
- 'app/controllers/profiles/two_factor_auths_controller.rb'
9+
- 'app/helpers/form_helper.rb'
10+
- 'app/helpers/groups_helper.rb'
11+
- 'app/helpers/time_helper.rb'
12+
- 'app/helpers/timeboxes_helper.rb'
13+
- 'app/helpers/tree_helper.rb'
14+
- 'app/helpers/users_helper.rb'
15+
- 'app/models/concerns/relative_positioning.rb'
16+
- 'app/models/design_management/version.rb'
17+
- 'app/models/integrations/chat_message/pipeline_message.rb'
18+
- 'app/models/merge_request_diff.rb'
19+
- 'app/models/namespace.rb'
20+
- 'app/models/network/graph.rb'
21+
- 'app/models/note.rb'
22+
- 'app/models/notification_reason.rb'
23+
- 'app/models/project_feature.rb'
24+
- 'app/models/terraform/state.rb'
25+
- 'app/models/webauthn_registration.rb'
26+
- 'app/presenters/project_presenter.rb'
27+
- 'app/services/cohorts_service.rb'
28+
- 'app/services/concerns/validates_classification_label.rb'
29+
- 'app/services/groups/group_links/destroy_service.rb'
30+
- 'app/services/issuable_links/create_service.rb'
31+
- 'app/services/issues/relative_position_rebalancing_service.rb'
32+
- 'app/services/jira/requests/base.rb'
33+
- 'app/services/projects/blame_service.rb'
34+
- 'config/initializers/1_settings.rb'
35+
- 'config/initializers/carrierwave_patch.rb'
36+
- 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb'
37+
- 'danger/roulette/Dangerfile'
38+
- 'ee/app/models/ee/integrations/jira.rb'
39+
- 'ee/app/models/geo/upload_registry.rb'
40+
- 'ee/app/models/iterations/cadence.rb'
41+
- 'ee/app/models/license.rb'
42+
- 'ee/app/models/namespaces/storage/root_size.rb'
43+
- 'ee/app/policies/ee/issuable_policy.rb'
44+
- 'ee/app/services/boards/epics/position_create_service.rb'
45+
- 'ee/app/services/geo/registry_consistency_service.rb'
46+
- 'ee/app/services/vulnerabilities/create_service.rb'
47+
- 'ee/lib/gitlab/expiring_subscription_message.rb'
48+
- 'ee/spec/helpers/ee/users/callouts_helper_spec.rb'
49+
- 'ee/spec/models/ee/audit_event_spec.rb'
50+
- 'ee/spec/models/ee/iterations/cadence_spec.rb'
51+
- 'ee/spec/models/ee/project_statistics_spec.rb'
52+
- 'ee/spec/models/geo/project_registry_spec.rb'
53+
- 'ee/spec/models/license_spec.rb'
54+
- 'ee/spec/models/security/finding_spec.rb'
55+
- 'ee/spec/models/status_page/project_setting_spec.rb'
56+
- 'ee/spec/presenters/subscription_presenter_spec.rb'
57+
- 'ee/spec/requests/api/graphql/project/incident_management/oncall_shifts_spec.rb'
58+
- 'ee/spec/services/boards/epics/position_create_service_spec.rb'
59+
- 'ee/spec/support/shared_examples/models/geo_framework_registry_shared_examples.rb'
60+
- 'ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb'
61+
- 'lib/banzai/filter/references/user_reference_filter.rb'
62+
- 'lib/banzai/filter_array.rb'
63+
- 'lib/extracts_ref.rb'
64+
- 'lib/gitlab/chaos.rb'
65+
- 'lib/gitlab/ci/config/normalizer/number_strategy.rb'
66+
- 'lib/gitlab/console.rb'
67+
- 'lib/gitlab/database/background_migration/batch_metrics.rb'
68+
- 'lib/gitlab/database/background_migration/batched_migration.rb'
69+
- 'lib/gitlab/database/migrations/background_migration_helpers.rb'
70+
- 'lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb'
71+
- 'lib/gitlab/database/postgres_hll/buckets.rb'
72+
- 'lib/gitlab/database/query_analyzers/prevent_cross_database_modification.rb'
73+
- 'lib/gitlab/email/message/in_product_marketing/helper.rb'
74+
- 'lib/gitlab/i18n/po_linter.rb'
75+
- 'lib/gitlab/import_export/project/relation_factory.rb'
76+
- 'lib/gitlab/memory/instrumentation.rb'
77+
- 'lib/gitlab/metrics/prometheus.rb'
78+
- 'lib/gitlab/middleware/rails_queue_duration.rb'
79+
- 'lib/gitlab/pagination/gitaly_keyset_pager.rb'
80+
- 'lib/gitlab/quick_actions/issuable_actions.rb'
81+
- 'lib/gitlab/relative_positioning.rb'
82+
- 'lib/gitlab/template_parser/parser.rb'
83+
- 'lib/gitlab/tree_summary.rb'
84+
- 'lib/gitlab/usage/metrics/name_suggestion.rb'
85+
- 'lib/gitlab/utils/email.rb'
86+
- 'lib/omni_auth/strategies/bitbucket.rb'
87+
- 'qa/qa/ee/page/project/secure/pipeline_security.rb'
88+
- 'qa/qa/resource/api_fabricator.rb'
89+
- 'qa/qa/resource/group_access_token.rb'
90+
- 'qa/qa/resource/impersonation_token.rb'
91+
- 'qa/qa/resource/personal_access_token.rb'
92+
- 'qa/qa/resource/project_access_token.rb'
93+
- 'qa/qa/runtime/feature.rb'
94+
- 'qa/qa/tools/test_resources_handler.rb'
95+
- 'scripts/packages/automated_cleanup.rb'
96+
- 'scripts/perf/gc/print_gc_stats.rb'
97+
- 'scripts/perf/query_limiting_report.rb'
98+
- 'scripts/review_apps/automated_cleanup.rb'
99+
- 'spec/controllers/projects/issues_controller_spec.rb'
100+
- 'spec/controllers/search_controller_spec.rb'
101+
- 'spec/helpers/events_helper_spec.rb'
102+
- 'spec/helpers/time_helper_spec.rb'
103+
- 'spec/lib/api/helpers/pagination_strategies_spec.rb'
104+
- 'spec/lib/banzai/filter/front_matter_filter_spec.rb'
105+
- 'spec/lib/gitlab/ci/ansi2json/line_spec.rb'
106+
- 'spec/lib/gitlab/ci/runner_releases_spec.rb'
107+
- 'spec/lib/gitlab/ci/trace/chunked_io_spec.rb'
108+
- 'spec/lib/gitlab/ci/trace/stream_spec.rb'
109+
- 'spec/lib/gitlab/conan_token_spec.rb'
110+
- 'spec/lib/gitlab/database/background_migration/batched_job_spec.rb'
111+
- 'spec/lib/gitlab/database/batch_count_spec.rb'
112+
- 'spec/lib/gitlab/database/consistency_checker_spec.rb'
113+
- 'spec/lib/gitlab/graphql/tracers/metrics_tracer_spec.rb'
114+
- 'spec/lib/gitlab/instrumentation/redis_interceptor_spec.rb'
115+
- 'spec/lib/gitlab/issues/rebalancing/state_spec.rb'
116+
- 'spec/lib/gitlab/kroki_spec.rb'
117+
- 'spec/lib/gitlab/memory/instrumentation_spec.rb'
118+
- 'spec/lib/gitlab/memory/watchdog/configurator_spec.rb'
119+
- 'spec/lib/gitlab/memory/watchdog/monitor/unique_memory_growth_spec.rb'
120+
- 'spec/lib/gitlab/project_search_results_spec.rb'
121+
- 'spec/lib/gitlab/prometheus_client_spec.rb'
122+
- 'spec/lib/gitlab/quick_actions/extractor_spec.rb'
123+
- 'spec/lib/gitlab/regex_spec.rb'
124+
- 'spec/lib/gitlab/search/abuse_validators/no_abusive_term_length_validator_spec.rb'
125+
- 'spec/lib/gitlab/slash_commands/deploy_spec.rb'
126+
- 'spec/lib/gitlab/url_blocker_spec.rb'
127+
- 'spec/mailers/notify_spec.rb'
128+
- 'spec/models/appearance_spec.rb'
129+
- 'spec/models/ci/build_spec.rb'
130+
- 'spec/models/ci/runner_spec.rb'
131+
- 'spec/models/commit_spec.rb'
132+
- 'spec/models/concerns/pg_full_text_searchable_spec.rb'
133+
- 'spec/models/custom_emoji_spec.rb'
134+
- 'spec/models/environment_spec.rb'
135+
- 'spec/models/grafana_integration_spec.rb'
136+
- 'spec/models/integrations/chat_message/push_message_spec.rb'
137+
- 'spec/models/merge_request_diff_spec.rb'
138+
- 'spec/models/packages/package_file_spec.rb'
139+
- 'spec/models/project_metrics_setting_spec.rb'
140+
- 'spec/models/prometheus_alert_spec.rb'
141+
- 'spec/requests/api/pypi_packages_spec.rb'
142+
- 'spec/requests/lfs_http_spec.rb'
143+
- 'spec/services/ci/pipeline_schedules/calculate_next_run_service_spec.rb'
144+
- 'spec/services/issues/relative_position_rebalancing_service_spec.rb'
145+
- 'spec/services/web_hook_service_spec.rb'
146+
- 'spec/support/cycle_analytics_helpers/test_generation.rb'
147+
- 'spec/support/helpers/dependency_proxy_helpers.rb'
148+
- 'spec/support/models/ci/partitioning_testing/cascade_check.rb'
149+
- 'spec/support/shared_examples/features/sidebar_shared_examples.rb'
150+
- 'spec/support/shared_examples/models/relative_positioning_shared_examples.rb'
151+
- 'spec/support/shared_examples/services/packages/debian/generate_distribution_shared_examples.rb'
152+
- 'spec/tooling/lib/tooling/kubernetes_client_spec.rb'
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
# Cop supports --autocorrect.
3+
Lint/AmbiguousRange:
4+
Details: grace period
5+
Exclude:
6+
- 'app/models/ci/runner.rb'
7+
- 'app/services/clusters/agent_tokens/track_usage_service.rb'
8+
- 'lib/gitlab/seeders/ci/runner/runner_fleet_pipeline_seeder.rb'
9+
- 'spec/lib/gitlab/database/reindexing/reindex_concurrently_spec.rb'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
# Cop supports --autocorrect.
3+
Lint/DeprecatedConstants:
4+
Details: grace period
5+
Exclude:
6+
- 'scripts/pipeline_test_report_builder.rb'
7+
- 'spec/scripts/pipeline_test_report_builder_spec.rb'
+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
Lint/DuplicateBranch:
3+
Details: grace period
4+
Exclude:
5+
- 'app/controllers/concerns/issuable_collections.rb'
6+
- 'app/controllers/concerns/sorting_preference.rb'
7+
- 'app/controllers/projects/google_cloud/databases_controller.rb'
8+
- 'app/controllers/repositories/lfs_storage_controller.rb'
9+
- 'app/helpers/ci/status_helper.rb'
10+
- 'app/helpers/icons_helper.rb'
11+
- 'app/helpers/labels_helper.rb'
12+
- 'app/models/application_setting_implementation.rb'
13+
- 'app/models/integrations/base_chat_notification.rb'
14+
- 'app/models/packages/package.rb'
15+
- 'app/models/release.rb'
16+
- 'app/services/admin/set_feature_flag_service.rb'
17+
- 'app/services/ci/job_token_scope/add_project_service.rb'
18+
- 'app/services/spam/spam_action_service.rb'
19+
- 'config/initializers/postgresql_cte.rb'
20+
- 'ee/app/controllers/projects/integrations/jira/issues_controller.rb'
21+
- 'ee/app/controllers/projects/security/policies_controller.rb'
22+
- 'ee/app/finders/compliance_management/merge_requests/compliance_violations_finder.rb'
23+
- 'ee/app/models/ee/vulnerability.rb'
24+
- 'ee/app/models/license.rb'
25+
- 'ee/app/models/vulnerabilities/read.rb'
26+
- 'lib/event_filter.rb'
27+
- 'lib/gitlab/checks/branch_check.rb'
28+
- 'lib/gitlab/ci/yaml_processor.rb'
29+
- 'lib/gitlab/database/load_balancing/load_balancer.rb'
30+
- 'lib/gitlab/import_export/project/relation_factory.rb'
31+
- 'lib/gitlab/search_results.rb'
32+
- 'lib/mattermost/session.rb'
33+
- 'lib/sidebars/groups/menus/settings_menu.rb'
34+
- 'qa/qa/resource/pipeline.rb'
35+
- 'scripts/rubocop-parse'
36+
- 'spec/support/shared_contexts/features/integrations/integrations_shared_context.rb'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
# Cop supports --autocorrect.
3+
Lint/DuplicateRegexpCharacterClassElement:
4+
Details: grace period
5+
Exclude:
6+
- 'lib/gitlab/path_regex.rb'
7+
- 'spec/support/shared_contexts/features/integrations/integrations_shared_context.rb'

0 commit comments

Comments
 (0)