diff --git a/Gemfile b/Gemfile index 546b26f..7b4bfd3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.0' +gem 'rails', '3.0.1' gem 'sinatra' # async wrappers @@ -19,28 +19,4 @@ gem 'em-mysqlplus', :git => 'git://github.com/igrigorik/em-mysqlplus.git', :r gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http' gem 'addressable', :require => 'addressable/uri' -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -# gem 'sqlite3-ruby', :require => 'sqlite3' - -# Use unicorn as the web server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger -# gem 'ruby-debug' - -# Bundle the extra gems: -# gem 'bj' -# gem 'nokogiri', '1.4.1' -# gem 'sqlite3-ruby', :require => 'sqlite3' -# gem 'aws-s3', :require => 'aws/s3' - -# Bundle gems for certain environments: -# gem 'rspec', :group => :test -# group :test do -# gem 'webrat' -# end +gem 'thin' diff --git a/Rakefile b/Rakefile index 13f1f9f..7607ba2 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require File.expand_path('../config/application', __FILE__) require 'rake' -Rails::Application.load_tasks +AsyncRails3::Application.load_tasks diff --git a/config/application.rb b/config/application.rb index 25c7c74..1c87f09 100644 --- a/config/application.rb +++ b/config/application.rb @@ -39,6 +39,7 @@ class Application < Rails::Application # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" + config.active_support.deprecation = :log # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password]