Permalink
Browse files

Get the dummy app running with Rails 3.1 and ignore vim swap files

  • Loading branch information...
1 parent ec656e1 commit 7556fcdbdba09cd14f6e8e4acdede45e8ca5f954 @mhoran mhoran committed Feb 22, 2012
View
@@ -4,3 +4,4 @@ pkg/
spec/dummy/db/*.sqlite3
spec/dummy/log/*.log
spec/dummy/tmp/
+*.swp
@@ -1,7 +1,6 @@
require File.expand_path('../boot', __FILE__)
require "active_model/railtie"
-require "active_record/railtie"
require "action_controller/railtie"
require "action_view/railtie"
require "action_mailer/railtie"
@@ -1,22 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3
-development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
- adapter: sqlite3
- database: ":memory:"
- pool: 5
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
@@ -11,7 +11,6 @@
# Show full error reports and disable caching
config.consider_all_requests_local = true
- config.action_view.debug_rjs = true
config.action_controller.perform_caching = false
# Don't care if the mailer can't send
View
@@ -16,9 +16,6 @@
Capybara.default_driver = :rack_test
Capybara.default_selector = :css
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
# Load support files
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

0 comments on commit 7556fcd

Please sign in to comment.