Skip to content

Commit 45088cb

Browse files
authored
Merge pull request #5770 from avalonmediasystem/staging
Release 7.7.1 🎉
2 parents eb51ca5 + 442f2b3 commit 45088cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+794
-472
lines changed

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gem 'bootsnap', require: false
55
gem 'listen'
66
gem 'net-smtp', require: false
77
gem 'psych', '< 4'
8-
gem 'rails', '=7.0.4.3'
8+
gem 'rails', '~>7.0.8'
99
gem 'sprockets', '~>3.7.2'
1010
#gem 'sprockets-rails', require: 'sprockets/railtie'
1111
gem 'sqlite3'
@@ -53,7 +53,7 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
5353
#gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
5454
gem 'bootstrap-toggle-rails'
5555
gem 'bootstrap_form'
56-
gem 'iiif_manifest', '>= 1.4.0'
56+
gem 'iiif_manifest', '~> 1.5'
5757
gem 'rack-cors', require: 'rack/cors'
5858
gem 'rails_same_site_cookie'
5959
gem 'recaptcha', require: 'recaptcha/rails'
@@ -155,7 +155,7 @@ group :production do
155155
gem 'google-analytics-rails', '1.1.0'
156156
gem 'lograge'
157157
gem 'okcomputer'
158-
gem 'puma', '>= 4.3.8'
158+
gem 'puma', '>= 6.4.2'
159159
end
160160

161161
# Install the bundle --with aws when running on Amazon Elastic Beanstalk

