Commit a2e5e1f4 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'pl-rubocop-todo-redundant-begin' into 'master'

Resolves rubocop offense Style/RedundantBegin

See merge request gitlab-org/gitlab!58017
parents ac7a6af6 62caa1a6
......@@ -847,13 +847,6 @@ Style/RaiseArgs:
Enabled: false
EnforcedStyle: exploded
# Offense count: 2
# Cop supports --auto-correct.
Style/RedundantBegin:
Exclude:
- 'app/services/clusters/applications/check_installation_progress_service.rb'
- 'lib/gitlab/database/postgres_hll/batch_distinct_counter.rb'
# Offense count: 26
# Cop supports --auto-correct.
# Configuration parameters: SafeForConstants.
......
......@@ -19,9 +19,7 @@ module Clusters
def check_timeout
if timed_out?
begin
app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
end
app.make_errored!("Operation timed out. Check pod logs for #{pod_name} for more details.")
else
ClusterWaitForAppInstallationWorker.perform_in(
ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
......
---
title: Resolves offenses Style/RedundantBegin
merge_request: 58017
author: Shubham Kumar (@imskr)
type: fixed
......@@ -69,10 +69,8 @@ module Gitlab
hll_buckets = Buckets.new
while batch_start <= finish
begin
hll_buckets.merge_hash!(hll_buckets_for_batch(batch_start, batch_start + batch_size))
batch_start += batch_size
end
hll_buckets.merge_hash!(hll_buckets_for_batch(batch_start, batch_start + batch_size))
batch_start += batch_size
sleep(SLEEP_TIME_IN_SECONDS)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment