diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:58:47 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:58:47 +0100 |
| commit | 6ef35461dc7148ce37ed602d65a24f6c883fd044 (patch) | |
| tree | c190505eaa8b98b4fcae4403bdd4776957d07785 /railties | |
| parent | 10fe6a6d8940300dd6698ec38e9c9573404e687d (diff) | |
| download | rails-6ef35461dc7148ce37ed602d65a24f6c883fd044.tar.gz rails-6ef35461dc7148ce37ed602d65a24f6c883fd044.tar.bz2 rails-6ef35461dc7148ce37ed602d65a24f6c883fd044.zip | |
Merge docrails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/environments/environment.rb | 3 | ||||
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 2140dfe971..abdb863130 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -63,5 +63,6 @@ Rails::Initializer.run do |config| # config.active_record.schema_format = :sql # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector + # Please note that observers generated using script/generate observer need to have an _observer suffix + # config.active_record.observers = :cacher, :garbage_collector, :forum_observer end diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 5be3b5dd8e..6ff895aa30 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -6,7 +6,7 @@ include_password = false OptionParser.new do |opt| opt.banner = "Usage: dbconsole [options] [environment]" - opt.on("-p", "--include-password", "Automatically provide the database from database.yml") do |v| + opt.on("-p", "--include-password", "Automatically provide the password from database.yml") do |v| include_password = true end opt.parse!(ARGV) |