Merge PR#3541 to this branch to undo it.

bug/bundler_fix
Tod Beardsley 2014-07-17 11:36:36 -05:00
commit 5d3b472293
No known key found for this signature in database
GPG Key ID: 1EFFB682ADB9F193
2 changed files with 4 additions and 0 deletions

View File

@ -21,6 +21,8 @@ gem 'robots'
# Needed for some post modules
gem 'sqlite3'
gem 'hpricot', :require => 'hpricot'
group :db do
# Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0'

View File

@ -20,6 +20,7 @@ GEM
factory_girl (4.2.0)
activesupport (>= 3.0.0)
fivemat (1.2.1)
hpricot (0.8.6)
i18n (0.6.5)
json (1.8.0)
metasploit_data_models (0.17.0)
@ -69,6 +70,7 @@ DEPENDENCIES
database_cleaner
factory_girl (>= 4.1.0)
fivemat (= 1.2.1)
hpricot
json
metasploit_data_models (= 0.17.0)
meterpreter_bins (= 0.0.6)