Skip to content

Commit 6cb416b

Browse files
author
Brian Kelly
authored
Bump gems and fix rubocop issues (#403)
1 parent 4924829 commit 6cb416b

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ GEM
171171
dalli (3.2.8)
172172
database_cleaner (2.1.0)
173173
database_cleaner-active_record (>= 2, < 3)
174-
database_cleaner-active_record (2.2.1)
174+
database_cleaner-active_record (2.2.2)
175175
activerecord (>= 5.a)
176-
database_cleaner-core (~> 2.0.0)
176+
database_cleaner-core (~> 2.0)
177177
database_cleaner-core (2.0.1)
178178
date (3.4.1)
179179
deep_merge (1.2.2)
@@ -191,7 +191,7 @@ GEM
191191
docile (1.4.1)
192192
dotenv (2.8.1)
193193
drb (2.2.3)
194-
dry-cli (1.2.0)
194+
dry-cli (1.3.0)
195195
dumb_delegator (1.1.0)
196196
erb (5.0.2)
197197
erubi (1.13.1)
@@ -256,7 +256,7 @@ GEM
256256
i18n (1.14.7)
257257
concurrent-ruby (~> 1.0)
258258
ice_nine (0.11.2)
259-
importmap-rails (2.1.0)
259+
importmap-rails (2.2.2)
260260
actionpack (>= 6.0.0)
261261
activesupport (>= 6.0.0)
262262
railties (>= 6.0.0)
@@ -273,7 +273,7 @@ GEM
273273
rails-dom-testing (>= 1, < 3)
274274
railties (>= 4.2.0)
275275
thor (>= 0.14, < 2.0)
276-
json (2.13.0)
276+
json (2.13.2)
277277
json-schema (5.2.1)
278278
addressable (~> 2.8)
279279
bigdecimal (~> 3.1)
@@ -312,12 +312,12 @@ GEM
312312
mime-types (3.7.0)
313313
logger
314314
mime-types-data (~> 3.2025, >= 3.2025.0507)
315-
mime-types-data (3.2025.0715)
315+
mime-types-data (3.2025.0729)
316316
mini_mime (1.1.5)
317317
minitar (1.0.2)
318318
minitest (5.25.5)
319319
msgpack (1.8.0)
320-
multi_json (1.16.0)
320+
multi_json (1.17.0)
321321
multi_xml (0.7.2)
322322
bigdecimal (~> 3.1)
323323
mutex_m (0.3.0)
@@ -340,7 +340,7 @@ GEM
340340
net-smtp (0.5.1)
341341
net-protocol
342342
net-ssh (7.3.0)
343-
newrelic_rpm (9.19.0)
343+
newrelic_rpm (9.20.0)
344344
nio4r (2.7.4)
345345
nokogiri (1.18.9-arm64-darwin)
346346
racc (~> 1.4)
@@ -366,7 +366,7 @@ GEM
366366
orm_adapter (0.5.0)
367367
ostruct (0.6.3)
368368
parallel (1.27.0)
369-
parser (3.3.8.0)
369+
parser (3.3.9.0)
370370
ast (~> 2.4.1)
371371
racc
372372
popper_js (1.16.1)
@@ -430,8 +430,8 @@ GEM
430430
rdoc (6.14.2)
431431
erb
432432
psych (>= 4.0.0)
433-
regexp_parser (2.10.0)
434-
reline (0.6.1)
433+
regexp_parser (2.11.0)
434+
reline (0.6.2)
435435
io-console (~> 0.5)
436436
responders (3.1.1)
437437
actionpack (>= 5.2)
@@ -462,15 +462,15 @@ GEM
462462
rspec-mocks (~> 3.13)
463463
rspec-support (~> 3.13)
464464
rspec-support (3.13.4)
465-
rubocop (1.78.0)
465+
rubocop (1.79.1)
466466
json (~> 2.3)
467467
language_server-protocol (~> 3.17.0.2)
468468
lint_roller (~> 1.1.0)
469469
parallel (~> 1.10)
470470
parser (>= 3.3.0.2)
471471
rainbow (>= 2.2.2, < 4.0)
472472
regexp_parser (>= 2.9.3, < 3.0)
473-
rubocop-ast (>= 1.45.1, < 2.0)
473+
rubocop-ast (>= 1.46.0, < 2.0)
474474
ruby-progressbar (~> 1.7)
475475
unicode-display_width (>= 2.4.0, < 4.0)
476476
rubocop-ast (1.46.0)
@@ -546,8 +546,8 @@ GEM
546546
actionpack (>= 6.1)
547547
activesupport (>= 6.1)
548548
sprockets (>= 3.0.0)
549-
sqlite3 (2.7.2-arm64-darwin)
550-
sqlite3 (2.7.2-x86_64-linux-gnu)
549+
sqlite3 (2.7.3-arm64-darwin)
550+
sqlite3 (2.7.3-x86_64-linux-gnu)
551551
sshkit (1.24.0)
552552
base64
553553
logger

app/controllers/application_controller.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
class ApplicationController < ActionController::Base
22
# Adds a few additional behaviors into the application controller
33
include Blacklight::Controller
4+
45
layout :determine_layout if respond_to? :layout
56

67
before_action :allow_geoblacklight_params

app/models/user.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
class User < ApplicationRecord
22
# Connects this user object to Blacklights Bookmarks.
33
include Blacklight::User
4+
45
# Include default devise modules. Others available are:
56
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
67
devise :omniauthable, omniauth_providers: [:shibboleth]

0 commit comments

Comments
 (0)