Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2fbdc529
Commit
2fbdc529
authored
Mar 31, 2021
by
Shubham Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolves rubocop offense Style/RedundantBegin
Fixes auto correct rubocop offenses
parent
c765eb69
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
11 deletions
+9
-11
.rubocop_todo.yml
.rubocop_todo.yml
+0
-7
app/services/clusters/applications/check_installation_progress_service.rb
...sters/applications/check_installation_progress_service.rb
+2
-2
changelogs/unreleased/pl-rubocop-todo-redundant-begin.yml
changelogs/unreleased/pl-rubocop-todo-redundant-begin.yml
+5
-0
lib/gitlab/database/postgres_hll/batch_distinct_counter.rb
lib/gitlab/database/postgres_hll/batch_distinct_counter.rb
+2
-2
No files found.
.rubocop_todo.yml
View file @
2fbdc529
...
@@ -847,13 +847,6 @@ Style/RaiseArgs:
...
@@ -847,13 +847,6 @@ Style/RaiseArgs:
Enabled
:
false
Enabled
:
false
EnforcedStyle
:
exploded
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
# Offense count: 26
# Cop supports --auto-correct.
# Cop supports --auto-correct.
# Configuration parameters: SafeForConstants.
# Configuration parameters: SafeForConstants.
...
...
app/services/clusters/applications/check_installation_progress_service.rb
View file @
2fbdc529
...
@@ -19,9 +19,9 @@ module Clusters
...
@@ -19,9 +19,9 @@ module Clusters
def
check_timeout
def
check_timeout
if
timed_out?
if
timed_out?
begin
app
.
make_errored!
(
"Operation timed out. Check pod logs for
#{
pod_name
}
for more details."
)
app
.
make_errored!
(
"Operation timed out. Check pod logs for
#{
pod_name
}
for more details."
)
end
else
else
ClusterWaitForAppInstallationWorker
.
perform_in
(
ClusterWaitForAppInstallationWorker
.
perform_in
(
ClusterWaitForAppInstallationWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
ClusterWaitForAppInstallationWorker
::
INTERVAL
,
app
.
name
,
app
.
id
)
...
...
changelogs/unreleased/pl-rubocop-todo-redundant-begin.yml
0 → 100644
View file @
2fbdc529
---
title
:
Resolves offenses Style/RedundantBegin
merge_request
:
author
:
Shubham Kumar (@imskr)
type
:
fixed
lib/gitlab/database/postgres_hll/batch_distinct_counter.rb
View file @
2fbdc529
...
@@ -69,10 +69,10 @@ module Gitlab
...
@@ -69,10 +69,10 @@ module Gitlab
hll_buckets
=
Buckets
.
new
hll_buckets
=
Buckets
.
new
while
batch_start
<=
finish
while
batch_start
<=
finish
begin
hll_buckets
.
merge_hash!
(
hll_buckets_for_batch
(
batch_start
,
batch_start
+
batch_size
))
hll_buckets
.
merge_hash!
(
hll_buckets_for_batch
(
batch_start
,
batch_start
+
batch_size
))
batch_start
+=
batch_size
batch_start
+=
batch_size
end
sleep
(
SLEEP_TIME_IN_SECONDS
)
sleep
(
SLEEP_TIME_IN_SECONDS
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment