From 83dd21c830486e5cab9ac168f4979cbba4a21dba Mon Sep 17 00:00:00 2001
From: Mehmet Emin INAC <minac@gitlab.com>
Date: Tue, 23 Mar 2021 13:44:43 +0100
Subject: [PATCH] Update the version of `gitlab-styles` gem
---
.rubocop_todo.yml | 9 +++++++++
Gemfile | 2 +-
Gemfile.lock | 4 ++--
.../oncall_rotations/persist_shifts_job_spec.rb | 2 ++
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 35778f056b409..d698214642643 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -323,6 +323,10 @@ Performance/Detect:
Performance/MethodObjectAsBlock:
Enabled: false
+# Offense count: 42
+Performance/OpenStruct:
+ Enabled: false
+
# Offense count: 18
# Cop supports --auto-correct.
# Configuration parameters: AutoCorrect.
@@ -376,6 +380,11 @@ RSpec/EmptyExampleGroup:
- 'ee/spec/services/personal_access_tokens/revoke_invalid_tokens_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
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
diff --git a/Gemfile b/Gemfile
index c8240c3cdc287..10bd86c59aa17 100644
--- a/Gemfile
+++ b/Gemfile
@@ -377,7 +377,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
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 'bundler-audit', '~> 0.7.0.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index aa08e41631d46..ebfdb0243c97c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,7 +472,7 @@ GEM
pry (~> 0.13.0)
gitlab-sidekiq-fetcher (0.5.5)
sidekiq (~> 5)
- gitlab-styles (6.1.0)
+ gitlab-styles (6.2.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-performance (~> 1.9.2)
@@ -1432,7 +1432,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug
gitlab-sidekiq-fetcher (= 0.5.5)
- gitlab-styles (~> 6.1.0)
+ gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
diff --git a/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb b/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
index 13d26fa293a8d..674bdde49071d 100644
--- a/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
+++ b/ee/spec/workers/incident_management/oncall_rotations/persist_shifts_job_spec.rb
@@ -65,6 +65,7 @@
updated_at: updated_at # Friday @ 6:00
)
end
+
let_it_be(:active_period) { active_period_for_date_with_tz(updated_at, rotation) }
around do |example|
@@ -171,6 +172,7 @@
starts_at: starts_at
)
end
+
let_it_be(:active_period) { active_period_for_date_with_tz(starts_at, rotation) }
let_it_be(:existing_shift) do
create(
--
GitLab