From b5c6d666f03b98f131fad7aa1ca13846eef5fc90 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 18 Dec 2012 22:42:49 +0100 Subject: fix language --- app/views/shared/_header.de.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 4666adb72cd6a0316f0c1c338bc26449cebdd125 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Wed, 19 Dec 2012 00:07:11 +0100 Subject: fix database default settings --- config/database.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) 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 -- cgit v1.2.3