Skip to content

Commit fada463

Browse files
committed
Merge branch 'master' of github.com:rubyforgood/diaper
2 parents baf8453 + 11c3eea commit fada463

File tree

2 files changed

+61
-61
lines changed

2 files changed

+61
-61
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ end
77

88
ruby "2.7.1"
99

10-
gem "api-auth", "~> 2.3"
10+
gem "api-auth", "~> 2.4"
1111
gem 'bootstrap', '~> 4.4.1'
1212
gem 'bootstrap-select-rails'
1313
gem "bugsnag"
@@ -36,7 +36,7 @@ gem "pg", "~> 1.2.3"
3636
gem 'popper_js'
3737
gem "prawn-rails"
3838
gem "puma"
39-
gem "rails", "~> 6.0.2"
39+
gem "rails", "~> 6.0.3"
4040
gem "sass-rails"
4141
gem "sidekiq"
4242
gem "simple_form"

Gemfile.lock

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.2.2)
5-
actionpack (= 6.0.2.2)
4+
actioncable (6.0.3)
5+
actionpack (= 6.0.3)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.2.2)
9-
actionpack (= 6.0.2.2)
10-
activejob (= 6.0.2.2)
11-
activerecord (= 6.0.2.2)
12-
activestorage (= 6.0.2.2)
13-
activesupport (= 6.0.2.2)
8+
actionmailbox (6.0.3)
9+
actionpack (= 6.0.3)
10+
activejob (= 6.0.3)
11+
activerecord (= 6.0.3)
12+
activestorage (= 6.0.3)
13+
activesupport (= 6.0.3)
1414
mail (>= 2.7.1)
15-
actionmailer (6.0.2.2)
16-
actionpack (= 6.0.2.2)
17-
actionview (= 6.0.2.2)
18-
activejob (= 6.0.2.2)
15+
actionmailer (6.0.3)
16+
actionpack (= 6.0.3)
17+
actionview (= 6.0.3)
18+
activejob (= 6.0.3)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.2.2)
22-
actionview (= 6.0.2.2)
23-
activesupport (= 6.0.2.2)
21+
actionpack (6.0.3)
22+
actionview (= 6.0.3)
23+
activesupport (= 6.0.3)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.2.2)
29-
actionpack (= 6.0.2.2)
30-
activerecord (= 6.0.2.2)
31-
activestorage (= 6.0.2.2)
32-
activesupport (= 6.0.2.2)
28+
actiontext (6.0.3)
29+
actionpack (= 6.0.3)
30+
activerecord (= 6.0.3)
31+
activestorage (= 6.0.3)
32+
activesupport (= 6.0.3)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.2.2)
35-
activesupport (= 6.0.2.2)
34+
actionview (6.0.3)
35+
activesupport (= 6.0.3)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.2.2)
41-
activesupport (= 6.0.2.2)
40+
activejob (6.0.3)
41+
activesupport (= 6.0.3)
4242
globalid (>= 0.3.6)
43-
activemodel (6.0.2.2)
44-
activesupport (= 6.0.2.2)
45-
activerecord (6.0.2.2)
46-
activemodel (= 6.0.2.2)
47-
activesupport (= 6.0.2.2)
48-
activestorage (6.0.2.2)
49-
actionpack (= 6.0.2.2)
50-
activejob (= 6.0.2.2)
51-
activerecord (= 6.0.2.2)
43+
activemodel (6.0.3)
44+
activesupport (= 6.0.3)
45+
activerecord (6.0.3)
46+
activemodel (= 6.0.3)
47+
activesupport (= 6.0.3)
48+
activestorage (6.0.3)
49+
actionpack (= 6.0.3)
50+
activejob (= 6.0.3)
51+
activerecord (= 6.0.3)
5252
marcel (~> 0.3.1)
53-
activesupport (6.0.2.2)
53+
activesupport (6.0.3)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
5757
tzinfo (~> 1.1)
58-
zeitwerk (~> 2.2)
58+
zeitwerk (~> 2.2, >= 2.2.2)
5959
addressable (2.7.0)
6060
public_suffix (>= 2.0.2, < 5.0)
6161
airbrussh (1.4.0)
6262
sshkit (>= 1.6.1, != 1.7.0)
6363
annotate (3.1.1)
6464
activerecord (>= 3.2, < 7.0)
6565
rake (>= 10.4, < 14.0)
66-
api-auth (2.3.1)
66+
api-auth (2.4.0)
6767
ast (2.4.0)
6868
autoprefixer-rails (9.5.1)
6969
execjs
@@ -130,15 +130,15 @@ GEM
130130
crack (0.4.3)
131131
safe_yaml (~> 1.0.0)
132132
crass (1.0.6)
133-
database_cleaner (1.8.4)
133+
database_cleaner (1.8.5)
134134
debug_inspector (0.0.3)
135135
devise (4.7.1)
136136
bcrypt (~> 3.0)
137137
orm_adapter (~> 0.1)
138138
railties (>= 4.1.0)
139139
responders
140140
warden (~> 1.2.3)
141-
devise_invitable (2.0.1)
141+
devise_invitable (2.0.2)
142142
actionmailer (>= 5.0)
143143
devise (>= 4.6)
144144
diff-lcs (1.3)
@@ -183,7 +183,7 @@ GEM
183183
jquery-rails (>= 4.0.5, < 5.0.0)
184184
jquery-ui-rails (>= 5.0.2)
185185
momentjs-rails (>= 2.9.0)
186-
geocoder (1.6.2)
186+
geocoder (1.6.3)
187187
globalid (0.4.2)
188188
activesupport (>= 4.2.0)
189189
groupdate (5.0.0)
@@ -244,7 +244,7 @@ GEM
244244
marcel (0.3.3)
245245
mimemagic (~> 0.3.2)
246246
method_source (0.9.2)
247-
mimemagic (0.3.4)
247+
mimemagic (0.3.5)
248248
mini_magick (4.10.1)
249249
mini_mime (1.0.2)
250250
mini_portile2 (2.4.0)
@@ -301,20 +301,20 @@ GEM
301301
rack
302302
rack-test (1.1.0)
303303
rack (>= 1.0, < 3)
304-
rails (6.0.2.2)
305-
actioncable (= 6.0.2.2)
306-
actionmailbox (= 6.0.2.2)
307-
actionmailer (= 6.0.2.2)
308-
actionpack (= 6.0.2.2)
309-
actiontext (= 6.0.2.2)
310-
actionview (= 6.0.2.2)
311-
activejob (= 6.0.2.2)
312-
activemodel (= 6.0.2.2)
313-
activerecord (= 6.0.2.2)
314-
activestorage (= 6.0.2.2)
315-
activesupport (= 6.0.2.2)
304+
rails (6.0.3)
305+
actioncable (= 6.0.3)
306+
actionmailbox (= 6.0.3)
307+
actionmailer (= 6.0.3)
308+
actionpack (= 6.0.3)
309+
actiontext (= 6.0.3)
310+
actionview (= 6.0.3)
311+
activejob (= 6.0.3)
312+
activemodel (= 6.0.3)
313+
activerecord (= 6.0.3)
314+
activestorage (= 6.0.3)
315+
activesupport (= 6.0.3)
316316
bundler (>= 1.3.0)
317-
railties (= 6.0.2.2)
317+
railties (= 6.0.3)
318318
sprockets-rails (>= 2.0.0)
319319
rails-controller-testing (1.0.4)
320320
actionpack (>= 5.0.1.x)
@@ -330,9 +330,9 @@ GEM
330330
ruby-graphviz (~> 1.2)
331331
rails-html-sanitizer (1.3.0)
332332
loofah (~> 2.3)
333-
railties (6.0.2.2)
334-
actionpack (= 6.0.2.2)
335-
activesupport (= 6.0.2.2)
333+
railties (6.0.3)
334+
actionpack (= 6.0.3)
335+
activesupport (= 6.0.3)
336336
method_source
337337
rake (>= 0.8.7)
338338
thor (>= 0.20.3, < 2.0)
@@ -464,7 +464,7 @@ GEM
464464
unicode-display_width (1.7.0)
465465
warden (1.2.8)
466466
rack (>= 2.0.6)
467-
web-console (4.0.1)
467+
web-console (4.0.2)
468468
actionview (>= 6.0.0)
469469
activemodel (>= 6.0.0)
470470
bindex (>= 0.4.0)
@@ -495,7 +495,7 @@ PLATFORMS
495495

496496
DEPENDENCIES
497497
annotate
498-
api-auth (~> 2.3)
498+
api-auth (~> 2.4)
499499
awesome_print
500500
better_errors
501501
binding_of_caller
@@ -547,7 +547,7 @@ DEPENDENCIES
547547
pry-rails
548548
pry-remote
549549
puma
550-
rails (~> 6.0.2)
550+
rails (~> 6.0.3)
551551
rails-controller-testing
552552
rails-erd
553553
rb-readline (~> 0.5.3)

0 commit comments

Comments
 (0)