Skip to content

Commit 28b5fb3

Browse files
authored
Merge branch 'develop' into feature/nrmi-295-urn-upload-error-handling
2 parents 0cc61c0 + 0283e1a commit 28b5fb3

2 files changed

Lines changed: 87 additions & 86 deletions

File tree

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '3.4.8'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 8.0', '>= 8.0.4'
7+
gem 'rails', '~> 8.1', '>= 8.1.2.1'
88

99
# State machine
1010
gem 'aasm'
@@ -44,7 +44,7 @@ gem 'redcarpet', '~> 3.6'
4444
gem 'auth0', '~> 5.1', '>= 5.1.2', require: false
4545

4646
# Google Login
47-
gem 'omniauth-google-oauth2', '>= 1.2.0'
47+
gem 'omniauth-google-oauth2', '>= 1.2.2'
4848
gem 'omniauth-rails_csrf_protection', '~> 2.0', '>= 2.0.0'
4949

5050
# Admin Frontend
@@ -112,7 +112,7 @@ group :development, :test do
112112
gem 'dotenv-rails', '>= 3.2.0'
113113
gem 'factory_bot_rails', '~> 6.5', '>= 6.5.1'
114114
gem 'pry-rails'
115-
gem 'rspec-rails', '~> 8.0', '>= 8.0.0'
115+
gem 'rspec-rails', '~> 8.0', '>= 8.0.4'
116116
end
117117

118118
group :development do
@@ -131,7 +131,7 @@ group :test do
131131
gem 'jsonapi-rspec', require: false
132132
gem 'ruby_event_store-rspec'
133133
gem 'rspec-json_expectations'
134-
gem 'shoulda-matchers', '~> 6.0', '>= 6.0.0'
134+
gem 'shoulda-matchers', '~> 7.0', '>= 7.0.1'
135135
gem 'capybara', '~> 3.40', '>= 3.40.0'
136136
gem 'climate_control'
137137
gem 'webmock', '>= 3.24.0'

Gemfile.lock

