Merge branch 'master' into depfu/update/cancancan-3.4.0
This commit is contained in:
commit
4d13a4aa38
1 changed files with 4 additions and 4 deletions
|
|
@ -161,7 +161,7 @@ GEM
|
|||
childprocess (4.1.0)
|
||||
chronic (0.10.2)
|
||||
chunky_png (1.4.0)
|
||||
climate_control (1.0.1)
|
||||
climate_control (1.1.1)
|
||||
cloudinary (1.23.0)
|
||||
aws_cf_signer
|
||||
rest-client (>= 2.0.0)
|
||||
|
|
@ -180,7 +180,7 @@ GEM
|
|||
rexml
|
||||
crass (1.0.6)
|
||||
daemons (1.4.0)
|
||||
dalli (3.2.1)
|
||||
dalli (3.2.2)
|
||||
dante (0.2.0)
|
||||
database_cleaner (2.0.1)
|
||||
database_cleaner-active_record (~> 2.0.0)
|
||||
|
|
@ -399,7 +399,7 @@ GEM
|
|||
hashery (~> 2.0)
|
||||
ruby-rc4
|
||||
ttfunk
|
||||
pg (1.3.5)
|
||||
pg (1.4.1)
|
||||
prawn (2.4.0)
|
||||
pdf-core (~> 0.9.0)
|
||||
ttfunk (~> 1.7)
|
||||
|
|
@ -538,7 +538,7 @@ GEM
|
|||
sprockets-rails
|
||||
tilt
|
||||
selectize-rails (0.12.6)
|
||||
selenium-webdriver (4.2.1)
|
||||
selenium-webdriver (4.3.0)
|
||||
childprocess (>= 0.5, < 5.0)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
rubyzip (>= 1.2.2, < 3.0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue