Skip to content

Commit 751ca6c

Browse files
authored
Merge pull request #1072 from sul-dlss/update-dependencies
Update dependencies
2 parents 8eafa85 + 7a848da commit 751ca6c

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

.rubocop.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,12 @@ Rails/SquishedSQLHeredocs: # (new in 2.8)
207207
Enabled: true
208208
Rails/WhereNot: # (new in 2.8)
209209
Enabled: true
210+
211+
Layout/BeginEndAlignment: # (new in 0.91)
212+
Enabled: true
213+
Lint/ConstantDefinitionInBlock: # (new in 0.91)
214+
Enabled: true
215+
Lint/IdentityComparison: # (new in 0.91)
216+
Enabled: true
217+
Lint/UselessTimes: # (new in 0.91)
218+
Enabled: true

Gemfile.lock

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ GEM
108108
deep_merge (~> 1.2, >= 1.2.1)
109109
dry-validation (~> 1.0, >= 1.0.0)
110110
connection_pool (2.2.3)
111-
crack (0.4.3)
112-
safe_yaml (~> 1.0.0)
111+
crack (0.4.4)
113112
crass (1.0.6)
114113
daemons (1.3.1)
115114
deep_merge (1.2.1)
@@ -267,7 +266,7 @@ GEM
267266
net-ssh (>= 2.6.5, < 7.0.0)
268267
net-ssh (6.1.0)
269268
netrc (0.11.0)
270-
nio4r (2.5.3)
269+
nio4r (2.5.4)
271270
nokogiri (1.10.10)
272271
mini_portile2 (~> 2.4.0)
273272
nokogiri-happymapper (0.8.1)
@@ -360,7 +359,7 @@ GEM
360359
rdf-xsd (1.99.0)
361360
rdf (~> 1.99)
362361
redis (4.2.2)
363-
regexp_parser (1.7.1)
362+
regexp_parser (1.8.0)
364363
rest-client (2.1.0)
365364
http-accept (>= 1.7.0, < 2.0)
366365
http-cookie (>= 1.0.2, < 2.0)
@@ -390,18 +389,18 @@ GEM
390389
rspec-support (3.9.3)
391390
rspec_junit_formatter (0.4.1)
392391
rspec-core (>= 2, < 4, != 2.12.0)
393-
rubocop (0.90.0)
392+
rubocop (0.91.0)
394393
parallel (~> 1.10)
395394
parser (>= 2.7.1.1)
396395
rainbow (>= 2.2.2, < 4.0)
397396
regexp_parser (>= 1.7)
398397
rexml
399-
rubocop-ast (>= 0.3.0, < 1.0)
398+
rubocop-ast (>= 0.4.0, < 1.0)
400399
ruby-progressbar (~> 1.7)
401400
unicode-display_width (>= 1.4.0, < 2.0)
402-
rubocop-ast (0.4.0)
401+
rubocop-ast (0.4.2)
403402
parser (>= 2.7.1.4)
404-
rubocop-rails (2.8.0)
403+
rubocop-rails (2.8.1)
405404
activesupport (>= 4.2.0)
406405
rack (>= 1.1)
407406
rubocop (>= 0.87.0)
@@ -420,7 +419,6 @@ GEM
420419
mime-types
421420
nokogiri
422421
rest-client
423-
safe_yaml (1.0.5)
424422
scrub_rb (1.0.1)
425423
sidekiq (6.1.2)
426424
connection_pool (>= 2.2.2)

app/controllers/application_controller.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ def check_auth_token
2626
end
2727

2828
def decoded_auth_token
29-
@decoded_auth_token ||= begin
30-
body = JWT.decode(http_auth_header, Settings.dor.hmac_secret, true, algorithm: 'HS256').first
31-
HashWithIndifferentAccess.new body
32-
rescue StandardError
33-
nil
34-
end
29+
@decoded_auth_token ||=
30+
begin
31+
body = JWT.decode(http_auth_header, Settings.dor.hmac_secret, true, algorithm: 'HS256').first
32+
HashWithIndifferentAccess.new body
33+
rescue StandardError
34+
nil
35+
end
3536
end
3637

3738
def http_auth_header

0 commit comments

Comments
 (0)