--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -11,7 +11,6 @@ config.whiny_nils = true
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 config.action_view.debug_rjs                         = true
 
 # ActionMailer::Base.default_url_options[:protocol] = 'https'

--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,7 +14,6 @@ config.log_level = :warn
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
-config.action_view.cache_template_extensions   = true
 
 cache_dir = File.expand_path(File.join(RAILS_ROOT, 'public', 'cache'))
 config.action_controller.page_cache_directory = cache_dir

--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -4,13 +4,13 @@ describe ApplicationHelper do
   
   it "renders a message if an object is not ready?" do
     repos = repositories(:johans)
-    build_notice_for(repos).should include("This repository is being created")
+    helper.build_notice_for(repos).should include("This repository is being created")
   end
   
   it "renders block if object is ready" do
     obj = mock("any given object")
     obj.stub!(:ready?).and_return(true)
-    render_if_ready(obj) do
+    helper.render_if_ready(obj) do
       "moo"
     end.should == "moo"
   end
@@ -19,7 +19,7 @@ describe ApplicationHelper do
     obj = mock("any given object")
     obj.stub!(:ready?).and_return(false)
     _erbout = "" # damn you RSpec!
-    render_if_ready(obj) do
+    helper.render_if_ready(obj) do
       "moo"
     end
     _erbout.should_not == "moo"
@@ -27,18 +27,18 @@ describe ApplicationHelper do
   end
   
   it "gives us the domain of a full url" do
-    base_url("http://foo.com").should == "foo.com"
-    base_url("http://www.foo.com").should == "www.foo.com"
-    base_url("http://foo.bar.baz.com").should == "foo.bar.baz.com"
-    base_url("http://foo.com/").should == "foo.com"
-    base_url("http://foo.com/bar/baz").should == "foo.com"
+    helper.base_url("http://foo.com").should == "foo.com"
+    helper.base_url("http://www.foo.com").should == "www.foo.com"
+    helper.base_url("http://foo.bar.baz.com").should == "foo.bar.baz.com"
+    helper.base_url("http://foo.com/").should == "foo.com"
+    helper.base_url("http://foo.com/bar/baz").should == "foo.com"
   end
   
   it "generates a valid gravatar url" do
     email = "someone@myemail.com";
     url = gravatar_url_for(email)
     
-    base_url(url).should == "www.gravatar.com"
+    helper.base_url(url).should == "www.gravatar.com"
     url.include?(Digest::MD5.hexdigest(email)).should == true
     url.include?("avatar.php?").should == true
   end
@@ -46,14 +46,14 @@ describe ApplicationHelper do
     
   it "should generate a blank commit graph url if the graph isn't there" do
     File.should_receive(:exist?).and_return(false)
-    url = commit_graph_tag(repositories(:johans))    
+    url = helper.commit_graph_tag(repositories(:johans))    
     url.should == nil
   end
   
   it "should generate a blank url for commit graph by author if the graph isn't there" do
     File.should_receive(:exist?).and_return(false)
     
-    url = commit_graph_by_author_tag(repositories(:johans))
+    url = helper.commit_graph_by_author_tag(repositories(:johans))
     url.should == nil
   end
 end

--- a/spec/helpers/blobs_helper_spec.rb
+++ b/spec/helpers/blobs_helper_spec.rb
@@ -2,30 +2,34 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe BlobsHelper do
   
+  def included_modules
+    (class << helper; self; end).send(:included_modules)
+  end
+  
   it "includes the RepostoriesHelper" do
-    self.class.ancestors.should include(RepositoriesHelper)
+    included_modules.should include(RepositoriesHelper)
   end
   
   it "includes the TreesHelper" do
-    self.class.ancestors.should include(TreesHelper)
-  end
+    included_modules.should include(TreesHelper)
+  end  
   
   describe "line_numbers_for" do
     it "renders something with line numbers" do
-      numbered = line_numbers_for("foo\nbar\nbaz")
+      numbered = helper.line_numbers_for("foo\nbar\nbaz")
       numbered.should include(%Q{<td class="line-numbers"><a href="#line2" name="line2">2</a></td>})
       numbered.should include(%Q{<td class="code">bar</td>})
     end
   
     it "renders one line with line numbers" do
-      numbered = line_numbers_for("foo")
+      numbered = helper.line_numbers_for("foo")
       numbered.should include(%Q{<td class="line-numbers"><a href="#line1" name="line1">1</a></td>})
       numbered.should include(%Q{<td class="code">foo</td>})
     end
   
     it "doesn't blow up when with_line_numbers receives nil" do
       proc{
-        line_numbers_for(nil).should == %Q{<table id="codeblob" class="highlighted">\n</table>}
+        helper.line_numbers_for(nil).should == %Q{<table id="codeblob" class="highlighted">\n</table>}
       }.should_not raise_error
     end
   end
