Skip to content

Commit 1df671c

Browse files
authored
Merge pull request #194 from mastodon/update_minitest_and_rails
Update minitest and rails on fasp_base and fasp_data_sharing
2 parents 7cc14c3 + 7ecdec7 commit 1df671c

4 files changed

Lines changed: 160 additions & 118 deletions

File tree

‎fasp_base/Gemfile.lock‎

Lines changed: 74 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,73 +8,73 @@ PATH
88
idnx
99
linzer (>= 0.7.7)
1010
openssl
11-
rails (>= 8.0.0)
11+
rails (>= 8.1.3)
1212

1313
GEM
1414
remote: https://rubygems.org/
1515
specs:
1616
action_text-trix (2.1.15)
1717
railties
18-
actioncable (8.1.1)
19-
actionpack (= 8.1.1)
20-
activesupport (= 8.1.1)
18+
actioncable (8.1.3.1)
19+
actionpack (= 8.1.3.1)
20+
activesupport (= 8.1.3.1)
2121
nio4r (~> 2.0)
2222
websocket-driver (>= 0.6.1)
2323
zeitwerk (~> 2.6)
24-
actionmailbox (8.1.1)
25-
actionpack (= 8.1.1)
26-
activejob (= 8.1.1)
27-
activerecord (= 8.1.1)
28-
activestorage (= 8.1.1)
29-
activesupport (= 8.1.1)
24+
actionmailbox (8.1.3.1)
25+
actionpack (= 8.1.3.1)
26+
activejob (= 8.1.3.1)
27+
activerecord (= 8.1.3.1)
28+
activestorage (= 8.1.3.1)
29+
activesupport (= 8.1.3.1)
3030
mail (>= 2.8.0)
31-
actionmailer (8.1.1)
32-
actionpack (= 8.1.1)
33-
actionview (= 8.1.1)
34-
activejob (= 8.1.1)
35-
activesupport (= 8.1.1)
31+
actionmailer (8.1.3.1)
32+
actionpack (= 8.1.3.1)
33+
actionview (= 8.1.3.1)
34+
activejob (= 8.1.3.1)
35+
activesupport (= 8.1.3.1)
3636
mail (>= 2.8.0)
3737
rails-dom-testing (~> 2.2)
38-
actionpack (8.1.1)
39-
actionview (= 8.1.1)
40-
activesupport (= 8.1.1)
38+
actionpack (8.1.3.1)
39+
actionview (= 8.1.3.1)
40+
activesupport (= 8.1.3.1)
4141
nokogiri (>= 1.8.5)
4242
rack (>= 2.2.4)
4343
rack-session (>= 1.0.1)
4444
rack-test (>= 0.6.3)
4545
rails-dom-testing (~> 2.2)
4646
rails-html-sanitizer (~> 1.6)
4747
useragent (~> 0.16)
48-
actiontext (8.1.1)
48+
actiontext (8.1.3.1)
4949
action_text-trix (~> 2.1.15)
50-
actionpack (= 8.1.1)
51-
activerecord (= 8.1.1)
52-
activestorage (= 8.1.1)
53-
activesupport (= 8.1.1)
50+
actionpack (= 8.1.3.1)
51+
activerecord (= 8.1.3.1)
52+
activestorage (= 8.1.3.1)
53+
activesupport (= 8.1.3.1)
5454
globalid (>= 0.6.0)
5555
nokogiri (>= 1.8.5)
56-
actionview (8.1.1)
57-
activesupport (= 8.1.1)
56+
actionview (8.1.3.1)
57+
activesupport (= 8.1.3.1)
5858
builder (~> 3.1)
5959
erubi (~> 1.11)
6060
rails-dom-testing (~> 2.2)
6161
rails-html-sanitizer (~> 1.6)
62-
activejob (8.1.1)
63-
activesupport (= 8.1.1)
62+
activejob (8.1.3.1)
63+
activesupport (= 8.1.3.1)
6464
globalid (>= 0.3.6)
65-
activemodel (8.1.1)
66-
activesupport (= 8.1.1)
67-
activerecord (8.1.1)
68-
activemodel (= 8.1.1)
69-
activesupport (= 8.1.1)
65+
activemodel (8.1.3.1)
66+
activesupport (= 8.1.3.1)
67+
activerecord (8.1.3.1)
68+
activemodel (= 8.1.3.1)
69+
activesupport (= 8.1.3.1)
7070
timeout (>= 0.4.0)
71-
activestorage (8.1.1)
72-
actionpack (= 8.1.1)
73-
activejob (= 8.1.1)
74-
activerecord (= 8.1.1)
75-
activesupport (= 8.1.1)
71+
activestorage (8.1.3.1)
72+
actionpack (= 8.1.3.1)
73+
activejob (= 8.1.3.1)
74+
activerecord (= 8.1.3.1)
75+
activesupport (= 8.1.3.1)
7676
marcel (~> 1.0)
77-
activesupport (8.1.1)
77+
activesupport (8.1.3.1)
7878
base64
7979
bigdecimal
8080
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -158,7 +158,9 @@ GEM
158158
marcel (1.1.0)
159159
mini_mime (1.1.5)
160160
mini_portile2 (2.8.9)
161-
minitest (5.27.0)
161+
minitest (6.0.6)
162+
drb (~> 2.0)
163+
prism (~> 1.5)
162164
net-http (0.9.1)
163165
uri (>= 0.11.1)
164166
net-imap (0.5.12)
@@ -174,6 +176,22 @@ GEM
174176
nokogiri (1.18.10)
175177
mini_portile2 (~> 2.8.2)
176178
racc (~> 1.4)
179+
nokogiri (1.18.10-aarch64-linux-gnu)
180+
racc (~> 1.4)
181+
nokogiri (1.18.10-aarch64-linux-musl)
182+
racc (~> 1.4)
183+
nokogiri (1.18.10-arm-linux-gnu)
184+
racc (~> 1.4)
185+
nokogiri (1.18.10-arm-linux-musl)
186+
racc (~> 1.4)
187+
nokogiri (1.18.10-arm64-darwin)
188+
racc (~> 1.4)
189+
nokogiri (1.18.10-x86_64-darwin)
190+
racc (~> 1.4)
191+
nokogiri (1.18.10-x86_64-linux-gnu)
192+
racc (~> 1.4)
193+
nokogiri (1.18.10-x86_64-linux-musl)
194+
racc (~> 1.4)
177195
openssl (4.0.2)
178196
parallel (1.27.0)
179197
parser (3.3.8.0)
@@ -182,7 +200,7 @@ GEM
182200
pp (0.6.3)
183201
prettyprint
184202
prettyprint (0.2.0)
185-
prism (1.4.0)
203+
prism (1.9.0)
186204
propshaft (1.3.1)
187205
actionpack (>= 7.0.0)
188206
activesupport (>= 7.0.0)
@@ -202,30 +220,30 @@ GEM
202220
rack (>= 1.3)
203221
rackup (2.2.1)
204222
rack (>= 3)
205-
rails (8.1.1)
206-
actioncable (= 8.1.1)
207-
actionmailbox (= 8.1.1)
208-
actionmailer (= 8.1.1)
209-
actionpack (= 8.1.1)
210-
actiontext (= 8.1.1)
211-
actionview (= 8.1.1)
212-
activejob (= 8.1.1)
213-
activemodel (= 8.1.1)
214-
activerecord (= 8.1.1)
215-
activestorage (= 8.1.1)
216-
activesupport (= 8.1.1)
223+
rails (8.1.3.1)
224+
actioncable (= 8.1.3.1)
225+
actionmailbox (= 8.1.3.1)
226+
actionmailer (= 8.1.3.1)
227+
actionpack (= 8.1.3.1)
228+
actiontext (= 8.1.3.1)
229+
actionview (= 8.1.3.1)
230+
activejob (= 8.1.3.1)
231+
activemodel (= 8.1.3.1)
232+
activerecord (= 8.1.3.1)
233+
activestorage (= 8.1.3.1)
234+
activesupport (= 8.1.3.1)
217235
bundler (>= 1.15.0)
218-
railties (= 8.1.1)
236+
railties (= 8.1.3.1)
219237
rails-dom-testing (2.3.0)
220238
activesupport (>= 5.0.0)
221239
minitest
222240
nokogiri (>= 1.6)
223241
rails-html-sanitizer (1.6.2)
224242
loofah (~> 2.21)
225243
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)
226-
railties (8.1.1)
227-
actionpack (= 8.1.1)
228-
activesupport (= 8.1.1)
244+
railties (8.1.3.1)
245+
actionpack (= 8.1.3.1)
246+
activesupport (= 8.1.3.1)
229247
irb (~> 1.13)
230248
rackup (>= 1.0.0)
231249
rake (>= 12.2)

‎fasp_base/fasp_base.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
1717
Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
1818
end
1919

20-
spec.add_dependency "rails", ">= 8.0.0"
20+
spec.add_dependency "rails", ">= 8.1.3"
2121
spec.add_dependency "bcrypt"
2222
spec.add_dependency "httpx"
2323
spec.add_dependency "linzer", ">= 0.7.7"

0 commit comments

Comments
 (0)