Merge branch 'staging/electro-release' into feature/MSP-9707/smb-bruteforce-refactor

config/boot.rb

@@ -6,12 +6,12 @@ GEMFILE_EXTENSIONS = [
     ''
 ]
 
-unless ENV['BUNDLE_GEMFILE']
-  require 'pathname'
-
 msfenv_real_pathname = Pathname.new(__FILE__).realpath
 root = msfenv_real_pathname.parent.parent
 
+unless ENV['BUNDLE_GEMFILE']
+  require 'pathname'
+
   GEMFILE_EXTENSIONS.each do |extension|
     extension_pathname = root.join("Gemfile#{extension}")
 
@@ -22,7 +22,6 @@ unless ENV['BUNDLE_GEMFILE']
   end
 end
 
-
 begin
   require 'bundler'
 rescue LoadError
@@ -31,7 +30,6 @@ rescue LoadError
   exit(0)
 end
 
-
 Bundler.setup
 
 lib_path = root.join('lib').to_path