Merge branch 'develop'

2 files changed, 23 insertions, 16 deletions

diff --git a/app/views/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml
index c6205ae..10ad2a0 100644
--- a/app/views/shared/_header.de.html.haml
+++ b/app/views/shared/_header.de.html.haml
@@ -37,5 +37,5 @@
     - else
       .user-context
         = link_to "Registrieren", sign_up_path 
-        oder
+        or
         = link_to "Anmelden", log_in_path
diff --git a/config/database.yml b/config/database.yml
index 4ea8d4a..bd1748e 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,22 +1,29 @@
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000  
+development: 
+   adapter: mysql2 
+   encoding: utf8 
+   database: gemeinschaft 
+   pool: 5 
+   username: gemeinschaft 
+   password: gemeinschaft 
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true 
 
-production:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000  
+production: 
+   adapter: mysql2 
+   encoding: utf8 
+   database: gemeinschaft 
+   pool: 10 
+   username: gemeinschaft 
+   password: gemeinschaft 
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true
 
 # 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: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3
-  pool: 5
-  timeout: 5000
-
+   adapter: sqlite3
+   database: db/test.sqlite3
+   pool: 5
+   timeout: 5000
\ No newline at end of file