diff --git a/Gemfile.lock b/Gemfile.lock index 54810fe8a5..e0154b6eb4 100644 --- a/Gemfile.lock +++ b/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 diff --git a/config/application.rb b/config/application.rb index 54c1e29d4d..7be9b69f0d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,6 +14,13 @@ Bundler.require( ) ) +# +# Railties +# + +# For compatibility with jquery-rails (and other engines that need action_view) in pro +require 'action_view/railtie' + # # Project # diff --git a/lib/msf/base/config.rb b/lib/msf/base/config.rb index fce480ef33..beaac2a5b8 100644 --- a/lib/msf/base/config.rb +++ b/lib/msf/base/config.rb @@ -10,6 +10,7 @@ require 'fileutils' # Project # +require 'metasploit/framework/version' require 'rex/compat' module Msf diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index 190059ebd6..6999c787e3 100644 --- a/metasploit-framework.gemspec +++ b/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)