Skip to content

Commit a1392d5

Browse files
authored
Merge branch 'master' into master
2 parents 0e7568b + 7ef5497 commit a1392d5

40 files changed

+254
-98
lines changed

.github/workflows/ruby-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ jobs:
3939

4040
- name: Test
4141
run: bundle exec rake test
42+

Gemfile.lock

+95-91
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
PATH
22
remote: .
33
specs:
4-
payment_icons (1.7.45)
4+
payment_icons (1.7.49)
55
frozen_record
66
railties (>= 5.0)
77
sassc-rails
88

99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
actioncable (7.2.1)
13-
actionpack (= 7.2.1)
14-
activesupport (= 7.2.1)
12+
actioncable (8.0.1)
13+
actionpack (= 8.0.1)
14+
activesupport (= 8.0.1)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
1717
zeitwerk (~> 2.6)
18-
actionmailbox (7.2.1)
19-
actionpack (= 7.2.1)
20-
activejob (= 7.2.1)
21-
activerecord (= 7.2.1)
22-
activestorage (= 7.2.1)
23-
activesupport (= 7.2.1)
18+
actionmailbox (8.0.1)
19+
actionpack (= 8.0.1)
20+
activejob (= 8.0.1)
21+
activerecord (= 8.0.1)
22+
activestorage (= 8.0.1)
23+
activesupport (= 8.0.1)
2424
mail (>= 2.8.0)
25-
actionmailer (7.2.1)
26-
actionpack (= 7.2.1)
27-
actionview (= 7.2.1)
28-
activejob (= 7.2.1)
29-
activesupport (= 7.2.1)
25+
actionmailer (8.0.1)
26+
actionpack (= 8.0.1)
27+
actionview (= 8.0.1)
28+
activejob (= 8.0.1)
29+
activesupport (= 8.0.1)
3030
mail (>= 2.8.0)
3131
rails-dom-testing (~> 2.2)
32-
actionpack (7.2.1)
33-
actionview (= 7.2.1)
34-
activesupport (= 7.2.1)
32+
actionpack (8.0.1)
33+
actionview (= 8.0.1)
34+
activesupport (= 8.0.1)
3535
nokogiri (>= 1.8.5)
36-
racc
37-
rack (>= 2.2.4, < 3.2)
36+
rack (>= 2.2.4)
3837
rack-session (>= 1.0.1)
3938
rack-test (>= 0.6.3)
4039
rails-dom-testing (~> 2.2)
4140
rails-html-sanitizer (~> 1.6)
4241
useragent (~> 0.16)
43-
actiontext (7.2.1)
44-
actionpack (= 7.2.1)
45-
activerecord (= 7.2.1)
46-
activestorage (= 7.2.1)
47-
activesupport (= 7.2.1)
42+
actiontext (8.0.1)
43+
actionpack (= 8.0.1)
44+
activerecord (= 8.0.1)
45+
activestorage (= 8.0.1)
46+
activesupport (= 8.0.1)
4847
globalid (>= 0.6.0)
4948
nokogiri (>= 1.8.5)
50-
actionview (7.2.1)
51-
activesupport (= 7.2.1)
49+
actionview (8.0.1)
50+
activesupport (= 8.0.1)
5251
builder (~> 3.1)
5352
erubi (~> 1.11)
5453
rails-dom-testing (~> 2.2)
5554
rails-html-sanitizer (~> 1.6)
56-
activejob (7.2.1)
57-
activesupport (= 7.2.1)
55+
activejob (8.0.1)
56+
activesupport (= 8.0.1)
5857
globalid (>= 0.3.6)
59-
activemodel (7.2.1)
60-
activesupport (= 7.2.1)
61-
activerecord (7.2.1)
62-
activemodel (= 7.2.1)
63-
activesupport (= 7.2.1)
58+
activemodel (8.0.1)
59+
activesupport (= 8.0.1)
60+
activerecord (8.0.1)
61+
activemodel (= 8.0.1)
62+
activesupport (= 8.0.1)
6463
timeout (>= 0.4.0)
65-
activestorage (7.2.1)
66-
actionpack (= 7.2.1)
67-
activejob (= 7.2.1)
68-
activerecord (= 7.2.1)
69-
activesupport (= 7.2.1)
64+
activestorage (8.0.1)
65+
actionpack (= 8.0.1)
66+
activejob (= 8.0.1)
67+
activerecord (= 8.0.1)
68+
activesupport (= 8.0.1)
7069
marcel (~> 1.0)
71-
activesupport (7.2.1)
70+
activesupport (8.0.1)
7271
base64
72+
benchmark (>= 0.3)
7373
bigdecimal
7474
concurrent-ruby (~> 1.0, >= 1.3.1)
7575
connection_pool (>= 2.2.5)
@@ -79,30 +79,32 @@ GEM
7979
minitest (>= 5.1)
8080
securerandom (>= 0.3)
8181
tzinfo (~> 2.0, >= 2.0.5)
82+
uri (>= 0.13.1)
8283
base64 (0.2.0)
83-
bigdecimal (3.1.8)
84+
benchmark (0.4.0)
85+
bigdecimal (3.1.9)
8486
builder (3.3.0)
8587
bump (0.10.0)
8688
coderay (1.1.3)
8789
concurrent-ruby (1.3.4)
88-
connection_pool (2.4.1)
90+
connection_pool (2.5.0)
8991
crass (1.0.6)
90-
date (3.3.4)
92+
date (3.4.1)
9193
drb (2.2.1)
92-
erubi (1.13.0)
93-
ffi (1.17.0)
94+
erubi (1.13.1)
95+
ffi (1.17.1)
9496
frozen_record (0.27.4)
9597
activemodel
9698
globalid (1.2.1)
9799
activesupport (>= 6.1)
98-
i18n (1.14.5)
100+
i18n (1.14.6)
99101
concurrent-ruby (~> 1.0)
100-
io-console (0.7.2)
101-
irb (1.14.0)
102+
io-console (0.8.0)
103+
irb (1.14.3)
102104
rdoc (>= 4.0.0)
103105
reline (>= 0.4.2)
104-
logger (1.6.1)
105-
loofah (2.22.0)
106+
logger (1.6.4)
107+
loofah (2.24.0)
106108
crass (~> 1.0.2)
107109
nokogiri (>= 1.12.0)
108110
mail (2.8.1)
@@ -113,9 +115,9 @@ GEM
113115
marcel (1.0.4)
114116
method_source (1.1.0)
115117
mini_mime (1.1.5)
116-
mini_portile2 (2.8.7)
117-
minitest (5.25.1)
118-
net-imap (0.4.16)
118+
mini_portile2 (2.8.8)
119+
minitest (5.25.4)
120+
net-imap (0.5.5)
119121
date
120122
net-protocol
121123
net-pop (0.1.2)
@@ -124,57 +126,58 @@ GEM
124126
timeout
125127
net-smtp (0.5.0)
126128
net-protocol
127-
nio4r (2.7.3)
128-
nokogiri (1.16.7)
129+
nio4r (2.7.4)
130+
nokogiri (1.18.1)
129131
mini_portile2 (~> 2.8.2)
130132
racc (~> 1.4)
131-
pry (0.14.2)
133+
pry (0.15.2)
132134
coderay (~> 1.1)
133135
method_source (~> 1.0)
134-
psych (5.1.2)
136+
psych (5.2.2)
137+
date
135138
stringio
136139
racc (1.8.1)
137-
rack (3.1.7)
138-
rack-session (2.0.0)
140+
rack (3.1.8)
141+
rack-session (2.1.0)
142+
base64 (>= 0.1.0)
139143
rack (>= 3.0.0)
140-
rack-test (2.1.0)
144+
rack-test (2.2.0)
141145
rack (>= 1.3)
142-
rackup (2.1.0)
146+
rackup (2.2.1)
143147
rack (>= 3)
144-
webrick (~> 1.8)
145-
rails (7.2.1)
146-
actioncable (= 7.2.1)
147-
actionmailbox (= 7.2.1)
148-
actionmailer (= 7.2.1)
149-
actionpack (= 7.2.1)
150-
actiontext (= 7.2.1)
151-
actionview (= 7.2.1)
152-
activejob (= 7.2.1)
153-
activemodel (= 7.2.1)
154-
activerecord (= 7.2.1)
155-
activestorage (= 7.2.1)
156-
activesupport (= 7.2.1)
148+
rails (8.0.1)
149+
actioncable (= 8.0.1)
150+
actionmailbox (= 8.0.1)
151+
actionmailer (= 8.0.1)
152+
actionpack (= 8.0.1)
153+
actiontext (= 8.0.1)
154+
actionview (= 8.0.1)
155+
activejob (= 8.0.1)
156+
activemodel (= 8.0.1)
157+
activerecord (= 8.0.1)
158+
activestorage (= 8.0.1)
159+
activesupport (= 8.0.1)
157160
bundler (>= 1.15.0)
158-
railties (= 7.2.1)
161+
railties (= 8.0.1)
159162
rails-dom-testing (2.2.0)
160163
activesupport (>= 5.0.0)
161164
minitest
162165
nokogiri (>= 1.6)
163-
rails-html-sanitizer (1.6.0)
166+
rails-html-sanitizer (1.6.2)
164167
loofah (~> 2.21)
165-
nokogiri (~> 1.14)
166-
railties (7.2.1)
167-
actionpack (= 7.2.1)
168-
activesupport (= 7.2.1)
168+
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)
169+
railties (8.0.1)
170+
actionpack (= 8.0.1)
171+
activesupport (= 8.0.1)
169172
irb (~> 1.13)
170173
rackup (>= 1.0.0)
171174
rake (>= 12.2)
172175
thor (~> 1.0, >= 1.2.2)
173176
zeitwerk (~> 2.6)
174177
rake (13.2.1)
175-
rdoc (6.7.0)
178+
rdoc (6.10.0)
176179
psych (>= 4.0.0)
177-
reline (0.5.9)
180+
reline (0.6.0)
178181
io-console (~> 0.5)
179182
sassc (2.4.0)
180183
ffi (~> 1.9)
@@ -184,26 +187,27 @@ GEM
184187
sprockets (> 3.0)
185188
sprockets-rails
186189
tilt
187-
securerandom (0.3.1)
190+
securerandom (0.4.1)
188191
sprockets (4.2.1)
189192
concurrent-ruby (~> 1.0)
190193
rack (>= 2.2.4, < 4)
191194
sprockets-rails (3.5.2)
192195
actionpack (>= 6.1)
193196
activesupport (>= 6.1)
194197
sprockets (>= 3.0.0)
195-
stringio (3.1.1)
198+
stringio (3.1.2)
196199
thor (1.3.2)
197-
tilt (2.4.0)
198-
timeout (0.4.1)
200+
tilt (2.5.0)
201+
timeout (0.4.3)
199202
tzinfo (2.0.6)
200203
concurrent-ruby (~> 1.0)
201-
useragent (0.16.10)
202-
webrick (1.8.1)
203-
websocket-driver (0.7.6)
204+
uri (1.0.2)
205+
useragent (0.16.11)
206+
websocket-driver (0.7.7)
207+
base64
204208
websocket-extensions (>= 0.1.0)
205209
websocket-extensions (0.1.5)
206-
zeitwerk (2.6.18)
210+
zeitwerk (2.7.1)
207211

208212
PLATFORMS
209213
ruby
@@ -215,4 +219,4 @@ DEPENDENCIES
215219
rails (>= 5.0)
216220

217221
BUNDLED WITH
218-
2.5.20
222+
2.5.3
+1
Loading
Loading
Loading

0 commit comments

Comments
 (0)