Gemfile.lock

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -68,47 +68,47 @@ GIT
6868
GEM
6969
remote: https://rubygems.org/
7070
specs:
71-
actioncable (7.0.4.3)
72-
actionpack (= 7.0.4.3)
73-
activesupport (= 7.0.4.3)
71+
actioncable (7.0.8.1)
72+
actionpack (= 7.0.8.1)
73+
activesupport (= 7.0.8.1)
7474
nio4r (~> 2.0)
7575
websocket-driver (>= 0.6.1)
76-
actionmailbox (7.0.4.3)
77-
actionpack (= 7.0.4.3)
78-
activejob (= 7.0.4.3)
79-
activerecord (= 7.0.4.3)
80-
activestorage (= 7.0.4.3)
81-
activesupport (= 7.0.4.3)
76+
actionmailbox (7.0.8.1)
77+
actionpack (= 7.0.8.1)
78+
activejob (= 7.0.8.1)
79+
activerecord (= 7.0.8.1)
80+
activestorage (= 7.0.8.1)
81+
activesupport (= 7.0.8.1)
8282
mail (>= 2.7.1)
8383
net-imap
8484
net-pop
8585
net-smtp
86-
actionmailer (7.0.4.3)
87-
actionpack (= 7.0.4.3)
88-
actionview (= 7.0.4.3)
89-
activejob (= 7.0.4.3)
90-
activesupport (= 7.0.4.3)
86+
actionmailer (7.0.8.1)
87+
actionpack (= 7.0.8.1)
88+
actionview (= 7.0.8.1)
89+
activejob (= 7.0.8.1)
90+
activesupport (= 7.0.8.1)
9191
mail (~> 2.5, >= 2.5.4)
9292
net-imap
9393
net-pop
9494
net-smtp
9595
rails-dom-testing (~> 2.0)
96-
actionpack (7.0.4.3)
97-
actionview (= 7.0.4.3)
98-
activesupport (= 7.0.4.3)
99-
rack (~> 2.0, >= 2.2.0)
96+
actionpack (7.0.8.1)
97+
actionview (= 7.0.8.1)
98+
activesupport (= 7.0.8.1)
99+
rack (~> 2.0, >= 2.2.4)
100100
rack-test (>= 0.6.3)
101101
rails-dom-testing (~> 2.0)
102102
rails-html-sanitizer (~> 1.0, >= 1.2.0)
103-
actiontext (7.0.4.3)
104-
actionpack (= 7.0.4.3)
105-
activerecord (= 7.0.4.3)
106-
activestorage (= 7.0.4.3)
107-
activesupport (= 7.0.4.3)
103+
actiontext (7.0.8.1)
104+
actionpack (= 7.0.8.1)
105+
activerecord (= 7.0.8.1)
106+
activestorage (= 7.0.8.1)
107+
activesupport (= 7.0.8.1)
108108
globalid (>= 0.6.0)
109109
nokogiri (>= 1.8.5)
110-
actionview (7.0.4.3)
111-
activesupport (= 7.0.4.3)
110+
actionview (7.0.8.1)
111+
activesupport (= 7.0.8.1)
112112
builder (~> 3.1)
113113
erubi (~> 1.4)
114114
rails-dom-testing (~> 2.0)
@@ -145,8 +145,8 @@ GEM
145145
om (~> 3.1)
146146
rdf (~> 3.2)
147147
rdf-rdfxml (~> 3.2)
148-
activejob (7.0.4.3)
149-
activesupport (= 7.0.4.3)
148+
activejob (7.0.8.1)
149+
activesupport (= 7.0.8.1)
150150
globalid (>= 0.3.6)
151151
activejob-traffic_control (0.1.3)
152152
activejob (>= 4.2)
@@ -155,25 +155,25 @@ GEM
155155
activejob-uniqueness (0.2.5)
156156
activejob (>= 4.2, < 7.1)
157157
redlock (>= 1.2, < 2)
158-
activemodel (7.0.4.3)
159-
activesupport (= 7.0.4.3)
160-
activerecord (7.0.4.3)
161-
activemodel (= 7.0.4.3)
162-
activesupport (= 7.0.4.3)
158+
activemodel (7.0.8.1)
159+
activesupport (= 7.0.8.1)
160+
activerecord (7.0.8.1)
161+
activemodel (= 7.0.8.1)
162+
activesupport (= 7.0.8.1)
163163
activerecord-session_store (2.0.0)
164164
actionpack (>= 5.2.4.1)
165165
activerecord (>= 5.2.4.1)
166166
multi_json (~> 1.11, >= 1.11.2)
167167
rack (>= 2.0.8, < 3)
168168
railties (>= 5.2.4.1)
169-
activestorage (7.0.4.3)
170-
actionpack (= 7.0.4.3)
171-
activejob (= 7.0.4.3)
172-
activerecord (= 7.0.4.3)
173-
activesupport (= 7.0.4.3)
169+
activestorage (7.0.8.1)
170+
actionpack (= 7.0.8.1)
171+
activejob (= 7.0.8.1)
172+
activerecord (= 7.0.8.1)
173+
activesupport (= 7.0.8.1)
174174
marcel (~> 1.0)
175175
mini_mime (>= 1.1.0)
176-
activesupport (7.0.4.3)
176+
activesupport (7.0.8.1)
177177
concurrent-ruby (~> 1.0, >= 1.0.2)
178178
i18n (>= 1.6, < 2)
179179
minitest (>= 5.1)
@@ -335,7 +335,7 @@ GEM
335335
activerecord (>= 5.a)
336336
database_cleaner-core (~> 2.0.0)
337337
database_cleaner-core (2.0.1)
338-
date (3.3.3)
338+
date (3.3.4)
339339
declarative (0.0.20)
340340
deep_merge (1.2.2)
341341
deprecation (1.1.0)
@@ -346,7 +346,7 @@ GEM
346346
railties (>= 4.1.0)
347347
responders
348348
warden (~> 1.2.3)
349-
devise_invitable (2.0.8)
349+
devise_invitable (2.0.9)
350350
actionmailer (>= 5.0)
351351
devise (>= 4.6)
352352
diff-lcs (1.5.0)
@@ -438,8 +438,8 @@ GEM
438438
fugit (1.8.1)
439439
et-orbi (~> 1, >= 1.2.7)
440440
raabro (~> 1.4)
441-
globalid (1.1.0)
442-
activesupport (>= 5.0)
441+
globalid (1.2.1)
442+
activesupport (>= 6.1)
443443
google-analytics-rails (1.1.0)
444444
google-apis-core (0.11.0)
445445
addressable (~> 2.5, >= 2.5.1)
@@ -491,10 +491,10 @@ GEM
491491
hydra-access-controls (= 12.1.0)
492492
hydra-core (= 12.1.0)
493493
rails (>= 5.2, < 7.1)
494-
i18n (1.14.1)
494+
i18n (1.14.4)
495495
concurrent-ruby (~> 1.0)
496496
iconv (1.0.8)
497-
iiif_manifest (1.4.0)
497+
iiif_manifest (1.5.0)
498498
activesupport (>= 4)
499499
ims-lti (1.1.13)
500500
builder
@@ -557,7 +557,7 @@ GEM
557557
activesupport (>= 4)
558558
railties (>= 4)
559559
request_store (~> 1.0)
560-
loofah (2.21.3)
560+
loofah (2.22.0)
561561
crass (~> 1.0.2)
562562
nokogiri (>= 1.12.0)
563563
mail (2.8.1)
@@ -569,42 +569,42 @@ GEM
569569
rexml
570570
scrub_rb (>= 1.0.1, < 2)
571571
unf
572-
marcel (1.0.2)
572+
marcel (1.0.4)
573573
matrix (0.4.2)
574574
memoist (0.16.2)
575575
method_source (1.0.0)
576576
mime-types (3.4.1)
577577
mime-types-data (~> 3.2015)
578578
mime-types-data (3.2022.0105)
579-
mini_mime (1.1.2)
580-
mini_portile2 (2.8.4)
579+
mini_mime (1.1.5)
580+
mini_portile2 (2.8.5)
581581
minitar (0.9)
582-
minitest (5.21.2)
582+
minitest (5.22.3)
583583
msgpack (1.6.0)
584584
multi_json (1.15.0)
585585
multi_xml (0.6.0)
586586
multipart-post (2.3.0)
587587
mysql2 (0.5.5)
588-
net-imap (0.3.4)
588+
net-imap (0.4.10)
589589
date
590590
net-protocol
591591
net-ldap (0.18.0)
592592
net-pop (0.1.2)
593593
net-protocol
594-
net-protocol (0.2.1)
594+
net-protocol (0.2.2)
595595
timeout
596596
net-scp (4.0.0)
597597
net-ssh (>= 2.6.5, < 8.0.0)
598-
net-smtp (0.3.3)
598+
net-smtp (0.4.0.1)
599599
net-protocol
600600
net-ssh (7.0.1)
601601
netrc (0.11.0)
602-
nio4r (2.5.8)
602+
nio4r (2.7.1)
603603
noid (0.9.0)
604604
noid-rails (3.1.0)
605605
actionpack (>= 5.0.0, < 7.1)
606606
noid (~> 0.9)
607-
nokogiri (1.15.3)
607+
nokogiri (1.16.3)
608608
mini_portile2 (~> 2.8.2)
609609
racc (~> 1.4)
610610
nom-xml (1.2.0)
@@ -650,33 +650,33 @@ GEM
650650
pry (>= 0.10.4)
651651
psych (3.3.4)
652652
public_suffix (5.0.1)
653-
puma (6.3.0)
653+
puma (6.4.2)
654654
nio4r (~> 2.0)
655655
raabro (1.4.0)
656-
racc (1.7.1)
657-
rack (2.2.8)
658-
rack-cors (2.0.1)
656+
racc (1.7.3)
657+
rack (2.2.9)
658+
rack-cors (2.0.2)
659659
rack (>= 2.0.0)
660660
rack-protection (3.0.5)
661661
rack
662662
rack-proxy (0.7.6)
663663
rack
664664
rack-test (2.1.0)
665665
rack (>= 1.3)
666-
rails (7.0.4.3)
667-
actioncable (= 7.0.4.3)
668-
actionmailbox (= 7.0.4.3)
669-
actionmailer (= 7.0.4.3)
670-
actionpack (= 7.0.4.3)
671-
actiontext (= 7.0.4.3)
672-
actionview (= 7.0.4.3)
673-
activejob (= 7.0.4.3)
674-
activemodel (= 7.0.4.3)
675-
activerecord (= 7.0.4.3)
676-
activestorage (= 7.0.4.3)
677-
activesupport (= 7.0.4.3)
666+
rails (7.0.8.1)
667+
actioncable (= 7.0.8.1)
668+
actionmailbox (= 7.0.8.1)
669+
actionmailer (= 7.0.8.1)
670+
actionpack (= 7.0.8.1)
671+
actiontext (= 7.0.8.1)
672+
actionview (= 7.0.8.1)
673+
activejob (= 7.0.8.1)
674+
activemodel (= 7.0.8.1)
675+
activerecord (= 7.0.8.1)
676+
activestorage (= 7.0.8.1)
677+
activesupport (= 7.0.8.1)
678678
bundler (>= 1.15.0)
679-
railties (= 7.0.4.3)
679+
railties (= 7.0.8.1)
680680
rails-controller-testing (1.0.5)
681681
actionpack (>= 5.0.1.rc1)
682682
actionview (>= 5.0.1.rc1)
@@ -691,15 +691,15 @@ GEM
691691
rails_same_site_cookie (0.1.9)
692692
rack (>= 1.5)
693693
user_agent_parser (~> 2.6)
694-
railties (7.0.4.3)
695-
actionpack (= 7.0.4.3)
696-
activesupport (= 7.0.4.3)
694+
railties (7.0.8.1)
695+
actionpack (= 7.0.8.1)
696+
activesupport (= 7.0.8.1)
697697
method_source
698698
rake (>= 12.2)
699699
thor (~> 1.0)
700700
zeitwerk (~> 2.5)
701701
rainbow (3.1.1)
702-
rake (13.0.6)
702+
rake (13.1.0)
703703
rb-fsevent (0.11.2)
704704
rb-inotify (0.10.1)
705705
ffi (~> 1.0)
@@ -858,7 +858,7 @@ GEM
858858
semantic_range (>= 2.3.0)
859859
shoulda-matchers (5.3.0)
860860
activesupport (>= 5.2.0)
861-
sidekiq (6.5.9)
861+
sidekiq (6.5.12)
862862
connection_pool (>= 2.2.5, < 3)
863863
rack (~> 2.0)
864864
redis (>= 4.5.0, < 5)
@@ -918,9 +918,9 @@ GEM
918918
rdf (~> 3.2)
919919
terser (1.2.0)
920920
execjs (>= 0.3.0, < 3)
921-
thor (1.2.2)
921+
thor (1.3.1)
922922
tilt (2.0.11)
923-
timeout (0.3.2)
923+
timeout (0.4.1)
924924
trailblazer-option (0.1.2)
925925
twitter-typeahead-rails (0.11.1.pre.corejavascript)
926926
actionpack (>= 3.1)
@@ -937,7 +937,7 @@ GEM
937937
unicode-display_width (2.4.2)
938938
unicode-types (1.8.0)
939939
user_agent_parser (2.14.0)
940-
view_component (2.82.0)
940+
view_component (2.83.0)
941941
activesupport (>= 5.2.0, < 8.0)
942942
concurrent-ruby (~> 1.0)
943943
method_source (~> 1.0)
@@ -958,15 +958,15 @@ GEM
958958
crack (>= 0.3.2)
959959
hashdiff (>= 0.4.0, < 2.0.0)
960960
webrick (1.8.1)
961-
websocket-driver (0.7.5)
961+
websocket-driver (0.7.6)
962962
websocket-extensions (>= 0.1.0)
963963
websocket-extensions (0.1.5)
964964
with_locking (1.0.2)
965965
xml-simple (1.1.9)
966966
rexml
967967
xpath (3.2.0)
968968
nokogiri (~> 1.8)
969-
zeitwerk (2.6.11)
969+
zeitwerk (2.6.13)
970970
zk (1.10.0)
971971
zookeeper (~> 1.5.0)
972972
zookeeper (1.5.5)
@@ -1037,7 +1037,7 @@ DEPENDENCIES
10371037
httpx
10381038
hydra-head (~> 12.0)
10391039
iconv (~> 1.0.6)
1040-
iiif_manifest (>= 1.4.0)
1040+
iiif_manifest (~> 1.5)
10411041
ims-lti (~> 1.1.13)
10421042
jbuilder (~> 2.0)
10431043
jquery-datatables
@@ -1064,9 +1064,9 @@ DEPENDENCIES
10641064
pry-byebug
10651065
pry-rails
10661066
psych (< 4)
1067-
puma (>= 4.3.8)
1067+
puma (>= 6.4.2)
10681068
rack-cors
1069-
rails (= 7.0.4.3)
1069+
rails (~> 7.0.8)
10701070
rails-controller-testing
10711071
rails_same_site_cookie
10721072
rb-readline

0 commit comments

Comments
 (0)