diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-09-26 23:36:55 -0700 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-09-27 02:56:20 -0700 |
| commit | a030e4b6645263ae409b37b569eff2600eb98aa8 (patch) | |
| tree | 5c25b0ba808f70f2780509ffc6173645706d6d5c | |
| parent | 2088d2eba86878dafaa69e8b908a0db2730451b4 (diff) | |
| download | gitlab-ce-a030e4b6645263ae409b37b569eff2600eb98aa8.tar.gz | |
cleanup database.yml files
| -rw-r--r-- | config/database.yml.example | 8 | ||||
| -rw-r--r-- | config/database.yml.mysql | 8 | ||||
| -rw-r--r-- | config/database.yml.sqlite | 8 |
3 files changed, 5 insertions, 19 deletions
diff --git a/config/database.yml.example b/config/database.yml.example index 5b5c3f0b80b..c5a2b8d605b 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -9,12 +9,11 @@ production: pool: 5 username: root password: "secure password" + # host: localhost # socket: /tmp/mysql.sock - -# -# Development specific # +# Development specific # development: adapter: mysql2 @@ -38,6 +37,3 @@ test: &test username: root password: "secure password" # socket: /tmp/mysql.sock - -cucumber: - <<: *test diff --git a/config/database.yml.mysql b/config/database.yml.mysql index 99cd7eaa5cf..436bea77f0f 100644 --- a/config/database.yml.mysql +++ b/config/database.yml.mysql @@ -9,12 +9,11 @@ production: pool: 5 username: root password: "secure password" + # host: localhost # socket: /tmp/mysql.sock - -# -# Development specific # +# Development specific # development: adapter: mysql2 @@ -38,6 +37,3 @@ test: &test username: root password: # socket: /tmp/mysql.sock - -cucumber: - <<: *test diff --git a/config/database.yml.sqlite b/config/database.yml.sqlite index 077a17ba661..591448f6bee 100644 --- a/config/database.yml.sqlite +++ b/config/database.yml.sqlite @@ -12,11 +12,8 @@ production: pool: 5 timeout: 5000 - -# -# Development specific -# # +# Development specific # development: adapter: sqlite3 @@ -32,6 +29,3 @@ test: &test database: db/test.sqlite3 pool: 5 timeout: 5000 - -cucumber: - <<: *test |