Download as
Browse Code »

Commit 4182e50674d57f70a76d7b2735d413d5c74efad4

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 69ce8240
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fixing database.yml samples

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
config/database.yml.dist
  Diff comments   View file @4182e50
@@ -20,7 +20,7 @@ development: @@ -20,7 +20,7 @@ development:
20 # Warning: The database defined as 'test' will be erased and 20 # Warning: The database defined as 'test' will be erased and
21 # re-generated from your development database when you run 'rake'. 21 # re-generated from your development database when you run 'rake'.
22 # Do not set this db to the same as development or production. 22 # Do not set this db to the same as development or production.
23 -test: 23 +test: &TEST
24 adapter: mysql 24 adapter: mysql
25 database: noosfero_test 25 database: noosfero_test
26 username: root 26 username: root
config/database.yml.sqlite3
  Diff comments   View file @4182e50
@@ -2,7 +2,7 @@ development: @@ -2,7 +2,7 @@ development:
2 adapter: sqlite3 2 adapter: sqlite3
3 database: db/development.db 3 database: db/development.db
4 4
5 -test: 5 +test: &TEST
6 adapter: sqlite3 6 adapter: sqlite3
7 database: db/test.db 7 database: db/test.db
8 8
@@ -11,5 +11,4 @@ production: @@ -11,5 +11,4 @@ production:
11 database: db/production.db 11 database: db/production.db
12 12
13 cucumber: 13 cucumber:
14 - adapter: sqlite3  
15 - database: db/test.db 14 + <<: *TEST