infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,749 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

14 Commits (07ea8bedb5a7f5d4bc827724e60884caa0d6d629)

Author SHA1 Message Date
Luke Imhoff d56dd318b9
require 'action_view/railtie' for pro compatibility 
MSP-10848

Other railties, like jquery-rails, need 'action_view/railtie', but don't
require it themselves, so require it explictly in
`config/application.rb` to prevent msfconsole boot errors.
 2014-08-04 20:12:28 -05:00
Matt Buck f7aa324c35
Update metasploit-model and metasploit_data_models deps 2014-07-30 13:10:09 -05:00
James Lee 1ee32b3b98
Bump metasploit-model so we can use Realm::Key map 2014-07-29 12:19:03 -05:00
James Lee ef7f5fe967 Make metasploit-model a direct dep 
Needed for all the scanners that use Metasploit::Model::Realm::Key
constants.
 2014-07-29 10:30:46 -05:00
Brandon Turner ff017f83f7 Merge pull request #105 from rapid7/bug/MSP-10684-electro-installers 
MSP-10684 Allow declaring root via env var in gemspecs
 2014-07-16 16:51:46 -05:00
cdoughty-r7 1ad04eb2d9 Merge pull request #111 from rapid7/bug/MSP-10714-gem-version 
Fix gem version to support rubygems < 2.1
 2014-07-16 13:23:33 -05:00
Lance Sanchez 1e2df81397
Attempting to fix a gemfile mergeconflict 
MSP-10721
 2014-07-16 10:22:27 -05:00
Brandon Turner 044fdb8c55
Fix gem version to support rubygems < 2.1 
MSP-10714
 2014-07-15 19:02:39 -05:00
Brandon Turner 20131781b4
Use realpath to resolve symlinks in MSF_ROOT 2014-07-14 09:42:49 -05:00
Brandon Turner f29050b6b2
Use MSF_ROOT instead of MSP_ROOT 2014-07-10 20:22:50 -05:00
Brandon Turner e6e88ab4fe
Allow declaring root via env var in gemspecs 
The bundle build tasks temporarily relocate Gemfile and gemspecs to
temporary directories when packing bundles.  For this to work, we can't
depend on the Gemfile/gemspec exisiting in a specific location relative
to other code.

This allows specifying the project root via the MSP_ROOT environment
variable.  If you do not specify MSP_ROOT, the behavior is unchanged.

MSP-10684
 2014-07-10 15:04:33 -05:00
Luke Imhoff b92e95ee7f
Add rubyzip 1.1.X 
MSP-10004
 2014-06-10 13:23:40 -05:00
Luke Imhoff 9e78509aac
Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro 
MSP-9653

Conflicts:
	Gemfile
	Gemfile.lock
 2014-06-02 13:40:11 -05:00
Luke Imhoff 898b108863
Gemspec 
MSP-9653

Add gemspec for metasploit-framework so that pro can declare it as a
proper dependency.  DO NOT release metasploit-framework to rubygems: it
is 47 MB and would be not be nice to their servers.
 2014-06-02 13:03:07 -05:00