Commit 4073b15a authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'implement_final_let_it_be_cop' into 'master'

Update gitlab-styles gem version

See merge request gitlab-org/gitlab!55899
parents a15c73be 83dd21c8
...@@ -323,6 +323,10 @@ Performance/Detect: ...@@ -323,6 +323,10 @@ Performance/Detect:
Performance/MethodObjectAsBlock: Performance/MethodObjectAsBlock:
Enabled: false Enabled: false
# Offense count: 42
Performance/OpenStruct:
Enabled: false
# Offense count: 18 # Offense count: 18
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: AutoCorrect. # Configuration parameters: AutoCorrect.
...@@ -376,6 +380,11 @@ RSpec/EmptyExampleGroup: ...@@ -376,6 +380,11 @@ RSpec/EmptyExampleGroup:
- 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_spec.rb' - 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_spec.rb'
- 'spec/services/projects/prometheus/alerts/notify_service_spec.rb' - 'spec/services/projects/prometheus/alerts/notify_service_spec.rb'
# Offense count: 1162
# Cop supports --auto-correct.
RSpec/EmptyLineAfterFinalLetItBe:
Enabled: false
# Offense count: 1428 # Offense count: 1428
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle. # Configuration parameters: EnforcedStyle.
......
...@@ -377,7 +377,7 @@ group :development, :test do ...@@ -377,7 +377,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0' gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.1.0', require: false gem 'gitlab-styles', '~> 6.2.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false
......
...@@ -472,7 +472,7 @@ GEM ...@@ -472,7 +472,7 @@ GEM
pry (~> 0.13.0) pry (~> 0.13.0)
gitlab-sidekiq-fetcher (0.5.5) gitlab-sidekiq-fetcher (0.5.5)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (6.1.0) gitlab-styles (6.2.0)
rubocop (~> 0.91, >= 0.91.1) rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1) rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.9.2) rubocop-performance (~> 1.9.2)
...@@ -1432,7 +1432,7 @@ DEPENDENCIES ...@@ -1432,7 +1432,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug gitlab-pry-byebug
gitlab-sidekiq-fetcher (= 0.5.5) gitlab-sidekiq-fetcher (= 0.5.5)
gitlab-styles (~> 6.1.0) gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
......
...@@ -65,6 +65,7 @@ RSpec.describe IncidentManagement::OncallRotations::PersistShiftsJob do ...@@ -65,6 +65,7 @@ RSpec.describe IncidentManagement::OncallRotations::PersistShiftsJob do
updated_at: updated_at # Friday @ 6:00 updated_at: updated_at # Friday @ 6:00
) )
end end
let_it_be(:active_period) { active_period_for_date_with_tz(updated_at, rotation) } let_it_be(:active_period) { active_period_for_date_with_tz(updated_at, rotation) }
around do |example| around do |example|
...@@ -171,6 +172,7 @@ RSpec.describe IncidentManagement::OncallRotations::PersistShiftsJob do ...@@ -171,6 +172,7 @@ RSpec.describe IncidentManagement::OncallRotations::PersistShiftsJob do
starts_at: starts_at starts_at: starts_at
) )
end end
let_it_be(:active_period) { active_period_for_date_with_tz(starts_at, rotation) } let_it_be(:active_period) { active_period_for_date_with_tz(starts_at, rotation) }
let_it_be(:existing_shift) do let_it_be(:existing_shift) do
create( create(
......
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