Land #11702, use a released metasm gem for update

master
Brent Cook 2019-04-08 18:12:01 -05:00
commit a5184d39dc
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
2 changed files with 1 additions and 11 deletions

View File

@ -5,9 +5,6 @@ gemspec name: 'metasploit-framework'
gem 'sqlite3', '~>1.3.0'
# use custom metasm until fix for 2.5 is released
gem 'metasm', git: "https://github.com/rapid7/metasm", branch: "ruby_2_5_compat"
# separate from test as simplecov is not run on travis-ci
group :coverage do
# code coverage for tests

View File

@ -1,10 +1,3 @@
GIT
remote: https://github.com/rapid7/metasm
revision: 916b7ca5a728321a8a4a890bd21e588e1f2ac5a6
branch: ruby_2_5_compat
specs:
metasm (1.0.4)
PATH
remote: .
specs:
@ -165,6 +158,7 @@ GEM
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
metasm (1.0.4)
metasploit-concern (2.0.5)
activemodel (~> 4.2.6)
activesupport (~> 4.2.6)
@ -375,7 +369,6 @@ PLATFORMS
DEPENDENCIES
factory_bot_rails
fivemat
metasm!
metasploit-framework!
octokit
pry