Skip to content

Commit 960392d

Browse files
committed
Merge pull request rapid7#1725 from bturner-r7/mdm_from_rubygems
Use metasploit_data_models from rubygems
2 parents 8376531 + 97f4882 commit 960392d

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'activerecord'
77
# Needed for some admin modules (scrutinizer_add_user.rb)
88
gem 'json'
99
# Database models shared between framework and Pro.
10-
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.6.4'
10+
gem 'metasploit_data_models', '~> 0.6.14'
1111
# Needed by msfgui and other rpc components
1212
gem 'msgpack'
1313
# Needed by anemone crawler

Gemfile.lock

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
GIT
2-
remote: git://github.com/rapid7/metasploit_data_models.git
3-
revision: d6af3cf0413c1ad317c16c143791097bd0a5afff
4-
tag: 0.6.4
5-
specs:
6-
metasploit_data_models (0.6.4)
7-
activerecord (>= 3.2.13)
8-
activesupport
9-
pg
10-
111
GEM
122
remote: http://rubygems.org/
133
specs:
@@ -30,6 +20,10 @@ GEM
3020
activesupport (>= 3.0.0)
3121
i18n (0.6.1)
3222
json (1.7.7)
23+
metasploit_data_models (0.6.14)
24+
activerecord (>= 3.2.13)
25+
activesupport
26+
pg
3327
msgpack (0.5.4)
3428
multi_json (1.0.4)
3529
nokogiri (1.5.9)
@@ -62,7 +56,7 @@ DEPENDENCIES
6256
database_cleaner
6357
factory_girl (>= 4.1.0)
6458
json
65-
metasploit_data_models!
59+
metasploit_data_models (~> 0.6.14)
6660
msgpack
6761
nokogiri
6862
pcaprub

0 commit comments

Comments
 (0)