@@ -33,25 +37,25 @@ describe BlobsHelper do
   describe "render_highlighted()" do
     it "tries to figure out the filetype" do
       Uv.should_receive(:syntax_names_for_data).with("foo.rb", "puts 'foo'").and_return(["ruby"])
-      render_highlighted("puts 'foo'", "foo.rb")
+      helper.render_highlighted("puts 'foo'", "foo.rb")
     end
     
     it "parses the text" do
       Uv.should_receive(:syntax_names_for_data).with("foo.rb", "puts 'foo'").and_return(["ruby"])
       Uv.should_receive(:parse).and_return("puts 'foo'")
-      render_highlighted("puts 'foo'", "foo.rb")
+      helper.render_highlighted("puts 'foo'", "foo.rb")
     end
     
     it "adds linenumbers" do
-      should_receive(:line_numbers_for).and_return(123)
-      render_highlighted("puts 'foo'", "foo.rb")
+      helper.should_receive(:line_numbers_for).and_return(123)
+      helper.render_highlighted("puts 'foo'", "foo.rb")
     end
   end
   
   describe "too_big_to_render" do
     it "knows when a blob is too big to be rendered within reasonable time" do
-      too_big_to_render?(1.kilobyte).should == false
-      too_big_to_render?(150.kilobyte+1).should == true
+      helper.too_big_to_render?(1.kilobyte).should == false
+      helper.too_big_to_render?(150.kilobyte+1).should == true
     end
   end
   

--- a/spec/helpers/commits_helper_spec.rb
+++ b/spec/helpers/commits_helper_spec.rb
@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe CommitsHelper do
   
   it "includes the RepostoriesHelper" do
-    self.class.ancestors.should include(RepositoriesHelper)
+    included_modules = (class << helper; self; end).send(:included_modules)
+    included_modules.should include(RepositoriesHelper)
   end
   
   describe "render_diff_stats" do
@@ -22,18 +23,18 @@ describe CommitsHelper do
     
     it "renders a list of files as anchor links" do
       files = @stats.files.keys
-      rendered_stats = render_diff_stats(@stats)
+      rendered_stats = helper.render_diff_stats(@stats)
       files.each do |filename|
         rendered_stats.should include(%Q{<li><a href="##{h(filename)}">#{h(filename)}</a>})
       end
     end
     
     it "renders a graph of minuses for deletions" do
-      render_diff_stats(@stats).should include(%Q{spec/database_spec.rb</a>&nbsp;17&nbsp;<small class="deletions">#{"-"*12}</small>})
+      helper.render_diff_stats(@stats).should include(%Q{spec/database_spec.rb</a>&nbsp;17&nbsp;<small class="deletions">#{"-"*12}</small>})
     end
     
     it "renders a graph of plusses for inserts" do
-      render_diff_stats(@stats).should match(
+      helper.render_diff_stats(@stats).should match(
         /spec\/database_spec\.rb<\/a>&nbsp;17&nbsp;<small class="deletions.+<\/small><small class="insertions">#{"\\+"*5}<\/small>/
       )
     end

--- a/spec/helpers/logs_helper_spec.rb
+++ b/spec/helpers/logs_helper_spec.rb
@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe LogsHelper do
   
   it "includes the RepostoriesHelper" do
-    self.class.ancestors.should  include(RepositoriesHelper)
+    included_modules = (class << helper; self; end).send(:included_modules)
+    included_modules.should  include(RepositoriesHelper)
   end
 end

--- a/spec/helpers/trees_helper_spec.rb
+++ b/spec/helpers/trees_helper_spec.rb
@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe TreesHelper do
   
   it "includes the RepostoriesHelper" do
-    self.class.ancestors.should include(RepositoriesHelper)
+    included_modules = (class << helper; self; end).send(:included_modules)
+    included_modules.should include(RepositoriesHelper)
   end
   
   describe "commit_for_tree_path" do

--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -11,12 +11,12 @@ describe UsersHelper do
       Need to investigate if this is a Rails bug and
       either fix it there or let go of obfuscation.
     }
-    #pending(message) do
+    pending(message) do
       email = "aAT@NOSPAM@bDOTcom"
       encoded = (0...email.length).inject("") do |result, index|
         result << sprintf("%%%x",email[index])
       end
       helper.encoded_mail_to("a@b.com").should match(/#{encoded}/)
-    #end
+    end
   end
 end

--- a/vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb
+++ b/vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb
@@ -1,7 +1,5 @@
 require 'spec/interop/test'
 
-ActionView::Base.cache_template_extensions = false
-
 module Spec
   module Rails