Nuke Merb because it's too irritating to use

anaisbetts · Jun 2, 2008 · 173c156 · 173c156
1 parent 57b1acd
commit 173c156
Show file tree

Hide file tree

Showing 27 changed files with 0 additions and 1,044 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,17 +1,11 @@
 $:.unshift File.dirname(__FILE__)
-Gem.path.unshift(File.join(File.dirname(__FILE__), "web", "gems"))
 
 require 'rubygems'
 require 'rake/clean'
 require 'rake/testtask'
 require 'spec/rake/spectask'
 require 'pallet'
 
-# Merb Includes
-require 'fileutils'
-require 'rubigen'
-include FileUtils
-
 
 # Load other build files
 Dir.glob("build/*.rake").each {|x| load x}

diff --git a/_autotest/discover.rb b/_autotest/discover.rb
diff --git a/_autotest/merb.rb b/_autotest/merb.rb
diff --git a/_autotest/merb_rspec.rb b/_autotest/merb_rspec.rb
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
diff --git a/app/controllers/exceptions.rb b/app/controllers/exceptions.rb