Download as
Browse Code »

Commit a030e4b6645263ae409b37b569eff2600eb98aa8

Authored by Nihad Abbasov
1 parent 2088d2eb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

cleanup database.yml files

Showing 3 changed files with 5 additions and 19 deletions   Show diff stats
config/database.yml.example
  Diff comments   View file @a030e4b
@@ -9,12 +9,11 @@ production: @@ -9,12 +9,11 @@ production:
9 pool: 5 9 pool: 5
10 username: root 10 username: root
11 password: "secure password" 11 password: "secure password"
  12 + # host: localhost
12 # socket: /tmp/mysql.sock 13 # socket: /tmp/mysql.sock
13 14
14 -  
15 -#  
16 -# Development specific  
17 # 15 #
  16 +# Development specific
18 # 17 #
19 development: 18 development:
20 adapter: mysql2 19 adapter: mysql2
@@ -38,6 +37,3 @@ test: &test @@ -38,6 +37,3 @@ test: &test
38 username: root 37 username: root
39 password: "secure password" 38 password: "secure password"
40 # socket: /tmp/mysql.sock 39 # socket: /tmp/mysql.sock
41 -  
42 -cucumber:  
43 - <<: *test  
config/database.yml.mysql
  Diff comments   View file @a030e4b
@@ -9,12 +9,11 @@ production: @@ -9,12 +9,11 @@ production:
9 pool: 5 9 pool: 5
10 username: root 10 username: root
11 password: "secure password" 11 password: "secure password"
  12 + # host: localhost
12 # socket: /tmp/mysql.sock 13 # socket: /tmp/mysql.sock
13 14
14 -  
15 -#  
16 -# Development specific  
17 # 15 #
  16 +# Development specific
18 # 17 #
19 development: 18 development:
20 adapter: mysql2 19 adapter: mysql2
@@ -38,6 +37,3 @@ test: &amp;test @@ -38,6 +37,3 @@ test: &amp;test
38 username: root 37 username: root
39 password: 38 password:
40 # socket: /tmp/mysql.sock 39 # socket: /tmp/mysql.sock
41 -  
42 -cucumber:  
43 - <<: *test  
config/database.yml.sqlite
  Diff comments   View file @a030e4b
@@ -12,11 +12,8 @@ production: @@ -12,11 +12,8 @@ production:
12 pool: 5 12 pool: 5
13 timeout: 5000 13 timeout: 5000
14 14
15 -  
16 -#  
17 -# Development specific  
18 -#  
19 # 15 #
  16 +# Development specific
20 # 17 #
21 development: 18 development:
22 adapter: sqlite3 19 adapter: sqlite3
@@ -32,6 +29,3 @@ test: &amp;test @@ -32,6 +29,3 @@ test: &amp;test
32 database: db/test.sqlite3 29 database: db/test.sqlite3
33 pool: 5 30 pool: 5
34 timeout: 5000 31 timeout: 5000
35 -  
36 -cucumber:  
37 - <<: *test