Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rubocop-govuk from 4.12.0 to 4.13.0 #1025

Merged
merged 2 commits into from
Jan 5, 2024
Merged

Bump rubocop-govuk from 4.12.0 to 4.13.0 #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69e398
Bump rubocop-govuk from 4.12.0 to 4.13.0
dependabot[bot] Dec 24, 2023
87dc9b4
Conform to new style guide
peterdavidhamilton Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ GEM
activesupport (>= 5.0.0)
jsbundling-rails (1.2.1)
railties (>= 6.0.0)
json (2.6.3)
json (2.7.1)
json-jwt (1.16.3)
activesupport (>= 4.2)
aes_key_wrap
Expand Down Expand Up @@ -357,7 +357,7 @@ GEM
orm_adapter (0.5.0)
os (1.1.4)
pagy (6.2.0)
parallel (1.23.0)
parallel (1.24.0)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -437,7 +437,7 @@ GEM
rdoc (6.5.0)
psych (>= 4.0.0)
redcarpet (3.6.0)
regexp_parser (2.8.1)
regexp_parser (2.8.3)
reline (0.3.9)
io-console (~> 0.5)
representable (3.2.0)
Expand Down Expand Up @@ -467,40 +467,41 @@ GEM
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rubocop (1.55.0)
rubocop (1.59.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-capybara (2.19.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.24.0)
rubocop (~> 1.33)
rubocop-govuk (4.12.0)
rubocop (= 1.55.0)
rubocop-ast (= 1.29.0)
rubocop-rails (= 2.20.2)
rubocop-govuk (4.13.0)
rubocop (= 1.59.0)
rubocop-ast (= 1.30.0)
rubocop-rails (= 2.23.0)
rubocop-rake (= 0.6.0)
rubocop-rspec (= 2.22.0)
rubocop-rspec (= 2.25.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.20.2)
rubocop-rails (2.23.0)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.22.0)
rubocop (~> 1.33)
rubocop-rspec (2.25.0)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-graphviz (1.2.5)
Expand Down
5 changes: 3 additions & 2 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def modules_completed

# @return [String]
def authority_name
(local_authority.presence || 'Multiple')
local_authority.presence || 'Multiple'
end

# @return [String]
Expand All @@ -295,7 +295,8 @@ def role_type_required?
return false unless registration_complete?
return true if setting_other?
return false unless setting_valid?
return true if select_new_role?

true if select_new_role?
end

# @return [Boolean]
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/data.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace :data do
puts 'Truncate responses'
ActiveRecord::Base.connection.execute('TRUNCATE responses RESTART IDENTITY CASCADE')
puts 'Migrating user answers to responses'
UserAnswer.all.each do |user_answer|
UserAnswer.all.find_each do |user_answer|
response = Response.create!(
user_id: user_answer.user_id,
training_module: user_answer.module,
Expand Down