Commit Graph

4 Commits (fbb18b57691310ef57fa3e6463ad78bc000666c0)

Author SHA1 Message Date
Samuel Huckins 149c3ecc63
Various merge resolutions from master <- staging
* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
2014-08-15 11:33:31 -05:00
Tod Beardsley 2c24cc5c00
Add .plugins to yardoc'able directories. 2014-07-11 14:23:01 -05:00
Brandon Turner 725fbea851 Merge pull request #1563 from rapid7/bug/yard-guard
[Story #45771305]

Conflicts:
	Rakefile
2013-03-07 17:35:03 -06:00
Luke Imhoff 7ca33c12bd Update Gemfile to metasploit_data_models 0.6.1
[#45771305]

MetasploitDataModels 0.6.1 adds a re-usable yard.rake so that all
Metasploit project don't have to define their own.  It also adds guards
so that the YARD tasks aren't defined (and don't cause errors) if YARD
is not available.

This also adds support for making the Rakefile work with `bundle install
--without development test` so it still functions in the bundle building
environment for Pro.
2013-03-07 14:22:35 -06:00