From: Frederik Ramm <frederik@remote.org>
Date: Sat, 8 Nov 2008 19:55:13 +0000 (+0000)
Subject: fix accidental commit of local config changes
X-Git-Tag: live~7609^2~186
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7a3f7bc2dd1cd89cb69a4b6f0f1e38859535891d?ds=sidebyside

fix accidental commit of local config changes
---

diff --git a/config/database.yml b/config/database.yml
index 09c9dbe6b..cc3f9a1a5 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,9 +12,9 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: osm
-  username: osm
-  password: osm
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
   encoding: utf8
 
diff --git a/config/environment.rb b/config/environment.rb
index 2c9e4803c..171bb6fc8 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -60,7 +60,7 @@ Rails::Initializer.run do |config|
 
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
-  config.log_level = :debug
+  # config.log_level = :debug
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!