merged

flexd · Apr 16, 2011 · 634411f · 634411f
2 parents 62f438a + cc6f960
commit 634411f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ gem "sinatra", ">=1.0"
 gem "bson_ext"
 gem "mongoid", "2.0.0.beta.17"
 gem 'sinatra-mongoid-config', :git => "git://github.com/flexd/sinatra-mongoid-config.git"
-gem 'sinatra-cache'
 gem "rspec"
 gem "rack-test"
 gem "haml"

diff --git a/application.rb b/application.rb
@@ -8,9 +8,6 @@
 configure do
   set :views, "#{File.dirname(__FILE__)}/views"
   set :root, File.dirname(__FILE__)
-  set :cache_enabled, false
-  set :cache_output_dir, Proc.new { File.join(root, 'tmp', 'cache') }
-  set :cache_logging_level, :debug
 end
 
 error do

diff --git a/environment.rb b/environment.rb
@@ -6,7 +6,6 @@
 require 'sinatra' unless defined?(Sinatra)
 require 'sinatra-mongoid-config'
 require 'sinatra/redirect_with_flash'
-require 'sinatra/cache'
 require 'resque'
 require 'carrierwave'
 require 'pp'
@@ -37,6 +36,5 @@
   #DataMapper.setup(:default, "postgres://civ5replays_production:[email protected]/civ5replays_#{Sinatra::Base.environment}")
   #DataMapper.setup(:default, (ENV["DATABASE_URL"] || "sqlite3:///#{File.expand_path(File.dirname(__FILE__))}/#{Sinatra::Base.environment}.db"))
   use Rack::Flash
-  enable :sessions
 
 end