Brent Cook
63ae70f061
remove pry/method_source git binding, this is not a vital update
2017-05-26 23:03:44 -05:00
Brent Cook
ce9cfa5727
bit-struct updated, no need for my branch anymore
2017-05-26 23:00:21 -05:00
Brent Cook
6485042162
update rubyntlm to use the released gem
2017-05-12 05:59:11 -05:00
Brent Cook
c16e2fa88e
bump to prerelease rubyntlm to get rid of Ruby 2.4 warning msgs.
2017-04-14 14:06:19 -05:00
Jeffrey Martin
157d28ab3d
make metasploit-aggregator a framework package
2017-04-12 12:33:13 -05:00
Brent Cook
2276bd0c7d
switch back to released octokit gem
2017-04-06 15:36:02 -05:00
Jeffrey Martin
c845745f0b
remove platform restriction on metasploit-aggregator
2017-04-06 13:09:09 -05:00
Brent Cook
3237575024
add ruby 2.1-2.4, update gems with in-flight 2.4 fixes
2017-04-04 04:06:35 -05:00
Jeffrey Martin
baf7e01ec8
Land #8108 , temporarily fix bundles on aarch64
2017-03-14 15:48:29 -05:00
Brent Cook
50beade203
skip aggregator on arm platforms for now
...
the build of grpc fails for warnings
2017-03-06 04:10:32 -05:00
Jeffrey Martin
f8c2bd4f52
expand remote sessions list detail retrieval
2017-02-02 15:21:09 -06:00
Jeffrey Martin
02966d31e1
point aggregator at paranoid branch
2017-02-02 14:31:25 -06:00
Jeffrey Martin
5bf54fef0f
create aggregator connection as plugin
2017-02-02 14:31:21 -06:00
David Maloney
fd543f13af
fix deps
2016-05-13 13:34:18 -05:00
David Maloney
c52f3dcb0e
update to rails 4.2.6
...
fix lost dep unlocks and upgrade rails to 4.2.6
MS-1400
2016-04-15 11:45:43 -05:00
William Vu
22d08fdf39
Revert #6748 , premature Gemfile* changes
2016-04-06 14:52:22 -05:00
David Maloney
fea142dc6e
unlock gemfile deps first
...
unlock the gemfile deps
MS-1330
2016-04-04 13:55:53 -05:00
Brent Cook
b8d53dde4a
Merge branch 'upstream-master' into staging/rails-upgrade
2016-03-29 15:56:50 -05:00
wchen-r7
57984706b8
Resolve merge conflict with Gemfile
2016-03-24 18:13:31 -05:00
David Maloney
b878e762c0
pin rake version to 1.x line
...
rake 11 remvoes the last_comment method which
causes a error when trying to run rake jobs
current guidance is to pin the version back to
before the change
MS-1230
2016-03-10 15:39:06 -06:00
David Maloney
1911d0cd17
missed credential
2016-03-09 15:39:06 -06:00
David Maloney
ca18996272
setup rails staging branch
...
rails 4.1 baby!
2016-03-09 15:35:00 -06:00
David Maloney
88697a5d3f
Merge branch 'master' into staging/rails-upgrade
2016-03-08 15:22:04 -06:00
darkbushido
7eb1dcddcb
Moving the metasploit gems out of the development group
2016-03-02 16:09:24 -06:00
David Maloney
c0c6dc7a18
point to other staging brnaches for gems
...
the gem dependencies that have been modified
so far are being pulled in from their staging branches
on github instead of rubygems for this branch
2016-02-22 11:31:58 -06:00
wchen-r7
b0cfb4aacf
Add info -d to show module documentation in .md
2016-02-16 22:44:03 -06:00
Luke Imhoff
4f2ed69daa
Update fivemat to rspec 3 compatible version
...
MS-673
2015-12-10 21:47:22 -06:00
Luke Imhoff
d38ed931a5
Update to rspec 3.3 in Gemfile
...
MSP-13484
2015-12-10 21:47:22 -06:00
Brent Cook
1b951b36fe
remove -db / -pcap / -all gemspecs, merge into one
2015-11-11 15:01:50 -06:00
William Vu
e6202e3eda
Revert "Land #6060 , Gemfile/gemspec updates"
...
This reverts commit 8f4046da40
, reversing
changes made to 2df149b0a5
.
2015-11-08 19:32:15 -06:00
Brent Cook
725d61d6e4
remove -db / -pcap / -all gemspecs, merge into one
2015-11-04 08:34:56 -06:00
darkbushido
542937415b
updating the gemspecs to use the pre-release versions of the other metasploit gems
2015-04-29 14:07:50 -05:00
Matt Buck
4ae8c622d1
Upgrade factory_girls
...
MSP-12322
2015-03-18 11:28:08 -05:00
Matt Buck
2cd5be021b
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
db/schema.rb
metasploit-framework-db.gemspec
metasploit-framework.gemspec
2015-01-08 13:12:27 -06:00
Luke Imhoff
633b4b9e51
Disable simplecov on travis-ci
...
MSP-11671
`bundler install --without coverage` will not install `simplecov`.
Running without simplecov changes the average runtime of `rake
cucumber:boot` from (n=13) 112.50 seconds to (n=10) 32.17 seconds
(-71.41%). (-73.68% from 2c1203ba49d49603aec169eed053ab929ccdedc6.) Raw
data:
https://docs.google.com/spreadsheets/d/1vCRi_38Go3Wfq670eDCXMTSSXL1blSbk6NQsgpOqfYw/edit?usp=sharing .
2014-12-05 11:58:09 -06:00
Matt Buck
66fde33a0c
Get framework working on rails 4 branch with new gemspecs
2014-11-12 14:06:51 -06:00
Matt Buck
02ec1fb234
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
2014-11-12 10:13:34 -06:00
Trevor Rosen
8511dc4131
Merge branch 'landing/4135' into upstream-master
...
Land #4135
* Improve Bundle management:
* Option to install w/out DB group
* Option to install w/out pcap support
2014-11-10 09:26:42 -06:00
Luke Imhoff
122928d952
Remove redundant rb-readline from Gemfile
...
MSP-11585
The entry in the gemspec is sufficient.
2014-11-06 14:51:10 -06:00
Luke Imhoff
06222911f6
Move pcap bundler group to metasploit-framework-pcap.gemspec
...
MSP-11578
This will allow Metasploit Pro to use the
metasploit-framework-pcap.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
2014-11-05 09:40:57 -06:00
Luke Imhoff
a56a063b84
Move db bundler group to metasploit-framework-db.gemspec
...
MSP-11578
This will allow Metasploit Pro to use the
metasploit-framework-db.gemspec to ensure it has the correct version of
gems that were previously only in metasploit-framework's Gemfile and so
weren't being checked for version compatibility when Pro used
metasploit-framework.gemspec.
2014-11-05 08:58:46 -06:00
darkbushido
2d7c517e2f
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2014-11-04 15:34:25 -06:00
James Lee
867329d4b3
Fix readline by mucking with load path
2014-10-29 22:14:49 -05:00
Matt Buck
25d1caabb5
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile
Gemfile.lock
metasploit-framework.gemspec
2014-10-14 15:20:15 -05:00
James Lee
a65ee6cf30
Land #3373 , recog
...
Conflicts:
Gemfile
Gemfile.lock
data/js/detect/os.js
lib/msf/core/exploit/remote/browser_exploit_server.rb
modules/exploits/android/browser/webview_addjavascriptinterface.rb
2014-10-03 18:05:58 -05:00
Matt Buck
478dbd32f2
Bump to newly-released versions of gems
...
MSP-11412
2014-10-03 12:07:23 -05:00
Matt Buck
f748256e47
Use the prerelease versions of the gems
...
MSP-11412
2014-10-03 10:29:10 -05:00
Matt Buck
04dbfb9ad6
Bump metasploit gem dependencies
...
MSP-11412
2014-10-02 18:11:13 -05:00
Matt Buck
71efeb0c26
Also PATH out the deps for metasploit-credential and metasploit_data_models
...
MSP-11412
2014-10-02 14:08:35 -05:00
Matt Buck
05c71af03c
PATH out the deps to metasploit-concern and metasploit-model, for the moment
2014-10-02 13:29:50 -05:00