Permalink
Browse files

use Rails 3.0.0

  • Loading branch information...
1 parent 6366eed commit b35e5abd36edc4b97e5a893ef3e47474f97f1c5f @koichiro koichiro committed Sep 3, 2010
View
13 Gemfile
@@ -2,13 +2,16 @@
source "http://rubygems.org"
-gem "rails", "3.0.0.beta4"
+gem "rails", "3.0.0"
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'warden-openid'
-gem 'devise', "1.1.rc2"
+gem 'devise', "1.1.2"
gem 'bluefeather'
-gem 'will_paginate', '3.0.pre'
-gem 'rspec', "2.0.0.beta.15"
-gem 'rspec-rails', "2.0.0.beta.15"
+gem 'will_paginate', '3.0.pre2'
gem 'racknga'
+
+group :development, :test do
+ gem 'rspec', ">= 2.0.0.beta.20"
+ gem 'rspec-rails', ">= 2.0.0.beta.20"
+end
View
@@ -10,4 +10,4 @@ require 'rake/testtask'
require 'rake/rdoctask'
# require 'spec/rake/spectask'
-Rails::Application.load_tasks
+Taiyaking::Application.load_tasks
View
@@ -13,8 +13,10 @@ class Application < Rails::Application
# -- all .rb files in that directory are automatically loaded.
# Add additional load paths for your own custom dirs
- # config.load_paths += %W( #{config.root}/extras )
+ config.autoload_paths += %W( #{config.root}/lib )
+ # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+ #
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -13,6 +13,7 @@
config.consider_all_requests_local = true
config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
+ config.active_support.deprecation = :log
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
@@ -43,4 +43,5 @@
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
+ config.active_support.deprecation = :notify
end
@@ -29,4 +29,6 @@
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
+ config.action_dispatch.show_exceptions = false
+ config.active_support.deprecation = :stderr
end
@@ -13,4 +13,4 @@
end
session_secret = session_secret_file.read.strip
-Rails.application.config.secret_token = session_secret
+Taiyaking::Application.config.secret_token = session_secret
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.
-Rails.application.config.session_store :cookie_store, :key => '_taiyaking_session'
+Taiyaking::Application.config.session_store :cookie_store, :key => '_taiyaking_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
View
@@ -1,4 +1,4 @@
-Taiyaking::Application.routes.draw do |map|
+Taiyaking::Application.routes.draw do
devise_for(:users,
:controllers => {:sessions => "users/sessions"},
:path_names => {:sign_in => "login", :sign_out => "logout"})

0 comments on commit b35e5ab

Please sign in to comment.