Merge pull request rapid7#3615 from limhoff-r7/bug/MSP-10848/nightly-msfconsole

trosen-r7 · trosen-r7 · commit b769b419ae1f · 2014-08-05T07:56:37.000-05:00
require 'action_view/railtie' for pro compatibility
diff --git 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
@@ -14,6 +14,13 @@
     )
 )
 
+#
+# Railties
+#
+
+# For compatibility with jquery-rails (and other engines that need action_view) in pro
+require 'action_view/railtie'
+
 #
 # Project
 #
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,13 @@`
`14`	`14`	`)`
`15`	`15`	`)`
`16`	`16`
	`17`	`+#`
	`18`	`+# Railties`
	`19`	`+#`
	`20`	`+`
	`21`	`+# For compatibility with jquery-rails (and other engines that need action_view) in pro`
	`22`	`+require 'action_view/railtie'`
	`23`	`+`
`17`	`24`	`#`
`18`	`25`	`# Project`
`19`	`26`	`#`