Skip to content

Commit

Permalink
Merge pull request #344 from aspettl/dependabot/bundler/rubocop-b643d…
Browse files Browse the repository at this point in the history
…64fa5

Bump the rubocop group across 1 directory with 2 updates
  • Loading branch information
aspettl authored Feb 1, 2025
2 parents 0b1f13d + 7be3abb commit 650abfa
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crass (1.0.6)
date (3.4.1)
devise (4.9.4)
Expand All @@ -110,7 +110,7 @@ GEM
ffi (1.17.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
importmap-rails (2.1.0)
actionpack (>= 6.0.0)
Expand All @@ -124,7 +124,7 @@ GEM
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.9.1)
language_server-protocol (3.17.0.3)
language_server-protocol (3.17.0.4)
logger (1.6.5)
loofah (2.23.1)
crass (~> 1.0.2)
Expand Down Expand Up @@ -160,7 +160,7 @@ GEM
orm_adapter (0.5.0)
ostruct (0.6.1)
parallel (1.26.3)
parser (3.3.6.0)
parser (3.3.7.0)
ast (~> 2.4.1)
racc
psych (5.2.2)
Expand All @@ -171,7 +171,7 @@ GEM
nio4r (~> 2.0)
pwned (2.4.1)
racc (1.8.1)
rack (3.1.8)
rack (3.1.9)
rack-session (2.0.0)
rack (>= 3.0.0)
rack-test (2.2.0)
Expand Down Expand Up @@ -222,22 +222,22 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.4.0)
rubocop (1.69.2)
rubocop (1.71.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
rubocop-ast (1.38.0)
parser (>= 3.3.1.0)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.28.0)
rubocop-rails (2.29.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
Expand Down Expand Up @@ -274,7 +274,7 @@ GEM
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (3.1.3)
unicode-display_width (3.1.4)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
uri (1.0.2)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/accounts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ def add_edit_breadcrumb

# Only allow a list of trusted parameters through.
def new_account_params
params.require(:account).permit(:type, :email, :enabled, :password, :forward, :forward_to, :alias_target)
params.expect(account: %i[type email enabled password forward forward_to alias_target])
end

def account_params
params.require(:account).permit(:enabled, :password, :forward, :forward_to, :alias_target)
params.expect(account: %i[enabled password forward forward_to alias_target])
end
end
4 changes: 2 additions & 2 deletions app/controllers/domains_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ def add_edit_breadcrumb

# Only allow a list of trusted parameters through.
def new_domain_params
params.require(:domain).permit(:type, :domain, :enabled, :catchall, :catchall_target, :alias_target)
params.expect(domain: %i[type domain enabled catchall catchall_target alias_target])
end

def domain_params
params.require(:domain).permit(:enabled, :catchall, :catchall_target, :alias_target)
params.expect(domain: %i[enabled catchall catchall_target alias_target])
end
end

0 comments on commit 650abfa

Please sign in to comment.