Lines changed: 83 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,70 @@ GEM
99
specs:
1010
aasm (4.12.3)
1111
concurrent-ruby (~> 1.0)
12-
action_text-trix (2.1.16)
12+
action_text-trix (2.1.18)
1313
railties
14-
actioncable (8.1.2)
15-
actionpack (= 8.1.2)
16-
activesupport (= 8.1.2)
14+
actioncable (8.1.3)
15+
actionpack (= 8.1.3)
16+
activesupport (= 8.1.3)
1717
nio4r (~> 2.0)
1818
websocket-driver (>= 0.6.1)
1919
zeitwerk (~> 2.6)
20-
actionmailbox (8.1.2)
21-
actionpack (= 8.1.2)
22-
activejob (= 8.1.2)
23-
activerecord (= 8.1.2)
24-
activestorage (= 8.1.2)
25-
activesupport (= 8.1.2)
20+
actionmailbox (8.1.3)
21+
actionpack (= 8.1.3)
22+
activejob (= 8.1.3)
23+
activerecord (= 8.1.3)
24+
activestorage (= 8.1.3)
25+
activesupport (= 8.1.3)
2626
mail (>= 2.8.0)
27-
actionmailer (8.1.2)
28-
actionpack (= 8.1.2)
29-
actionview (= 8.1.2)
30-
activejob (= 8.1.2)
31-
activesupport (= 8.1.2)
27+
actionmailer (8.1.3)
28+
actionpack (= 8.1.3)
29+
actionview (= 8.1.3)
30+
activejob (= 8.1.3)
31+
activesupport (= 8.1.3)
3232
mail (>= 2.8.0)
3333
rails-dom-testing (~> 2.2)
34-
actionpack (8.1.2)
35-
actionview (= 8.1.2)
36-
activesupport (= 8.1.2)
34+
actionpack (8.1.3)
35+
actionview (= 8.1.3)
36+
activesupport (= 8.1.3)
3737
nokogiri (>= 1.8.5)
3838
rack (>= 2.2.4)
3939
rack-session (>= 1.0.1)
4040
rack-test (>= 0.6.3)
4141
rails-dom-testing (~> 2.2)
4242
rails-html-sanitizer (~> 1.6)
4343
useragent (~> 0.16)
44-
actiontext (8.1.2)
44+
actiontext (8.1.3)
4545
action_text-trix (~> 2.1.15)
46-
actionpack (= 8.1.2)
47-
activerecord (= 8.1.2)
48-
activestorage (= 8.1.2)
49-
activesupport (= 8.1.2)
46+
actionpack (= 8.1.3)
47+
activerecord (= 8.1.3)
48+
activestorage (= 8.1.3)
49+
activesupport (= 8.1.3)
5050
globalid (>= 0.6.0)
5151
nokogiri (>= 1.8.5)
52-
actionview (8.1.2)
53-
activesupport (= 8.1.2)
52+
actionview (8.1.3)
53+
activesupport (= 8.1.3)
5454
builder (~> 3.1)
5555
erubi (~> 1.11)
5656
rails-dom-testing (~> 2.2)
5757
rails-html-sanitizer (~> 1.6)
58-
activejob (8.1.2)
59-
activesupport (= 8.1.2)
58+
activejob (8.1.3)
59+
activesupport (= 8.1.3)
6060
globalid (>= 0.3.6)
61-
activemodel (8.1.2)
62-
activesupport (= 8.1.2)
63-
activerecord (8.1.2)
64-
activemodel (= 8.1.2)
65-
activesupport (= 8.1.2)
61+
activemodel (8.1.3)
62+
activesupport (= 8.1.3)
63+
activerecord (8.1.3)
64+
activemodel (= 8.1.3)
65+
activesupport (= 8.1.3)
6666
timeout (>= 0.4.0)
6767
activerecord-import (2.2.0)
6868
activerecord (>= 4.2)
69-
activestorage (8.1.2)
70-
actionpack (= 8.1.2)
71-
activejob (= 8.1.2)
72-
activerecord (= 8.1.2)
73-
activesupport (= 8.1.2)
69+
activestorage (8.1.3)
70+
actionpack (= 8.1.3)
71+
activejob (= 8.1.3)
72+
activerecord (= 8.1.3)
73+
activesupport (= 8.1.3)
7474
marcel (~> 1.0)
75-
activesupport (8.1.2)
75+
activesupport (8.1.3)
7676
base64
7777
bigdecimal
7878
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -133,7 +133,7 @@ GEM
133133
net-http-persistent (~> 4.0)
134134
nokogiri (~> 1, >= 1.10.8)
135135
base64 (0.3.0)
136-
bigdecimal (4.0.1)
136+
bigdecimal (4.1.0)
137137
bootsnap (1.11.1)
138138
msgpack (~> 1.2)
139139
brakeman (4.3.1)
@@ -178,7 +178,7 @@ GEM
178178
drb (2.2.3)
179179
email_validator (2.2.4)
180180
activemodel
181-
erb (6.0.1)
181+
erb (6.0.2)
182182
erubi (1.13.1)
183183
et-orbi (1.4.0)
184184
tzinfo
@@ -188,7 +188,7 @@ GEM
188188
factory_bot_rails (6.5.1)
189189
factory_bot (~> 6.5)
190190
railties (>= 6.1.0)
191-
faraday (1.10.4)
191+
faraday (1.10.5)
192192
faraday-em_http (~> 1.0)
193193
faraday-em_synchrony (~> 1.0)
194194
faraday-excon (~> 1.1)
@@ -204,7 +204,7 @@ GEM
204204
faraday-em_synchrony (1.0.1)
205205
faraday-excon (1.1.0)
206206
faraday-httpclient (1.0.1)
207-
faraday-multipart (1.1.1)
207+
faraday-multipart (1.2.0)
208208
multipart-post (~> 2.0)
209209
faraday-net_http (1.0.2)
210210
faraday-net_http_persistent (1.2.0)
@@ -267,7 +267,7 @@ GEM
267267
rails-dom-testing (>= 1, < 3)
268268
railties (>= 4.2.0)
269269
thor (>= 0.14, < 2.0)
270-
json (2.18.1)
270+
json (2.19.3)
271271
jsonapi-deserializable (0.2.0)
272272
jsonapi-parser (0.1.1)
273273
jsonapi-rails (0.4.1)
@@ -312,7 +312,7 @@ GEM
312312
request_store (~> 1.0)
313313
lolsoap (0.11.0)
314314
nokogiri (~> 1.5)
315-
loofah (2.25.0)
315+
loofah (2.25.1)
316316
crass (~> 1.0.2)
317317
nokogiri (>= 1.12.0)
318318
mail (2.9.0)
@@ -329,7 +329,8 @@ GEM
329329
mime-types-data (3.2023.0808)
330330
mini_mime (1.1.5)
331331
mini_portile2 (2.8.9)
332-
minitest (6.0.1)
332+
minitest (6.0.2)
333+
drb (~> 2.0)
333334
prism (~> 1.5)
334335
msgpack (1.5.1)
335336
multi_xml (0.8.1)
@@ -351,10 +352,10 @@ GEM
351352
net-protocol
352353
netrc (0.11.0)
353354
nio4r (2.7.5)
354-
nokogiri (1.19.1)
355+
nokogiri (1.19.2)
355356
mini_portile2 (~> 2.8.2)
356357
racc (~> 1.4)
357-
oauth2 (2.0.17)
358+
oauth2 (2.0.18)
358359
faraday (>= 0.17.3, < 4.0)
359360
jwt (>= 1.0, < 4.0)
360361
logger (~> 1.2)
@@ -367,13 +368,13 @@ GEM
367368
logger
368369
rack (>= 2.2.3)
369370
rack-protection
370-
omniauth-google-oauth2 (1.2.1)
371+
omniauth-google-oauth2 (1.2.2)
371372
jwt (>= 2.9.2)
372373
oauth2 (~> 2.0)
373374
omniauth (~> 2.0)
374375
omniauth-oauth2 (~> 1.8)
375-
omniauth-oauth2 (1.8.0)
376-
oauth2 (>= 1.4, < 3)
376+
omniauth-oauth2 (1.9.0)
377+
oauth2 (>= 2.0.2, < 3)
377378
omniauth (~> 2.0)
378379
omniauth-rails_csrf_protection (2.0.1)
379380
actionpack (>= 4.2)
@@ -420,26 +421,26 @@ GEM
420421
rack (>= 1.3)
421422
rackup (2.3.1)
422423
rack (>= 3)
423-
rails (8.1.2)
424-
actioncable (= 8.1.2)
425-
actionmailbox (= 8.1.2)
426-
actionmailer (= 8.1.2)
427-
actionpack (= 8.1.2)
428-
actiontext (= 8.1.2)
429-
actionview (= 8.1.2)
430-
activejob (= 8.1.2)
431-
activemodel (= 8.1.2)
432-
activerecord (= 8.1.2)
433-
activestorage (= 8.1.2)
434-
activesupport (= 8.1.2)
424+
rails (8.1.3)
425+
actioncable (= 8.1.3)
426+
actionmailbox (= 8.1.3)
427+
actionmailer (= 8.1.3)
428+
actionpack (= 8.1.3)
429+
actiontext (= 8.1.3)
430+
actionview (= 8.1.3)
431+
activejob (= 8.1.3)
432+
activemodel (= 8.1.3)
433+
activerecord (= 8.1.3)
434+
activestorage (= 8.1.3)
435+
activesupport (= 8.1.3)
435436
bundler (>= 1.15.0)
436-
railties (= 8.1.2)
437+
railties (= 8.1.3)
437438
rails-dom-testing (2.3.0)
438439
activesupport (>= 5.0.0)
439440
minitest
440441
nokogiri (>= 1.6)
441-
rails-html-sanitizer (1.6.2)
442-
loofah (~> 2.21)
442+
rails-html-sanitizer (1.7.0)
443+
loofah (~> 2.25)
443444
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
444445
rails_event_store (2.18.0)
445446
activejob (>= 6.0)
@@ -452,9 +453,9 @@ GEM
452453
ruby_event_store-browser (= 2.18.0)
453454
rails_event_store_active_record (2.18.0)
454455
ruby_event_store-active_record (= 2.18.0)
455-
railties (8.1.2)
456-
actionpack (= 8.1.2)
457-
activesupport (= 8.1.2)
456+
railties (8.1.3)
457+
actionpack (= 8.1.3)
458+
activesupport (= 8.1.3)
458459
irb (~> 1.13)
459460
rackup (>= 1.0.0)
460461
rake (>= 12.2)
@@ -496,17 +497,17 @@ GEM
496497
diff-lcs (>= 1.2.0, < 2.0)
497498
rspec-support (~> 3.13.0)
498499
rspec-json_expectations (2.1.0)
499-
rspec-mocks (3.13.7)
500+
rspec-mocks (3.13.8)
500501
diff-lcs (>= 1.2.0, < 2.0)
501502
rspec-support (~> 3.13.0)
502-
rspec-rails (8.0.3)
503+
rspec-rails (8.0.4)
503504
actionpack (>= 7.2)
504505
activesupport (>= 7.2)
505506
railties (>= 7.2)
506-
rspec-core (~> 3.13)
507-
rspec-expectations (~> 3.13)
508-
rspec-mocks (~> 3.13)
509-
rspec-support (~> 3.13)
507+
rspec-core (>= 3.13.0, < 5.0.0)
508+
rspec-expectations (>= 3.13.0, < 5.0.0)
509+
rspec-mocks (>= 3.13.0, < 5.0.0)
510+
rspec-support (>= 3.13.0, < 5.0.0)
510511
rspec-support (3.13.7)
511512
rubocop (1.84.2)
512513
json (~> 2.3)
@@ -555,8 +556,8 @@ GEM
555556
sprockets-rails
556557
tilt
557558
securerandom (0.4.1)
558-
shoulda-matchers (6.5.0)
559-
activesupport (>= 5.2.0)
559+
shoulda-matchers (7.0.1)
560+
activesupport (>= 7.1)
560561
sidekiq (8.0.8)
561562
connection_pool (>= 2.5.0)
562563
json (>= 2.9.0)
@@ -595,7 +596,7 @@ GEM
595596
temple (0.10.4)
596597
thor (1.5.0)
597598
tilt (2.6.1)
598-
timeout (0.6.0)
599+
timeout (0.6.1)
599600
tsort (0.2.0)
600601
tzinfo (2.0.6)
601602
concurrent-ruby (~> 1.0)
@@ -624,7 +625,7 @@ GEM
624625
xpath (3.2.0)
625626
nokogiri (~> 1.8)
626627
zache (0.13.1)
627-
zeitwerk (2.7.4)
628+
zeitwerk (2.7.5)
628629

