Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release

Author: limhoff-r7

Gemfile.lock

@@ -2,6 +2,7 @@ PATH
   remote: .
   specs:
     metasploit-framework (4.10.0.pre.dev)
+      actionpack (< 4.0.0)
       activesupport (>= 3.0.0, < 4.0.0)
       bcrypt
       json

config/application.rb

@@ -14,6 +14,13 @@
     )
 )
 
+#
+# Railties
+#
+
+# For compatibility with jquery-rails (and other engines that need action_view) in pro
+require 'action_view/railtie'
+
 #
 # Project
 #

lib/msf/base/config.rb

@@ -10,6 +10,7 @@
 # Project
 #
 
+require 'metasploit/framework/version'
 require 'rex/compat'
 
 module Msf

metasploit-framework.gemspec

@@ -51,6 +51,8 @@ Gem::Specification.new do |spec|
 
   # Need 3+ for ActiveSupport::Concern
   spec.add_runtime_dependency 'activesupport', '>= 3.0.0', rails_version_constraint
+  # Needed for config.action_view for view plugin compatibility for Pro
+  spec.add_runtime_dependency 'actionpack', rails_version_constraint
   # Needed for some admin modules (cfme_manageiq_evm_pass_reset.rb)
   spec.add_runtime_dependency 'bcrypt'
   # Needed for some admin modules (scrutinizer_add_user.rb)