Skip to content

Commit 4219672

Browse files
authored
Merge branch 'master' into depfu/update/factory_bot_rails-6.1.0
2 parents 77593bc + 21207f7 commit 4219672

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

Gemfile.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,11 @@ GEM
4545
addressable (2.7.0)
4646
public_suffix (>= 2.0.2, < 5.0)
4747
arel (9.0.0)
48+
argon2 (2.0.2)
49+
ffi (~> 1.9)
50+
ffi-compiler (>= 0.1)
4851
ast (2.4.0)
49-
bcrypt (3.1.13)
52+
bcrypt (3.1.15)
5053
bindex (0.5.0)
5154
builder (3.2.4)
5255
byebug (11.1.3)
@@ -61,10 +64,11 @@ GEM
6164
capybara-email (3.0.2)
6265
capybara (>= 2.4, < 4.0)
6366
mail
64-
clearance (2.1.0)
67+
clearance (2.3.0)
6568
actionmailer (>= 5.0)
6669
activemodel (>= 5.0)
6770
activerecord (>= 5.0)
71+
argon2 (~> 2.0, >= 2.0.2)
6872
bcrypt (>= 3.1.1)
6973
email_validator (~> 2.0)
7074
railties (>= 5.0)
@@ -76,7 +80,7 @@ GEM
7680
coffee-script-source
7781
execjs
7882
coffee-script-source (1.12.2)
79-
concurrent-ruby (1.1.6)
83+
concurrent-ruby (1.1.7)
8084
crass (1.0.6)
8185
email_validator (2.0.1)
8286
activemodel
@@ -88,9 +92,12 @@ GEM
8892
factory_bot (~> 6.1.0)
8993
railties (>= 5.0.0)
9094
ffi (1.11.1)
95+
ffi-compiler (1.0.1)
96+
ffi (>= 1.0.0)
97+
rake
9198
globalid (0.4.2)
9299
activesupport (>= 4.2.0)
93-
i18n (1.8.3)
100+
i18n (1.8.5)
94101
concurrent-ruby (~> 1.0)
95102
jaro_winkler (1.5.4)
96103
jbuilder (2.10.0)
@@ -184,7 +191,7 @@ GEM
184191
sprockets (>= 2.8, < 4.0)
185192
sprockets-rails (>= 2.0, < 4.0)
186193
tilt (>= 1.1, < 3)
187-
spring (2.1.0)
194+
spring (2.1.1)
188195
spring-watcher-listen (2.0.1)
189196
listen (>= 2.7, < 4.0)
190197
spring (>= 1.2, < 3.0)

0 commit comments

Comments
 (0)