629630
PLATFORMS
630631
ruby
@@ -665,26 +666,26 @@ DEPENDENCIES
665666
mutex_m (~> 0.3.0)
666667
net-http (>= 0.4.0)
667668
nokogiri (>= 1.18.9)
668-
omniauth-google-oauth2 (>= 1.2.0)
669+
omniauth-google-oauth2 (>= 1.2.2)
669670
omniauth-rails_csrf_protection (~> 2.0, >= 2.0.0)
670671
parslet
671672
pg (>= 0.18, < 2.0)
672673
progress_bar
673674
pry-rails
674675
puma (~> 6.4, >= 6.4.3)
675676
rack-maintenance (~> 3.0)
676-
rails (~> 8.0, >= 8.0.4)
677+
rails (~> 8.1, >= 8.1.2.1)
677678
rails_event_store (~> 2.18, >= 2.18.0)
678679
redcarpet (~> 3.6)
679680
rollbar (~> 3.5, >= 3.5.1)
680681
rspec-json_expectations
681-
rspec-rails (~> 8.0, >= 8.0.0)
682+
rspec-rails (~> 8.0, >= 8.0.4)
682683
rubocop (>= 1.66.0)
683684
rubocop-rails (~> 2.34, >= 2.34.0)
684685
rubyXL (~> 3.4, >= 3.4.28)
685686
ruby_event_store-rspec
686687
sass-rails (~> 6.0, >= 6.0.0)
687-
shoulda-matchers (~> 6.0, >= 6.0.0)
688+
shoulda-matchers (~> 7.0, >= 7.0.1)
688689
sidekiq-cron (>= 2.3.1)
689690
sidekiq-pro!
690691
simple_form (>= 5.4.0)

0 commit comments

Comments
 (0)