Merge pull request #776 from sonalkr132/deprecation

Follow up on update of rails and activeuuid
This commit is contained in:
Christian Bruckmayer 2016-02-29 11:40:05 +01:00
commit dace1037bd
7 changed files with 100 additions and 62 deletions

View file

@ -164,10 +164,10 @@ GEM
font-awesome-rails (4.1.0.0)
railties (>= 3.2, < 5.0)
formatador (0.2.4)
formtastic (2.3.0.rc3)
actionpack (>= 3.0)
formtastic-bootstrap (3.0.0)
formtastic (>= 2.2)
formtastic (3.1.3)
actionpack (>= 3.2.13)
formtastic-bootstrap (3.1.1)
formtastic (>= 3.0)
geocoder (1.2.2)
globalid (0.3.6)
activesupport (>= 4.1.0)
@ -501,7 +501,7 @@ DEPENDENCIES
devise_ichain_authenticatable
factory_girl_rails
font-awesome-rails
formtastic (~> 2.3.0.rc3)
formtastic (~> 3.1.1)
formtastic-bootstrap
gravtastic
guard-rspec (~> 4.2.8)