diff --git a/.rubocop_todo/layout/line_continuation_leading_space.yml b/.rubocop_todo/layout/line_continuation_leading_space.yml
index e4c5fb8359355289401b60bf0e4700b99946f735..33ea7a24cb9c5e6848a903ee127452bff26c1dd9 100644
--- a/.rubocop_todo/layout/line_continuation_leading_space.yml
+++ b/.rubocop_todo/layout/line_continuation_leading_space.yml
@@ -3,18 +3,4 @@
Layout/LineContinuationLeadingSpace:
Exclude:
- 'ee/lib/tasks/gitlab/geo.rake'
- - 'lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb'
- - 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb'
- - 'lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb'
- - 'lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb'
- - 'lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb'
- - 'lib/gitlab/github_import/importer/events/changed_reviewer.rb'
- - 'lib/gitlab/import_export/project/import_task.rb'
- - 'lib/gitlab/reference_counter.rb'
- - 'lib/gitlab/tracking/standard_context.rb'
- - 'qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb'
- - 'rubocop/cop/graphql/descriptions.rb'
- - 'rubocop/cop/migration/add_columns_to_wide_tables.rb'
- - 'rubocop/cop/migration/background_migrations.rb'
- - 'scripts/lib/glfm/parse_examples.rb'
- 'scripts/qa/testcases-check'
diff --git a/lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb b/lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb
index 46758bc8fedb7f4e5229d5f6ac5fa7d83118babf..223f48ddd2cdeee8c3157ed4f80c9732112737f5 100644
--- a/lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb
+++ b/lib/gitlab/background_migration/populate_operation_visibility_permissions_from_operations.rb
@@ -12,9 +12,9 @@ class PopulateOperationVisibilityPermissionsFromOperations < BatchedMigrationJob
def perform
each_sub_batch do |batch|
batch.update_all('monitor_access_level=operations_access_level,' \
- 'infrastructure_access_level=operations_access_level,' \
- ' feature_flags_access_level=operations_access_level,'\
- ' environments_access_level=operations_access_level')
+ 'infrastructure_access_level=operations_access_level, ' \
+ 'feature_flags_access_level=operations_access_level, '\
+ 'environments_access_level=operations_access_level')
end
end
diff --git a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
index 7158489df9a3df20f33939dd8213b9f9b32e76a7..29f4303f2d25539db70f7e3f42ea27befbdfe8d7 100644
--- a/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
+++ b/lib/gitlab/ci/parsers/security/validators/schema_validator.rb
@@ -111,16 +111,16 @@ def populate_schema_version_errors
def add_schema_version_errors
if report_version.nil?
- template = _("Report version not provided,"\
- " %{report_type} report type supports versions: %{supported_schema_versions}."\
- " GitLab will attempt to validate this report against the earliest supported versions of this report"\
- " type, to show all the errors but will not ingest the report")
+ template = _("Report version not provided, "\
+ "%{report_type} report type supports versions: %{supported_schema_versions}. "\
+ "GitLab will attempt to validate this report against the earliest supported versions of this report "\
+ "type, to show all the errors but will not ingest the report")
message = format(template, report_type: report_type, supported_schema_versions: supported_schema_versions)
else
- template = _("Version %{report_version} for report type %{report_type} is unsupported, supported versions"\
- " for this report type are: %{supported_schema_versions}."\
- " GitLab will attempt to validate this report against the earliest supported versions of this report"\
- " type, to show all the errors but will not ingest the report")
+ template = _("Version %{report_version} for report type %{report_type} is unsupported, supported versions "\
+ "for this report type are: %{supported_schema_versions}. "\
+ "GitLab will attempt to validate this report against the earliest supported versions of this report "\
+ "type, to show all the errors but will not ingest the report")
message = format(template, report_version: report_version, report_type: report_type, supported_schema_versions: supported_schema_versions)
end
@@ -165,9 +165,9 @@ def find_latest_patch_version
end
def add_supported_major_minor_behavior_warning
- template = _("This report uses a supported MAJOR.MINOR schema version but the PATCH version doesn't match"\
- " any vendored schema version. Validation will be attempted against version"\
- " %{find_latest_patch_version}")
+ template = _("This report uses a supported MAJOR.MINOR schema version but the PATCH version doesn't match "\
+ "any vendored schema version. Validation will be attempted against version "\
+ "%{find_latest_patch_version}")
message = format(template, find_latest_patch_version: find_latest_patch_version)
diff --git a/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb b/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb
index 1cb91a5c45b5c99bc79ec0899febfaff74ec9517..ec3461ec14361805c9fd8074e6edec6236010247 100644
--- a/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb
+++ b/lib/gitlab/database/load_balancing/sidekiq_server_middleware.rb
@@ -20,8 +20,8 @@ def call(worker, job, _queue)
if use_primary?(strategy)
::Gitlab::Database::LoadBalancing::Session.current.use_primary!
elsif strategy == :retry
- raise JobReplicaNotUpToDate, "Sidekiq job #{resolved_class} JID-#{job['jid']} couldn't use the replica."\
- " Replica was not up to date."
+ raise JobReplicaNotUpToDate, "Sidekiq job #{resolved_class} JID-#{job['jid']} couldn't use the replica. "\
+ "Replica was not up to date."
else
# this means we selected an up-to-date replica, but there is nothing to do in this case.
end
diff --git a/lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb b/lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb
index 5145b0d0938763fb46c6ac63950b4719d8298bac..556a96de475631336afea84bbcfae464452d49f2 100644
--- a/lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb
+++ b/lib/gitlab/database/partitioning_migration_helpers/index_helpers.rb
@@ -33,8 +33,8 @@ def add_concurrent_partitioned_index(table_name, column_names, options = {})
partitioned_table = find_partitioned_table(table_name)
if index_name_exists?(table_name, options[:name])
- Gitlab::AppLogger.warn "Index not created because it already exists (this may be due to an aborted" \
- " migration or similar): table_name: #{table_name}, index_name: #{options[:name]}"
+ Gitlab::AppLogger.warn "Index not created because it already exists (this may be due to an aborted " \
+ "migration or similar): table_name: #{table_name}, index_name: #{options[:name]}"
return
end
diff --git a/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb b/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb
index 22111623752f112339f57f1ee3fab6ed3bbb0096..f7e6a07d8f94c058d82b359b3da2000f9ecc0e56 100644
--- a/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb
+++ b/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers.rb
@@ -389,8 +389,8 @@ def find_column_definition(table, column)
def create_range_id_partitioned_copy(source_table_name, partitioned_table_name, partition_column, primary_keys)
if table_exists?(partitioned_table_name)
- Gitlab::AppLogger.warn "Partitioned table not created because it already exists" \
- " (this may be due to an aborted migration or similar): table_name: #{partitioned_table_name} "
+ Gitlab::AppLogger.warn "Partitioned table not created because it already exists " \
+ "(this may be due to an aborted migration or similar): table_name: #{partitioned_table_name} "
return
end
@@ -417,8 +417,8 @@ def create_range_id_partitioned_copy(source_table_name, partitioned_table_name,
def create_range_partitioned_copy(source_table_name, partitioned_table_name, partition_column, primary_key)
if table_exists?(partitioned_table_name)
- Gitlab::AppLogger.warn "Partitioned table not created because it already exists" \
- " (this may be due to an aborted migration or similar): table_name: #{partitioned_table_name} "
+ Gitlab::AppLogger.warn "Partitioned table not created because it already exists " \
+ "(this may be due to an aborted migration or similar): table_name: #{partitioned_table_name} "
return
end
@@ -485,8 +485,8 @@ def to_sql_date_literal(date)
def create_range_partition_safely(partition_name, table_name, lower_bound, upper_bound)
if table_exists?(table_for_range_partition(partition_name))
- Gitlab::AppLogger.warn "Partition not created because it already exists" \
- " (this may be due to an aborted migration or similar): partition_name: #{partition_name}"
+ Gitlab::AppLogger.warn "Partition not created because it already exists " \
+ "(this may be due to an aborted migration or similar): partition_name: #{partition_name}"
return
end
@@ -503,8 +503,8 @@ def drop_sync_trigger(source_table_name)
def create_sync_function(name, partitioned_table_name, unique_key)
if function_exists?(name)
- Gitlab::AppLogger.warn "Partitioning sync function not created because it already exists" \
- " (this may be due to an aborted migration or similar): function name: #{name}"
+ Gitlab::AppLogger.warn "Partitioning sync function not created because it already exists " \
+ "(this may be due to an aborted migration or similar): function name: #{name}"
return
end
@@ -549,8 +549,8 @@ def build_set_statements(column_names, unique_key)
def create_sync_trigger(table_name, trigger_name, function_name)
if trigger_exists?(table_name, trigger_name)
- Gitlab::AppLogger.warn "Partitioning sync trigger not created because it already exists" \
- " (this may be due to an aborted migration or similar): trigger name: #{trigger_name}"
+ Gitlab::AppLogger.warn "Partitioning sync trigger not created because it already exists " \
+ "(this may be due to an aborted migration or similar): trigger name: #{trigger_name}"
return
end
diff --git a/lib/gitlab/github_import/importer/events/changed_reviewer.rb b/lib/gitlab/github_import/importer/events/changed_reviewer.rb
index eb142478b16eabbdc7d2482e547a292926e3c8b2..6207984c3b38625c999db69ac1a612e26fd15d1b 100644
--- a/lib/gitlab/github_import/importer/events/changed_reviewer.rb
+++ b/lib/gitlab/github_import/importer/events/changed_reviewer.rb
@@ -41,11 +41,11 @@ def parse_body(issue_event, requested_reviewer_id)
requested_reviewer = User.find(requested_reviewer_id).to_reference
if issue_event.event == 'review_request_removed'
- "#{SystemNotes::IssuablesService.issuable_events[:review_request_removed]}" \
- " #{requested_reviewer}"
+ "#{SystemNotes::IssuablesService.issuable_events[:review_request_removed]} " \
+ "#{requested_reviewer}"
else
- "#{SystemNotes::IssuablesService.issuable_events[:review_requested]}" \
- " #{requested_reviewer}"
+ "#{SystemNotes::IssuablesService.issuable_events[:review_requested]} " \
+ "#{requested_reviewer}"
end
end
end
diff --git a/lib/gitlab/import_export/project/import_task.rb b/lib/gitlab/import_export/project/import_task.rb
index 47cdb630adae912bcdcdfb60c9a68d5da7c9d185..3568e08af4c08b085f5161f1bf8af89fc3e42fde 100644
--- a/lib/gitlab/import_export/project/import_task.rb
+++ b/lib/gitlab/import_export/project/import_task.rb
@@ -72,9 +72,9 @@ def full_path
end
def show_import_start_message
- logger.info "Importing GitLab export: #{file_path} into GitLab" \
- " #{full_path}" \
- " as #{current_user.name}"
+ logger.info "Importing GitLab export: #{file_path} into GitLab " \
+ "#{full_path} " \
+ "as #{current_user.name}"
end
def import_params
diff --git a/lib/gitlab/reference_counter.rb b/lib/gitlab/reference_counter.rb
index f41e42b9e9c127d9e6190c72d52d5560c2f3084c..0feb3912fe0f0cb2315a3378a2b893abae74270c 100644
--- a/lib/gitlab/reference_counter.rb
+++ b/lib/gitlab/reference_counter.rb
@@ -51,8 +51,8 @@ def decrease
redis_cmd do |redis|
current_value = redis.decr(key)
if current_value < 0
- Gitlab::AppLogger.warn("Reference counter for #{gl_repository} decreased" \
- " when its value was less than 1. Resetting the counter.")
+ Gitlab::AppLogger.warn("Reference counter for #{gl_repository} decreased " \
+ "when its value was less than 1. Resetting the counter.")
redis.del(key)
end
end
diff --git a/lib/gitlab/tracking/standard_context.rb b/lib/gitlab/tracking/standard_context.rb
index c4fd81b0e3424008cff5328e31e8c54f8b40974f..8505b98240eb56812bc533545a698237fed4f399 100644
--- a/lib/gitlab/tracking/standard_context.rb
+++ b/lib/gitlab/tracking/standard_context.rb
@@ -64,8 +64,8 @@ def to_h
def check_argument_type(argument_name, argument_value, allowed_classes)
return if argument_value.nil? || allowed_classes.any? { |allowed_class| argument_value.is_a?(allowed_class) }
- exception = "Invalid argument type passed for #{argument_name}." \
- " Should be one of #{allowed_classes.map(&:to_s)}"
+ exception = "Invalid argument type passed for #{argument_name}. " \
+ "Should be one of #{allowed_classes.map(&:to_s)}"
Gitlab::ErrorTracking.track_and_raise_for_dev_exception(ArgumentError.new(exception))
end
diff --git a/rubocop/cop/graphql/descriptions.rb b/rubocop/cop/graphql/descriptions.rb
index b096dfb148e0635c971b8a145c57b2219ac7fbb9..f02e995f0e2d608c5243f23da6af9edc1d032170 100644
--- a/rubocop/cop/graphql/descriptions.rb
+++ b/rubocop/cop/graphql/descriptions.rb
@@ -53,10 +53,10 @@ class Descriptions < RuboCop::Cop::Base
MSG_STYLE_GUIDE_LINK = 'See the description style guide: https://docs.gitlab.com/ee/development/api_graphql_styleguide.html#description-style-guide'
MSG_NO_DESCRIPTION = "Please add a `description` property. #{MSG_STYLE_GUIDE_LINK}".freeze
MSG_NO_PERIOD = "`description` strings must end with a `.`. #{MSG_STYLE_GUIDE_LINK}".freeze
- MSG_BAD_START = "`description` strings should not start with \"A...\" or \"The...\"."\
- " #{MSG_STYLE_GUIDE_LINK}".freeze
- MSG_CONTAINS_THIS = "`description` strings should not contain the demonstrative \"this\"."\
- " #{MSG_STYLE_GUIDE_LINK}".freeze
+ MSG_BAD_START = "`description` strings should not start with \"A...\" or \"The...\". "\
+ "#{MSG_STYLE_GUIDE_LINK}".freeze
+ MSG_CONTAINS_THIS = "`description` strings should not contain the demonstrative \"this\". "\
+ "#{MSG_STYLE_GUIDE_LINK}".freeze
def_node_matcher :graphql_describable?, <<~PATTERN
(send nil? {:field :argument :value} ...)
diff --git a/rubocop/cop/migration/add_columns_to_wide_tables.rb b/rubocop/cop/migration/add_columns_to_wide_tables.rb
index ba53177b5d5d1502a0cc419e73e24419c483be5a..9e330310b4ccdb4fc1dcfbbd9a511a777c4dd092 100644
--- a/rubocop/cop/migration/add_columns_to_wide_tables.rb
+++ b/rubocop/cop/migration/add_columns_to_wide_tables.rb
@@ -9,8 +9,8 @@ module Migration
class AddColumnsToWideTables < RuboCop::Cop::Base
include MigrationHelpers
- MSG = '`%s` is a wide table with several columns, adding more should be avoided unless absolutely necessary.' \
- ' Consider storing the column in a different table or creating a new one.'
+ MSG = '`%s` is a wide table with several columns, adding more should be avoided unless absolutely necessary. ' \
+ 'Consider storing the column in a different table or creating a new one.'
DENYLISTED_METHODS = %i[
add_column
diff --git a/rubocop/cop/migration/background_migrations.rb b/rubocop/cop/migration/background_migrations.rb
index e131ab42318f1fb391b26015ae16360093869f17..bb260737798b5e10c7e544e0195df8651ad2cfdc 100644
--- a/rubocop/cop/migration/background_migrations.rb
+++ b/rubocop/cop/migration/background_migrations.rb
@@ -8,8 +8,8 @@ module Migration
class BackgroundMigrations < RuboCop::Cop::Base
include MigrationHelpers
- MSG = 'Background migrations are deprecated. Please use a Batched Background Migration instead.'\
- ' More info: https://docs.gitlab.com/ee/development/database/batched_background_migrations.html'
+ MSG = 'Background migrations are deprecated. Please use a Batched Background Migration instead. '\
+ 'More info: https://docs.gitlab.com/ee/development/database/batched_background_migrations.html'
def on_send(node)
name = node.children[1]
diff --git a/scripts/lib/glfm/parse_examples.rb b/scripts/lib/glfm/parse_examples.rb
index aedca27488992f69cb9491cd87ea8ad9c26f2b1e..f8f6960a3516e25e591b1ca50c4621dedc361567 100644
--- a/scripts/lib/glfm/parse_examples.rb
+++ b/scripts/lib/glfm/parse_examples.rb
@@ -108,8 +108,8 @@ def parse_examples(spec_txt_lines)
# headers should be size 3 or less [<H1_headertext>, <H2_headertext>, <H3_headertext>]
if headers.length == 1 && line =~ h3_regex
- errmsg = "Error: The H3 '#{headertext}' may not be nested directly within the H1 '#{headers[0]}'. " \
- " Add an H2 header before the H3 header."
+ errmsg = "Error: The H3 '#{headertext}' may not be nested directly within the H1 '#{headers[0]}'. " \
+ "Add an H2 header before the H3 header."
raise errmsg
end
diff --git a/scripts/qa/testcases-check b/scripts/qa/testcases-check
index 6bfc3d76305b586d6a36f09c33759712c735529e..17316674feecae120f2320feeedc050cd96eea21 100755
--- a/scripts/qa/testcases-check
+++ b/scripts/qa/testcases-check
@@ -74,7 +74,8 @@ else
puts missing_message % missing_testcases.join("\n") unless missing_testcases.empty?
puts format_message % testcase_format_errors.join("\n") unless testcase_format_errors.empty?
puts "\n*** Please link a unique test case from the GitLab project for the errors listed above.\n"
- puts " See: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/best_practices.html#link-a-test-to-its-test-case"\
- " for further details on how to create test cases"
+ puts " See: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/" \
+ "best_practices.html#link-a-test-to-its-test-case " \
+ "for further details on how to create test cases"
exit 1
end