lib/masterview/initializer.rb in masterview-0.3.3 vs lib/masterview/initializer.rb in masterview-0.3.4

@@ -692,10 +692,10 @@
       self.inline_erb_end = '}}}'
       self.inline_erb_substitution_regex = /\{\{\{(([^}]|\}[^}]|\}\}[^}])*)\}\}\}/
 
       # Rails application options
       self.parse_masterview_templates_at_startup = true
-      self.reparse_changed_masterview_templates = on_rails? ? (not ActionController::Base.perform_caching) : false
+      self.reparse_changed_masterview_templates = (on_rails? && defined?(::ActionController)) ? (not ::ActionController::Base.perform_caching) : false # when in cruise control ActionController was not defined yet
       self.admin_auth_mixin = nil # if defined then this module will be included in MasterView controller
       self.enable_admin_pages = is_development
       self.enable_view_rhtml = is_development
       self.generate_rhtml_files = false