Commit Graph

9 Commits (7b29e6e0571cd76210d3611372ac1dd38dd5213f)

Author SHA1 Message Date
Brent Cook 180c395aa3 just print the error, but don't give specific advice 2019-03-15 07:18:48 -05:00
Brent Cook 3027df6ab3 final tweaks 2019-03-14 06:47:58 -05:00
Brent Cook 2a906a2a32 be even clearer 2019-03-14 06:31:54 -05:00
Brent Cook e1e13d964d give better specific instructions where bundler versions are stepping on each other 2019-03-14 06:27:37 -05:00
Brent Cook c197a0d019 actually show why bundler failed to load 2019-03-12 11:33:34 -05:00
Jon Hart f51dd2b6f4
Use bundler/setup for more graceful bundler related failures 2014-11-17 18:06:01 -08:00
Luke Imhoff 78e6c3a65b
Fix merge error
While helping Dave Maloney port the changes from lib/msfenv.rb to
config/boot.rb for the Gemfile.local support, I failed to notice that
root was only defined in the unless block when it is needed no matter
what.
2014-06-20 14:32:29 -05:00
David Maloney 99b1702559
Merge branch 'master' into staging/electro-release
Conflicts:
	lib/msfenv.rb
2014-06-20 11:38:47 -05:00
Luke Imhoff 3370465d84
Use railties to load Metasploit::Credential correctly
MSP-9606

In order to support Metasploit::Credential correctly,
metasploit-framework needs to support Metasploit::Concern, which does
all its magic using a Rails::Engine initializer, so the easiest path is
to make metasploit-framework be able to use Rails::Engines.  To make
Rails::Engine use Rails::Engine, make a dummy Rails::Application
subclass so that all the initializers will be run when anything requires
msfenv.
2014-05-12 15:03:51 -05:00